Removed older version.

(Portage version: 2.1.2_pre1)
 (Signed Manifest commit)

5 files changed, 7 insertions, 441 deletions

diff --git a/media-tv/linuxtv-dvb-apps/Manifest b/media-tv/linuxtv-dvb-apps/Manifest
index b1d32b354f55..013893fd8cf5 100644
--- a/media-tv/linuxtv-dvb-apps/Manifest
+++ b/media-tv/linuxtv-dvb-apps/Manifest
@@ -17,20 +17,10 @@ AUX linuxtv-dvb-apps-1.1.0_p20060423-makefile.patch 488 RMD160 bc2938d277d20b320
 MD5 2c34f88b84c92e2320ce1373d19e4431 files/linuxtv-dvb-apps-1.1.0_p20060423-makefile.patch 488
 RMD160 bc2938d277d20b320a3a80514199f537e9cd515e files/linuxtv-dvb-apps-1.1.0_p20060423-makefile.patch 488
 SHA256 2460a36afff004cb4d5524575fb104eb24c0192b3f9951b4087e1aa2f8a7ddc2 files/linuxtv-dvb-apps-1.1.0_p20060423-makefile.patch 488
-AUX linuxtv-dvb-apps-1.1.1-includefile.patch 447 RMD160 a558269921dc22a532656740a60762ec59ee5441 SHA1 611c61162bc99d615c28b5cba388cb6619f428ea SHA256 7c83be3d4698742ad5b5d45dce0f37cdfb9a0e543bb4aba13249194946d8c641
-MD5 d31e3f58cf2889830bbeb23fb63ad2e7 files/linuxtv-dvb-apps-1.1.1-includefile.patch 447
-RMD160 a558269921dc22a532656740a60762ec59ee5441 files/linuxtv-dvb-apps-1.1.1-includefile.patch 447
-SHA256 7c83be3d4698742ad5b5d45dce0f37cdfb9a0e543bb4aba13249194946d8c641 files/linuxtv-dvb-apps-1.1.1-includefile.patch 447
-AUX linuxtv-dvb-apps-1.1.1-makefile.patch 9446 RMD160 bfc13963a9e909797f813092dd56d4a10bb53810 SHA1 aaf2f64b74490aa91daadbe3bc72c82e1567411a SHA256 2908028eff9de4d9adb33f52a36d9374391085e1d9a7b94efd7a73e86de1a06f
-MD5 08c12ac8e04cb5ebeedc5cc397516b5f files/linuxtv-dvb-apps-1.1.1-makefile.patch 9446
-RMD160 bfc13963a9e909797f813092dd56d4a10bb53810 files/linuxtv-dvb-apps-1.1.1-makefile.patch 9446
-SHA256 2908028eff9de4d9adb33f52a36d9374391085e1d9a7b94efd7a73e86de1a06f files/linuxtv-dvb-apps-1.1.1-makefile.patch 9446
 DIST dvb-apps-20060423.tar.bz2 258420 RMD160 1374a2f813009391eb6df5f5ecf2993e5e068f25 SHA1 695ea867b9cf24f7ba7258c58da2af858e10c216 SHA256 bff65c334ac7d9cbc7bf4ce20e06f3d2bdc9f69b1452bec2086da7a71e006888
 DIST dvb-apps-snapshot-20050702.tar.bz2 158259 RMD160 054ce63a1b1a2b36b92df6b3b6930ad3ac6a07c2 SHA1 51274426ff6cd7331558cd2b004758842d92797b SHA256 8be4de5da8ab56ad9500ac42636b8444c0fd7cdd38a656d3053af24ae40cda6d
 DIST linuxtv-dvb-apps-1.1.0.tar.bz2 73973 RMD160 ba16fca5565568fc053586794466205c5314b0b9 SHA1 f57966f177eadd94253f9b92280fe00aa1bb3324 SHA256 5b3b6d16995cc31024f2340f9b56bdd28bc8569ac4bf75392575fe9605c1e1b9
-DIST linuxtv-dvb-apps-1.1.1.tar.bz2 81917 RMD160 35c6a3d5a63beb3bdd61dc46cfc5c67171cf3625 SHA1 4722dc11c1db9eb23276660779c2365a069614bf SHA256 371f8133db705bde6c2f79cccb0b1a1f626a0d94bf41acceba5d76a69155f057
 DIST linuxtv-dvb-apps-20060917.tar.bz2 278797 RMD160 7d4478f0baa698ed62327993c5d9fd2e51c852f8 SHA1 17d1281adede30215466edbaa5b521f963e3ea60 SHA256 535f9d68e5f49650f12ec39aa3b7f4c9a5a07af9a7cd7addc210d8083743aaf0
-DIST linuxtv-scan-data-20060609.tar.bz2 41072 RMD160 eb21f7249de9ead601493639abb539ca549c2253 SHA1 38779d570493e822a3da7bc9674194bcdaf95e4f SHA256 3d5da18d30ddcc1460343779a056289745ff3bb5268f9141c893854205d5e2e9
 EBUILD linuxtv-dvb-apps-1.1.0.ebuild 2105 RMD160 7ef437bc71a94e6393802416d4e0f97c6c0f0569 SHA1 61a6cb318765da638bbf673baa9336ed65894720 SHA256 4cfcf444334f3933285fdb69cb47c1ea7f9656c619f86a2638b16f6ab738bf88
 MD5 1c27736f4ff65cfe105c80f9306823b2 linuxtv-dvb-apps-1.1.0.ebuild 2105
 RMD160 7ef437bc71a94e6393802416d4e0f97c6c0f0569 linuxtv-dvb-apps-1.1.0.ebuild 2105
@@ -43,18 +33,14 @@ EBUILD linuxtv-dvb-apps-1.1.0_p20060423.ebuild 1757 RMD160 089ca4a95c945ec14a844
 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.20060917.ebuild 2229 RMD160 127b64ca290986c76c281e2a4c0b5fc5797ef649 SHA1 d40f7d4c3db1d36b4e8d8b40eebdcc94ec64dc9f SHA256 4bb4286e46de23cbb44ef2177eafdc14fd31532c1ccb313e7c0495b348329f1f
 MD5 b0e173ef59983bd0d7f178e131ce59b6 linuxtv-dvb-apps-1.1.1.20060917.ebuild 2229
 RMD160 127b64ca290986c76c281e2a4c0b5fc5797ef649 linuxtv-dvb-apps-1.1.1.20060917.ebuild 2229
 SHA256 4bb4286e46de23cbb44ef2177eafdc14fd31532c1ccb313e7c0495b348329f1f linuxtv-dvb-apps-1.1.1.20060917.ebuild 2229
-MISC ChangeLog 3619 RMD160 2687c803ba65bf5b09ea4e06ab49a9ffa5d9e9c0 SHA1 e0b1c35023d72161b5007ec5ddcc5c66e8012485 SHA256 4c618d18ec5e800aa55f856ea7c2884d49baec52be061762aef62496d893d81d
-MD5 10add111e062bc399a82425ee35652ca ChangeLog 3619
-RMD160 2687c803ba65bf5b09ea4e06ab49a9ffa5d9e9c0 ChangeLog 3619
-SHA256 4c618d18ec5e800aa55f856ea7c2884d49baec52be061762aef62496d893d81d ChangeLog 3619
+MISC ChangeLog 3834 RMD160 a245cf1d0bb3b91ad657cbfe38bccf62e2123e63 SHA1 26e7bdcc00e0a7494502105ea618f327c140b0a4 SHA256 dbd6e66a341f6412780f3ab019cd30b9deb05c69ccfdede7fb377952df886d6f
+MD5 75c6604406d9578bb4dcbd909fde0581 ChangeLog 3834
+RMD160 a245cf1d0bb3b91ad657cbfe38bccf62e2123e63 ChangeLog 3834
+SHA256 dbd6e66a341f6412780f3ab019cd30b9deb05c69ccfdede7fb377952df886d6f ChangeLog 3834
 MISC metadata.xml 217 RMD160 2daa552f0b03b2d6ab99fec1eee8ab6648890b75 SHA1 a3ae417f36e171df6c47fbb7460f85a3f957ed3a SHA256 11770dd9c2b190c9d2ba13d3ce36a56e6dddcc8d8a9d11eb20d930cac5d7990f
 MD5 dff9ded73ffb6549a59f5e6144af1cfd metadata.xml 217
 RMD160 2daa552f0b03b2d6ab99fec1eee8ab6648890b75 metadata.xml 217
@@ -68,16 +54,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 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
 MD5 657f8b2516c6636fa3f19697b32e2f33 files/digest-linuxtv-dvb-apps-1.1.1.20060917 280
 RMD160 446907278e990bfbd93928449db3bb1d0a5249db files/digest-linuxtv-dvb-apps-1.1.1.20060917 280
 SHA256 187d782b1be59a55f14d85831b6e9e92e1105b5b4a27935570d3797844d6a267 files/digest-linuxtv-dvb-apps-1.1.1.20060917 280
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFDalGt2vP6XvVdOcRAhpQAJ47wVTUWHdmRO2zJVYCiukbMnfodACfQqHy
-59mqA9gdh4PScDBXpfpYE5g=
-=wHmy
+iD8DBQFFDbspt2vP6XvVdOcRArIzAKCc7P1mchQGMMNoyQhbdAMAmYnTuwCffb8b
+bd9gDinoMBpOOY+3lfOlu74=
+=enU8
 -----END PGP SIGNATURE-----
diff --git a/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.1-r1 b/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.1-r1
deleted file mode 100644
index 9b18966bdc90..000000000000
--- a/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.1-r1
+++ /dev/null
@@ -1,6 +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
-MD5 8341cea5bb414c7d22d151ccc3cd6358 linuxtv-scan-data-20060609.tar.bz2 41072
-RMD160 eb21f7249de9ead601493639abb539ca549c2253 linuxtv-scan-data-20060609.tar.bz2 41072
-SHA256 3d5da18d30ddcc1460343779a056289745ff3bb5268f9141c893854205d5e2e9 linuxtv-scan-data-20060609.tar.bz2 41072
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
deleted file mode 100644
index ff6d304520f4..000000000000
--- a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1-includefile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 1fecd4512cfc..000000000000
--- a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.1-makefile.patch
+++ /dev/null
@@ -1,324 +0,0 @@
-diff -ru linuxtv-dvb-apps-1.1.1-orig/test/Makefile linuxtv-dvb-apps-1.1.1/test/Makefile
---- linuxtv-dvb-apps-1.1.1-orig/test/Makefile	2004-01-17 17:59:46.000000000 +0100
-+++ linuxtv-dvb-apps-1.1.1/test/Makefile	2006-05-29 18:02:49.000000000 +0200
-@@ -1,7 +1,9 @@
- # Makefile for Linux DVB API Version 3 test programs
- 
- CC = gcc
--CFLAGS = -g -O2 -W -Wall -I../include
-+CFLAGS   ?= -g -O2 -W -Wall
-+CPPFLAGS += -I../include
-+LDFLAGS  ?=
- 
- TARGETS = \
- 	diseqc		\
-@@ -32,6 +34,8 @@
- 
- test_sections test_sec_ne test_pes test_tt: hex_dump.o
- 
-+install: all
-+
- clean:
- 	rm -f $(TARGETS) *.o
- 
-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	2004-01-17 17:59:46.000000000 +0100
-+++ linuxtv-dvb-apps-1.1.1/util/av7110_loadkeys/Makefile	2006-05-29 18:01:39.000000000 +0200
-@@ -1,5 +1,8 @@
- CC = gcc
--CFLAGS = -g -Wall -O2
-+CFLAGS ?= -g -Wall -O2
-+LDFLAGS ?=
-+
-+bindir ?= /usr/local/bin
- 
- all: av7110_loadkeys evtest
- 
-@@ -42,6 +45,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	2004-01-17 17:59:46.000000000 +0100
-+++ linuxtv-dvb-apps-1.1.1/util/dvbdate/Makefile	2006-05-29 17:56:28.000000000 +0200
-@@ -1,22 +1,24 @@
- 
- CC      = gcc
--CFLAGS  = -g -O2 -MD -Wall -I. -I../../include
--LFLAGS  =
-+CFLAGS   ?= -g -O2 -MD -Wall
-+CPPFLAGS += -I. -I../../include
-+LDFLAGS  ?=
- 
- OBJS    = dvbdate.o
- TARGET  = dvbdate
--DESTDIR = /usr/local/bin/
-+
-+bindir  ?= /usr/local/bin/
- 
- all: $(TARGET)
- 
- .c.o:
--	$(CC) $(CFLAGS) -c $< -o $@
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
- 
- $(TARGET): $(OBJS)
--	$(CC) -o $@ $(OBJS) $(LFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
- 
- 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	2004-01-17 17:59:46.000000000 +0100
-+++ linuxtv-dvb-apps-1.1.1/util/dvbnet/Makefile	2006-05-29 17:56:43.000000000 +0200
-@@ -1,26 +1,29 @@
- 
- CC      = gcc
--CFLAGS  = -g -O2 -MD -Wall -I. -I../../include
--LFLAGS  =
-+CFLAGS   ?= -g -O2 -MD -Wall
-+CPPFLAGS += -I. -I../../include
-+LDFLAGS  ?=
- 
- OBJS    = dvbnet.o
- TARGET  = dvbnet
--DESTDIR = /usr/local/bin/
-+bindir  ?= /usr/local/bin/
- 
- all: version.h $(TARGET)
- 
- .c.o:
--	$(CC) $(CFLAGS) -c $< -o $@
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
-+
-+dvbnet.o: version.h
- 
- $(TARGET): $(OBJS)
--	$(CC) -o $@ $(OBJS) $(LFLAGS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
- 
- version.h:
- 	printf '#define VERSION_INFO "%s (Build %s)"\n' \
- 		"`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	2004-01-19 18:10:16.000000000 +0100
-+++ linuxtv-dvb-apps-1.1.1/util/dvbtraffic/Makefile	2006-05-29 17:57:10.000000000 +0200
-@@ -1,6 +1,16 @@
- 
--dvbtraffic: dvbtraffic.c
--	gcc -MD -g -O2 -Wall -I../../include $< -o $@
-+CC = gcc
-+CFLAGS   ?= -MD -g -O2 -Wall
-+CPPFLAGS += -I../../include
-+LDFLAGS  ?=
-+
-+bindir ?= /usr/local/bin
-+
-+dvbtraffic: dvbtraffic.o
-+	$(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
-+
-+install: dvbtraffic
-+	install -m 755 dvbtraffic $(DESTDIR)/$(bindir) 
- 
- clean:
- 	rm -f *.o *.d dvbtraffic
-Nur in linuxtv-dvb-apps-1.1.1/util/lib: lnb.d.
-Nur in linuxtv-dvb-apps-1.1.1/util/lib: lnb.o.
-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	2004-01-17 17:59:46.000000000 +0100
-+++ linuxtv-dvb-apps-1.1.1/util/lib/Makefile	2006-05-29 18:03:00.000000000 +0200
-@@ -1,17 +1,22 @@
- 
- CC = gcc
--CFLAGS = -MD -g -Wall -O2 -I../../include -I.
--LFLAGS = -g -Wall
-+CFLAGS   ?= -MD -g -Wall -O2
-+CPPFLAGS += -I../../include -I.
-+LDFLAGS  ?= 
- 
- OBJS = lnb.o
- SRCS = $(OBJS:.o=.c)
- 
- TARGET = lnb.o
- 
-+all: $(TARGET)
-+
- $(TARGET): $(SRCS)
- 
- .c.o:
--	$(CC) $(CFLAGS) -c $< -o $@
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
-+
-+install: all
- 
- clean:
- 	$(RM) *.o *.d $(TARGET)
-diff -ru linuxtv-dvb-apps-1.1.1-orig/util/Makefile linuxtv-dvb-apps-1.1.1/util/Makefile
---- linuxtv-dvb-apps-1.1.1-orig/util/Makefile	2004-01-17 17:59:46.000000000 +0100
-+++ linuxtv-dvb-apps-1.1.1/util/Makefile	2006-05-29 17:38:39.000000000 +0200
-@@ -8,5 +8,6 @@
- 	$(MAKE) -C dvbdate $(MAKECMDGOALS)
- 	$(MAKE) -C dvbtraffic $(MAKECMDGOALS)
- 	$(MAKE) -C av7110_loadkeys $(MAKECMDGOALS)
-+	$(MAKE) -C ttusb_dec_reset $(MAKECMDGOALS)
- 
- FORCE:
-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-18 01:34:53.000000000 +0200
-+++ linuxtv-dvb-apps-1.1.1/util/scan/Makefile	2006-05-29 17:55:21.000000000 +0200
-@@ -1,21 +1,37 @@
- 
- CC = gcc
--CFLAGS = -MD -g -Wall -O2 -I../../include
--LFLAGS = -g -Wall
-+CFLAGS   ?= -MD -g -Wall -O2
-+CPPFLAGS += -I../../include
-+LDFLAGS  ?= 
- 
- 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
-+
-+bindir ?= /usr/local/bin
- 
- $(TARGET): $(OBJS)
--	$(CC) $(LFLAGS) -o $(TARGET) $(OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS)
- 
- .c.o:
--	$(CC) $(CFLAGS) -c $< -o $@
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -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
- 
-Nur in linuxtv-dvb-apps-1.1.1/util/szap: azap.d.
-Nur in linuxtv-dvb-apps-1.1.1/util/szap: azap.o.
-Nur in linuxtv-dvb-apps-1.1.1/util/szap: czap.d.
-Nur in linuxtv-dvb-apps-1.1.1/util/szap: czap.o.
-Nur in linuxtv-dvb-apps-1.1.1/util/szap: femon.d.
-Nur in linuxtv-dvb-apps-1.1.1/util/szap: femon.o.
-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-18 01:31:54.000000000 +0200
-+++ linuxtv-dvb-apps-1.1.1/util/szap/Makefile	2006-05-29 17:59:27.000000000 +0200
-@@ -1,11 +1,15 @@
- CC = gcc
--CFLAGS = -MD -Wall -g -O2 -I../../include -I../lib
--LFLAGS = -Wall -g -O2
-+CFLAGS   ?= -MD -Wall -g -O2
-+CPPFLAGS += -I../../include -I../lib
-+LDFLAGS  ?= 
- RM = rm -f
- 
- TARGETS = szap tzap czap azap femon
- OBJS = szap.o tzap.o czap.o azap.o femon.o
- 
-+bindir  ?= /usr/local/bin
-+datadir ?= /usr/local/share
-+
- all: $(OBJS) $(TARGETS)
- 	@echo
- 	@echo "--------------------------------------------------------------------------------"
-@@ -20,16 +24,30 @@
- 	@echo
- 
- szap: szap.o ../lib/lnb.o
--	$(CC) $(LFLAGS) -o szap szap.o ../lib/lnb.o
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< ../lib/lnb.o
- 
- .c.o:
--	$(CC) $(CFLAGS) -o $@ -c $<
-+	$(CC) $(CFLAGS) $(CPPFLAGS) -o $@ -c $<
- 
- .o:
--	$(CC) $(LFLAGS) -o $@ $<
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $<
- 
-+install: install-bin install-data
-+install-bin: all
-+	test "$(bindir)/" != "/" && mkdir -p $(DESTDIR)$(bindir)/
-+	for i in $(TARGETS) ; do \
-+		install -m 755 $$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/ \
-+	; install -m 644 `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
- 
-Nur in linuxtv-dvb-apps-1.1.1/util/szap: szap.d.
-Nur in linuxtv-dvb-apps-1.1.1/util/szap: szap.o.
-Nur in linuxtv-dvb-apps-1.1.1/util/szap: tzap.d.
-Nur in linuxtv-dvb-apps-1.1.1/util/szap: tzap.o.
-diff -ru linuxtv-dvb-apps-1.1.1-orig/util/ttusb_dec_reset/Makefile linuxtv-dvb-apps-1.1.1/util/ttusb_dec_reset/Makefile
---- linuxtv-dvb-apps-1.1.1-orig/util/ttusb_dec_reset/Makefile	2004-01-21 23:13:45.000000000 +0100
-+++ linuxtv-dvb-apps-1.1.1/util/ttusb_dec_reset/Makefile	2006-05-29 18:03:49.000000000 +0200
-@@ -1,17 +1,21 @@
- CC	= gcc
- RM	= rm -f
--CFLAGS	= -g -Wall -O2
--LFLAGS	= -g -Wall
--LDFLAGS = -lusb
-+CFLAGS	?= -g -Wall -O2
-+LDFLAGS	?= 
-+LDADD	+= -lusb
- 
- OBJS	= ttusb_dec_reset.o
- TARGET	= ttusb_dec_reset
- 
-+bindir ?= /usr/local/bin
-+
-+all: $(TARGET)
-+
- $(TARGET): $(OBJS)
--	$(CC) $(LFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(TARGET) $(OBJS) $(LDADD)
- 
--.c.o:
--	$(CC) $(CFLAGS) -c $< -o $@
-+install: all
-+	install -m 755 $(TARGET) $(DESTDIR)/$(bindir)
- 
- clean:
- 	$(RM) *.o $(TARGET)
diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1-r1.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1-r1.ebuild
deleted file mode 100644
index f0952dc74c19..000000000000
--- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,75 +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-r1.ebuild,v 1.1 2006/06/10 13:11:05 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
-		mirror://gentoo/linuxtv-scan-data-20060609.tar.bz2"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="usb? ( >=dev-libs/libusb-0.1.10a )"
-RDEPEND="${DEPEND}"
-
-src_unpack()
-{
-	unpack ${P}.tar.bz2
-
-	epatch ${FILESDIR}/${P}-includefile.patch
-	epatch ${FILESDIR}/${P}-makefile.patch
-
-	cd ${S}
-	unpack linuxtv-scan-data-20060609.tar.bz2
-
-	# 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."
-}