gentoo resync : 16.01.2020

20 files changed, 113 insertions, 281 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 0199fca2758f..753a2107b40c 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/din/Manifest b/media-sound/din/Manifest
index a133dfa25058..0c0461318a11 100644
--- a/media-sound/din/Manifest
+++ b/media-sound/din/Manifest
@@ -1,11 +1,5 @@
 AUX din-43.0.1-fix-random-constants.patch 683 BLAKE2B b745da8778155f1e8330b54114f80b86e35d6d94e48d224fc615c20103dc2b18d63a331ef88c0ee8dfed50e6f4ae0feb9d62a89f8bbf1bf12e68b7b94c9eba48 SHA512 bc85b3150067b26faebc494146e60062658cd8c8110523becbf85ff2034e5a949103ef0a46ff4941338a035a299a7475c9a1bb208e3bdd1935e725723b42416f
 AUX din-43.0.1-makefile.patch 552 BLAKE2B c73746b64789dc54f4186777d507fc77c9a0b25e025be4adb48c4620adf4560ef600a445a8822ac045b0a39b4003c5b9007b5a36ed97fd61cdc6a1b8d96bdf74 SHA512 408d71e3b1e262eb83cc6cf0cd3ab4ee164bb9a6fda5244a6445d627c53b23e3d3d3e64bfb9f2c69e8168ecda0a46f8b4768100710f219a8b78325d238af4207
-AUX din-5.2.1-desktop.patch 226 BLAKE2B 808207d496c746029eceb300c2a4b3d4746bf704f0fa93976623d11f47ea063a8ca0a7422a01cb324e869f2054ee6bf47e4cf5814092f05ac1abb4505c74f231 SHA512 fe6d1e8774232077cfa585f79fcfcf4ac441a61b5f9d3f556e526094fd7a049530ebd028ec0d18807335038d0e65809726fe59ee4b7c1f32811b4b349d00e76b
-AUX din-5.2.1-makefile.patch 691 BLAKE2B e6ccb4ba6b3bc8ef2f318e88f9616c6740950f2b0c0f82ca1ffab458655437e57a18d95cff30637a8e68ceca9d10e28f4b91a384140e171e58545819fc9c03f5 SHA512 dbb0390dacd7aed6320955b9573e9c09ce88b0297ffd28e38fd6f1d9ab0b875dde6e2bbc8b38e87eefd5aa790cd2a6c817dd39a3d5919cb2e1404ace99cf4cff
-AUX din-5.2.1-tcl.patch 644 BLAKE2B 7d990afaa5d770dee87c2723c763ab178d89e54479f5688907aa5ce5082fdc2bb9097a85c47f3a7e0f6e73bded0af4bdb2209520147c694adc5492957963b60f SHA512 ac7f1b63bd90c04ba89651c9932b25368db57e143177d14a93c7b750426c60f91a8127d576562b3e61af855ef7f8c352a149dcbff6469a27dd05774d133d21ea
-AUX fix-random-constants.patch 1279 BLAKE2B 87532e2f2be8caeef60c6852dd74480718324cdfab45d9e123c0d0a39672b4bb6a2cc0ee1ac81aebcfc8e8d937b6094d52be401ed0d1f2531f4f00c8399c7e8d SHA512 0cf71beed7e46fc83fdf7360b4cc7fd2c8f26f5d3a2c7a43d39454b79f3d63b71dbf056b3f61b8b53c363e50e2506a92b891715667bf32b251b668251da5e058
 DIST din-43.0.1.tar.gz 3644254 BLAKE2B 6b441ce93b3bd68e3bad5d7a6fea1914f250a5e35410f12c64da7ab1f530aa74b4a8f624a7b6ec70e26b62f5b3f8ada674ad7286b89e2569bbec9f3f29cccac6 SHA512 14df7f52a80801f062ed1a81c5625d8730e7bcc21cfa5256ecce9b478494828a3d0877c37434f30883aa519f767a70ba1cee4d203ec57c5bc72de1c47d2d848d
-DIST din-5.2.1.tar.gz 321269 BLAKE2B eb3b3ebad7a973dfc9bd4d6edbcc83e545c5e11c564a4f592ddef996e971c52fd8b4508933d76dd6964fcbaf5eebe5f0230171eef6466d63540c01918a946379 SHA512 0fa7de383c869f9f55ee055f821f3b541ca7df83d61f9bdb6b9e0227a724abe098073985cb4f3eb381199d4baa84d9ee2b86b74614e11cb8b58b119230ca3c09
 EBUILD din-43.0.1.ebuild 1129 BLAKE2B 7cf6804cb88ca8b101a13083316377cd845737469eacf2c2c5382f4ddb8f7e0771858620e14a762d17a272bfd280ac2e7141642972ac66c5ecd1fb32d6b56817 SHA512 bded33507a5b15c1688a8c61ba3b114a5c7a48f0edc57646f7940e4c652d9c2b2f5e3edbb16e48f3ece033637351206c08f2a9200e10c2f37725fa128ad85c5e
-EBUILD din-5.2.1.ebuild 842 BLAKE2B 5e7177cab16b45d5049bbf7cbfe3c65f905429f1b7101d894d18bc6ab98765332e9c7b3fe64d55ed948a7e4c2289a2393dd435d03e263aad1732bccfd256ca53 SHA512 f01c83f185bf3a08e4bbf66de498849b16e05e96a081228b33a0237ad964c439f367307615115a64081d47babf2c81cd379f9b72258b641415f4aaa958c02e4d
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-sound/din/din-5.2.1.ebuild b/media-sound/din/din-5.2.1.ebuild
deleted file mode 100644
index 592a773fe05f..000000000000
--- a/media-sound/din/din-5.2.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils autotools
-
-DESCRIPTION="a software musical instrument and audio synthesizer"
-HOMEPAGE="http://dinisnoise.org/"
-SRC_URI="https://din.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	dev-lang/tcl:0=
-	media-libs/liblo
-	media-sound/jack-audio-connection-kit
-	net-libs/libircclient
-	sci-libs/fftw:3.0
-	virtual/opengl
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch "${FILESDIR}"/${P}-tcl.patch
-	epatch "${FILESDIR}"/${P}-desktop.patch
-	epatch "${FILESDIR}"/fix-random-constants.patch
-
-	# force script to be regenerated so it uses the right data path
-	rm data/checkdotdin || die
-
-	eautoreconf
-}
diff --git a/media-sound/din/files/din-5.2.1-desktop.patch b/media-sound/din/files/din-5.2.1-desktop.patch
deleted file mode 100644
index e9bd7a62bc56..000000000000
--- a/media-sound/din/files/din-5.2.1-desktop.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- din-5.2.1/data/din.desktop
-+++ din-5.2.1/data/din.desktop
-@@ -8,4 +8,4 @@
- StartupNotify=true
- Terminal=false
- Type=Application
--Categories=Application;AudioVideo;Audio;Midi;Music;
-+Categories=AudioVideo;Audio;Midi;Music;
diff --git a/media-sound/din/files/din-5.2.1-makefile.patch b/media-sound/din/files/din-5.2.1-makefile.patch
deleted file mode 100644
index 1f79f82ce495..000000000000
--- a/media-sound/din/files/din-5.2.1-makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- din-5.2.1/src/Makefile.am
-+++ din-5.2.1/src/Makefile.am
-@@ -1,5 +1,5 @@
--AM_CXXFLAGS = $(liblo_CFLAGS) $(jack_CFLAGS) $(fftw3f_CFLAGS) -I /usr/include -I /usr/local/include -I /opt/include -I/usr/include/tcl8.5 -I/usr/local/include/tcl8.5 -I /opt/include/tcl8.5 -I ../include  -Wall -O3
--LIBS += $(liblo_LIBS) $(jack_LIBS) $(fftw3f_LIBS) -L/usr/lib/tcl8.5 -L/usr/local/lib/tcl8.5 -L /opt/lib/tcl8.5 -L /usr/lib -L /opt/lib -L /usr/local/lib -ltcl8.5 -lGL -lircclient -lrt -lX11
-+AM_CXXFLAGS = $(liblo_CFLAGS) $(jack_CFLAGS) $(fftw3f_CFLAGS) -I /usr/include -I ../include  -Wall
-+LIBS += $(liblo_LIBS) $(jack_LIBS) $(fftw3f_LIBS) -ltcl -lGL -lircclient -lrt -lX11
- 
- bin_PROGRAMS = din
- 
diff --git a/media-sound/din/files/din-5.2.1-tcl.patch b/media-sound/din/files/din-5.2.1-tcl.patch
deleted file mode 100644
index a5582f1bba15..000000000000
--- a/media-sound/din/files/din-5.2.1-tcl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- din-5.2.1/configure.ac
-+++ din-5.2.1/configure.ac
-@@ -3,7 +3,7 @@
- AC_CONFIG_SRCDIR([configure.ac])
- AC_PROG_CXX
- AC_CHECK_HEADERS([GL/gl.h],AC_MSG_NOTICE([+++ Found OpenGL +++]),[AC_MSG_ERROR([!!! Please install OpenGL !!!])])
--AC_CHECK_HEADERS([tcl.h] [tcl8.5/tcl.h],AC_MSG_NOTICE([+++ Found Tcl 8.5 +++]),[AC_MSG_WARN([!!! Is Tcl 8.5 installed? !!!])])
-+AC_CHECK_HEADERS([tcl.h], AC_MSG_NOTICE([+++ Found Tcl +++]),[AC_MSG_ERROR([!!! Please install Tcl !!!])])
- AC_CHECK_HEADERS([libircclient/libircclient.h],,[AC_MSG_ERROR([!!! Please install libircclient !!!])])
- PKG_CHECK_MODULES([liblo], [liblo])
- PKG_CHECK_MODULES([jack], [jack])
diff --git a/media-sound/din/files/fix-random-constants.patch b/media-sound/din/files/fix-random-constants.patch
deleted file mode 100644
index f055b10140d6..000000000000
--- a/media-sound/din/files/fix-random-constants.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Redefine some constants in include/random.h as unsigned
- These constants are used with unsigned variables, so redefine them
- for consistency.
- .
- This also fixes compilation errors under C++11: In C++11, array initialization
- is considered list initialization and so prohibits narrowing conversions
- (from negative signed values to unsigned).
-Author: Philip Chung <philipchung1995@yahoo.com>
-Bug-Debian: https://bugs.debian.org/811778
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
----
- include/random.h |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- din-5.2.1.orig/include/random.h
-+++ din-5.2.1/include/random.h
-@@ -28,9 +28,9 @@
- 
- const int N = 624;
- const int M = 397;
--const int MATRIX_A = 0x9908b0df; /* constant vector a */
--const int UPPER_MASK = 0x80000000; /* most significant w-r bits */
--const int LOWER_MASK = 0x7fffffff; /* least significant r bits */
-+const unsigned int MATRIX_A = 0x9908b0df; /* constant vector a */
-+const unsigned int UPPER_MASK = 0x80000000; /* most significant w-r bits */
-+const unsigned int LOWER_MASK = 0x7fffffff; /* least significant r bits */
- 
- static unsigned int mt[N]; /* the array for the state vector  */
- static int mti=N+1; /* mti==N+1 means mt[N] is not initialized */
diff --git a/media-sound/grip/Manifest b/media-sound/grip/Manifest
index 4f7393359485..14d12ea967b7 100644
--- a/media-sound/grip/Manifest
+++ b/media-sound/grip/Manifest
@@ -1,9 +1,5 @@
-DIST grip-3.10.2.tar.gz 980804 BLAKE2B d7dd2585d379733a60215705b5d91ffb3ba292bf78b6728c0ce4ccd98eeb79a5c26131b1023e884d51810857c25a18066e89e726d6d08e2b8b125840b0c30016 SHA512 ee17d5842ff4d13b812e5863ce5d0c516d6bf6bffc8131c685056e1f4bb003ebbc9cad99d48d0dc9d3657d0b13d63c2bf09a67db0d37ea47c8ce715c70cfd3fa
 DIST grip-3.9.0.tar.gz 968706 BLAKE2B 9d530b1e7c93239d4298a57a784eec38d98fe57e2c964018a04a8646ce5f1f4734b21103f31612bac4cc45c8c03eeca2080ba88d60a2cfe51d161ef61758639b SHA512 748821f59c90d7239bb711a4a7e1df4e9f2b67ff7bd5c635a2c49389efc7836cca6672cdd93e727f8b97c4e2221f895cc7b4110aa0d3419a5fbe56530ca1b1d0
-DIST grip-4.0.0.tar.gz 1004651 BLAKE2B c6f4e5be8a3635be9445b9ad215e0629697ac31f71e92fa68ceffe5396acd6a1fc19597ed6f6f8ced4d350e30484f6cc12ceb6e35fc15ec3e905c5bd2ec81877 SHA512 1e17cc81b2fc9063edacbcbb1cd23ea2c55ac013a3dc57f754e267ef7a3a62f44b4e11561f05ec8534f02ae6543aafecd8882d25bf6b843d01f5cddf05618319
 DIST grip-4.0.1.tar.gz 1004917 BLAKE2B 0102d21570c5716283354cda65c694b3be708e7718535f2f3c806187edcd5ebceb834fec9f73908780d23e33f973b60e223a8d7d60e0f61f2bbe0e5340792f16 SHA512 3c5d13e83ae5b0ac03f887fd96b254700f25850ec8794daf4ff454efea0bd59e6a201e0104ffb72c5cc07fee67efe13d0891354faf09452a667131e04d9e1ac3
-EBUILD grip-3.10.2.ebuild 1222 BLAKE2B df43a95a06e053381848e36234eba2c8f7436c0db415ae88ca389c59a80aa37ccc15a496ee02d9845565446b4caabe4fbde6f7363c493fd01b5c178da71a30f3 SHA512 539dd6555803d76a6ea9e805ae883956de001001af699405ff9d70d774548e68513006a42131e9242f7249dbb057eb69790e4db48ab051e61a2f3791c414edde
-EBUILD grip-3.9.0.ebuild 1208 BLAKE2B 4b0840d67f852edead6ed6e52e7290df4cbfcef116ea7f6a9473d6eb49f80498d0c9e004e468a97cbf7c5572987049795e312b69eeaca3f8cf3e307888a5aaa7 SHA512 4ca022cb15eda867d1efcfa476d782894094d401a26a98469b27739ca9d5a9778a9bed61f970f8270951915d3fd73bfc76bb29053cd65991fa1f17288ed826fe
-EBUILD grip-4.0.0.ebuild 1223 BLAKE2B 03a279603807bc00bcd7a23688ca3f8fd0a66ac1a062212e7527887a74d12dc709de5029eb04a82a968ecf9ae75c62d03e34e28893d2e240cdc3f86a05bd51ff SHA512 d7c5ed2b6804818c849854e97a11e5089fcf618fc8f3ef6af9e41e62ad2f70d4bf092e43ba819dd42b47559c4837670f873c56a3e3a6a5f8583901a236bea65e
-EBUILD grip-4.0.1.ebuild 1223 BLAKE2B 03a279603807bc00bcd7a23688ca3f8fd0a66ac1a062212e7527887a74d12dc709de5029eb04a82a968ecf9ae75c62d03e34e28893d2e240cdc3f86a05bd51ff SHA512 d7c5ed2b6804818c849854e97a11e5089fcf618fc8f3ef6af9e41e62ad2f70d4bf092e43ba819dd42b47559c4837670f873c56a3e3a6a5f8583901a236bea65e
+EBUILD grip-3.9.0-r1.ebuild 1123 BLAKE2B 2ad0f72c98b3fa5a1502d0e3cc2d2a9df3f27b8ac4717fe4d611ecc7885f41d77d9fa38b0549660250898aefa0395e96e7cc76f56f6b6e52d076f75089f11bb5 SHA512 ca61062df0ebc206a5ecf9ac8fde50d9a6b884b709d221f6448055452c94c2b6f2149fc2df52becfe99a1044852a320a92a48c17c3065545bdd46f25b962d0dd
+EBUILD grip-4.0.1-r1.ebuild 1139 BLAKE2B 56d000454b17a2f3f67cd1213055eaa22e0a147be5655fcf2ca1a46a51a53759a2c607ff726150d0e0eafaf15c9d194ff7e2b2616363adc71c899094d6c10139 SHA512 beeb53ea39155fc7e1426e731b67bbcde7dd516b1e7e8625d1cacee7b1c8914ff4343b1fa613f29cf8a97eae30b17563861e25d23a1c79d84974e17deb64275c
 MISC metadata.xml 327 BLAKE2B 3e97916828952f228021896112537b6fa34d2dd248200e76de94e1bb2bb072b6ffb8d97ff69616ebd0d778cffe1aab456bdebea17ec4b93cdbf2cc273c8ed9bf SHA512 3daf9c932bd4e3392751cb3c89ffbaf77b4da1eb3acc20a5cc30bfb8a1d0bc054fe1012ed76499f3c24ca0b599fbdafe9357a7ed1f26b8c4e924a48ffeb8bf14
diff --git a/media-sound/grip/grip-3.10.2.ebuild b/media-sound/grip/grip-3.10.2.ebuild
deleted file mode 100644
index 5ebbbe73084f..000000000000
--- a/media-sound/grip/grip-3.10.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs libtool
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper"
-HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="vorbis"
-
-# lame and vorbis-tools are no real RDEPENDs. But without them
-# grip cannot convert ripped files to any format. So use them as
-# a sane default.
-RDEPEND="
-	gnome-base/libgnome
-	>=gnome-base/libgnomeui-2.2.0
-	>=media-libs/id3lib-3.8.3
-	media-sound/cdparanoia
-	media-sound/lame
-	net-misc/curl
-	>=x11-libs/gtk+-2.2:2
-	x11-libs/libX11
-	x11-libs/pango
-	x11-libs/vte:0
-	vorbis? ( media-sound/vorbis-tools )
-"
-# gnome-extra/yelp, see bug 416843
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
-}
-
-src_configure() {
-	# Bug #69536
-	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
-	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
-
-	econf --disable-werror
-}
diff --git a/media-sound/grip/grip-3.9.0.ebuild b/media-sound/grip/grip-3.9.0-r1.ebuild
index 21ff65596542..07771797ceba 100644
--- a/media-sound/grip/grip-3.9.0.ebuild
+++ b/media-sound/grip/grip-3.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,12 +36,6 @@ DEPEND="
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	default
-
-	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
-}
-
 src_configure() {
 	# Bug #69536
 	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
diff --git a/media-sound/grip/grip-4.0.0.ebuild b/media-sound/grip/grip-4.0.0.ebuild
deleted file mode 100644
index 1c4858f20805..000000000000
--- a/media-sound/grip/grip-4.0.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic toolchain-funcs libtool
-
-DESCRIPTION="GTK+ based Audio CD Player/Ripper"
-HOMEPAGE="https://sourceforge.net/projects/grip/"
-SRC_URI="mirror://sourceforge/grip/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="vorbis"
-
-# lame and vorbis-tools are no real RDEPENDs. But without them
-# grip cannot convert ripped files to any format. So use them as
-# a sane default.
-RDEPEND="
-	dev-libs/glib:2
-	gnome-base/libgnome
-	>=gnome-base/libgnomeui-2.2.0
-	>=media-libs/id3lib-3.8.3
-	media-sound/cdparanoia
-	media-sound/lame
-	net-misc/curl
-	>=x11-libs/gtk+-2.2:2
-	x11-libs/libX11
-	x11-libs/pango
-	vorbis? ( media-sound/vorbis-tools )
-"
-# gnome-extra/yelp, see bug 416843
-DEPEND="
-	${RDEPEND}
-	sys-devel/gettext
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
-}
-
-src_configure() {
-	# Bug #69536
-	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
-
-	strip-linguas be bg ca de en en_CA en_GB en_US es fi fr hu it ja nb nl pl_PL pt_BR ru sr vi zh_CN zh_HK zh_TW
-
-	econf --disable-werror
-}
diff --git a/media-sound/grip/grip-4.0.1.ebuild b/media-sound/grip/grip-4.0.1-r1.ebuild
index 1c4858f20805..e5b048598f1c 100644
--- a/media-sound/grip/grip-4.0.1.ebuild
+++ b/media-sound/grip/grip-4.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,11 +38,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-src_prepare() {
-	default
-	sed '/^Icon/s@grip\b@gripicon@' -i grip.desktop || die
-}
-
 src_configure() {
 	# Bug #69536
 	[[ $(tc-arch) == "x86" ]] && append-flags "-mno-sse"
diff --git a/media-sound/marrie/Manifest b/media-sound/marrie/Manifest
index a1cc6b73c577..04f27fd4f71c 100644
--- a/media-sound/marrie/Manifest
+++ b/media-sound/marrie/Manifest
@@ -1,4 +1,4 @@
-DIST marrie-0.3.2.tar.gz 7626 BLAKE2B 5adb814f50b850621c19e4be1b60e4dd8f94d44c4ecadc3df6650b49fb16a3f31569a8d17ea7e6359d726a15ec4063ffa22d7815e8a17e3f5340348ade172aef SHA512 da6688e18124f2c95e2dd9846a2578fd2e6312f7e145424f50761eaabdd3c234424921f289b595e8842a9f5e3863a9ef106331c19cec42de9731d12f9584958a
-EBUILD marrie-0.3.2-r1.ebuild 1129 BLAKE2B 6cb533a50f0b8bd101040659dbb2bf6058f428b295f1431c72fefb100c1b703480cda5eaa9997d1208182efc0745f79ba86ac11462b838ec54fed1f99c07f1c2 SHA512 c8c206d4f43fea270fa04696a6738d6fc291646d289cfeda2283e10f874bc3a706188d6c7a9f2b7c12d6ce78def5f1017cdd05bad4aef7179146cdebddd69c6b
-EBUILD marrie-9999.ebuild 1129 BLAKE2B 6cb533a50f0b8bd101040659dbb2bf6058f428b295f1431c72fefb100c1b703480cda5eaa9997d1208182efc0745f79ba86ac11462b838ec54fed1f99c07f1c2 SHA512 c8c206d4f43fea270fa04696a6738d6fc291646d289cfeda2283e10f874bc3a706188d6c7a9f2b7c12d6ce78def5f1017cdd05bad4aef7179146cdebddd69c6b
+DIST marrie-0.4.tar.gz 7775 BLAKE2B 7b68fbdfe35c7e72fe111b44bbabf4e60eb9f6211867184d1f3f7bc7b1c067f99223eea2dd3c7809f041d0a7b5ac80be360d3c14808605f3145b8d39a0a9c7fd SHA512 9ed8677729e7575519f130c1866923e7223dabf07c9c24b9e3f6a70cd5e1e56da2a5d1a34011b73d65c8d8fa4c962f65709883b9444d078d6439769d4afb644b
+EBUILD marrie-0.4.ebuild 891 BLAKE2B 25c3c89709bf3a3d9513341a844302ac0c70382c5c5cb7f5734718c4e457a6d657be36ac60a1dfad77738d17bbe3f630ab5cd7f0024c04a72309a388300c322f SHA512 df45a2fae94dab5fc27feaac9adbe4303319edd897a569fb00d6ea2db6738e2ffda2a95c5ad7ef32537a5b1a3dcadd7b674675ca3c68847e137f18a0f005e7b1
+EBUILD marrie-9999.ebuild 891 BLAKE2B 25c3c89709bf3a3d9513341a844302ac0c70382c5c5cb7f5734718c4e457a6d657be36ac60a1dfad77738d17bbe3f630ab5cd7f0024c04a72309a388300c322f SHA512 df45a2fae94dab5fc27feaac9adbe4303319edd897a569fb00d6ea2db6738e2ffda2a95c5ad7ef32537a5b1a3dcadd7b674675ca3c68847e137f18a0f005e7b1
 MISC metadata.xml 569 BLAKE2B ea1c6ebe3f298e3dbed792c9bd0f95e6ce147f242aca7495d6ab87ee6850e0fbd1195b88b8fc341a11344f8662c0a49387826eeef67a5ddefe97391ed3898a3f SHA512 29d513b17b49e83d2ab52e5872f94d5a626e8d744faa876dda08932be0f06003f30153712634adbef8313c7c1e7b8d6c58912e84aaeca883b0a479033409b365
diff --git a/media-sound/marrie/marrie-0.3.2-r1.ebuild b/media-sound/marrie/marrie-0.4.ebuild
index c44c712b03f4..128c50ca86f9 100644
--- a/media-sound/marrie/marrie-0.3.2-r1.ebuild
+++ b/media-sound/marrie/marrie-0.4.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7} )
 
 GIT_ECLASS=""
 if [[ ${PV} = *9999* ]]; then
@@ -25,32 +26,15 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/setuptools
-	>=dev-python/feedparser-5.1.3"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils )"
-
-src_compile() {
-	distutils-r1_src_compile
-	if use doc; then
-		rst2html.py README.rst marrie.html || die "rst2html.py failed"
-	fi
-}
+IUSE=""
 
-src_install() {
-	distutils-r1_src_install
-	if use doc; then
-		dohtml marrie.html
-	fi
-}
+RDEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
 
 pkg_postinst() {
 	distutils-r1_pkg_postinst
 	elog
 	elog "You'll need a media player and a file downloader."
-	elog "Recommended packages: net-misc/wget and media-video/mplayer"
+	elog "Recommended packages: net-misc/wget and media-video/mpv"
 	elog
 }
diff --git a/media-sound/marrie/marrie-9999.ebuild b/media-sound/marrie/marrie-9999.ebuild
index c44c712b03f4..128c50ca86f9 100644
--- a/media-sound/marrie/marrie-9999.ebuild
+++ b/media-sound/marrie/marrie-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7} )
 
 GIT_ECLASS=""
 if [[ ${PV} = *9999* ]]; then
@@ -25,32 +26,15 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/setuptools
-	>=dev-python/feedparser-5.1.3"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/docutils )"
-
-src_compile() {
-	distutils-r1_src_compile
-	if use doc; then
-		rst2html.py README.rst marrie.html || die "rst2html.py failed"
-	fi
-}
+IUSE=""
 
-src_install() {
-	distutils-r1_src_install
-	if use doc; then
-		dohtml marrie.html
-	fi
-}
+RDEPEND="dev-python/feedparser[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
 
 pkg_postinst() {
 	distutils-r1_pkg_postinst
 	elog
 	elog "You'll need a media player and a file downloader."
-	elog "Recommended packages: net-misc/wget and media-video/mplayer"
+	elog "Recommended packages: net-misc/wget and media-video/mpv"
 	elog
 }
diff --git a/media-sound/pulseeffects/Manifest b/media-sound/pulseeffects/Manifest
index 77bbde5d4594..ad7608979867 100644
--- a/media-sound/pulseeffects/Manifest
+++ b/media-sound/pulseeffects/Manifest
@@ -1,8 +1,10 @@
 DIST pulseeffects-4.6.8.tar.gz 1882449 BLAKE2B 57a93eeb32304628efb51473912a70485e054ef50e9e9aec9731ba761dd7809ce0a8c3838fc74a04c6a29537bf182a74c6e6715c722ce76670c8be71dc4a5608 SHA512 672204ad90534ad45228b3473902eb8489c8306c7850f2b2a6f983aa89955529fb5381d6a7d703de94dcd658ffd5b560cce17291a0b23654b225ebd301659e74
 DIST pulseeffects-4.6.9.tar.gz 1925035 BLAKE2B f059169721e643cb3e3a6db42d3a0fef0bb7696c6b2a5583e69573e7620f87d4a06ed448e298e0ca4e9868dcdd8cec8bbf71e7fb83c094d3840a9f90919ea571 SHA512 c767508ae3d9fb8df3e8d27a05bfa908e6c0862514a20b81fbc3ea8680c9d6ca20bac8d90d513494aaccbda29104e0dc015b81dab0bee5a40b708c415246ce3e
 DIST pulseeffects-4.7.0.tar.gz 1931247 BLAKE2B 88545378c55c968e5973973593c8cf8e5ccfbca60c28af5f4604be247dbaeba25f68dd21be77b9160dfaa7dc633127c7a0066615d607d2e5adc8e5608d6132d0 SHA512 9d47a61abaa851b83344437d12d0c674459c0dcc27096f1ce8d22fde8dd56c0819f81cee56a9ef13c93d476ed02195743b2fec1a66794b6878ed796da6c166bd
+DIST pulseeffects-4.7.1.tar.gz 1995518 BLAKE2B 81a0e53875278c5264cc306b81d299b0d016f806f7f142fddceb8aef8798b4f64163f05d72f44ae147195b871b59ed9dce52bba8b98597362e9f154336daff7a SHA512 19a84986ff49d832147697ed81e793f6f7b22600b4b928cf9efe7db0ed455181547d21b3216d47e4d0ae495ef420ce8392cbef0d1edef0d9d5130a1ad2d89c8f
 EBUILD pulseeffects-4.6.8.ebuild 1855 BLAKE2B feb368814eb1124176505d2db6589d1177afe8dc09c8c4f44baddd24984c4f41c89b1e77c3159e7c9eeff4379c3a77e23e409ba1d85ec6a116dd713f9adff1e6 SHA512 c3a45f3c2ae1d3ac82b58110c1529f596e1c367bf66efa5692702e877d11af596da62bb20fb20a69ebb4e0edc6120f8652b801ad6eb43e40238d4297dd630691
 EBUILD pulseeffects-4.6.9.ebuild 1857 BLAKE2B 3c9e2a5136bbcc522a3fd46e98f9ff7d8af418276953eac37de28ca254fc639b6c37add537b9e52cc8afcb09fb90c103f2e7ca9d8d5639ea4438010cd10dd6aa SHA512 79b59faba833d5de9b0b488d471c122e0963e73ff36336afd31c4d33c47f73a3a40c3c6eff777fcf35e18112eeec8d0218d7698b3d1ed2f706a07974b64efbe3
 EBUILD pulseeffects-4.7.0.ebuild 1857 BLAKE2B 3c9e2a5136bbcc522a3fd46e98f9ff7d8af418276953eac37de28ca254fc639b6c37add537b9e52cc8afcb09fb90c103f2e7ca9d8d5639ea4438010cd10dd6aa SHA512 79b59faba833d5de9b0b488d471c122e0963e73ff36336afd31c4d33c47f73a3a40c3c6eff777fcf35e18112eeec8d0218d7698b3d1ed2f706a07974b64efbe3
+EBUILD pulseeffects-4.7.1.ebuild 1857 BLAKE2B 10efa614690ca487cc4af4ae9c6828d22b72aec4da55ff278df0591b6faf1f7a341637e7c49f99f0df64d46fac3ac40e42ec5c9f3b7c4704e2c9cf2231eb5109 SHA512 c305a407096482f8bfa3977aad878df3bf4578800c12702cde270ff174cae5d677290ee055662e7f361760290f08cb9a46aed44ecf0c7c7bc2408675ecc7da99
 EBUILD pulseeffects-9999.ebuild 1857 BLAKE2B 3c9e2a5136bbcc522a3fd46e98f9ff7d8af418276953eac37de28ca254fc639b6c37add537b9e52cc8afcb09fb90c103f2e7ca9d8d5639ea4438010cd10dd6aa SHA512 79b59faba833d5de9b0b488d471c122e0963e73ff36336afd31c4d33c47f73a3a40c3c6eff777fcf35e18112eeec8d0218d7698b3d1ed2f706a07974b64efbe3
 MISC metadata.xml 946 BLAKE2B dfa67811eaa1e6c66ae63c0476c5a79d7167abf7909e15f7279ca6676d0d2527bc403b37c731f6a14f207e7d2176183f2b2d4abb0b1bb1c682eed3a19a5bbd06 SHA512 4410693f173e25f13fd87850f2ebe2998d7afb531550ec8c75aa044605ede8436b138ad920791ed454b5acd5db018807ecb97e156be1ab17bc73a7746cf3aeaa
diff --git a/media-sound/pulseeffects/pulseeffects-4.7.1.ebuild b/media-sound/pulseeffects/pulseeffects-4.7.1.ebuild
new file mode 100644
index 000000000000..29b27d822298
--- /dev/null
+++ b/media-sound/pulseeffects/pulseeffects-4.7.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, compressor, reverberation, equalizer auto volume effects for Pulseaudio"
+HOMEPAGE="https://github.com/wwmm/pulseeffects"
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	SRC_URI=""
+	EGIT_REPO_URI="https://github.com/wwmm/pulseeffects"
+else
+	SRC_URI="https://github.com/wwmm/pulseeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf mda-lv2 rubberband"
+
+#TODO: optional : lilv, zam-plugins (check from archlinux pkg)
+RDEPEND="
+	>=dev-libs/boost-1.41:=
+	>=dev-cpp/glibmm-2.56.0
+	>=dev-cpp/gtkmm-3.20:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=x11-libs/gtk+-3.18:3
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/lsp-plugins-1.1.7[lv2]
+	>=media-libs/gstreamer-1.12.0:1.0
+	>=media-libs/gst-plugins-good-1.12.0:1.0
+	>=media-libs/gst-plugins-bad-1.12.0:1.0
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.0:1.0 )
+	>=media-plugins/gst-plugins-ladspa-1.12.0:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.0:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.0:1.0
+	calf? ( >=media-plugins/calf-0.90.0[lv2] )
+	mda-lv2? ( media-plugins/mda-lv2 )
+	rubberband? ( media-libs/rubberband )
+	>=media-libs/zita-convolver-3.0.0
+	media-libs/libebur128
+	media-sound/pulseaudio
+	sys-apps/dbus"
+# see 47a950b00c6db383ad07502a8fc396ecca98c1ce for dev-libs/appstream-glib
+# and sys-devel/gettext depends reasoning
+DEPEND="
+	${RDEPEND}
+	dev-libs/appstream-glib
+	sys-devel/gettext
+"
+BDEPEND="
+	>=sys-devel/gcc-7.3.0
+	dev-util/itstool
+	media-libs/libsamplerate
+	virtual/pkgconfig
+"
+
+pkg_postinst(){
+	gnome2_gconf_install
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm(){
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	gnome2_icon_cache_update
+}
diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index ce50665830b8..21828ef53d29 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,5 +1,6 @@
 AUX qsampler-0.5.3-Makefile.patch 466 BLAKE2B 17d8ac1e29f6668a02fc7734d51f40e9f5a161da799fdeb2ddc5eaa89a69c607de6183fab78a13f4bec5a0efc002081589ca141f3232f37cc0051218f440fd5b SHA512 6f02c41941bacce8b49837471f5699960b069bd48e99b116402afa5452116890fa26da340a2e85b036d2051906b5eb828832598925b1d314de2a866eec47f155
+AUX qsampler-9999-Makefile.patch 515 BLAKE2B b12882524ac5e0500a6c07804ed8b50ae085ac14873b723ca4ec2a71797da76711c5516ca0f6866994a1172d3f19ae671009d270be4429850e8bff0893044123 SHA512 0d49e0d178e638cddd69677c064368b5e6dc214c173286c3f6f82b1c469a875559bb25538ed8433d4e842d98418d344dc349ac454239983006b7cd4f195b1751
 DIST qsampler-0.5.6.tar.gz 260607 BLAKE2B 52002ad95fe11266337f058124e7ae33947eb50ce5b12574c9091c10827bff2a8135a52bd53dd030be0394fdb39c2bd034308ae9d615c0b74ad660a06573446b SHA512 2a3a322fec31d9c66d7d1e9b4a7f74629e4b2bcf3ee2350bca8d450d2f68c41ac80563f8e28bd5314f00f0387503aa1e33c0b94ff518cca27b2ca93d9d72334e
 EBUILD qsampler-0.5.6.ebuild 1018 BLAKE2B 8a350360a4d6bc54ae75a3f2e895a4711cc50532f62cf3d260a38a25142ee7531b4641bbeb539e41b35864ad5d37834d7fda94f827eb8c3dbac3a34057cf6c36 SHA512 254e07e7188f7fa5a381e04826f2a5aa0c636c74fcbbcec66cd144b3575c1d813021309acc8843ddd31f62677054d5ecd71d915195ccd611c64cab9a8bf4a004
-EBUILD qsampler-9999.ebuild 1487 BLAKE2B e08a0d113ed1f8c4e09c19731fc270b8f8c0e1ddd62082cf57da5cd63f508b6a77ab2ca08d0d55fd070905506d61f53e4e67ad38fd2cdf1c92a03d9450513b9b SHA512 b0c155feaa5a7a50ad51634626ea3701cdb0ee6a6d93f6ffd0ae928348370f5362bf1ce58f188fc87530b7fc55913f156881854189fcb7cde02bf0574317b5a9
+EBUILD qsampler-9999.ebuild 1480 BLAKE2B e937433e396dfdb3474e9a5c53b4a4a45a0d729bfd6c08be4b07159e7d3cba8373887f513e6cfe5c981e977dd28bc05e5a7c629e8382f50ae3cc96f7fed48ea5 SHA512 520c03a9dc34616972b76f040f5438be71cf5395a5cca41053c864333f6d818fc17cad32c2760340760c1c018509bd420973778aa81cfacb5f96cb4fe0b9b304
 MISC metadata.xml 493 BLAKE2B 4df149f56c8c138f3a0037470860cc03040d482a75dfde7d27fa71526003c1fcfd42915cc822dc8d7de93aa73f034cb0c72e8882937770b7872d1db72ab6419d SHA512 1e64ef3cc6a1389548e5c88f676d68567f034cebcfbcdf14c369d5c73d914059fb2a8eff2f7e66b5700400b92560d042097ecf91b39712b8552f74fe1e75e6cd
diff --git a/media-sound/qsampler/files/qsampler-9999-Makefile.patch b/media-sound/qsampler/files/qsampler-9999-Makefile.patch
new file mode 100644
index 000000000000..5da44d8a8175
--- /dev/null
+++ b/media-sound/qsampler/files/qsampler-9999-Makefile.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile.in b/Makefile.in
+index 9756274..f88b2fd 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -111,7 +111,6 @@ install:	$(target) translations_lrelease $(name).1
+ 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
+ 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
+ 	@install -v -m 0644 $(name)*.1 $(DESTDIR)$(mandir)/man1
+-	@gzip -nvf $(DESTDIR)$(mandir)/man1/$(name)*.1
+ 
+ uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
+ 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
diff --git a/media-sound/qsampler/qsampler-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild
index 968945ad9b52..c59da124ba79 100644
--- a/media-sound/qsampler/qsampler-9999.ebuild
+++ b/media-sound/qsampler/qsampler-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -33,7 +33,7 @@ DEPEND="${COMMON_DEPEND}
 
 DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
 
-PATCHES=( "${FILESDIR}/${PN}-0.5.3-Makefile.patch" )
+PATCHES=( "${FILESDIR}/${P}-Makefile.patch" )
 
 src_prepare() {
 	default