several updates. Refer to ChangeLog

12 files changed, 44 insertions, 129 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 8a6006ee48da..aeeb737cc768 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,22 @@
 # 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.72 2004/02/23 02:22:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.73 2004/03/11 01:08:09 pylon Exp $
+
+*cdrtools-2.01_alpha27 (11 Mar 2004)
+
+  11 Mar 2004; Lars Weiler <pylon@gentoo.org> cdrtools-2.01_alpha19.ebuild,
+  cdrtools-2.01_alpha20.ebuild, cdrtools-2.01_alpha23.ebuild,
+  cdrtools-2.01_alpha25.ebuild, cdrtools-2.01_alpha26.ebuild,
+  cdrtools-2.01_alpha27.ebuild, files/cdrtools-2.01-fixinclude.patch:
+  
+  Delete several old ebuilds.
+
+  From alpha25 on, cdrtools does not include /usr/src/linux/include, so the
+  problems with libscg should be history.
+  
+  alpha26 is currently the latest version with working dvdr-support; that's
+  the reason why alpha27 is package-masked.  Should the dvdr-patch be
+  available on alpha27, we can remove the mask.
 
   22 Feb 2004; Aron Griffis <agriffis@gentoo.org>
   cdrtools-2.01_alpha25.ebuild:
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 8ca61b214f2e..8a24dfe1cd29 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,12 +1,9 @@
-MD5 5576f58d4d1a9f640e96add91e368503 ChangeLog 10053
-MD5 74077b9ba766dc55e500cb7bcfd151d1 cdrtools-2.01_alpha25.ebuild 2195
+MD5 d92d2719102d897d1d02b9f9cf60ae64 cdrtools-2.01_alpha27.ebuild 2300
+MD5 a0e53c5a4692467750ad749f7bd54aec cdrtools-2.01_alpha26.ebuild 2300
+MD5 ce9e011fc2e8d58f182951abb97d6f9d ChangeLog 10708
+MD5 3fa6717cc23716b9d2027b11b1e6b898 cdrtools-2.01_alpha25.ebuild 2249
 MD5 f9fcbc79ca94669d29f5937fbabae7f6 metadata.xml 444
-MD5 7a4b49d770031f7c6747c611ded7bc9a cdrtools-2.01_alpha19.ebuild 2189
-MD5 180a8d154221e49dc7633c8e2bebdcf2 cdrtools-2.01_alpha20.ebuild 2241
-MD5 9ddd5fdbf8092e8321095f0af99a3124 cdrtools-2.01_alpha23.ebuild 2203
-MD5 2aa3425ea6089f40e9c5f4918a18e146 files/digest-cdrtools-2.01_alpha25 144
-MD5 6802ad40abc88b0397f1f5c580b39083 files/cdrtools-2.01-fixinclude.patch 561
-MD5 bada1ee8ca01fbf2ae79c91e3615ee95 files/digest-cdrtools-2.01_alpha19 143
 MD5 3e09d97c263f22dbda9a67df209b533c files/cdrtools-2.01-kernel25-support.patch 602
-MD5 2c50f56284bb45813424bab2618583fb files/digest-cdrtools-2.01_alpha20 146
-MD5 fcc5828a2edaa9a7aeca2bff46e3f922 files/digest-cdrtools-2.01_alpha23 144
+MD5 2aa3425ea6089f40e9c5f4918a18e146 files/digest-cdrtools-2.01_alpha25 144
+MD5 a804495e10e1149476f6c18a85fb0fb9 files/digest-cdrtools-2.01_alpha26 144
+MD5 8dd8de52eb91658f29f13c1a69f97ffd files/digest-cdrtools-2.01_alpha27 144
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha20.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha20.ebuild
deleted file mode 100644
index 090430a9f590..000000000000
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha20.ebuild
+++ /dev/null
@@ -1,89 +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_alpha20.ebuild,v 1.3 2004/01/07 03:25:32 pylon Exp $
-
-inherit eutils
-
-DOWNLOADFILENAME="cdrtools-2.01a20pre4"
-
-DVDR_PATCH_P="cdrtools-2.01a16-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/${DOWNLOADFILENAME}.tar.gz
-	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/cdrtools-2.01_alpha25.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha25.ebuild
index a6752e3d2b88..a0eabab70965 100644
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha25.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01_alpha25.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_alpha25.ebuild,v 1.9 2004/02/23 02:22:01 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha25.ebuild,v 1.10 2004/03/11 01:08:10 pylon Exp $
 
 
 inherit eutils
@@ -34,6 +34,7 @@ src_unpack() {
 
 	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
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha19.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha26.ebuild
index f29b1d3f6656..025697a509e4 100644
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha19.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01_alpha26.ebuild
@@ -1,10 +1,11 @@
 # 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.3 2004/01/07 03:25:32 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha26.ebuild,v 1.1 2004/03/11 01:08:11 pylon Exp $
+
 
 inherit eutils
 
-DVDR_PATCH_P="cdrtools-2.01a16-dvd.patch"
+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
@@ -12,7 +13,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"
+KEYWORDS="~x86 ~ppc ~hppa ~sparc ~alpha ~amd64 ~ia64"
 IUSE="dvdr"
 
 DEPEND="virtual/glibc"
@@ -29,10 +30,11 @@ src_unpack() {
 	# <azarah@gentoo.org> (05 Feb 2003)
 	epatch ${FILESDIR}/${PN}-2.01-kernel25-support.patch
 
-	use dvdr && epatch ../${DVDR_PATCH_P}
+	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
@@ -43,7 +45,7 @@ src_unpack() {
 }
 
 src_compile() {
-	emake || die
+	emake CC="${CC} -D__attribute_const__=const" || die
 }
 
 src_install() {
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha23.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha27.ebuild
index 6326dec55778..1d7f66721e68 100644
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha23.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01_alpha27.ebuild
@@ -1,10 +1,11 @@
 # 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_alpha23.ebuild,v 1.6 2004/01/29 04:32:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha27.ebuild,v 1.1 2004/03/11 01:08:11 pylon Exp $
+
 
 inherit eutils
 
-DVDR_PATCH_P="cdrtools-2.01a20-dvd.patch"
+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
@@ -12,7 +13,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"
@@ -29,10 +30,11 @@ src_unpack() {
 	# <azarah@gentoo.org> (05 Feb 2003)
 	epatch ${FILESDIR}/${PN}-2.01-kernel25-support.patch
 
-	use dvdr && epatch ../${DVDR_PATCH_P}
+	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
@@ -43,7 +45,7 @@ src_unpack() {
 }
 
 src_compile() {
-	emake CC=${CC} || die
+	emake CC="${CC} -D__attribute_const__=const" || die
 }
 
 src_install() {
diff --git a/app-cdr/cdrtools/files/cdrtools-2.01-fixinclude.patch b/app-cdr/cdrtools/files/cdrtools-2.01-fixinclude.patch
deleted file mode 100644
index 24c33cd4f673..000000000000
--- a/app-cdr/cdrtools/files/cdrtools-2.01-fixinclude.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur cdrtools-2.01.orig/DEFAULTS/Defaults.linux cdrtools-2.01/DEFAULTS/Defaults.linux
---- cdrtools-2.01.orig/DEFAULTS/Defaults.linux	2003-02-16 00:01:48.000000000 +0000
-+++ cdrtools-2.01/DEFAULTS/Defaults.linux	2004-02-17 14:40:31.723913408 +0000
-@@ -18,7 +18,7 @@
- ###########################################################################
- CWARNOPTS=
- 
--DEFINCDIRS=	$(SRCROOT)/include /usr/src/linux/include
-+DEFINCDIRS=	$(SRCROOT)/include /usr/include/linux
- LDPATH=		-L/opt/schily/lib
- RUNPATH=	-R $(INS_BASE)/lib -R /opt/schily/lib -R $(OLIBSDIR)
- 
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha19 b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha19
deleted file mode 100644
index 231ee95df93b..000000000000
--- a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha19
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d35cbd5af1b2a375656db66e9bd79739 cdrtools-2.01a19.tar.bz2 1359744
-MD5 01ad227cc3b700fd5f19a6a043c1b847 cdrtools-2.01a16-dvd.patch.bz2 7462
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha20 b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha20
deleted file mode 100644
index da42b64504e2..000000000000
--- a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha20
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 ad80ebe689ec6c29539d900cfb1050cd cdrtools-2.01a20pre4.tar.gz 1659378
-MD5 01ad227cc3b700fd5f19a6a043c1b847 cdrtools-2.01a16-dvd.patch.bz2 7462
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha23 b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha23
deleted file mode 100644
index d6e8e3cc1922..000000000000
--- a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha23
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 2d5f7a9a6a71d9d9fa1d9075a8f42c01 cdrtools-2.01a23.tar.bz2 1367731
-MD5 70e6533beb86f0e6fb09843e6cb659a6 cdrtools-2.01a20-dvd.patch.bz2 12054
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha26 b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha26
new file mode 100644
index 000000000000..cc5e212b32eb
--- /dev/null
+++ b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha26
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 000000000000..082dfc66b954
--- /dev/null
+++ b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha27
@@ -0,0 +1,2 @@
+MD5 3e7e19f445027d1b932f9bfab2970277 cdrtools-2.01a27.tar.bz2 1388766
+MD5 59369010af7e4ff46a0743b582baeab3 cdrtools-2.01a26-dvd.patch.bz2 12430