Restore gnome-vfs support, move thumbnail support to its own USE flag, fix missing autoreconf dependencies, fix missing intltoolize call, rework automagic patch, bug #289856 and fix bug #298813. Clean up old revision.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

7 files changed, 102 insertions, 132 deletions

diff --git a/gnome-extra/libgsf/ChangeLog b/gnome-extra/libgsf/ChangeLog
index 88092b87f1d4..e8419d4a3847 100644
--- a/gnome-extra/libgsf/ChangeLog
+++ b/gnome-extra/libgsf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/libgsf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.150 2010/01/09 21:23:43 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.151 2010/01/13 22:57:48 eva Exp $
+
+  13 Jan 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -libgsf-1.14.11.ebuild, libgsf-1.14.16.ebuild,
+  +files/libgsf-1.14.16-automake-fixes.patch,
+  files/libgsf-1.14.16-gconf-automagic.patch, metadata.xml:
+  Restore gnome-vfs support, move thumbnail support to its own USE flag, fix
+  missing autoreconf dependencies, fix missing intltoolize call, rework
+  automagic patch, bug #289856 and fix bug #298813. Clean up old revision.
 
   09 Jan 2010; Christian Faulhammer <fauli@gentoo.org>
   libgsf-1.14.16.ebuild:
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index 0dd8f96057a6..b867d33d6568 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,21 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libgsf-1.14.16-gconf-automagic.patch 1897 RMD160 d62df8cf9fb359f36b7eb57cdba6c8ed4212645f SHA1 583f4b4a3198988ecdc803a512e5cfab9f84a201 SHA256 7e09918a8a4b885ad57c180291acc2cd009f111b597df7216e8042b828dcde01
+AUX libgsf-1.14.16-automake-fixes.patch 618 RMD160 6426795391ab582106f9f6c131974f57d078f432 SHA1 7e85ce7ae9d23599a88f740e2ddbd2d4b1d92acf SHA256 db89b4a2d6614c0ed233303f12340856ff5313a536a60bc89bc9e4dec6684135
+AUX libgsf-1.14.16-gconf-automagic.patch 2201 RMD160 0a7f63db3fd9dd740f37de0d2cb42f6f75294a75 SHA1 4636e593872ec761b79921e9e935725541f4edb6 SHA256 9171232083d44e581918872f2eb3bf9b3571cde63b434caa9a04ff7c8b0c93f7
+DIST gnome-mplayer-0.9.6-gconf-2.m4.tgz 763 RMD160 cdf17b11dea5da26cc9a17fff953480ee1c39a0f SHA1 e0403cd21c59e305ae26e2d511740a9b1ea17be1 SHA256 d392f4cdb99f398ffb67674a2f0e64debcc4574f5ea203c1c25e91532fce894f
 DIST libgsf-1.14.10.tar.bz2 634273 RMD160 a92116ca562a0ee558484f5c700aab2b1a643681 SHA1 119ad7a1ced076758d1801802afa0a79414a5e52 SHA256 66a3f34e64d0a7294424d529bf12361544c588f40b2b69162d22a6034bee0a61
-DIST libgsf-1.14.11.tar.bz2 637329 RMD160 5654eaedd6e40622d2f8385a0ac27d5d2e3959b1 SHA1 9f097ba5e3d538f6810ae27941a918964aea1de9 SHA256 ceb5fc6538d5998d83adf3fdf04f1dd344a5d0803c87593fadcd02db7ceabfcf
 DIST libgsf-1.14.15.tar.bz2 589878 RMD160 804601e912c75fb5f433a445cf19b55c70712144 SHA1 813f039274a08104da2eabb3074f59d254e96bed SHA256 4a0f500b05d826390f01d5230049d3005fa0a1210f31463910717f3f46338836
 DIST libgsf-1.14.16.tar.bz2 599091 RMD160 ca9e6cafb2a2a1ba02e57a0e378471b1c5ecde6e SHA1 9461d816c283e977d88916932def678560f9c8d5 SHA256 11fd8fca1bdbcfa426276a124ad083cca9632f03cf766523bcdfb2fca0b08908
 EBUILD libgsf-1.14.10.ebuild 2025 RMD160 bca1eb196b0042758a5375be8b6a472d995ffaf7 SHA1 591c367b38076aed76064a5588b76043a22d7727 SHA256 8d274faf803c577d98e292adcd8c6a16a3c49ec601cfc05bfb3ab6b0da01acb6
-EBUILD libgsf-1.14.11.ebuild 2032 RMD160 f0de025d733faf615657c6fc8548907b3c2f45f6 SHA1 976ec4045911319dbf1fb3f75355741f4d148f8b SHA256 860883e04f9d357ea67ee7501dd39e888262df509a2e4a79b06943bc4236d3df
 EBUILD libgsf-1.14.15.ebuild 1770 RMD160 b6d72266f2f7164c81019fddf5e6f6a23a82d671 SHA1 0a0b528050554664523a8594db595939b5e29079 SHA256 726461b267275efaec9d8a6acca67e9bc3a4d8d5bd15bef4a24604936b022824
-EBUILD libgsf-1.14.16.ebuild 2042 RMD160 8d167c9993dde61b943035b3df6797bcf6e0ec44 SHA1 f9c91488148af93a8dc5c92cd31e34b63660b829 SHA256 2bed18fc4988585bd53c9665bd9a6afd86c65305701fa4a22f28c835a107eebf
-MISC ChangeLog 18535 RMD160 5cdce94b2880b0e6ada11831058b5014d3c5b945 SHA1 001ce02d325260c54f7076799c2b4dc9076a88c5 SHA256 392b8d3f9f5714819f29ececad59e57c9e3a87df57f989ce2587a89730015f2a
-MISC metadata.xml 313 RMD160 d8e30aac2552e7c62d3135d095cdd76d2336f616 SHA1 aca225e6a50e0065c5294b0f44be6e7be30d2997 SHA256 281b15d6ca37ef5f68eee6f6fd02e5473d6e479867d2d1ed61fa0537914cb492
+EBUILD libgsf-1.14.16.ebuild 2493 RMD160 9601476e335038106a24af026e84f636bfba0751 SHA1 a3e530215a040493865ad29dbd1eb15de46ef1b5 SHA256 4edcbde9780dba0649ed1ff506248a6eda406640e6720c88b47c8a552f8242bd
+MISC ChangeLog 18967 RMD160 3103a5981d3d41064301bfe0554ecd1bdfd55e61 SHA1 0c027875380c7e1bae80d1b9f7afb9482fcf4af8 SHA256 f785b854894adb23215ba346b5a83d8c30a9afb41c9c49fb39569e89b5d81f99
+MISC metadata.xml 304 RMD160 266992ac9d503bb80b31164d13d394853fb72bcc SHA1 97b443e72047a31c18a881dd95cc0034a02c6fc0 SHA256 97dcc056bc6ee681e66294ff87260cba35805a12db640f00c08b8ee3f7e96005
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAktI8+UACgkQNQqtfCuFneP6lQCdHRj5prV8XJhTPskrJm/cW16L
-O0gAn2XUlyyqGN29wirPpUfuURDj0yZe
-=sVMr
+iEYEARECAAYFAktOUAEACgkQ1fmVwcYIWAYZTwCgqkG9R8XayReJU2f3UabUwE2r
+edIAnio2DiRfG1XbgW4Ll8b/Ra2Do03a
+=Zs5r
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgsf/files/libgsf-1.14.16-automake-fixes.patch b/gnome-extra/libgsf/files/libgsf-1.14.16-automake-fixes.patch
new file mode 100644
index 000000000000..1c8e11fe883a
--- /dev/null
+++ b/gnome-extra/libgsf/files/libgsf-1.14.16-automake-fixes.patch
@@ -0,0 +1,23 @@
+From 7d697fc4c5cac0f22809243144251167626b9dfb Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 13 Jan 2010 23:17:17 +0100
+Subject: [PATCH] Drop inadequate variable from Makefile.am
+
+Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=298813
+---
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 4294bbe..aa66c78 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,4 @@
+-ACLOCAL_AMFLAGS = -I m4 $(ACLOCAL_FLAGS)
++ACLOCAL_AMFLAGS = -I m4
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libgsf-1.pc
+-- 
+1.6.6.rc3
+
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
index 2df1da29ad36..7c77b48e7682 100644
--- a/gnome-extra/libgsf/files/libgsf-1.14.16-gconf-automagic.patch
+++ b/gnome-extra/libgsf/files/libgsf-1.14.16-gconf-automagic.patch
@@ -1,23 +1,48 @@
-Fix automagic gconf for thumbnailer
+From 469631abe5b723ccabdcf9518bd0adf8fc767e89 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 13 Jan 2010 23:10:44 +0100
+Subject: [PATCH] Make gconf/thumbnailer dependency optional
 
-http://bugs.gentoo.org/attachment.cgi?id=207912&action=view
+This just needs gconf-2.m4 to be present in m4/ directory in order to
+run correctly.
 
+Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=289856
 ---
---- configure.in
-+++ configure.in
-@@ -499,21 +499,41 @@
+ configure.in |   39 +++++++++++++++++++++++++--------------
+ 1 files changed, 25 insertions(+), 14 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index 73948f9..c4860d6 100644
+--- a/configure.in
++++ b/configure.in
+@@ -499,21 +499,32 @@ AM_CONDITIONAL(WITH_LIBGSF_BONOBO, test $have_bonobo = yes)
  
  # ===================
  # 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
++AS_IF([test "$with_gconf" != "no"], [
++    PKG_CHECK_EXISTS([gconf-2.0 >= 2.24.0],[
++        AC_CHECK_PROG([GCONFTOOL], [gconftool-2], [gconftool-2], [no])
++        AS_IF([test "$GCONFTOOL" = "no"], [
++            AC_MSG_WARN([thumbnailer will not be built, unable to find gconftool-2])
++            have_gconf=no
++            ], [
++            have_gconf=yes
++            ])
++        ],[have_gconf=no])
++    ], [have_gconf=no])
++
++AS_IF([test "$have_gconf" = "yes"], [], [
++    AS_IF([test "$with_gconf" = "yes"],
++        [AC_MSG_ERROR([gconf support requested, but not available.])])
++    ])
++
++AM_GCONF_SOURCE_2
++AM_CONDITIONAL(WITH_GCONF, test "$have_gconf" = "yes")
  
 -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.
@@ -31,32 +56,12 @@ http://bugs.gentoo.org/attachment.cgi?id=207912&action=view
 -    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
+-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"
  
+-- 
+1.6.6.rc3
+
diff --git a/gnome-extra/libgsf/libgsf-1.14.11.ebuild b/gnome-extra/libgsf/libgsf-1.14.11.ebuild
deleted file mode 100644
index d36e850eb3b4..000000000000
--- a/gnome-extra/libgsf/libgsf-1.14.11.ebuild
+++ /dev/null
@@ -1,78 +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/libgsf/libgsf-1.14.11.ebuild,v 1.7 2009/04/12 21:02:43 bluebird 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.16
-	>=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.35.0
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-PDEPEND="gnome? ( media-gfx/imagemagick )"
-
-DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--with-gio
-		--disable-static
-		$(use_with bzip2 bz2)
-		$(use_with gnome gnome-vfs)
-		$(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
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/gsf
-}
diff --git a/gnome-extra/libgsf/libgsf-1.14.16.ebuild b/gnome-extra/libgsf/libgsf-1.14.16.ebuild
index 590aff02eaff..63c633268616 100644
--- a/gnome-extra/libgsf/libgsf-1.14.16.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4 2010/01/09 21:23:43 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.14.16.ebuild,v 1.5 2010/01/13 22:57:48 eva Exp $
 
 EAPI="2"
 GCONF_DEBUG="no"
@@ -9,11 +9,13 @@ inherit autotools eutils gnome2 python multilib
 
 DESCRIPTION="The GNOME Structured File Library"
 HOMEPAGE="http://www.gnome.org/"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/gnome-mplayer-0.9.6-gconf-2.m4.tgz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc gnome gtk python"
+IUSE="bzip2 doc gnome gtk python thumbnail"
 
 RDEPEND="
 	>=dev-libs/glib-2.16
@@ -21,16 +23,18 @@ RDEPEND="
 	sys-libs/zlib
 	bzip2? ( app-arch/bzip2 )
 	gnome? (
-		>=gnome-base/gconf-2
-		>=gnome-base/libbonobo-2 )
+		>=gnome-base/libbonobo-2
+		>=gnome-base/gnome-vfs-2.2 )
 	gtk? ( >=x11-libs/gtk+-2 )
 	python? (
 		>=dev-python/pygobject-2.10
-		>=dev-python/pygtk-2.10 )"
+		>=dev-python/pygtk-2.10 )
+	thumbnail? ( >=gnome-base/gconf-2 )"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=dev-util/intltool-0.35.0
+	dev-util/gtk-doc-am
 	doc? ( >=dev-util/gtk-doc-1 )"
 
 PDEPEND="gnome? ( media-gfx/imagemagick )"
@@ -42,18 +46,26 @@ pkg_setup() {
 		--with-gio
 		--disable-static
 		$(use_with bzip2 bz2)
-		$(use_with gnome gconf)
+		$(use_with gnome gnome-vfs)
 		$(use_with gnome bonobo)
 		$(use_with python)
-		$(use_with gtk gdk-pixbuf)"
+		$(use_with gtk gdk-pixbuf)
+		$(use_with thumbnail gconf)"
 }
 
 src_prepare() {
 	gnome2_src_prepare
 
-	# Fix gconf automagic, bug 289856
+	cp "${WORKDIR}/gnome-mplayer-0.9.6-gconf-2.m4" m4/ \
+		|| die "failed to copy gconf macro"
+
+	# Fix gconf automagic, bug #289856
 	epatch "${FILESDIR}/${P}-gconf-automagic.patch"
 
+	# Fix useless variable in toplevel Makefile.am, bug #298813
+	epatch "${FILESDIR}/${P}-automake-fixes.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
 	eautoreconf
 
 	# disable pyc compiling
diff --git a/gnome-extra/libgsf/metadata.xml b/gnome-extra/libgsf/metadata.xml
index 43c4f8a3a929..b228cecad9d7 100644
--- a/gnome-extra/libgsf/metadata.xml
+++ b/gnome-extra/libgsf/metadata.xml
@@ -4,6 +4,6 @@
 <herd>gnome</herd>
 <use>
 	<flag name="gtk">Enable use of gdk in thumbnailer</flag>
-	<!-- <flag name="thumbnail">Enable libgsf supported formats thumbnailer</flag> -->
+	<flag name="thumbnail">Enable libgsf supported formats thumbnailer</flag>
 </use>
 </pkgmetadata>