remove static useflag, backport patch from upstream to fix #152798

(Portage version: 2.1.2_pre3-r8)

4 files changed, 104 insertions, 1 deletions

diff --git a/gnome-extra/nautilus-cd-burner/ChangeLog b/gnome-extra/nautilus-cd-burner/ChangeLog
index f61919b92f19..d77441e25618 100644
--- a/gnome-extra/nautilus-cd-burner/ChangeLog
+++ b/gnome-extra/nautilus-cd-burner/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/nautilus-cd-burner
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/ChangeLog,v 1.144 2006/10/20 17:55:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/ChangeLog,v 1.145 2006/10/30 19:31:44 allanonjl Exp $
+
+*nautilus-cd-burner-2.16.1-r1 (30 Oct 2006)
+
+  30 Oct 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +files/nautilus-cd-burner-2.16.1-make_iso_c.patch,
+  -nautilus-cd-burner-2.16.1.ebuild, +nautilus-cd-burner-2.16.1-r1.ebuild:
+  remove static useflag, backport patch from upstream to fix #152798
 
   20 Oct 2006; Aron Griffis <agriffis@gentoo.org>
   nautilus-cd-burner-2.14.2.ebuild:
diff --git a/gnome-extra/nautilus-cd-burner/files/digest-nautilus-cd-burner-2.16.1-r1 b/gnome-extra/nautilus-cd-burner/files/digest-nautilus-cd-burner-2.16.1-r1
new file mode 100644
index 000000000000..50655748e2a0
--- /dev/null
+++ b/gnome-extra/nautilus-cd-burner/files/digest-nautilus-cd-burner-2.16.1-r1
@@ -0,0 +1,3 @@
+MD5 f64e98c9b3d3a21cb54dc4d4d3983de2 nautilus-cd-burner-2.16.1.tar.bz2 703744
+RMD160 bccc2b7513e71c0c15195628c4dfceeaebe5d1f3 nautilus-cd-burner-2.16.1.tar.bz2 703744
+SHA256 5cc224a8dfb3bbe005f06ac6b9466e4b97bde122c5db8064b25f663e3dac8e2e nautilus-cd-burner-2.16.1.tar.bz2 703744
diff --git a/gnome-extra/nautilus-cd-burner/files/nautilus-cd-burner-2.16.1-make_iso_c.patch b/gnome-extra/nautilus-cd-burner/files/nautilus-cd-burner-2.16.1-make_iso_c.patch
new file mode 100644
index 000000000000..a30536c80801
--- /dev/null
+++ b/gnome-extra/nautilus-cd-burner/files/nautilus-cd-burner-2.16.1-make_iso_c.patch
@@ -0,0 +1,49 @@
+===================================================================
+RCS file: /cvs/gnome/nautilus-cd-burner/src/make-iso.c,v
+retrieving revision 1.13
+retrieving revision 1.13.2.1
+diff -u -r1.13 -r1.13.2.1
+--- src/make-iso.c	2006/09/29 18:23:54	1.13
++++ src/make-iso.c	2006/10/25 17:03:53	1.13.2.1
+@@ -965,11 +965,11 @@
+ gboolean
+ nautilus_burn_iso_graft_get_info (NautilusBurnIsoGraft *graft,
+ 				  guint64              *size,
+-				  gboolean             *use_joliet,
++				  gboolean             *use_joliet_out,
+ 				  GError              **error)
+ {
+ 	GPtrArray            *argv;
+-	gboolean              _use_joliet;
++	gboolean              use_joliet;
+ 	char                 *stdout_data;
+ 	char                 *stderr_data;
+ 	int                   exit_status;
+@@ -978,7 +978,7 @@
+ 	char                 *filelist;
+ 	gboolean              result;
+ 
+-	_use_joliet = TRUE;
++	use_joliet = TRUE;
+ 	argv = NULL;
+ 	filelist = create_temp_graft_file (graft);
+ 	iso_size = 0;
+@@ -991,7 +991,7 @@
+ 
+ 	g_ptr_array_add (argv, "mkisofs");
+ 	g_ptr_array_add (argv, "-r");
+-	if (_use_joliet) {
++	if (use_joliet) {
+ 		g_ptr_array_add (argv, "-J");
+ 	}
+ 	if (ncb_mkisofs_supports_utf8 ()) {
+@@ -1062,6 +1062,9 @@
+ 	if (size != NULL) {
+ 		*size = iso_size;
+ 	}
++	if (use_joliet_out != NULL) {
++		*use_joliet_out = use_joliet;
++	}
+ 
+ 	return result;
+ }
diff --git a/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.1-r1.ebuild b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.1-r1.ebuild
new file mode 100644
index 000000000000..6ee0fff62212
--- /dev/null
+++ b/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-cd-burner/nautilus-cd-burner-2.16.1-r1.ebuild,v 1.1 2006/10/30 19:31:44 allanonjl Exp $
+
+inherit gnome2 eutils
+
+DESCRIPTION="CD and DVD writer plugin for Nautilus"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="cdr dvdr"
+
+RDEPEND=">=gnome-base/gnome-vfs-2.1.3.1
+	>=dev-libs/glib-2.6
+	>=x11-libs/gtk+-2.6
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnome-2.14
+	>=gnome-base/eel-2.14
+	>=gnome-base/nautilus-2.15.3
+	>=gnome-base/gconf-2
+	>=gnome-base/gnome-mount-0.4
+	>=sys-apps/hal-0.5.7
+	>=sys-apps/dbus-0.6.0
+	cdr? ( virtual/cdrtools )
+	dvdr? ( >=app-cdr/dvd+rw-tools-6.1 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.35"
+
+DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --enable-gnome-mount"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# fix for #152798
+	epatch "${FILESDIR}"/${P}-make_iso_c.patch
+}