Renamed some files to avoid file-collisions. Set maintainer to myself.

Package-Manager: portage-2.1_pre3-r1

14 files changed, 572 insertions, 11 deletions

diff --git a/media-libs/libdvb/ChangeLog b/media-libs/libdvb/ChangeLog
index 0a218525a840..98674f3f24b3 100644
--- a/media-libs/libdvb/ChangeLog
+++ b/media-libs/libdvb/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for media-libs/libdvb
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/ChangeLog,v 1.22 2005/12/13 11:37:30 zzam Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/ChangeLog,v 1.23 2006/01/21 13:54:27 zzam Exp $
+
+*libdvb-0.5.5.1-r2 (21 Jan 2006)
+*libdvb-0.5.5-r2 (21 Jan 2006)
+*libdvb-0.5.0-r3 (21 Jan 2006)
+
+  21 Jan 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/libdvb-0.5.0-gentoo-file-collisions.patch,
+  +files/libdvb-0.5.5.1-gentoo-file-collisions.patch,
+  +files/libdvb-0.5.5-gentoo-file-collisions.patch, metadata.xml,
+  +libdvb-0.5.0-r3.ebuild, +libdvb-0.5.5-r2.ebuild,
+  +libdvb-0.5.5.1-r2.ebuild:
+  Renamed some files to avoid file-collisions. Set maintainer to myself.
 
   13 Dec 2005; Matthias Schwarzott <zzam@gentoo.org> libdvb-0.5.0-r1.ebuild,
   libdvb-0.5.0-r2.ebuild, libdvb-0.5.5.ebuild, libdvb-0.5.5-r1.ebuild,
diff --git a/media-libs/libdvb/Manifest b/media-libs/libdvb/Manifest
index 0ebee1d91600..6c32d4a42a42 100644
--- a/media-libs/libdvb/Manifest
+++ b/media-libs/libdvb/Manifest
@@ -1,18 +1,37 @@
-MD5 2f4b306e59ae68295fca207192036ceb ChangeLog 3917
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 b12a73b6f7332a761c635ad33b1b1375 ChangeLog 4393
 MD5 b60c65ce69975d3a63cce5830639e6fd files/digest-libdvb-0.5.0-r1 64
 MD5 b60c65ce69975d3a63cce5830639e6fd files/digest-libdvb-0.5.0-r2 64
+MD5 b60c65ce69975d3a63cce5830639e6fd files/digest-libdvb-0.5.0-r3 64
 MD5 32ee5372809634529d6892a5aa76b7ad files/digest-libdvb-0.5.5 64
 MD5 32ee5372809634529d6892a5aa76b7ad files/digest-libdvb-0.5.5-r1 64
+MD5 32ee5372809634529d6892a5aa76b7ad files/digest-libdvb-0.5.5-r2 64
 MD5 780b4f37ff13c0c42c9966bf4ddf0640 files/digest-libdvb-0.5.5.1 66
 MD5 780b4f37ff13c0c42c9966bf4ddf0640 files/digest-libdvb-0.5.5.1-r1 66
+MD5 780b4f37ff13c0c42c9966bf4ddf0640 files/digest-libdvb-0.5.5.1-r2 66
 MD5 69502406503f38e60bd8e35f2f80e586 files/errno.patch 258
+MD5 170099215f05e824a2320838ef728199 files/libdvb-0.5.0-gentoo-file-collisions.patch 4051
 MD5 76dfb6639fdd6868d34b0eec46123c06 files/libdvb-0.5.0-gentoo.patch 2448
+MD5 f9f9ac189a879c339aade17f3bacb284 files/libdvb-0.5.5-gentoo-file-collisions.patch 4796
 MD5 2be0eba6ba9919ca334c327d3310a254 files/libdvb-0.5.5-gentoo.patch 1065
+MD5 f9f9ac189a879c339aade17f3bacb284 files/libdvb-0.5.5.1-gentoo-file-collisions.patch 4796
 MD5 34510a9d50277d893ab3a8b316291349 files/libdvb-0.5.5.1-gentoo.patch 1052
 MD5 1ea18f4c6370ce0cf6cb0bb16a7d1f1a libdvb-0.5.0-r1.ebuild 1062
 MD5 503001b583ab47c70e40a1951758be9b libdvb-0.5.0-r2.ebuild 1120
+MD5 ca3cd1038c41a8b60c377ad2f3db54a2 libdvb-0.5.0-r3.ebuild 1134
 MD5 c236283cf89eba4b41f10120b39ee7be libdvb-0.5.5-r1.ebuild 1345
-MD5 a225473ff2e7b11b574fdac8bd2b4892 libdvb-0.5.5.1-r1.ebuild 1268
+MD5 995c2795fbe87b68b0d1a715c5dd78de libdvb-0.5.5-r2.ebuild 1359
+MD5 7a30ede843c9956487979f2b7c9f4347 libdvb-0.5.5.1-r1.ebuild 1268
+MD5 7f27b3d68a225574bbcfc3794bcb09c3 libdvb-0.5.5.1-r2.ebuild 1303
 MD5 ee02cb01e35096c862f3a90eea650799 libdvb-0.5.5.1.ebuild 1234
-MD5 a135911c3d02ffb273acd8d8896fa8f2 libdvb-0.5.5.ebuild 1326
-MD5 46b3654b1563aad69c575e55e8d67b61 metadata.xml 220
+MD5 5d374892aafc3e2d726d59bd714564df libdvb-0.5.5.ebuild 1326
+MD5 dff9ded73ffb6549a59f5e6144af1cfd metadata.xml 217
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFD0j1OZfSl1Kp5KmoRAtW+AJ9EIRXYJv+5PT7igMdkEINAIi6qVwCdFWqQ
+t6Dsbi3klRyHTVEwMWI9kfI=
+=HoSi
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libdvb/files/digest-libdvb-0.5.0-r3 b/media-libs/libdvb/files/digest-libdvb-0.5.0-r3
new file mode 100644
index 000000000000..c6ec2552f15e
--- /dev/null
+++ b/media-libs/libdvb/files/digest-libdvb-0.5.0-r3
@@ -0,0 +1 @@
+MD5 1a293f072e2280c8910c7cd745b79441 libdvb-0.5.0.tar.gz 255381
diff --git a/media-libs/libdvb/files/digest-libdvb-0.5.5-r2 b/media-libs/libdvb/files/digest-libdvb-0.5.5-r2
new file mode 100644
index 000000000000..f3dd3461ac0e
--- /dev/null
+++ b/media-libs/libdvb/files/digest-libdvb-0.5.5-r2
@@ -0,0 +1 @@
+MD5 245e59b51ab8c64cd8d84a39262433d4 libdvb-0.5.5.tar.gz 282174
diff --git a/media-libs/libdvb/files/digest-libdvb-0.5.5.1-r2 b/media-libs/libdvb/files/digest-libdvb-0.5.5.1-r2
new file mode 100644
index 000000000000..00169162b126
--- /dev/null
+++ b/media-libs/libdvb/files/digest-libdvb-0.5.5.1-r2
@@ -0,0 +1 @@
+MD5 47612d2f8a4d4dee746a166d8b7f6f77 libdvb-0.5.5.1.tar.gz 312295
diff --git a/media-libs/libdvb/files/libdvb-0.5.0-gentoo-file-collisions.patch b/media-libs/libdvb/files/libdvb-0.5.0-gentoo-file-collisions.patch
new file mode 100644
index 000000000000..2e1ef0fa8a7b
--- /dev/null
+++ b/media-libs/libdvb/files/libdvb-0.5.0-gentoo-file-collisions.patch
@@ -0,0 +1,129 @@
+diff -ru libdvb-0.5.0-orig/dvb-mpegtools/main.cc libdvb-0.5.0/dvb-mpegtools/main.cc
+--- libdvb-0.5.0-orig/dvb-mpegtools/main.cc	2006-01-21 14:31:56.978292000 +0100
++++ libdvb-0.5.0/dvb-mpegtools/main.cc	2006-01-21 14:33:40.616769000 +0100
+@@ -55,7 +55,7 @@
+ 
+ #define PROGS 30
+ 
+-char *prognames[PROGS+1] = { "streamtype",    // 0 	
++char *prognames[PROGS+1] = { "streamtype_mpg",    // 0 	
+ 			     "ts2pes", 	    // 1 	
+ 			     "ps2vid", 	
+ 			     "pes2aud_es", 	
+@@ -64,7 +64,7 @@
+ 			     "pes2vid", 	
+ 			     "tspids", 		
+ 			     "pes2ts", 		
+-			     "analyze", 	      
++			     "analyze_mpg", 	      
+ 			     "pes_demux", 	 // 10 		
+ 			     "es_demux", 		
+ 			     "ts_demux", 		
+@@ -89,7 +89,7 @@
+ };
+ 
+ 
+-enum { streamtype_,    // 0 	
++enum { streamtype_mpg_,    // 0 	
+        ts2pes_, 	    // 1 	
+        ps2vid_, 	
+        pes2aud_es_, 	
+@@ -98,7 +98,7 @@
+        pes2vid_, 	
+        tspids_, 		
+        pes2ts_, 		
+-       analyze_, 	      
++       analyze_mpg_, 	      
+        pes_demux_, 	 // 10 		
+        es_demux_, 		
+        ts_demux_, 		
+@@ -126,9 +126,9 @@
+ {
+ 	switch(progn){
+ 		
+-	case streamtype_:
+-		cerr << "usage: streamtype <filename>" << endl;
+-		cerr << "or     streamtype < <filename> (or pipe)" << endl;
++	case streamtype_mpg_:
++		cerr << "usage: streamtype_mpg <filename>" << endl;
++		cerr << "or     streamtype_mpg < <filename> (or pipe)" << endl;
+ 		break;
+ 		
+ 	case ts2pes_:
+@@ -178,9 +178,9 @@
+ 		cerr << " (or pipe)" << endl;
+ 		break;
+ 
+-	case analyze_:
+-		cerr << "usage: analyze <filename>" << endl;
+-		cerr << "    or analyze < <filename> (or pipe)" << endl;
++	case analyze_mpg_:
++		cerr << "usage: analyze_mpg <filename>" << endl;
++		cerr << "    or analyze_mpg < <filename> (or pipe)" << endl;
+ 		break;
+ 
+ 	case pes_demux_:	
+@@ -326,7 +326,7 @@
+ 		}
+ 		
+ 		switch( progn ){
+-		case streamtype_:
++		case streamtype_mpg_:
+ 		{
+ 			char *streams[4] = { "PS_STREAM", "TS_STREAM"
+ 						    , "PES_STREAM"};
+@@ -436,7 +436,7 @@
+ 			}
+ 			break;
+ 			
+-		case analyze_:
++		case analyze_mpg_:
+ 			if (fd == STDIN_FILENO){
+ 				analyze(cin);
+ 			} else {
+diff -ru libdvb-0.5.0-orig/dvb-mpegtools/Makefile libdvb-0.5.0/dvb-mpegtools/Makefile
+--- libdvb-0.5.0-orig/dvb-mpegtools/Makefile	2006-01-21 14:31:56.978292000 +0100
++++ libdvb-0.5.0/dvb-mpegtools/Makefile	2006-01-21 14:34:02.902161750 +0100
+@@ -11,8 +11,8 @@
+ CPPSRC = $(wildcard *.cpp)
+ CSRC = $(wildcard *.cc) 
+ COBJ = $(notdir $(SRC:.c=.o)) 
+-LINKS = streamtype ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
+-	tspids pes2ts analyze pes_demux es_demux ts_demux ts_es_demux \
++LINKS = streamtype_mpg ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
++	tspids pes2ts analyze_mpg pes_demux es_demux ts_demux ts_es_demux \
+ 	pesplot remux pes2ts2 pes_repack split_mpg cut_mpg ts2ps ts2es\
+ 	insert_pat_pmt get_http extract_pes extract_pes_payload\
+ 	change_aspect_1_1 change_aspect_4_3 change_aspect_16_9 \
+diff -ru libdvb-0.5.0-orig/dvb-mpegtools/README libdvb-0.5.0/dvb-mpegtools/README
+--- libdvb-0.5.0-orig/dvb-mpegtools/README	2006-01-21 14:31:56.978292000 +0100
++++ libdvb-0.5.0/dvb-mpegtools/README	2006-01-21 14:34:36.620269000 +0100
+@@ -21,10 +21,10 @@
+ get_http http://mymachine:8090/test.avi | mplayer -
+ usage: get_http <URL>
+ 
+-streamtype
++streamtype_mpg (original name was streamtype, renamed to avoid name collisions) 
+ tries to recognize the stream type and gives information about the stream.
+-usage: streamtype <filename>
+-or     streamtype < <filename> (or pipe)
++usage: streamtype_mpg <filename>
++or     streamtype_mpg < <filename> (or pipe)
+ 
+ ts2ps
+ ts2pes
+@@ -70,11 +70,11 @@
+ usage: pes2ts2 <filename> <audio  PID> <video PID>
+ or pes2ts2 < <filename> <audio  PID> <video PID> (or pipe)
+ 
+-analyze	
++analyze_mpg (original name was analyze, renamed to avoid name collisions)
+ gives some information about a PS/PES stream and all the packets
+ contained therein.
+-usage: analyze <filename>
+-or analyze < <filename> (or pipe)
++usage: analyze_mpg <filename>
++or analyze_mpg < <filename> (or pipe)
+ 
+ pes_demux	
+ es_demux
diff --git a/media-libs/libdvb/files/libdvb-0.5.5-gentoo-file-collisions.patch b/media-libs/libdvb/files/libdvb-0.5.5-gentoo-file-collisions.patch
new file mode 100644
index 000000000000..408c62c28112
--- /dev/null
+++ b/media-libs/libdvb/files/libdvb-0.5.5-gentoo-file-collisions.patch
@@ -0,0 +1,129 @@
+diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/main.cc libdvb-0.5.5.1/dvb-mpegtools/main.cc
+--- libdvb-0.5.5.1-orig/dvb-mpegtools/main.cc	2006-01-21 14:16:09.919104500 +0100
++++ libdvb-0.5.5.1/dvb-mpegtools/main.cc	2006-01-21 14:16:38.460888250 +0100
+@@ -54,7 +54,7 @@
+ 
+ #define PROGS 29
+ 
+-char *prognames[PROGS+1] = { "streamtype",    // 0
++char *prognames[PROGS+1] = { "streamtype_mpg",    // 0
+                              "ts2pes", 	    // 1
+                              "ps2vid",
+                              "pes2aud_es",
+@@ -63,7 +63,7 @@
+                              "pes2vid",
+                              "tspids",
+                              "pes2ts",
+-                             "analyze",
++                             "analyze_mpg",
+                              "pes_demux", 	 // 10
+                              "es_demux",
+                              "ts_demux",
+@@ -87,7 +87,7 @@
+                            };
+ 
+ 
+-enum { streamtype_,    // 0
++enum { streamtype_mpg_,    // 0
+        ts2pes_, 	    // 1
+        ps2vid_,
+        pes2aud_es_,
+@@ -96,7 +96,7 @@
+        pes2vid_,
+        tspids_,
+        pes2ts_,
+-       analyze_,
++       analyze_mpg_,
+        pes_demux_, 	 // 10
+        es_demux_,
+        ts_demux_,
+@@ -123,9 +123,9 @@
+ {
+         switch(progn) {
+ 
+-        case streamtype_:
+-                cerr << "usage: streamtype <filename>" << endl;
+-                cerr << "or     streamtype < <filename> (or pipe)" << endl;
++        case streamtype_mpg_:
++                cerr << "usage: streamtype_mpg <filename>" << endl;
++                cerr << "or     streamtype_mpg < <filename> (or pipe)" << endl;
+                 break;
+ 
+         case ts2pes_:
+@@ -175,9 +175,9 @@
+                 cerr << " (or pipe)" << endl;
+                 break;
+ 
+-        case analyze_:
+-                cerr << "usage: analyze <filename>" << endl;
+-                cerr << "    or analyze < <filename> (or pipe)" << endl;
++        case analyze_mpg_:
++                cerr << "usage: analyze_mpg <filename>" << endl;
++                cerr << "    or analyze_mpg < <filename> (or pipe)" << endl;
+                 break;
+ 
+         case pes_demux_:
+@@ -320,7 +320,7 @@
+                 }
+ 
+                 switch( progn ) {
+-                case streamtype_: {
++                case streamtype_mpg_: {
+                                 char *streams[4] = { "PS_STREAM", "TS_STREAM"
+                                                      , "PES_STREAM"};
+                                 char *tv_form[3] = {"DUNNO", "PAL", "NTSC"};
+@@ -426,7 +426,7 @@
+                         }
+                         break;
+ 
+-                case analyze_:
++                case analyze_mpg_:
+                         if (fd == STDIN_FILENO) {
+                                 analyze(cin);
+                         } else {
+diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/Makefile libdvb-0.5.5.1/dvb-mpegtools/Makefile
+--- libdvb-0.5.5.1-orig/dvb-mpegtools/Makefile	2006-01-21 14:16:09.919104500 +0100
++++ libdvb-0.5.5.1/dvb-mpegtools/Makefile	2006-01-21 14:16:38.460888250 +0100
+@@ -11,8 +11,8 @@
+ CPPSRC = $(wildcard *.cpp)
+ CSRC = $(wildcard *.cc) 
+ COBJ = $(notdir $(SRC:.c=.o)) 
+-LINKS = streamtype ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
+-	tspids pes2ts analyze pes_demux es_demux ts_demux ts_es_demux \
++LINKS = streamtype_mpg ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
++	tspids pes2ts analyze_mpg pes_demux es_demux ts_demux ts_es_demux \
+ 	pesplot pes2ts2 pes_repack split_mpg cut_mpg ts2ps ts2es\
+ 	insert_pat_pmt get_http extract_pes extract_pes_payload\
+ 	change_aspect_1_1 change_aspect_4_3 change_aspect_16_9 \
+diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/README libdvb-0.5.5.1/dvb-mpegtools/README
+--- libdvb-0.5.5.1-orig/dvb-mpegtools/README	2006-01-21 14:16:09.923104750 +0100
++++ libdvb-0.5.5.1/dvb-mpegtools/README	2006-01-21 14:24:06.020859000 +0100
+@@ -21,10 +21,10 @@
+ get_http http://mymachine:8090/test.avi | mplayer -
+ usage: get_http <URL>
+ 
+-streamtype
++streamtype_mpg (original name was streamtype, renamed to avoid name collisions) 
+ tries to recognize the stream type and gives information about the stream.
+-usage: streamtype <filename>
+-or     streamtype < <filename> (or pipe)
++usage: streamtype_mpg <filename>
++or     streamtype_mpg < <filename> (or pipe)
+ 
+ ts2ps
+ ts2pes
+@@ -70,11 +70,11 @@
+ usage: pes2ts2 <filename> <audio  PID> <video PID>
+ or pes2ts2 < <filename> <audio  PID> <video PID> (or pipe)
+ 
+-analyze	
++analyze_mpg (original name was analyze, renamed to avoid name collisions)
+ gives some information about a PS/PES stream and all the packets
+ contained therein.
+-usage: analyze <filename>
+-or analyze < <filename> (or pipe)
++usage: analyze_mpg <filename>
++or analyze_mpg < <filename> (or pipe)
+ 
+ pes_demux	
+ es_demux
diff --git a/media-libs/libdvb/files/libdvb-0.5.5.1-gentoo-file-collisions.patch b/media-libs/libdvb/files/libdvb-0.5.5.1-gentoo-file-collisions.patch
new file mode 100644
index 000000000000..408c62c28112
--- /dev/null
+++ b/media-libs/libdvb/files/libdvb-0.5.5.1-gentoo-file-collisions.patch
@@ -0,0 +1,129 @@
+diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/main.cc libdvb-0.5.5.1/dvb-mpegtools/main.cc
+--- libdvb-0.5.5.1-orig/dvb-mpegtools/main.cc	2006-01-21 14:16:09.919104500 +0100
++++ libdvb-0.5.5.1/dvb-mpegtools/main.cc	2006-01-21 14:16:38.460888250 +0100
+@@ -54,7 +54,7 @@
+ 
+ #define PROGS 29
+ 
+-char *prognames[PROGS+1] = { "streamtype",    // 0
++char *prognames[PROGS+1] = { "streamtype_mpg",    // 0
+                              "ts2pes", 	    // 1
+                              "ps2vid",
+                              "pes2aud_es",
+@@ -63,7 +63,7 @@
+                              "pes2vid",
+                              "tspids",
+                              "pes2ts",
+-                             "analyze",
++                             "analyze_mpg",
+                              "pes_demux", 	 // 10
+                              "es_demux",
+                              "ts_demux",
+@@ -87,7 +87,7 @@
+                            };
+ 
+ 
+-enum { streamtype_,    // 0
++enum { streamtype_mpg_,    // 0
+        ts2pes_, 	    // 1
+        ps2vid_,
+        pes2aud_es_,
+@@ -96,7 +96,7 @@
+        pes2vid_,
+        tspids_,
+        pes2ts_,
+-       analyze_,
++       analyze_mpg_,
+        pes_demux_, 	 // 10
+        es_demux_,
+        ts_demux_,
+@@ -123,9 +123,9 @@
+ {
+         switch(progn) {
+ 
+-        case streamtype_:
+-                cerr << "usage: streamtype <filename>" << endl;
+-                cerr << "or     streamtype < <filename> (or pipe)" << endl;
++        case streamtype_mpg_:
++                cerr << "usage: streamtype_mpg <filename>" << endl;
++                cerr << "or     streamtype_mpg < <filename> (or pipe)" << endl;
+                 break;
+ 
+         case ts2pes_:
+@@ -175,9 +175,9 @@
+                 cerr << " (or pipe)" << endl;
+                 break;
+ 
+-        case analyze_:
+-                cerr << "usage: analyze <filename>" << endl;
+-                cerr << "    or analyze < <filename> (or pipe)" << endl;
++        case analyze_mpg_:
++                cerr << "usage: analyze_mpg <filename>" << endl;
++                cerr << "    or analyze_mpg < <filename> (or pipe)" << endl;
+                 break;
+ 
+         case pes_demux_:
+@@ -320,7 +320,7 @@
+                 }
+ 
+                 switch( progn ) {
+-                case streamtype_: {
++                case streamtype_mpg_: {
+                                 char *streams[4] = { "PS_STREAM", "TS_STREAM"
+                                                      , "PES_STREAM"};
+                                 char *tv_form[3] = {"DUNNO", "PAL", "NTSC"};
+@@ -426,7 +426,7 @@
+                         }
+                         break;
+ 
+-                case analyze_:
++                case analyze_mpg_:
+                         if (fd == STDIN_FILENO) {
+                                 analyze(cin);
+                         } else {
+diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/Makefile libdvb-0.5.5.1/dvb-mpegtools/Makefile
+--- libdvb-0.5.5.1-orig/dvb-mpegtools/Makefile	2006-01-21 14:16:09.919104500 +0100
++++ libdvb-0.5.5.1/dvb-mpegtools/Makefile	2006-01-21 14:16:38.460888250 +0100
+@@ -11,8 +11,8 @@
+ CPPSRC = $(wildcard *.cpp)
+ CSRC = $(wildcard *.cc) 
+ COBJ = $(notdir $(SRC:.c=.o)) 
+-LINKS = streamtype ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
+-	tspids pes2ts analyze pes_demux es_demux ts_demux ts_es_demux \
++LINKS = streamtype_mpg ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
++	tspids pes2ts analyze_mpg pes_demux es_demux ts_demux ts_es_demux \
+ 	pesplot pes2ts2 pes_repack split_mpg cut_mpg ts2ps ts2es\
+ 	insert_pat_pmt get_http extract_pes extract_pes_payload\
+ 	change_aspect_1_1 change_aspect_4_3 change_aspect_16_9 \
+diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/README libdvb-0.5.5.1/dvb-mpegtools/README
+--- libdvb-0.5.5.1-orig/dvb-mpegtools/README	2006-01-21 14:16:09.923104750 +0100
++++ libdvb-0.5.5.1/dvb-mpegtools/README	2006-01-21 14:24:06.020859000 +0100
+@@ -21,10 +21,10 @@
+ get_http http://mymachine:8090/test.avi | mplayer -
+ usage: get_http <URL>
+ 
+-streamtype
++streamtype_mpg (original name was streamtype, renamed to avoid name collisions) 
+ tries to recognize the stream type and gives information about the stream.
+-usage: streamtype <filename>
+-or     streamtype < <filename> (or pipe)
++usage: streamtype_mpg <filename>
++or     streamtype_mpg < <filename> (or pipe)
+ 
+ ts2ps
+ ts2pes
+@@ -70,11 +70,11 @@
+ usage: pes2ts2 <filename> <audio  PID> <video PID>
+ or pes2ts2 < <filename> <audio  PID> <video PID> (or pipe)
+ 
+-analyze	
++analyze_mpg (original name was analyze, renamed to avoid name collisions)
+ gives some information about a PS/PES stream and all the packets
+ contained therein.
+-usage: analyze <filename>
+-or analyze < <filename> (or pipe)
++usage: analyze_mpg <filename>
++or analyze_mpg < <filename> (or pipe)
+ 
+ pes_demux	
+ es_demux
diff --git a/media-libs/libdvb/libdvb-0.5.0-r3.ebuild b/media-libs/libdvb/libdvb-0.5.0-r3.ebuild
new file mode 100644
index 000000000000..746fc1335571
--- /dev/null
+++ b/media-libs/libdvb/libdvb-0.5.0-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.0-r3.ebuild,v 1.1 2006/01/21 13:54:27 zzam Exp $
+
+inherit eutils
+
+DESCRIPTION="libdvb package with added CAM library and libdvbmpegtools as well as dvb-mpegtools"
+HOMEPAGE="http://www.metzlerbros.org/dvb/"
+SRC_URI="http://www.metzlerbros.org/dvb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND="media-tv/linuxtv-dvb-headers"
+
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	# Disable compilation of sample programs
+	# and use DESTDIR when installing
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/errno.patch"
+	epatch "${FILESDIR}/${P}-gentoo-file-collisions.patch"
+	sed -i.orig Makefile -e 's-/include-/include/libdvb-g'
+}
+
+src_compile() {
+	emake || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR="${D}" PREFIX=/usr install || die
+
+	insinto "/usr/share/doc/${PF}/sample_progs"
+	doins sample_progs/*
+	insinto "/usr/share/doc/${PF}/samplerc"
+	doins samplerc/*
+
+	dodoc README
+}
diff --git a/media-libs/libdvb/libdvb-0.5.5-r2.ebuild b/media-libs/libdvb/libdvb-0.5.5-r2.ebuild
new file mode 100644
index 000000000000..f8c46e7b4fb5
--- /dev/null
+++ b/media-libs/libdvb/libdvb-0.5.5-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.5-r2.ebuild,v 1.1 2006/01/21 13:54:27 zzam Exp $
+
+inherit eutils
+
+DESCRIPTION="libdvb package with added CAM library and libdvbmpegtools as well as dvb-mpegtools"
+HOMEPAGE="http://www.metzlerbros.org/dvb/"
+SRC_URI="http://www.metzlerbros.org/dvb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND="media-tv/linuxtv-dvb-headers"
+
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	# Disable compilation of sample programs
+	# and use DESTDIR when installing
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/errno.patch"
+	epatch "${FILESDIR}/${P}-gentoo-file-collisions.patch"
+	sed -i.orig Makefile -e 's-/include-/include/libdvb-g'
+}
+
+src_compile() {
+	emake || die "compile problem"
+}
+
+src_install() {
+	#einstall DESTDIR="${D}" || die "Install problem"
+	make DESTDIR="${D}" PREFIX=/usr install || die
+
+	use doc && insinto "/usr/share/doc/${PF}/sample_progs" && \
+	doins sample_progs/* && \
+	insinto "/usr/share/doc/${PF}/samplerc" && \
+	doins samplerc/*
+
+	echo
+	einfo "The script called 'dia' has been installed as dia-dvb"
+	einfo "so that it doesn't overwrite the binary of app-office/dia."
+	einfo
+
+	dodoc README
+}
diff --git a/media-libs/libdvb/libdvb-0.5.5.1-r1.ebuild b/media-libs/libdvb/libdvb-0.5.5.1-r1.ebuild
index 5b248472d150..a62cba905876 100644
--- a/media-libs/libdvb/libdvb-0.5.5.1-r1.ebuild
+++ b/media-libs/libdvb/libdvb-0.5.5.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.5.1-r1.ebuild,v 1.4 2005/12/13 11:37:30 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.5.1-r1.ebuild,v 1.5 2006/01/21 13:54:27 zzam Exp $
 
 inherit eutils
 
diff --git a/media-libs/libdvb/libdvb-0.5.5.1-r2.ebuild b/media-libs/libdvb/libdvb-0.5.5.1-r2.ebuild
new file mode 100644
index 000000000000..0da1c25fae63
--- /dev/null
+++ b/media-libs/libdvb/libdvb-0.5.5.1-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.5.1-r2.ebuild,v 1.1 2006/01/21 13:54:27 zzam Exp $
+
+inherit eutils
+
+DESCRIPTION="libdvb package with added CAM library and libdvbmpegtools as well as dvb-mpegtools"
+HOMEPAGE="http://www.metzlerbros.org/dvb/"
+SRC_URI="http://www.metzlerbros.org/dvb/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~x86"
+IUSE="doc"
+
+RDEPEND="media-tv/linuxtv-dvb-headers"
+
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Disable compilation of sample programs
+	# and use DESTDIR when installing
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-gentoo-file-collisions.patch
+
+	sed -i -e '/^CFLAGS=/d' config.mk || die
+	sed -i.orig Makefile -e 's-/include-/include/libdvb-'
+}
+
+src_install() {
+	#einstall DESTDIR="${D}" || die "Install problem"
+	make DESTDIR="${D}" PREFIX=/usr install || die
+
+	use doc && insinto "/usr/share/doc/${PF}/sample_progs" && \
+	doins sample_progs/* && \
+	insinto "/usr/share/doc/${PF}/samplerc" && \
+	doins samplerc/*
+
+	einfo "The script called 'dia' has been installed as dia-dvb"
+	einfo "so that it doesn't overwrite the binary of app-office/dia."
+
+	dodoc README
+}
diff --git a/media-libs/libdvb/libdvb-0.5.5.ebuild b/media-libs/libdvb/libdvb-0.5.5.ebuild
index 5dc92fac840a..afcea5da9056 100644
--- a/media-libs/libdvb/libdvb-0.5.5.ebuild
+++ b/media-libs/libdvb/libdvb-0.5.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.5.ebuild,v 1.7 2005/12/13 11:37:30 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.5.ebuild,v 1.8 2006/01/21 13:54:27 zzam Exp $
 
 inherit eutils
 
diff --git a/media-libs/libdvb/metadata.xml b/media-libs/libdvb/metadata.xml
index 2677d846fc47..0451cc9d5019 100644
--- a/media-libs/libdvb/metadata.xml
+++ b/media-libs/libdvb/metadata.xml
@@ -2,5 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>media-tv</herd>
-<maintainer><email>lordvan@gentoo.org</email></maintainer>
+<maintainer><email>zzam@gentoo.org</email></maintainer>
 </pkgmetadata>