9 files changed, 35 insertions, 96 deletions
diff --git a/media-libs/libdvb/ChangeLog b/media-libs/libdvb/ChangeLog
index 38aa9a1cb18c..c1fa1476524c 100644
--- a/media-libs/libdvb/ChangeLog
+++ b/media-libs/libdvb/ChangeLog
@@ -1,6 +1,14 @@
 # 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.11 2004/12/06 17:29:09 lordvan Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/ChangeLog,v 1.12 2005/01/29 22:09:31 dragonheart Exp $
+
+*libdvb-0.5.5 (30 Jan 2005)
+
+  30 Jan 2005; Daniel Black <dragonheart@gentoo.org> +files/errno.patch,
+  -libdvb-0.2.1.ebuild, -libdvb-0.2.3.ebuild, libdvb-0.5.0-r1.ebuild,
+  libdvb-0.5.5.ebuild:
+  old version clean out and errno.patch added as per bug #75471. Thanks to
+  Konstantin Münning <konstantin@muenning.com>
 
   06 Dec 2004; Thomas Raschbacher <lordvan@gentoo.org> :
   Version bump; fixes Bug #41060
diff --git a/media-libs/libdvb/Manifest b/media-libs/libdvb/Manifest
index 082b90daded5..b7a1faedbaf9 100644
--- a/media-libs/libdvb/Manifest
+++ b/media-libs/libdvb/Manifest
@@ -1,12 +1,13 @@
-MD5 774f64ee661d2134aa4f9592570a49c3 libdvb-0.5.0-r1.ebuild 986
+MD5 f4608c55c40f92f7b34d47482954d563 ChangeLog 1868
 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 f4608c55c40f92f7b34d47482954d563 ChangeLog 1868
+MD5 a0172fd7222ec194e1865f2ebb1af843 libdvb-0.5.0-r1.ebuild 1062
 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 4614b67b52eb535258904d37dd7362ef libdvb-0.5.5.ebuild 1292
+MD5 69502406503f38e60bd8e35f2f80e586 files/errno.patch 258
 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
+MD5 76dfb6639fdd6868d34b0eec46123c06 files/libdvb-0.5.0-gentoo.patch 2448
+MD5 32ee5372809634529d6892a5aa76b7ad files/digest-libdvb-0.5.5 64
+MD5 2be0eba6ba9919ca334c327d3310a254 files/libdvb-0.5.5-gentoo.patch 1065
diff --git a/media-libs/libdvb/files/digest-libdvb-0.2.1 b/media-libs/libdvb/files/digest-libdvb-0.2.1
deleted file mode 100644
index 0d79566e5d78..000000000000
--- a/media-libs/libdvb/files/digest-libdvb-0.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ad8703162288b4abb1eacdad3153bab3 libdvb-0.2.1.tar.gz 61463
diff --git a/media-libs/libdvb/files/digest-libdvb-0.2.3 b/media-libs/libdvb/files/digest-libdvb-0.2.3
deleted file mode 100644
index 7f8b48cae7ad..000000000000
--- a/media-libs/libdvb/files/digest-libdvb-0.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f1f3031efdf5a2ceed6c69382246267e libdvb-0.2.3.tar.gz 64473
diff --git a/media-libs/libdvb/files/errno.patch b/media-libs/libdvb/files/errno.patch
new file mode 100644
index 000000000000..275684ef89ac
--- /dev/null
+++ b/media-libs/libdvb/files/errno.patch
@@ -0,0 +1,8 @@
+--- libdvb/DVB.cc	2004-09-15 20:56:21.000000000 +0200
++++ libdvb-korr/DVB.cc	2004-12-23 21:07:54.329614000 +0100
+@@ -1,4 +1,5 @@
+ #include <DVB.hh>
++#include <errno.h>
+ 
+ static const fe_code_rate_t ftab [8] = {
+         FEC_AUTO, FEC_1_2, FEC_2_3, FEC_3_4,
diff --git a/media-libs/libdvb/libdvb-0.2.1.ebuild b/media-libs/libdvb/libdvb-0.2.1.ebuild
deleted file mode 100644
index 4870f81a08db..000000000000
--- a/media-libs/libdvb/libdvb-0.2.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.2.1.ebuild,v 1.7 2004/07/14 20:01:52 agriffis Exp $
-
-IUSE=""
-
-DESCRIPTION="mpegtools package for manipulation of various MPEG file formats"
-HOMEPAGE="http://www.metzlerbros.org/dvb/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-DEPEND=">=media-tv/linuxtv-dvb-1.0.0_pre2"
-
-src_compile() {
-	# setting $ARCH cuz it uses ${ARCH}g++
-	ARCH='' emake
-}
-
-src_install() {
-	# no proper Makefile (no DESTDIR)
-	mv ${S}/Makefile ${S}/Makefile_orig
-	sed s%/usr/local/lib/%${D}/usr/lib/% ${S}/Makefile_orig > ${S}/Makefile
-	dodir /usr/lib
-	make install || die
-
-	# install headers
-	dodir /usr/include/libdvb
-	insinto /usr/include/libdvb
-	doins ${S}/*.h ${S}/*.hh
-
-	# docs
-	dodoc ${S}/README
-
-	# config stuff
-	dodoc ${S}/dvbrc.*
-}
diff --git a/media-libs/libdvb/libdvb-0.2.3.ebuild b/media-libs/libdvb/libdvb-0.2.3.ebuild
deleted file mode 100644
index f5e8a1e1c229..000000000000
--- a/media-libs/libdvb/libdvb-0.2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.2.3.ebuild,v 1.7 2004/07/14 20:01:52 agriffis Exp $
-
-IUSE=""
-
-DESCRIPTION="mpegtools package for manipulation of various MPEG file formats"
-HOMEPAGE="http://www.metzlerbros.org/dvb/"
-SRC_URI="http://www.metzlerbros.org/dvb/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-
-DEPEND=">=media-tv/linuxtv-dvb-1.0.0_pre2"
-
-src_compile() {
-	# setting $ARCH cuz it uses ${ARCH}g++
-	ARCH='' emake
-}
-
-src_install() {
-	# no proper Makefile (no DESTDIR)
-	mv ${S}/Makefile ${S}/Makefile_orig
-	sed s%/usr/local/lib/%${D}/usr/lib/% ${S}/Makefile_orig > ${S}/Makefile
-	dodir /usr/lib
-	make install || die
-
-	# install headers
-	dodir /usr/include/libdvb
-	insinto /usr/include/libdvb
-	doins ${S}/*.h ${S}/*.hh
-
-	# docs
-	dodoc ${S}/README
-
-	# config stuff
-	dodoc ${S}/dvbrc.*
-}
diff --git a/media-libs/libdvb/libdvb-0.5.0-r1.ebuild b/media-libs/libdvb/libdvb-0.5.0-r1.ebuild
index 82d41b5f34f9..9b4ac04edf86 100644
--- a/media-libs/libdvb/libdvb-0.5.0-r1.ebuild
+++ b/media-libs/libdvb/libdvb-0.5.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.0-r1.ebuild,v 1.8 2004/07/14 20:01:52 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.0-r1.ebuild,v 1.9 2005/01/29 22:09:31 dragonheart Exp $
 
 inherit eutils
 
@@ -21,7 +21,8 @@ src_unpack() {
 
 	# Disable compilation of sample programs
 	# and use DESTDIR when installing
-	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-gentoo.patch" || die "patch failed"
+	epatch ${FILESDIR}/errno.patch || die "patch failed"
 }
 
 src_compile() {
diff --git a/media-libs/libdvb/libdvb-0.5.5.ebuild b/media-libs/libdvb/libdvb-0.5.5.ebuild
index 3772d98bca44..64f72824bed3 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-2004 Gentoo Foundation
+# 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.ebuild,v 1.1 2004/12/06 17:29:09 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvb/libdvb-0.5.5.ebuild,v 1.2 2005/01/29 22:09:31 dragonheart Exp $
 
 inherit eutils
 
@@ -21,7 +21,8 @@ src_unpack() {
 
 	# Disable compilation of sample programs
 	# and use DESTDIR when installing
-	epatch "${FILESDIR}/${P}-gentoo.patch"
+	epatch "${FILESDIR}/${P}-gentoo.patch" || die "patch failed"
+	epatch ${FILESDIR}/errno.patch || die "patch failed"
 }
 
 src_compile() {
@@ -29,8 +30,8 @@ src_compile() {
 }
 
 src_install() {
-	einstall DESTDIR="${D}" || die "Install problem"
-#make DESTDIR="${D}" PREFIX=/usr install || die
+	#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/* && \