gentoo resync : 25.08.2020

6 files changed, 77 insertions, 207 deletions

diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index ca6a32f572a9..b4bd205472fa 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,15 +1,10 @@
 AUX libv4l-1.16.6-gcc10-fno-common.patch 2423 BLAKE2B 6938e2b75b01e3bc3a1cfa03e2e95591848697e60742c4f65f342fa3ddfe5bddebba8d3bb17ab1de7d870592501f897c4e0aa5a6b2c8754bb0ae3c111df8942c SHA512 7b9fad4f640f14484cd0ab42812fb19392e0959a28511fc4343aff7185e181daf0f32c3460ba398dcd703c5ede9bdc00f1765ffb083cc34fdd8649801eec871f
+AUX libv4l-1.20.0-automagic.patch 1603 BLAKE2B f17cf8a132a96bf48abd33d8dab488c8acb58fe2fdba145c0457e331e0ab40cbc5710e11afb8443dcfd2bc752d8e331b36f4200886c32f9ddff56481633f5c67 SHA512 a603eae9b9bec5f45320cf66f8a6c8dfbc6070505bf0b250d1e4efa6530c7dce1656810c6bf63a83f20a0fd0e039c7150db13b2719947517505619e22b254c32
 AUX libv4l-1.6.2-sysmacros.patch 1821 BLAKE2B 9242ec9dccf2b14ab4d3ebc1246035ec3a1816d0b0389577638949cf8e493074132b7c13db6c1ca360ad5e2a2de271166126110d2f237d068185aeb2c3293c4b SHA512 ff6addf5d8e8da4f8502f1af8f21de60c9579da11b3aa3145d42030387bdcdd7c6263d5b6cdcba302ea8b8b3a578dbd17d75e11250d4074df2b6ca59d6de1d55
 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.18.1.tar.bz2 1995211 BLAKE2B 853fd7390ea98bcb833ccf43a9408d2ab7212d87512351bf5f4cbb8e626f18e0b8224b953283eb57a93c4d4de5626ce1f9d896d1a9856623f6322ff2be5bb9a7 SHA512 2e9f77abc2fd65bd6a5508831185a941553441384719293f99ece7e6c53c37bb142eb3719532b11f1cef48df691667d2a4235d920338d672738d40659d499056
-DIST v4l-utils-1.6.2.tar.bz2 1148309 BLAKE2B 8153a1e3803b9e59eae064f2c88e4b865a56193788a8cb204dc34e9ae50e66794ba7f020ad4b0ff9af995f57d9b9a9e0225e0f8a09eeefae42d063131d7e549a SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2
+DIST v4l-utils-1.20.0.tar.bz2 2030419 BLAKE2B 218082b88c42dcb9da3dbdd81b184c0e7402ca7ba35678a2905e16c11db1fe7065a19ec84b5fd57e2ed4718965c3e8097f8e8bdd04a38a485716efe3ec62e42a SHA512 179ca8dbbf7af5fa4870b70f17645d7834fe6ba52670ae6b58473efa257db0cd812ce14f16574cc4491c0bcb218835e4c29f1354882a151687eecec97852fc63
 EBUILD libv4l-1.10.1.ebuild 1400 BLAKE2B 0a109cf4ce02b5698a9eaa3021bb12b462f520ee22fbc3c56a3e4cb2831020db862759b0e0a1b43d2bbb36d89a6b31a3f097415e8939f34b350c263726888cc0 SHA512 2232d3dce5dfb8b2a2d4ffa368e20d920a9c438ed7cdfb850e8e0f1c4c5e20186b5f2f3e30be6d945c8e704d0734dc4dbb411582e8758e2f571841b9a1f23379
-EBUILD libv4l-1.16.3.ebuild 1356 BLAKE2B 0c7992fb2e53bac0255e9d80ad4b7aa3cf320544a48e891a4746001d9b3c69bdfb04ddde99f91b9aa0b5579185048c185f7baebd4acf8bc3e3aafccc9303529c SHA512 395082dc3461936632e96ce65f8eb563cac7741d30247ed7d1d564574b57004278a61f457eff1579215a6c19e3d677a1fb24d3d669bdfdd598eaa16450b75b9c
 EBUILD libv4l-1.16.6.ebuild 1462 BLAKE2B e494bb7c233a67b174834037f94b44473744d02e3f64c81221aa384353d36ab120ce1d84a331e2c833d04119d2d3a5a70982fd9f3fdfaf3d05d2c0d200a557a5 SHA512 026eb18799f282078f861a2f26f1ba81d7b3a6f3d80acfd20d93431c4507ea6f2815f976e625e84074da3f1b951c1b7335f48572d7bc0ad87436ad5eddbdb751
-EBUILD libv4l-1.18.0.ebuild 1465 BLAKE2B 288b6c2258790fd7de0ca36e02842227ba524f8a4d761767896681f2b3d5e791b35eb78042ed726fa005926b38bc8ff6b3b4c7834f691317efcd35665ef4314f SHA512 92c5f1aeb9cee88a219394a48c2eea7981787d255863f51134b24f3f105322392f5cb9d9b256dc0e68444a8c399b807eda5d3cdf77d6c982b668ecf3d93f0c02
-EBUILD libv4l-1.18.1.ebuild 1404 BLAKE2B 67207e0668e0b0eedab52f1cb817282455868047dd19aec889a2eddbae230b153c5c4c5c3da2494f1a07248e4f08e4cfdb4458d467bb0f747bd7c2d9033858e8 SHA512 da23bd79616d78f00aab92ac98142d5e029e5cea80c1a8470d1bd65b6c5695d1f1ebcfa2756f454fcb9c87297dc21f210748b45ffdf7b09ec8b4199c18e7317d
-EBUILD libv4l-1.6.2.ebuild 1371 BLAKE2B 43328abd8eb7cc182aa9c84de92dfc5b9e7635b876f1a662964f4be76aa3b9224f1bfd7a862e905bf4a95ddf3e7ffebaa0148f3ef459863ec9100c5b42b09e59 SHA512 777f7e6f18e9665d1753c0dc85358ffa9319497b077724a214e7388c2560bfeb1ae6dd7400baa947ed961fa6d551ecf441d3184283876609626da418343a50f5
+EBUILD libv4l-1.20.0.ebuild 1516 BLAKE2B 584560890dc0e683597d2911f896e10ba6dedbb550483f9dbfd464eea4f00a622d0451b7bce3375e19ec3709ac750b8ce8b47d877ad5e7bffe9e8e95a21f9eab SHA512 8d2342aaeded0fe008f4d6be287926fdea178961900ecfda56c6b7652b3e4768a72603ef4139240d15ef696399ef112326668233d6207c2ab8284597f4ffb485
 MISC metadata.xml 1116 BLAKE2B 0a5c579aaa12eda3c043a7684a41ef17b8c7ed7411c2639fa3c0df6466f34ad01fa9d18fff1edd65b2bb4b9bf429e1a7c0ef120d75cbae8ea9dcbdbaa5e4b372 SHA512 8bf11a27222e9672c3662a6d807cfda13b5935618289b7acc259db7bfd9a13095b57d881170b7354fa8e971a87e15592e92f8853be18415618df38672a684c41
diff --git a/media-libs/libv4l/files/libv4l-1.20.0-automagic.patch b/media-libs/libv4l/files/libv4l-1.20.0-automagic.patch
new file mode 100644
index 000000000000..017513bcb907
--- /dev/null
+++ b/media-libs/libv4l/files/libv4l-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-libs/libv4l/libv4l-1.16.3.ebuild b/media-libs/libv4l/libv4l-1.16.3.ebuild
deleted file mode 100644
index f5aa891dab97..000000000000
--- a/media-libs/libv4l/libv4l-1.16.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit libtool linux-info multilib-minimal
-
-MY_P="v4l-utils-${PV}"
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
-SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	virtual/libudev[${MULTILIB_USEDEP}]
-	!media-tv/v4l2-ctl
-	!<media-tv/ivtv-utils-1.4.0-r2"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-"
-BDEPEND="virtual/pkgconfig
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	CONFIG_CHECK="~SHMEM"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Hard disable the flags that apply only to the utils.
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--disable-qv4l2 \
-		--disable-qvidcap \
-		--disable-v4l-utils \
-		$(use_with jpeg)
-}
-
-multilib_src_compile() {
-	emake -C lib
-}
-
-multilib_src_install() {
-	emake -j1 -C lib DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog README.lib* TODO
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/media-libs/libv4l/libv4l-1.18.0.ebuild b/media-libs/libv4l/libv4l-1.18.0.ebuild
deleted file mode 100644
index 7d3bcdb76785..000000000000
--- a/media-libs/libv4l/libv4l-1.18.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit libtool linux-info multilib-minimal
-
-MY_P="v4l-utils-${PV}"
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
-SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg"
-
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	!elibc_glibc? ( sys-libs/argp-standalone )
-	virtual/libudev[${MULTILIB_USEDEP}]
-	!media-tv/v4l2-ctl
-	!<media-tv/ivtv-utils-1.4.0-r2"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-"
-BDEPEND="virtual/pkgconfig
-	sys-devel/gettext"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-1.16.6-gcc10-fno-common.patch )
-
-pkg_setup() {
-	CONFIG_CHECK="~SHMEM"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Hard disable the flags that apply only to the utils.
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--disable-qv4l2 \
-		--disable-qvidcap \
-		--disable-v4l-utils \
-		$(use_with jpeg)
-}
-
-multilib_src_compile() {
-	emake -C lib
-}
-
-multilib_src_install() {
-	emake -j1 -C lib DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog README.lib* TODO
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
diff --git a/media-libs/libv4l/libv4l-1.18.1.ebuild b/media-libs/libv4l/libv4l-1.20.0.ebuild
index 19690840ac81..9c2ddcdbbd2e 100644
--- a/media-libs/libv4l/libv4l-1.18.1.ebuild
+++ b/media-libs/libv4l/libv4l-1.20.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit libtool linux-info multilib-minimal
+inherit autotools linux-info multilib-minimal
 
 MY_P="v4l-utils-${PV}"
 
@@ -14,21 +14,31 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
 LICENSE="LGPL-2.1+"
 SLOT="0/0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg"
+IUSE="dvb jpeg"
 
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+RDEPEND="
+	dvb? ( virtual/libudev[${MULTILIB_USEDEP}] )
 	!elibc_glibc? ( sys-libs/argp-standalone )
-	virtual/libudev[${MULTILIB_USEDEP}]
+	jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
 	!media-tv/v4l2-ctl
-	!<media-tv/ivtv-utils-1.4.0-r2"
-DEPEND="${RDEPEND}
-	virtual/os-headers"
+	!<media-tv/ivtv-utils-1.4.0-r2
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
 BDEPEND="
+	sys-devel/gettext
 	virtual/pkgconfig
-	sys-devel/gettext"
+"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-automagic.patch
+)
+
 pkg_setup() {
 	CONFIG_CHECK="~SHMEM"
 	linux-info_pkg_setup
@@ -36,7 +46,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	elibtoolize
+	eautoreconf
 }
 
 multilib_src_configure() {
@@ -44,10 +54,12 @@ multilib_src_configure() {
 	ECONF_SOURCE=${S} \
 	econf \
 		--disable-static \
+		$(use_enable dvb libdvbv5) \
 		--disable-qv4l2 \
 		--disable-qvidcap \
 		--disable-v4l-utils \
-		$(use_with jpeg)
+		$(use_with jpeg) \
+		$(use_with dvb libudev)
 }
 
 multilib_src_compile() {
diff --git a/media-libs/libv4l/libv4l-1.6.2.ebuild b/media-libs/libv4l/libv4l-1.6.2.ebuild
deleted file mode 100644
index 483f176ab6cc..000000000000
--- a/media-libs/libv4l/libv4l-1.6.2.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info ltprune multilib-minimal
-
-MY_P=v4l-utils-${PV}
-
-DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
-HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
-SRC_URI="http://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="jpeg"
-
-# The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg.
-RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
-	!media-tv/v4l2-ctl
-	!<media-tv/ivtv-utils-1.4.0-r2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/os-headers
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	CONFIG_CHECK="~SHMEM"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sysmacros.patch
-}
-
-multilib_src_configure() {
-	# Hard disable the flags that apply only to the utils.
-	ECONF_SOURCE=${S} \
-	econf \
-		--disable-static \
-		--disable-qv4l2 \
-		--disable-v4l-utils \
-		--without-libudev \
-		$(use_with jpeg)
-}
-
-multilib_src_compile() {
-	emake -C lib
-}
-
-multilib_src_install() {
-	emake -j1 -C lib DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog README.lib* TODO
-	prune_libtool_files --all
-}