added the missing patch

4 files changed, 436 insertions, 14 deletions

diff --git a/app-cdr/xcdroast/ChangeLog b/app-cdr/xcdroast/ChangeLog
index 884774fca544..ff6d43ba6dd1 100644
--- a/app-cdr/xcdroast/ChangeLog
+++ b/app-cdr/xcdroast/ChangeLog
@@ -4,6 +4,10 @@
 
 *xcdroast-0.98_alpha15-r1 (02 Nov 2003)
 
+  02 Nov 2003; Luca Barbato <lu_zero@gentoo.org> 
+  files/xcdroast-0.98alpha15-dvd.patch :
+  Added the patch to let xcdroast use cdrtools + dvdr patches for dvd burning.
+
   02 Nov 2003; Lars Weiler <pylon@gentoo.org> xcdroast-0.98_alpha15-r1.ebuild:
   DVD-support uses cdrecord-ProDVD. This is closed-source software, but it works
   and free for use for educational, research and private purposes. A key has to
diff --git a/app-cdr/xcdroast/Manifest b/app-cdr/xcdroast/Manifest
index 2e08e5a60ce7..90f43b9aa380 100644
--- a/app-cdr/xcdroast/Manifest
+++ b/app-cdr/xcdroast/Manifest
@@ -1,13 +1,14 @@
-MD5 44dc0dbf33c4a83847a46479ebd6299d xcdroast-0.98_alpha15-r1.ebuild 2070
+MD5 218b7861ca60c3c92287becf6dcf96ce ChangeLog 5153
+MD5 7079ceeda811e4258b56504baad55770 xcdroast-0.98_alpha14-r2.ebuild 2189
 MD5 a9919266035f49883684f4124186a035 xcdroast-0.98_alpha13.ebuild 1036
+MD5 af9852b249b8e0fab9bd0d55dbea4455 metadata.xml 400
+MD5 255ad362f2823ba3ef4f3395311565f5 xcdroast-0.98_alpha15-r1.ebuild 2065
 MD5 2ad1a3424779d6031188b00aae151567 xcdroast-0.98_alpha15.ebuild 1672
 MD5 70ad5f1d00b2979b61744c11cb01ed20 xcdroast-0.98_alpha14-r1.ebuild 1447
-MD5 7079ceeda811e4258b56504baad55770 xcdroast-0.98_alpha14-r2.ebuild 2189
-MD5 371c9dac515fb451078437bdf8483902 ChangeLog 4982
-MD5 af9852b249b8e0fab9bd0d55dbea4455 metadata.xml 400
-MD5 81d2a239119f3ee928aa0f3fce67529c files/digest-xcdroast-0.98_alpha14-r1 195
 MD5 0120b1d769ff87b3ad382bbde206bc8c files/digest-xcdroast-0.98_alpha14-r2 316
 MD5 567160e14807b00f670b9a47b45c6d39 files/digest-xcdroast-0.98_alpha15-r1 249
+MD5 81d2a239119f3ee928aa0f3fce67529c files/digest-xcdroast-0.98_alpha14-r1 195
+MD5 26768959e3621b77b59f887551742eba files/xcdroast-0.98alpha15-dvd.patch 15532
 MD5 3e686196e9586859da7a2b76780f38b7 files/xcdroast-0.98alpha14-dvd.patch 14315
-MD5 fd211bcdb0aa941e5ae0cea66cbbebfe files/digest-xcdroast-0.98_alpha13 73
 MD5 567160e14807b00f670b9a47b45c6d39 files/digest-xcdroast-0.98_alpha15 249
+MD5 fd211bcdb0aa941e5ae0cea66cbbebfe files/digest-xcdroast-0.98_alpha13 73
diff --git a/app-cdr/xcdroast/files/xcdroast-0.98alpha15-dvd.patch b/app-cdr/xcdroast/files/xcdroast-0.98alpha15-dvd.patch
new file mode 100644
index 000000000000..7208bd624503
--- /dev/null
+++ b/app-cdr/xcdroast/files/xcdroast-0.98alpha15-dvd.patch
@@ -0,0 +1,417 @@
+diff -ruN xcdroast-0.98alpha15.org/src/create.c xcdroast-0.98alpha15/src/create.c
+--- xcdroast-0.98alpha15.org/src/create.c	2003-11-02 21:03:38.000000000 +0100
++++ xcdroast-0.98alpha15/src/create.c	2003-11-02 21:15:25.000000000 +0100
+@@ -523,11 +523,7 @@
+         gtk_widget_show(tbl);
+         vbox = gtk_vbox_new(FALSE,10);
+         gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,1,2,0,1);
+-	if (!curset.isProDVD) {
+-        	f1 = gtk_frame_new(_("CD-Information"));
+-	} else {
+         	f1 = gtk_frame_new(_("CD/DVD-Information"));
+-	}
+         set_font_and_color_frame(f1,BOLDFONT,NULL);
+         gtk_table_attach_defaults(GTK_TABLE(tbl),f1,0,1,0,1);
+         gtk_widget_show(f1);
+@@ -1260,11 +1256,7 @@
+         gtk_widget_show(tbl);
+         vbox = gtk_vbox_new(FALSE,10);
+         gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,0,1,0,1);
+-	if (!curset.isProDVD) {
+-        	f1 = gtk_frame_new(_("CD-Information"));
+-	} else {
+         	f1 = gtk_frame_new(_("CD/DVD-Information"));
+-	}
+         set_font_and_color_frame(f1,BOLDFONT,NULL);
+         gtk_box_pack_start(GTK_BOX(vbox),f1,TRUE,TRUE,0);
+         gtk_widget_show(f1);
+@@ -2979,11 +2971,7 @@
+                 GTK_SIGNAL_FUNC(fixate_clicked), NULL);
+         define_tooltip(b1,_("Just fixate (close) the CD, if for some reason the CD has been written but not fixated."));
+ 
+-	if (!curset.isProDVD) {
+-        	b1 = gtk_button_new_with_label(_("Blank CD-RW"));
+-	} else {
+         	b1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW"));
+-	}
+         gtk_box_pack_start(GTK_BOX(hbox),b1,TRUE,TRUE,10);
+         gtk_widget_show(b1);
+         gtk_signal_connect(GTK_OBJECT(b1), "clicked",
+@@ -3086,7 +3074,6 @@
+                 gtk_widget_show (menu_item);
+                 i++;
+         }
+-        if (curset.isProDVD) {
+                 i = 0;
+                 tmpval = curset.cdrtype;
+                 while (dvdtypes[i] != 0) {
+@@ -3110,7 +3097,6 @@
+                         gtk_widget_show (menu_item);
+                         i++;
+                 }
+-        }
+ 
+         gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
+         gtk_option_menu_set_history(GTK_OPTION_MENU (omenu),menuhistory);
+@@ -5773,12 +5759,7 @@
+ 	/* mark as not defined yet */
+ 	bootable_frame1 = NULL;
+ 	bootable_frame2 = NULL;
+-
+-	if (!curset.isProDVD) {
+-		f1 = gtk_frame_new(_("Options to create a bootable CD"));
+-	} else {
+ 		f1 = gtk_frame_new(_("Options to create a bootable CD/DVD"));
+-	}
+ 	set_font_and_color_frame(f1,BOLDFONT,NULL);
+         gtk_container_set_border_width(GTK_CONTAINER (f1),5);
+ 	gtk_box_pack_start(GTK_BOX(box),f1,TRUE,TRUE,0);
+@@ -5794,11 +5775,7 @@
+ 	gtk_box_pack_start(GTK_BOX(vbox),tbl,FALSE,FALSE,0);
+         gtk_widget_show(tbl);
+ 
+-	if (!curset.isProDVD) {
+-        	l1 = rightjust_gtk_label_new(_("Make CD bootable?"));
+-	} else {
+         	l1 = rightjust_gtk_label_new(_("Make CD/DVD bootable?"));
+-	}
+         gtk_table_attach_defaults(GTK_TABLE(tbl),l1,0,7,0,1);
+         gtk_widget_show(l1);
+ 
+@@ -6792,7 +6769,7 @@
+ 			fill_session_available();
+ 			/* force recalc of session size if dvd */
+ 			/* so he will get the multisession warning */
+-			if (curset.cdrtype >= 1000 && curset.isProDVD == 1 && curset.multisession == 1) {
++			if (curset.cdrtype >= 1000 && curset.multisession == 1) {
+ 				set_sessionsize_unknown();	
+ 			}
+ 			break;
+@@ -7023,7 +7000,6 @@
+                 gtk_widget_show (menu_item);
+                 i++;
+         }
+-        if (curset.isProDVD) {
+                 i = 0;
+                 tmpval = curset.cdrtype;
+                 while (dvdtypes[i] != 0) {
+@@ -7047,7 +7023,6 @@
+                         gtk_widget_show (menu_item);
+                         i++;
+                 }
+-        }
+ 
+         gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
+         gtk_option_menu_set_history(GTK_OPTION_MENU (omenu),menuhistory);
+@@ -7174,11 +7149,7 @@
+         gtk_widget_show(b1);
+         define_tooltip(b1,_("Set additional write options for advanced users."));
+ 	/* blank button */
+-	if (!curset.isProDVD) {
+-        	b1 = gtk_button_new_with_label(_("Blank CD-RW"));
+-	} else {
+         	b1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW"));
+-	}
+         gtk_signal_connect (GTK_OBJECT (b1), "clicked",
+                 GTK_SIGNAL_FUNC(blankcd_clicked), NULL);
+         gtk_table_attach_defaults(GTK_TABLE(tbl),b1,2,12,11,12);
+diff -ruN xcdroast-0.98alpha15.org/src/duplicate.c xcdroast-0.98alpha15/src/duplicate.c
+--- xcdroast-0.98alpha15.org/src/duplicate.c	2003-11-02 21:03:38.000000000 +0100
++++ xcdroast-0.98alpha15/src/duplicate.c	2003-11-02 21:17:21.000000000 +0100
+@@ -1156,11 +1156,7 @@
+ 	gtk_table_set_col_spacings(GTK_TABLE(tbl),10);
+ 	gtk_box_pack_start(GTK_BOX(actionspace),tbl,TRUE,TRUE,10);
+ 	gtk_widget_show(tbl);
+-	if (!curset.isProDVD) {
+-		f1 = gtk_frame_new(_("CD-Information"));
+-	} else {
+ 		f1 = gtk_frame_new(_("CD/DVD-Information"));
+-	}
+ 	set_font_and_color_frame(f1,BOLDFONT,NULL);
+ 	gtk_table_attach_defaults(GTK_TABLE(tbl),f1,0,1,0,1);
+ 	gtk_widget_show(f1);
+@@ -1739,11 +1735,7 @@
+ 	gtk_widget_show(tbl);
+ 	vbox = gtk_vbox_new(FALSE,10);
+ 	gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,0,1,0,1);
+-	if (!curset.isProDVD) {
+-		f1 = gtk_frame_new(_("CD-Information"));
+-	} else {
+ 		f1 = gtk_frame_new(_("CD/DVD-Information"));
+-	}
+ 	set_font_and_color_frame(f1,BOLDFONT,NULL);
+ 	gtk_box_pack_start(GTK_BOX(vbox),f1,TRUE,TRUE,0);
+ 	gtk_widget_show(f1);
+@@ -2241,11 +2233,7 @@
+ 	gtk_widget_show(tbl);
+ 	vbox = gtk_vbox_new(FALSE,10);
+ 	gtk_table_attach_defaults(GTK_TABLE(tbl),vbox,0,1,0,1);
+-	if (!curset.isProDVD) {
+-		f1 = gtk_frame_new(_("CD-Information"));
+-	} else {
+ 		f1 = gtk_frame_new(_("CD/DVD-Information"));
+-	}
+ 	set_font_and_color_frame(f1,BOLDFONT,NULL);
+ 	gtk_box_pack_start(GTK_BOX(vbox),f1,TRUE,TRUE,0);
+ 	gtk_widget_show(f1);
+@@ -3090,11 +3078,7 @@
+ 	gtk_table_set_col_spacings(GTK_TABLE(tbl),10);
+ 	gtk_box_pack_start(GTK_BOX(actionspace),tbl,TRUE,TRUE,10);
+ 	gtk_widget_show(tbl);
+-	if (!curset.isProDVD) {
+-		f1 = gtk_frame_new(_("CD to write"));
+-	} else {
+ 		f1 = gtk_frame_new(_("CD/DVD to write"));
+-	}
+ 	set_font_and_color_frame(f1,BOLDFONT,NULL);
+ 	gtk_table_attach_defaults(GTK_TABLE(tbl),f1,0,1,0,1);
+ 	gtk_widget_show(f1);
+@@ -3107,22 +3091,14 @@
+ 	hbox = gtk_hbox_new(TRUE,10);
+ 	gtk_box_pack_start(GTK_BOX(actionspace),hbox,FALSE,TRUE,5);
+ 	gtk_widget_show(hbox);
+-	if (!curset.isProDVD) {
+-		b1 = gtk_button_new_with_label(_("Write CD"));
+-	} else {
+ 		b1 = gtk_button_new_with_label(_("Write CD/DVD"));
+-	}
+ 	gtk_box_pack_start(GTK_BOX(hbox),b1,TRUE,TRUE,10);
+ 	gtk_widget_show(b1);
+ 	gtk_signal_connect(GTK_OBJECT(b1), "clicked",
+ 		GTK_SIGNAL_FUNC(writetracks_clicked), NULL);
+ 	define_tooltip(b1,_("Writes all tracks specified by the TOC file to a CD."));
+ 
+-	if (!curset.isProDVD) {
+-		b1 = gtk_button_new_with_label(_("Blank CD-RW"));
+-	} else {
+ 		b1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW"));
+-	}
+ 	gtk_box_pack_start(GTK_BOX(hbox),b1,TRUE,TRUE,10);
+ 	gtk_widget_show(b1);
+ 	gtk_signal_connect(GTK_OBJECT(b1), "clicked",
+@@ -3239,7 +3215,6 @@
+ 		gtk_widget_show (menu_item);
+ 		i++;
+ 	}
+-	if (curset.isProDVD) {
+ 		i = 0;
+ 		tmpval = curset.cdrtype;
+ 		while (dvdtypes[i] != 0) {
+@@ -3263,7 +3238,6 @@
+ 			gtk_widget_show (menu_item);
+ 			i++;
+ 		}
+-	}
+ 
+ 	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);
+ 	gtk_option_menu_set_history(GTK_OPTION_MENU (omenu),menuhistory);
+@@ -3984,11 +3958,7 @@
+ 	side_widgets[0] = b1;
+ 	define_tooltip(b1,_("Displays information about the currently inserted CD and tracks stored on the harddrive."));
+ 
+-	if (!curset.isProDVD) {
+-		b1 = gtk_toggle_button_new_with_label(_("Read CD"));
+-	} else {
+ 		b1 = gtk_toggle_button_new_with_label(_("Read CD/DVD"));
+-	}
+ 	gtk_table_attach_defaults(GTK_TABLE(side_t), b1, 0,1,2,3);
+ 	gtk_widget_show(b1);
+ 	side_handlers[1] = gtk_signal_connect (GTK_OBJECT (b1), "clicked",
+@@ -3996,11 +3966,7 @@
+ 	side_widgets[1] = b1;
+ 	define_tooltip(b1,_("Reads all tracks of a CD and copy them to the harddrive."));
+ 
+-	if (!curset.isProDVD) {
+-		b1 = gtk_toggle_button_new_with_label(_("Verify CD"));
+-	} else {
+ 		b1 = gtk_toggle_button_new_with_label(_("Verify CD/DVD"));
+-	}
+ 	gtk_table_attach_defaults(GTK_TABLE(side_t), b1, 0,1,3,4);
+ 	gtk_widget_show(b1);
+ 	side_handlers[2] = gtk_signal_connect (GTK_OBJECT (b1), "clicked",
+@@ -4016,11 +3982,7 @@
+ 	side_widgets[3] = b1;
+ 	define_tooltip(b1,_("Plays audio tracks (.wav files) from the harddrive via soundcard."));
+ 
+-	if (!curset.isProDVD) {
+-		b1 = gtk_toggle_button_new_with_label(_("Write CD"));
+-	} else {
+ 		b1 = gtk_toggle_button_new_with_label(_("Write CD/DVD"));
+-	}
+ 	gtk_table_attach_defaults(GTK_TABLE(side_t), b1, 0,1,5,6);
+ 	gtk_widget_show(b1);
+ 	side_handlers[4] = gtk_signal_connect (GTK_OBJECT (b1), "clicked",
+diff -ruN xcdroast-0.98alpha15.org/src/io.c xcdroast-0.98alpha15/src/io.c
+--- xcdroast-0.98alpha15.org/src/io.c	2003-11-02 21:03:38.000000000 +0100
++++ xcdroast-0.98alpha15/src/io.c	2003-11-02 21:24:51.000000000 +0100
+@@ -327,7 +327,7 @@
+ gint next;
+ 
+ 	/* skip header */
+-	if (strncmp(line,"Cdrecord",8) == 0) {
++	if (strncmp(line,"Cdrecord",8) == 0 || strncmp(line,"Cdrecord",5) == 0) {
+ 		return;
+ 	}
+ 
+@@ -6400,7 +6400,7 @@
+ 	}
+ 
+ 	/* prodvd and beginning to write soon? */
+-	if (curset.isProDVD && curset.cdrtype > 1000) {
++	if (curset.cdrtype > 1000) {
+ 		if (strstr(line,"Last chance to quit")) {
+ 			cdrtimer = gtk_timeout_add(1000, 
+ 					cdrtimer_callback, NULL);
+diff -ruN xcdroast-0.98alpha15.org/src/main.c xcdroast-0.98alpha15/src/main.c
+--- xcdroast-0.98alpha15.org/src/main.c	2003-11-02 21:03:38.000000000 +0100
++++ xcdroast-0.98alpha15/src/main.c	2003-11-02 21:09:11.000000000 +0100
+@@ -226,13 +226,8 @@
+ 	gtk_box_pack_start(GTK_BOX(sidespace), side_t,TRUE,TRUE,0);
+ 
+ 	side_t_btn1 = gtk_button_new_with_label (_("Setup"));
+-	if (!curset.isProDVD) {
+-		side_t_btn2 = gtk_button_new_with_label (_("Duplicate CD"));
+-		side_t_btn3 = gtk_button_new_with_label (_("Create CD"));
+-	} else {
+ 		side_t_btn2 = gtk_button_new_with_label (_("Duplicate CD/DVD"));
+ 		side_t_btn3 = gtk_button_new_with_label (_("Create CD/DVD"));
+-	}
+ 	side_t_btn4 = gtk_button_new_with_label (_("Exit"));
+ 
+ 	gtk_signal_connect (GTK_OBJECT (side_t_btn1), "clicked",
+@@ -581,18 +576,11 @@
+ */
+ 
+         /* warn about non-existing LFS support in dvd mode */
+-        if (curset.isProDVD == 1 && sizeof(off_t) != 8) {
++        if (sizeof(off_t) != 8) {
+                 show_dialog(ICO_WARN, _("Warning: Your system is not able to create files larger\nthan 2 GB. Writing DVDs will therefore not possible."), T_OK, NULL, NULL, 0);
+         }
+ 
+         /* if we are in DVD mode, check if the security-key is set */
+-        if (curset.isProDVD == 1) {
+-                keyenv = getenv("CDR_SECURITY");
+-                if (keyenv == NULL) {
+-			show_dialog(ICO_WARN, _("Warning: You have not entered a cdrecord-ProDVD key in setup.\nPlease see the FAQ on how to obtain your free key.\nYou also have to renew the key every few months because it got an\nexpire date. You will not be able to properly write DVDs without it."), T_OK, NULL, NULL, 0); 
+-                }
+-
+-	}
+ 
+ 	dolog(1,"Starting X-CD-Roast\n");
+ 
+diff -ruN xcdroast-0.98alpha15.org/src/menus.c xcdroast-0.98alpha15/src/menus.c
+--- xcdroast-0.98alpha15.org/src/menus.c	2003-11-02 21:03:38.000000000 +0100
++++ xcdroast-0.98alpha15/src/menus.c	2003-11-02 21:26:42.000000000 +0100
+@@ -2701,11 +2701,7 @@
+ 	gtk_container_set_border_width (GTK_CONTAINER (box1), 5);
+         gtk_container_add(GTK_CONTAINER(dialog),box1);
+ 
+-        if (!curset.isProDVD) {
+-		f1 = gtk_frame_new(_("Blank CD-RW"));
+-        } else {
+ 		f1 = gtk_frame_new(_("Blank CD/DVD+-RW"));
+-        }
+ 	set_font_and_color_frame(f1,BOLDFONT,NULL);
+ 	gtk_box_pack_start(GTK_BOX(box1),f1,TRUE,TRUE,0);
+ 	gtk_widget_show(f1);
+@@ -2811,11 +2807,7 @@
+ 	gtk_box_pack_start(GTK_BOX(box1),box3,FALSE,TRUE,5);
+ 	gtk_widget_show(box3);
+ 
+-        if (!curset.isProDVD) {
+-		button1 = gtk_button_new_with_label(_("Blank CD-RW"));
+-        } else {
+ 		button1 = gtk_button_new_with_label(_("Blank CD/DVD+-RW"));
+-        }
+ 	gtk_box_pack_start(GTK_BOX(box3),button1,TRUE,TRUE,10);
+ 	gtk_widget_show(button1);
+ 	gtk_signal_connect(GTK_OBJECT(button1),"clicked",
+diff -ruN xcdroast-0.98alpha15.org/src/setup.c xcdroast-0.98alpha15/src/setup.c
+--- xcdroast-0.98alpha15.org/src/setup.c	2003-11-02 21:03:38.000000000 +0100
++++ xcdroast-0.98alpha15/src/setup.c	2003-11-02 21:20:44.000000000 +0100
+@@ -305,13 +305,6 @@
+ 	dolog(2, "Confirm setup\n");
+ 
+ 	/* some lasts checks and warnings */
+-	if (is_dvdwriter(setupdata.writer_devnr) && !curset.isProDVD) {
+-		ret = show_dialog(ICO_WARN, _("Please note that you have to install ProDVD support before\nyou can write DVDs. Currently you will only be able to\nwrite regular CDs with your DVD-Writer."), T_OK,T_CANCEL, NULL, 0);
+-		if (ret == 1) {
+-			/* abort */
+-			return;
+-		}
+-	}
+ 
+ 	/* get the writer device string */
+ 	if (convert_devnr2busid(setupdata.writer_devnr, tmp) == 0) {
+@@ -1137,11 +1130,7 @@
+ 	gtk_box_pack_start(GTK_BOX(vbox2),tbl,FALSE,TRUE,0);
+ 	gtk_widget_show(tbl);
+ 
+-	if (!curset.isProDVD) {
+-		l1 = rightjust_gtk_label_new(_("CD Writer Device:"));
+-	} else {
+ 		l1 = rightjust_gtk_label_new(_("CD/DVD Writer Device:"));
+-	}
+ 	gtk_table_attach_defaults(GTK_TABLE(tbl),l1,0,15,0,1);
+ 	gtk_widget_show(l1);
+ 	
+@@ -2774,11 +2763,6 @@
+ 	gtk_text_set_point(GTK_TEXT(txt),0);
+ 	gtk_text_thaw(GTK_TEXT(txt));
+ 
+-	if (curset.isProDVD == 0) {
+-		gtk_widget_set_sensitive(f1, FALSE);
+-		gtk_widget_set_sensitive(l1, FALSE);
+-		gtk_widget_set_sensitive(txt, FALSE);
+-	}
+ }
+ 
+ 
+@@ -3183,11 +3167,7 @@
+ 	gtk_container_add (GTK_CONTAINER (f1), tbl);
+ 	gtk_widget_show(tbl);
+ 
+-	if (!curset.isProDVD) {
+-		check = gtk_check_button_new_with_label(_("change CD Writer Device"));
+-	} else {
+ 		check = gtk_check_button_new_with_label(_("change CD/DVD Writer Device"));
+-	}
+ 	gtk_signal_connect(GTK_OBJECT(check),"clicked",
+ 		GTK_SIGNAL_FUNC(root_options_selected),GINT_TO_POINTER(0));
+ 	gtk_table_attach_defaults(GTK_TABLE(tbl),check,1,9,0,1);
+@@ -3205,11 +3185,7 @@
+ 	gtk_widget_show(check);
+ 	define_tooltip(check, _("If enabled, then the user is allowed the change the write parameters for the CD Writer (e.g. Speed and FIFO-Buffer-Size)."));
+ 
+-	if (!curset.isProDVD) {
+-		check = gtk_check_button_new_with_label(_("change CD Reader Device"));
+-	} else {
+ 		check = gtk_check_button_new_with_label(_("change CD/DVD Reader Device"));
+-	}
+ 	gtk_signal_connect(GTK_OBJECT(check),"clicked",
+ 		GTK_SIGNAL_FUNC(root_options_selected),GINT_TO_POINTER(2));
+ 	gtk_table_attach_defaults(GTK_TABLE(tbl),check,1,9,1,2);
+@@ -3372,11 +3348,7 @@
+ 	gtk_notebook_append_page(GTK_NOTEBOOK (notebook),f1,l1);
+ 	draw_scsi_scan(f1);
+ 
+-	if (!curset.isProDVD) {
+-		l2 = gtk_label_new(_("CD Settings"));
+-	} else {
+ 		l2 = gtk_label_new(_("CD/DVD Settings"));
+-	}
+ 	f2 = gtk_frame_new(NULL);
+ 	gtk_container_set_border_width (GTK_CONTAINER (f2), 10);
+ 	gtk_widget_show_all(f2);
+diff -ruN xcdroast-0.98alpha15.org/src/xtools.c xcdroast-0.98alpha15/src/xtools.c
+--- xcdroast-0.98alpha15.org/src/xtools.c	2003-11-02 21:03:38.000000000 +0100
++++ xcdroast-0.98alpha15/src/xtools.c	2003-11-02 21:28:46.000000000 +0100
+@@ -3540,7 +3540,7 @@
+ 	isdvd = 0;
+ 	i = get_writerreaderdevs_index(devnr);
+ 
+-	if (i >= 0 && curset.isProDVD && writerreaderdevs[i]->is_dvdwriter) {
++	if (i >= 0 && writerreaderdevs[i]->is_dvdwriter) {
+ 	        if (convert_devnr2busid(devnr,tmp) != 0) {
+ 	                g_error("non existing cdrom?");
+ 	        }
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r1.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r1.ebuild
index c7d5d22b8e65..741378895da5 100644
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r1.ebuild
+++ b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha15-r1.ebuild,v 1.1 2003/11/02 20:15:26 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha15-r1.ebuild,v 1.2 2003/11/02 22:02:30 lu_zero Exp $
 
 inherit eutils
 
@@ -37,24 +37,24 @@ src_compile() {
 	local myconf
 	use nls || myconf="${myconf} --disable-nls"
 	use gtk2 && myconf="${myconf} --enable-gtk2"
-	
-	econf ${myconf} || die 
-	make PREFIX=/usr || die 
+
+	econf ${myconf} || die
+	make PREFIX=/usr || die
 }
 
 src_install() {
 	make PREFIX=/usr DESTDIR=${D} install || die
-	
+
 	cd doc
 	dodoc DOCUMENTATION FAQ README* TRANSLATION.HOWTO
 	cd ..
-	
+
 	# move man pages to /usr/share/man to be LFH compliant
 	mv ${D}/usr/man ${D}/usr/share
-	
+
 	#remove extraneous directory
 	rm ${D}/usr/etc -rf
-	
+
 	#install cdrecord.prodvd
 	if use dvdr; then
 		into /usr/lib/xcdroast-0.98