diff options
Diffstat (limited to 'media-tv/linuxtv-dvb-apps')
9 files changed, 7 insertions, 516 deletions
diff --git a/media-tv/linuxtv-dvb-apps/Manifest b/media-tv/linuxtv-dvb-apps/Manifest index f6b60c083d54..0f43bd614fbe 100644 --- a/media-tv/linuxtv-dvb-apps/Manifest +++ b/media-tv/linuxtv-dvb-apps/Manifest @@ -1,46 +1,20 @@ -----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 -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-20060917.tar.bz2 278797 RMD160 7d4478f0baa698ed62327993c5d9fd2e51c852f8 SHA1 17d1281adede30215466edbaa5b521f963e3ea60 SHA256 535f9d68e5f49650f12ec39aa3b7f4c9a5a07af9a7cd7addc210d8083743aaf0 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 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.20060917.ebuild 2445 RMD160 c826bb0316b1853eba753daedf0c8f8bde16fb32 SHA1 2af4bc56fda6e5776c28b0904fdb5d7e7e74cf20 SHA256 47df35e02e651f50482cf97cc511987cab4ee8c3ac7c35ccf1fa3e72670a613e MD5 1177be30ff631f250269ea7d4783c15c linuxtv-dvb-apps-1.1.1.20060917.ebuild 2445 RMD160 c826bb0316b1853eba753daedf0c8f8bde16fb32 linuxtv-dvb-apps-1.1.1.20060917.ebuild 2445 SHA256 47df35e02e651f50482cf97cc511987cab4ee8c3ac7c35ccf1fa3e72670a613e linuxtv-dvb-apps-1.1.1.20060917.ebuild 2445 -MISC ChangeLog 4087 RMD160 27eabac11cb83812c6fcc8b89e739d447c3ee585 SHA1 b0166722e697f5c99e20b4248c909a36b47135e4 SHA256 5cbfe91fc63cb770e4835d3bee4bcdaa9634a3fa0d409ca7d52ea919dbba7113 -MD5 4ab5784890cc06e68d11ab2de019aa5f ChangeLog 4087 -RMD160 27eabac11cb83812c6fcc8b89e739d447c3ee585 ChangeLog 4087 -SHA256 5cbfe91fc63cb770e4835d3bee4bcdaa9634a3fa0d409ca7d52ea919dbba7113 ChangeLog 4087 +MISC ChangeLog 4560 RMD160 5908f270d3ae02a3a9ed2844a4725aaded18d8a9 SHA1 abdb9d51eeded3add3f74367b5c71530ea108a91 SHA256 f3b167d5604f5cd28a239ad9f75a28043350212a68c84a6383c5a1f0e0bd5a70 +MD5 e58e0b6b98b9b88db6cb4f610960624b ChangeLog 4560 +RMD160 5908f270d3ae02a3a9ed2844a4725aaded18d8a9 ChangeLog 4560 +SHA256 f3b167d5604f5cd28a239ad9f75a28043350212a68c84a6383c5a1f0e0bd5a70 ChangeLog 4560 MISC metadata.xml 217 RMD160 2daa552f0b03b2d6ab99fec1eee8ab6648890b75 SHA1 a3ae417f36e171df6c47fbb7460f85a3f957ed3a SHA256 11770dd9c2b190c9d2ba13d3ce36a56e6dddcc8d8a9d11eb20d930cac5d7990f MD5 dff9ded73ffb6549a59f5e6144af1cfd metadata.xml 217 RMD160 2daa552f0b03b2d6ab99fec1eee8ab6648890b75 metadata.xml 217 @@ -48,19 +22,13 @@ SHA256 11770dd9c2b190c9d2ba13d3ce36a56e6dddcc8d8a9d11eb20d930cac5d7990f metadata 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 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) -iD8DBQFFONb6t2vP6XvVdOcRAhCgAJ0Q5a0JACK2tMzHe+9PX2NqC5cAlQCeLZWE -fYl9btjEgCCwdejbJgcKPHQ= -=l5wz +iD8DBQFFONict2vP6XvVdOcRArfmAKCje4zTCgGo0jjymTu3tKnKsUUcbgCgq5/G +LMp42YqOSR+LOl2ZxxjhZx4= +=2b3/ -----END PGP SIGNATURE----- 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 deleted file mode 100644 index af01f67f0ca5..000000000000 --- a/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.0_p20050702 +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 14bb7b27b589..000000000000 --- a/media-tv/linuxtv-dvb-apps/files/digest-linuxtv-dvb-apps-1.1.0_p20060423 +++ /dev/null @@ -1,3 +0,0 @@ -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/linuxtv-dvb-apps-1.1.0_p20050702-gentoo-datafiles.patch b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.0_p20050702-gentoo-datafiles.patch deleted file mode 100644 index 6e69e1da3cc6..000000000000 --- a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.0_p20050702-gentoo-datafiles.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- dvb-apps-snapshot-20050704-before/util/szap/Makefile 2005-07-04 21:52:01.000000000 +0200 -+++ dvb-apps-snapshot-20050704/util/szap/Makefile 2005-07-04 21:52:58.000000000 +0200 -@@ -43,6 +43,11 @@ - 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 - - -include $(wildcard *.d) dummy - diff --git a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.0_p20050702-gentoo-install-ca_zap.patch b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.0_p20050702-gentoo-install-ca_zap.patch deleted file mode 100644 index cdf594e7e1d5..000000000000 --- a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.0_p20050702-gentoo-install-ca_zap.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- linuxtv-dvb-apps-20050704/util/ca_zap/Makefile.orig 2005-07-05 21:52:30.000000000 +0200 -+++ linuxtv-dvb-apps-20050704/util/ca_zap/Makefile 2005-07-05 21:53:21.000000000 +0200 -@@ -16,6 +16,11 @@ - clean: - $(RM) $(TARGETS) *.o *.d ca_zap - --install: -+install: install-bin install-data -+install-bin: -+ test "$(bindir)/" != "/" -+ mkdir -p $(DESTDIR)$(bindir)/ -+ for i in $(TARGETS) ; do cp $$i $(DESTDIR)$(bindir)/ ; done -+install-data: - - -include $(wildcard *.d) dummy diff --git a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.0_p20050702-gentoo-makefile-corrections.patch b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.0_p20050702-gentoo-makefile-corrections.patch deleted file mode 100644 index eae7d4697255..000000000000 --- a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.0_p20050702-gentoo-makefile-corrections.patch +++ /dev/null @@ -1,291 +0,0 @@ -diff -ru dvb-apps-snapshot-20050702-orig/lib/libdvbcfg/Makefile dvb-apps-snapshot-20050702/lib/libdvbcfg/Makefile ---- dvb-apps-snapshot-20050702-orig/lib/libdvbcfg/Makefile 2005-07-02 15:34:55.000000000 +0200 -+++ dvb-apps-snapshot-20050702/lib/libdvbcfg/Makefile 2005-07-03 12:22:55.000000000 +0200 -@@ -16,7 +16,7 @@ - dvbcfg_common.h \ - dvbcfg_multiplex.h - --CFLAGS = -I. -+CFLAGS += -I. -I../../include - - LIB = libdvbcfg.a - RANLIB = ranlib -diff -ru dvb-apps-snapshot-20050702-orig/lib/libdvbcfg/test/Makefile dvb-apps-snapshot-20050702/lib/libdvbcfg/test/Makefile ---- dvb-apps-snapshot-20050702-orig/lib/libdvbcfg/test/Makefile 2005-07-02 15:34:55.000000000 +0200 -+++ dvb-apps-snapshot-20050702/lib/libdvbcfg/test/Makefile 2005-07-03 12:22:55.000000000 +0200 -@@ -1,5 +1,5 @@ - --CFLAGS = -I.. -+CFLAGS += -I.. - - test: dvbcfg_test.o ../libdvbcfg.a - gcc -o dvbcfg_test dvbcfg_test.o ../libdvbcfg.a -diff -ru dvb-apps-snapshot-20050702-orig/lib/libdvben50221/Makefile dvb-apps-snapshot-20050702/lib/libdvben50221/Makefile ---- dvb-apps-snapshot-20050702-orig/lib/libdvben50221/Makefile 2005-07-02 15:34:55.000000000 +0200 -+++ dvb-apps-snapshot-20050702/lib/libdvben50221/Makefile 2005-07-03 12:22:55.000000000 +0200 -@@ -1,6 +1,7 @@ - CC=gcc --CFLAGS= -g -Wall -W -I ../libdvbsi $(ARCH) --CPPFLAGS = -MD -I../libdvbsi -I. $(DEFS) -+CFLAGS ?= -g -Wall -W -+CFLAGS += -I ../libdvbsi $(ARCH) -+CPPFLAGS += -MD -I../libdvbsi -I. -I../../include $(DEFS) - OBJS = en50221_hlci.o asn_1.o en50221_encode.o gimmick.o - RM=rm - -@@ -9,10 +10,12 @@ - $(OBJS): %.o : %.c - $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ - --libs: -+libs: $(OBJS) - ar rcs libdvben50221.a en50221_hlci.o asn_1.o en50221_encode.o gimmick.o - - clean: - $(RM) *.a *.o *.d - -+install: -+ - -include $(wildcard *.d) dummy -diff -ru dvb-apps-snapshot-20050702-orig/lib/libdvbsi/Makefile dvb-apps-snapshot-20050702/lib/libdvbsi/Makefile ---- dvb-apps-snapshot-20050702-orig/lib/libdvbsi/Makefile 2005-07-02 15:34:55.000000000 +0200 -+++ dvb-apps-snapshot-20050702/lib/libdvbsi/Makefile 2005-07-03 12:22:55.000000000 +0200 -@@ -1,6 +1,7 @@ - CC=gcc --CFLAGS= -g -Wall -O2 $(ARCH) --CPPFLAGS = -MD -I../../include -I../lib -I. $(DEFS) -+CFLAGS ?= -g -Wall -O2 -+CFLAGS += $(ARCH) -+CPPFLAGS += -MD -I../../include -I../lib -I. $(DEFS) - RM=rm - - OBJS = filter.o pat.o pmt.o si.o descriptor.o channels.o -@@ -12,7 +13,9 @@ - clean: - $(RM) *.o *.d *.a - --libs: -+libs: $(OBJS) - ar rcs libdvbsi.a filter.o pat.o pmt.o si.o descriptor.o channels.o - -+install: -+ - -include $(wildcard *.d) dummy -diff -ru dvb-apps-snapshot-20050702-orig/test/Makefile dvb-apps-snapshot-20050702/test/Makefile ---- dvb-apps-snapshot-20050702-orig/test/Makefile 2005-07-02 15:34:55.000000000 +0200 -+++ dvb-apps-snapshot-20050702/test/Makefile 2005-07-03 12:22:55.000000000 +0200 -@@ -1,8 +1,9 @@ - # Makefile for Linux DVB API Version 3 test programs - - CC = gcc --CFLAGS = -g -O2 -W -Wall -D__user= $(ARCH) --CPPFLAGS = -I../include $(DEFS) -+CFLAGS ?= -g -O2 -W -Wall -+CFLAGS += -D__user= $(ARCH) -+CPPFLAGS += -I../include $(DEFS) - - TARGETS = \ - diseqc \ -diff -ru dvb-apps-snapshot-20050702-orig/util/av7110_loadkeys/Makefile dvb-apps-snapshot-20050702/util/av7110_loadkeys/Makefile ---- dvb-apps-snapshot-20050702-orig/util/av7110_loadkeys/Makefile 2005-07-02 15:34:55.000000000 +0200 -+++ dvb-apps-snapshot-20050702/util/av7110_loadkeys/Makefile 2005-07-03 12:22:55.000000000 +0200 -@@ -1,6 +1,7 @@ - CC = gcc --CFLAGS = -g -Wall -O2 $(ARCH) --CPPFLAGS = $(DEFS) -+CFLAGS ?= -g -Wall -O2 -+CFLAGS += $(ARCH) -+CPPFLAGS += $(DEFS) - DEFS = '-DDATADIR="$(datadir)"' - bindir = /usr/local/bin - datadir = /usr/local/share -diff -ru dvb-apps-snapshot-20050702-orig/util/ca_zap/Makefile dvb-apps-snapshot-20050702/util/ca_zap/Makefile ---- dvb-apps-snapshot-20050702-orig/util/ca_zap/Makefile 2005-07-02 15:34:55.000000000 +0200 -+++ dvb-apps-snapshot-20050702/util/ca_zap/Makefile 2005-07-03 12:22:55.000000000 +0200 -@@ -1,6 +1,7 @@ - CC = gcc --CFLAGS = -g -O2 -W -Wall -o $(ARCH) --CPPFLAGS = -MD -I../../lib/libdvbsi -I../../lib/libdvben50221 -+CFLAGS ?= -g -O2 -W -Wall -+CFLAGS += $(ARCH) -+CPPFLAGS += -MD -I../../lib/libdvbsi -I../../lib/libdvben50221 -I../../include - LDFLAGS = -g -O2 -L ../../lib/libdvbsi -ldvbsi -L ../../lib/libdvben50221 -ldvben50221 - RM = rm -f - -@@ -9,10 +10,12 @@ - - all: $(OBJS) $(TARGETS) - --ca_zap: -- $(CC) $(CPPFLAGS) $(CFLAGS) ca_zap ca_zap.o $(LDFLAGS) -+ca_zap: $(OBJS) -+ $(CC) $(CPPFLAGS) $(CFLAGS) -o ca_zap ca_zap.o $(LDFLAGS) - - clean: - $(RM) $(TARGETS) *.o *.d ca_zap - -+install: -+ - -include $(wildcard *.d) dummy -diff -ru dvb-apps-snapshot-20050702-orig/util/dib3000-watch/Makefile dvb-apps-snapshot-20050702/util/dib3000-watch/Makefile ---- dvb-apps-snapshot-20050702-orig/util/dib3000-watch/Makefile 2005-07-02 15:34:55.000000000 +0200 -+++ dvb-apps-snapshot-20050702/util/dib3000-watch/Makefile 2005-07-03 12:22:55.000000000 +0200 -@@ -1,11 +1,11 @@ - CC=gcc - TARGET=dib3000-watch - OBJECTS=dib3000-watch.o --CFLAGS=-c -Wall -+CFLAGS ?= -Wall - LFLAGS=-lm - - .c.o: -- $(CC) $(CFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $< -o $@ - - all: $(TARGET) - -diff -ru dvb-apps-snapshot-20050702-orig/util/dst-utils/Makefile dvb-apps-snapshot-20050702/util/dst-utils/Makefile ---- dvb-apps-snapshot-20050702-orig/util/dst-utils/Makefile 2005-07-02 15:34:55.000000000 +0200 -+++ dvb-apps-snapshot-20050702/util/dst-utils/Makefile 2005-07-03 12:22:55.000000000 +0200 -@@ -1,6 +1,7 @@ - CC = gcc --CFLAGS = -g -O2 -W -Wall -o $(ARCH) --CPPFLAGS = -MD -I../../lib/libdvbsi -I../../lib/libdvben50221 -+CFLAGS ?= -g -O2 -W -Wall -+CFLAGS += $(ARCH) -+CPPFLAGS += -MD -I../../lib/libdvbsi -I../../lib/libdvben50221 -I../../include - LDFLAGS = -g -O2 -L ../../lib/libdvbsi -ldvbsi -L ../../lib/libdvben50221 -ldvben50221 - RM = rm -f - -@@ -9,10 +10,12 @@ - - all: $(OBJS) $(TARGETS) - --dst_test: -- $(CC) $(CPPFLAGS) $(CFLAGS) dst_test dst_test.o $(LD_FLAGS) -+dst_test: $(OBJS) -+ $(CC) $(CPPFLAGS) $(CFLAGS) -o dst_test dst_test.o $(LD_FLAGS) - - clean: - $(RM) $(TARGETS) *.o dst_test - -+install: -+ - -include $(wildcard *.d) dummy -diff -ru dvb-apps-snapshot-20050702-orig/util/dvbdate/Makefile dvb-apps-snapshot-20050702/util/dvbdate/Makefile ---- dvb-apps-snapshot-20050702-orig/util/dvbdate/Makefile 2005-07-02 15:34:55.000000000 +0200 -+++ dvb-apps-snapshot-20050702/util/dvbdate/Makefile 2005-07-03 12:22:55.000000000 +0200 -@@ -1,7 +1,8 @@ - - CC = gcc --CFLAGS = -g -O2 -Wall $(ARCH) --CPPFLAGS= -MD -I../../include $(DEFS) -+CFLAGS ?= -g -O2 -Wall -+CFLAGS += $(ARCH) -+CPPFLAGS += -MD -I../../include $(DEFS) - LFLAGS = - - OBJS = dvbdate.o -diff -ru dvb-apps-snapshot-20050702-orig/util/dvbnet/Makefile dvb-apps-snapshot-20050702/util/dvbnet/Makefile ---- dvb-apps-snapshot-20050702-orig/util/dvbnet/Makefile 2005-07-02 15:34:55.000000000 +0200 -+++ dvb-apps-snapshot-20050702/util/dvbnet/Makefile 2005-07-03 12:22:55.000000000 +0200 -@@ -1,7 +1,8 @@ - - CC = gcc --CFLAGS = -g -O2 -Wall $(ARCH) --CPPFLAGS= -MD -I. -I../../include $(DEFS) -+CFLAGS ?= -g -O2 -Wall -+CFLAGS += $(ARCH) -+CPPFLAGS += -MD -I. -I../../include $(DEFS) - LFLAGS = - bindir = /usr/local/bin - libdir = /usr/local/lib -@@ -14,6 +15,8 @@ - .c.o: - $(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@ - -+dvbnet.o: version.h -+ - $(TARGET): $(OBJS) - $(CC) -o $@ $(OBJS) $(LFLAGS) - -diff -ru dvb-apps-snapshot-20050702-orig/util/dvbtraffic/Makefile dvb-apps-snapshot-20050702/util/dvbtraffic/Makefile ---- dvb-apps-snapshot-20050702-orig/util/dvbtraffic/Makefile 2005-07-02 15:34:55.000000000 +0200 -+++ dvb-apps-snapshot-20050702/util/dvbtraffic/Makefile 2005-07-03 12:22:55.000000000 +0200 -@@ -1,5 +1,6 @@ --CFLAGS = -g -O2 -Wall $(ARCH) --CPPFLAGS = -MD -I../../include $(DEFS) -+CFLAGS ?= -g -O2 -Wall -+CFLAGS += $(ARCH) -+CPPFLAGS += -MD -I../../include $(DEFS) - bindir = /usr/local/bin - - dvbtraffic: dvbtraffic.c -diff -ru dvb-apps-snapshot-20050702-orig/util/lib/Makefile dvb-apps-snapshot-20050702/util/lib/Makefile ---- dvb-apps-snapshot-20050702-orig/util/lib/Makefile 2005-07-02 15:34:55.000000000 +0200 -+++ dvb-apps-snapshot-20050702/util/lib/Makefile 2005-07-03 12:22:55.000000000 +0200 -@@ -1,7 +1,8 @@ - - CC = gcc --CFLAGS = -g -Wall -O2 $(ARCH) --CPPFLAGS = -MD -I../../include -I. $(DEFS) -+CFLAGS ?= -g -Wall -O2 -+CFLAGS += $(ARCH) -+CPPFLAGS += -MD -I../../include -I. $(DEFS) - bindir = /usr/local/bin - - OBJS = lnb.o -diff -ru dvb-apps-snapshot-20050702-orig/util/scan/Makefile dvb-apps-snapshot-20050702/util/scan/Makefile ---- dvb-apps-snapshot-20050702-orig/util/scan/Makefile 2005-07-02 15:34:55.000000000 +0200 -+++ dvb-apps-snapshot-20050702/util/scan/Makefile 2005-07-03 12:22:55.000000000 +0200 -@@ -1,7 +1,8 @@ - - CC = gcc --CFLAGS = -g -Wall -O2 $(ARCH) --CPPFLAGS = -MD -I../../include -I../lib $(DEFS) -+CFLAGS ?= -g -Wall -O2 -+CFLAGS +=$(ARCH) -+CPPFLAGS += -MD -I../../include -I../lib $(DEFS) - LFLAGS = -g -Wall - DEFS = '-DDATADIR="$(datadir)"' - bindir = /usr/local/bin -@@ -35,9 +36,11 @@ - mkdir -p $(DESTDIR)$(datadir)/dvb - for d in dvb-* atsc ; do test -d $$d || continue ; echo ..... $$d ..... \ - ; mkdir -p $(DESTDIR)$(datadir)/dvb/$$d/ \ -- ; cp `find $$d -type f` $(DESTDIR)$(datadir)/dvb/$$d/ ; done -+ ; cp `find $$d -type f|grep -v CVS` $(DESTDIR)$(datadir)/dvb/$$d/ ; done - - -include $(wildcard *.d) dummy - -+atsc_psip_section.h: atsc_psip_section.c -+ - atsc_psip_section.c: atsc_psip_section.pl section_generate.pl - perl section_generate.pl atsc_psip_section.pl -diff -ru dvb-apps-snapshot-20050702-orig/util/szap/Makefile dvb-apps-snapshot-20050702/util/szap/Makefile ---- dvb-apps-snapshot-20050702-orig/util/szap/Makefile 2005-07-02 15:34:55.000000000 +0200 -+++ dvb-apps-snapshot-20050702/util/szap/Makefile 2005-07-03 12:22:55.000000000 +0200 -@@ -1,6 +1,7 @@ - CC = gcc --CFLAGS = -Wall -g -O2 $(ARCH) --CPPFLAGS = -MD -I../../include -I../lib $(DEFS) -+CFLAGS ?= -Wall -g -O2 -+CFLAGS += $(ARCH) -+CPPFLAGS += -MD -I../../include -I../lib $(DEFS) - LFLAGS = -Wall -g -O2 - RM = rm -f - DEFS = '-DDATADIR="$(datadir)"' -diff -ru dvb-apps-snapshot-20050702-orig/util/ttusb_dec_reset/Makefile dvb-apps-snapshot-20050702/util/ttusb_dec_reset/Makefile ---- dvb-apps-snapshot-20050702-orig/util/ttusb_dec_reset/Makefile 2005-07-02 15:34:55.000000000 +0200 -+++ dvb-apps-snapshot-20050702/util/ttusb_dec_reset/Makefile 2005-07-03 12:22:55.000000000 +0200 -@@ -1,7 +1,8 @@ - CC = gcc - RM = rm -f --CFLAGS = -g -Wall -O2 $(ARCH) --CPPFLAGS = $(DEFS) -+CFLAGS ?= -g -Wall -O2 -+CFLAGS += $(ARCH) -+CPPFLAGS += $(DEFS) - LFLAGS = -g -Wall - LDFLAGS = -lusb - bindir = /usr/local/bin diff --git a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.0_p20060423-makefile.patch b/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.0_p20060423-makefile.patch deleted file mode 100644 index 8e2a3a6d4aad..000000000000 --- a/media-tv/linuxtv-dvb-apps/files/linuxtv-dvb-apps-1.1.0_p20060423-makefile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru dvb-apps-20060423-orig/util/dib3000-watch/Makefile dvb-apps-20060423/util/dib3000-watch/Makefile ---- dvb-apps-20060423-orig/util/dib3000-watch/Makefile 2006-04-23 23:12:14.000000000 +0200 -+++ dvb-apps-20060423/util/dib3000-watch/Makefile 2006-04-23 23:18:53.000000000 +0200 -@@ -16,3 +16,8 @@ - rm -f $(TARGET) $(OBJECTS) *~ - - dib-demod-watch.o: dib3000-watch.h dib-i2c.h dib3000.h -+ -+install: install-bin -+install-bin: $(TARGET) -+ install -m 755 $(TARGET) $(DESTDIR)$(bindir) -+ diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.0_p20050702.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.0_p20050702.ebuild deleted file mode 100644 index 9059a82223ab..000000000000 --- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.0_p20050702.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2005 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.0_p20050702.ebuild,v 1.5 2005/10/29 19:44:29 zzam Exp $ - - -inherit eutils - -MY_P="${PN/linuxtv-/}-snapshot-${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="mirror://gentoo/${MY_P}.tar.bz2" -KEYWORDS="~amd64 x86" -S=${WORKDIR}/${MY_P} - -DEPEND="usb? ( >=dev-libs/libusb-0.1.10a )" -RDEPEND="${DEPEND}" - -src_unpack() -{ - unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-gentoo-makefile-corrections.patch - epatch ${FILESDIR}/${P}-gentoo-datafiles.patch - epatch ${FILESDIR}/${P}-gentoo-install-ca_zap.patch - - # disables compilation of ttusb_dec_reset which requires libusb - use usb || sed -i util/Makefile -e '/ttusb_dec_reset/d' - - # 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 - - emake bindir=/usr/bin datadir=/usr/share libdir=/usr/lib 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." -} diff --git a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.0_p20060423.ebuild b/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.0_p20060423.ebuild deleted file mode 100644 index 8fb2e9bf0e2b..000000000000 --- a/media-tv/linuxtv-dvb-apps/linuxtv-dvb-apps-1.1.0_p20060423.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.0_p20060423.ebuild,v 1.2 2006/07/12 12:03:09 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="mirror://gentoo/${MY_P}.tar.bz2" -KEYWORDS="~amd64 x86" -S=${WORKDIR}/${MY_P} - -DEPEND="usb? ( >=dev-libs/libusb-0.1.10a )" -RDEPEND="${DEPEND}" - -src_unpack() -{ - unpack ${A} - cd ${S} - - epatch ${FILESDIR}/${P}-makefile.patch - - # 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." -} |