some more patches

9 files changed, 489 insertions, 96 deletions

diff --git a/app-cdr/xcdroast/Manifest b/app-cdr/xcdroast/Manifest
index 87417a8305ff..8bd5db15d892 100644
--- a/app-cdr/xcdroast/Manifest
+++ b/app-cdr/xcdroast/Manifest
@@ -1,6 +1,6 @@
 MD5 a9919266035f49883684f4124186a035 xcdroast-0.98_alpha13.ebuild 1036
 MD5 70ad5f1d00b2979b61744c11cb01ed20 xcdroast-0.98_alpha14-r1.ebuild 1447
-MD5 6e4ad74258a188786c4df28a1a8707cd xcdroast-0.98_alpha14-r2.ebuild 1900
+MD5 c62e3fc06a857f65445222f9eb6f30e8 xcdroast-0.98_alpha14-r2.ebuild 1899
 MD5 97be980cca4d959ef6031ef5fc4ea00f ChangeLog 3561
 MD5 af9852b249b8e0fab9bd0d55dbea4455 metadata.xml 400
 MD5 81d2a239119f3ee928aa0f3fce67529c files/digest-xcdroast-0.98_alpha14-r1 195
diff --git a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha10-r3 b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha10-r3
deleted file mode 100644
index 82d6570be400..000000000000
--- a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha10-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6f9ffd30c7ba8f067c2f1bddcc83d7d8 xcdroast-0.98alpha10.tar.gz 749736
diff --git a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha14 b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha14
deleted file mode 100644
index 669e0ca24fe3..000000000000
--- a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c5f3f1ab6ff6d286bd984def54ef0c54 xcdroast-0.98alpha14.tar.gz 2870727
diff --git a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha14-r2 b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha14-r2
new file mode 100644
index 000000000000..4de2425076c7
--- /dev/null
+++ b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha14-r2
@@ -0,0 +1,5 @@
+MD5 c5f3f1ab6ff6d286bd984def54ef0c54 xcdroast-0.98alpha14.tar.gz 2870727
+MD5 eee8611102934f4aeebf2ecaec38cc40 error_write_tracks.patch 315
+MD5 394581545b46ffebb2ef5286ec5586e3 cdrtools201a17.patch 391
+MD5 bd246be214244db822444d7b07e2c21b dvd_atip.patch 634
+MD5 8d9d3d1976de75083a207041fefdd8cb debian_scan.patch 732
diff --git a/app-cdr/xcdroast/files/xcdroast-0.98alpha14-dvd.patch b/app-cdr/xcdroast/files/xcdroast-0.98alpha14-dvd.patch
new file mode 100644
index 000000000000..3fc09dd25bf6
--- /dev/null
+++ b/app-cdr/xcdroast/files/xcdroast-0.98alpha14-dvd.patch
@@ -0,0 +1,398 @@
+--- xcdroast-0.98alpha14/src/main.c.dvd	2003-05-25 22:27:11.000000000 +0200
++++ xcdroast-0.98alpha14/src/main.c	2003-06-17 11:52:28.000000000 +0200
+@@ -220,13 +220,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",
+@@ -540,7 +535,7 @@
+ */
+ 
+         /* 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);
+         }
+ 
+--- xcdroast-0.98alpha14/src/xtools.c.dvd	2003-05-26 20:19:11.000000000 +0200
++++ xcdroast-0.98alpha14/src/xtools.c	2003-06-17 11:52:28.000000000 +0200
+@@ -3415,7 +3415,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?");
+ 	        }
+--- xcdroast-0.98alpha14/src/setup.c.dvd	2003-05-27 21:39:27.000000000 +0200
++++ xcdroast-0.98alpha14/src/setup.c	2003-06-17 12:57:32.000000000 +0200
+@@ -295,13 +295,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) {
+@@ -1127,11 +1120,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);
+ 	
+@@ -2740,11 +2729,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);
+-	}
+ }
+ 
+ 
+@@ -3146,11 +3130,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);
+@@ -3168,11 +3148,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);
+@@ -3334,11 +3310,7 @@
+ 	gtk_widget_show(f1);
+ 	draw_scsi_scan(f1);
+ 
+-	if (!curset.isProDVD) {
+-		l1 = gtk_label_new(_("CD Settings"));
+-	} else {
+ 		l1 = gtk_label_new(_("CD/DVD Settings"));
+-	}
+ 	f1 = gtk_frame_new(NULL);
+ 	gtk_container_set_border_width (GTK_CONTAINER (f1), 10);
+ 	gtk_notebook_append_page(GTK_NOTEBOOK (notebook),f1,l1);
+--- xcdroast-0.98alpha14/src/menus.c.dvd	2003-05-29 20:47:25.000000000 +0200
++++ xcdroast-0.98alpha14/src/menus.c	2003-06-17 11:52:28.000000000 +0200
+@@ -2603,11 +2603,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(f1,BOLDFONT,NULL);
+ 	gtk_box_pack_start(GTK_BOX(box1),f1,TRUE,TRUE,0);
+ 	gtk_widget_show(f1);
+@@ -2713,11 +2709,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",
+--- xcdroast-0.98alpha14/src/duplicate.c.dvd	2003-05-29 14:12:33.000000000 +0200
++++ xcdroast-0.98alpha14/src/duplicate.c	2003-06-17 11:52:28.000000000 +0200
+@@ -1149,11 +1149,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(f1,BOLDFONT,NULL);
+ 	gtk_table_attach_defaults(GTK_TABLE(tbl),f1,0,1,0,1);
+ 	gtk_widget_show(f1);
+@@ -1710,11 +1706,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(f1,BOLDFONT,NULL);
+ 	gtk_box_pack_start(GTK_BOX(vbox),f1,TRUE,TRUE,0);
+ 	gtk_widget_show(f1);
+@@ -2212,11 +2204,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(f1,BOLDFONT,NULL);
+ 	gtk_box_pack_start(GTK_BOX(vbox),f1,TRUE,TRUE,0);
+ 	gtk_widget_show(f1);
+@@ -3057,11 +3045,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(f1,BOLDFONT,NULL);
+ 	gtk_table_attach_defaults(GTK_TABLE(tbl),f1,0,1,0,1);
+ 	gtk_widget_show(f1);
+@@ -3074,22 +3058,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",
+@@ -3206,7 +3182,6 @@
+ 		gtk_widget_show (menu_item);
+ 		i++;
+ 	}
+-	if (curset.isProDVD) {
+ 		i = 0;
+ 		tmpval = curset.cdrtype;
+ 		while (dvdtypes[i] != 0) {
+@@ -3230,7 +3205,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);
+@@ -3947,11 +3921,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",
+@@ -3959,11 +3929,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",
+@@ -3979,11 +3945,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",
+--- xcdroast-0.98alpha14/src/create.c.dvd	2003-05-29 14:12:15.000000000 +0200
++++ xcdroast-0.98alpha14/src/create.c	2003-06-17 11:52:28.000000000 +0200
+@@ -508,11 +508,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(f1,BOLDFONT,NULL);
+         gtk_table_attach_defaults(GTK_TABLE(tbl),f1,0,1,0,1);
+         gtk_widget_show(f1);
+@@ -1245,11 +1241,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(f1,BOLDFONT,NULL);
+         gtk_box_pack_start(GTK_BOX(vbox),f1,TRUE,TRUE,0);
+         gtk_widget_show(f1);
+@@ -2723,11 +2715,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",
+@@ -2830,7 +2818,6 @@
+                 gtk_widget_show (menu_item);
+                 i++;
+         }
+-        if (curset.isProDVD) {
+                 i = 0;
+                 tmpval = curset.cdrtype;
+                 while (dvdtypes[i] != 0) {
+@@ -2854,7 +2841,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);
+@@ -5722,11 +5708,7 @@
+ 	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(f1,BOLDFONT,NULL);
+         gtk_container_set_border_width(GTK_CONTAINER (f1),5);
+ 	gtk_box_pack_start(GTK_BOX(box),f1,TRUE,TRUE,0);
+@@ -5742,11 +5724,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);
+ 
+@@ -6731,7 +6709,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;
+@@ -6962,7 +6940,6 @@
+                 gtk_widget_show (menu_item);
+                 i++;
+         }
+-        if (curset.isProDVD) {
+                 i = 0;
+                 tmpval = curset.cdrtype;
+                 while (dvdtypes[i] != 0) {
+@@ -6986,7 +6963,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);
+@@ -7113,11 +7089,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);
+--- xcdroast-0.98alpha14/src/io.c.dvd	2003-05-29 15:14:42.000000000 +0200
++++ xcdroast-0.98alpha14/src/io.c	2003-06-17 11:52:28.000000000 +0200
+@@ -326,7 +326,7 @@
+ gint next;
+ 
+ 	/* skip header */
+-	if (strncmp(line,"Cdrecord",8) == 0) {
++	if (strncmp(line,"Cdrecord",8) == 0 || strncmp(line,"Cdrecord",5) == 0) {
+ 		return;
+ 	}
+ 
+@@ -6326,7 +6326,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 --git a/app-cdr/xcdroast/metadata.xml b/app-cdr/xcdroast/metadata.xml
new file mode 100644
index 000000000000..7b72174d780b
--- /dev/null
+++ b/app-cdr/xcdroast/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+	<email>pylon@gentoo.org</email>
+	<name>Lars Weiler</name>
+	<description>Testing on x86 and ppc (only CD-RW, no DVD!)</description>
+</maintainer>
+<longdescription>Menu based front-end to mkisofs and cdrecord</longdescription>
+</pkgmetadata>
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha10-r3.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha10-r3.ebuild
deleted file mode 100644
index e7ad19295d16..000000000000
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha10-r3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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_alpha10-r3.ebuild,v 1.2 2003/08/05 15:05:15 vapier Exp $
-
-MY_P="${P/_/}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Menu based front-end to mkisofs and cdrecord"
-HOMEPAGE="http://www.xcdroast.org/"
-SRC_URI="http://www.xcdroast.org/download/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-
-# WARNING: cdrtools and mkisofs versions hard coded, see below
-DEPEND="=x11-libs/gtk+-1.2* 
-	=dev-libs/glib-1.2*
-	>=media-libs/gdk-pixbuf-0.16.0
-	>=media-libs/giflib-3.0
-	~app-cdr/cdrtools-1.11.33"
-RDEPEND="~app-cdr/cdrtools-1.11.33"
-
-src_compile() {
-	# NOTE: This will need to be updated to work with future versions of
-	# xcdroast (hardcoded versions).  The listed dependencies are part 
-	# of the cdrtools package.
-	mv xcdroast.h xcdroast.h.orig
-	sed -e 's|CDRECORD_VERSION "1.10"|CDRECORD_VERSION "1.11a24"|' \
-		-e 's|CDDA2WAV_VERSION "1.10"|CDDA2WAV_VERSION "1.11a24"|' \
-		-e 's|READCD_VERSION "1.10"|READCD_VERSION "1.11a19"|' \
-		-e 's|MKISOFS_VERSION "1.14"|MKISOFS_VERSION "1.15a23"|' \
-		xcdroast.h.orig > xcdroast.h || die
-
-	make PREFIX=/usr CC="gcc ${CFLAGS}" || die
-}
-
-src_install() {
-	make PREFIX=/usr DESTDIR=${D} install || die
-	chown root.wheel ${D}/usr/bin/xcdrgtk
-	dodoc CHANGELOG COPYING DOCUMENTATION FAQ README* TRANSLATION.HOWTO
-
-	# move man pages to /usr/share/man to be LFH compliant
-	mv ${D}/usr/man ${D}/usr/share
-}
-
-pkg_postinst() {
-	einfo "Due to limitations in the xcdroast program, the version of cdrtools"
-	einfo "that it depends on must be hardcoded in the xcdroast program.  This"
-	einfo "means you must have a specific version of cdrtools installed if you"
-	einfo "plan to use xcdroast.  You may need to 'pin' the version of cdrtools"
-	einfo "in use.  (See the portage manual for details)"
-}
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha14-r2.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha14-r2.ebuild
new file mode 100644
index 000000000000..4badc19ad525
--- /dev/null
+++ b/app-cdr/xcdroast/xcdroast-0.98_alpha14-r2.ebuild
@@ -0,0 +1,73 @@
+# 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_alpha14-r2.ebuild,v 1.1 2003/09/04 00:17:33 pylon Exp $
+
+inherit eutils
+
+S=${WORKDIR}/${P/_/}
+DESCRIPTION="Menu based front-end to mkisofs and cdrecord"
+HOMEPAGE="http://www.xcdroast.org/"
+SRC_URI="mirror://sourceforge/xcdroast/${P/_/}.tar.gz
+	http://www.xcdroast.org/xcdr098/patches/error_write_tracks.patch
+	http://www.xcdroast.org/xcdr098/patches/cdrtools201a17.patch
+	http://www.xcdroast.org/xcdr098/patches/dvd_atip.patch
+	http://www.xcdroast.org/xcdr098/patches/debian_scan.patch"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="nls dvd"
+
+DEPEND="=x11-libs/gtk+-1.2*
+	=dev-libs/glib-1.2*
+	>=media-libs/gdk-pixbuf-0.16.0
+	>=media-libs/giflib-3.0
+	>=app-cdr/cdrtools-2.01_alpha17
+	dvd? ( >=app-cdr/cdrtools-dvdr-2.0 )"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${P/_/}.tar.gz
+	cd ${S}/src
+
+	# Patch to fix "Error Writing Tracks" Bug
+	epatch ${DISTDIR}/error_write_tracks.patch
+
+	# This will also fix the startup segfaults on Gentoo systems
+	epatch ${DISTDIR}/debian_scan.patch
+
+	# Patch to fix startup problem with cdrools >=2.01alpha17
+	epatch ${DISTDIR}/cdrtools201a17.patch
+
+	# Patches for DVD writing
+	if use dvd; then
+		# Patch to fix fixes the display of ATIP information of DVD-media.
+		epatch ${DISTDIR}/dvd_atip.patch
+
+		#Patch to enable DVD-Writing
+		epatch ${FILESDIR}/${P/_/}-dvd.patch
+	fi
+}
+
+src_compile() {
+	local myconf
+	use nls || myconf="${myconf} --disable-nls"
+
+	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
+}
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha14.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha14.ebuild
deleted file mode 100644
index a5c95fda583b..000000000000
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha14.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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_alpha14.ebuild,v 1.2 2003/08/05 15:05:15 vapier Exp $
-
-S=${WORKDIR}/${P/_/}
-DESCRIPTION="Menu based front-end to mkisofs and cdrecord"
-HOMEPAGE="http://www.xcdroast.org/"
-SRC_URI="mirror://sourceforge/xcdroast/${P/_/}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="nls"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	=dev-libs/glib-1.2*
-	>=media-libs/gdk-pixbuf-0.16.0
-	>=media-libs/giflib-3.0
-	>=app-cdr/cdrtools-2.0"
-
-src_compile() {
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-
-	econf ${myconf} || die
-	make PREFIX=/usr || die
-}
-
-src_install() {
-	make PREFIX=/usr DESTDIR=${D} install || die
-	#chown root.wheel ${D}/usr/bin/xcdrgtk
-	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
-}