gentoo resync : 25.08.2020

3 files changed, 1 insertions, 179 deletions

diff --git a/media-plugins/mythplugins/Manifest b/media-plugins/mythplugins/Manifest
index d436d2f5ac07..344453c1e374 100644
--- a/media-plugins/mythplugins/Manifest
+++ b/media-plugins/mythplugins/Manifest
@@ -1,5 +1,3 @@
-DIST mythplugins-30.0.tar.gz 101169041 BLAKE2B 0125c6234c168b9b24110b817e9e9a632187743c9ca44a46a8d464be6c330067f31da6fb252ed2a5fd770756229f2d95a746bd5d0e03be1e97fecc0de86603be SHA512 a29125ca33b1b100f51feb7a2ccff16d62928e474a393f11fc4b4fb77d0a85d9d4dd138acf757b527c0f936f3ff2e7d3eddcacef183d642429e36bc3e44ecbf4
 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 4134 BLAKE2B c492412dd23446c4707beb5c91393c252f6c16d35a7f460c6f99ccd2f7490be1e47d2a3c674bfd0b6a8edca6124266df112a51de6720b207fa5e53a2f7d756c4 SHA512 5b804535c769ac4395bb8429d56d51eca5f7e464463598e143eed0b2b8e670fd8387f4834c97df592e44fa0181008c71a6b829d1a74e1cf1213472c2eee695be
-MISC metadata.xml 1648 BLAKE2B c3bf88af62ef3c7dc370c085f99e555c890ffbdac07e3a9106ed1c277d4c6943a1be2702b3cb8d376665073d69e42d0e629186825fd09ccb03d5d5378ff2ce31 SHA512 43e6c090619bd621b07683e56aa2c90cb163072aa3c5093f6ec5eda147dd1b67ca01488934bb49f851b8fd667b3f47f2e106b98f7f53d97b600fa5ce77d5c7b0
+MISC metadata.xml 1569 BLAKE2B 721600943857e1531edd3c5cb323809dc3deb80de3f3d2e83ac179a5fc5ffaf40f180565d48c9e57079bcff25f0cbd72ce489142f0ac6a15caf83e047cdb6e42 SHA512 410354edf8d459b5fa3bf83ff95a13316f4ccd2d3e2121689356e52d34a371b37168c677d38bcfe9812d88ddbfea3868fb356c7b8c8f697327494bdaff04e961
diff --git a/media-plugins/mythplugins/metadata.xml b/media-plugins/mythplugins/metadata.xml
index 3b81a44089c8..d81da3debf32 100644
--- a/media-plugins/mythplugins/metadata.xml
+++ b/media-plugins/mythplugins/metadata.xml
@@ -17,7 +17,6 @@
 		<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>
diff --git a/media-plugins/mythplugins/mythplugins-30.0-r2.ebuild b/media-plugins/mythplugins/mythplugins-30.0-r2.ebuild
deleted file mode 100644
index efbc5d121caa..000000000000
--- a/media-plugins/mythplugins/mythplugins-30.0-r2.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# 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 )
-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-${MAJOR_PV}*[alsa?,cdda?,cdr?,exif?,fftw?,ieee1394?,libass?,opengl?,python,raw?,xml?,xvid]
-	mytharchive? (
-		app-cdr/dvd+rw-tools
-		$(python_gen_cond_dep '
-			dev-python/pillow[${PYTHON_MULTI_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? (
-		$(python_gen_cond_dep '
-			dev-python/pycurl[${PYTHON_MULTI_USEDEP}]
-			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
-			dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]
-			dev-python/oauth[${PYTHON_MULTI_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
-}