Added some patches (from upstream and from Debian) so that xcdroast works

with current cdrkit and cdrtools.
Package-Manager: portage-2.1.2_rc1-r5

8 files changed, 219 insertions, 11 deletions

diff --git a/app-cdr/xcdroast/ChangeLog b/app-cdr/xcdroast/ChangeLog
index e636cb4e90c2..c8d355b91131 100644
--- a/app-cdr/xcdroast/ChangeLog
+++ b/app-cdr/xcdroast/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-cdr/xcdroast
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/ChangeLog,v 1.48 2006/10/28 14:56:25 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/ChangeLog,v 1.49 2006/11/11 04:51:57 pylon Exp $
+
+*xcdroast-0.98_alpha15-r4 (11 Nov 2006)
+
+  11 Nov 2006; Lars Weiler <pylon@gentoo.org> +files/cdrecord2wodim.patch,
+  +files/cdrecord_versions.patch, +files/modern_cdrtools.patch,
+  xcdroast-0.98_alpha15-r3.ebuild, +xcdroast-0.98_alpha15-r4.ebuild:
+  Added some patches (from upstream and from Debian) so that xcdroast works
+  with current cdrkit and cdrtools.
 
   28 Oct 2006; Lars Weiler <pylon@gentoo.org>
   xcdroast-0.98_alpha15-r3.ebuild:
diff --git a/app-cdr/xcdroast/Manifest b/app-cdr/xcdroast/Manifest
index 23585872e371..ba9a6844dffc 100644
--- a/app-cdr/xcdroast/Manifest
+++ b/app-cdr/xcdroast/Manifest
@@ -2,24 +2,40 @@ AUX 64bit_gsize.patch 471 RMD160 629cc85cf526801a077cc73ff6b597799418869c SHA1 f
 MD5 121eabf95d22bf4f85b5c0426bf133a5 files/64bit_gsize.patch 471
 RMD160 629cc85cf526801a077cc73ff6b597799418869c files/64bit_gsize.patch 471
 SHA256 71a46d1afb8ed22c1a5d49c4ad655bc273136cfad3d67624ea940a860d610e6e files/64bit_gsize.patch 471
+AUX cdrecord2wodim.patch 2605 RMD160 38e884194da8d7982d75b660174827cf0305cdfb SHA1 acb6af7ba467d03ce9f452fed30358f374b63f7a SHA256 c7a52d06e49a5da67f26792a908a7c44a3c2f8055e20ef5a62a1f9e20d4912f6
+MD5 835e5010b4489870131883e98eac138d files/cdrecord2wodim.patch 2605
+RMD160 38e884194da8d7982d75b660174827cf0305cdfb files/cdrecord2wodim.patch 2605
+SHA256 c7a52d06e49a5da67f26792a908a7c44a3c2f8055e20ef5a62a1f9e20d4912f6 files/cdrecord2wodim.patch 2605
+AUX cdrecord_versions.patch 618 RMD160 80bdd9c72a14e15a9b03c7da816ead3bcebde03a SHA1 e9bc050764c6163407047518eb16e411c74bd42c SHA256 932e60ade91c9e8894ac25703b825632e9b194090ba1b27374df5eb7f3a1b435
+MD5 2b03f1e7e4200d6e5a8faf0f760c706c files/cdrecord_versions.patch 618
+RMD160 80bdd9c72a14e15a9b03c7da816ead3bcebde03a files/cdrecord_versions.patch 618
+SHA256 932e60ade91c9e8894ac25703b825632e9b194090ba1b27374df5eb7f3a1b435 files/cdrecord_versions.patch 618
 AUX gtk2locale.patch 643 RMD160 65ae2d7db3862056622bc0120fe2d607dd991875 SHA1 bb3d2f2c7edede86af6c367c8b5b09339251250c SHA256 30f4daa092c9321f4d43d26541b7a4403e20104abdc766d00735f5972b443854
 MD5 ccb3a30dc25ffa6c7d78b64ea8cb7f75 files/gtk2locale.patch 643
 RMD160 65ae2d7db3862056622bc0120fe2d607dd991875 files/gtk2locale.patch 643
 SHA256 30f4daa092c9321f4d43d26541b7a4403e20104abdc766d00735f5972b443854 files/gtk2locale.patch 643
+AUX modern_cdrtools.patch 584 RMD160 703caf45884424fcc5ddf153236cf54260ebc5c7 SHA1 548cf9dcbe11c045cd2edab1f6c28aad4f5a18aa SHA256 ae915e39df9060e0e24e4188088b12c31970730b1b75f84fe9a09756eb3e68c6
+MD5 c6d79250927ac4722f2c36d992ba80e9 files/modern_cdrtools.patch 584
+RMD160 703caf45884424fcc5ddf153236cf54260ebc5c7 files/modern_cdrtools.patch 584
+SHA256 ae915e39df9060e0e24e4188088b12c31970730b1b75f84fe9a09756eb3e68c6 files/modern_cdrtools.patch 584
 AUX xcdroast-0.98alpha15-dvd.patch 15532 RMD160 0a871e0f4a52477a05347c5c7184b157e4c7a8ab SHA1 c6fc10ac94fa8b9826580a4fcf4e9d5466ea41c1 SHA256 0bfe89f5a18a990b5a20fec1ee1cb3129c8268000a5b039cff47fabeb2a953ab
 MD5 26768959e3621b77b59f887551742eba files/xcdroast-0.98alpha15-dvd.patch 15532
 RMD160 0a871e0f4a52477a05347c5c7184b157e4c7a8ab files/xcdroast-0.98alpha15-dvd.patch 15532
 SHA256 0bfe89f5a18a990b5a20fec1ee1cb3129c8268000a5b039cff47fabeb2a953ab files/xcdroast-0.98alpha15-dvd.patch 15532
 DIST xcdroast-0.98_alpha15_new_configure.tar.gz 82301 RMD160 125c5a48462bac3515c93f7e9f6e428cb901d80c SHA1 be4533b3c81c2cf0bf5ac6c9943c3b57ec559927 SHA256 0e33617f9315482dd95e1228e27461e45bea4516abaebfb5b6449aedaec9de90
 DIST xcdroast-0.98alpha15.tar.gz 3282794 RMD160 9198f67659023ce8f508fa2c331df9d9c8b81a8f SHA1 f354ea9ffe918c4ec11312d5537e6e245730fecc SHA256 40be77142b23fa62265a23e473bd3af43df6ab01332ea991a5ef3069530b28d8
-EBUILD xcdroast-0.98_alpha15-r3.ebuild 2008 RMD160 1d100393ac56207808a7d2c1595a04309fd2dabb SHA1 051b608a36a7022a98e9c4f4c6de0dc302fbb3bb SHA256 b7261ba720b35277490cf8b2f730e10d5f33ea9ab38d6e65fea7200f2e4047b5
-MD5 b8831d8ed4df56c63482ab57be3c6292 xcdroast-0.98_alpha15-r3.ebuild 2008
-RMD160 1d100393ac56207808a7d2c1595a04309fd2dabb xcdroast-0.98_alpha15-r3.ebuild 2008
-SHA256 b7261ba720b35277490cf8b2f730e10d5f33ea9ab38d6e65fea7200f2e4047b5 xcdroast-0.98_alpha15-r3.ebuild 2008
-MISC ChangeLog 8235 RMD160 30425d4dd19073a7b207413571de01a3fd5aaf8d SHA1 47018a6a0cc0040e343b87c549d30e906468f193 SHA256 e9c0ffbfad8cf9906adf6c51287c1f33159af9b28a0b839dec8fb9c0163fd316
-MD5 3b6c8bd83f76cd4f06f83a495386aa9c ChangeLog 8235
-RMD160 30425d4dd19073a7b207413571de01a3fd5aaf8d ChangeLog 8235
-SHA256 e9c0ffbfad8cf9906adf6c51287c1f33159af9b28a0b839dec8fb9c0163fd316 ChangeLog 8235
+EBUILD xcdroast-0.98_alpha15-r3.ebuild 2013 RMD160 fe2bbaf1ea8f8ec8b1183a8e49d03ccdc81b9f50 SHA1 0eaff12840f9a22c4b9f735bd4f3d34839484075 SHA256 76c8b370b2dd3ec546611273fbd98a415a9a01857a17a4daa51fb2357ae4a5fb
+MD5 17aa5914d0043f259134be84ebbdd0a6 xcdroast-0.98_alpha15-r3.ebuild 2013
+RMD160 fe2bbaf1ea8f8ec8b1183a8e49d03ccdc81b9f50 xcdroast-0.98_alpha15-r3.ebuild 2013
+SHA256 76c8b370b2dd3ec546611273fbd98a415a9a01857a17a4daa51fb2357ae4a5fb xcdroast-0.98_alpha15-r3.ebuild 2013
+EBUILD xcdroast-0.98_alpha15-r4.ebuild 1741 RMD160 1c21f039908417dc0a3f315653d17a9af12fe0e9 SHA1 2af3e53b00e6c888930e7840cae0a72f0e8326b4 SHA256 cd6e3e04acb38e304a92a6aef1f842d5572797c780258967534ec8811f9993d4
+MD5 7bbcfa6450bd7afbab8ec7740c139f65 xcdroast-0.98_alpha15-r4.ebuild 1741
+RMD160 1c21f039908417dc0a3f315653d17a9af12fe0e9 xcdroast-0.98_alpha15-r4.ebuild 1741
+SHA256 cd6e3e04acb38e304a92a6aef1f842d5572797c780258967534ec8811f9993d4 xcdroast-0.98_alpha15-r4.ebuild 1741
+MISC ChangeLog 8597 RMD160 e59f99637e16772effee95488c597b576d3e25cd SHA1 a571824a2675393f9f202312c92cc2881753cc26 SHA256 d8e1e614f45c174f172b624eead4fec757b580ea7874335569d6812101e4dba7
+MD5 a0d7a604af65af7a9cb4daf269d7f53e ChangeLog 8597
+RMD160 e59f99637e16772effee95488c597b576d3e25cd ChangeLog 8597
+SHA256 d8e1e614f45c174f172b624eead4fec757b580ea7874335569d6812101e4dba7 ChangeLog 8597
 MISC metadata.xml 247 RMD160 7a2b92c08eec2dc74474226529601870161ced75 SHA1 30e2f8e33a1a0ccd255272d40b84fadfe13c90d5 SHA256 4e1e94075219a6cc8cde9d7249eeacbb64f0ec101401aa58aec45e5ad901f2ed
 MD5 c7cf0bf2a01fd5bb41778f1941040287 metadata.xml 247
 RMD160 7a2b92c08eec2dc74474226529601870161ced75 metadata.xml 247
@@ -27,3 +43,6 @@ SHA256 4e1e94075219a6cc8cde9d7249eeacbb64f0ec101401aa58aec45e5ad901f2ed metadata
 MD5 81026ffeea221e2154db8bf91e369465 files/digest-xcdroast-0.98_alpha15-r3 569
 RMD160 0f3938e89cfb13e07d193d80cc3a180195f39c11 files/digest-xcdroast-0.98_alpha15-r3 569
 SHA256 2c99c8cd73357dec3d09038be61757a08e297a8d0ef1223cd6f716b8c8de0c31 files/digest-xcdroast-0.98_alpha15-r3 569
+MD5 81026ffeea221e2154db8bf91e369465 files/digest-xcdroast-0.98_alpha15-r4 569
+RMD160 0f3938e89cfb13e07d193d80cc3a180195f39c11 files/digest-xcdroast-0.98_alpha15-r4 569
+SHA256 2c99c8cd73357dec3d09038be61757a08e297a8d0ef1223cd6f716b8c8de0c31 files/digest-xcdroast-0.98_alpha15-r4 569
diff --git a/app-cdr/xcdroast/files/cdrecord2wodim.patch b/app-cdr/xcdroast/files/cdrecord2wodim.patch
new file mode 100644
index 000000000000..8a9c486e7253
--- /dev/null
+++ b/app-cdr/xcdroast/files/cdrecord2wodim.patch
@@ -0,0 +1,71 @@
+diff -urNad xcdroast-0.98+0alpha15~/src/io.c xcdroast-0.98+0alpha15/src/io.c
+--- xcdroast-0.98+0alpha15~/src/io.c	2006-09-09 16:24:37.000000000 +0200
++++ xcdroast-0.98+0alpha15/src/io.c	2006-09-09 16:26:32.000000000 +0200
+@@ -1273,7 +1273,7 @@
+ 	drvcount = 0;
+ 
+ 	get_wrap_path_cdrecord(line);
+-	strcat(line," driver=help 2>&1");
++	strcat(line," driver=help 2>&1 | sed -n '/Driver types:/,//p'");
+ 
+ 	dodebug(1, "calling: %s\n", line);
+         if ((fpin = popen(line,"r")) == NULL) {
+@@ -5856,7 +5856,7 @@
+ 	drvcount = 0;
+ 
+ 	get_wrap_path_cdrecord(line);
+-	strcat(line," blank=help 2>&1");
++	strcat(line," blank=help 2>&1 | sed -n '/Blanking options:/,//p'");
+ 
+ 	dodebug(1, "calling: %s\n", line);
+ 
+@@ -9913,7 +9913,7 @@
+ 	} else {
+ 		get_wrap_path("CDRECORD",line);
+ 	}
+-	strcat(line," -version 2>/dev/null");
++	strcat(line," -version 2>&1");
+ 
+ 	dodebug(1, "calling: %s\n", line);
+         if ((fpin = popen(line,"r")) == NULL) {
+@@ -10137,7 +10137,7 @@
+ 
+ 	strcpy(ver,"");
+ 	get_wrap_path("READCD",line);
+-	strcat(line," -version 2>/dev/null");
++	strcat(line," -version 2>/dev/null | head -n 1");
+ 
+ 	dodebug(1, "calling: %s\n", line);
+         if ((fpin = popen(line,"r")) == NULL) {
+
+diff -urNad xcdroast-0.98alpha15.orig/src/main.c xcdroast-0.98alpha15/src/main.c
+--- xcdroast-0.98alpha15.orig/src/main.c	2006-11-11 04:38:39.000000000 +0100
++++ xcdroast-0.98alpha15/src/main.c	2006-11-11 04:39:33.000000000 +0100
+@@ -586,13 +586,13 @@
+         }
+ 
+         /* if we are in DVD mode, check if the security-key is set */
+-        if (curset.isProDVD == 1) {
++        /* 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 -urNad xcdroast-0.98alpha15.orig/src/xcdroast.h xcdroast-0.98alpha15/src/xcdroast.h
+--- xcdroast-0.98alpha15.orig/src/xcdroast.h	2006-11-11 04:38:39.000000000 +0100
++++ xcdroast-0.98alpha15/src/xcdroast.h	2006-11-11 04:38:51.000000000 +0100
+@@ -113,7 +113,7 @@
+    /usr/local/lib/xcdroast-0.98/bin/cdrecord) */
+ 
+ #define CDRECORD "bin/cdrecord" 
+-#define CDRECORDPRODVD "bin/cdrecord.prodvd" 
++#define CDRECORDPRODVD "bin/cdrecord" 
+ #define CDDA2WAV "bin/cdda2wav"
+ #define READCD "bin/readcd"
+ #define MKISOFS "bin/mkisofs"
diff --git a/app-cdr/xcdroast/files/cdrecord_versions.patch b/app-cdr/xcdroast/files/cdrecord_versions.patch
new file mode 100644
index 000000000000..3b303e8625f0
--- /dev/null
+++ b/app-cdr/xcdroast/files/cdrecord_versions.patch
@@ -0,0 +1,15 @@
+diff -urNad trunk~/src/xcdroast.h trunk/src/xcdroast.h
+--- trunk~/src/xcdroast.h       2006-05-06 15:18:20.000000000 +0200
++++ trunk/src/xcdroast.h        2006-05-08 11:47:57.000000000 +0200
+@@ -124,8 +124,8 @@
+    IT WONT WORK WITH LOWER VERSIONS, EVEN WHEN YOU THINK IT DOES! */
+
+ #define CDRECORD_VERSION "1.11a34"
+-#define CDRECORD_PRODVD_VERSION "2.01a11"
+-#define CDRECORD_VERSION_WITH_ONTHFLYAUDIO "2.01a13"
++#define CDRECORD_PRODVD_VERSION "2.01.01"
++#define CDRECORD_VERSION_WITH_ONTHFLYAUDIO "2.01.01"
+ #define MKISOFS_VERSION "1.15a17"
+ #define CDDA2WAV_VERSION "1.11a34"
+ #define READCD_VERSION "1.11a34"
+
diff --git a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha15-r4 b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha15-r4
new file mode 100644
index 000000000000..83df78c8a710
--- /dev/null
+++ b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha15-r4
@@ -0,0 +1,6 @@
+MD5 8ad7858aa96d29466b74b093ee82149b xcdroast-0.98_alpha15_new_configure.tar.gz 82301
+RMD160 125c5a48462bac3515c93f7e9f6e428cb901d80c xcdroast-0.98_alpha15_new_configure.tar.gz 82301
+SHA256 0e33617f9315482dd95e1228e27461e45bea4516abaebfb5b6449aedaec9de90 xcdroast-0.98_alpha15_new_configure.tar.gz 82301
+MD5 2a9c1d9f2ef58713c453e674b989be3e xcdroast-0.98alpha15.tar.gz 3282794
+RMD160 9198f67659023ce8f508fa2c331df9d9c8b81a8f xcdroast-0.98alpha15.tar.gz 3282794
+SHA256 40be77142b23fa62265a23e473bd3af43df6ab01332ea991a5ef3069530b28d8 xcdroast-0.98alpha15.tar.gz 3282794
diff --git a/app-cdr/xcdroast/files/modern_cdrtools.patch b/app-cdr/xcdroast/files/modern_cdrtools.patch
new file mode 100644
index 000000000000..3aba1e8268ba
--- /dev/null
+++ b/app-cdr/xcdroast/files/modern_cdrtools.patch
@@ -0,0 +1,21 @@
+--- xcdroast-0.98alpha15/src/io.c	2003-10-26 15:24:48.000000000 +0100
++++ xcdroast-0.98alpha15-P/src/io.c	2006-09-25 20:07:33.000000000 +0200
+@@ -9026,7 +9026,7 @@
+ 		strcat(tmp2,"-D ");
+ 	}
+ 	if (masterparam.opt[7]) {
+-		strcat(tmp2,"-L ");
++		strcat(tmp2,"-allow-leading-dots ");
+ 	}
+ 	if (masterparam.opt[8]) {
+ 		strcat(tmp2,"-d ");
+@@ -9160,7 +9160,7 @@
+ 	}	
+ 	if (masterparam.publisher) {
+ 		strcpy(tmptmp, masterparam.publisher);
+-		g_snprintf(tmp5,MAXLINE,"-P \"%s\" ",
++		g_snprintf(tmp5,MAXLINE,"-publisher \"%s\" ",
+ 			convert_escape(tmptmp));
+ 		strcat(tmp4,tmp5);
+ 	}	
+
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild
index e22bf5f63481..ea1b3af83bca 100644
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild
+++ b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild,v 1.21 2006/10/28 14:56:25 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha15-r3.ebuild,v 1.22 2006/11/11 04:51:57 pylon Exp $
 
 inherit eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/xcdroast/${P/_/}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc amd64"
-IUSE="nls"
+IUSE="nls dvdr"
 
 DEPEND=">=x11-libs/gtk+-2.0.3
 	dev-util/pkgconfig"
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r4.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r4.ebuild
new file mode 100644
index 000000000000..6c694f7238f1
--- /dev/null
+++ b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha15-r4.ebuild,v 1.1 2006/11/11 04:51:57 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
+	mirror://gentoo/${P}_new_configure.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+IUSE="nls dvdr"
+
+DEPEND=">=x11-libs/gtk+-2.0.3
+	dev-util/pkgconfig"
+
+RDEPEND="virtual/cdrtools"
+
+src_unpack() {
+	unpack ${P/_/}.tar.gz
+	cd ${S}
+	unpack ${P}_new_configure.tar.gz
+
+	cd ${S}/src
+	epatch ${FILESDIR}/gtk2locale.patch
+	epatch ${FILESDIR}/modern_cdrtools.patch
+	epatch ${FILESDIR}/cdrecord_versions.patch
+	epatch ${FILESDIR}/cdrecord2wodim.patch
+	use amd64 && epatch ${FILESDIR}/64bit_gsize.patch
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		--enable-gtk2 \
+		--disable-dependency-tracking || die
+
+	make PREFIX=/usr || die
+}
+
+src_install() {
+	make PREFIX=/usr DESTDIR=${D} install || die
+
+	cd ${S}/doc
+	dodoc DOCUMENTATION FAQ README* TRANSLATION.HOWTO
+
+	# 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
+
+	insinto /usr/share/icons/hicolor/48x48/apps
+	newins ${S}/xpms/xcdricon.xpm xcdroast.xpm
+
+	make_desktop_entry xcdroast "X-CD-Roast" xcdroast "AudioVideo;DiscBurning"
+}
+
+pkg_postinst() {
+	if use dvdr; then
+		einfo "As both cdrkit and cdrtools are capable of DVD writing they"
+		einfo "can be used with xcdroast.  But you have to start xcdroast"
+		einfo "with the option '-n' to skip the version check."
+	fi
+}