Version bump (Thanks to Christoph Brill <egore@gmx.de>, bug #88163).

Removed errno-patch, it is now included in upstream.
Changed dependency according to bug #98672 comment #4.
Package-Manager: portage-2.0.51.22-r2

5 files changed, 99 insertions, 5 deletions

diff --git a/media-libs/libdvb/ChangeLog b/media-libs/libdvb/ChangeLog
index 92eb15e446d0..9f1240ae64c9 100644
--- a/media-libs/libdvb/ChangeLog
+++ b/media-libs/libdvb/ChangeLog
@@ -1,6 +1,14 @@
 # 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.13 2005/07/27 11:10:37 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/ChangeLog,v 1.14 2005/08/06 11:25:35 zzam Exp $
+
+*libdvb-0.5.5.1 (06 Aug 2005)
+
+  06 Aug 2005; Matthias Schwarzott <zzam@gentoo.org>
+  +files/libdvb-0.5.5.1-gentoo.patch, +libdvb-0.5.5.1.ebuild:
+  Version bump (Thanks to Christoph Brill <egore@gmx.de>, bug #88163).
+  Removed errno-patch, it is now included in upstream.
+  Changed dependency according to bug #98672 comment #4.
 
   27 Jul 2005; Pieter Van den Abeele <pvdabeel@gentoo.org>
   libdvb-0.5.0-r1.ebuild, libdvb-0.5.5.ebuild:
diff --git a/media-libs/libdvb/Manifest b/media-libs/libdvb/Manifest
index 8a7906331077..a3fe762c3f70 100644
--- a/media-libs/libdvb/Manifest
+++ b/media-libs/libdvb/Manifest
@@ -1,9 +1,12 @@
-MD5 56b4837ca3b2927142911ce170ad6f70 ChangeLog 2337
+MD5 ae32484b2b184a42bbe021b3f2ae4399 libdvb-0.5.5.1.ebuild 1271
 MD5 64316af9275a3d11675946070707fedf libdvb-0.5.0-r1.ebuild 1062
 MD5 2720650426ea0784ba1991bc573ff268 libdvb-0.5.5.ebuild 1285
+MD5 5f52090c88f012ca958b2b383513128d ChangeLog 2663
 MD5 46b3654b1563aad69c575e55e8d67b61 metadata.xml 220
-MD5 b60c65ce69975d3a63cce5830639e6fd files/digest-libdvb-0.5.0-r1 64
-MD5 32ee5372809634529d6892a5aa76b7ad files/digest-libdvb-0.5.5 64
+MD5 2be0eba6ba9919ca334c327d3310a254 files/libdvb-0.5.5-gentoo.patch 1065
 MD5 69502406503f38e60bd8e35f2f80e586 files/errno.patch 258
+MD5 780b4f37ff13c0c42c9966bf4ddf0640 files/digest-libdvb-0.5.5.1 66
 MD5 76dfb6639fdd6868d34b0eec46123c06 files/libdvb-0.5.0-gentoo.patch 2448
-MD5 2be0eba6ba9919ca334c327d3310a254 files/libdvb-0.5.5-gentoo.patch 1065
+MD5 32ee5372809634529d6892a5aa76b7ad files/digest-libdvb-0.5.5 64
+MD5 34510a9d50277d893ab3a8b316291349 files/libdvb-0.5.5.1-gentoo.patch 1052
+MD5 b60c65ce69975d3a63cce5830639e6fd files/digest-libdvb-0.5.0-r1 64
diff --git a/media-libs/libdvb/files/digest-libdvb-0.5.5.1 b/media-libs/libdvb/files/digest-libdvb-0.5.5.1
new file mode 100644
index 000000000000..00169162b126
--- /dev/null
+++ b/media-libs/libdvb/files/digest-libdvb-0.5.5.1
@@ -0,0 +1 @@
+MD5 47612d2f8a4d4dee746a166d8b7f6f77 libdvb-0.5.5.1.tar.gz 312295
diff --git a/media-libs/libdvb/files/libdvb-0.5.5.1-gentoo.patch b/media-libs/libdvb/files/libdvb-0.5.5.1-gentoo.patch
new file mode 100644
index 000000000000..2820abfc65a0
--- /dev/null
+++ b/media-libs/libdvb/files/libdvb-0.5.5.1-gentoo.patch
@@ -0,0 +1,33 @@
+--- Makefile.orig	2005-03-22 14:23:25.000000000 +0100
++++ Makefile	2005-04-06 16:25:50.000000000 +0200
+@@ -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	2005-03-22 14:23:25.000000000 +0100
++++ config.mk	2005-04-06 16:27:14.000000000 +0200
+@@ -1,7 +1,7 @@
+ # -*- makefile -*-
+ #
+ 
+-PREFIX = /usr/local
++PREFIX = /usr
+ VERSION = 0.5.5.1
+ CFLAGS=-O2 -Wall -g
+ INCLUDES=-I. -I../include 
+--- dvb-mpegtools/Makefile.orig	2005-03-22 14:23:25.000000000 +0100
++++ dvb-mpegtools/Makefile	2005-04-06 16:28:08.000000000 +0200
+@@ -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.1.ebuild b/media-libs/libdvb/libdvb-0.5.5.1.ebuild
new file mode 100644
index 000000000000..b48e9310daee
--- /dev/null
+++ b/media-libs/libdvb/libdvb-0.5.5.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 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.ebuild,v 1.1 2005/08/06 11:25:35 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"
+
+DEPEND=">=sys-apps/sed-4
+	|| (
+		>=sys-kernel/linux-headers-2.6.11-r2
+		media-tv/linuxtv-dvb
+	)"
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	# Disable compilation of sample programs
+	# and use DESTDIR when installing
+	epatch "${FILESDIR}/${P}-gentoo.patch" || die "patch failed"
+}
+
+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
+}