version bump and alpha23 stable on x86 and ppc

5 files changed, 109 insertions, 12 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 96103ff20b29..41572fe4f535 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,13 @@
 # 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.63 2004/01/07 03:25:32 pylon Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.64 2004/01/17 22:13:26 pylon Exp $
+
+*cdrtools-2.01_alpha23 (17 Jan 2004)
+
+  17 Jan 2004; Lars Weiler <pylon@gentoo.org> cdrtools-2.01_alpha23.ebuild,
+  cdrtools-2.01_alpha25.ebuild:
+  Added the alpha25-version
+  Bumped the alpha23-version stable for both x86 and ppc
 
   07 Jan 2004; Lars Weiler <pylon@gentoo.org> :
   Version bump. New revision of Mandrake's DVD patch included. Thanks to
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 450f82dc5cb7..52b05f35ee26 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,20 +1,22 @@
+MD5 bdb0cae4fc93506171f64fa86d8bec16 ChangeLog 9059
+MD5 dd788d268eefd59adee7a1ebaa40de0b cdrtools-1.11.39-r1.ebuild 1506
 MD5 14688cb558dac45e79f8339bbfb53c44 cdrtools-1.11.40.ebuild 1414
+MD5 f51c6d9660d5dc00592da6f4c9daa8ee cdrtools-2.01_alpha14.ebuild 1656
+MD5 7460d8b62a729132f4fe1b1c584654bb cdrtools-2.01_alpha16.ebuild 1815
 MD5 2f2a6e8bf78a82c660f6a31de20b7938 cdrtools-2.01_alpha18-r1.ebuild 2035
-MD5 e30bebbfb984f260a3fd7a223254905e cdrtools-2.01_alpha23.ebuild 2076
 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 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 4247915590a61948cf9dd0ef3ed858da cdrtools-2.01_alpha23.ebuild 2074
+MD5 f9fcbc79ca94669d29f5937fbabae7f6 metadata.xml 444
+MD5 e30bebbfb984f260a3fd7a223254905e cdrtools-2.01_alpha25.ebuild 2076
+MD5 4dc0a1f8df2b42d358365eeb526e867d files/cdrecord-scsiopen-format.patch 352
 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
+MD5 5bf9f8da4dc6b60ac0c2dca1de9fd881 files/digest-cdrtools-1.11.40 70
 MD5 983f5f65e96f3381528cf89c733781d9 files/digest-cdrtools-2.01_alpha14 69
 MD5 a5d2f2339b75bf4919653d91b83ec07d files/digest-cdrtools-2.01_alpha16 69
+MD5 8261622dd12c6ef676c1791b8bba3620 files/digest-cdrtools-2.01_alpha18-r1 142
 MD5 bada1ee8ca01fbf2ae79c91e3615ee95 files/digest-cdrtools-2.01_alpha19 143
 MD5 2c50f56284bb45813424bab2618583fb files/digest-cdrtools-2.01_alpha20 146
 MD5 fcc5828a2edaa9a7aeca2bff46e3f922 files/digest-cdrtools-2.01_alpha23 144
-MD5 4dc0a1f8df2b42d358365eeb526e867d files/cdrecord-scsiopen-format.patch 352
-MD5 5bf9f8da4dc6b60ac0c2dca1de9fd881 files/digest-cdrtools-1.11.40 70
+MD5 3077e6afa15d6811e346b85465cb67eb files/digest-cdrtools-2.01_alpha25 144
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha23.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha23.ebuild
index 9d3ba41f9a22..0cb4f24633e5 100644
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha23.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01_alpha23.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~hppa ~sparc ~alpha ~amd64 ~ia64"
+KEYWORDS="x86 ppc ~hppa ~sparc ~alpha ~amd64 ~ia64"
 IUSE="dvdr"
 
 DEPEND="virtual/glibc"
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha25.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha25.ebuild
new file mode 100644
index 000000000000..9d3ba41f9a22
--- /dev/null
+++ b/app-cdr/cdrtools/cdrtools-2.01_alpha25.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_alpha25 b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha25
new file mode 100644
index 000000000000..7ddc0f95af4b
--- /dev/null
+++ b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha25
@@ -0,0 +1,2 @@
+MD5 b2a374130bf7946ac90ebbe2fc8d9176 cdrtools-2.01a25.tar.bz2 1377848
+MD5 70e6533beb86f0e6fb09843e6cb659a6 cdrtools-2.01a20-dvd.patch.bz2 12054