gentoo resync : 28.04.2021

17 files changed, 92 insertions, 26 deletions

diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index a90c7606ad06..64d6feb5c8ae 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/channeleditor/Manifest b/media-tv/channeleditor/Manifest
index 4df4b8507c50..dde460143376 100644
--- a/media-tv/channeleditor/Manifest
+++ b/media-tv/channeleditor/Manifest
@@ -2,5 +2,6 @@ AUX build-1.9.2.1.xml 1204 BLAKE2B 6a00e578c9108f0a6df66eab6e4aac582a0b699d05bc2
 AUX channeleditor-1.9.2.1-messages.properties.patch 18594 BLAKE2B 0b24118aca4bf3d43127def0f25ba11afeef13b7e5f6a10457c33390f5e5173168ca6245b6deb62aab4658fc22c762b5662baf2904fd4d9c326d9bb55fbd4068 SHA512 2a023617e7231f1a140ec92a8ddd2997182de8fa662d728ece01d8a3fede358d2c2bf180e038f094938db2ca3aa6857fae11e9a53885d95a6af520d88ff62347
 AUX channeleditor-1.9.2.1-messages_en.properties.patch 7226 BLAKE2B f5992f06de852454a004883d96dc61e56728a745dd03f7545f9854ee839ac55ca511b518aa03e20cbb2a6126bb34964c7af72f4b81536bdcec24f76988826ec0 SHA512 8a2c09010ce01f001150a759bb91fdf2bdebf4a6776ada8fc1dfbb4b9000aeb4d5ad0be5bb99ed4b5237c4a070ebbea5ca862585a74f1c64dad5349127f45a97
 DIST channeleditor_1.9.2.1_src.tar.gz 317608 BLAKE2B 26afc8d08a525f26c942fda20eb8ed63ff973bc112743edb80043ef9f2bd78f34dc4b2ef7ad60110b624dbfa6e2058a41e945b616d2ca587acffefe5b15b583e SHA512 84147868aa8b1aacf4ef31a7665822bc7ccd4f7372aaa040aacd8ee42581db1d67092b6b09cda6e447bae2c058fe4ceaab28f3e2a268a54dc5ac25452e64d7d9
-EBUILD channeleditor-1.9.2.1-r2.ebuild 1444 BLAKE2B 81c169ed7e78ada298eeb82d84fc1055ead8ada1b0b0d525958a8361e17ae0761729599d71a9a2d8077b5dae53660c1644a832afa5f846935a98c877c5dfeb55 SHA512 f7c9f5d308eda235421783bbbc42e4a0000f5e95f7a23cc71cd1e44607163f2a4f31f57c9a728c9ed943ff7f666d027bc9bd955a0fadf538242ffb8783ff0abe
+EBUILD channeleditor-1.9.2.1-r2.ebuild 1447 BLAKE2B 0e10a726fe62ba37ec91e8de234780d9b0efb60f326a03ce6631aba37560d3f134c67de13ddd1a08fea3b093221f2a2ea43e8d419efd3eef2ea4cfbd018755f3 SHA512 c5d2670b592dbb898cc47c5abb260a23d85d7cab23bc9e9deebb107668ddb8a78654f1f59d3ffe05c44b881a0262e26f550bd27a682163da4fad12e3734c7de6
+EBUILD channeleditor-1.9.2.1-r3.ebuild 1453 BLAKE2B 5a6f1d7be8a619e652b3ce219491a4174ae0670e095e658876cd7a0ceb71cf75e2fd6df61d9739948f314ec0fb98c83bd1b0fb0ac94572a87046ef8b2cef28cc SHA512 96a8f5c8e0b2ea516ca5020d7ee709169fc01bbbb464f83c33d825c908e968c60436633a4cc121f3d0b60ce1e84ae9e28b833a97af66b4c904e3b9fe485c6c4b
 MISC metadata.xml 332 BLAKE2B 94c6fc0a7d5f1fc8ba176c5ec6fbf88d05b2af0463a8bb59547db726fac957ba32a8386db915d3afb6c86088f1865bda3c4d142a8d9ee8896f5cb416f79c8267 SHA512 69d8f78543a8a036dbb365e8cd89755265e8be29085c4f68de21b833325163ef17ec16927d0a3a3f414daf54dd123e6f654d82b7d354af59ce5665c5cf65ec6e
diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild
index 587e3271b494..4605bec42ea3 100644
--- a/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 JAVA_PKG_IUSE=source
-inherit desktop eutils java-pkg-2 java-ant-2 xdg
+inherit desktop edos2unix java-pkg-2 java-ant-2 xdg
 
 DESCRIPTION="Editor for VDR channels.conf"
 HOMEPAGE="https://sites.google.com/site/reniershomepage/"
diff --git a/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
new file mode 100644
index 000000000000..684ff24bffbb
--- /dev/null
+++ b/media-tv/channeleditor/channeleditor-1.9.2.1-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE=source
+inherit desktop edos2unix java-pkg-2 java-ant-2 xdg
+
+DESCRIPTION="Editor for VDR channels.conf"
+HOMEPAGE="https://sites.google.com/site/reniershomepage/"
+SRC_URI="mirror://sourceforge/${PN}/${P/-/_}_src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.8:*"
+DEPEND=">=virtual/jdk-1.8:*"
+
+PATCHES=(
+	# include localisation changes
+	"${FILESDIR}"/${P}-messages.properties.patch
+	"${FILESDIR}"/${P}-messages_en.properties.patch
+)
+
+S="${WORKDIR}/${PN}"
+
+mainclass() {
+	# read Main-Class from MANIFEST.MF
+	sed -n "s/^Main-Class: \([^ ]\+\).*/\1/p" "${S}/MANIFEST.MF" \
+	|| die "reading Main-Class failed"
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	# move files out of build and remove stuff not needed in the package
+	mv build/* "${S}" || die "cleaning build dir failed"
+	rm -f src/java/org/javalobby/icons/{README,COPYRIGHT} \
+		|| die "removing files failed"
+
+	# copy build.xml
+	cp -f "${FILESDIR}/build-${PV}.xml" build.xml \
+		|| die "copying build.xml failed"
+
+	# convert CRLF to LF
+	edos2unix MANIFEST.MF
+}
+
+src_compile() {
+	eant build -Dmanifest.mainclass=$(mainclass)
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar
+	java-pkg_dolauncher ${PN} --main $(mainclass)
+
+	use source && java-pkg_dosrc src
+
+	make_desktop_entry channeleditor Channeleditor "" "Utility"
+}
diff --git a/media-tv/dvbtune/Manifest b/media-tv/dvbtune/Manifest
index d0c8d1065377..616f572b6506 100644
--- a/media-tv/dvbtune/Manifest
+++ b/media-tv/dvbtune/Manifest
@@ -1,5 +1,5 @@
 AUX dvbtune-0.5-r1-gentoo.diff 470 BLAKE2B dee9019ca01042746a5abe7c9ab16d732aed8a55d85adb5541e748e84acef3cb4b34ce11d23036dc152ce738082625185c271a255aa6949a807f87ccf02d50a9 SHA512 0cefd5b9673e115cc360d72b211ef806ee16797443c35a78ecdc188c2c08eb4d54af7a1ca72526e18bae13de61f0126f5bc1eddcd7b0c9b5ed92ea46ae0b701e
 AUX dvbtune-0.5-stdint.patch 251 BLAKE2B 200e2663edb6fae39638e40c0cbccd256054796d605b2b00faa97b27dc45a02c023fce949d4482511d73cd5631bd90c77ac67e71350c3a29bc03205460ecd88f SHA512 2f7408cd2f98276363465ea892294c165e61232cbcd4aaae6a3e4b325a48a02ebc2083646388079a47585f097dc7e09ea5b616610850f0e4b592226a79cc70f0
 DIST dvbtune-0.5.tar.gz 20601 BLAKE2B 6e788e44c0c228506599a6a32baf527050e09d0802692ece635bf5432a47cb81f738be49c0577ceb4597f9da7ced6607ea102a6d04dfcf991c24b5a1b3db7532 SHA512 0c6e8b8b4185b1b63638f0eff3e07b2c5e4b3bb9d95debb1625973cec2293315754487702ba9f7ed6bd6a0a518b09c8333d9ac4cd40b61f56c311c3d624fd365
-EBUILD dvbtune-0.5-r1.ebuild 678 BLAKE2B ea6d40cccdde4b303b3949be4c019ed42507ba6b83e73a714b60b0b5df14d8a67a307f9e16dd6c1dddde32d7e0abe228029c8b6d911938ccd7d5e98c65ed3f22 SHA512 abf62380659e7fa1517430a481a7d404fe5d244439f7753fd29cac64f7eea1dd724be404acf09993aa6bc1151f107ae64a4e5d9e735c7b915f34ec7906478d17
+EBUILD dvbtune-0.5-r1.ebuild 675 BLAKE2B ae13ddfab80654e15243102e2a9bfcfa22943e8c546f609357818da96af768574168e5b3c43dc593ff6b59b423ac4318db5cee2613a85f7ffab0228b2d4ecb35 SHA512 9eb185efc3660f7a22959a5acad85301794b00d23f4142c3bb9f4160ffb0c9b268ffee18b4af9095644f2d989ee19a9ce19a3dd101c37dff35de199b3ee6befd
 MISC metadata.xml 245 BLAKE2B 93ecb07b44a63a38bcbad0ea9783d8ac97a77a78c66e78941b16086522c2e07acd645544eba5c9d1a8efa0f1cb418e558501bd7b64f6e74dcfd9081b8632368e SHA512 d07141fde891b0f88b4f91ea7b4e7da644ad57f74ac7a9f3d43af56c387a9d06e4b995e18756222c77f8ca6d8fc6d83081806b77c19ded68dbc6fb6845af18e5
diff --git a/media-tv/dvbtune/dvbtune-0.5-r1.ebuild b/media-tv/dvbtune/dvbtune-0.5-r1.ebuild
index a626f6b54357..ccd198855ffc 100644
--- a/media-tv/dvbtune/dvbtune-0.5-r1.ebuild
+++ b/media-tv/dvbtune/dvbtune-0.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils
+inherit epatch
 
 DESCRIPTION="simple tuning app for DVB cards"
 HOMEPAGE="https://sourceforge.net/projects/dvbtools"
diff --git a/media-tv/gtk-v4l/Manifest b/media-tv/gtk-v4l/Manifest
index da473933863a..d1c60cbdfe59 100644
--- a/media-tv/gtk-v4l/Manifest
+++ b/media-tv/gtk-v4l/Manifest
@@ -1,4 +1,4 @@
 AUX gtk-v4l-0.4-device-remove-source-on-finalize.patch 1850 BLAKE2B 534955aab1ddecd3586ae472c3b6bcc2fd48da2a796bd2bedd93b430865b015c8519e616e890dff4064ecbe10c4e163aec79ff36aa428f1de4b436bda04123b0 SHA512 2fea2369c1f2084a71f4f934c870f14b08ddf61fa0ed50fb9de9c8250b431519cf38470d404d8428e667c958c9a1b2a674fc71177f508d85a1b7468b881a2d3c
 DIST gtk-v4l-0.4.tar.gz 328732 BLAKE2B b9040bb4be35d21998226e776f6844da12d75b4db51c8191ee658d9ef5701b27f8b400914eea07a39bb2ed0855f34a59c547bf412031c033212b9966fa1fe97e SHA512 ed0e1245d9b1cfce6612c91dacd09f26850a9420088d7de172c4bd582b70f4427820940e6cf98a831493edfe52d20fb02d6b2d62b695a24127097f50963df321
-EBUILD gtk-v4l-0.4.ebuild 812 BLAKE2B 1a2e73d06a5aa92fbc8fa8f78bdbd3f7bf0dd99c44d76ebdcbbe294490222c7759bcccdf7b73b077c4c966dc1aa1ef6e9dd674eb5f9539c14780ba063dfa5465 SHA512 d3033fc179ba71ca6cec0a79c6c0753b9c7066ad6869b92858cf09451faf57e6f90b8f1874c63cbbf1de25f36ab786c857db78a9cc01240f2b7b1f47a63be6b9
+EBUILD gtk-v4l-0.4.ebuild 812 BLAKE2B c3a253ddce2c533504f99214185158a5cc779d171866e1de192b81b9847758c22d8b8541afa7e91fb3731fea3501895045c87f8f6e8b1160bc5b4ddb3172dfc2 SHA512 e3732459ec227cee1e35ae8786a28829c8feeeed7206051e00969f5aea9dab9e75f34f9e0661dee4d484ac6c270b716f04ebb115f7a20c7c0db50f063a4ac2ab
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-tv/gtk-v4l/gtk-v4l-0.4.ebuild b/media-tv/gtk-v4l/gtk-v4l-0.4.ebuild
index 15a9ed779c81..96c1e41b6eed 100644
--- a/media-tv/gtk-v4l/gtk-v4l-0.4.ebuild
+++ b/media-tv/gtk-v4l/gtk-v4l-0.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils ltprune
+inherit epatch ltprune
 
 DESCRIPTION="A control application for Video 4 Linux (based on C and GTK+)"
 HOMEPAGE="http://fedorahosted.org/gtk-v4l/"
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 6e2466ec8833..854cddc4c044 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,9 +1,10 @@
 DIST ffmpeg-kodi-4.3.1-Matrix-Beta1.tar.gz 13477440 BLAKE2B 49415f76fd2a888b0efadb19597bd89db65c3d9e1224ab529ff0d73ab5734a23982b4d4905ddeb105ce59a816c4642cdb9f5568b0c39c29f5fb9431f9623d4ec SHA512 ce43390e816dabeed4ca231f5f7adade6c721c38e17996a57810fb6025ea49b812133c2a6e29aac7c674d4e4af3a21dbd7e605d85fb966935a01bda983b884ac
+DIST ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz 13490949 BLAKE2B 90007f2c4bac0e0a52b419d9333cf75b00e291f1ea7447cbdc579ee2f860de7c436c924253600f3fbd6e3faaabe97aaf46db083a5bbd2f5f03badcca5d643e89 SHA512 d3719253d674b16638b873545583b82fba3176803c81ba8bcb37e90456dd956f1c2ee8996493840cff2d61c6399f06ed0524a759f46e4ce174bce23e9c6eda4a
 DIST kodi-19.0.tar.gz 52311355 BLAKE2B 543936b8fb607d1d629a8f2abd9cd0cb3bf6114aa93647c7e8ccee2f99ff1f84a2740bb57f0cbf675b3efa5914e98c57effb28ecd8e9df83a39d67ee708280a2 SHA512 d6c9fe7414b64d33d919d6c3de1ddb4800e36b786a460d2d2f5c1e5346cd4819487e54f212c37778103d44dd051f7df6c74e0a98a0b21d1e4dc9bedaa8570422
 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-19.0.ebuild 10993 BLAKE2B b6a7569f8d957ac23d20365539f3c7e18b54a9daf02c679ea7b47b4363bd8780d80f23812a99b105d9d1fe42b85895fac25522393b0d257341ea8abaa602d073 SHA512 334e4c773a029b2d8b723f64ba0ec00b5feb1d14e1bbd798d6bf5cabb1f24d3c7ca57f6395dc7c3c6e388fd7c55651b8e586b246660abb23279d6227e361d065
-EBUILD kodi-19.9999.ebuild 10993 BLAKE2B b6a7569f8d957ac23d20365539f3c7e18b54a9daf02c679ea7b47b4363bd8780d80f23812a99b105d9d1fe42b85895fac25522393b0d257341ea8abaa602d073 SHA512 334e4c773a029b2d8b723f64ba0ec00b5feb1d14e1bbd798d6bf5cabb1f24d3c7ca57f6395dc7c3c6e388fd7c55651b8e586b246660abb23279d6227e361d065
-EBUILD kodi-9999.ebuild 10971 BLAKE2B 921863fe8859275dbefe33f282352ee8e1b0f0eae6e0132bd9cd29165338f52a00fab498310663660b5cc542b669356a195c4119717557a2acec8e2b9a0ab7ac SHA512 1cba85287830d14262d627fb06fde06f8213ad194576cb797a7289b3d35145b464f90b00857f6e9aa6734703b8cb640d0ae8d66a2e03f06fea3526e1cda23f3e
+EBUILD kodi-19.0.ebuild 10992 BLAKE2B ede29490739244a7df514f67c007182c82a3540c9dd5d3fd676a0aebc2160b7584bea67e3f7cf44d47e4d31ea8aadf991e2607ea475eb3bdb5a5ddbf382e5aaf SHA512 5101e453c8260f0b9a04b7c03e01b0bd87ce116f91eeae4e634ae74f0e01cfca2076126e0f0e02f1c0e169eabe51e881b25db5d2b154e85ca46c5167f3de917e
+EBUILD kodi-19.9999.ebuild 10992 BLAKE2B e13a18e8e79e26b48ff47ef5e54955e1f182209a131dbb8356a949738d74e5d19bacd24cf3ec869ee538f8378fca7a5da478673f310b576f1c6b5b6682d56f9d SHA512 fc4924486e32f08435021c7d59b83eff01cf7c4602bf41bbbd48de4255f2b9cb1b4b7f87888898d59ac5d9743445bca7c291238c653d23c3132db88ec99f1bec
+EBUILD kodi-9999.ebuild 10970 BLAKE2B 59c9e74d2c567c6faaba942a398d4d25fc3e47035afd0a22ef7429eec7948c4a3d0e3ed587a05dd9f48000472fc0a7c45846a047a87335d57cb23dd988374ff8 SHA512 5b2f14ce2d7b795eb5feb9ce6fe0b2ea0bd3e132f6aa18ac61967e89c30f96b943ac6441c0cb39c63e7993e94ce3d7c7d82bb1e5034743737afe8719548224de
 MISC metadata.xml 2707 BLAKE2B 647da6ee38f710be18a87b3b3267dddcbe1f4e23f3008a73f6d800e8c765a58dbdcf4b0ec165aa45be843276712b5a1feee5754b8553a43ba149993702cf2252 SHA512 04ad8ecd819f0c7779bdac2860bf31f89b7308c633c527a9f70600bfb1d82681874d4304c59f394a91c18fdac1441e5d97dee2ab81ace1589985c0c422a672b0
diff --git a/media-tv/kodi/kodi-19.0.ebuild b/media-tv/kodi/kodi-19.0.ebuild
index 0c01abfd0056..a39d3ca1acd0 100644
--- a/media-tv/kodi/kodi-19.0.ebuild
+++ b/media-tv/kodi/kodi-19.0.ebuild
@@ -26,7 +26,7 @@ else
 	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 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm arm64 ~x86"
 	S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
 fi
 
diff --git a/media-tv/kodi/kodi-19.9999.ebuild b/media-tv/kodi/kodi-19.9999.ebuild
index 0c01abfd0056..e644af36dbdb 100644
--- a/media-tv/kodi/kodi-19.9999.ebuild
+++ b/media-tv/kodi/kodi-19.9999.ebuild
@@ -7,9 +7,9 @@ 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.3.1"
+FFMPEG_VERSION="4.3.2"
 CODENAME="Matrix"
-FFMPEG_KODI_VERSION="Beta1"
+FFMPEG_KODI_VERSION="19.1"
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 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
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 234e0adf22e4..7a6c254d702f 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -7,9 +7,9 @@ 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.3.1"
+FFMPEG_VERSION="4.3.2"
 CODENAME="Matrix"
-FFMPEG_KODI_VERSION="Beta1"
+FFMPEG_KODI_VERSION="19.1"
 PYTHON_COMPAT=( python3_{6,7,8,9} )
 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
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 065e79bf0466..20dc764fa402 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -11,6 +11,6 @@ AUX mythtv.logrotate.d-r4 235 BLAKE2B 4f6df360f5191aaf4a2b55bd3edc7bc4aab92c46db
 AUX xinitrc-r1 234 BLAKE2B 0227ea065f1c43e1b2f1583bcbc798db76e9a08d345bbd8ed8837a6ba424b187c814e3ff0d7690d2d9f7a7617f4fbcce20df926e43bc6e89aec3e352aab6de8f SHA512 885adfe395fe553f6d5cf518856be7be9a6bf6073888f8e055271ed7c3d9ad85a162e9e9ff95a68e54047948ac280796c69ef55d0b4e549eb0beabbf0fec1188
 DIST mythtv-31.0.tar.gz 102552136 BLAKE2B b09b41230eb2cae19d770c3cc59151863e0a56e95a86627473d52613e62f0acf3bd0c4bb37afb340ab874c222899f9d3c219ded470785d27960db9b39d784ceb SHA512 d53817231409934ef37d12739c38cf6936f04f816b0ba1c9738ce99b5b4ff387c70b683ccd84f649ff2f74992b2158829f5f1d1ffe06c8768da1922b90439f6e
 DIST mythtv-31.0_p20210225.tar.gz 102623768 BLAKE2B 560d3e08abb7bacbb58499a541f0d96a7b7813deb74d7e7692625dfdb09c5ec126e3f5fd014f7bd6c0640e52dd62b5bab87db40426deb9768d6de1d84b9c0d59 SHA512 832fab6d0094e43f0601485d5ca1249d95a8e293cd5bfe53208c482a43ff19396a435fa7c63c21f728fdc47fc55cb135eb766140f67ec60114965c83500e99e8
-EBUILD mythtv-31.0-r5.ebuild 12338 BLAKE2B 51da4268224542e713b2b8d5c7581c792a6809595461c12c9156fea5b06a70cca5b64a7fe721a049542e88c27b7036edcf635a0513cdcab65e31f0bc37cc2532 SHA512 22c9121e4c6a19f922ca5dc596c7172a5481ecb7ddd12fc910ba860b85a5fecf74dfddf925744a82b39e0b16181f700605296baf0c4a1e5277e2fb4a2b386418
-EBUILD mythtv-31.0_p20210225.ebuild 12445 BLAKE2B 0aace4c5922d58204ec859386608b0768c02716478078df7302aa57baa3a49da72f5cfee74697cf2b0b00a4a54c3b3ceb9cf1f4798bf5e74ff92397c68362fec SHA512 d1fb6ade3cd1e8cf12ada4d0bed0a6baff0acc6ff17e8056ce389f057a4114217893eaccdcaecf850a736732cd79e03afc35154718341072d7cb227a110c54c8
+EBUILD mythtv-31.0-r5.ebuild 12344 BLAKE2B 614e5a4b0fda18d861ef3555a69c9af7ca0bbe1bdf2c3611d35c7f04667ad8ef38f6d2d3d3ef751ef4c1538a3937ab236ffa439d8c94b10bc6e4b480ebb6e721 SHA512 ca865900a5df068706f55561b9ebe2023bab5fe223b3defa88979c284693f8c0d154a0ed32bcdb14feb251e9f0d45df286e0a604a33712511596f57ed52d0e5e
+EBUILD mythtv-31.0_p20210225.ebuild 12451 BLAKE2B 16117b87fe94de5a84f6b574d932916e789c049d29590d5fc467d98f2cb68dec08098b3053338f47eee9f151db78eb270fa1ea6ed97978c4c667c64488ed34ad SHA512 a7a1ba693dec2d5ef4f2f8db13ec72575210bbb1c26ff0e8ae08b55566bd776c1133fd2a564c13455f8c7e7a1be699eaf3933c3f2d651da98a0fd1286237b15d
 MISC metadata.xml 2238 BLAKE2B 24444a3132c3eec819a11a2994669f8fb758bb3f62c2605d9fc5ccd9fedf679f8a841322c1250eeed32d86acd0b79d1f186c754dca89f9d93e07ba2f9c7f1e86 SHA512 220828ae331a2d6bcc1b92e88d9bfa82ab714b8ba737099a0b6807c05ec8102878491d372b31cbdbb7fc5ded871dd7deb162a636e1fbe540e2dcab7d80000a36
diff --git a/media-tv/mythtv/mythtv-31.0-r5.ebuild b/media-tv/mythtv/mythtv-31.0-r5.ebuild
index 5c7f46cdf4e9..45f316f6ed08 100644
--- a/media-tv/mythtv/mythtv-31.0-r5.ebuild
+++ b/media-tv/mythtv/mythtv-31.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,7 +37,7 @@ RDEPEND="
 	dev-libs/lzo
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
+	dev-qt/qtgui:5[jpeg]
 	dev-qt/qtnetwork:5
 	dev-qt/qtscript:5
 	dev-qt/qtsql:5[mysql]
diff --git a/media-tv/mythtv/mythtv-31.0_p20210225.ebuild b/media-tv/mythtv/mythtv-31.0_p20210225.ebuild
index afb8c5cb9cc0..fdfb309e826e 100644
--- a/media-tv/mythtv/mythtv-31.0_p20210225.ebuild
+++ b/media-tv/mythtv/mythtv-31.0_p20210225.ebuild
@@ -41,7 +41,7 @@ RDEPEND="
 	dev-libs/lzo
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
+	dev-qt/qtgui:5[jpeg]
 	dev-qt/qtnetwork:5
 	dev-qt/qtscript:5
 	dev-qt/qtsql:5[mysql]
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 15c1b8dd3838..72ffb90fc1fc 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,4 +1,4 @@
 AUX v4l-utils-1.20.0-automagic.patch 1603 BLAKE2B f17cf8a132a96bf48abd33d8dab488c8acb58fe2fdba145c0457e331e0ab40cbc5710e11afb8443dcfd2bc752d8e331b36f4200886c32f9ddff56481633f5c67 SHA512 a603eae9b9bec5f45320cf66f8a6c8dfbc6070505bf0b250d1e4efa6530c7dce1656810c6bf63a83f20a0fd0e039c7150db13b2719947517505619e22b254c32
 DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
-EBUILD v4l-utils-1.20.0.ebuild 2419 BLAKE2B e9736d6b601ae501a4c573f7be2db2411f228a15c113f13c27e318bc5138156fe1263216aca685dfa44f8b2266788425cbb8a9189f79a56d932963945b69ae04 SHA512 e7e48453a880d8beaa3f4ca8e573c2887ce004c6a2e6cc41a1591a2dfaa08ebc54dbbf1ea095736d0767f968d20eb2afc88172f2e075f69f6cadfe6a1374a52e
+EBUILD v4l-utils-1.20.0.ebuild 2446 BLAKE2B d5008b2f3497f10070131a4ea094876d6b9ae289f6bee69e917a91d9e3a62c51286bbb4876c903bfa78ac26ac421dc57246b8312d8c5a9f3bcb3f62906109df0 SHA512 0fd157053cd420889d63b5ef1dcf4933f8c01c46a782dea7fac6db0fa084aa9c6f66ef934fdb643d142565185bab5c2ece18a5036dd492e3ffcbf4ccf3759224
 MISC metadata.xml 322 BLAKE2B 0e97d8cbd1e3c9efd375500604308990419a8a1684241309406bf2516eab3b2c381c3efeb3838715c1f55fa72d906d9e7a05e6130619b7be0235621b63659f5d SHA512 e5f448069693b582de3044925082100a530a1c7e246b3d61a81accaa49918548a48f39b3785e96462c702361409b45d1aa95040dcdc33d742f45126d8531c9d2
diff --git a/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
index 38e272fbe767..6a579d1605e2 100644
--- a/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
@@ -71,9 +71,9 @@ 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" \
+			MOC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/moc" \
+			UIC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/uic" \
+			RCC="$($(tc-getPKG_CONFIG) --variable=host_bins Qt5Core)/rcc" \
 		)
 		if use !opengl; then
 			sed -e 's/Qt5OpenGL/DiSaBlEd/g' -i configure || die