gentoo resync : 25.11.2020

4 files changed, 15 insertions, 95 deletions

diff --git a/media-tv/linuxtv-dvb-apps/Manifest b/media-tv/linuxtv-dvb-apps/Manifest
index ce4416e8ee4f..961b5ad3a491 100644
--- a/media-tv/linuxtv-dvb-apps/Manifest
+++ b/media-tv/linuxtv-dvb-apps/Manifest
@@ -1,9 +1,9 @@
 AUX linuxtv-dvb-apps-1.1.1.20100223-alevt.patch 1418 BLAKE2B e8501fc28ae0e2288ad1ebb7f56e7dd61d979294d332fe1df6cb08ba0d3ebd1835dd60b31ffe5e350659080ca75cf0297921ad5a3cd0e4dfe08e12dcfc081fcb SHA512 7490d18c3408bc412a3f3a3bb54544885f863ee146176dd8f9caae624043b5ad797f9fe9edc1ae627fd82b0fdb392e6f458d814e68a11ef4efa253c1add4016d
 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-1.1.1.20140321-gcc10.patch 413 BLAKE2B 0d66160c487ef9f952e1870541c71a3c6c81fdd72dd0bbe16c9495fc618357aef78de0a390953aa80cbbb5e17d89b226eb92a8892a4375ba033f7a43b1af2f69 SHA512 eec40d8917ef2a67fbe3888b0cf44154b1af8fad5363578df87ca3f3bd7a2536c05017c2889676ee5150ae810d71ee6fe156813aa97af0d74dde82ca0ea2a18e
 AUX linuxtv-dvb-apps-glibc-2.31.patch 291 BLAKE2B b03833abf623175e9697a2745e9d99c7510b34e3823b42e4a394739d39a534cb4781a076879c85794fc4f9f703ded73778695b8334324186c4bafb3285d0dbb7 SHA512 efd1e8aa91cdcdff7f17856f13bb8689d3eb0288e2ff45c05bc55b44b32a137854c194cb3ee477a243b5377b44f221481e3323c9caa0065eb551cddf37a89c41
 AUX linuxtv-dvb-apps-no-ca_set_pid.patch 1004 BLAKE2B 36ab3817546d5a832473f4d69a2ce97642f3a6d7d8b17cb036d8976398274c4c9e040cb60a909e8f28f1ff25e6cfbb990dfe0b44b4c729b7e8abe30e645704bc SHA512 1cef92aee99ee03255115e1979b0342bbf9b45bd55c6f9ff6a8529edaf6f3a36c172a145c01706341486aae5d6e0a3fde52b535af97e020cb7009d23e0c9cf72
 DIST linuxtv-dvb-apps-1.1.1.20140321.tar.bz2 368759 BLAKE2B 5ef1bc4ee4f0ab167cda8d87a73c83566b40005e16fbaa79525af4fb0b117dec19a4883eedad8bcfedd269c2e295dd7f9e055f905dff5f39dffe1ff052e87547 SHA512 ceb057f760fa0b3902e6824e74b9392be9a7bd3318a1a83f206c99672da17904060ffdc35e84c89d3b8af60ac29d4427acad44e9ae16797baaeb5738e2ab1bf5
-EBUILD linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild 2197 BLAKE2B cb1b0548cba008ff25916ad12fe7eea67019f44c30b155d24c26824487a661c26ea6657accb562501306dba83bb2cf8cdd5bd3303332ff2b3721a73582f7383b SHA512 82a944c5cef64499ba5fbede59d020f9499ba2d7f375ae9bd1efda0294becd7a8231f2501227277b8a2e7f2d3b110b5e979af46a0743e7bb70c26d256411675d
-EBUILD linuxtv-dvb-apps-1.1.1.20140321.ebuild 2152 BLAKE2B 0e1886a393669ffd430bfe4036f1ea9862a6ad24fc7930873426856ea27b4551a3f02efd628c72edef6533a750ee335f7381b411d5fd430585053fd559c74654 SHA512 6d7462b31af1d4db0b5380c2e2ca8d86574aced20ff2a2a6d6763025f4fbb10ff7946a0055c181e9b3ea5b5ce3371818e6c952e9732bac90a8236ee3ea971a5a
+EBUILD linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild 2255 BLAKE2B 0f6ba014c7aaeac0a91bc2fd451d50a71bc07b1ec0c00b7c5323a669f725c35e888ddc3976369c64bb46bfc8017beffdd436f9375d70e7e40f62a44e38e04746 SHA512 cf5b128c399f142099427efb5b7c307f386c726cbb10492fb78b5aa0bdc1d4804ac8a2811f58e6b6d036d0cdcd76e3c63e2e78f2b1edd4d40307cb9b4397c5a9
 MISC metadata.xml 230 BLAKE2B b1572b7d9c8d7cfb1ad670feba63226e05f2aa6d2de71ad3be92798dc2d1a21678aae2f8f9af6314e2a9fdc5fb1ac9fcac993d9b75a9afa457853888c94b0943 SHA512 1aaabf344edf8981ded68904e05257b579370a589c86b1ea8984378ad6a8ed3daf91c5e9069c07d207d47cf1f70a8039c644dbf6108557ed2053cba9769723ed
diff --git a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20140321-gcc10.patch b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20140321-gcc10.patch
new file mode 100644
index 000000000000..d218183be147
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1.20140321-gcc10.patch
@@ -0,0 +1,11 @@
+https://723420.bugs.gentoo.org/attachment.cgi?id=639692
+--- a/util/alevt/vbi.c
++++ b/util/alevt/vbi.c
+@@ -35,7 +35,6 @@
+ 
+ static u8 *rawbuf; // one common buffer for raw vbi data
+ static int rawbuf_size; // its current size
+-u_int16_t sid;
+ static char *vbi_names[]
+ 	= { "/dev/vbi", "/dev/vbi0", "/dev/video0", "/dev/dvb/adapter0/demux0",
+ 	NULL }; // default device names if none was given at the command line
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
index e0dddee3f36c..821333cff38e 100644
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321-r1.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.1.20100223-perl526.patch
 	"${FILESDIR}"/${PN}-no-ca_set_pid.patch
 	"${FILESDIR}"/${PN}-glibc-2.31.patch
+	"${FILESDIR}"/${PN}-1.1.1.20140321-gcc10.patch
 )
 
 src_prepare() {
@@ -89,5 +90,5 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "/usr/bin/scan has been installed as scan-dvb."
+	elog "${EPREFIX}/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
deleted file mode 100644
index 616e5095aba8..000000000000
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20140321.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs vcs-snapshot
-
-HOMEPAGE="https://www.linuxtv.org/"
-DESCRIPTION="Small utils for DVB to scan, zap, view signal strength"
-SRC_URI="https://www.linuxtv.org/hg/dvb-apps/archive/3d43b280298c.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm 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
-"
-RDEPEND+="
-	media-tv/dtv-scan-tables
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.1.20100223-ldflags.patch
-	"${FILESDIR}"/${PN}-1.1.1.20100223-alevt.patch
-	"${FILESDIR}"/${PN}-1.1.1.20100223-perl526.patch
-	"${FILESDIR}"/${PN}-no-ca_set_pid.patch
-)
-
-src_prepare() {
-	default
-
-	# do not compile test-progs, incompatible with videodev2.h
-	sed -i '/-C test/d' Makefile || die
-
-	# remove copy of header-files
-	rm -rv "${S}"/include/ || die
-}
-
-src_compile() {
-	emake V=1 CC=$(tc-getCC) $(usex usb "ttusb_dec_reset=1" "")
-	use alevt && emake -C util/alevt CC=$(tc-getCC) OPT="${CFLAGS}"
-}
-
-src_install() {
-	emake V=1 prefix="${EPREFIX}/usr" libdir="${EPREFIX}/usr/$(get_libdir)" \
-		$(usex usb "ttusb_dec_reset=1" "") \
-		DESTDIR="${D}" INSTDIR="${T}" install
-
-	if use alevt ; then
-		dodir /usr/share/{applications,man/man1}
-		emake -C util/alevt DESTDIR="${D}" install
-	fi
-
-	# rename scan to scan-dvb
-	mv "${ED}"/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."
-}