Version bumped. See Bug #134116.

Package-Manager: portage-2.1_rc3

9 files changed, 311 insertions, 5 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/Manifest b/media-tv/linuxtv-dvb-apps/Manifest
index 31a6567d2e94..b93ca1001fb6 100644
--- a/media-tv/linuxtv-dvb-apps/Manifest
+++ b/media-tv/linuxtv-dvb-apps/Manifest
@@ -1,12 +1,74 @@
-MD5 e32db8a897577b476bbac40002f3158c ChangeLog 2692
-MD5 e59829ae0e470e61df8042ac7cae37ae files/digest-linuxtv-dvb-apps-1.1.0 74
-MD5 f0abd17dd61428298069f80983583b6f files/digest-linuxtv-dvb-apps-1.1.0_p20050702 79
-MD5 79ff540a8bc7b4075c497328135228e3 files/digest-linuxtv-dvb-apps-1.1.0_p20060423 70
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX linuxtv-dvb-apps-1.1.0_p20050702-gentoo-datafiles.patch 649 RMD160 ce10d83db2db0d2369105bf5b9e09c84ac586bc0 SHA1 a8d22f498d2dd6a22b8dabe632b97c048a8c57cc SHA256 4a2fb54991f334b1045a40c011ccb39b0696489204a6c49bcf8528240904927c
 MD5 6104b3f8ec6d578f2afa21d626a428c8 files/linuxtv-dvb-apps-1.1.0_p20050702-gentoo-datafiles.patch 649
+RMD160 ce10d83db2db0d2369105bf5b9e09c84ac586bc0 files/linuxtv-dvb-apps-1.1.0_p20050702-gentoo-datafiles.patch 649
+SHA256 4a2fb54991f334b1045a40c011ccb39b0696489204a6c49bcf8528240904927c files/linuxtv-dvb-apps-1.1.0_p20050702-gentoo-datafiles.patch 649
+AUX linuxtv-dvb-apps-1.1.0_p20050702-gentoo-install-ca_zap.patch 471 RMD160 8d44a310118bcd78f988004c44963276efc65d55 SHA1 cecf2f6328e003a60c8fd18a9232164fba037393 SHA256 aad86d055568e04e47743755343f505b32f6282ea237304c3ea5d251bec7fc60
 MD5 086f7b665b6d4a51bc0c82a3a67c4c4c files/linuxtv-dvb-apps-1.1.0_p20050702-gentoo-install-ca_zap.patch 471
+RMD160 8d44a310118bcd78f988004c44963276efc65d55 files/linuxtv-dvb-apps-1.1.0_p20050702-gentoo-install-ca_zap.patch 471
+SHA256 aad86d055568e04e47743755343f505b32f6282ea237304c3ea5d251bec7fc60 files/linuxtv-dvb-apps-1.1.0_p20050702-gentoo-install-ca_zap.patch 471
+AUX linuxtv-dvb-apps-1.1.0_p20050702-gentoo-makefile-corrections.patch 10434 RMD160 766f3c8fdf92cc7dba434bf3fadf72703751c33a SHA1 414998becc48c350cc195f2b068dfd16912df5bd SHA256 910a4d363afbeef32b402d5418f4319cca343f66701f7f215ebf343fb59330c3
 MD5 a6d5954df07a40b6caaa2175bf51a3db files/linuxtv-dvb-apps-1.1.0_p20050702-gentoo-makefile-corrections.patch 10434
+RMD160 766f3c8fdf92cc7dba434bf3fadf72703751c33a files/linuxtv-dvb-apps-1.1.0_p20050702-gentoo-makefile-corrections.patch 10434
+SHA256 910a4d363afbeef32b402d5418f4319cca343f66701f7f215ebf343fb59330c3 files/linuxtv-dvb-apps-1.1.0_p20050702-gentoo-makefile-corrections.patch 10434
+AUX linuxtv-dvb-apps-1.1.0_p20060423-makefile.patch 488 RMD160 bc2938d277d20b320a3a80514199f537e9cd515e SHA1 371f2c8f01d8adb4e3045d634916761a8d21db30 SHA256 2460a36afff004cb4d5524575fb104eb24c0192b3f9951b4087e1aa2f8a7ddc2
 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 4753 RMD160 f3e9805a29e7b1e3cdc559ba9fc7826aa8a64ac9 SHA1 5d8b911990b0be7466b35590b74093506e5c277c SHA256 07a868379f059a7c719b168321637c688fc0d5daebcd88a711c438e18545b0aa
+MD5 8a2a04745bbd97749d1fda333a80061c files/linuxtv-dvb-apps-1.1.1-makefile.patch 4753
+RMD160 f3e9805a29e7b1e3cdc559ba9fc7826aa8a64ac9 files/linuxtv-dvb-apps-1.1.1-makefile.patch 4753
+SHA256 07a868379f059a7c719b168321637c688fc0d5daebcd88a711c438e18545b0aa files/linuxtv-dvb-apps-1.1.1-makefile.patch 4753
+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
+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
+SHA256 4cfcf444334f3933285fdb69cb47c1ea7f9656c619f86a2638b16f6ab738bf88 linuxtv-dvb-apps-1.1.0.ebuild 2105
+EBUILD linuxtv-dvb-apps-1.1.0_p20050702.ebuild 1801 RMD160 95db90a72c89339e2179b2104befa190dc65b49c SHA1 fac0553d904c6fab6336e594776fd821618ef6cb SHA256 e7236def6ff1955a878a18688418fa1d598b6a7ea5b4e5a6b00b387baf831ee7
 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.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 2953 RMD160 67fbacdb4e70d21df9b513d898cb8ae674f20e15 SHA1 bba34a73ca6f96badffb25d8ddd075aaf3db50af SHA256 ff1bc298c545188009c474ef08865a1d5efb585fee5d39f7c4558d7c25f7c2bb
+MD5 1b863c2563d0fe766bf4dc5361870b6b ChangeLog 2953
+RMD160 67fbacdb4e70d21df9b513d898cb8ae674f20e15 ChangeLog 2953
+SHA256 ff1bc298c545188009c474ef08865a1d5efb585fee5d39f7c4558d7c25f7c2bb ChangeLog 2953
+MISC metadata.xml 217 RMD160 2daa552f0b03b2d6ab99fec1eee8ab6648890b75 SHA1 a3ae417f36e171df6c47fbb7460f85a3f957ed3a SHA256 11770dd9c2b190c9d2ba13d3ce36a56e6dddcc8d8a9d11eb20d930cac5d7990f
 MD5 dff9ded73ffb6549a59f5e6144af1cfd metadata.xml 217
+RMD160 2daa552f0b03b2d6ab99fec1eee8ab6648890b75 metadata.xml 217
+SHA256 11770dd9c2b190c9d2ba13d3ce36a56e6dddcc8d8a9d11eb20d930cac5d7990f metadata.xml 217
+MD5 f117ec04f10f73368b94d2893c6e7eaf files/digest-linuxtv-dvb-apps-1.1.0 268
+RMD160 8ac7f2bc0b5bd231af85e80c7ceb00425ffd132a files/digest-linuxtv-dvb-apps-1.1.0 268
+SHA256 0c2cb71fae305de1d50eab27d9012247d93a75572df02c20c290d9536184deda files/digest-linuxtv-dvb-apps-1.1.0 268
+MD5 a2a9e1f9c2a4d75b7600e64a8fbbc949 files/digest-linuxtv-dvb-apps-1.1.0_p20050702 283
+RMD160 b2957e327d97d63d43fcc176fbdee36afd7dfeec files/digest-linuxtv-dvb-apps-1.1.0_p20050702 283
+SHA256 77f98fceef45e372385d5bf836301365c1a2fb8bd271c496b9e72fea0855dcf2 files/digest-linuxtv-dvb-apps-1.1.0_p20050702 283
+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
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEeacNZfSl1Kp5KmoRAiwLAJ4+oYuIUDKWTnMDtSGtZetbnV4DLQCcCDGp
+6bTCWX5d+GoTm6jiLJ5bJ6M=
+=KJmC
+-----END PGP SIGNATURE-----
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."
+}