Added patch created by azarah for linking correct shared-libraries with PIC. Installs now to correct dirs with help of multilib.

Package-Manager: portage-2.1.1_pre3-r4

5 files changed, 365 insertions, 8 deletions

diff --git a/media-libs/libdvb/ChangeLog b/media-libs/libdvb/ChangeLog
index cdbbbc9912b5..89b6c6159872 100644
--- a/media-libs/libdvb/ChangeLog
+++ b/media-libs/libdvb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libdvb
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/ChangeLog,v 1.29 2006/07/24 10:35:26 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/ChangeLog,v 1.30 2006/07/24 19:18:55 zzam Exp $
+
+*libdvb-0.5.5.1-r3 (24 Jul 2006)
+
+  24 Jul 2006; Matthias Schwarzott <zzam@gentoo.org>
+  +files/libdvb-0.5.5.1-shared-libs.patch, +libdvb-0.5.5.1-r3.ebuild:
+  Added patch created by azarah for linking correct shared-libraries with PIC.
+  Installs now to correct dirs with help of multilib.
 
   24 Jul 2006; Matthias Schwarzott <zzam@gentoo.org>
   -files/libdvb-0.5.0-gentoo.patch,
diff --git a/media-libs/libdvb/Manifest b/media-libs/libdvb/Manifest
index de91a73452a2..31948b4675ad 100644
--- a/media-libs/libdvb/Manifest
+++ b/media-libs/libdvb/Manifest
@@ -9,15 +9,23 @@ AUX libdvb-0.5.5.1-gentoo.patch 1052 RMD160 16b94bbb5ccf30208dddeb778679599b18c5
 MD5 34510a9d50277d893ab3a8b316291349 files/libdvb-0.5.5.1-gentoo.patch 1052
 RMD160 16b94bbb5ccf30208dddeb778679599b18c5c788 files/libdvb-0.5.5.1-gentoo.patch 1052
 SHA256 371d977bca97c3f3c5649980108e4f5a74da5c9560cbc1debc0edfc1a34d0cde files/libdvb-0.5.5.1-gentoo.patch 1052
+AUX libdvb-0.5.5.1-shared-libs.patch 8834 RMD160 2cb9acbeb3004252cd0a8dd8c14b3e9ea5aee5e9 SHA1 f4479671481688920be30fc3489c9495a9ad28d5 SHA256 e5519e2f3751f1cd3f7a780124065c959e153f1bffcca5fb11d5e9d30b6dd39b
+MD5 3c44454007b8b414e47221592043b098 files/libdvb-0.5.5.1-shared-libs.patch 8834
+RMD160 2cb9acbeb3004252cd0a8dd8c14b3e9ea5aee5e9 files/libdvb-0.5.5.1-shared-libs.patch 8834
+SHA256 e5519e2f3751f1cd3f7a780124065c959e153f1bffcca5fb11d5e9d30b6dd39b files/libdvb-0.5.5.1-shared-libs.patch 8834
 DIST libdvb-0.5.5.1.tar.gz 312295 RMD160 d6d938fb0dee08de632c25ad134f944fe3dfcddb SHA1 9f62be81e220a1902d4f7f80fe1330ca4ee655e4 SHA256 941e8020129111377652bd7253ea85e6c133fd1c23c66bd9fc0ca9eabab1385a
 EBUILD libdvb-0.5.5.1-r2.ebuild 1278 RMD160 9c741344e70f9d9c450665cb3ee3087ee1840889 SHA1 8405d0a61fdcf9ceb727b02cfa1feaa1d9fa1759 SHA256 608841f8b8dfe08be623f665c96c011a5174c72adadf6af43508b6a92bb1232f
 MD5 06e586d679c37c587df6142b20739f88 libdvb-0.5.5.1-r2.ebuild 1278
 RMD160 9c741344e70f9d9c450665cb3ee3087ee1840889 libdvb-0.5.5.1-r2.ebuild 1278
 SHA256 608841f8b8dfe08be623f665c96c011a5174c72adadf6af43508b6a92bb1232f libdvb-0.5.5.1-r2.ebuild 1278
-MISC ChangeLog 5433 RMD160 7d61e82b78cb4e9e0a225e1e29ad37c71bb5d1fb SHA1 d20c9a5d99789edd180d19461fe94d0832cb2f1c SHA256 a41290f94f2a3554f9d796e1780ecee74a500a88ff3e796da257d4aa24d01e25
-MD5 bd511ceded5c02d9cc4af15058eeeb95 ChangeLog 5433
-RMD160 7d61e82b78cb4e9e0a225e1e29ad37c71bb5d1fb ChangeLog 5433
-SHA256 a41290f94f2a3554f9d796e1780ecee74a500a88ff3e796da257d4aa24d01e25 ChangeLog 5433
+EBUILD libdvb-0.5.5.1-r3.ebuild 1439 RMD160 30a08cf213257c4ac46ccb992c2cbf0de13da6e9 SHA1 4824440fd8ce6307ee8da9de12e2cce73973bee2 SHA256 46640616796c74c69cd8e828d701fd4216f6993025d349a269bda3f59ec56d95
+MD5 c2a4e90a60323c0b213aaa45e18591f6 libdvb-0.5.5.1-r3.ebuild 1439
+RMD160 30a08cf213257c4ac46ccb992c2cbf0de13da6e9 libdvb-0.5.5.1-r3.ebuild 1439
+SHA256 46640616796c74c69cd8e828d701fd4216f6993025d349a269bda3f59ec56d95 libdvb-0.5.5.1-r3.ebuild 1439
+MISC ChangeLog 5724 RMD160 7158f3e3e727fd57324571a4db1dc5b852b1c1fe SHA1 3c6fbeefbcb9decdbb2423a47f28aaa08698d9c6 SHA256 4d473536f5006326b74b34e8817101f927b77ad33f4fab64c746be1fc9df2b6f
+MD5 054efc5c6c521927d8c8ec670b8d1d06 ChangeLog 5724
+RMD160 7158f3e3e727fd57324571a4db1dc5b852b1c1fe ChangeLog 5724
+SHA256 4d473536f5006326b74b34e8817101f927b77ad33f4fab64c746be1fc9df2b6f ChangeLog 5724
 MISC metadata.xml 217 RMD160 2daa552f0b03b2d6ab99fec1eee8ab6648890b75 SHA1 a3ae417f36e171df6c47fbb7460f85a3f957ed3a SHA256 11770dd9c2b190c9d2ba13d3ce36a56e6dddcc8d8a9d11eb20d930cac5d7990f
 MD5 dff9ded73ffb6549a59f5e6144af1cfd metadata.xml 217
 RMD160 2daa552f0b03b2d6ab99fec1eee8ab6648890b75 metadata.xml 217
@@ -25,10 +33,13 @@ SHA256 11770dd9c2b190c9d2ba13d3ce36a56e6dddcc8d8a9d11eb20d930cac5d7990f metadata
 MD5 0f4390fadb7298c9d14bac79fd4150b0 files/digest-libdvb-0.5.5.1-r2 244
 RMD160 ba71c7ec6d839319437b723a5bb125cc4ec5ae0d files/digest-libdvb-0.5.5.1-r2 244
 SHA256 58ef6a24c4da3a72b8450c043efd7890ca4d435d613b518df95eff062178d9c8 files/digest-libdvb-0.5.5.1-r2 244
+MD5 0f4390fadb7298c9d14bac79fd4150b0 files/digest-libdvb-0.5.5.1-r3 244
+RMD160 ba71c7ec6d839319437b723a5bb125cc4ec5ae0d files/digest-libdvb-0.5.5.1-r3 244
+SHA256 58ef6a24c4da3a72b8450c043efd7890ca4d435d613b518df95eff062178d9c8 files/digest-libdvb-0.5.5.1-r3 244
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFExKJ6t2vP6XvVdOcRAj/VAJ4ou9sK9RdaV5NSYqpfEosR19W8lwCaAgYx
-IldvmMb/fT+tQ4vCFlU4WUc=
-=r520
+iD8DBQFExR0pt2vP6XvVdOcRArzeAKClmMUVcFK099Uig6KZACDTkPb3iwCgxaPW
+GykqwXUg6/Ut3E17xUUrgDo=
+=mQMp
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libdvb/files/digest-libdvb-0.5.5.1-r3 b/media-libs/libdvb/files/digest-libdvb-0.5.5.1-r3
new file mode 100644
index 000000000000..3ce8b79cd3cf
--- /dev/null
+++ b/media-libs/libdvb/files/digest-libdvb-0.5.5.1-r3
@@ -0,0 +1,3 @@
+MD5 47612d2f8a4d4dee746a166d8b7f6f77 libdvb-0.5.5.1.tar.gz 312295
+RMD160 d6d938fb0dee08de632c25ad134f944fe3dfcddb libdvb-0.5.5.1.tar.gz 312295
+SHA256 941e8020129111377652bd7253ea85e6c133fd1c23c66bd9fc0ca9eabab1385a libdvb-0.5.5.1.tar.gz 312295
diff --git a/media-libs/libdvb/files/libdvb-0.5.5.1-shared-libs.patch b/media-libs/libdvb/files/libdvb-0.5.5.1-shared-libs.patch
new file mode 100644
index 000000000000..2a39c6a16f45
--- /dev/null
+++ b/media-libs/libdvb/files/libdvb-0.5.5.1-shared-libs.patch
@@ -0,0 +1,288 @@
+diff -urpN libdvb-0.5.5.1/dvb-mpegtools/Makefile libdvb-0.5.5.1.az/dvb-mpegtools/Makefile
+--- libdvb-0.5.5.1/dvb-mpegtools/Makefile	2006-07-24 19:15:35.000000000 +0200
++++ libdvb-0.5.5.1.az/dvb-mpegtools/Makefile	2006-07-24 19:15:54.000000000 +0200
+@@ -29,7 +29,7 @@ links: dvb-mpegtools_main
+ 	done
+ 
+ clean:
+-	- rm -f *.o .depend dvb-mpegtools_main dvb-mplex ctest *~ $(LINKS) ctest audiofilter show_dvb_image\
++	-rm -f *.o .depend dvb-mpegtools_main dvb-mplex ctest *~ $(LINKS) ctest audiofilter show_dvb_image \
+ 	dvbaudio
+ 
+ dvb-mpegtools_main: main.o
+diff -urpN libdvb-0.5.5.1/libdvb/Makefile libdvb-0.5.5.1.az/libdvb/Makefile
+--- libdvb-0.5.5.1/libdvb/Makefile	2005-03-22 15:23:25.000000000 +0200
++++ libdvb-0.5.5.1.az/libdvb/Makefile	2006-07-24 19:30:31.000000000 +0200
+@@ -1,26 +1,34 @@
+ 
+ include ../config.mk
+ 
+-OBJS=devices.o DVB.o OSD.o 
++OBJS=OSD.o devices.o DVB.o 
++A_OBJS=$(addprefix a_,$(OBJS))
++SO_OBJS=$(addprefix so_,$(OBJS)) 
+ LIBS=-L./ -lpthread
+-DVB_LIBS=libdvb.a
++DVB_LIBS=libdvb.a libdvb.so.0
+ 
+ main: $(DVB_LIBS) 
+ 
+-libdvb.a: $(OBJS)
+-	ar -rcs libdvb.a $(OBJS) 
++libdvb.a: $(A_OBJS)
++	ar -rcs $@ $(A_OBJS) 
+ 
+-DVB.o: DVB.cc ../include/DVB.hh
+-	$(CXX) $(INCLUDES) $(CFLAGS) -c $<
++libdvb.so.0: $(SO_OBJS)
++	$(CXX) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $(SO_OBJS)
+ 
+-devices.o: devices.cc ../include/devices.hh
+-	$(CXX) $(INCLUDES) $(CFLAGS) -c $<
++a_%.o: %.c
++	$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
+ 
+-.c.o: 
+-	$(CC) $(INCLUDES) $(CFLAGS) -c $<
++a_%.o: %.cc
++	$(CXX) $(INCLUDES) $(CFLAGS) -c $< -o $@
+ 
+-.cc.o: 
+-	$(CXX) $(INCLUDES) $(CFLAGS) -c $<
++so_%.o: %.c
++	$(CC) -fPIC $(INCLUDES) $(CFLAGS) -c $< -o $@
++
++so_%.o: %.cc
++	$(CXX) -fPIC $(INCLUDES) $(CFLAGS) -c $< -o $@
++
++*DVB.o:: DVB.cc ../include/DVB.hh
++*devices.o:: devices.cc ../include/devices.hh
+ 
+ clean:
+-	-rm -f *.o $(DVB_LIBS) *~
++	-rm -f *.o $(DVB_LIBS) *.0 *~
+diff -urpN libdvb-0.5.5.1/libdvbci/Makefile libdvb-0.5.5.1.az/libdvbci/Makefile
+--- libdvb-0.5.5.1/libdvbci/Makefile	2005-03-22 15:23:25.000000000 +0200
++++ libdvb-0.5.5.1.az/libdvbci/Makefile	2006-07-24 19:30:23.000000000 +0200
+@@ -2,22 +2,32 @@
+ include ../config.mk
+ 
+ CI_OBJS=ci.o ci2.o
++A_CI_OBJS=$(addprefix a_,$(CI_OBJS))
++SO_CI_OBJS=$(addprefix so_,$(CI_OBJS)) 
+ LIBS=-L./ -lpthread
+-DVB_LIBS=libdvbci.a
++DVB_LIBS=libdvbci.a libdvbci.so.0
+ 
+ main: $(DVB_LIBS)
+ 
+-libdvbci.a: $(CI_OBJS)
+-	ar -rcs libdvbci.a $(CI_OBJS) 
++libdvbci.a: $(A_CI_OBJS)
++	ar -rcs $@ $(A_CI_OBJS) 
+ 
+-ci.o: ci.cc ../include/ci.hh
+-	$(CXX) $(INCLUDES) $(CFLAGS) -c $<
++libdvbci.so.0: $(SO_CI_OBJS)
++	$(CXX) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $(SO_CI_OBJS)
+ 
+-.c.o: 
+-	$(CC) $(INCLUDES) $(CFLAGS) -c $<
++a_%.o: %.c
++	$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
+ 
+-.cc.o: 
+-	$(CXX) $(INCLUDES) $(CFLAGS) -c $<
++a_%.o: %.cc
++	$(CXX) $(INCLUDES) $(CFLAGS) -c $< -o $@
++
++so_%.o: %.c
++	$(CC) -fPIC $(INCLUDES) $(CFLAGS) -c $< -o $@
++
++so_%.o: %.cc
++	$(CXX) -fPIC $(INCLUDES) $(CFLAGS) -c $< -o $@
++
++*ci.o:: ci.cc ../include/ci.hh
+ 
+ clean:
+-	-rm -f *.o $(DVB_LIBS) *~
++	-rm -f *.o $(DVB_LIBS) *.0 *~
+diff -urpN libdvb-0.5.5.1/libdvbmpeg/Makefile libdvb-0.5.5.1.az/libdvbmpeg/Makefile
+--- libdvb-0.5.5.1/libdvbmpeg/Makefile	2005-03-22 15:23:25.000000000 +0200
++++ libdvb-0.5.5.1.az/libdvbmpeg/Makefile	2006-07-24 19:30:46.000000000 +0200
+@@ -2,35 +2,53 @@
+ include ../config.mk
+ 
+ DCFLAGS =  $(CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+-MFLAG  = -M
++MFLAG  = -MM
+ OBJS = ctools.o ringbuffy.o transform.o cpptools.o
++A_OBJS = $(addprefix a_,$(OBJS))
++SO_OBJS = $(addprefix so_,$(OBJS)) 
+ SRC  = $(wildcard *.c)
+ CPPSRC = $(wildcard *.cpp)
+ CSRC = $(wildcard *.cc) 
+ INCS = -I../include
++DVB_LIBS = libdvbmpegtools.a libdvbmpegtools.so.0 
+ 
+-all: libdvbmpegtools.a
++all: $(DVB_LIBS)
+ 
+ .PHONY: depend clean install uninstall
+ 
+ clean:
+-	- rm -f *.o  *~ *.a .depend
++	- rm -f *.o  *~ $(DVB_LIBS) *.0 .*_depend
+ 
+-libdvbmpegtools.a: $(OBJS)
+-	ar -rcs libdvbmpegtools.a $(OBJS) 
++libdvbmpegtools.a: $(A_OBJS)
++	ar -rcs $@ $(A_OBJS) 
+ 
+-%.o:    %.cc 
+-	$(CXX) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
++libdvbmpegtools.so.0: $(SO_OBJS)
++	$(CXX) -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $(SO_OBJS) 
+ 
+-%.o:    %.cpp
+-	$(CXX) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
++a_%.o: %.c
++	$(CC) $(DCFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@
+ 
+-%.o:    %.c 
+-	$(CC) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
++a_%.o: %.cc
++	$(CXX) $(DCFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@
+ 
+-.depend: 
+-	$(CXX) $(DEFINES) $(MFLAG) $(SRC) $(CSRC) $(CPPSRC) $(INCLUDES)> .depend
++so_%.o: %.c
++	$(CC) -fPIC $(DCFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@
+ 
++so_%.o: %.cc
++	$(CXX) -fPIC $(DCFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@
+ 
++.a_depend: $(SRC) $(CSRC) $(CPPSRC)
++	@rm -f $@
++	@for x in $(SRC) $(CSRC) $(CPPSRC) ; do \
++		$(CXX) $(DEFINES) $(MFLAG) -MT "a_$${x/.*/.o}" $$x $(INCLUDES) >> $@; \
++	done
+ 
+-include .depend
++.so_depend: $(SRC) $(CSRC) $(CPPSRC)
++	@rm -f $@
++	@for x in $(SRC) $(CSRC) $(CPPSRC) ; do \
++		$(CXX) $(DEFINES) $(MFLAG) -MT "so_$${x/.*/.o}" $$x $(INCLUDES) >> $@; \
++	done
++
++
++-include .a_depend
++-include .so_depend
+diff -urpN libdvb-0.5.5.1/Makefile libdvb-0.5.5.1.az/Makefile
+--- libdvb-0.5.5.1/Makefile	2006-07-24 19:15:35.000000000 +0200
++++ libdvb-0.5.5.1.az/Makefile	2006-07-24 19:34:35.000000000 +0200
+@@ -1,7 +1,9 @@
+ 
+ SOURCEDIRS=include libdvb libdvbci libdvbmpeg sample_progs dvb-mpegtools samplerc 
+ DVB-MPEGTOOLS= dvb-mpegtools_main dvb-mplex audiofilter dvbaudio
+-DVB_LIBS=libdvb.a libdvbci.a libdvbmpegtools.a
++DVB_A_LIBS=libdvb.a libdvbci.a libdvbmpegtools.a
++DVB_SO_LIBS=$(DVB_A_LIBS:.a=.so.0)
++DVB_LIBS=$(DVB_A_LIBS) $(DVB_SO_LIBS)
+ HEADERS=include/DVB.hh include/ci.hh include/devices.hh include/channel.h include/ctools.h \
+ 	include/transform.h include/ringbuffy.h include/cpptools.hh include/OSD.h \
+ 	include/osd.hh
+@@ -16,6 +18,10 @@ main: $(DVB_LIBS) $(DVB-MPEGTOOLS)
+ install: $(DVB_LIBS) $(HEADERS)
+ 	mkdir -p $(DESTDIR)$(PREFIX)/lib
+ 	install -m 644 $(DVB_LIBS) $(DESTDIR)$(PREFIX)/lib/
++	for x in $(DVB_SO_LIBS) ; do \
++		rm -f $(DESTDIR)$(PREFIX)/lib/$${x/.0/}; \
++		ln -s $$x $(DESTDIR)$(PREFIX)/lib/$${x/.0/}; \
++	done
+ 	mkdir -p $(DESTDIR)$(PREFIX)/include
+ 	install -m 644 $(HEADERS) $(DESTDIR)$(PREFIX)/include
+ 	make -C dvb-mpegtools install
+@@ -25,52 +31,55 @@ uninstall: 
+ 	for i in $(HEADERS); do rm -f $(DESTDIR)$(PREFIX)/$$i;done
+ 	make -C dvb-mpegtools uninstall
+ 
+-libdvb.a: libdvb/libdvb.a
+-	cp libdvb/libdvb.a .
++libdvb.%: libdvb/libdvb.%
++	cp $< .
+ 
+-libdvbci.a: libdvbci/libdvbci.a
+-	cp libdvbci/libdvbci.a .
++libdvbci.%: libdvbci/libdvbci.%
++	cp $< .
+ 
+-libdvbmpegtools.a: libdvbmpeg/libdvbmpegtools.a
+-	cp libdvbmpeg/libdvbmpegtools.a .
++libdvbmpegtools.%: libdvbmpeg/libdvbmpegtools.%
++	cp $< .
+ 
+-libdvb/libdvb.a:
+-	make -C libdvb main
+-
+-libdvbci/libdvbci.a:
+-	make -C libdvbci main
+-
+-libdvbmpeg/libdvbmpegtools.a:
+-	make -C libdvbmpeg libdvbmpegtools.a
+-
+-merge_dvb: libdvb.a sample_progs/merge.cc
+-conv:      libdvb.a sample_progs/conv.cc
+-satscan:   libdvb.a sample_progs/satscan.cc
+-quickscan:   libdvb.a sample_progs/quickscan.cc
+-cam_set:   libdvbci.a sample_progs/cam_set.cc
+-cam_test:  libdvb.a libdvbmpegtools.a sample_progs/cam_test.cc
++%.so: %.so.0
++	ln -s $< $@
++
++libdvb/libdvb.%: $(basename $@)
++	make -C libdvb $<
++
++libdvbci/libdvbci.%: $(basename $@)
++	make -C libdvbci $<
++
++libdvbmpeg/libdvbmpegtools.%: $(basename $@)
++	make -C libdvbmpeg $<
++
++merge_dvb: libdvb.so sample_progs/merge.cc
++conv:      libdvb.so sample_progs/conv.cc
++satscan:   libdvb.so sample_progs/satscan.cc
++quickscan:   libdvb.so sample_progs/quickscan.cc
++cam_set:   libdvbci.so sample_progs/cam_set.cc
++cam_test:  libdvb.so libdvbmpegtools.so sample_progs/cam_test.cc
+ 	make -C sample_progs main
+ 	for f in $(TEST_PROGS); do cp sample_progs/$$f . ; done
+ 
+-dvb-mpegtools_main: libdvbmpegtools.a dvb-mpegtools/main.cc
+-dvb-mplex:          libdvbmpegtools.a dvb-mpegtools/mplex.cpp
++dvb-mpegtools_main: libdvbmpegtools.so dvb-mpegtools/main.cc
++dvb-mplex:          libdvbmpegtools.so dvb-mpegtools/mplex.cpp
+ audiofilter:        dvb-mpegtools/audiofilter.c
+-dvbaudio:           libdvb.a libdvbmpegtools.a dvb-mpegtools/dvbaudio.cc
++dvbaudio:           libdvb.so libdvbmpegtools.so dvb-mpegtools/dvbaudio.cc
+ 	make -C dvb-mpegtools all
+ 	for f in $(DVB-MPEGTOOLS); do cp dvb-mpegtools/$$f . ; done
+ 
+-dvbs:  libdvb.a libdvbmpegtools.a dvbserver/dvbs_main.cc
++dvbs:  libdvb.so libdvbmpegtools.so dvbserver/dvbs_main.cc
+ 	make -C dvbserver  dvbs_main
+ 
+ 
+ clean:
+-	-rm -f libdvb-$(VERSION).tar.gz $(DVB_LIBS) $(TEST_PROGS) $(DVB-MPEGTOOLS) *~
++	-rm -f libdvb-$(VERSION).tar.gz $(DVB_LIBS) *.so $(TEST_PROGS) $(DVB-MPEGTOOLS) *~
+ 	make -C libdvb clean
+ 	make -C libdvbci clean
+ 	make -C libdvbmpeg clean
+ 	make -C sample_progs clean
+ 	make -C dvb-mpegtools clean
+-	rm include/*~
++	rm -f include/*~
+ 
+ dist:	
+ 	mkdir libdvb-$(VERSION)
diff --git a/media-libs/libdvb/libdvb-0.5.5.1-r3.ebuild b/media-libs/libdvb/libdvb-0.5.5.1-r3.ebuild
new file mode 100644
index 000000000000..06f7e5c7e2c4
--- /dev/null
+++ b/media-libs/libdvb/libdvb-0.5.5.1-r3.ebuild
@@ -0,0 +1,48 @@
+# 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-r3.ebuild,v 1.1 2006/07/24 19:18:55 zzam Exp $
+
+inherit eutils multilib
+
+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"
+
+DEPEND="media-tv/linuxtv-dvb-headers"
+
+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
+	epatch "${FILESDIR}"/${P}-shared-libs.patch
+
+	sed -i -e '/^CFLAGS=/d' config.mk || die
+	sed -i Makefile \
+		-e 's-/include-/include/libdvb-' \
+		-e 's-/lib/-/$(LIBDIR)/-'
+}
+
+src_install() {
+	#einstall DESTDIR="${D}" || die "Install problem"
+	insinto /usr/$(get_libdir)
+	make DESTDIR="${D}" PREFIX=/usr LIBDIR=$(get_libdir) install || die "Problem at make install"
+
+	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
+}