cleanup for wrt bug 515636

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x34C2808A

7 files changed, 14 insertions, 414 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/Manifest b/media-tv/linuxtv-dvb-apps/Manifest
index 3d2d426efc30..4bfb623d1562 100644
--- a/media-tv/linuxtv-dvb-apps/Manifest
+++ b/media-tv/linuxtv-dvb-apps/Manifest
@@ -3,33 +3,15 @@ Hash: SHA256
 
 AUX linuxtv-dvb-apps-1.1.1.20100223-alevt.patch 1418 SHA256 1707ddbdac648059c84837fdabdcb2fa2d73661748f82163023a187d0ecc9ffd SHA512 7490d18c3408bc412a3f3a3bb54544885f863ee146176dd8f9caae624043b5ad797f9fe9edc1ae627fd82b0fdb392e6f458d814e68a11ef4efa253c1add4016d WHIRLPOOL 3feab555bd3c4b721fb815a19799ed04f2228a4e8841a1b1de2913770d34cdd1b616738031cf3b7b077cafa66c27febd683b69441caaad0f7d1a7ca357f3a0dd
 AUX linuxtv-dvb-apps-1.1.1.20100223-ldflags.patch 607 SHA256 8eb444d72c922db4166c5f926ae80537c56e1087ef792be34749caa6629f7e94 SHA512 abaf61336531e33148a8a0d5d4dfa545a607b077430e6e9ae363a667524fcf3d41e5fec1112e795dcf6be5160a8ef57049b224dac42b1211d3ea3b9f865dba48 WHIRLPOOL bfe1e4b63c54eb4b903030fe33ef1a5332756f652ace3b423b03e695e4959c9fd26eb03bc15ed67b8ef324cce508e53b90dc66b6766a7e466e2d5ee085708591
-AUX linuxtv-dvb-apps-20070114-linux-headers-2.6.22.diff 485 SHA256 a75badcabe081924d0fdcdfa844b81b429478e042c9902e619f95e929f8c81e8 SHA512 ce383c52ff46a4e8e2c1a3b2e27e896f2d556dcf9bf4da692a27f3b50bbdba148b25a810343ea45857057bfc4a1075cd58b4b27fade4484b044b66038a990e41 WHIRLPOOL 3cd36ec828175a82bf2e86917d4cb82b83f8684e55760e56451c7408e7dec98c3825733a042cfa0e8451b42409c253ce42610625bab3b9fee80f452b3c1c5bd4
 DIST linuxtv-dvb-apps-1.1.1.20100223.tar.bz2 429129 SHA256 8a657a1479de665a6d95d8f5585ffd0228232e1a030b88435d4c40d85e983461 SHA512 0950197e2a199b1ab4392fa2e893d9b537d2b8fed05b24d8b81a2abf11ed2373dcb299a51e217c6508ea68b81691728b120328e4080de68519449fc5fd506161 WHIRLPOOL 5129c13fbc1cc65c9a5177d29de87563c22f4a8c78bbe4534e65a9c46b3683344c5a296cd157379c7af9500a9079daea8418b927a65ed1596d24d6300441ed20
-DIST linuxtv-dvb-apps-20060917.tar.bz2 278797 SHA256 535f9d68e5f49650f12ec39aa3b7f4c9a5a07af9a7cd7addc210d8083743aaf0
-DIST linuxtv-dvb-apps-20070114.tar.bz2 311657 SHA256 c4fbe3df4cf02a63fb8b6c6343b33b13cfa0400559224e40421f227fa27e5afd
-DIST linuxtv-dvb-apps-20080317.tar.bz2 314588 SHA256 639c9240e8944b95f7e78efdbb42ad866b965af68e420f614dabefd22adf5cdf
-DIST linuxtv-dvb-apps-20100223.tar.bz2 429129 SHA256 8a657a1479de665a6d95d8f5585ffd0228232e1a030b88435d4c40d85e983461 SHA512 0950197e2a199b1ab4392fa2e893d9b537d2b8fed05b24d8b81a2abf11ed2373dcb299a51e217c6508ea68b81691728b120328e4080de68519449fc5fd506161 WHIRLPOOL 5129c13fbc1cc65c9a5177d29de87563c22f4a8c78bbe4534e65a9c46b3683344c5a296cd157379c7af9500a9079daea8418b927a65ed1596d24d6300441ed20
-EBUILD linuxtv-dvb-apps-1.1.1.20060917.ebuild 2503 SHA256 0ae707007a834d8b2d503787f7ddf5bf634ead41ededad9860eed43b624eb39a SHA512 a302b7a15c66a2e198f6cda44902efcd4e41f1e03b3ebfe54e55e139ec4060aa08bdd1997bcf65c86651c27acc034d5d6f5935eeca6eaa4d2652ac5895eb1b52 WHIRLPOOL 35df0c4b6f0e28e9a04b0122935098598eaadfb4309c67e737dde370b5b8a51b7719cdcae862de038ac7a2e1a5cea7c4a9a8e59fe7f5d960f3399e6b89c91fc1
-EBUILD linuxtv-dvb-apps-1.1.1.20070114.ebuild 2447 SHA256 0cac97840ea091d35daf99e9c6645220e658bdd33d9f68bfba36939199d2ef6b SHA512 b12a725bbdc07b4a03dec67234bb99e1cd9cc488ecff3c716ef4d3f3ae7447dff06aa183b9d0d0634d1c56b441b3923f65a16f1fbe6ab39c491a162372439d57 WHIRLPOOL b58efcbfb34e60c59a7aed4d74ca98dd5d2ac053da2783a50c97d81419b4939b78d874c9322f8be89be8c020b95d6de660c4e4313f9ecd711f0c5621ca900f9f
-EBUILD linuxtv-dvb-apps-1.1.1.20080317.ebuild 2262 SHA256 be288461c2a2303896b39450343fe58d79e92688545aaab11e880956201a77c6 SHA512 2c99cd4aed5661affe8ecb9fb0d42b428c2fd9a525bf7f2911f9e8db06224b632979c87be9362e227590490d55db4eb62e930e4a267a77969b5695693d66b135 WHIRLPOOL bba24e3022241dbaf6ebdd4f18b1a30a3845454809203b38822410e741963f7bb2bba72b38bf801d34976f3e60b0a54b3171d5ddf0cf5de62d349fef2f738b75
 EBUILD linuxtv-dvb-apps-1.1.1.20100223-r1.ebuild 2175 SHA256 a20e7db806a1a0151b3bd80c7ad840dbeeb875c5bbb1fc917d15540da65804b6 SHA512 ec68b3e9dcfff7c4f27b54ad3ce0eb73da3c0790dd307f694d8908f9563c54aa02f46fcd07882215ee21461955e2049e7cda5d97c6bcaf3f19dd76fd6add1730 WHIRLPOOL 7fedf6bae4e808439c47d9653c721cb304de7d6078a52341b648e1423d6042b41b3dfe67d1000d1ab824e6c21e23a5d0752654b1ba2f9b74db91b4dc1f9df14e
-EBUILD linuxtv-dvb-apps-1.1.1.20100223.ebuild 2110 SHA256 3ca5d6862b7f7369858b3ca720b716d239293010aeb337b44e498cf5d71cd542 SHA512 9cad44fd3ce72a9ef2e4bbba4a7537bf6fd1a51ec593e286f48389406637f6307a169a913e33e9334f509dda89b2acc52518c381ca440de5c6c77b8e23de4a98 WHIRLPOOL b1a0fa81223bdfb8ad70dd766e2d6d43b0c02d0490728b5b533399c362b4db83bed4ba78a940676a7080d1703e995a3089217d3fb04e2d463ed7cc46e37fdc92
-MISC ChangeLog 10453 SHA256 3f19dc220b72b224798daec5cb48d17ff4efe9d9f4a5414abdcd52ee711798d4 SHA512 a785af97f817bea3412626569e59ab2ae3a8789ca2233b351e1faca0b902021d9c5dc7ce10c69adffc0125883845f9cde7b56c35384d53e747de15a798ca3ce3 WHIRLPOOL 96e0b12da6b3a838f5a6a175675035b2ae8f678604b714c1b3b9d2e0088cd32537d7e5a6df2d3c4cdf2f348db4203f3dfb29bb51ee7cf9ca794ce88f40e7376e
+MISC ChangeLog 10778 SHA256 ce7291532ddc2241bd4df91f2680d813acd3b28f1cedcdb2eb89f93a439a8aec SHA512 72c1167fd940b2eaba154b7010fbc55f3f630f83e101bffa40d09276a30308eb7b8b712dc766ffea6cf532f0b34ce6876e774382c911de549656545296f183d1 WHIRLPOOL 9c9b18f24fb3d04aff6bc792bb8ea75cc546be003388c34674ebdecd75a3687128d69c56f04dbdbb04db03edcf9f9646957bb077630673bac62587c231ef3dee
 MISC metadata.xml 225 SHA256 3bada61d7f0f943acf12f3c99a7977bbad11dd497348b913e2b569936d48edcd SHA512 d32cb8c50954d0c94e46f7b5b7d4d15c869e0a654f567c3ce6c320d3df27352bca71a888b32b571788e4233eb5033849b398e0b314f9d5e61c6ae404bdc59eb6 WHIRLPOOL 96aacf105e5301f50cf09aa971095a5cacd76574db52829545dad9174fe29288b34d1ae2879e91908b41d808853e52bf0d052e78d666a7f27f831722aed62228
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
 
-iQIcBAEBCAAGBQJTF2z7AAoJELp701BxlEWfvisP/j3Pqlcv8+izREoXDO6M7wZy
-DH+dpmJfttCXiUHvd+QB5slnP8YmiuL3Xix1tO5MUiYCu9TsasjtUArgCNUNPhuh
-Wy0tDwztD07RnrhGvR3797x4CBV/fK5Z0FBqvc8PNbdQ7Cdw/S/8aApLEABJZhDw
-4/wd5/hhuzITepDpotZZ4s3k15vYz8RdoPLam1tx9Ias1/n7rEpbApb/MwDR9Cyu
-f+maaD6nm+0AFdVnHLd85K+c3kuKBDMdqC9OgVGzi+Cjm8emlMEmeX799T0omMla
-oqt3S2IYYqDecZ2326Itf2SNhsPh3M8y1Dmz5QqhSAl4iVRYigTSN9k7cqnRZKW6
-zurBg6wwtY4kqDZBpBSSbb/8+R5nNY2ZaMZmvt93SXGqIOdEObOmE6oj2KEb+F61
-ov8HwWNB0czARhGLTGTYMo1Q1o0rJQvnbf4erXGfEvRPHyZ9fOvPkPBT9uyRQzW9
-YAYF6zHFEE8D73852TCTMvWJ1AkyLolMhWgzKWzxIhTNrp6cW+a0iQRU0nPYkH3f
-DL7EnMifY2ow2LCCB6TW8cnvUwtErmS/cbYIHoK1yW08O+eVi9QTxSCzoaj4AVX3
-sD1gBDhqnbptYcIk7aOUw9CpvP0kOHfKZXoQE4e7x6n4k63X1nykDKKhyl5N6dvk
-NDFt1I0m3c6YBuM1tAUt
-=NaCh
+iD8DBQFTr//0dn07HTTCgIoRCKchAJ49dQrPxiPWfyxojhfmqs99GudysQCfd/7Y
+fBEidF43i5vHISCSy1DYSPk=
+=Vc/f
 -----END PGP SIGNATURE-----
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."
-}