3 files changed, 12 insertions, 94 deletions
diff --git a/media-tv/linuxtv-dvb-apps/Manifest b/media-tv/linuxtv-dvb-apps/Manifest
index ce6adbe795a6..832c8bcc9e34 100644
--- a/media-tv/linuxtv-dvb-apps/Manifest
+++ b/media-tv/linuxtv-dvb-apps/Manifest
@@ -38,22 +38,18 @@ EBUILD linuxtv-dvb-apps-1.1.0_p20050702.ebuild 1801 RMD160 95db90a72c89339e2179b
 MD5 fe90bd3b536f39352b9bdd34940676d9 linuxtv-dvb-apps-1.1.0_p20050702.ebuild 1801
 RMD160 95db90a72c89339e2179b2104befa190dc65b49c linuxtv-dvb-apps-1.1.0_p20050702.ebuild 1801
 SHA256 e7236def6ff1955a878a18688418fa1d598b6a7ea5b4e5a6b00b387baf831ee7 linuxtv-dvb-apps-1.1.0_p20050702.ebuild 1801
-EBUILD linuxtv-dvb-apps-1.1.0_p20060423.ebuild 1758 RMD160 44285a9337ac27eeaf34de2b9c5b21112c7cc02f SHA1 37c6b515e6f715aafc82a6c6e088a86141682eea SHA256 84ae1b17013ff4ef397283230e0025d3198f3d1ef4305a9d6dc059a68f0e7b1a
-MD5 e7a901b224a3ec75d8ea5a3d14eb5776 linuxtv-dvb-apps-1.1.0_p20060423.ebuild 1758
-RMD160 44285a9337ac27eeaf34de2b9c5b21112c7cc02f linuxtv-dvb-apps-1.1.0_p20060423.ebuild 1758
-SHA256 84ae1b17013ff4ef397283230e0025d3198f3d1ef4305a9d6dc059a68f0e7b1a linuxtv-dvb-apps-1.1.0_p20060423.ebuild 1758
+EBUILD linuxtv-dvb-apps-1.1.0_p20060423.ebuild 1757 RMD160 089ca4a95c945ec14a8445477b1b09ffe6c22aa6 SHA1 ed56acbe08ca5c8c47091d862d23935bdde1b9a9 SHA256 24ad43c9d36987522be4ca7aeb62135a0f339469003c0f48b64e249e4762907a
+MD5 2b5f72efb381959b8563b1bfc845cbaa linuxtv-dvb-apps-1.1.0_p20060423.ebuild 1757
+RMD160 089ca4a95c945ec14a8445477b1b09ffe6c22aa6 linuxtv-dvb-apps-1.1.0_p20060423.ebuild 1757
+SHA256 24ad43c9d36987522be4ca7aeb62135a0f339469003c0f48b64e249e4762907a linuxtv-dvb-apps-1.1.0_p20060423.ebuild 1757
 EBUILD linuxtv-dvb-apps-1.1.1-r1.ebuild 1895 RMD160 62230c63163ace2ef045d3191ca18dab022152e5 SHA1 b7049ccad02c5874f413c2197f9a4d732af2a7f2 SHA256 948d8f8c2bd3af6c7c8894b5fdf6e8eb7f67e505a9d86bf51c4f7196d1e8ee0e
 MD5 1b3ca61222c517878d3558081bc51a54 linuxtv-dvb-apps-1.1.1-r1.ebuild 1895
 RMD160 62230c63163ace2ef045d3191ca18dab022152e5 linuxtv-dvb-apps-1.1.1-r1.ebuild 1895
 SHA256 948d8f8c2bd3af6c7c8894b5fdf6e8eb7f67e505a9d86bf51c4f7196d1e8ee0e linuxtv-dvb-apps-1.1.1-r1.ebuild 1895
-EBUILD linuxtv-dvb-apps-1.1.1.ebuild 1787 RMD160 f0298a913122602c76ce2581eddb8003bd157c17 SHA1 d9a0ff85b78c3fa6a1f979db2b0ccd8a05a03fe8 SHA256 79bcb47e7dc918e25b5c34026f6420f7fda97a06a6a42bcb67b9ec16df6e4819
-MD5 27a626c505e08c4b97e265fefad7470f linuxtv-dvb-apps-1.1.1.ebuild 1787
-RMD160 f0298a913122602c76ce2581eddb8003bd157c17 linuxtv-dvb-apps-1.1.1.ebuild 1787
-SHA256 79bcb47e7dc918e25b5c34026f6420f7fda97a06a6a42bcb67b9ec16df6e4819 linuxtv-dvb-apps-1.1.1.ebuild 1787
-MISC ChangeLog 3275 RMD160 c99d7c6bff44734efee45bbd414090aa87305115 SHA1 ca0398dbcd0b04743c969c186b81dcba3b7347e0 SHA256 f255f6c15e434c7f877c67c35db86adf45db11dfca2e06158c91263b7577dba0
-MD5 05cec553c6c8ea416914efd419972004 ChangeLog 3275
-RMD160 c99d7c6bff44734efee45bbd414090aa87305115 ChangeLog 3275
-SHA256 f255f6c15e434c7f877c67c35db86adf45db11dfca2e06158c91263b7577dba0 ChangeLog 3275
+MISC ChangeLog 3450 RMD160 24ba7262c46e05d926c51adb7771caf387874ffb SHA1 b5ef11f3009183481abd464b0ede083e46266b94 SHA256 f92aa3e8cc8878473d0f3655005aca894f1dad302f756406d834cac248431189
+MD5 55e41be8d206b5cd6e14410eefb44bd0 ChangeLog 3450
+RMD160 24ba7262c46e05d926c51adb7771caf387874ffb ChangeLog 3450
+SHA256 f92aa3e8cc8878473d0f3655005aca894f1dad302f756406d834cac248431189 ChangeLog 3450
 MISC metadata.xml 217 RMD160 2daa552f0b03b2d6ab99fec1eee8ab6648890b75 SHA1 a3ae417f36e171df6c47fbb7460f85a3f957ed3a SHA256 11770dd9c2b190c9d2ba13d3ce36a56e6dddcc8d8a9d11eb20d930cac5d7990f
 MD5 dff9ded73ffb6549a59f5e6144af1cfd metadata.xml 217
 RMD160 2daa552f0b03b2d6ab99fec1eee8ab6648890b75 metadata.xml 217
@@ -67,16 +63,13 @@ SHA256 77f98fceef45e372385d5bf836301365c1a2fb8bd271c496b9e72fea0855dcf2 files/di
 MD5 498cafd0b23029d26f8d81ceee6b1f43 files/digest-linuxtv-dvb-apps-1.1.0_p20060423 256
 RMD160 0dfc8c48fbdff3c2fd92cbab80150cac431b1230 files/digest-linuxtv-dvb-apps-1.1.0_p20060423 256
 SHA256 14287dafd7b6d0bd47e8c9fc93e53ef716ce866f2e6bc003037e4f6521d1fe67 files/digest-linuxtv-dvb-apps-1.1.0_p20060423 256
-MD5 6491773e9585613948195ad4ee2ecce3 files/digest-linuxtv-dvb-apps-1.1.1 268
-RMD160 f6f45d2f0d99b9057ceefd3cec911090c65b4bb2 files/digest-linuxtv-dvb-apps-1.1.1 268
-SHA256 4424e959e416d21488d896306a153bc50ad70c5af716ac20dd985a618d1e26f7 files/digest-linuxtv-dvb-apps-1.1.1 268
 MD5 1d1082a936ffff401f34ef7f3aabcc66 files/digest-linuxtv-dvb-apps-1.1.1-r1 548
 RMD160 ac85602d54a0274efe55e7dbbe0a458ab3a7c626 files/digest-linuxtv-dvb-apps-1.1.1-r1 548
 SHA256 4fc81d4c1a340544beb33acdd5392bd5ff202ebeeca46435c24aad28dbffe291 files/digest-linuxtv-dvb-apps-1.1.1-r1 548
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
+Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEisTvZfSl1Kp5KmoRAk3HAKCPD8araTisRL0nc09IuHRIUeJk6gCeMnBM
-rxCPbp+ErJCUARNsnkP6wm8=
-=fEvW
+iD8DBQFEtOUHt2vP6XvVdOcRAm4xAKCJgpCItafDBHrECIcUIMBqO/VzggCgroq6
+zp9DUvyct82WisTUCuOQpb8=
+=pwCu
 -----END PGP SIGNATURE-----
diff --git a/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.1 b/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.1
deleted file mode 100644
index 8f5a04bb5121..000000000000
--- a/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 de958cdb8d00e74792dd69f3c945b037 linuxtv-dvb-apps-1.1.1.tar.bz2 81917
-RMD160 35c6a3d5a63beb3bdd61dc46cfc5c67171cf3625 linuxtv-dvb-apps-1.1.1.tar.bz2 81917
-SHA256 371f8133db705bde6c2f79cccb0b1a1f626a0d94bf41acceba5d76a69155f057 linuxtv-dvb-apps-1.1.1.tar.bz2 81917
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.ebuild
deleted file mode 100644
index 0f96f7562c3a..000000000000
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.1 2006/05/28 13:35:02 zzam Exp $
-
-
-inherit eutils
-
-MY_P="${PN/linuxtv-/}-${PV/*_p/}"
-
-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="http://www.linuxtv.org/download/dvb/${P}.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="usb? ( >=dev-libs/libusb-0.1.10a )"
-RDEPEND="${DEPEND}"
-
-src_unpack()
-{
-	unpack ${A}
-
-	epatch ${FILESDIR}/${P}-includefile.patch
-	epatch ${FILESDIR}/${P}-makefile.patch
-
-	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'
-}
-
-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"
-
-	dodoc README TODO INSTALL
-	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/READEM README.ttusb_dec_reset
-}
-
-pkg_postinst()
-{
-	einfo "Please read the documentation in /usr/share/doc/${PF}."
-	einfo "The channel lists and other files are installed in"
-	einfo "/usr/share/dvb"
-	einfo
-	einfo "The scanning utility is now installed as dvbscan."
-}