10 files changed, 1 insertions, 449 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 456d467b4387..b84793e7e3e7 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/jack-example-tools/Manifest b/media-sound/jack-example-tools/Manifest
index b55f2276197b..b72488db7199 100644
--- a/media-sound/jack-example-tools/Manifest
+++ b/media-sound/jack-example-tools/Manifest
@@ -1,5 +1,3 @@
-DIST jack-example-tools-3.tar.gz 125686 BLAKE2B b0fbb68f2a21711113516a6754e13230b009f21d73a4fa8b94f2e8e81b71f6d95c246eae88d479daf3f4f6e0ccf3eb8295ff1b1b76603676c6d8b09d0594f9db SHA512 2fe33c4fc294a4e4e2c0c271d5e2f28bac162939c25536902c772fcc919d2a0923fcefd27305f3fce283edfe043d2da7773b66988a1f14f8670d5cac90c8d7e9
 DIST jack-example-tools-4.tar.gz 125676 BLAKE2B 0cfe696efb227558c13e3f7d3afb57938a69bc9f04a7efb7eaf6a22f123f97898d321490022a62ed1897ed6101bf04669f28dc24b70ab920d7fecadeabaf0c92 SHA512 f3fbbf24d4bdcbca959da74793b44292883192f91675f6ee80f01f9ff5181fca052bea6725c5b8b93a1ecfe293f6dc1c14c49519c2b8b57d26202b224d53f0ed
-EBUILD jack-example-tools-3.ebuild 1434 BLAKE2B d558b1cef6a14fd314b01f46e38d33478e77019a2b6696240bfd3e221a5c6ff261e2f10fa1dbf3eb8ca61c8006b4acf9e14f413a3ae14d929ea6a0febb778a9b SHA512 a53ee68ec3ca7f029e19e46e69bc32ac943c3a71b4baffc1b99472050e8882efafbdb775f957b254ca63bdeb74110a8ac3d04975796846fd9df56cfb7e816d9d
 EBUILD jack-example-tools-4.ebuild 1439 BLAKE2B 3c278ca29661dce3f03556c2dd5f6c8e0c2a7380bafe2bdd8b018423be0ef410ee0bcc09b25e28c0c989b1334877f0d628db32a2592ea3e587b8230bd4a5f160 SHA512 b9d23b656e62cd340d6e573e2e27e307aee5efaee515cc2afe1ab445e5ee5e7150ee25930cb42213edd9d160e9eb65568ca72e732e0344d7f2f15ede47338179
 MISC metadata.xml 731 BLAKE2B 7c83aa6f9f1e4c7c43d6104cd089a69755c72577e728592ccedb8153687257c267609636832797d7dbfdac7f73bf55a3f0a195baaac442bf919f783589fb98b2 SHA512 1db07c3ba14f3a096c333630690e2b6bb1fd060fafe9aa132d7e455a5f89351b3074112eaac24bddf0e8697c0a8008ca4de192c78947cacea43a3aa2b71ef492
diff --git a/media-sound/jack-example-tools/jack-example-tools-3.ebuild b/media-sound/jack-example-tools/jack-example-tools-3.ebuild
deleted file mode 100644
index 29d01081d9c3..000000000000
--- a/media-sound/jack-example-tools/jack-example-tools-3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-DESCRIPTION="Official examples and tools from the JACK project"
-HOMEPAGE="https://jackaudio.org/"
-SRC_URI="https://github.com/jackaudio/jack-example-tools/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+ zalsa? ( GPL-3+ )"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-IUSE="alsa jack-net jack-netsource opus +readline sndfile zalsa"
-
-RDEPEND="
-	virtual/jack
-	alsa? (
-		media-libs/alsa-lib
-		media-libs/libsamplerate
-	)
-	jack-net? (
-		|| (
-			media-sound/jack2[libsamplerate]
-			media-video/pipewire[jack-sdk(-)]
-		)
-	)
-	jack-netsource? (
-		media-libs/libsamplerate
-		opus? ( media-libs/opus[custom-modes] )
-	)
-	readline? ( sys-libs/readline:= )
-	sndfile? ( media-libs/libsndfile )
-	zalsa? (
-		media-libs/alsa-lib
-		media-libs/zita-alsa-pcmi
-		media-libs/zita-resampler:=
-	)
-	!<media-sound/jack-audio-connection-kit-0.126.0
-	!<media-sound/jack2-1.9.21"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature alsa alsa_in_out)
-		$(meson_feature jack{-,_}net)
-		$(meson_feature jack{-,_}netsource)
-		$(meson_feature readline readline_support)
-		$(meson_feature sndfile jack_rec)
-		$(meson_feature zalsa)
-		$(usex jack-netsource \
-			$(meson_feature opus opus_support) \
-			-Dopus_support=disabled)
-	)
-
-	meson_src_configure
-}
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index e96a1ce71ce0..3441775efea3 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,7 +1,4 @@
-AUX jack2-1.9.21-python3.11.patch 635 BLAKE2B 8e9168c2d44e087c20f0b6b1ac7a08bf957a5427f3c396e88ba3d0918e636500265e8182a39a8831b9cd37f9db3e86ff3ff6222e191d18f110b964a36c446982 SHA512 be0bb5fb4d65f99dc8355393a02c79ac36f64f7bb0e36a0e6c08ca99cc5c5340a5457fa13e7937d70349a4e0b86074c69232f69cab26779a7e53de5710b4b7fe
-DIST jack2-1.9.21.tar.gz 1006157 BLAKE2B 052486300bd17860964115427d4b5755ce7a4e4607bf9eb4e2b94d5b0cc61cf6a6b56d3a3eae9e91a1195a3316dd1f1ec1357275803805957e4b6f7a76424e24 SHA512 0e9ce581fca3c5d9ffb1de22b45cae6d94085c6f92ff3554892e25727baf66a2269f10d338d95d991e8380c4be5e0cc1e1453b9f878c7dc2e8a990f3bd458557
 DIST jack2-1.9.22.tar.gz 933448 BLAKE2B 8c42cb996e132f711ad8b7071d44601e21bfc8fe24802113825b8434abc8734c981daa2b09f10a7ecb1492a51d631255a99649d6d76343622b5e38da07e0c598 SHA512 d93cb2bcc57b72b6815eed143de1092d14fe22542ae9a1f8480d9ed5f44b59c50f81279d18bdd84ff6276ddd71ca1aa64a1e46d61199a5eda0d873a356194ab4
-EBUILD jack2-1.9.21-r1.ebuild 2804 BLAKE2B e4f12e7e43e5aaf180104edd6e2a90271d558e13d554a2b51d960aad1185b90f3a2cb3a869762801d812caf15028d89a609b0a7ccefac39f17281874eaf18e8f SHA512 1fcfe81604a4d73089740b024eb01165aaa84c08898577fd5ff1c9d2b3613f894cd875ba6c27289539f32b704a693dc084f8c6fb3764dc227f262d78aa8b08a8
 EBUILD jack2-1.9.22.ebuild 2569 BLAKE2B a311750d35f22f0e294d60207aa3384aeb2074f0c2c358ad41595ab94710ebab63d067a693065014cb63c7a19ea6203e1a26d49339867746016bc861cd52813c SHA512 6c0382d8776efb70bb11134a0db0dad0c08a2b21d5ac9bc755dbe7013435b0b4433b7fb9794a7118543ff395172930c1b28ed42905b5ebeb373888df2f6cb892
 EBUILD jack2-9999.ebuild 2575 BLAKE2B 79fe3564746ce8bb349bc1f0d7addd4bf03cf746250f2140b31e73a5463546dc713f761e67bc019dff2d02668d055340740432180884c20e9d8db060e4f4bf4f SHA512 228742ca5683228d7c9a725cc9b375339bab279cefb19eac0acab476efd8a40341d516b668367cd519ec75641538200c84b47c97c30148e499a8ac65e839ddbe
 MISC metadata.xml 780 BLAKE2B 2cbd15be73cfc17162ab0cd6d5311bb4ab48f19dae7224df11712a9ab91fbbbba383e80fe3c99f3a1bb0ee91015144799f58652c782bce1405d5b7a4f8e203ee SHA512 ac8d68929de1d11a39d89ca0ccc0e330790596af7f58fe5305c328dddc74438ec465beca11cce7244e8f2421a446aab900b90b018dd73d688dae7062d26d0e16
diff --git a/media-sound/jack2/files/jack2-1.9.21-python3.11.patch b/media-sound/jack2/files/jack2-1.9.21-python3.11.patch
deleted file mode 100644
index f4aafcf16aed..000000000000
--- a/media-sound/jack2/files/jack2-1.9.21-python3.11.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-'U' is default and deprecated since python-3.3, becomes a failure in 3.11.
-
-Just a quick fix (rather than bump waf) while waiting for upstream's
-plans to migrate to meson:
-https://github.com/jackaudio/jack2/issues/898
---- a/waflib/ConfigSet.py
-+++ b/waflib/ConfigSet.py
-@@ -314,3 +314,3 @@
- 		tbl = self.table
--		code = Utils.readf(filename, m='rU')
-+		code = Utils.readf(filename, m='r')
- 		for m in re_imp.finditer(code):
---- a/waflib/Context.py
-+++ b/waflib/Context.py
-@@ -664,3 +664,3 @@
- 	try:
--		code = Utils.readf(path, m='rU', encoding=encoding)
-+		code = Utils.readf(path, m='r', encoding=encoding)
- 	except EnvironmentError:
diff --git a/media-sound/jack2/jack2-1.9.21-r1.ebuild b/media-sound/jack2/jack2-1.9.21-r1.ebuild
deleted file mode 100644
index fd26048dd608..000000000000
--- a/media-sound/jack2/jack2-1.9.21-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-inherit flag-o-matic python-single-r1 waf-utils multilib-minimal
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/jackaudio/${PN}.git"
-else
-	SRC_URI="https://github.com/jackaudio/jack2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Jackdmp jack implemention for multi-processor machine"
-HOMEPAGE="https://jackaudio.org/"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="2"
-IUSE="+alsa +classic dbus doc ieee1394 libsamplerate metadata opus pam +tools systemd"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	|| ( classic dbus )"
-
-DEPEND="
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	dbus? (
-		dev-libs/expat[${MULTILIB_USEDEP}]
-		sys-apps/dbus[${MULTILIB_USEDEP}]
-	)
-	libsamplerate? ( media-libs/libsamplerate[${MULTILIB_USEDEP}] )
-	ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] )
-	metadata? ( sys-libs/db:=[${MULTILIB_USEDEP}] )
-	opus? ( media-libs/opus[custom-modes,${MULTILIB_USEDEP}] )
-	systemd? ( classic? ( sys-apps/systemd:= ) )"
-RDEPEND="
-	${DEPEND}
-	dbus? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/dbus-python[${PYTHON_USEDEP}]
-		')
-	)
-	pam? ( sys-auth/realtime-base )
-	!media-sound/jack-audio-connection-kit
-	!media-video/pipewire[jack-sdk(-)]"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-# tools were formerly provided here, pull to maintain expectations
-PDEPEND="tools? ( media-sound/jack-example-tools )"
-
-DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.21-python3.11.patch
-)
-
-src_prepare() {
-	default
-
-	python_fix_shebang waf
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# clients crash if built with lto
-	# https://github.com/jackaudio/jack2/issues/485
-	filter-lto
-
-	local wafargs=(
-		--mandir="${EPREFIX}"/usr/share/man/man1 # override eclass' for man1
-
-		--alsa=$(usex alsa)
-		--celt=no
-		$(usev classic --classic)
-		--db=$(usex metadata)
-		$(usev dbus --dbus)
-		--doxygen=$(multilib_native_usex doc)
-		--firewire=$(usex ieee1394)
-		--iio=no
-		--opus=$(usex opus)
-		--portaudio=no
-		--samplerate=$(usex libsamplerate)
-		--systemd=$(multilib_native_usex systemd $(usex classic))
-		--winmme=no
-
-		# obsolete options, migrated to media-sound/jack-example-tools
-		# and will be removed entirely next version
-		--example-tools=no
-		--readline=no
-		--sndfile=no
-		--zalsa=no
-	)
-
-	waf-utils_src_configure "${wafargs[@]}"
-}
-
-multilib_src_compile() {
-	waf-utils_src_compile
-}
-
-multilib_src_install() {
-	waf-utils_src_install
-}
-
-multilib_src_install_all() {
-	use dbus && python_fix_shebang "${ED}"/usr/bin/jack_control
-}
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index c7168e8fbbf8..326e9cd0c196 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,8 +1,5 @@
 AUX xmms2-0.9.1-cpp-client.patch 503 BLAKE2B b8127c72ab8830cb0c4ca45c5c7887f194f5cbe0999167f8eadd803df75ecaaaf3b4246d691be1b6106dbede0b3293747fa6d1cfc5f151968dd26065aa9e3b15 SHA512 3b5703614a3afe49cadaf74b2d5e9d436232af62dc60248f929961806ab058ed8b06df0fd9ec0f958e2b454e3be75028117fc9c7a071bef1f9d2aa5496c448c5
 AUX xmms2-0.9.1-faad.patch 437 BLAKE2B 832db481404d470d347ee73ae04064d5ce423aca2a4a7681a80301e33522245429306e26eb200f9e111de60e2fa5341478f51282ee8c2264cf3b60a79b83a797 SHA512 7b5380762e311e1479073ca922343ce5d0dbfe2b3ab0f9218e2d85d52d8a37e301a6bb7bdfc0603b3f72578421df0ff335edb8bd9ea20e485cc1037a2197c62c
-AUX xmms2-0.9.1-rtvg.patch 1076 BLAKE2B cb0eee29a4245850f2455fd7b12845017ddd2453d48d903386fcc083e4429389fb50b2fd296ebac41e101e68d7f030b646e65b2e493f351c91ec81a9672f6f77 SHA512 113b90339f4afc99f54eeb6776354c471ffa0d4e60d3525150ed2020af3d95dcca89aeaa849cd216c54f0d6eaf712f157c08145901a89b4cb0460c752c526e40
-DIST xmms2-0.9.1.tar.bz2 1940773 BLAKE2B 4044499c2ffc55e66d5836e2e36360486b970ff05f0dc17b62e65111c06cfcc84f58c74427b1afa4455b4e0bdb7784dc8840cc84411bc57cb7b9f0cac4e46359 SHA512 a7d42202571d7eb5d9da4c9f5d55d2f6e072df52892080d6cc4349f66a55f5fece510c9872be9814dd5b258d0c59e2704ea8497c2d3be515c510d602c17b703a
 DIST xmms2-0.9.2.tar.xz 1740744 BLAKE2B fc3b219c37c909e640a0f55f3280b3a4f1e3965ab6ac2da8814d569e9ff6b95a94b32dee04028e22555465fb02cd52857a6a2aebb4794d71bfa7836db642033e SHA512 07531b8d743e7454d9e2650dbdbaff1d75eb98f01ab9f8d3fa9ba031ef5ac066f69d1ce90c6a860014f1f0f5fd43c6a9a2a0330656d938c300a427e610b540a6
-EBUILD xmms2-0.9.1-r2.ebuild 5547 BLAKE2B 046adfa84057752b500584127352f538105f4c6e0f34a1535d933e80c12973f3a3b5644d8f542a504d61ac2daeeeb66ed05bbdc01e5175826e899b214ee2819b SHA512 f8483ad05d2a55fd2742d5811c9b3c4fba56d310c5e285a92780d029647d11422faef6fbe84d7ac17a751cf50ce10b22bc7a5f58eb16d4f5baf2fb5a068f9c9c
 EBUILD xmms2-0.9.2.ebuild 5291 BLAKE2B 941f9891cf0725e7a5dc19e26927285db7c58745684885056fd67a2f72a323f4247e780a60f22df7ca50c39753658842be0d61b0e9bd9b6645312a94967c6ac2 SHA512 063a7ccce94932b355f2b3f92b46cddb6066eb679ecbb593d96779c94f4c195846ad4524561d5898251a6a899f2356c8e7b2065fcec5a8b40a5de53b900e5810
-MISC metadata.xml 1533 BLAKE2B 260527ce9ba7070a2b799079df9ad4ab3eff10e8568d4015da83648dab4c3862fe6ebc3e7472cc8fe2bd8130f56d8c92a2c910612c475aafefaea047834175bc SHA512 f2939005bdff85690f2be6282c4ee4aa2adfe4ed87ae21bb9e906393d0fdf90666852b3f441acfebe5c2d9737ba6572733d304b7eff370b672975e6fcc8dab25
+MISC metadata.xml 1472 BLAKE2B 1ad415f39603eb6959f85bad95c95e49c6d36fbed3ea2fbe4e3c58772ed335cc5ec4375f19bfc60493a1c30911109f52e870df45acc36d972b0fc56e44c60803 SHA512 aaa7996662236229f4c78cfac1de6e702991c3191f8c20b25a290b6a0bde29a3a00355ad746a767206ea089e1be88ae79abd3a563ce3a8305480406af62f83e7
diff --git a/media-sound/xmms2/files/xmms2-0.9.1-rtvg.patch b/media-sound/xmms2/files/xmms2-0.9.1-rtvg.patch
deleted file mode 100644
index 86f48ca066dc..000000000000
--- a/media-sound/xmms2/files/xmms2-0.9.1-rtvg.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Add knob to control valgrind usage during tests.
-https://bugs.gentoo.org/424377
---- a/waftools/unittest.py
-+++ b/waftools/unittest.py
-@@ -147,5 +147,6 @@
- def configure(conf):
-     conf.load("waf_unit_test")
--    conf.find_program("valgrind", var="VALGRIND", mandatory=False)
-+    if conf.options.enable_valgrind is True:
-+        conf.find_program("valgrind", var="VALGRIND", mandatory=False)
-     conf.find_program("lcov", var="LCOV", mandatory=False)
-     conf.find_program("genhtml", var="GENHTML", mandatory=False)
---- a/wscript
-+++ b/wscript
-@@ -624,4 +624,8 @@
-     opt.add_option('--without-ldconfig', action='store_false',
-                    dest='ldconfig', help="Don't run ldconfig after install")
-+    opt.add_option('--with-valgrind', action='store_true', default=None,
-+                   dest='enable_valgrind', help="Run testsuite under valgrind (if present).")
-+    opt.add_option('--without-valgrind', action='store_false', default=None,
-+                   dest='enable_valgrind', help="Don't run testsuite under valgrind.")
- 
-     opt.recurse("src/xmms")
diff --git a/media-sound/xmms2/metadata.xml b/media-sound/xmms2/metadata.xml
index 941958b6ab34..c0c77429c86b 100644
--- a/media-sound/xmms2/metadata.xml
+++ b/media-sound/xmms2/metadata.xml
@@ -17,7 +17,6 @@
 		<flag name="server">Build xmms2 player daemon (otherwise only clients are built)</flag>
 		<flag name="sid">Support for C64 SID using <pkg>media-libs/libsidplay</pkg></flag>
 		<flag name="tremor">Support Vorbis using an alternate fixed-point decoder with <pkg>media-libs/tremor</pkg></flag>
-		<flag name="valgrind">Run unit tests under valgrind</flag>
 		<flag name="vocoder">Phase vocoder effect plugin</flag>
 		<flag name="xml">Enable support for various XML based playlists and sources: RSS, XSPF</flag>
 	</use>
diff --git a/media-sound/xmms2/xmms2-0.9.1-r2.ebuild b/media-sound/xmms2/xmms2-0.9.1-r2.ebuild
deleted file mode 100644
index bf7eea106f09..000000000000
--- a/media-sound/xmms2/xmms2-0.9.1-r2.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="threads(+)"
-inherit flag-o-matic optfeature perl-functions python-single-r1 waf-utils
-
-DESCRIPTION="X(cross)platform Music Multiplexing System, next generation of the XMMS player"
-HOMEPAGE="https://github.com/XMMS2"
-SRC_URI="https://github.com/xmms2/xmms2-devel/releases/download/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ~riscv x86"
-
-# IUSE static map to be passed to --with-{optionals,plugins}=opt1,opt2,...
-# flag:opt = `usev flag opt`, opt = `usev opt`, :opt = `echo opt`
-# (if have a use for some of these disabled features, please fill a bug)
-XMMS2_OPTIONALS=(
-	cxx:xmmsclient++,xmmsclient++-glib :launcher mlib-update:medialib-updater
-	:nycli perl :pixmaps python server:s4 test:tests libvisual:vistest
-	# disabled: et,mdns,migrate-collections,ruby,sqlite2s4,xmmsclient-cf,xmmsclient-ecore
-)
-XMMS2_PLUGINS=(
-	aac:faad airplay alsa ao :asx cdda :cue curl :diskwrite :equalizer
-	ffmpeg:apefile,asf,avcodec,flv,tta :file flac fluidsynth:fluidsynth,mid1,midsquash
-	gme :html ices :icymetaint :id3v2 jack :karaoke :m3u mac +mad mms modplug
-	mp3:mpg123 :mp4 musepack :normalize :null :nulstripper ofa opus oss :pls
-	pulseaudio:pulse :replaygain samba sid sndfile speex tremor vocoder +vorbis
-	:wave wavpack :xml xml:rss,xspf zeroconf:daap
-	# disabled: coreaudio,gvfs,nms,sc68,sun,waveout
-)
-
-IUSE="
-	${XMMS2_OPTIONALS[@]%:*}
-	${XMMS2_PLUGINS[@]%:*}
-	+server valgrind"
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	test? ( server )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	sys-libs/readline:=
-	libvisual? (
-		media-libs/libsdl[opengl,video]
-		media-libs/libvisual:0.4
-	)
-	server? (
-		aac? ( media-libs/faad2 )
-		airplay? ( dev-libs/openssl:= )
-		alsa? ( media-libs/alsa-lib )
-		ao? ( media-libs/libao )
-		cdda? (
-			dev-libs/libcdio-paranoia:=
-			dev-libs/libcdio:=
-			media-libs/libdiscid
-		)
-		curl? ( net-misc/curl )
-		ffmpeg? ( media-video/ffmpeg:= )
-		flac? ( media-libs/flac:= )
-		fluidsynth? ( media-sound/fluidsynth:= )
-		gme? ( media-libs/game-music-emu )
-		ices? (
-			media-libs/libogg
-			media-libs/libshout
-			media-libs/libvorbis
-		)
-		jack? ( virtual/jack )
-		mac? ( media-sound/mac )
-		mad? ( media-libs/libmad )
-		mms? (
-			media-libs/libmms
-			media-video/ffmpeg:=
-		)
-		modplug? ( media-libs/libmodplug )
-		mp3? ( media-sound/mpg123 )
-		musepack? ( media-sound/musepack-tools )
-		ofa? (
-			dev-libs/expat
-			media-libs/libofa
-			sci-libs/fftw:3.0=
-		)
-		opus? ( media-libs/opusfile )
-		pulseaudio? ( media-libs/libpulse )
-		samba? ( net-fs/samba )
-		sid? ( media-libs/libsidplay:2 )
-		sndfile? ( media-libs/libsndfile )
-		speex? (
-			media-libs/libogg
-			media-libs/speex
-		)
-		tremor? ( media-libs/tremor )
-		vocoder? (
-			media-libs/libsamplerate
-			sci-libs/fftw:3.0=
-		)
-		vorbis? ( media-libs/libvorbis )
-		wavpack? ( media-sound/wavpack )
-		xml? ( dev-libs/libxml2 )
-		zeroconf? (
-			net-dns/avahi[mdnsresponder-compat]
-			net-misc/curl
-		)
-	)"
-RDEPEND="
-	${COMMON_DEPEND}
-	perl? (
-		dev-lang/perl
-		dev-perl/glib-perl
-		virtual/perl-Carp
-		virtual/perl-IO
-		virtual/perl-Scalar-List-Utils
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
-	)"
-DEPEND="
-	${COMMON_DEPEND}
-	cxx? ( dev-libs/boost )
-	test? ( dev-util/cunit )"
-BDEPEND="
-	${PYTHON_DEPS}
-	virtual/pkgconfig
-	perl? (	dev-perl/Pod-Parser )
-	python? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]') )
-	test? ( valgrind? ( dev-util/valgrind ) )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.1-cpp-client.patch
-	"${FILESDIR}"/${PN}-0.9.1-faad.patch
-	"${FILESDIR}"/${PN}-0.9.1-rtvg.patch
-)
-
-src_prepare() {
-	default
-
-	# meant to be configured, but give a default for out-of-the-box midi
-	sed -e "s|/path/to/.*sf2|${EPREFIX}/usr/share/sounds/sf2/FluidR3_GM.sf2|" \
-		-i src/plugins/fluidsynth/fluidsynth.c || die
-}
-
-src_configure() {
-	filter-lto # `xmms2 add somefile` breaks with lto + fortify=2
-
-	local wafargs=(
-		--boost-includes="${ESYSROOT}"/usr/include
-		--with-target-platform="${CHOST}"
-	)
-
-	xmms2_flag() {
-		local IFS=:
-		set -- ${1#+}
-
-		if [[ ${1} ]]; then
-			usev ${1} ,${2:-${1}}
-		else
-			echo ,${2}
-		fi
-	}
-
-	local flag optionals plugins
-
-	if use server; then
-		for flag in "${XMMS2_PLUGINS[@]}"; do
-			plugins+=$(xmms2_flag ${flag})
-		done
-	else
-		wafargs+=( --without-xmms2d )
-	fi
-
-	for flag in "${XMMS2_OPTIONALS[@]}"; do
-		optionals+=$(xmms2_flag ${flag})
-	done
-
-	wafargs+=(
-		# pass even if empty to avoid automagic
-		--with-optionals=${optionals:1}
-		--with-plugins=${plugins:1}
-	)
-
-	if use perl; then
-		perl_set_version
-		wafargs+=( --with-perl-archdir="${ARCH_LIB}" )
-	fi
-
-	if use valgrind; then
-		if valgrind true &>/dev/null; then
-			wafargs+=( --with-valgrind )
-		else
-			ewarn "valgrind was disabled due to failing a basic sanity check" #807271
-		fi
-	fi
-
-	waf-utils_src_configure "${wafargs[@]}"
-}
-
-src_compile() {
-	waf-utils_src_compile --notests
-}
-
-src_test() {
-	waf-utils_src_compile --alltests
-}
-
-src_install() {
-	local DOCS=( AUTHORS README.mdown *.ChangeLog )
-	waf-utils_src_install --without-ldconfig --notests
-
-	use libvisual && dobin _build_/src/clients/vistest/xmms2-libvisual
-
-	use python && python_optimize
-
-	# to avoid editing waftools/man.py (use find given not always installed)
-	find "${ED}" -type f -name '*.gz' -exec gzip -d {} + || die
-}
-
-pkg_postinst() {
-	use fluidsynth && optfeature "the default MIDI soundfont" media-sound/fluid-soundfont
-}