gentoo resync : 11.05.2021

34 files changed, 504 insertions, 164 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 6fc16907a8a1..df6f403c05a4 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/bpmdetect/Manifest b/media-sound/bpmdetect/Manifest
index 918945a6c57c..1c99b2ab5188 100644
--- a/media-sound/bpmdetect/Manifest
+++ b/media-sound/bpmdetect/Manifest
@@ -1,3 +1,4 @@
+AUX bpmdetect-0.7.0_pre20170810-gcc-11.patch 1088 BLAKE2B d904b707ab056ce4aed215746111793b066e00805dd3ed112987427f0b19cd418f2e95977ea6f8b3abe1fd22fb0d8c53dddf69677ef0de3f06da4ae09340dd04 SHA512 69fe2da55b51ef3d2f6b8e9f2b969e931ced80967db880b270fc6e27a02ed5c26ae13062fc6889574b59687ee1c4ae852df641d6cc29cc0537c8ec198ddce852
 DIST bpmdetect-0.7.0_pre20170810.tar.gz 257777 BLAKE2B 8a6cfa43b70883d3bf03328c9e52a642140c5a25cd72ea5a9515394551e2ae108135b284b788e12a53e79cb0e2fd916d35a27d743558abb996ad5eb5db7beb45 SHA512 a2bbb67c2e5c46b08396e85fd4b91a5fa8622222929a4a67abdcb4587f04f1d8f40414800cb476f7aaa66d95571dd2d65332e48ed639b621a4351f70ab545779
-EBUILD bpmdetect-0.7.0_pre20170810.ebuild 741 BLAKE2B aa0352300404f18fdd9dc91844decb78a1d539d64f075563b07f897a550eff5e18faf409024c6db8e6216cf97a062c2b5fd408123f7c25c0dc185ad3cb092dca SHA512 7cbc6820b5e3ba523d25b59824a45111ca1211de5529a4bdddcf337e8e2a3021c5204c185e72174fc3ea6edd979a62be55fa349be6c812fecb565e0d128914af
+EBUILD bpmdetect-0.7.0_pre20170810.ebuild 784 BLAKE2B 431f5d70df8580ec226aebf70cc7839490b98a0d65e7609ed22979d206ecc342db9926b10805d6f405f35989a3bdaeecb1169cf4145b0d2e55f64c706515ac23 SHA512 5ab4a6d74b62fa3dc738e400dbfef51d7c02d3baba2ac1a15b186aeee68930aefd32accc05dc2cc2e10f607c18f324443807dad2aa8375ac746700831b178d95
 MISC metadata.xml 332 BLAKE2B 85eb37ef9ed0b6efcb8611d66b7d8087424e848bd60b819dc3b095480066de0d64d98fc95de3324542e160bdfd9007c80c6391327681df383c03bac26c83754c SHA512 7a6f93e001d436f33d8ee55b467eb2e398b65193ee0c77c0d087916372cba7a5b9693d15aec27e738ea05d54901c1f4f855722384bb9f86d59e10b7d6b6b17d7
diff --git a/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild b/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild
index a94e3a52f961..5e436f36d0e5 100644
--- a/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild
+++ b/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild
@@ -32,6 +32,8 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=("${FILESDIR}"/${P}-gcc-11.patch)
+
 src_install() {
 	einstalldocs
 	dobin "${BUILD_DIR}"/src/${PN}
diff --git a/media-sound/bpmdetect/files/bpmdetect-0.7.0_pre20170810-gcc-11.patch b/media-sound/bpmdetect/files/bpmdetect-0.7.0_pre20170810-gcc-11.patch
new file mode 100644
index 000000000000..9264d92f8602
--- /dev/null
+++ b/media-sound/bpmdetect/files/bpmdetect-0.7.0_pre20170810-gcc-11.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/740328
+https://github.com/Tatsh/bpmdetect/pull/2
+
+From 4dbca9ede5126da8d6ce2949cd8db53096fb03fe Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 9 May 2021 13:12:20 +0100
+Subject: [PATCH] src/trackmp3.cpp: fix build against gcc-11
+
+On gcc-11 build fails as:
+
+```
+../src/trackmp3.cpp: In member function 'int TrackMp3::findFrame(int)':
+../src/trackmp3.cpp:458:13: error:
+  ordered comparison of pointer with integer zero ('MadSeekFrameType*' and 'int')
+  458 |     if (temp>0) {
+      |         ~~~~^~
+```
+
+The fix changes pointer-to-int comparison to NULL comparison.
+
+Reported-by: Agostino Sarubbo
+Bug: https://bugs.gentoo.org/740328
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/trackmp3.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/trackmp3.cpp
++++ b/src/trackmp3.cpp
+@@ -455,7 +455,7 @@ int TrackMp3::findFrame(int pos) {
+             temp = m_qSeekList.at(--frameIdx);
+     }
+ 
+-    if (temp>0) {
++    if (temp) {
+         return temp->pos;
+     } else {
+         return 0;
+-- 
+2.31.1
+
diff --git a/media-sound/drumstick/Manifest b/media-sound/drumstick/Manifest
index f561406bd289..d89051150931 100644
--- a/media-sound/drumstick/Manifest
+++ b/media-sound/drumstick/Manifest
@@ -1,5 +1,3 @@
-DIST drumstick-2.0.0.tar.gz 1865424 BLAKE2B ee87dd222add121c8a6faaac5b8a755e2d6f7b257db890f6bbdbf5380d9771dc5b65a73d716f0cfd343a46c4227adcd2d85e4a359fcaa445b2291dc1ac188cfe SHA512 aacb4ca5a3354da6380ba146ee7ba57e646d19fe6a5d083e00b795221453a87d1baf25965784e7c8a97b9b00a3dda643bce144f62b6a27118f081c681089381a
 DIST drumstick-2.1.1.tar.gz 1959938 BLAKE2B 010072faac3819d326659421d7c2c32345f8f5cf3fdcf390b80f57f942e786d569feb19319eca21ca5346ea1f990f54353afc52ecad4fbc6b631065e7b3ed751 SHA512 764b2db79f49f1ab428f472a2f4715c1ab5a9d948af43c77befc2e758b43c604673c7c0c39779a63240a31d6169f648a8c67680c1a42891c6a6cdbd2a481f557
-EBUILD drumstick-2.0.0.ebuild 1557 BLAKE2B 9c5e9e54433e49d8af60c992c3779ade767b5ba65176f324ba6639709687af037a4ae2107c1d1fc769d1df9c04c03065fa50187afa73fe4faec2b97b94a22f23 SHA512 fa95c6d86aeecfc4d2f895c5d671776d304481d7c3a96c256a39475ae03446e65a4d18f78ee8bcecb7d629cfb323092bc606236c944f3af9922bbe561c622a35
-EBUILD drumstick-2.1.1.ebuild 1476 BLAKE2B bd05362b139984277adfd03d982c2cb61bf95d34b2e85291c92ae42b0220c74066b8adcf0cd88287b7fda2a18a69783c4409684956e3b09a852023008c0bd438 SHA512 624cb7035c87f78c225d282bec57887d6bea741732d7b758f5f4a8e8781ada342ae4d0599fcea1476c66fe27b59befd98f0c0a7916ca2ab5ebb3d8283e68c9eb
+EBUILD drumstick-2.1.1.ebuild 1474 BLAKE2B 07193c21cb0472ca1c4a2dd7c7f5aa61000f8c8355a30250fdc02b5dd618db289b74b88bda95fa0f9eff5a182e92b67b5c57891d0cd2b265fc7d968f915674b8 SHA512 e88f66b0013ebf2e6bca1cdbac194a8f8b5363503119bd782b862bbbf7430892f8ed428822220764925a0528c5b4f03f5dec245c93e89d1243bca919a02170da
 MISC metadata.xml 543 BLAKE2B ab65d693031858992d6015da0dd074b2fe2975d50136fb105674c9f51b694d6b41e3d0b6f93e2b0928dac68aabd32cf1b4b3081d460639cbe6bd3e8b3a045c46 SHA512 b91230be7ae7d1cce86bba1b2706d88fb4beab8a37f1faef5d4ce79627bea14798d508269c6fe0b132450be6698a9466987b6d71d12006e09f58dc25404e784f
diff --git a/media-sound/drumstick/drumstick-2.0.0.ebuild b/media-sound/drumstick/drumstick-2.0.0.ebuild
deleted file mode 100644
index 7aba3ea8a9a5..000000000000
--- a/media-sound/drumstick/drumstick-2.0.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg
-
-DESCRIPTION="Qt/C++ wrapper for ALSA sequencer"
-HOMEPAGE="https://drumstick.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc fluidsynth pulseaudio"
-
-BDEPEND="
-	dev-libs/libxslt
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-	x11-misc/shared-mime-info
-	doc? (
-		app-doc/doxygen[dot]
-		app-text/docbook-xsl-stylesheets
-	)
-"
-DEPEND="
-	dev-qt/designer:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	media-libs/alsa-lib
-	fluidsynth? ( media-sound/fluidsynth )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS README TODO )
-
-RESTRICT="test"
-
-src_prepare() {
-	cmake_src_prepare
-
-	if ! use doc ; then
-		sed -e "/find_package(Doxygen/s/^/# disabled by -doc/" \
-			-i CMakeLists.txt || die
-	fi
-
-	if ! use fluidsynth ; then
-		sed -e "/pkg_check_modules(FLUIDSYNTH/s/^/# disabled by -fluidsynth/" \
-			-i library/rt-backends/CMakeLists.txt || die
-	fi
-
-	if ! use pulseaudio ; then
-		sed -e "/pkg_check_modules(PULSE/s/^/# disabled by -pulseaudio/" \
-			-i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=OFF
-		-DUSE_DBUS=ON
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doxygen
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	cmake_src_install
-}
diff --git a/media-sound/drumstick/drumstick-2.1.1.ebuild b/media-sound/drumstick/drumstick-2.1.1.ebuild
index 1459d1b265ae..dd7730300b59 100644
--- a/media-sound/drumstick/drumstick-2.1.1.ebuild
+++ b/media-sound/drumstick/drumstick-2.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc fluidsynth pulseaudio"
 
 BDEPEND="
diff --git a/media-sound/gigedit/Manifest b/media-sound/gigedit/Manifest
index 3b21f68bf369..a224bae8acbf 100644
--- a/media-sound/gigedit/Manifest
+++ b/media-sound/gigedit/Manifest
@@ -1,4 +1,6 @@
 DIST gigedit-1.1.1.tar.bz2 1146369 BLAKE2B 3a8a42db746d9fdaf713ae29e238c6f0fddcf4f5c1542fe980fb26babd28707bd3831db4f0d9e8aa58621bf1c7e08113315893515e1f445c5be9600e4e1bef12 SHA512 223702628e83e12a292f902e32baa355aca31ee82f1f8b9fed586ec9c0aaec56956d7bdc958238ec64e79b2f4c5ef9246face669b2b3645046e51d8c8289a964
-EBUILD gigedit-1.1.1-r1.ebuild 1109 BLAKE2B 211338b2f7fcfda81fbb1b5e0a387da6eb770a012904545a3ac40a2b1289e479aed65e225d65ca4149d765f6ae5dbd01da2fbf0f3c004312bc06424083d45014 SHA512 252d012c3e22d00c208858c61fded2e0699e502b5dd78d023e5e65b8247f587e6823a2e5de70adea00573a814aeadf937dc103af403212b57209f19f6cd1a769
-EBUILD gigedit-9999.ebuild 1108 BLAKE2B 9ccd9104a94171f655b9a8063b522586d8c946875b38fd367a2436d2e6b0ef271ca54c2f733f1abd3f7e23312afdd052a294e58dd39b1d9de797c2cd4411cbc0 SHA512 5262aaf1758b25adf5a5e18307bf2f2eaaf537be384d44c707620e04245a31ec01a7ce529f17041ada2e8786f260a7a09b137aeaffea6bab30ae1b7147962b7c
+DIST gigedit-1.2.0.tar.bz2 1174502 BLAKE2B 049e4c60b345c192255669a71588df1e2905590f95351d8a79134b210d03087ac9cc33f12cbf2e38208b95ad452f299c78877632989cd914d98a05c5967087d5 SHA512 b991a5193af34be70db6eb8c18fc58e01b822b6997bfc6c3ee06eca42f57375d341316e8abc594824668c7cb916b0643a1ee1b5c34426bf3ec5e202dfc565c8f
+EBUILD gigedit-1.1.1-r1.ebuild 965 BLAKE2B e1426f55ad36985ae38131dc1db9936e96b8736808e9fb1a3ebf54e8ce05a09e624c7faf998442307e7d949f24afdec6848bf1dcc08f332feda94d7eedbf3239 SHA512 65b7981f73005785ae58383c83162f4f21e301f194d90d3bb488db4ab1ff86ed29bf85586418149df20555509df9764ad000e83d2777723a1eebca14f3639432
+EBUILD gigedit-1.2.0.ebuild 1026 BLAKE2B 497454e945acca12e7c65615d6e6b93d2473b7a6ea8010e5a835ccb4e422901c69f95396300ae50c92d36b45a2033acc877cf43a64942a0e3fd0396eb4a2e532 SHA512 e9aa456753499df0363eba63b016667b2922041297eb98f39137788d82880d13bacccb54fca1546d597f423e1561fdd818d82e1468f792f3e6b4ed6df8430f7d
+EBUILD gigedit-9999.ebuild 1012 BLAKE2B fec2f13b93378b6f01f76e8ffdb2c66cc94b8e5b5a489d17da5bff57dc1816e07bcdb152944ae200f6677027d95d569f62d4928befcdf9fa9f2e6d70cf10cd45 SHA512 820026ae8c6914b7ea4eb90354c87e707027fc61e0fedcaafc3410a747149ccc636289b49ea48de37c674cfbb204b4d4e8eede2a286b2fcb72b98197c6e09bc0
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/gigedit/gigedit-1.1.1-r1.ebuild b/media-sound/gigedit/gigedit-1.1.1-r1.ebuild
index e8c0ba9adca2..8c8ab2c48999 100644
--- a/media-sound/gigedit/gigedit-1.1.1-r1.ebuild
+++ b/media-sound/gigedit/gigedit-1.1.1-r1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools desktop xdg
+
+inherit autotools desktop flag-o-matic xdg
 
 DESCRIPTION="An instrument editor for gig files"
 HOMEPAGE="http://www.linuxsampler.org/"
@@ -11,43 +12,33 @@ SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE=""
 
-BDEPEND="
-	sys-devel/gettext
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-"
-CDEPEND="
+RDEPEND="
 	dev-cpp/gtkmm:2.4
 	>=media-libs/libgig-3.3.0
 	>=media-libs/libsndfile-1.0.2
-	>=media-sound/linuxsampler-0.5.1
-"
+	>=media-sound/linuxsampler-0.5.1"
 DEPEND="${RDEPEND}"
-RDEPEND="${CDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig"
 
 src_prepare() {
 	default
-
 	# docdir is not propagated there
-	sed -i "s%\$(datadir)/doc/\$(PACKAGE)%\$(datadir)/doc/${P}%g" doc/quickstart/Makefile.am || die
+	sed -i '/docdir/d' doc/quickstart/Makefile.am || die
 	eautoreconf
 }
 
 src_configure() {
+	append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/linuxsampler"
 	econf --disable-static
 }
 
-src_compile() {
-	emake LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/$(get_libdir)/linuxsampler"
-}
-
 src_install() {
 	default
-
-	einfo "Removing static libs..."
-	find "${D}" -name "*.la" -delete || die "Failed to remove static libs"
-
 	make_desktop_entry gigedit GigEdit "" "AudioVideo;AudioVideoEditing"
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-sound/gigedit/gigedit-1.2.0.ebuild b/media-sound/gigedit/gigedit-1.2.0.ebuild
new file mode 100644
index 000000000000..4d2a0ef9057a
--- /dev/null
+++ b/media-sound/gigedit/gigedit-1.2.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic xdg
+
+DESCRIPTION="An instrument editor for gig files"
+HOMEPAGE="http://www.linuxsampler.org/"
+SRC_URI="http://download.linuxsampler.org/packages/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-cpp/gtkmm:2.4
+	media-libs/libgig
+	media-libs/libsndfile
+	media-sound/linuxsampler"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	# docdir is not propagated there
+	sed -i '/docdir/d' doc/quickstart/Makefile.am || die
+	# file missing in pot file
+	echo src/gigedit/ScriptPatchVars.cpp >> "po/POTFILES.in" || die
+	eautoreconf
+}
+
+src_configure() {
+	append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/linuxsampler"
+	econf --disable-static
+}
+
+src_install() {
+	default
+	make_desktop_entry gigedit GigEdit "" "AudioVideo;AudioVideoEditing"
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-sound/gigedit/gigedit-9999.ebuild b/media-sound/gigedit/gigedit-9999.ebuild
index 6aee05e17e9a..aaef3a74634e 100644
--- a/media-sound/gigedit/gigedit-9999.ebuild
+++ b/media-sound/gigedit/gigedit-9999.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools desktop xdg subversion
+
+inherit autotools desktop flag-o-matic xdg subversion
 
 DESCRIPTION="An instrument editor for gig files"
 HOMEPAGE="http://www.linuxsampler.org/"
@@ -10,44 +11,35 @@ ESVN_REPO_URI="https://svn.linuxsampler.org/svn/gigedit/trunk"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
 
-BDEPEND="
-	sys-devel/gettext
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-"
-CDEPEND="
+RDEPEND="
 	dev-cpp/gtkmm:2.4
-	>=media-libs/libgig-3.3.0
-	>=media-libs/libsndfile-1.0.2
-	>=media-sound/linuxsampler-0.5.1
-"
+	media-libs/libgig
+	media-libs/libsndfile
+	media-sound/linuxsampler"
 DEPEND="${RDEPEND}"
-RDEPEND="${CDEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	dev-util/intltool
+	virtual/pkgconfig"
 
 src_prepare() {
 	default
-
 	# docdir is not propagated there
-	sed -i "s%\$(datadir)/doc/\$(PACKAGE)%\$(datadir)/doc/${P}%g" doc/quickstart/Makefile.am || die
+	sed -i '/docdir/d' doc/quickstart/Makefile.am || die
+	# file missing in pot file
+	echo src/gigedit/ScriptPatchVars.cpp >> "po/POTFILES.in" || die
 	eautoreconf
 }
 
 src_configure() {
+	append-ldflags -Wl,-rpath,"${EPREFIX}/usr/$(get_libdir)/linuxsampler"
 	econf --disable-static
 }
 
-src_compile() {
-	emake LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/$(get_libdir)/linuxsampler"
-}
-
 src_install() {
 	default
-
-	einfo "Removing static libs..."
-	find "${D}" -name "*.la" -delete || die "Failed to remove static libs"
-
 	make_desktop_entry gigedit GigEdit "" "AudioVideo;AudioVideoEditing"
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/media-sound/gstreamripper/Manifest b/media-sound/gstreamripper/Manifest
index eef347236c31..e6098599935c 100644
--- a/media-sound/gstreamripper/Manifest
+++ b/media-sound/gstreamripper/Manifest
@@ -1,3 +1,3 @@
 DIST GStreamripperX-0.2.tar.gz 187186 BLAKE2B 66beccb382316331efcea25b5c97d31a3a7c8e59c3f50026909872f761704182bdca1ec919a4350d8324688634c3b9e654e86db1c750cf0992aa538db9c7939a SHA512 6b4253d7b9f02bcba3e5815390bfc284e3d04f5518055d650efc61e650c6c7a8a6bcf0d86cbe56fd8b59969d77e83aab6d09c0fe12d0e77c621e91ed5ce3253c
-EBUILD gstreamripper-0.2.ebuild 834 BLAKE2B 2dfd1606de689dc0b72af92a57956c7bc868ac66ea70876d978f8217d49d7db16ee8cd73cf7fcb65d140f4b9a3bd32e9877ba35a8e597c47dd77ec8d88647973 SHA512 9adcff6ee8bcabc51d59f504b932131e26828660a5cf75d7f3ebb5130f5cce602f6fabd64c272c440d682b40d483f7014370a155e297c9004a2bab5e3d9e9fab
+EBUILD gstreamripper-0.2.ebuild 825 BLAKE2B 288c02c93b509d55939fdb81eaa98708e4559b40a79d469b51c9a40bd5e5cbe4ca4f057b5c380f753b975f11cbaafb1b9095a88e7e061355f2fe8560fad0c870 SHA512 a7635844356d65546321c2072f6f47f142b1b48a624008ffaec17b613b1be8915f308c55f03764affb560a1a68750efc55053dc3802f4f6f715632e74917adc7
 MISC metadata.xml 336 BLAKE2B d3da99e54752acee38135b0eeac55d1aa5148c2ad67440b7f7264e84cb07ac519f0312ea61cc73a7f8cbe7002b304870ffb9fff79144e4eabf207f1b0dab1a0d SHA512 62020c37a8649f01b5dafecc35d4bf614c1628e725713f36923b58956a1461ba6f83c8a64fd714b895ff759c105d9ff0069e85a41a72e2fbf5da7e01aeed8f1c
diff --git a/media-sound/gstreamripper/gstreamripper-0.2.ebuild b/media-sound/gstreamripper/gstreamripper-0.2.ebuild
index 04fce64ff8b1..38325af58bec 100644
--- a/media-sound/gstreamripper/gstreamripper-0.2.ebuild
+++ b/media-sound/gstreamripper/gstreamripper-0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,11 +10,11 @@ MY_P=GStreamripperX-${PV}
 DESCRIPTION="A GTK+ toolkit based frontend for streamripper"
 HOMEPAGE="https://sourceforge.net/projects/gstreamripper/"
 SRC_URI="mirror://sourceforge/gstreamripper/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
 
 RDEPEND="
 	x11-libs/gtk+:2
@@ -22,8 +22,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
-
 src_compile() {
 	emake CFLAGS="${CFLAGS}"
 }
diff --git a/media-sound/jack_capture/Manifest b/media-sound/jack_capture/Manifest
index 52a274a981c8..85579c3b4c55 100644
--- a/media-sound/jack_capture/Manifest
+++ b/media-sound/jack_capture/Manifest
@@ -1,6 +1,7 @@
 AUX jack_capture-0.9.73-Makefile.patch 1046 BLAKE2B 5a87ea22918f46c625b23715b3bccabec6380e68374d877f6b1c3b9bb838fc3b5805c84c8a3acce3eb0cc2b7de6374a9a0124fad040c31ed8ac776972c43b7ec SHA512 8cfd1322299d314021ce58b7500ae538a43073fcc1df6514fd879d3b47db53069870846f450fb097a5a738f92dcac14e052821aa07ee1364cca648d94a47c754
+AUX jack_capture-0.9.73-avoid-custom-asprintf.patch 1800 BLAKE2B 78e1389865fd741cf6153a6a2f88996e9c9108c31a5239fda85de49a3217547117baf7d70cda213c7718e103d65f3f6ab9325b134634ac5ab1351d17727bfe43 SHA512 67c30d0d13070852af8fe0b1bc63f0e7061fb005c0c60331ac11c29162f0c256907b0e5404a2915e2a36474774cbacedc3336016ab61d7bf92b1c36ae03e5d29
 AUX jack_capture-0.9.73-r1-Makefile.patch 1193 BLAKE2B be2301633901dc63853292c014adf76e0999184bf331983036116a4591e83233f05a1ff6299691c2a3409bff7223acfacffe36aca643e26e2c689ffbb4b2ec67 SHA512 b7ac7d9c040358309c3652b9c620b805b303852d6c978042790200555013077455caaa63a0c877c863b968500396ec2d3cac08b6b7cb4d7694e0344926b6a9c5
 DIST jack_capture-0.9.73.tar.gz 63676 BLAKE2B 0ea944dc544f237501485c5d89299c2d1e202da2d1e3c4ef7922f4d2d49af7f0c871f077613da63ee3cb1a457a2a4edf4c1ab4b6b0625b4cb455db56d880e6f5 SHA512 eecab2e26d5e83b65adf386d6fb38f2d9169cf1574e462ec455367f7d98f4f4d5a9d0766b9c572cfdcb43c55ae914bb8a2222267842c9912e2afe13c1f7b0038
-EBUILD jack_capture-0.9.73-r1.ebuild 1105 BLAKE2B 5a1d6c2cf6240d779cfcf654e46a4e9c48665d97307fa0e28bc33738690cd0583206b688d8fc9c0cd3f89469ea6625ec2728136945ad1822058a337c2c3158d7 SHA512 1f9f09867157bb520dcb599b85e2312ff1af759b63c43977b4303c85726c759a44378aa8394d5e47acb4a0a3ac33ce523ec6b218d650b0252b8ee9235fb9fe64
+EBUILD jack_capture-0.9.73-r1.ebuild 1153 BLAKE2B 0502175c757bd2f82dc2534249247a8dbc26e0eea04f908e210a51d92bb3673cd03f1cb1a57e6e4390bf7889e06d0a114f1e7e2247cf35b764a06f784fea4557 SHA512 77c289a9f62a049f94a5d19eded20b78a21a317fda9f4f5ea608bb28232f6f89f4a67860f12682d0e4f26c985490d2fe0c7be15533fc2c7476fd6dd94bf1093d
 EBUILD jack_capture-9999.ebuild 1087 BLAKE2B ceb60e4476202319d11924b209c7858973e584590eade242d1508979335c9cd6723135f6d1a6da4cb70699c998cdf9429bcdee39aac7a390876e01fa5a4186e1 SHA512 39102ee68e3cff459954b469e4d38dce3382b39dd73d9b7eda0d152eaa2a46add6c28c22518f2ec8cd24540b4ffd52547e105a5fbd95fb0d25e6813d76d4b5b0
 MISC metadata.xml 361 BLAKE2B 87172f0c67cc6e071e287d233f2fcb91be1d7207fb7c321b002145cf0812a3b44cf317c0797aa281d199639d1a57670e5a1eb16d50160997882beece3e2539af SHA512 b410a8813b1a48dfc920e97401bd31f38349ef588e9fa770da53ed541b87a7da895465712d679bca09c4e27b2caf9ed84a553c330e48f6307fa91471de514513
diff --git a/media-sound/jack_capture/files/jack_capture-0.9.73-avoid-custom-asprintf.patch b/media-sound/jack_capture/files/jack_capture-0.9.73-avoid-custom-asprintf.patch
new file mode 100644
index 000000000000..6c4d32985b6e
--- /dev/null
+++ b/media-sound/jack_capture/files/jack_capture-0.9.73-avoid-custom-asprintf.patch
@@ -0,0 +1,68 @@
+diff --git a/jack_capture.c b/jack_capture.c
+index b2d15a1..ccbfa5c 100644
+--- a/jack_capture.c
++++ b/jack_capture.c
+@@ -20,6 +20,8 @@
+ 
+ #include "das_config.h"
+ 
++#define _GNU_SOURCE 1
++
+ #include <signal.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -900,54 +902,6 @@ static void stop_helper_thread(void){
+ /////////////////////////////////////////////////////////////////////
+ 
+ 
+-#ifndef __USE_GNU
+-/* This code has been derived from an example in the glibc2 documentation.
+- * "asprintf() implementation for braindamaged operating systems"
+- * Copyright (C) 1991, 1994-1999, 2000, 2001 Free Software Foundation, Inc.
+- */
+-#ifdef _WIN32
+-#define vsnprintf _vsnprintf
+-#endif
+-#ifndef __APPLE__
+-int asprintf(char **buffer, char *fmt, ...) {
+-    /* Guess we need no more than 200 chars of space. */
+-    int size = 200;
+-    int nchars;
+-    va_list ap;
+-
+-    *buffer = (char*)malloc(size);
+-    if (*buffer == NULL) return -1;
+-
+-    /* Try to print in the allocated space. */
+-    va_start(ap, fmt);
+-    nchars = vsnprintf(*buffer, size, fmt, ap);
+-    va_end(ap);
+-
+-    if (nchars >= size)
+-    {
+-        char *tmpbuff;
+-        /* Reallocate buffer now that we know how much space is needed. */
+-        size = nchars+1;
+-        tmpbuff = (char*)realloc(*buffer, size);
+-
+-        if (tmpbuff == NULL) { /* we need to free it*/
+-            free(*buffer);
+-            return -1;
+-        }
+-
+-        *buffer=tmpbuff;
+-        /* Try again. */
+-        va_start(ap, fmt);
+-        nchars = vsnprintf(*buffer, size, fmt, ap);
+-        va_end(ap);
+-    }
+-
+-    if (nchars < 0) return nchars;
+-    return size;
+-}
+-#endif
+-#endif
+-
+ #define ARGS_ADD_ARGV(FMT,ARG) \
+   argv=(char**) realloc((void*)argv, (argc+2)*sizeof(char*)); \
+   asprintf(&argv[argc++], FMT, ARG); argv[argc] = 0;
diff --git a/media-sound/jack_capture/jack_capture-0.9.73-r1.ebuild b/media-sound/jack_capture/jack_capture-0.9.73-r1.ebuild
index 17e85197eb3d..d8ddd678eb88 100644
--- a/media-sound/jack_capture/jack_capture-0.9.73-r1.ebuild
+++ b/media-sound/jack_capture/jack_capture-0.9.73-r1.ebuild
@@ -25,7 +25,8 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}/${P}-Makefile.patch"
+	"${FILESDIR}/${P}-avoid-custom-asprintf.patch"
 )
 
 DOCS=( README config )
diff --git a/media-sound/linuxsampler/Manifest b/media-sound/linuxsampler/Manifest
index 4e7b8757ed83..61167867c5e7 100644
--- a/media-sound/linuxsampler/Manifest
+++ b/media-sound/linuxsampler/Manifest
@@ -2,6 +2,8 @@ AUX linuxsampler-2.0.0-lv2-automagic.patch 929 BLAKE2B 11e2dac74d6e4bc76385544f9
 AUX linuxsampler-2.0.0-nptl-hardened.patch 654 BLAKE2B 1e3f06d78cce3a67847bf3bedbb40b4ee7d28d410997444506d21d4ed0e646106ddcc78c770c3e214d73e474e6138f436841d3ce1703c9da2f06df3df921e9ce SHA512 cc75f55d80264d939650ea87c967e206110ae07245ae8e00dd83bed63a4e0aa75aa2a18b3b384ca3557896e44b2a13bd34deb3cc6f5487d7516b09b2c05e1594
 AUX linuxsampler-2.1.1-fix-yyterror-not-declared.patch 427 BLAKE2B 017c8fd7e7343eb582a5fcbf083be3fa9fcb02fff69caace767534ee509215a835caf548cce73955295c39a6a42409e0caf3ec3e5752018235ccf2defe327b0f SHA512 6a89d17600eab3aac9b9a90899c441af1359b7798fe79ceed4e3acb624024e6285e56210b484f50fc03dfd7da4def2cfdb708adfd0526d84d9b041256fd6f4e6
 DIST linuxsampler-2.1.1.tar.bz2 1410461 BLAKE2B dacaab33601f25954ea1a3380c8e28358d2111b664982f25ec9cac46adb99241ecfd53101ca3b23428c1a16fcef738b1e7e481b1c7eeb6d9659773f5b8856b55 SHA512 3f172efe40bbe130a2ac09f9393a46a30cc327a6754a80fdb36e65276518ec82befa2075acc567ccd99c22d9859c1a65f58ff2ad7af70cd9e4649ae14fd5357c
+DIST linuxsampler-2.2.0.tar.bz2 1507276 BLAKE2B 9650938d0aace876e817884121b824713dd2f747505344d7895e7d99da62f2214fb4c4bf43c398f4e486202e23e7a57288e19734e8c565a917d823169deb717a SHA512 9015bb8d3af125e13c5c2ef3ae2d3987f7b7dda72e238cff25e622a3291019f5e392195dd27e7e783c70d877d9b267915fc443369eb17117e5eb7c54b8496c68
 EBUILD linuxsampler-2.1.1.ebuild 1771 BLAKE2B cc80a074fe0207af14bf0ff376ca725905489182eb7b66303548e9bc6aa84cde640777c20e69ef1032305693a39da3efb7f0e21977d5b48d77edbcfdde37f8a1 SHA512 5f94e326e83d9c9adf20d70d893262c44aeb2c0f9b178027348f053bcd6f7ddcbbce613db48e35d3b53582b81e1f5bbe410167746ccdeef817e5cc96411d7843
-EBUILD linuxsampler-9999.ebuild 1577 BLAKE2B e79cae44e8560f0e4790e595d77e34adf9d9c74f2ad99ac20c681a632adc5bb0ee38faf5d2af8c4893322548fb0d2ea4a1b3a25bce439ca766f679b493ff53c0 SHA512 016ac964bfb4eac8d3f32596d684e1e7432eabf53f4f8968ee33eec7a311fdbc71311c4040f1597ecee0a1a3487ec36cc313939c38a22938358fbfa3003cd8da
+EBUILD linuxsampler-2.2.0.ebuild 1736 BLAKE2B 4eb201a3026a0b354427f61ef28d033eeff6e62b9249ef3112f28d1c0ccdc054dd0e212655d6f353b581e48ee534d6d07d786994f0a98fd2628766389c59070d SHA512 c32b57b3d9803b820abb581a179c6d4851f011a7bafc6fe1d68bbcf5d1541d68fea81c18ffe2a6a728fccad89b9145641757faaf4a0451a6ee0a730bd398d3eb
+EBUILD linuxsampler-9999.ebuild 1563 BLAKE2B 9e429cc9f1877db28206ab161a952d3a0219a099a4d04aaa54f59a313ffbd4471a579a2e8b86d42c289af60da6518e7f2e6cdf7d01b8f30b5af39224aff81387 SHA512 cea0571ab48c8db627184052d56b9f0c8e6f3096d89dfff8ce2fcdf4a24e556b1cd06d75dc1b5baa5e50851d3bc12e3281f3c6d2d72347224d0b34da2455b3fb
 MISC metadata.xml 391 BLAKE2B 61588190c31aaa0c88b7f4ad84cb3fe01cc41e6bf8d6dc3c607647fb30a36557f373525bc69cd927fcb5a425633bd751bf5347862ce23fa07d945ae01dae3aed SHA512 06d0561b1b0689da35775b4483e6738eb98ee2c4f9773cdaa0220d3e200eb37c6760d58a9993a1dc4e2110adbddb1d2764425aac3619d8c1af715cc368fc4fc4
diff --git a/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild b/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild
new file mode 100644
index 000000000000..db469f65a3ab
--- /dev/null
+++ b/media-sound/linuxsampler/linuxsampler-2.2.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Software audio sampler engine with professional grade features"
+HOMEPAGE="https://www.linuxsampler.org/"
+SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa doc jack lv2 sf2 sqlite"
+REQUIRED_USE="|| ( alsa jack )"
+
+RDEPEND="
+	media-libs/libgig
+	media-libs/libsndfile[-minimal]
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	lv2? ( media-libs/lv2 )
+	sqlite? ( dev-db/sqlite )
+"
+DEPEND="${RDEPEND}
+	media-libs/dssi
+	media-libs/ladspa-sdk
+"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.0-nptl-hardened.patch"
+	"${FILESDIR}/${PN}-2.0.0-lv2-automagic.patch"
+	"${FILESDIR}/${PN}-2.1.1-fix-yyterror-not-declared.patch"
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	default
+	# Force regeneration of the file to let it build with all bison
+	# versions, bug #556204
+	rm src/network/lscpparser.cpp || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-arts-driver
+		--disable-static
+		$(use_enable alsa alsa-driver)
+		$(use_enable jack jack-driver)
+		$(use_enable lv2)
+		$(use_enable sqlite instruments-db)
+		$(use_enable sf2 sf2-engine)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake
+	use doc && emake docs
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( doc/html/. )
+	default
+	find "${D}" -name '*.la' -delete || die
+
+	# lscp files conflict with nilfs-utils, bug #556330
+	mv "${D}/usr/bin/lscp" "${D}/usr/bin/lscp-${PN}" || die
+	mv "${D}/usr/share/man/man1/lscp.1" "${D}/usr/share/man/man1/lscp-${PN}.1" || die
+}
diff --git a/media-sound/linuxsampler/linuxsampler-9999.ebuild b/media-sound/linuxsampler/linuxsampler-9999.ebuild
index bd097fd3cce7..d33e3b81f2f0 100644
--- a/media-sound/linuxsampler/linuxsampler-9999.ebuild
+++ b/media-sound/linuxsampler/linuxsampler-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,12 +16,12 @@ IUSE="alsa doc jack lv2 sf2 sqlite"
 REQUIRED_USE="|| ( alsa jack )"
 
 RDEPEND="
-	>=media-libs/libgig-4.2.0
+	media-libs/libgig
 	media-libs/libsndfile[-minimal]
 	alsa? ( media-libs/alsa-lib )
 	jack? ( virtual/jack )
 	lv2? ( media-libs/lv2 )
-	sqlite? ( >=dev-db/sqlite-3.3 )
+	sqlite? ( dev-db/sqlite )
 "
 DEPEND="${RDEPEND}
 	media-libs/dssi
diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index c2e6ac3495c7..0b04ef487b6c 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,9 +1,10 @@
 AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e30e29e6c4d6330cc298a568ee7dd7014af6b9c1f1c4d98b8c11c96da7f74660eb4b3b522f449e7a6a431addc SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59
 AUX mixxx-2.2.3-qt-5.14.patch 17550 BLAKE2B 3f5c16106bbda8e45f1180ef6f2323a3786ddb11f9a355fac57c545d71a1f5080ef39665011d41b4500643a4e33340851bb3d849d381874e4abf9ac42a18e85f SHA512 677d8e832aab28f21c2641b1a94fce6fa43d652ba76b580a8a7cb7911dc5e5fb788cdcf7825906e7894d90198433f96e421531af4e65bd7d16a8b16fcb68fb54
+AUX mixxx-2.2.4-fix-scons-compat.patch 744 BLAKE2B ffadce18947d538a8f614bc3c53f7e4da5020f2ef87b06e258d864a33fee64f059db5789eff0ad5524161bcbc93565fc5af58e546eff913c5305c5f23871707a SHA512 29bb141ac45fb89cf84018fe1b7ffacbe856d1d2aa6e2eede49b699dd9541f8a25bebc7d3945f6ce044b2a65f134d43142279ef9dd2a2e87c6300e5591634b52
 AUX mixxx-2.2.4-metadata.patch 848 BLAKE2B c5acec33886b585572426da7dd56c147c64683ab5f30b5f8023836330b365bbd17cd490cc70ae383c2159b18fcf9b582f6020b04df20dc18c49c0489c59c6f90 SHA512 d09fbb8171e84b0a0fb23249efb9485140e080e3abaa06c4c59ce1b1110d84f6d6e8c421207ffb214738ddf3e23739db04257bef212728631f9a740693b5c8f8
 AUX mixxx-9999-docs.patch 469 BLAKE2B 6daf15a450b79fb85deb9a218c5762e26bc3a88e92f96fc73575ac64eb9731945e3fc95d63e3f4b391f07263dc2ec56820ca486725971cf35ee223afd30dede9 SHA512 76d18e26ccdfb0bfda9bb7563a5012e567b2546dee8014da9070a8654d93fd548475293ae9cbd1914407727b146738e6ba5647229acc41b43f1405cd8efe5d80
 DIST mixxx-2.2.4.tar.gz 35480450 BLAKE2B 3ce656a7249ce7105de369f650cdc6e3fc70df1899ff99fc37d2c938545d1e8bec2ef3afd34ce3d63c29fae900ed67abb3ab615678ed36dc9bb5c2f14854198f SHA512 34f67088ea2271cb13b75d001d3814237b1b6c2052646d670a36e341fb78e24c34d361a3eb03b0dbfb2d94b0026fecc9125713d7533aac7e99161c27090115fa
-EBUILD mixxx-2.2.4.ebuild 3176 BLAKE2B 854b2c6ad80e0ebb8f2dc04be5c0cee2c4c524510c45e5083f1366ddcff4c6f26a83d16b5ff6b32a98eedf0bf4afe20707abef965926f0955f045acf7d75088f SHA512 29d0169c5f7248db1d365837ea7348f60add692b766986420ea0eb731a74e13233d7c412646f06f2242dd389d2a5483e19f79d108840f43e46473e464aafa002
+EBUILD mixxx-2.2.4.ebuild 3226 BLAKE2B a786466b637b5beada3fbdd4cf77a776d31ae490d96888f6765cd17cc755ca1ed8cae7584bd8629d28e3503dce7e93334f481d6aef37ec4f8abbb8b2764b8337 SHA512 a662f3d6499115657cc9586ca9c7f90c45097c55a5e2f9a76e88c411cd085d8f23bf9c487de1eb909e1038359cdfb9569d2ab9d4b1f8a186a4501f98c9d427c2
 EBUILD mixxx-2.3.9999.ebuild 2738 BLAKE2B dc8f2fbc90bb92ea7b59b0a52854353e1816f7cf8d252cb3dea23efbb09ef7654d46f6fa866c206d51a21aa2c301a80ea0703ca04366b50c57880c8823384d6d SHA512 8d5a8c234cd067d8877b36d074e30661bcb23fcf15afa15c993e89ce9835d0f3fed3b89e640d62f91ddd18861f58cd9ff88fd3f0684ffb57b2c94734766f1ca1
 EBUILD mixxx-9999.ebuild 2738 BLAKE2B dc8f2fbc90bb92ea7b59b0a52854353e1816f7cf8d252cb3dea23efbb09ef7654d46f6fa866c206d51a21aa2c301a80ea0703ca04366b50c57880c8823384d6d SHA512 8d5a8c234cd067d8877b36d074e30661bcb23fcf15afa15c993e89ce9835d0f3fed3b89e640d62f91ddd18861f58cd9ff88fd3f0684ffb57b2c94734766f1ca1
 MISC metadata.xml 849 BLAKE2B 68fcb8b3e3353ad0c99ff9532c5b098738addbe5f3965bc931d5555f0110ee3b4a39514ae471881d8a4b0270d4257e502bd82d9010b235394ae3d0daf2ba4089 SHA512 eb222405a3de8c013d44b2fb114d42f32d54651309ec66176433ad055937a45d4dc7cc2cf3075a413ba508348100f74bd4c06ac77fc7960fbcf915d86bb02336
diff --git a/media-sound/mixxx/files/mixxx-2.2.4-fix-scons-compat.patch b/media-sound/mixxx/files/mixxx-2.2.4-fix-scons-compat.patch
new file mode 100644
index 000000000000..816d888a734d
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.2.4-fix-scons-compat.patch
@@ -0,0 +1,24 @@
+diff -dNur a/build/qt4.py b/build/qt4.py
+--- a/build/qt4.py	2020-05-15 23:26:10.000000000 +0200
++++ b/build/qt4.py	2021-03-17 11:13:58.867445884 +0100
+@@ -42,7 +42,7 @@
+ import SCons.Tool
+ import SCons.Util
+ 
+-class ToolQt4Warning(SCons.Warnings.Warning):
++class ToolQt4Warning(SCons.Warnings.SConsWarning):
+     pass
+ 
+ class GeneratedMocFileNotIncluded(ToolQt4Warning):
+diff -dNur a/build/qt5.py b/build/qt5.py
+--- a/build/qt5.py	2020-05-15 23:26:10.000000000 +0200
++++ b/build/qt5.py	2021-03-17 11:12:39.568689777 +0100
+@@ -43,7 +43,7 @@
+ import SCons.Tool
+ import SCons.Util
+ 
+-class ToolQt5Warning(SCons.Warnings.Warning):
++class ToolQt5Warning(SCons.Warnings.SConsWarning):
+     pass
+ 
+ class GeneratedMocFileNotIncluded(ToolQt5Warning):
diff --git a/media-sound/mixxx/mixxx-2.2.4.ebuild b/media-sound/mixxx/mixxx-2.2.4.ebuild
index 5e8d641266f4..da8c58ae71b9 100644
--- a/media-sound/mixxx/mixxx-2.2.4.ebuild
+++ b/media-sound/mixxx/mixxx-2.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -84,6 +84,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.0.0-docs.patch
 	"${FILESDIR}"/${PN}-2.2.3-qt-5.14.patch
 	"${FILESDIR}"/${PN}-2.2.4-metadata.patch
+	"${FILESDIR}"/${PN}-2.2.4-fix-scons-compat.patch
 )
 
 src_prepare() {
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index ce7f5da81ada..96c16f8d44a6 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,3 +1,5 @@
 DIST mpg123-1.26.5.tar.bz2 1051356 BLAKE2B c58ccb78b406bd9405c803d4d203a75ae981e3493fab84e15da49290d2d1b87912292838aa48c50cf192b8bcee4ea1bf18d89bbfc6df14452cb350356e6cbba0 SHA512 0c2b3174c834e4bd459a3324b825d9bf9341a3486c0af815773b00cb007578cb718522ac4e983c7ad7e3bb5df9fdd342a03cb51345c41f68971145196ac04b7a
+DIST mpg123-1.27.2.tar.bz2 1067102 BLAKE2B 14da616ffd9e798f07f8eaa00080a1a5ff8cf3c3c7436cc83c8f2264317a30a88ee98ddd0ac077c43672887daff447bf10d287be72a5c7d1a4d5580c90e68298 SHA512 b1c7de0c1b1d14cce3b3ba72e7454b7ce392443a3eaace0431381f1871e2fda1470b8efd07176057f8bf76d88f14c2b7ffae470ba34a3271c7e779277b86d6c0
 EBUILD mpg123-1.26.5.ebuild 2764 BLAKE2B bbc01b409734939d4fbfe7390001d395b7688e9b1b8422bc9dda4ec49f5b02b6ca9ed5794d2e66caf55f4db13811cf2dc9964aa6f0efc1a8ef15c3cf73d45590 SHA512 cec89a55f42b61b72693a658d1acb0de0e7115c2b0efce0f596c9f8cde8c009f4e15666d9e26679b45c0ed2c42926bf0bb16fa13c2d55b80fd8022106189c981
+EBUILD mpg123-1.27.2.ebuild 2760 BLAKE2B 71996cbe978df08d7a2eaa45ed95a71649eef62dd1ee89b878e44fadbfef173718f3ddbdba8e98109cb5cee4d46ad8dbeb144a1b90197af68c131f543f086745 SHA512 3031dc355f017f04dbe2bdc9337e7d1db250ea0fc09dd92e1816ef08615e679edee70e8f8b2dc54ebb42a953ea97200e72e6841525616831f97431c7411419b6
 MISC metadata.xml 525 BLAKE2B 8604e161c32fb1f812a3f90d0489983289dc1db8ffc3dd259ea2cc2d8bbbf14a99448619f881c88f25188434efc903d399498126aceba9aa14e21094aa23dfa7 SHA512 06621f91056d0eb4131385dd430c15839c943d6560c59b711508064a8141020b795d0f7193f884365092332c4b3464dd0cd493e921519c9eab8b7ea4d9ce03b7
diff --git a/media-sound/mpg123/mpg123-1.27.2.ebuild b/media-sound/mpg123/mpg123-1.27.2.ebuild
new file mode 100644
index 000000000000..b8286510b25f
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.27.2.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs libtool multilib-minimal
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="https://www.mpg123.org/"
+SRC_URI="https://www.mpg123.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_ppc_altivec alsa coreaudio int-quality ipv6 jack cpu_flags_x86_mmx nas oss portaudio pulseaudio sdl cpu_flags_x86_sse"
+
+# No MULTILIB_USEDEP here since we only build libmpg123 for non native ABIs.
+RDEPEND="
+	app-eselect/eselect-mpg123
+	dev-libs/libltdl:0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+src_prepare() {
+	default
+	elibtoolize # for Darwin bundles
+}
+
+multilib_src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	# Build fails without -D_GNU_SOURCE like this:
+	# error: ‘struct hostent’ has no member named ‘h_addr’
+	append-cflags -D_GNU_SOURCE
+
+	if $(multilib_is_native_abi) ; then
+		local flag
+		for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+			if use ${flag}; then
+				_audio+=" ${flag/pulseaudio/pulse}"
+				_output=${flag/pulseaudio/pulse}
+			fi
+		done
+	fi
+
+	use cpu_flags_ppc_altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use cpu_flags_x86_sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext
+		# bug #164504
+		_cpu=generic_fpu
+	else
+		use cpu_flags_x86_mmx && _cpu=mmx
+		use cpu_flags_x86_3dnow && _cpu=3dnow
+		use cpu_flags_x86_sse && _cpu=x86
+		use cpu_flags_x86_3dnowext && _cpu=x86
+	fi
+
+	local myconf=(
+		--with-optimization=0
+		--with-audio="${_audio}"
+		--with-default-audio=${_output}
+		--with-cpu=${_cpu}
+		--enable-network
+		$(use_enable ipv6)
+		--enable-int-quality=$(usex int-quality)
+	)
+
+	multilib_is_native_abi || myconf+=( --disable-modules )
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	if ! $(multilib_is_native_abi) ; then
+		sed -i -e 's:src doc:src/libmpg123:' Makefile || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/pulseaudio-ctl/Manifest b/media-sound/pulseaudio-ctl/Manifest
index 84bc9fe0a19e..14cf0f3f6821 100644
--- a/media-sound/pulseaudio-ctl/Manifest
+++ b/media-sound/pulseaudio-ctl/Manifest
@@ -1,7 +1,9 @@
 DIST pulseaudio-ctl-1.67.tar.gz 6615 BLAKE2B fd760fc5475cdd9c6bbced9f4bbe0f62e793364d375f0bc24686986d42c9ddcfeddde501950c3572a4bf004cdfba36d3dc5aa1df3eed7a9730a437e74eb97b26 SHA512 5ea1cbfd87cf073de46b6fd9953a3c7b9c6969da46103dd5dfc56aa3f179b2ba36ade5db7ca47d204f0f60ac02020f1a4f2dd58bbaf010f9a99780702295418c
 DIST pulseaudio-ctl-1.68.tar.gz 6575 BLAKE2B a126730f53687b8456ed06f205e13d9380f7cadd4581430b4263dff65ebd33b22ad698cad4271402f873d9fa6c3499fd805ba02e9108723dcd60690016fcc196 SHA512 8ed4383d123d235bcde2e89a0a81fea96daa81dabb37cc9428eb3dd8e0c80fde3b9adf2b3ff911abaf6c4e5cb7cdbd74ce6817e080b3dba65d9206677ce10de5
 DIST pulseaudio-ctl-1.69.tar.gz 6577 BLAKE2B db55eec57e1204eef228ad331fd0b95bab2ee16625ca94fe4632ee713412b0686f1c1abc509f8c2ee0d1e6b08147f79ab961a4039fdadc351a88bcaedc13a9e0 SHA512 4cd80bb917b95ed96bee5005b54f50cbce6d3e341aee32c91daf301e3b4bc8fdd8b4c350b3a3951c6afa740df4565dfc5f0fdb7c858a3f2c7321c983f3fb36c2
+DIST pulseaudio-ctl-1.70.tar.gz 6513 BLAKE2B bd752c42a6ec7c205112637a11e2abae1474b2bcb43f09fa46439b1509c816e8baadd547868821f495f79acf9606bc913ee8664286f181357e264ffa3cdf60f9 SHA512 59ec5f3da3021fd79ba33d9934c6dde9eebdfcc5e7651355b69c54e13cf6525d741a68780c6dc5c871ad108a261334657f7f25306e59fc6142912e2ff2278cb7
 EBUILD pulseaudio-ctl-1.67.ebuild 688 BLAKE2B 3a49094e376b4b94d8dc000bb482c7e1f05dcf27efde4a79ad3b98cd1cc0b908dab4a9a4008f19371b8ba5834de35bfc7813cb8c60240c2983011d77332add43 SHA512 1dddd8e10477b99d15c64cff2f05401c36c6f09ecbae7216b44b1a8c8abbe977c00bd9c304d51f6521dce8a70ff87c624d6f539f9c1c1de78175b64f97b10295
 EBUILD pulseaudio-ctl-1.68.ebuild 615 BLAKE2B 7c751c3dd17cd4a51e142ec436dcea1620c5e24bd5bc87a03a4b81e8933dfa885a65bcd5275929afbac1cbfb41f28aa30ded77812b6ffc629f111c0fc715112b SHA512 66c38fb2cc349bd2ef934f6760a14669463d9985c575a7ff63a8250419d7a6e8609460dfc26e66f217f75a79535f6e66cc8bc4b2c88fea11cbc00b67e8b36b4a
 EBUILD pulseaudio-ctl-1.69.ebuild 615 BLAKE2B 5aca5a348d7b120ec3bf68b560fa9ed9d4e9e748312909c2c7dcf53cdb2273dba7753554221df1901fde969ce8849d1d42ef57566f05c2a01401abc9a6d38892 SHA512 5b7d59037fee4103d8498f3c71fce30035a8b3b5aea68486851efb816cc0adb7747722e3ecbebbc038476bcee476962a10590876f47c3224ca2f08e183daa873
+EBUILD pulseaudio-ctl-1.70.ebuild 615 BLAKE2B 5aca5a348d7b120ec3bf68b560fa9ed9d4e9e748312909c2c7dcf53cdb2273dba7753554221df1901fde969ce8849d1d42ef57566f05c2a01401abc9a6d38892 SHA512 5b7d59037fee4103d8498f3c71fce30035a8b3b5aea68486851efb816cc0adb7747722e3ecbebbc038476bcee476962a10590876f47c3224ca2f08e183daa873
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70.ebuild b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70.ebuild
new file mode 100644
index 000000000000..64655c017f73
--- /dev/null
+++ b/media-sound/pulseaudio-ctl/pulseaudio-ctl-1.70.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="CLI utility to control PulseAudio volume"
+HOMEPAGE="https://github.com/graysky2/pulseaudio-ctl"
+SRC_URI="https://github.com/graysky2/pulseaudio-ctl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Optional runtime deps: dbus-send for KDE OSD, notify-send for libnotify
+# in both cases they should be already present if DE supports them
+RDEPEND="media-sound/pulseaudio"
+
+src_install() {
+	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}"
+}
diff --git a/media-sound/schismtracker/Manifest b/media-sound/schismtracker/Manifest
index e7efa7c45cd3..0cf06292f139 100644
--- a/media-sound/schismtracker/Manifest
+++ b/media-sound/schismtracker/Manifest
@@ -1,5 +1,5 @@
-DIST schismtracker-20180810.tar.gz 1064821 BLAKE2B d8016437db7cf6e0087150755090621ba15661753ebcfb8081f0c137a93389d04aa7a5e1ac09fb1366d1d3b3f76c22cb497171a74fb226347eb194c58c1f0f18 SHA512 d131cec7e4749941f0e5806bff14e0782a01f14f8a68605270d09ff40af1d20fffd4c7caf2926c5a63d3e0c0bb1ed24ce4a5e4cccc280ac045a22cfb8544c498
 DIST schismtracker-20190805.tar.gz 1307914 BLAKE2B 97158f05b55063173fb3a8198d21d4c3f33a1c9d2882170b8dbce91dec75863ae1f282297c66fea376fc94559b9492477dadbc3e2516cfb2dda8772793f59124 SHA512 6ef51d8938a31b2978cfa40bef2bf04eb6b02e8443d8b221454f6e47f3b49308c9999f1af61cf9786b5bc32b621c1548a702e53403df211176dacabc3252b83d
-EBUILD schismtracker-20180810-r1.ebuild 1538 BLAKE2B 45094033db089d5f2b3927596a1c45fa9df319134eb1a7f33daf531d320eeb98431e6732b353985339f543c1c49231131c44739a2d9b2defdef2124e1bdeda26 SHA512 35b7d9ced817c661d9fa3f226f9a35ebab418221af4af7dfb393ea92801e36b2a63c23e3761ff005a0fa5e5e75a271b09b6c45c16f5d7fd73c04d6daaa05341e
-EBUILD schismtracker-20190805.ebuild 1432 BLAKE2B d529ac8fa07d6936c58679da0ffff537684dc7119a2305dadb9bd80d7e10f22c3eed3b5be5a2aa0e63450a7f354a2cc773814ddba76d7b6d17a9e02c449d3cb9 SHA512 66dc02371d2b792d0783dfa926d86345397ad7326cabec423422327620daeb81984a28e7e446992c344742c1b375c85de90c981fb4123f38369d8f7c4937a698
-MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
+DIST schismtracker-20200412.tar.gz 1308056 BLAKE2B 8c104d92889982310d895b9d432ee8bf6da75f583d38490d6796718411298aa0627cc268e070f8c679de4341c910507f78e394b5ba8aeb5b71b3410f2919aa35 SHA512 f4c55ad7d47c9e90aecd8fbe9be399e0b82cd8a815ba1df9c1e23141b0c8a8bb80c9256ce5530327f52b3a34bf84b918d4e1f093ab19d47c180435a63ee6f23b
+EBUILD schismtracker-20190805.ebuild 1430 BLAKE2B f183a48a46eac6350da059dbdfe7231de6c8e3fb0b261f6d2fc2ef27d4c0cfd8da4dd528523fc41e453c2065b21ef432fdc65a339bac529966609f2a8a5d8ffe SHA512 2376ef542792a18e8b80e1429992226c5a709a28e174de759dbf81d220eb7ad2975b74c49e66cbd76e8b74c79b927fd10afad450f8f14ce9cffed25380cd3bae
+EBUILD schismtracker-20200412.ebuild 1432 BLAKE2B d529ac8fa07d6936c58679da0ffff537684dc7119a2305dadb9bd80d7e10f22c3eed3b5be5a2aa0e63450a7f354a2cc773814ddba76d7b6d17a9e02c449d3cb9 SHA512 66dc02371d2b792d0783dfa926d86345397ad7326cabec423422327620daeb81984a28e7e446992c344742c1b375c85de90c981fb4123f38369d8f7c4937a698
+MISC metadata.xml 355 BLAKE2B 90bb7342fbf7defe952aaaa3a65ad1e1144455314d8a2af7219805450a9e3a3df9b0fb9b334c8eec07af7f4f1296e49cf2c9fd3ae750b77f4a5325efa5524337 SHA512 98760ffd7921d91711f3293f3650270ee8de44f7d143066e9d6861b020dd4fe06fa4083ec1a4022846aaa47187151dab2847cd2fe9c571a5c251fa917effea9d
diff --git a/media-sound/schismtracker/metadata.xml b/media-sound/schismtracker/metadata.xml
index 39626a990be5..cc8fbffd7c43 100644
--- a/media-sound/schismtracker/metadata.xml
+++ b/media-sound/schismtracker/metadata.xml
@@ -5,4 +5,7 @@
     <email>sound@gentoo.org</email>
     <name>Gentoo Sound project</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">schismtracker/schismtracker</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/schismtracker/schismtracker-20190805.ebuild b/media-sound/schismtracker/schismtracker-20190805.ebuild
index 68df087a73c5..1c2988cf91b2 100644
--- a/media-sound/schismtracker/schismtracker-20190805.ebuild
+++ b/media-sound/schismtracker/schismtracker-20190805.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2 public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/media-sound/schismtracker/schismtracker-20180810-r1.ebuild b/media-sound/schismtracker/schismtracker-20200412.ebuild
index 5c18d760c9f3..68df087a73c5 100644
--- a/media-sound/schismtracker/schismtracker-20180810-r1.ebuild
+++ b/media-sound/schismtracker/schismtracker-20200412.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools desktop xdg-utils
+inherit autotools desktop xdg
 
 DESCRIPTION="Free implementation of Impulse Tracker, a tool used to create high quality music"
 HOMEPAGE="http://schismtracker.org/"
@@ -11,12 +11,12 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2 public-domain"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="
 	media-libs/alsa-lib
-	>=media-libs/libsdl-1.2[X]
+	media-libs/libsdl[X]
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXv
@@ -50,11 +50,3 @@ src_install() {
 	domenu sys/fd.org/*.desktop
 	doicon icons/schism{,-itf}-icon-128.png
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/wavbreaker/Manifest b/media-sound/wavbreaker/Manifest
index 8e15dd42076e..d11ee86788ef 100644
--- a/media-sound/wavbreaker/Manifest
+++ b/media-sound/wavbreaker/Manifest
@@ -1,5 +1,8 @@
 AUX wavbreaker-0.10-pkgconfig.patch 350 BLAKE2B 85657b02fcb5b6f7c9be8e81217bc02c816732f57cf51e3cde17179dd71d62df46f05d378910e06702419a822a050a4840b6c5433628e6f56dcc791f9d5e67c6 SHA512 a8f75bc1592b4aab528175a055936fc23d50a266b8aaee317fa6039c5ccebed2e02db0454b2b4d6494fc8705ecd39bf04dfa485de6921961e53347dead9d0d45
 AUX wavbreaker-0.11-QA-desktop-file.patch 211 BLAKE2B 64b1f3198a0cafb45b1d81978e1b61e06140f97aa4f01145513d8f2e8361b90d918fb299fa5318031b902d0c89695a93cf882794d8a35ea2b177197649636cb0 SHA512 375cb7f844726439ea06feee9360029d59de86ca1eeef8bf9b312e1a4b2207841ca6a6fa6dd8f947481fc74c45f44587adc1dc1f01d3e0485f783cdf872cc548
+AUX wavbreaker-0.13-QA-desktop-file.patch 323 BLAKE2B 7a4414df32591399f7fe99a2f15e2a8d78a4da6ac435e69943cfa4b50bad5f41842a386f2de6ab048bdc9bd1cac0f26fa68b95923530cb140cb2a58e4fd7019f SHA512 a167b438504b7b88bc538ca45fd700ee5072e671c20830a72749f0bb07d1ac1430a438c17c5e7f1e3cc3ff6fee208c976e273d8600d528540742ecb7197b09bc
 DIST wavbreaker-0.11.tar.gz 496733 BLAKE2B 2ecdad2f19071d672eea4960883af3f1e5b034d43307896cbd9caed9fb087579124851cab6fbfbc54276945c6b229f2ac6f2e7b9b839d02487569b08d65b0210 SHA512 3dee23ef7c0db651cd1ebae78db3f950b5b22ae4f0a323f66e1243a88c0e41390f9f4abde663ef7a1d1c841e0cbb779612d6078cd327a0f1d48e6a812c8ce4e1
+DIST wavbreaker-0.13.tar.gz 366998 BLAKE2B 4f863699d6e0c5573d4af615a0ae8cd1d4d1b2fc74cc060ab8d0fb298e57812a8675b641bc69a45ae1015b3e6c0731a228aee773caaeaed75cafedf065dbbff0 SHA512 3585bdc6eb937d02ff8287c370a2f480dbdedfc6304505ee45943ed34e4302af480bdea511f7d4fb6778b9f5b25a435b533392eedac9869c650202645a64c574
 EBUILD wavbreaker-0.11.ebuild 888 BLAKE2B 34a183a5805485fe742795d91c106d2ba4dcf889924c230c0da4538628b5ad55fb1c567200f01cb254b85d842e0bcd78ad288ad12b42528d622c00837fd64ec2 SHA512 748402257cd0f0db7472d371b756636c95f405a14e8a40bc3085bfad3c655376f1ec73d1b78d0d9d7c76d3da9c340b87857cbdbce136a44358ec7cb9bd818e6c
-MISC metadata.xml 333 BLAKE2B db08ea8f604d1e01bd8da72c1a8a907a8fc528d3384fd5a33d9584c6aace01ec7d972fa37c9f75d3898ee5d064adae7ce5d01eeb48bb85486afaf5330418860f SHA512 d96b3c68abb0afe8c0821d0c9d5b48089e201dcdffffedcc41ee93d44fa3cc11b22eb782b13ded1fde4bfe2187aa2b371a2167d7305ade2bfeff0d201657ac98
+EBUILD wavbreaker-0.13.ebuild 647 BLAKE2B cd4654e658cb97b7f7ea729f5974d3c1ea6bf9426745d4b6bc4c2617bee65fd9f919214787fba08a0bb9f46d8cd871fe00abc0b37007e8f1f9271291513a20e4 SHA512 b01a6d712cfda389307b3d14fac4d23cffabadc7a10cf1e24b684f4c2d79401c95826e6e7d93c356b38c1dcdfefb0a3516e820292508dc0cebc5cc16cd23783c
+MISC metadata.xml 387 BLAKE2B 329d78b990cc196a7c4be49a461e315932d750ab7784253e18d188ef07e7f33ef63f3bec81d3d1465bb0969470e914ba33f241cc555f4ee4e5eeb84eb56f0748 SHA512 40e053f7daadf827b7d6d07b72d315a5baa1ea9c2896fdece467dc772f6fb0f294108acc9d34df01b3c0e57ffe4daa40d77f2dab0b6d1af3c023d89a19bf1e8e
diff --git a/media-sound/wavbreaker/files/wavbreaker-0.13-QA-desktop-file.patch b/media-sound/wavbreaker/files/wavbreaker-0.13-QA-desktop-file.patch
new file mode 100644
index 000000000000..be118c7bf798
--- /dev/null
+++ b/media-sound/wavbreaker/files/wavbreaker-0.13-QA-desktop-file.patch
@@ -0,0 +1,9 @@
+--- a/data/net.sourceforge.wavbreaker.desktop
++++ b/data/net.sourceforge.wavbreaker.desktop
+@@ -5,5 +5,5 @@ Comment[de]=Teilen Sie .wav-Dateien in mehrere Teile
+ Exec=wavbreaker
+ Icon=net.sourceforge.wavbreaker
+ Type=Application
+-Categories=Application;AudioVideo;Audio;
++Categories=AudioVideo;Audio;
+ MimeType=audio/x-wav
diff --git a/media-sound/wavbreaker/metadata.xml b/media-sound/wavbreaker/metadata.xml
index 66ce1ead9f22..9870fe19ebff 100644
--- a/media-sound/wavbreaker/metadata.xml
+++ b/media-sound/wavbreaker/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">thp/wavbreaker</remote-id>
 		<remote-id type="sourceforge">wavbreaker</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/media-sound/wavbreaker/wavbreaker-0.13.ebuild b/media-sound/wavbreaker/wavbreaker-0.13.ebuild
new file mode 100644
index 000000000000..c14b99f53615
--- /dev/null
+++ b/media-sound/wavbreaker/wavbreaker-0.13.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg
+
+DESCRIPTION="wavbreaker/wavmerge GTK+ utility to break or merge WAV files"
+HOMEPAGE="http://wavbreaker.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mp3"
+
+RDEPEND="
+	dev-libs/glib
+	media-libs/libao
+	x11-libs/gtk+:3
+	mp3? ( media-sound/mpg123 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.13-QA-desktop-file.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use mp3)
+	)
+
+	meson_src_configure
+}