bump to 1.14.8, bug #234231. add pygtk to RDEPEND for codegen, bug #211074

(Portage version: 2.2_rc8/cvs/Linux 2.6.24-gentoo-r8 i686)

3 files changed, 42 insertions, 21 deletions

diff --git a/gnome-extra/libgsf/ChangeLog b/gnome-extra/libgsf/ChangeLog
index 28cc65c0f7ee..d86ec09af593 100644
--- a/gnome-extra/libgsf/ChangeLog
+++ b/gnome-extra/libgsf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/libgsf
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.117 2008/05/29 17:10:11 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.118 2008/08/23 12:03:10 eva Exp $
+
+*libgsf-1.14.8 (23 Aug 2008)
+
+  23 Aug 2008; Gilles Dartiguelongue <eva@gentoo.org> -libgsf-1.14.3.ebuild,
+  libgsf-1.14.7.ebuild, +libgsf-1.14.8.ebuild:
+  bump to 1.14.8, bug #234231
+  add pygtk to RDEPEND for codegen, bug #211074
 
   29 May 2008; Ali Polatel <hawking@gentoo.org> libgsf-1.14.3.ebuild,
   libgsf-1.14.7.ebuild:
diff --git a/gnome-extra/libgsf/libgsf-1.14.7.ebuild b/gnome-extra/libgsf/libgsf-1.14.7.ebuild
index 945328f9f7f8..eb270846861b 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
 # 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.12 2008/05/29 17:10:11 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.7.ebuild,v 1.13 2008/08/23 12:03:10 eva Exp $
 
 inherit eutils gnome2 python multilib
 
@@ -21,7 +21,8 @@ RDEPEND="
 	sys-libs/zlib
 	bzip2? ( app-arch/bzip2 )
 	python? ( dev-lang/python
-		>=dev-python/pygobject-2.10 )"
+		>=dev-python/pygobject-2.10
+		>=dev-python/pygtk-2.10 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
diff --git a/gnome-extra/libgsf/libgsf-1.14.3.ebuild b/gnome-extra/libgsf/libgsf-1.14.8.ebuild
index c7b51b7df61e..e59e70e2ef40 100644
--- a/gnome-extra/libgsf/libgsf-1.14.3.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.8.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.13 2008/05/29 17:10:11 hawking Exp $
+# $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
 
@@ -9,37 +9,48 @@ 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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="bzip2 doc gnome python"
 
-RDEPEND=">=dev-libs/libxml2-2.4.16
-	>=dev-libs/glib-2.6
-	sys-libs/zlib
-	gnome? ( media-gfx/imagemagick
-		>=gnome-base/gconf-2
+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/pygtk-2.8 )"
-# This package (currently) needs >=pygobject-2.8 and pygtk-codegen-2.0 for python
-# support, which is provided by either pygtk-2.8* or any pygobject version (they were
-# separated for pygobject version 2.10 and up). As for codegen we already need
-# pygtk, then depending on just >=pygtk-2.8 is sufficient, as 2.8 provides pygobject
-# and 2.10 will pull in the pygobject separate package.
+		>=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 )"
 
-G2CONF="${G2CONF} \
-	$(use_with bzip2 bz2) \
-	$(use_with gnome) \
-	$(use_with python)"
+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
@@ -63,5 +74,7 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_pkg_postrm
-	use python && python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/gsf
+	if use python; then
+		python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/gsf
+	fi
 }