stable on ppc and x86

15 files changed, 69 insertions, 695 deletions

diff --git a/app-cdr/xcdroast/ChangeLog b/app-cdr/xcdroast/ChangeLog
index d437d21fa077..56eec52a3e26 100644
--- a/app-cdr/xcdroast/ChangeLog
+++ b/app-cdr/xcdroast/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for app-cdr/xcdroast
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
 # /space/gentoo/cvsroot/gentoo-x86/app-cdr/xcdroast/ChangeLog,v 1.7 2002/06/05 02:39:55 lostlogic Exp
 
+*xcdroast-0.98_alpha15-r3 (17 Jan 2004)
+
+  17 Jan 2004; Lars Weiler <pylon@gentoo.org> xcdroast-0.98_alpha15-r2.ebuild,
+  xcdroast-0.98_alpha15-r3.ebuild:
+  Made slightly changes in alpha15-r3 as cdrecord-prodvd became a package by
+  it's own. Bumped alpha15-r2 stable for x86 and ppc.
+
   18 Dec 2003; Jason Wever <weeve@gentoo.org> xcdroast-0.98_alpha15-r2.ebuild:
   Added ~sparc keyword.
 
diff --git a/app-cdr/xcdroast/Manifest b/app-cdr/xcdroast/Manifest
index 857d22d48263..0b6835c64b2f 100644
--- a/app-cdr/xcdroast/Manifest
+++ b/app-cdr/xcdroast/Manifest
@@ -1,17 +1,8 @@
-MD5 25c344ddcf9ea714d30c533df16cbca6 ChangeLog 5975
+MD5 5ce891e397b756564633827f7471dac9 ChangeLog 6262
 MD5 af9852b249b8e0fab9bd0d55dbea4455 metadata.xml 400
-MD5 a9919266035f49883684f4124186a035 xcdroast-0.98_alpha13.ebuild 1036
-MD5 70ad5f1d00b2979b61744c11cb01ed20 xcdroast-0.98_alpha14-r1.ebuild 1447
-MD5 7079ceeda811e4258b56504baad55770 xcdroast-0.98_alpha14-r2.ebuild 2189
-MD5 8cae3d09a0ccee6a07aafb5b28071189 xcdroast-0.98_alpha15-r1.ebuild 2051
-MD5 eb906a43db955b972f21d790ca93baf2 xcdroast-0.98_alpha15-r2.ebuild 2899
-MD5 4f62a2557bb9a93a4cf8338a488b5b89 xcdroast-0.98_alpha15.ebuild 1658
-MD5 fd211bcdb0aa941e5ae0cea66cbbebfe files/digest-xcdroast-0.98_alpha13 73
-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 249
-MD5 567160e14807b00f670b9a47b45c6d39 files/digest-xcdroast-0.98_alpha15-r1 249
+MD5 ff605bde8ba3c18987ed6400c198819d xcdroast-0.98_alpha15-r2.ebuild 2915
+MD5 9955a388886287d5b18d460e5b657297 xcdroast-0.98_alpha15-r3.ebuild 2645
 MD5 cea69309a5dc72515300ef5bd2c898f8 files/digest-xcdroast-0.98_alpha15-r2 335
 MD5 ccb3a30dc25ffa6c7d78b64ea8cb7f75 files/gtk2locale.patch 643
-MD5 3e686196e9586859da7a2b76780f38b7 files/xcdroast-0.98alpha14-dvd.patch 14315
 MD5 26768959e3621b77b59f887551742eba files/xcdroast-0.98alpha15-dvd.patch 15532
+MD5 c74d0c61a25d9eefcba4401b5ffdfa0d files/digest-xcdroast-0.98_alpha15-r3 159
diff --git a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha13 b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha13
deleted file mode 100644
index 14608302f361..000000000000
--- a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ba5d006cc8a9d13c223ccc11c2fc088a xcdroast-0.98alpha13.tar.gz 2124714
diff --git a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha14-r1 b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha14-r1
deleted file mode 100644
index 60c84d18d7b3..000000000000
--- a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha14-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c5f3f1ab6ff6d286bd984def54ef0c54 xcdroast-0.98alpha14.tar.gz 2870727
-MD5 eee8611102934f4aeebf2ecaec38cc40 error_write_tracks.patch 315
-MD5 bd246be214244db822444d7b07e2c21b dvd_atip.patch 634
diff --git a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha14-r2 b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha14-r2
deleted file mode 100644
index 4de2425076c7..000000000000
--- a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha14-r2
+++ /dev/null
@@ -1,5 +0,0 @@
-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/digest-xcdroast-0.98_alpha15 b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha15
deleted file mode 100644
index 6bb01d7eb68c..000000000000
--- a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2a9c1d9f2ef58713c453e674b989be3e xcdroast-0.98alpha15.tar.gz 3282794
-MD5 6e9f1d0b8b19c2e67f1f151686ce37f1 cdrecord-prodvd-2.01a12-i586-pc-linux-gnu 375228
-MD5 00ab13ddafcd4737ac5f93928e8d4f5e cdrecord-prodvd-2.0-powerpc-unknown-linux-gnu 381964
diff --git a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha15-r1 b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha15-r1
deleted file mode 100644
index 6bb01d7eb68c..000000000000
--- a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha15-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2a9c1d9f2ef58713c453e674b989be3e xcdroast-0.98alpha15.tar.gz 3282794
-MD5 6e9f1d0b8b19c2e67f1f151686ce37f1 cdrecord-prodvd-2.01a12-i586-pc-linux-gnu 375228
-MD5 00ab13ddafcd4737ac5f93928e8d4f5e cdrecord-prodvd-2.0-powerpc-unknown-linux-gnu 381964
diff --git a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha15-r3 b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha15-r3
new file mode 100644
index 000000000000..6c1cf6bdc1a9
--- /dev/null
+++ b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha15-r3
@@ -0,0 +1,2 @@
+MD5 2a9c1d9f2ef58713c453e674b989be3e xcdroast-0.98alpha15.tar.gz 3282794
+MD5 8ad7858aa96d29466b74b093ee82149b xcdroast-0.98_alpha15_new_configure.tar.gz 82301
diff --git a/app-cdr/xcdroast/files/xcdroast-0.98alpha14-dvd.patch b/app-cdr/xcdroast/files/xcdroast-0.98alpha14-dvd.patch
deleted file mode 100644
index 3fc09dd25bf6..000000000000
--- a/app-cdr/xcdroast/files/xcdroast-0.98alpha14-dvd.patch
+++ /dev/null
@@ -1,398 +0,0 @@
---- 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/xcdroast-0.98_alpha13.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha13.ebuild
deleted file mode 100644
index cfde458b674b..000000000000
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha13.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_alpha13.ebuild,v 1.7 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
-}
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha14-r1.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha14-r1.ebuild
deleted file mode 100644
index 665a449276e4..000000000000
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha14-r1.ebuild
+++ /dev/null
@@ -1,59 +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-r1.ebuild,v 1.2 2003/08/05 15:05:15 vapier 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/dvd_atip.patch"
-
-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"
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${P/_/}.tar.gz
-
-	cd ${S}/src
-
-	# Patch to fix "Error Writing Tracks" Bug
-	epatch ${DISTDIR}/error_write_tracks.patch
-
-	# Patch to fix fixes the display of ATIP information of DVD-media.
-	epatch ${DISTDIR}/dvd_atip.patch
-}
-
-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
-}
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha14-r2.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha14-r2.ebuild
deleted file mode 100644
index e49dae88376a..000000000000
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha14-r2.ebuild
+++ /dev/null
@@ -1,81 +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-r2.ebuild,v 1.4 2003/10/31 05:37:51 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/a14/error_write_tracks.patch
-	http://www.xcdroast.org/xcdr098/patches/a14/cdrtools201a17.patch
-	http://www.xcdroast.org/xcdr098/patches/a14/dvd_atip.patch
-	http://www.xcdroast.org/xcdr098/patches/a14/debian_scan.patch"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ppc"
-IUSE="nls dvd dvdr"
-
-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"
-
-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
-
-	# Patch to fix fixes the display of ATIP information of DVD-media.
-	use dvd && epatch ${DISTDIR}/dvd_atip.patch
-
-	#Patch to enable DVD-writing
-	use dvdr && epatch ${FILESDIR}/${P/_/}-dvd.patch
-}
-
-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
-}
-
-pkg_postinst() {
-	if use dvdr; then
-		echo
-		einfo "You are now using X-CD-Roast with the cdrtools patches for several"
-		einfo "DVD writers.  You can also use cdrecord-ProDVD, which has to be"
-		einfo "installed manually."
-		einfo "See http://www.xcdroast.org/xcdr098/README.ProDVD.txt for further"
-		einfo "instructions."
-		echo
-	fi
-}
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r2.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r2.ebuild
index 7553d84ab3b8..898cab3188b2 100644
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r2.ebuild
+++ b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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-r2.ebuild,v 1.4 2003/12/19 02:49:30 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha15-r2.ebuild,v 1.5 2004/01/17 22:28:45 pylon Exp $
 
 inherit eutils
 
@@ -14,14 +14,14 @@ SRC_URI="mirror://sourceforge/xcdroast/${P/_/}.tar.gz
 RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc"
+KEYWORDS="x86 ppc ~sparc ~amd64"
 IUSE="nls dvdr gtk2 gnome"
 
 DEPEND="
 	gtk2? ( >=x11-libs/gtk+-2.0.3 )
 	!gtk2? ( =x11-libs/gtk+-1.2.10* )
+	!gtk2? ( >=media-libs/gdk-pixbuf-0.16.0 )
 	=dev-libs/glib-1.2*
-	>=media-libs/gdk-pixbuf-0.16.0
 	>=media-libs/giflib-3.0
 	>=app-cdr/cdrtools-2.01_alpha17"
 
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r1.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild
index 70adb0423c13..b640d2fed03f 100644
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r1.ebuild
+++ b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.3 2003/11/21 23:38:35 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild,v 1.1 2004/01/17 22:28:45 pylon Exp $
 
 inherit eutils
 
@@ -8,27 +8,33 @@ 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
-	dvdr? ( ftp://ftp.berlios.de/pub/cdrecord/ProDVD/cdrecord-prodvd-2.01a12-i586-pc-linux-gnu )
-	dvdr? ( ftp://ftp.berlios.de/pub/cdrecord/ProDVD/cdrecord-prodvd-2.0-powerpc-unknown-linux-gnu )"
+	mirror://gentoo/${P}_new_configure.tar.gz"
 RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="nls dvdr gtk2"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+IUSE="nls dvdr gtk2 gnome"
 
-DEPEND="gtk2? ( >=x11-libs/gtk+-2.0.3 )
+DEPEND="
+	gtk2? ( >=x11-libs/gtk+-2.0.3 )
 	!gtk2? ( =x11-libs/gtk+-1.2.10* )
+	!gtk2? ( >=media-libs/gdk-pixbuf-0.16.0 )
 	=dev-libs/glib-1.2*
-	>=media-libs/gdk-pixbuf-0.16.0
-	>=media-libs/giflib-3.0
-	dev-libs/libpcre
-	>=app-cdr/cdrtools-2.01_alpha17"
+	>=media-libs/giflib-3.0"
 
-RDEPEND="${DEPEND}"
+RDEPEND="
+	dvdr? (
+		x86? ( >=app-cdr/cdrecord-prodvd-2.01_alpha24 )
+	)
+	>=app-cdr/cdrtools-2.01_alpha17"
 
 src_unpack() {
 	unpack ${P/_/}.tar.gz
+	cd ${S}
+	unpack ${P}_new_configure.tar.gz
+
 	cd ${S}/src
+	use gtk2 && epatch ${FILESDIR}/gtk2locale.patch
 }
 
 src_compile() {
@@ -56,8 +62,38 @@ src_install() {
 	#install cdrecord.prodvd
 	if use dvdr; then
 		into /usr/lib/xcdroast-0.98
-		use x86 && newbin ${DISTDIR}/cdrecord-prodvd-2.01a12-i586-pc-linux-gnu cdrecord.prodvd
-		use ppc && newbin ${DISTDIR}/cdrecord-prodvd-2.0-powerpc-unknown-linux-gnu cdrecord.prodvd
+		dosym /usr/bin/cdrecord.prodvd cdrecord.prodvd
+	fi
+
+	if use gnome; then
+		#create a symlink to the pixmap directory
+		dodir /usr/share/pixmaps
+		dosym /usr/lib/xcdroast-0.98/icons/xcdricon.png /usr/share/pixmaps/xcdricon.png
+		#add a menu entry to the gnome menu
+		cat <<EOF >xcdroast.desktop
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Exec=/usr/bin/xcdroast
+Icon=/usr/share/pixmaps/xcdricon.png
+StartupNotify=true
+Terminal=false
+Type=Application
+Categories=GNOME;Application;AudioVideo;
+TryExec=
+X-GNOME-DocPath=
+Name[de]=X-CD-Roast
+GenericName[de]=
+Comment[de]=CDs brennen
+Name[sv]=Cd-grill
+GenericName[sv]=
+Comment[sv]=Rosta en CD
+Name[fr]=Grilleur CD
+GenericName[fr]=
+Comment[fr]=Grillez des CDs
+EOF
+		insinto /usr/share/applications
+		doins xcdroast.desktop
 	fi
 }
 
@@ -67,7 +103,7 @@ pkg_postinst() {
 		einfo "cdrecord-ProDVD has been installed with this package.  It will be used only"
 		einfo "for images larger than 1GB."
 		einfo "You have to type in the license key that is available free for personal use."
-		einfo "See ftp://ftp.berlios.de/pub/cdrecord/ProDVD/README for furhter information."
+		einfo "See ftp://ftp.berlios.de/pub/cdrecord/ProDVD/README for further information."
 		echo
 	fi
 }
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha15.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha15.ebuild
deleted file mode 100644
index f1e48c627445..000000000000
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha15.ebuild
+++ /dev/null
@@ -1,68 +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_alpha15.ebuild,v 1.3 2003/11/21 23:38:35 spider 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"
-RESTRICT="nomirror"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~ppc"
-IUSE="nls dvdr gtk2"
-
-DEPEND="gtk2? ( >=x11-libs/gtk+-2.0.3 )
-	!gtk2? ( =x11-libs/gtk+-1.2.10* )
-	=dev-libs/glib-1.2*
-	>=media-libs/gdk-pixbuf-0.16.0
-	>=media-libs/giflib-3.0
-	dev-libs/libpcre
-	>=app-cdr/cdrtools-2.01_alpha17"
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${P/_/}.tar.gz
-	cd ${S}/src
-
-	#Patch to enable DVD-writing
-	use dvdr && epatch ${FILESDIR}/${P/_/}-dvd.patch
-}
-
-src_compile() {
-	local myconf
-	use nls || myconf="${myconf} --disable-nls"
-	use gtk2 && myconf="${myconf} --enable-gtk2"
-
-	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
-}
-
-pkg_postinst() {
-	if use dvdr; then
-		echo
-		einfo "You are now using X-CD-Roast with the cdrtools patches for several"
-		einfo "DVD writers.  You can also use cdrecord-ProDVD, which has to be"
-		einfo "installed manually."
-		einfo "See http://www.xcdroast.org/xcdr098/README.ProDVD.txt for further"
-		einfo "instructions."
-		echo
-	fi
-}