gentoo auto-resync : 30:07:2022 - 03:08:54

35 files changed, 217 insertions, 361 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 33404f6aa7db..af7f157c1b52 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/baudline/Manifest b/media-sound/baudline/Manifest
index 1bbbd8f1cde7..a253268bcc62 100644
--- a/media-sound/baudline/Manifest
+++ b/media-sound/baudline/Manifest
@@ -1,4 +1,4 @@
 DIST baudline_1.08_linux_i686.tar.gz 1945014 BLAKE2B 01dfd3c03a7d5dab3f3d65d660239ec51ec157f9711aaebfa6a155a46ec353c5d2c6676bc88f4f4642bbdabc5adf89ad174b5fb7d229933962065b0c44383055 SHA512 eb53b0508316f156b4d8ee86b9280657260039e41b7ab946796d9780af2b105c7839fd2d7bfcee032a96e27a8bc87acc7ce564b8eeccbaf348af96b2f5828e16
 DIST baudline_1.08_linux_x86_64.tar.gz 2270546 BLAKE2B 722318b4d3a1e244c8e6c57555a29b9b1305c26a3f7711cd13deef3e2f57ed78bdd624947a9db1c10cda2f807c0248e14cd1a0fc28da0a7a0511e41d75fb84cc SHA512 d0cb5dc0e6cc3fd79dbc2a37e7a1b9bbb050c953d1d2893f24f87a45f301fbc69ba4ba3b2f32903caec391ed0ca6913d2c320ca82039bb41185b21e100a754c4
-EBUILD baudline-1.08-r1.ebuild 1573 BLAKE2B 000d579ede1a6540db37830afe8c23d6dcda68d811bf1b2cf7a0dd5e78bfac08d0d812bc1b7ba54b79d46a02e8c3325c9c2324a994f495f036752c300ea01a9a SHA512 fb5f87b143eec8bfb5a94a748e30d0d98786b2a9db6566f114dc6edc0d86c51472e8b779ab3479b4dd13743c6af045f4e1ba203487696956835b2b356773cc7a
+EBUILD baudline-1.08-r2.ebuild 1593 BLAKE2B 0df5aa959c19eb232c4834786fb9edb6ecc326881ddb1389cc1dec322d75e4222044da6a28e2d068429f04d1a8e866ebe05d80e59cbd235482933ed4c52a2e3c SHA512 4178fceea5fe879813e1e5a58f563dc5523429affc52ceabe926c84c355b803c94998ee442f41dcc02cb8c3d6cea59429645beee32c2bc53e8d40753d87d92b6
 MISC metadata.xml 784 BLAKE2B 86498481988ca19326620eee3726c8b95c538337659a4f137c21c0a4603fa98864b4c03d342f33c009f7659ff1e8ea5ccaf776fde3f6f343f6d537ea140d273f SHA512 9d8bee3fa27b88fc243af752f7145ba0fa12673a30a0b59be11fa679fa1a912538e20c5d131beda9b75db93536e3b20aa97984a59dd3ffd471409f951169ec7e
diff --git a/media-sound/baudline/baudline-1.08-r1.ebuild b/media-sound/baudline/baudline-1.08-r2.ebuild
index 6c4a606f37ee..b1acd9cd0f9e 100644
--- a/media-sound/baudline/baudline-1.08-r1.ebuild
+++ b/media-sound/baudline/baudline-1.08-r2.ebuild
@@ -1,31 +1,34 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit desktop xdg
 
 DESCRIPTION="A time-frequency browser designed for visualization of spectral domains"
 HOMEPAGE="https://www.baudline.com/"
-SRC_URI="amd64? ( https://www.baudline.com/${PN}_${PV}_linux_x86_64.tar.gz )
+SRC_URI="
+	amd64? ( https://www.baudline.com/${PN}_${PV}_linux_x86_64.tar.gz )
 	x86? ( https://www.baudline.com/${PN}_${PV}_linux_i686.tar.gz )"
 
 LICENSE="baudline"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
 IUSE="jack"
-
 RESTRICT="mirror bindist"
-QA_PREBUILT="opt/baudline/baudline*"
 
-RDEPEND="media-fonts/font-adobe-75dpi
+RDEPEND="
+	media-fonts/font-adobe-75dpi
 	media-fonts/font-misc-misc
+	sys-libs/glibc
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXmu
 	x11-libs/libXt
 	x11-libs/libXxf86vm"
 
+QA_PREBUILT="opt/baudline/baudline*"
+
 src_unpack() {
 	default
 	# strip arch names from S
diff --git a/media-sound/combine_wave/Manifest b/media-sound/combine_wave/Manifest
index 3fa02af51e97..e102b93aa21e 100644
--- a/media-sound/combine_wave/Manifest
+++ b/media-sound/combine_wave/Manifest
@@ -1,4 +1,6 @@
+AUX combine_wave-0.3.1-makefile.patch 449 BLAKE2B 93a6bcc3429e9a239a438f11e4ca2fd136fcebfb93b4cbef0661d37c09e34b9d92cb4789f6a0f8863d7e60f6f97a211c2c24e376b5dd087080ac0e1974d54916 SHA512 de8aefea0b4866683a97bb81cb3456640a1dcc46c4f9a7268ea45addcdf2dc78e6cf05c3d6712840cfe6fae141285693a7b2c6e8e9c7f678b6cd5d19453884e7
+AUX combine_wave-0.3.1-missing-includes.patch 268 BLAKE2B ef9aa01211f675d5c3fc0bd9386668f6b3f278597076745e1b1c3b990409608c4065bc9e38fdbeafae07292c26cf18b4d471c7e29bdf00d5221ad90b8905200c SHA512 e8aa66b7cea2175aac68995f12f4dbd5edeb43484044133298a1a4aae0ad28712addfcfa53a66c5f2f5e95294785d55b463ebd0aaccddba71b8277626cc9565e
 AUX combine_wave-0.3.1-overflow.patch 765 BLAKE2B 3b4be839e5292b059345535a67ea4702c62aee72ac04e44bce52d8321f52e2b46efc7a8161b8fc5dc246f441dff3a6d6631246aac0ccfaf4dd6d2eb212fa7f22 SHA512 0c19f3f7344b586fa546b1c32fc7e4469ba84fd415e24ddbfdf5085739c1bc6f3b2e518e7715da52a647e30961219eda310cc6d5505f803486491996f3e71887
 DIST combine_wave-0.3.1.tgz 14875 BLAKE2B 8884cbb07bf2f713c9f308420e7c48c366575ca5fc390d0e067760eba3f6bdd197fe1b12bf5fe5b0100f376146b85d42fc6ac42ad01e48a2b9e30ffc85f136c0 SHA512 81c97074b86945d6dc7299a79e38483ce50693f25b450e9bbdfc60ea1812e9a767e726805f0cd638e27321146cd72a9ed4df77cae5522b1777d0980c3eaaa3a8
-EBUILD combine_wave-0.3.1-r1.ebuild 731 BLAKE2B 1636b0ad274c8bf049819ce1e6696f22e0da7da05fa30dcba8c9d0ceace00e6cdd9a8a6399f829197a1b617b905ab21b0d87e937ddc3915b4ddfd9704f7b0665 SHA512 d5a17daeb8193f544708a8259a1743d13b71577f6ab6847e49c1c3eaf211dcfffc051822ea1a0eb140c21daf44cb9b2061a2a1e0d95ffa97c73fc2b2bf4b78db
+EBUILD combine_wave-0.3.1-r2.ebuild 617 BLAKE2B 5c897d1b73237699b122fa66593c5e51d9f1c719d9544681a314d0a23f30096102aa9c5e1331c9b05234856a5005ddf40cdf4315fa71a6574d6e01c71b690548 SHA512 3ef8b8aebc810a332f13f0bd1f6bc565b6eedfeedf9b92f611c458ef97c2aafd40dceb141746465023a5be9eb9f5c2ef7b2ac46c6db7f6d85f78e03b1d981963
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild b/media-sound/combine_wave/combine_wave-0.3.1-r2.ebuild
index 6974e43cf260..ff73a2b87cd2 100644
--- a/media-sound/combine_wave/combine_wave-0.3.1-r1.ebuild
+++ b/media-sound/combine_wave/combine_wave-0.3.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -12,18 +12,12 @@ SRC_URI="http://panteltje.com/panteltje/dvd/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DOCS=( CHANGES README combine_wave.man )
-
-PATCHES=( "${FILESDIR}/${P}-overflow.patch" )
-
-src_prepare() {
-	default
-	# fix makefile
-	sed -i -e "s:gcc:\$(CC):g" -e "s:= -O2:+=:g" \
-		-e "s:\( -o \): \$(LDFLAGS)\1:g" Makefile || die "sed Makefile failed"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-overflow.patch
+	"${FILESDIR}"/${P}-missing-includes.patch
+)
 
 src_configure() {
 	tc-export CC
@@ -31,5 +25,7 @@ src_configure() {
 
 src_install() {
 	dobin combine_wave
+
 	einstalldocs
+	dodoc combine_wave.man
 }
diff --git a/media-sound/combine_wave/files/combine_wave-0.3.1-makefile.patch b/media-sound/combine_wave/files/combine_wave-0.3.1-makefile.patch
new file mode 100644
index 000000000000..591d56ad1867
--- /dev/null
+++ b/media-sound/combine_wave/files/combine_wave-0.3.1-makefile.patch
@@ -0,0 +1,22 @@
+--- a/Makefile
++++ b/Makefile
+@@ -3,16 +3,13 @@
+ #CC  = /usr/local/bin/g++
+ #CC  = /usr/bin/g++
+ 
+-CFLAGS = -O2 -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+-
+-.c.o:
+-	gcc $(CFLAGS) -c $<
++CFLAGS += -Wall
++CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ 
+ OBJECT =\
+ combine_wave.o
+ 
+-a.out : $(OBJECT)
+-	gcc -o combine_wave  $(OBJECT)
++all: combine_wave
+ 		
+ # DEPENDENCIES
+ combine_wave.o : combine_wave.c combine_wave.h wave_header.h
diff --git a/media-sound/combine_wave/files/combine_wave-0.3.1-missing-includes.patch b/media-sound/combine_wave/files/combine_wave-0.3.1-missing-includes.patch
new file mode 100644
index 000000000000..3d6a3c938ba1
--- /dev/null
+++ b/media-sound/combine_wave/files/combine_wave-0.3.1-missing-includes.patch
@@ -0,0 +1,14 @@
+--- a/combine_wave.h
++++ b/combine_wave.h
+@@ -12,9 +12,10 @@
+ #include <float.h>
+ #include <math.h>
+ #include <linux/soundcard.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include "stdint.h"
+ #include <sys/ioctl.h>
++#include <sys/select.h>
+ #include <string.h> 
+ 
+ 
diff --git a/media-sound/easytag/Manifest b/media-sound/easytag/Manifest
index 0f24512aef6b..3d38d8288270 100644
--- a/media-sound/easytag/Manifest
+++ b/media-sound/easytag/Manifest
@@ -1,4 +1,4 @@
 AUX easytag-2.4.3-ogg-corruption.patch 7233 BLAKE2B e0123a9d195a85d80136fc831cdfe1a870346a2f0cf0213a53e0ef51bc82e72db390898df0c8d02ba8865c3571e5d2f8b8faafe0b3750b6cd123e3fe065cc65f SHA512 f25cedb0f09edf987317f395133195f115549503a6c02edfce7e49f1f24d2e5d01920c9b48f41addb2b632d68bb329cbdefc25aec4e56239daa4f7980d33bd10
 DIST easytag-2.4.3.tar.xz 1381084 BLAKE2B 22358cd15e53a51f2786ad2a62e5d9eea78e9c8b8127d2820dbd5657d734a9a0e694a6d180ad730b87c8c236e3d3396c9ea4c651df4080d0f4b4dc0e212b945c SHA512 ef596341772ce7da3b7feec2c82a20ca29d25c2496074c469be5b8dd75d2b2718e689310e0d61de53bc29a4f54ce9f853a336e1a35076046fd107afd28699087
-EBUILD easytag-2.4.3-r2.ebuild 1794 BLAKE2B 90edb37db9eeae374e6a471ee17ecad9ffef3dd4ee233f4c31a536e901ff754cd3c45fbf428793ba36774f287f7d86b8e02317d0f46d7f28149f1e20ac777394 SHA512 fcca520f2fece17cc8dc134f0cf9730812756c578a5c1f3ccf68d504fa8683167a7828b2adf12d6b41e20adbf17d82d58f8bd84430232b2d6c57f75e489a54c2
+EBUILD easytag-2.4.3-r3.ebuild 1780 BLAKE2B 67903f4f3eefb1747fd99e38d7789ae01c3a75ad41b40e942d8cba618d060f2811c45ddf6fb34846ea7ba8692be778ddf96adbb1fe518a8105f9f4681d28e52b SHA512 e1dadb2f8570265459799b0fce36db6d2d930e2af72ebf15ed2f8a2096fadf40e8734f2d8356b62015a03007906c0ec496c2947e1370e9fce94eb4a74edf69bc
 MISC metadata.xml 515 BLAKE2B 60cb9bf9c733779b208136aaabcbe19173ae5c0615d1d6b5266a5aabe7f90d21e0e7b1191eb1709c3350d312da6d5d1635f40c6b4e2572d5a57fb33d5144461d SHA512 0ff15896c4394587bff993f1a77d1b72b413bcc03f788d070b000097a7527cdb30fc8637513a457c32e592caa0bb1076043c099b2ae5172360274ca063cd5530
diff --git a/media-sound/easytag/easytag-2.4.3-r2.ebuild b/media-sound/easytag/easytag-2.4.3-r3.ebuild
index bfadc0488b19..98b5ca0d6565 100644
--- a/media-sound/easytag/easytag-2.4.3-r2.ebuild
+++ b/media-sound/easytag/easytag-2.4.3-r3.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-GNOME2_LA_PUNT="yes"
 inherit gnome2
 
 DESCRIPTION="GTK+ utility for editing MP2, MP3, MP4, FLAC, Ogg and other media tags"
@@ -12,13 +11,11 @@ HOMEPAGE="https://wiki.gnome.org/Apps/EasyTAG"
 LICENSE="GPL-2 GPL-2+ LGPL-2 LGPL-2+ LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
 IUSE="flac mp3 mp4 nautilus opus speex test vorbis wavpack"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	opus? ( vorbis )
-	speex? ( vorbis )
-"
+	speex? ( vorbis )"
 
 RDEPEND="
 	>=dev-libs/glib-2.38:2
@@ -40,9 +37,9 @@ RDEPEND="
 		>=media-libs/libogg-1.3.1
 		>=media-libs/libvorbis-1.3.4
 	)
-	wavpack? ( >=media-sound/wavpack-4.70 )
-"
-DEPEND="${RDEPEND}
+	wavpack? ( >=media-sound/wavpack-4.70 )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	app-text/docbook-xml-dtd:4.4
 	app-text/yelp-tools
 	dev-util/glib-utils
@@ -54,10 +51,9 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-libs/appstream-glib
 		>=dev-util/desktop-file-utils-0.22
-	)
-"
+	)"
 
-PATCHES=( "${FILESDIR}/${P}-ogg-corruption.patch" )
+PATCHES=( "${FILESDIR}"/${P}-ogg-corruption.patch )
 
 src_configure() {
 	gnome2_src_configure \
diff --git a/media-sound/ezstream/Manifest b/media-sound/ezstream/Manifest
index 70e9048056dd..9081aa669c2d 100644
--- a/media-sound/ezstream/Manifest
+++ b/media-sound/ezstream/Manifest
@@ -1,5 +1,5 @@
 AUX ezstream.confd 60 BLAKE2B 2b2d8a1bbfd6fbd4a196dc8eecc07939b9c85b6a6ffa0f138a51e6cab1a29080aae7a91bcbf4b628c6786612ea87da20fac01f1c118e965ef672f845b19372b9 SHA512 09f178f665d8677e3c75055028f975b98310fb2017ac0d69ae40b6417134ecec40ac90493fb861e1c46a2473fdd87bc088955032e62ddfbb8e201b306066d9c3
 AUX ezstream.initd 633 BLAKE2B 32536c9fd48d9d1a77c8ba829b9aba135ca3339aed91f36f6bc90d2e89610a4d1eba0588d5dd90f7aa7b83f8f4737276178fc8cbae3b7db0cab4141e46106ea6 SHA512 684b56d3f828ce518d5fa1d5d9be64ef4b1d591fd0bed75d9842cc8d2ed79c8aab500d22465e02c60b8be5f1662462ff3a4b19a789ac807d290113cf29f6efd3
 DIST ezstream-0.6.0.tar.gz 250448 BLAKE2B 18449d90e51a6880c6acf3d99fd449f666de811dec5dc964102d87b7d1d08dab01e3d9d8d959f4a456ba695464693fec3d990115cc6b6513fcde02c937dab1c1 SHA512 d6b621db85a0d56dcc54a8b7a0136c25342ec507f04ab397a53f46a74e85e94806e17d0a0a59e66096b5c0d97b7f98eaba95a50c1ca6c8d82aed11b854d0d33d
-EBUILD ezstream-0.6.0-r1.ebuild 854 BLAKE2B 583e4e5b249feeee0d0611b78faeaef4df717161d9e56d561562ffb8303099dc8bc76b6280cc6c942970d0f41e51e2d4f3c529528575acf9951ec37fef2e61cd SHA512 87aa6d4ef146d50e660066a463e4569c07ab000f5d830b2de16ca0da36ceac63f5e07e2c11bb7a564f1a89011e8aea3d678283aaa37f3ecddfab1b85db5286a1
+EBUILD ezstream-0.6.0-r2.ebuild 844 BLAKE2B 110f6ba39753601b78b74ea487a340c13c197feeabeeed8eafbdd31e320dd2a802d9e92842fcf1cefa0a3d0d32becece7c761f094fdf3302314d8c9e33667056 SHA512 3ff1dc9f7465c1a172069aebec66581a5684bc72a95f3912eccad472e858ad168f5f24692c1f14eacebaf858b9410854605be895a91643a9c617e1cde3ce1fbd
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/ezstream/ezstream-0.6.0-r1.ebuild b/media-sound/ezstream/ezstream-0.6.0-r2.ebuild
index 665c2a35883f..d9cb6fb09888 100644
--- a/media-sound/ezstream/ezstream-0.6.0-r1.ebuild
+++ b/media-sound/ezstream/ezstream-0.6.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="A command line source client for Icecast media streaming servers"
 HOMEPAGE="https://www.icecast.org/ezstream/"
@@ -12,19 +12,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="taglib"
 
-COMMON_DEPEND="dev-libs/libxml2
+DEPEND="
+	dev-libs/libxml2
 	>=media-libs/libshout-2.2
 	!taglib? ( media-libs/libvorbis )
 	taglib? ( media-libs/taglib )"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="
+	${DEPEND}
 	net-misc/icecast"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	econf \
 		--enable-examplesdir='$(docdir)/examples' \
-		$(use_with taglib taglib "/usr")
+		$(use_with taglib taglib "${ESYSROOT}"/usr)
 }
 
 src_install() {
@@ -33,5 +34,5 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.initd ${PN}
 	newconfd "${FILESDIR}"/${PN}.confd ${PN}
 
-	rm -f "${D%/}"/usr/share/doc/${PF}/COPYING
+	rm -f "${ED}"/usr/share/doc/${PF}/COPYING || die
 }
diff --git a/media-sound/mp32ogg/Manifest b/media-sound/mp32ogg/Manifest
index 0d15b8f94749..df6608086e79 100644
--- a/media-sound/mp32ogg/Manifest
+++ b/media-sound/mp32ogg/Manifest
@@ -3,5 +3,5 @@ AUX mp32ogg-0.11-r4-quality.patch 2676 BLAKE2B 7d3b5f6b3fe9e3f8f99031b0cc30a1fc3
 AUX mp32ogg-0.11-r5-german_umlaut.patch 1786 BLAKE2B b25e35b6a231f4138c137a413c60a9420e63bb453da7df5f53868124c0f581c9d1c4b4350dbad1322470c297d39e9cabdb2fa0372e7aa50417ebf62340ce94c1 SHA512 9e95d4de4bb4656dd9600282a169ed1c47e50dc4b47219375138e0e81d3b5e9ed14f2f8411422a7cb68a0bc458ce34af20bdf9d4f606200118a2a70451e33aeb
 AUX mp32ogg-0.11-r6-force-filename-stringification.patch 374 BLAKE2B 76a3c37e46a94cdf2712bc74bb1d981344ce6a47831d8c63b49137e66e0724df304f7fbe5696cb0a08605b56ef7c9c9b24e992e503e89687c7433acbd07fdb89 SHA512 0179d71462fb6d88f5378d5a82622544eed9869b1bd533c1fccc73337a8b3820030dfa4abe6e04f6a887da92696882d303a6e94f955166b95c7df31a437a9494
 DIST mp32ogg 9216 BLAKE2B b73b17b7005ae53487a78b5e4ae118b1c18b713609ec9d7fb83b9f1295ae21b0cf5a3178445042562cea992c078b432353a40c46cbfa5a5e49c45e8cbae95002 SHA512 342c3e0430d203fed8f793fb14fa532210cac616a0f48d243c9a14477d048bf9da3dbab5712cdf24cff2d98c6a5bc1edb43080f4ee05672fcf8f3e07fa667bd1
-EBUILD mp32ogg-0.11-r6.ebuild 784 BLAKE2B 8f70106f59b2427cfc3a968b18109383352c3ea06b61909f781c5922d7d301e3906a735ca45290de41a0c5c00807a50a702144c47194e0f64323bf41ab4667fa SHA512 ced29fa6a3e071c0016f83882893501034a7859f1f43c4840f815761f3c5d31a2de678333bc52604dd26a31bb469dac0882eaa03a03c0db1a099a82cc9824169
+EBUILD mp32ogg-0.11-r7.ebuild 765 BLAKE2B ef95accf421d2045af227e045d6c2c52154f37849678dbf287cb1d87ab923f88dfdea9dd07f8d9cc2fcd2a625a9dddbd44314cf2e2b9f26fd4417e9159041205 SHA512 e817d3ce29c38b5dcb970baf391a683d96555c8ff652785e0bdde595c2708bc82d31f552197e69c1ce727f82ba426ef4e821dbf963d1eaf805e41d5bf34ac6d4
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild b/media-sound/mp32ogg/mp32ogg-0.11-r7.ebuild
index 92d9ea2f2c79..c6a304b79373 100644
--- a/media-sound/mp32ogg/mp32ogg-0.11-r6.ebuild
+++ b/media-sound/mp32ogg/mp32ogg-0.11-r7.ebuild
@@ -1,30 +1,28 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="A perl script to convert MP3 files to Ogg Vorbis files"
 HOMEPAGE="http://faceprint.com/code/"
 SRC_URI="ftp://ftp.faceprint.com/pub/software/scripts/mp32ogg"
+S="${WORKDIR}"
 
 LICENSE="Artistic"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-RDEPEND="media-sound/mpg123
+RDEPEND="
 	dev-perl/MP3-Info
 	dev-perl/String-ShellQuote
+	media-sound/mpg123
 	media-sound/vorbis-tools"
-DEPEND=""
-
-S=${WORKDIR}
 
 PATCHES=(
-	"${FILESDIR}/${P}-r4-mpg321.patch"
-	"${FILESDIR}/${P}-r4-quality.patch"\
-	"${FILESDIR}/${P}-r5-german_umlaut.patch"
-	"${FILESDIR}/${P}-r6-force-filename-stringification.patch"
+	"${FILESDIR}"/${P}-r4-mpg321.patch
+	"${FILESDIR}"/${P}-r4-quality.patch
+	"${FILESDIR}"/${P}-r5-german_umlaut.patch
+	"${FILESDIR}"/${P}-r6-force-filename-stringification.patch
 )
 
 src_unpack() {
diff --git a/media-sound/mp3blaster/Manifest b/media-sound/mp3blaster/Manifest
index ff8cad508c16..bf92616db48d 100644
--- a/media-sound/mp3blaster/Manifest
+++ b/media-sound/mp3blaster/Manifest
@@ -1,5 +1,5 @@
 AUX mp3blaster-3.2.5-fix-build-system.patch 2785 BLAKE2B 85f48a92691a538f01cf36c472d9d94e41a45bc0556e50b5f0375ef31c5aa2d2a44356ab2d732e11c135fac1a58b9e5c4e69a218f2d65663ea098319ad6964a8 SHA512 307796e8967b942f1b8133c271eb2a4a24ac9ce3ef2d3ed144197d615ba801198b4af115439f4306c5b84c5c3b7b4025475ed1dbae992d2731f646636ce8df8f
 AUX mp3blaster-3.2.5-fix-c++14.patch 1206 BLAKE2B 2f007e1af876c70bab2202e628824a7b80ac1d1fddefb805849f7089d342690f4654e67829794bd17eea23c64a60b0a511dcc14d23987f577d69d57ce1d900bf SHA512 cf0fe93ad0e6a75a58a855aae87222de923709a775552138ad95754ced9812a62c3a1cdc4d7091e1b727c0425cec40d223a9533ad4a735efed24d5a62db4e8e4
 DIST mp3blaster-3.2.6.tar.gz 354019 BLAKE2B 7fcb9011c436015c2f81a1a28b19896dffdba578969edb8cc29ed20fef7f222be3c23a1409c5c0a4c2ecb5b10432178c5581837938ede23ee76fe3205eecbb51 SHA512 eb977eb46b86449c6d433b1740aa08580e5b8f3d55d82d6f2623cd5fd103d73b7df127fb9ac650a21da61ad4948eb569a812e15d9adc9424d491fa625e198e0d
-EBUILD mp3blaster-3.2.6.ebuild 1559 BLAKE2B 2b85d26d26618c47e43d4897e420cba78b30ec3f80e2a12e94e6a7a16b98b48a71cd7d4a9e6d029bea55981b1efcef4d38fc01e9b5be548c4b5ab89272e3f98d SHA512 35e3d279d0a8c28ecbd64c5e741e37644f55bd6a009ba42d58b27ca1c682fa5bbd24e3be051742e416b068e244fc31c4449ea31826e299b66d65601a18ebcb3f
+EBUILD mp3blaster-3.2.6-r1.ebuild 1565 BLAKE2B ca920b6964b34fb1c37fb05ae497cbce9fe437a87a58c0e7f4464682758255528c80d46f9e1e5c957dcb23f7844d5dc1940d9b5201da5c34901973f9136b6a9d SHA512 ac10082ca77cb9f2f281e1bab6699d43354b6298f176ef4563cf45006d81217d450e7fa646742c2b099adfd2785534bf70d892950c00030cd90407457c8bd3b0
 MISC metadata.xml 433 BLAKE2B 4f113956ab8327011a21b00b5c05d1d1719ab58e9a39975e01cb4938bf95517614620c483f659e1ff83ed7ebf62d76c661cbff6f0e7a983159b2c91d72cd278b SHA512 a680b2e39fed703c6a78e2e043d57063a20e7beb17061f7220434ae6d04549ae2e4524be7e9056d24b141df45739856b8d74fd5169703b3252117ff7a74a073e
diff --git a/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild b/media-sound/mp3blaster/mp3blaster-3.2.6-r1.ebuild
index 396b57202668..7f2f19ec0182 100644
--- a/media-sound/mp3blaster/mp3blaster-3.2.6.ebuild
+++ b/media-sound/mp3blaster/mp3blaster-3.2.6-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -13,18 +13,19 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ppc ppc64 ~riscv sparc x86"
 IUSE="lirc oss +sdl sid vorbis"
+REQUIRED_USE="|| ( oss sdl )"
 
 RDEPEND="
-	sys-libs/ncurses:0=
+	sys-libs/ncurses:=
 	lirc? ( app-misc/lirc )
 	sdl? ( media-libs/libsdl )
 	sid? ( media-libs/libsidplay:1 )
 	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	x11-misc/imake
+DEPEND="
+	${RDEPEND}
 	oss? ( virtual/os-headers )"
+BDEPEND="x11-misc/imake"
 
-REQUIRED_USE="|| ( oss sdl )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2.5-fix-c++14.patch
 	"${FILESDIR}"/${PN}-3.2.5-fix-build-system.patch
@@ -57,8 +58,8 @@ src_install() {
 	default
 
 	# relocate everything except commands.txt because it's used by src/main.cc
-	mv -vf "${ED%/}"/usr/share/{${PN}/{charmap,sample.*},doc/${PF}} || die
+	mv -vf "${ED}"/usr/share/{${PN}/{charmap,sample.*},doc/${PF}} || die
 
 	# file collision with media-sound/splay
-	mv -vf "${ED%/}"/usr/bin/splay{,_mp3blaster} || die
+	mv -vf "${ED}"/usr/bin/splay{,_mp3blaster} || die
 }
diff --git a/media-sound/mp3val/Manifest b/media-sound/mp3val/Manifest
index b1e7f2a73f42..7810f885bd04 100644
--- a/media-sound/mp3val/Manifest
+++ b/media-sound/mp3val/Manifest
@@ -1,4 +1,5 @@
-AUX mp3val-0.1.8-open.patch 477 BLAKE2B 8478e14f62b66b104de26e002a6f04271d96ee45c587ccb62ba808597531d8aa9878477443efeb62e2dcda534a9f213c11084634c9f0006301f330a0a420d29d SHA512 cbb11127ddecf808b41948220937078c96c87410b29676037ebb0187705f1c2f53d48c87924f9feb138ac33546d389f233940b6251d58bfc9975df7557a2aa22
+AUX mp3val-0.1.8-makefile.patch 264 BLAKE2B febbf9efb632ba000374214f12b3c2e255943d078e51b4994b1d0bf23e0c50979db3fc55072a30efed1df84d44e69e7e5a7553841aa8f1e7b2c2e44337ab0cf9 SHA512 795fcad6fe3f56df747f12555b6674735f646306c802eb510e562b844d6aa76741525cafcd055383620a983f7975cff3039797da3a7d57badf4729f353298d0e
+AUX mp3val-0.1.8-open.patch 378 BLAKE2B a6cb18e6ed85f8d0ff59582a7b4e18628573bc5dc32fa128ab78be0a8f968291e462a070ed5e5c59d36a665705f2c2a0f433d68192b3ace405fddb6adc87f163 SHA512 9b46911abc0d1e58c2eaf65e9e30a0152ca105eefb42f9ae1970b282bb48cd403da82fe6fd6b5f77aa961895cefa3f29e260faf45c42f93253a60b585662b268
 DIST mp3val-0.1.8-src.tar.gz 21406 BLAKE2B 5b2a3697db40fb9c450c6f3c23834e137b01b5a0e5787079e8b50a2b0c4e98e988077680e54541a3022601a81aee86950eded02e526c41ea0f11804613852de6 SHA512 62371453be53840fb0f0d87c9fcf9cbd6f5c8ae107e529f0cb6b8190ef9e7ebf564bb080c9d0a6adc3b5450673e70b5f4343dee82c1e6400750935cccebc2604
-EBUILD mp3val-0.1.8.ebuild 657 BLAKE2B 84279894c8a9164ab2c0685ce781175f2874e79d5c37adc947e3316e18a56e44cf41694bbb8365fc8901440e9b074a95a837a28c6195d83c8f3ee75408e5c41a SHA512 d22ab39517ba066e49d08ff30ec95e32150667756cda900a294926a58395880fbdf5dd726f2b3ccacd1e3186b29e1de7f539682a76a7e459c313ddb74f5222b9
+EBUILD mp3val-0.1.8-r1.ebuild 601 BLAKE2B 872c1f3714da1bb590ffa16e428237cf02ed3850333a826216a8a027b229495e0a8851440d8fb0746aa886b091735dc8d79a67f880fe889975131af7800a6184 SHA512 0f4d8520357cd79a610534772ba96b784488d051297ed68937c3a00f4ac5470922f427662c74930ef3e0b37f9815afcf3584ed570842aea88700450b75681008
 MISC metadata.xml 357 BLAKE2B d34e74d1f942d164d1ab4a5006994a7bba614d7769b90bc7f7d2b809dde6bb735a113709e7ee906dd3cdcd113ae53ec09880ce532cf7e8c0aef91fac49cc00c6 SHA512 9f8eee82387053eb90b05c02833c4567e9190ecc9c26e4ca5a4083aebbd46c3a389a2773e659cad6780b03b5ef1509116874e3ffa12dd50bfb5e7e59ad20c84b
diff --git a/media-sound/mp3val/files/mp3val-0.1.8-makefile.patch b/media-sound/mp3val/files/mp3val-0.1.8-makefile.patch
new file mode 100644
index 000000000000..8da20930602f
--- /dev/null
+++ b/media-sound/mp3val/files/mp3val-0.1.8-makefile.patch
@@ -0,0 +1,12 @@
+--- a/Makefile.linux
++++ b/Makefile.linux
+@@ -1,7 +1,7 @@
+-CXXFLAGS=-Wall -O2

++CXXFLAGS += -Wall

+ 

+ mp3val: main.o mpegparse.o out.o report.o crossapi.o crc.o

+-	$(CXX) $(CXXFLAGS) $^ -o $@

++	$(CXX) $(LDFLAGS) $(CXXFLAGS) $^ -o $@

+ 

+ clean:

+ 	rm -f mp3val

diff --git a/media-sound/mp3val/files/mp3val-0.1.8-open.patch b/media-sound/mp3val/files/mp3val-0.1.8-open.patch
index 2b844c1fac1e..499e23272387 100644
--- a/media-sound/mp3val/files/mp3val-0.1.8-open.patch
+++ b/media-sound/mp3val/files/mp3val-0.1.8-open.patch
@@ -1,11 +1,11 @@
---- mp3val-0.1.8-src/crossapi.cpp.orig	2010-05-03 10:45:53.000000000 -0700
-+++ mp3val-0.1.8-src/crossapi.cpp	2017-02-19 23:38:21.000000000 -0000
+--- a/crossapi.cpp
++++ b/crossapi.cpp
 @@ -241,7 +241,7 @@
- //Moving failed due to different logical drives of source and destination. Let's copy:
- 	id=open(szOldName,O_RDONLY);
- 	if(id==-1) return 0;
--	od=open(szNewName,O_WRONLY|O_CREAT|O_TRUNC);
-+	od=open(szNewName, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
- 	if(od==-1) {
- 		close(id);
- 		return 0;
+ //Moving failed due to different logical drives of source and destination. Let's copy:

+ 	id=open(szOldName,O_RDONLY);

+ 	if(id==-1) return 0;

+-	od=open(szNewName,O_WRONLY|O_CREAT|O_TRUNC);

++	od=open(szNewName, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);

+ 	if(od==-1) {

+ 		close(id);

+ 		return 0;

diff --git a/media-sound/mp3val/mp3val-0.1.8.ebuild b/media-sound/mp3val/mp3val-0.1.8-r1.ebuild
index 3294d430344a..6a51bfd27fde 100644
--- a/media-sound/mp3val/mp3val-0.1.8.ebuild
+++ b/media-sound/mp3val/mp3val-0.1.8-r1.ebuild
@@ -1,29 +1,26 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit edos2unix
+EAPI=8
+
+inherit toolchain-funcs
 
 DESCRIPTION="Validate and fix MPEG audio files"
 HOMEPAGE="http://mp3val.sourceforge.net/"
 SRC_URI="mirror://sourceforge/mp3val/${P}-src.tar.gz"
+S="${WORKDIR}/${P}-src"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${P}-src"
 
 PATCHES=(
-	"${FILESDIR}/${P}-open.patch"
+	"${FILESDIR}"/${P}-open.patch
+	"${FILESDIR}"/${P}-makefile.patch
 )
 
-src_prepare() {
-	edos2unix "${S}"/{*.{cpp,h},Makefile*}
-	chmod a-x "${S}"/*
-	sed -i -e '/^C.*FLAGS.*=/d' "${S}"/Makefile.linux
-	default
+src_configure() {
+	tc-export CXX
 }
 
 src_compile() {
@@ -32,6 +29,8 @@ src_compile() {
 
 src_install() {
 	dobin mp3val
-	dohtml manual.html
+
 	dodoc changelog.txt
+	docinto html
+	dodoc manual.html
 }
diff --git a/media-sound/mpdscribble/Manifest b/media-sound/mpdscribble/Manifest
index 9e3f5f909ef4..739551fd40c3 100644
--- a/media-sound/mpdscribble/Manifest
+++ b/media-sound/mpdscribble/Manifest
@@ -3,9 +3,7 @@ AUX mpdscribble-0.23-Unconditionally-generate-systemd-unit-files.patch 1407 BLAK
 AUX mpdscribble-0.23-gcc12-time.patch 1184 BLAKE2B efe572750084d7c625007280fbb3a7e5703aecc37e81a0a0f4b6d81bfa9d2b855e684c8da0d64d5c825306a1cd9ed7d23d2a62ba7c7eb9f9bd9f0f33c1491f7f SHA512 cafc2aaa95f4e9a184ae1724c1343991ee9f2b4937ae09ca41abdbf2e3d09263229c3d9070bf8b8ac37b0d2a583d8c6bb20dcb49ef55e5aaa9323851584302d8
 AUX mpdscribble.rc 475 BLAKE2B f57a87b042cd60d87119ea396bd84bdf846a04fcfadff69b6bfa6700cd177dd95cb5e7c753fc51eb4916410a64e20d42dff1a9e0b5024f2ad1d1d7e3ed3751f9 SHA512 b82d3e5678aba145a5c8d172ebf74960d164e3e934426cc755948d795743bb07158f502705d40c1730a40b6a6d73e84c5792419adaf6ab83ec7c33756f0abb43
 DIST mpdscribble-0.22.tar.bz2 116981 BLAKE2B 13b15ca9e49faa3e5d254bc2864de4a0c409d8767db586def3a7bee415c67f84ddffbd7fce6093afe4aba5d5e66db8182aed52d9a141bebf4094a400f2ababe3 SHA512 bedd93392a4d5a0609dcaf7aefeeff3851f3084da8c34a4fc1f8fde51c2ba10b8370ac52cc8d55f0c9a96fffed975827a0935087c2c51880b7bfef8d79182dc8
-DIST mpdscribble-0.23.tar.xz 46624 BLAKE2B 47c59a4b2936b7990bb2d8563422c553d1e08b39a09a873fae1ad0215bd1fcc0dbcaa69e62eab9332530717a200a52295018a578e3c615e83d68d84564060402 SHA512 f924076a8aa201f67ba81e72a44d3dd1c31618bd87e4f75f6b63f7b3814fa08f6ef4f7964b1d518c5f8b68a1f8ba88f867c08ed8b0387157eec8e9f97eb0b825
 DIST mpdscribble-0.24.tar.xz 69856 BLAKE2B 84143ed7f6978aff32fa759bbe90c934ba5c58df294d375921ffb1cd45de13ecd867fb832940088228fdad4c09948cd82c8dfe9b7fe77d6652743d522bfde8b7 SHA512 cca57f54f69ec1c870805cc58057e6325b6f5897370c315dcd6a64c5dd28ac07fdbddaa8b56f8c1fd88e71d27505f1a87decd68fbdff1f3fe1eaadec8ae80dae
 EBUILD mpdscribble-0.22.ebuild 707 BLAKE2B 2ce67900b9bde1e81839e257cf3365f934873177b9675113915f6c46e68b6de006e703e37930162ef07558f46a0213ad1d06ecf038dd0546788388ac51ca0aaf SHA512 e2aaf1b1bb18bb8a0311b3e34379669666606fc2af58b2eaec6098dc88b2cb9a6f25a5c0db3ec01d83a68e041853a2c6963e01b1466e15400c188d604c27e131
-EBUILD mpdscribble-0.23.ebuild 1006 BLAKE2B 07297a75cee5e1c3ab03420fa971c86360cba4a45cbcce3ba30f30085724593195560587b11e3f678bbb422045496c489a74de923e855c0c2a309ac03ebb74ae SHA512 831bc63481bdb6474d906c45b6af9a9720dfb394f6ec83f71fa680428f5a016fc5a4a86d157a8a7380a2c1cbd0af42bffcd38cde46808bfeed94a2652cb41518
 EBUILD mpdscribble-0.24.ebuild 1049 BLAKE2B 1db73a25ab89729df94c009fb55be4d11de546e3d52f96204d852c070d9c6c6868d6bf6a258d51b3acc666946af07e2e28412a998351077e3655b0046e035c70 SHA512 3e7ba1db5e0fdbe1957d84fef30c5137ee21136940f6ebf4cf650aa28294e46e9a9d9e3e116b8e4fe377a26b0422b5dc86b0dc77bb4c3d49b5358956b662bb51
 MISC metadata.xml 784 BLAKE2B c38018b5bc728569e23dccc11fe4509b916448fec5316ac7170fe2fd4decb9a4ed568f40d039ed2d514e22209c18033f14324a5ff26521658e27e79c4102eab9 SHA512 f52ee040880383020d9f945359fd2597b44898fa215619e2ad435dfb1128791f8fcddcaa4cf1426712d684e3c1fa41e35fa35e1920364199e158cf24001c1443
diff --git a/media-sound/mpdscribble/mpdscribble-0.23.ebuild b/media-sound/mpdscribble/mpdscribble-0.23.ebuild
deleted file mode 100644
index 31a25f8e4100..000000000000
--- a/media-sound/mpdscribble/mpdscribble-0.23.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson systemd
-
-DESCRIPTION="An MPD client that submits information to Audioscrobbler"
-HOMEPAGE="
-	https://www.musicpd.org/clients/mpdscribble/
-	https://github.com/MusicPlayerDaemon/mpdscribble
-"
-SRC_URI="https://www.musicpd.org/download/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="
-	dev-libs/boost
-	dev-libs/libgcrypt:=
-	media-libs/libmpdclient
-	net-misc/curl
-"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS COPYING NEWS README.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.23-Unconditionally-generate-systemd-unit-files.patch
-	"${FILESDIR}"/${PN}-0.23-Don-t-install-AUTHORS-COPYING-NEWS-README.rst.patch
-)
-
-src_install() {
-	meson_src_install
-	newinitd "${FILESDIR}/mpdscribble.rc" mpdscribble
-	keepdir /var/cache/mpdscribble
-
-	systemd_dounit "${BUILD_DIR}"/systemd/system/"${PN}".service
-	systemd_douserunit "${BUILD_DIR}"/systemd/user/"${PN}".service
-}
diff --git a/media-sound/mup/Manifest b/media-sound/mup/Manifest
index 96362631e11b..7a2985288dd7 100644
--- a/media-sound/mup/Manifest
+++ b/media-sound/mup/Manifest
@@ -1,7 +1,4 @@
-AUX mup-6.6-makefile.patch 2563 BLAKE2B 32f32af677b83ef0889c073d0cde368c3119ef7b654531cf407a6d8796c374d78979e56095d7ce3f68ee037e0a3b3205147366b12909bac70a8d64a5c6b04ec8 SHA512 d6609bc8ee5d327bb1252d5d536b9bd5f67e58add6552fbc63456a9773eeff6c5fff2029ad754b48cc8539a001fdd6bffd74368e8e1e7085e83ea7247eb87251
 AUX mup-6.9-build-system.patch 6205 BLAKE2B f944b6dab3d206dc5fae2c5f08c36bc24310094c5cf9f7ab15098a2ace87d2bb5863eb08f254d0c2e34d0ec2e1c3eaf18f7e6e0161f6829b74fd56d1edbfd7bd SHA512 3a26e09748e89857a8f30c7b3d0fc567e46cb7494148467cac491cc0ccea4aaef25bc7364fe808931000321489a09101d357d996daa24b477c693b4e4b20a329
-DIST mup66src.tar.gz 2514430 BLAKE2B d2747a0fc46f055b370456305b1c56bd1e35827c10686650804801826a945d7a60a25095a3d789fbec0abf2a0aab6cb2e1a8b87eadd2858674f54cbfca377dfb SHA512 3239be85eb9e52adf941a3c927e200a3232d697ee081b359ee63d8aac7a8748af09cc66eef33b6145ccdfeb548a1f93130beb99960ed858d695fcc286c61bd35
 DIST mup69src.tar.gz 3062560 BLAKE2B cb7456fe52f85a122106675372a5ffabe9466086e730cbb15dbb590ea2485ecfc34e52d8b8c7c3a583d98e4e8e352be07a203e41da38cd145adf11cdf59bad92 SHA512 b3b49177e12b6a8dbd711e88a327826b60e4141a0720c1be4900af2124ac29592572d866d98f2a5b8318fb008fb035371ad83f152601bf22d98a3e7568ecfe95
-EBUILD mup-6.6.ebuild 905 BLAKE2B f3b807f60097085b05c04689fda392c2b1967ac604cd6884ead3a27356785f58ec78881191b02376af667b24f38cffeceb2e1a04036fdf2099dcf29d279bb68f SHA512 140c359ef8440ee3e88a25fb83f5004f3610abb4ee6bfbf5fcc2f9cca08e4ceb0fd3fdc27675571c34bf77789b0ea4c94d3a667dd09190130ccab7e579cdca02
 EBUILD mup-6.9.ebuild 950 BLAKE2B 8bef011a1927b72ab08c19bee523ed7367d7e85b5341ca81c4ab26750a46453825e6777ca791576bf6f03a9312745a87078e448224b9a1c167a8f6be65aa24fe SHA512 b884343f448468de498ac966e6e072e280534fa9bcb867ba4a1be00e00d1c14042a857cff6eeb82dbf06c1ce3e76b80c7756081db908337c1089b01aac633bac
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/mup/files/mup-6.6-makefile.patch b/media-sound/mup/files/mup-6.6-makefile.patch
deleted file mode 100644
index 0350a6e80447..000000000000
--- a/media-sound/mup/files/mup-6.6-makefile.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Fix header/library locations for fltk, respect LDFLAGS, and allow the ebuild to
-handle docs install.
-
---- mup-6.6/makefile
-+++ mup-6.6/makefile
-@@ -80,12 +80,12 @@
- 
- # You can change this if your X libraries and headers are somewhere else
- # (like /usr/X11R6).
--X_LOCATION = /usr/X11
-+X_LOCATION = /usr
- 
- # If you installed fltk somewhere other than $(X_LOCATION)/lib
- # set this to find them, as in
- # FLTK_LIB_LOCATION = -L/usr/local/lib
--FLTK_LIB_LOCATION =
-+FLTK_LIB_LOCATION = -L/usr/lib/fltk
- 
- # The X libraries to link with Mupmate.
- # Depending on how fltk was compiled, you may be able to omit
-@@ -99,7 +99,7 @@
- #FLTK_VERSION=FLTK_1_1
- 
- # The FLTK header files are under $(FLTK_INCLUDE)/FL
--FLTK_INCLUDE = $(X_LOCATION)/include
-+FLTK_INCLUDE = $(X_LOCATION)/include/fltk
- 
- # You can use fltk_jpeg or jpeg library, whichever you have
- # or depending on how fltk was compiled, you may not need it at all
-@@ -251,25 +251,25 @@
- 	flex -t extras/lex.l > mup/lex.c
- 
- mup/mup: $(MUP_HDRS) $(MUP_SRC)
--	$(CCOMPILER) $(CFLAGS) -o $@ $(MUP_SRC) -lm
-+	$(CCOMPILER) $(CFLAGS) $(LDFLAGS) -o $@ $(MUP_SRC) -lm
- 
- mupdisp/mupdisp: $(MUPDISP_HDRS) $(MUPDISP_BITMAPS) $(MUPDISP_SRC)
--	$(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB $(MUPDISP_SRC) -lX11
-+	$(CCOMPILER) $(CFLAGS) $(LDFLAGS) -L$(X_LOCATION)/lib -o $@ -DNO_VGA_LIB $(MUPDISP_SRC) -lX11
- 	# For Linux console mode support, comment out the previous line
- 	# and uncomment the following line
- 	# $(CCOMPILER) $(CFLAGS) -L$(X_LOCATION)/lib -o $@ $(MUPDISP_SRC) -lvga -lX11 -lm
- 
- mkmupfnt/mkmupfnt: $(MKMUPFNT_SRC)
--	$(CCOMPILER) $(CFLAGS) -o $@ $(MKMUPFNT_SRC)
-+	$(CCOMPILER) $(CFLAGS) $(LDFLAGS) -o $@ $(MKMUPFNT_SRC)
- 
- mupmate/mupmate: $(MUPMATE_SRC) $(MUPMATE_HDRS) $(MUPMATE_OTHER_FILES)
--	$(CPPCOMPILER) $(CFLAGS) -o $@ $(MUPMATE_SRC) \
-+	$(CPPCOMPILER) $(CXXFLAGS) $(LDFLAGS) -o $@ $(MUPMATE_SRC) \
- 	$(FLTK_VERSION) -I$(FLTK_INCLUDE) -Imup -L$(X_LOCATION)/lib \
- 	$(FLTK_LIB_LOCATION) -lfltk -lfltk_images $(X_LIBS) \
- 	$(JPEGLIB) $(PNGLIB) $(ZLIB) -lm
- 
- install:	all
--	mkdir -p $(BINDIR) $(MANDIR) $(DOCDIR)/uguide $(ICONDIR) $(LIBDIR)
-+	mkdir -p $(BINDIR) $(MANDIR) $(ICONDIR) $(LIBDIR)
- 	cp mup/mup $(BINDIR)/mup
- 	cp mkmupfnt/mkmupfnt $(BINDIR)/mkmupfnt
- 	cp mupdisp/mupdisp $(BINDIR)/mupdisp
-@@ -278,8 +278,6 @@
- 	cp mupmate/mupmate $(BINDIR)/mupmate
- 	cp mupprnt $(BINDIR)/mupprnt
- 	cp docs/*.1 $(MANDIR)
--	cp docs/README* docs/*.txt docs/*.ps docs/*.mup $(DOCDIR)
--	cp docs/uguide/* $(DOCDIR)/uguide
- 	cp $(MUPMATE_OTHER_FILES) $(ICONDIR)
- 	cp $(MUP_LIB_FILES) $(LIBDIR)
- 
diff --git a/media-sound/mup/mup-6.6.ebuild b/media-sound/mup/mup-6.6.ebuild
deleted file mode 100644
index 2647e954d2c2..000000000000
--- a/media-sound/mup/mup-6.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Program for printing music scores"
-HOMEPAGE="http://www.arkkra.com/"
-SRC_URI="ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz"
-
-LICENSE="Arkkra"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11
-	x11-libs/libXext
-	>=x11-libs/fltk-1.3:1
-	x11-libs/libXpm
-	virtual/jpeg:0
-	media-libs/libpng:0="
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
-
-src_prepare() {
-	default
-	sed -i -e "s:/lib:/$(get_libdir):g" makefile || die
-}
-
-src_compile() {
-	emake CCOMPILER="$(tc-getCC)" CPPCOMPILER="$(tc-getCXX)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc docs/{*.txt,README0}
-	docinto html
-	dodoc docs/{*.html,uguide/*}
-	docinto sample
-	dodoc docs/{*.mup,*.ps}
-}
diff --git a/media-sound/rexima/Manifest b/media-sound/rexima/Manifest
index f6d12246ce94..cc328adfbf63 100644
--- a/media-sound/rexima/Manifest
+++ b/media-sound/rexima/Manifest
@@ -1,3 +1,4 @@
+AUX rexima-1.4-makefile.patch 493 BLAKE2B e51d7cf175f7a355a4c33932a2607cdf22484e1e16c6f6522bb5ba8955bb4f09f35867313a71ddc48cbacac8d62ca04f0bac8cc21f672ec701e6e6072d6bcb0b SHA512 226ecbebd01740ada86b4f7f0b8d5e5626cdd6c3af4cdcbe7606effbc8d23d4f4459967a31e57f97b0f418d1dfe1c32a940d0883f2a5e6f8354b418c13e72200
 DIST rexima-1.4.tar.gz 15903 BLAKE2B 9852560036ef58a2e22974bca153d24ab07735fe5c679b3e4bd6a8a22c81a246fa28b0d52034736952faa599a0a8f4a73f34dcfa8cfb8df079148fa82bbf995b SHA512 6a4c70fd2f61446a2e79a3a22218d443f7ae4df9928b73c66f8d4d2f592d50c57f5fe53875bf975a8ffb6d9d8f99bc99d083ced2714b7623bef06229f8e37fd6
-EBUILD rexima-1.4-r1.ebuild 688 BLAKE2B a8c9f5b9bfedb05860b42597aac9a12a6dbdf9ff612b9aee25cddf8911b616664fcc65813bc012f4b44e9e228deb9136b60c0624b20ebdf47302c63805a68d6a SHA512 92b8944b62b761b78f28a428c70d733ae9695fa88d121a1d5c4b9f0c27bd28fea4bb17ecb4a6185950fd31d77062651f2180cfa1918d5a9a8c668066651b4868
+EBUILD rexima-1.4-r2.ebuild 644 BLAKE2B 7f26f1afccb706ffcd7c954974cd3b2f03aca9d91fdaa1d25122253185b6753070bd6a42c31e326fa80a40f25db0045818f437997851d1530bf5fe03f4e7d576 SHA512 ff3d11ab54868547974e7823ff493dbeb2e9f325408e615cfa0183f8fe6775d167e61769545f8654aaff14683a5f0ba35b6d86de2fe28b19c11a71458f47375f
 MISC metadata.xml 250 BLAKE2B 3e6dae5d5f3b3ac412806dd8615a1975c7ea8a64bfd72ad54f2c93a9b24c19c620ac3e8b26e1f6cadec899443e138ee4fb7a82ecb83c784d0c03ee91854d8622 SHA512 2bfce2cf73aefce6dda06ea351cb93b2990b9543f48be1ae5406a5a5acf2c34faed1eb2ce715eb689eb50a9a1add5576b39232eb818c233f5a5589e16032aca8
diff --git a/media-sound/rexima/files/rexima-1.4-makefile.patch b/media-sound/rexima/files/rexima-1.4-makefile.patch
new file mode 100644
index 000000000000..9c70493b4cd5
--- /dev/null
+++ b/media-sound/rexima/files/rexima-1.4-makefile.patch
@@ -0,0 +1,24 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,7 +1,9 @@
+ # Makefile - makefile for rexima
+ 
+-CC=gcc
+-CFLAGS=-O -Wall
++PKG_CONFIG ?= pkg-config
++CFLAGS += -Wall
++CPPFLAGS += $(shell $(PKG_CONFIG) --cflags ncurses)
++LDLIBS = $(shell $(PKG_CONFIG) --libs ncurses)
+ 
+ # Set BINDIR to directory for binary,
+ # MANDIR to directory for man page.
+@@ -16,9 +18,6 @@
+ 
+ all: rexima
+ 
+-rexima: rexima.o
+-	$(CC) $(CFLAGS) -o rexima rexima.o -lncurses
+-
+ installdirs:
+ 	/bin/sh ./mkinstalldirs $(BINDIR) $(MANDIR)
+ 
diff --git a/media-sound/rexima/rexima-1.4-r1.ebuild b/media-sound/rexima/rexima-1.4-r2.ebuild
index 60fcf194acd7..72dfeb4e8a71 100644
--- a/media-sound/rexima/rexima-1.4-r1.ebuild
+++ b/media-sound/rexima/rexima-1.4-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -12,19 +12,15 @@ SRC_URI="ftp://ftp.ibiblio.org/pub/Linux/apps/sound/mixers/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
 
-RDEPEND="sys-libs/ncurses:0="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_configure() {
-	tc-export CC
+PATCHES=( "${FILESDIR}"/${P}-makefile.patch )
 
-	cat > Makefile <<- _EOF_ || die
-		LDLIBS=$($(tc-getPKG_CONFIG) --libs ncurses)
-		all: rexima
-	_EOF_
+src_configure() {
+	tc-export CC PKG_CONFIG
 }
 
 src_install() {
diff --git a/media-sound/soundconverter/Manifest b/media-sound/soundconverter/Manifest
index 1ff122d85e36..4ef2bf231948 100644
--- a/media-sound/soundconverter/Manifest
+++ b/media-sound/soundconverter/Manifest
@@ -1,5 +1,3 @@
-DIST soundconverter-3.0.2.tar.xz 208440 BLAKE2B e7817648fe27b2083629ea718b0479f7b9e2607a017868b1e1ce3fb0407a84a548bd007647e73a1d4163a7f51b162a89e3914419ccdbfd07586c2a94a23f4af2 SHA512 0746395de412a4d845e3df4d6cce0dbcba266c9efc8db71663dd1c751d2a5de5b0dc266f24bbfe6c00f69428801ce5f9558fc8e5e2f5d5e6be8562085cd7fe92
 DIST soundconverter-4.0.3.gh.tar.gz 632495 BLAKE2B 9a2847b5ebb998b9122ff4020e47dc5b84635a6e1ae0de9061bab18e813ab3918278e940df80bc370b071de77a82a3637c376d9ebdd84d2f7b00865dda94935a SHA512 0674eb430bb3cf267ceabee8e7dbdeb2ee81e537ca093fcf6e1adab21112690ed9e3eb349a994805ddfc51b3a4f875b87a5819a1f2cf020752eb8e742665a998
-EBUILD soundconverter-3.0.2-r1.ebuild 1825 BLAKE2B dfad0e7f1e681fee074bcbf0503d6b9e36b5c219e591a24cb0e436ba34f2bf3eb391cbffccce51225d5eaa447e9c9ffc4d2bebb0587603f51c757fd4f071dcb5 SHA512 6e8c1754f91e7dfb132cefed59b508014658552aa68a15f3c4de6ef1ce287bcb2390e7549f920f19c3e8f4bf1101f4c5dc084b76cc4ea3053d1df896303c10c4
 EBUILD soundconverter-4.0.3.ebuild 2727 BLAKE2B 07d192af018bcabb475effbc8690f6f73fbb927e07b722283aee59b24bd9caf3c8e6395b7f6c8f938abe911c9af375f8653264ed0b10ca8837f2122e0656ac5b SHA512 5b9d6e578e82912b3f3d0d2778ebe191a79ffcf8087a6bfb27d1d77e90a743ad15f69d3ef0244ca06a70f10f6ef8490bdee38c2442edd3b4ed8a275c58c6f176
 MISC metadata.xml 413 BLAKE2B b72915536e7a83e087d9fbe87756b3a8ffa38265360d17bfacaadf75694a032bf55b024574813692ff91e0664ab0849584ab3027e277443260ff9a3afc31ffa4 SHA512 772a3ec6f12308dea14140a65e35c66066e7f9869e1518f92313f23f46f2a6f7b3f18f3b2650c7197c934d07219bca656c446aae7ef7532b57323f924222939e
diff --git a/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild b/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
deleted file mode 100644
index dceecba8d9c3..000000000000
--- a/media-sound/soundconverter/soundconverter-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="A simple audiofile converter application for the GNOME environment"
-HOMEPAGE="https://soundconverter.org/"
-MY_PV="${PV/_/-}"
-SRC_URI="https://launchpad.net/${PN}/trunk/${MY_PV}/+download/${PN}-${MY_PV}.tar.xz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="aac flac libnotify mp3 ogg opus vorbis"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/gobject-introspection:=
-	x11-libs/gtk+:3[introspection]
-	media-libs/gstreamer:1.0[introspection]
-"
-
-# gst-plugins-meta for any decoders, USE flags for specific encoders used by code
-# List in soundconverter/gstreamer.py
-# wavenc and mp4mux come from gst-plugins-good, which everyone having base should have, so unconditional
-RDEPEND="${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-	$(python_gen_cond_dep '
-		dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-	')
-	libnotify? ( x11-libs/libnotify[introspection] )
-
-	media-libs/gst-plugins-base:1.0[vorbis?,ogg?]
-	media-plugins/gst-plugins-meta:1.0
-	flac? ( media-plugins/gst-plugins-flac:1.0 )
-	media-libs/gst-plugins-good:1.0
-	mp3? (
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-lame:1.0
-	)
-	aac? ( media-plugins/gst-plugins-faac:1.0 )
-	opus? (	media-plugins/gst-plugins-opus:1.0 )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-RESTRICT="test" # broken pot files list in 3.0.0 release, making src_test fallback to "make test" which fails
-
-src_prepare() {
-	python_fix_shebang .
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED%/}"/usr/$(get_libdir)/soundconverter/python
-}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index cc22380e9360..1888b4f6f245 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -3,4 +3,4 @@ DIST spotify-client_1.0.72.117.g6bd7cc73-35_i386.deb 95135550 BLAKE2B ad4587dd6b
 DIST spotify-client_1.1.84.716.gc5f8b819_amd64.deb 119770140 BLAKE2B 071ee877e9c6c9a64cc3e06cdd72530e5da60087c56c29ad9511ed427df987d76258142120442ad78370f2d78c282016025ed43f7f7e94b4efb44e4a201bc839 SHA512 3cc25f28ae791ac26607117a5df668f803ed8e58f0ace085010a6242fdde97766bdc1c752560850795c9b4324f3e019937fe9af2788a1946ebb70ee781f50d99
 EBUILD spotify-1.0.72-r1.ebuild 3208 BLAKE2B dbe0adc8f45c8c83d2a6734b36439ac0ce67b48ea518ae9153a5006c1ef4e923cd768a983495c35bac8d1469d4e7f5b5c26e73284f43ff9d5d84dd23e80c6740 SHA512 8955f11f24a1a50827b2dc9c37e03ac0c24ad8d352cf91598a3d39c65679f54cd3b8660f21e5a8f1347e408ec1fea8e23a962fd7e2c93b64f034d74a9304ae26
 EBUILD spotify-1.1.84.ebuild 3484 BLAKE2B 96204b642b4b655fcc1c498f99552257b4c29b72a28d052ad62170665f1d81528969fa4af986cf03140a6a1aee6fef23648c909f52ea0c62e95f124745a0db14 SHA512 656e149989a990f2215c477be7e892c629193d08df6b94f83f0f24ee51e9cc75b2eb4bfc320406ba1f15aade79e3ce1b0a592651abfd3dcf6bb2715f31f2a636
-MISC metadata.xml 633 BLAKE2B acdcc4b02017e86b02be5f5e7fb56a292c5c0be9bceebf2a6d2caa4512ef240f5c1dc9d1ee6f48b1d8391556dccd81e94cda1e7233af5cd666536f5c6cb35a1e SHA512 c7b74768267009ac22c3ed90da61a60ea3ef6bb6a35c859f58ab2707af310f5201f35a526182402d669639b470ca47cd59f5a7b820b170122c4989b15f960fcc
+MISC metadata.xml 629 BLAKE2B 378a7cf4218c3c968ba0f84bb3eec0b46949131cc8db7e741d3c8ac14525527bff1269d46e41565e34d9c47e81d40caf2b5d80e433e7a47593085395a9f714f2 SHA512 42352511f0085a00f5ee07f06358110cfe1d5318eb2ea819c288ca37cf5885d14f74511037d672c4e71e8ff4a8d8d07ab4dbd522ebff4af5c9d19f4c751ebc0c
diff --git a/media-sound/spotify/metadata.xml b/media-sound/spotify/metadata.xml
index a8c59b0ec70a..64b7b60216ed 100644
--- a/media-sound/spotify/metadata.xml
+++ b/media-sound/spotify/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <use>
-    <flag name="local-playback">Allows playing local files with the Spotify client</flag>
-    <flag name="pax-kernel">Triggers a paxmarking of the main Spotify binary</flag>
-    <flag name="pulseaudio">Controls the dependency on pulseaudio or apulse</flag>
-    <flag name="systray">Pulls in dependencies needed for systray support on some desktop environments</flag>
-  </use>
-<maintainer type="person">
-<email>prometheanfire@gentoo.org</email>
-<name>Matthew Thode</name>
-</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<use>
+		<flag name="local-playback">Allows playing local files with the Spotify client</flag>
+		<flag name="pax-kernel">Triggers a paxmarking of the main Spotify binary</flag>
+		<flag name="pulseaudio">Controls the dependency on pulseaudio or apulse</flag>
+		<flag name="systray">Pulls in dependencies needed for systray support on some desktop environments</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-sound/tagtool/Manifest b/media-sound/tagtool/Manifest
index 8eca902bf1ac..181642f5b1cd 100644
--- a/media-sound/tagtool/Manifest
+++ b/media-sound/tagtool/Manifest
@@ -1,4 +1,5 @@
-AUX tagtool-0.12.3-underlinking.patch 2714 BLAKE2B 5576cab572d24cfd30fd2ca20f057daa0aa08c82f889c0f9e2c1fad3e72527579ad24a608d80c6b6b66abb0ba26704ebb7778620bcd1159fbc80259dc6cc6707 SHA512 679754976a0bd4f8e64bce1363d74bb783265718ba7d76f5d4101df72214e740ca5e50af9bd0798230e57ec8647bb5c10f8a39b86bd57df4df52276cb59053f0
+AUX tagtool-0.12.3-QA-desktop.patch 242 BLAKE2B 1ed0f06a9508a57f88156f45897215bb4d5bc6a95f9d591f0952dde29c911ae4132d99f77ae457d5f35c3fb426045819f8aec46b892af043a4720dad866cbc1b SHA512 ea60592b98d31270897e855cfa5ea633988a9d8e4d155a421593ac08799a20efb402d574e2bd75d0dccf6e890b50224323354e7a5275119f7dadb2b0d91e237c
+AUX tagtool-0.12.3-autotools.patch 2870 BLAKE2B a1c03faef377af6a3d51a5c2ffd766a4857d71b12e8ec3727f2e3ab11975f88d7e683c91ed130bfc7d35d60f0de02fb3e12df2a5d81cfcb0f3e05ac4075dde62 SHA512 ded7531f36334487c1c05ac2516077ff5e3df539bcfc3faa7513ac1668d3c601db529e74676e351dee2c9785738d4791d44a6f15183760dbe534247e98c198e1
 DIST tagtool-0.12.3.tar.bz2 303743 BLAKE2B 58186540d9495d7a4d03bae2433822d20b9a578f279229ea267c17039a87f3dcc5fbbb105a6cd67e177ebd48ca2bf9af893013e4cf60b64b414de71633306697 SHA512 f32cf8ab072b9e8f52c5afd27e93f348a6d573085f71efedf81764a2d20941e580583c6536d420f25956eae84dcb6d1930229e60bc068ec7948247cfa64ff385
-EBUILD tagtool-0.12.3-r1.ebuild 1050 BLAKE2B d5b4cf9fd64da8443a5e51e3321c1d2ede479b5c9750587e7cfed433902322d88bf1e95854c217574330b4e25e45aded015d01e5dc313f9bca1d9afc8079e6fe SHA512 26c3af16b805fd21a7231bd943d8861cc3eb5053f144456a8f6859f0660a7cdea2256000e21dfe1526f2e2d474fb488666bbd5e6db6936b833c17416be565b78
+EBUILD tagtool-0.12.3-r2.ebuild 954 BLAKE2B a7a98d889735f9c790dd56106348303d3baf711f88a3a0659e7c6cfc43e7baa5850c290ba9bf071d1ed6427b4c464789a105801fecb6581eaa82c2f6442711fd SHA512 f2edc2128b211a8a75583c6a00b62339e214f8dcf643b36ec06e626d825f74eae3d53784c0fb45875af40d1973a035a9509cef9c31803d252bc97ead70ee0d5b
 MISC metadata.xml 331 BLAKE2B d6551557a943009e85384db344db0220d153b4a44e14d463d04da0c0e73beeceae83f4d0cca15b57e985d10fb542af494be8769137f73430f0f8105a96a8af52 SHA512 25559a24e503a70f044f7937731fb4e1003409fa9c1c0d05909388e4f630c0e0414bd94148b163130ca7bb2430c19343558b53867ee5b423532a69cb3f91f23f
diff --git a/media-sound/tagtool/files/tagtool-0.12.3-QA-desktop.patch b/media-sound/tagtool/files/tagtool-0.12.3-QA-desktop.patch
new file mode 100644
index 000000000000..50c290d0ee15
--- /dev/null
+++ b/media-sound/tagtool/files/tagtool-0.12.3-QA-desktop.patch
@@ -0,0 +1,10 @@
+--- a/data/tagtool.desktop.in
++++ b/data/tagtool.desktop.in
+@@ -3,6 +3,6 @@
+ _Comment=MP3 and Ogg Vorbis tag editor
+ Exec=tagtool
+ Icon=TagTool
+-Terminal=False
++Terminal=false
+ Type=Application
+ Categories=Audio;AudioVideo;AudioVideoEditing;
diff --git a/media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch b/media-sound/tagtool/files/tagtool-0.12.3-autotools.patch
index 9569ad2fbaf5..40d1f5e80441 100644
--- a/media-sound/tagtool/files/tagtool-0.12.3-underlinking.patch
+++ b/media-sound/tagtool/files/tagtool-0.12.3-autotools.patch
@@ -1,10 +1,11 @@
-Fix underlinking issues caused by missing libm and libogg linking
-Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=513012
+* Fix underlinking issues caused by missing libm and libogg linking
+  https://bugs.gentoo.org/513012
+* Fix spurious test failure caused by incomplete POTFILES.in
+  https://bugs.gentoo.org/631236
+* In addition, fix nonidiomatic AC_ARG_ENABLE option handling.
 
-In addition, fix nonidiomatic AC_ARG_ENABLE option handling.
-
---- tagtool-0.12.3/configure.ac
-+++ tagtool-0.12.3/configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -13,20 +13,16 @@
  
  
@@ -57,8 +58,15 @@ In addition, fix nonidiomatic AC_ARG_ENABLE option handling.
  
  AM_CONDITIONAL(ENABLE_MP3,    test "$enable_mp3" = "yes")
  AM_CONDITIONAL(ENABLE_VORBIS, test "$enable_vorbis" = "yes")
---- tagtool-0.12.3/src/Makefile.am
-+++ tagtool-0.12.3/src/Makefile.am
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -22,3 +22,4 @@
+ src/vorbis_edit.c
+ src/vorbis_edit_field.c
+ src/vorbis_file.c
++src/vcedit.c
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -28,7 +28,8 @@
  vorbis_sources = vorbis_file.c vorbis_file.h vorbis_edit.c 		\
  	vorbis_edit.h vorbis_edit_field.c vorbis_edit_field.h vcedit.c 	\
diff --git a/media-sound/tagtool/tagtool-0.12.3-r1.ebuild b/media-sound/tagtool/tagtool-0.12.3-r2.ebuild
index be7039a613eb..bdd326c02eb6 100644
--- a/media-sound/tagtool/tagtool-0.12.3-r1.ebuild
+++ b/media-sound/tagtool/tagtool-0.12.3-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -15,21 +15,20 @@ KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="mp3 +vorbis"
 REQUIRED_USE="|| ( mp3 vorbis )"
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+	x11-libs/gtk+:2
 	>=gnome-base/libglade-2.6
 	mp3? ( >=media-libs/id3lib-3.8.3-r6 )
 	vorbis? ( >=media-libs/libvorbis-1 )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-underlinking.patch
+	"${FILESDIR}"/${P}-autotools.patch
+	"${FILESDIR}"/${P}-QA-desktop.patch
 )
 
 src_prepare() {
-	# QA fix for wrong boolean value
-	sed -i -e 's/Terminal=False/Terminal=false/' data/tagtool.desktop.in || die
-
 	default
 	eautoreconf
 }
@@ -43,9 +42,8 @@ src_configure() {
 src_install() {
 	emake \
 		DESTDIR="${D}" \
-		GNOME_SYSCONFDIR="${D}/etc" \
-		sysdir="${D}/usr/share/applets/Multimedia" \
+		GNOME_SYSCONFDIR="${ED}"/etc \
+		sysdir="${ED}"/usr/share/applets/Multimedia \
 		install
-
-	dodoc ChangeLog NEWS README TODO THANKS
+	einstalldocs
 }