gentoo resync : 13.06.2020

3 files changed, 170 insertions, 2 deletions

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
+}