Bump to 0.9-r2. inherit autotools, bug #263886. Fix compilation with gnome 2.26, bug #261914.

(Portage version: 2.2_rc26/cvs/Linux x86_64)

4 files changed, 64 insertions, 5 deletions

diff --git a/gnome-extra/nautilus-open-terminal/ChangeLog b/gnome-extra/nautilus-open-terminal/ChangeLog
index 64fd853e4aa8..33e6a28d7640 100644
--- a/gnome-extra/nautilus-open-terminal/ChangeLog
+++ b/gnome-extra/nautilus-open-terminal/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-extra/nautilus-open-terminal
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-open-terminal/ChangeLog,v 1.31 2009/03/22 12:20:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-open-terminal/ChangeLog,v 1.32 2009/03/28 22:40:07 eva Exp $
+
+*nautilus-open-terminal-0.9-r2 (28 Mar 2009)
+
+  28 Mar 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/nautilus-open-terminal-0.9-gnomevfs.patch, metadata.xml,
+  -nautilus-open-terminal-0.9-r1.ebuild,
+  +nautilus-open-terminal-0.9-r2.ebuild:
+  Bump to 0.9-r2. inherit autotools, bug #263886. Fix compilation with gnome
+  2.26, bug #261914.
 
 *nautilus-open-terminal-0.9-r1 (22 Mar 2009)
 
diff --git a/gnome-extra/nautilus-open-terminal/files/nautilus-open-terminal-0.9-gnomevfs.patch b/gnome-extra/nautilus-open-terminal/files/nautilus-open-terminal-0.9-gnomevfs.patch
new file mode 100644
index 000000000000..1b109e583323
--- /dev/null
+++ b/gnome-extra/nautilus-open-terminal/files/nautilus-open-terminal-0.9-gnomevfs.patch
@@ -0,0 +1,47 @@
+---
+https://bugs.gentoo.org/show_bug.cgi?id=261914
+http://svn.gnome.org/viewvc/nautilus-open-terminal?view=revision&revision=217
+
+Fix building with gnome 2.26 libs.
+diff --git a/configure.in b/configure.in
+index 6b4da94..88edc6a 100644
+--- a/configure.in
++++ b/configure.in
+@@ -13,6 +13,7 @@ NAUTILUS_REQUIRED=2.21.2
+ EEL_REQUIRED=2.6.0
+ LIBGNOME_DESKTOP_REQUIRED=2.9.91
+ GLIB_REQUIRED=2.4.0
++GNOMEVFS_REQUIRED=2.0
+ 
+ AC_PROG_CC
+ AM_PROG_LIBTOOL
+@@ -29,6 +30,7 @@ fi
+ PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED glib-2.0 >= $GLIB_REQUIRED)
+ PKG_CHECK_MODULES(GCONF, gconf-2.0)
+ PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED)
++PKG_CHECK_MODULES(GNOMEVFS, gnome-vfs-2.0 >= $GNOMEVFS_REQUIRED)
+ 
+ PKG_CHECK_MODULES(GLIB_RECENT, glib-2.0 >= 2.13.3,
+                   AC_DEFINE(HAVE_GLIB_DESKTOP_DIR_API, 1, [g_get_user_special_dir() support]),
+@@ -42,6 +44,9 @@ AC_SUBST(NAUTILUS_LIBS)
+ AC_SUBST(GCONF_CFLAGS)
+ AC_SUBST(GCONF_LIBS)
+ 
++AC_SUBST(GNOMEVFS_CFLAGS)
++AC_SUBST(GNOMEVFS_LIBS)
++
+ AC_SUBST(GNOMEDESKTOP_CFLAGS)
+ AC_SUBST(GNOMEDESKTOP_LIBS)
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3161190..f25795a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -9,6 +9,7 @@ INCLUDES =						\
+ 	$(DISABLE_DEPRECATED_CFLAGS)			\
+ 	$(NAUTILUS_CFLAGS)				\
+ 	$(GCONF_CFLAGS)					\
++	$(GNOMEVFS_CFLAGS)				\
+ 	$(GNOMEDESKTOP_CFLAGS)
+ 
+ nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR)
diff --git a/gnome-extra/nautilus-open-terminal/metadata.xml b/gnome-extra/nautilus-open-terminal/metadata.xml
index 41205bf0b9ae..dad9001338dc 100644
--- a/gnome-extra/nautilus-open-terminal/metadata.xml
+++ b/gnome-extra/nautilus-open-terminal/metadata.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome</herd>
-	</pkgmetadata>
+</pkgmetadata>
diff --git a/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.9-r1.ebuild b/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.9-r2.ebuild
index 545aab36b901..d5a7ef6710c6 100644
--- a/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.9-r1.ebuild
+++ b/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.9-r2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.9-r1.ebuild,v 1.1 2009/03/22 12:20:50 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.9-r2.ebuild,v 1.1 2009/03/28 22:40:07 eva Exp $
 
 EAPI="2"
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="Nautilus Plugin for Opening Terminals"
 HOMEPAGE="http://manny.cluecoder.org/packages/nautilus-open-terminal/"
@@ -35,7 +35,10 @@ src_prepare() {
 	# Be a bit more future proof, bug #260903
 	sed "s/-Werror//" -i src/Makefile.am src/Makefile.in || die "sed failed"
 
+	# Fix compilation with gnome 2.26 libs, bug #261914
+	epatch "${FILESDIR}/${P}-gnomevfs.patch"
+
 	# Respect LINGUAS
 	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautomake
+	eautoreconf
 }