summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2003-02-05 20:33:31 +0000
committerMartin Schlemmer <azarah@gentoo.org>2003-02-05 20:33:31 +0000
commit6f43046e817adb9b4a8d8bacd499ae31472df4c5 (patch)
treefcd3b6fa105b70d8c7a4210481a5a394453963c4 /app-cdr
parentVersion bump. Marked unstable. (diff)
downloadhistorical-6f43046e817adb9b4a8d8bacd499ae31472df4c5.tar.gz
historical-6f43046e817adb9b4a8d8bacd499ae31472df4c5.tar.bz2
historical-6f43046e817adb9b4a8d8bacd499ae31472df4c5.zip
kernel 2.5 support
Diffstat (limited to 'app-cdr')
-rw-r--r--app-cdr/cdrtools/ChangeLog5
-rw-r--r--app-cdr/cdrtools/cdrtools-2.01_alpha02.ebuild20
-rw-r--r--app-cdr/cdrtools/files/cdrtools-2.01-kernel25-support.patch14
3 files changed, 33 insertions, 6 deletions
diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 5f19b6d792a1..df0e44d36d7a 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-cdr/cdrtools
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.31 2003/01/29 21:24:32 agenkin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.32 2003/02/05 20:33:31 azarah Exp $
+
+ 05 Feb 2003; Martin Schlemmer <azarah@gentoo.org> :
+ Add support for 2.5 kernel.
*cdrtools-2.01_alpha02 (29 Jan 2003)
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha02.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha02.ebuild
index c3e52294f771..82aa11748354 100644
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha02.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01_alpha02.ebuild
@@ -1,20 +1,30 @@
# Copyright 1999-2002 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_alpha02.ebuild,v 1.2 2003/02/03 10:42:22 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha02.ebuild,v 1.3 2003/02/05 20:33:31 azarah Exp $
+IUSE=""
+
+inherit eutils
+
+S="${WORKDIR}/${PN}-2.01"
DESCRIPTION="A set of tools for CDR drives, including cdrecord."
+SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.gz"
HOMEPAGE="http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html"
-LICENSE="GPL-2"
-DEPEND="virtual/glibc"
+LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~x86 ~ppc"
-SRC_URI="ftp://ftp.berlios.de/pub/cdrecord/alpha/${P/_alpha/a}.tar.gz"
-S=${WORKDIR}/${PN}-2.01
+DEPEND="virtual/glibc"
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 -e "s:/opt/schily:/usr:g" < Defaults.linux > Defaults.linux.hacked
mv Defaults.linux.hacked Defaults.linux
diff --git a/app-cdr/cdrtools/files/cdrtools-2.01-kernel25-support.patch b/app-cdr/cdrtools/files/cdrtools-2.01-kernel25-support.patch
new file mode 100644
index 000000000000..14ad73d6171b
--- /dev/null
+++ b/app-cdr/cdrtools/files/cdrtools-2.01-kernel25-support.patch
@@ -0,0 +1,14 @@
+--- cdrtools-2.01/libscg/scsi-linux-sg.c.orig 2003-02-05 21:01:31.000000000 +0200
++++ cdrtools-2.01/libscg/scsi-linux-sg.c 2003-02-05 21:16:33.000000000 +0200
+@@ -66,6 +66,11 @@
+ #if LINUX_VERSION_CODE >= 0x01031a /* <linux/scsi.h> introduced in 1.3.26 */
+ #if LINUX_VERSION_CODE >= 0x020000 /* <scsi/scsi.h> introduced somewhere. */
+ /* Need to fine tune the ifdef so we get the transition point right. */
++#if LINUX_VERSION_CODE >= 0x020500 /* 2.5.x breaks things again */
++#define __KERNEL__
++#include <asm/types.h>
++#undef __KERNEL__
++#endif
+ #include <scsi/scsi.h>
+ #else
+ #include <linux/scsi.h>