added upstream patches

5 files changed, 108 insertions, 1 deletions

diff --git a/app-cdr/xcdroast/ChangeLog b/app-cdr/xcdroast/ChangeLog
index ff6d43ba6dd1..2aefa952ed5c 100644
--- a/app-cdr/xcdroast/ChangeLog
+++ b/app-cdr/xcdroast/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 2002-2003 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-r2 (15 Nov 2003)
+
+  15 Nov 2003; Lars Weiler <pylon@gentoo.org> xcdroast-0.98_alpha15-r2.ebuild:
+  Added two patches from xcdroast.org that fixes problems with gtk2 and the
+  not-needed pcre-lib.
+
 *xcdroast-0.98_alpha15-r1 (02 Nov 2003)
 
   02 Nov 2003; Luca Barbato <lu_zero@gentoo.org> 
diff --git a/app-cdr/xcdroast/Manifest b/app-cdr/xcdroast/Manifest
index 852094fac8da..55a05c81a06b 100644
--- a/app-cdr/xcdroast/Manifest
+++ b/app-cdr/xcdroast/Manifest
@@ -2,7 +2,7 @@ MD5 255ad362f2823ba3ef4f3395311565f5 xcdroast-0.98_alpha15-r1.ebuild 2065
 MD5 a9919266035f49883684f4124186a035 xcdroast-0.98_alpha13.ebuild 1036
 MD5 2ad1a3424779d6031188b00aae151567 xcdroast-0.98_alpha15.ebuild 1672
 MD5 70ad5f1d00b2979b61744c11cb01ed20 xcdroast-0.98_alpha14-r1.ebuild 1447
-MD5 2e6c08d2d587a3ccb774e85b5807ad78 xcdroast-0.98_alpha15-r2.ebuild 2217
+MD5 ab5cf5db8adccd985ac4cd9e4eb3ad45 xcdroast-0.98_alpha15-r2.ebuild 2215
 MD5 7079ceeda811e4258b56504baad55770 xcdroast-0.98_alpha14-r2.ebuild 2189
 MD5 714e1ee7df9f19d28e46d4c076655a1f ChangeLog 5373
 MD5 af9852b249b8e0fab9bd0d55dbea4455 metadata.xml 400
diff --git a/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha15-r2 b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha15-r2
new file mode 100644
index 000000000000..e9f56aaf8bfa
--- /dev/null
+++ b/app-cdr/xcdroast/files/digest-xcdroast-0.98_alpha15-r2
@@ -0,0 +1,4 @@
+MD5 2a9c1d9f2ef58713c453e674b989be3e xcdroast-0.98alpha15.tar.gz 3282794
+MD5 8ad7858aa96d29466b74b093ee82149b xcdroast-0.98_alpha15_new_configure.tar.gz 82301
+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/gtk2locale.patch b/app-cdr/xcdroast/files/gtk2locale.patch
new file mode 100644
index 000000000000..137c14d9c32c
--- /dev/null
+++ b/app-cdr/xcdroast/files/gtk2locale.patch
@@ -0,0 +1,18 @@
+--- xtools.c.org	2003-11-06 11:19:10.000000000 +0100
++++ xtools.c	2003-11-06 11:27:59.000000000 +0100
+@@ -3662,9 +3662,13 @@
+ 	if (c_locale_is_utf8)
+ 		return str;
+ 
+-	/* should be logical to use g_filename_from_utf8() here, but
+-	   somehow this works not correctly on my testsystem */
++#ifdef BROKEN_GTK2_LOCALE
++	/* on my redhat 7.3 system it does only work that way, but
++	   on other systems the correct way is in the #else branch */ 
+ 	locstr = g_locale_from_utf8(str, strlen(str), &in, &out, NULL);
++#else
++	locstr = g_filename_from_utf8(str, strlen(str), &in, &out, NULL);
++#endif
+ 	if (locstr) {
+ 		strncpy(str, locstr, MAXLINE);
+ 	}
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha15-r2.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r2.ebuild
new file mode 100644
index 000000000000..f8d6b61e867e
--- /dev/null
+++ b/app-cdr/xcdroast/xcdroast-0.98_alpha15-r2.ebuild
@@ -0,0 +1,79 @@
+# 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-r2.ebuild,v 1.1 2003/11/15 04:53:03 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/xcdroast-0.98_alpha15_new_configure.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 )"
+RESTRICT="nomirror"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="nls dvdr gtk2"
+
+DEPEND="gtk? (
+		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
+	>=app-cdr/cdrtools-2.01_alpha17"
+
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${P/_/}.tar.gz
+	cd ${S}
+	unpack xcdroast-0.98_alpha15_new_configure.tar.gz
+
+	cd ${S}/src
+	use gtk2 && epatch ${FILESDIR}/gtk2locale.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
+
+	#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
+	fi
+}
+
+pkg_postinst() {
+	if use dvdr; then
+		echo
+		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 further information."
+		echo
+	fi
+}