version bump and header adjustment

11 files changed, 115 insertions, 23 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index b699ec7c12e4..96103ff20b29 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.62 2003/12/14 23:36:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.63 2004/01/07 03:25:32 pylon Exp $
+
+  07 Jan 2004; Lars Weiler <pylon@gentoo.org> :
+  Version bump. New revision of Mandrake's DVD patch included. Thanks to
+  s.kapfinger@gmx.de for the ebuild.
 
   14 Dec 2003; <agriffis@gentoo.org> cdrtools-2.01_alpha20.ebuild:
   stable on ia64
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index a9d2131c7b34..450f82dc5cb7 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,13 +1,13 @@
-MD5 c252d782fe4684be60e6cfabf4f7ce8c cdrtools-1.11.40.ebuild 1413
-MD5 8e5a56273ad0149ebb50192f57b372a2 cdrtools-2.01_alpha18-r1.ebuild 2041
+MD5 14688cb558dac45e79f8339bbfb53c44 cdrtools-1.11.40.ebuild 1414
+MD5 2f2a6e8bf78a82c660f6a31de20b7938 cdrtools-2.01_alpha18-r1.ebuild 2035
 MD5 e30bebbfb984f260a3fd7a223254905e cdrtools-2.01_alpha23.ebuild 2076
-MD5 9ce67949cc912a90f8351a87bb790d6c cdrtools-2.01_alpha19.ebuild 2193
-MD5 c9a1af39671b78d706a0799748c54d2d cdrtools-2.01_alpha14.ebuild 1655
-MD5 24b5b4cf22ebb2fed7fa7e508be45035 ChangeLog 8830
+MD5 7a4b49d770031f7c6747c611ded7bc9a cdrtools-2.01_alpha19.ebuild 2189
+MD5 f51c6d9660d5dc00592da6f4c9daa8ee cdrtools-2.01_alpha14.ebuild 1656
+MD5 e59eb49bfcdda4c14dcfd485b5be1b47 ChangeLog 8827
 MD5 f9fcbc79ca94669d29f5937fbabae7f6 metadata.xml 444
-MD5 2e90bf176b1f9f03c28658126035412f cdrtools-2.01_alpha20.ebuild 2244
-MD5 34798221523990ad2be664f3b708e5dc cdrtools-2.01_alpha16.ebuild 1814
-MD5 bb739f7b184c324f395fbcb4a94548c6 cdrtools-1.11.39-r1.ebuild 1505
+MD5 180a8d154221e49dc7633c8e2bebdcf2 cdrtools-2.01_alpha20.ebuild 2241
+MD5 7460d8b62a729132f4fe1b1c584654bb cdrtools-2.01_alpha16.ebuild 1815
+MD5 dd788d268eefd59adee7a1ebaa40de0b cdrtools-1.11.39-r1.ebuild 1506
 MD5 3e09d97c263f22dbda9a67df209b533c files/cdrtools-2.01-kernel25-support.patch 602
 MD5 2450e62730dcd41c5fe0c92844d92f1a files/digest-cdrtools-1.11.39-r1 70
 MD5 8261622dd12c6ef676c1791b8bba3620 files/digest-cdrtools-2.01_alpha18-r1 142
diff --git a/app-cdr/cdrtools/cdrtools-1.11.39-r1.ebuild b/app-cdr/cdrtools/cdrtools-1.11.39-r1.ebuild
index c00a9785de58..79f3019cbd58 100644
--- a/app-cdr/cdrtools/cdrtools-1.11.39-r1.ebuild
+++ b/app-cdr/cdrtools/cdrtools-1.11.39-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-1.11.39-r1.ebuild,v 1.3 2003/10/01 09:27:33 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-1.11.39-r1.ebuild,v 1.4 2004/01/07 03:25:32 pylon Exp $
 
 inherit eutils
 
diff --git a/app-cdr/cdrtools/cdrtools-1.11.40.ebuild b/app-cdr/cdrtools/cdrtools-1.11.40.ebuild
index f2a4847e5d5f..3bcdd3f98158 100644
--- a/app-cdr/cdrtools/cdrtools-1.11.40.ebuild
+++ b/app-cdr/cdrtools/cdrtools-1.11.40.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-1.11.40.ebuild,v 1.6 2003/10/01 09:27:33 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-1.11.40.ebuild,v 1.7 2004/01/07 03:25:32 pylon Exp $
 
 DESCRIPTION="A set of tools for CDR drives, including cdrecord."
 HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html"
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha14.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha14.ebuild
index 23e821961385..f4b782d2ee76 100644
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha14.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01_alpha14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha14.ebuild,v 1.5 2003/10/01 09:27:33 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha14.ebuild,v 1.6 2004/01/07 03:25:32 pylon Exp $
 
 inherit eutils
 
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha16.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha16.ebuild
index ad797d231560..7aa173cb7d3d 100644
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha16.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01_alpha16.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha16.ebuild,v 1.8 2003/10/01 09:27:33 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha16.ebuild,v 1.9 2004/01/07 03:25:32 pylon Exp $
 
 inherit eutils
 
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha18-r1.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha18-r1.ebuild
index 180d3c4f297e..867e677395a8 100644
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha18-r1.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01_alpha18-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha18-r1.ebuild,v 1.6 2003/10/22 11:48:03 darkspecter Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha18-r1.ebuild,v 1.7 2004/01/07 03:25:32 pylon Exp $
 
 inherit eutils
 
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha19.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha19.ebuild
index 24e413565444..f29b1d3f6656 100644
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha19.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01_alpha19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha19.ebuild,v 1.2 2003/11/29 14:39:42 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha19.ebuild,v 1.3 2004/01/07 03:25:32 pylon Exp $
 
 inherit eutils
 
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha20.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha20.ebuild
index 00031258d55c..090430a9f590 100644
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha20.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01_alpha20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha20.ebuild,v 1.2 2003/12/14 23:36:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha20.ebuild,v 1.3 2004/01/07 03:25:32 pylon Exp $
 
 inherit eutils
 
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha23.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha23.ebuild
new file mode 100644
index 000000000000..9d3ba41f9a22
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-2.01_alpha23.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils
+
+DVDR_PATCH_P="cdrtools-2.01a20-dvd.patch"
+DESCRIPTION="A set of tools for CDR drives, including cdrecord."
+HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html"
+SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.bz2
+	dvdr? ( http://people.mandrakesoft.com/~warly/files/cdrtools/archives/${DVDR_PATCH_P}.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~hppa ~sparc ~alpha ~amd64 ~ia64"
+IUSE="dvdr"
+
+DEPEND="virtual/glibc"
+PROVIDE="virtual/cdrtools"
+
+S=${WORKDIR}/${PN}-2.01
+
+src_unpack() {
+	unpack ${A}
+	use dvdr && unpack ${DVDR_PATCH_P}.bz2
+
+	cd ${S}
+	# Add support for 2.5 kernels
+	# <azarah@gentoo.org> (05 Feb 2003)
+	epatch ${FILESDIR}/${PN}-2.01-kernel25-support.patch
+
+	use dvdr && epatch ../${DVDR_PATCH_P}
+
+	cd ${S}/DEFAULTS
+	sed -i -e "s:/opt/schily:/usr:g" Defaults.linux
+
+	cd ${S}/librscg
+	sed -i -e "s:/opt/schily:/usr:g" scsi-remote.c
+
+	cd ${S}/RULES
+	cp i386-linux-cc.rul x86_64-linux-cc.rul
+	cp i386-linux-gcc.rul x86_64-linux-gcc.rul
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	cd ${S}
+	dobin cdda2wav/OBJ/*-linux-cc/cdda2wav
+	dobin cdrecord/OBJ/*-linux-cc/cdrecord
+	dobin mkisofs/OBJ/*-linux-cc/mkisofs
+	dobin readcd/OBJ/*-linux-cc/readcd
+	dosbin rscsi/OBJ/*-linux-cc/rscsi
+	insinto /usr/include
+	doins incs/*-linux-cc/align.h incs/*-linux-cc/avoffset.h incs/*-linux-cc/xconfig.h
+
+	cd mkisofs/diag/OBJ/*-linux-cc
+	dobin devdump isodump isoinfo isovfy
+
+	cd ${S}
+	insinto /etc/default
+	doins rscsi/rscsi.dfl
+
+	cd ${S}/libs/*-linux-cc
+	dolib.a *.a
+
+	cd ${S}
+	insinto /usr/include/scsilib
+	doins include/*.h
+	insinto /usr/include/scsilib/scg
+	doins include/scg/*.h
+
+	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/files/digest-cdrtools-2.01_alpha23 b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha23
new file mode 100644
index 000000000000..d6e8e3cc1922
--- /dev/null
+++ b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha23
@@ -0,0 +1,2 @@
+MD5 2d5f7a9a6a71d9d9fa1d9075a8f42c01 cdrtools-2.01a23.tar.bz2 1367731
+MD5 70e6533beb86f0e6fb09843e6cb659a6 cdrtools-2.01a20-dvd.patch.bz2 12054