latest upstream snapshot. Includes many scan file updates. Drops duplicate installs of scan files in /usr/share/dvb.

Package-Manager: portage-2.1.3.9

4 files changed, 122 insertions, 5 deletions

diff --git a/media-tv/linuxtv-dvb-apps/ChangeLog b/media-tv/linuxtv-dvb-apps/ChangeLog
index 5c194d774d3e..1d611bf89f1f 100644
--- a/media-tv/linuxtv-dvb-apps/ChangeLog
+++ b/media-tv/linuxtv-dvb-apps/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-tv/linuxtv-dvb-apps
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/ChangeLog,v 1.33 2007/08/11 19:18:58 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/ChangeLog,v 1.34 2007/09/24 20:04:55 cardoe Exp $
+
+*linuxtv-dvb-apps-1.1.1.20070924 (24 Sep 2007)
+
+  24 Sep 2007; Doug Goldstein <cardoe@gentoo.org>
+  +linuxtv-dvb-apps-1.1.1.20070924.ebuild:
+  latest upstream snapshot. Includes many scan file updates. Drops duplicate
+  installs of scan files in /usr/share/dvb.
 
   11 Aug 2007; Markus Rothe <corsair@gentoo.org>
   linuxtv-dvb-apps-1.1.1.20070114.ebuild:
diff --git a/media-tv/linuxtv-dvb-apps/Manifest b/media-tv/linuxtv-dvb-apps/Manifest
index 3665b4f20a08..c16fd28156e4 100644
--- a/media-tv/linuxtv-dvb-apps/Manifest
+++ b/media-tv/linuxtv-dvb-apps/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX linuxtv-dvb-apps-20070114-linux-headers-2.6.22.diff 485 RMD160 770c70019cecfcd4202aa7c59598bdfddfc3e3df SHA1 47fc8e8bae1fc3c53d522c20b509618bf6aa2bcc SHA256 a75badcabe081924d0fdcdfa844b81b429478e042c9902e619f95e929f8c81e8
 MD5 bb951a796c5204c79929a8d9e2a7ce56 files/linuxtv-dvb-apps-20070114-linux-headers-2.6.22.diff 485
 RMD160 770c70019cecfcd4202aa7c59598bdfddfc3e3df files/linuxtv-dvb-apps-20070114-linux-headers-2.6.22.diff 485
@@ -5,6 +8,7 @@ SHA256 a75badcabe081924d0fdcdfa844b81b429478e042c9902e619f95e929f8c81e8 files/li
 DIST linuxtv-dvb-apps-1.1.0.tar.bz2 73973 RMD160 ba16fca5565568fc053586794466205c5314b0b9 SHA1 f57966f177eadd94253f9b92280fe00aa1bb3324 SHA256 5b3b6d16995cc31024f2340f9b56bdd28bc8569ac4bf75392575fe9605c1e1b9
 DIST linuxtv-dvb-apps-20060917.tar.bz2 278797 RMD160 7d4478f0baa698ed62327993c5d9fd2e51c852f8 SHA1 17d1281adede30215466edbaa5b521f963e3ea60 SHA256 535f9d68e5f49650f12ec39aa3b7f4c9a5a07af9a7cd7addc210d8083743aaf0
 DIST linuxtv-dvb-apps-20070114.tar.bz2 311657 RMD160 7903be5c782d76829d00f16345e1f869e663bbc9 SHA1 026c3e45fb778e399384f23d4eab7dc03c66dd9c SHA256 c4fbe3df4cf02a63fb8b6c6343b33b13cfa0400559224e40421f227fa27e5afd
+DIST linuxtv-dvb-apps-20070924.tar.bz2 306662 RMD160 c21c0aba869d47f8f8e4c2bf62b2a23476a8e5c3 SHA1 53da1e43517d5309d53726ca2a8b6dffd6379474 SHA256 1cb3e2c40512fb3f2d89df7319bdbdf472a05f03ac3333729738810c3a58fc37
 EBUILD linuxtv-dvb-apps-1.1.0.ebuild 2095 RMD160 6c56c461063bb5f64e80b0bec3fa4183794743f8 SHA1 65f459216570088db9ee562ad42d4155901e4a25 SHA256 badfd8c5d7a50897a0630779b9e366dcbac946672de767136a571f9aa5cd0d20
 MD5 615fc77147e15599721c2af2841313ae linuxtv-dvb-apps-1.1.0.ebuild 2095
 RMD160 6c56c461063bb5f64e80b0bec3fa4183794743f8 linuxtv-dvb-apps-1.1.0.ebuild 2095
@@ -17,10 +21,14 @@ EBUILD linuxtv-dvb-apps-1.1.1.20070114.ebuild 2391 RMD160 a294c998395e482d1d504d
 MD5 509f53d480021355f020e6fcf02f345d linuxtv-dvb-apps-1.1.1.20070114.ebuild 2391
 RMD160 a294c998395e482d1d504d7acc9e8d302650ae61 linuxtv-dvb-apps-1.1.1.20070114.ebuild 2391
 SHA256 cfef9300c8fa7d876506542da769b8ddbc1c5312269fb3df82b0c2f3d53f3633 linuxtv-dvb-apps-1.1.1.20070114.ebuild 2391
-MISC ChangeLog 6331 RMD160 c06f797f5a4bc60dfa0f793e6429c9768763a40c SHA1 c4e90a4f9dc8b83e7e6adacd65a18bb90de1573e SHA256 b0a21c90ff22a7b4c3b0ff5ac41c513490ed2a9dc02f686151c61bff713857a3
-MD5 4a2c6045f23d363d2cb3b0179dce4e24 ChangeLog 6331
-RMD160 c06f797f5a4bc60dfa0f793e6429c9768763a40c ChangeLog 6331
-SHA256 b0a21c90ff22a7b4c3b0ff5ac41c513490ed2a9dc02f686151c61bff713857a3 ChangeLog 6331
+EBUILD linuxtv-dvb-apps-1.1.1.20070924.ebuild 2211 RMD160 5f4f8b373679712ab8cf686dbe1156a3a6294719 SHA1 9a47a5f81e790f345df1410f2a7fc2d6b16a2a80 SHA256 14efd45d5f19e1099b63837fcb8d2d89890996100d78d7ea7ac443bcd6b549b5
+MD5 21c78bea57aea8f4947063d86de92279 linuxtv-dvb-apps-1.1.1.20070924.ebuild 2211
+RMD160 5f4f8b373679712ab8cf686dbe1156a3a6294719 linuxtv-dvb-apps-1.1.1.20070924.ebuild 2211
+SHA256 14efd45d5f19e1099b63837fcb8d2d89890996100d78d7ea7ac443bcd6b549b5 linuxtv-dvb-apps-1.1.1.20070924.ebuild 2211
+MISC ChangeLog 6593 RMD160 d6e2eeb6a7fa488117bc4ca566433ba3fcf79ace SHA1 8732d9d6553dfcdf49402a416420f51c41d3bd73 SHA256 3672ace05def1f7c1dddba617ef71078a505d55a477e18e543e7efa42acaf4c6
+MD5 7af18b2e69752bc3b4b369a1f8df79c5 ChangeLog 6593
+RMD160 d6e2eeb6a7fa488117bc4ca566433ba3fcf79ace ChangeLog 6593
+SHA256 3672ace05def1f7c1dddba617ef71078a505d55a477e18e543e7efa42acaf4c6 ChangeLog 6593
 MISC metadata.xml 251 RMD160 c065cf1ec58e88e891b34257ea9af16f7b902b08 SHA1 423dea543053ebe8ad5583b6e21870d9a70ff295 SHA256 9e1ffea7a6d01ecd008e6f8475b9d5bbb136bbce993014d8da7582ad14df6d0a
 MD5 5e69fa8fee86381022d8085b73238a47 metadata.xml 251
 RMD160 c065cf1ec58e88e891b34257ea9af16f7b902b08 metadata.xml 251
@@ -34,3 +42,13 @@ SHA256 187d782b1be59a55f14d85831b6e9e92e1105b5b4a27935570d3797844d6a267 files/di
 MD5 f98301d2521cbdcd70856f6a5067716d files/digest-linuxtv-dvb-apps-1.1.1.20070114 280
 RMD160 e6625cfe06f39348ee0b5d5610ce74c37a509d42 files/digest-linuxtv-dvb-apps-1.1.1.20070114 280
 SHA256 f37a77c3e22d98871dd59b2e0297b24d96648b5c97c5311de89d35c71da96ef0 files/digest-linuxtv-dvb-apps-1.1.1.20070114 280
+MD5 462f32c2bce37528d60119eac643bcb7 files/digest-linuxtv-dvb-apps-1.1.1.20070924 280
+RMD160 198c183b122c43767c3b4213c3d5886a2b5c45bf files/digest-linuxtv-dvb-apps-1.1.1.20070924 280
+SHA256 ecff6ace7c10e99dd48887cb0e9c703f0f955ddd5bfec9382646f7d43e347e12 files/digest-linuxtv-dvb-apps-1.1.1.20070924 280
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFG+BhxoeSe8B0zEfwRAhAgAJ9ZGTvgB5jlYotw5J5FQUK94G7/JACffkUN
+d/2JTQ1yB4omvhVI0mLP0dY=
+=IyJ7
+-----END PGP SIGNATURE-----
diff --git a/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.1.20070924 b/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.1.20070924
new file mode 100644
index 000000000000..f2384c77860d
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.1.20070924
@@ -0,0 +1,3 @@
+MD5 bb5519df1ad3078f83c9a9f84bc1815e linuxtv-dvb-apps-20070924.tar.bz2 306662
+RMD160 c21c0aba869d47f8f8e4c2bf62b2a23476a8e5c3 linuxtv-dvb-apps-20070924.tar.bz2 306662
+SHA256 1cb3e2c40512fb3f2d89df7319bdbdf472a05f03ac3333729738810c3a58fc37 linuxtv-dvb-apps-20070924.tar.bz2 306662
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070924.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070924.ebuild
new file mode 100644
index 000000000000..84a318233628
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.20070924.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2007 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.20070924.ebuild,v 1.1 2007/09/24 20:04:55 cardoe Exp $
+
+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 ~ia64 ~ppc ~x86"
+
+RDEPEND="usb? ( >=dev-libs/libusb-0.1.10a )"
+DEPEND="${DEPEND}
+	media-tv/linuxtv-dvb-headers"
+
+S="${WORKDIR}/dvb-apps-4bca5d49c9bd"
+
+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 TODO
+	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."
+}