gentoo resync : 18.11.2019

33 files changed, 539 insertions, 333 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 2ebd3b8d80b8..7e25c7b09c5a 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/alsa-plugins/Manifest b/media-plugins/alsa-plugins/Manifest
index 1e77086004fb..e855e9da6e14 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1,15 +1,14 @@
 AUX 51-pulseaudio-probe.conf 437 BLAKE2B 5eb7afb4bef1e647cfa1c3e9d6417000c0e74f2722d07a55e63e3a1ad36507bb15c970507450fcc29b51b8cfb77a1a15d8a68a9b1e5dca3279f5b2df85e731f8 SHA512 325c323ad4dcf03a4cf2528d6f5d6a0769c3e3d7bcf09c6fc11fb9cb61bef2cec1e8ad5073c07b6865ffdec4c32165cd80a7c856d13d538ff8320be1c83f9af7
 AUX alsa-plugins-1.0.23-automagic.patch 346 BLAKE2B d544fdbf01229404342ae84c81ec72cccbb5def2593bbd323e464300bf04e95ba9f52a24e365b786d44d361a55165841121990f319801574c81e46ef0a111a7e SHA512 e10f990a0138d83af93bbcb8848a588ed0a1dc643452352b75ca56e243979b69a07a1b6685dbd4c5ff6e32a3d2e98fcb3c0f5da35ff5645c0cae490ece3c710c
 AUX alsa-plugins-1.0.28-libav10.patch 10113 BLAKE2B 880c8e9781ab19afcd724c408c5291948b4ef028935915c13134c03dae393e0a7e9a258fa91905a1a7a663a276d2a53cde6be3477bd5ed5d0e3b6ea2ae38767d SHA512 b0a169c300e3cb21ee76a6773ccc1f6d69c0e9af604d6bf24669a561e038cf670bac20c5eff5ac48b33f3f36de81d99895b6a43c8310b2609e9b2bfce42cc0bc
-AUX alsa-plugins-1.1.5-optional_plugins.patch 1123 BLAKE2B 453d9455741c118bde8ac697cc3d5b8b1404eb93d842e7a05193175261cdcd30d34e0cc7a8bd90aeb402799c60bce81dd42dcac2bd3b085b3385ba9e06cc2859 SHA512 9659eca8a071cdb2cbae6f1ec6fc0b447a45858a5464023f1dc5c36fda8053572d6a2a8cff629e8c2768b8a61e9f15d6d7cf420ab1aad1b3773084b7ed959c5e
 AUX pulse-default.conf 196 BLAKE2B 4293e2ba9b4c87c35e3bdfe45781f86af733341c8bada5a78b38d08c59c5774e5679487e877d11fb7866b2ed7d9f9441552f864e9c2b9e42119eda62e1459ae8 SHA512 c64f73a46c9f50704d4b2bef09d95ce3bc2352da1437750f49974ab8e6f60d5467d5d94ab0e1490deea5f2b1f67b20aa60a10c502e7d6e049649bca4208f7c1e
 DIST alsa-plugins-1.1.1.tar.bz2 366193 BLAKE2B 02892b0c241cf34d3bfce6cf580dbb6bedbce9253c3e57f04d3093a6cbb1d5b5e9b92566945962b875de20ba3e556e9c1fc4bb4e970502e3c03fc821e5e264fe SHA512 9dd277cb5cce144ce4e5e0010cebcba0f8634c783e7bcd80ce6d04b198d6de5150a2764df3087a39a468b5fb7c4578de2e252095568e811dedaa5e7ffdbeb7c9
-DIST alsa-plugins-1.1.6.tar.bz2 367485 BLAKE2B efe8b8447db4f68761060e4f48c86c76f821fd7795d8edec0c8f5a03f7406a422f630f012433ac12c3af3222b7b587820a92e937c80dba6bb8766deb854b9706 SHA512 f01633cd7166a2fba4c5b4d5d786b5a2122f6a810f5b5b7209c42033759d116a4515174e7ee57973d5de716be88a246d733dc5a2daf92b72377c274b04db401b
 DIST alsa-plugins-1.1.8.tar.bz2 375346 BLAKE2B 65c161ee375e7aed85dbe918a39bc2aa4818bbcfbaadf405f5f0170d9944ff55b5a9da3690e3cd78bd7ffff74ecf235f49cfc3a5dfe18b627c5a9cb0dc1eb207 SHA512 bb1a4411921ec332f47b43515f6d3b4c03a01568854950b9b5c3f0d8172d9a0c4a5b3652bc64c62eae5ea3aaa5d95fe3d32c0a213fe99adf490a9807bcb58ecd
 DIST alsa-plugins-1.1.9.tar.bz2 406127 BLAKE2B 10bf3e96289a88edabfa3018d33ab4666982fe409eb41c486e6b9eee0dde87e926f3241c31e240b3bab114c8ab2c6d6bab92dd6192bceb467a01fcb6adc44b8e SHA512 1969dfe8f2bb4283e81a18da73d2f7f86d8788d1a8764d7195b4830b2f4704c208eacb50a1e26e20c9fe57e7d5bb06a004112d84cc86b4682b4180d2fec4d5d9
+DIST alsa-plugins-1.2.1.tar.bz2 406309 BLAKE2B 2ac26ad87fcdcc4452ec32b2b437d3be4308f13ce2a8e24150f319805b6d684edc6be9e51654f27c1a5bbc01a7caa9eb70250be405dc6921ecd93ee417f24cdf SHA512 a49ef9290b66855112e301a5fd5a0932f13a50254e164f3340f2b342a36469532ee783beabfe5e95870dbf4cd81ca1e8d0415d94c8c7ee963133fb3c343721de
 EBUILD alsa-plugins-1.1.1-r1.ebuild 2716 BLAKE2B 6e4e45f7b9ebe382dedb7e8bf50c1867b66d8bf0c6a647647a5f3de2af414c053e00277d80f4828a95680c115b9e6c2d9a973352d3814868b7b0628fd154dbb0 SHA512 7e8e4a8dfd0eaff522f8bb3b8c3ff625cac0299529fd5005485c00d575f6cbc06240659eba0d4451c8fcf33ea2ccbd7416d6d38a0a8f41a8c5b88c4aad44861a
-EBUILD alsa-plugins-1.1.6.ebuild 2888 BLAKE2B 53010a3af9bea06d72a2cd29003ef79f9c660d006b35f1c722b1ad6d5042d5fb49275e1d3eec1d75fd2451463dc1521c217e91163cd041a2920e6c8400f74898 SHA512 5b942533f326be2cc4a08a3f8b3b75725538562a4b52c7eca6a1b995c59ba96a302aeda9c3ebe925ed151cd1f2baa52c238e928ee7235766ba393ac5483da603
 EBUILD alsa-plugins-1.1.8.ebuild 2830 BLAKE2B a6dc6799d8a9619bd493c96c399660172e02a2a21ec8b39f48eb34c950cef825cb739ef9b255b1d10765a886eb522efed865dc3ea79307cd0fc739077e52db20 SHA512 f764fba4d8385d22362b2e30c05f4b35d3bd5e204e02b79757a07c7b9c7ee96d0e76c572086ee5a0064568ac8fc1ffccea69c634d6c3f5781c63e69857e72b7b
 EBUILD alsa-plugins-1.1.9-r1.ebuild 3065 BLAKE2B b29d856bd528e96937fa542e7a7864b1e6aef29fac712ed50d32c770db1d7d1e010bcb98c4982465f4a899cb97f09de005337801a7275955f2a823bf73bb0e38 SHA512 ea192a0fb2e89ccbc09d04aa4a5c845a09cf9200b6f93c4a36497985b0472f6863d41312043b4e055e8f7ec1fc7f3bf3647ab6e0cdd8f2b91ed8ff618bc77817
 EBUILD alsa-plugins-1.1.9.ebuild 2939 BLAKE2B 9eb1977b1d9250e44c42efe066105b8c9b4570d24d54287091f1973900667968f0e7f29f357bea33f45ed7a9e45901d07c618d0782248c166bf41c8f28bb3c61 SHA512 3c098be52919086a259966982e19dc7dd8fd8c174ed40de7d0d1b1e121e579c49fa4f3af280f22810c2e3bb93921e154e1abcfc92da3529c1e7033db996908d2
+EBUILD alsa-plugins-1.2.1.ebuild 3070 BLAKE2B eb69d3fce1991b49bfdacb6b212bfdfc2c00982b9e4595e86ec0fd7e97eb28d6f9ea8a5d8afbcf1086231ad8900508dc9d843dcd7f373bb65706a2ff93e40609 SHA512 6bfc0711d3a5020c25cc69a91a0ccaf62850e890c531047d72d3c686f3aed20b80155e1b552c613a86b72fbca7078547bdc87fc4ec50087e2454af3ef6f26048
 MISC metadata.xml 512 BLAKE2B 2fa80544d70890c99164643bc1706b8c2e5f3d50c991e781e68441072366b1b89d0082507bf1c27d11d95bcd1c7d508f09ce0b193bd7d4ca77f27a2bdf9e24c8 SHA512 fce90766306d36d97ae40cbebf7b788f6f11766afc6d9680f563271ea184373ae20480b99b6e60edc74d9bfb222acd1d11c50163a31520f073a00bba9050e361
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild
index 64eb75cc803b..c320568f707e 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.1.6.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit autotools flag-o-matic multilib multilib-minimal
 
 DESCRIPTION="ALSA extra plugins"
@@ -10,7 +10,7 @@ SRC_URI="https://www.alsa-project.org/files/pub/plugins/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sh sparc x86 ~amd64-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux"
 IUSE="arcam_av debug ffmpeg jack libav libsamplerate +mix oss pulseaudio speex +usb_stream"
 
 RDEPEND="
@@ -27,12 +27,8 @@ RDEPEND="
 		media-libs/speexdsp[${MULTILIB_USEDEP}]
 	)
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.1.5-optional_plugins.patch"
-)
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
@@ -40,9 +36,9 @@ src_prepare() {
 	# For some reasons the polyp/pulse plugin does fail with alsaplayer with a
 	# failed assert. As the code works just fine with asserts disabled, for now
 	# disable them waiting for a better solution.
-	sed -i \
+	sed \
 		-e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
-		pulse/Makefile.am || die
+		-i pulse/Makefile.am || die
 
 	eautoreconf
 }
@@ -51,9 +47,12 @@ multilib_src_configure() {
 	use debug || append-cppflags -DNDEBUG
 
 	local myeconfargs=(
+		# default does not contain $prefix: bug #673464
+		--with-alsalconfdir="${EPREFIX}"/etc/alsa/conf.d
+
 		--with-speex="$(usex speex lib no)"
 		$(use_enable arcam_av arcamav)
-		$(use_enable ffmpeg avcodec)
+		$(use_enable ffmpeg libav)
 		$(use_enable jack)
 		$(use_enable libsamplerate samplerate)
 		$(use_enable mix)
@@ -72,7 +71,7 @@ multilib_src_install_all() {
 	dodoc upmix.txt vdownmix.txt README-pcm-oss
 	use jack && dodoc README-jack
 	use libsamplerate && dodoc samplerate.txt
-	use ffmpeg && dodoc lavcrate.txt a52.txt
+	use ffmpeg && dodoc lavrate.txt a52.txt
 
 	if use pulseaudio; then
 		dodoc README-pulse
@@ -84,12 +83,14 @@ multilib_src_install_all() {
 		doins "${FILESDIR}"/51-pulseaudio-probe.conf
 		# bug #410261, comment 5+
 		# seems to work fine without any path
-		sed -i \
+		sed \
 			-e "s:/usr/lib/alsa-lib/::" \
-			"${ED%/}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
+			-i "${ED}"/usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf || die #410261
+		dosym ../../../usr/share/alsa/alsa.conf.d/51-pulseaudio-probe.conf \
+			/etc/alsa/conf.d/51-pulseaudio-probe.conf #670960
 	fi
 
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
+	find "${ED}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
 }
 
 pkg_postinst() {
diff --git a/media-plugins/alsa-plugins/files/alsa-plugins-1.1.5-optional_plugins.patch b/media-plugins/alsa-plugins/files/alsa-plugins-1.1.5-optional_plugins.patch
deleted file mode 100644
index cb232b2da6fb..000000000000
--- a/media-plugins/alsa-plugins/files/alsa-plugins-1.1.5-optional_plugins.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 565cfc8800c2e7a122f6574f67a7da8f1165e34d Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sun, 18 Feb 2018 16:00:39 +0100
-Subject: [PATCH] Makefile.am: Add missing code for enhanced configure option
- of alsa plugins
-
-Commit 1201e158fb00bf15c353d088c94c1cb3eff9653c added the pieces for
-configure but did not do the same for Makefile.
-As result all plugins were still built regardless of corresponding
---disable-* option being called with configure.
----
- Makefile.am | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 69cfe0d..76cefef 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = oss mix usb_stream arcam-av doc
-+SUBDIRS = doc
- if HAVE_JACK
- SUBDIRS += jack
- endif
-@@ -20,6 +20,18 @@ endif
- if HAVE_SPEEXDSP
- SUBDIRS += speex
- endif
-+if HAVE_OSS
-+SUBDIRS += oss
-+endif
-+if HAVE_MIX
-+SUBDIRS += mix
-+endif
-+if HAVE_USBSTREAM
-+SUBDIRS += usb_stream
-+endif
-+if HAVE_ARCAMAV
-+SUBDIRS += arcam-av
-+endif
- 
- EXTRA_DIST = gitcompile version COPYING.GPL m4/attributes.m4
- AUTOMAKE_OPTIONS = foreign
--- 
-2.16.2
-
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index aaf609c0d6ba..3fdbfeb91c64 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,6 +1,8 @@
 DIST audacious-plugins-3.10.1.tar.bz2 1715477 BLAKE2B fda3940e6c06aadd93a3e1538be747083fcc969cf3118cf3e942787906b9ee0a13bd3c30d15ba19cb713559cdf8f7b71d7b961173b1619f0aafbdea5deb75ac3 SHA512 454e9ce4061e92a0ecda40f562d4cc7453fc0019fd76b25dbe9e319319fa37c22f9785cb29563e8074de8a88e6130106aca1e431790297e1b4636dc974fde565
 DIST audacious-plugins-3.9-gtk3.tar.bz2 1842950 BLAKE2B 55f373be204a9b4c9cff41d41d43c4776f680ab203643e90e5d338bec2e7f8a4c60cda9caa08e461089a475f3ec1bc237538f781718eb0d26a4365743337e977 SHA512 e2529af761bc97e589cac08689b16db657096b1bbfcc802789726ae1b472746025bec1b492de52eef755d7b50574d09b9250761bf701b1ca37f8a0e8db0f207b
-EBUILD audacious-plugins-3.10.1.ebuild 4289 BLAKE2B 8d27f4bbbba260be7182cb8f2b287a9b717f0c0394a8b980895864a952e8726aa846c724e6b1ae54bc3462c5e9d62e91742a0f5fb670b853d9982ebbb2ef6557 SHA512 d836d8eea63c8651c4b742e6fd58d02d55e68de1954fe8abda83b18b631e28666af6012c47a8e532e4a0bdbcdce00a135f371e8a729c2d29a926d29acb8b0d32
-EBUILD audacious-plugins-3.9-r2.ebuild 3686 BLAKE2B 1aadcffb6133fcfce85acb06cd1e520b5da20365396c99e968c364f7455430a3233ce760638c0800b16301e601b9a5788b1b724d6a30d9e7976c9ff9f6f96ea2 SHA512 3356517402b4434d74488b2bca1f58e1119453d676bd073bed97408e218606fb390ceede95bef4132d29eab7bff01739b728719c1b55c737af0595202dca92ea
-EBUILD audacious-plugins-9999.ebuild 4289 BLAKE2B 8d27f4bbbba260be7182cb8f2b287a9b717f0c0394a8b980895864a952e8726aa846c724e6b1ae54bc3462c5e9d62e91742a0f5fb670b853d9982ebbb2ef6557 SHA512 d836d8eea63c8651c4b742e6fd58d02d55e68de1954fe8abda83b18b631e28666af6012c47a8e532e4a0bdbcdce00a135f371e8a729c2d29a926d29acb8b0d32
-MISC metadata.xml 1333 BLAKE2B f27c5c2d94c45688e56a6a48382c6b5fb3e05bfbbdff613af56ce386af8f607b6d24f5eedfebe221274fe5f56d0d13cc1cba21c11007ff9b5ceb5080f36dde64 SHA512 2c31199cc1f095d0108223e15584dd901fedc88aa02820bf4749cbb1014eeec5af04e1df9688efdd2c2b78a4f27658dec3a73a7c3e6e3968fc8ab659611e9c81
+DIST audacious-plugins-4.0-beta1.tar.bz2 1731865 BLAKE2B 0187137f25b19f672fe580c13ab0050d1968fc95886fa66e42a83ff674e37463f19fc29a0603afc1a0f25b54ae535b12089c44b6c7a45f23022dc71f5a366062 SHA512 4d365967478c926db3c71b68b8c4bf0333da551f1581b01f860d0846162d6f6d1564a9fc627ce3cfcea4e47c02133dbd37407dedc283d9945e60c4f472e9dd41
+EBUILD audacious-plugins-3.10.1.ebuild 4291 BLAKE2B eb44cea093e8395fdd4603a64c88e1449069ed729df9cd1013e2494dbafb789a01e79575a23feb201a9b7a41fe785bceef483537084405134c08037203bf6e4a SHA512 82036373ebe6599ff638f6a4f681c6ad2d442b6d020c8c4b83a4a4185b8a56335c94f02c25c37a02d5b8a8d66cfb50bf3a5df19e163a1f723cfeb6a60eaf8a34
+EBUILD audacious-plugins-3.9-r2.ebuild 3690 BLAKE2B e62cdee5db3cd27a5e75f0db1cfd154dd589a09512930bf2126c2a460a63cd1914aa8cfa4181d0772a738ecde06e9cfaf1cf80efe05d36354fe791c017aef6e8 SHA512 4f1555d09c925c8d950759591e49f5039134dd48f110ba572151caa8579a283df2c46c7433058d9458be682f1cc77ba31b3d6538267c32f475f55276230aba6d
+EBUILD audacious-plugins-4.0_beta1.ebuild 4097 BLAKE2B 37fc776ce81cdbd5614257b278f60e9acb78b86402f07f6d9ac4b9b4df92464fe66691eeef7388420eecb88e8e920c6595004a1965c809d6ccc36acb087d36c2 SHA512 403292d2ebb6e34bcbc69acd8f5bdf34e65c3102e8d70431d5c8e1e484a75d80f7bef546cf860473562ca7085759871b51a1da0a4882569cc57e60d31de4fc7e
+EBUILD audacious-plugins-9999.ebuild 4445 BLAKE2B f2d07e0780bbae46510f5d7f219562d2c29bb5b0430ab5f8a401f96ab8633807c36bb471060092ea0ba4356df4c98a23c2175d9f0389ca26880c01f91854ad09 SHA512 5babc868d4997e962f3c8a25bfa430fa1c64f776215b83d25d945ef5dfc877151eb4dd7dedfdfb97c9fda94d53df407a5374d7d12c069817ff0578a25de9df5c
+MISC metadata.xml 1464 BLAKE2B 203b5318b5e7e9e3a4e2b5804b1085ed384e3467e8ab8c7ea8a110ea2dc0e6e1d027b47d6f02900d3847b9e107dac02a6b71676319cdeffb2252b7671017ac9f SHA512 b56fcde4db2650796f2e7eb0086617950b081cdd77196013444e693b99b1ab2dfb2a6bfdc36149d795d5be84beb80e5a236348f4f473f3158b29e2a72c311126
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10.1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10.1.ebuild
index c5831e1e045b..23c7267d5bb8 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.10.1.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.10.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
 else
 	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 DESCRIPTION="Lightweight and versatile audio player"
 HOMEPAGE="https://audacious-media-player.org/"
@@ -58,10 +58,10 @@ DEPEND="
 	bs2b? ( media-libs/libbs2b )
 	cdda? (
 		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
+		dev-libs/libcdio-paranoia:=
 		>=media-libs/libcddb-1.2.1
 	)
-	cue? ( media-libs/libcue )
+	cue? ( media-libs/libcue:= )
 	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
 	flac? (
 		>=media-libs/flac-1.2.1-r1
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.9-r2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.9-r2.ebuild
index 82afc3d0bfca..93bf6d8de500 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-3.9-r2.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-3.9-r2.ebuild
@@ -46,10 +46,10 @@ RDEPEND="
 	bs2b? ( media-libs/libbs2b )
 	cdda? (
 		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
+		dev-libs/libcdio-paranoia:=
 		>=media-libs/libcddb-1.2.1
 	)
-	cue? ( media-libs/libcue )
+	cue? ( media-libs/libcue:= )
 	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
 	flac? (
 		>=media-libs/flac-1.2.1-r1
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.0_beta1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.0_beta1.ebuild
new file mode 100644
index 000000000000..b815a044cb5f
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-4.0_beta1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${P/_/-}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git"
+else
+	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+fi
+DESCRIPTION="Lightweight and versatile audio player"
+HOMEPAGE="https://audacious-media-player.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac adplug +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth http gme
+	jack lame libav libnotify libsamplerate lirc mms modplug mp3 nls opengl
+	pulseaudio qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
+REQUIRED_USE="
+	|| ( alsa jack pulseaudio qtmedia sdl )
+	ampache? ( http )"
+
+# The following plugins REQUIRE a GUI build of audacious, because non-GUI
+# builds do NOT install the libaudgui library & headers.
+# Plugins without a configure option:
+#   alarm
+#   albumart
+#   delete-files
+#   ladspa
+#   playlist-manager
+#   search-tool
+#   skins
+#   vtx
+# Plugins with a configure option:
+#   glspectrum
+#   gtkui
+#   hotkey
+#   notify
+#   statusicon
+BDEPEND="
+	dev-util/gdbus-codegen
+	virtual/pkgconfig
+	nls? ( dev-util/intltool )
+"
+DEPEND="
+	app-arch/unzip
+	dev-libs/dbus-glib
+	dev-libs/glib
+	dev-libs/libxml2:2
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	~media-sound/audacious-${PV}
+	aac? ( >=media-libs/faad2-2.7 )
+	adplug? ( media-libs/adplug )
+	alsa? ( >=media-libs/alsa-lib-1.0.16 )
+	ampache? ( =media-libs/ampache_browser-1* )
+	bs2b? ( media-libs/libbs2b )
+	cdda? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia:=
+		>=media-libs/libcddb-1.2.1
+	)
+	cue? ( media-libs/libcue:= )
+	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
+	flac? (
+		>=media-libs/flac-1.2.1-r1
+		>=media-libs/libvorbis-1.0
+	)
+	fluidsynth? ( media-sound/fluidsynth:= )
+	http? ( >=net-libs/neon-0.26.4 )
+	jack? (
+		>=media-libs/bio2jack-0.4
+		virtual/jack
+	)
+	lame? ( media-sound/lame )
+	libnotify? ( x11-libs/libnotify )
+	libsamplerate? ( media-libs/libsamplerate:= )
+	lirc? ( app-misc/lirc )
+	mms? ( >=media-libs/libmms-0.3 )
+	modplug? ( media-libs/libmodplug )
+	mp3? ( >=media-sound/mpg123-1.12.1 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
+	opengl? ( dev-qt/qtopengl:5 )
+	qtmedia? ( dev-qt/qtmultimedia:5 )
+	scrobbler? ( net-misc/curl )
+	sdl? ( media-libs/libsdl2[sound] )
+	sid? ( >=media-libs/libsidplayfp-1.0.0 )
+	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
+	soxr? ( media-libs/soxr )
+	speedpitch? ( media-libs/libsamplerate:= )
+	vorbis? (
+		>=media-libs/libogg-1.1.3
+		>=media-libs/libvorbis-1.2.0
+	)
+	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
+}
+
+src_prepare() {
+	default
+	if ! use nls; then
+		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
+	fi
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-mpris2
+		--enable-qt
+		--enable-songchange
+		--disable-gtk
+		--disable-openmpt # not packaged
+		--disable-oss4
+		--disable-coreaudio
+		--disable-sndio
+		$(use_enable aac)
+		$(use_enable adplug)
+		$(use_enable alsa)
+		$(use_enable ampache)
+		$(use_enable bs2b)
+		$(use_enable cdda cdaudio)
+		$(use_enable cue)
+		$(use_enable flac)
+		$(use_enable flac filewriter)
+		$(use_enable fluidsynth amidiplug)
+		$(use_enable gme console)
+		$(use_enable http neon)
+		$(use_enable jack)
+		$(use_enable lame filewriter_mp3)
+		$(use_enable libnotify notify)
+		$(use_enable libsamplerate resample)
+		$(use_enable lirc)
+		$(use_enable mms)
+		$(use_enable modplug)
+		$(use_enable mp3 mpg123)
+		$(use_enable nls)
+		$(use_enable opengl qtglspectrum)
+		$(use_enable pulseaudio pulse)
+		$(use_enable qtmedia qtaudio)
+		$(use_enable scrobbler scrobbler2)
+		$(use_enable sdl sdlout)
+		$(use_enable sid)
+		$(use_enable sndfile)
+		$(use_enable soxr)
+		$(use_enable speedpitch)
+		$(use_enable vorbis)
+		$(use_enable wavpack)
+		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index c5831e1e045b..8ca80a9cf2be 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -17,11 +17,14 @@ HOMEPAGE="https://audacious-media-player.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac adplug +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libav libnotify libsamplerate
-	lirc mms modplug mp3 nls opengl pulseaudio qt5 qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
+IUSE="aac adplug +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gtk http gme
+	jack lame libav libnotify libsamplerate lirc mms modplug mp3 nls opengl
+	pulseaudio qtmedia scrobbler sdl sid sndfile soxr speedpitch streamtuner
+	vorbis wavpack"
 REQUIRED_USE="
 	|| ( alsa jack pulseaudio qtmedia sdl )
-	ampache? ( qt5 http ) qtmedia? ( qt5 )"
+	ampache? ( http )
+	gtk? ( !ampache !qtmedia !streamtuner )"
 
 # The following plugins REQUIRE a GUI build of audacious, because non-GUI
 # builds do NOT install the libaudgui library & headers.
@@ -50,7 +53,7 @@ DEPEND="
 	dev-libs/dbus-glib
 	dev-libs/glib
 	dev-libs/libxml2:2
-	~media-sound/audacious-${PV}[qt5=]
+	~media-sound/audacious-${PV}[gtk=]
 	aac? ( >=media-libs/faad2-2.7 )
 	adplug? ( media-libs/adplug )
 	alsa? ( >=media-libs/alsa-lib-1.0.16 )
@@ -58,16 +61,27 @@ DEPEND="
 	bs2b? ( media-libs/libbs2b )
 	cdda? (
 		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
+		dev-libs/libcdio-paranoia:=
 		>=media-libs/libcddb-1.2.1
 	)
-	cue? ( media-libs/libcue )
+	cue? ( media-libs/libcue:= )
 	ffmpeg? ( >=virtual/ffmpeg-0.7.3 )
 	flac? (
 		>=media-libs/flac-1.2.1-r1
 		>=media-libs/libvorbis-1.0
 	)
 	fluidsynth? ( media-sound/fluidsynth:= )
+	gtk? (
+		x11-libs/gtk+:2
+		x11-libs/libXcomposite
+		x11-libs/libXrender
+	)
+	!gtk? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
 	http? ( >=net-libs/neon-0.26.4 )
 	jack? (
 		>=media-libs/bio2jack-0.4
@@ -81,17 +95,6 @@ DEPEND="
 	modplug? ( media-libs/libmodplug )
 	mp3? ( >=media-sound/mpg123-1.12.1 )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	!qt5? (
-		x11-libs/gtk+:2
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		opengl? ( dev-qt/qtopengl:5 )
-	)
 	qtmedia? ( dev-qt/qtmultimedia:5 )
 	scrobbler? ( net-misc/curl )
 	sdl? ( media-libs/libsdl2[sound] )
@@ -99,6 +102,7 @@ DEPEND="
 	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
 	soxr? ( media-libs/soxr )
 	speedpitch? ( media-libs/libsamplerate:= )
+	streamtuner? ( dev-qt/qtnetwork:5 )
 	vorbis? (
 		>=media-libs/libogg-1.1.3
 		>=media-libs/libvorbis-1.2.0
@@ -109,6 +113,10 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
+pkg_setup() {
+	use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
+}
+
 src_prepare() {
 	default
 	if ! use nls; then
@@ -118,11 +126,10 @@ src_prepare() {
 }
 
 src_configure() {
-	use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-
 	local myeconfargs=(
 		--enable-mpris2
 		--enable-songchange
+		--disable-openmpt # not packaged
 		--disable-oss4
 		--disable-coreaudio
 		--disable-sndio
@@ -137,6 +144,10 @@ src_configure() {
 		$(use_enable flac filewriter)
 		$(use_enable fluidsynth amidiplug)
 		$(use_enable gme console)
+		$(use_enable gtk aosd)
+		$(use_enable gtk gtk)
+		$(use_enable gtk hotkey)
+		$(use_enable !gtk qt)
 		$(use_enable http neon)
 		$(use_enable jack)
 		$(use_enable lame filewriter_mp3)
@@ -148,10 +159,6 @@ src_configure() {
 		$(use_enable mp3 mpg123)
 		$(use_enable nls)
 		$(use_enable pulseaudio pulse)
-		$(use_enable !qt5 aosd)
-		$(use_enable !qt5 gtk)
-		$(use_enable !qt5 hotkey)
-		$(use_enable qt5 qt)
 		$(use_enable qtmedia qtaudio)
 		$(use_enable scrobbler scrobbler2)
 		$(use_enable sdl sdlout)
@@ -159,11 +166,14 @@ src_configure() {
 		$(use_enable sndfile)
 		$(use_enable soxr)
 		$(use_enable speedpitch)
+		$(use_enable streamtuner)
 		$(use_enable vorbis)
 		$(use_enable wavpack)
 		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
 	)
-	use qt5 && myeconfargs+=( $(usex opengl --enable-qtglspectrum --disable-qtglspectrum) )
+	use !gtk && myeconfargs+=(
+		$(usex opengl --enable-qtglspectrum --disable-qtglspectrum)
+	)
 
 	econf "${myeconfargs[@]}"
 }
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index cdc6bec65c66..ca584bce40c1 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -16,12 +16,14 @@
 		<flag name="cue">Support CUE sheets using the libcue library</flag>
 		<flag name="fluidsynth">Support FluidSynth as MIDI synth backend</flag>
 		<flag name="gme">Support various gaming console music formats</flag>
+		<flag name="gtk">Build with GTK interface instead of Qt5</flag>
 		<flag name="http">Support HTTP streams through neon</flag>
-		<flag name="qt5">Build with Qt5 interface instead Gtk+</flag>
+		<flag name="qt5">Build with Qt5 interface instead of GTK</flag>
 		<flag name="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="scrobbler">Build with scrobbler/LastFM submission support</flag>
 		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
 		<flag name="soxr">Build with SoX Resampler support</flag>
 		<flag name="speedpitch">Enable speed/pitch effects</flag>
+		<flag name="streamtuner">Build the streamtuner plugin</flag>
 	</use>
 </pkgmetadata>
diff --git a/media-plugins/ladspa-bs2b/Manifest b/media-plugins/ladspa-bs2b/Manifest
index ff1e9b350e3c..5c6b322325bc 100644
--- a/media-plugins/ladspa-bs2b/Manifest
+++ b/media-plugins/ladspa-bs2b/Manifest
@@ -1,4 +1,4 @@
 DIST ladspa-bs2b-0.9.1.tar.bz2 237542 BLAKE2B e37b5bd2e5cc1ee43f121c91137132a1330476a69fe40b159ca7dee8e38f486b17a9895012eb4a21f4a3c324693a7d3db689867f3edf2cfe2ea4bc2468d3ecac SHA512 1ef4b2b71cecb7f42b1b78fe20ffb7715aad1b360abbcbca629cad58d9377ff8779a0fe983b3c6f5a00376120c838deda1d160ff9f378a955cf4b308bc5bc46a
-EBUILD ladspa-bs2b-0.9.1-r1.ebuild 440 BLAKE2B 3b5242feb583dbdcf30a8abb6f0552b4b9a56afb7d1a26a4017b6cdc33091139aacb5a1a0d7bc1bcca3dab92c6a2dfbce7380aa4b11b981e0d48ee849d6b533e SHA512 a2b57a0f38eb1ee94d995d317327f8938acc019b7e554fc492871c3afaa0e128758685e70f84b61c6cdee0c7deb2bb85780f152e3f68e1fa5b084dd48cac53c3
+EBUILD ladspa-bs2b-0.9.1-r1.ebuild 438 BLAKE2B cd0b303ac893648dd6eeb241b9272daf4f55532860eef8c05ef2ed8d2b0fa97a87ecd917d8e80fd632995f7139c3eaeafddadff48e669cf857fd16a0a3ce63ba SHA512 56db6957c4e123dcdebad33796934a388c6fbc4e70645cee43adcbe716a3a0e2d07df7a0d58203f102670a0ced4542af20065b3c5e4a434c684d5b751618a145
 EBUILD ladspa-bs2b-0.9.1.ebuild 540 BLAKE2B c9d2bec6e99103a912205125d40cea5ec5156f2d5701cfdc20b50d9970ab1c88bc1252ad73e44364af9033a23e3bcae260909ca879dbf4f33da37c7383d4404b SHA512 0804c9ed7a37a2a7de56c06295cd9a15d115f8b68bfaa5739a961dbfa31ada02b277866d9a35875534487bb8ea8a8d3c40bcc9deed6747b99c483c8e1b9a1ec9
 MISC metadata.xml 323 BLAKE2B efc717d30d62bb072e15f4187c451e372d099e8d3666c4b992ef6658c3034bd041c105aa8bc52ae4871084f8b8b28fbb062009581f086c8eb784da7e6eff7c3a SHA512 354b905e42944d16d4ba721edee73c2ecb0cad94afcee0a471082cc267f11bc7d1c49ecb4281b6ba8206c2256ee526b345966eea457d99a0e06a440b5a126399
diff --git a/media-plugins/ladspa-bs2b/ladspa-bs2b-0.9.1-r1.ebuild b/media-plugins/ladspa-bs2b/ladspa-bs2b-0.9.1-r1.ebuild
index 8fb9247457dd..1320304cec31 100644
--- a/media-plugins/ladspa-bs2b/ladspa-bs2b-0.9.1-r1.ebuild
+++ b/media-plugins/ladspa-bs2b/ladspa-bs2b-0.9.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/bs2b/plugins/LADSPA%20plugin/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="media-libs/ladspa-sdk
diff --git a/media-plugins/mda-lv2/Manifest b/media-plugins/mda-lv2/Manifest
index f0f3a0ce713b..5d4462b00f64 100644
--- a/media-plugins/mda-lv2/Manifest
+++ b/media-plugins/mda-lv2/Manifest
@@ -1,5 +1,3 @@
-DIST mda-lv2-1.0.0.tar.bz2 2154530 BLAKE2B 4053f7e8c861487ce32fb5e4b94e643084f9a6aa91423011c52c0b8938308abff12a3804b194d7ac2a30a1e5d13e1b69add1b5c18927b4dff687a79b250d42e2 SHA512 3ee521d916eeaec14c64d3cc84d036e3c2152441cb1c266d8971e823a7e498039a210e49af5f1a9a773ac85cb49c620acf64e46a0625c6969f559b4c99786575
 DIST mda-lv2-1.2.2.tar.bz2 2160906 BLAKE2B 2b0660395b3508247558305a1ec80c27c8e23ae4db3fb6eb30a06df54bca822256f712961dbaf9e318966be8f4c90824ea4246499fa2343a59376ef80f862eb5 SHA512 da9960462a896f8412cc1918e3a7c0bf9d33d5431a1264035705ca21295d52de1e6b5360369b9da519376a78f72b0c750d133d89b04240f3e35a210e4551854a
-EBUILD mda-lv2-1.0.0.ebuild 517 BLAKE2B 81cb2ee49daa43b22a5c3e8f38eeffac71b4b633ae20a860f0a146028ba5368850a5323bd4ae549f717c6484ac9407c6cf1e9a62e1065434086a75b1e1a0f3d8 SHA512 345b3c159873e56e2a919082dbff9fdf78295eb05e4b197fabcf68fe0cf2c3ff0c8b9d0d3ff3dd734eb66fc3a7b26e45684ccc75f94219eaa286aa1e731b3ace
 EBUILD mda-lv2-1.2.2.ebuild 527 BLAKE2B bfd459b9758fb088dab6fa345d13eb19b04e8509dff503a9ddf1fcb2d68fd3171dab9f69a2fd802309b2b3b51d547cad0448689df475a4ebb546c22262a62078 SHA512 08e0869b5355ba2bc3f863db53f12d74e4cebde7a1cddcc331577bd5894cc81aa7ed9e4c8cbc79c663be21da947fbd2c7ba5410a2212a350e539a9a7905d5c47
 MISC metadata.xml 1639 BLAKE2B a4ef48117da13a3372fc3edd7a2f5c5a720e710f192193647842d5f1435d1a6976e6d229845c22e372f30313d6fb47cb1915855c529241e1b7a9bcfbc448d600 SHA512 aab04b98a5b005f186f2f81444f24899a2204a79971deb638b7fb8f4907a622c538fc01d5a606d4471a7650539993ee2b668324834f11dde9479d140d7edee19
diff --git a/media-plugins/mda-lv2/mda-lv2-1.0.0.ebuild b/media-plugins/mda-lv2/mda-lv2-1.0.0.ebuild
deleted file mode 100644
index 3f64822e59bd..000000000000
--- a/media-plugins/mda-lv2/mda-lv2-1.0.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="LV2 port of the MDA plugins by Paul Kellett"
-HOMEPAGE="http://drobilla.net/software/mda-lv2/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="media-libs/lv2"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	virtual/pkgconfig"
-
-DOCS=( "README" )
diff --git a/media-plugins/mythplugins/Manifest b/media-plugins/mythplugins/Manifest
new file mode 100644
index 000000000000..e3dde2ec7516
--- /dev/null
+++ b/media-plugins/mythplugins/Manifest
@@ -0,0 +1,3 @@
+DIST mythplugins-30.0.tar.gz 101169041 BLAKE2B 0125c6234c168b9b24110b817e9e9a632187743c9ca44a46a8d464be6c330067f31da6fb252ed2a5fd770756229f2d95a746bd5d0e03be1e97fecc0de86603be SHA512 a29125ca33b1b100f51feb7a2ccff16d62928e474a393f11fc4b4fb77d0a85d9d4dd138acf757b527c0f936f3ff2e7d3eddcacef183d642429e36bc3e44ecbf4
+EBUILD mythplugins-30.0.ebuild 4301 BLAKE2B 506e07b595bf362a6d95c33cf25b09bd092ed4ca06659a0a3e9611d3394733b5a07ec9ec5b20d91d2c85d6008e5dfcc11b9cb99b24935e3401cddf612d7e71cc SHA512 14158b804cc41fccfdf6ebcc583ac4101963319a4b5494cebdaef496229466409eab44ca29e02829690719f658ddb27c862d4aff988a86801f402c28d2a905f6
+MISC metadata.xml 1648 BLAKE2B c3bf88af62ef3c7dc370c085f99e555c890ffbdac07e3a9106ed1c277d4c6943a1be2702b3cb8d376665073d69e42d0e629186825fd09ccb03d5d5378ff2ce31 SHA512 43e6c090619bd621b07683e56aa2c90cb163072aa3c5093f6ec5eda147dd1b67ca01488934bb49f851b8fd667b3f47f2e106b98f7f53d97b600fa5ce77d5c7b0
diff --git a/media-plugins/mythplugins/metadata.xml b/media-plugins/mythplugins/metadata.xml
new file mode 100644
index 000000000000..3b81a44089c8
--- /dev/null
+++ b/media-plugins/mythplugins/metadata.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>thebitpit@earthlink.net</email>
+		<name>Wilson Michaels</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="cdr">Allows MythMusic to burn CD-Rs</flag>
+		<flag name="exif">Allows MythGallery to read EXIF data from photos</flag>
+		<flag name="fftw">Adds visual effects to MythMusic when playing back music</flag>
+		<flag name="hls">HTTP Live Streaming support</flag>
+		<flag name="raw">Allows MythGallery to view photos saved in RAW format</flag>
+		<flag name="mytharchive">Allows you to archive recorded content to CD or DVD</flag>
+		<flag name="mythbrowser">Adds a web browser within MythTV</flag>
+		<flag name="mythgallery">Adds a picture viewing gallery within MythTV</flag>
+		<flag name="mythgame">Adds a frontend to various ROM emulators within MythTV</flag>
+		<flag name="mythmusic">Adds the ability for MythTV to act as a music player</flag>
+		<flag name="mythnetvision">Adds the ability to view netvision devices within MythTV</flag>
+		<flag name="mythnews">Adds a news viewer within MythTV</flag>
+		<flag name="mythweather">Adds weather information within MythTV</flag>
+		<flag name="mythzmserver">Build mythzmserver daemon needed by zoneminder on LAN</flag>
+		<flag name="mythzoneminder">Adds support for zoneminder (requires active mythzmserver daemon on LAN).</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">MythTV/mythtv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-plugins/mythplugins/mythplugins-30.0.ebuild b/media-plugins/mythplugins/mythplugins-30.0.ebuild
new file mode 100644
index 000000000000..b574a2449e66
--- /dev/null
+++ b/media-plugins/mythplugins/mythplugins-30.0.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml"
+BACKPORTS="03f44039848bd09444ff4baa8dc158bd61454079"
+MY_P=${P%_p*}
+
+inherit python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="Official WMythTV plugins"
+HOMEPAGE="https://www.mythtv.org"
+# mythtv and mythplugins are separate builds in the same github MythTV/mythtv repository
+SRC_URI="https://github.com/MythTV/mythtv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+
+MYTHPLUGINS="mytharchive +mythbrowser +mythgallery mythgame \
+mythmusic +mythnetvision +mythnews +mythweather mythzmserver mythzoneminder"
+IUSE="${MYTHPLUGINS} alsa cdda cdr exif fftw +hls ieee1394 libass +opengl raw +theora +vorbis +xml xvid"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-libs/glib:2
+	dev-libs/openssl:0=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtsql:5
+	media-libs/freetype:2
+	media-libs/libpng:0=
+	sys-apps/util-linux
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXinerama
+	x11-libs/libXrandr
+	x11-libs/libXv
+	x11-libs/libXxf86vm
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	hls? (
+		media-libs/faac
+		media-libs/libvpx:=
+		>=media-libs/x264-0.0.20111220:=
+		>=media-sound/lame-3.93.1
+	)
+	ieee1394? (
+		>=media-libs/libiec61883-1.0.0
+		>=sys-libs/libavc1394-0.5.3
+		>=sys-libs/libraw1394-1.2.0
+	)
+	libass? ( >=media-libs/libass-0.9.11:= )
+	=media-tv/mythtv-${PV}*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,python,raw?,xml?,xvid]
+	mytharchive? (
+		app-cdr/dvd+rw-tools
+		dev-python/pillow[${PYTHON_USEDEP}]
+		media-video/dvdauthor
+		media-video/mjpegtools[png]
+		media-video/transcode
+		virtual/cdrtools
+	)
+	mythbrowser? ( dev-qt/qtwebkit:5 )
+	mythgallery? (
+		media-libs/tiff:0
+		opengl? ( virtual/opengl:= )
+		exif? ( >media-libs/libexif-0.6.9:= )
+		raw? ( media-gfx/dcraw )
+	)
+	mythgame? ( sys-libs/zlib[minizip] )
+	mythmusic? (
+		>=media-libs/flac-1.1.2
+		media-libs/libogg
+		>=media-libs/libvorbis-1.0
+		>=media-libs/taglib-1.6
+		>=media-sound/lame-3.93.1
+		fftw? ( sci-libs/fftw:3.0= )
+		opengl? ( virtual/opengl )
+		cdda? (
+			dev-libs/libcdio:=
+			cdr? ( virtual/cdrtools )
+		)
+	)
+	mythnetvision? (
+		dev-python/pycurl[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/mysql-python[${PYTHON_USEDEP}]
+		dev-python/oauth[${PYTHON_USEDEP}]
+	)
+	mythweather? (
+		dev-perl/Date-Manip
+		dev-perl/XML-Simple
+		dev-perl/XML-XPath
+		dev-perl/DateTime
+		dev-perl/Image-Size
+		dev-perl/DateTime-Format-ISO8601
+		dev-perl/SOAP-Lite
+		dev-perl/JSON
+	)
+	mythzmserver? ( dev-db/mysql-connector-c:0/18 )
+	theora? ( media-libs/libtheora )
+	xml? ( >=dev-libs/libxml2-2.6.0:= )
+	xvid? ( >=media-libs/xvid-1.1.0 )
+"
+RDEPEND="${DEPEND}
+	!media-plugins/mytharchive
+	!media-plugins/mythbrowser
+	!media-plugins/mythgallery
+	!media-plugins/mythgame
+	!media-plugins/mythmovies
+	!media-plugins/mythmusic
+	!media-plugins/mythnetvision
+	!media-plugins/mythnews
+	!media-plugins/mythweather
+	!media-plugins/mythzmserver
+	!media-plugins/mythzoneminder
+"
+REQUIRED_USE="
+	mythmusic? ( vorbis )
+	mythnetvision? ( ${PYTHON_REQUIRED_USE} )
+	mythnews? ( mythbrowser )
+"
+
+# mythtv and mythplugins are separate builds in the same github MythTV/mythtv repository
+S="${WORKDIR}/mythtv-${PV}/mythplugins"
+
+DOC_CONTENTS="
+Common plugins are installed by default. Disable unneeded plugins individually with USE flags:
+-mythbrowser -mythgallery -mythmusic -mythnetvision -mythnews -mythweather
+Additional plugins may be installed with USE flags mytharchive mythgame mythzmserver mythzoneminder
+"
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		--python=${EPYTHON} \
+		--extra-ldflags="${LDFLAGS}" \
+		$(use_enable cdda cdio) \
+		$(use_enable exif) \
+		$(use_enable exif new-exif) \
+		$(use_enable fftw) \
+		$(use_enable opengl) \
+		$(use_enable raw dcraw) \
+		$(use_enable mytharchive) \
+		$(use_enable mythbrowser) \
+		$(use_enable mythgallery) \
+		$(use_enable mythgame) \
+		$(use_enable mythmusic) \
+		$(use_enable mythnetvision) \
+		$(use_enable mythnews) \
+		$(use_enable mythweather) \
+		$(use_enable mythzmserver) \
+		$(use_enable mythzoneminder)
+}
+
+src_install() {
+	emake STRIP="true" INSTALL_ROOT="${D}" install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/media-plugins/tap-plugins/Manifest b/media-plugins/tap-plugins/Manifest
index 579ecbfbeffa..31b52b8ba7f8 100644
--- a/media-plugins/tap-plugins/Manifest
+++ b/media-plugins/tap-plugins/Manifest
@@ -1,7 +1,5 @@
 AUX tap-plugins-0.7.0-cflags-ldflags.patch 5001 BLAKE2B 10d5586fc49815f28b034cbde7e80149675650bce6185e4d83c8f240f1aac3f642c2aa910ff62fc25ca74ad0b2297a897d06356e0e6802d7dcff8d07de0cea4d SHA512 6c7a4ac2a80ba8896a3746dd181315c789fa7d1003240b11b0efbb2ea81e45b863d61a383e3dfb2123b6bafcc382b7547da4ad83f06314581575fe86f800d6fc
 AUX tap-plugins-0.7.3-cflags-ldflags.patch 901 BLAKE2B fac21c62373310ec7a9a1ab067cbeaa8d202f4cc54c84c11757122786f24a2a811a3a032b6d7eb37d43261946160f74ab33c58d50d777a45a152dfe9535f9803 SHA512 f345e823400b7ea3dcdc8a880cc16d476dc4f55662eb041d2ec40de6763c52c05019990a762fd623c257c870874940c974b628e7ce315d6e4cc4babc70e28a90
-DIST tap-plugins-0.7.2.tar.gz 70961 BLAKE2B 65d69db60afbd04b4951135987b93c62d6dacae98f8d838378a2fd693ccc14b294ccc4878357f977383fdf92c55c4530eb724528bfd6c7a16e7bd1355cc919c1 SHA512 3cd7605b03c2732f22d7ff79c889b50db4514d232c639cf964d65b2428b8ce6193824e26622ded662cae74351daa38a321bc1b1590035e5fa0fb79bb4620edd0
 DIST tap-plugins-0.7.3.tar.gz 70495 BLAKE2B 6e0974be78fa9a8092555282d1d8a3cb5d11731e78119bd0f71e843f6a7557aebd48cc2c8f3cdcc4f90e52eaea357926c0ad2fc9bd9c95bb361ecb7d181f098e SHA512 c4e9c93b9fd8afb82067cf3a48ae665843da775c3af6124147ff1f8651d96734a4b961c4c5ea48877b32770e6d0b5a793af32a5cbb6e3b9afd5b59c8b3cc2621
-EBUILD tap-plugins-0.7.2.ebuild 755 BLAKE2B 0f8c8aea556962456a2bdba5dfd5daaac181d10edafb915788fc0b52f540742e8aef8064979596b8c785b320018aa3f71322c29fafd0ef4914e886f540783cf0 SHA512 c63eb868fc859000d79d76f5dc47f99063344aeee8908dc50916936eba5e4738beedd404946ab295c007f332844c3933922dd073e141af202be0c6981fc0d172
 EBUILD tap-plugins-0.7.3.ebuild 755 BLAKE2B 4d3ef2ecd86d55e8011976ba053631f5557a45dcfbc368dd827359a7697a444518f5bec7e2b9ec0ea4158feabc1be119f58c66b5e1c5a367fb0362d8da81ee17 SHA512 e1d3f77ea092490cea8c64f14031253f73e67db7d378e76794fdcc8384a4ddad75aa19459600052c19eb47bedbeb9326b20ac76aee1e02fa49686a9b8cdeedca
 MISC metadata.xml 1616 BLAKE2B 55ad5ec5fb9218329bd3454b553115c4139d71d6d31a182e0e35750e99963b8b83de92b9c82df3928f7a570395b9bfdf8d5a171a1ff33c7c8443875dca7af9e7 SHA512 876598a8cda8a0331c5fd97d04984a222b2e6a9c0aeffe780f5e970dc1914c75c7e56701fcfa42ef318b0aa88183149f498346a23c5990d6bd7383199c875e01
diff --git a/media-plugins/tap-plugins/tap-plugins-0.7.2.ebuild b/media-plugins/tap-plugins/tap-plugins-0.7.2.ebuild
deleted file mode 100644
index 3f5724473fc9..000000000000
--- a/media-plugins/tap-plugins/tap-plugins-0.7.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit multilib toolchain-funcs eutils
-
-IUSE=""
-
-DESCRIPTION="A bunch of LADSPA plugins for audio processing"
-HOMEPAGE="http://tap-plugins.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-DEPEND="media-libs/ladspa-sdk"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.7.0-cflags-ldflags.patch"
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) OPT_CFLAGS="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dodoc README CREDITS
-	insinto /usr/$(get_libdir)/ladspa
-	insopts -m0755
-	doins *.so
-	insinto /usr/share/ladspa/rdf
-	insopts -m0644
-	doins *.rdf
-}
diff --git a/media-plugins/vco-plugins/Manifest b/media-plugins/vco-plugins/Manifest
index 3f855b027edf..59173694477b 100644
--- a/media-plugins/vco-plugins/Manifest
+++ b/media-plugins/vco-plugins/Manifest
@@ -1,4 +1,3 @@
 DIST VCO-plugins-0.3.0.tar.bz2 18445 BLAKE2B 8b85f16ec0a118531f68f6fe3223250a9786d9b8e75c2cbdafd868eee00883a49eac2a15fcd7e238d50eb40165ddc2f1ff8f202e76715260bccd6d43fb943dc0 SHA512 44e066acdda38137dcc6a6b504a8453f8d0d25c90ba091e71a48554b47e60365a1e6b0bad694ec7340d399951b8b0592507be153370d1b4924d399310cf106c5
-EBUILD vco-plugins-0.3.0-r1.ebuild 727 BLAKE2B ac4ddfac475d6cb12d77e892364b16cd95549f4ab7c5285815c7e922f86767e949fc399f6b3862bf832a90031b2b4c9549f24ad5736bc18568d121f56b17f926 SHA512 1d3af77e9549017e80efa4e657be5975f766c753589f52c22c780f73d5db129914b720c590fa34afd437606409b3602ca5d29d94843938815c3ec86c0104f58a
-EBUILD vco-plugins-0.3.0.ebuild 721 BLAKE2B 9355a5f6c012501973f2a7c3936c4f6c0f54c738b6972de247d7c718d157826ffaa512664135c9afdb23de2c39a40c995cbaf6db04e973b543c606455cf65218 SHA512 a0ef2fe50919e65656070a8f446c129c66cbe340094d8ff094e4f225fca8bb8a99e0cf9fdeeaa923d809a819ca9e76f3a76ee60525b2b48e03ac04c3546096e3
+EBUILD vco-plugins-0.3.0-r1.ebuild 725 BLAKE2B 559cbf10882d431085a920b8686127d99d65bd57ff1bcf860a2a926a9fe45978ffbcbeba42c7d7759f9f733ccae7a1d872a0185cb40868690454dc4a6f61a253 SHA512 f5656dc6d11bf124bc9272426f7c4af2d65f3f23060e547f8995a7575127ec04729bbd4fb4745a5a93ad7937d85066bf7274b1552f6a6daa0de40cfa2c80eaa1
 MISC metadata.xml 259 BLAKE2B 91d2cc7f9ffec656984dd18988a2590a831985a51c93d540af04f796a82b49fedb3adbd5eae9c4c502aa8b4132252c0816589d47d7e8030d9e943dd852f3503d SHA512 1884a7f7d50806bd4addad63ca916f7e27388c953e6345e15fe20d500c217f5f0fcc05fcfa6e20220c28a870801f5e8aab538f5c7f8f211d27de27c98abdb600
diff --git a/media-plugins/vco-plugins/vco-plugins-0.3.0-r1.ebuild b/media-plugins/vco-plugins/vco-plugins-0.3.0-r1.ebuild
index 315bb0747414..308eab4a4c6a 100644
--- a/media-plugins/vco-plugins/vco-plugins-0.3.0-r1.ebuild
+++ b/media-plugins/vco-plugins/vco-plugins-0.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 DEPEND="media-libs/ladspa-sdk"
diff --git a/media-plugins/vco-plugins/vco-plugins-0.3.0.ebuild b/media-plugins/vco-plugins/vco-plugins-0.3.0.ebuild
deleted file mode 100644
index 4534f480b8e8..000000000000
--- a/media-plugins/vco-plugins/vco-plugins-0.3.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit multilib toolchain-funcs
-
-MY_P=${P/vco/VCO}
-
-DESCRIPTION="SAW-VCO ladspa plugin package. Anti-aliased oscillators"
-HOMEPAGE="http://www.kokkinizita.net/linuxaudio/"
-SRC_URI="http://www.kokkinizita.net/linuxaudio/downloads/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="media-libs/ladspa-sdk"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	tc-export CXX
-	sed -i -e "s/-O3//" \
-		-e "s/g++/$(tc-getCXX) ${LDFLAGS}/" Makefile || die "sed failed"
-}
-
-src_install() {
-	dodoc AUTHORS README
-	insinto /usr/$(get_libdir)/ladspa
-	insopts -m0755
-	doins *.so
-}
diff --git a/media-plugins/vdr-dvbhddevice/Manifest b/media-plugins/vdr-dvbhddevice/Manifest
index acfefa3df494..9f199bbb4795 100644
--- a/media-plugins/vdr-dvbhddevice/Manifest
+++ b/media-plugins/vdr-dvbhddevice/Manifest
@@ -1,9 +1,7 @@
+AUX convert-bool-fix.patch 1174 BLAKE2B 4e2d8f6c905ebc45a5b4a8740b545ca7f9406ca5a32bdeb4d8681d4bda3e8b0ad31b5c3d3f5ae79027e741b3e4da93aee237131de8f73e23776019679f178c7f SHA512 3790a53abea21d9024b5f6d3f53d092f0c99fab3741b43aca3d9b26215efea142bce7a769b0d4263ef8303cdda50e68be4747265ef44858b8df48a277c5136d8
 AUX define_AUDIO_GET_PTS.patch 360 BLAKE2B 59b15a5667e71df36ffca863dbcc5952ee9cc813c715fa4affd93de1a1988a5ce0e7d323739013e47567f96576c05292ba82ed2a44a4328139320467dbe201ad SHA512 16b020c92b33c481ea7b41205f048870df2bd3ae38cd5ba388a505e43d9893c20de7baa5aa298de42d83276d01630eb6a1ac949b18aee5226869b2b57264b5cc
 DIST dvbhddevice-2.1.3_p20140115.tar.gz 40424 BLAKE2B 99d5fece7557c7c9f2b0174c9b1f01ac7628f0f0b6aa954f3e829de4653e10cbed6d0516b966f69737aff9ffafd224b3558bd868e972b64ab60c965ba569555a SHA512 29729325affec5e1330cf361a0c82ee5ef9f48f9a6a5032881b331a6451c05c8d99831c43e3eb08129053a7549dd4cd73a5e0afc6fe04d35956c8fecad48d2f4
-DIST vdr-dvbhddevice-2.1.6_p20141116.tar.gz 40902 BLAKE2B 60829c76226c1f0254ac6cdd940fcbcbf08d4cf0a50bfd9ab992db80f63f07389ab29cd4a04aec6319744a39e86cce7dbfee240ab77e819726facd9dbc6d7964 SHA512 0189cf5bfd1d9648915ec65427b4eeeb85ac80281a07a910e65381d86913c37d5840abd8984f17028afe63eae457c7ce398a446e3ad4b70ae4deada316c14b5b
 DIST vdr-dvbhddevice-2.2.0_p20180420.tar.gz 42772 BLAKE2B c70842be34181b15aab69f5a62ba98f4cc72ad5148db684a45ae5c6b74431517b70cda72dbfb6abc371675fd2742f86000b02c645bfba5b6a6b64817f5c59b35 SHA512 bc6ede24897a7704ecefcfdca92eeaf1bf9f8ed2410a478a21cc712730bfe94616c01379a172214f664481fba636ee3aea33540a6cf258597015dfb73720c408
-EBUILD vdr-dvbhddevice-2.1.3_p20140115-r1.ebuild 1044 BLAKE2B 2bd45c2b8c14ee05aa378c7252f04470f66ce4724adaa5a55ce7eaf9ee15d893c80ccc77eabd29514243269192458ee41ecbfc2a6698967f78584b1b05e219d0 SHA512 8740268eb2f76b2625deaca9eccfa70df15b0322951e3ddda633f577dd9ee0ad3b4db4dc92479b6e704aea5269856c60cf0d045df8d09f0805b295c735d3c52e
 EBUILD vdr-dvbhddevice-2.1.3_p20140115.ebuild 842 BLAKE2B c487d9dc3d33893c57612bb0b0e29e0a2c3863675f4f0b2c45a1b62df449e07ecf7ad66a4f90febd8437ce6a822a396ad4aa6b8835aaa5bb38cea07edac5412b SHA512 ecda86c62b7f9049222f8714ce3e4d159e7d94cdb6ddf98669172c5ee2458d3c9245efd4127044d7feeb0b9de6da5251c7d98584c603f457c3cba12df4e0b8e6
-EBUILD vdr-dvbhddevice-2.1.6_p20141116-r1.ebuild 1004 BLAKE2B eef06e5956e37469ce7cc895cdf6d0bb1267dd181127c83ddb8b30ef7b85d3829a713bde5799299134135967e9fd46b378bf7c1ca24d1485702b559316b4816d SHA512 2e9b744bae3e1f0754bfb321af762422258effca238e2e6092fd7895923225eb6ed9415dc4cd835b89eb866013df59624a5acff9725bd862385d756115b79b58
-EBUILD vdr-dvbhddevice-2.2.0_p20180420.ebuild 864 BLAKE2B caee5aed7525c2ca82f14567c3171fe3c1e4fbe75c1354a5188c334ef24e19204689efa788d001627e39842a8d0245843112ecaea5e306490b20fc4cfae71659 SHA512 e77fbd39d863137ca39d36e0a859c002e2a10cf8a0a06d45432c481aba7a1af19b2c599180f81c962204084e4e506206261621031effc271974eef2e79808e0c
+EBUILD vdr-dvbhddevice-2.2.0_p20180420.ebuild 1006 BLAKE2B aa7b4534fa104a06a0b9c7c5b70d063cb41f58383f3d1e64fcc5f897fceb3a9ec2e110f90eb804d344ae1f57c3bb8fa61f64d84295f18146c71464fa39ea39d1 SHA512 482836310f11a870d6b594b40bbd9c635cabbac5aaba71609387abbc01038b661d71a1ad9416e7656353df88440ab1fa4b4fc2a670a330176ab7d27e096a40e7
 MISC metadata.xml 565 BLAKE2B a629f35ce42591e8d978f8a6d5876f709fecbbef016776b2f7dbbac1c35dd4b22507398532db75be26b84cf4d0bc611bdcfe7e8219c11918be6bfb2e5580e96c SHA512 1d507d140eab426dc90ef53fe5f842f97128052a6c6ec27eb09fc5ccf23378e76567a59ee7830d8f195b0557308e67286144855ec22e28f8a113c700d8e53d59
diff --git a/media-plugins/vdr-dvbhddevice/files/convert-bool-fix.patch b/media-plugins/vdr-dvbhddevice/files/convert-bool-fix.patch
new file mode 100644
index 000000000000..0bdc79fba948
--- /dev/null
+++ b/media-plugins/vdr-dvbhddevice/files/convert-bool-fix.patch
@@ -0,0 +1,36 @@
+fix cannot convert bool to boolean wrt bug #693418
+
+Signed-of-by: Joerg Bornkessel <hd_brummy@astrali.de> (13 Nov 2019)
+diff -Naur powARman-dvbhddevice-2ea854ae8c7a.orig/dvbhdffdevice.c powARman-dvbhddevice-2ea854ae8c7a/dvbhdffdevice.c
+--- powARman-dvbhddevice-2ea854ae8c7a.orig/dvbhdffdevice.c	2019-11-13 18:46:50.000000000 +0100
++++ powARman-dvbhddevice-2ea854ae8c7a/dvbhdffdevice.c	2019-11-13 18:48:12.000000000 +0100
+@@ -1069,15 +1069,15 @@
+         }
+      else {
+         esyslog("ERROR: out of memory");
+-        return false;
++        return FALSE;
+         }
+      if (jcd->mem) {
+         cinfo->dest->next_output_byte = jcd->mem + Used;
+         cinfo->dest->free_in_buffer = jcd->size - Used;
+-        return true;
++        return TRUE;
+         }
+      }
+-  return false;
++  return FALSE;
+ }
+ 
+ static void JpegCompressTermDestination(j_compress_ptr cinfo)
+@@ -1122,8 +1122,8 @@
+   cinfo.in_color_space = JCS_YCbCr;
+ 
+   jpeg_set_defaults(&cinfo);
+-  jpeg_set_quality(&cinfo, Quality, true);
+-  jpeg_start_compress(&cinfo, true);
++  jpeg_set_quality(&cinfo, Quality, TRUE);
++  jpeg_start_compress(&cinfo, TRUE);
+ 
+   int rs = Width * 3;
+   JSAMPROW rp[Height];
diff --git a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.3_p20140115-r1.ebuild b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.3_p20140115-r1.ebuild
deleted file mode 100644
index 02e0463d33c9..000000000000
--- a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.3_p20140115-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vdr-plugin-2
-
-HG_REVISION="60c58ae453d0"
-HG_REVISION_DATE="20140115"
-
-DESCRIPTION="VDR Plugin: output device for the 'Full Featured' TechnoTrend
-S2-6400 DVB Card"
-HOMEPAGE="https://bitbucket.org/powARman/dvbhddevice"
-SRC_URI="https://bitbucket.org/powARman/dvbhddevice/get/${HG_REVISION}.tar.gz
--> dvbhddevice-2.1.3_p${HG_REVISION_DATE}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-video/vdr-1.7.39"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/dvbhddevice-${HG_REVISION}"
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	fix_vdr_libsi_include dvbhdffdevice.c
-
-	if has_version ">=media-video/vdr-2.1.10"; then
-		sed -e "s:pm = RenderPixmaps():pm = dynamic_cast<cPixmapMemory *>(RenderPixmaps()):"\
-			-e "s:delete pm;:DestroyPixmap(pm);:"\
-			-i hdffosd.c
-	fi
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	doheader dvbhdffdevice.h hdffcmd.h
-
-	insinto /usr/include/libhdffcmd
-	doins libhdffcmd/*.h
-}
diff --git a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.6_p20141116-r1.ebuild b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.6_p20141116-r1.ebuild
deleted file mode 100644
index a2da1c862aed..000000000000
--- a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.1.6_p20141116-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit vdr-plugin-2
-
-HG_REVISION="88cd727ebc99"
-HG_REVISION_DATE="20141116"
-
-DESCRIPTION="VDR Plugin: output device for the 'Full Featured' TechnoTrend
-S2-6400 DVB Card"
-HOMEPAGE="https://bitbucket.org/powARman/dvbhddevice"
-SRC_URI="https://bitbucket.org/powARman/dvbhddevice/get/${HG_REVISION}.tar.gz ->
-		${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND=">=media-video/vdr-2.0.0"
-
-S="${WORKDIR}/powARman-${VDRPLUGIN}-${HG_REVISION}"
-
-src_prepare() {
-	vdr-plugin-2_src_prepare
-
-	fix_vdr_libsi_include dvbhdffdevice.c
-
-	if has_version ">=media-video/vdr-2.1.10"; then
-		sed -e "s:pm = RenderPixmaps():pm = dynamic_cast<cPixmapMemory *>(RenderPixmaps()):"\
-			-e "s:delete pm;:DestroyPixmap(pm);:"\
-			-i hdffosd.c
-	fi
-}
-
-src_install() {
-	vdr-plugin-2_src_install
-
-	doheader dvbhdffdevice.h hdffcmd.h
-
-	insinto /usr/include/libhdffcmd
-	doins libhdffcmd/*.h
-}
diff --git a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420.ebuild b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420.ebuild
index 9f21531f038a..67fe2ca2c87b 100644
--- a/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420.ebuild
+++ b/media-plugins/vdr-dvbhddevice/vdr-dvbhddevice-2.2.0_p20180420.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2018 Gentoo Authors
+# Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,8 +8,7 @@ inherit vdr-plugin-2
 HG_REVISION="2ea854ae8c7a"
 HG_REVISION_DATE="20180420"
 
-DESCRIPTION="VDR Plugin: output device for the 'Full Featured' TechnoTrend
-S2-6400 DVB Card"
+DESCRIPTION="VDR Plugin: output device for the 'Full Featured' TechnoTrend S2-6400 DVB Card"
 HOMEPAGE="https://bitbucket.org/powARman/dvbhddevice"
 SRC_URI="https://bitbucket.org/powARman/dvbhddevice/get/${HG_REVISION}.tar.gz ->
 		${P}.tar.gz"
@@ -17,17 +16,22 @@ SRC_URI="https://bitbucket.org/powARman/dvbhddevice/get/${HG_REVISION}.tar.gz ->
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND=">=media-video/vdr-2.0.0"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/convert-bool-fix.patch"
+	"${FILESDIR}/define_AUDIO_GET_PTS.patch" )
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-dvbhddevice.*
+	usr/lib64/vdr/plugins/libvdr-dvbhddevice.*"
+
 S="${WORKDIR}/powARman-${VDRPLUGIN}-${HG_REVISION}"
 
 src_prepare() {
 	vdr-plugin-2_src_prepare
 
-	eapply "${FILESDIR}/define_AUDIO_GET_PTS.patch"
 	fix_vdr_libsi_include dvbhdffdevice.c
 }
 
diff --git a/media-plugins/vdr-permashift/Manifest b/media-plugins/vdr-permashift/Manifest
index 51cdb6cb77bb..de2f95b6e983 100644
--- a/media-plugins/vdr-permashift/Manifest
+++ b/media-plugins/vdr-permashift/Manifest
@@ -1,3 +1,4 @@
 DIST vdr-permashift-1.0.1.tgz 49184 BLAKE2B 2342f0d071afd7f38b6109a514f124760aaf0058c9ef974974ee31f282a5ede8ee3636431e0c7e30a39f2da5ec966471b9c6ca073a8a13054052fbc8418fb3dc SHA512 b69e492e42f9ba2123f45e5ea1de8db937c3569a35da53429a4c97222e8a1aff0d4a5ab22920e65796d173e2963a9feda02a5a558309784b6296cd041352f252
+EBUILD vdr-permashift-1.0.1-r1.ebuild 540 BLAKE2B 27563d7890180aa922d3482c6a3874011c4eb8d671941be1adf8fb1dded8e6e99a4e5c346ae6a3f9f61af1e797b70c5f0d576a1ef613056f53017383251767e2 SHA512 2ce14ceb35a39227396774559ad6e2685f3b436ca9513425c6b612e399c09d14b71057576433319bf7292542bc908228251be82e42ca7b157c32c39d0a61b93f
 EBUILD vdr-permashift-1.0.1.ebuild 465 BLAKE2B 2d0e2305463a12ee1c0cb940744bddd6e1032b5a5c7862d987726b0493f0e3259941e7bcf1f56a70e436a284879be87d4923fae6bddcf7225cbb85a22ae19976 SHA512 66ab153bcd031060bff71963b7a29e2298021f25fde3c05355ccd6a756d45006d2c4be186e3ee315e8fcb809d87ef9e8ca6e8a44c3ecf8b923a0402037432da6
-MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
+MISC metadata.xml 477 BLAKE2B 082ad4f53e9c433ebb519be1cba7b079d1372d8b18b169092f4dd17cea14c4be99f4a3ca49934305817a45ca8208c079c85fe4d9bb0ba3c9cfb4754b02dec9c1 SHA512 9d317606d6f1dde6af151f99db3e0a119a47e2a6816da518a343777980236f93942e8fc3694fb5f80ad6a1c6b6e4b9d81064dbb7b2bfe4694a65fbd05cf9ac8f
diff --git a/media-plugins/vdr-permashift/metadata.xml b/media-plugins/vdr-permashift/metadata.xml
index 27f419c289c3..cd73dfdd5965 100644
--- a/media-plugins/vdr-permashift/metadata.xml
+++ b/media-plugins/vdr-permashift/metadata.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>vdr@gentoo.org</email>
-<name>Gentoo VDR Project</name>
-</maintainer>
+	<maintainer type="person">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/vdr-permashift/vdr-permashift-1.0.1-r1.ebuild b/media-plugins/vdr-permashift/vdr-permashift-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..b9bc55b455b9
--- /dev/null
+++ b/media-plugins/vdr-permashift/vdr-permashift-1.0.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vdr-plugin-2
+
+DESCRIPTION="VDR Plugin: permanent timeshift by recording live TV on RAM"
+HOMEPAGE="http://ein-eike.de/vdr-plugin-permashift-english/"
+SRC_URI="http://ein-eike.de/wordpress/wp-content/uploads/2014/11/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=">=media-video/vdr-2.0.6[permashift]"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-.*
+	usr/lib64/vdr/plugins/libvdr-.*"
diff --git a/media-plugins/vdr-pvr350/Manifest b/media-plugins/vdr-pvr350/Manifest
index c02ab5439a85..021392b395f5 100644
--- a/media-plugins/vdr-pvr350/Manifest
+++ b/media-plugins/vdr-pvr350/Manifest
@@ -1,3 +1,3 @@
 DIST vdr-pvr350-1.7.5.tgz 48676 BLAKE2B 42af0c22704aaf1ac51ed3b5b8af76e8850ae63d09d110db140a2c8eaa29448800da291642d753bec894c345e58e1095453db4b902eab51e6188efe5be3e94e6 SHA512 dd29836afe4e56b6ec083210920964645568c2680c170d435b379593f7f8fc1a5420e10af53126cfb82be4764aee47d2233b8fca3efece0ccb221c1a94445d05
-EBUILD vdr-pvr350-1.7.5.ebuild 962 BLAKE2B b02b4dbda2a19e20ba8ec9f38e3af970f5790aaa8385d94511e68ff23b9dada5187315bcd3e5fb95386e5e2d2c4b6ea42f92a61d2663e6177dda5b5795422275 SHA512 2806e4cb7bb9a26c47279cd48df7b112ed03e1a26f25b14f78070267c806b7ca0104a1b87861554ba7f1b213f678d46fa5b659115b5dbe2cd76795fa40d40a48
-MISC metadata.xml 341 BLAKE2B a946e7442d32f3b1f55648ab99947151557fa0ba9fbf756ce65aaec998b49c88d8e7c2c0ae1595cae3137e4713c93ab77916893fe081da27070abdfa59558711 SHA512 7da125b264c38aadbac1c973c7212db2fe04d6c91687f76dedc95c5060a38258ef426101a9d52024da974e98fbc35a3b61df8dba30a5f40ee9b89c4dbe1ca803
+EBUILD vdr-pvr350-1.7.5.ebuild 823 BLAKE2B 7cb0e4a8618e3137d722a203d66a6c2d11f3134508ab74f252750d4e2a44b9ca06f457e65ba0f9f66e76469e06a4483cd6df33460c9fd3f0a653a46bd9df63ba SHA512 2324b0778870cd31b374758825dfc42f7f618779419f700cf429a38ad7975532af8999cd2beec9aa8efcdecf138226e8c9b30bd0032580fc0ce3174874079929
+MISC metadata.xml 477 BLAKE2B 082ad4f53e9c433ebb519be1cba7b079d1372d8b18b169092f4dd17cea14c4be99f4a3ca49934305817a45ca8208c079c85fe4d9bb0ba3c9cfb4754b02dec9c1 SHA512 9d317606d6f1dde6af151f99db3e0a119a47e2a6816da518a343777980236f93942e8fc3694fb5f80ad6a1c6b6e4b9d81064dbb7b2bfe4694a65fbd05cf9ac8f
diff --git a/media-plugins/vdr-pvr350/metadata.xml b/media-plugins/vdr-pvr350/metadata.xml
index f373077d8727..cd73dfdd5965 100644
--- a/media-plugins/vdr-pvr350/metadata.xml
+++ b/media-plugins/vdr-pvr350/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>vdr@gentoo.org</email>
-<name>Gentoo VDR Project</name>
-</maintainer>
-<use>
-	<flag name="yaepg">Enables full support for the output format of
-		vdr-yaepg</flag>
-</use>
+	<maintainer type="person">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/vdr-pvr350/vdr-pvr350-1.7.5.ebuild b/media-plugins/vdr-pvr350/vdr-pvr350-1.7.5.ebuild
index 18b1dc989e9d..326a91d890ab 100644
--- a/media-plugins/vdr-pvr350/vdr-pvr350-1.7.5.ebuild
+++ b/media-plugins/vdr-pvr350/vdr-pvr350-1.7.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit vdr-plugin-2
 
@@ -14,27 +14,18 @@ SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="yaepg"
 
 DEPEND=">=media-video/vdr-2
 	media-sound/mpg123
 	media-sound/twolame
-	media-libs/a52dec
-	yaepg? ( >=media-video/vdr-2[yaepg] )"
+	media-libs/a52dec"
 RDEPEND="${DEPEND}"
 
-DEPEND="${DEPEND}
-	|| ( >=sys-kernel/linux-headers-2.6.38 )"
-
 S="${WORKDIR}/${P#vdr-}"
 
-pkg_setup() {
-	vdr-plugin-2_pkg_setup
-
-	if use yaepg; then
-		BUILD_PARAMS="SET_VIDEO_WINDOW=1"
-	fi
-}
+QA_FLAGS_IGNORED="
+	usr/lib/vdr/plugins/libvdr-.*
+	usr/lib64/vdr/plugins/libvdr-.*"
 
 src_prepare() {
 	# remove empty language files