gentoo resync : 15.12.2019

4 files changed, 37 insertions, 67 deletions

diff --git a/media-tv/dtv-scan-tables/Manifest b/media-tv/dtv-scan-tables/Manifest
index 8ee97f0ed2e8..9ed27633d672 100644
--- a/media-tv/dtv-scan-tables/Manifest
+++ b/media-tv/dtv-scan-tables/Manifest
@@ -1,5 +1,6 @@
-AUX Makefile.patch 2012 BLAKE2B b9de2e1df4ada602cc824e16abe8bd3ed1c1855052c0ff24bddc86fd646b53e948d619ab9d878d015e009122b6eeddd7f1889f43909dd69f29273d3a175c481b SHA512 346e6d4ae239b223153408362f172d0af1a4aa63bbf6a1b65074d1e7827b03662332a5bc5966370a2bfec197c2f2df1e3d638187754a1dfcf7dc4bbda8476370
 DIST dtv-scan-tables-2017-10-03-c1986d5148d8.tar.bz2 168709 BLAKE2B fb4a7ad5b6892a7e7eed1d57ebb49b1f4493076f6f744953d2d5c51c0e1cf7fdaf864ad050c578c2697f5b11d72c245b96ee369522cb58d38a1a2cef035099a7 SHA512 e2b0cf8f52b536be6a532b4a2896421a8150fdc19613e92c92d0c8275fcfd306cb091db32fa26f97bbec0a51ef4ba61b5f98e8c974280a3f6dd36b67a3bf4aad
+DIST dtv-scan-tables-2019-09-22-f07bde777d4d.tar.bz2 270211 BLAKE2B 76d5250a8eb7e9ce5c83eb9486ea1b398f3565ed027863057f143ae15c196fa01489f17fa71082ac878f49dac653da8967673872cb3e298f99cd59376c82ee39 SHA512 806fadcfc767d09dc9b474af089c2fa68ccafd91e110b74dc47f3a2ea90ebb74f80633831a20a51578fce3fbd4556a23c6bca9f7139be7c3de8eff79d2ee321c
 EBUILD dtv-scan-tables-0_p20171003.ebuild 736 BLAKE2B e97f810aa9a13bf409de4b71a7be136a3ddae6afb724afc3d7b2e1d2041f648158619fa29ddf904288304886c5cec3470c23149f96707c1fc08d6c7af2a05dc5 SHA512 772d083bdb99c78fe8b72c9552919d333a3fd97753e5c4da07cb1c305664deb021c71a19d49ce13101bc8f768970adfe7b1f12b4ed6447100a3a69590735d286
-EBUILD dtv-scan-tables-9999.ebuild 864 BLAKE2B 33ba2e1e329559cc34a217216534ad80f25249ca5f47d45a86bb877ed5babe545465e5429ef5acf639d2bb092ab015cd6b80071b5e6da079df4f8b5cf4f52262 SHA512 56e57caf097145a0c2fce2acad42df479467f87f6842738b4943d8fb2f70ff603a71a3c5d43939ce00f82d9faaf4ecbe6f23637363be73831a18f8749fb2c3a1
+EBUILD dtv-scan-tables-0_p20190922.ebuild 741 BLAKE2B b930164b495b422178137fa20f0758e057e7bdb22aa8e812592a22f70bcb7ec30917dbfcacb833066c93baf38f7874974851dcdb4fb7580cf566865ac255e03e SHA512 c69be11fb400fb39a66e78802d8dd19ac8edd13a79efaea589d42af2c59900778ec35ddec2d8f5029f7c0a6559985018b9c290c57d150d37fb9a663720bb0548
+EBUILD dtv-scan-tables-9999.ebuild 741 BLAKE2B b930164b495b422178137fa20f0758e057e7bdb22aa8e812592a22f70bcb7ec30917dbfcacb833066c93baf38f7874974851dcdb4fb7580cf566865ac255e03e SHA512 c69be11fb400fb39a66e78802d8dd19ac8edd13a79efaea589d42af2c59900778ec35ddec2d8f5029f7c0a6559985018b9c290c57d150d37fb9a663720bb0548
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20190922.ebuild b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20190922.ebuild
new file mode 100644
index 000000000000..73d9b36229da
--- /dev/null
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-0_p20190922.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV#9999} != ${PV} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.linuxtv.org/dtv-scan-tables.git"
+else
+	COMMIT="f07bde777d4d"
+	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}/usr/share/dvb"
+fi
+
+DESCRIPTION="Digital TV scan tables in v3 and v5 format"
+HOMEPAGE="https://linuxtv.org/"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+BDEPEND=">=media-tv/v4l-utils-1.4"
+
+DOCS=( README )
+
+src_compile() {
+	emake dvbv3 dvbv5
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" install install_v3
+	einstalldocs
+}
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 305e482a9150..73d9b36229da 100644
--- a/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
+++ b/media-tv/dtv-scan-tables/dtv-scan-tables-9999.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.linuxtv.org/dtv-scan-tables.git"
 else
-	COMMIT="c1986d5148d8"
+	COMMIT="f07bde777d4d"
 	SRC_URI="https://linuxtv.org/downloads/dtv-scan-tables/dtv-scan-tables-${PV:3:4}-${PV:7:2}-${PV:9:2}-${COMMIT}.tar.bz2"
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}/usr/share/dvb"
@@ -18,18 +18,10 @@ HOMEPAGE="https://linuxtv.org/"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 
-DEPEND=">=media-tv/v4l-utils-1.4"
+BDEPEND=">=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
 }
diff --git a/media-tv/dtv-scan-tables/files/Makefile.patch b/media-tv/dtv-scan-tables/files/Makefile.patch
deleted file mode 100644
index 60c6cde17ef2..000000000000
--- a/media-tv/dtv-scan-tables/files/Makefile.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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
-