Version bump; bug #193544. Cleaned out old version.

(Portage version: 2.1.3.19)

6 files changed, 18 insertions, 30 deletions

diff --git a/app-cdr/cdrtools/ChangeLog b/app-cdr/cdrtools/ChangeLog
index 7df41c198708..b9f380b683f3 100644
--- a/app-cdr/cdrtools/ChangeLog
+++ b/app-cdr/cdrtools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/cdrtools
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.192 2007/11/10 19:38:13 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/ChangeLog,v 1.193 2007/11/11 11:55:17 pylon Exp $
+
+*cdrtools-2.01.01_alpha36 (11 Nov 2007)
+
+  11 Nov 2007; Lars Weiler <pylon@gentoo.org>
+  -files/cdrtools-2.01.01a03-rezero.patch,
+  -files/cdrtools-2.01a27-writemode.patch, -cdrtools-2.01.01_alpha32.ebuild,
+  +cdrtools-2.01.01_alpha36.ebuild:
+  Version bump; bug #193544.  Cleaned out old version.
 
   10 Nov 2007; Samuli Suominen <drac@gentoo.org>
   cdrtools-2.01.01_alpha34.ebuild:
diff --git a/app-cdr/cdrtools/cdrtools-2.01.01_alpha32.ebuild b/app-cdr/cdrtools/cdrtools-2.01.01_alpha36.ebuild
index 61fcde56575d..d144b5c9780b 100644
--- a/app-cdr/cdrtools/cdrtools-2.01.01_alpha32.ebuild
+++ b/app-cdr/cdrtools/cdrtools-2.01.01_alpha36.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha32.ebuild,v 1.1 2007/07/30 20:18:50 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/cdrtools/cdrtools-2.01.01_alpha36.ebuild,v 1.1 2007/11/11 11:55:17 pylon Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -25,8 +25,6 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	# CAN-2004-0806 - Bug 63187
-	epatch "${FILESDIR}"/${PN}-2.01-scsi-remote.patch
 	epatch "${FILESDIR}"/${PN}-2.01.01a03-warnings.patch
 
 	# ppc-macos support
@@ -35,6 +33,8 @@ src_unpack() {
 
 	sed -i "s:/opt/schily:/usr:g" Defaults.${MYARCH}
 	sed -i "s:/usr/src/linux/include::g" Defaults.${MYARCH}
+	# For dynamic linking:
+	sed -i "s:static:dynamic:" Defaults.${MYARCH}
 
 	cd "${S}"/librscg
 	sed -i "s:/opt/schily:/usr:g" scsi-remote.c
@@ -81,6 +81,9 @@ src_install() {
 	cd "${S}"/libs/*-*-cc
 	dolib.a *.a || die "dolib failed"
 
+	cd "${S}"/libs/*-*-cc/pic
+	dolib.so * || die "dolib.so failed"
+
 	cd "${S}"
 	insinto /usr/include/scsilib
 	doins include/schily/*.h
diff --git a/app-cdr/cdrtools/files/cdrtools-2.01.01a03-rezero.patch b/app-cdr/cdrtools/files/cdrtools-2.01.01a03-rezero.patch
deleted file mode 100644
index 7e8d71f7a6c2..000000000000
--- a/app-cdr/cdrtools/files/cdrtools-2.01.01a03-rezero.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- cdrtools-2.01.01/cdrecord/cdrecord.c.rezero	2005-08-03 12:50:28.000000000 +0200
-+++ cdrtools-2.01.01/cdrecord/cdrecord.c	2005-08-03 12:50:53.000000000 +0200
-@@ -3880,7 +3880,8 @@
- 	scsi_start_stop_unit(scgp, 1, 0, immed);
- 	wait_unit_ready(scgp, 120);
- 	scgp->silent++;
--	rezero_unit(scgp);	/* Is this needed? Not supported by some drvives */
-+	/* kernel >= 2.6.12 does not like that as user
-+	rezero_unit(scgp); */	/* Is this needed? Not supported by some drvives */
- 	scgp->silent--;
- 	test_unit_ready(scgp);
- 	scsi_start_stop_unit(scgp, 1, 0, immed);
diff --git a/app-cdr/cdrtools/files/cdrtools-2.01a27-writemode.patch b/app-cdr/cdrtools/files/cdrtools-2.01a27-writemode.patch
deleted file mode 100644
index 68f0e8a2fd3f..000000000000
--- a/app-cdr/cdrtools/files/cdrtools-2.01a27-writemode.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cdrtools-2.01/cdrecord/cdrecord.c.writemode	2004-03-12 13:37:54.164860489 +0100
-+++ cdrtools-2.01/cdrecord/cdrecord.c	2004-03-12 13:38:02.747937392 +0100
-@@ -3597,8 +3597,6 @@
- 			errmsgno(EX_BAD, "No write mode specified.\n");
- 			errmsgno(EX_BAD, "Asuming -tao mode.\n");
- 			errmsgno(EX_BAD, "Future versions of cdrecord may have different drive dependent defaults.\n");
--			errmsgno(EX_BAD, "Continuing in 5 seconds...\n");
--			sleep(5);
- 			tao = 1;
- 		}
- 		tracks++;
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-2.01.01_alpha32 b/app-cdr/cdrtools/files/digest-cdrtools-2.01.01_alpha32
deleted file mode 100644
index 93b9675235f7..000000000000
--- a/app-cdr/cdrtools/files/digest-cdrtools-2.01.01_alpha32
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 af2c7f85df6efab92d0104a257ea5729 cdrtools-2.01.01a32.tar.bz2 1656938
-RMD160 3639c693f8c7cc1dbc1e1879f0eb60d47b154290 cdrtools-2.01.01a32.tar.bz2 1656938
-SHA256 e6bc1a1a4c1ceb684d85d05c034883b8c805506620c177db35a19de1b44ba8ab cdrtools-2.01.01a32.tar.bz2 1656938
diff --git a/app-cdr/cdrtools/files/digest-cdrtools-2.01.01_alpha36 b/app-cdr/cdrtools/files/digest-cdrtools-2.01.01_alpha36
new file mode 100644
index 000000000000..40853542b443
--- /dev/null
+++ b/app-cdr/cdrtools/files/digest-cdrtools-2.01.01_alpha36
@@ -0,0 +1,3 @@
+MD5 0e6f9ecd4e4df0735a981156c0b22682 cdrtools-2.01.01a36.tar.bz2 1664644
+RMD160 12ad5e9cf28d620c97e3aa8523851c2fb10eac00 cdrtools-2.01.01a36.tar.bz2 1664644
+SHA256 2271ffad792fe01b04a7cc472c3ea6511997a1ba5e6060816faaa0d4ab9b481e cdrtools-2.01.01a36.tar.bz2 1664644