several bugs resolved; stable on x86 and ppc; remove unneeded ebuilds.

10 files changed, 31 insertions, 278 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 826443757243..d9a94b26420a 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.79 2004/05/15 23:54:49 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.80 2004/05/26 17:17:35 pylon Exp $
+
+*cdrtools-2.01_alpha28 (26 May 2004)
+
+  26 May 2004; Lars Weiler <pylon@gentoo.org> -cdrtools-2.01_alpha26.ebuild,
+  -cdrtools-2.01_alpha27-r1.ebuild, -cdrtools-2.01_alpha27.ebuild,
+  -cdrtools-2.01_alpha28.ebuild, +cdrtools-2.01_alpha28-r1.ebuild:
+  Solved several bugs:
+  - Tools will be build with optimized CFLAGS
+  - Missing man-pages will be installed
+  - Info about using dev=ATAPI: for IDE CD burners
+  Stable on x86 and ppc.
+  Cleaned up unneeded ebuilds.
 
   15 May 2004; Stephen P. Becker <geoman@gentoo.org>
   cdrtools-2.01_alpha25.ebuild:
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 2fe997b0d407..6972e2336a43 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,13 +1,15 @@
-MD5 5379ec386d943e7bf1a65c24df646dab cdrtools-2.01_alpha27.ebuild 2559
-MD5 8461e1182dbe17166aa9f7cabcd44c6f cdrtools-2.01_alpha26.ebuild 2311
-MD5 36bfaaa3703ed7dc3037d811a4a6706e cdrtools-2.01_alpha28.ebuild 2086
-MD5 6ba2fb1f27e7d774de57fa2fedacbe37 cdrtools-2.01_alpha27-r1.ebuild 2095
-MD5 219a16cf837728ee1723bb938bc51863 ChangeLog 11494
-MD5 e370a27888298d415a1f0b0aae276866 cdrtools-2.01_alpha25.ebuild 2268
+MD5 d7b98b323d5e21cc6acf07721c396d6d cdrtools-2.01_alpha25.ebuild 2267
+MD5 6d94ae6d1df49f9270f0e8daeade0cf2 cdrtools-2.01_alpha26.ebuild 2310
+MD5 65fbc0e817da047724a3e379239b6c8a cdrtools-2.01_alpha27.ebuild 2558
 MD5 f9fcbc79ca94669d29f5937fbabae7f6 metadata.xml 444
+MD5 a86e927cad6677077e1dacf6e4121bc6 cdrtools-2.01_alpha27-r1.ebuild 2094
+MD5 b4689adf834a4f1e56a6a0da2664265d ChangeLog 11493
+MD5 b3eb7119661e864fa19246fa8aecce6f cdrtools-2.01_alpha28-r1.ebuild 2263
+MD5 c23ac134924cc3bad8c38a20ed6980f9 cdrtools-2.01_alpha28.ebuild 2085
 MD5 3e09d97c263f22dbda9a67df209b533c files/cdrtools-2.01-kernel25-support.patch 602
-MD5 a837e5ec6aa55af738b729e8e5196a74 files/digest-cdrtools-2.01_alpha27-r1 70
 MD5 2aa3425ea6089f40e9c5f4918a18e146 files/digest-cdrtools-2.01_alpha25 144
 MD5 a804495e10e1149476f6c18a85fb0fb9 files/digest-cdrtools-2.01_alpha26 144
 MD5 5dd187d17d1cd750449097987ee4039e files/digest-cdrtools-2.01_alpha27 298
+MD5 a837e5ec6aa55af738b729e8e5196a74 files/digest-cdrtools-2.01_alpha27-r1 70
 MD5 c4cf871ee75ade04155e6e66ff8cb85b files/digest-cdrtools-2.01_alpha28 70
+MD5 c4cf871ee75ade04155e6e66ff8cb85b files/digest-cdrtools-2.01_alpha28-r1 70
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha26.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha26.ebuild
deleted file mode 100644
index acad43b2843a..000000000000
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha26.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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_alpha26.ebuild,v 1.2 2004/04/19 07:56:44 vapier Exp $
-
-inherit eutils gcc
-
-DVDR_PATCH_P="cdrtools-2.01a26-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 ${WORKDIR}/${DVDR_PATCH_P}
-
-	cd ${S}/DEFAULTS
-	sed -i -e "s:/opt/schily:/usr:g" Defaults.linux
-	sed -i -e "s:/usr/src/linux/include::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 CC="$(gcc-getCC) -D__attribute_const__=const" || 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/cdrtools-2.01_alpha27.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha27.ebuild
deleted file mode 100644
index c914a337ad78..000000000000
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha27.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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_alpha27.ebuild,v 1.4 2004/04/19 07:56:44 vapier Exp $
-
-inherit eutils gcc
-
-DESCRIPTION="A set of tools for CD and DVD recording, 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/${P/_alpha/a}-dvd.patch.bz2
-			http://people.mandrakesoft.com/~warly/files/cdrtools/archives/${P/_alpha/a}-o_excl.patch.bz2
-			http://people.mandrakesoft.com/~warly/files/cdrtools/archives/${P/_alpha/a}-writemode.patch.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}
-
-	cd ${S}
-	# Add support for 2.5 kernels
-	# <azarah@gentoo.org> (05 Feb 2003)
-	epatch ${FILESDIR}/${PN}-2.01-kernel25-support.patch
-
-	if use dvdr; then
-		epatch ${WORKDIR}/${P/_alpha/a}-dvd.patch
-		epatch ${WORKDIR}/${P/_alpha/a}-o_excl.patch
-		epatch ${WORKDIR}/${P/_alpha/a}-writemode.patch
-	fi
-
-	cd ${S}/DEFAULTS
-	sed -i -e "s:/opt/schily:/usr:g" Defaults.linux
-	sed -i -e "s:/usr/src/linux/include::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 CC="$(gcc-getCC) -D__attribute_const__=const" || 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/cdrtools-2.01_alpha27-r1.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha28-r1.ebuild
index 1fd8e140c3c6..ff2240f5e08c 100644
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha27-r1.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01_alpha28-r1.ebuild
@@ -1,6 +1,6 @@
 # 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_alpha27-r1.ebuild,v 1.3 2004/05/03 10:43:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha28-r1.ebuild,v 1.1 2004/05/26 17:17:35 pylon Exp $
 
 inherit eutils gcc
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~arm ~hppa ~amd64 ~ia64"
+KEYWORDS="x86 ppc ~hppa ~sparc ~alpha ~amd64 ~ia64"
 IUSE=""
 
 DEPEND="virtual/glibc"
@@ -39,7 +39,7 @@ src_unpack() {
 }
 
 src_compile() {
-	emake CC="$(gcc-getCC) -D__attribute_const__=const" || die
+	emake CC="$(gcc-getCC) -D__attribute_const__=const" COPTX="${CFLAGS}" CPPOPTX="${CPPFLAGS}" LDOPTX="${LDFLAGS}" || die
 }
 
 src_install() {
@@ -72,9 +72,15 @@ src_install() {
 	cd ${S}
 	dodoc ABOUT Changelog COPYING README README.{ATAPI,audio,cdplus,cdrw,cdtext,cdclone,copy,DiskT@2,linux,linux-shm,multi,parallel,raw,rscsi,sony,verify} START
 	doman */*.1
+	doman */*.8
 
 	cd ${S}/doc
 	dodoc cdrecord-1.8.1_de-doc_0.1.tar
 	docinto print
 	dodoc *.ps
 }
+
+pkg_postinst() {
+	einfo "The command line option 'dev=ATAPI:' should be added for IDE CD writers."
+}
+
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha28.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha28.ebuild
deleted file mode 100644
index 33e5a53b72e9..000000000000
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha28.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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_alpha28.ebuild,v 1.1 2004/05/14 02:06:40 pylon Exp $
-
-inherit eutils gcc
-
-DESCRIPTION="A set of tools for CD recording, 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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~hppa ~sparc ~alpha ~amd64 ~ia64"
-IUSE=""
-
-DEPEND="virtual/glibc"
-PROVIDE="virtual/cdrtools"
-
-S=${WORKDIR}/${PN}-2.01
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	# Add support for 2.5 kernels
-	# <azarah@gentoo.org> (05 Feb 2003)
-	epatch ${FILESDIR}/${PN}-2.01-kernel25-support.patch
-
-	cd ${S}/DEFAULTS
-	sed -i -e "s:/opt/schily:/usr:g" Defaults.linux
-	sed -i -e "s:/usr/src/linux/include::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 CC="$(gcc-getCC) -D__attribute_const__=const" || 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
-	doins cdrecord/cdrecord.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 ABOUT Changelog COPYING README README.{ATAPI,audio,cdplus,cdrw,cdtext,cdclone,copy,DiskT@2,linux,linux-shm,multi,parallel,raw,rscsi,sony,verify} START
-	doman */*.1
-
-	cd ${S}/doc
-	dodoc cdrecord-1.8.1_de-doc_0.1.tar
-	docinto print
-	dodoc *.ps
-}
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha26 b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha26
deleted file mode 100644
index cc5e212b32eb..000000000000
--- a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha26
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 826eff906650fdd41597479416598275 cdrtools-2.01a26.tar.bz2 1386961
-MD5 59369010af7e4ff46a0743b582baeab3 cdrtools-2.01a26-dvd.patch.bz2 12430
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha27 b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha27
deleted file mode 100644
index 2d74e5dd0cb8..000000000000
--- a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha27
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 3e7e19f445027d1b932f9bfab2970277 cdrtools-2.01a27.tar.bz2 1388766
-MD5 de1bdde2b406c27798e21b04345a9a0a cdrtools-2.01a27-dvd.patch.bz2 12484
-MD5 d58897a06f898cedbb314998aeaf39f2 cdrtools-2.01a27-o_excl.patch.bz2 2481
-MD5 00bda85f3f05806f95743d647accd595 cdrtools-2.01a27-writemode.patch.bz2 332
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha27-r1 b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha27-r1
deleted file mode 100644
index 0ffb62ceac0d..000000000000
--- a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha27-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3e7e19f445027d1b932f9bfab2970277 cdrtools-2.01a27.tar.bz2 1388766
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha28 b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha28-r1
index c6f24aef6f16..c6f24aef6f16 100644
--- a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha28
+++ b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha28-r1