11 files changed, 40 insertions, 323 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index bce1487eb1a0..456d467b4387 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/amsynth/Manifest b/media-sound/amsynth/Manifest
index 116acbc78c4a..fda44faa3751 100644
--- a/media-sound/amsynth/Manifest
+++ b/media-sound/amsynth/Manifest
@@ -1,7 +1,5 @@
 AUX amsynth-1.12.2-metadata.patch 522 BLAKE2B 8d49d9323dd7739c90aa456d5e123b3f2303764ae2c3959fc3a4b271e109d56151f3ddf08a21904fbd6aa4e397c96eea88c7735a02004e600d0c07b3a58dd9e1 SHA512 ea35b8ae9d11525b314cd4c89385e24b98c22dec34a042b694a707e9a3bdf8741497c6ede792d9837976cf939795f7e645be23174cddcc5df9b3fb228ef56198
 AUX amsynth-1.12.2-x11.patch 1233 BLAKE2B 4df9ab5cfc99ddfbf490a716ae52f13727d4307e4added4ca6916e9fdf31a09b909bdcd437d1076caa3e7c305145e5ab9a2ee1b1747c1c6fb4c506dc37b6fce1 SHA512 03732a90908d9756f9d8517021255860cadc73becec99888fc74d26aa307c2b7e756c265b8e04b356fcf95868d8c125129fcf32820d38131c857e762d2854e10
-DIST amsynth-1.13.1.tar.gz 846485 BLAKE2B 32dc7f50a2f5fd7c937c22728fc028f0892f1b76fe613a5fd5025c9c2afe73118e2f661d77668ca3faab691f95ad6c997b7b14b9600f2ca12470c022e4f03860 SHA512 2420edd1c0926c45e86bedc4200b4e39a919e34afc202f0b8c60b172c4f9da5c073305dde006b9e6915ad054c0cfcf259952fa2b8f035378cc04af7fd1bf5c73
 DIST amsynth-1.13.2.tar.gz 1621330 BLAKE2B 04f0b81e0a63f4f0bbd6b1dbc92c9ae638a46ad5e5b0bbaaf99cd7cf53761e3a599e6c15f303ea509e53e5aaf8d9040e17e783c8111abdf4fa4837dcd50092d1 SHA512 b93949d3be3c484a27534bd515b12a460aa07d353635b09ecee0e731bf27025b4bf4684e2968cf3a7887c765e1ad80a912fd86582c6f028738fa60df82a40f86
-EBUILD amsynth-1.13.1.ebuild 1164 BLAKE2B 72e27e77a4a965e5c40348b45b18d5dd6de4f4f7f901cf2c3911169c7076305f867bdebb0f6851598259ea2e1a2d1b6c9263b6ca707ffe53ae8b7a04dca68dbb SHA512 0e5137963330889deeb2b46b886fe0eaa2a678c185272454404b20ec6013c1c381861edad1b5f901127a8f1430e951cdb2a9366a809b7bdc753e800fc89ea348
 EBUILD amsynth-1.13.2.ebuild 1164 BLAKE2B 72e27e77a4a965e5c40348b45b18d5dd6de4f4f7f901cf2c3911169c7076305f867bdebb0f6851598259ea2e1a2d1b6c9263b6ca707ffe53ae8b7a04dca68dbb SHA512 0e5137963330889deeb2b46b886fe0eaa2a678c185272454404b20ec6013c1c381861edad1b5f901127a8f1430e951cdb2a9366a809b7bdc753e800fc89ea348
 MISC metadata.xml 581 BLAKE2B 5037cdf24f188f706fc4f413589b4c7c9c48c35bb611f1360f1a1395a2a8a123cca098cb4835ba5a4c8c85187fa6e829c515bc9909e89bf03e7d526236793cdf SHA512 fb63a72d147949e50e286a8aa2a3ecef65c1db90c5453dfb749fd8707a78beac99886ed6ccb1560b0dce48cd6b7212d51193b1af2b323ad2aa6bbc7bd538f965
diff --git a/media-sound/amsynth/amsynth-1.13.1.ebuild b/media-sound/amsynth/amsynth-1.13.1.ebuild
deleted file mode 100644
index cfa69f0933f4..000000000000
--- a/media-sound/amsynth/amsynth-1.13.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg
-
-DESCRIPTION="Virtual analogue synthesizer"
-HOMEPAGE="https://github.com/amsynth/amsynth"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/release-${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa dssi gtk jack lash lv2 nsm oss vst"
-
-REQUIRED_USE="dssi? ( gtk ) lv2? ( gtk ) vst? ( gtk )"
-
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-"
-RDEPEND="
-	alsa? (
-		media-libs/alsa-lib:=
-		media-sound/alsa-utils
-	)
-	dssi? (
-		media-libs/dssi:=
-		media-libs/liblo:=
-	)
-	gtk? (
-		x11-libs/gtk+:2
-		x11-libs/libX11
-	)
-	jack? ( virtual/jack )
-	lash? ( media-sound/lash )
-	lv2? ( media-libs/lv2 )
-"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.12.2-metadata.patch"
-)
-
-src_prepare() {
-	default
-	! use gtk && eapply "${FILESDIR}/${PN}-1.12.2-x11.patch"
-}
-
-src_configure() {
-	econf \
-		$(use_with alsa) \
-		$(use_with dssi) \
-		$(use_with gtk gui) \
-		$(use_with jack) \
-		$(use_with lash) \
-		$(use_with lv2) \
-		$(use_with nsm) \
-		$(use_with oss) \
-		$(use_with vst)
-}
diff --git a/media-sound/guitarix/Manifest b/media-sound/guitarix/Manifest
index b96594af949b..2c88586c559e 100644
--- a/media-sound/guitarix/Manifest
+++ b/media-sound/guitarix/Manifest
@@ -1,7 +1,8 @@
 AUX guitarix-0.41.0-nostrip.patch 1601 BLAKE2B dbfbcb84635fed192ef5d3fdfe97f6d30891cd0f7877cccff3cb9125d756ce3a30206ed67b1c4a30f85e7689245c8ec7fd2b12a5894f07756ed6bdb31a4ad492 SHA512 5002b05fa2fe13bb9f28e1b6d8f9cce518550b58e77e8d56fa278fa16232ab94c06618733364b5271667e77700809136333e55db1215ca7b9436f48590b6a297
+AUX guitarix-0.41.0-py3.11.patch 774 BLAKE2B 21a0f9caff1faf18cb68b04abd2e5658cac7997ac5155550accae9dee295d79b9c5d01cce0c6c08bdba3d92ec04a7abb8d13183f60f8ba60d169c71b0e3f2450 SHA512 97d18fa4112a3998cbcc353c02df51593baa18f97a487d301fbaab360ba90d73cb091029184a9eee62dc1fb5d8bc33d74fae18ba13243fb220899fe62fff70e2
 DIST guitarix2-0.43.1.tar.xz 71742288 BLAKE2B bfa72a20f5fe1bdd08162e283f7074f6bcd6b4d6ccb1771f0351e60802ebf030f8f6627d2480ccd2e5972215847edd62bff38c338723fd0bf2504b9b2cee5101 SHA512 30e56d863308cea18bb4af6f71d3e8d852662b4252c998507a1c3de9a2d97fe1c4ecb525bd35ef8e176b5cb5138806553cba157c1aa6cb14e48fe0bbea8a7def
 DIST guitarix2-0.44.1.tar.xz 71754176 BLAKE2B 57a1ad0be133fe2851ff7539d5c467a649774a1de90569e83feeb3ba2b05324ce0ee6d4388122cdb3fdcb36afac4cb7cfd2d6ab0216ff2f56d8e7c2886d14152 SHA512 d2c0e40762d97ed7ce61c3115fc3800cc569a2bb4f66e09147507a9eaa815fb9d1363444353a5854035755bd1b1e247ccb341aed60ca0ecf6a77019da73064c1
 EBUILD guitarix-0.43.1.ebuild 1798 BLAKE2B 5ed241ae5a9c95a00c8fb9f9e6dcf03b35d50d7295743231b189641036cbf5ab486ee5c1f81544bacdc372a9cbf731fcc1daa6eec354b4bc42afcc1b94a5dd62 SHA512 e9b87f4b21b3bebc89fd2d75b7c35931427f0b71b27405d7fb31996560462ba083f8f84dc53b7cb1892158c7fd89d9c0cfff4abd9ba8abe08a2fa7c8fc1afb39
-EBUILD guitarix-0.44.1.ebuild 1798 BLAKE2B 5ed241ae5a9c95a00c8fb9f9e6dcf03b35d50d7295743231b189641036cbf5ab486ee5c1f81544bacdc372a9cbf731fcc1daa6eec354b4bc42afcc1b94a5dd62 SHA512 e9b87f4b21b3bebc89fd2d75b7c35931427f0b71b27405d7fb31996560462ba083f8f84dc53b7cb1892158c7fd89d9c0cfff4abd9ba8abe08a2fa7c8fc1afb39
-EBUILD guitarix-9999.ebuild 1888 BLAKE2B cecffd1eb7a4e135b5c580d65da244069ad339e659ed46f86b83b20d3d3cdb4fbe0507d4657788a53c7bedd5e9a1981a1bb7973904d6e386068f6c201bfe4a53 SHA512 2b519c485fcfbc87b77a95da68af33e33fbadddacb551006befc1ad3416f9a0c53d4b9c7ff6de5913a386557e93487cd0ce1facdf27324292cb259580a0ead80
-MISC metadata.xml 692 BLAKE2B d71528f5f53831df41070160d9abee21667fc98c2000f28f87abd1669497cd7dbdf5f16ce8401d54e1886eda75ba7f991387586b9c758a35c5b5a9dde6a29a2a SHA512 0444744e99fd322718d0cd5b42406b549e72db08ca053a8ff06fe405646946291038719e6b6873dd1695b6661e2864c03f225476108b2424a5c9019e9983a0c4
+EBUILD guitarix-0.44.1.ebuild 1847 BLAKE2B 0b776e42ebc98d13b7df91912b438feb4a2cf54cf8e061cd40297f374fb36bbcb386640bdaff2fc1891f12a14062841470696e09b284ce56c1cb703893a45d88 SHA512 b6cf2dd1fba4e20f6cb5767dc67e3221fdd170af1f359df9b0892c0adc0d715105fcc5ffd650080d5cd6bd0f6e6e4dd167f2497a292650c88e68a9668c646f6c
+EBUILD guitarix-9999.ebuild 1867 BLAKE2B 638655f7f0187d725978f139d0bff282dc698ba49f275e34cde06b4951cf00d25d289a800ad06131e50646a10a53a9ff6a088fd6d53f6f3469ae36ab9d8604cd SHA512 6eaf0cc3020f54cfc4a7473fcb1006f46f67c5366bbab9c1e1014aed5825189853d99da6327a8d017498a2a592f24778c344ef72ed9e795cfa5cc499b620ec2b
+MISC metadata.xml 775 BLAKE2B 9d259fec3163a9b8150ed287c8ed803314620ba60c60dd479051ae980d5c25a007b38b2d6712720af834b90ff91c72962d55bb539983001f98bb4ed549511c35 SHA512 6ad0963c139caaffa1b58a60fa30a797b69a7ed74a8924606e60c75b2ae6751954c179ab0ff40a83288c0ad7655c9ed499e38c7bf0a88928e2dcddf5ab6a5826
diff --git a/media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch b/media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch
new file mode 100644
index 000000000000..34a8bc68c824
--- /dev/null
+++ b/media-sound/guitarix/files/guitarix-0.41.0-py3.11.patch
@@ -0,0 +1,26 @@
+From 39d7c21c4173eb0f121b1bbff439d9cf43331a00 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <hub@figuiere.net>
+Date: Wed, 11 Jan 2023 18:55:36 -0500
+Subject: [PATCH] waf: python 3.11 removed the 'U' open mode
+
+Python3 deprecated it already by making this the default behaviour.
+---
+ trunk/wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/trunk/wscript b/trunk/wscript
+index 947fd3d1..3f1f5cf3 100644
+--- a/wscript
++++ b/wscript
+@@ -537,7 +537,7 @@ def sub_file(task):
+     dst_fname = task.outputs[0].abspath()
+     lst = task.generator.sub_list
+ 
+-    with open(src_fname, 'rU') as f:
++    with open(src_fname, 'r') as f:
+         txt = f.read()
+     for (key, val) in lst:
+         re_pat = re.compile(key, re.M)
+-- 
+2.39.2
+
diff --git a/media-sound/guitarix/guitarix-0.44.1.ebuild b/media-sound/guitarix/guitarix-0.44.1.ebuild
index 05d31784013b..04e6a893b200 100644
--- a/media-sound/guitarix/guitarix-0.44.1.ebuild
+++ b/media-sound/guitarix/guitarix-0.44.1.ebuild
@@ -1,18 +1,16 @@
 # Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='threads(+)'
 
 inherit python-any-r1 waf-utils xdg
 
-MY_P="${PN}2-${PV}"
-
 DESCRIPTION="Virtual guitar amplifier for Linux"
 HOMEPAGE="https://guitarix.org/"
-SRC_URI="mirror://sourceforge/guitarix/guitarix/${MY_P}.tar.xz"
+SRC_URI="https://github.com/brummer10/${PN}/releases/download/V${PV}/guitarix2-${PV}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -65,6 +63,7 @@ DOCS=( changelog README )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.41.0-nostrip.patch
+	"${FILESDIR}"/${PN}-0.41.0-py3.11.patch
 )
 
 src_configure() {
diff --git a/media-sound/guitarix/guitarix-9999.ebuild b/media-sound/guitarix/guitarix-9999.ebuild
index 80afc539188d..0f1305ac3816 100644
--- a/media-sound/guitarix/guitarix-9999.ebuild
+++ b/media-sound/guitarix/guitarix-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2019-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE='threads(+)'
 
 EGIT_OVERRIDE_REPO_ENYOJS_BOOTPLATE="https://github.com/enyojs/bootplate.git"
@@ -11,11 +11,9 @@ EGIT_OVERRIDE_BRANCH_ENYOJS_BOOTPLATE="master"
 
 inherit python-any-r1 waf-utils xdg git-r3
 
-MY_P="${PN}2-${PV}"
-
 DESCRIPTION="Virtual guitar amplifier for Linux"
 HOMEPAGE="https://guitarix.org/"
-EGIT_REPO_URI="https://git.code.sf.net/p/guitarix/git"
+EGIT_REPO_URI="https://github.com/brummer10/${PN}.git"
 S="${WORKDIR}/${P}/trunk"
 
 LICENSE="GPL-2"
diff --git a/media-sound/guitarix/metadata.xml b/media-sound/guitarix/metadata.xml
index 34ccfab7be05..e08a9c3c4ba8 100644
--- a/media-sound/guitarix/metadata.xml
+++ b/media-sound/guitarix/metadata.xml
@@ -18,4 +18,7 @@
 		<flag name="nsm">Build NSM (Non Session Manager) support</flag>
 		<flag name="standalone">Build standalone application</flag>
 	</use>
+	<upstream>
+		<remote-id type="github">brummer10/guitarix</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index 2b51feb6083b..6e66b1ea2f40 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,9 +1,5 @@
-DIST strawberry-1.0.12.tar.xz 11231600 BLAKE2B 7c65d3f0a7418bd4e4ec2d5032406457066f3402efd9f2632f378c15d0c549ab516a8d09dd6d31e2e5723af36d1481614a2b355404596f2384db397ce52495ca SHA512 f29d9d59576788cfb5521a4394dd16501a6dc277c70ebff3629dc891ae70baaebc98ec07f4eda281ac5ebc6c8693c35a5a6611e014d27850beaf20125601e5ce
-DIST strawberry-1.0.13.tar.xz 11232884 BLAKE2B f2762a280ca00d080836f2d9a201161588119f26c59bdc6d5a9fd2bfc98d8dc64110e675fb8860cecd44a1406e0b869b14793644a8cfd01316b7ec823489efd6 SHA512 b870252a3abcc6accfc7b9b52563573f42fb65d8322880bcd6558a083d8e12da043e5967165dcdc4714800ce283e837c68cbf3a61a5c018a4978c7b7b5b39bff
 DIST strawberry-1.0.14.tar.xz 11234760 BLAKE2B 2dc0d1cee93ffa130da403c986c147f5d3eb59689079a0450183edc53947f7472ea5ff69c57c8ce971f03e89896d06c51bf22bcf57f97adb97067c8a35cf0e15 SHA512 bf667cb93b8f0ffdb8dc625df821bc4355e3845629ff25ed57d7999e19072edffab05f27dbea90adf0bb9a9cbe478856a292a1a6f7ed2c5f37442548699a4c02
 DIST strawberry-1.0.15.tar.xz 11230148 BLAKE2B a6ee4dac23dc3c4707a6b31f39bd794975e2c8aeab438419cf2972a1a7f3b9bf54837550db542e2c19bcf08346b04ec9d952e84529865e067c5e7df0a9e0189d SHA512 074b3da1dea22e1e21fcb1039d77e9edf898953ff0a16b28d4ad36052b454e669a4a92e988f1091e7987104149764e411ca68bd95b5f1e18f3e744d2c7dd3625
-EBUILD strawberry-1.0.12.ebuild 3019 BLAKE2B b35558cf019062a6ba15ba7f837db388299ea48a3a881c6dabd59e798caf2830df4f765d7dfe462439d886869ba576ca0cd7579d998b42daf0b1e7e6eef7f689 SHA512 5c58c3ed1ec917dbd6e620a227a4e9efffa08a5e160a9875ffcfa713fc3c7552f66f2d227262c91fc6aeec76d0f3b055c3e5720c53520b6e9b89a0142b65f18d
-EBUILD strawberry-1.0.13.ebuild 3021 BLAKE2B 49d972f0be2dfca036c8d61ec1272ac7098d2ada74f5de1058429af2e14708a978c157f82914db222cd99eda6b1230c6d06ab43d3a5ad658678618accbb8d339 SHA512 9037db1106c60e5e280a374ed1ab29881b09a450b2d5399b9fecb295b120b3282197948dbefef3fdf51cdf3d22e3e1bacedd02e2ce02ae0c7b9bd2d894218c0c
 EBUILD strawberry-1.0.14-r1.ebuild 3074 BLAKE2B f3bccdddfdd29215a378741edd6c561d931e4809f5e5525feed4bfc0ce8a7d074f909f72bb13aa6bae99e99a107042a5007da4839597a01b5b37ed11c4c29123 SHA512 899d59a6e80e7a54f20bd0058cba48d11eeb41f6383e52c9cfffb313253300c842d21018a3198c74fa0b6f5a1074f9a2d00e5d8fa612a72e7c586e30b78d90db
 EBUILD strawberry-1.0.15.ebuild 3076 BLAKE2B 350be6043994cd9086c488a3c3272fbef5fef56d4bd21af7a423f3b83ea4ea820db13e5d4f2c683c22105777c986bca18ffa044c66470da36b852b1671b1f34a SHA512 a1a44a9c4ab9ffe060bcd143845f0ce374bd72521d0abcea099a1fc49c8b583c4c58d929dba54652cc3361fc343008ad77770e6a8de121ab07cd5872ce2de683
 EBUILD strawberry-9999.ebuild 3076 BLAKE2B 350be6043994cd9086c488a3c3272fbef5fef56d4bd21af7a423f3b83ea4ea820db13e5d4f2c683c22105777c986bca18ffa044c66470da36b852b1671b1f34a SHA512 a1a44a9c4ab9ffe060bcd143845f0ce374bd72521d0abcea099a1fc49c8b583c4c58d929dba54652cc3361fc343008ad77770e6a8de121ab07cd5872ce2de683
diff --git a/media-sound/strawberry/strawberry-1.0.12.ebuild b/media-sound/strawberry/strawberry-1.0.12.ebuild
deleted file mode 100644
index 13770970ff46..000000000000
--- a/media-sound/strawberry/strawberry-1.0.12.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2023 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
-}
diff --git a/media-sound/strawberry/strawberry-1.0.13.ebuild b/media-sound/strawberry/strawberry-1.0.13.ebuild
deleted file mode 100644
index 884e0da1aa38..000000000000
--- a/media-sound/strawberry/strawberry-1.0.13.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2023 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
-}