gentoo resync : 11.08.2021

10 files changed, 9 insertions, 633 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index a9c15bb731da..1c4c06cf2126 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/channeleditor/Manifest b/media-tv/channeleditor/Manifest
index dde460143376..b85e0bab1f1b 100644
--- a/media-tv/channeleditor/Manifest
+++ b/media-tv/channeleditor/Manifest
@@ -3,5 +3,5 @@ AUX channeleditor-1.9.2.1-messages.properties.patch 18594 BLAKE2B 0b24118aca4bf3
 AUX channeleditor-1.9.2.1-messages_en.properties.patch 7226 BLAKE2B f5992f06de852454a004883d96dc61e56728a745dd03f7545f9854ee839ac55ca511b518aa03e20cbb2a6126bb34964c7af72f4b81536bdcec24f76988826ec0 SHA512 8a2c09010ce01f001150a759bb91fdf2bdebf4a6776ada8fc1dfbb4b9000aeb4d5ad0be5bb99ed4b5237c4a070ebbea5ca862585a74f1c64dad5349127f45a97
 DIST channeleditor_1.9.2.1_src.tar.gz 317608 BLAKE2B 26afc8d08a525f26c942fda20eb8ed63ff973bc112743edb80043ef9f2bd78f34dc4b2ef7ad60110b624dbfa6e2058a41e945b616d2ca587acffefe5b15b583e SHA512 84147868aa8b1aacf4ef31a7665822bc7ccd4f7372aaa040aacd8ee42581db1d67092b6b09cda6e447bae2c058fe4ceaab28f3e2a268a54dc5ac25452e64d7d9
 EBUILD channeleditor-1.9.2.1-r2.ebuild 1447 BLAKE2B 0e10a726fe62ba37ec91e8de234780d9b0efb60f326a03ce6631aba37560d3f134c67de13ddd1a08fea3b093221f2a2ea43e8d419efd3eef2ea4cfbd018755f3 SHA512 c5d2670b592dbb898cc47c5abb260a23d85d7cab23bc9e9deebb107668ddb8a78654f1f59d3ffe05c44b881a0262e26f550bd27a682163da4fad12e3734c7de6
-EBUILD channeleditor-1.9.2.1-r3.ebuild 1453 BLAKE2B 5a6f1d7be8a619e652b3ce219491a4174ae0670e095e658876cd7a0ceb71cf75e2fd6df61d9739948f314ec0fb98c83bd1b0fb0ac94572a87046ef8b2cef28cc SHA512 96a8f5c8e0b2ea516ca5020d7ee709169fc01bbbb464f83c33d825c908e968c60436633a4cc121f3d0b60ce1e84ae9e28b833a97af66b4c904e3b9fe485c6c4b
+EBUILD channeleditor-1.9.2.1-r3.ebuild 1452 BLAKE2B 23156d708d32ce2242d47ed00100edca224d81ed80b09e49834c095584d17b0187c7e81ede444cf00cc64eda8b5d7fc85a6b67abbc204c4a96873bb4b74c25f9 SHA512 407955e4aa520acdcc1cfba306e061c2b77a702894f3276582ec78f05bf586d9704afeddd695e8e8d945c365c01a9fd203415302d1185ca61bca72c047a3ac9c
 MISC metadata.xml 332 BLAKE2B 94c6fc0a7d5f1fc8ba176c5ec6fbf88d05b2af0463a8bb59547db726fac957ba32a8386db915d3afb6c86088f1865bda3c4d142a8d9ee8896f5cb416f79c8267 SHA512 69d8f78543a8a036dbb365e8cd89755265e8be29085c4f68de21b833325163ef17ec16927d0a3a3f414daf54dd123e6f654d82b7d354af59ce5665c5cf65ec6e
diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
index 684ff24bffbb..e648beb2140b 100644
--- a/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=virtual/jre-1.8:*"
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index e59b5665fa22..872b833ab5ee 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -10,9 +10,7 @@ AUX mythtv-31.0-Remove_ldconfig.patch 399 BLAKE2B 26b480b30ccb779523a06fc81ec653
 AUX mythtv.logrotate.d-r4 235 BLAKE2B 4f6df360f5191aaf4a2b55bd3edc7bc4aab92c46dbd7b7bc1295371b7ef451056f902d92e3209654463850d2cbca579c60d25c1f9065ac80ce3e57fa1fe8e661 SHA512 8dd8936599acabfa55ad7efb870de431e03cb86c3c96156c2c0eee6675962dcc527391260f2ba66e3d54c1d41373001ef25c9d2421e83940c686d14b5f29fff7
 AUX xinitrc-r1 234 BLAKE2B 0227ea065f1c43e1b2f1583bcbc798db76e9a08d345bbd8ed8837a6ba424b187c814e3ff0d7690d2d9f7a7617f4fbcce20df926e43bc6e89aec3e352aab6de8f SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188
 DIST mythtv-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56e95a86627473d52613e62f0acf3bd0c4bb37afb340ab874c222899f9d3c219ded470785d27960db9b39d784ceb SHA512 d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e
-DIST mythtv-31.0_p20210225.tar.gz 102623768 BLAKE2B 560d3e08abb7bacbb58499a541f0d96a7b7813deb74d7e7692625dfdb09c5ec126e3f5fd014f7bd6c0640e52dd62b5bab87db40426deb9768d6de1d84b9c0d59 SHA512 832fab6d0094e43f0601485d5ca1249d95a8e293cd5bfe53208c482a43ff19396a435fa7c63c21f728fdc47fc55cb135eb766140f67ec60114965c83500e99e8
-DIST mythtv-31.0_p20210606.tar.gz 102637509 BLAKE2B c915d8ac1ade57bddfb56e796796385caff1b5d52967bc24b0719dea89e7e73ed0ee4f878f68e166b8d808b1c4413f1534a1e91e313cd6ece25515bcc4f2d378 SHA512 24c678b0a349259603527520643804287e316376dc3cb56686cdead010a98823769b906e93f61729323a38f5a270e39913ed91ef518889bbfedaced5b5d1b618
+DIST mythtv-31.0_p20210731.tar.gz 102637029 BLAKE2B 0ca6124d20d428c8b9999813c819c01a97c4806fbd2f70f5b50d698c5f9c3cafd3141ee1379b2b63510705e2083109d91362c3fcc6277f58d461f2138d1604fd SHA512 e262ce91fd8a523daa772d13675ff6639f95202f66be67b2a405e9ea9204d6663128621c5142752f2a889e25cbc8be6d92b3759508767e94207326343a91f092
 EBUILD mythtv-31.0-r5.ebuild 12344 BLAKE2B 614e5a4b0fda18d861ef3555a69c9af7ca0bbe1bdf2c3611d35c7f04667ad8ef38f6d2d3d3ef751ef4c1538a3937ab236ffa439d8c94b10bc6e4b480ebb6e721 SHA512 ca865900a5df068706f55561b9ebe2023bab5fe223b3defa88979c284693f8c0d154a0ed32bcdb14feb251e9f0d45df286e0a604a33712511596f57ed52d0e5e
-EBUILD mythtv-31.0_p20210225.ebuild 12451 BLAKE2B 16117b87fe94de5a84f6b574d932916e789c049d29590d5fc467d98f2cb68dec08098b3053338f47eee9f151db78eb270fa1ea6ed97978c4c667c64488ed34ad SHA512 a7a1ba693dec2d5ef4f2f8db13ec72575210bbb1c26ff0e8ae08b55566bd776c1133fd2a564c13455f8c7e7a1be699eaf3933c3f2d651da98a0fd1286237b15d
-EBUILD mythtv-31.0_p20210606.ebuild 12453 BLAKE2B 7e8e7f90e46b81e73fa08b74b2c06324153865726087dbfd3b10740328992058d42d01ba13dc7674c203a887d77ed80efa319840f456d3c66ad876116403eb5f SHA512 8cb63a22e635134665ddfd3d7175a99b071a09be6645dc930b83319cf10b4f5ee190d6cb14b27e0dc16121fa290b2e40056ee3da6e5f265f49ecf4289b2191e6
+EBUILD mythtv-31.0_p20210731.ebuild 12453 BLAKE2B 8c0771c16357803c0340179f807f5387c578b16332318c58e24c487672cf3c32b9dd0bbd56110b759413c657dab2515f3a8f16207a1788be5e1a0dedb42cebf6 SHA512 a299ddfd24c059935efd36d7a06986c846aa493b9f102741efd5d0fb62e8460766ac7e8780aed21bebc3c9aab9766f8720869cb0f42407ac7922d223caef20e9
 MISC metadata.xml 2238 BLAKE2B 24444a3132c3eec819a11a2994669f8fb758bb3f62c2605d9fc5ccd9fedf679f8a841322c1250eeed32d86acd0b79d1f186c754dca89f9d93e07ba2f9c7f1e86 SHA512 220828ae331a2d6bcc1b92e88d9bfa82ab714b8ba737099a0b6807c05ec8102878491d372b31cbdbb7fc5ded871dd7deb162a636e1fbe540e2dcab7d80000a36
diff --git a/media-tv/mythtv/mythtv-31.0_p20210225.ebuild b/media-tv/mythtv/mythtv-31.0_p20210225.ebuild
deleted file mode 100644
index fdfb309e826e..000000000000
--- a/media-tv/mythtv/mythtv-31.0_p20210225.ebuild
+++ /dev/null
@@ -1,435 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit eutils flag-o-matic python-any-r1 qmake-utils readme.gentoo-r1 systemd user-info
-
-MY_COMMIT="b6ddf202a496dac180218a6581344251804f2086"
-
-DESCRIPTION="Open Source DVR and media center hub"
-HOMEPAGE="https://www.mythtv.org https://github.com/MythTV/mythtv"
-if [[ $(ver_cut 3) == "p" ]] ; then
-	SRC_URI="https://github.com/MythTV/mythtv/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-	# mythtv and mythplugins are separate builds in the github MythTV project
-	S="${WORKDIR}/mythtv-${MY_COMMIT}/mythtv"
-else
-	SRC_URI="https://github.com/MythTV/mythtv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	# mythtv and mythplugins are separate builds in the github mythtv project
-	S="${WORKDIR}/${P}/mythtv"
-fi
-KEYWORDS="~amd64 ~x86"
-LICENSE="GPL-2+"
-SLOT="0"
-
-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 nvdec +opengl oss perl pulseaudio python raw systemd vaapi vdpau vpx
-	+wrapper x264 x265 +xml xmltv +xvid +X zeroconf
-	${IUSE_INPUT_DEVICES} ${IUSE_VIDEO_CAPTURE_DEVICES}"
-
-REQUIRED_USE="
-	bluray? ( xml )
-	cdr? ( cdda )
-"
-RDEPEND="
-	acct-user/mythtv
-	dev-libs/glib:2
-	dev-libs/lzo
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5[jpeg]
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5[mysql]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-fonts/corefonts
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/tex-gyre
-	media-gfx/exiv2:=
-	media-libs/freetype:2
-	media-libs/libsamplerate
-	media-libs/taglib
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	autostart? (
-		net-dialup/mingetty
-		x11-apps/xset
-		x11-wm/evilwm
-	)
-	bluray? (
-		dev-libs/libcdio:=
-		media-libs/libbluray:=[java?]
-		sys-fs/udisks:2
-	)
-	cec? ( dev-libs/libcec )
-	dvd? (
-		dev-libs/libcdio:=
-		media-libs/libdvdcss
-		sys-fs/udisks:2
-	)
-	egl? ( media-libs/mesa[egl] )
-	fftw? ( sci-libs/fftw:3.0=[threads] )
-	hdhomerun? ( media-libs/libhdhomerun )
-	ieee1394? (
-		media-libs/libiec61883
-		sys-libs/libavc1394
-		sys-libs/libraw1394
-	)
-	jack? ( virtual/jack )
-	java? ( dev-java/ant-core )
-	lame? ( media-sound/lame )
-	lcd? ( app-misc/lcdproc )
-	libass? ( media-libs/libass:= )
-	lirc? ( app-misc/lirc )
-	nvdec? ( x11-drivers/nvidia-drivers )
-	opengl? ( dev-qt/qtopengl:5 )
-	pulseaudio? ( media-sound/pulseaudio )
-	systemd? ( sys-apps/systemd:= )
-	vaapi? ( x11-libs/libva:=[opengl] )
-	vdpau? ( x11-libs/libvdpau )
-	vpx? ( media-libs/libvpx:= )
-	x264? (	media-libs/x264:= )
-	X? (
-		x11-apps/xinit
-		x11-libs/libX11:=
-		x11-libs/libXext:=
-		x11-libs/libXinerama:=
-		x11-libs/libXrandr:=
-		x11-libs/libXv:=
-		x11-libs/libXxf86vm:=
-		x11-misc/wmctrl:=
-	)
-	x265? (	media-libs/x265 )
-	xml? ( dev-libs/libxml2:2 )
-	xmltv? (
-		dev-perl/XML-LibXML
-		media-tv/xmltv
-	 )
-	xvid? ( media-libs/xvid )
-	zeroconf? (
-		dev-libs/openssl:=
-		net-dns/avahi[mdnsresponder-compat]
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-	opengl? ( virtual/opengl )
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="
-	${RDEPEND}
-	dev-lang/yasm
-	x11-base/xorg-proto
-	perl? (
-		dev-perl/DBD-mysql
-		dev-perl/DBI
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-INET6
-		dev-perl/LWP-Protocol-https
-		dev-perl/Net-UPnP
-		dev-perl/XML-Simple
-	)
-	python? (
-		$(python_gen_any_dep '
-			dev-python/python-dateutil[${PYTHON_USEDEP}]
-			dev-python/future[${PYTHON_USEDEP}]
-			dev-python/lxml[${PYTHON_USEDEP}]
-			dev-python/mysqlclient[${PYTHON_USEDEP}]
-			dev-python/requests-cache[${PYTHON_USEDEP}]
-			dev-python/simplejson[${PYTHON_USEDEP}]
-		')
-	)
-"
-python_check_deps() {
-	use python || return 0
-	has_version "dev-python/python-dateutil[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/future[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/lxml[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/mysqlclient[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/requests-cache[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-30.0_p20190808-respect_LDFLAGS.patch"
-)
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Support for metadata lookup changes is added. User configuration required.
-Details at: https://www.mythtv.org/wiki/Metadata_Lookup_Changes_March_2021
-
-Suppport for Python 2.7 is removed.
-
-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.
-The mythtv user's primary group is now mythtv. (formerly video)
-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 (recommended)
-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
-"
-
-pkg_setup() {
-	use python && python-any-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!"
-
-}
-
-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 X xrandr)
-	)
-
-	# Hardware accellerators
-	myconf+=(
-		$(use_enable nvdec)
-		$(use_enable vaapi)
-		$(use_enable vdpau)
-		$(use_enable opengl)
-		$(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
-	use python && 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-r3 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) Finding none is OK.
-	if ! use perl; then
-		find contrib/ -name '*.pl' -exec rm {} \;
-	fi
-	# Ensure we don't install scripts needing the python bindings (bug #516968) Finding none is OK.
-	if ! use python; then
-		find contrib/ -name '*.py' -exec rm {} \;
-	fi
-	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
-		newenvd - 95mythtv <<- _EOF_
-			CONFIG_PROTECT=\"$(egethome mythtv)\"
-		_EOF_
-		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
-	use python && 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
-}
diff --git a/media-tv/mythtv/mythtv-31.0_p20210606.ebuild b/media-tv/mythtv/mythtv-31.0_p20210731.ebuild
index 33aaa5252e24..811cdfd2ce02 100644
--- a/media-tv/mythtv/mythtv-31.0_p20210606.ebuild
+++ b/media-tv/mythtv/mythtv-31.0_p20210731.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit eutils flag-o-matic python-any-r1 qmake-utils readme.gentoo-r1 systemd user-info
 
-MY_COMMIT="3162473370b31c749e8417b1b19fe6dc2186cb95"
+MY_COMMIT="5824c588db24b4e71a7d94e829e6419f71089297"
 
 DESCRIPTION="Open Source DVR and media center hub"
 HOMEPAGE="https://www.mythtv.org https://github.com/MythTV/mythtv"
diff --git a/media-tv/xmltv/Manifest b/media-tv/xmltv/Manifest
index 21d087584f42..c546fdff0ba4 100644
--- a/media-tv/xmltv/Manifest
+++ b/media-tv/xmltv/Manifest
@@ -1,5 +1,3 @@
-DIST xmltv-0.5.70.tar.bz2 1274164 BLAKE2B 4a6cbf6bc2f8f113a91fc579afbfc69fc04aec020d386182f6fd78f9f8c18821d0dc09077cccb1ad30e6f0583f958210fbf717d356f1e47dcf785e5a85864dc4 SHA512 36dd497dc20d296ca984ad0a1ca19f471c97cac7bfe7c5d4baeaae7faea565c36103bea10e7a7ae813c1cfc35c7ac376299edd2bf01c4c5da981cb5cca13317c
 DIST xmltv-0.6.1.tar.gz 838051 BLAKE2B d4011ee31b56096ae275647e0cbd85b11c2edbc3d150208aa619900c9741ac3bed2a1255d778622883b3d24a32ce3b803f5719fdd2273549bafa31ebdcb1a887 SHA512 137dad875c6f7f77fb986b4662b411766424676df0a2422f3dc123c8cec4e1dff123ea68577add65c0e5bcf2d0bdf89d7fba0ed423502ec27e2aa82ec6b10bc2
-EBUILD xmltv-0.5.70.ebuild 5265 BLAKE2B d348aea253e6d6a9f9f23d462e5bfba6f0ab9bd0f71b41832583f87d6e81e3a3d655ebb3853a0dee48ab52d11967911870e22e81a9fdeede15cdfc37f82c91d9 SHA512 d3504aaa69166138922e3a955cf1e549739a4667fb680c34bc523f3e0958a37ec76e3d6bd28cea0be93eb253d16fed904af148680e189c55850d3c033f7b99bc
-EBUILD xmltv-0.6.1.ebuild 5928 BLAKE2B 8333047166f51111ae42dafafff6259ec0588df911932ed142a211b7648d21233b23fa12d34e96893a05e5c71de498e2746af788462bddcf4b48bfc01c9d3b97 SHA512 b44687f3f5cfdf9976c175eec35d179f47788ae3f014e37c4047369447f2a9a371150191fefec166f05397b2b234002417b969de96bf6ca0bd70988ef59fa080
-MISC metadata.xml 2715 BLAKE2B 217df2efea127bf288238afaffc6ce3ba08db1afeafbc84f01625b373bd09cb002f96c47d44d1f6c434ee60a200e262b913b561e0a81376dbd1a777bbe32f090 SHA512 6ae132d5075564c7d32d2230e0b6a029723266507ec9db2b7c756986421753f8ee8519fd0cf0b754250842563a91dc28d284a82ffc930c04c64d141b8e0fedf5
+EBUILD xmltv-0.6.1-r1.ebuild 5972 BLAKE2B 4e089470ce4aee09b85f8b2dca3f4df9da81b9ec352d92522e840622bd2a85a91c7d8b377188ae43e9ccf77c5ca75284bda30bfc0deb88260caa7c1724263239 SHA512 1375ca63cf2e18b9d23182dcd5799bce6e22e2dd843bf72f79cd8d6c1e8e0cfa3b07670fda72d2228e2e9e023eb0cb55d73700468bba5b64c330baa1091bd43e
+MISC metadata.xml 2388 BLAKE2B b343aea9e4bce488cd50c1efe04698611e69efba2b8005cb6b819950c690d9eb619548a507f3805aaa983ca972d0f79627c251543d264cbba661a02ca6350023 SHA512 37d10ef01e9cd28f3ad844ead6b9cce38cad140a8b7d25617d485535a9a23dc0b58666e32ddbbf7ec63e07a3878a7574fe02f2406d6f6c6657446984def1628a
diff --git a/media-tv/xmltv/metadata.xml b/media-tv/xmltv/metadata.xml
index 56cd4daa47de..3d9b2b74ca5a 100644
--- a/media-tv/xmltv/metadata.xml
+++ b/media-tv/xmltv/metadata.xml
@@ -14,15 +14,12 @@
 		<flag name="ch-search">Grabber for Switzerland</flag>
 		<flag name="dk">Denmark tv listing grabber</flag>
 		<flag name="dtvla">Latin America digital tv listing grabber</flag>
-		<flag name="es-laguiatv">Spain alternative grabber</flag>
 		<flag name="eu-dotmedia">Grabber for Europe (xmltv.se / dotmedia)</flag>
-		<flag name="eu-epg">EPG grabber for some European countries.</flag>
 		<flag name="eu-epgdata">include fanart URLs for some European countries.</flag>
 		<flag name="eu-xmltvse">Grabbber for Europe [replaces eu-dotmedia and se-tvzon]</flag>
 		<flag name="fi">Finland tv listing grabber (0.6.1 add ampparit telsu)</flag>
 		<flag name="fi-sv">Grabber for Finland (Swedish)</flag>
 		<flag name="fr">France tv listing grabber</flag>
-		<flag name="fr-kazer">France (Kazer) tv listing grabber</flag>
 		<flag name="huro">Hungarian tv listing grabber</flag>
 		<flag name="il">Israel tv listing grabber</flag>
 		<flag name="is">Iceland tv listing grabber</flag>
@@ -30,8 +27,6 @@
 		<flag name="na-dd">North America tv listing grabber</flag>
 		<flag name="na-dtv">North America Direct TV grabber</flag>
 		<flag name="na-tvmedia">Grabber for North America (TVMedia)</flag>
-		<flag name="nl">Netherlands tv listing grabber [REMOVED 0.6.1]</flag>
-		<flag name="no-gf">Norway Gfeed tv listing grabber</flag>
 		<flag name="pt-meo">Grabber for Portugal (MEO)</flag>
 		<flag name="pt-vodafone">Grabber for Portugal (Vodafone)</flag>
 		<flag name="se-swedb">Sweden tv listing grabber</flag>
diff --git a/media-tv/xmltv/xmltv-0.5.70.ebuild b/media-tv/xmltv/xmltv-0.5.70.ebuild
deleted file mode 100644
index 73301898cf4e..000000000000
--- a/media-tv/xmltv/xmltv-0.5.70.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-module
-
-DESCRIPTION="Set of utilities to manage TV listings stored in the XMLTV format"
-HOMEPAGE="http://xmltv.org"
-SRC_URI="mirror://sourceforge/xmltv/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~x86-linux"
-
-IUSE="ar ch-search dk dtvla es-laguiatv eu-dotmedia eu-epg fi fi-sv
-fr fr-kazer huro il is it na-dd na-dtv na-tvmedia nl no-gf pt-meo se-swedb
-se-tvzon tr uk-bleb uk-tvguide tv-check tv-combiner tv-pick-cgi zz-sdjson"
-
-RDEPEND=">=dev-perl/libwww-perl-5.65
-	>=dev-perl/XML-Parser-2.34
-	>=dev-perl/XML-Twig-3.10
-	>=dev-perl/Date-Manip-5.42
-	>=dev-perl/XML-Writer-0.6
-	virtual/perl-Memoize
-	virtual/perl-Storable
-	>=dev-perl/Lingua-Preferred-0.2.4
-	>=dev-perl/Term-ProgressBar-2.03
-	virtual/perl-IO-Compress
-	dev-perl/Unicode-String
-	dev-perl/TermReadKey
-	dev-perl/File-Slurp
-	>=dev-lang/perl-5.6.1
-	dev-perl/XML-LibXML
-	dev-perl/XML-TreePP
-"
-DEPEND="${RDEPEND}
-	ar? ( dev-perl/HTML-Tree >=dev-perl/HTML-Parser-3.34 dev-perl/HTTP-Cookies dev-perl/TimeDate )
-	ch-search? ( dev-perl/HTML-Tree >=dev-perl/HTML-Parser-3.34 )
-	dk? ( dev-perl/JSON dev-perl/IO-stringy dev-perl/DateTime )
-	dtvla? ( dev-perl/HTML-Tree dev-perl/HTTP-Cookies dev-perl/TimeDate )
-	es-laguiatv? ( dev-perl/HTML-Tree )
-	eu-dotmedia? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
-	eu-epg? ( dev-perl/Archive-Zip dev-perl/DateTime-Format-Strptime >=dev-perl/HTML-Parser-3.34 dev-perl/IO-stringy )
-	fi? ( dev-perl/HTML-Tree )
-	fi-sv? ( dev-perl/IO-stringy dev-perl/HTML-Tree dev-perl/DateTime )
-	fr? ( dev-perl/DateTime-TimeZone dev-perl/HTML-Tree dev-perl/DateTime >=dev-perl/HTML-Parser-3.34 )
-	huro? ( dev-perl/HTML-Tree )
-	is? ( dev-perl/XML-DOM dev-perl/XML-LibXSLT )
-	na-dd? ( dev-perl/SOAP-Lite )
-	na-dtv? ( >=dev-perl/HTML-Parser-3.34 dev-perl/DateTime dev-perl/HTTP-Cookies )
-	na-tvmedia? ( dev-perl/XML-LibXML )
-	nl? ( dev-perl/HTTP-Cache-Transparent dev-perl/HTML-Tree dev-perl/DateTime >=dev-perl/HTML-Parser-3.34 dev-perl/TimeDate )
-	pt-meo? ( dev-perl/XML-LibXML dev-perl/DateTime )
-	se-swedb? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
-	se-tvzon? ( dev-perl/XML-LibXML dev-perl/IO-stringy dev-perl/HTTP-Cache-Transparent )
-	tr? ( dev-perl/URI dev-perl/HTTP-Cache-Transparent dev-perl/DateTime dev-perl/HTTP-Cookies dev-perl/TimeDate )
-	uk-bleb? ( dev-perl/IO-stringy dev-perl/Archive-Zip )
-	uk-tvguide? ( dev-perl/HTML-Tree dev-perl/URI dev-perl/HTTP-Cache-Transparent dev-perl/DateTime dev-perl/TimeDate )
-	zz-sdjson? ( dev-perl/DateTime-Format-ISO8601 virtual/perl-Digest-SHA dev-perl/JSON dev-perl/List-MoreUtils dev-perl/libwww-perl virtual/perl-Storable dev-perl/Try-Tiny )
-	tv-check? ( dev-perl/Tk dev-perl/Tk-TableMatrix )
-	tv-combiner? ( dev-perl/XML-LibXML )
-"
-
-PREFIX="/usr"
-
-pkg_setup() {
-	# Uses Data::Manip in various places which can fail
-	# if TZ is still set to Factory as it is in stock gentoo
-	# install media
-	export TZ=UTC
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:\$VERSION = '${PV}':\$VERSION = '${PVR}':" \
-		-e "/^@docs/s:doc/COPYING ::" \
-		Makefile.PL || die
-}
-
-src_configure() {
-	make_config() {
-		# Never except default configuration
-		echo "no"
-
-		# Enable Agentina
-		usex ar
-		# Enable Switzerland Search
-		usex ch-search
-		# Enable Denmark
-		usex dk
-		# Enable Latin America
-		usex dtvla
-		# Enable Spain
-		usex es-laguiatv
-		# Enable EU xmltv.se
-		usex eu-dotmedia
-		# Enable EU epgdata.com
-		usex eu-epg
-		# Enable Finland
-		usex fi
-		# Enable Swedish listings in Finland
-		usex fi-sv
-		# Enable France
-		usex fr
-		# Enable France EPG from kazer.org
-		usex fr-kazer
-		# Enable Hungary and Romania
-		usex huro
-		# Enable Israel
-		usex il
-		# Enable Iceland
-		usex is
-		# Enable Italy
-		usex it
-		# Enable Italy from DVB-S stream
-		echo "no" # missing Linux::DVB
-		# Enable North America using DataDirect
-		usex na-dd
-		# Enable North America from directv.com
-		usex na-dtv
-		# Enable North America XMLTVListings.com
-		usex na-tvmedia
-		# Enable Netherlands
-		usex nl
-		# Enable Portugal EPG from sappo.pt
-		usex pt-meo
-		# Enable Sweden
-		usex se-swedb
-		# Enable Sweeden Alternative
-		usex se-tvzon
-		# Enable Turkey
-		usex tr
-		# Enable UK fast alternative grabber
-		usex uk-bleb
-		# Enable UK/Ireland TV Guide
-		usex uk-tvguide
-		# Enable Schedules Direct JSON
-		usex zz-sdjson
-		# Enable Schedules Direct JSON (SQLite version)
-		echo "no" # TODO
-		# Enable GUI checking.
-		usex tv-check
-		# Enable combiner
-		usex tv-combiner
-		# Enable CGI support
-		usex tv-pick-cgi
-	}
-
-	pm_echovar=`make_config`
-	perl-module_src_configure
-}
-
-src_install() {
-	# actually make test should be unneeded, but if non na grabbers
-	# start to not install remove comment below
-	#make test
-	#make
-
-	# to bypass build issue
-	#make DESTDIR=${D} install || die "error installing"
-
-	perl-module_src_install
-
-	local i
-	for i in $(grep -rl "${D}" "${D}"); do
-		sed -e "s:${D}::g" -i "${i}" || die
-	done
-
-	if use tv-pick-cgi; then
-		dobin choose/tv_pick/tv_pick_cgi
-	fi
-}
-
-pkg_postinst() {
-	if use tv-pick-cgi; then
-		elog "To use tv_pick_cgi, please link it from /usr/bin/tv_pick_cgi"
-		elog "to where the ScriptAlias directive is configured."
-	fi
-}
diff --git a/media-tv/xmltv/xmltv-0.6.1.ebuild b/media-tv/xmltv/xmltv-0.6.1-r1.ebuild
index ded091d096e2..b88c635fc279 100644
--- a/media-tv/xmltv/xmltv-0.6.1.ebuild
+++ b/media-tv/xmltv/xmltv-0.6.1-r1.ebuild
@@ -155,6 +155,7 @@ RDEPEND="
 		dev-perl/HTTP-Message
 		dev-perl/LWP-Protocol-https
 		dev-perl/Try-Tiny
+		dev-perl/XML-LibXML
 	)
 	zz-sdjson-sqlite? (
 		dev-lang/perl
@@ -169,6 +170,7 @@ RDEPEND="
 		dev-perl/File-Which
 		dev-perl/List-MoreUtils
 		dev-perl/LWP-UserAgent-Determined
+		dev-perl/XML-LibXML
 	)
 	tv-check? (
 		dev-perl/Tk