Added a patch to gtoaster's source code so that devices are detected as

sr? instead of scd?.  See bug #9659

3 files changed, 68 insertions, 3 deletions

diff --git a/app-cdr/gtoaster/ChangeLog b/app-cdr/gtoaster/ChangeLog
index b95e3fe42c9c..b13539629020 100644
--- a/app-cdr/gtoaster/ChangeLog
+++ b/app-cdr/gtoaster/ChangeLog
@@ -1,12 +1,16 @@
 # ChangeLog for app-cdr/gtoaster
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtoaster/ChangeLog,v 1.5 2002/10/28 23:54:36 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtoaster/ChangeLog,v 1.6 2002/10/31 01:22:59 raker Exp $
 
 *gtoaster-1.0_beta6 (06 Sep 2002)
 
+  30 Oct 2002; Nick Hadaway <raker@gentoo.org> gtoaster-1.0_beta6.ebuild,
+  files/scdtosr.diff :
+  Modified source code so detection of devices defaults to sr instead of
+  scd.
+
   28 Oct 2002; Seemant Kulleen <seemant@gentoo.org>
   gtoaster-1.0_beta6.ebuild :
-
   Added app-cdr/cdrdao to DEPEND list, closing bug #9661 by
   grant.likely@gdcanada.com (Grant Likely)
 
diff --git a/app-cdr/gtoaster/files/scdtosr.diff b/app-cdr/gtoaster/files/scdtosr.diff
new file mode 100644
index 000000000000..9005943fd3ed
--- /dev/null
+++ b/app-cdr/gtoaster/files/scdtosr.diff
@@ -0,0 +1,54 @@
+diff -urN gtoaster/cddrives.c gtoaster-modified/cddrives.c
+--- gtoaster/cddrives.c	2002-08-07 12:58:13.000000000 -0500
++++ gtoaster-modified/cddrives.c	2002-10-30 19:10:50.000000000 -0600
+@@ -412,7 +412,7 @@
+ 		 (strstr(type,"DVD-RW.")!=NULL)||
+ 		 (strstr(type,"CD-R50S")!=NULL))
+ 	       is_recorder=1;
+-	     sprintf(device,"/dev/scd%i",devicenum);
++	     sprintf(device,"/dev/sr%i",devicenum);
+ 		 /* get mountpoint from lookup file (usually /etc/fstab) */
+ 	     cddrives_getmountpoint(device,mountpoint);
+ 	     if (cddrives_getrombyscsiid(scsiid)!=NULL)
+@@ -512,7 +512,7 @@
+ 
+    i=cddrives_cdinfo_create(_("(Model)"),
+ 			    _("(Manufacturer)"),
+-			    _("/dev/scd0"),
++			    _("/dev/sr0"),
+ 			    _("0,0"),
+ 			    _("/mnt/cdrom"),
+ 			    0,
+diff -urN gtoaster/gtoasterr gtoaster-modified/gtoasterr
+--- gtoaster/gtoasterr	2000-08-28 13:05:39.000000000 -0500
++++ gtoaster-modified/gtoasterr	2002-10-30 19:11:14.000000000 -0600
+@@ -50,10 +50,10 @@
+ fillstate_themed=0
+ fillstate_colors=50453,56101,49657:47329,49752,52009:58221,48027,59293:41650,59785,65535:50274,49151,65535
+ audio_default=Enlightenment Sound Daemon
+-recorder=/dev/scd1
++recorder=/dev/sr1
+ rec_mountpoint=/cdrom2
+ rec_scsiid=1,0
+-cddrives_drives=/dev/scd0(0,0) /dev/scd1(1,0)
++cddrives_drives=/dev/sr0(0,0) /dev/sr1(1,0)
+ isotrack_client_ms=mkisofs$eltorito -quiet -a -V "fsedit_volid" -f -J -r -C cdr_msinfo -M recorder "fsedit_destpath"
+ common_showcmdline=false
+ 
+@@ -119,14 +119,14 @@
+ [drives]
+ model=DVD-ROM SD-608  
+ manufacturer=SAMSUNG 
+-device=/dev/scd0
++device=/dev/sr0
+ scsiid=0,0,0
+ mountpoint=/cdrom
+ dae_usesg=1
+ is_recorder=0
+ model=CD-Writer+ 7200 
+ manufacturer=HP      
+-device=/dev/scd1
++device=/dev/sr1
+ scsiid=0,1,0
+ mountpoint=/cdrom2
+ dae_usesg=1
diff --git a/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild b/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild
index 889fff59d2d3..d11d88e73254 100644
--- a/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild
+++ b/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild,v 1.5 2002/10/28 23:54:36 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/gtoaster/gtoaster-1.0_beta6.ebuild,v 1.6 2002/10/31 01:22:59 raker Exp $
 
 IUSE="nls esd gnome oss oggvorbis"
 
@@ -31,6 +31,13 @@ RDEPEND="=x11-libs/gtk+-1.2*
 	oggvorbis? ( >=media-sound/vorbis-tools-1.0_rc2
 		>=media-sound/oggtst-0.0 )"
 
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	patch -p1 < ${FILESDIR}/scdtosr.diff || die "patch failed"
+
+}
 
 src_compile() {