gentoo resync : 25.09.2021

8 files changed, 4 insertions, 482 deletions

diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 2c4b1e695f1e..74d9c8099aee 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,16 +1,9 @@
-AUX xmms2-0.8-ffmpeg2.patch 455 BLAKE2B 4009dd67794554c3dd98199944410f435f978d1ea86c3c280678d24cd8b85846e34d73c6a960e5188827d1523300e7869a3c0c1094fd355fc9c77f917a257508 SHA512 6aa567c3d823780c7fc8951735f59bcbe3345989e077d3ea6d8100acedd3ebf30523f05152fb80827c236ff83674bb47ca0917b5d2331c4d79c4502e41b365a3
 AUX xmms2-0.8-rtvg.patch 1358 BLAKE2B 1544ae0719b02ad94c19239d7ad3b16d3df3a29e1a5580b7541f2c8966f88c9fefafe2e151524e8e0397ac147c65898a841629acaf7f6d96fb76f0f57e4e2e33 SHA512 cc4d0d6cb459040fa55478b55780f34556f78627a2313b598eb276509248f3b6df4c252722ca2f996847e2f3a01392e9435fefd1ad5342c3a87a54bf0673cb0f
-AUX xmms2-0.8_p20161122-be-hash.patch 1075 BLAKE2B 7c9678016751b207a5ef48c0f7963bc0a2e3e99fb461e52b5745bc5e2dde6c329bb358e58802c127aef96d5912e22a7df7a64f719286e9cf7787703765c4b18f SHA512 051e22907315bb6bda201497e1c2ef84d919fc7d39aefac187b3616c5f6c41e768cdd79cfe197fbadfdda3863f9e9c96b5f72fa07d5e1655451328cde8ba5781
 AUX xmms2-0.8_p20161122-cpp-client.patch 624 BLAKE2B fd08746e4ce3c83a1cfed7a6794e169f435da2a1fdf639ae2d948109a22526a5a68f03f1dfabeaabc022dda8b403d08b2cf3c6944429b1b748ee75ac69840caf SHA512 19af5f465c1e48a9ca780b6cad1348eb6fc315b05923f0d4ded7c6972e2cbb3213ad8adf994e13c80c1d69c47bee97660fccad85c9b98ab9752a0ff9f930ea7c
 AUX xmms2-0.8_p20161122-faad.patch 629 BLAKE2B e2dc8964d1002ff55be736e6b0370f946e9d8dbdeaab8f9f50bebce210b431894174e80fbba8bc77c79f048c69d8ece85585395840a09fce6b58fdaaf404494f SHA512 7a40d77cefcc483e6ee24a672b30ddd9f763e642bbac6baf88c315ea4a1aea9c87212627fd641f6107f76ab3185a762129ed02c2f090b2264f89016fe4ff2d5f
-AUX xmms2-0.8_p20161122-gcc-10.patch 222 BLAKE2B a198b2e69081253f299ff1c7f94f0a2d3572a31caf4b7ec7de20e8d9a9bc404c58a98b31f0da6560034fe09599ae2e9f03b97728f45ad2fc30061b384c9fb13d SHA512 44685777b04e46e236104a74e654162a85b5c76c9838572921cc78b4775a7c2d5127566202415bfab10bb17261e242b034dde8aaf44024b66daa55a150ed1352
 AUX xmms2-0.8_p20161122-mac-4.patch 1215 BLAKE2B 746bcf75ce5b1f73ecb4023e776080674da5781d122f988ddb719ccdfb1da95fb632242004096a79861c0a9f0a3a49734a86bd8ac4c0541d3b3742cd722c8d44 SHA512 14b46640163f1d651e310d1bf08ec190a7449615c574952c19fa2c7f86215d83d3ee6d6cbe0f665a5fdd44ec44e44bc339a480ce753f16f2b49a4206dde1c12b
-AUX xmms2-0.8_p20161122-tarball.patch 2764 BLAKE2B 1d6ea9bc40db3145460a8ef06c732114475087ea05eef65fd837d6c3bf346478579d7c6ab0bf33387d2228a319245e0e4d2562935be75a58abd04e88205d4373 SHA512 5b03d129a55ac14462a68e47ecba29c2817eb83d122a3614c624c743ecc29a7bac066644aa61d5ac74f9cb59808d1a9bac077dc360c507da722c206b948301ac
-DIST waf-2.0.19.tar.bz2 682213 BLAKE2B 0bd2e31827ac65e0565abc09df37a42193ff37b50b6d0244f8b10ba7f308b4ba31ba864742d8c8d4005b86e611223dc4315cf70c0dbbf6b7db8f02e4f551fbb2 SHA512 ae7f3973c79e44313b4894c75763ad43ccd2be88e0d351d7f606ce495c5a464a379c85c076ebd8ba577fc88918af2bbb39bbec1049f25f02c14d98388e012c59
 DIST waf-2.0.22.tar.bz2 687244 BLAKE2B feea82e7e6aaba1187f368aa00025f206a7217196de9be7a97ca6aa8882823decd79db38dda4f1f25e81541eaa44edf029eea8d57e28f7d31b94d9ee93201ea9 SHA512 a3a275fd4c81c7b7385c2da001f3924d272105b8f33839265ebbb38708051b7cb13b9b9019e84325707d04513de0c13b032b1ad21458aec6586d10df4ed8d5f5
-DIST xmms2-0.8DrO_o-949-gca15e830.tar.bz2 1928653 BLAKE2B f34abf0c68f4574593eb706744cc4354bc9b679d005bcaf4a9f03ef90fcb14935428c73d3d74565c41a70efcfa6541af15a455d091b6d17e7ca613229c1c1390 SHA512 affd7fdd259cdb952e972b62f24ab8eb6afd2c87786254a7ae81adffdcfe1454dcf2fb95811a8b90db74dba84918526fd8c920e11582b36aa48725f293c73edb
 DIST xmms2-0.8_p20201016.tar.gz 1720185 BLAKE2B e1cad8ed2ece9d8ce905ffe86de53bb4010639d83fd15700eefccf190034577ff8666f3557bfb23741ed8400eba1e6246ef28ff21c4dbbe499239da945befc74 SHA512 0e73771f56c341e5dea15451457426958217de3ac19cad1924c11740f96feb69e385242a27a9cf9258841ed4e6538c12e135492f715bfae6976b31fb358508bf
 DIST xmms2-s4-0.8_p20201016.tar.gz 184231 BLAKE2B 0676f89b743e265af01593c215c609ae48ea368d861fd28b022b4124a00852182686a46ebf90ac44a10343f86ba5c398c47fd85e2688971b2b4445f3c3843af5 SHA512 f510141ca792893feba2c00d9bc437f492fdce7c29b12c9a8432792ca5a1703cc7068e1a9f4641abd50b320fefb5867fb5bc58a58b0b0272cf75828c764f94ed
-EBUILD xmms2-0.8_p20161122-r8.ebuild 8076 BLAKE2B 0f140d493ba41bd33bcaf1e70c8e8483fc72bf88dd42ccc3d181bcbc2509044e5dfd2853194db73796be0eb53bd8c543df22c8f2b401a770489c2172ddd35797 SHA512 db01b170edd8ebc1ed4f8de8302485fed54123884b0527ecc21604d298c6157cf96e5583d8720089dd06fd0ee76130a4fa8015c7f1f251fa9b3c0c4e1a30c7f3
-EBUILD xmms2-0.8_p20201016.ebuild 5866 BLAKE2B 9fb7649ed611191a0b6a036d23518c9a65e52cdcd945840fc2a83d9340da888de99d69c1f84664572776c64f478b2d084beea3627c67678fb9f86eb610e53f77 SHA512 0477e3d22b9499e698cfc14196cb4443d5e8cb9ba2ff7410d6fb93259acef9815689268e2d427794a2c7d1598d9903675dd03b662703305c1275e39964cd3991
-MISC metadata.xml 1619 BLAKE2B bd0c79b7dd4bb6037fb8f8df628a3882a5464e3e2b6547230987d0da6f188e0895d392cc110369aa142c5dab23b554014ce7df344d14d54f04d4c8994a3be509 SHA512 af1936c30bc91f85faeea6b54b3d2bb98172f2f75fabbad669f52bcedbff96f9a6226594114fba1748fbe82cbe0953df2baab03ab3d414a057428ce41346de30
+EBUILD xmms2-0.8_p20201016.ebuild 5873 BLAKE2B 5009cc7bec5f3a4addf40555dc4a43a9f4a044cf309433b37430efa4f2f13073662efd341b89809e89b69cd7dc44c65613ee612c5fdc6034bf73402df992bbb1 SHA512 9380099454cafefb9032d6a366a523591707f4323b14745024bf5cd181ca1d14e7cb9ef49d7a02f96aba2a26b65435911b138fdccb2d2ef48445f9e0a1f196bb
+MISC metadata.xml 1529 BLAKE2B 0f5c762b0325e767ba28410bd6838960e84df8a8f30ceda76833809b21b4e109f01caa2c4c5e234aacd4697f9a0a43d8fc1012f62261b8a1e9e458e2530b9dfe SHA512 be88d429da72efc944841bbb11c85dd6e746201eae90c20cc588bb5c42958315fc23bb9388396e971f0bc2069d4eb6dd9189b9c8f4c7cf4f343ca491f9d744be
diff --git a/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch b/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch
deleted file mode 100644
index 2e9fac380ea0..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-ffmpeg2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c
-===================================================================
---- xmms2-0.8DrO_o.orig/src/plugins/avcodec/avcodec.c
-+++ xmms2-0.8DrO_o/src/plugins/avcodec/avcodec.c
-@@ -29,6 +29,10 @@
- 
- #define AVCODEC_BUFFER_SIZE 16384
- 
-+#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
-+#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
-+#endif
-+
- typedef struct {
- 	AVCodecContext *codecctx;
- 
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch
deleted file mode 100644
index 5fa43298cf7f..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-be-hash.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d97c8b8239e8b3c5ddb951d427b7d78ea7faad25 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 30 Jul 2017 23:08:02 +0100
-Subject: [PATCH] OTHER: _xmmsv_dict_hash: make hash function
- endianness-agnostic
-
-The following code:
-    uint32_t k;
-    memcpy (&k, data, sizeof (k));
-computes different data depending on platform endianness.
-
-That causes test_xmmsv_serialize_coll_match test to fail
-as collection order is serialized in wrong order.
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- src/lib/xmmstypes/xmmsv_dict.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/xmmstypes/xmmsv_dict.c b/src/lib/xmmstypes/xmmsv_dict.c
-index 5ebe4eb3..32533285 100644
---- a/src/lib/xmmstypes/xmmsv_dict.c
-+++ b/src/lib/xmmstypes/xmmsv_dict.c
-@@ -66,8 +66,10 @@ _xmmsv_dict_hash (const void *key, int len)
- 
- 	while (len >= 4)
- 	{
--		uint32_t k;
--		memcpy (&k, data, sizeof (k));
-+		uint32_t k = data [0]
-+			| data [1] << 8
-+			| data [2] << 16
-+			| data [3] << 24;
- 
- 		k *= m;
- 		k ^= k >> r;
--- 
-2.13.3
-
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch
deleted file mode 100644
index 29a8311d2197..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-gcc-10.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/lib/s4/tests/s4/t_transactions.c
-+++ b/src/lib/s4/tests/s4/t_transactions.c
-@@ -19,7 +19,7 @@
- #include <glib.h>
- #include <glib/gstdio.h>
- 
--s4_t *s4;
-+extern s4_t *s4;
- s4_val_t *val;
- 
- SETUP (Transactions) {
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch
deleted file mode 100644
index eef49b13f16f..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-tarball.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff --git a/utils/gen-changelog.py b/utils/gen-changelog.py
-index b539088a..301c0461 100755
---- a/utils/gen-changelog.py
-+++ b/utils/gen-changelog.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- from subprocess import check_output
- import os
- 
-diff --git a/utils/gen-tarball.py b/utils/gen-tarball.py
-index 2ae2a4d1..09ed5074 100755
---- a/utils/gen-tarball.py
-+++ b/utils/gen-tarball.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from subprocess import check_output, call
- import tarfile
- import os
-@@ -40,15 +40,19 @@ def add_files(ball, prefix, template, files):
- 
- VERSION = check_output(["git", "describe"]).strip()
- 
-+# TODO: derive paths from submodule configuration
- TUTORIAL_DIR="doc/tutorial"
-+S4_DIR="src/lib/s4"
- 
- PREFIX="xmms2-%s" % VERSION
- PREFIX_TUTORIAL="%s/%s" % (PREFIX, TUTORIAL_DIR)
-+PREFIX_S4="%s/%s" % (PREFIX, S4_DIR)
- 
- DIST_DIR="dist"
- DIST_XMMS2="%s/xmms2-%s.tar" % (DIST_DIR, VERSION)
- DIST_XMMS2_BZ2="%s/xmms2-%s.tar.bz2" % (DIST_DIR, VERSION)
- DIST_TUTORIAL="%s/xmms2-tutorial-%s.tar" % (DIST_DIR, VERSION)
-+DIST_S4="%s/xmms2-tutorial-%s.tar" % (DIST_DIR, VERSION)
- 
- if not os.path.exists(DIST_DIR):
-     os.mkdir(DIST_DIR)
-@@ -62,6 +66,9 @@ if os.path.exists(DIST_XMMS2_BZ2):
- if os.path.exists(DIST_TUTORIAL):
-     os.unlink(DIST_TUTORIAL)
- 
-+if os.path.exists(DIST_S4):
-+    os.unlink(DIST_S4)
-+
- # Tar up XMMS2
- call("git archive --format=tar --prefix=%s/ HEAD > %s" % (PREFIX, DIST_XMMS2), shell=True)
- 
-@@ -69,9 +76,11 @@ call("git archive --format=tar --prefix=%s/ HEAD > %s" % (PREFIX, DIST_XMMS2), s
- call("git submodule init", shell=True)
- call("git submodule update", shell=True)
- call("git --git-dir=%s/.git archive --format=tar --prefix=%s/ HEAD > %s" % (TUTORIAL_DIR, PREFIX_TUTORIAL, DIST_TUTORIAL), shell=True)
-+call("git --git-dir=%s/.git archive --format=tar --prefix=%s/ HEAD > %s" % (S4_DIR, PREFIX_S4, DIST_S4), shell=True)
- 
--# Append the tutorials to the XMMS2 archive
-+# Append the tutorials and s4 to the XMMS2 archive
- call("tar -Af %s %s" % (DIST_XMMS2, DIST_TUTORIAL), shell=True)
-+call("tar -Af %s %s" % (DIST_XMMS2, DIST_S4), shell=True)
- 
- # Append ChangeLog and a summary of all file hashes."
- add_files(DIST_XMMS2, PREFIX, get_template(DIST_XMMS2, os.path.join(PREFIX, "wscript")), [
-diff --git a/utils/gen-tree-hashes.py b/utils/gen-tree-hashes.py
-index 7f8b9e4f..9d27adb0 100755
---- a/utils/gen-tree-hashes.py
-+++ b/utils/gen-tree-hashes.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- from subprocess import check_output
- from operator import itemgetter
- import os
-@@ -21,3 +21,4 @@ def collect_hashes(*paths):
- 
- print check_output("git describe", shell=True)
- print collect_hashes(".", "doc/tutorial")
-+print collect_hashes(".", "src/lib/s4")
diff --git a/media-sound/xmms2/metadata.xml b/media-sound/xmms2/metadata.xml
index 34034fc9473e..7f08040bab7a 100644
--- a/media-sound/xmms2/metadata.xml
+++ b/media-sound/xmms2/metadata.xml
@@ -14,7 +14,6 @@
 		<flag name="mac">Support for Monkey's Audio (APE) format using <pkg>media-sound/mac</pkg></flag>
 		<flag name="mlib-update">Enable building of xmms2-mlib-updater client</flag>
 		<flag name="ofa">Support for Open Fingerprint Architecture (OFA)</flag>
-		<flag name="phonehome">This client sends anonymous usage-statistics to the xmms2</flag>
 		<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>
diff --git a/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild b/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
deleted file mode 100644
index bf8cb66ac17e..000000000000
--- a/media-sound/xmms2/xmms2-0.8_p20161122-r8.ebuild
+++ /dev/null
@@ -1,327 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10} )
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit multiprocessing perl-functions python-single-r1 ruby-single toolchain-funcs
-
-# generated as 'python2 ./utils/gen-tarball.py' from clean git tree
-MY_P="${P%_p*}DrO_o-949-gca15e830"
-WAF_VER="2.0.19"
-
-DESCRIPTION="X(cross)platform Music Multiplexing System. Next generation of the XMMS player"
-HOMEPAGE="https://github.com/XMMS2"
-#SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${MY_P}.tar.bz2
-	https://waf.io/waf-${WAF_VER}.tar.bz2"
-LICENSE="GPL-2 LGPL-2.1"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc x86"
-
-IUSE="aac airplay +alsa ao asf cdda curl cxx ffmpeg flac fluidsynth ices
-jack mac mlib-update mms +mad modplug mp3 mp4 musepack ofa opus oss
-perl phonehome pulseaudio python ruby samba +server sid sndfile speex
-test valgrind +vorbis vocoder wavpack xml zeroconf"
-
-RDEPEND="server? (
-		>=dev-db/sqlite-3.3.4
-
-		aac? ( >=media-libs/faad2-2.0 )
-		airplay? ( dev-libs/openssl:0= )
-		alsa? ( media-libs/alsa-lib )
-		ao? ( media-libs/libao )
-		cdda? ( dev-libs/libcdio-paranoia
-			>=media-libs/libdiscid-0.1.1
-			>=media-sound/cdparanoia-3.9.8 )
-		curl? ( >=net-misc/curl-7.15.1 )
-		ffmpeg? ( media-video/ffmpeg )
-		flac? ( media-libs/flac )
-		fluidsynth? ( media-sound/fluidsynth )
-		ices? ( media-libs/libogg
-			media-libs/libshout
-			media-libs/libvorbis )
-		jack? ( virtual/jack )
-		mac? ( media-sound/mac )
-		mms? ( media-video/ffmpeg
-			>=media-libs/libmms-0.3 )
-		modplug? ( media-libs/libmodplug )
-		mad? ( media-libs/libmad )
-		mp3? ( >=media-sound/mpg123-1.5.1 )
-		musepack? ( media-sound/musepack-tools )
-		ofa? ( media-libs/libofa )
-		opus? ( media-libs/opus
-			media-libs/opusfile )
-		pulseaudio? ( media-sound/pulseaudio )
-		samba? ( >=net-fs/samba-4.2 )
-		sid? ( media-sound/sidplay
-			media-libs/resid )
-		sndfile? ( media-libs/libsndfile )
-		speex? ( media-libs/speex
-			media-libs/libogg )
-		vorbis? ( media-libs/libvorbis )
-		vocoder? ( sci-libs/fftw:3.0= media-libs/libsamplerate )
-		wavpack? ( media-sound/wavpack )
-		xml? ( dev-libs/libxml2 )
-		zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-	)
-
-	>=dev-libs/glib-2.12.9
-	cxx? ( >=dev-libs/boost-1.32 )
-	perl? ( >=dev-lang/perl-5.8.8 )
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( ${RUBY_DEPS} )
-"
-
-DEPEND="${RDEPEND}
-	dev-lang/python
-	virtual/pkgconfig
-	perl? ( dev-perl/Module-Build
-		virtual/perl-Module-Metadata )
-	python? ( >=dev-python/cython-0.15.1 )
-	test? ( dev-util/cunit
-		valgrind? ( dev-util/valgrind ) )
-"
-
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# needs port
-	#epatch "${FILESDIR}/${PN}"-0.8DrO_o-waflib-fix-perl.patch #578778
-
-	"${FILESDIR}/${PN}"-0.8-ffmpeg2.patch #536232
-
-	"${FILESDIR}/${PN}"-0.8-rtvg.patch #424377
-
-	# required to build tarball from git tree
-	"${FILESDIR}/${P}"-tarball.patch
-
-	# fix hash to be the same on LE/BE platforms
-	"${FILESDIR}/${P}"-be-hash.patch
-
-	# handle mac-3 -> -4 API change
-	"${FILESDIR}/${P}"-mac-4.patch
-
-	# C++ client dangling reference: https://github.com/xmms2/xmms2-devel/pull/5
-	"${FILESDIR}/${P}"-cpp-client.patch
-
-	# gcc-10 stopped putting globals into common section
-	"${FILESDIR}/${P}"-gcc-10.patch
-
-	# fix required since faad 2.9.0
-	"${FILESDIR}/${P}"-faad.patch
-)
-
-pkg_setup() {
-	# used both for building xmms2 and
-	# optionally linking client library
-	# against python
-	python-single-r1_pkg_setup
-}
-
-# use_enable() is taken as proto
-# ${1} - useflag
-# ${2} - xmms2 option/plugin name (equals to ${1} if not set)
-
-xmms2_flag() {
-	[[ -z ${1} ]] && eerror "!!! empty arg. usage: xmms2_flag <USEFLAG> [<xmms2_flagname>]."
-
-	local UWORD=${2:-${1}}
-
-	case ${1} in
-		ENABLED)
-			echo ",${UWORD}"
-			;;
-		DISABLED)
-			;;
-		*)
-			use ${1} && echo ",${UWORD}"
-			;;
-	esac
-}
-
-src_prepare() {
-	mv "${WORKDIR}/waf-${WAF_VER}"/{waf,waflib/} . || die
-	default
-}
-
-src_configure() {
-	# ./configure alike options.
-	local waf_params=(
-		--prefix=/usr
-		--libdir=/usr/$(get_libdir)
-		--with-target-platform="${CHOST}"
-		--mandir=/usr/share/man
-		--infodir=/usr/share/info
-		--datadir=/usr/share
-		--sysconfdir=/etc
-		--localstatedir=/var/lib
-	)
-
-	local optionals=""
-	local plugins=""
-	if ! use server ; then
-		waf_params+=( --without-xmms2d )
-	else
-		# some fun static mappings:
-		local option_map=(	# USE		# sorted xmms2 option flag (same, as USE if empty)
-					"phonehome	et"
-					"ENABLED	launcher"
-					"mlib-update	medialib-updater"
-					"ENABLED	nycli"
-					"		perl"
-					"ENABLED	pixmaps"
-					"		python"
-					"		ruby"
-					"DISABLED	tests"
-					"DISABLED	vistest"
-					"cxx		xmmsclient++"
-					"cxx		xmmsclient++-glib"
-					"DISABLED	xmmsclient-cf"
-					"DISABLED	xmmsclient-ecore" # not in tree
-
-					"test		tests"
-				)
-
-		local plugin_map=(	# USE		# sorted xmms2 plugin flag (same, as USE if empty)
-					"		alsa"
-					"		airplay"
-					"		ao"
-					"ffmpeg		apefile"
-					"ffmpeg		avcodec"
-					"		asf"
-					"ENABLED	asx"
-					"		cdda"
-					"DISABLED	coreaudio" # MacOS only?
-					"		curl"
-					"ENABLED	cue"
-					"zeroconf	daap"
-					"ENABLED	diskwrite"
-					"ENABLED	equalizer"
-					"aac		faad"
-					"ENABLED	file"
-					"		flac"
-					"		fluidsynth"
-					"ffmpeg		flv"
-					"ffmpeg		tta"
-					"DISABLED	gme" # not in tree
-					"DISABLED	gvfs" # obsolete #647604
-					"ENABLED	html"
-					"		ices"
-					"ENABLED	icymetaint"
-					"ENABLED	id3v2"
-					"		jack"
-					"ENABLED	karaoke"
-					"ENABLED	m3u"
-					"		mac"
-					"		mms"
-					"		mad"
-					"ENABLED	midsquash"
-					"		mp4" # bug #387961 (aac, mp3, ape can sit there)
-					"mp3		mpg123"
-					"		modplug"
-					"		musepack"
-					"DISABLED	nms" # not in tree
-					"ENABLED	normalize"
-					"ENABLED	null"
-					"ENABLED	nulstripper"
-					"		ofa"
-					"		opus"
-					"		oss"
-					"ENABLED	pls"
-					"pulseaudio	pulse"
-					"ENABLED	replaygain"
-					"xml		rss"
-					"		samba"
-					"DISABLED	sc68" #not in tree
-					"		sid"
-					"		sndfile"
-					"		speex"
-					"DISABLED	sun" # {Open,Net}BSD only
-					"DISABLED	tremor" # not in tree
-					"		vorbis"
-					"		vocoder"
-					"ffmpeg		tta"
-					"ENABLED	wave"
-					"DISABLED	waveout" # windows only
-					"		wavpack"
-					"xml		xspf"
-					"ENABLED	xml"
-				)
-
-		local option
-		for option in "${option_map[@]}"; do
-			optionals+=$(xmms2_flag ${option})
-		done
-
-		local plugin
-		for plugin in "${plugin_map[@]}"; do
-			plugins+=$(xmms2_flag ${plugin})
-		done
-
-		if use perl; then
-			perl_set_version
-			waf_params+=( --with-perl-archdir="${ARCH_LIB}" )
-		fi
-	fi # ! server
-
-	# pass them explicitely even if empty as we try to avoid magic deps
-	waf_params+=(
-		--with-optionals="${optionals:1}" # skip first ',' if yet
-		--with-plugins="${plugins:1}"
-		$(use_with valgrind)
-	)
-
-	CC="$(tc-getCC)"         \
-	CPP="$(tc-getCPP)"       \
-	AR="$(tc-getAR)"         \
-	RANLIB="$(tc-getRANLIB)" \
-	CXX="$(tc-getCXX)"       \
-	    ./waf configure "${waf_params[@]}" || die "'waf configure' failed"
-}
-
-src_compile() {
-	# waf is very keen to run tests in build phase (bug #424377) but
-	# it does not bother running tests twice, so the hack below works:
-	./waf --verbose build || ./waf --verbose build || die "waf build failed"
-}
-
-src_test() {
-	# rerun tests
-	./waf --alltests || die "waf --alltests failed"
-}
-
-src_install() {
-	./waf --without-ldconfig --destdir="${D}" install || die "'waf install' failed"
-	dodoc AUTHORS TODO
-
-	python_optimize
-
-	# waftools/man.py always compresses man pages with gzip.
-	# to avoid code changed let's just un-gzip manpages
-	local m
-	for m in "${ED}"/usr/share/man/man1/*.gz; do
-		# For some combination of USEs no mans are installed.
-		if [[ -f ${m} ]]; then
-			einfo "Uncompressing '${m#${ED}}' back."
-			gzip -d "${m}" || die
-		fi
-	done
-}
-
-pkg_postinst() {
-	if use phonehome ; then
-		einfo ""
-		einfo "The phone-home client xmms2-et was activated"
-		einfo "This client sends anonymous usage-statistics to the xmms2"
-		einfo "developers which may help finding bugs"
-		einfo "Disable the phonehome useflag if you don't like that"
-	fi
-}
diff --git a/media-sound/xmms2/xmms2-0.8_p20201016.ebuild b/media-sound/xmms2/xmms2-0.8_p20201016.ebuild
index 6966575236d9..d01c06980c3a 100644
--- a/media-sound/xmms2/xmms2-0.8_p20201016.ebuild
+++ b/media-sound/xmms2/xmms2-0.8_p20201016.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}/${PN}-devel-${XMMS2_COMMIT}"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86"
+KEYWORDS="~alpha amd64 ~arm ppc x86"
 
 # IUSE static map to be passed to --with-{optionals,plugins}=opt1,opt2,...
 # flag:opt = `usev flag opt`, opt = `usev opt`, :opt = `echo opt`
@@ -221,7 +221,7 @@ src_test() {
 }
 
 src_install() {
-	./waf install --destdir="${D}" --without-ldconfig || die
+	./waf install --destdir="${D}" --without-ldconfig --notests || die
 
 	einstalldocs