gentoo resync : 13.06.2020

23 files changed, 396 insertions, 263 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index 560dc4fd2af1..868151b702fe 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 07e7c89002d8..01dfc1ccccc7 100644
--- a/media-plugins/alsa-plugins/Manifest
+++ b/media-plugins/alsa-plugins/Manifest
@@ -1,7 +1,5 @@
 AUX 51-pulseaudio-probe.conf 437 BLAKE2B 5eb7afb4bef1e647cfa1c3e9d6417000c0e74f2722d07a55e63e3a1ad36507bb15c970507450fcc29b51b8cfb77a1a15d8a68a9b1e5dca3279f5b2df85e731f8 SHA512 325c323ad4dcf03a4cf2528d6f5d6a0769c3e3d7bcf09c6fc11fb9cb61bef2cec1e8ad5073c07b6865ffdec4c32165cd80a7c856d13d538ff8320be1c83f9af7
 AUX pulse-default.conf 196 BLAKE2B 4293e2ba9b4c87c35e3bdfe45781f86af733341c8bada5a78b38d08c59c5774e5679487e877d11fb7866b2ed7d9f9441552f864e9c2b9e42119eda62e1459ae8 SHA512 c64f73a46c9f50704d4b2bef09d95ce3bc2352da1437750f49974ab8e6f60d5467d5d94ab0e1490deea5f2b1f67b20aa60a10c502e7d6e049649bca4208f7c1e
-DIST alsa-plugins-1.2.1.tar.bz2 406309 BLAKE2B 2ac26ad87fcdcc4452ec32b2b437d3be4308f13ce2a8e24150f319805b6d684edc6be9e51654f27c1a5bbc01a7caa9eb70250be405dc6921ecd93ee417f24cdf SHA512 a49ef9290b66855112e301a5fd5a0932f13a50254e164f3340f2b342a36469532ee783beabfe5e95870dbf4cd81ca1e8d0415d94c8c7ee963133fb3c343721de
 DIST alsa-plugins-1.2.2.tar.bz2 406494 BLAKE2B 64148e3e6fcf651a2ac62b6b5f3cc915fe6718d35fea53da08f6f4b1a5ff06ba29e69b8cd2a95e3b9edf3880570b1d0b9267239f705043dab592c27fdd150ef3 SHA512 25a7dfaa64be024447d889b5cde668f1308d197f54880548a82d50beb4ac0dbff33b415da1e26dc5229408c934247a9bd38acfb0f82ca388deac0d77ab3cdadb
-EBUILD alsa-plugins-1.2.1.ebuild 3004 BLAKE2B eaf4a2f4b4053f439b2b70257d789dce8e22be1010d32aa649cefcf2e04ba7d0b4d4af3904b961c1ea7cc261d7a1ef20a28bd253fd32e9923f28d75e945e3a2f SHA512 9a89468199c10ae69e84b143192a32a57104fe021e6d12e4238cdd3d8872420f2675666dc6c403839c2f661e25abab133872c02b7bdaa88b2b7032edd64a5c72
 EBUILD alsa-plugins-1.2.2.ebuild 3024 BLAKE2B 47959f6f20d5cc67216fbc7037fc2df6abf5d8f046a43bd2bb4da1aa11bccf04bdc7c805e354a8b61cda24ada5999a75b51bfba2bfe5cbd6d930bbaa76d46238 SHA512 e627069813135380621098133c29b5bab069e247cbd1c08a120b1a3dcab35cb776ee603199b73471f8a61f3dfd8061d05852466eac75cf63ada1b2e66c0b0a81
 MISC metadata.xml 512 BLAKE2B 2fa80544d70890c99164643bc1706b8c2e5f3d50c991e781e68441072366b1b89d0082507bf1c27d11d95bcd1c7d508f09ce0b193bd7d4ca77f27a2bdf9e24c8 SHA512 fce90766306d36d97ae40cbebf7b788f6f11766afc6d9680f563271ea184373ae20480b99b6e60edc74d9bfb222acd1d11c50163a31520f073a00bba9050e361
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild
deleted file mode 100644
index 63868db995ad..000000000000
--- a/media-plugins/alsa-plugins/alsa-plugins-1.2.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools flag-o-matic multilib multilib-minimal
-
-DESCRIPTION="ALSA extra plugins"
-HOMEPAGE="http://www.alsa-project.org/"
-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 sparc x86 ~amd64-linux"
-IUSE="arcam_av debug ffmpeg jack libsamplerate +mix oss pulseaudio speex +usb_stream"
-
-RDEPEND="
-	>=media-libs/alsa-lib-${PV}:=[${MULTILIB_USEDEP}]
-	ffmpeg? ( media-video/ffmpeg:0= )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	libsamplerate? ( >=media-libs/libsamplerate-0.1.8-r1:=[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	speex? (
-		>=media-libs/speex-1.2.0:=[${MULTILIB_USEDEP}]
-		media-libs/speexdsp[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# 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 \
-		-e '/AM_CFLAGS/s:-Wall:-DNDEBUG -Wall:' \
-		-i pulse/Makefile.am || die
-
-	eautoreconf
-}
-
-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 libav)
-		$(use_enable jack)
-		$(use_enable libsamplerate samplerate)
-		$(use_enable mix)
-		$(use_enable oss)
-		$(use_enable pulseaudio)
-		$(use_enable speex speexdsp)
-		$(use_enable usb_stream usbstream)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	cd doc || die
-	dodoc upmix.txt vdownmix.txt README-pcm-oss
-	use jack && dodoc README-jack
-	use libsamplerate && dodoc samplerate.txt
-	use ffmpeg && dodoc lavrate.txt a52.txt
-
-	if use pulseaudio; then
-		dodoc README-pulse
-		# install ALSA configuration files
-		# making PA to be used by alsa clients
-		insinto /usr/share/alsa
-		doins "${FILESDIR}"/pulse-default.conf
-		insinto /usr/share/alsa/alsa.conf.d
-		doins "${FILESDIR}"/51-pulseaudio-probe.conf
-		# bug #410261, comment 5+
-		# seems to work fine without any path
-		sed \
-			-e "s:/usr/lib/alsa-lib/::" \
-			-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}" -type f \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_postinst() {
-	if use pulseaudio; then
-		einfo "The PulseAudio device is now set as the default device if the"
-		einfo "PulseAudio server is found to be running. Any custom"
-		einfo "configuration in /etc/asound.conf or ~/.asoundrc for this"
-		einfo "purpose should now be unnecessary."
-	fi
-}
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 1dbef847d01c..ee2ecc99a083 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-4.0.3.tar.bz2 1759123 BLAKE2B 7a389a1d8f1bc17ce53e4e8c2560291c00b305ca0988f7ee27ce8a15d4be200d380a3525d43d1c04f6de9d7653f73c91721ba985801dc49dfa64b56309145f9b SHA512 6aaf9ca1d70e211e779baa65de844118f2e3c5ecef2ce6342429748e64437ddc67286ea286fbd7b0282304747dab31972f73ccb0aa312968c19d832ac0e0a6fc
+DIST audacious-plugins-4.0.4.tar.bz2 1761281 BLAKE2B 36f77d19e2cac461cd5649589bc4cb19a76577c30d5de4015688da5bf21efe1c835e1160534bc377e9a6f495fc9c2650544cc6c7bafac61c2f7187991a4d7935 SHA512 d0b435658f5aff9318e521e85d335444e089f80a267c2b9391123365b1c95b535bfa668ea772d9c437ad2611288ec7961a2ecf1d8cf8687f3b32a3cb1e14ddf8
 EBUILD audacious-plugins-3.10.1-r3.ebuild 3849 BLAKE2B c829fdcb6a41aad4cf807ccf0719a1877789a06e1811fa64a574dad26838723cbafacf6645235417e2b68cecfeb2bb66b4a3d061816fcab8e554a8bc34a9c5c9 SHA512 7b5710f309e15c2e465531edf626238faa607369f2a46fb0b4defe3523286f04ae897c6016c0c4ff1f540e8701e7ee9ca15921840b32c8ae001257793b3dfd0d
 EBUILD audacious-plugins-4.0.3.ebuild 4145 BLAKE2B e05a4040a1c2f61f111ce4f4f3ef1e60c3e4594a292bc989dfc467fb8aefd2b30cfaca1576ef7ec582d1c851b89b75381e5a52a991809c75923629c5b3cd762c SHA512 5f6dae8d50a5a3641d27fa8edfe47b9fd5f56e05d984522a913c2211bc2885f45cc92a81ada71611220072166ec62122009804b086b6aeecfa898d68c2bc39de
-EBUILD audacious-plugins-9999.ebuild 4444 BLAKE2B 7d6b475ded94f7fcfe9ae74efb3a8558cd599686c14c02ed0498e2b8945e791392cc269bdeb28f437f4ec7671a396fae37e2d6680e7ba4fae4df438ab4a0626e SHA512 21c95c887368cf14dd32a2fe6405d02f66ab17e53163b6d9660e61adf99f31330f4e5a40e9be1abc14b2b88e14064e7472cca80c08b768a194edd5c16a878e88
-MISC metadata.xml 1317 BLAKE2B 49a347b9594d7f9c5fe658313e06205b419899f13af88a3d7ca8b03ffbf6359da8ea4c4645781c248f8f72c889e2e21d125e9469bad22da66df464b3002d2bbc SHA512 8b510eca153c546d9ed25466652b5318b220f9fb6ca3c07c61ecdc5595366bece42d6aeb938d3c522f775d6dd4ad54d60749b43d84dad1441d782628aa70dc3f
+EBUILD audacious-plugins-4.0.4.ebuild 4070 BLAKE2B 720c0ce91402ad2fef3c60411eb675c09c173f2bd7fb50213ff244c86a1eb67713a8d8d4db7adebb1012465321659a623eeb83e98f6009e4d65e729a910c541b SHA512 7c84ea8b62ad9d9d570ce182ddf35391a547bb3a6990d536de157b08eeea4af2e2ffcd5fa8a707b701472d28f194eaefa182eb37b5d464daf3a5697c9124d3e8
+EBUILD audacious-plugins-9999.ebuild 4128 BLAKE2B a4d64f7a16659e1cc4c939a9503756dfdc9f1297cdcf82e65204e768df1e6599596d4633ed2f2fdb406a01ca01c225ff73340051a92a81dcff63bc76a2b984d8 SHA512 c7c8861f1af4d563326ca9513101d48148c92fc0b90a545303cc8849e30debf689beb757dbb305f48606e3788832cb84dcda0af1a4e9511ae44ba0914ba7c3ac
+MISC metadata.xml 1251 BLAKE2B 1b67d43427b19c320e46b134c1780048def69a124aaa0c6d47ee1a55c7738a896cffae3a1f52fc2c5103d9d064fe6281d50f6bdcc839c046118b41b59f353d75 SHA512 145522b449bda87e294a0a63e95f4d12634695feea5d9d6f703079c9f742e7736cc232ecc7726e1d14740689b188ee473299d4fa5045e488f2fea5a4b4071d8e
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild
new file mode 100644
index 000000000000..76a54c61081b
--- /dev/null
+++ b/media-plugins/audacious-plugins/audacious-plugins-4.0.4.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2020 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 +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
+	lame libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio
+	scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack"
+REQUIRED_USE="ampache? ( http ) streamtuner? ( 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/qtmultimedia:5
+	dev-qt/qtwidgets:5
+	~media-sound/audacious-${PV}
+	aac? ( >=media-libs/faad2-2.7 )
+	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? ( >=media-video/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 )
+	opengl? ( dev-qt/qtopengl:5 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
+	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:= )
+	streamtuner? ( dev-qt/qtnetwork:5 )
+	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-qtaudio
+		--enable-songchange
+		--disable-adplug # not packaged
+		--disable-gtk
+		--disable-openmpt # not packaged
+		--disable-oss4
+		--disable-coreaudio
+		--disable-sndio
+		$(use_enable aac)
+		$(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 scrobbler scrobbler2)
+		$(use_enable sdl sdlout)
+		$(use_enable sid)
+		$(use_enable sndfile)
+		$(use_enable soxr)
+		$(use_enable speedpitch)
+		$(use_enable streamtuner)
+		$(use_enable vorbis)
+		$(use_enable wavpack)
+		$(use_with ffmpeg ffmpeg ffmpeg)
+	)
+
+	econf "${myeconfargs[@]}"
+}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
index f9b1ea0ec287..b915d2ebe95b 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
@@ -17,14 +17,10 @@ HOMEPAGE="https://audacious-media-player.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme gtk http
-	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? ( http ) streamtuner? ( http )
-	gtk? ( !ampache !qtmedia !streamtuner )"
+IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
+	lame libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio
+	scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack X"
+REQUIRED_USE="ampache? ( http ) streamtuner? ( http )"
 
 # The following plugins REQUIRE a GUI build of audacious, because non-GUI
 # builds do NOT install the libaudgui library & headers.
@@ -53,7 +49,11 @@ DEPEND="
 	dev-libs/dbus-glib
 	dev-libs/glib
 	dev-libs/libxml2:2
-	~media-sound/audacious-${PV}[gtk=]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtwidgets:5
+	~media-sound/audacious-${PV}
 	aac? ( >=media-libs/faad2-2.7 )
 	alsa? ( >=media-libs/alsa-lib-1.0.16 )
 	ampache? ( =media-libs/ampache_browser-1* )
@@ -70,17 +70,6 @@ DEPEND="
 		>=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
@@ -93,8 +82,8 @@ DEPEND="
 	mms? ( >=media-libs/libmms-0.3 )
 	modplug? ( media-libs/libmodplug )
 	mp3? ( >=media-sound/mpg123-1.12.1 )
+	opengl? ( dev-qt/qtopengl:5 )
 	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	qtmedia? ( dev-qt/qtmultimedia:5 )
 	scrobbler? ( net-misc/curl )
 	sdl? ( media-libs/libsdl2[sound] )
 	sid? ( >=media-libs/libsidplayfp-1.0.0 )
@@ -107,6 +96,7 @@ DEPEND="
 		>=media-libs/libvorbis-1.2.0
 	)
 	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
+	X? ( dev-qt/qtx11extras:5 )
 "
 RDEPEND="${DEPEND}"
 
@@ -127,8 +117,11 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--enable-mpris2
+		--enable-qt
+		--enable-qtaudio
 		--enable-songchange
 		--disable-adplug # not packaged
+		--disable-gtk
 		--disable-openmpt # not packaged
 		--disable-oss4
 		--disable-coreaudio
@@ -143,10 +136,6 @@ 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)
@@ -157,8 +146,8 @@ src_configure() {
 		$(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)
@@ -168,10 +157,8 @@ src_configure() {
 		$(use_enable streamtuner)
 		$(use_enable vorbis)
 		$(use_enable wavpack)
-		$(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg))
-	)
-	use !gtk && myeconfargs+=(
-		$(usex opengl --enable-qtglspectrum --disable-qtglspectrum)
+		$(use_enable X qthotkey)
+		$(use_with ffmpeg ffmpeg ffmpeg)
 	)
 
 	econf "${myeconfargs[@]}"
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 02bd0208b848..30eb5c5c92d9 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -15,7 +15,6 @@
 		<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="qtmedia">Enable playback via <pkg>dev-qt/qtmultimedia</pkg></flag>
 		<flag name="scrobbler">Build with scrobbler/LastFM submission support</flag>
diff --git a/media-plugins/gimp-lensfun/Manifest b/media-plugins/gimp-lensfun/Manifest
deleted file mode 100644
index e1b3823530d9..000000000000
--- a/media-plugins/gimp-lensfun/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gimp-lensfun-0.2.4-exiv2-0.27.1.patch 243 BLAKE2B b2b113981da41bb7421481fde90d40624855f1a3a920dbcdae96ceb7e4fee512ce8559842b2189fbee8e00c13f7495e0def8955fc8b065950b348ecfb0902324 SHA512 58d486b26c8c55af4a9cbb9c087ae44d9d16100ac7e0fadab84eaa62e165c0a7cff66fc6f7ad0d0c0eafd471b029e344a0fea8b065760c1cc8edaacc895479ed
-DIST gimp-lensfun-0.2.4.tar.gz 29039 BLAKE2B 30c5abac6e00e74e008a94f0fa23391d9dc336b5a6540ec7a0deb33e250cc2df66821db67b4bd76b36c9745a600838c834c01c27db741f8349f2ac13dc60e963 SHA512 5a73a00d71c28d92881bfc2b15be7e8adef8756af808f8ae19f0e3208287853fe4f735b1bef23b658f660da8393b68cbe8416804173944d0c844ac284be77671
-EBUILD gimp-lensfun-0.2.4-r1.ebuild 946 BLAKE2B aa8cdb12f08eeff21f289f0e498673b98e9061e916ef23567a6f5fd1c8ab6b1d0475c7e5442c907f17fe701d12b1d7b686c2e9bd6ce1c7452c869d4ce30045e5 SHA512 13c2401faf147316cc73f51076f171b74c1c3369dac1184327a0828770bc32a82b9a3d5a2e0eb6076048792b5f34eb7f3695971ec7f6da8f6781ddf64695cff2
-MISC metadata.xml 249 BLAKE2B 30a93482d9da433af6ed4cabb5bdcc20e297296af8b5e58a4ee18942514d4cae56462b5e61e23db269a20dfdd3b956ba0dc22488e03e4a8222f8d6d64df9918e SHA512 f0120dd9871a00b101f65f11eec65f7bde96cc2641f7913fb24f1633b09f4af36ab70ca48422dd8ce89c81b5819c79d4eb3b04950821816fbc0520525959f8d1
diff --git a/media-plugins/gimp-lensfun/files/gimp-lensfun-0.2.4-exiv2-0.27.1.patch b/media-plugins/gimp-lensfun/files/gimp-lensfun-0.2.4-exiv2-0.27.1.patch
deleted file mode 100644
index d62f1790d5de..000000000000
--- a/media-plugins/gimp-lensfun/files/gimp-lensfun-0.2.4-exiv2-0.27.1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/gimplensfun.cpp
-+++ b/src/gimplensfun.cpp
-@@ -31,8 +31,7 @@
- #include <libgimp/gimp.h>
- #include <libgimp/gimpui.h>
- 
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- 
- #define VERSIONSTR "0.2.4"
- 
diff --git a/media-plugins/gimp-lensfun/gimp-lensfun-0.2.4-r1.ebuild b/media-plugins/gimp-lensfun/gimp-lensfun-0.2.4-r1.ebuild
deleted file mode 100644
index 2756553cbcfa..000000000000
--- a/media-plugins/gimp-lensfun/gimp-lensfun-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Gimp plugin to correct lens distortions"
-HOMEPAGE="https://seebk.github.io/GIMP-Lensfun/"
-SRC_URI="https://github.com/seebk/GIMP-Lensfun/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="openmp"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	media-gfx/exiv2
-	<media-gfx/gimp-2.10.0
-	>=media-libs/lensfun-0.3.2
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" )
-
-S=${WORKDIR}/GIMP-Lensfun-${PV}
-
-pkg_setup() {
-	if use openmp && [[ ${MERGE_TYPE} != binary ]]; then
-		tc-has-openmp || die "Please switch to an openmp compatible compiler"
-	fi
-}
-
-src_prepare() {
-	default
-
-	if ! use openmp; then
-		sed -i "s/-fopenmp//g" Makefile || die
-	fi
-
-	tc-export CXX
-}
-
-src_install() {
-	exeinto $(gimptool-2.0 --gimpplugindir)/plug-ins
-	doexe ${PN}
-}
diff --git a/media-plugins/gst-plugins-webrtc/Manifest b/media-plugins/gst-plugins-webrtc/Manifest
new file mode 100644
index 000000000000..2f3b53456c6a
--- /dev/null
+++ b/media-plugins/gst-plugins-webrtc/Manifest
@@ -0,0 +1,3 @@
+DIST gst-plugins-bad-1.16.2.tar.xz 4887812 BLAKE2B edf10aeb365d9a7cf4b5172af29b46cff4c7a49a3e4dde881469f5738b5a525eb51a6f70bb1dd6f680e4e48977d65769ac8e8f41d914b7ce7719b9fa260a7bd4 SHA512 aeaf3388156fe7317e193a3f940d391a6d8a1187f93e6925cee4cb02c4e78d9b456c22c27c318f0f9b2212ca68887c5cdcc256adaf068bfab8ec5c091a1e8805
+EBUILD gst-plugins-webrtc-1.16.2.ebuild 821 BLAKE2B b06cf5757411e45708280c45847eda4c9d2ae42ed7d2775bfe67113d29ad3e528405d2c92b3cc2d98bba2123edb528cae40756f6b5ed56972b0214b970413d8d SHA512 b150ad612d62c98a4930efc8dc81cc4172d155e6f020607301d18eb644c8baf97576af3c2862fd9f4e2ac0e0b1c65c8cdcd1b006c6e7abb63dff6268bca41a3f
+MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.16.2.ebuild b/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.16.2.ebuild
new file mode 100644
index 000000000000..991e373498e5
--- /dev/null
+++ b/media-plugins/gst-plugins-webrtc/gst-plugins-webrtc-1.16.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE=gst-plugins-bad
+
+inherit gstreamer
+
+DESCRIPTION="WebRTC plugins for GStreamer"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/gst-plugins-base-${PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/gst-plugins-bad-${PV}:1.0[${MULTILIB_USEDEP}]
+	>=media-libs/webrtc-audio-processing-0.2[${MULTILIB_USEDEP}]
+	<media-libs/webrtc-audio-processing-0.4
+	>=net-libs/libnice-0.1.14[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+GST_PLUGINS_BUILD="webrtc webrtcdsp"
+GST_PLUGINS_BUILD_DIR="webrtc webrtcdsp"
+
+src_prepare() {
+	default
+	gstreamer_system_link gst-libs/gst/webrtc:gstreamer-webrtc
+	gstreamer_system_link gst-libs/gst/sctp:gstreamer-sctp
+	gstreamer_system_link gst-libs/gst/audio:gstreamer-bad-audio
+}
diff --git a/media-plugins/gimp-lensfun/metadata.xml b/media-plugins/gst-plugins-webrtc/metadata.xml
index 5f4100165ca7..fb1ea7216a80 100644
--- a/media-plugins/gimp-lensfun/metadata.xml
+++ b/media-plugins/gst-plugins-webrtc/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">seebk/GIMP-Lensfun</remote-id>
-	</upstream>
+<maintainer type="project">
+	<email>gstreamer@gentoo.org</email>
+	<name>GStreamer package maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index c094e9829fdc..9dd8c328fa60 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -1,7 +1,4 @@
-AUX config.gentoo-r1 499 BLAKE2B 8a4f1261f09e613c2bd666b070c4f5848a5b30ed48cf5668623274a4aaaeb525ded1ac83f8b5e0d6a7ec7c149c1959651e15ca3223a29e7a9487ce206c972b95 SHA512 4fab673258f340f00a79ced3106b6f32b74eaa7c691447422890ef66ae5ac82f703b3ad08178d656823d9cd51510521ff92c41866e629657a6e67c53279c0752
-AUX config.gentoo-so-r2 524 BLAKE2B b540de1163b9eb6014bd421c62d582bb6b4341866e6fb8212bc0c38c7fc3c9bf4f5cf6e1bd95a9e30879384dfad3232361985b10a093b900b52bb6ca01216577 SHA512 03d6a8712c0c2c4b7b7ebcdcada9ab6ece6fd19ffafc61c864821d19671001efb7c91b77fcf35ed38275c46d305ade3a7a655922fdec3ab6e7e00785242ee5fd
 AUX config.gentoo-so-r3 539 BLAKE2B e80c461f69a991641100d3966d1d100dc7fe8c15e3edc358bcd8ebd17a3f8c4d00a5557c9983f51a251a4602dcc378138df736f13665f5d5140081e047df0f5b SHA512 3f7d4a860b45ff6769fe1f29e694dfb897ab5b7c50f3d0d896425d300be6277df850cdb67cf311a0671ba747339b32f65d44a95b020940b3d1ac5764d873f20f
-AUX live-recursive3.patch 557 BLAKE2B f18a8152345006272b2b7385053ffd012e6dabc5754ae7712def7e90c55040c9e1c80dafc0d30555751e183c2b9d92de4410d8cb95d8707414cb17f641acbb6f SHA512 98992859d1f8149e337adbf42c13276e6bf40d5497399ab4f82351cd5caf78ecd60e28df24d36b34cfd02e83365cb37ae1b264afcb52334f304695b400bce622
 DIST live.2020.03.06.tar.gz 7231080 BLAKE2B 95a1d3cc394eba473296973a1e44160dd1ca8e2efbc322a2e0bfbdb183244cda28b219ea14a51c8d146807d829b566a9c3782b291d5abfbd306a92e030e108e4 SHA512 7da439fbdeab0da6687dee56d9a27bf7b8f8a9c84b420d72f2e2a7ff7a73d18756d1fdb920f29b36917d93efcecc9230877637322d5041eeba114882b4bf7a06
 EBUILD live-2020.03.06.ebuild 3052 BLAKE2B fefa656dca0f1ebde2bb5ecccee03c0e5ca2abb1efed3a0921bfefd975cc4cb5eb59197fef1fa8086a03614e024465d64567f0a39909a4c83d6d3c76449c688e SHA512 0d306cb3123b1ee15828c3ae77f782c74a1b408989a80d5a7b16dfe869cff67d8cb3dc4a7ded87aa86d56d173c34ff3474732bb3e4dbc2ac24c127e8c828581e
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-plugins/live/files/config.gentoo-r1 b/media-plugins/live/files/config.gentoo-r1
deleted file mode 100644
index d77fb19758a5..000000000000
--- a/media-plugins/live/files/config.gentoo-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DXLOCALE_NOT_USED
-C =			c
-C_COMPILER =		$(CC)
-C_FLAGS =		$(COMPILE_OPTS) $(CFLAGS)
-CPP =			cpp
-CPLUSPLUS_COMPILER =	$(CXX)
-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) $(CXXFLAGS)
-OBJ =			o
-LINK =			$(CXX) -o
-LINK_OPTS =		-L.
-CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		$(LD) -o
-LIBRARY_LINK_OPTS =	$(LINK_OPTS) -r -Bstatic
-LIB_SUFFIX =			a
-LIBS_FOR_CONSOLE_APPLICATION =
-LIBS_FOR_GUI_APPLICATION =
-EXE =
diff --git a/media-plugins/live/files/config.gentoo-so-r2 b/media-plugins/live/files/config.gentoo-so-r2
deleted file mode 100644
index fb9241ef3e86..000000000000
--- a/media-plugins/live/files/config.gentoo-so-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-COMPILE_OPTS =		$(INCLUDES) -I. -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DXLOCALE_NOT_USED
-C =			c
-C_COMPILER =		$(CC)
-C_FLAGS =		$(COMPILE_OPTS) -fPIC $(CFLAGS)
-CPP =			cpp
-CPLUSPLUS_COMPILER =	$(CXX)
-CPLUSPLUS_FLAGS =	$(COMPILE_OPTS) -fPIC $(CXXFLAGS)
-OBJ =			o
-LINK =			$(CXX) -o
-LINK_OPTS =		-L.
-CONSOLE_LINK_OPTS =	$(LINK_OPTS)
-LIBRARY_LINK =		$(CXX) -o
-LIBRARY_LINK_OPTS =	$(LINK_OPTS) -shared -Wl,-soname,$@
-LIB_SUFFIX =			so
-LIBS_FOR_CONSOLE_APPLICATION =
-LIBS_FOR_GUI_APPLICATION =
-EXE =
diff --git a/media-plugins/live/files/live-recursive3.patch b/media-plugins/live/files/live-recursive3.patch
deleted file mode 100644
index 29afe86e8197..000000000000
--- a/media-plugins/live/files/live-recursive3.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: live/Makefile.tail
-===================================================================
---- live.orig/Makefile.tail
-+++ live/Makefile.tail
-@@ -16,9 +16,6 @@ all:
- 	cd $(GROUPSOCK_DIR) ; $(MAKE)
- 	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE)
- 	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE)
--	cd $(TESTPROGS_DIR) ; $(MAKE)
--	cd $(MEDIA_SERVER_DIR) ; $(MAKE)
--	cd $(PROXY_SERVER_DIR) ; $(MAKE)
- 	@echo
- 	@echo "For more information about this source code (including your obligations under the LGPL), please see our FAQ at http://live555.com/liveMedia/faq.html"
- 
diff --git a/media-plugins/mythplugins/Manifest b/media-plugins/mythplugins/Manifest
index c9f807e2a6de..7aa0efed5a12 100644
--- a/media-plugins/mythplugins/Manifest
+++ b/media-plugins/mythplugins/Manifest
@@ -1,3 +1,5 @@
 DIST mythplugins-30.0.tar.gz 101169041 BLAKE2B 0125c6234c168b9b24110b817e9e9a632187743c9ca44a46a8d464be6c330067f31da6fb252ed2a5fd770756229f2d95a746bd5d0e03be1e97fecc0de86603be SHA512 a29125ca33b1b100f51feb7a2ccff16d62928e474a393f11fc4b4fb77d0a85d9d4dd138acf757b527c0f936f3ff2e7d3eddcacef183d642429e36bc3e44ecbf4
-EBUILD mythplugins-30.0-r2.ebuild 4397 BLAKE2B 951e134154df05682f7af66ef22d419dd6d9cba0a238762d7bf0fdfeb4b547f0c7e1ced969d9171448377e7cfa3cccaa1db59f449a9e9d3d069267f9ade96480 SHA512 639073bf05a3a7a633d097118699e69aca7ab99d1b2474a5842cc9bbe866d519fdc3954d7cf57bc47ea99e791592308acbf9b43e27a1da37208288bd055a2c23
+DIST mythplugins-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56e95a86627473d52613e62f0acf3bd0c4bb37afb340ab874c222899f9d3c219ded470785d27960db9b39d784ceb SHA512 d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e
+EBUILD mythplugins-30.0-r2.ebuild 4461 BLAKE2B 75ade4698ab445f25b1d5a53adbcf18f418363eee1119b12a35bf6a6cb61aa03f1d0ac6759e3d30d8f82f9a12e69f6c8c23cc864f49a37692453b02bd8f20ee1 SHA512 5e9435e4cfa7a6ac063cbcdc925e8b8bdca3d7827a45908149b54d5332ac1c6d11af9d70d4d464e2d7c28526796b0698f5ac4be29c1785e795e3fae282395404
+EBUILD mythplugins-31.0.ebuild 4124 BLAKE2B 9916234a4266fa9ec2a93b1be7bde11813ebc45068e8ed0e49546ce8ce0c92d1f3b74e8994ca99a99b9a853b4b86c00789970d451e5f5ce60e8ac28098f6183f SHA512 4ffff1aabe6d819e70a22439393594ea5520e822682ac6e9743ca539f568d134470c2bcc5550756c1255209ad738714c4b7fe785b74e426ac775f8a75e519468
 MISC metadata.xml 1648 BLAKE2B c3bf88af62ef3c7dc370c085f99e555c890ffbdac07e3a9106ed1c277d4c6943a1be2702b3cb8d376665073d69e42d0e629186825fd09ccb03d5d5378ff2ce31 SHA512 43e6c090619bd621b07683e56aa2c90cb163072aa3c5093f6ec5eda147dd1b67ca01488934bb49f851b8fd667b3f47f2e106b98f7f53d97b600fa5ce77d5c7b0
diff --git a/media-plugins/mythplugins/mythplugins-30.0-r2.ebuild b/media-plugins/mythplugins/mythplugins-30.0-r2.ebuild
index d47df1ea18e9..efbc5d121caa 100644
--- a/media-plugins/mythplugins/mythplugins-30.0-r2.ebuild
+++ b/media-plugins/mythplugins/mythplugins-30.0-r2.ebuild
@@ -3,6 +3,9 @@
 
 EAPI=7
 
+# Grab only the major version number.
+MAJOR_PV=${PV%%.*}
+
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="xml"
 BACKPORTS="03f44039848bd09444ff4baa8dc158bd61454079"
@@ -53,7 +56,7 @@ DEPEND="
 		>=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]
+	=media-tv/mythtv-${MAJOR_PV}*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,python,raw?,xml?,xvid]
 	mytharchive? (
 		app-cdr/dvd+rw-tools
 		$(python_gen_cond_dep '
diff --git a/media-plugins/mythplugins/mythplugins-31.0.ebuild b/media-plugins/mythplugins/mythplugins-31.0.ebuild
new file mode 100644
index 000000000000..ad77fcfcd4bc
--- /dev/null
+++ b/media-plugins/mythplugins/mythplugins-31.0.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Grab only the major version number.
+MAJOR_PV=${PV%%.*}
+
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_REQ_USE="xml"
+
+#BACKPORTS="03f44039848bd09444ff4baa8dc158bd61454079"
+MY_P=${P%_p*}
+
+inherit python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="Official MythTV plugins"
+HOMEPAGE="https://www.mythtv.org https://github.com/MythTV/mythtv"
+# 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 mythgame \
+mythmusic mythnetvision +mythnews +mythweather mythzmserver mythzoneminder"
+IUSE="${MYTHPLUGINS} alsa cdda cdr exif fftw +hls ieee1394 libass +opengl raw +theora +vorbis +xml xvid"
+
+# Mythnetvision temporarily disabled by upstream - should be fixed soon.
+REQUIRED_USE="
+	!mythnetvision
+	mytharchive? ( ${PYTHON_REQUIRED_USE} )
+	mythnetvision? ( ${PYTHON_REQUIRED_USE} )
+	mythmusic? ( vorbis )
+	mythnews? ( mythbrowser )
+"
+RDEPEND="
+	dev-libs/glib:2
+	dev-libs/openssl:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtsql:5
+	media-libs/freetype:2
+	media-libs/libpng:=
+	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 )
+	hls? (
+		media-libs/faac
+		media-libs/libvpx:=
+		media-libs/x264:=
+		media-sound/lame
+	)
+	ieee1394? (
+		media-libs/libiec61883
+		sys-libs/libavc1394
+		sys-libs/libraw1394
+	)
+	libass? ( media-libs/libass:= )
+	=media-tv/mythtv-${MAJOR_PV}*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,raw?,xml?,xvid]
+	mytharchive? (
+		${PYTHON_DEPS}
+		app-cdr/dvd+rw-tools
+		dev-python/pillow
+		dev-python/mysqlclient
+		=media-tv/mythtv-${MAJOR_PV}*[python]
+		media-video/dvdauthor
+		media-video/mjpegtools[png]
+		media-video/transcode
+		virtual/cdrtools
+	)
+	mythbrowser? ( dev-qt/qtwebkit:5 )
+	mythgame? (
+		sys-libs/zlib[minizip]
+		dev-perl/XML-Twig
+	)
+	mythmusic? (
+		media-libs/flac
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/taglib
+		media-sound/lame
+		fftw? ( sci-libs/fftw:3.0= )
+		opengl? ( virtual/opengl )
+		cdda? (
+			media-sound/cdparanoia
+			dev-libs/libcdio:=
+			cdr? ( virtual/cdrtools )
+		)
+	)
+	mythnetvision? (
+		${PYTHON_DEPS}
+		dev-python/lxml
+		dev-python/oauth
+		dev-python/pycurl
+		dev-python/urllib3
+		=media-tv/mythtv-${MAJOR_PV}*[python]
+	)
+	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
+		=media-tv/mythtv-${MAJOR_PV}*[perl]
+	)
+	mythzmserver? ( dev-db/mysql-connector-c:= )
+	theora? ( media-libs/libtheora )
+	xml? ( dev-libs/libxml2:= )
+	xvid? ( media-libs/xvid )
+"
+DEPEND=${RDEPEND}
+
+# mythtv and mythplugins are separate builds in the same github MythTV/mythtv repository
+S="${WORKDIR}/mythtv-${PV}/mythplugins"
+
+DOC_CONTENTS="
+Mythgallery code moved to mythtv and is no longer a plugin in version 31.0.
+As of 3/23/2020, MythNetVision is disabled, work in progress.
+
+Common plugins are installed by default. Disable unneeded plugins individually with USE flags:
+-mythbrowser -mythmusic -mythnetvision -mythnews -mythweather
+Additional plugins may be installed with USE flags mytharchive mythgame mythzmserver mythzoneminder
+"
+
+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 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/vdr-permashift/Manifest b/media-plugins/vdr-permashift/Manifest
index 1c844a629a1a..64fbe63b8097 100644
--- a/media-plugins/vdr-permashift/Manifest
+++ b/media-plugins/vdr-permashift/Manifest
@@ -1,5 +1,5 @@
 DIST vdr-permashift-1.0.1.tgz 49184 BLAKE2B 2342f0d071afd7f38b6109a514f124760aaf0058c9ef974974ee31f282a5ede8ee3636431e0c7e30a39f2da5ec966471b9c6ca073a8a13054052fbc8418fb3dc SHA512 b69e492e42f9ba2123f45e5ea1de8db937c3569a35da53429a4c97222e8a1aff0d4a5ab22920e65796d173e2963a9feda02a5a558309784b6296cd041352f252
 DIST vdr-permashift-1.0.4_pre20200301.tar.gz 52894 BLAKE2B 710a8373fb1bfb8d51eabb43db56c79a29c3fbd34f730f02bc73bfde6f1da68a3fdae221e06f71c25108bba6b5dc87b0a975d6dd62beef64738649c0e796a191 SHA512 a9e78df00d43ef692092ea299e13520ebc71766a7ebdbf3c0963e535014c837b3556b2fa81b444680830c703b56f459ef2ec01904282c0f34b80e20cba96a5f8
-EBUILD vdr-permashift-1.0.1-r1.ebuild 540 BLAKE2B ef2fe87c051809b0f0188a0bf92a6c886fe011bef1eb023c512f7a5041c1d3d499cecf635460375ccc01825ecd63660e03fb0f337ed7cd9274403a36807f0fd3 SHA512 c012e5ece5755afb8e61f48981637711d45bb537d3a54fc4f8ae6b665eaa23cd00dbc2a915dc9a1f6276d22752f05ae24863140957d917b6b07f50412a1ed4b1
-EBUILD vdr-permashift-1.0.4_pre20200301.ebuild 727 BLAKE2B 06a0a3b0b17ffd4a3c6c0a11aef2eacdb26e7d0d332134eefb58034c3451f6cb13f8ef648c2b282744b0a65346f2321f63d1658a74065c5dd783ebca057eebba SHA512 ba81c37e53bd80401a2568cfbf745eeb21aa2db7885efa8b08a5a6353752ec8dd09388aa3059e4bb3248a5852d45b7cf7319299536a689a1027735e66071d83c
+EBUILD vdr-permashift-1.0.1-r1.ebuild 542 BLAKE2B b4e9a67bfe416d0edb93bde06d87779291b478cd024a96bfe6cc553637b23b23b108ddd463665e7deaa2a56b1459c63faaad2e56cb8baad26922fdea7e4e9f52 SHA512 6336d6e88a6da5e580e8fd0fbf2b19cd58c01bee3d4b4184dd70eb79ef1fea79521a3a5684ec040073e7a052da6e004f3936d36b7613054d9ee0d61d725d3429
+EBUILD vdr-permashift-1.0.4_pre20200301.ebuild 728 BLAKE2B e0be0f58afc96a95725de8ae97e2cd546a9644940df9f81982ae7696bd16736d23d2d2c0e53dd054c90210200eedd53ac64c4137da13c4fca6e2d7f74b6a36b3 SHA512 171d7f77db285e7e022be7ce85dedda47be59b7e89ac4a43a464cba73817295c924b6eb5215cbac2ae37194f0e9a354a8fb371943d80f313308d20487810333c
 MISC metadata.xml 477 BLAKE2B 082ad4f53e9c433ebb519be1cba7b079d1372d8b18b169092f4dd17cea14c4be99f4a3ca49934305817a45ca8208c079c85fe4d9bb0ba3c9cfb4754b02dec9c1 SHA512 9d317606d6f1dde6af151f99db3e0a119a47e2a6816da518a343777980236f93942e8fc3694fb5f80ad6a1c6b6e4b9d81064dbb7b2bfe4694a65fbd05cf9ac8f
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
index e0ea35303d93..cea4c6abf918 100644
--- a/media-plugins/vdr-permashift/vdr-permashift-1.0.1-r1.ebuild
+++ b/media-plugins/vdr-permashift/vdr-permashift-1.0.1-r1.ebuild
@@ -6,8 +6,8 @@ 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"
+HOMEPAGE="https://ein-eike.de/vdr-plugin-permashift-english/"
+SRC_URI="https://ein-eike.de/wordpress/wp-content/uploads/2014/11/${P}.tgz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/media-plugins/vdr-permashift/vdr-permashift-1.0.4_pre20200301.ebuild b/media-plugins/vdr-permashift/vdr-permashift-1.0.4_pre20200301.ebuild
index 94863818ef20..ece2759181fb 100644
--- a/media-plugins/vdr-permashift/vdr-permashift-1.0.4_pre20200301.ebuild
+++ b/media-plugins/vdr-permashift/vdr-permashift-1.0.4_pre20200301.ebuild
@@ -9,7 +9,7 @@ inherit vdr-plugin-2
 GIT_VERSION="f3541d7c0e3e201daf06a49304db0a0d7d5f8dd1"
 
 DESCRIPTION="VDR Plugin: permanent timeshift by recording live TV on RAM"
-HOMEPAGE="http://ein-eike.de/vdr-plugin-permashift-english/"
+HOMEPAGE="https://ein-eike.de/vdr-plugin-permashift-english/"
 SRC_URI="https://github.com/eikesauer/Permashift/archive/${GIT_VERSION}.tar.gz -> ${PF}.tar.gz"
 
 LICENSE="GPL-2+"