gentoo resync : 30.10.2021

33 files changed, 116 insertions, 523 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 3556b9fd52d7..af45ae274c8b 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index ebabfd1a507e..aa7ce87d8d4a 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -7,5 +7,5 @@ DIST csound-6.16.1-distributable.tar.xz 25142436 BLAKE2B fe29208afe2cfc9740e68da
 DIST csound-6.16.2-distributable.tar.xz 25169396 BLAKE2B f51c27606f53571d998a62667c55c60a831c076ced993c4eaa8fa24a7e0a8d4872055dc59455b70124f51e2c419018345e2d0e9a33b95d4362f8c6bdecb8310d SHA512 b72c89b2935d92840f5cb7f6d5696e74a3528f5d37858218691f0f6331a69f63b261937a8a8d346d6e182cf8f4a40af85167a4e42fd005cfcf5b4c9daa822f75
 EBUILD csound-6.16.1.ebuild 7132 BLAKE2B 134d88291b5af94d99a8c2e0b6b421b3a75722db07b204eb0e8e98991365ecc78a260f691ba3fb37191da4b506ec8bd57392174e191a9ed3185b38280c89a882 SHA512 30a822eea460f01ba8b6201c8978d1fc1f40ff9cdea8ebb1fbe99ed7c3b6adac686ab400a5ec1adc9321b978c3919408ad79f22b393fc3d34e003dc860ac987f
 EBUILD csound-6.16.2.ebuild 7132 BLAKE2B 134d88291b5af94d99a8c2e0b6b421b3a75722db07b204eb0e8e98991365ecc78a260f691ba3fb37191da4b506ec8bd57392174e191a9ed3185b38280c89a882 SHA512 30a822eea460f01ba8b6201c8978d1fc1f40ff9cdea8ebb1fbe99ed7c3b6adac686ab400a5ec1adc9321b978c3919408ad79f22b393fc3d34e003dc860ac987f
-EBUILD csound-9999.ebuild 6880 BLAKE2B f07b7aff3c721a0115d1edd7e6389ecc7203ff7bb20c4d114516a96490a29af0005837724a1ddeb5ae3ae362fa8a743757c13b6fe16dfc68346089b4e66d837d SHA512 cb74a9452eda7897f5595491d2c974cba029af4609faaed6fadcb2895b850e5c73b0e54c62172bd50919cb46de20aaa9f1a510c8a43298f750ae93cfd34fa256
+EBUILD csound-9999.ebuild 5166 BLAKE2B ae5a7585fe35ccab9efd9d5da3c09ed6e94a18e156ad5b69473cf59db54cacf140d30f4dbf6202a983c6b4b7fe7eae6ad2c15cf5402344709bca5ee9e5e395b4 SHA512 e9e9fe4de713c770d3ef60541ef5024f5829b6e1d5d5d8dad33f29dcd27391ffefe6e33f7f35e82c08bb03fcfaf5c5660e37c3200ff0cc510758838bea44a9d1
 MISC metadata.xml 1244 BLAKE2B cd28c168f6625c7ab090f3b3812fbdcb8a7f2e17d649083c54761ea3a109d4ec90f9d6241cacf8502f386d10fa682e5c2d0be1a77a6f19d94820d80115b290a9 SHA512 96e697c02828da5fa3ca22a3a564f76ad06b55d8479f5bd2c207aa2427675b814f351fd5d9e5ec61e9c3b88d2e803137288a11e15dc92c149c015a2dcd315cbc
diff --git a/media-sound/csound/csound-9999.ebuild b/media-sound/csound/csound-9999.ebuild
index f997f81d6444..0486ace1f63d 100644
--- a/media-sound/csound/csound-9999.ebuild
+++ b/media-sound/csound/csound-9999.ebuild
@@ -5,12 +5,12 @@
 # we have to repackage the tarball. For that purpose use `bash files/repackage.sh version`
 # Reference: https://github.com/csound/csound/issues/1148
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-1 luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7,8,9,10} )
 
-inherit cmake lua-single python-single-r1 toolchain-funcs
+inherit cmake lua-single python-single-r1
 
 if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/csound/csound.git"
@@ -30,36 +30,30 @@ HOMEPAGE="https://csound.github.io/"
 
 LICENSE="LGPL-2.1 doc? ( FDL-1.2+ )"
 SLOT="0"
-IUSE="+alsa beats chua curl +cxx debug doc double-precision dssi examples
-fltk +fluidsynth hdf5 jack java keyboard linear lua mp3 nls osc portaudio
-portaudio portmidi pulseaudio python samples static-libs stk test +threads +utils
-vim-syntax websocket"
+IUSE="+alsa beats curl +cxx debug doc double-precision dssi examples jack java lua nls osc portaudio
+portaudio portmidi pulseaudio samples static-libs test +threads +utils vim-syntax"
 
 REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
 	alsa? ( threads )
 	java? ( cxx )
-	linear? ( double-precision )
 	lua? ( ${LUA_REQUIRED_USE} cxx )
-	python? ( ${PYTHON_REQUIRED_USE} cxx )
 "
 
 BDEPEND="
+	sys-devel/bison
 	sys-devel/flex
 	virtual/yacc
-	chua? ( dev-libs/boost )
 	lua? ( dev-lang/swig )
-	python? ( dev-lang/swig )
 	nls? ( sys-devel/gettext )
 	test? (
 		dev-util/cunit
 		${PYTHON_DEPS}
 	)
 "
-# linear currently works only with sci-mathematics-gmm-5.1
-#   https://github.com/csound/csound/issues/920
 CDEPEND="
 	dev-cpp/eigen:3
-	>=media-libs/libsndfile-1.0.16
+	media-libs/libsndfile
 	media-libs/libsamplerate
 	sys-libs/zlib
 	alsa? ( media-libs/alsa-lib )
@@ -68,25 +62,19 @@ CDEPEND="
 		media-libs/dssi
 		media-libs/ladspa-sdk
 	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	fltk? ( x11-libs/fltk:1[threads?] )
-	hdf5? ( sci-libs/hdf5 )
 	jack? ( virtual/jack )
 	java? ( >=virtual/jdk-1.8:* )
-	keyboard? ( x11-libs/fltk:1[threads?] )
-	linear? ( =sci-mathematics/gmm-5.1* )
 	lua? ( ${LUA_DEPS} )
-	mp3? ( >=media-sound/lame-3.100-r3 )
 	osc? ( media-libs/liblo )
 	portaudio? ( media-libs/portaudio )
 	portmidi? ( media-libs/portmidi )
 	pulseaudio? ( media-sound/pulseaudio )
-	python? ( ${PYTHON_DEPS} )
-	stk? ( media-libs/stk )
 	utils? ( !media-sound/snd )
-	websocket? ( net-libs/libwebsockets:= )
 "
-RDEPEND="${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	${PYTHON_DEPS}
+"
 DEPEND="
 	${CDEPEND}
 	dev-libs/boost
@@ -101,15 +89,12 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-6.13.0-xdg-open.patch"
-	"${FILESDIR}/${PN}-6.15.0-lame.patch"
 )
 
 pkg_setup() {
 	use lua && lua-single_pkg_setup
 
-	if use python || use test ; then
-		python-single-r1_pkg_setup
-	fi
+	python-single-r1_pkg_setup
 }
 
 src_prepare() {
@@ -123,47 +108,21 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_BELA=OFF
-		-DBUILD_BUCHLA_OPCODES=ON
-		-DBUILD_CHUA_OPCODES=$(usex chua)
-		-DBUILD_COUNTER_OPCODES=ON
 		-DBUILD_CSBEATS=$(usex beats)
-		-DBUILD_CUDA_OPCODES=OFF
 		-DBUILD_CXX_INTERFACE=$(usex cxx)
+		-DBUILD_DEPRECATED_OPCODES=ON
 		-DBUILD_DSSI_OPCODES=$(usex dssi)
-		-DBUILD_EMUGENS_OPCODES=ON
-		-DBUILD_EXCITER_OPCODES=ON
-		-DBUILD_FLUID_OPCODES=$(usex fluidsynth)
-		-DBUILD_FRAMEBUFFER_OPCODES=ON
-		-DBUILD_HDF5_OPCODES=$(usex hdf5)
 		-DBUILD_INSTALLER=OFF
-		-DBUILD_JACK_OPCODES=$(usex jack)
 		-DBUILD_JAVA_INTERFACE=$(usex java)
-		-DBUILD_LINEAR_ALGEBRA_OPCODES=$(usex linear)
 		-DBUILD_LUA_INTERFACE=$(usex lua)
-		-DBUILD_MP3OUT_OPCODE=$(usex mp3)
 		-DBUILD_MULTI_CORE=$(usex threads)
-		-DBUILD_OPENCL_OPCODES=OFF
 		-DBUILD_OSC_OPCODES=$(usex osc)
-		-DBUILD_P5GLOVE_OPCODES=OFF
 		-DBUILD_PADSYNTH_OPCODES=ON
-		-DBUILD_PLATEREV_OPCODES=ON
-		-DBUILD_PVSGENDY_OPCODE=OFF
-		-DBUILD_PYTHON_INTERFACE=$(usex python)
 		-DBUILD_RELEASE=ON
 		-DBUILD_SCANSYN_OPCODES=OFF # this is not allowed to be redistributed: https://github.com/csound/csound/issues/1148
-		-DBUILD_SELECT_OPCODE=ON
-		-DBUILD_SERIAL_OPCODES=ON
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STACK_OPCODES=ON
 		-DBUILD_STATIC_LIBRARY=$(usex static-libs "ON" $(usex test))
-		-DBUILD_STK_OPCODES=$(usex stk)
 		-DBUILD_TESTS=$(usex test)
 		-DBUILD_UTILITIES=$(usex utils)
-		-DBUILD_VIRTUAL_KEYBOARD=$(usex keyboard)
-		-DBUILD_VST4CS_OPCODES=OFF
-		-DBUILD_WEBSOCKET_OPCODE=$(usex websocket)
-		-DBUILD_WIIMOTE_OPCODES=OFF
-		-DBUILD_WINSOUND=OFF
 
 		-DFAIL_MISSING=ON
 		-DNEW_PARSER_DEBUG=$(usex debug)
@@ -171,12 +130,9 @@ src_configure() {
 
 		-DUSE_ALSA=$(usex alsa)
 		-DUSE_ATOMIC_BUILTIN=ON
-		-DUSE_AUDIOUNIT=OFF # Apple specific
 		-DUSE_COMPILER_OPTIMIZATIONS=ON
-		-DUSE_COREMIDI=OFF # Apple specific
 		-DUSE_CURL=$(usex curl)
 		-DUSE_DOUBLE=$(usex double-precision)
-		-DUSE_FLTK=$(usex fltk)
 		-DUSE_GETTEXT=$(usex nls)
 		-DUSE_GIT_COMMIT=ON
 		-DUSE_IPMIDI=ON
@@ -186,7 +142,7 @@ src_configure() {
 		-DUSE_PORTAUDIO=$(usex portaudio)
 		-DUSE_PORTMIDI=$(usex portmidi)
 		-DUSE_PULSEAUDIO=$(usex pulseaudio)
-
+		-DUSE_VCPKG=OFF
 	)
 
 	use java && mycmakeargs+=(
@@ -212,9 +168,6 @@ src_install() {
 		OPCODEDIR$(usex double-precision 64 '')="${EPREFIX}/usr/$(get_libdir)/${PN}/plugins$(usex double-precision 64 '')"
 		CSSTRNGS="${EPREFIX}/usr/share/locale"
 	_EOF_
-	if use stk ; then
-		echo RAWWAVE_PATH=\"${EPREFIX}/usr/share/csound/rawwaves\" >> "${T}"/62${PN} || die
-	fi
 	doenvd "${T}"/62${PN}
 
 	if use examples ; then
@@ -234,7 +187,7 @@ src_install() {
 	# rename extract to csound_extract (bug #247394)
 	mv "${ED}"/usr/bin/{,csound_}extract || die
 
-	use python && python_optimize
+	python_optimize
 
 	use java && (dosym lib_jcsound6.so usr/lib64/lib_jcsound.so.1 || die "Failed to create java lib symlink")
 
diff --git a/media-sound/daudio/files/daudio.rc b/media-sound/daudio/files/daudio.rc
index 5f934107051a..5f934107051a 100755..100644
--- a/media-sound/daudio/files/daudio.rc
+++ b/media-sound/daudio/files/daudio.rc
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index 4d9f3b299184..6cc8897ace9d 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,9 +1,5 @@
 AUX din-48-fix-random-constants.patch 667 BLAKE2B 2747a1c60f2f968cd4e173996900d889b9c45f77af6aba035a4fe29ced8882178cc3fbfa925dc2bc02aced071648e008f409ecd9c6b3782838dec5344a8b71f4 SHA512 0805ea12a272276ba1883ab624c96566dbb71168bd9a0e4ecbe6f3373287e7d88d5a897c03e0385acf12a7fc79a4be73f1d66ec699790986cd2c863e6ca251bc
-AUX din-49.1-makefile.patch 1888 BLAKE2B 89e5c6a81d97a56560ffddac770fba6aa0c476ceabec6fcd0983d9a21ba8579d61057bc56280163f2f5d15584541a15f07dd401eb9ce9f32f3da73f39d1f5997 SHA512 2e685ca57b8fba640d302868406ac573c1218da5fc0c40223e0420a60f31dc0baefcd07dff3b0c8627076cd7284655a3958f563a6ff73c20eef4d2570a035b59
-AUX din-50.2-gcc11-rename-identifier.patch 1207 BLAKE2B 336f06a9e4baf9e7dcb44c86c40adef61caa2ea231d695e59720e600d2fba9c7f788be63c18b135ebefcfda879ea067b633066c80a7f9b8bb501c0c31bbbe16f SHA512 2496ac4026b70f0c3b00adcf3b295ddb77c25e10f436b0222432536f0a5d3efd1d5a8df4d5ba15643c7c29323e2d25dcd197649815e90c11e19fb28dd6a8eedc
 AUX din-51.1.1-makefile.patch 1906 BLAKE2B e620aa00b69c460a694de60a4e16539f6b6f123e38a282e59db6b2e2b623cbec3bd793df2f1e7d935d955314023f90dd4b2dd12f155bb0c261328456af46a1d9 SHA512 02f3080beeadb90d725e4f94d4e39bc944aa22287b2af3b78b8094c4200ad58ffd02ad0359c4b677c89a426874394e134b526347b53ea3efa76fe950b007eafb
-DIST din-50.2.tar.gz 3687036 BLAKE2B b51923d755c5b4635d79c77f204bf42da9926fc247dde9d3ad175bc858a674a3064589608bfd67331ef40a417fdbbee4e90ae6a9bc2930355213738225fcd7e4 SHA512 4d60f26434559259b778181f2b46e2689af94179fc254b61e1ea623cafa49030736b69effd82fb2f62b8e908883cf272147dde884487c9a7beed9c26cf0a7498
 DIST din-51.1.1.tar.gz 3700797 BLAKE2B 559a4476188ac6d9da596be011bdaa8b379bb336220b3f94edf04e3eeb9ca0100fbaaa0fc10f9a9f37d3efa436acddac5c06435c6b3ebb4d21afdbd7c65b2dc8 SHA512 ea5e1ab79cbc24abb80a9fd25d8304f36ab2345505ee98132196685cda73b31dd7db3f62cb1821cbdc9694703d3454bd58d733833710d492ecebffee23732a0f
-EBUILD din-50.2.ebuild 1145 BLAKE2B ad96be1ff43ee274ffc8d7605024888952ea6f2cdf9dc8c11dd27b6192d065bf7e4e66cfeff4abdcc2514934ebe55795a33f185f59c81f147e95540a21edba8e SHA512 1050c39d47fbf190f35f410220a5c38f637c32d7bda5fd33efb896df8fc2ee2348a52f084b3f8261b912a7869008fb1a13fb0f901d9c9f13e26ba3baf285f34e
-EBUILD din-51.1.1.ebuild 1085 BLAKE2B 7daf285ccbd334752a8ce0fb3d8799c3fd987aa6d4cd0d660674494e65d2a5aed96d4c71a96ee6e1c678d45d8f50f5beb3a0da62a8cdfb3dad3ea9be2ba04cac SHA512 fa516a25c9ba70aedb1f214b474fad340f0ff3865089b7b37767ca02222ab1be6fd58b54878c4a931a00ee323501a14cdf878c3b7dfc0162b694e9ba097b1e12
+EBUILD din-51.1.1.ebuild 1083 BLAKE2B 474d674d77d7350c744a50d61863b12cba148e73afd6d56d52f30d293b7a89659d658a3ede854dd0de281ade1d26e399aca940b90565a9980537acce5737b780 SHA512 d9bc8d1038e6f30e3fb6c1cc608b6760135e4df33fc8da7525df75b4fadd22d4676083e6c3abb05300cc562444fa7a1503c49209a90b5765130ac8ef6b166736
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/din/din-50.2.ebuild b/media-sound/din/din-50.2.ebuild
deleted file mode 100644
index 31e46f323352..000000000000
--- a/media-sound/din/din-50.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools edos2unix xdg
-
-DESCRIPTION="a software musical instrument and audio synthesizer"
-HOMEPAGE="https://dinisnoise.org/"
-SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa jack"
-
-RDEPEND="
-	dev-lang/tcl:0=
-	media-libs/libsdl:=
-	virtual/glu
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	jack? ( virtual/jack )
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/boost
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="|| ( alsa jack )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-49.1-makefile.patch"
-	"${FILESDIR}/${PN}-48-fix-random-constants.patch"
-	"${FILESDIR}/${PN}-50.2-gcc11-rename-identifier.patch"
-)
-
-src_prepare() {
-	default
-
-	edos2unix pixmaps/${PN}.desktop
-
-	use jack && (sed -i "s/-lasound/-ljack/g" src/Makefile.am || die "Failed to fix jack linking")
-
-	eautoreconf
-}
-
-src_configure() {
-	# Jack takes over alsa.
-	local sound_engine
-
-	use jack && sound_engine="UNIX_JACK" || sound_engine="LINUX_ALSA"
-
-	econf CXXFLAGS="${CXXFLAGS} -D__${sound_engine}__"
-}
diff --git a/media-sound/din/din-51.1.1.ebuild b/media-sound/din/din-51.1.1.ebuild
index 4c4933184e27..43999113438b 100644
--- a/media-sound/din/din-51.1.1.ebuild
+++ b/media-sound/din/din-51.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.org/download/dinisnoise_source_code/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+alsa jack"
 
 RDEPEND="
diff --git a/media-sound/din/files/din-49.1-makefile.patch b/media-sound/din/files/din-49.1-makefile.patch
deleted file mode 100644
index 0a96d894c2c0..000000000000
--- a/media-sound/din/files/din-49.1-makefile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index c7cc5ce..2b07a9b 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,7 +1,7 @@
- #dinincludedir = $(pkgsrcdir)
- 
--AM_CXXFLAGS = -I /usr/include/tcl8.6 -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\" 
--LIBS +=  -ltcl8.6 -lSDL -lGL -lpthread -lasound
-+AM_CXXFLAGS = -Wall -D_THREAD_SAFE -DHAVE_OPENGL -D__LICENSED__ -D __SVG__ -D__GPL20__ -D __BOOST_TIME__ -DPREFIX=\"@prefix@\" 
-+LIBS +=  -ltcl -lSDL -lGL -lpthread -lasound
- 
- bin_PROGRAMS = din
- din_SOURCES = alarm.cc arrow_button.cc audio.cc authors_note.cc ball.cc ball_ops.cc basic_editor.cc beat2value.cc binaural_drone.cc binaural_drones.cc bit_display.cc box_selector.cc button.cc capturer.cc checkbutton.cc chrono.cc circler.cc command.cc compressor.cc console.cc console_iterator.cc countries.cc cross_button.cc curve.cc curve_display.cc curve_editor.cc curve_library.cc curve_mixer.cc curve_picker.cc curve_samples.cc custom_periodic.cc delay.cc din.cc din_info.cc drone.cc fader.cc fft.cc field.cc filled_button.cc font.cc font_editor.cc fractaliser.cc globals.cc glyph.cc gravity.cc hit.cc help.cc item_list.cc keyboard_keyboard.cc label.cc levels.cc line.cc lissajous.cc listeners.cc main.cc menu.cc mesh.cc midi_in.cc minus_button.cc mocap.cc modulator.cc mondrian.cc morpher.cc morse_code.cc mouse_slider.cc multi_curve.cc note.cc noiser.cc number.cc oscilloscope.cc phrasor.cc play.cc plugin.cc plugin_browser.cc plus_button.cc point_modulator.cc range.cc recorder.cc rect.cc rose_milker.cc scale_info.cc scale_notes.cc scalelist.cc separator.cc settings.cc sine_mixer.cc slit.cc solver.cc spiraler.cc starrer.cc superformula.cc tap_bpm.cc tcl_interp.cc textboard.cc tokenizer.cc trail.cc triggered_note.cc ui.cc ui_sin_cos_radius.cc viewwin.cc warper.cc widget.cc kiss_fft.c RtAudio.cpp RtMidi.cpp
diff --git a/media-sound/din/files/din-50.2-gcc11-rename-identifier.patch b/media-sound/din/files/din-50.2-gcc11-rename-identifier.patch
deleted file mode 100644
index 8245a5cb021b..000000000000
--- a/media-sound/din/files/din-50.2-gcc11-rename-identifier.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/787185
-
-From 9ea918cfdfcd99fbcac64a820ddbaefb562c11a0 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Mon, 14 Jun 2021 15:06:58 +0000
-Subject: [PATCH] src/help.h: Rename __help identifier
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-__help is reserved, so we need to rename it to fix a build failure with GCC 11:
-
-	"In addition to the names documented in this manual, reserved names include all
-	external identifiers (global functions and variables) that begin with an
-	underscore (‘_’) and all identifiers regardless of use that begin with either
-	two underscores or an underscore followed by a capital letter are reserved names."
-	-- glibc manual, 1.3.3 Reserved Names
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- src/help.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/help.h b/src/help.h
-index ae0954b..af7f178 100644
---- a/src/help.h
-+++ b/src/help.h
-@@ -5,8 +5,8 @@
- * For more information, please visit https://dinisnoise.org/

- */

- 

--#ifndef __help

--#define __help

-+#ifndef DIN_help

-+#define DIN_help

- #include <string>

- #include <vector>

- struct help {

--- 
-2.32.0
-
diff --git a/media-sound/fluidsynth/Manifest b/media-sound/fluidsynth/Manifest
index 8d9ec373d4d2..55d2ddf9be59 100644
--- a/media-sound/fluidsynth/Manifest
+++ b/media-sound/fluidsynth/Manifest
@@ -1,5 +1,3 @@
-DIST fluidsynth-2.2.2.tar.gz 1741567 BLAKE2B 78fe02ae37db70e7aa92071aa609ff6f3dc6217827f89091ded1a8e2d30e84f3d7a095e101fcccfe720e9c3445f58e15da588cfcd7063388ab642649536b8fa0 SHA512 208956e367725de4b1faeba7d4125a6a85bb4191ef0354a7087809e93d93b8986cdc30b78c135a743104851d15f3bb09776855fa02a686de0810dd14c97851c3
 DIST fluidsynth-2.2.3.tar.gz 1745344 BLAKE2B 0d08c67532392d32501a71f1e6fac6d55a0a0a607dae914106e1674df0a96869041530f75669193305a091ec40177e2925345df24d75a369c87e738ec1f4eb2e SHA512 67f8da02714350cc0439fbdce763d00cb08d01301a6aaa3e2655e67935048b43e18968c9a52aa64c702b5e30ae2b2b4946f69e8be4af5889fa414c654d4eb13e
-EBUILD fluidsynth-2.2.2.ebuild 3360 BLAKE2B ad1ee9272aa056d67edec8ff2325c028dbea02a563debff1e6e3cdff7896610316033f544e70e7d13b537b48dddcd70717cd9283a285e8b12b6f8ae0e56038d2 SHA512 9b82983139158b67a8470c7531741e7390711e8cc803a113e5dc0068a7a6e23f824cc215c3e3c57472fd0738e3d6dceee57798ff24aed40cf7e545a800b0cea7
-EBUILD fluidsynth-2.2.3.ebuild 3361 BLAKE2B 4104d026e0c5ad48b59b317d7a85e68f4ae99dd318e325c2c78d1dbe0816a3377f25af6668ef62b7b31bae508c173cefbe712678b92ded6017ec3c2444b7e4c7 SHA512 f32d83da0eb860e80e2e510ddb2e1a0b858a8b4c68642b617dd5e0719db45c10f055cee9fd31edb3c2b5f27db0aba6f1f252d591f2ec8e1d03ff21405400c2e6
+EBUILD fluidsynth-2.2.3.ebuild 3360 BLAKE2B ad1ee9272aa056d67edec8ff2325c028dbea02a563debff1e6e3cdff7896610316033f544e70e7d13b537b48dddcd70717cd9283a285e8b12b6f8ae0e56038d2 SHA512 9b82983139158b67a8470c7531741e7390711e8cc803a113e5dc0068a7a6e23f824cc215c3e3c57472fd0738e3d6dceee57798ff24aed40cf7e545a800b0cea7
 MISC metadata.xml 431 BLAKE2B f739f538274e2e63b1977673b0766a594db59982ab71d6552d1e841434c4040bb7af29d441b1d9e8ce61385dbdb8e522b5591f6826a4c52f085bf004f9fe8426 SHA512 c8085e7652a504610fb841e302ee380de58a67a16a9b874447c00ee20c2d56119254eed954704e8bd4cf8e574980da2dd2f90baa5c99e59cd534e26245af67bb
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.2.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.2.ebuild
deleted file mode 100644
index 57dcd76a5287..000000000000
--- a/media-sound/fluidsynth/fluidsynth-2.2.2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib systemd
-
-DESCRIPTION="Software real-time synthesizer based on the Soundfont 2 specifications"
-HOMEPAGE="https://www.fluidsynth.org"
-SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
-IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	dev-libs/glib:2[${MULTILIB_USEDEP}]
-	alsa? (
-		media-libs/alsa-lib[${MULTILIB_USEDEP}]
-		lash? ( media-sound/lash[${MULTILIB_USEDEP}] )
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	ladspa? (
-		media-libs/ladspa-sdk[${MULTILIB_USEDEP}]
-		media-plugins/cmt-plugins[${MULTILIB_USEDEP}]
-	)
-	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	readline? ( sys-libs/readline:0=[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	sndfile? ( media-libs/libsndfile[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog README.md THANKS TODO doc/fluidsynth-v20-devdoc.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-Denable-alsa=$(usex alsa)
-		-Denable-aufile=ON
-		-Denable-dbus=$(usex dbus)
-		-Denable-debug=$(usex debug)
-		-Denable-dsound=OFF # Windows
-		-Denable-floats=OFF # loat instead of double for DSP samples
-		-Denable-fpe-check=$(usex debug)
-		-Denable-ipv6=$(usex ipv6)
-		-Denable-jack=$(usex jack)
-		-Denable-ladspa=$(usex ladspa)
-		-Denable-libinstpatch=ON # https://github.com/swami/libinstpatch
-		-Denable-midishare=OFF # http://midishare.sourceforge.net/
-		-Denable-network=$(usex network)
-		-Denable-opensles=OFF
-		-Denable-oboe=OFF # requires OpenSLES and/or AAudio
-		-Denable-oss=$(usex oss)
-		-Denable-libsndfile=$(usex sndfile)
-		-Denable-pkgconfig=ON
-		-Denable-portaudio=$(usex portaudio)
-		-Denable-profiling=$(usex debug)
-		-Denable-pulseaudio=$(usex pulseaudio)
-		-Denable-readline=$(usex readline)
-		-Denable-sdl2=$(usex sdl)
-		-Denable-systemd=$(usex systemd)
-		-Denable-threads=$(usex threads)
-		-Denable-trap-on-fpe=$(usex debug)
-		-Denable-ubsan=OFF # compile and link against UBSan (for debugging fluidsynth internals)
-		-Denable-waveout=OFF # Windows
-		-Denable-winmidi=OFF # Windows
-	)
-
-	if use alsa; then
-		mycmakeargs+=( -Denable-lash=$(usex lash) )
-	else
-		mycmakeargs+=( -Denable-lash=OFF )
-	fi
-
-	if use systemd; then
-		mycmakeargs+=( -DFLUID_DAEMON_ENV_FILE="/etc/fluidsynth.conf" )
-	fi
-
-	cmake-multilib_src_configure
-}
-
-install_systemd_files() {
-	if multilib_is_native_abi; then
-		systemd_dounit "${BUILD_DIR}/fluidsynth.service"
-		insinto /etc
-		doins "${BUILD_DIR}/fluidsynth.conf"
-	fi
-}
-
-multilib_src_test() {
-	eninja check
-}
-
-src_install() {
-	cmake-multilib_src_install
-
-	docinto pdf
-	dodoc doc/*.pdf
-
-	if use examples; then
-		docinto examples
-		dodoc doc/examples/*.c
-	fi
-
-	if use systemd; then
-		multilib_foreach_abi install_systemd_files
-
-		elog "When using fluidsynth as a systemd service, make sure"
-		elog "to configure your fluidsynth settings globally in "
-		elog "/etc/fluidsynth.conf or per-user in ~/.config/fluidsynth"
-	fi
-}
diff --git a/media-sound/fluidsynth/fluidsynth-2.2.3.ebuild b/media-sound/fluidsynth/fluidsynth-2.2.3.ebuild
index 55dbaf6c26ea..57dcd76a5287 100644
--- a/media-sound/fluidsynth/fluidsynth-2.2.3.ebuild
+++ b/media-sound/fluidsynth/fluidsynth-2.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/FluidSynth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE="alsa dbus debug examples ipv6 jack ladspa lash network oss portaudio pulseaudio +readline sdl +sndfile systemd threads"
 
 BDEPEND="
diff --git a/media-sound/gmpc/files/gmpc-11.8.16-icons.patch b/media-sound/gmpc/files/gmpc-11.8.16-icons.patch
index ea37effa9f74..ea37effa9f74 100755..100644
--- a/media-sound/gmpc/files/gmpc-11.8.16-icons.patch
+++ b/media-sound/gmpc/files/gmpc-11.8.16-icons.patch
diff --git a/media-sound/mt-daapd/files/mt-daapd.init.2 b/media-sound/mt-daapd/files/mt-daapd.init.2
index c77b7dd2bb5d..c77b7dd2bb5d 100755..100644
--- a/media-sound/mt-daapd/files/mt-daapd.init.2
+++ b/media-sound/mt-daapd/files/mt-daapd.init.2
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index 09f95479e5b9..c222017937f0 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -1,5 +1,5 @@
 DIST pavucontrol-4.0.tar.xz 165216 BLAKE2B 5a556dbd8132d811b7704b377f4a62ad606378e235f9892a7951e1f981917e4196d17e85350ef757a956e6fbc448f0f6cd600b5656e12e2152b71d10b5e64e2a SHA512 eaea303c46ddb36733aed88c8a603907d70e4539c345d8acec23527d3306ee21ae630c0508bdab6ae52cbc2f1eb8fc4b212abda72876dc92e83fba7ceb623be2
 DIST pavucontrol-5.0.tar.xz 194248 BLAKE2B 9e6b9b7d94be51a4ad8b5310e031c4fed0f5299e67c770c9a573c0647edf27345014fb6504892fad29b9b5e79ce43ed312217dbed8e2b31b805f291531062903 SHA512 5673d783c2c819a68b49025c051bedd39f4caba446a479797b06569e24a96acc0924ba680d2416baff8c3211cfc7c94760d503900207fbe7c89c5cb2adaebec1
 EBUILD pavucontrol-4.0.ebuild 858 BLAKE2B e613591d317859e84c8330efa3adaa311b005153044e4e588c9131ded0fac49a0e7ed6212d77a214cc8e9b5419e9ac96359ead9cbf61bde86c7c8c96ef656107 SHA512 3edc52431b727d80603cfc51704d57f4cec1e12fdbeeaa56729d64cdaf0bf2edce65028f9c0d929f7c0cfa64541fd5a706fb97fcc65cdc286835bffad2bdf956
-EBUILD pavucontrol-5.0-r1.ebuild 836 BLAKE2B bfb1bcf5f301e83df97d1942280500e679af41f0916e349913f0690040fd6f150c6707d477c21d04b51dbb751c89d0418dd494a7966e763a27b7fe828b8d10eb SHA512 c835444b0adb89b081aef99e174812b4745c0d5ddcd83e6c69ac7bf599375f420e0ef2a93818d9fcd0bb750bf7b9bae6a074bf0209823a842b0296fc027028c1
+EBUILD pavucontrol-5.0-r1.ebuild 834 BLAKE2B 8d4d834c90a5705525ac51501dc792ac66bd6ecd7bc5fb7292b767915a1b340fbd6db3cb032dfc4b924dfae300296de8b79231b00623858e467bae4398a35804 SHA512 34cafe43d0dd5c813635b96f203f37be9d46982366e0e5d5131bc7c68dfdd22d5af8295425f27924b8c442e1ffa3eebb5f492d550b837eb69a18ce483dad2699
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild b/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
index e34a65496b9e..ad306056748c 100644
--- a/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-5.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/media-sound/peercast/files/peercast.initd b/media-sound/peercast/files/peercast.initd
index 9739b4a31381..9739b4a31381 100755..100644
--- a/media-sound/peercast/files/peercast.initd
+++ b/media-sound/peercast/files/peercast.initd
diff --git a/media-sound/pulseaudio-modules-bt/Manifest b/media-sound/pulseaudio-modules-bt/Manifest
index c90d37e28cc8..7c4dc561dcc9 100644
--- a/media-sound/pulseaudio-modules-bt/Manifest
+++ b/media-sound/pulseaudio-modules-bt/Manifest
@@ -1,4 +1,6 @@
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
+DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
 DIST pulseaudio-modules-bt-1.4.tar.gz 87558 BLAKE2B 98b21d8fced5b88d59e45ca4fa2505d3606616a8a09dd95eb91e30b0d31c8a0ec7e52e4c2fd1b601130f69a997871064849fa0c8847ec0686fb42a2ccd7ac43b SHA512 390b6ad0931b464a546c6624bec38cc5b6da7084e4defe2045f4164b0c910a9dd6d4327466eb0e53fcfbc78c995cf2e3634a75b67ee2a14f38ed18e31b5d2bce
+EBUILD pulseaudio-modules-bt-1.4-r1.ebuild 2170 BLAKE2B b692c89de2f16c30586737d6577531086f3cc6794f638de1dd7251711bfe9188c9d7ab341d9c8e73d3f4edbb517247d6ad6fd19e8996b576b2063d98b5170abf SHA512 7c28546f9eb9d1e4758d403d04eac9c76e7cac9c20c3b1e96891ba0be9cd6f77fbed171861d57315e967ed41b5f40171e99b6def9c5c24fb6df1c79d0216ac51
 EBUILD pulseaudio-modules-bt-1.4.ebuild 2170 BLAKE2B 9e09eaf4e2ba634bb05c48a8db1a813a201589c7dc41a44653de6d630e03571f5d73c6071ff03dc292218b47881eb9cab717ee71ee61ea1941777021e5d58e56 SHA512 af3d8e0303cd3eec86155cf390fdca9d0ea68000bd6c84f91a772be354a630fc20e06cf4c172ac9a702ec2bef5884f532c78cd2c9fb5c1243f3bc40c03628546
 MISC metadata.xml 767 BLAKE2B 7787505018f779a109f761f1ad5d73bc19654491d1a9adb900fb97cb023abcb76753f964d9c39eb9a98924391bd8a08e916c652b21e942dda31c84e8e16dce01 SHA512 2b12af8d5dda44c9cb5f58685f49c65a865f29e9f1506f5d5e5c4cce6629b19e49774e71c7b078c877ed053ee5c6530d219cf9fbe1c2a8c9a4e4628c497d5848
diff --git a/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r1.ebuild b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r1.ebuild
new file mode 100644
index 000000000000..dd8941809a38
--- /dev/null
+++ b/media-sound/pulseaudio-modules-bt/pulseaudio-modules-bt-1.4-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit cmake readme.gentoo-r1
+
+DESCRIPTION="PulseAudio modules for LDAC, aptX, aptX HD, and AAC for Bluetooth"
+HOMEPAGE="https://github.com/EHfive/pulseaudio-modules-bt"
+
+PULSE_VER="15.0"
+SRC_URI="
+	https://github.com/EHfive/pulseaudio-modules-bt/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PULSE_VER}.tar.xz
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="fdk +ffmpeg +ldac +native-headset ofono-headset"
+
+DEPEND="
+	fdk? ( media-libs/fdk-aac:0= )
+	ffmpeg? ( media-video/ffmpeg )
+	media-libs/sbc
+	ldac? ( media-libs/libldac )
+	>=net-wireless/bluez-5
+	>=sys-apps/dbus-1.0.0
+	ofono-headset? ( >=net-misc/ofono-1.13 )
+	>=media-sound/pulseaudio-${PULSE_VER}[-bluetooth]
+"
+# Ordinarily media-libs/libldac should be in DEPEND too, but for now upstream repo is using a ldac submodule instead.
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+DISABLE_AUTOFORMATTING="no"
+DOC_CONTENTS="
+After getting media-sound/pulseaudio merged without its bluetooth
+support (to not collide with this) you may have removed the loading
+of bluetooth modules in default.pa config file, leading to failure
+to use your bluetooth device (see
+https://github.com/EHfive/pulseaudio-modules-bt/issues/33).
+Please ensure you have this lines present in your /etc/pulse/default.pa
+file:
+
+.ifexists module-bluetooth-policy.so
+load-module module-bluetooth-policy
+.endif
+
+.ifexists module-bluetooth-discover.so
+load-module module-bluetooth-discover
+.endif
+"
+
+src_prepare() {
+	cmake_src_prepare
+
+	# pulseaudio headers needed to build
+	rmdir pa/ || die
+	ln -s ../pulseaudio-${PULSE_VER}/ pa || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCODEC_AAC_FDK=$(usex fdk "ON" "OFF")
+		-DCODEC_APTX_FF=$(usex ffmpeg "ON" "OFF")
+		-DCODEC_APTX_HD_FF=$(usex ffmpeg "ON" "OFF")
+		-DCODEC_LDAC=$(usex ldac "ON" "OFF")
+		-DNATIVE_HEADSET=$(usex native-headset "ON" "OFF")
+		-DOFONO_HEADSET=$(usex ofono-headset "ON" "OFF")
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 813887b4b8fd..f8e5eb307807 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -10,6 +10,6 @@ AUX pulseaudio.tmpfiles 36 BLAKE2B 4fe7c88fb35f561b0eb756146db17e37201126b5d7f90
 DIST pulseaudio-13.0.tar.xz 1901768 BLAKE2B 651a80f54525f196bcb036d893fedd4d9f34e10459918281397a45f498c31bff0d0c836f4e64aab5ac2612ffd5a0cab1a41ea710bbee5fd34dfc9ea1236deea9 SHA512 d445b8ccd43029a0ca0e456fc9291a79d3434d6496ead7eb329ab348d5249235e8bde6cf2be68765d8f761452dbe1486fb10c739e40b1e67ed75787bbd24ac0c
 DIST pulseaudio-15.0.tar.xz 1521760 BLAKE2B a6f7b74fdcfe7f2a993eafb9f465946915a24b6801d3077971b9377290d6c70b3f8640a800abd09d5901db96a20349f31b1beedd9da2249f69b591fb8392f489 SHA512 352ef20384c76c631c0faa73b08e2318902a433712e0c086a5ac7a0ae58873c8d4be8f35879bdec71a93b19ae8e2ba073cacac4d56215bcf58375a0cd9d88833
 EBUILD pulseaudio-13.0-r1.ebuild 11453 BLAKE2B 87e52e6b724603770f5d8ed003ae0801c733c97e036445f7b0279fda84323cd4bc7f25e89ed1c71aebb51e16d448dc15f5d8e0b26eac225155fa6d9c9e299295 SHA512 60b553dfa5733975526c39c269f3169e9993128840d49e99fb6c164094e77d72f47046461e0d60351ac2b2225fa5702a18977f92af811f0ff2340854f9630d23
-EBUILD pulseaudio-15.0-r1.ebuild 11135 BLAKE2B 3bafae7e0d4591562d78e0f61a15bdd4d64816f493b0a3d91dc90ed0ad456a5fb5c0e38272dbfc46bf46c0b1fce5e849104c3bd20968a9a4a70103ce58131a39 SHA512 e40a9486263e8617ff768f18d1ed137b5427c33de5fa4a29dc696b8dbba204ee60bcdd653a2caec4a8e8b909659131aab4d612ac9d808f19475ce345655fe405
+EBUILD pulseaudio-15.0-r1.ebuild 11131 BLAKE2B 97acbff6f752aa03f0fae1980603d552d0198d2e4dbef65cae0126d2ca5206bbcc8c2de3f11e853cc623e722f1b74b91ecd1a704204919128d7adc41b4cc2ec0 SHA512 438a0f5937ccc0749f2a902ac62ba34e510607cc43468fa99149da081e03a15e218a70a9795992ba75a5b017aa82c0940074de30c4545444c76487765eaf64f0
 EBUILD pulseaudio-15.0-r100.ebuild 1105 BLAKE2B a57a7c879c6a180c9a6495a5acbbfc2bad20173a6c971737f673835f57d730b5808bad5360f3b90af6629c92d968a4b38b181fc148ee9dbccaf2a60da163032e SHA512 d40c2271be2b359ffe8738a3f49d42e86acddec899ac93695bc66453920e2b118a001404ae96e49baab3184edb6c20db90b4a9674b774b4e093444e3fd751ed1
 MISC metadata.xml 3400 BLAKE2B 5e80f40f078e30e51975512fc465417c647106cdd5076c41f6bdd9b2a8757759a1e72391a2f8a90666c60b7ffa968e5b28b2b9aeae6906ef8837a7c959ace18a SHA512 6b81f6a80d6aaf72f56d00256e2715cd53758fc6adbd0a7a5b2836d9dc30ce61fd8a591e52ebb7e33288d6a87b172f75ae610dc9b13d4c28101eea5c2d2eb073
diff --git a/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild b/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild
index 7781c2a71890..14c9658fb5b7 100644
--- a/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-15.0-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}"
 else
 	SRC_URI="https://freedesktop.org/software/${PN}/releases/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 # libpulse-simple and libpulse link to libpulse-core; this is daemon's
diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 668c4acd5b43..68d95bc13fb2 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -2,5 +2,5 @@ AUX sonic-visualiser-4.3-meson.build.patch 4428 BLAKE2B 30f2fb4f69f633de44e7f50f
 DIST sonic-visualiser-4.3.tar.gz 6467269 BLAKE2B 4c9bbfc751f94dfc0e8c93a8ba791b0a4bf949fe1f528a081da583ad720dcb25b3e6f84e31104f11ab5003b338b62a1ca1a9572bc9ec820d0a4269d25cbe0e04 SHA512 cbe0edee9f346545222e05156e4536710db932d6ec335687e91f2f4b24582e7f47703a3ecade87574ead8fa78dca821fd9ff2eb0d6e44c2b9c33c8d053fd738d
 DIST sonic-visualiser-4.4.tar.gz 6475000 BLAKE2B 37797b5fdcc397530a8b36bb1727bc56be703738505a117c853616eace41344b9526f98602ec872f4baa157cb1e92044bf7e3ef9079fa24b456453542bcf5763 SHA512 a76a6e5fc2381a3e7c89762687176fa60a8b731951438094af0ecd50103f73104a4366eacf731015573f8d5e5f436cf497a3e0e041363d5158d4f546bdd1f7b0
 EBUILD sonic-visualiser-4.3-r1.ebuild 1638 BLAKE2B 24fd029abfaa5de80f6975679db06cd0e3f6b8de17ab7b209bf964f4f2eebee5627bfb44768c0fd676fbd4d8d5009167c2f7fddeabc63c4aca6a98e08a30f263 SHA512 e7ae7fae399d1ad994ae92cd38a6dbaf7e628e6c12a466e448c8536f68902239844bdd6d4313f1028e31feef01abba4021610fc5c2153d83f5541d782e854a42
-EBUILD sonic-visualiser-4.4.ebuild 1855 BLAKE2B 7aa499545f4d0ba092cdde4821e2afdb189f61f12c8499e4ed25a9835941a77f4475ae1d64da6868b6c9827ccb243f64b9ba1a943d22f09be008da08d80fefde SHA512 064aa5f61c4ded7ba9402011eb741da97442ea804a8fe8ba9f9193489c5b69a5e08e7314e84add7dcc0b8409db45102a414191a812c25b2ccb3ad5530b5c1613
+EBUILD sonic-visualiser-4.4.ebuild 1854 BLAKE2B 93d4d82f16b81db8e5ed833f2356ef4036f346356d4af41a912c5d8a827efb1e3a7568c855df263129961c1d265bcee4ce1b8071b7f60efd7532fa0b5d636ae0 SHA512 043bba4edf2a8b88cbcff696fe8e3309e5beffe317eedd5cb53c757342404cbfec1b3f8012f33bf96adb2508c4291e82747069a07d87184706a0e7e98f443d88
 MISC metadata.xml 457 BLAKE2B fee1474516a395ba251de868c533ab4f88ac346a169a71e1513593f0ffa99f3365f0a7d87c24c31e73cf4f06d500b8bafe83f02230e6f24ebf8c0a23b43cd662 SHA512 58c25ca412527ef47411204f5ce579c3731c5b19922c43c13f069dae0c498e63879cc209e1f93e3487a2c32972df8ac45af690b4d470bfea9e497a3b9699c3a7
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.4.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.4.ebuild
index 8d1d65fccee0..cd16b31dbb51 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.4.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test"
 
 BDEPEND="
diff --git a/media-sound/sound-juicer/Manifest b/media-sound/sound-juicer/Manifest
index 704865aa5e8e..f373b5acdcbb 100644
--- a/media-sound/sound-juicer/Manifest
+++ b/media-sound/sound-juicer/Manifest
@@ -1,3 +1,3 @@
 DIST sound-juicer-3.38.0.tar.xz 1775916 BLAKE2B d811f91256197cb6575f491e3c692a60ccfaa78ae28d5a489c27e835dec07a16c19b5bae6cae774e6efe3bc7ae10cffc3c03f652f9e60263325167cb1b348743 SHA512 d76d38839c1f5a997a900d0ba4f43d59e38d9a1d547f51bdf15d1aa9ee0a2b24210a876bfccb7b221feb1adab5882ac1d884da6131a0f259dd985326222eff9f
-EBUILD sound-juicer-3.38.0.ebuild 1257 BLAKE2B 84f632ea04e71fa744bfd955e19cf9f6e57a001877997f3da7525de02d7dd621c33f17b6c3132b53534d8ccaa6b713c059b5d2b52c15a2a04b27593afbe5fdcd SHA512 6e993870e8593c69fc78bff94011e02e69770d209f2bd82f9ecc1a22e22ee682a270e61ebb357af593f3918f2cd997cedd229b3b588beadd04421e00dfd8e2df
+EBUILD sound-juicer-3.38.0.ebuild 1256 BLAKE2B c45e8779f2ce3edf34d6627344afc96f7664ccdf8dc44628d09f46c8cc386ff4f949b882d5c8f86f02802c440d5608c73c818a272384b2d8741c837fb566ec84 SHA512 294cd9c42b92348ee15c332af4f5196e4d83b4292d5e6cc9e4f7f1cc6b964cd869286d669c1cf6f22786ddfef8fc6983a0b17694b3ab40f1c2bca3a16fb39540
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild b/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
index 352b520fdb30..ead4e36ce1ee 100644
--- a/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
+++ b/media-sound/sound-juicer/sound-juicer-3.38.0.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/SoundJuicer"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86"
 IUSE="flac test vorbis"
 RESTRICT="!test? ( test )"
 
diff --git a/media-sound/sox/Manifest b/media-sound/sox/Manifest
index 3be0d0958fc5..7cbaeb073e03 100644
--- a/media-sound/sox/Manifest
+++ b/media-sound/sox/Manifest
@@ -1,5 +1,3 @@
-DIST sox-14.4.2_p20200803.zip 1089835 BLAKE2B fa53d8c9f14620675bf534090bf6c69ec256bb977aa1b3c01b2d95ba8e685eb4f9d479872f303b2954aa1b063c095bf3b90e5b746fd8d7d66e35476e5218fa6b SHA512 8c485a53b9ecce9ecf759d7bbf8d95e568a89505bec7d1258afded4c7ad0f28c624b637a188ab87b64dee720db59b8de20c347805910f0401f00550832e16392
 DIST sox-14.4.2_p20210509.zip 942551 BLAKE2B 2ddd229faacb9190fe18052b1c02da40d4c3f24fc73dd08b28ac99bef267cb05f8bcbf64e0c397c391b3be2467667783ed94f6c60798af069567e1c237ec9ccd SHA512 4868f9b77141b7e2caf2571ceb68a48bd744732e72f63ed787f8e0b9fe39b77de4e998b32d99c2500e10b017a1fd1a3379f4f9f8b67db6093b85d02cb3447934
-EBUILD sox-14.4.2_p20200803-r2.ebuild 2833 BLAKE2B 321acd4a7c6587b310c85ebcaaffa3ea60aed488e4b3ef95fc082275e91e2170212d762a7f9de55c6e3d9050e18c4c56af3b560385f5decea16dafb75c79f58e SHA512 59e0d8bf59301124f02c2dc859c8debc4e50c62bb7055826380bdb6f2c57df51142e18af43bcf27bc07583370c4e50a75b82f3b1bdd51423c564a47ea631638d
-EBUILD sox-14.4.2_p20210509.ebuild 2875 BLAKE2B ae46bd3d5e96c0f61c6b9b254308442015bd2cdd5e767efabb103af1bfdcf5012eaed532ec78635bbc56bd26d835b4122623276d199c1fdc8bc50b3c1705249f SHA512 97b27b4dd3bc79f91d56387934df3a65b396773bf5a3d2c8ffcfa6987066fbcd1d56ecdcd47ae3b533be1fa4f38e5a097558911eb32bdf7744a76d7e015a53f3
+EBUILD sox-14.4.2_p20210509.ebuild 2874 BLAKE2B 445724cd1a56678852890786adf28c31cca4ee01181fb83ef063f7cfa2f890564ce434853a6fddad86a1448235ec3535230206b5396602a5c14f75331ee2be8f SHA512 e20a9b184ea185a86c0e548de1d7465205d3e4ca0db464a7514189ebf4c3ce624d6747e10d50e8a3532730e5ff0251d28e5216c64a34554b7cbb2174e5613c77
 MISC metadata.xml 709 BLAKE2B 29d863a59fa534ccdaf3ccfe73ec03ff931055b7537ce3ef1111a596c8178f944910cd3c917e25f778a1e297d5fd0023833d0a8556adb6cd187fbd59e2ff5703 SHA512 a40c70b421b78a8bf2b7044b1b512600120c0352bf61755ba7d48af621fcc33c82ef3c7eff3df10c913add4b7250f7fb7461ea7171b21a07f306794d7c1cbdbf
diff --git a/media-sound/sox/sox-14.4.2_p20200803-r2.ebuild b/media-sound/sox/sox-14.4.2_p20200803-r2.ebuild
deleted file mode 100644
index c8ec11bac503..000000000000
--- a/media-sound/sox/sox-14.4.2_p20200803-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-# We take a snapshot because of the huge number of security
-# and other fixes since the release of 14.4.2.
-# Recommend mirroring the snapshot; unclear if they are stable URIs.
-COMMIT="50857c46c03a85c72826e819f5e815aad4a4633d"
-MY_P="sox-code-${COMMIT}"
-
-DESCRIPTION="The swiss army knife of sound processing programs"
-HOMEPAGE="http://sox.sourceforge.net"
-# Source: https://sourceforge.net/code-snapshots/git/s/so/sox/code.git/${MY_P}.zip
-SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}.zip -> ${P}.zip"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="alsa amr ao debug encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile static-libs twolame wavpack"
-
-BDEPEND="
-	app-arch/unzip
-	virtual/pkgconfig
-"
-RDEPEND="
-	dev-libs/libltdl:0=
-	>=media-sound/gsm-1.0.12-r1
-	sys-apps/file
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	ao? ( media-libs/libao:= )
-	encode? ( >=media-sound/lame-3.98.4 )
-	flac? ( >=media-libs/flac-1.1.3 )
-	id3tag? ( media-libs/libid3tag:= )
-	ladspa? ( media-libs/ladspa-sdk )
-	mad? ( media-libs/libmad )
-	ogg? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	opus? (
-		media-libs/opus
-		media-libs/opusfile
-	)
-	png? (
-		media-libs/libpng:0=
-		sys-libs/zlib
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	sndfile? ( >=media-libs/libsndfile-1.0.11 )
-	twolame? ( media-sound/twolame )
-	wavpack? ( media-sound/wavpack )"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS )
-
-src_prepare() {
-	default
-
-	# bug #386027
-	sed -i -e 's:CFLAGS="-g":CFLAGS="$CFLAGS -g":' configure.ac || die
-
-	# bug #712630
-	if use elibc_musl ; then
-		ewarn "Applying musl workaround for bug #712630."
-		ewarn "File-type detection with pipes may be missing."
-		sed -i '/error FIX NEEDED HERE/d' src/formats.c || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with alsa) \
-		$(use_with amr amrnb) \
-		$(use_with amr amrwb) \
-		$(use_with ao) \
-		$(use_enable debug) \
-		$(use_with encode lame) \
-		$(use_with flac) \
-		$(use_with id3tag) \
-		$(use_with ladspa) \
-		$(use_with mad) \
-		$(use_enable openmp) \
-		$(use_with ogg oggvorbis) \
-		$(use_with oss) \
-		$(use_with opus) \
-		$(use_with png) \
-		$(use_with pulseaudio) \
-		$(use_with sndfile) \
-		$(use_enable static-libs static) \
-		$(use_with twolame) \
-		$(use_with wavpack) \
-		--with-distro="Gentoo"
-}
-
-src_install() {
-	default
-	# libltdl is used for loading plugins, keeping libtool files with empty
-	# dependency_libs what otherwise would be -exec rm -f {} +
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
diff --git a/media-sound/sox/sox-14.4.2_p20210509.ebuild b/media-sound/sox/sox-14.4.2_p20210509.ebuild
index 7575b5867ffc..bf31ee4ef9a9 100644
--- a/media-sound/sox/sox-14.4.2_p20210509.ebuild
+++ b/media-sound/sox/sox-14.4.2_p20210509.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="alsa amr ao encode flac id3tag ladspa mad ogg openmp oss opus png pulseaudio sndfile sndio static-libs twolame wavpack"
 
 BDEPEND="
diff --git a/media-sound/terminatorx/Manifest b/media-sound/terminatorx/Manifest
index b52b62c1c49c..381427de3f03 100644
--- a/media-sound/terminatorx/Manifest
+++ b/media-sound/terminatorx/Manifest
@@ -1,8 +1,4 @@
-AUX terminatorx-4.0.1-desktop-QA.patch 268 BLAKE2B 0f99d7317802773c3afc3c0e54c7744f79df333b65480123d929ab7a8bf5cebbe2772db241fec1570a2fced0a0e3ad71f2f7602e5f9c12c2faf8165edb5e8547 SHA512 3aaed47fdecceceee188f37a6af2a0fe35c9605fec5a581f48d17c4cb237512d0abc38e5da59b42d8b22bd16cf03947291746460f0bd6c4991f36ead81de1010
-AUX terminatorx-4.0.1-gtkcombotext.patch 437 BLAKE2B 582d82d04bd443188325f127a9766f6b35d6547339a839bbc7460f800bcf0721e30c6c77e42cfcfb5a91c683a11c90fb967849e8b7577e68dc11448b1a1f9873 SHA512 d801d60deb2d18444979791246c9eac7b41f2e7f8ecf5fa25a9b4d9294b0c0bd5dc107ac63aab04a85962efdea316f43df9736ef6009a174f1e8d6a7eb53c1c3
 AUX terminatorx-4.1.0-metadata-dir.patch 438 BLAKE2B 848b76d7c86b049964cbdf0b3070491f78430c8b613f9860824ea550a32c9a4309da656d6c970ebda52819cbea21cc3dad75666f02b8f4f4cbf5c5b1d223a35b SHA512 263bda47b9376b5de8c056999be92655658355ef2c0557ecf84fa7f84542c78580071cb04e46907df028bd4badf72547084ffee1bea31809c0e9c294d8f00e05
-DIST terminatorX-4.0.1.tar.bz2 1832692 BLAKE2B 61eeb6362cdf56cb73df3bfbff65cf3699a0ef686d77894b87feab5f25f927267bc28573c3ee41981ded3b452b1d37c035260ffbe0fdcf6d0b0c0319c61a6137 SHA512 06128633e128f2158367dcde0e913dafc68d62644e7a5182a2391829dadcb9c46430d0cac16cb17113939623266f32cb4624a8548a51b8c01bdfa2860a6c0093
 DIST terminatorX-4.1.0.tar.bz2 1832295 BLAKE2B a328d05bb0c3c88719eb711dcf3f50eac08cd140e3225f42633744b39ce49f3e074263997ec21b2cc245740fa3f672a19b89d929fad1d0131981988fc80f37fc SHA512 2dc87bdbb4f4d24e10f0c8fac99b4ccecac6036c6dc950184cbdd1d05fe0a4c723ea1b04c49837fb0aa8f149ca9d2fb5d2c42f5109031184980a14fe549312fc
-EBUILD terminatorx-4.0.1-r2.ebuild 1411 BLAKE2B c226688c9595acfd1c65058abf1ce6761fd02e49026710c59b42625c8caea0179228bfddb9f1867113436844d218ca6fac347726e800bf5cbfc20c78aa06bf2c SHA512 f13956c85e3f4cfa624139a82a322dd0ac0e621d42a668429a732dd17a5c32bfe363b215810769d026a7b16e979e8ce4b4267e0b734149112ea5faf2599ed6a7
-EBUILD terminatorx-4.1.0.ebuild 1544 BLAKE2B 2a3cf8bff673bfceaa8524f9cd7172a0ddaf1db08b5b8c381a33fedf5b49fc57556a2e08cb5d58ce974fa3364c9fb8df1caba8080c06f7c472c37f631b3aa921 SHA512 30dda39f590d1cd1df2d850a2971e7f1b0fe783ce39e6a2812dc5a4371e16f1fddfd74b0df9ecc45a50e24ebd71226cb12bc364c56ca6cf80f7078abd2f2a638
+EBUILD terminatorx-4.1.0.ebuild 1542 BLAKE2B 7e7adf5a9aba6a1859099c3b0a47c6b9b8f5d11a5187b37e1e03f3740298055b257cedbefaffb50731090fd765c7dff99840d7107928ffe674f317225f09b25a SHA512 67de59ffdb9c6bce6011d9b9a31dc73e1eb5fe0b1f66504c3a9179cda2b5fd8b5a0ccf0ae47f64e42645c80bf61b53de4406bd792efa87d54c546f7cc54b1b37
 MISC metadata.xml 256 BLAKE2B 211ca90d8f704be5ca8a1994f0e8f1adbe1fd4937a10a301ced0b9be171dfdabb223661d168535cd7f5edfe0c8edca4620945e13dc3c43b5832ac183913188f0 SHA512 fde3b658512fa6742886d7dd84efc906331b43f5b0f8fdca353fe2280653381716d7143473c9237b9fe58b9df5889b38b008da34f6ce4b64336f38642d78e3dd
diff --git a/media-sound/terminatorx/files/terminatorx-4.0.1-desktop-QA.patch b/media-sound/terminatorx/files/terminatorx-4.0.1-desktop-QA.patch
deleted file mode 100644
index 970b72f4de81..000000000000
--- a/media-sound/terminatorx/files/terminatorx-4.0.1-desktop-QA.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/terminatorX.desktop
-+++ b/terminatorX.desktop
-@@ -8,5 +8,5 @@ Comment=Versatile DJ scratching and mixing application.
- Terminal=false
- Type=Application
- Icon=terminatorX
--Categories=Application;AudioVideo;
-+Categories=AudioVideo;
- StartupNotify=true
--- 
-2.26.2
-
diff --git a/media-sound/terminatorx/files/terminatorx-4.0.1-gtkcombotext.patch b/media-sound/terminatorx/files/terminatorx-4.0.1-gtkcombotext.patch
deleted file mode 100644
index 566dfecc210b..000000000000
--- a/media-sound/terminatorx/files/terminatorx-4.0.1-gtkcombotext.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix build failure on kfreebsd
-Author: Sebastian Ramacher <sramacher@debian.org>
-Bug-Debian: https://bugs.debian.org/741623
-Forwarded: yes
-Last-Update: 2014-04-25
-
---- a/src/tX_dialog.cc
-+++ b/src/tX_dialog.cc
-@@ -244,7 +244,7 @@ void append_alsa_device_list(GtkComboBox
- 	}
- }
- #else
--void append_alsa_device_list(GtkComboBoxText *combo) {
-+void append_alsa_device_list(GtkComboBoxText *combo, char* current) {
- }
- #endif
- 
diff --git a/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild b/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild
deleted file mode 100644
index 5940c58dd66f..000000000000
--- a/media-sound/terminatorx/terminatorx-4.0.1-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2
-
-MY_P=${P/terminatorx/terminatorX}
-
-DESCRIPTION="Realtime audio synthesizer allowing you to 'scratch' on sampled audio data"
-HOMEPAGE="http://www.terminatorx.org/"
-SRC_URI="http://www.terminatorx.org/dist/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-# Making X optional fails when disabled: https://bugs.gentoo.org/636832
-IUSE="alsa debug mad pulseaudio vorbis sox"
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib )
-	mad? ( media-sound/madplay )
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
-	sox? ( media-sound/sox
-		media-sound/mpg123 )
-	x11-libs/gtk+:3
-	>=dev-libs/glib-2.2:2
-
-	x11-libs/libXi
-	x11-libs/libXxf86dga
-
-	dev-libs/libxml2:2
-	media-libs/audiofile:=
-	media-libs/ladspa-sdk
-	media-libs/liblrdf
-	media-plugins/cmt-plugins
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-	app-text/gnome-doc-utils
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# Fails to build with USE="X vorbis -alsa -debug -mad -pulseaudio
-	# -sox", bug #604288
-	"${FILESDIR}"/${P}-gtkcombotext.patch
-	# 740502
-	"${FILESDIR}"/${P}-desktop-QA.patch
-)
-
-src_configure() {
-	gnome2_src_configure \
-		--enable-x11 \
-		$(use_enable alsa) \
-		$(use_enable debug) \
-		$(use_enable mad) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable vorbis) \
-		$(use_enable sox)
-}
diff --git a/media-sound/terminatorx/terminatorx-4.1.0.ebuild b/media-sound/terminatorx/terminatorx-4.1.0.ebuild
index c7a57d22bb33..c34a201fbaec 100644
--- a/media-sound/terminatorx/terminatorx-4.1.0.ebuild
+++ b/media-sound/terminatorx/terminatorx-4.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 # Making X optional fails when disabled: https://bugs.gentoo.org/636832
 IUSE="alsa debug jack mad pulseaudio vorbis sox"