Some facelifts.

Also, the patch seems to apply with fuzz to the latest 2.01, so why
not provide it as well.

5 files changed, 98 insertions, 6 deletions

diff --git a/app-cdr/cdrtools-dvdr/ChangeLog b/app-cdr/cdrtools-dvdr/ChangeLog
index 2fbac2630e24..3f8616e4366e 100644
--- a/app-cdr/cdrtools-dvdr/ChangeLog
+++ b/app-cdr/cdrtools-dvdr/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for app-cdr/cdrtools-dvdr
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools-dvdr/ChangeLog,v 1.1 2003/03/05 01:42:18 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools-dvdr/ChangeLog,v 1.2 2003/03/05 02:39:32 agenkin Exp $
+
+*cdrtools-dvdr-2.01_alpha4 (04 Mar 2003)
+
+  04 Mar 2003; Arcady Genkin <agenkin@getoo.org> :
+  The patch seems to apply with fuzz for the latest 2.01.
 
 *cdrtools-dvdr-1.11.37 (04 Mar 2003)
 
   04 Mar 2003; Arcady Genkin <agenkin@getoo.org> :
   Initial version of the ebuild.  Closes bug #13385.
-  Thanks to Faye Pearson <faye@clara.net>.
\ No newline at end of file
+  Thanks to Faye Pearson <faye@clara.net>.
diff --git a/app-cdr/cdrtools-dvdr/cdrtools-dvdr-1.11.37.ebuild b/app-cdr/cdrtools-dvdr/cdrtools-dvdr-1.11.37.ebuild
index 76210ac65d14..06768934c2e8 100644
--- a/app-cdr/cdrtools-dvdr/cdrtools-dvdr-1.11.37.ebuild
+++ b/app-cdr/cdrtools-dvdr/cdrtools-dvdr-1.11.37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools-dvdr/cdrtools-dvdr-1.11.37.ebuild,v 1.1 2003/03/05 01:42:18 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools-dvdr/cdrtools-dvdr-1.11.37.ebuild,v 1.2 2003/03/05 02:39:32 agenkin Exp $
 
 DESCRIPTION="A set of tools for CDR drives, including cdrecord.	 Includes Mandrake's DVDR patch."
 HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html"
@@ -10,15 +10,18 @@ DEPEND="virtual/glibc"
 SLOT="0"
 KEYWORDS="~x86"
 
+DVDR_PATCH_P=cdrtools-1.11a37-dvd.patch
 MY_P=${PN/-dvdr/}-${PV%.*}a${PV##*.}
 S=${WORKDIR}/${PN/-dvdr}-1.11
 SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/OLD/2.0aX/${MY_P}.tar.gz
-	http://people.mandrakesoft.com/~warly/files/cdrtools/${MY_P}-dvd.patch.bz2"
+	http://people.mandrakesoft.com/~warly/files/cdrtools/${DVDR_PATCH_P}.bz2"
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz || die
-	unpack ${MY_P}-dvd.patch.bz2 || die
-	patch -p0 < ${MY_P}-dvd.patch || die
+	unpack ${DVDR_PATCH_P}.bz2 || die
+
+	cd ${S}
+	patch -p1 < ../${DVDR_PATCH_P} || die "Patch failed"
 
 	cd ${S}/DEFAULTS
 	sed -e "s:/opt/schily:/usr:g" < Defaults.linux > Defaults.linux.hacked
diff --git a/app-cdr/cdrtools-dvdr/cdrtools-dvdr-2.01_alpha04.ebuild b/app-cdr/cdrtools-dvdr/cdrtools-dvdr-2.01_alpha04.ebuild
new file mode 100644
index 000000000000..a00317a939c3
--- /dev/null
+++ b/app-cdr/cdrtools-dvdr/cdrtools-dvdr-2.01_alpha04.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools-dvdr/cdrtools-dvdr-2.01_alpha04.ebuild,v 1.1 2003/03/05 02:39:32 agenkin Exp $
+
+inherit eutils
+
+DESCRIPTION="A set of tools for CDR drives, including cdrecord.	 Includes Mandrake's DVDR patch."
+HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+
+DEPEND="virtual/glibc"
+
+DVDR_PATCH_P=cdrtools-1.11a37-dvd.patch
+SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${PN/-dvdr/}-${PV/_alpha/a}.tar.gz
+	http://people.mandrakesoft.com/~warly/files/cdrtools/${DVDR_PATCH_P}.bz2"
+S="${WORKDIR}/${PN/-dvdr/}-2.01"
+
+src_unpack() {
+	unpack ${PN/-dvdr/}-${PV/_alpha/a}.tar.gz || die
+	unpack ${DVDR_PATCH_P}.bz2 || die
+
+	cd ${S}
+	patch -p1 < ../${DVDR_PATCH_P} || die "Patch failed."
+
+	cd ${S}
+	# Add support for 2.5 kernels
+	# <azarah@gentoo.org> (05 Feb 2003)
+	epatch ${FILESDIR}/${PN/-dvdr}-2.01-kernel25-support.patch || die
+	
+	cd ${S}/DEFAULTS
+	sed -e "s:/opt/schily:/usr:g" < Defaults.linux > Defaults.linux.hacked
+	mv Defaults.linux.hacked Defaults.linux
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	dobin cdda2wav/OBJ/*-linux-cc/cdda2wav
+	dobin cdrecord/OBJ/*-linux-cc/cdrecord
+	cd ${S}
+	dobin mkisofs/OBJ/*-linux-cc/mkisofs
+	dobin readcd/OBJ/*-linux-cc/readcd
+	insinto /usr/include
+	doins incs/*-linux-cc/align.h incs/*-linux-cc/avoffset.h
+
+	cd mkisofs/diag/OBJ/*-linux-cc
+	dobin devdump isodump isoinfo isovfy
+
+	cd ${S}/libs/*-linux-cc
+	dolib.a *.a
+
+	cd  ${S}
+	dodoc Changelog COPYING PORTING README* START
+
+	cd ${S}/doc
+	dodoc cdrecord-1.8.1_de-doc_0.1.tar
+	docinto print
+	dodoc *.ps
+	newman cdda2wav.man cdda2wav.1
+	newman cdrecord.man cdrecord.1
+	newman readcd.man readcd.1
+	newman isoinfo.man isoinfo.8
+	newman mkisofs.man mkisofs.8
+}
diff --git a/app-cdr/cdrtools-dvdr/files/cdrtools-2.01-kernel25-support.patch b/app-cdr/cdrtools-dvdr/files/cdrtools-2.01-kernel25-support.patch
new file mode 100644
index 000000000000..14ad73d6171b
--- /dev/null
+++ b/app-cdr/cdrtools-dvdr/files/cdrtools-2.01-kernel25-support.patch
@@ -0,0 +1,14 @@
+--- cdrtools-2.01/libscg/scsi-linux-sg.c.orig	2003-02-05 21:01:31.000000000 +0200
++++ cdrtools-2.01/libscg/scsi-linux-sg.c	2003-02-05 21:16:33.000000000 +0200
+@@ -66,6 +66,11 @@
+ #if LINUX_VERSION_CODE >= 0x01031a /* <linux/scsi.h> introduced in 1.3.26 */
+ #if LINUX_VERSION_CODE >= 0x020000 /* <scsi/scsi.h> introduced somewhere. */
+ /* Need to fine tune the ifdef so we get the transition point right. */
++#if LINUX_VERSION_CODE >= 0x020500 /* 2.5.x breaks things again */
++#define __KERNEL__
++#include <asm/types.h>
++#undef __KERNEL__
++#endif
+ #include <scsi/scsi.h>
+ #else
+ #include <linux/scsi.h>
diff --git a/app-cdr/cdrtools-dvdr/files/digest-cdrtools-dvdr-2.01_alpha04 b/app-cdr/cdrtools-dvdr/files/digest-cdrtools-dvdr-2.01_alpha04
new file mode 100644
index 000000000000..386d2be4e0e7
--- /dev/null
+++ b/app-cdr/cdrtools-dvdr/files/digest-cdrtools-dvdr-2.01_alpha04
@@ -0,0 +1,2 @@
+MD5 151f3613e6e19a2eaf174168fa6764a2 cdrtools-2.01a04.tar.gz 1587459
+MD5 482c6d971c4e6626bd289a6c82543334 cdrtools-1.11a37-dvd.patch.bz2 6534