gentoo resync : 08.10.2021

4 files changed, 6 insertions, 193 deletions

diff --git a/media-plugins/mythplugins/Manifest b/media-plugins/mythplugins/Manifest
index 9a8a09fa16e8..b8bba444da7a 100644
--- a/media-plugins/mythplugins/Manifest
+++ b/media-plugins/mythplugins/Manifest
@@ -1,5 +1,3 @@
-DIST mythplugins-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56e95a86627473d52613e62f0acf3bd0c4bb37afb340ab874c222899f9d3c219ded470785d27960db9b39d784ceb SHA512 d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e
 DIST mythplugins-31.0_p20210731.tar.gz 102637029 BLAKE2B 0ca6124d20d428c8b9999813c819c01a97c4806fbd2f70f5b50d698c5f9c3cafd3141ee1379b2b63510705e2083109d91362c3fcc6277f58d461f2138d1604fd SHA512 e262ce91fd8a523daa772d13675ff6639f95202f66be67b2a405e9ea9204d6663128621c5142752f2a889e25cbc8be6d92b3759508767e94207326343a91f092
-EBUILD mythplugins-31.0-r2.ebuild 4042 BLAKE2B 94191bf5420ea88b0306523adde82eb52581570851f43589db61fe5b7700005333791ab4ccc74d85d46d959497d4d1edd99c556d7d7d9c6335d6dd217af99705 SHA512 744e8fc6d13d195759af855a68c94a9d05a26da0d0ba9d1026f7964c1f9465f5a5f6e1fa56cc16ab4fd87857245732f48b0ced951eb51e2646c2babb4915a339
-EBUILD mythplugins-31.0_p20210731-r1.ebuild 4274 BLAKE2B 17c6049f06224fd2417eff1aee32995f88458eab867b904438ae1d140abdc27514599b35be3798913b03ca5062450094af3957c805b96099808ccd2b4721a2ff SHA512 37e6f11b0c2dac43741a451a6498e1b32103c0756892441d0d7fcec71ade5e5f232088e9bfffd2dd8549a0819588ea0b51dd49b4f2d3a5197584a714b10863a2
-MISC metadata.xml 1610 BLAKE2B 91709dabcbaa8e406bd9e91c3db70b0eaa6a8f49187344a043e1e1dfbda91eaecf9628ae30b973138b5223557eddbb7802026862aacfce7f006db828ea2a6d71 SHA512 8981ed6c0a3368ee87d6dd8ef05131ac5b87aa42e92717d9386d88bb30e3ffa612d03844fa9a46a340907dd3c70b5df42cc92a6f6c5da06663160587ec51814f
+EBUILD mythplugins-31.0_p20210731-r2.ebuild 3779 BLAKE2B bca34b52a8c2c3d8da8512c057c204c78b7dda56da956facf077f59fe32c417d945de7f3b429908fcc66e98124ee566c8556196137545e67833750e53ebc02f3 SHA512 619ede18468bf3b0315d73b62e248084c51f65ba5125b9f971c689d804a0bbc85cd38f21031c066c23ecbb262d54b977749876e6cdfaf22ec8eadc2b0ef9d31a
+MISC metadata.xml 1394 BLAKE2B b9e35ba810b181c739e167acc988c8231b5dbe01e8fe5479604d45b1571a22b8c7afa47ae907100119c93b072076a4dffefa8a66b4353cec91ec901d3f140165 SHA512 631957ed05261e9285ffc3ba002614a5560c530db07d3d23285318eca34d85862d527fe96a5a7931fb338cb0f9d4e65c9c543b36d2fa9b300c80f703339abc5b
diff --git a/media-plugins/mythplugins/metadata.xml b/media-plugins/mythplugins/metadata.xml
index d18ad820c3bb..42e09a229eae 100644
--- a/media-plugins/mythplugins/metadata.xml
+++ b/media-plugins/mythplugins/metadata.xml
@@ -16,11 +16,8 @@
 		<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="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>
diff --git a/media-plugins/mythplugins/mythplugins-31.0-r2.ebuild b/media-plugins/mythplugins/mythplugins-31.0-r2.ebuild
deleted file mode 100644
index dc68f54f90bc..000000000000
--- a/media-plugins/mythplugins/mythplugins-31.0-r2.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2021 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=( python3_{7,8} )
-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
-		app-cdr/cdrtools
-	)
-	mythbrowser? ( dev-qt/qtwebkit:5 )
-	mythgame? (
-		sys-libs/zlib[minizip]
-		dev-perl/XML-Twig
-	)
-	mythmusic? (
-		dev-qt/qtwebkit:5
-		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? ( app-cdr/cdrtools )
-		)
-	)
-	mythnetvision? (
-		${PYTHON_DEPS}
-		dev-python/lxml
-		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.
-
-No plugins are installed by default. Enable plugins individually with USE flags:
-mytharchive mythbrowser mythgame mythmusic mythnetvision mythnews mythweather 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/mythplugins/mythplugins-31.0_p20210731-r1.ebuild b/media-plugins/mythplugins/mythplugins-31.0_p20210731-r2.ebuild
index 573023cfd14e..c6fd4bf6fa81 100644
--- a/media-plugins/mythplugins/mythplugins-31.0_p20210731-r1.ebuild
+++ b/media-plugins/mythplugins/mythplugins-31.0_p20210731-r2.ebuild
@@ -28,8 +28,8 @@ LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
 
-MYTHPLUGINS="mytharchive mythbrowser mythgame \
-mythmusic mythnetvision mythnews mythweather mythzmserver mythzoneminder"
+MYTHPLUGINS="mytharchive mythgame mythnetvision \
+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.
@@ -37,8 +37,6 @@ REQUIRED_USE="
 	!mythnetvision
 	mytharchive? ( ${PYTHON_REQUIRED_USE} )
 	mythnetvision? ( ${PYTHON_REQUIRED_USE} )
-	mythmusic? ( vorbis )
-	mythnews? ( mythbrowser )
 "
 RDEPEND="
 	dev-libs/glib:2
@@ -81,26 +79,10 @@ RDEPEND="
 		media-video/transcode
 		app-cdr/cdrtools
 	)
-	mythbrowser? ( dev-qt/qtwebkit:5 )
 	mythgame? (
 		sys-libs/zlib[minizip]
 		dev-perl/XML-Twig
 	)
-	mythmusic? (
-		dev-qt/qtwebkit:5
-		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? ( app-cdr/cdrtools )
-		)
-	)
 	mythnetvision? (
 		${PYTHON_DEPS}
 		dev-python/lxml
@@ -131,13 +113,14 @@ 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.
 
 No plugins are installed by default. Enable plugins individually with USE flags:
-mytharchive mythbrowser mythgame mythmusic mythnetvision mythnews mythweather mythzmserver mythzoneminder
+mytharchive mythgame mythnetvision mythweather mythzmserver mythzoneminder
 "
 
 src_configure() {
 	econf \
 		--python=${EPYTHON} \
 		--extra-ldflags="${LDFLAGS}" \
+		--disable-mythbrowser \
 		$(use_enable cdda cdio) \
 		$(use_enable exif) \
 		$(use_enable exif new-exif) \
@@ -145,11 +128,8 @@ src_configure() {
 		$(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)