Updated 2.6 compatibility patch, now also works with Linux 2.4 thanks to Ben Peddell <klightspeed@klightspeed.is-a-geek.net>

7 files changed, 40 insertions, 29 deletions

diff --git a/sys-fs/udftools/ChangeLog b/sys-fs/udftools/ChangeLog
index 71e53b62b7d4..26f0b3cb49f1 100644
--- a/sys-fs/udftools/ChangeLog
+++ b/sys-fs/udftools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/udftools
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udftools/ChangeLog,v 1.5 2004/11/06 20:17:44 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udftools/ChangeLog,v 1.6 2004/12/30 23:42:06 dsd Exp $
+
+*udftools-1.0.0b-r4 (30 Dec 2004)
+
+  30 Dec 2004; Daniel Drake <dsd@gentoo.org> metadata.xml,
+  +files/cdrwtool-linux2.6-fix-v2.patch, -files/cdrwtool-linux2.6-fix.patch,
+  -udftools-1.0.0b-r3.ebuild, +udftools-1.0.0b-r4.ebuild:
+  Updated 2.6 compatibility patch, now also works with Linux 2.4 thanks to Ben
+  Peddell <klightspeed@klightspeed.is-a-geek.net>
 
 *udftools-1.0.0b-r3 (06 Nov 2004)
 
diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index a438f3c0b0d7..749b18d98fbe 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -1,7 +1,7 @@
-MD5 c36151495a12ec1d64eaf4a0c28511ce ChangeLog 1214
-MD5 43c872252a620e391c449e150e344a3a metadata.xml 224
+MD5 bd0a330e7866dea96d4658a24e7780c3 udftools-1.0.0b-r4.ebuild 891
 MD5 c80598ca0877dc6b771065c805a0cbeb udftools-1.0.0b.ebuild 647
-MD5 27e83ceb490d4b23ca3c7a37bdec93b8 udftools-1.0.0b-r3.ebuild 941
+MD5 c36151495a12ec1d64eaf4a0c28511ce ChangeLog 1214
+MD5 0cf47a30a6ac05387d56c265d786ade1 metadata.xml 249
+MD5 3e4db84bced51283c2de39869e96e554 files/cdrwtool-linux2.6-fix-v2.patch 876
 MD5 18571ea3d9ddefaa4b26a1e871b27585 files/digest-udftools-1.0.0b 68
-MD5 19419eb50f095349495b1ae537185cbf files/cdrwtool-linux2.6-fix.patch 576
-MD5 d52ea5d393bd61a45f983ebc01703d93 files/digest-udftools-1.0.0b-r3 137
+MD5 d52ea5d393bd61a45f983ebc01703d93 files/digest-udftools-1.0.0b-r4 137
diff --git a/sys-fs/udftools/files/cdrwtool-linux2.6-fix-v2.patch b/sys-fs/udftools/files/cdrwtool-linux2.6-fix-v2.patch
new file mode 100644
index 000000000000..602c808a1b0b
--- /dev/null
+++ b/sys-fs/udftools/files/cdrwtool-linux2.6-fix-v2.patch
@@ -0,0 +1,22 @@
+Fix CD blanking for kernels 2.6.8 and newer
+(write access is required to perform blanking commands)
+
+The original version broke support on Linux 2.4, thanks to Ben Peddell for pointing
+this out to me, and for the updated patch.
+
+ - Daniel Drake <dsd@gentoo.org>
+ - Ben Peddell <klightspeed@klightspeed.is-a-geek.net>
+
+--- udftools-1.0.0b3/cdrwtool/main.c.orig	2004-12-30 22:53:52.000000000 +0000
++++ udftools-1.0.0b3/cdrwtool/main.c	2004-12-30 22:54:36.000000000 +0000
+@@ -242,7 +242,9 @@ int main(int argc, char *argv[])
+ 	udf_init_disc(&disc.udf_disc);
+ 	strcpy(filename, CDROM_DEVICE);
+ 	parse_args(argc, argv, &disc, filename);
+-	if ((fd = open(filename, O_RDONLY | O_NONBLOCK)) < 0)
++	if (((fd = open(filename, O_RDWR | O_NONBLOCK)) < 0) &&
++		((errno != EROFS) ||
++		((fd = open(filename, O_RDONLY | O_NONBLOCK)) < 0)))
+ 	{
+ 		perror("open cdrom device");
+ 		return fd;
diff --git a/sys-fs/udftools/files/cdrwtool-linux2.6-fix.patch b/sys-fs/udftools/files/cdrwtool-linux2.6-fix.patch
deleted file mode 100644
index 827904dd36f9..000000000000
--- a/sys-fs/udftools/files/cdrwtool-linux2.6-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix CD blanking for kernels 2.6.8 and newer
-(write access is required to perform blanking commands)
-
- - Daniel Drake <dsd@gentoo.org>
-
---- udftools-1.0.0b3/cdrwtool/main.c.orig	2004-11-06 16:39:36.651892368 +0000
-+++ udftools-1.0.0b3/cdrwtool/main.c	2004-11-06 16:39:48.184139200 +0000
-@@ -242,7 +242,7 @@
- 	udf_init_disc(&disc.udf_disc);
- 	strcpy(filename, CDROM_DEVICE);
- 	parse_args(argc, argv, &disc, filename);
--	if ((fd = open(filename, O_RDONLY | O_NONBLOCK)) < 0)
-+	if ((fd = open(filename, O_RDWR | O_NONBLOCK)) < 0)
- 	{
- 		perror("open cdrom device");
- 		return fd;
diff --git a/sys-fs/udftools/files/digest-udftools-1.0.0b-r3 b/sys-fs/udftools/files/digest-udftools-1.0.0b-r4
index 55f8b9eb6f1d..55f8b9eb6f1d 100644
--- a/sys-fs/udftools/files/digest-udftools-1.0.0b-r3
+++ b/sys-fs/udftools/files/digest-udftools-1.0.0b-r4
diff --git a/sys-fs/udftools/metadata.xml b/sys-fs/udftools/metadata.xml
index 11616e7f96a6..4a425cc13117 100644
--- a/sys-fs/udftools/metadata.xml
+++ b/sys-fs/udftools/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<herd>base-system</herd>
 <maintainer>
 	<email>dsd@gentoo.org</email>
 	<name>Daniel Drake</name>
diff --git a/sys-fs/udftools/udftools-1.0.0b-r3.ebuild b/sys-fs/udftools/udftools-1.0.0b-r4.ebuild
index 286ecde9107c..da0841d3e747 100644
--- a/sys-fs/udftools/udftools-1.0.0b-r3.ebuild
+++ b/sys-fs/udftools/udftools-1.0.0b-r4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udftools/udftools-1.0.0b-r3.ebuild,v 1.1 2004/11/06 20:17:44 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udftools/udftools-1.0.0b-r4.ebuild,v 1.1 2004/12/30 23:42:06 dsd Exp $
 
 inherit eutils
 
-MY_P="${P}${PR/r/}"
+MY_P="${P}3"
 S=${WORKDIR}/${MY_P}
 DESCRIPTION="Ben Fennema's tools for packet writing and the UDF filesystem"
 SRC_URI="mirror://sourceforge/linux-udf/${MY_P}.tar.gz
@@ -26,13 +26,9 @@ src_unpack() {
 	epatch ${WORKDIR}/${MY_P}.patch
 
 	# Fix CD blanking for 2.6.8 and newer
-	epatch ${FILESDIR}/cdrwtool-linux2.6-fix.patch
+	epatch ${FILESDIR}/cdrwtool-linux2.6-fix-v2.patch
 }
 
-src_compile() {
-	econf || die
-	emake || die
-}
 
 src_install () {
 	make DESTDIR=${D} install || die