Changed the emake to (probably) solve bug #30798.

6 files changed, 25 insertions, 85 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 2cfdb7c2c652..d47359340136 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,10 @@
 # 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.70 2004/02/09 15:36:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.71 2004/02/23 01:04:03 pylon Exp $
+
+  23 Feb 2004; Lars Weiler <pylon@gentoo.org> cdrtools-2.01_alpha16.ebuild,
+  cdrtools-2.01_alpha25.ebuild, files/cdrtools-2.01-fixinclude.patch:
+  Changed the emake to (probably) solve bug #30798.
 
   09 Feb 2004; <gustavoz@gentoo.org> cdrtools-2.01_alpha25.ebuild:
   stable on sparc
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 779bc8c7562b..56922cc5247e 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,13 +1,12 @@
-MD5 10810dad111c3af8a47e028f41b31fdd ChangeLog 9744
-MD5 7460d8b62a729132f4fe1b1c584654bb cdrtools-2.01_alpha16.ebuild 1815
-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 c9c3c5f385443738880f56d25f842366 cdrtools-2.01_alpha25.ebuild 2167
 MD5 f9fcbc79ca94669d29f5937fbabae7f6 metadata.xml 444
+MD5 9ddd5fdbf8092e8321095f0af99a3124 cdrtools-2.01_alpha23.ebuild 2203
+MD5 180a8d154221e49dc7633c8e2bebdcf2 cdrtools-2.01_alpha20.ebuild 2241
+MD5 7a4b49d770031f7c6747c611ded7bc9a cdrtools-2.01_alpha19.ebuild 2189
+MD5 967b9e1c49fe5d490546720515d8be5c ChangeLog 9940
+MD5 bc5c65ffeb621cb66a7009535bf04aec cdrtools-2.01_alpha25.ebuild 2194
 MD5 3e09d97c263f22dbda9a67df209b533c files/cdrtools-2.01-kernel25-support.patch 602
-MD5 a5d2f2339b75bf4919653d91b83ec07d files/digest-cdrtools-2.01_alpha16 69
 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 2aa3425ea6089f40e9c5f4918a18e146 files/digest-cdrtools-2.01_alpha25 144
+MD5 6802ad40abc88b0397f1f5c580b39083 files/cdrtools-2.01-fixinclude.patch 561
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha16.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha16.ebuild
deleted file mode 100644
index 7aa173cb7d3d..000000000000
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha16.ebuild
+++ /dev/null
@@ -1,74 +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_alpha16.ebuild,v 1.9 2004/01/07 03:25:32 pylon Exp $
-
-inherit eutils
-
-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.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ppc hppa ~sparc ~alpha ~amd64"
-
-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 || die
-
-	cd ${S}/DEFAULTS
-	sed -i -e "s:/opt/schily:/usr:g" Defaults.linux
-
-	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() {
-	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 incs/*-linux-cc/xconfig.h
-
-	cd mkisofs/diag/OBJ/*-linux-cc
-	dobin devdump isodump isoinfo isovfy
-
-	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 bfe21f8f9a19..970c85611155 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.7 2004/02/09 15:36:09 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha25.ebuild,v 1.8 2004/02/23 01:04:03 pylon Exp $
 
 
 inherit eutils
@@ -44,7 +44,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
new file mode 100644
index 000000000000..24c33cd4f673
--- /dev/null
+++ b/app-cdr/cdrtools/files/cdrtools-2.01-fixinclude.patch
@@ -0,0 +1,12 @@
+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_alpha16 b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha16
deleted file mode 100644
index 34d892b082e4..000000000000
--- a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 79a5d6603c6b1c8f007e2634beb75c40 cdrtools-2.01a16.tar.gz 1640701