gentoo resync : 15.12.2019

4 files changed, 27 insertions, 28 deletions

diff --git a/media-tv/ivtv-utils/Manifest b/media-tv/ivtv-utils/Manifest
index 8ed625194f92..e60f93557b17 100644
--- a/media-tv/ivtv-utils/Manifest
+++ b/media-tv/ivtv-utils/Manifest
@@ -1,5 +1,5 @@
-AUX ivtv-utils-1.4.0-gentoo.patch 2488 BLAKE2B 348f93c26a97e6f781e5258097cc72c319fcf56b7782dd247b798e86d5c92bbe4044f0759b431d92d9139f725b0324275759affba2cdbb24ad74270fac808339 SHA512 552b98643cef842087a47a6bd88a64d8943770356e8d6860a4c40ab43bd4cc550dd452e783d134cf14ee6e2dd22722257fbebf4b6103c7fee3d678f1ceab09f5
-AUX ivtv-utils-1.4.1-overflow.patch 1762 BLAKE2B 260b519153d319062751fe0d597732b043c943e121c6a7bde3ca69841b83c15dfbccc00654bb9a106a457634fe8a2cd177fce0311e94b9d6af0162df94b47812 SHA512 775acf1bc8b13e811a4aad1d9f7ab3051634e8a7d521a1a594e06262cb9a0d782d55b37bdc93618390253403b5ed98af5756d24522a5f61489401f4ffc71903e
+AUX ivtv-utils-1.4.0-gentoo.patch 2423 BLAKE2B cf0cb7fb1ea7c0d9cd62b6d2fce3e342b45b835b1d27708f431fcc371e5f7763d4fcc3809d3e775a6d6a9b08077825ea5786f948c480e72931e2e7db2339abb0 SHA512 1737dc876704775dbcd361af38dce65711215a25c3e7b5c0f4f447518d9752b3488df308ef82693ce2c7471600527d49c374209bee02e1686575d15cf3ac06cd
+AUX ivtv-utils-1.4.1-overflow.patch 1774 BLAKE2B 7ec6fe101125f367a90f54b771f9ac6bd2179e94986115177e34d2fc294cffd9d893b9aeb15e629f1990c99c5d7d3d6d5b4189d3dac8cc24f572b2b2bab91796 SHA512 5c19bc5420f0e7f1f501b0e117fdd3108799607f380bc8609ccd9126eb6fade4da21a41918f88613127969afd6712ab19bcb2dbc295d93454f5da918609c66eb
 DIST ivtv-utils-1.4.1.tar.gz 189918 BLAKE2B 7880b532ffb3a1ffa13c38b74b57f82a199486ba5bc8e310cb5447ad78d05a0380b51070a0dc67e4f1120d49c8c7d9a2b829e3922585484906efccc4f2b96fb5 SHA512 719c922fb819ba7f0ca3d4bbede571c416dc9f282bd8a7e2fbe7d9b4298541a104f8a848e113379eeec052206658b7a0a2e0eea1b7917e90f2aee37fe0010bed
-EBUILD ivtv-utils-1.4.1.ebuild 901 BLAKE2B ab0c3e482dc27fd84b981e1c74067102bb8958cffdaf641be0df42ae2bc129d5d9f22a2a074867323d8a311a6ae71977ae6872c6b7151588bd65182e77556b55 SHA512 de39ffc9d653bace3d8885159ad902f1c726dcc37d430c03a3bf83c53aa93ab6de5ac7e554eae1aaec8271e246240e778678ce91b66098bd5bc548135d5a565f
+EBUILD ivtv-utils-1.4.1.ebuild 869 BLAKE2B 7d163c5e7a93c37320e7a6bd870e9077b3ad55df0fd968288b10e54bae249e1c96a51795854b721baf0e41ab10dfd8020ccdad5dd582bcc09e5a3f92be5409c7 SHA512 81d1f135939dc1c590cb15c9fcc585ea396efa6bf57604a7cd5912306e898746731e99ebddf563aa47cf6ad37e3e72407a770656f5fad90e7e73b68704194677
 MISC metadata.xml 302 BLAKE2B 98fc025993a88c607187f0b8e9fe7295800fce7a4d0db4378118175be7dd9af2131130e5872b79faf415dd404d635c72524395927e8f5c4e7184d24e75e97937 SHA512 fd8133b38c4139c841e83a26e24cb2695a6f711b0f9a5495d8f9363d9ae32bc26d03e7e1b5a708d549fbe72452af853c5b326b1a2d27cd5dc630bda8a6fed9a2
diff --git a/media-tv/ivtv-utils/files/ivtv-utils-1.4.0-gentoo.patch b/media-tv/ivtv-utils/files/ivtv-utils-1.4.0-gentoo.patch
index 4b75d177e391..5c03e6e737ee 100644
--- a/media-tv/ivtv-utils/files/ivtv-utils-1.4.0-gentoo.patch
+++ b/media-tv/ivtv-utils/files/ivtv-utils-1.4.0-gentoo.patch
@@ -10,8 +10,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=321303
 
 Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
 
---- test/Makefile
-+++ test/Makefile
+--- a/test/Makefile
++++ b/test/Makefile
 @@ -7,13 +7,13 @@
  	ivtv-osd-dma-test ivtv-fb-colormap-test \
  	ivtv-fb-16-bit-test ps-analyzer
@@ -30,8 +30,8 @@ Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
 
  clean: 
  	rm -f *.o $(EXES)
---- utils/Makefile.orig	2010-05-24 15:35:11.321677941 +0000
-+++ utils/Makefile	2010-05-24 15:35:15.595615306 +0000
+--- a/utils/Makefile
++++ b/utils/Makefile
 @@ -9,41 +9,39 @@
  X86_EXES := ivtvplay ivtv-mpegindex #ivtv-encoder
  endif
@@ -86,8 +86,8 @@ Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
  	install -d $(DESTDIR)/$(BINDIR)
  	install -m 0755 $(BIN) $(DESTDIR)/$(BINDIR)
  
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -1,6 +1,6 @@
  all clean install:
 -	make -C utils $@
diff --git a/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-overflow.patch b/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-overflow.patch
index 1c2a66159639..24f24d41acaa 100644
--- a/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-overflow.patch
+++ b/media-tv/ivtv-utils/files/ivtv-utils-1.4.1-overflow.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/339405
 
---- utils/cx25840ctl/cx25840ctl.c
-+++ utils/cx25840ctl/cx25840ctl.c
+--- a/utils/cx25840ctl/cx25840ctl.c
++++ b/utils/cx25840ctl/cx25840ctl.c
 @@ -57,7 +57,7 @@
  		return 0;
  	}
@@ -20,8 +20,8 @@ http://bugs.gentoo.org/339405
  	if ((fp = fopen(sysfile, "r")) != NULL)
  	{
  		fgets(name, sizeof(name), fp);
---- utils/ivtv-ctl.c
-+++ utils/ivtv-ctl.c
+--- a/utils/ivtv-ctl.c
++++ b/utils/ivtv-ctl.c
 @@ -358,7 +358,7 @@
  	__u32 reset = 0;
  	int new_debug_level, gdebug_level;
@@ -49,8 +49,8 @@ http://bugs.gentoo.org/339405
  		if (dowrite(buf, "/sys/module/ivtv/parameters/debug") == 0) {
  			printf(" set debug level: ");
  			print_debug_mask(new_debug_level);
---- utils/v4l2-ctl.cpp
-+++ utils/v4l2-ctl.cpp
+--- a/utils/v4l2-ctl.cpp
++++ b/utils/v4l2-ctl.cpp
 @@ -416,7 +416,7 @@
  {
  	char buf[10];
diff --git a/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild b/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
index 14f05778ee08..637e4c6bad13 100644
--- a/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
+++ b/media-tv/ivtv-utils/ivtv-utils-1.4.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="IVTV utilities for Hauppauge PVR PCI cards"
 HOMEPAGE="http://www.ivtvdriver.org/"
@@ -20,24 +21,22 @@ RDEPEND="${DEPEND}
 		dev-perl/Video-Frequencies
 		dev-perl/Video-ivtv
 		dev-perl/Config-IniFiles
-		virtual/perl-Getopt-Long
 		dev-perl/Tk
-		)"
+		virtual/perl-Getopt-Long
+	)"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.4.0-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.4.1-overflow.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-gentoo.patch
+	"${FILESDIR}"/${PN}-1.4.1-overflow.patch
+)
 
-src_compile() {
+src_configure() {
 	tc-export CC CXX
-	emake
 }
 
 src_install() {
 	emake DESTDIR="${D}" PREFIX="/usr" install
-	dodoc ChangeLog README doc/*
+	dodoc -r ChangeLog README doc/.
 
 	if use perl; then
 		dobin utils/perl/*.pl