Extended the cdrecord2wodim.patch so that it works with cdrkit-1.0_pre5.

Package-Manager: portage-2.1.2_rc1-r5

4 files changed, 36 insertions, 24 deletions

diff --git a/app-cdr/xcdroast/ChangeLog b/app-cdr/xcdroast/ChangeLog
index c8d355b91131..ffce2666b114 100644
--- a/app-cdr/xcdroast/ChangeLog
+++ b/app-cdr/xcdroast/ChangeLog
@@ -1,6 +1,10 @@
 # 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.49 2006/11/11 04:51:57 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/ChangeLog,v 1.50 2006/11/11 13:01:30 pylon Exp $
+
+  11 Nov 2006; Lars Weiler <pylon@gentoo.org> files/cdrecord2wodim.patch,
+  xcdroast-0.98_alpha15-r4.ebuild:
+  Extended the cdrecord2wodim.patch so that it works with cdrkit-1.0_pre5.
 
 *xcdroast-0.98_alpha15-r4 (11 Nov 2006)
 
diff --git a/app-cdr/xcdroast/Manifest b/app-cdr/xcdroast/Manifest
index ba9a6844dffc..5e269bbfc020 100644
--- a/app-cdr/xcdroast/Manifest
+++ b/app-cdr/xcdroast/Manifest
@@ -2,10 +2,10 @@ 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 cdrecord2wodim.patch 3145 RMD160 a5554a0da5d1aacc3a2bce003666548a5f6977dd SHA1 c368e542e86204eb15cb4b21aecdd6cf9dd8bf80 SHA256 fc99ab5ab87a368c8db4a91161b95a9f99a1a8e9ad2550ae7926487bad875ae9
+MD5 9b8ac26bdd33d9efd0d922c6b8425df5 files/cdrecord2wodim.patch 3145
+RMD160 a5554a0da5d1aacc3a2bce003666548a5f6977dd files/cdrecord2wodim.patch 3145
+SHA256 fc99ab5ab87a368c8db4a91161b95a9f99a1a8e9ad2550ae7926487bad875ae9 files/cdrecord2wodim.patch 3145
 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
@@ -28,14 +28,14 @@ EBUILD xcdroast-0.98_alpha15-r3.ebuild 2013 RMD160 fe2bbaf1ea8f8ec8b1183a8e49d03
 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
+EBUILD xcdroast-0.98_alpha15-r4.ebuild 1506 RMD160 9cb0b816e738177728ca12af76c90bef42957680 SHA1 cae5b2ea07a7618d3a82c0073c2d7a1ac81d5c03 SHA256 cc9cf3bd539d8716fc7b1cc8cc33fbaf20d916a2448b3bcc4f4538c721813704
+MD5 16541cf8a812fec8353aa960aa5b0deb xcdroast-0.98_alpha15-r4.ebuild 1506
+RMD160 9cb0b816e738177728ca12af76c90bef42957680 xcdroast-0.98_alpha15-r4.ebuild 1506
+SHA256 cc9cf3bd539d8716fc7b1cc8cc33fbaf20d916a2448b3bcc4f4538c721813704 xcdroast-0.98_alpha15-r4.ebuild 1506
+MISC ChangeLog 8782 RMD160 a47d0dba419c078d1bf2bff9f399c24b1174de47 SHA1 eae9f72ea7fdbb588b13f5d9e6deadeed34977a3 SHA256 e5657a74d61f132bcf3e4a4a62da075e28e259a204d098c4faa6c058651d8a3e
+MD5 5bd372880acdc0f304e9aa1d3aac111e ChangeLog 8782
+RMD160 a47d0dba419c078d1bf2bff9f399c24b1174de47 ChangeLog 8782
+SHA256 e5657a74d61f132bcf3e4a4a62da075e28e259a204d098c4faa6c058651d8a3e ChangeLog 8782
 MISC metadata.xml 247 RMD160 7a2b92c08eec2dc74474226529601870161ced75 SHA1 30e2f8e33a1a0ccd255272d40b84fadfe13c90d5 SHA256 4e1e94075219a6cc8cde9d7249eeacbb64f0ec101401aa58aec45e5ad901f2ed
 MD5 c7cf0bf2a01fd5bb41778f1941040287 metadata.xml 247
 RMD160 7a2b92c08eec2dc74474226529601870161ced75 metadata.xml 247
diff --git a/app-cdr/xcdroast/files/cdrecord2wodim.patch b/app-cdr/xcdroast/files/cdrecord2wodim.patch
index 8a9c486e7253..11668c540fe7 100644
--- a/app-cdr/xcdroast/files/cdrecord2wodim.patch
+++ b/app-cdr/xcdroast/files/cdrecord2wodim.patch
@@ -69,3 +69,19 @@ diff -urNad xcdroast-0.98alpha15.orig/src/xcdroast.h xcdroast-0.98alpha15/src/xc
  #define CDDA2WAV "bin/cdda2wav"
  #define READCD "bin/readcd"
  #define MKISOFS "bin/mkisofs"
+diff -urNad xcdroast-0.98alpha15.orig/src/io.c xcdroast-0.98alpha15/src/io.c
+--- xcdroast-0.98alpha15.orig/src/io.c	2006-11-11 13:39:27.000000000 +0100
++++ xcdroast-0.98alpha15/src/io.c	2006-11-11 13:40:59.000000000 +0100
+@@ -348,6 +348,12 @@
+ 		return;
+ 	}
+ 
++	/* as of cdrkit-1.0_pre5 we need to test for wodim: as well */
++	strcpy(tmp,"wodim: ");
++	if (strncmp(line, tmp, strlen(tmp)) == 0) {
++		return;
++	}
++
+ 	/* a line with device-info found (by checking for ")")*/
+ 	p1 = index(line,')');
+ 	if (p1 != NULL && !strstr(line,")\"") && 
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r4.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r4.ebuild
index 6c694f7238f1..cdc0f41e8a3c 100644
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r4.ebuild
+++ b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r4.ebuild
@@ -1,18 +1,18 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/xcdroast/xcdroast-0.98_alpha15-r4.ebuild,v 1.2 2006/11/11 13:01:30 pylon Exp $
 
 inherit eutils
 
 S=${WORKDIR}/${P/_/}
-DESCRIPTION="Menu based front-end to mkisofs and cdrecord"
+DESCRIPTION="Old-school menu based front-end for CD and DVD writing"
 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"
+IUSE="nls"
 
 DEPEND=">=x11-libs/gtk+-2.0.3
 	dev-util/pkgconfig"
@@ -58,11 +58,3 @@ src_install() {
 
 	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
-}