Bump to 1.14.11. Closes bug #255241.

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

4 files changed, 15 insertions, 93 deletions

diff --git a/gnome-extra/libgsf/ChangeLog b/gnome-extra/libgsf/ChangeLog
index 2a08b1df9ce3..99fb90d6f98d 100644
--- a/gnome-extra/libgsf/ChangeLog
+++ b/gnome-extra/libgsf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/libgsf
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.125 2009/02/06 03:06:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.126 2009/02/09 23:10:03 eva Exp $
+
+*libgsf-1.14.11 (09 Feb 2009)
+
+  09 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org> libgsf-1.14.7.ebuild,
+  -libgsf-1.14.8.ebuild, -libgsf-1.14.9.ebuild, +libgsf-1.14.11.ebuild:
+  Bump to 1.14.11. Closes bug #255241.
 
   06 Feb 2009; Jeroen Roovers <jer@gentoo.org> libgsf-1.14.10.ebuild:
   Stable for HPPA (bug #254447).
diff --git a/gnome-extra/libgsf/libgsf-1.14.9.ebuild b/gnome-extra/libgsf/libgsf-1.14.11.ebuild
index 8954ff69f93b..00b48d9c89a0 100644
--- a/gnome-extra/libgsf/libgsf-1.14.9.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.9.ebuild,v 1.2 2008/10/12 10:34:25 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.11.ebuild,v 1.1 2009/02/09 23:10:03 eva Exp $
 
 inherit eutils gnome2 python multilib
 
@@ -26,17 +26,17 @@ RDEPEND="
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
+	>=dev-util/intltool-0.35.0
 	doc? ( >=dev-util/gtk-doc-1 )"
 
 PDEPEND="gnome? ( media-gfx/imagemagick )"
 
 DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
 
-# FIXME: requires gio-standalone, what is it ?
 pkg_setup() {
 	G2CONF="${G2CONF}
 		--with-gio
+		--disable-static
 		$(use_with bzip2 bz2)
 		$(use_with gnome gnome-vfs)
 		$(use_with gnome bonobo)
@@ -49,8 +49,6 @@ src_unpack() {
 	# disable pyc compiling
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile
-
-	intltoolize --force || die "intltoolize failed"
 }
 
 pkg_preinst() {
@@ -76,7 +74,5 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	if use python; then
-		python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/gsf
-	fi
+	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/gsf
 }
diff --git a/gnome-extra/libgsf/libgsf-1.14.7.ebuild b/gnome-extra/libgsf/libgsf-1.14.7.ebuild
index eb270846861b..b8c6eadba878 100644
--- a/gnome-extra/libgsf/libgsf-1.14.7.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.7.ebuild,v 1.13 2008/08/23 12:03:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.7.ebuild,v 1.14 2009/02/09 23:10:03 eva Exp $
 
 inherit eutils gnome2 python multilib
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="arm ia64 ppc sh sparc"
 IUSE="bzip2 doc gnome python"
 
 RDEPEND="
diff --git a/gnome-extra/libgsf/libgsf-1.14.8.ebuild b/gnome-extra/libgsf/libgsf-1.14.8.ebuild
deleted file mode 100644
index e59e70e2ef40..000000000000
--- a/gnome-extra/libgsf/libgsf-1.14.8.ebuild
+++ /dev/null
@@ -1,80 +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/libgsf/libgsf-1.14.8.ebuild,v 1.1 2008/08/23 12:03:10 eva Exp $
-
-inherit eutils gnome2 python multilib
-
-DESCRIPTION="The GNOME Structured File Library"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 doc gnome python"
-
-RDEPEND="
-	>=dev-libs/glib-2.8
-	>=dev-libs/libxml2-2.4.16
-	gnome? ( >=gnome-base/gconf-2
-		>=gnome-base/libbonobo-2
-		>=gnome-base/gnome-vfs-2.2 )
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	python? ( dev-lang/python
-		>=dev-python/pygobject-2.10
-		>=dev-python/pygtk-2.10 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.29
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-PDEPEND="gnome? ( media-gfx/imagemagick )"
-
-DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
-
-# FIXME: requires gio-standalone, what is it ?
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--without-gvfs
-		$(use_with bzip2 bz2)
-		$(use_with gnome)
-		$(use_with gnome bonobo)
-		$(use_with python)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# disable pyc compiling
-	mv py-compile py-compile.orig
-	ln -s $(type -P true) py-compile
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libgsf-1.so.1
-	preserve_old_lib /usr/$(get_libdir)/libgsf-gnome-1.so.1
-	preserve_old_lib /usr/$(get_libdir)/libgsf-1.so.113
-	preserve_old_lib /usr/$(get_libdir)/libgsf-gnome-1.so.113
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	if use python; then
-		python_version
-		python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/gsf
-	fi
-
-	preserve_old_lib_notify /usr/$(get_libdir)/libgsf-1.so.1
-	preserve_old_lib_notify /usr/$(get_libdir)/libgsf-gnome-1.so.1
-	preserve_old_lib_notify /usr/$(get_libdir)/libgsf-1.so.113
-	preserve_old_lib_notify /usr/$(get_libdir)/libgsf-gnome-1.so.113
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-	if use python; then
-		python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/gsf
-	fi
-}