gentoo resync : 03.03.2019

3 files changed, 2 insertions, 93 deletions

diff --git a/media-tv/linuxtv-dvb-apps/Manifest b/media-tv/linuxtv-dvb-apps/Manifest
index 25195396e1f0..d97f80705f1f 100644
--- a/media-tv/linuxtv-dvb-apps/Manifest
+++ b/media-tv/linuxtv-dvb-apps/Manifest
@@ -2,8 +2,6 @@ AUX linuxtv-dvb-apps-1.1.1.20100223-alevt.patch 1418 BLAKE2B e8501fc28ae0e2288ad
 AUX linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch 607 BLAKE2B ea2f229d1ab2d0f5df3541b85a90caa06c25e7296b5d77dfb572ac5b261efd4b61e4022ca0ee80fe31be7046b47090ea2e7457710e762ad2eecbc5165db2996b SHA512 abaf61336531e33148a8a0d5d4dfa545a607b077430e6e9ae363a667524fcf3d41e5fec1112e795dcf6be5160a8ef57049b224dac42b1211d3ea3b9f865dba48
 AUX linuxtv-dvb-apps-1.1.1.20100223-perl526.patch 519 BLAKE2B 1546d43af3d337062d1a454e79be0d70349c91950e55ce66e84e75092277d50a7c327eef48bd85239ccb86c8284a6393cd77b173b895956e66af17d625a767d3 SHA512 73fea472e484f41d9c3eb676628dc2765081c92202823c03489d866534cdfef81559205cdb7f0e4578f217e0b0102ee94ed1faf56b7c3a3eb8c4c7d9dfc1b1e8
 AUX linuxtv-dvb-apps-no-ca_set_pid.patch 1004 BLAKE2B 36ab3817546d5a832473f4d69a2ce97642f3a6d7d8b17cb036d8976398274c4c9e040cb60a909e8f28f1ff25e6cfbb990dfe0b44b4c729b7e8abe30e645704bc SHA512 1cef92aee99ee03255115e1979b0342bbf9b45bd55c6f9ff6a8529edaf6f3a36c172a145c01706341486aae5d6e0a3fde52b535af97e020cb7009d23e0c9cf72
-DIST linuxtv-dvb-apps-1.1.1.20100223.tar.bz2 429129 BLAKE2B d67eb79f89243e73528ce1e79935031f9afb7270c4c22a8670f3c48b75d7ddbe0efe1188b77851b875f78a35419186b7015b82e335063751eecd1f9eacc72947 SHA512 0950197e2a199b1ab4392fa2e893d9b537d2b8fed05b24d8b81a2abf11ed2373dcb299a51e217c6508ea68b81691728b120328e4080de68519449fc5fd506161
 DIST linuxtv-dvb-apps-1.1.1.20140321.tar.bz2 368759 BLAKE2B 5ef1bc4ee4f0ab167cda8d87a73c83566b40005e16fbaa79525af4fb0b117dec19a4883eedad8bcfedd269c2e295dd7f9e055f905dff5f39dffe1ff052e87547 SHA512 ceb057f760fa0b3902e6824e74b9392be9a7bd3318a1a83f206c99672da17904060ffdc35e84c89d3b8af60ac29d4427acad44e9ae16797baaeb5738e2ab1bf5
-EBUILD linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild 2032 BLAKE2B 2c48c887e58d67763ab08ffa86261a111ad8f0152d34e78a2b130a85769334a1b7bbb77087489718dc82d4741c2599855c949048af6a4b4da3154b6609775c54 SHA512 9e65d54aa3cc1443a524f79d35b77037618255d47b25c97d9a8d7c807b35299d44e85d041be4b3f0f76a293195d3be0b6846762f85e5dda3e6e774d95f2047d1
-EBUILD linuxtv-dvb-apps-1.1.1.20140321.ebuild 2153 BLAKE2B beb6ee581d9e93855b85bc3036037d03263485f21e108a1f65afaacada3d732a99db04393f6ed9d3c5440d27cead04da68da575ceb45bdc83db5ebb7a00d0f50 SHA512 7b2d643ad63d63f4b08eef7f7986819c86a80911a29a64a97cfda7d98c18bb0c1d20e24f94f544578484656f91823de1ac6e857f93f9325b0ca250da01ab03fc
+EBUILD linuxtv-dvb-apps-1.1.1.20140321.ebuild 2152 BLAKE2B 0e1886a393669ffd430bfe4036f1ea9862a6ad24fc7930873426856ea27b4551a3f02efd628c72edef6533a750ee335f7381b411d5fd430585053fd559c74654 SHA512 6d7462b31af1d4db0b5380c2e2ca8d86574aced20ff2a2a6d6763025f4fbb10ff7946a0055c181e9b3ea5b5ce3371818e6c952e9732bac90a8236ee3ea971a5a
 MISC metadata.xml 230 BLAKE2B b1572b7d9c8d7cfb1ad670feba63226e05f2aa6d2de71ad3be92798dc2d1a21678aae2f8f9af6314e2a9fdc5fb1ac9fcac993d9b75a9afa457853888c94b0943 SHA512 1aaabf344edf8981ded68904e05257b579370a589c86b1ea8984378ad6a8ed3daf91c5e9069c07d207d47cf1f70a8039c644dbf6108557ed2053cba9769723ed
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild
deleted file mode 100644
index 1cb348724186..000000000000
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-HOMEPAGE="https://www.linuxtv.org/"
-DESCRIPTION="Small utils for DVB to scan, zap, view signal strength, ..."
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="alevt usb"
-
-RDEPEND="
-	alevt? (
-		!media-video/alevt
-		media-libs/libpng:0=
-		media-libs/zvbi[v4l]
-		sys-libs/zlib
-		x11-libs/libX11
-	)
-	usb? ( virtual/libusb:0 )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	virtual/linuxtv-dvb-headers
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-alevt.patch \
-		"${FILESDIR}"/${P}-perl526.patch
-
-	# do not compile test-progs, incompatible with videodev2.h
-	sed -e '/-C test/d' \
-		-i Makefile || die
-
-	# remove copy of header-files
-	rm -rf "${S}"/include || die
-}
-
-src_compile() {
-	emake V=1 CC=$(tc-getCC) $(usex usb "ttusb_dec_reset=1" "")
-	if use alevt ; then
-		emake -C util/alevt CC=$(tc-getCC) OPT="${CFLAGS}"
-	fi
-}
-
-src_install() {
-	insinto /usr/bin
-	emake V=1 prefix="${EROOT}usr" libdir="${EROOT}usr/$(get_libdir)" \
-		$(usex usb "ttusb_dec_reset=1" "") \
-		DESTDIR="${D}" INSTDIR="${T}" install
-	if use alevt ; then
-		dodir /usr/share/applications
-		dodir /usr/share/man/man1
-		emake -C util/alevt DESTDIR="${D}" install
-	fi
-
-	# rename scan to scan-dvb
-	mv "${D}"/usr/bin/scan{,-dvb} || die
-
-	# install zap-files
-	local dir=""
-	for dir in dvb-{s,c,t} atsc ; do
-		insinto /usr/share/dvb/zap/${dir}
-		doins "${S}"/util/szap/channels-conf/${dir}/*
-	done
-
-	# install remote-key files
-	insinto /usr/share/dvb/av7110_loadkeys
-	doins util/av7110_loadkeys/*.rc*
-
-	# install Documentation
-	dodoc README
-	newdoc util/scan/README README.scan-dvb
-	newdoc util/szap/README README.zap
-	newdoc util/av7110_loadkeys/README README.av7110_loadkeys
-
-	use usb && newdoc util/ttusb_dec_reset/README README.ttusb_dec_reset
-}
-
-pkg_postinst() {
-	elog "/usr/bin/scan has been installed as scan-dvb."
-}
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild
index c48c28e70acf..616e5095aba8 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 -> ${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="alevt usb"
 
 RDEPEND="