gentoo resync : 13.10.2019

4 files changed, 30 insertions, 35 deletions

diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 20dd3985630f..51a45c27ad65 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -13,6 +13,6 @@ AUX mythtv.logrotate.d-r4 235 BLAKE2B 4f6df360f5191aaf4a2b55bd3edc7bc4aab92c46db
 AUX xinitrc-r1 234 BLAKE2B 0227ea065f1c43e1b2f1583bcbc798db76e9a08d345bbd8ed8837a6ba424b187c814e3ff0d7690d2d9f7a7617f4fbcce20df926e43bc6e89aec3e352aab6de8f SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188
 DIST mythtv-29.1-r1.tar.gz 105657217 BLAKE2B 9d42464b0c75c2d3a359b528e3f7917cfb281f48451167afc6517caa9702da44fce2d48566fd902ec08af35117232113b4d499e2c9a3cf2ad2634d91cf532ca7 SHA512 0eadc37661d9fa93a63c0f425cd43d43533889b0afcea1478b2645e083ba6c96eebf2eec088db1ed6f0a0727c03b7c90c0c18b83c194d630dda3bac45bca5d87
 DIST mythtv-30.0_p20190808.tar.gz 101208060 BLAKE2B af8966dd6353fc514c9a95083f28e8b7b19f16e1bd5a4f7590a946c306bf16a09f0028c76da975e423136834f8f06d7f2a570b43957ef4ae5e42ee241b579f0a SHA512 c02371c0b2162556e40a560a0fd9cb121f46f2ccedbc2ca74cd03aa9caf2b7ea4bbaa09ae6320eb782f932190f449e7fdd274a6d6ba9676e5fd9b7f5432632a2
-EBUILD mythtv-29.1-r1.ebuild 10359 BLAKE2B ee8b0c0f0b25caef4577620d6374032d70c1bf4371cfe4979c48c22833c4c61acf7adf9da1e455e548ac3cf2cb23c1070c8d8e70f7566bebc8a062e9c1f05cac SHA512 21e86109e648b74e636c590ff73d3245ea4306bbafaaa8129185701a4cbf13e6eeb7389ca7a83ddb32be847b99464d0b8368561beb2d85a2891f5e0c8f2d2c1a
-EBUILD mythtv-30.0_p20190808.ebuild 11365 BLAKE2B a42be279dc1d4927fd0d9f618ddd3f5858fad4aafed73b776c6a987502ada9bff4da704b69f85fe844ed97e132d58fae18c82ea21bb129cc916817dfc92c7d76 SHA512 6e04c36152dcb6b538080d01cf8bf0864e9c02482c06565a95245bc60aa34c5065d62bf365ee97351442d18b604211e0ef6bfc85f5259f0cbb1396f0c4655a66
-MISC metadata.xml 2312 BLAKE2B 854ba3cb41be09b8fa70e7d7334214fd20712bf687590f8d74f337fa329868691dca33cea6944ea684ee15fad2c5e0553e8e36cccb1022d7b8e379aa2f589a5d SHA512 0dec95d5dd0477b2e91a7b19355d2ef2a1f92b6e774c2683f930f3b47d2ad93aa23e511f37a73a61ac1e9b5ba2364d93948f01f93e645f1197e11bce6fac56a7
+EBUILD mythtv-29.1-r2.ebuild 10323 BLAKE2B 4070e12d19b075f34035f42d7a4c34c87154fa718a80cc06d9aecb081ebee647a3401dfe75ef791c936dc9cea1a301883a08071c6a486ee160dda1ee354cbb6e SHA512 a1d6c81d05268e767bf94dce93a78c4f7f4045470ed0e26df482a68eccd87dea74be446d7a1c4432f7d20e5d29118c290a5dcf9d485c1ba2d380af79838003d9
+EBUILD mythtv-30.0_p20190808-r1.ebuild 11338 BLAKE2B f1daa280cf951f28b60cdba548730921bb9b9aa628894e5c97079c2844605e751e66123870ad8001d1ee6ebbacc1c374a3a97b9e502c202149103b95b5fb478c SHA512 dbd2e95b46120114aee33f554ca44a008f4b1f1aafc9cda6350e1b34f2c7c6ebcf033a78fc6865c027288855da8585563a88ca176465680446f514203ca72dd4
+MISC metadata.xml 2331 BLAKE2B 14f6ab28a064eb01b307221ae545f43d43068bf892aadd84a8ef51c3dedde634a9cdcab834fce08704cdd35b87b6d7753b4f01cb7c804947f20298a574df7c58 SHA512 28aff33650ce9d0921574f18a254262f49bfd88c8a0b4b6d6661216f2824f78c35ecc06a06677bd357148186ae9934021dcd877122a74d4f3803285edb47dc18
diff --git a/media-tv/mythtv/metadata.xml b/media-tv/mythtv/metadata.xml
index f6172ecf9665..3360a064da60 100644
--- a/media-tv/mythtv/metadata.xml
+++ b/media-tv/mythtv/metadata.xml
@@ -16,7 +16,6 @@
 		<flag name="bluray">Use the system libbluray for BluRay support</flag>
 		<flag name="cec">Allows control of CEC enabled TVs via HDMI</flag>
 		<flag name="ceton">Ceton InfiniTV 4 a CableCARD-enabled tuner support</flag>
-		<flag name="crystalhd">Broadcom CrystalHD hardware support</flag>
 		<flag name="debug">Instructs Qt to use the 'debug' target</flag>
 		<flag name="egl">EGL video output support</flag>
 		<flag name="fftw">Support visualizations via <pkg>sci-libs/fftw</pkg></flag>
@@ -36,6 +35,7 @@
 		<flag name="wrapper">Use Ubuntu mythtfrontend wrapper</flag>
 		<flag name="x265">Enable h265 encoding using x265</flag>
 		<flag name="xmltv">Support <pkg>media-tv/xmltv</pkg> TV listing - not used by Schedules Direct]</flag>
+		<flag name="xnvctrl">External XNVCtrl support using Nvidia proprietary driver</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">MythTV/mythtv</remote-id>
diff --git a/media-tv/mythtv/mythtv-29.1-r1.ebuild b/media-tv/mythtv/mythtv-29.1-r2.ebuild
index 05fc94797448..90ff6b9021fe 100644
--- a/media-tv/mythtv/mythtv-29.1-r1.ebuild
+++ b/media-tv/mythtv/mythtv-29.1-r2.ebuild
@@ -15,14 +15,14 @@ MYTHTV_BRANCH="fixes/29"
 
 DESCRIPTION="Homebrew PVR project"
 HOMEPAGE="https://www.mythtv.org"
-SRC_URI="https://github.com/MythTV/mythtv/archive/${BACKPORTS}.tar.gz -> ${PF}.tar.gz"
+SRC_URI="https://github.com/MythTV/mythtv/archive/${BACKPORTS}.tar.gz -> ${P}-r1.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 SLOT="0/${PV}"
 
 IUSE_INPUT_DEVICES="input_devices_joystick"
-IUSE="alsa altivec autostart bluray cec crystalhd debug dvb dvd egl fftw +hls \
+IUSE="alsa altivec autostart bluray cec debug dvb dvd egl fftw +hls \
 	ieee1394 jack lcd libass lirc mythlogserver perl pulseaudio python systemd +theora \
 	vaapi vdpau +vorbis +wrapper +xml xmltv +xvid zeroconf ${IUSE_INPUT_DEVICES}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -47,7 +47,6 @@ COMMON="
 	media-libs/taglib
 	>=media-sound/lame-3.93.1
 	sys-libs/zlib
-	virtual/mysql
 	virtual/opengl
 	x11-libs/libX11
 	x11-libs/libXext
@@ -63,9 +62,6 @@ COMMON="
 		sys-fs/udisks:2
 	)
 	cec? ( dev-libs/libcec )
-	dvb? (
-		virtual/linuxtv-dvb-headers
-	)
 	dvd? (
 		dev-libs/libcdio:=
 		sys-fs/udisks:2
@@ -73,7 +69,7 @@ COMMON="
 	egl? ( media-libs/mesa[egl] )
 	fftw? ( sci-libs/fftw:3.0= )
 	hls? (
-		<media-libs/libvpx-1.7.0:=
+		<media-libs/libvpx-1.8.0:=
 		>=media-libs/x264-0.0.20111220:=
 	)
 	ieee1394? (
@@ -135,10 +131,14 @@ DEPEND="${COMMON}
 	x11-base/xorg-proto
 "
 
-S="${WORKDIR}/${PF}/mythtv"
+S="${WORKDIR}/${P}-r1/mythtv"
 
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="
+If a MYSQL server is installed, a mythtv MySQL user and mythconverg database
+is created if it does not already exist.
+You will be prompted for your MySQL root password.
+
 To have this machine operate as recording host for MythTV,
 mythbackend must be running. Run the following:
 rc-update add mythbackend default
@@ -242,7 +242,6 @@ src_configure() {
 	# Video
 	myconf="${myconf} $(use_enable vdpau)"
 	myconf="${myconf} $(use_enable vaapi)"
-	myconf="${myconf} $(use_enable crystalhd)"
 
 	# Input
 	use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
@@ -366,7 +365,7 @@ pkg_info() {
 }
 
 pkg_config() {
-	echo "Creating mythtv MySQL user and mythconverg database if it does not"
-	echo "already exist. You will be prompted for your MySQL root password."
-	"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
+	if [[ -e "${EROOT}"/usr/bin/mysql ]]; then
+		"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
+	fi
 }
diff --git a/media-tv/mythtv/mythtv-30.0_p20190808.ebuild b/media-tv/mythtv/mythtv-30.0_p20190808-r1.ebuild
index 1e8752cdcda3..43af82f6be94 100644
--- a/media-tv/mythtv/mythtv-30.0_p20190808.ebuild
+++ b/media-tv/mythtv/mythtv-30.0_p20190808-r1.ebuild
@@ -10,7 +10,7 @@ BACKPORTS="5cde0578d84926171b20c8f7e95a101e9b0b9457" # August 8, 2019
 MY_P=${P%_p*}
 MY_PV=${PV%_p*}
 
-inherit eutils flag-o-matic python-single-r1 qmake-utils readme.gentoo-r1 systemd vcs-snapshot
+inherit eutils flag-o-matic python-single-r1 qmake-utils readme.gentoo-r1 systemd user vcs-snapshot
 
 MYTHTV_BRANCH="fixes/${P%.*}"
 
@@ -24,9 +24,9 @@ SLOT="0/${PV}"
 
 IUSE_INPUT_DEVICES="input_devices_joystick"
 IUSE_VIDEO_CAPTURE_DEVICES="v4l ivtv ieee1394 hdpvr hdhomerun vbox ceton"
-IUSE="alsa altivec asi autostart bluray cdda cdr cec crystalhd debug dvd dvb egl exif fftw jack java
+IUSE="alsa altivec asi autostart bluray cdda cdr cec debug dvd dvb egl exif fftw jack java
 	+lame lcd libass lirc +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx
-	+wrapper x264 x265 +xml xmltv +xvid +X zeroconf
+	+wrapper x264 x265 +xml xmltv xnvctrl +xvid +X zeroconf
 	${IUSE_INPUT_DEVICES} ${IUSE_VIDEO_CAPTURE_DEVICES}"
 REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )
@@ -57,7 +57,6 @@ COMMON="
 	media-libs/taglib
 	lame? ( >=media-sound/lame-3.93.1 )
 	sys-libs/zlib
-	virtual/mysql
 	opengl? ( virtual/opengl )
 	X? (
 		x11-libs/libX11:=
@@ -111,7 +110,8 @@ COMMON="
 	systemd? ( sys-apps/systemd:= )
 	vaapi? ( x11-libs/libva:=[opengl] )
 	vdpau? ( x11-libs/libvdpau )
-	vpx? ( media-libs/libvpx:= )
+	vpx? ( <media-libs/libvpx-1.8.0:= )
+	xnvctrl? ( x11-drivers/nvidia-drivers:=[tools,static-libs] )
 	x264? (	>=media-libs/x264-0.0.20111220:= )
 	x265? (	media-libs/x265 )
 	xml? ( >=dev-libs/libxml2-2.6.0 )
@@ -150,12 +150,13 @@ PATCHES=(
 )
 
 # mythtv and mythplugins are separate builds in the github mythtv project
-S="${WORKDIR}/${PF}/mythtv"
+S="${WORKDIR}/${P}/mythtv"
 
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="
-Creating mythtv MySQL user and mythconverg database if it does not
-already exist. You will be prompted for your MySQL root password.
+If a MYSQL server is installed, a mythtv MySQL user and mythconverg database
+is created if it does not already exist.
+You will be prompted for your MySQL root password.
 
 Mythtv is updated to use correct FHS/Gentoo policy paths.
 Updating mythtv installations may report:
@@ -264,7 +265,7 @@ src_configure() {
 	# Video Output Support
 	myconf+=(
 		$(use_enable X x11)
-		$(use_enable X xnvctrl)
+		$(use_enable xnvctrl)
 		$(use_enable X xrandr)
 		$(use_enable X xv)
 	)
@@ -272,7 +273,6 @@ src_configure() {
 	# Hardware accellerators
 	myconf+=(
 		$(use_enable vdpau)
-		$(use_enable crystalhd)
 		$(use_enable vaapi)
 		$(use_enable vaapi vaapi2)
 		$(use_enable opengl opengl-video)
@@ -376,12 +376,10 @@ src_install() {
 	fi
 
 	if use autostart; then
-		local mythtv_homedir="$( egethome mythtv )"
-
-		echo CONFIG_PROTECT="\"${mythtv_homedir}\"" > "${T}"/95mythtv
+		echo CONFIG_PROTECT=\"$(egethome mythtv)\" > "${T}"/95mythtv
 		doenvd "${T}"/95mythtv
 
-		insinto "${mythtv_homedir}"
+		insinto $(egethome mythtv)
 		newins "${FILESDIR}"/bash_profile .bash_profile
 		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
 	fi
@@ -403,10 +401,6 @@ src_install() {
 	done
 }
 
-pkg_preinst() {
-	export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}$( egethome mythtv )"
-}
-
 pkg_postinst() {
 	readme.gentoo_print_elog
 }
@@ -416,5 +410,7 @@ pkg_info() {
 }
 
 pkg_config() {
-	"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
+	if [[ -e "${EROOT}"/usr/bin/mysql ]]; then
+		"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
+	fi
 }