gentoo auto-resync : 04:09:2024 - 12:28:34

10 files changed, 181 insertions, 13 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index a8f6a1264aa1..19f2224a54f0 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index 2a9ccc64509b..542c5ea8e858 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,5 +1,5 @@
 DIST jack2-1.9.22-python3.12.patch.xz 32080 BLAKE2B d581d38cd32d8933bf4a9fdb1c6f3445d8e05be5ae1775335180b6f5daea9e5bad036560a33027d09d0a996a22fcb068140e2b61483fa8a7c4e8091bda39d114 SHA512 e63b73526719dcd4276036e71a7dd8f44c01c3048330724ec3fa8cf5f189055ac58f57493e87163017fbbe201b76672a9115b64957b575f0f7a1b6d9f7ec40e3
 DIST jack2-1.9.22.tar.gz 933448 BLAKE2B 8c42cb996e132f711ad8b7071d44601e21bfc8fe24802113825b8434abc8734c981daa2b09f10a7ecb1492a51d631255a99649d6d76343622b5e38da07e0c598 SHA512 d93cb2bcc57b72b6815eed143de1092d14fe22542ae9a1f8480d9ed5f44b59c50f81279d18bdd84ff6276ddd71ca1aa64a1e46d61199a5eda0d873a356194ab4
-EBUILD jack2-1.9.22.ebuild 2705 BLAKE2B 993cef6240d132f7705e596b975eecb63b72e2aad7e59dcf5ce3a6058df480e37c27f4465f8d019a05f39dba7a897ffc80c4596c019abeb641a8495a8b399f28 SHA512 c47b0f9955c209f98fa318969feb7c61b7641922f2ec493a9077c5328852f7f7f9559d9752005b2a2eb5f2f799ed5de779734199fe54c1f4903f04760fafede2
-EBUILD jack2-9999.ebuild 2589 BLAKE2B 7c469bed034ca010a3d66198d1ccfafc454e4bf7a2aafb629fb0fe964bf2523e0fc076d264c01e62612c5be41ecaaaecf7ba2838aeb856afd4824baec1d162a7 SHA512 f1215b10b1751b539d4682e7d29ecd8b85f7dcf2a14376e2fb4633f17bf59bb7505f4a58771270166d4211b05ab0bbb929d8eb5582f5aad6198a9ee6bbb465d1
+EBUILD jack2-1.9.22.ebuild 2705 BLAKE2B d8dcda1a60b2861cadabcdd6840e606536d36ec9db08a1966e8bc5cb7ed151c4c7be0a88aa6e65ed951c93c4650b528842ef9a46b2f8fe922da405765f2b0555 SHA512 a6ee4dfca8e5cc0186a6e01faeb53c20969e0ea2dc9d9ad9341c4dd26915e4deb4699140aa7e426c639b9f0458c915fcb46ecbc745c4f32d02a97c03e9cff323
+EBUILD jack2-9999.ebuild 2589 BLAKE2B b054c4bdfc2161a297e056c8c6387d4bcf750c1c7e8f40486fd3b50c4e772b412bc5019676c08310c10e4856444db1d5deb2d5c0a778ed0cdd6e3d8065e6b85d SHA512 762ea00446c2dd79b1b164a75b3cebca0106e64d7d82d948be790776f52432c79c350c5c208a19f245173e26a7646db28ec80c9880754d2b79707d2d9237a6ab
 MISC metadata.xml 780 BLAKE2B 2cbd15be73cfc17162ab0cd6d5311bb4ab48f19dae7224df11712a9ab91fbbbba383e80fe3c99f3a1bb0ee91015144799f58652c782bce1405d5b7a4f8e203ee SHA512 ac8d68929de1d11a39d89ca0ccc0e330790596af7f58fe5305c328dddc74438ec465beca11cce7244e8f2421a446aab900b90b018dd73d688dae7062d26d0e16
diff --git a/media-sound/jack2/jack2-1.9.22.ebuild b/media-sound/jack2/jack2-1.9.22.ebuild
index c52bbee4676b..3a33beb69665 100644
--- a/media-sound/jack2/jack2-1.9.22.ebuild
+++ b/media-sound/jack2/jack2-1.9.22.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="threads(+)"
 inherit flag-o-matic python-single-r1 waf-utils multilib-minimal
 
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index 2241477aa20d..5f680d13f15f 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="threads(+)"
 inherit flag-o-matic python-single-r1 waf-utils multilib-minimal
 
diff --git a/media-sound/owntone/Manifest b/media-sound/owntone/Manifest
index 549a9e9c0f9f..f851e2f2a9d5 100644
--- a/media-sound/owntone/Manifest
+++ b/media-sound/owntone/Manifest
@@ -2,5 +2,8 @@ AUX owntone-28.9-stream-support.patch 848 BLAKE2B ce4b2083d2beee8129255a13384909
 AUX owntone.confd 227 BLAKE2B f19256cbe06f06471f5e6d7e4ab6f96dd108acc801e76ddbf2ac6219e373a919885e506442134e5838dbdabf6cc2481590aeedd690df707eeab325524449e6b5 SHA512 7b436941609b54685ce17bbe5f274b13bb742441683409be0a8f98a8f758dd45f1706ba667fb8023b6e1dd1589d8d02bec03cee42737c5da0d57904d6928a252
 AUX owntone.initd 822 BLAKE2B 48d39eaf2a812058d8d6d3469bb65d2baa9ca992304bc5ec7557c75dc4afaba3665c8cab763a7277bb4f8cbaba44efe60a53e4ed9b2d8585f95f83a7f24fe45c SHA512 8bc2dca5894850cb5274c7ff09f72c8d0585182fe6150e894488670e06784a7bb13ac8393c20cd2f1d483b931e2701f92550a206b122e1fd0d2cd597a0ed4a1a
 DIST owntone-28.9.tar.xz 1066248 BLAKE2B 68ba46e6ff2e406d54ccfe387191a67d4eb7590db3039d87ffcd5eabf7417059084997f0d6be810d164616cd663b2e4143714ef4ac31acb7d91e254ccd342465 SHA512 29f42a4a8c9501a038ecc5026fc4bce9d777dee722937b89a55523cd68f001c821017d09f32b704a0c331879f7049d7d087d8e6899c82924f45401b012c65e95
+DIST owntone-28.9_p20240903-40c22e3d.tar.gz 5730828 BLAKE2B 8328a1c06fa40f27d55c3b28149a0b50f6bf295fe96c1f11bd82e677447ee3c5b5bf55b7d77f201fa73095c1b3f1a878b80b241ac1467d2977611eec3901d1d5 SHA512 5b8ea0aafd8cc63752152ab2e7ae82bb6cd02b743efd419b75f9a3bf2981b26066ef34c26c392822e0666e633653749fce5cdffb83bac788546a3b9a729e1e96
+DIST owntone-40c22e3-mpd-0.24-r1.patch 75389 BLAKE2B 8047a72dcd374c03e81ea0ab2e2017cab40c58d11d8cf566580b422bbede793696d434ebfacf9d9b2366c91e86a949a8f1c7abced045025a98d7e2795f05c781 SHA512 6a0aa32622083f47eedf172880bb7d6debd3063fa18059510b022e3eca7afbd7d8c29d5f7fc8a3b04b54a42585e6df8e5568615125316a063ff58f97ca2206b4
 EBUILD owntone-28.9.ebuild 1760 BLAKE2B d3ef912c1225e63a1de9dc4ab2a27fcf4f7c1a40c569f619c55853f8d90cfe3e21a1ae4d7cf2fcb5ee6dddb1b3b55ba53174f1cc5d6ab91301b0665cb6e5bd51 SHA512 7b703ddb3caf2cf691dc0644e316918ee7665490bcb534b42865709563e70346913c8abe1231251fec5f8b3fc676fbc256039bd7c430375b0bfa6494a1abad09
+EBUILD owntone-28.9_p20240903.ebuild 2012 BLAKE2B 7a8cfa1294470d7a07e6443e933f25e3e50e9309a558173b41d6119c5586042dc92d5496b742409b7301b9e4340015ac17b9aaf8a1b414ca44cfcb130f585924 SHA512 8d59b2c2862d27db9f5fee67531a292ba49411b7ec4ce53554c272d592082b7b5573eaac15e0b6827d1b623ab1278ab45f8fd065c5f21b70f4d86647b554d801
 MISC metadata.xml 403 BLAKE2B efbee0defee322407b936352527f4977549249fc59371d7be2c9d396303c7fbe3adad16ed562c87cb3b7ea0a8e5077f8f0cf3a41f354ee778f913f46081e2eff SHA512 2a6b993fe4989132a85969b88124169ca2079e98a984f597cee5a5c48300dc78babd748765575e14a8247f6cbf81b58b1d12808ac765a9a11357e40d74433cdf
diff --git a/media-sound/owntone/owntone-28.9_p20240903.ebuild b/media-sound/owntone/owntone-28.9_p20240903.ebuild
new file mode 100644
index 000000000000..7d107bce1626
--- /dev/null
+++ b/media-sound/owntone/owntone-28.9_p20240903.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+GITREV="40c22e3d2f716177ad737998f3ef909f20c4acfa"
+DESCRIPTION="DAAP (iTunes) and MPD media server"
+HOMEPAGE="https://owntone.github.io/owntone-server"
+SRC_URI="https://github.com/owntone/owntone-server/archive/${GITREV}.tar.gz -> ${P}-${GITREV:0:8}.tar.gz
+	https://github.com/grobian/owntone-mpd/releases/download/mpd-0.24-r1/${PN}-${GITREV:0:7}-mpd-0.24-r1.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+alsa +chromecast"
+S="${WORKDIR}/${PN}-server-${GITREV}"
+
+RDEPEND="
+	app-pda/libplist
+	dev-db/sqlite:3
+	dev-libs/confuse
+	dev-libs/json-c
+	dev-libs/libevent
+	dev-libs/libgcrypt
+	dev-libs/libsodium
+	dev-libs/libunistring
+	dev-libs/libxml2
+	dev-libs/mxml:0
+	dev-libs/protobuf-c
+	media-libs/alsa-lib
+	media-video/ffmpeg
+	net-dns/avahi
+	net-libs/libwebsockets
+	net-misc/curl
+	sys-devel/gettext
+	sys-libs/zlib
+	acct-group/audio
+	acct-user/owntone
+	alsa? ( media-libs/alsa-lib )
+	chromecast? ( net-libs/gnutls media-video/ffmpeg[opus] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gperf
+	sys-apps/gawk
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${DISTDIR}"/${PN}-${GITREV:0:7}-mpd-0.24-r1.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# fix log path, and enable songs/cache databases
+	sed -i \
+		-e "/logfile = /s:= .*$:= ${EPREFIX}/var/log/owntone/owntone.log:" \
+		-e "/\(db_path\|cache_path\) =/s:/cache/:/:" \
+		-e "/\(db_path\|cache_path\) =/s:^#::" \
+		owntone.conf.in || die
+}
+
+src_configure() {
+	econf \
+		--without-pulseaudio \
+		--with-libwebsockets \
+		--with-avahi \
+		--with-user=owntone \
+		--with-group=audio \
+		$(use_with alsa) \
+		$(use_enable chromecast) || die
+}
+
+src_install() {
+	default
+
+	rm -Rf "${ED}"/var/lib  # all empty dirs
+	find "${ED}" -name "*.la" -delete
+
+	keepdir /var/lib/owntone
+	keepdir /var/log/owntone
+	fowners owntone /var/log/owntone
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index 0e9d330d8aeb..f4de2f89e4ad 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,8 +1,10 @@
 DIST picard-2.12.1.tar.gz 5863157 BLAKE2B 0015b0c378088f2cd2d7f2449a41c544b9f4cb4e521e9728a872f37ab21815f492a8a80886ce294e17406808cb965968962b8fde6625907f324c50b3ba53d160 SHA512 d9a9f574d7a4ca981cd224068c59eef5f3acdab8e8f84a3d5c5c4428d57c49e706899f039e246c0bdbe85206b1777c8211e54d02982bd163c7bbcad5126b3d11
 DIST picard-2.12.2.tar.gz 5863787 BLAKE2B f9f8fc5ffe424ce2a9aa154994e7ec1adf61a61a94769fb36d715de9ec84f1dac2d49f27d13900354adad7dcb936d62a2eba429e4ccb20dc5d6849d7f4b22adc SHA512 d06583c82737e6b5f26a639f24ecec115f29a9df7498e2632e084bcfc31f13c72965bd862c19c496fe0539c8987812d53ed9298522e37989c733af2f7ecface1
+DIST picard-2.12.3.tar.gz 5878683 BLAKE2B cdbe37842d5e2602941513835a3f28ff1ab2cad6ec37f41e6c1d8d4df2a8c957a36422414f2e4ce06d217c19b4a737fc4385022edb3052bba9cac138fa73c50b SHA512 0c4ec97f7d786982685cc095c838e46435b7305f10c33cd7d82eba006150acee934a92a182c3891e48555a7b958068782e9458ee4368cc4e3e39ad80cda858be
 DIST picard-2.12.tar.gz 5857635 BLAKE2B 4eaec28830d85a0a45d220012fbb1acbfd40accc1536e47aa616b7d0014ef6f36111a6e9d6992862f9ff5419f7cb0c7b2b7b0a737ceca20bc804ce040f52ab22 SHA512 28f8d6b7b59a9a145404ab497a4ef0d71f2fefe86b9ec28b7f6879ec10f5ab1fd3582363bb15dd92c92c624843e87c11fce959fee75d0b312e72f6575d93b1a6
 EBUILD picard-2.12.1.ebuild 1460 BLAKE2B 107be2b163a16c68827762f10acbd1564a803b0d633ab140c5eec7fbb1fa735ba72e12a09e7f06060f0d35fe0c3deee85fc632385530bc752eee9ec0a307572e SHA512 41d6e045267fc0d24b5cff98cfbfb4084815d2dd3dfb54c28a27b82bebfee4606df2766c82d917e256e361f009d6ab5a2985228f9428f1ac9014746ad3d9a3cb
 EBUILD picard-2.12.2.ebuild 1460 BLAKE2B 107be2b163a16c68827762f10acbd1564a803b0d633ab140c5eec7fbb1fa735ba72e12a09e7f06060f0d35fe0c3deee85fc632385530bc752eee9ec0a307572e SHA512 41d6e045267fc0d24b5cff98cfbfb4084815d2dd3dfb54c28a27b82bebfee4606df2766c82d917e256e361f009d6ab5a2985228f9428f1ac9014746ad3d9a3cb
+EBUILD picard-2.12.3.ebuild 1460 BLAKE2B 107be2b163a16c68827762f10acbd1564a803b0d633ab140c5eec7fbb1fa735ba72e12a09e7f06060f0d35fe0c3deee85fc632385530bc752eee9ec0a307572e SHA512 41d6e045267fc0d24b5cff98cfbfb4084815d2dd3dfb54c28a27b82bebfee4606df2766c82d917e256e361f009d6ab5a2985228f9428f1ac9014746ad3d9a3cb
 EBUILD picard-2.12.ebuild 1458 BLAKE2B 4ea9ce9a342e40e0ec10fc604f8042188b9611f280afc5048466a44551a5f1cb7172e54c089e60b0e56d1b77054a2c6d8790d6b02ce8507f3947931047844ae5 SHA512 daea247c3f1a37cc46150515480365e0a53565c4af3edbedc76cb61e7b2d6828e856eb1fb8a4b1825104f7ea80c4c441e114c09028d5cb2c60f4e375d0ff17fb
 EBUILD picard-9999.ebuild 1460 BLAKE2B 107be2b163a16c68827762f10acbd1564a803b0d633ab140c5eec7fbb1fa735ba72e12a09e7f06060f0d35fe0c3deee85fc632385530bc752eee9ec0a307572e SHA512 41d6e045267fc0d24b5cff98cfbfb4084815d2dd3dfb54c28a27b82bebfee4606df2766c82d917e256e361f009d6ab5a2985228f9428f1ac9014746ad3d9a3cb
 MISC metadata.xml 740 BLAKE2B cc09a7bf012e0b85ff55531ace5d8b187cd68fdae7d274cb640a7ae446296c2ac70bb599955d6ab2570b3eb879c28cad0cf2e70fe7339c2c0c58fd8b0dcdcac7 SHA512 321188fd4887593a3683b2c507673baa9e2faf2b46b0158338a67e72dbf5267b93c1e358ceadeacd707d6a6bb234a4fae8ef681779463c4ab5bd3b79dbd47c43
diff --git a/media-sound/picard/picard-2.12.3.ebuild b/media-sound/picard/picard-2.12.3.ebuild
new file mode 100644
index 000000000000..6a6e26e28fc9
--- /dev/null
+++ b/media-sound/picard/picard-2.12.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..13} )
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_EXT=1
+
+inherit distutils-r1 xdg
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/metabrainz/picard"
+	inherit git-r3
+else
+	SRC_URI="https://data.musicbrainz.org/pub/musicbrainz/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Cross-platform music tagger"
+HOMEPAGE="https://picard.musicbrainz.org"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="discid fingerprints nls"
+
+BDEPEND="
+	nls? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/fasteners[${PYTHON_USEDEP}]
+		dev-python/pyjwt[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		media-libs/mutagen[${PYTHON_USEDEP}]
+		discid? ( dev-python/discid[${PYTHON_USEDEP}] )
+	')
+	fingerprints? ( media-libs/chromaprint[tools] )
+"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	local build_args=(
+		--disable-autoupdate
+	)
+	if ! use nls; then
+		build_args+=( --disable-locales )
+	fi
+	distutils-r1_python_compile ${build_args[@]}
+}
+
+python_install() {
+	local install_args=(
+		--disable-autoupdate
+		--skip-build
+	)
+	if ! use nls; then
+		install_args+=( --disable-locales )
+	fi
+	distutils-r1_python_install ${install_args[@]}
+}
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 4ce3aba75cec..ddf15ec9bd6e 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,5 +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
 DIST xmms2-0.9.3.tar.xz 1741548 BLAKE2B 19a99d66d3b6991811c1124b76becaa05d04602a84725ca166141947272a3a033545a2e315a70751e8fab83a9b3b16235f1e408dd13caac0a8e7cbf9e8101e34 SHA512 03f2f6b66a35a8e80fdba3afb2a550c19ce2b7b6d53c63c7a735eb787f79b27a325b0715a31544e87c86e386f54a5a9a89aa3a9e81ae5ed29e362bd7b5bfa1ad
-EBUILD xmms2-0.9.3-r1.ebuild 5282 BLAKE2B 38f7ff2e35778bf88f2df8a5788df8266a393a54713b45ffd3c84a52b156609821a0b1115e2381c90cf0f3bb8d9c69c10c97a3e532f8c73ed07233e25e2ffefe SHA512 f3b63109de8851f35fa4a270216d00669d6555a941d1c61c6d80f3215ce62af26c95e4927a59c0af985dad571b66a012f2c811c2ab866b3fcd0d5bae73e16975
+EBUILD xmms2-0.9.3-r1.ebuild 5288 BLAKE2B cfbac959fb59e252871e14849262def05faf2d85150c066512c44c7f0c8e2a33b98fdc3b263d923c6e08535d47cc19882c908e25f636b4ed118c03591bff7a73 SHA512 e6b3ad9435927e4479004b48a324420c0cf37bccfe09b3658e274ec588f0976c7811c3d55f2d9796939f487d8cec724730b03e70773173a05b7ab5ec7f137b0e
 MISC metadata.xml 1313 BLAKE2B ccb64de086998cdc0e8e71a44d0e84107ac7effae08b8628aa872b9ce85a11f465f2501bf4ef1bb13a1e10e92a6caa281c885bfb46673c16d4ab1117871908b2 SHA512 0882de8a7c5bdc4e9289bc03c582d8a8a627090dfaa9658d9ab174ceae000faad92044466ca7517b3214ddd475509131c432f5008778de41a8bec5b7250c737b
diff --git a/media-sound/xmms2/xmms2-0.9.3-r1.ebuild b/media-sound/xmms2/xmms2-0.9.3-r1.ebuild
index a466553f269a..eda60ca94541 100644
--- a/media-sound/xmms2/xmms2-0.9.3-r1.ebuild
+++ b/media-sound/xmms2/xmms2-0.9.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 PYTHON_REQ_USE="threads(+)"
 inherit flag-o-matic optfeature perl-functions python-single-r1 waf-utils
 
@@ -36,10 +36,12 @@ XMMS2_PLUGINS=(
 IUSE="
 	${XMMS2_OPTIONALS[@]%:*}
 	${XMMS2_PLUGINS[@]%:*}
-	+server"
+	+server
+"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
-	test? ( server )"
+	test? ( server )
+"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -96,7 +98,8 @@ COMMON_DEPEND="
 			net-dns/avahi[mdnsresponder-compat]
 			net-misc/curl
 		)
-	)"
+	)
+"
 RDEPEND="
 	${COMMON_DEPEND}
 	perl? (
@@ -109,16 +112,19 @@ RDEPEND="
 	python? (
 		${PYTHON_DEPS}
 		$(python_gen_cond_dep 'dev-python/pygobject[${PYTHON_USEDEP}]')
-	)"
+	)
+"
 DEPEND="
 	${COMMON_DEPEND}
 	cxx? ( dev-libs/boost )
-	test? ( dev-util/cunit )"
+	test? ( dev-util/cunit )
+"
 BDEPEND="
 	${PYTHON_DEPS}
 	virtual/pkgconfig
 	perl? (	dev-perl/Pod-Parser )
-	python? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]') )"
+	python? ( $(python_gen_cond_dep 'dev-python/cython[${PYTHON_USEDEP}]') )
+"
 
 QA_CONFIG_IMPL_DECL_SKIP=(
 	avcodec_free_frame # succcessfully detects that this is gone in newer ffmpeg