gentoo Easter resync : 12.04.2020

19 files changed, 660 insertions, 435 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 9d9705d6079c..7845e4fefa7e 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index dbda9e51e853..fe9f1d816967 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -5,11 +5,13 @@ DIST ffmpeg-kodi-4.2.2-Matrix-Alpha1.tar.gz 13066195 BLAKE2B 7db50ea93358bb90ac0
 DIST kodi-18.3.tar.gz 51013397 BLAKE2B cce29d481397dddd3c942f83a034bc6d73eafc1be2a50436e1e5611ccf04c27e6110c4b4f99f7f7d1cf8da3e2550209c8bee3db6e98136b8fa9738c4b1fc7e43 SHA512 4e898e28238dcbc67e106c5a0ef88bd6a82f8c0ad00e77e3ddbe2da6181b37d9ca1ba6bda57206223cfa119c5291edb4410d3e773d97b5ab67660e49929437ec
 DIST kodi-18.4.tar.gz 51027569 BLAKE2B 47e3377abb4a1e5a3c26b1519f45ab9347127467594841ac689b857a3f4163731951d4e1e4960bce5c2af4fa224acf4a3887f42bdc41a603bba4979d3bcbcda8 SHA512 ae08fc29d20387d9352dc1ae4a89da19962a279b89705ff8f7869377281589d44a685cebaa8509d3252ae79215dcdaadb72e9fa752e6d2bce59974bc23276aad
 DIST kodi-18.5.tar.gz 51025415 BLAKE2B c439790a85466d50875cd63ccdc6fee1b16c5ee67d9a3371b1a006292f642e59c6321cb63f698e1a43bc7be45209dbf993028b1184722f7b51dbe6fef6a292ba SHA512 6fe70d8ee5b6ffd3d43b89487554e41eed8dbf95bb017b82578b547ec248ae94f4dda298f0d85c5896019f7032eba4e1e2494c8140dde9c9b9cb21802acfd029
+DIST kodi-18.6.tar.gz 51031022 BLAKE2B bc82ad8bcce8f0881a5a98fa0fd56de18413d0043dcbae9dafe25ae45e533ef02d7a95a460cba8efd899fe8c2ffa62fa228aa788e23196269efc57faff13a134 SHA512 9dffb052e0adf7c838ace178dd1e0e7b5fb02f01d43f90e22aa7d225bc67496586daab9bed2d20c1aaca34d4e69a9973fec5065f5076def2eb32da630d9cb67d
 DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
 DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
 DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
 EBUILD kodi-18.3-r1.ebuild 9637 BLAKE2B f664ff7359fca7b8d9aa4cb02e21d83835ae9de281d0a6540dfe9f6d203fdc263465274e9440cf1919dd64eff769b41a9d44db5aaddb34f9f33dffe5c0a9ca43 SHA512 81a975e03150e5da65928d2730299649fe94ef5538f4577cfeb26eee39cd888b7fec2b5fc4d9d8b814ff8e74c619f4ef00d840a05dd279547524f1743ed19d89
 EBUILD kodi-18.4-r1.ebuild 9521 BLAKE2B 312c594e5dd8c851af3a21e8b373892aed11aab8a2f29ec7442b46439242fe7f9fb04be8ab1460e8752e15258174d1c5ff66fee07cd041a2c65bdc95e0a65e83 SHA512 364ced13e0db628cf535c99137bbad2b5f6cb6f071bb1781e96314b365625cec3936213bae1827fbe6f926ecb2565a32e356b58b3951b10794920d2f9df4aecd
 EBUILD kodi-18.5-r2.ebuild 9492 BLAKE2B 022c819338e0cf341f84e62d2b72381a71a41c2088b27eea9e21a598aaaec2e778df11c19a22448da4bb035611fc5e549d321c08cd76c3e234b4aa343d545739 SHA512 dca47435172ec06cb6ee9514d684559f67f6532c9c037e5b57f374ce3c5d36420c95ed441e914fe5ba35cbb0e6d3581f2797297328758be4d752261a806d501a
-EBUILD kodi-9999.ebuild 8938 BLAKE2B 2e0f529a28d220be3871c67052e56cf2bad77337540404edebae85621c037f2401d6a0bfe36341d350fcfe7a54480bdce8f932afde67b7e7534c1880a131e54b SHA512 b9362ce05a4b31ac5959352e8c2f36511f4f979f16f15dd896ebb3546c7ba9ad10f9c17446907c7475f75972d5cfbe514c647a6b55045809faecdaba1f9a5a35
+EBUILD kodi-18.6.ebuild 9498 BLAKE2B 2a314aa8ea6034457824dcc3b47dacfb4b31b36abacd3d3837d009cbdcbab8fa336b4a7b0600f88f40be494c382e4fa584dedd1df8171806ff58390c11f839f3 SHA512 ac1f0bac4b001b4be1b2bcf7eec39179c424f36d7fbb8ba02b17343cc94b0e553c0402c9369994fb1e0395797fe1573e24f88f3c55009b2e0348b3a1e976fc7f
+EBUILD kodi-9999.ebuild 8946 BLAKE2B e7b132aec715483341eed1bf9ff972d8d6df8d63416a210a037ff6c03db3d835d9ae60421263bfb199f42b5e428a7aa40dda79aa6d97a8138447a4acae8b9af4 SHA512 60d7e0a7a79767669928f1b8715ec6dfd616233500816dd1c5a5b143ccdd217830c7157f4879bfcf499efb8d84f9ca2c74742688ec91f33df967590da3e91dbb
 MISC metadata.xml 1720 BLAKE2B 3158b87065286649496de2edf821c37042cafe7e729f7ba31c571ade72cf8f9fbce218485ac721ad896fa5ef751becfd2f3b4ce1645e97b4db673ec879884834 SHA512 f8d52358276ad8c2eb23632451f025ac45f799fa392bd59fcfd4417d9e9e76cf9ce066ac50cd8ee563319d7f2248b28c45fee3059a4e069ebb862e41d230b1da
diff --git a/media-tv/kodi/kodi-18.6.ebuild b/media-tv/kodi/kodi-18.6.ebuild
new file mode 100644
index 000000000000..415eac36df3a
--- /dev/null
+++ b/media-tv/kodi/kodi-18.6.ebuild
@@ -0,0 +1,320 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="libressl?,sqlite,ssl"
+LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
+LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
+LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
+FFMPEG_VERSION="4.0.4"
+CODENAME="Leia"
+FFMPEG_KODI_VERSION="18.4"
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
+	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
+	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
+	!system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+PATCHES=(
+	"${FILESDIR}/${PN}-18.5-cassert.patch"
+)
+
+if [[ ${PV} == *9999 ]] ; then
+	PYTHON_COMPAT=( python2_7 python3_{6,7} )
+	EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+	inherit git-r3
+else
+	PYTHON_COMPAT=( python2_7 )
+	MY_PV=${PV/_p/_r}
+	MY_PV=${MY_PV/_alpha/a}
+	MY_PV=${MY_PV/_beta/b}
+	MY_PV=${MY_PV/_rc/rc}
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+fi
+
+inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
+
+DESCRIPTION="A free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+# use flag is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( gles opengl )
+	^^ ( gbm raspberry-pi wayland X )
+	?? ( mariadb mysql )
+	udev? ( !libusb )
+	udisks? ( dbus )
+	upower? ( dbus )
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	airplay? (
+		>=app-pda/libplist-2.0.0
+		net-libs/shairplay
+	)
+	alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
+	bluetooth? ( net-wireless/bluez )
+	bluray? ( >=media-libs/libbluray-1.0.2 )
+	caps? ( sys-libs/libcap )
+	dbus? ( sys-apps/dbus )
+	dev-db/sqlite
+	dev-libs/expat
+	dev-libs/flatbuffers
+	>=dev-libs/fribidi-0.19.7
+	cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
+	dev-libs/libpcre[cxx]
+	>=dev-libs/libinput-1.10.5
+	>=dev-libs/libxml2-2.9.4
+	>=dev-libs/lzo-2.04
+	dev-libs/tinyxml[stl]
+	$(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
+	>=dev-libs/libcdio-0.94
+	>=dev-libs/libfmt-3.0.1
+	dev-libs/libfstrcmp
+	gbm? (	media-libs/mesa[gbm] )
+	gles? (
+		!raspberry-pi? ( media-libs/mesa[gles2] )
+	)
+	lcms? ( media-libs/lcms:2 )
+	libusb? ( virtual/libusb:1 )
+	virtual/ttf-fonts
+	media-fonts/roboto
+	>=media-libs/fontconfig-2.12.4
+	>=media-libs/freetype-2.8
+	>=media-libs/libass-0.13.4
+	!raspberry-pi? ( media-libs/mesa[egl,X(+)] )
+	>=media-libs/taglib-1.11.1
+	system-ffmpeg? (
+		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]
+		libressl? ( media-video/ffmpeg[libressl,-openssl] )
+		!libressl? ( media-video/ffmpeg[-libressl,openssl] )
+	)
+	mysql? ( dev-db/mysql-connector-c:= )
+	mariadb? ( dev-db/mariadb-connector-c:= )
+	>=net-misc/curl-7.56.1[http2]
+	nfs? ( >=net-fs/libnfs-2.0.0:= )
+	opengl? ( media-libs/glu )
+	!libressl? ( >=dev-libs/openssl-1.0.2l:0= )
+	libressl? ( dev-libs/libressl:0= )
+	raspberry-pi? (
+		|| ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] )
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+	>=sys-libs/zlib-1.2.11
+	udev? ( virtual/udev )
+	vaapi? (
+		x11-libs/libva:=
+		opengl? ( x11-libs/libva[opengl] )
+		system-ffmpeg? ( media-video/ffmpeg[vaapi] )
+		vdpau? ( x11-libs/libva[vdpau] )
+		wayland? ( x11-libs/libva[wayland] )
+		X? ( x11-libs/libva[X] )
+	)
+	virtual/libiconv
+	vdpau? (
+		|| ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+		system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+	)
+	wayland? (
+		>=dev-cpp/waylandpp-0.2.3:=
+		media-libs/mesa[wayland]
+		>=dev-libs/wayland-protocols-1.7
+	)
+	webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		system-ffmpeg? ( media-video/ffmpeg[X] )
+	)
+	x11-libs/libdrm
+	>=x11-libs/libxkbcommon-0.4.1
+	xslt? ( dev-libs/libxslt )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+	lirc? ( app-misc/lirc )
+	!media-tv/xbmc
+	udisks? ( sys-fs/udisks:2 )
+	upower? ( sys-power/upower )
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/bzip2
+	app-arch/xz-utils
+	dev-lang/swig
+	dev-libs/crossguid
+	dev-libs/rapidjson
+	dev-util/cmake
+	dev-util/gperf
+	media-libs/giflib
+	>=media-libs/libjpeg-turbo-1.5.1:=
+	>=media-libs/libpng-1.6.26:0=
+	test? ( dev-cpp/gtest )
+	virtual/pkgconfig
+	virtual/jre
+	x86? ( dev-lang/nasm )
+"
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+pkg_setup() {
+	check_extra_config
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]] ; then
+		if python_is_python3; then
+			EGIT_BRANCH="feature_python3"
+			ewarn "Using the experimental Python 3 branch!"
+			ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
+			ewarn "To use the non-experimental Python 2 version:"
+			ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
+			ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
+		fi
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/platform/linux/*.cpp || die
+
+	# Prepare tools and libs witch are configured with autotools during compile time
+	AUTOTOOLS_DIRS=(
+		"${S}"/lib/cpluff
+		"${S}"/tools/depends/native/TexturePacker/src
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src
+	)
+
+	local d
+	for d in "${AUTOTOOLS_DIRS[@]}" ; do
+		pushd ${d} >/dev/null || die
+		AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+		popd >/dev/null || die
+	done
+	elibtoolize
+
+	# Prevent autoreconf rerun
+	sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+		"${S}"/cmake/modules/FindCpluff.cmake \
+		"${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+		"${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+		|| die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+		-DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+		-DENABLE_ALSA=$(usex alsa)
+		-DENABLE_AIRTUNES=$(usex airplay)
+		-DENABLE_AVAHI=$(usex zeroconf)
+		-DENABLE_BLUETOOTH=$(usex bluetooth)
+		-DENABLE_BLURAY=$(usex bluray)
+		-DENABLE_CCACHE=OFF
+		-DENABLE_CEC=$(usex cec)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DVDCSS=$(usex css)
+		-DENABLE_INTERNAL_CROSSGUID=OFF
+		-DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+		-DENABLE_INTERNAL_FSTRCMP=OFF
+		-DENABLE_CAP=$(usex caps)
+		-DENABLE_LCMS2=$(usex lcms)
+		-DENABLE_LIRCCLIENT=$(usex lirc)
+		-DENABLE_MARIADBCLIENT=$(usex mariadb)
+		-DENABLE_MICROHTTPD=$(usex webserver)
+		-DENABLE_MYSQLCLIENT=$(usex mysql)
+		-DENABLE_NFS=$(usex nfs)
+		-DENABLE_OPENGLES=$(usex gles)
+		-DENABLE_OPENGL=$(usex opengl)
+		-DENABLE_OPTICAL=$(usex dvd)
+		-DENABLE_PLIST=$(usex airplay)
+		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
+		-DENABLE_SMBCLIENT=$(usex samba)
+		-DENABLE_UDEV=$(usex udev)
+		-DENABLE_UPNP=$(usex upnp)
+		-DENABLE_VAAPI=$(usex vaapi)
+		-DENABLE_VDPAU=$(usex vdpau)
+		-DENABLE_XSLT=$(usex xslt)
+		-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
+		-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
+		-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
+	)
+
+	use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+	if use system-ffmpeg; then
+		mycmakeargs+=( -DWITH_FFMPEG="yes" )
+	else
+		mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+	fi
+
+	if use gbm; then
+		mycmakeargs+=(
+			-DCORE_PLATFORM_NAME="gbm"
+			-DGBM_RENDER_SYSTEM="$(usex opengl gl gles)"
+		)
+	fi
+
+	if use wayland; then
+		mycmakeargs+=(
+			-DCORE_PLATFORM_NAME="wayland"
+			-DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)"
+		)
+	fi
+
+	if use raspberry-pi; then
+		mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" )
+	fi
+
+	if use X; then
+		mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile all
+}
+
+src_test() {
+	cmake_build check
+}
+
+src_install() {
+	cmake_src_install
+
+	pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+	newicon media/icon48x48.png kodi.png
+
+	rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+	dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+		usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+	python_domodule tools/EventClients/lib/python/xbmcclient.py
+	python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send
+}
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 66db93958aeb..05abeb2ffc78 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -86,13 +86,14 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	libusb? ( virtual/libusb:1 )
 	virtual/ttf-fonts
 	media-fonts/roboto
+	media-libs/dav1d
 	>=media-libs/fontconfig-2.13.1
 	>=media-libs/freetype-2.10.1
 	>=media-libs/libass-0.13.4
 	!raspberry-pi? ( media-libs/mesa[egl,X(+)] )
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
-		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]
+		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d,encode,postproc]
 		libressl? ( media-video/ffmpeg[libressl,-openssl] )
 		!libressl? ( media-video/ffmpeg[-libressl,openssl] )
 	)
@@ -142,7 +143,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
 "
 RDEPEND="${COMMON_DEPEND}
 	lirc? ( app-misc/lirc )
-	!media-tv/xbmc
 	udisks? ( sys-fs/udisks:2 )
 	upower? ( sys-power/upower )
 "
diff --git a/media-tv/linuxtv-dvb-apps/Manifest b/media-tv/linuxtv-dvb-apps/Manifest
index d97f80705f1f..ef2fdb560221 100644
--- a/media-tv/linuxtv-dvb-apps/Manifest
+++ b/media-tv/linuxtv-dvb-apps/Manifest
@@ -1,7 +1,9 @@
 AUX linuxtv-dvb-apps-1.1.1.20100223-alevt.patch 1418 BLAKE2B e8501fc28ae0e2288ad1ebb7f56e7dd61d979294d332fe1df6cb08ba0d3ebd1835dd60b31ffe5e350659080ca75cf0297921ad5a3cd0e4dfe08e12dcfc081fcb SHA512 7490d18c3408bc412a3f3a3bb54544885f863ee146176dd8f9caae624043b5ad797f9fe9edc1ae627fd82b0fdb392e6f458d814e68a11ef4efa253c1add4016d
 AUX linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch 607 BLAKE2B ea2f229d1ab2d0f5df3541b85a90caa06c25e7296b5d77dfb572ac5b261efd4b61e4022ca0ee80fe31be7046b47090ea2e7457710e762ad2eecbc5165db2996b SHA512 abaf61336531e33148a8a0d5d4dfa545a607b077430e6e9ae363a667524fcf3d41e5fec1112e795dcf6be5160a8ef57049b224dac42b1211d3ea3b9f865dba48
 AUX linuxtv-dvb-apps-1.1.1.20100223-perl526.patch 519 BLAKE2B 1546d43af3d337062d1a454e79be0d70349c91950e55ce66e84e75092277d50a7c327eef48bd85239ccb86c8284a6393cd77b173b895956e66af17d625a767d3 SHA512 73fea472e484f41d9c3eb676628dc2765081c92202823c03489d866534cdfef81559205cdb7f0e4578f217e0b0102ee94ed1faf56b7c3a3eb8c4c7d9dfc1b1e8
+AUX linuxtv-dvb-apps-glibc-2.31.patch 291 BLAKE2B b03833abf623175e9697a2745e9d99c7510b34e3823b42e4a394739d39a534cb4781a076879c85794fc4f9f703ded73778695b8334324186c4bafb3285d0dbb7 SHA512 efd1e8aa91cdcdff7f17856f13bb8689d3eb0288e2ff45c05bc55b44b32a137854c194cb3ee477a243b5377b44f221481e3323c9caa0065eb551cddf37a89c41
 AUX linuxtv-dvb-apps-no-ca_set_pid.patch 1004 BLAKE2B 36ab3817546d5a832473f4d69a2ce97642f3a6d7d8b17cb036d8976398274c4c9e040cb60a909e8f28f1ff25e6cfbb990dfe0b44b4c729b7e8abe30e645704bc SHA512 1cef92aee99ee03255115e1979b0342bbf9b45bd55c6f9ff6a8529edaf6f3a36c172a145c01706341486aae5d6e0a3fde52b535af97e020cb7009d23e0c9cf72
 DIST linuxtv-dvb-apps-1.1.1.20140321.tar.bz2 368759 BLAKE2B 5ef1bc4ee4f0ab167cda8d87a73c83566b40005e16fbaa79525af4fb0b117dec19a4883eedad8bcfedd269c2e295dd7f9e055f905dff5f39dffe1ff052e87547 SHA512 ceb057f760fa0b3902e6824e74b9392be9a7bd3318a1a83f206c99672da17904060ffdc35e84c89d3b8af60ac29d4427acad44e9ae16797baaeb5738e2ab1bf5
+EBUILD linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild 2193 BLAKE2B 67a6ba51badb002e38290b81647c5313ee9daa3431ad9465044f7a854204f958bba49fc959950607e3c319f611b0425c5e9fa7f0f1ff9dcba791509d635694de SHA512 95ba56052be08f403a3cf9fc42c14b31fb8ab60656dbbc4f09849c86bad5ea37ad1ac7cfa080aeaa25f5ab237b207f960280f7b196b22ad4c1645b566958ccc4
 EBUILD linuxtv-dvb-apps-1.1.1.20140321.ebuild 2152 BLAKE2B 0e1886a393669ffd430bfe4036f1ea9862a6ad24fc7930873426856ea27b4551a3f02efd628c72edef6533a750ee335f7381b411d5fd430585053fd559c74654 SHA512 6d7462b31af1d4db0b5380c2e2ca8d86574aced20ff2a2a6d6763025f4fbb10ff7946a0055c181e9b3ea5b5ce3371818e6c952e9732bac90a8236ee3ea971a5a
 MISC metadata.xml 230 BLAKE2B b1572b7d9c8d7cfb1ad670feba63226e05f2aa6d2de71ad3be92798dc2d1a21678aae2f8f9af6314e2a9fdc5fb1ac9fcac993d9b75a9afa457853888c94b0943 SHA512 1aaabf344edf8981ded68904e05257b579370a589c86b1ea8984378ad6a8ed3daf91c5e9069c07d207d47cf1f70a8039c644dbf6108557ed2053cba9769723ed
diff --git a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-glibc-2.31.patch b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-glibc-2.31.patch
new file mode 100644
index 000000000000..d404212b5e38
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-glibc-2.31.patch
@@ -0,0 +1,14 @@
+--- a/util/dvbdate/dvbdate.c
++++ b/util/dvbdate/dvbdate.c
+@@ -309,7 +309,10 @@
+  */
+ int set_time(time_t * new_time)
+ {
+-	if (stime(new_time)) {
++	struct timespec s = {0};
++	s.tv_sec = new_time;
++
++	if (clock_settime(CLOCK_REALTIME, &s)) {
+ 		perror("Unable to set time");
+ 		return -1;
+ 	}
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
new file mode 100644
index 000000000000..1ec133ccb2ee
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs vcs-snapshot
+
+HOMEPAGE="https://www.linuxtv.org/"
+DESCRIPTION="Small utils for DVB to scan, zap, view signal strength"
+SRC_URI="https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="alevt usb"
+
+RDEPEND="
+	alevt? (
+		!media-video/alevt
+		media-libs/libpng:0=
+		media-libs/zvbi[v4l]
+		sys-libs/zlib
+		x11-libs/libX11
+	)
+	usb? ( virtual/libusb:0 )
+"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	virtual/linuxtv-dvb-headers
+"
+RDEPEND+="
+	media-tv/dtv-scan-tables
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.1.20100223-ldflags.patch
+	"${FILESDIR}"/${PN}-1.1.1.20100223-alevt.patch
+	"${FILESDIR}"/${PN}-1.1.1.20100223-perl526.patch
+	"${FILESDIR}"/${PN}-no-ca_set_pid.patch
+	"${FILESDIR}"/${PN}-glibc-2.31.patch
+)
+
+src_prepare() {
+	default
+
+	# do not compile test-progs, incompatible with videodev2.h
+	sed -i '/-C test/d' Makefile || die
+
+	# remove copy of header-files
+	rm -rv "${S}"/include/ || die
+}
+
+src_compile() {
+	emake V=1 CC=$(tc-getCC) $(usex usb "ttusb_dec_reset=1" "")
+	use alevt && emake -C util/alevt CC=$(tc-getCC) OPT="${CFLAGS}"
+}
+
+src_install() {
+	emake V=1 prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(usex usb "ttusb_dec_reset=1" "") \
+		DESTDIR="${D}" INSTDIR="${T}" install
+
+	if use alevt ; then
+		dodir /usr/share/{applications,man/man1}
+		emake -C util/alevt DESTDIR="${D}" install
+	fi
+
+	# rename scan to scan-dvb
+	mv "${ED}"/usr/bin/scan{,-dvb} || die
+
+	# install zap-files
+	local dir=""
+	for dir in dvb-{s,c,t} atsc ; do
+		insinto /usr/share/dvb/zap/${dir}
+		doins "${S}"/util/szap/channels-conf/${dir}/*
+	done
+
+	# install remote-key files
+	insinto /usr/share/dvb/av7110_loadkeys
+	doins util/av7110_loadkeys/*.rc*
+
+	# install Documentation
+	dodoc README
+	newdoc util/scan/README README.scan-dvb
+	newdoc util/szap/README README.zap
+	newdoc util/av7110_loadkeys/README README.av7110_loadkeys
+
+	use usb && newdoc util/ttusb_dec_reset/README README.ttusb_dec_reset
+}
+
+pkg_postinst() {
+	elog "/usr/bin/scan has been installed as scan-dvb."
+}
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"
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 2a91466475a2..fff83025addc 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,9 +1,12 @@
+AUX v4l-utils-1.16.6-gcc10-fno-common.patch 2423 BLAKE2B 6938e2b75b01e3bc3a1cfa03e2e95591848697e60742c4f65f342fa3ddfe5bddebba8d3bb17ab1de7d870592501f897c4e0aa5a6b2c8754bb0ae3c111df8942c SHA512 7b9fad4f640f14484cd0ab42812fb19392e0959a28511fc4343aff7185e181daf0f32c3460ba398dcd703c5ede9bdc00f1765ffb083cc34fdd8649801eec871f
 AUX v4l-utils-1.6.2-sysmacros.patch 1853 BLAKE2B ed1f474be9650b0b4e5812746499935ac8a483ea71b335183c1648f97309d1d01209df1dbaf70f4e5b8e0d838ca97750bc37b4943dbeadbcac7c31ed9077969f SHA512 ea3e4a19c8b57833519b6356e647572021ac2a6a00942394a89949ff02aa3e0f70a72b0ef0f025615a7c81c0c79f1cacaa01a82161a05d806e3c8c792995353d
 DIST v4l-utils-1.10.1.tar.bz2 1352235 BLAKE2B 7ececae8ad5ebd999070b0c3626fdf5b0a4bc81562d2c2a712ff9625025d3e6c4ff664ba85998dedaa1ee77295d3cea39306305c20573c07156a07ec0ac8d10a SHA512 524bfd4e93e82f2dd55f0baa3e8be5850d4675b46fd0197b6d1287fc0d502c6b5c64bdf461af9630345f2d847d6aa5b6dc483693cee452da0b6729f156a5d98d
 DIST v4l-utils-1.16.3.tar.bz2 1894961 BLAKE2B 71c674abbb3415e592354998e1baa3eedbb4be21757bef80b463ea987e9fc231789e6b333b37d0d9916cb30729e04951dc9f1755ab00a82502fdc415b00cb9a2 SHA512 404672d18d94861c6957ea3a15a6a48f238d3859940810952a5a8cc33b57f1a360d1a19af28405c01b073c0ece90c5995a71dbe6544b30bdb8eace7daeb4bc0b
 DIST v4l-utils-1.16.6.tar.bz2 1893768 BLAKE2B f31cf794f6949fa2c1f45db8bae99a10a5fbc67af356889f636ab03cfd04011a82939a10f01145c56001b91655664530cfbda7d64c523752b8bb77159a1c80ab SHA512 f011218591e32b0ca3239373d9ea4739d7cfe3a6bef5f8a996253cea9b9d836ba488132e2a1b8f6f61cd69f1bcecc20e4b5c26f9c95a2a912e17c400b9fa9b58
-EBUILD v4l-utils-1.10.1.ebuild 1676 BLAKE2B 30166273ce20e91439667f57cda52bb7cf1a13e9627c6e223656685b1fe607028e208b4496b43db4dbb2c8bd75dab990fe84c29c792609b581210be494946a64 SHA512 c81e3cedfda2a94661431379cf5e56237ac0d876a29139f37725341ffeed2e5056d1540544e89b382ac4b09c2b3a45f8c6dcf5b8f98e3379ea433abd5a193575
-EBUILD v4l-utils-1.16.3-r1.ebuild 1843 BLAKE2B 46f25960bd80a69c923cfa3ea1a62bd2eed6a2c20d5ad61164dec5ce0dbd6da656e526cbcd094b3bb40e77d6a0ba24f61f6c904887ab70fd1ca949af531fdd12 SHA512 9ea267b9ed6d2abe7d04e6a53df4a1337dcebf133f42783b7fc5ef853f26e560bf10f94965e203e14e56f8da46357275b23eed59c243823dd9dfcb2091377c42
-EBUILD v4l-utils-1.16.3.ebuild 1768 BLAKE2B ed5b2f5884fa03440735d060ad8fac1931bafafb53eb14aaa68ff68a163c038592d7d099c00c0886050b7a751a1d163d09613886bd72f57e4003d55733af840b SHA512 9063665b2994026a6087f80630fc5d351f93be02d87afa69a7ddd72832185e1d06cd1163a3c2e636409845770e1cb8caf52da6cc5af4274912d2f0c38fcc3b0e
-EBUILD v4l-utils-1.16.6.ebuild 1842 BLAKE2B e451ebba2c6b61568944c482bd0a5631ce59db238b6ba56fd84b529cfea66b7f2594cda88395146aabe85efe6b119633ee0453debf29c204e3ccd2203b665812 SHA512 faafb1198ce491cdd892e5839d5a2d8844023fac82373969ebd16241514ea3a5f45e6e4374b3e4509971b33177d82334ab0dccb8cd76f19e984bfcdc0e3681ed
+DIST v4l-utils-1.18.0.tar.bz2 1995506 BLAKE2B 35cd138c88960e5b02431c408a43905a73ea6a7650a939abc2250e1f219bda1437262a7083d90d8b4d39c5bd2cce5f6fc590b8dc09a8738fb5baf55266256b94 SHA512 749c804671f039d907bf782cba5d1c23fff48066f3b6d4a0249fb9b65c493ee3945b544ee2a306dda79973da04f0301278ee88775f798aba590e5d0f15226d49
+EBUILD v4l-utils-1.10.1.ebuild 1670 BLAKE2B 1d9d03cd1cbb0a59a570d42984155db7e6e9b9d59edb7fddaa644fd773150443b5ae7192def7368ef0cfe912470d3defbf5184e609df3dc4156186a5602f7385 SHA512 b8994091122f8498fa8ec7a0fa4a95b9ee7b49ad446facbdba4eb0abee8fc213364fd145bf87799e7a3b6484deae26b0f2ef9e08f4d7fdb9228dc63ac23b52d0
+EBUILD v4l-utils-1.16.3-r1.ebuild 1837 BLAKE2B 5838a1e2be624961876c860029faa70986959e52ac2b8eca6cce56284560bc348f8720d7d713c35d1f27a410c1fc3bd91c4f1730cab3abd3776e34317e655b79 SHA512 d3b974c7539aa85464cd0919207ae4ab1381897d3bd17b8a5edcba0064a3d383ff29cccad450592f3f294e4346fed70e7eb27b29db0dc050474ca17f89b01c47
+EBUILD v4l-utils-1.16.3.ebuild 1762 BLAKE2B f062ceff94129dd768586fb70dcb0fd230c203b7a202ca1fdecf51c3c1839458b89a1e8565a9d597b247cb1024fdb6e81ad907a585111f599b4d91f48c830f61 SHA512 aa3caad85a32fdba87258b96fff41afb4a75de9e8c7acb974d31823e591654d203a76b0949d4228656c89fb1376bc3becb7c0f7c6fb36e9d92c65ddaa8dbdf0f
+EBUILD v4l-utils-1.16.6.ebuild 1899 BLAKE2B ee9875b6515d18728bbde8a5e1d8babe9c49403c9388286a2d746ad36d7f24900ff72c17b1a601cc07a11c3ae024e6c1c19b6125a84930c7952eb734dbf30d29 SHA512 e88848d6b0849f4049e71c968baf876046ed47d5673d08f4a6f020f04c9633bda772d918fabdfe37a07d354da8c4672080a3b95ce018982e95ed22661789b38e
+EBUILD v4l-utils-1.18.0.ebuild 1914 BLAKE2B 75e91df19524f3f63871b53362af72c4c3af91bb8089eb703d62bf8c51e1cebb0bb585673ca687683a09b302c08525e9eaa2758b1dedab441712d86016401a14 SHA512 4dad3bd400dd66fb2b6ee0c3cf199c8477a018f56abfcbfa53de3f50095f0fcc0e5a9613f4ba24640a165830b77d96963d7aba4ca313b575e7d84f25f0e6db17
 MISC metadata.xml 326 BLAKE2B b2b3aecf2ef313c08d06033344cc470302df8031246a7a919d01419f6d40f5a708ea6cfc222a0b7b2ac442f761f90b49fb414ffe6342a500cb446cdf0c562d70 SHA512 2f4cabeecc98ba82d51fe56871e3b950be0baa58a73c11067f91a0b5dce02bde063d32617ed68ee68d4c2a0af92e6d80a306e3b95548aad6d9734d4577cfafab
diff --git a/media-tv/v4l-utils/files/v4l-utils-1.16.6-gcc10-fno-common.patch b/media-tv/v4l-utils/files/v4l-utils-1.16.6-gcc10-fno-common.patch
new file mode 100644
index 000000000000..33855c682b63
--- /dev/null
+++ b/media-tv/v4l-utils/files/v4l-utils-1.16.6-gcc10-fno-common.patch
@@ -0,0 +1,68 @@
+From afb123618b087f3ca2305b84fb004624662e52f0 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Wed, 26 Feb 2020 11:07:29 +0100
+Subject: Fix GCC 10 / -fno-common
+
+* GCC 10 switches its default symbol emission mode
+  to cause linker errors when an object is defined
+  more than once.
+
+Bug: https://bugs.gentoo.org/706756
+Signed-off-by: David Seifert <soap@gentoo.org>
+Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
+---
+ lib/include/libdvbv5/desc_t2_delivery.h |  2 +-
+ lib/libdvbv5/dvb-v5.h                   | 26 +++++++++++++-------------
+ 2 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/lib/include/libdvbv5/desc_t2_delivery.h b/lib/include/libdvbv5/desc_t2_delivery.h
+index 93594b76..8c11fa9a 100644
+--- a/lib/include/libdvbv5/desc_t2_delivery.h
++++ b/lib/include/libdvbv5/desc_t2_delivery.h
+@@ -215,7 +215,7 @@ extern const unsigned dvbt2_transmission_mode[];
+  * @brief converts from internal representation to string the SISO_MISO
+  *	  field of dvb_desc_t2_delivery:SISO_MISO field.
+  */
+-const char *siso_miso[4];
++extern const char *siso_miso[4];
+ 
+ #ifdef __cplusplus
+ }
+diff --git a/lib/libdvbv5/dvb-v5.h b/lib/libdvbv5/dvb-v5.h
+index 45aaddda..3540bac1 100644
+--- a/lib/libdvbv5/dvb-v5.h
++++ b/lib/libdvbv5/dvb-v5.h
+@@ -14,17 +14,17 @@ struct fe_status_name {
+ 	char *name;
+ };
+ extern struct fe_status_name fe_status_name[8];
+-const char *fe_code_rate_name[14];
+-const char *fe_modulation_name[15];
+-const char *fe_transmission_mode_name[10];
+-const unsigned fe_bandwidth_name[8];
+-const char *fe_guard_interval_name[12];
+-const char *fe_hierarchy_name[6];
+-const char *fe_voltage_name[4];
+-const char *fe_tone_name[3];
+-const char *fe_inversion_name[4];
+-const char *fe_pilot_name[4];
+-const char *fe_rolloff_name[5];
+-const char *dvb_v5_name[72];
+-const char *delivery_system_name[20];
++extern const char *fe_code_rate_name[14];
++extern const char *fe_modulation_name[15];
++extern const char *fe_transmission_mode_name[10];
++extern const unsigned fe_bandwidth_name[8];
++extern const char *fe_guard_interval_name[12];
++extern const char *fe_hierarchy_name[6];
++extern const char *fe_voltage_name[4];
++extern const char *fe_tone_name[3];
++extern const char *fe_inversion_name[4];
++extern const char *fe_pilot_name[4];
++extern const char *fe_rolloff_name[5];
++extern const char *dvb_v5_name[72];
++extern const char *delivery_system_name[20];
+ #endif
+-- 
+cgit v1.2.1
+
diff --git a/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild b/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
index 3baefa7a4edc..e18fe0d18460 100644
--- a/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.10.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ppc ~ppc64 ~sparc x86"
 IUSE="qt5 udev"
 
 RDEPEND=">=media-libs/libv4l-${PV}
diff --git a/media-tv/v4l-utils/v4l-utils-1.16.3-r1.ebuild b/media-tv/v4l-utils/v4l-utils-1.16.3-r1.ebuild
index b1b0a9cc7938..0a929df32fb6 100644
--- a/media-tv/v4l-utils/v4l-utils-1.16.3-r1.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.16.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~sparc x86"
 IUSE="+bpf opengl qt5"
 
 RDEPEND=">=media-libs/libv4l-${PV}[jpeg]
diff --git a/media-tv/v4l-utils/v4l-utils-1.16.3.ebuild b/media-tv/v4l-utils/v4l-utils-1.16.3.ebuild
index 2c205e2624a8..c17b61ef7427 100644
--- a/media-tv/v4l-utils/v4l-utils-1.16.3.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.16.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="opengl qt5"
 
 RDEPEND=">=media-libs/libv4l-${PV}[jpeg]
diff --git a/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild b/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
index b756dca8b45e..5b1881372f23 100644
--- a/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.16.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~sparc x86"
 IUSE="+bpf opengl qt5"
 
 RDEPEND=">=media-libs/libv4l-${PV}[jpeg]
@@ -31,6 +31,8 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.16.6-gcc10-fno-common.patch )
+
 src_configure() {
 	if use qt5; then
 		append-cxxflags -std=c++11
diff --git a/media-tv/v4l-utils/v4l-utils-1.18.0.ebuild b/media-tv/v4l-utils/v4l-utils-1.18.0.ebuild
new file mode 100644
index 000000000000..777a22b6a552
--- /dev/null
+++ b/media-tv/v4l-utils/v4l-utils-1.18.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic udev xdg-utils
+
+DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
+HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
+SRC_URI="https://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+bpf opengl qt5"
+
+RDEPEND=">=media-libs/libv4l-${PV}[jpeg]
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		opengl? ( dev-qt/qtopengl:5[-gles2(-)] virtual/opengl )
+		media-libs/alsa-lib
+	)
+	virtual/libudev
+	>=virtual/jpeg-0-r2:0=
+	bpf? ( virtual/libelf:= )
+	!media-tv/v4l2-ctl
+	!<media-tv/ivtv-utils-1.4.0-r2"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	bpf? ( sys-devel/clang:*[llvm_targets_BPF] )
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.16.6-gcc10-fno-common.patch )
+
+src_configure() {
+	if use qt5; then
+		append-cxxflags -std=c++11
+		local qt5_paths=( \
+			MOC="$(pkg-config --variable=host_bins Qt5Core)/moc" \
+			UIC="$(pkg-config --variable=host_bins Qt5Core)/uic" \
+			RCC="$(pkg-config --variable=host_bins Qt5Core)/rcc" \
+		)
+		if use !opengl; then
+			sed -e 's/Qt5OpenGL/DiSaBlEd/g' -i configure || die
+		fi
+	fi
+	# Hard disable the flags that apply only to the libs.
+	econf \
+		--disable-static \
+		$(use_enable qt5 qv4l2) \
+		$(use_enable qt5 qvidcap) \
+		$(use_enable bpf) \
+		--with-udevdir="$(get_udevdir)" \
+		--with-jpeg \
+		"${qt5_paths[@]}"
+}
+
+src_install() {
+	emake -C utils DESTDIR="${D}" install
+	emake -C contrib DESTDIR="${D}" install
+
+	dodoc README
+	newdoc utils/libv4l2util/TODO TODO.libv4l2util
+	newdoc utils/libmedia_dev/README README.libmedia_dev
+	newdoc utils/dvb/README README.dvb
+	newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
+}
+
+pkg_postinst() { xdg_icon_cache_update; }
+pkg_postrm() { xdg_icon_cache_update; }