[gentoo-commits] repo/gentoo:master commit in: media-plugins/mythplugins/

[Jakov Smolić]

commit:     c2640c694096597ab4615d65c3f5c7624847af57
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  5 07:05:51 2021 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Oct  5 07:36:52 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2640c69

media-plugins/mythplugins: Remove qtwebkit support

Closes: https://bugs.gentoo.org/750893
Closes: https://bugs.gentoo.org/684580
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 media-plugins/mythplugins/metadata.xml             |  3 ---
 ...s-31.0-r2.ebuild => mythplugins-31.0-r3.ebuild} | 27 +++-------------------
 ...ebuild => mythplugins-31.0_p20210731-r2.ebuild} | 27 +++-------------------
 3 files changed, 6 insertions(+), 51 deletions(-)

diff --git a/media-plugins/mythplugins/metadata.xml b/media-plugins/mythplugins/metadata.xml
index d18ad820c3b..42e09a229ea 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-r3.ebuild
similarity index 83%
rename from media-plugins/mythplugins/mythplugins-31.0-r2.ebuild
rename to media-plugins/mythplugins/mythplugins-31.0-r3.ebuild
index dc68f54f90b..a875396d2eb 100644
--- a/media-plugins/mythplugins/mythplugins-31.0-r2.ebuild
+++ b/media-plugins/mythplugins/mythplugins-31.0-r3.ebuild
@@ -22,8 +22,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.
@@ -31,8 +31,6 @@ REQUIRED_USE="
 	!mythnetvision
 	mytharchive? ( ${PYTHON_REQUIRED_USE} )
 	mythnetvision? ( ${PYTHON_REQUIRED_USE} )
-	mythmusic? ( vorbis )
-	mythnews? ( mythbrowser )
 "
 RDEPEND="
 	dev-libs/glib:2
@@ -75,26 +73,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
@@ -128,7 +110,7 @@ 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() {
@@ -142,11 +124,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)

diff --git a/media-plugins/mythplugins/mythplugins-31.0_p20210731-r1.ebuild b/media-plugins/mythplugins/mythplugins-31.0_p20210731-r2.ebuild
similarity index 83%
rename from media-plugins/mythplugins/mythplugins-31.0_p20210731-r1.ebuild
rename to media-plugins/mythplugins/mythplugins-31.0_p20210731-r2.ebuild
index 573023cfd14..e5c493797d0 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,7 +113,7 @@ 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() {
@@ -145,11 +127,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)