Bring the 0.5.0 version to media-libs. Ditch DVB.cc patch as it has been fixed upstream. Consolidate the other two patches into one and use epatch. Properly install sample_progs and samplerc items.

6 files changed, 125 insertions, 3 deletions

diff --git a/media-libs/libdvb/ChangeLog b/media-libs/libdvb/ChangeLog
index 3f7e67b92113..ce5d234684e2 100644
--- a/media-libs/libdvb/ChangeLog
+++ b/media-libs/libdvb/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for media-libs/libdvb
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/ChangeLog,v 1.2 2003/04/22 10:23:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/ChangeLog,v 1.3 2003/10/20 02:41:51 max Exp $
+
+*libdvb-0.5.0-r1 (19 Oct 2003)
+
+  19 Oct 2003; Max Kalika <max@gentoo.org> libdvb-0.5.0-r1.ebuild,
+  metadata.xml, files/libdvb-0.5.0-gentoo.patch:
+  Bring the 0.5.0 version to media-libs. Ditch DVB.cc patch as it has been fixed
+  upstream. Consolidate the other two patches into one and use epatch. Properly
+  install sample_progs and samplerc items.
+
+*libdvb-0.5.0 ( 04 Oct 2003)
+  04 Oct 2003; Thomas Raschbacher <lordvan@gentoo.org>: libdvb-0.5.0.ebuild,
+  metadata.xml:
+  This includes dvb-mpegtools (see description) initial ebuild
 
 *libdvb-0.2.3 (21 Mar 2003)
 
@@ -15,4 +28,4 @@
 	
 *media-video/libdvb-0.2.1 (07 Mar 2003)
   07 Mar 2003; Thomas Raschbacher <lordvan@gentoo.org>: libdvb-0.2.1.ebuild: 
-  initial ebuild
\ No newline at end of file
+  initial ebuild
diff --git a/media-libs/libdvb/Manifest b/media-libs/libdvb/Manifest
index 9e63eca0cde9..da18e4196dad 100644
--- a/media-libs/libdvb/Manifest
+++ b/media-libs/libdvb/Manifest
@@ -1,5 +1,9 @@
-MD5 b77ac3c788ed79af303fbad335f8b6b7 ChangeLog 691
+MD5 829909304753d4c217514fd4847b485b libdvb-0.5.0-r1.ebuild 942
 MD5 7f4572f1b09dcf1a202bc1ecc88ba336 libdvb-0.2.1.ebuild 945
 MD5 dc4aadc30062f69916372b1ff3d38087 libdvb-0.2.3.ebuild 960
+MD5 decc66b4b727022c564d260de7893d6d ChangeLog 1228
+MD5 46b3654b1563aad69c575e55e8d67b61 metadata.xml 220
+MD5 76dfb6639fdd6868d34b0eec46123c06 files/libdvb-0.5.0-gentoo.patch 2448
 MD5 4c0db82d3d92095bb9244be6b9e7d328 files/digest-libdvb-0.2.1 63
 MD5 f33cd1ee9929337830cd09fd15029d2e files/digest-libdvb-0.2.3 63
+MD5 b60c65ce69975d3a63cce5830639e6fd files/digest-libdvb-0.5.0-r1 64
diff --git a/media-libs/libdvb/files/digest-libdvb-0.5.0-r1 b/media-libs/libdvb/files/digest-libdvb-0.5.0-r1
new file mode 100644
index 000000000000..c6ec2552f15e
--- /dev/null
+++ b/media-libs/libdvb/files/digest-libdvb-0.5.0-r1
@@ -0,0 +1 @@
+MD5 1a293f072e2280c8910c7cd745b79441 libdvb-0.5.0.tar.gz 255381
diff --git a/media-libs/libdvb/files/libdvb-0.5.0-gentoo.patch b/media-libs/libdvb/files/libdvb-0.5.0-gentoo.patch
new file mode 100644
index 000000000000..8a711a21993f
--- /dev/null
+++ b/media-libs/libdvb/files/libdvb-0.5.0-gentoo.patch
@@ -0,0 +1,61 @@
+--- Makefile.orig	2003-10-19 17:57:59.000000000 -0700
++++ Makefile	2003-10-19 17:58:13.000000000 -0700
+@@ -11,18 +11,18 @@
+ 
+ 
+ 
+-main: $(DVB_LIBS) $(TEST_PROGS) $(DVB-MPEGTOOLS)
++main: $(DVB_LIBS) $(DVB-MPEGTOOLS)
+ 
+ install: $(DVB_LIBS) $(HEADERS)
+-	[ ! -d "$(PREFIX)/lib" ] && mkdir -p $(PREFIX)/lib
+-	install -m 644 $(DVB_LIBS) $(PREFIX)/lib/
+-	[ ! -d "$(PREFIX)/include" ] && mkdir -p $(PREFIX)/include
+-	install -m 644 $(HEADERS) $(PREFIX)/include/
++	[ ! -d "$(DESTDIR)/$(PREFIX)/lib" ] && mkdir -p $(DESTDIR)/$(PREFIX)/lib
++	install -m 644 $(DVB_LIBS) $(DESTDIR)/$(PREFIX)/lib/
++	[ ! -d "$(DESTDIR)/$(PREFIX)/include" ] && mkdir -p $(DESTDIR)/$(PREFIX)/include
++	install -m 644 $(HEADERS) $(DESTDIR)/$(PREFIX)/include/
+ 	make -C dvb-mpegtools install
+ 
+ uninstall: 
+-	for i in $(DVB_LIBS); do rm -f $(PREFIX)/lib/$$i;done
+-	for i in $(HEADERS); do rm -f $(PREFIX)/$$i;done
++	for i in $(DVB_LIBS); do rm -f $(DESTDIR)/$(PREFIX)/lib/$$i;done
++	for i in $(HEADERS); do rm -f $(DESTDIR)/$(PREFIX)/$$i;done
+ 	make -C dvb-mpegtools uninstall
+ 
+ libdvb.a: libdvb/libdvb.a
+--- dvb-mpegtools/Makefile.orig	2003-10-19 17:58:29.000000000 -0700
++++ dvb-mpegtools/Makefile	2003-10-19 17:58:41.000000000 -0700
+@@ -57,20 +57,20 @@
+ 	$(CC) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
+ 
+ install: dvb-mpegtools_main
+-	install -D -m 755 dvb-mplex $(PREFIX)/bin/dvb-mplex
+-	install -m 755 audiofilter $(PREFIX)/bin/
+-	install -m 755 dvb-mpegtools_main $(PREFIX)/bin/
+-	install -m 755 dvbaudio $(PREFIX)/bin/
++	install -D -m 755 dvb-mplex $(DESTDIR)/$(PREFIX)/bin/dvb-mplex
++	install -m 755 audiofilter $(DESTDIR)/$(PREFIX)/bin/
++	install -m 755 dvb-mpegtools_main $(DESTDIR)/$(PREFIX)/bin/
++	install -m 755 dvbaudio $(DESTDIR)/$(PREFIX)/bin/
+ 	for f in $(LINKS); do\
+-		ln -sf $(PREFIX)/bin/dvb-mpegtools_main $(PREFIX)/bin/$$f ;\
++		ln -sf $(PREFIX)/bin/dvb-mpegtools_main $(DESTDIR)/$(PREFIX)/bin/$$f ;\
+ 	done
+ 
+ uninstall:
+-	for f in $(LINKS); do rm -f $(PREFIX)/bin/$$f;done
+-	rm -f $(PREFIX)/bin/dvb-mpegtools_main
+-	rm -f $(PREFIX)/bin/dvbaudio
+-	rm -f $(PREFIX)/bin/audiofilter
+-	rm -f $(PREFIX)/lib/libdvbmpegtools
++	for f in $(LINKS); do rm -f $(DESTDIR)/$(PREFIX)/bin/$$f;done
++	rm -f $(DESTDIR)/$(PREFIX)/bin/dvb-mpegtools_main
++	rm -f $(DESTDIR)/$(PREFIX)/bin/dvbaudio
++	rm -f $(DESTDIR)/$(PREFIX)/bin/audiofilter
++	rm -f $(DESTDIR)/$(PREFIX)/lib/libdvbmpegtools
+ 
+ .depend: 
+ 	$(CXX) $(DEFINES) $(MFLAG) $(SRC) $(CSRC) $(CPPSRC) $(INCLUDES)> .depend
diff --git a/media-libs/libdvb/libdvb-0.5.0-r1.ebuild b/media-libs/libdvb/libdvb-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..5583d143c780
--- /dev/null
+++ b/media-libs/libdvb/libdvb-0.5.0-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.0-r1.ebuild,v 1.1 2003/10/20 02:41:51 max Exp $
+
+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="x86"
+
+DEPEND=">=sys-apps/sed-4
+	>=media-tv/linuxtv-dvb-1.0.1"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	# Disable compilation of sample programs
+	# and use DESTDIR when installing
+	epatch "${FILESDIR}/${P}-gentoo.patch"
+}
+
+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/metadata.xml b/media-libs/libdvb/metadata.xml
new file mode 100644
index 000000000000..2677d846fc47
--- /dev/null
+++ b/media-libs/libdvb/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>media-tv</herd>
+<maintainer><email>lordvan@gentoo.org</email></maintainer>
+</pkgmetadata>