7 files changed, 5 insertions, 127 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 5905f14367dd..2a3f3b45ce2e 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/cd-discid/Manifest b/media-sound/cd-discid/Manifest
index 41a8c04f79aa..eecd82f4dcc2 100644
--- a/media-sound/cd-discid/Manifest
+++ b/media-sound/cd-discid/Manifest
@@ -1,3 +1,3 @@
 DIST cd-discid-1.4.tar.gz 12487 BLAKE2B ee20afdefaec407dd043b85fa6bf3cc8c9fdbbb1c63793161126935d75e148d65f59723bc8a4dfa95322db0fac3eaa7ab46c7ee0b927a9cc8dca9ce3a0ac1715 SHA512 f601ea8b7ad73e22ebafc22c392f120fe2e5ed2e275f8c53aab92b27ca1738b9f0c53dd5ed7a012915fe8f1f30fd2356f973895e2dbfe649937930e69faa0c29
-EBUILD cd-discid-1.4-r1.ebuild 606 BLAKE2B 063962c8f2f7e8850617f9ea9b13dbbaf0d57bee2d1a8c7f608c7b42fdddbff3d83b0be117daa7c11c9ec41df042811431871aa4b3f5aaf832cef5fb0522d797 SHA512 0fc70d117e8250c39e8c094a9f312cbafd3e740a63a4407839b6b9f96d7b48687c83207e02779f5b7d700e00fcb6f27e71df997ca6a09709d2846fe25159e1ad
+EBUILD cd-discid-1.4-r1.ebuild 608 BLAKE2B f5c7ce2243c449070d8378252b7f94fc08cddbad83f97331b3e72756f555475502fb714b847f3f09b652583984bef5e9babf26719afd378468355900b3eeefdd SHA512 60cca0236839e4d7fbfe8c54fc5b4138c48f675fcb831ecad2dc0a48cefb10d8057d1c8dc04bb80fc3df49363a3502565f375338b883757ff59f8c750d14a5a0
 MISC metadata.xml 333 BLAKE2B 4b1a16625fc5d8ff1b1b5cbbbb5bc82ea1ea6179368d7cbd37fa9290681940de6472b7606f4379b472a3bfdcbdb0bd39db860aa4273eb7cf70837f0fb46629bd SHA512 23f14f1ea66d479f3c5821d177f8fc3c9253a172f52f195928e7344efa2abbcf4a950266367a8073f648dd3b50a7e40960e6b9a9a81faf383c98fb42d00bf861
diff --git a/media-sound/cd-discid/cd-discid-1.4-r1.ebuild b/media-sound/cd-discid/cd-discid-1.4-r1.ebuild
index be503d716c86..e92d35bd7102 100644
--- a/media-sound/cd-discid/cd-discid-1.4-r1.ebuild
+++ b/media-sound/cd-discid/cd-discid-1.4-r1.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="returns the disc id for the cd in the cd-rom drive"
 HOMEPAGE="https://github.com/taem/cd-discid"
-SRC_URI="https://github.com/taem/${PN}/archive/upstream/1.4.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/taem/${PN}/archive/upstream/${PV}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}/${PN}-upstream-${PV}"
 
 LICENSE="GPL-2"
diff --git a/media-sound/gmpc/Manifest b/media-sound/gmpc/Manifest
index a6357406f66b..cab63c8696be 100644
--- a/media-sound/gmpc/Manifest
+++ b/media-sound/gmpc/Manifest
@@ -2,5 +2,5 @@ AUX gmpc-11.8.16-AM_CONFIG_HEADER.patch 170 BLAKE2B 2b359e328445c00d63591e8b0f47
 AUX gmpc-11.8.16-icons.patch 7380 BLAKE2B bd546a009efc5c37eb50593763fc39231f07c611805aac08b2353ad3ce283e6b948c49b0be0f232e81d94ee717a4a3b1dd7c19177659aabe5554caa873c9b672 SHA512 cabee4790552b22e31873fdd0b2c786743fdb9fe3b5eb613ec85e83e27285116e6f05c1d8ac7013d9d2b17ec765876a276804c08b1ccc6d78051991c50b769d8
 AUX gmpc-11.8.16-underlinking.patch 241 BLAKE2B 69400fae94f780e81bdf078b26c2bdca69fe03fbff42a3600a9cba2310981a94ddd01c07f418571a6168108fde11cfd02e4a40230fbbde25d4b3868e09decf19 SHA512 ff1d628f0bdf4be3d0c1130762ecb0c90f2a93cbe0d31b3df25168b04a68b0292788b7c1c5c69b243a16ccfb1185d1622d5c7e1c6d390460db37156ad5f78576
 DIST gmpc-11.8.16.tar.gz 7082909 BLAKE2B 913b7b55029f6fe78dcae7355bd571f4d6e95c4d1891e12251717b7fe846a69b52ba9cf2c65042a36295830dbec65128d0aa119d8503c934a3f09b86b42a0409 SHA512 4e5c8112edc016ac6c472b0099347a4fcd0336022e15be8d76fae449d30e533df92a4379aa98e389e624b9910ff3f528afb682f64901ea53f09e00d3d5678623
-EBUILD gmpc-11.8.16-r2.ebuild 1239 BLAKE2B e1d5b6e0a85c6848eb1fa5c90093844acbb4b110f57d9834e49d4ceb325c61fe63c45dc5d5edf710d62b659fcbf5be7891ec97598e67fdf6e41ad52a1c6bae41 SHA512 7104abbb94bdeda018c16839d03ea7658add1fe8431ef4cbc13e5c4195eb7080b6c612274204e20e553d31cfd0bc404b8673f43c47128ae49298c70761b6f13c
+EBUILD gmpc-11.8.16-r2.ebuild 1249 BLAKE2B 758f82f53930955ee2e6bd0084740dfa25b15801c587ae28e99e3b1cf50f33793f0f8d9b40397331399345a24881ca487d319d5a40f6b6cc6c225edbe614c819 SHA512 fabebe65db25c4b30ddc9bc5c982530411bb916a2f866a751a453a0c5666987aa381acde592e408e448cd7b44fdfb309f95722dd58fb599004f016300b99ebf0
 MISC metadata.xml 437 BLAKE2B ddfac3aab507c391c2897b974ae9737f4f0db0d29eb9a0098e2d35149fd8719fc2724b880d166fa0e15df3f5a2cc4b3ef91760fc3eb69b976ecbe80ee3060dfa SHA512 014c9b99d8864c33c3bd5217a776b0d16c92457e0ead751a49218f0a36b424a8cbe2ebb80af39ffd52ff5cd6a15406e6117fbc600b7f76b34cf1099fad9bd2d1
diff --git a/media-sound/gmpc/gmpc-11.8.16-r2.ebuild b/media-sound/gmpc/gmpc-11.8.16-r2.ebuild
index 911dcb5e0a5a..26780928182f 100644
--- a/media-sound/gmpc/gmpc-11.8.16-r2.ebuild
+++ b/media-sound/gmpc/gmpc-11.8.16-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit autotools vala xdg
 
 DESCRIPTION="A GTK+2 client for the Music Player Daemon"
 HOMEPAGE="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client"
-SRC_URI="http://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
+SRC_URI="http://download.sarine.nl/Programs/gmpc/$(ver_cut 1-2)/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 13d5e47fe0f0..4bab4d5a01e8 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,7 +1,5 @@
-DIST strawberry-1.0.7.tar.xz 11216436 BLAKE2B f7bc53f33be53fb9d947ea4f4c29827cc4248b0249904f2e48cbd9e4440de1f7f866d83c9fddc92cfb6f56b050c4dc40f0ad5e67a58c2a75e47a9d666847e9b3 SHA512 9bf092c3990ae0c2ce63074c7f6076ccab896ae915c4ee255a7fbb6534d50467648f3e96bc029075acfd50515c45ade867e55518d9a68ec9c10a741e1976d64f
 DIST strawberry-1.0.8.tar.xz 11222136 BLAKE2B b11b4a082eb2c2d180d7d217884ac498c692df1d76e54ca41e83ea3ab456c4920d3348ee0b154f02d22902b84263fb0afb86c5e125d669fc54b6ffce1719abb3 SHA512 7d43a80d4aac16379929e147a4cc7af8b2866a3a14adee8716ff89ff255859eca197f448ff605e255f0d3d74a8e0d1babf4534cfd58b5247533c37dfae6f96e3
 DIST strawberry-1.0.9.tar.xz 11226840 BLAKE2B 4d7619a4161b422c417a69be1eede54068279a5829070a9d84d02d05c7504813710758d639901073b9567183be61ff66a6cd3aec9585b0ec2371d12440e8284b SHA512 ccfd9e451b719cc9aeca5ce2fd260681e649edfae14cfee2d7f9b2f978b3d111e8d449f16af4869c95c96f657a7d61b4d2353ed0b0fbe6734eb31271a1577ea4
-EBUILD strawberry-1.0.7.ebuild 3019 BLAKE2B f90ce6144be7f24a66d09d114f4ec9b4f28bd6c12e37a423b785973b8391f06dff2c35eca6e344c6b1ce82dd64e65f0d894e8de1e8eb1bf7cb5c08bce72a604b SHA512 6b803a3b98994f7628d2cb8f729ca189c7d72d865a76087f0fda8f00d8922844d3e16516e27bca8c3b547a3608f0074c999707472ecb3c2c2aab37344d04f2e9
 EBUILD strawberry-1.0.8.ebuild 3019 BLAKE2B f90ce6144be7f24a66d09d114f4ec9b4f28bd6c12e37a423b785973b8391f06dff2c35eca6e344c6b1ce82dd64e65f0d894e8de1e8eb1bf7cb5c08bce72a604b SHA512 6b803a3b98994f7628d2cb8f729ca189c7d72d865a76087f0fda8f00d8922844d3e16516e27bca8c3b547a3608f0074c999707472ecb3c2c2aab37344d04f2e9
 EBUILD strawberry-1.0.9.ebuild 3021 BLAKE2B 626e0dce302219386fc8cddc66d0f11127718685392fbd0324610ea2099c581376871db28d214cbf00c906d697a067713f02e24034ccc2aa93d799ed184a1c44 SHA512 5c5c18f84ebcc125638f590631f92c20103dc4ea344358f2f8b9eb3f3f2932589936a45a25ad13ea2aa664bdedb96b960a74decbba91973d8175407ee421a7a4
 EBUILD strawberry-9999.ebuild 3021 BLAKE2B 626e0dce302219386fc8cddc66d0f11127718685392fbd0324610ea2099c581376871db28d214cbf00c906d697a067713f02e24034ccc2aa93d799ed184a1c44 SHA512 5c5c18f84ebcc125638f590631f92c20103dc4ea344358f2f8b9eb3f3f2932589936a45a25ad13ea2aa664bdedb96b960a74decbba91973d8175407ee421a7a4
diff --git a/media-sound/strawberry/strawberry-1.0.7.ebuild b/media-sound/strawberry/strawberry-1.0.7.ebuild
deleted file mode 100644
index b14411677be9..000000000000
--- a/media-sound/strawberry/strawberry-1.0.7.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic plocale xdg
-
-PLOCALES="ca cs de es es_AR es_ES es_MX fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
-
-DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
-HOMEPAGE="https://www.strawberrymusicplayer.org/"
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="cdda debug +gstreamer ipod moodbar mtp pulseaudio +udisks vlc"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-COMMON_DEPEND="
-	dev-db/sqlite:=
-	dev-libs/glib:2
-	dev-libs/protobuf:=
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5[ssl]
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	media-libs/taglib
-	x11-libs/libX11
-	cdda? ( dev-libs/libcdio:= )
-	gstreamer? (
-		media-libs/chromaprint:=
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	ipod? ( media-libs/libgpod )
-	moodbar? ( sci-libs/fftw:3.0 )
-	mtp? ( media-libs/libmtp )
-	pulseaudio? ( media-sound/pulseaudio )
-	vlc? ( media-video/vlc )
-"
-# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
-RDEPEND="${COMMON_DEPEND}
-	gstreamer? (
-		media-plugins/gst-plugins-meta:1.0
-		media-plugins/gst-plugins-soup:1.0
-		media-plugins/gst-plugins-taglib:1.0
-	)
-	mtp? ( gnome-base/gvfs[mtp] )
-	udisks? ( sys-fs/udisks:2 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-cpp/gtest
-	dev-libs/boost
-	dev-qt/qttest:5
-"
-
-DOCS=( Changelog README.md )
-
-REQUIRED_USE="
-	cdda? ( gstreamer )
-	|| ( gstreamer vlc )
-"
-
-src_prepare() {
-	plocale_find_changes "src/translations" "" ".po"
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	# spotify is not in portage
-	local mycmakeargs=(
-		-DBUILD_WERROR=OFF
-		# avoid automagically enabling of ccache (bug #611010)
-		-DCCACHE_EXECUTABLE=OFF
-		-DENABLE_GIO=ON
-		-DLINGUAS="$(plocale_get_locales)"
-		-DENABLE_AUDIOCD="$(usex cdda)"
-		-DENABLE_GSTREAMER="$(usex gstreamer)"
-		-DENABLE_LIBGPOD="$(usex ipod)"
-		-DENABLE_LIBMTP="$(usex mtp)"
-		-DENABLE_LIBPULSE="$(usex pulseaudio)"
-		-DENABLE_MOODBAR="$(usex moodbar)"
-		-DENABLE_MUSICBRAINZ="$(usex gstreamer)"
-		-DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
-		-DENABLE_UDISKS2="$(usex udisks)"
-		-DENABLE_VLC="$(usex vlc)"
-		# Disable until we have qt6 in the tree
-		-DWITH_QT6=OFF
-	)
-
-	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	if use gstreamer ; then
-		elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
-		elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
-		elog "depending on your preferences"
-	fi
-}