gentoo Easter resync : 12.04.2020

5 files changed, 73 insertions, 423 deletions

diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 89b6b0c49ff9..c1f74146ac3e 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -4,6 +4,7 @@ AUX mythbackend.init-r2 2050 BLAKE2B d3646ebdb703d094c6340226907739f7b84d1fb48b3
 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-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
@@ -13,7 +14,6 @@ AUX mythtv.logrotate.d-r4 235 BLAKE2B 4f6df360f5191aaf4a2b55bd3edc7bc4aab92c46db
 AUX xinitrc-r1 234 BLAKE2B 0227ea065f1c43e1b2f1583bcbc798db76e9a08d345bbd8ed8837a6ba424b187c814e3ff0d7690d2d9f7a7617f4fbcce20df926e43bc6e89aec3e352aab6de8f SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188
 DIST mythtv-29.1-r1.tar.gz 105657217 BLAKE2B 9d42464b0c75c2d3a359b528e3f7917cfb281f48451167afc6517caa9702da44fce2d48566fd902ec08af35117232113b4d499e2c9a3cf2ad2634d91cf532ca7 SHA512 0eadc37661d9fa93a63c0f425cd43d43533889b0afcea1478b2645e083ba6c96eebf2eec088db1ed6f0a0727c03b7c90c0c18b83c194d630dda3bac45bca5d87
 DIST mythtv-30.0_p20190808.tar.gz 101208060 BLAKE2B af8966dd6353fc514c9a95083f28e8b7b19f16e1bd5a4f7590a946c306bf16a09f0028c76da975e423136834f8f06d7f2a570b43957ef4ae5e42ee241b579f0a SHA512 c02371c0b2162556e40a560a0fd9cb121f46f2ccedbc2ca74cd03aa9caf2b7ea4bbaa09ae6320eb782f932190f449e7fdd274a6d6ba9676e5fd9b7f5432632a2
-EBUILD mythtv-29.1-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
+EBUILD mythtv-29.1-r3.ebuild 10395 BLAKE2B 50804881b0d890cb0a71d294abf98ed2a551a1989662e7a09d59fe543227da5c40c654eb126cbbedede97039fd0a4aca0c5d8b4d7774f89f914ccc445fc06819 SHA512 deaa68fa6d738cf0892865a2efaa3dfec0ad1c91662820207fba0fee0203e28fb7e0879acd6228f570638e9cb11fdac66fca667cab5238794a82a42a9129ed87
+EBUILD mythtv-30.0_p20190808-r3.ebuild 12540 BLAKE2B 0d2af88f8f9f51803e0d0df93ab4b9dc04481021b7566dad526f390d4a9651ecd8f63c37c79e09fa34e1ca0b5dd28c38b1be9d06d9d09633c5cee9351d6985b9 SHA512 bc41bbde71a5a98fa103432a34c013f5e61714a3ddb181e005e7810123b31dce2753b981533fc51be3ab06e98918cb428a04470debfffbe519b36a6eae35599c
 MISC metadata.xml 2331 BLAKE2B 14f6ab28a064eb01b307221ae545f43d43068bf892aadd84a8ef51c3dedde634a9cdcab834fce08704cdd35b87b6d7753b4f01cb7c804947f20298a574df7c58 SHA512 28aff33650ce9d0921574f18a254262f49bfd88c8a0b4b6d6661216f2824f78c35ecc06a06677bd357148186ae9934021dcd877122a74d4f3803285edb47dc18
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
new file mode 100644
index 000000000000..168c23379423
--- /dev/null
+++ b/media-tv/mythtv/files/mythtv-29.1-Fix_create_webbrowser_window.patch
@@ -0,0 +1,61 @@
+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/mythtv-29.1-r2.ebuild b/media-tv/mythtv/mythtv-29.1-r3.ebuild
index c386ea2be4ff..a5660a5775ad 100644
--- a/media-tv/mythtv/mythtv-29.1-r2.ebuild
+++ b/media-tv/mythtv/mythtv-29.1-r3.ebuild
@@ -155,7 +155,10 @@ to journald via the console at the notice verbosity.
 
 MYTHTV_GROUPS="video,audio,tty,uucp"
 
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.1.patch" ) # bug 691904
+PATCHES=(
+	"${FILESDIR}/${P}-exiv2-0.27.1.patch"
+	"${FILESDIR}/${P}-Fix_create_webbrowser_window.patch"
+)
 
 pkg_setup() {
 	python-single-r1_pkg_setup
@@ -285,6 +288,7 @@ src_configure() {
 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
@@ -336,7 +340,7 @@ src_install() {
 	done
 
 	# Ensure that Python scripts are executed by Python 2
-	python_fix_shebang "${ED}/usr/share/mythtv"
+	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' | \
diff --git a/media-tv/mythtv/mythtv-30.0_p20190808-r1.ebuild b/media-tv/mythtv/mythtv-30.0_p20190808-r1.ebuild
deleted file mode 100644
index c3cd77028d34..000000000000
--- a/media-tv/mythtv/mythtv-30.0_p20190808-r1.ebuild
+++ /dev/null
@@ -1,416 +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 toolchain-funcs 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 )
-"
-
-# Some of the QA tests fail -- fix in next revision
-RESTRICT="test"
-
-COMMON="
-	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:=
-		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 )
-	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:= )
-	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}
-	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
-	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.
-
-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() {
-	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))
-
-	einfo "Running ./configure ${myconf[@]} - THIS MAY TAKE A WHILE."
-	./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[@]}"
-}
-
-src_install() {
-	emake STRIP="true" INSTALL_ROOT="${D}" install
-	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
-	find "${ED}/usr/share/mythtv" -type f -name '*.py' | while read file; do
-		if [[ ! "${file##*/}" = "__init__.py" ]]; then
-			chmod a+x "${file}" || die "Failed to make python file $(basename ${file}) executable"
-		fi
-	done
-
-	# 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 -type f -name '*.pl' | \
-		while read file; do
-		chmod a+x "${file}" || die
-	done
-}
-
-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-30.0_p20190808-r2.ebuild b/media-tv/mythtv/mythtv-30.0_p20190808-r3.ebuild
index b09dc0235f97..d18a3162d6f8 100644
--- a/media-tv/mythtv/mythtv-30.0_p20190808-r2.ebuild
+++ b/media-tv/mythtv/mythtv-30.0_p20190808-r3.ebuild
@@ -146,6 +146,7 @@ PATCHES=(
 	"${FILESDIR}/${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"
 )
 
 # mythtv and mythplugins are separate builds in the github mythtv project
@@ -357,7 +358,7 @@ src_configure() {
 
 src_install() {
 	emake STRIP="true" INSTALL_ROOT="${D}" install
-	python_optimize  # does all packages by default
+	use python && python_optimize  # does all packages by default
 	dodoc AUTHORS UPGRADING README
 	readme.gentoo_create_doc
 
@@ -408,7 +409,7 @@ src_install() {
 		-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"
+	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"