gentoo resync : 29.12.2022

8 files changed, 3 insertions, 477 deletions

diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 0c6689b107bc..2440a0dbb38d 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,15 +1,6 @@
-AUX xmms2-0.8-rtvg.patch 1358 BLAKE2B 1544ae0719b02ad94c19239d7ad3b16d3df3a29e1a5580b7541f2c8966f88c9fefafe2e151524e8e0397ac147c65898a841629acaf7f6d96fb76f0f57e4e2e33 SHA512 cc4d0d6cb459040fa55478b55780f34556f78627a2313b598eb276509248f3b6df4c252722ca2f996847e2f3a01392e9435fefd1ad5342c3a87a54bf0673cb0f
-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-mac-4.patch 1215 BLAKE2B 746bcf75ce5b1f73ecb4023e776080674da5781d122f988ddb719ccdfb1da95fb632242004096a79861c0a9f0a3a49734a86bd8ac4c0541d3b3742cd722c8d44 SHA512 14b46640163f1d651e310d1bf08ec190a7449615c574952c19fa2c7f86215d83d3ee6d6cbe0f665a5fdd44ec44e44bc339a480ce753f16f2b49a4206dde1c12b
-AUX xmms2-0.8_p20201016-ffmpeg5.patch 3751 BLAKE2B 4ef9c4a1a9bf74491a9a099266b8b727ef9f0b6d6a5d05e2370932281e14a3f76a004fd1f24fe9457a9a1b6d6740ca14f7749385567ec148823b4d428c4ee677 SHA512 c18ed39ffe7d9bab5a4fa5cac25d90dbfad9d127baf8bc84adc9c25481a3ebf5267ec2848919ca340153ed384941c48121b2c6f820c7bfad2455bd17c8f68d4a
 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 waf-2.0.22.tar.bz2 687244 BLAKE2B feea82e7e6aaba1187f368aa00025f206a7217196de9be7a97ca6aa8882823decd79db38dda4f1f25e81541eaa44edf029eea8d57e28f7d31b94d9ee93201ea9 SHA512 a3a275fd4c81c7b7385c2da001f3924d272105b8f33839265ebbb38708051b7cb13b9b9019e84325707d04513de0c13b032b1ad21458aec6586d10df4ed8d5f5
-DIST xmms2-0.8_p20201016.tar.gz 1720185 BLAKE2B e1cad8ed2ece9d8ce905ffe86de53bb4010639d83fd15700eefccf190034577ff8666f3557bfb23741ed8400eba1e6246ef28ff21c4dbbe499239da945befc74 SHA512 0e73771f56c341e5dea15451457426958217de3ac19cad1924c11740f96feb69e385242a27a9cf9258841ed4e6538c12e135492f715bfae6976b31fb358508bf
 DIST xmms2-0.9.1.tar.bz2 1940773 BLAKE2B 4044499c2ffc55e66d5836e2e36360486b970ff05f0dc17b62e65111c06cfcc84f58c74427b1afa4455b4e0bdb7784dc8840cc84411bc57cb7b9f0cac4e46359 SHA512 a7d42202571d7eb5d9da4c9f5d55d2f6e072df52892080d6cc4349f66a55f5fece510c9872be9814dd5b258d0c59e2704ea8497c2d3be515c510d602c17b703a
-DIST xmms2-s4-0.8_p20201016.tar.gz 184231 BLAKE2B 0676f89b743e265af01593c215c609ae48ea368d861fd28b022b4124a00852182686a46ebf90ac44a10343f86ba5c398c47fd85e2688971b2b4445f3c3843af5 SHA512 f510141ca792893feba2c00d9bc437f492fdce7c29b12c9a8432792ca5a1703cc7068e1a9f4641abd50b320fefb5867fb5bc58a58b0b0272cf75828c764f94ed
-EBUILD xmms2-0.8_p20201016-r2.ebuild 5910 BLAKE2B 857f8877eed08b63640483f312fa99d9a626f2f32988f525c156d5416d1b3812740c63086a59cb0aadef6aaf51f4685706ff4ad1fadb30aadb063f8c0b3bd09e SHA512 4837be50ebf0560e263aa54bd98d462140e63a86456942f42efeb4869897274b5f5b5a643a80df67482ee755ed8230406d102db15cfa7d16b18526b52bd3b24d
-EBUILD xmms2-0.9.1.ebuild 5505 BLAKE2B bb5d03e6b8dc67a3d5329d28d64553ef4aa60b2e11d9cd334054b8ca887af77e38cae215751ee136a57b058a0b0a3af7d5bf5cc322c4629918ac204e9da19395 SHA512 8eee7a7d1831a0b75eafec174b42cc197b76735eac11f7af1213db695d9d07e4bf36fafeaa6ffc6f4c63b244130f9b8b00ce07808203a53e57ebb4b7242cc837
+EBUILD xmms2-0.9.1.ebuild 5502 BLAKE2B 2a1dd2d05e55d8deb20d74083eccf5876b9e8b60c85f8eeb5de0f064cff3cbce9598daae9d0d2793826584f8a6a383d20e5afbbefd24f4eeec655315851f2503 SHA512 3550565ea698b8ceefd0034bb058a58332bd8a88b69959d589ec9f16eea5c3e1a5bddbc2cb4749fee322cc90e527c042a600210d416a9331918bfcf865c3d534
 MISC metadata.xml 1437 BLAKE2B 7f3c3cd1d134ee5c24a9dc1990108012640b366a587832eda270bcef2bca91777f9358a067d351f9ac83c118680b60af2955a3f195a6adc20eb84dc334553fb8 SHA512 0533f6c30210a6c2f06cefd833df6fbd8ebfcc510e6bf05133210a57d7d05e45875d829555011b6827b8fc440cb0779f85d4ca17dd3e862cf0519e874e0d8c9f
diff --git a/media-sound/xmms2/files/xmms2-0.8-rtvg.patch b/media-sound/xmms2/files/xmms2-0.8-rtvg.patch
deleted file mode 100644
index e0a970c91869..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8-rtvg.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Add knob to disable valgrind at test runtime.
-
-When valgrind is installed in system but is not
-working we should still be able to run tests.
-
-Bug: https://bugs.gentoo.org/424377
---- a/waftools/unittest.py
-+++ b/waftools/unittest.py
-@@ -64,7 +64,8 @@ def generate_coverage(bld):
- 
- 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
-@@ -501,6 +501,10 @@ def options(opt):
-                    dest='ldconfig', help="Run ldconfig after install even if not root")
-     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.sub_options("src/xmms")
-     for o in optional_subdirs + subdirs:
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch
deleted file mode 100644
index df1d1c616576..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-cpp-client.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://github.com/xmms2/xmms2-devel/pull/5
-
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 6 Dec 2018 07:19:08 +0000
-Subject: [PATCH] OTHER: fix c++ client dangling reference
---- a/src/include/xmmsclient/xmmsclient++/mainloop.h
-+++ b/src/include/xmmsclient/xmmsclient++/mainloop.h
-@@ -41,7 +41,7 @@ namespace Xmms
- 			 *  @note The constructor should only initialize the
- 			 *        mainloop, not start it!
- 			 */
--			MainloopInterface( xmmsc_connection_t* conn ) :
-+			MainloopInterface( xmmsc_connection_t*& conn ) :
- 				running_( false ), conn_( conn ) { }
- 
- 			/** Destructor.  Should also stop the loop.
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch
deleted file mode 100644
index 2a206b913fe4..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-faad.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-This line has stopped working since security fixes in the faad 2.9.0
-release. XMMS2 upstream were informed via IRC but have yet to act on
-it. I've run XMMS2 with this patch for months without issue.
-
--- Chewi
-
---- a/src/plugins/faad/faad.c
-+++ b/src/plugins/faad/faad.c
-@@ -242,7 +242,6 @@ xmms_faad_init (xmms_xform_t *xform)
- 	 * and durations calculations... So we cheat and tell libfaad2 we're feeding
- 	 * it frame 1.
- 	 */
--	NeAACDecPostSeekReset (data->decoder, 1);
- 
- 	/* FIXME: Because for HE AAC files some versions of libfaad return the wrong
- 	 * samplerate in init, we have to do one read and let it decide the real
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch b/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch
deleted file mode 100644
index 9785b4198d51..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20161122-mac-4.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/xmms2/xmms2-devel/pull/2
-
-From: Jérôme Carretero <cJ@zougloub.eu>
-Date: Tue, 24 Oct 2017 18:43:26 -0400
-Subject: [PATCH] plugins: mac: support newer mac API version
---- a/src/plugins/mac/mac.cpp
-+++ b/src/plugins/mac/mac.cpp
-@@ -210,8 +210,12 @@ xmms_mac_get_media_info (xmms_xform_t *xform)
- 				gchar *name;
- 
- 				field_name = pTagField->GetFieldName ();
--				name = (gchar *)GetUTF8FromUTF16 (field_name);
- 
-+#if MAC_DLL_INTERFACE_VERSION_NUMBER >= 1000
-+				name = (gchar *)CAPECharacterHelper::GetUTF8FromUTF16 (field_name);
-+#else
-+				name = (gchar *)GetUTF8FromUTF16 (field_name);
-+#endif
- 				memset (field_value, 0, 255);
- 				int size = 255;
- 				p_ape_tag->GetFieldString (field_name, (char *)field_value, &size, TRUE);
---- a/src/plugins/mac/source_adapter.h
-+++ b/src/plugins/mac/source_adapter.h
-@@ -38,7 +38,13 @@ public:
- 	~CSourceAdapter () {};
- 
- 	// open / close
--	int Open (const wchar_t * pName) { return ERROR_SUCCESS; }
-+#if MAC_DLL_INTERFACE_VERSION_NUMBER >= 1000
-+	int Open (const wchar_t * pName, BOOL bOpenReadOnly = FALSE)
-+#else
-+	int Open (const wchar_t * pName)
-+#endif
-+	{ return ERROR_SUCCESS; }
-+
- 	int Close () { return ERROR_SUCCESS; }
- 
- 	// read / write
diff --git a/media-sound/xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch b/media-sound/xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch
deleted file mode 100644
index b338e57cdfca..000000000000
--- a/media-sound/xmms2/files/xmms2-0.8_p20201016-ffmpeg5.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-Lazy migration from audio4 that's missing in ffmpeg5, may not be
-entirely right but tested to play at least .tta/.wma properly.
-
-https://github.com/xmms2/xmms2-devel/pull/11
-
-Bug: https://bugs.gentoo.org/834398
-Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
---- a/src/plugins/avcodec/avcodec.c
-+++ b/src/plugins/avcodec/avcodec.c
-@@ -32,4 +32,5 @@
- typedef struct {
- 	AVCodecContext *codecctx;
-+	AVPacket packet;
- 
- 	guchar *buffer;
-@@ -150,4 +151,5 @@
- 	data->buffer_size = AVCODEC_BUFFER_SIZE;
- 	data->codecctx = NULL;
-+	data->packet.size = 0;
- 
- 	data->read_out_frame = av_frame_alloc ();
-@@ -155,6 +157,4 @@
- 	xmms_xform_private_data_set (xform, data);
- 
--	avcodec_register_all ();
--
- 	mimetype = xmms_xform_indata_get_str (xform,
- 	                                      XMMS_STREAM_TYPE_MIMETYPE);
-@@ -467,43 +467,35 @@
- xmms_avcodec_internal_decode_some (xmms_avcodec_data_t *data)
- {
--	int got_frame = 0;
--	gint bytes_read = 0;
--	AVPacket packet;
-+	int rc = 0;
- 
--	av_init_packet (&packet);
--	packet.data = data->buffer;
--	packet.size = data->buffer_length;
--
--	/* clear buffers and reset fields to defaults */
--	av_frame_unref (data->read_out_frame);
--
--	bytes_read = avcodec_decode_audio4 (
--		data->codecctx, data->read_out_frame, &got_frame, &packet);
--
--	/* The DTS decoder of ffmpeg is buggy and always returns
--	 * the input buffer length, get frame length from header */
--	/* FIXME: Is ^^^^ still true? */
--	if (!strcmp (data->codec_id, "dca") && bytes_read > 0) {
--		bytes_read = ((int)data->buffer[5] << 12) |
--		             ((int)data->buffer[6] << 4) |
--		             ((int)data->buffer[7] >> 4);
--		bytes_read = (bytes_read & 0x3fff) + 1;
-+	if (data->packet.size == 0) {
-+		av_init_packet (&data->packet);
-+		data->packet.data = data->buffer;
-+		data->packet.size = data->buffer_length;
-+
-+		rc = avcodec_send_packet(data->codecctx, &data->packet);
-+		if (rc == AVERROR_EOF)
-+			rc = 0;
-+	}
-+
-+	if (rc == 0) {
-+		rc = avcodec_receive_frame(data->codecctx, data->read_out_frame);
-+		if (rc < 0) {
-+			data->packet.size = 0;
-+			data->buffer_length = 0;
-+			if (rc == AVERROR(EAGAIN)) rc = 0;
-+			else if (rc == AVERROR_EOF) rc = 1;
-+		}
-+		else
-+			rc = 1;
- 	}
- 
--	if (bytes_read < 0 || bytes_read > data->buffer_length) {
-+	if (rc < 0) {
-+		data->packet.size = 0;
- 		XMMS_DBG ("Error decoding data!");
- 		return -1;
- 	}
- 
--	if (bytes_read < data->buffer_length) {
--		data->buffer_length -= bytes_read;
--		g_memmove (data->buffer,
--		           data->buffer + bytes_read,
--		           data->buffer_length);
--	} else {
--		data->buffer_length = 0;
--	}
--
--	return got_frame ? 1 : 0;
-+	return rc;
- }
- 
---- a/src/plugins/avcodec/wscript
-+++ b/src/plugins/avcodec/wscript
-@@ -2,5 +2,5 @@
- 
- ## Code fragments for configuration
--avcodec_decode_audio4_fragment = """
-+avcodec_send_packet_fragment = """
- #ifdef HAVE_LIBAVCODEC_AVCODEC_H
- # include "libavcodec/avcodec.h"
-@@ -10,9 +10,7 @@
- int main(void) {
-     AVCodecContext *ctx;
--    AVFrame *frame;
--    int got_frame;
-     AVPacket *pkt;
- 
--    avcodec_decode_audio4 (ctx, frame, &got_frame, pkt);
-+    avcodec_send_packet (ctx, pkt);
- 
-     return 0;
-@@ -44,7 +42,7 @@
-     # * ffmpeg: commit e4de716, lavc 53.40.0, release 0.9
-     # * libav: commit 0eea212, lavc 53.25.0, release 0.8
--    conf.check_cc(fragment=avcodec_decode_audio4_fragment, uselib="avcodec",
--                  uselib_store="avcodec_decode_audio4",
--                  msg="Checking for function avcodec_decode_audio4", mandatory=True)
-+    conf.check_cc(fragment=avcodec_send_packet_fragment, uselib="avcodec",
-+                  uselib_store="avcodec_send_packet",
-+                  msg="Checking for function avcodec_send_packet", mandatory=True)
- 
-     # non-mandatory function avcodec_free_frame since
diff --git a/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild b/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild
deleted file mode 100644
index 0edb6f31cd7f..000000000000
--- a/media-sound/xmms2/xmms2-0.8_p20201016-r2.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit multiprocessing optfeature perl-functions python-single-r1 toolchain-funcs
-
-XMMS2_COMMIT="46da10f0e20c53fd2b40843617ed182c0cba4ebb"
-S4_COMMIT="652ac581df7a0bca04334da397f8bb4f86eb7b59"
-WAF_VER="2.0.22"
-
-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/archive/${XMMS2_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/xmms2/s4/archive/${S4_COMMIT}.tar.gz -> ${PN}-s4-${PV}.tar.gz
-	https://waf.io/waf-${WAF_VER}.tar.bz2"
-S="${WORKDIR}/${PN}-devel-${XMMS2_COMMIT}"
-
-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`
-XMMS2_OPTIONALS=(
-	cxx:xmmsclient++,xmmsclient++-glib :launcher mlib-update:medialib-updater
-	:nycli perl :pixmaps python server:s4 test:tests
-	# disabled: et,mdns,migrate-collections,ruby,sqlite2s4,vistest,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}"
-RESTRICT="!test? ( test ) !server? ( test )"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	sys-libs/readline:=
-	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/libogg
-			media-libs/opus
-			media-libs/opusfile
-		)
-		pulseaudio? ( media-sound/pulseaudio )
-		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
-		)
-	)
-	python? ( virtual/libcrypt:= )"
-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.8-rtvg.patch
-	"${FILESDIR}"/${PN}-0.8_p20161122-mac-4.patch
-	"${FILESDIR}"/${PN}-0.8_p20161122-cpp-client.patch
-	"${FILESDIR}"/${PN}-0.8_p20161122-faad.patch
-	"${FILESDIR}"/${P}-ffmpeg5.patch
-)
-
-src_prepare() {
-	rmdir src/lib/s4 && mv ../s4-${S4_COMMIT} src/lib/s4 || die
-	mv ../waf-${WAF_VER}/waf{,lib} . || die
-
-	default
-
-	sed -e "s|/path/to/.*sf2|${EPREFIX}/usr/share/sounds/sf2/FluidR3_GM.sf2|" \
-		-i src/plugins/fluidsynth/fluidsynth.c || die
-}
-
-src_configure() {
-	local waf=(
-		./waf configure
-		--prefix="${EPREFIX}"/usr
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--boost-includes="${ESYSROOT}"/usr/include # needed for prefix
-		--with-custom-version="%(version)s (git commit: ${XMMS2_COMMIT:0:8})"
-		--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
-		waf+=( --without-xmms2d )
-	fi
-
-	for flag in "${XMMS2_OPTIONALS[@]}"; do
-		optionals+=$(xmms2_flag ${flag})
-	done
-
-	waf+=(
-		# pass even if empty to avoid automagic
-		--with-optionals=${optionals:1}
-		--with-plugins=${plugins:1}
-	)
-
-	if use perl; then
-		perl_set_version
-		waf+=( --with-perl-archdir="${ARCH_LIB}" )
-	fi
-
-	if use valgrind; then
-		if valgrind true &>/dev/null; then
-			waf+=( --with-valgrind )
-		else
-			ewarn "valgrind was disabled due to failing a basic sanity check" #807271
-		fi
-	fi
-
-	tc-export AR CC CXX
-
-	echo "${waf[*]}"
-	"${waf[@]}" || die
-}
-
-src_compile() {
-	./waf build -j$(makeopts_jobs) --verbose --notests || die
-}
-
-src_test() {
-	./waf --alltests || die
-}
-
-src_install() {
-	./waf install --destdir="${D}" --without-ldconfig --notests || die
-
-	einstalldocs
-
-	use python && python_optimize
-
-	# to avoid editing waftools/man.py (use find given not always installed)
-	find "${ED}" -name '*.gz' -exec gzip -d {} + || die
-}
-
-pkg_postinst() {
-	use fluidsynth && optfeature "the default MIDI soundfont" media-sound/fluid-soundfont
-}
diff --git a/media-sound/xmms2/xmms2-0.9.1.ebuild b/media-sound/xmms2/xmms2-0.9.1.ebuild
index 3352a282436e..64355359cdbe 100644
--- a/media-sound/xmms2/xmms2-0.9.1.ebuild
+++ b/media-sound/xmms2/xmms2-0.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit multiprocessing optfeature perl-functions python-single-r1 toolchain-funcs
 
 DESCRIPTION="X(cross)platform Music Multiplexing System, next generation of the XMMS player"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/xmms2/xmms2-devel/releases/download/${PV}/${P}.tar.b
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~riscv ~x86"
+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`