gentoo resync : 25.08.2020

6 files changed, 8 insertions, 406 deletions

diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 35191c1ae9e1..9940816adb1b 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -6,7 +6,6 @@ AUX mythbackend.service-28 2689 BLAKE2B 1141975d442d5308700d05710030114cc4c42887
 AUX mythfrontend.conf 474 BLAKE2B d81e2e91bb4a8afef746268ec832129ac6b02c27d0e7414a912a04ac2edec69ca59367d24fa8d80d5f6c8d6b0f462cb022d4307070a267e970405a9cf0448d64 SHA512 8b3967f5e7d719fefe50b8868dc1b974c3f6337335e7e65799ddb331abe07df0fadb4cb619758fefeaa0c4d0d1dac6f00e0982736cab5acac993bdaced0051c2
 AUX mythfrontend.wrapper 794 BLAKE2B f4f8cf24665f75d38d932551534c14d3d93673384719cd494abc77a308bbc1c5842965c39540ff6bdfe5fed660594acd9f9e2767fba8fa7c782ba525eb287d33 SHA512 d69676d3b981c76988bbe60277f74028668c851db7db3c37a60ecc95ae18d9f77cd38511fcd3deb95d1f87bf659d7b0bcd7f1dd469801950d28f7b3f6f6947e3
 AUX mythtv-29.1-Fix_create_webbrowser_window.patch 1564 BLAKE2B aa1eeb57d2943c95a5e46a024c16fee91e6d473881a670a9ac07993d141c3d1062c769a82a616a6cb35dafe01d0fe19553c9664b211e6d14c66e7a2172210cc6 SHA512 645f4bd29d67cbb2b2e9f00a273111c9d9dbcaab42273938cecc41cf4f2088310cb3b70477192dd9b0434db02f23ca3a0ff9128defa63453317ec9005b1e0b49
-AUX mythtv-29.1-exiv2-0.27.1.patch 572 BLAKE2B 0c1cb5173d453ece343273584823c0d5b3efb4f1f8b860254131eafb973911ef521e638ae5ab39c161052e68a86a0f4152c055ae5a07a0bb9fe8a837dec7a716 SHA512 367719aa51480680bb3cbd49721d6d0782f2d0d4d13a739a8cd9c9ccffdd0d8f82c4f7f88935555d749d5af7b005b95c9e1d44bb6e23bc0e70e8bc3f9d1b5d70
 AUX mythtv-30.0_p20190808-Fix_Dereferencing_type-punned_pointer.patch 1913 BLAKE2B b5ea6ec46961ded89331b041434a5bcb861bac632475611986e1fd1db9b186392249a770f634a7a4a97847f9b36fbabd3a1edc5447068a79fcee41131908ef55 SHA512 51d66f7044e15adad7bad94dac89eaeb6bc8c42d793c57565c48061359ec4486ca754471a64bee0dc36d5da0346a462488ad24c2cb7a74b82d22acf8103a3c64
 AUX mythtv-30.0_p20190808-Fix_unitialized_variables.patch 659 BLAKE2B ff947ef9e669cb47c2e7ec9081963e855596843ca0da9e248e3ec0c2111a50dd1fd1b38f700b0c31d7281959e05219c1548ec6b631347e22583b96b083fe5715 SHA512 e92bd3b13a0ded212d10423063c228fffc24fad6401d8ee371cd766f73e23832b6cdc7e46d729362b4d1ba8ce4704cb7d4a841ad7a0560a297e7e5b8b3944aa6
 AUX mythtv-30.0_p20190808-cast_constants_to_short.patch 24201 BLAKE2B d76e519666914f6c9a510fb0aec493e361e857f51e56bd7d120657f350b0bf5da329a89eb58c9789f8f030c6d08bfe0171750690b76d8c2add807942aa686d59 SHA512 c2724ad248222ac4190412cf68e54ee0b265fdde128996e68a2e178e6debe0180c23f9c7d1878466f9a5689fab8172370c6b31c90aa9a096fb5919ec6e8960fe
@@ -15,11 +14,9 @@ AUX mythtv-31.0-Include_QPainterPath.patch 404 BLAKE2B 226a49e58457d8a23cd0cb45a
 AUX mythtv-31.0-Remove_ldconfig.patch 399 BLAKE2B 26b480b30ccb779523a06fc81ec6535a3f2a5c7660d86d6a31ab64975b83339ea9c175fdcffdf96942315c30f6bf3b33bb348e5bba4695d1805810f046e629ed SHA512 7460f8e5a4981b16f07c4be6b227da62c3106fa7da499a12348309538a57f6d271998de75503941d91afadefbc975c3870195123c5a9856ce779360a9636f1a4
 AUX mythtv.logrotate.d-r4 235 BLAKE2B 4f6df360f5191aaf4a2b55bd3edc7bc4aab92c46dbd7b7bc1295371b7ef451056f902d92e3209654463850d2cbca579c60d25c1f9065ac80ce3e57fa1fe8e661 SHA512 8dd8936599acabfa55ad7efb870de431e03cb86c3c96156c2c0eee6675962dcc527391260f2ba66e3d54c1d41373001ef25c9d2421e83940c686d14b5f29fff7
 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
 DIST mythtv-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56e95a86627473d52613e62f0acf3bd0c4bb37afb340ab874c222899f9d3c219ded470785d27960db9b39d784ceb SHA512 d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e
-EBUILD mythtv-29.1-r3.ebuild 10442 BLAKE2B 85bda826b17e104b4a58e44f60dc8c45fe0c9cac1c5f6944b855d83e3a1d8bc2df6d2404c2e44b355a023100f86ab3ef82f8405bef3f7547a9d093df380a6004 SHA512 8f5fccb7b5972062f8f17ccc5f391d5e19a476434407849894a6ea32a8aa8cad4cb72ba587bb2ac74d52d73b5663507305be768dad50a55c97eeb0ba0b85beb5
-EBUILD mythtv-30.0_p20190808-r3.ebuild 12587 BLAKE2B 4d16ebef7d79df51902481f36bd8619b3546a9283e2884d5329e6b8040cdabf116ec67b3e0244b3926e1405b2febdeaba08e39cc91486ae8d64074f2c8666d9a SHA512 45517e413a34a3ee248c95e08e235198912e6789c622f9e9f6d6c8ba49a99ace1a2d4292fee9d2faa0554b724364b81a011b63d609eedc68836023baae9585b7
+EBUILD mythtv-30.0_p20190808-r3.ebuild 12593 BLAKE2B 4b147dc08cb1b1113536e6c95d3e07f683f7d3e750b3e9871d60ff8b784306573d6c7e1e226ac52d0b0f984ad90e400e1051973f5b73f5ac66ebb8fa6c5f2e6a SHA512 11b498e4664204ccbd15210cdb7a5790930111bfee2ca54cd2457380b3a041c55706d9ee67fd6f8d8297e8a2fc729291e952326302e4e74d58451ed410e43557
 EBUILD mythtv-31.0-r1.ebuild 12345 BLAKE2B cb5a9fbf31781d2d024ff1ef83136da8105b5bb6216b4deab3271195ec9cbc909eb6d252042998164751523430d34ef3e8cdc79b3c90812117712d631abe1b3c SHA512 3dca774f047b5ac1b8f095316fa90429002fec668abe7f67d89cb7a92688efe60725c73e306b8ad257942fb775ceb34e44557e2c0093628f4767b2aae9712b79
-EBUILD mythtv-31.0.ebuild 12341 BLAKE2B 62be6f93ca622f9061abf11a43e8eb8f31ad37472a87c3b6671457033c743f14e4440c2ea3383afd7656a08a4e8f405ff987a8ef6bd9f311044e8fc544fc1b29 SHA512 1700da0bf4ca829c6f5828fde429aa217660e75b6f6d30e7ac6c0d573045e99b240e4d7d67da8e04c7b9d9b05be6ecd1e33dc1e722607015769026a68c660661
-MISC metadata.xml 2418 BLAKE2B 23c6fc3b63c3cec7c042e4f59c2e1f690133c146a76675607707c3c0d27292643d2495deec46590a186ed9577e6fb57f2f1f2b4576be6f3fdb246f8691edd4cd SHA512 9483d8a5fd2488caf890dca2edf8108fbdc32784be40ae913a7ac59190f0da49e3a1a728440303979034d1488e23acd1e2b4c25d143eebc3747e703ec91a86f9
+EBUILD mythtv-31.0-r2.ebuild 12454 BLAKE2B e38590cc4034291d3852f8c66b7d568784aaddf409c0dfc3b563cd75560d4ab5fc5a7ed1518250db1d1db1558287e926c6ddcdf8f0118add15d3f998259d6e28 SHA512 754b6adf5d2f5e9671c9b738e6a379e41a0b389d471296f5e0ed7181201b16584fa6ac4ddcb6a2e3160d03da56cbb1dd9fbedf8d23091a74c4566de31604afb9
+MISC metadata.xml 2285 BLAKE2B cbc924af3ac54973580a7ab7f73669d24da3b1da9edfc8717fb1996ee59193337b1490a909ef0ab8ef400e323120dedab938d79564b306d196c167ca22a9476c SHA512 8bd3b71213ebf3bced2aa83cc85d3117e200138b64217eb40d8c73c84290c00c0fca7f6b18801fbc7a07f9d55234dfd01da33a47b2ea5b561329200260284983
diff --git a/media-tv/mythtv/files/mythtv-29.1-exiv2-0.27.1.patch b/media-tv/mythtv/files/mythtv-29.1-exiv2-0.27.1.patch
deleted file mode 100644
index afdf423355ed..000000000000
--- a/media-tv/mythtv/files/mythtv-29.1-exiv2-0.27.1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Fix build with exiv2-0.27.1
-Thanks-to: Amel Hodzic <ilmostro7@gmail.com>
-
---- a/libs/libmythmetadata/imagemetadata.cpp
-+++ b/libs/libmythmetadata/imagemetadata.cpp
-@@ -7,14 +7,7 @@ 
- #include "exitcodes.h"        // for ffprobe
- 
- // libexiv2 for Exif metadata
--//#include <exiv2/exiv2.hpp>
--// Note: Older versions of Exiv2 don't have the exiv2.hpp include
--// file.  Using image.hpp instead seems to work.
--#ifdef _MSC_VER
--#include <exiv2/src/image.hpp>
--#else
--#include <exiv2/image.hpp>
--#endif
-+#include <exiv2/exiv2.hpp>
- 
- // To read FFMPEG Metadata
- extern "C" {
diff --git a/media-tv/mythtv/metadata.xml b/media-tv/mythtv/metadata.xml
index bdf4a7d2994d..73a0226c88a5 100644
--- a/media-tv/mythtv/metadata.xml
+++ b/media-tv/mythtv/metadata.xml
@@ -21,14 +21,12 @@
 		<flag name="fftw">Support visualizations via <pkg>sci-libs/fftw</pkg></flag>
 		<flag name="hdhomerun">Silicondust USA Inc.network-attached tuner support</flag>
 		<flag name="hdpvr">Hauppauge HD-PVR?</flag>
-		<flag name="hls">HTTP Live Streaming support</flag>
 		<flag name="ieee1394">Firewire enabled Cable boxe support</flag>
 		<flag name="ivtv">Support kernel driver for the iTVC15 family of MPEG codecs</flag>
 		<flag name="jack">Allows MythTV to use JACK as your sound output device</flag>
 		<flag name="java">BD-J support for Blu-ray discs</flag>
 		<flag name="lcd">Enable use of <pkg>app-misc/lcdproc</pkg> data display</flag>
 		<flag name="lirc">LIRC remote control device support</flag>
-		<flag name="mythlogserver">Enable support for syslog and file logging</flag>
 		<flag name="nvdec">Enable NVDEC (NVCUVID) hardware accelerated video decoding</flag>
 		<flag name="perl">Build the perl bindings for MythTV</flag>
 		<flag name="vbox">V@Box Communications network-attached tuner devices support</flag>
diff --git a/media-tv/mythtv/mythtv-29.1-r3.ebuild b/media-tv/mythtv/mythtv-29.1-r3.ebuild
deleted file mode 100644
index 36d423879a12..000000000000
--- a/media-tv/mythtv/mythtv-29.1-r3.ebuild
+++ /dev/null
@@ -1,374 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-# git diff --relative=mythtv v0.27.6.. > ~/mythtv-0.27.6/patches/mythtv.patch
-BACKPORTS="d8a2db77f5731cf32c6d31127452391c6cf7f91f"
-MY_P=${P%_p*}
-MY_PV=${PV%_p*}
-
-inherit flag-o-matic python-single-r1 qmake-utils user-info readme.gentoo-r1 systemd toolchain-funcs vcs-snapshot
-
-MYTHTV_BRANCH="fixes/29"
-
-DESCRIPTION="Homebrew PVR project"
-HOMEPAGE="https://www.mythtv.org"
-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 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}
-	bluray? ( xml )
-	theora? ( vorbis )
-"
-
-COMMON="
-	acct-user/mythtv
-	dev-libs/glib:2
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtscript:5
-	dev-qt/qtsql:5[mysql]
-	dev-qt/qtopengl:5
-	dev-qt/qtwebkit:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	media-gfx/exiv2:=
-	media-libs/freetype:2
-	media-libs/taglib
-	>=media-sound/lame-3.93.1
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXinerama
-	x11-libs/libXv
-	x11-libs/libXrandr
-	x11-libs/libXxf86vm
-	x11-misc/wmctrl
-	alsa? ( >=media-libs/alsa-lib-1.0.24 )
-	bluray? (
-		dev-libs/libcdio:=
-		media-libs/libbluray:=
-		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= )
-	hls? (
-		<media-libs/libvpx-1.8.0:=
-		>=media-libs/x264-0.0.20111220:=
-	)
-	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 )
-	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 )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/lxml
-		dev-python/mysql-python
-		dev-python/urlgrabber
-		dev-python/future
-		dev-python/requests-cache
-	)
-	systemd? ( sys-apps/systemd:= )
-	theora? ( media-libs/libtheora media-libs/libogg )
-	vaapi? ( x11-libs/libva:=[opengl] )
-	vdpau? ( x11-libs/libvdpau )
-	vorbis? ( >=media-libs/libvorbis-1.0 media-libs/libogg )
-	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}
-	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}
-	dev-lang/yasm
-	virtual/pkgconfig
-	x11-base/xorg-proto
-"
-
-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
-
-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.
-"
-
-MYTHTV_GROUPS="video,audio,tty,uucp"
-
-PATCHES=(
-	"${FILESDIR}/${P}-exiv2-0.27.1.patch"
-	"${FILESDIR}/${P}-Fix_create_webbrowser_window.patch"
-	"${FILESDIR}/${P}-Include_QPainterPath.patch"
-)
-
-pkg_setup() {
-	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
-
-	# 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 myconf=
-
-	# Setup paths
-	myconf="${myconf} --prefix=${EPREFIX}/usr"
-	myconf="${myconf} --libdir=${EPREFIX}/usr/$(get_libdir)"
-	myconf="${myconf} --libdir-name=$(get_libdir)"
-	myconf="${myconf} --mandir=${EPREFIX}/usr/share/man"
-
-	# Audio
-	myconf="${myconf} $(use_enable alsa audio-alsa)"
-	myconf="${myconf} $(use_enable jack audio-jack)"
-	use pulseaudio || myconf="${myconf} --disable-audio-pulseoutput"
-
-	use altivec    || myconf="${myconf} --disable-altivec"
-	myconf="${myconf} $(use_enable dvb)"
-	myconf="${myconf} $(use_enable ieee1394 firewire)"
-	myconf="${myconf} $(use_enable lirc)"
-	myconf="${myconf} $(use_enable xvid libxvid)"
-	myconf="${myconf} --dvb-path=/usr/include"
-	myconf="${myconf} --enable-xrandr"
-	myconf="${myconf} --enable-xv"
-	myconf="${myconf} --enable-x11"
-	myconf="${myconf} --enable-nonfree"
-	myconf="${myconf} --enable-libmp3lame" # lame is not optional it is required for some broadcasts for silence detection of commercials
-	use cec || myconf="${myconf} --disable-libcec"
-	use zeroconf || myconf="${myconf} --disable-libdns-sd"
-	myconf="${myconf} $(use_enable theora libtheora)"
-	myconf="${myconf} $(use_enable vorbis libvorbis)"
-
-	if use hls; then
-		myconf="${myconf} --enable-libx264"
-		myconf="${myconf} --enable-libvpx"
-	fi
-
-	myconf="${myconf} $(use_enable libass)"
-
-	if use perl && use python; then
-		myconf="${myconf} --with-bindings=perl,python"
-	elif use perl; then
-		myconf="${myconf} --without-bindings=python"
-		myconf="${myconf} --with-bindings=perl"
-	elif use python; then
-		myconf="${myconf} --without-bindings=perl"
-		myconf="${myconf} --with-bindings=python"
-	else
-		myconf="${myconf} --without-bindings=perl,python"
-	fi
-
-	use python && myconf="${myconf} --python=${EPYTHON}"
-
-	if use debug; then
-		myconf="${myconf} --compile-type=debug"
-	else
-		myconf="${myconf} --compile-type=release"
-		#myconf="${myconf} --enable-debug" does nothing per sphery
-		myconf="${myconf} --disable-stripping" # FIXME: does not disable for all files, only for some
-	fi
-
-	# Video
-	myconf="${myconf} $(use_enable vdpau)"
-	myconf="${myconf} $(use_enable vaapi)"
-
-	# Input
-	use input_devices_joystick || myconf="${myconf} --disable-joystick-menu"
-
-	# Clean up DSO load times and other compiler bits
-	myconf="${myconf} --enable-symbol-visibility"
-	myconf="${myconf} --enable-pic"
-
-	# CPU settings
-	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
-		[ "${i}" = "native" ] && i="host"
-		myconf="${myconf} --cpu=${i}"
-		break
-	done
-
-	if tc-is-cross-compiler ; then
-		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel)"
-		myconf="${myconf} --cross-prefix=${CHOST}-"
-	fi
-
-	# Build boosters
-	has distcc ${FEATURES} || myconf="${myconf} --disable-distcc"
-	has ccache ${FEATURES} || myconf="${myconf} --disable-ccache"
-
-	myconf="${myconf} $(use_enable systemd systemd_notify)"
-	myconf="${myconf} $(use_enable systemd systemd_journal)"
-	use systemd || myconf="${myconf} $(use_enable mythlogserver)"
-
-	chmod +x ./external/FFmpeg/version.sh
-
-	einfo "Running ./configure ${myconf}"
-	./configure \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--extra-cflags="${CFLAGS}" \
-		--extra-cxxflags="${CXXFLAGS}" \
-		--extra-ldflags="${LDFLAGS}" \
-		--qmake=$(qt5_get_bindir)/qmake \
-		${myconf} || die "configure died"
-}
-
-src_install() {
-	emake STRIP="true" INSTALL_ROOT="${D}" install
-	dodoc AUTHORS UPGRADING README
-	use python && python_optimize  # does all packages by default
-	readme.gentoo_create_doc
-
-	insinto /usr/share/mythtv/database
-	doins database/*
-
-	newinitd "${FILESDIR}"/mythbackend.init-r2 mythbackend
-	newconfd "${FILESDIR}"/mythbackend.conf-r1 mythbackend
-	systemd_newunit "${FILESDIR}"/mythbackend.service-28 mythbackend.service
-
-	dodoc keys.txt
-
-	keepdir /etc/mythtv
-	chown -R mythtv "${ED}"/etc/mythtv
-	keepdir /var/log/mythtv
-	chown -R mythtv "${ED}"/var/log/mythtv
-	dodir /var/log/mythtv/old
-
-	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"
-		newbin "${FILESDIR}"/mythfrontend.wrapper mythfrontend
-		newconfd "${FILESDIR}"/mythfrontend.conf mythfrontend
-	fi
-
-	if use autostart; then
-		dodir /etc/env.d/
-		echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
-
-		insinto /home/mythtv
-		newins "${FILESDIR}"/bash_profile .bash_profile
-		newins "${FILESDIR}"/xinitrc-r1 .xinitrc
-	fi
-
-	# Make Python files executable
-	find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
-		if [[ ! "${file##*/}" = "__init__.py" ]]; then
-			chmod a+x "${file}"
-		fi
-	done
-
-	# 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 -type f -name '*.pl' | \
-		while read file; do
-		chmod a+x "${file}"
-	done
-
-	# Remove empty dir
-	rmdir "${ED}"/var/log/mythtv/old
-}
-
-pkg_preinst() {
-	export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
-
-pkg_info() {
-	if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
-		"${EROOT}"/usr/bin/mythfrontend --version
-	fi
-}
-
-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-30.0_p20190808-r3.ebuild b/media-tv/mythtv/mythtv-30.0_p20190808-r3.ebuild
index d32bbfce0ae4..820145e65378 100644
--- a/media-tv/mythtv/mythtv-30.0_p20190808-r3.ebuild
+++ b/media-tv/mythtv/mythtv-30.0_p20190808-r3.ebuild
@@ -147,7 +147,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-Fix_Dereferencing_type-punned_pointer.patch"
 	"${FILESDIR}/${P}-Fix_unitialized_variables.patch"
 	"${FILESDIR}/${PN}-29.1-Fix_create_webbrowser_window.patch"
-	"${FILESDIR}/${P}-Include_QPainterPath.patch"
+	"${FILESDIR}/${PN}-31.0-Include_QPainterPath.patch"
 )
 
 # mythtv and mythplugins are separate builds in the github mythtv project
diff --git a/media-tv/mythtv/mythtv-31.0.ebuild b/media-tv/mythtv/mythtv-31.0-r2.ebuild
index 9d3ead365ea8..8c2640774db3 100644
--- a/media-tv/mythtv/mythtv-31.0.ebuild
+++ b/media-tv/mythtv/mythtv-31.0-r2.ebuild
@@ -137,6 +137,7 @@ DEPEND="
 			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}]
 		')
 	)
@@ -146,6 +147,7 @@ python_check_deps() {
 	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}]"
 }
 
@@ -385,11 +387,11 @@ src_install() {
 
 	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
+	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
+	if ! use python; then
 		find contrib/ -name '*.py' -exec rm {} \;
 	fi
 	doins -r contrib/*