Version bump. Small fixes and translation updates. Drop *.la files since nautilus does not use it. Remove old revisions.

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

5 files changed, 24 insertions, 114 deletions

diff --git a/gnome-extra/nautilus-open-terminal/ChangeLog b/gnome-extra/nautilus-open-terminal/ChangeLog
index 08e37e1d536e..8f658763b92b 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.44 2009/12/26 16:53:16 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-open-terminal/ChangeLog,v 1.45 2010/01/11 21:58:57 eva Exp $
+
+*nautilus-open-terminal-0.18 (11 Jan 2010)
+
+  11 Jan 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -nautilus-open-terminal-0.9.ebuild, -nautilus-open-terminal-0.9-r2.ebuild,
+  -nautilus-open-terminal-0.13.ebuild, -nautilus-open-terminal-0.16.ebuild,
+  +nautilus-open-terminal-0.18.ebuild:
+  Version bump. Small fixes and translation updates. Drop *.la files since
+  nautilus does not use it. Remove old revisions.
 
   26 Dec 2009; Raúl Porcel <armin76@gentoo.org>
   nautilus-open-terminal-0.17.ebuild:
diff --git a/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.13.ebuild b/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.13.ebuild
deleted file mode 100644
index 29f033f0e96b..000000000000
--- a/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.13.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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.13.ebuild,v 1.2 2009/08/05 22:34:50 eva Exp $
-
-EAPI="2"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="Nautilus Plugin for Opening Terminals"
-HOMEPAGE="http://manny.cluecoder.org/packages/nautilus-open-terminal/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="
-	>=x11-libs/gtk+-2.4.0
-	>=dev-libs/glib-2.16
-	>=gnome-base/nautilus-2.21.2
-	>=gnome-base/gnome-desktop-2.26
-	>=gnome-base/gconf-2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
-
-G2CONF="${G2CONF} --disable-static"
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Be a bit more future proof, bug #260903
-	sed "s/-Werror//" -i src/Makefile.am src/Makefile.in || die "sed failed"
-}
diff --git a/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.16.ebuild b/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.18.ebuild
index 43b4eca724fb..fab43d3c3778 100644
--- a/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.16.ebuild
+++ b/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.16.ebuild,v 1.4 2009/11/28 18:18:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.18.ebuild,v 1.1 2010/01/11 21:58:57 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ HOMEPAGE="http://manny.cluecoder.org/packages/nautilus-open-terminal/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
@@ -28,7 +28,9 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
 
-G2CONF="${G2CONF} --disable-static"
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-static"
+}
 
 src_prepare() {
 	gnome2_src_prepare
@@ -39,3 +41,10 @@ src_prepare() {
 	# Fix intltoolize broken file, see upstream #577133
 	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
 }
+
+src_install() {
+	gnome2_src_install
+
+	# Nautilus does not need *.la files to load extensions
+	find "${D}" -name "*.la" -delete || die "remove of *.la files failed"
+}
diff --git a/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.9-r2.ebuild b/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.9-r2.ebuild
deleted file mode 100644
index d5a7ef6710c6..000000000000
--- a/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.9-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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-r2.ebuild,v 1.1 2009/03/28 22:40:07 eva Exp $
-
-EAPI="2"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Nautilus Plugin for Opening Terminals"
-HOMEPAGE="http://manny.cluecoder.org/packages/nautilus-open-terminal/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=gnome-base/eel-2.6
-	>=x11-libs/gtk+-2.4.0
-	>=dev-libs/glib-2.13.3
-	>=gnome-base/nautilus-2.21.2
-	>=gnome-base/gnome-desktop-2.9.91
-	>=gnome-base/gconf-2"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.18"
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"
-
-G2CONF="${G2CONF} --disable-static"
-
-src_prepare() {
-	gnome2_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"
-	eautoreconf
-}
diff --git a/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.9.ebuild b/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.9.ebuild
deleted file mode 100644
index df5caadcedd2..000000000000
--- a/gnome-extra/nautilus-open-terminal/nautilus-open-terminal-0.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2008 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.ebuild,v 1.5 2008/10/18 23:05:14 ranger Exp $
-
-inherit gnome2
-
-DESCRIPTION="Nautilus Plugin for Opening Terminals"
-HOMEPAGE="http://manny.cluecoder.org/packages/nautilus-open-terminal/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
-
-RDEPEND=">=gnome-base/eel-2.6
-		 >=x11-libs/gtk+-2.4.0
-		 >=dev-libs/glib-2.13.3
-		 >=gnome-base/nautilus-2.21.2
-		 >=gnome-base/gnome-desktop-2.9.91
-		 >=gnome-base/gconf-2.0.0"
-DEPEND="${RDEPEND}
-		sys-devel/gettext
-		dev-util/pkgconfig
-		>=dev-util/intltool-0.18"
-
-DOCS="AUTHORS ChangeLog INSTALL NEWS README TODO"