gentoo resync : 25.08.2020

5 files changed, 88 insertions, 156 deletions

diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index 424ef54fb874..47c8f06385d9 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,12 +1,10 @@
 AUX v4l-utils-1.16.6-gcc10-fno-common.patch 2423 BLAKE2B 6938e2b75b01e3bc3a1cfa03e2e95591848697e60742c4f65f342fa3ddfe5bddebba8d3bb17ab1de7d870592501f897c4e0aa5a6b2c8754bb0ae3c111df8942c SHA512 7b9fad4f640f14484cd0ab42812fb19392e0959a28511fc4343aff7185e181daf0f32c3460ba398dcd703c5ede9bdc00f1765ffb083cc34fdd8649801eec871f
+AUX v4l-utils-1.20.0-automagic.patch 1603 BLAKE2B f17cf8a132a96bf48abd33d8dab488c8acb58fe2fdba145c0457e331e0ab40cbc5710e11afb8443dcfd2bc752d8e331b36f4200886c32f9ddff56481633f5c67 SHA512 a603eae9b9bec5f45320cf66f8a6c8dfbc6070505bf0b250d1e4efa6530c7dce1656810c6bf63a83f20a0fd0e039c7150db13b2719947517505619e22b254c32
 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
-DIST v4l-utils-1.18.0.tar.bz2 1995506 BLAKE2B 35cd138c88960e5b02431c408a43905a73ea6a7650a939abc2250e1f219bda1437262a7083d90d8b4d39c5bd2cce5f6fc590b8dc09a8738fb5baf55266256b94 SHA512 749c804671f039d907bf782cba5d1c23fff48066f3b6d4a0249fb9b65c493ee3945b544ee2a306dda79973da04f0301278ee88775f798aba590e5d0f15226d49
+DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
 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
+EBUILD v4l-utils-1.20.0.ebuild 2067 BLAKE2B 6b5ee3a762345d2574258becfa815188868e78058fb700df786f8e1308d42ba3ff8e6cd0f66076273ae9503e009ef7ae299d3c161c5633a93b2e53a05e0a4257 SHA512 01c38429c9e2cca3c7d39599da9b35978d39c4f36c6c701612c1ce573d1e74f419f991957e702f5b1646088f3e7bf3b1699020d38a9866b85f3a1d07201b12b4
 MISC metadata.xml 322 BLAKE2B 0e97d8cbd1e3c9efd375500604308990419a8a1684241309406bf2516eab3b2c381c3efeb3838715c1f55fa72d906d9e7a05e6130619b7be0235621b63659f5d SHA512 e5f448069693b582de3044925082100a530a1c7e246b3d61a81accaa49918548a48f39b3785e96462c702361409b45d1aa95040dcdc33d742f45126d8531c9d2
diff --git a/media-tv/v4l-utils/files/v4l-utils-1.20.0-automagic.patch b/media-tv/v4l-utils/files/v4l-utils-1.20.0-automagic.patch
new file mode 100644
index 000000000000..017513bcb907
--- /dev/null
+++ b/media-tv/v4l-utils/files/v4l-utils-1.20.0-automagic.patch
@@ -0,0 +1,52 @@
+From e018720a49b96535613ca9173750ce2271608cd5 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 23 Aug 2020 16:33:21 +0100
+Subject: [PATCH] configure.ac: Add --without-libudev option to avoid automagic
+ dep
+
+Signed-off-by: James Le Cuirot <chewi@gentoo.org>
+---
+ configure.ac | 27 +++++++++++++++++----------
+ 1 file changed, 17 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d9f43ab5..e6134d08 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -291,16 +291,23 @@ else
+    AC_MSG_WARN(ALSA library not available)
+ fi
+ 
+-PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, have_libudev=no)
+-if test "x$have_libudev" = "xyes"; then
+-	AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev])
+-	LIBUDEV_CFLAGS="$libudev_CFLAGS"
+-	LIBUDEV_LIBS="$libudev_LIBS"
+-	AC_SUBST(LIBUDEV_CFLAGS)
+-	AC_SUBST(LIBUDEV_LIBS)
+-else
+-   AC_MSG_WARN(udev library not available)
+-fi
++AC_ARG_WITH([libudev],
++            AS_HELP_STRING([--without-libudev], [Do not use udev library]),
++            [],
++            [with_libudev=yes])
++
++have_libudev=no
++
++AS_IF([test "x$with_libudev" != xno -o "x$enable_libdvbv5" != xno],
++      [PKG_CHECK_MODULES(libudev, libudev, have_libudev=yes, [])
++       AS_IF([test "x$have_libudev" = xyes],
++             [AC_DEFINE([HAVE_LIBUDEV], [], [Use libudev])
++              LIBUDEV_CFLAGS="$libudev_CFLAGS"
++              LIBUDEV_LIBS="$libudev_LIBS"
++              AC_SUBST(LIBUDEV_CFLAGS)
++              AC_SUBST(LIBUDEV_LIBS)],
++             AC_MSG_WARN(udev library not available)
++            )])
+ 
+ AC_SUBST([JPEG_LIBS])
+ 
+-- 
+2.26.2
+
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
deleted file mode 100644
index 0a929df32fb6..000000000000
--- a/media-tv/v4l-utils/v4l-utils-1.16.3-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 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="amd64 ~arm ~arm64 ~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"
-
-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; }
diff --git a/media-tv/v4l-utils/v4l-utils-1.16.3.ebuild b/media-tv/v4l-utils/v4l-utils-1.16.3.ebuild
deleted file mode 100644
index c17b61ef7427..000000000000
--- a/media-tv/v4l-utils/v4l-utils-1.16.3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 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 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="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=
-	virtual/libelf:=
-	!media-tv/v4l2-ctl
-	!<media-tv/ivtv-utils-1.4.0-r2"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-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) \
-		--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; }
diff --git a/media-tv/v4l-utils/v4l-utils-1.18.0.ebuild b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
index 777a22b6a552..01f52bb05556 100644
--- a/media-tv/v4l-utils/v4l-utils-1.18.0.ebuild
+++ b/media-tv/v4l-utils/v4l-utils-1.20.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit flag-o-matic udev xdg-utils
+
+inherit autotools flag-o-matic udev xdg
 
 DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
 HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
@@ -11,27 +12,44 @@ 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"
+IUSE="+bpf dvb opengl qt5 +udev"
 
-RDEPEND=">=media-libs/libv4l-${PV}[jpeg]
+RDEPEND="
+	>=media-libs/libv4l-${PV}[dvb?,jpeg]
+	>=virtual/jpeg-0-r2:0=
+	bpf? ( virtual/libelf:= )
+	udev? ( virtual/libudev )
 	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}"
+	!<media-tv/ivtv-utils-1.4.0-r2
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
 BDEPEND="
-	bpf? ( sys-devel/clang:*[llvm_targets_BPF] )
 	sys-devel/gettext
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	bpf? ( sys-devel/clang:*[llvm_targets_BPF] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-automagic.patch
+)
 
-PATCHES=( "${FILESDIR}"/${PN}-1.16.6-gcc10-fno-common.patch )
+# Not really prebuilt but BPF objects make our QA checks go crazy.
+QA_PREBUILT="*/rc_keymaps/protocols/*.o"
+
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
 	if use qt5; then
@@ -45,14 +63,17 @@ src_configure() {
 			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 dvb libdvbv5) \
 		$(use_enable qt5 qv4l2) \
 		$(use_enable qt5 qvidcap) \
 		$(use_enable bpf) \
-		--with-udevdir="$(get_udevdir)" \
 		--with-jpeg \
+		$(use_with udev libudev) \
+		--with-udevdir="$(get_udevdir)" \
 		"${qt5_paths[@]}"
 }
 
@@ -66,6 +87,3 @@ src_install() {
 	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; }