gentoo resync : 19.07.2019

3 files changed, 68 insertions, 4 deletions

diff --git a/media-tv/dtv-scan-tables/Manifest b/media-tv/dtv-scan-tables/Manifest
index 9f6a5186ec37..8ee97f0ed2e8 100644
--- a/media-tv/dtv-scan-tables/Manifest
+++ b/media-tv/dtv-scan-tables/Manifest
@@ -1,4 +1,5 @@
+AUX Makefile.patch 2012 BLAKE2B b9de2e1df4ada602cc824e16abe8bd3ed1c1855052c0ff24bddc86fd646b53e948d619ab9d878d015e009122b6eeddd7f1889f43909dd69f29273d3a175c481b SHA512 346e6d4ae239b223153408362f172d0af1a4aa63bbf6a1b65074d1e7827b03662332a5bc5966370a2bfec197c2f2df1e3d638187754a1dfcf7dc4bbda8476370
 DIST dtv-scan-tables-2017-10-03-c1986d5148d8.tar.bz2 168709 BLAKE2B fb4a7ad5b6892a7e7eed1d57ebb49b1f4493076f6f744953d2d5c51c0e1cf7fdaf864ad050c578c2697f5b11d72c245b96ee369522cb58d38a1a2cef035099a7 SHA512 e2b0cf8f52b536be6a532b4a2896421a8150fdc19613e92c92d0c8275fcfd306cb091db32fa26f97bbec0a51ef4ba61b5f98e8c974280a3f6dd36b67a3bf4aad
 EBUILD dtv-scan-tables-0_p20171003.ebuild 736 BLAKE2B e97f810aa9a13bf409de4b71a7be136a3ddae6afb724afc3d7b2e1d2041f648158619fa29ddf904288304886c5cec3470c23149f96707c1fc08d6c7af2a05dc5 SHA512 772d083bdb99c78fe8b72c9552919d333a3fd97753e5c4da07cb1c305664deb021c71a19d49ce13101bc8f768970adfe7b1f12b4ed6447100a3a69590735d286
-EBUILD dtv-scan-tables-9999.ebuild 742 BLAKE2B 2b051afd0c0fd13514330eb0bef4e05ef2cd5fc12aea4c56905bf1f431d9181938dc26a0161c105e12daa7cb819b1ee68d70d0585000913b8dbde52fd5c5cc6a SHA512 e8c072d25cfa7262faa3ab2e1d597b523a50eb42f7b3c68ab62b8d9e5a3fa237d380012aa9daa83e03aee4e3bbd09e037fcce0906f8e34d9971453322c91ac8c
+EBUILD dtv-scan-tables-9999.ebuild 864 BLAKE2B 33ba2e1e329559cc34a217216534ad80f25249ca5f47d45a86bb877ed5babe545465e5429ef5acf639d2bb092ab015cd6b80071b5e6da079df4f8b5cf4f52262 SHA512 56e57caf097145a0c2fce2acad42df479467f87f6842738b4943d8fb2f70ff603a71a3c5d43939ce00f82d9faaf4ecbe6f23637363be73831a18f8749fb2c3a1
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
index c4ec5b113aae..305e482a9150 100644
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV#9999} != ${PV} ]]; then
 	inherit git-r3
@@ -20,13 +20,21 @@ SLOT="0"
 
 DEPEND=">=media-tv/v4l-utils-1.4"
 
+PATCHES=( "${FILESDIR}"/Makefile.patch )
 DOCS=( README )
 
+src_prepare() {
+	default
+
+	# Conversion failure!
+	rm -v dvb-t/ke-Nairobi || die
+}
+
 src_compile() {
 	emake dvbv3 dvbv5
 }
 
 src_install() {
-	emake PREFIX="${ED}usr" install install_v3
+	emake PREFIX="${ED}/usr" install install_v3
 	einstalldocs
 }
diff --git a/media-tv/dtv-scan-tables/files/Makefile.patch b/media-tv/dtv-scan-tables/files/Makefile.patch
new file mode 100644
index 000000000000..60c6cde17ef2
--- /dev/null
+++ b/media-tv/dtv-scan-tables/files/Makefile.patch
@@ -0,0 +1,55 @@
+From 17049393c60503d305787d06b7137227a99ed2af Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sat, 13 Jul 2019 16:23:23 +0100
+Subject: [PATCH] Improve Makefile to avoid "Argument list too long" error
+
+I wouldn't expect a foreach loop to be prone to this issue but it's
+not the right way to write a Makefile anyway.
+
+Note that conversion failures are now fatal and the dvb-t/ke-Nairobi
+file is failing to convert at the moment.
+
+Signed-off-by: James Le Cuirot <chewi@gentoo.org>
+---
+ Makefile | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 901dc9d..7cdb5bc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -17,6 +17,8 @@ DVBV3DIRS = atsc dvb-c dvb-s dvb-t
+ DVBV5DIRS = $(DVBV3DIRS) isdb-t
+ 
+ DVBV3CHANNELFILES = $(foreach dir,$(DVBV3DIRS),$(wildcard $(dir)/*))
++DVBV3OUTPUTFILES = $(patsubst %,$(DVBV3OUTPUTDIR)/%,$(DVBV3CHANNELFILES))
++DVBV5OUTPUTFILES = $(patsubst %,$(DVBV5OUTPUTDIR)/%,$(DVBV3CHANNELFILES))
+ 
+ DVBFORMATCONVERT_CHANNEL_DVBV5 = -ICHANNEL -ODVBV5
+ DVBFORMATCONVERT_CHANNEL_DVBV3 = -IDVBV5 -OCHANNEL
+@@ -42,14 +44,16 @@ ifeq ($(DVBV3DIR),)
+ DVBV3DIR = dvbv3
+ endif
+ 
+-dvbv3:
+-	@$(foreach var,$(DVBV3DIRS), $(MKDIR) $(DVBV3OUTPUTDIR)/$(var);)
+-	@$(foreach var,$(DVBV3CHANNELFILES), $(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV3) $(var) $(DVBV3OUTPUTDIR)/$(var);)
++$(DVBV3OUTPUTFILES): $(DVBV3OUTPUTDIR)/%: %
++	@$(MKDIR) "$(dir $@)"
++	@$(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV3) "$<" "$@"
+ 
++$(DVBV5OUTPUTFILES): $(DVBV5OUTPUTDIR)/%: $(DVBV3OUTPUTDIR)/%
++	@$(MKDIR) "$(dir $@)"
++	@$(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV5) "$<" "$@"
+ 
+-dvbv5: $(DVBV3OUTPUTDIR)
+-	@$(foreach var,$(DVBV3DIRS), $(MKDIR) $(DVBV5OUTPUTDIR)/$(var);)
+-	@$(foreach var,$(DVBV3CHANNELFILES), $(DVBFORMATCONVERT) $(DVBFORMATCONVERT_CHANNEL_DVBV5) $(DVBV3OUTPUTDIR)/$(var) $(DVBV5OUTPUTDIR)/$(var);)
++dvbv3: $(DVBV3OUTPUTFILES)
++dvbv5: $(DVBV5OUTPUTFILES)
+ 
+ install:
+ 	@mkdir -p $(DATADIR)/$(DVBV5DIR)
+-- 
+2.21.0
+