Version bump; fixes bug# 41060; made new patch; 'dia' gets installed as dia_dvb now so that it doesn't overwrite the app-office/dia binary

5 files changed, 89 insertions, 2 deletions

diff --git a/media-libs/libdvb/ChangeLog b/media-libs/libdvb/ChangeLog
index 19a229535dc5..38aa9a1cb18c 100644
--- a/media-libs/libdvb/ChangeLog
+++ b/media-libs/libdvb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libdvb
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/ChangeLog,v 1.10 2004/06/24 23:07:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/ChangeLog,v 1.11 2004/12/06 17:29:09 lordvan Exp $
+
+  06 Dec 2004; Thomas Raschbacher <lordvan@gentoo.org> :
+  Version bump; fixes Bug #41060
+  Changed patch to work with 0.5.5, it renames the dia script to dia_dvb now
 
   07 Jun 2004; Travis Tilley <lv@gentoo.org> libdvb-0.5.0-r1.ebuild:
   stable on amd64
diff --git a/media-libs/libdvb/Manifest b/media-libs/libdvb/Manifest
index c15e8e34cb59..082b90daded5 100644
--- a/media-libs/libdvb/Manifest
+++ b/media-libs/libdvb/Manifest
@@ -1,9 +1,12 @@
 MD5 774f64ee661d2134aa4f9592570a49c3 libdvb-0.5.0-r1.ebuild 986
 MD5 d803256013a07ce8634cd936b83ed98d libdvb-0.2.1.ebuild 918
+MD5 c2a846a27f0ae12b9dea3eb3219c0f59 libdvb-0.5.5.ebuild 1208
 MD5 bdc9a0805d3904f8014f0e336ce4d5ef libdvb-0.2.3.ebuild 933
-MD5 39ea52d80d918fc9066b444b7e3c99da ChangeLog 1701
+MD5 f4608c55c40f92f7b34d47482954d563 ChangeLog 1868
 MD5 46b3654b1563aad69c575e55e8d67b61 metadata.xml 220
+MD5 2be0eba6ba9919ca334c327d3310a254 files/libdvb-0.5.5-gentoo.patch 1065
 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 32ee5372809634529d6892a5aa76b7ad files/digest-libdvb-0.5.5 64
 MD5 b60c65ce69975d3a63cce5830639e6fd files/digest-libdvb-0.5.0-r1 64
diff --git a/media-libs/libdvb/files/digest-libdvb-0.5.5 b/media-libs/libdvb/files/digest-libdvb-0.5.5
new file mode 100644
index 000000000000..f3dd3461ac0e
--- /dev/null
+++ b/media-libs/libdvb/files/digest-libdvb-0.5.5
@@ -0,0 +1 @@
+MD5 245e59b51ab8c64cd8d84a39262433d4 libdvb-0.5.5.tar.gz 282174
diff --git a/media-libs/libdvb/files/libdvb-0.5.5-gentoo.patch b/media-libs/libdvb/files/libdvb-0.5.5-gentoo.patch
new file mode 100644
index 000000000000..c77783c3ae49
--- /dev/null
+++ b/media-libs/libdvb/files/libdvb-0.5.5-gentoo.patch
@@ -0,0 +1,33 @@
+--- Makefile_orig	2004-12-06 17:04:49.186749080 +0000
++++ Makefile	2004-12-06 17:10:31.217752464 +0000
+@@ -11,7 +11,7 @@
+ 
+ 
+ 
+-main: $(DVB_LIBS) $(TEST_PROGS) $(DVB-MPEGTOOLS)
++main: $(DVB_LIBS) $(DVB-MPEGTOOLS)
+ 
+ install: $(DVB_LIBS) $(HEADERS)
+ 	mkdir -p $(DESTDIR)$(PREFIX)/lib
+--- config.mk_orig	2004-12-06 17:12:20.200184616 +0000
++++ config.mk	2004-12-06 17:12:29.086833640 +0000
+@@ -1,7 +1,7 @@
+ # -*- makefile -*-
+ #
+ 
+-PREFIX = /usr/local
++PREFIX = /usr
+ VERSION = 0.5.5
+ CFLAGS=-O2 -Wall -g
+ INCLUDES=-I. -I../include -I../../include
+--- dvb-mpegtools/Makefile_orig	2004-12-06 17:19:58.700481976 +0000
++++ dvb-mpegtools/Makefile	2004-12-06 17:21:30.398541752 +0000
+@@ -62,7 +62,7 @@
+ 	install -m 755 dvb-mpegtools_main $(DESTDIR)$(PREFIX)/bin/
+ 	install -m 755 dvbaudio $(DESTDIR)$(PREFIX)/bin/
+ 	install -m 755 show_dvb_image $(DESTDIR)$(PREFIX)/bin/
+-	install -m 755 dia $(DESTDIR)$(PREFIX)/bin/
++	install -m 755 dia $(DESTDIR)$(PREFIX)/bin/dia_dvb
+ 	for f in $(LINKS); do\
+ 		(cd $(DESTDIR)$(PREFIX)/bin && ln -s -f dvb-mpegtools_main $$f) ;\
+ 	done
diff --git a/media-libs/libdvb/libdvb-0.5.5.ebuild b/media-libs/libdvb/libdvb-0.5.5.ebuild
new file mode 100644
index 000000000000..3772d98bca44
--- /dev/null
+++ b/media-libs/libdvb/libdvb-0.5.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2004 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.1 2004/12/06 17:29:09 lordvan 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="~x86 ~alpha ~ia64 ~amd64 ~ppc"
+IUSE="doc"
+
+DEPEND=">=sys-apps/sed-4
+	>=media-tv/linuxtv-dvb-1.1.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() {
+	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
+}