gentoo resync : 14.12.2020

7 files changed, 4 insertions, 562 deletions

diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 4c42b387377b..9db9c0746b58 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -5,17 +5,11 @@ AUX mythbackend.init-r3 2051 BLAKE2B b7e6d008b076bb51a14b9898c45e27ec9e9a0aac54c
 AUX mythbackend.service-28 2689 BLAKE2B 1141975d442d5308700d05710030114cc4c428879eaed030b065a7dc4a0d23f839f26cba0e6b660c938e15faf9e9ac3f5b36a979226068d0989f4b044e73ccee SHA512 945cd721c7114e7c9a334063c6f85de40c2dd8a40271b1755b31881ae2c067b67d34685e1cb2d9b09fdaa9bf58ea2763e4e314b288e53f8bfcef7b6942ce5dd1
 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-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-respect_LDFLAGS.patch 334 BLAKE2B 1e0ab12773e49fb349aa0b1c243f8d740ec9783e845307ded5763cf7872e090fbe19d74506e5dbea346c099a84fa395ac4c63dc45a03d20a04372b62bb39e3c1 SHA512 90cf1d4809df7859e611502590cbb1c2bdaea23e6f0a47351042be6287e2b5030ef0645e22f722bec5a029701fd3c2227c5dfb3509a2322b56a1aef60bcb2c33
 AUX mythtv-31.0-Include_QPainterPath.patch 404 BLAKE2B 226a49e58457d8a23cd0cb45aebb3e469a1732c79f979e7f558a85eac28129c5a5f363ec15cc0784fef1db4f0f4b897ce49f934a8c6ed2ea669d2e5ef5b1908d SHA512 e0fd7a3e897a94b5077814adc951e649de0792c1f0d3d9d10e002b31dc5e11c09ed110994397e69e66419fb0f648bc8a6de4155a43cd05947605cbdcf9390f8c
 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-30.0_p20190808-cast_constants_to_short.patch 24201 BLAKE2B d76e519666914f6c9a510fb0aec493e361e857f51e56bd7d120657f350b0bf5da329a89eb58c9789f8f030c6d08bfe0171750690b76d8c2add807942aa686d59 SHA512 c2724ad248222ac4190412cf68e54ee0b265fdde128996e68a2e178e6debe0180c23f9c7d1878466f9a5689fab8172370c6b31c90aa9a096fb5919ec6e8960fe
-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-30.0_p20190808-r3.ebuild 12691 BLAKE2B 4fd603369eca68ba6fc5525faac4a0c8c61e2d2443f470881322e29fb7c066fdc8105d8379ecd9d2e64030ab11fc0c3593af70f053fef33aaa2f9d2234f79f28 SHA512 de4804b6ed4d713671d569bf7950c028f896e6064057e04198e60c756ae176cbaa8e5266831f1d026e3a1aa2a17006642a321b56577b353888f1f7777382781d
-EBUILD mythtv-31.0-r3.ebuild 12429 BLAKE2B dc865772d4db73c2378c70e179e03e99c371f0996fedd7f62e1ca0ac9bb527051ca3d0387abba599c6299c5a1c50b438b49aadcf35b52f2e355a004271f55389 SHA512 8d3df7c1daf3d561b52620328f31126420efea81bc7e384b4b28c3bca32994a59754686edeb2450b8f5ea25c64e03b3f958d3d08919504cfc1fc627973ed4893
-MISC metadata.xml 2295 BLAKE2B 8c68aa90049846e866bc16a4c0512011e110ce853fc4cf35e6b4c380face9e6cbf620aa044162dd62a337894f0408c26da56c414641ae43c166719f387fe300e SHA512 0e621c55dfb72be00eeb00b6cd033ad7be99c3383a5273f2af03904ead91220bac03faa5a4a6e2b0520dc53796485d3911e879e6202ae4abc9cbc440bb271c3c
+EBUILD mythtv-31.0-r4.ebuild 12338 BLAKE2B 7d10cf83bab8d70d380f8b7b604a56f063d6bd990023af677d2beeac038c4fcc27ece5ab9f81ed7689d68982f04760c16c3a6b3fbcf0da2ff1d5f495d08feadf SHA512 51d267ffee95622ae924a54b25aa4fec6ba1764e1169513af79df9c8937a477b295fba1c65d9cf0fa47c13f005ba724c585080ad4e043dea72170e59b0c7e5ce
+MISC metadata.xml 2208 BLAKE2B ce791c95b02ccd293b326fa9463f35f3f6d48c53e7d44d2defbd8974e3d17795d2358b9258c5e7ddd2472dceb11b6ce3a991162694918086b3dea6f0d33be629 SHA512 86ae2e427699c268fd885ff16fec16912da42fe28556dcb8dd131af40e332f37b7b0d21bd3e6ec960aa4aaaf7660b8ca95ea132ea6c8a36c925d842283468846
diff --git a/media-tv/mythtv/files/mythtv-29.1-Fix_create_webbrowser_window.patch b/media-tv/mythtv/files/mythtv-29.1-Fix_create_webbrowser_window.patch
deleted file mode 100644
index 168c23379423..000000000000
--- a/media-tv/mythtv/files/mythtv-29.1-Fix_create_webbrowser_window.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Index: mythtv/libs/libmythui/mythuiwebbrowser.cpp
-Mythtv bug #13544 
-===================================================================
---- a/libs/libmythui/mythuiwebbrowser.cpp
-+++ b/libs/libmythui/mythuiwebbrowser.cpp
-@@ -873,4 +873,8 @@
- void MythUIWebBrowser::Init(void)
- {
-+    // only do the initialisation for widgets not being stored in the global object store
-+    if (parent() == GetGlobalObjectStore())
-+        return;
-+
-     if (m_initialized)
-         return;
-@@ -1128,4 +1132,7 @@
- void MythUIWebBrowser::SetActive(bool active)
- {
-+    if (!m_browser)
-+        return;
-+
-     if (m_active == active)
-         return;
-@@ -1326,4 +1333,7 @@
- void MythUIWebBrowser::Scroll(int dx, int dy)
- {
-+    if (!m_browser)
-+        return;
-+
-     QPoint startPos = m_browser->page()->currentFrame()->scrollPosition();
-     QPoint endPos = startPos + QPoint(dx, dy);
-@@ -1435,4 +1445,7 @@
- void MythUIWebBrowser::UpdateScrollBars(void)
- {
-+    if (!m_browser)
-+        return;
-+
-     QPoint position = m_browser->page()->currentFrame()->scrollPosition();
-     if (m_verticalScrollbar)
-@@ -1461,5 +1474,5 @@
-     UpdateScrollBars();
- 
--    if (!m_image)
-+    if (!m_image || !m_browser)
-         return;
- 
-@@ -1480,4 +1493,7 @@
- void MythUIWebBrowser::Pulse(void)
- {
-+    if (!m_browser)
-+        return;
-+
-     if (m_scrollAnimation.IsActive() &&
-         m_destinationScrollPos !=
-@@ -1522,4 +1538,7 @@
- bool MythUIWebBrowser::keyPressEvent(QKeyEvent *event)
- {
-+    if (!m_browser)
-+        return false;
-+
-     QStringList actions;
-     bool handled = false;
diff --git a/media-tv/mythtv/files/mythtv-30.0_p20190808-Fix_Dereferencing_type-punned_pointer.patch b/media-tv/mythtv/files/mythtv-30.0_p20190808-Fix_Dereferencing_type-punned_pointer.patch
deleted file mode 100644
index bc0751c887c3..000000000000
--- a/media-tv/mythtv/files/mythtv-30.0_p20190808-Fix_Dereferencing_type-punned_pointer.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/libs/libmythfreemheg/Programs.cpp
-+++ b/libs/libmythfreemheg/Programs.cpp
-@@ -232,7 +232,10 @@ void MHResidentProgram::CallProgram(bool fIsFork, const MHObjectRef &success, co
-                 for (int i = 0; i < format.Size(); i++)
-                 {
-                     unsigned char ch = format.GetAt(i);
--                    char buffer[5]; // Largest text is 4 chars for a year + null terminator
-+		    // Largest text is 4 chars for a year + null terminator
-+		    // But... adding a constant to the value might be 5 chars + null terminator
-+		    // Using 6 gets rid of compiler warning
-+                    char buffer[6];
- 
-                     if (ch == '%')
-                     {
-@@ -249,16 +252,16 @@ void MHResidentProgram::CallProgram(bool fIsFork, const MHObjectRef &success, co
-                         switch (ch)
-                         {
-                             case 'Y':
--                                sprintf(buffer, "%04d", timeStr->tm_year + 1900);
-+                                sprintf(buffer, "%04d", (unsigned short)(timeStr->tm_year + 1900));
-                                 break;
-                             case 'y':
-                                 sprintf(buffer, "%02d", timeStr->tm_year % 100);
-                                 break;
-                             case 'X':
--                                sprintf(buffer, "%02d", timeStr->tm_mon + 1);
-+                                sprintf(buffer, "%02d", (unsigned short)(timeStr->tm_mon + 1));
-                                 break;
-                             case 'x':
--                                sprintf(buffer, "%1d", timeStr->tm_mon + 1);
-+                                sprintf(buffer, "%1d", (unsigned short)(timeStr->tm_mon + 1));
-                                 break;
-                             case 'D':
-                                 sprintf(buffer, "%02d", timeStr->tm_mday);
diff --git a/media-tv/mythtv/files/mythtv-30.0_p20190808-Fix_unitialized_variables.patch b/media-tv/mythtv/files/mythtv-30.0_p20190808-Fix_unitialized_variables.patch
deleted file mode 100644
index db296242515c..000000000000
--- a/media-tv/mythtv/files/mythtv-30.0_p20190808-Fix_unitialized_variables.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/libs/libmythtv/eitfixup.cpp
-+++ b/libs/libmythtv/eitfixup.cpp
-@@ -842,7 +842,7 @@ void EITFixUp::SetUKSubtitle(DBEventEIT &event) const
- void EITFixUp::FixUK(DBEventEIT &event) const
- {
-     int position1;
--    int position2;
-+    int position2 = 0;
-     QString strFull;
- 
-     bool isMovie = event.m_category.startsWith("Movie",Qt::CaseInsensitive) ||
---- a/libs/libmythui/mythuitext.cpp
-+++ b/libs/libmythui/mythuitext.cpp
-@@ -1058,7 +1058,7 @@ int MythUIText::MoveCursor(int lines)
-     int lineCount = 0;
-     int currPos = 0;
-     int layoutStartPos = 0;
--    int xPos;
-+    int xPos = 0;
- 
-     for (int x = 0; x < m_Layouts.count(); x++)
-     {
diff --git a/media-tv/mythtv/metadata.xml b/media-tv/mythtv/metadata.xml
index 24e993307ee8..0de2e5e50fa6 100644
--- a/media-tv/mythtv/metadata.xml
+++ b/media-tv/mythtv/metadata.xml
@@ -34,7 +34,6 @@
 		<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-30.0_p20190808-r3.ebuild b/media-tv/mythtv/mythtv-30.0_p20190808-r3.ebuild
deleted file mode 100644
index 4809398bba76..000000000000
--- a/media-tv/mythtv/mythtv-30.0_p20190808-r3.ebuild
+++ /dev/null
@@ -1,432 +0,0 @@
-# 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
-	https://dev.gentoo.org/~juippis/distfiles/tmp/mythtv-30.0_p20190808-cast_constants_to_short.patch"
-
-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"
-	"${DISTDIR}/${P}-cast_constants_to_short.patch"
-	"${FILESDIR}/${P}-Fix_Dereferencing_type-punned_pointer.patch"
-	"${FILESDIR}/${P}-Fix_unitialized_variables.patch"
-	"${FILESDIR}/${PN}-29.1-Fix_create_webbrowser_window.patch"
-	"${FILESDIR}/${PN}-31.0-Include_QPainterPath.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
-	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-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
-	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-r3.ebuild b/media-tv/mythtv/mythtv-31.0-r4.ebuild
index b45f36f1ae77..1a3a406636bb 100644
--- a/media-tv/mythtv/mythtv-31.0-r3.ebuild
+++ b/media-tv/mythtv/mythtv-31.0-r4.ebuild
@@ -105,7 +105,6 @@ RDEPEND="
 	xml? ( dev-libs/libxml2:2 )
 	xmltv? (
 		dev-perl/XML-LibXML
-		dev-qt/qtwebkit:5
 		media-tv/xmltv
 	 )
 	xvid? ( media-libs/xvid )
@@ -162,6 +161,8 @@ S="${WORKDIR}/${P}/mythtv"
 
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="
+Suppport for Python 2.7 has been 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.
@@ -200,9 +201,6 @@ 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() {