gentoo (leap year) resync : 29.02.2020

10 files changed, 445 insertions, 156 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index b802e7acf3f2..9d9705d6079c 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/gentoo-vdr-scripts/Manifest b/media-tv/gentoo-vdr-scripts/Manifest
index a7a59056a38e..54acf2e9b385 100644
--- a/media-tv/gentoo-vdr-scripts/Manifest
+++ b/media-tv/gentoo-vdr-scripts/Manifest
@@ -1,5 +1,3 @@
-DIST gentoo-vdr-scripts-2.7.3.tar.bz2 49156 BLAKE2B b5aaeb2cc704a2d43e05cb30cc6ea0d01f6f1b00dbfdf8a61d87cfc0360a86f2e7fb10daaeae7210eac46bca36ce72e4e928e1ce0752ffa3343fac83392b530b SHA512 9d00acaf77bbbf52f4a4d4b8284d94b9d191c354de52ea6f7bba0751be661feec4915cca20be3d24a0471efe4b3f24c5dcc025e3e8b0cc6b2c37f8843b91a520
 DIST gentoo-vdr-scripts-2.8.tar.bz2 49662 BLAKE2B 1a49d03441c991f6aa08cefc3b6d3a926a18ef7cb6c97bef886f922901f681ab95e9b60648d3930136148dafdf87f702d564e5a89fb6945ef9ed0cec1c2fbbaa SHA512 587bfc329efb92f1d9d9f87b3eb88ff9c74f92587d20c1489e67c861c769f9cb307bd6314aa88dc7d2a1400bc408033b913093b8f219fa59857638f2d062eecf
-EBUILD gentoo-vdr-scripts-2.7.3.ebuild 3667 BLAKE2B d424ade9018e652c8f10da7909950758146c544a1e9c514393d3538b772e3cbd6689e02ba91c0a84da5189354903db41dc6067ca2f3966f5cdf51d2789df9549 SHA512 d48efb3d75d25a15786942e6c1c30c90a31d1f11ad8c2911b6fe33702802a39878360308a9e351e21aa891ffb67781367c5b851eb348d73b83c6c36207214520
 EBUILD gentoo-vdr-scripts-2.8.ebuild 2379 BLAKE2B c815ccb8ba882381c07f21e5b61908858e6c371f26fc6c753923dc5a750a7bd514bfa3f2bca66b82ff077e8af801ac1a4f18a7f7062ada038f7104e23641da75 SHA512 b73a0f45d467503f5986688657312fad9b4cf17815600dd6deec180e3b36ed25f6abb8a7823e960e3738b0510d04d83a84adeb8b68eedceb0d4cde7fa234b80c
-MISC metadata.xml 354 BLAKE2B 74ce746b4c49b338ad17df430f4aa1c11cad86684bf3c3003f2c2c2fc979435b53b5e30a997f009c53ea57d8441d09cc113b45ceaabc0a1d62f58e78ba73daae SHA512 9607950224075c12bcd9a43aef5cc3dd640cedee6689986713b10b2df1441a7694f8a527f03b66c15139dcaab917249ebd0899031432f545fe74a62aeabdce9d
+MISC metadata.xml 249 BLAKE2B d4dad5b7d4d1bbb3887888fd8519955b5e1262b2f3af04802d69aef6d836bf8d87d0316d9d3527d3a98c8c8ff98cf61d474bdc4ddbb3873592bae7fbfd9f4551 SHA512 b6440069f895b4d5360dec283faef3b6d3b3d65e7b895d8f8bcc2c7106d19db75ebede53ca8e0e67adf63af73ed54ca4efbc1c58b317dbfa27ed2050e175bde3
diff --git a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.3.ebuild b/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.3.ebuild
deleted file mode 100644
index e46f969af355..000000000000
--- a/media-tv/gentoo-vdr-scripts/gentoo-vdr-scripts-2.7.3.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="Scripts necessary for use of vdr as a set-top-box"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-vdr-scripts.git/about/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	https://dev.gentoo.org/~hd_brummy/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="nvram"
-
-RDEPEND="nvram? ( sys-power/nvram-wakeup )
-	app-admin/sudo
-	sys-process/wait_on_pid"
-
-VDR_HOME=/var/vdr
-
-pkg_setup() {
-	enewgroup vdr
-
-	# Add user vdr to these groups:
-	#   video - accessing dvb-devices
-	#   audio - playing sound when using software-devices
-	#   cdrom - playing dvds/audio-cds ...
-	enewuser vdr -1 /bin/bash "${VDR_HOME}" vdr,video,audio,cdrom
-}
-
-src_prepare() {
-	# moved into own package
-	sed -e '/SUBDIRS =/s# bin # #' -i usr/Makefile
-	sed -e '/all:/s#compile##' -i Makefile
-}
-
-src_install() {
-	default
-	dodoc README* TODO ChangeLog
-
-	# create necessary directories
-	diropts -ovdr -gvdr
-	keepdir "${VDR_HOME}"
-
-	local kd
-	for kd in shutdown-data merged-config-files dvd-images; do
-		keepdir "${VDR_HOME}/${kd}"
-	done
-}
-
-pkg_preinst() {
-	local PLUGINS_NEW=0
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.plugins ]]; then
-		PLUGINS_NEW=$(grep -v '^#' "${ROOT}"/etc/conf.d/vdr.plugins |grep -v '^$'|wc -l)
-	fi
-	if [[ ${PLUGINS_NEW} > 0 ]]; then
-		cp "${ROOT}"/etc/conf.d/vdr.plugins "${D}"/etc/conf.d/vdr.plugins
-	else
-		einfo "Migrating PLUGINS setting from /etc/conf.d/vdr to /etc/conf.d/vdr.plugins"
-		local PLUGIN
-		for PLUGIN in $(source "${ROOT}"/etc/conf.d/vdr;echo $PLUGINS); do
-			echo ${PLUGIN} >> "${D}"/etc/conf.d/vdr.plugins
-		done
-	fi
-
-	has_version "<${CATEGORY}/${PN}-0.5.4"
-	previous_less_than_0_5_4=$?
-
-	has_version "<${CATEGORY}/${PN}-2.6"
-	previous_less_than_2_6=$?
-}
-
-VDRSUDOENTRY="vdr ALL=NOPASSWD:/usr/share/vdr/bin/vdrshutdown-really.sh"
-
-pkg_postinst() {
-	if [[ $previous_less_than_0_5_4 = 0 ]] ; then
-		elog "\nVDR use now default the --cachedir parameter to store the epg.file"
-		elog "Please do not override this with the EPGFILE variable\n"
-
-		elog "svdrp port 2001 support removed\n"
-
-		elog "--rcu support removed, use media-plugin/vdr-rcu\n"
-	fi
-
-	if [[ $previous_less_than_2_6 = 0 ]]; then
-		elog "${CATEGORY}/${PN} supports now a init script"
-		elog "to start a X server"
-		elog "Please refer for detailed info to"
-		elog "${CATGORY}/${PN} README.x11-setup\n"
-	fi
-
-	if use nvram; then
-		elog "nvram wakeup is optional."
-		elog "To make use of it emerge sys-power/nvram-wakeup.\n"
-	fi
-
-	elog "Plugins which should be used are now set via its"
-	elog "own config-file called /etc/conf.d/vdr.plugins"
-	elog "or enabled via the frontend eselect vdr-plugin.\n"
-
-	if [[ -f "${ROOT}"/etc/conf.d/vdr.dvdswitch ]] &&
-		grep -q ^DVDSWITCH_BURNSPEED= "${ROOT}"/etc/conf.d/vdr.dvdswitch
-	then
-		ewarn "You are setting DVDSWITCH_BURNSPEED in /etc/conf.d/vdr.dvdswitch"
-		ewarn "This no longer has any effect, please use"
-		ewarn "VDR_DVDBURNSPEED in /etc/conf.d/vdr.cd-dvd"
-	fi
-
-	elog "systemd is supported by ${CATEGORY}/${PN}"
-	elog "Please read for detailed info on this"
-	elog "${CATEGORY}/${PN} README.systemd"
-}
-
-pkg_config() {
-	if grep -q /usr/share/vdr/bin/vdrshutdown-really.sh "${ROOT}"/etc/sudoers; then
-
-		einfo "Removing depricated entry from /etc/sudoers:"
-		einfo "-  ${VDRSUDOENTRY}"
-
-		cd "${T}"
-		cat >sudoedit-vdr.sh <<-SUDOEDITOR
-			#!/bin/bash
-			sed -i \${1} -e '/\/usr\/share\/vdr\/bin\/vdrshutdown-really.sh *$/d'
-
-		SUDOEDITOR
-		chmod a+x sudoedit-vdr.sh
-
-		VISUAL="${T}"/sudoedit-vdr.sh visudo -f "${ROOT}"/etc/sudoers || die "visudo failed"
-
-		einfo "Edited /etc/sudoers"
-	fi
-}
diff --git a/media-tv/gentoo-vdr-scripts/metadata.xml b/media-tv/gentoo-vdr-scripts/metadata.xml
index 973d97889167..984a01fab265 100644
--- a/media-tv/gentoo-vdr-scripts/metadata.xml
+++ b/media-tv/gentoo-vdr-scripts/metadata.xml
@@ -5,7 +5,4 @@
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
 	</maintainer>
-	<use>
-		<flag name="nvram">Add support for using nvram-wakeup to set wakeup time in bios</flag>
-	</use>
 </pkgmetadata>
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index e01cc62e5555..dbda9e51e853 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,6 +1,7 @@
 AUX kodi-18.5-cassert.patch 1402 BLAKE2B 02f2b63856cf1fd75749d78a0f9cf37cac55b20fc22302846011781c56e8902312a10e71c3e1b21f44aaa362efba2acefb73c5ae68643b569c541508f44d97bd SHA512 fbaa126dd647559749944c09e5424a76dccdaa5d8dc6299a52cb6215f20af29f3cf8d0596280f335e8a9be1ffe556fa47b33c9d28b22c2b47f51d738219aeb8c
 DIST ffmpeg-kodi-4.0.3-Leia-18.2.tar.gz 12426917 BLAKE2B 83da9511d7b4ef6a8c813561a061c4fe86712e4424c30c9005500751c6c79f4232910caaf13cd34d2db1867f592b042dd291d6c32a77f80107ce87a3a7db1760 SHA512 b4d4bf16f05b953ba81769446c8fd90246e1919b9ef671fb212008151c83d8445e4123ad37c352aa6243074962832e817749d2de318eb721d5bb5d655fd77ab2
 DIST ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz 12430413 BLAKE2B 6de6fde2c16264f851466b46f87c23c34e7d503203f69d47342d46034f153860190d196da51221f866315405c8a33325b2160283333256ee5d5e293336afae99 SHA512 c6dd75dbff7119adeeda246cfb640b5e8d3b4c242ef83e5ba070207b60f0c715c3fe3cb328d87687b70a133f122a03aba990f0e95f3aac7d5dbcee25bec59078
+DIST ffmpeg-kodi-4.2.2-Matrix-Alpha1.tar.gz 13066195 BLAKE2B 7db50ea93358bb90ac089851586156ce7cbd1be1474af2f087ba448a5168839ad61e84e313e638137156bccb44920a05783d2e6aa2b464c6cf692eccda392fe0 SHA512 19bd27687126ffb103a97709dfec7a4330a362410efbbe5ce3a68970d642c1b74c4bc0880600e232b3b34659d7fb0e40e233a8267a9b52921b0f810944a6297a
 DIST kodi-18.3.tar.gz 51013397 BLAKE2B cce29d481397dddd3c942f83a034bc6d73eafc1be2a50436e1e5611ccf04c27e6110c4b4f99f7f7d1cf8da3e2550209c8bee3db6e98136b8fa9738c4b1fc7e43 SHA512 4e898e28238dcbc67e106c5a0ef88bd6a82f8c0ad00e77e3ddbe2da6181b37d9ca1ba6bda57206223cfa119c5291edb4410d3e773d97b5ab67660e49929437ec
 DIST kodi-18.4.tar.gz 51027569 BLAKE2B 47e3377abb4a1e5a3c26b1519f45ab9347127467594841ac689b857a3f4163731951d4e1e4960bce5c2af4fa224acf4a3887f42bdc41a603bba4979d3bcbcda8 SHA512 ae08fc29d20387d9352dc1ae4a89da19962a279b89705ff8f7869377281589d44a685cebaa8509d3252ae79215dcdaadb72e9fa752e6d2bce59974bc23276aad
 DIST kodi-18.5.tar.gz 51025415 BLAKE2B c439790a85466d50875cd63ccdc6fee1b16c5ee67d9a3371b1a006292f642e59c6321cb63f698e1a43bc7be45209dbf993028b1184722f7b51dbe6fef6a292ba SHA512 6fe70d8ee5b6ffd3d43b89487554e41eed8dbf95bb017b82578b547ec248ae94f4dda298f0d85c5896019f7032eba4e1e2494c8140dde9c9b9cb21802acfd029
@@ -10,5 +11,5 @@ DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c
 EBUILD kodi-18.3-r1.ebuild 9637 BLAKE2B f664ff7359fca7b8d9aa4cb02e21d83835ae9de281d0a6540dfe9f6d203fdc263465274e9440cf1919dd64eff769b41a9d44db5aaddb34f9f33dffe5c0a9ca43 SHA512 81a975e03150e5da65928d2730299649fe94ef5538f4577cfeb26eee39cd888b7fec2b5fc4d9d8b814ff8e74c619f4ef00d840a05dd279547524f1743ed19d89
 EBUILD kodi-18.4-r1.ebuild 9521 BLAKE2B 312c594e5dd8c851af3a21e8b373892aed11aab8a2f29ec7442b46439242fe7f9fb04be8ab1460e8752e15258174d1c5ff66fee07cd041a2c65bdc95e0a65e83 SHA512 364ced13e0db628cf535c99137bbad2b5f6cb6f071bb1781e96314b365625cec3936213bae1827fbe6f926ecb2565a32e356b58b3951b10794920d2f9df4aecd
 EBUILD kodi-18.5-r2.ebuild 9492 BLAKE2B 022c819338e0cf341f84e62d2b72381a71a41c2088b27eea9e21a598aaaec2e778df11c19a22448da4bb035611fc5e549d321c08cd76c3e234b4aa343d545739 SHA512 dca47435172ec06cb6ee9514d684559f67f6532c9c037e5b57f374ce3c5d36420c95ed441e914fe5ba35cbb0e6d3581f2797297328758be4d752261a806d501a
-EBUILD kodi-9999.ebuild 8933 BLAKE2B 5565f7c99906e0eee3335908f09901297bdb9e2c9aa5b72da5a78eff7100edfc6df300a4747e21a2c3c356d6a471d2f48133c2e7c3c7d4de5181f978ad876dd9 SHA512 5a5c93434bbe6db0252ec5bcb4b92e7f8ecd4200b21ce2ca30d5eff3eb16bbe4be2696fd2c4c8f905e33c6d90bc4ea9ce8451b23b860fe67c25ef6e243d85734
+EBUILD kodi-9999.ebuild 8938 BLAKE2B 2e0f529a28d220be3871c67052e56cf2bad77337540404edebae85621c037f2401d6a0bfe36341d350fcfe7a54480bdce8f932afde67b7e7534c1880a131e54b SHA512 b9362ce05a4b31ac5959352e8c2f36511f4f979f16f15dd896ebb3546c7ba9ad10f9c17446907c7475f75972d5cfbe514c647a6b55045809faecdaba1f9a5a35
 MISC metadata.xml 1720 BLAKE2B 3158b87065286649496de2edf821c37042cafe7e729f7ba31c571ade72cf8f9fbce218485ac721ad896fa5ef751becfd2f3b4ce1645e97b4db673ec879884834 SHA512 f8d52358276ad8c2eb23632451f025ac45f799fa392bd59fcfd4417d9e9e76cf9ce066ac50cd8ee563319d7f2248b28c45fee3059a4e069ebb862e41d230b1da
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index b75aaa125040..66db93958aeb 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -7,9 +7,9 @@ PYTHON_REQ_USE="libressl?,sqlite,ssl"
 LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
 LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
 LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.0.4"
-CODENAME="Leia"
-FFMPEG_KODI_VERSION="18.4"
+FFMPEG_VERSION="4.2.2"
+CODENAME="Matrix"
+FFMPEG_KODI_VERSION="Alpha1"
 PYTHON_COMPAT=( python3_{6,7,8} )
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
@@ -75,7 +75,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
 		dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
 	')
-	>=dev-libs/libcdio-0.94
+	>=dev-libs/libcdio-2.1.0
 	>=dev-libs/libfmt-6.1.2
 	dev-libs/libfstrcmp
 	gbm? (	media-libs/mesa[gbm] )
@@ -98,7 +98,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	)
 	mysql? ( dev-db/mysql-connector-c:= )
 	mariadb? ( dev-db/mariadb-connector-c:= )
-	>=net-misc/curl-7.56.1[http2]
+	>=net-misc/curl-7.68.0[http2]
 	nfs? ( >=net-fs/libnfs-2.0.0:= )
 	opengl? ( media-libs/glu )
 	!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
@@ -155,7 +155,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/cmake
 	dev-util/gperf
 	media-libs/giflib
-	>=media-libs/libjpeg-turbo-1.5.1:=
+	>=media-libs/libjpeg-turbo-2.0.4:=
 	>=media-libs/libpng-1.6.26:0=
 	test? ( dev-cpp/gtest )
 	virtual/pkgconfig
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index b2fc55da0a1e..89b6b0c49ff9 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -13,6 +13,7 @@ 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-r2.ebuild 10339 BLAKE2B c9a45fa90c6fef749e1650dba85f8b7c9be27a8d3b8fe2537973249fa9fa71da8b349ae563aaddaaf19e01342e8e144e461b8473565b4d318ff3ecb53ce4a8a3 SHA512 51011c051b833122c42ce54be2de55904f73334c07438e8f63f0e517feb4f049057b3e6ba3408f2fb59dff9a6996a9f96cb6e807d4acaa44174ffc5432cc2d25
-EBUILD mythtv-30.0_p20190808-r1.ebuild 11354 BLAKE2B 0bb73204e5b908ffd73a5991552ca9c4af85181a80a532fd0134839624dd50514ca16121b77f69e665ae52991e82f2c325663803d4db0a6bbdb08d6b56581ba9 SHA512 07690e7d60b30a826f454a65a01561ab9f5600adac7f9675c1509aec342c9115b588217977dea91ad665745e654516ca11776c6971b1f5b1d4dca7d087cb132d
+EBUILD mythtv-29.1-r2.ebuild 10275 BLAKE2B 2bfd8666f16a58cfb2c043613b4553f458c23937642b4b6d3e5aecb2ff1c61e3638428c307ccd7f16bef6a340c277375141b02b7341852c1c6fd9706df7f189e SHA512 4dfa6cd829dce16b99fb9ec2e674840c01acd8fa8226951661d555122fee403812b20aa70c350132a90956e04b4f5f7a57b542fb3bce12c5a6e476afce653adb
+EBUILD mythtv-30.0_p20190808-r1.ebuild 11359 BLAKE2B bc8c8629dcde406ea0255494a8a9f054fdfcb9811f17ccaaec2516240c3273e39598394efd303fa0ee5c95c260dbdd1efa5c0cef740a75318f7a96961878eaa6 SHA512 48a5d45a4d2e0a79d14a5998a001f698a264175452abb57b60e45eef894831d86784a3510f5cd79cd5b04333c6eb2383567aee9da90fa31f4d4e7c3f041f147e
+EBUILD mythtv-30.0_p20190808-r2.ebuild 12451 BLAKE2B 7554b3c93e4f8c020a6ac613af71585ce00e894d01cd33d77f16a35a9c9a73a64b2a5566cece2770de145120092175b1ee3f90ef959cfb5da689b3650ff60fad SHA512 722478429a5f2a3c59f57256d7ff071ba448e8f8064d938158974c56b91e8ecadb075f80e1cb7ed1316be05f0d1c4c4ab0b52464e7717cc93cb9f3e70d0fe74e
 MISC metadata.xml 2331 BLAKE2B 14f6ab28a064eb01b307221ae545f43d43068bf892aadd84a8ef51c3dedde634a9cdcab834fce08704cdd35b87b6d7753b4f01cb7c804947f20298a574df7c58 SHA512 28aff33650ce9d0921574f18a254262f49bfd88c8a0b4b6d6661216f2824f78c35ecc06a06677bd357148186ae9934021dcd877122a74d4f3803285edb47dc18
diff --git a/media-tv/mythtv/mythtv-29.1-r2.ebuild b/media-tv/mythtv/mythtv-29.1-r2.ebuild
index b0eb9f826772..c386ea2be4ff 100644
--- a/media-tv/mythtv/mythtv-29.1-r2.ebuild
+++ b/media-tv/mythtv/mythtv-29.1-r2.ebuild
@@ -9,7 +9,7 @@ BACKPORTS="d8a2db77f5731cf32c6d31127452391c6cf7f91f"
 MY_P=${P%_p*}
 MY_PV=${PV%_p*}
 
-inherit flag-o-matic python-single-r1 qmake-utils user readme.gentoo-r1 systemd toolchain-funcs vcs-snapshot
+inherit flag-o-matic python-single-r1 qmake-utils user-info readme.gentoo-r1 systemd toolchain-funcs vcs-snapshot
 
 MYTHTV_BRANCH="fixes/29"
 
@@ -31,6 +31,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 "
 
 COMMON="
+	acct-user/mythtv
 	dev-libs/glib:2
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -111,8 +112,6 @@ COMMON="
 	)
 "
 RDEPEND="${COMMON}
-	!media-tv/mythtv-bindings
-	!x11-themes/mythtv-themes
 	media-fonts/corefonts
 	media-fonts/dejavu
 	media-fonts/liberation-fonts
@@ -160,8 +159,7 @@ PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" ) # bug 691904
 
 pkg_setup() {
 	python-single-r1_pkg_setup
-	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
-	usermod -a -G ${MYTHTV_GROUPS} mythtv
+	# The acct-user/mythtv package creates/manages the user 'mythtv'
 }
 
 src_prepare() {
diff --git a/media-tv/mythtv/mythtv-30.0_p20190808-r1.ebuild b/media-tv/mythtv/mythtv-30.0_p20190808-r1.ebuild
index 4c42db6d5f85..c3cd77028d34 100644
--- a/media-tv/mythtv/mythtv-30.0_p20190808-r1.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 toolchain-funcs user vcs-snapshot
+inherit eutils flag-o-matic python-single-r1 qmake-utils readme.gentoo-r1 systemd toolchain-funcs user-info vcs-snapshot
 
 MYTHTV_BRANCH="fixes/${P%.*}"
 
diff --git a/media-tv/mythtv/mythtv-30.0_p20190808-r2.ebuild b/media-tv/mythtv/mythtv-30.0_p20190808-r2.ebuild
new file mode 100644
index 000000000000..b09dc0235f97
--- /dev/null
+++ b/media-tv/mythtv/mythtv-30.0_p20190808-r2.ebuild
@@ -0,0 +1,429 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_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 user-info vcs-snapshot
+
+MYTHTV_BRANCH="fixes/${P%.*}"
+
+DESCRIPTION="Open Source DVR and media center hub"
+HOMEPAGE="https://www.mythtv.org"
+SRC_URI="https://github.com/MythTV/mythtv/archive/${BACKPORTS}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+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 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 xnvctrl +xvid +X zeroconf
+	${IUSE_INPUT_DEVICES} ${IUSE_VIDEO_CAPTURE_DEVICES}"
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
+	bluray? ( xml )
+	cdr? ( cdda )
+"
+COMMON_DEPEND="
+	acct-user/mythtv
+	dev-libs/glib:2
+	dev-libs/lzo
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	opengl? ( dev-qt/qtopengl:5 )
+	dev-qt/qtscript:5
+	dev-qt/qtsql:5[mysql]
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-gfx/exiv2:=
+	media-libs/freetype:2
+	media-libs/libsamplerate
+	media-libs/taglib
+	lame? ( >=media-sound/lame-3.93.1 )
+	sys-libs/zlib
+	opengl? ( virtual/opengl )
+	X? (
+		x11-libs/libX11:=
+		x11-libs/libXext:=
+		x11-libs/libXinerama:=
+		x11-libs/libXrandr:=
+		x11-libs/libXv:=
+		x11-libs/libXxf86vm:=
+		x11-misc/wmctrl:=
+	)
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	bluray? (
+		media-libs/libbluray:=[java?]
+		dev-libs/libcdio:=
+		sys-fs/udisks:2
+	)
+	cec? ( dev-libs/libcec )
+	dvd? (
+		dev-libs/libcdio:=
+		sys-fs/udisks:2
+	)
+	egl? ( media-libs/mesa[egl] )
+	fftw? ( sci-libs/fftw:3.0=[threads] )
+	hdhomerun? ( media-libs/libhdhomerun )
+	ieee1394? (
+		>=media-libs/libiec61883-1.0.0
+		>=sys-libs/libavc1394-0.5.3
+		>=sys-libs/libraw1394-1.2.0
+	)
+	jack? ( media-sound/jack-audio-connection-kit )
+	java? ( dev-java/ant-core )
+	lcd? ( app-misc/lcdproc )
+	libass? ( >=media-libs/libass-0.9.11:= )
+	lirc? ( app-misc/lirc )
+	perl? (
+		>=dev-perl/libwww-perl-5
+		dev-perl/DBD-mysql
+		dev-perl/HTTP-Message
+		dev-perl/IO-Socket-INET6
+		dev-perl/LWP-Protocol-https
+		dev-perl/Net-UPnP
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	systemd? ( sys-apps/systemd:= )
+	vaapi? ( x11-libs/libva:=[opengl] )
+	vdpau? ( x11-libs/libvdpau )
+	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 )
+	xvid? ( >=media-libs/xvid-1.1.0 )
+	zeroconf? (
+		dev-libs/openssl:0=
+		net-dns/avahi[mdnsresponder-compat]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/lxml[${PYTHON_MULTI_USEDEP}]
+			dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]
+			dev-python/urlgrabber[${PYTHON_MULTI_USEDEP}]
+			dev-python/future[${PYTHON_MULTI_USEDEP}]
+			dev-python/requests-cache[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	media-fonts/corefonts
+	media-fonts/dejavu
+	media-fonts/liberation-fonts
+	x11-apps/xinit
+	autostart? (
+		net-dialup/mingetty
+		x11-apps/xset
+		x11-wm/evilwm
+	)
+	dvd? ( media-libs/libdvdcss )
+	xmltv? ( >=media-tv/xmltv-0.5.43 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-lang/yasm
+	x11-base/xorg-proto
+"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-respect_LDFLAGS.patch"
+	"${FILESDIR}/${P}-cast_constants_to_short.patch"
+	"${FILESDIR}/${P}-Fix_Dereferencing_type-punned_pointer.patch"
+	"${FILESDIR}/${P}-Fix_unitialized_variables.patch"
+)
+
+# mythtv and mythplugins are separate builds in the github mythtv project
+S="${WORKDIR}/${P}/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.
+
+A mythtv user is maintained by acct-user/mythtv. An existing mythtv user
+may be modified to the configuration defined by acct-user/mythtv.
+An existing mythtv user may be changed which may alter some functionality.
+If it breaks mythtv you may need to (choose one):
+	* Restore the original mythtv user
+	* Create custom acct-user/mythtv overlay for your system
+	* Fix you system to use mythtv as daemon only
+Failure to emerge acct-user/mythtv indicates that the existing mythtv user
+is customized and not changed. Corrective action (choose one):
+	* Ignore emerge failure
+	* Create custom acct-user/mythtv overlay for your system
+	* Fix you system to use mythtv as daemon only
+	* Delete existing user and try again (dangerous)
+
+Mythtv is updated to use correct FHS/Gentoo policy paths.
+Updating mythtv installations may report:
+	* mythtv is in use, cannot update home
+	* There was an error when attempting to update the home directory for mythtv
+	* Please update it manually on your system (as root):
+	*       usermod -d "/var/lib/mythtv" "mythtv"
+This can be ignored. The previous default was "/home/mythtv".
+Use caution if you change the home directory.
+
+To have this machine operate as recording host for MythTV,
+mythbackend must be running. Run the following:
+rc-update add mythbackend default
+
+Your recordings folder must be owned 'mythtv'. e.g.
+chown -R mythtv /var/lib/mythtv
+
+Want mythfrontend to start automatically?
+Set USE=autostart. Details can be found at:
+https://dev.gentoo.org/~cardoe/mythtv/autostart.html
+
+Note that the systemd unit now restarts by default and logs
+to journald via the console at the notice verbosity.
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+	# The acct-user/mythtv package creates/manages the user 'mythtv'
+}
+
+src_prepare() {
+	default
+
+	# Perl bits need to go into vender_perl and not site_perl
+	sed -e "s:pure_install:pure_install INSTALLDIRS=vendor:" \
+		-i "${S}"/bindings/perl/Makefile || die "Cannot convert site_perl to vendor_perl!"
+
+	# Fix up the version info since we are using the fixes/${PV} branch
+	echo "SOURCE_VERSION=\"v${MY_PV}\"" > "${S}"/VERSION
+	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/VERSION
+	echo "SOURCE_VERSION=\"${BACKPORTS}\"" > "${S}"/EXPORTED_VERSION
+	echo "BRANCH=\"${MYTHTV_BRANCH}\"" >> "${S}"/EXPORTED_VERSION
+
+	echo "setting.extra -= -ldconfig" >> "${S}"/programs/mythfrontend/mythfrontend.pro
+}
+
+src_configure() {
+	local -a myconf
+
+	# Setup paths
+	myconf+=(--prefix="${EPREFIX}"/usr)
+	myconf+=(--libdir="${EPREFIX}"/usr/$(get_libdir))
+	myconf+=(--libdir-name=$(get_libdir))
+	myconf+=(--mandir="${EPREFIX}"/usr/share/man)
+
+	if use debug; then
+		myconf+=(--compile-type=debug)
+		myconf+=(--disable-stripping) # FIXME: does not disable for all files, only for some
+		myconf+=(--enable-valgrind) # disables timeouts for valgrind memory debugging
+	else
+		myconf+=(--compile-type=release)
+	fi
+
+	# Build boosters
+	has ccache "${FEATURES}" || myconf+=(--disable-ccache)
+	has distcc "${FEATURES}" || myconf+=(--disable-distcc)
+
+	# CPU settings
+	# Mythtv's configure is borrowed from ffmpeg,
+	# Bug #172723
+	# Try to get cpu type based on CFLAGS.
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+		[ "${i}" = "native" ] && i="host" # bug #273421
+		myconf+=(--cpu="${i}")
+		break
+	done
+	myconf+=($(use_enable altivec))
+
+	# Sound Output Support
+	myconf+=(
+		$(use_enable oss audio-oss)
+		$(use_enable alsa audio-alsa)
+		$(use_enable jack audio-jack)
+		$(use_enable pulseaudio audio-pulseoutput)
+	)
+
+	# Input Support
+	myconf+=(
+		$(use_enable lirc)
+		$(use_enable input_devices_joystick joystick-menu)
+		$(use_enable cec libcec)
+		$(use_enable ieee1394 firewire)
+		$(use_enable hdhomerun)
+		$(use_enable vbox)
+		$(use_enable ceton)
+		$(use_enable v4l v4l2)
+		$(use_enable ivtv)
+		$(use_enable hdpvr)
+		$(use_enable dvb)
+		$(use_enable asi)
+	)
+
+	# Video Output Support
+	myconf+=(
+		$(use_enable X x11)
+		$(use_enable xnvctrl)
+		$(use_enable X xrandr)
+		$(use_enable X xv)
+	)
+
+	# Hardware accellerators
+	myconf+=(
+		$(use_enable vdpau)
+		$(use_enable vaapi)
+		$(use_enable vaapi vaapi2)
+		$(use_enable opengl opengl-video)
+		$(use_enable opengl opengl-themepainter)
+		$(use_enable libass)
+	)
+
+	# System tools
+	myconf+=(
+		$(use_enable systemd systemd_notify)
+		$(use_enable systemd systemd_journal)
+		$(use_enable xml libxml2)
+		$(use_enable zeroconf libdns-sd)
+	)
+
+	# Bindings
+	if use perl && use python; then
+		myconf+=(--with-bindings=perl,python)
+	elif use perl; then
+		myconf+=(--without-bindings=python)
+		myconf+=(--with-bindings=perl)
+	elif use python; then
+		myconf+=(--without-bindings=perl)
+		myconf+=(--with-bindings=python)
+	else
+		myconf+=(--without-bindings=perl,python)
+	fi
+	use python && myconf+=(--python="${EPYTHON}")
+	myconf+=($(use_enable java bdjava))
+
+	# External codec library options (used for mythffmpeg and streaming transcode)
+	# lame is required for some broadcasts for silence detection of commercials
+	# default enable in IUSE with +lame
+	myconf+=(
+		$(use_enable lame libmp3lame)
+		$(use_enable xvid libxvid)
+		$(use_enable x264 libx264)
+		$(use_enable x265 libx265)
+		$(use_enable vpx libvpx)
+	)
+
+	# Clean up DSO load times and other compiler bits
+	myconf+=(--enable-symbol-visibility)
+	myconf+=(--enable-pic)
+
+	if tc-is-cross-compiler ; then
+		myconf+=(--enable-cross-compile --arch=$(tc-arch-kernel))
+		myconf+=(--cross-prefix="${CHOST}"-)
+	fi
+
+	myconf+=($(use_enable bluray libbluray_external))
+
+	# econf sets these options that are not handled by configure:
+	# --build --host --infodir --localstatedir --sysconfdir
+
+	einfo "Running ./configure ${myconf[@]} - THIS MAY TAKE A WHILE."
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		--cc="$(tc-getCC)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		--extra-ldflags="${LDFLAGS}" \
+		--qmake=$(qt5_get_bindir)/qmake \
+		"${myconf[@]}"
+}
+
+src_install() {
+	emake STRIP="true" INSTALL_ROOT="${D}" install
+	python_optimize  # does all packages by default
+	dodoc AUTHORS UPGRADING README
+	readme.gentoo_create_doc
+
+	insinto /usr/share/mythtv/database
+	doins database/*
+
+	newinitd "${FILESDIR}"/mythbackend.init-r2 mythbackend
+	newconfd "${FILESDIR}"/mythbackend.conf-r1 mythbackend
+	if use systemd; then
+		systemd_newunit "${FILESDIR}"/mythbackend.service-28 mythbackend.service
+	fi
+
+	dodoc keys.txt
+
+	keepdir /etc/mythtv
+	fowners -R mythtv /etc/mythtv
+	keepdir /var/log/mythtv
+	fowners -R mythtv /var/log/mythtv
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/mythtv.logrotate.d-r4 mythtv
+
+	insinto /usr/share/mythtv/contrib
+	# Ensure we don't install scripts needing the perl bindings (bug #516968)
+	use perl || find contrib/ -name '*.pl' -exec rm -f {} \;
+	# Ensure we don't install scripts needing the python bindings (bug #516968)
+	use python || find contrib/ -name '*.py' -exec rm -f {} \;
+	doins -r contrib/*
+
+	# Install our mythfrontend wrapper which is similar to Mythbuntu's
+	if use wrapper; then
+		mv "${ED}/usr/bin/mythfrontend" "${ED}/usr/bin/mythfrontend.real" || die "Failed to install mythfrontend.real"
+		newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
+		newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
+	fi
+
+	if use autostart; then
+		echo CONFIG_PROTECT=\"$(egethome mythtv)\" > "${T}"/95mythtv
+		doenvd "${T}"/95mythtv
+
+		insinto $(egethome mythtv)
+		newins "${FILESDIR}"/bash_profile .bash_profile
+		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
+	fi
+
+	# Make Python files executable but not files named "__init__.py"
+	find "${ED}/usr/share/mythtv" -type f -name '*.py' -exec expr \( {} : '.*__init__.py' \) = 0 \; \
+		-exec chmod a+x {} \; || die "Failed to make python file $(basename ${file}) executable"
+
+	# Ensure that Python scripts are executed by Python 2
+	python_fix_shebang "${ED}/usr/share/mythtv"
+
+	# Make shell & perl scripts executable
+	find "${ED}" -type f \( -name '*.sh' -o -name '*.pl' \) -exec chmod a+x {} \; || die "Failed to make script executable"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
+pkg_info() {
+	return
+}
+
+pkg_config() {
+	if [[ -e "${EROOT}"/usr/bin/mysql ]]; then
+		"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
+	fi
+}