gentoo resync : 15.12.2019

5 files changed, 48 insertions, 43 deletions

diff --git a/media-libs/libdv/Manifest b/media-libs/libdv/Manifest
index 92bfe394314f..dcbf096694fa 100644
--- a/media-libs/libdv/Manifest
+++ b/media-libs/libdv/Manifest
@@ -1,8 +1,8 @@
-AUX libdv-0.99-2.6.patch 439 BLAKE2B f7c373b2f2a5f36e4a040e0df2bbe4eec95c00f95503274fd8a18c1ac3c3f1beafb5532a53e37492f0fcfcb410d8e0eb1faa6d052fcbf414c2d9e68087b6b5ff SHA512 acc1923c8ef8bde6dcbb9159d5308c4477c5b6dc240bc521500b5cbe4143a69e19897f0b1d571f22a3580aa4e8cd00c00767346317b8b0be57fafd5bf09321cd
-AUX libdv-1.0.0-darwin.patch 1371 BLAKE2B c88fc5d63934b4fe5ac33b7d5d11e15051b266c48b2bf9a8c9fcea118e5bc166328b19d278420e578813f1617c01c16ec2ba2ae55787cf500154823c6b403598 SHA512 e3fc6f247dca712b1d32d9bc5ebafbc7f7bfc4cfe7f0c8cd24082fe866c383933dbc6fdef5d1d54134a55145fe89fdda04521bc6f49eac22f5f56b1b06735240
-AUX libdv-1.0.0-solaris.patch 4318 BLAKE2B 46506a694d6635bbc5ac2f26a470ebe924017e07e0440274ab1831049d9b3b678eec4921ac4b3a6464092409af40487b9c3ab028caeccdf2d1bd865d28069edd SHA512 dc28e7828ec0348b761e47ea2a113412f8ca3a3cf42d2beeaa3a5e5586885fc2b495509b36cf3ac7de82473be86476da46e998d785a11fd2cb6b8a3bf2232647
+AUX libdv-0.99-2.6.patch 360 BLAKE2B 9d50a7db83e137ec132d0f74205acdc91a2c60ac38a57399f73b00c37f2b665766c1f732ebaee4c2854b6e2901b4c00709cbac7d4b34005505daaf778ed207f6 SHA512 0f1d2f9ed2c35d9cd973cd28cde41992bf4e552e478c68af13de23a1abe11de9cc8b48cf307e965ccefc4242d65b6668050059a3fc394a56b5d0fd64518293f7
+AUX libdv-1.0.0-darwin.patch 1387 BLAKE2B 176cf7d2b8d8b6407615782f74a169c7d32d4b4db5d594a486d689a4881568605919bacb2b534436bf5007bed0025f27bb26d0f0232ebbcde9ff08bb5533c40a SHA512 63d65d7cfac1236c43cfb4b271113c8437a4394bf5eecf60761b516d1121e34d8f9690e62c917e2f8e1933a709eed79f3cf5d38e87c9bf9c74b413f3c0115cf9
+AUX libdv-1.0.0-solaris.patch 4334 BLAKE2B 0b1ccd282e6d5b7fbe0a9c8b08e7b256af74559c12e06f35481db64e28d44febc7ac01d0bf70de79359fb11bda31f526072fb686715dcb3f33a552ba6d58f9e8 SHA512 e9a54eb2cbd74ec22d912e868566283365e15b831596b36ed06e20abdc0c87803e5b42d0dee810c2a19f663abf6e7358fdb8335e189b75adeeac8bde7b3e8e98
 DIST libdv-1.0.0-pic.patch.bz2 9771 BLAKE2B b8a597b5fb5facab05845dae1d08a84a17067804ef873b97b7f975a96c622a5cf3b2bbb17d3f5a364dd1aba1afbf3dbf2b18695f9ae8ccf3fcc478b3d7a17a4f SHA512 18fbc341f9a9349f2325c4cbdf2fcf60bf0b35e2efeaacb9a3e541ace4ab2ffcf64d18409b2d76fd40c6096a69ffd151c2bdc8c33411d1640f150202eef12021
 DIST libdv-1.0.0.tar.gz 574565 BLAKE2B 42d17b07501fa508630afd1cdbaee9378f657a4ee4b77666f1a147ddfcf5a9d67d90e0a6da53bfe4f2b5418984579322565c9e8c76516e8193e75bd4751a731c SHA512 19887a6f452fa7da8924901ad841f5c4a434a3bde56c932ddb43717592aa744281e3a8ad220231e11d7e6bc3b0e704952a8324e5f85d4e088675edceeeca7dc8
 EBUILD libdv-1.0.0-r3.ebuild 1096 BLAKE2B a2858bf8bc1d4ddd37865f0ac19482ae5d2274454063cf1d163f926c81fbf4e17b87d483d9c8a3b0a23b7387929fea62c817539825ab05d8b265f117ede66045 SHA512 fb9420f7ef0c7717e6fb3e4d2abc684f0e19cb3c8a9235f19dabfb654b7909ecfd39daea6e845086ff6bf013c3a11843e06ecc82ca7df2e750a79d6b5bff938e
-EBUILD libdv-1.0.0-r4.ebuild 1344 BLAKE2B d0ea18cd95a43244a76a6913f133f68fde55a623988af7de9aa7c6eff70cfe693f3c19497a7b92e2b22e6ef83fc7031726b7f8761ff99e0b9a2e081477985c96 SHA512 6e39e98c1d746ede722d105388867b90ff32eb57e816b287dea6b77d41e4093b52ea993210670f0d98ea2e3a15c1dcf15efc39addb868160486a3b5f1187ffa5
+EBUILD libdv-1.0.0-r4.ebuild 1261 BLAKE2B 4acc813c74d46af4fe0926a5d4d7de71bfb74a17a9ab8934efbfec11bc311d104ebf2a552d6829bbb633c1e20986eec4448d28fa9226ed8a69f2f2cf32fc9643 SHA512 6a2860320d5f2163e5feeb7e05d96f231c2c1f31e71cd41914ad32afcc3763161410f53f94e79186d0a89c05085f2a471f6444b8849c7cffb195d817cac30118
 MISC metadata.xml 298 BLAKE2B 673bcb158cdfda64a33e7d107dfbe978badcbbd44312638f845fe3c1fe481d3060820f587d87277366955e47d65334e1365d87ae3b733ff22e1442bf399336be SHA512 7a9face79c85c9ddf6e562db5fe3c1702c20147adec5564dfb67695e5be198732c57d5592985466432ebf9201704dc848b9e8b73f9483096c942f0c5ecf87cb7
diff --git a/media-libs/libdv/files/libdv-0.99-2.6.patch b/media-libs/libdv/files/libdv-0.99-2.6.patch
index c2663be353d4..f9a5fb1e5fea 100644
--- a/media-libs/libdv/files/libdv-0.99-2.6.patch
+++ b/media-libs/libdv/files/libdv-0.99-2.6.patch
@@ -1,8 +1,8 @@
---- libdv-0.99/libdv/enc_input.c	2002-12-31 23:04:02.000000000 +0000
-+++ libdv-0.99/libdv/enc_input.c.plasmaroo	2003-12-30 16:42:19.000000000 +0000
-@@ -48,13 +48,13 @@
- 
- #if HAVE_DEV_VIDEO
+--- a/libdv/enc_input.c
++++ b/libdv/enc_input.c
+@@ -50,13 +50,13 @@
+ #define _DEVICE_H_
+ #define _LINUX_TIME_H
  #include <sys/types.h>
 -#include <linux/videodev.h>
  #include <sys/time.h>
diff --git a/media-libs/libdv/files/libdv-1.0.0-darwin.patch b/media-libs/libdv/files/libdv-1.0.0-darwin.patch
index c6d48d5a6949..5522e9d7e602 100644
--- a/media-libs/libdv/files/libdv-1.0.0-darwin.patch
+++ b/media-libs/libdv/files/libdv-1.0.0-darwin.patch
@@ -2,8 +2,8 @@
 
 https://sourceforge.net/tracker/index.php?func=detail&aid=2606558&group_id=4393&atid=304393
 
---- configure.ac
-+++ configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -244,7 +244,7 @@
  
  dnl Checks for library functions.
@@ -13,8 +13,8 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=2606558&group_id=4393&
  
  AC_SUBST(ac_aux_dir)
  AC_SUBST(RPM_RELEASE)
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -22621,7 +22621,7 @@
  rm -f conftest.mmap
  
@@ -24,8 +24,8 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=2606558&group_id=4393&
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
  { echo "$as_me:$LINENO: checking for $ac_func" >&5
---- config.h.in
-+++ config.h.in
+--- a/config.h.in
++++ b/config.h.in
 @@ -24,6 +24,12 @@
  /* Define to 1 if you have the `gettimeofday' function. */
  #undef HAVE_GETTIMEOFDAY
@@ -39,8 +39,8 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=2606558&group_id=4393&
  /* Define as 1 if you have gtk */
  #undef HAVE_GTK
  
---- encodedv/dvconnect.c
-+++ encodedv/dvconnect.c
+--- a/encodedv/dvconnect.c
++++ b/encodedv/dvconnect.c
 @@ -860,7 +860,7 @@
  
  int rt_raisepri (int pri)
diff --git a/media-libs/libdv/files/libdv-1.0.0-solaris.patch b/media-libs/libdv/files/libdv-1.0.0-solaris.patch
index e9cb440022af..8580d4ba7fd6 100644
--- a/media-libs/libdv/files/libdv-1.0.0-solaris.patch
+++ b/media-libs/libdv/files/libdv-1.0.0-solaris.patch
@@ -3,8 +3,8 @@
 
 https://sourceforge.net/tracker/index.php?func=detail&aid=2603455&group_id=4393&atid=304393
 
---- configure.ac
-+++ configure.ac
+--- a/configure.ac
++++ b/configure.ac
 @@ -208,6 +208,8 @@
  
  
@@ -23,8 +23,8 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=2603455&group_id=4393&
  
  dnl Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -20895,6 +20895,92 @@
  
  fi
@@ -127,8 +127,8 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=2603455&group_id=4393&
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
---- config.h.in
-+++ config.h.in
+--- a/config.h.in
++++ b/config.h.in
 @@ -30,6 +30,9 @@
  /* Define to 1 if you have the <inttypes.h> header file. */
  #undef HAVE_INTTYPES_H
@@ -139,8 +139,8 @@ https://sourceforge.net/tracker/index.php?func=detail&aid=2603455&group_id=4393&
  /* Define to 1 if you have the `m' library (-lm). */
  #undef HAVE_LIBM
  
---- encodedv/dvconnect.c
-+++ encodedv/dvconnect.c
+--- a/encodedv/dvconnect.c
++++ b/encodedv/dvconnect.c
 @@ -31,6 +31,9 @@
  
  #include <stdio.h>
diff --git a/media-libs/libdv/libdv-1.0.0-r4.ebuild b/media-libs/libdv/libdv-1.0.0-r4.ebuild
index 6788633e8d69..e519ffd56a41 100644
--- a/media-libs/libdv/libdv-1.0.0-r4.ebuild
+++ b/media-libs/libdv/libdv-1.0.0-r4.ebuild
@@ -1,44 +1,47 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit epatch epunt-cxx libtool ltprune flag-o-matic multilib-minimal
+inherit autotools flag-o-matic multilib-minimal
 
 DESCRIPTION="Software codec for dv-format video (camcorders etc)"
 HOMEPAGE="http://libdv.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+SRC_URI="
+	mirror://sourceforge/${PN}/${P}.tar.gz
 	mirror://gentoo/${PN}-1.0.0-pic.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
-RDEPEND="dev-libs/popt"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="dev-libs/popt:="
+DEPEND="
+	${RDEPEND}
+	media-libs/libsdl"
+BDEPEND="virtual/pkgconfig"
 
-DOCS=( AUTHORS ChangeLog INSTALL NEWS TODO )
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.99-2.6.patch
+	"${WORKDIR}"/${PN}-1.0.0-pic.patch
+	"${FILESDIR}"/${PN}-1.0.0-solaris.patch
+	"${FILESDIR}"/${PN}-1.0.0-darwin.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.99-2.6.patch
-	epatch "${WORKDIR}"/${PN}-1.0.0-pic.patch
-	epatch "${FILESDIR}"/${PN}-1.0.0-solaris.patch
-	epatch "${FILESDIR}"/${PN}-1.0.0-darwin.patch
-	elibtoolize
-	epunt_cxx #74497
+	default
+	eautoreconf
 
 	append-cppflags "-I${S}"
 }
 
 multilib_src_configure() {
 	ECONF_SOURCE="${S}"	econf \
-		$(use_enable static-libs static) \
+		--disable-static \
 		--without-debug \
 		--disable-gtk \
-		--disable-gtktest \
 		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+
 	if ! multilib_is_native_abi ; then
 		sed -i \
 			-e 's/ encodedv//' \
@@ -47,6 +50,8 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files --all
 	einstalldocs
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }