Fix gconf automagic, patch by Jan Aniŝĉuk and Sylvain BERTRAND, bug 289856

(Portage version: 2.1.7.16/cvs/Linux i686)

3 files changed, 78 insertions, 8 deletions

diff --git a/gnome-extra/libgsf/ChangeLog b/gnome-extra/libgsf/ChangeLog
index 0f14edf214d9..a3bd9687e894 100644
--- a/gnome-extra/libgsf/ChangeLog
+++ b/gnome-extra/libgsf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/libgsf
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.147 2009/12/03 17:14:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.148 2009/12/27 04:07:52 nirbheek Exp $
+
+  27 Dec 2009; Nirbheek Chauhan <nirbheek@gentoo.org> libgsf-1.14.16.ebuild,
+  +files/libgsf-1.14.16-gconf-automagic.patch:
+  Fix gconf automagic, patch by Jan Aniŝĉuk and Sylvain BERTRAND, bug
+  289856
 
   03 Dec 2009; Brent Baude <ranger@gentoo.org> libgsf-1.14.15.ebuild:
   Marking libgsf-1.14.15 ppc64 stable for bug 281427
diff --git a/gnome-extra/libgsf/files/libgsf-1.14.16-gconf-automagic.patch b/gnome-extra/libgsf/files/libgsf-1.14.16-gconf-automagic.patch
new file mode 100644
index 000000000000..2df1da29ad36
--- /dev/null
+++ b/gnome-extra/libgsf/files/libgsf-1.14.16-gconf-automagic.patch
@@ -0,0 +1,62 @@
+Fix automagic gconf for thumbnailer
+
+http://bugs.gentoo.org/attachment.cgi?id=207912&action=view
+
+---
+--- configure.in
++++ configure.in
+@@ -499,21 +499,41 @@
+ 
+ # ===================
+ # GConf configuration
++AC_ARG_WITH([gconf],
++    AC_HELP_STRING([--without-gconf],[disable the use of gconf (default: auto)]),
++		[],
++    [with_gconf=auto])
++
++have_gconf=not_tested
++if test "x$with_gconf" = "xyes" -o "x$with_gconf" = "xauto" ; then
++    PKG_CHECK_EXISTS([gconf-2.0 >= 2.24.0],[have_gconf=yes],[have_gconf=no])
++fi
+ 
+-dnl The following conditional is set in AM_GCONF_SOURCE_2.
+-dnl Because we may skip its execution, we have to set a default here.
+-AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [false])
+-
+-dnl Don't publish the GCONFTOOL variable, AM_GCONF_SOURCE_2 has ``gconftool-2'' hardwired.
+-m4_pattern_allow([^AM_GCONF_SOURCE_2$])
+-GCONFTOOL=
+-AC_CHECK_PROG([GCONFTOOL], [gconftool-2], [gconftool-2], [no])
+-if test "x$GCONFTOOL" = "xno"; then
+-    AC_MSG_WARN([thumbnailer will not be built, unable to find gconftool-2])
+-else
+-    AM_GCONF_SOURCE_2
++if test "x$with_gconf" = "xyes" -a "x$have_gconf" != "xyes" ; then
++    AC_MSG_ERROR([gconf support requested, but not available.])
+ fi
+-AM_CONDITIONAL(WITH_GCONF, test "x$GCONFTOOL" != "xno")
++m4_pattern_allow([AM_GCONF_SOURCE_2])dnl in case no autotools are available
++AM_GCONF_SOURCE_2
++# ===================
++
++# ===================
++# thumbnailer configuration
++build_thumbnailer=dont_know
++case "${with_gconf}" in
++no)
++    AC_MSG_WARN([gconf support disabled as requested (the thumbnailer won't be built)]);
++    build_thumbnailer=no;;
++yes)
++    build_thumbnailer=yes;;
++auto)
++    if test "xhave_conf" = "xyes"; then
++        build_thumbnailer=yes;
++    else
++        build_thumbnailer=no;
++    fi;;
++esac
++AM_CONDITIONAL(WITH_GCONF, test "x$build_thumbnailer" = "xyes")
++# ===================
+ 
+ LDFLAGS="-no-undefined $LDFLAGS"
+ 
diff --git a/gnome-extra/libgsf/libgsf-1.14.16.ebuild b/gnome-extra/libgsf/libgsf-1.14.16.ebuild
index c35465267102..174a0c9643c9 100644
--- a/gnome-extra/libgsf/libgsf-1.14.16.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.16.ebuild
@@ -1,11 +1,11 @@
 # 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.16.ebuild,v 1.1 2009/10/19 21:14:39 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.16.ebuild,v 1.2 2009/12/27 04:07:52 nirbheek Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
 
-inherit eutils gnome2 python multilib
+inherit autotools eutils gnome2 python multilib
 
 DESCRIPTION="The GNOME Structured File Library"
 HOMEPAGE="http://www.gnome.org/"
@@ -15,16 +15,14 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="bzip2 doc gnome gtk python"
 
-# FIXME: gconf is actually automagic and only needed for thumbnailer
 RDEPEND="
 	>=dev-libs/glib-2.16
 	>=dev-libs/libxml2-2.4.16
-	>=gnome-base/gconf-2
 	sys-libs/zlib
 	bzip2? ( app-arch/bzip2 )
 	gnome? (
-		>=gnome-base/libbonobo-2
-		>=gnome-base/gnome-vfs-2.2 )
+		>=gnome-base/gconf-2
+		>=gnome-base/libbonobo-2 )
 	gtk? ( >=x11-libs/gtk+-2 )
 	python? (
 		>=dev-python/pygobject-2.10
@@ -44,7 +42,7 @@ pkg_setup() {
 		--with-gio
 		--disable-static
 		$(use_with bzip2 bz2)
-		$(use_with gnome gnome-vfs)
+		$(use_with gnome gconf)
 		$(use_with gnome bonobo)
 		$(use_with python)
 		$(use_with gtk gdk-pixbuf)"
@@ -53,6 +51,11 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
+	# Fix gconf automagic, bug 289856
+	epatch "${FILESDIR}/${P}-gconf-automagic.patch"
+
+	eautoreconf
+
 	# disable pyc compiling
 	mv py-compile py-compile.orig
 	ln -s $(type -P true) py-compile