Version bump. This version compiles only with a kernel 2.6.8 and newer. It does not solve the issue with 2.6.8 kernels and non-root CD writing. Added also a statement about the different license in cdrecord.c (Bug #60883).

5 files changed, 21 insertions, 13 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 34c2d94bda64..02e3851aa75c 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.87 2004/08/16 23:09:39 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.88 2004/08/22 22:26:23 pylon Exp $
+
+*cdrtools-2.01_alpha37 (22 Aug 2004)
+
+  22 Aug 2004; Lars Weiler <pylon@gentoo.org> -cdrtools-2.01_alpha36.ebuild,
+  +cdrtools-2.01_alpha37.ebuild:
+  Version bump. This version compiles only with a kernel 2.6.8 and newer. It
+  does not solve the issue with 2.6.8 kernels and non-root CD writing. Added
+  also a statement about the different license in cdrecord.c (Bug #60883).
 
 *cdrtools-2.01_alpha36 (17 Aug 2004)
 
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 4b234fe4d6c1..017e98ee0199 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,9 +1,9 @@
-MD5 93b54227d1f5ba78e52ce776769b3d39 cdrtools-2.01_alpha36.ebuild 2315
 MD5 947d129be78831cb11da85b7ef433659 cdrtools-2.01_alpha28-r1.ebuild 2420
+MD5 be9c72bee4d3f2553235722d424d35fc cdrtools-2.01_alpha37.ebuild 2478
 MD5 6772d94575245a3fb7ecb1c6f00e1665 ChangeLog 12759
 MD5 734711c91add483af825b2092899d513 cdrtools-2.01_alpha25.ebuild 2249
 MD5 f9fcbc79ca94669d29f5937fbabae7f6 metadata.xml 444
 MD5 3e09d97c263f22dbda9a67df209b533c files/cdrtools-2.01-kernel25-support.patch 602
 MD5 c4cf871ee75ade04155e6e66ff8cb85b files/digest-cdrtools-2.01_alpha28-r1 70
 MD5 2aa3425ea6089f40e9c5f4918a18e146 files/digest-cdrtools-2.01_alpha25 144
-MD5 a52eb098917fc8a6609b38126c1ac1f8 files/digest-cdrtools-2.01_alpha36 70
+MD5 a910d63e42529c80e0220ead81cfa46c files/digest-cdrtools-2.01_alpha37 70
diff --git a/app-cdr/cdrtools/cdrtools-2.01_alpha36.ebuild b/app-cdr/cdrtools/cdrtools-2.01_alpha37.ebuild
index fd4cd089ac41..cd6c467628fe 100644
--- a/app-cdr/cdrtools/cdrtools-2.01_alpha36.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01_alpha37.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha36.ebuild,v 1.1 2004/08/16 23:09:39 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01_alpha37.ebuild,v 1.1 2004/08/22 22:26:23 pylon Exp $
 
 inherit eutils gcc gnuconfig
 
@@ -8,7 +8,7 @@ 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"
+LICENSE="GPL-2 freedist"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64 ~ppc64 ~mips"
 IUSE=""
@@ -21,11 +21,6 @@ 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
 	dosed "s:/opt/schily:/usr:g" Defaults.linux
 	dosed "s:/usr/src/linux/include::g" Defaults.linux
@@ -34,8 +29,8 @@ src_unpack() {
 	dosed "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
+	ln -sf x86_64-linux-cc.rul i386-linux-cc.rul
+	ln -sf x86_64-linux-gcc.rul i386-linux-gcc.rul
 	ln -sf ppc-linux-cc.rul ppc64-linux-cc.rul
 }
 
@@ -84,5 +79,10 @@ src_install() {
 }
 
 pkg_postinst() {
+	einfo "Note the special license on cdrecord/cdrecord.c starting from line 4648."
+	echo
 	einfo "The command line option 'dev=ATAPI:' should be used for IDE CD writers."
+	echo
+	ewarn "As with kernel 2.6.8 it's currently not possible to write CDs or DVDs as"
+	ewarn "a non-root user.  Gentoo will take care for the patches soon."
 }
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha36 b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha36
deleted file mode 100644
index e95d5aeeed51..000000000000
--- a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha36
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bae98192bf486c74b793bcff5a8c5d57 cdrtools-2.01a36.tar.bz2 1405467
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha37 b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha37
new file mode 100644
index 000000000000..23bfcb932983
--- /dev/null
+++ b/app-cdr/cdrtools/files/digest-cdrtools-2.01_alpha37
@@ -0,0 +1 @@
+MD5 fa6e05876d536d68bbdc63e5ca167902 cdrtools-2.01a37.tar.bz2 1410828