cleanup for wrt bug 515636

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 34C2808A)

6 files changed, 9 insertions, 391 deletions

diff --git a/media-tv/linuxtv-dvb-apps/ChangeLog b/media-tv/linuxtv-dvb-apps/ChangeLog
index 45d5a730f8c3..5847192ec9c5 100644
--- a/media-tv/linuxtv-dvb-apps/ChangeLog
+++ b/media-tv/linuxtv-dvb-apps/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-tv/linuxtv-dvb-apps
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/ChangeLog,v 1.52 2014/03/05 18:29:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/ChangeLog,v 1.53 2014/06/29 12:00:47 hd_brummy Exp $
+
+  29 Jun 2014; Joerg Bornkessel <hd_brummy@gentoo.org>
+  -linuxtv-dvb-apps-1.1.1.20060917.ebuild,
+  -linuxtv-dvb-apps-1.1.1.20070114.ebuild,
+  -linuxtv-dvb-apps-1.1.1.20080317.ebuild,
+  -linuxtv-dvb-apps-1.1.1.20100223.ebuild,
+  -files/linuxtv-dvb-apps-20070114-linux-headers-2.6.22.diff:
+  cleanup for wrt bug 515636
 
   05 Mar 2014; Agostino Sarubbo <ago@gentoo.org>
   linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild:
diff --git a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-20070114-linux-headers-2.6.22.diff b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-20070114-linux-headers-2.6.22.diff
deleted file mode 100644
index e54bf141d1b8..000000000000
--- a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-20070114-linux-headers-2.6.22.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru linuxtv-dvb-apps-20070114-orig/lib/libdvbapi/dvbvideo.c linuxtv-dvb-apps-20070114/lib/libdvbapi/dvbvideo.c
---- linuxtv-dvb-apps-20070114-orig/lib/libdvbapi/dvbvideo.c	2007-07-18 10:03:47.902372374 +0200
-+++ linuxtv-dvb-apps-20070114/lib/libdvbapi/dvbvideo.c	2007-07-18 10:04:15.404812842 +0200
-@@ -25,6 +25,7 @@
- #include <fcntl.h>
- #include <unistd.h>
- #include <sys/ioctl.h>
-+#include <linux/types.h>
- #include <linux/dvb/video.h>
- #include <errno.h>
- #include "dvbvideo.h"
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20060917.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20060917.ebuild
deleted file mode 100644
index c303aec3d2c5..000000000000
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20060917.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20060917.ebuild,v 1.10 2010/02/23 20:36:09 zzam Exp $
-
-EAPI="1"
-
-inherit eutils versionator multilib
-
-MY_P="${PN}-$(get_version_component_range 4)"
-
-IUSE="usb"
-SLOT="0"
-HOMEPAGE="http://www.linuxtv.org/"
-DESCRIPTION="small utils for DVB to scan, zap, view signal strength, ..."
-LICENSE="GPL-2"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-KEYWORDS="amd64 ppc x86"
-
-DEPEND="usb? ( virtual/libusb:0 )
-	!dev-db/xbase"
-RDEPEND="${DEPEND}"
-# !dev-db/xbase (bug #208596)
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack()
-{
-	unpack ${A}
-
-	cd "${S}"
-	# disables compilation of ttusb_dec_reset which requires libusb
-	if ! use usb; then
-		sed -i util/Makefile \
-			-e '/ttusb_dec_reset/d' \
-			-e '/dib3000-watch/d'
-	fi
-
-	# do not compile test-progs
-	sed -i Makefile -e '/-C test/d'
-
-	# [QA] Fix library install paths on multilib aware platforms.
-	# (you'd think passing libdir=/usr/$(get_libdir) to emake would work, but
-	# no...)
-	sed -i Make.rules -e "s:\$(prefix)/lib:\$(prefix)/$(get_libdir):g"
-}
-
-src_compile()
-{
-	# interferes with variable in Makefile
-	unset ARCH
-
-	emake bindir=/usr/bin datadir=/usr/share libdir=/usr/lib || die "failed to compile"
-}
-
-src_install()
-{
-	# interferes with variable in Makefile
-	unset ARCH
-
-	insinto /usr/bin
-	emake bindir=/usr/bin datadir=/usr/share libdir=/usr/lib prefix="${D}"/usr \
-		DESTDIR="${D}" INSTDIR="${T}" install || die "install failed"
-
-	# rename scan to dvbscan
-	mv "${D}"/usr/bin/scan "${D}"/usr/bin/dvbscan
-
-	# install scan-files
-	local dir
-	for dir in dvb-{s,c,t} atsc; do
-		insinto /usr/share/dvb/scan/${dir}
-		doins "${S}"/util/scan/${dir}/*
-	done
-
-	# install zap-files
-	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 "${S}"/util/av7110_loadkeys/*.rc*
-
-	# install Documentation
-	dodoc README
-	newdoc util/scan/README README.dvbscan
-	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 "Please read the documentation in /usr/share/doc/${PF}."
-	elog "The channel lists and other files are installed in"
-	elog "/usr/share/dvb"
-	elog
-	elog "The scanning utility is now installed as dvbscan."
-}
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild
deleted file mode 100644
index 3345eae7d940..000000000000
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070114.ebuild,v 1.13 2012/02/15 18:27:38 hd_brummy Exp $
-
-EAPI="1"
-
-inherit eutils versionator multilib
-
-MY_P="${PN}-$(get_version_component_range 4)"
-
-IUSE="usb"
-SLOT="0"
-HOMEPAGE="http://www.linuxtv.org/"
-DESCRIPTION="small utils for DVB to scan, zap, view signal strength, ..."
-LICENSE="GPL-2"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="usb? ( virtual/libusb:0 )
-	!dev-db/xbase"
-DEPEND="${RDEPEND}
-	virtual/linuxtv-dvb-headers"
-# !dev-db/xbase (bug #208596)
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack()
-{
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/${MY_P}-linux-headers-2.6.22.diff"
-
-	# disables compilation of ttusb_dec_reset which requires libusb
-	if ! use usb; then
-		sed -i util/Makefile \
-			-e '/ttusb_dec_reset/d' \
-			-e '/dib3000-watch/d'
-	fi
-
-	# do not compile test-progs
-	sed -i Makefile -e '/-C test/d'
-
-	# remove copy of header-files
-	rm -rf "${S}"/include
-}
-
-src_compile()
-{
-	# interferes with variable in Makefile
-	unset ARCH
-
-	emake bindir=/usr/bin datadir=/usr/share libdir=/usr/$(get_libdir) || die "failed to compile"
-}
-
-src_install()
-{
-	# interferes with variable in Makefile
-	unset ARCH
-
-	insinto /usr/bin
-	emake bindir=/usr/bin datadir=/usr/share libdir=/usr/$(get_libdir) prefix=/usr \
-		DESTDIR="${D}" INSTDIR="${T}" install || die "install failed"
-
-	# rename scan to dvbscan
-	mv "${D}"/usr/bin/scan "${D}"/usr/bin/dvbscan
-
-	# install scan-files
-	local dir
-	for dir in dvb-{s,c,t} atsc; do
-		insinto /usr/share/dvb/scan/${dir}
-		doins "${S}"/util/scan/${dir}/*
-	done
-
-	# install zap-files
-	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 "${S}"/util/av7110_loadkeys/*.rc*
-
-	# install Documentation
-	dodoc README
-	newdoc util/scan/README README.dvbscan
-	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 "Please read the documentation in /usr/share/doc/${PF}."
-	elog "The channel lists and other files are installed in"
-	elog "/usr/share/dvb"
-	elog
-	elog "The scanning utility is now installed as dvbscan."
-}
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20080317.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20080317.ebuild
deleted file mode 100644
index 76666c872beb..000000000000
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20080317.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20080317.ebuild,v 1.7 2012/02/15 18:27:38 hd_brummy Exp $
-
-EAPI="1"
-
-inherit eutils versionator multilib
-
-MY_P="${PN}-$(get_version_component_range 4)"
-
-IUSE="usb"
-SLOT="0"
-HOMEPAGE="http://www.linuxtv.org/"
-DESCRIPTION="small utils for DVB to scan, zap, view signal strength, ..."
-LICENSE="GPL-2"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-KEYWORDS="amd64 ppc x86"
-
-RDEPEND="usb? ( virtual/libusb:0 )
-	!dev-db/xbase"
-DEPEND="${RDEPEND}
-	virtual/linuxtv-dvb-headers"
-# !dev-db/xbase (bug #208596)
-
-S="${WORKDIR}/dvb-apps-3cde3460d120"
-
-src_unpack()
-{
-	unpack ${A}
-
-	cd "${S}"
-
-	# disables compilation of ttusb_dec_reset which requires libusb
-	if ! use usb; then
-		sed -i util/Makefile \
-			-e '/ttusb_dec_reset/d' \
-			-e '/dib3000-watch/d'
-	fi
-
-	# do not compile test-progs
-	sed -i Makefile -e '/-C test/d'
-
-	# remove copy of header-files
-	rm -rf "${S}"/include
-}
-
-src_compile()
-{
-	# interferes with variable in Makefile
-	unset ARCH
-
-	emake bindir=/usr/bin datadir=/usr/share libdir=/usr/$(get_libdir) || die "failed to compile"
-}
-
-src_install()
-{
-	# interferes with variable in Makefile
-	unset ARCH
-
-	insinto /usr/bin
-	emake bindir=/usr/bin datadir=/usr/share libdir=/usr/$(get_libdir) prefix=/usr \
-		DESTDIR="${D}" INSTDIR="${T}" install || die "install failed"
-
-	# rename scan to dvbscan
-	mv "${D}"/usr/bin/scan "${D}"/usr/bin/dvbscan
-
-	# install zap-files
-	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 "${S}"/util/av7110_loadkeys/*.rc*
-
-	# install Documentation
-	dodoc README
-	newdoc util/scan/README README.dvbscan
-	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 "Please read the documentation in /usr/share/doc/${PF}."
-	elog "The channel lists and other files are installed in"
-	elog "/usr/share/dvb"
-	elog
-	elog "The scanning utility is now installed as dvbscan."
-}
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223.ebuild
deleted file mode 100644
index 8792469f57e7..000000000000
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20100223.ebuild,v 1.4 2012/02/15 18:27:38 hd_brummy Exp $
-
-EAPI="1"
-
-inherit eutils versionator multilib
-
-MY_P="${PN}-$(get_version_component_range 4)"
-
-IUSE="usb"
-SLOT="0"
-HOMEPAGE="http://www.linuxtv.org/"
-DESCRIPTION="small utils for DVB to scan, zap, view signal strength, ..."
-LICENSE="GPL-2"
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="usb? ( virtual/libusb:0 )
-	!dev-db/xbase"
-DEPEND="${RDEPEND}
-	virtual/linuxtv-dvb-headers"
-# !dev-db/xbase (bug #208596)
-
-S="${WORKDIR}/dvb-apps-7de0663facd9"
-
-src_unpack()
-{
-	unpack ${A}
-
-	cd "${S}"
-
-	# do not compile test-progs
-	sed -i Makefile -e '/-C test/d'
-
-	# remove copy of header-files
-	rm -rf "${S}"/include
-}
-
-src_compile()
-{
-	# ttusb_dec_reset requires libusb
-	myopts=""
-	use usb && myopts="${myopts} ttusb_dec_reset=1"
-
-	emake bindir=/usr/bin datadir=/usr/share libdir=/usr/$(get_libdir) \
-		${myopts} || die "failed to compile"
-}
-
-src_install()
-{
-	insinto /usr/bin
-	emake bindir=/usr/bin datadir=/usr/share libdir=/usr/$(get_libdir) prefix=/usr \
-		DESTDIR="${D}" INSTDIR="${T}" ${myopts} install || die "install failed"
-
-	# rename scan to dvbscan
-	mv "${D}"/usr/bin/scan "${D}"/usr/bin/dvbscan
-
-	# install zap-files
-	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 "${S}"/util/av7110_loadkeys/*.rc*
-
-	# install Documentation
-	dodoc README
-	newdoc util/scan/README README.dvbscan
-	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 "Please read the documentation in /usr/share/doc/${PF}."
-	elog "The channel lists and other files are installed in"
-	elog "/usr/share/dvb"
-	elog
-	elog "The scanning utility is now installed as dvbscan."
-}