Version bumped. See Bug #134116.

(Portage version: 2.1_rc3)

8 files changed, 245 insertions, 1 deletions

diff --git a/media-tv/linuxtv-dvb-apps/ChangeLog b/media-tv/linuxtv-dvb-apps/ChangeLog
index e851cfe9e90d..d6d6c3c5ac1c 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-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/ChangeLog,v 1.12 2006/04/24 08:35:30 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/linuxtv-dvb-apps/ChangeLog,v 1.13 2006/05/28 13:35:02 zzam Exp $
+
+*linuxtv-dvb-apps-1.1.1 (28 May 2006)
+
+  28 May 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/linuxtv-dvb-apps-1.1.1-includefile.patch,
+  +files/linuxtv-dvb-apps-1.1.1-makefile.patch,
+  +linuxtv-dvb-apps-1.1.1.ebuild:
+  Version bumped. See Bug #134116.
 
 *linuxtv-dvb-apps-1.1.0_p20060423 (24 Apr 2006)
 
diff --git a/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.0 b/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.0
index 422552101880..a3240e826174 100644
--- a/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.0
+++ b/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.0
@@ -1 +1,3 @@
 MD5 987d0ac31aec23bfecaf9d224b563016 linuxtv-dvb-apps-1.1.0.tar.bz2 73973
+RMD160 ba16fca5565568fc053586794466205c5314b0b9 linuxtv-dvb-apps-1.1.0.tar.bz2 73973
+SHA256 5b3b6d16995cc31024f2340f9b56bdd28bc8569ac4bf75392575fe9605c1e1b9 linuxtv-dvb-apps-1.1.0.tar.bz2 73973
diff --git a/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.0_p20050702 b/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.0_p20050702
index d0626626963b..af01f67f0ca5 100644
--- a/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.0_p20050702
+++ b/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.0_p20050702
@@ -1 +1,3 @@
 MD5 23fd5f6e8db5a28e9513a3828c98d7c1 dvb-apps-snapshot-20050702.tar.bz2 158259
+RMD160 054ce63a1b1a2b36b92df6b3b6930ad3ac6a07c2 dvb-apps-snapshot-20050702.tar.bz2 158259
+SHA256 8be4de5da8ab56ad9500ac42636b8444c0fd7cdd38a656d3053af24ae40cda6d dvb-apps-snapshot-20050702.tar.bz2 158259
diff --git a/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.0_p20060423 b/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.0_p20060423
index d1b20831372b..14bb7b27b589 100644
--- a/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.0_p20060423
+++ b/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.0_p20060423
@@ -1 +1,3 @@
 MD5 b08e8e1e665124cd9e7a77dbd3b013b0 dvb-apps-20060423.tar.bz2 258420
+RMD160 1374a2f813009391eb6df5f5ecf2993e5e068f25 dvb-apps-20060423.tar.bz2 258420
+SHA256 bff65c334ac7d9cbc7bf4ce20e06f3d2bdc9f69b1452bec2086da7a71e006888 dvb-apps-20060423.tar.bz2 258420
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
new file mode 100644
index 000000000000..8f5a04bb5121
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.1
@@ -0,0 +1,3 @@
+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/files/linuxtv-dvb-apps-1.1.1-includefile.patch b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1-includefile.patch
new file mode 100644
index 000000000000..ff6d304520f4
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1-includefile.patch
@@ -0,0 +1,12 @@
+diff -Naur linuxtv-dvb-apps-1.1.1-orig/util/dvbnet/dvbnet.c linuxtv-dvb-apps-1.1.1/util/dvbnet/dvbnet.c
+--- linuxtv-dvb-apps-1.1.1-orig/util/dvbnet/dvbnet.c	2006-05-17 18:37:58.000000000 -0500
++++ linuxtv-dvb-apps-1.1.1/util/dvbnet/dvbnet.c	2006-05-23 10:20:23.000000000 -0500
+@@ -35,7 +35,7 @@
+ #include <sys/ioctl.h>
+ 
+ #include <linux/dvb/net.h>
+-#include <version.h>
++#include "version.h"
+ 
+ #ifndef VERSION_INFO
+ #define VERSION_INFO "1.1.1"
diff --git a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1-makefile.patch b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1-makefile.patch
new file mode 100644
index 000000000000..7c58ea9215f3
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1-makefile.patch
@@ -0,0 +1,143 @@
+diff -ru linuxtv-dvb-apps-1.1.1-orig/util/av7110_loadkeys/Makefile linuxtv-dvb-apps-1.1.1/util/av7110_loadkeys/Makefile
+--- linuxtv-dvb-apps-1.1.1-orig/util/av7110_loadkeys/Makefile	2006-05-28 15:14:41.000000000 +0200
++++ linuxtv-dvb-apps-1.1.1/util/av7110_loadkeys/Makefile	2006-05-28 15:15:30.000000000 +0200
+@@ -42,6 +42,9 @@
+ 	@echo '#endif  /* __INPUT_KEYNAMES_H */' >> $@
+ 	@echo '' >> $@
+ 
++install: av7110_loadkeys evtest
++	install -m 755 av7110_loadkeys $(DESTDIR)/$(bindir)
++	install -m 755 evtest $(DESTDIR)/$(bindir)
+ 
+ clean:
+ 	$(RM) core* *.o input_keynames.h av7110_loadkeys evtest
+diff -ru linuxtv-dvb-apps-1.1.1-orig/util/dvbdate/Makefile linuxtv-dvb-apps-1.1.1/util/dvbdate/Makefile
+--- linuxtv-dvb-apps-1.1.1-orig/util/dvbdate/Makefile	2006-05-28 15:14:41.000000000 +0200
++++ linuxtv-dvb-apps-1.1.1/util/dvbdate/Makefile	2006-05-28 15:20:01.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ OBJS    = dvbdate.o
+ TARGET  = dvbdate
+-DESTDIR = /usr/local/bin/
++bindir  ?= /usr/local/bin/
+ 
+ all: $(TARGET)
+ 
+@@ -16,7 +16,7 @@
+ 	$(CC) -o $@ $(OBJS) $(LFLAGS)
+ 
+ install: all
+-	install -m 755 $(TARGET) $(DESTDIR) 
++	install -m 755 $(TARGET) $(DESTDIR)/$(bindir) 
+ 
+ clean:
+ 	rm -f $(TARGET) $(OBJS) core* *~ *.d
+diff -ru linuxtv-dvb-apps-1.1.1-orig/util/dvbnet/Makefile linuxtv-dvb-apps-1.1.1/util/dvbnet/Makefile
+--- linuxtv-dvb-apps-1.1.1-orig/util/dvbnet/Makefile	2006-05-28 15:14:41.000000000 +0200
++++ linuxtv-dvb-apps-1.1.1/util/dvbnet/Makefile	2006-05-28 15:18:27.000000000 +0200
+@@ -5,7 +5,7 @@
+ 
+ OBJS    = dvbnet.o
+ TARGET  = dvbnet
+-DESTDIR = /usr/local/bin/
++bindir  ?= /usr/local/bin/
+ 
+ all: version.h $(TARGET)
+ 
+@@ -20,7 +20,7 @@
+ 		"`cat $@.in`" "`date +'%a %b %d %X %Y'`" > $@
+ 
+ install: all
+-	install -m 755 $(TARGET) $(DESTDIR) 
++	install -m 755 $(TARGET) $(DESTDIR)/$(bindir) 
+ 
+ clean:
+ 	rm -f $(TARGET) $(OBJS) version.h core* *~ *.d
+diff -ru linuxtv-dvb-apps-1.1.1-orig/util/dvbtraffic/Makefile linuxtv-dvb-apps-1.1.1/util/dvbtraffic/Makefile
+--- linuxtv-dvb-apps-1.1.1-orig/util/dvbtraffic/Makefile	2006-05-28 15:14:41.000000000 +0200
++++ linuxtv-dvb-apps-1.1.1/util/dvbtraffic/Makefile	2006-05-28 15:15:30.000000000 +0200
+@@ -2,5 +2,8 @@
+ dvbtraffic: dvbtraffic.c
+ 	gcc -MD -g -O2 -Wall -I../../include $< -o $@
+ 
++install: dvbtraffic
++	install -m 755 dvbtraffic $(DESTDIR)/$(bindir) 
++
+ clean:
+ 	rm -f *.o *.d dvbtraffic
+diff -ru linuxtv-dvb-apps-1.1.1-orig/util/lib/Makefile linuxtv-dvb-apps-1.1.1/util/lib/Makefile
+--- linuxtv-dvb-apps-1.1.1-orig/util/lib/Makefile	2006-05-28 15:14:41.000000000 +0200
++++ linuxtv-dvb-apps-1.1.1/util/lib/Makefile	2006-05-28 15:19:28.000000000 +0200
+@@ -8,11 +8,15 @@
+ 
+ TARGET = lnb.o
+ 
++all: $(TARGET)
++
+ $(TARGET): $(SRCS)
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) -c $< -o $@
+ 
++install: all
++
+ clean:
+ 	$(RM) *.o *.d $(TARGET)
+ 
+diff -ru linuxtv-dvb-apps-1.1.1-orig/util/scan/Makefile linuxtv-dvb-apps-1.1.1/util/scan/Makefile
+--- linuxtv-dvb-apps-1.1.1-orig/util/scan/Makefile	2006-05-28 15:14:41.000000000 +0200
++++ linuxtv-dvb-apps-1.1.1/util/scan/Makefile	2006-05-28 15:30:43.000000000 +0200
+@@ -6,7 +6,7 @@
+ OBJS = diseqc.o dump-zap.o dump-vdr.o scan.o lnb.o section.o atsc_psip_section.o
+ SRCS = $(OBJS:.o=.c)
+ 
+-TARGET = scan
++TARGET = dvbscan
+ 
+ $(TARGET): $(OBJS)
+ 	$(CC) $(LFLAGS) -o $(TARGET) $(OBJS)
+@@ -14,8 +14,21 @@
+ .c.o:
+ 	$(CC) $(CFLAGS) -c $< -o $@
+ 
++install-bin: $(TARGET)
++	install -m 755 $(TARGET) $(DESTDIR)/$(bindir) 
++
++install-data:
++	mkdir -p $(DESTDIR)$(datadir)/dvb
++	for d in dvb-* atsc ; do test -d $$d || continue ; echo ..... $$d ..... \
++	; mkdir -p $(DESTDIR)$(datadir)/dvb/scan/$$d/ \
++	; cp `find $$d -type f|grep -v CVS` $(DESTDIR)$(datadir)/dvb/scan/$$d/ ; done
++
++install: install-bin install-data
++
+ clean:
+ 	$(RM) *.o *.d $(TARGET)
+ 
++.PHONY: install install-bin install-data
++
+ -include $(wildcard *.d) dummy
+ 
+diff -ru linuxtv-dvb-apps-1.1.1-orig/util/szap/Makefile linuxtv-dvb-apps-1.1.1/util/szap/Makefile
+--- linuxtv-dvb-apps-1.1.1-orig/util/szap/Makefile	2006-05-28 15:14:41.000000000 +0200
++++ linuxtv-dvb-apps-1.1.1/util/szap/Makefile	2006-05-28 15:24:44.000000000 +0200
+@@ -28,8 +28,19 @@
+ .o:
+ 	$(CC) $(LFLAGS) -o $@ $<
+ 
++install: install-bin install-data
++install-bin: all
++	test "$(bindir)/" != "/" && mkdir -p $(DESTDIR)$(bindir)/
++	for i in $(TARGETS) ; do cp $$i $(DESTDIR)$(bindir)/ ; done
++install-data:
++	test "$(datadir)/" != "/" && mkdir -p $(DESTDIR)$(datadir)/dvb/zap
++	for d in dvb-{s,c,t} atsc ; do test -d channels-conf/$$d || continue ; echo ..... $$d ..... \
++	; mkdir -p $(DESTDIR)$(datadir)/dvb/zap/$$d/ \
++	; cp `find channels-conf/$$d -type f|grep -v CVS` $(DESTDIR)$(datadir)/dvb/zap/$$d/ ; done
+ clean:
+ 	$(RM) $(TARGETS) core* *.o *.d .depend
+ 
++.PHONY: install install-bin install-data
++
+ -include $(wildcard *.d) dummy
+ 
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
new file mode 100644
index 000000000000..0f96f7562c3a
--- /dev/null
+++ b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1.ebuild
@@ -0,0 +1,72 @@
+# 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."
+}