Fix bug 291339 -- need gconf-2.m4 for autoconf

Package-Manager: portage-2.1.7.2/cvs/Linux i686

4 files changed, 58 insertions, 15 deletions

diff --git a/app-text/evince/ChangeLog b/app-text/evince/ChangeLog
index bab48447b2bb..28c2b3bbf660 100644
--- a/app-text/evince/ChangeLog
+++ b/app-text/evince/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-text/evince
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.177 2009/10/29 21:19:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/ChangeLog,v 1.178 2009/11/01 10:38:20 nirbheek Exp $
+
+  01 Nov 2009; Nirbheek Chauhan <nirbheek@gentoo.org> +files/gconf-2.m4:
+  Fix bug 291339 -- need gconf-2.m4 for autoconf
 
   29 Oct 2009; Gilles Dartiguelongue <eva@gentoo.org> -evince-2.26.1.ebuild,
   +files/evince-2.27.4-smclient-configure.patch, +evince-2.28.1.ebuild,
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 56a1593deb7e..6beb9710d3a7 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,20 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX evince-0.7.1-display-menu.patch 476 RMD160 a16a5e1f32490a7db219442b23cbcf77773e6bdd SHA1 73a97e83b12ad80f6645339978717bcf8c7da575 SHA256 1f450dfe57ef3325cb4642141d76fc8e7bf837c221d81a2593214913af058f4d
 AUX evince-2.27.4-smclient-configure.patch 1994 RMD160 75e5952b1c4f74682c3e19e635849b29db4ff32a SHA1 1c9c65b4a6a66a5761055a90b0ac311c2624eaee SHA256 45d0323ef245bb50f7a64a6e457548356dbe4a5c07f798b5ebaab4ad310b2d65
+AUX gconf-2.m4 1579 RMD160 48aa5e5e77d4c024efb70b643403bec8969fe815 SHA1 5e3c4701f63b1b4614f48d94d03440af7155f119 SHA256 2c9a981afe5bba4486c8e0ddb66433aef4af953168bd254f6a5ba1c6692f80f8
 DIST evince-2.24.2.tar.bz2 1717166 RMD160 d038ac41e2d956011e294344e442317719149fb3 SHA1 918f8ec07c393cad4fea1c3315cd26ed384d65eb SHA256 aa6f29c93413e206b0e30fc241b4e5aa8d67c94baff50b9b92147543516e6bce
 DIST evince-2.26.2.tar.bz2 2033141 RMD160 00dd3dfa006dc019f8f951a356d7260283bf8bab SHA1 1a789e078b4c95f3e3387a45092ae2f222135013 SHA256 5165adb77af7dd355c600bc1fce4bcc7de2538ed02d0f87028660096a61af489
 DIST evince-2.28.1.tar.bz2 2033193 RMD160 6658e0516faffacd926de781da39c26e174ae182 SHA1 28fb2b9fa0bbe126d0275badcf6091e6e56d0e01 SHA256 c64047d4dc8424b613274651a5ef6bc78d306fc71bef36a3e033c07ddc2487a6
 EBUILD evince-2.24.2.ebuild 1690 RMD160 7a02554c58987ccbee819ccaa049027625b5fda6 SHA1 e25db42bd052f7a5c51215b3d9e50fc9b04ef04e SHA256 47ba66023934fc78dce7618fa34a89262c369ac6f6e4e4f2d753c2d1a30b333d
 EBUILD evince-2.26.2.ebuild 1894 RMD160 fa86fc71c2a144f04d28f6f574d08bb2684f7fa8 SHA1 cec080a1c933e98a230931b94135d27784c9543e SHA256 bf30df609f2465cc7e7dad10d9d5cc7bbbec5aff587c676ca5bec25d204ec9c3
-EBUILD evince-2.28.1.ebuild 2695 RMD160 394fe925348b3f991445fc5a2449d4741deb4b7b SHA1 69b29cb8a5cd25512c3e06b3ca930fdcc0225229 SHA256 be36142e52faaf97f548153c59fa1f108ff06aaae74195d8b79d7c9f0d5335e4
-MISC ChangeLog 25548 RMD160 fac002d2b66898967b693042a7bf991b6e380fa1 SHA1 3043dcba45cf7b2cbd13b7516b74a27080d9beee SHA256 79cc844fbe85e6849b7d2a844ebc02ed0d745d84bc9671b7f17a708be5aa74a8
+EBUILD evince-2.28.1.ebuild 2845 RMD160 16e9ac15b267925982ae6093e1bb5d129ffade4e SHA1 88eed142b335adb5b13dcb6dfa2a95af303dbf5a SHA256 94083415df06831268cec298c830fee4686082e33e4cfd98b3d02d48b0f5224c
+MISC ChangeLog 25676 RMD160 efc80ee2b605abe24d50c086449f8112259de0aa SHA1 e3ef96c8f4b1fe0844fd377d87ae040ac46a3b33 SHA256 099c33c1271625a929d1b447ba28e0ef93cf2bf3cb40d256e102988a5d19fdef
 MISC metadata.xml 601 RMD160 8963b582cc85e9e523b27d982d6d0c748f3a84ab SHA1 444f50d9a702cf170425b3808804ef9f50b4a8f7 SHA256 3f1878f2cb8b21146eadd2469f9d16b3c5a10c91d82e89093dffa3f38cf4d3e1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrqBswACgkQ1fmVwcYIWAY8HwCeKZmJ56mjCvCVoPkubnmXkofa
-blQAoLSe6naaYumE1dK+FJ+0NvShIH/8
-=JlUk
------END PGP SIGNATURE-----
diff --git a/app-text/evince/evince-2.28.1.ebuild b/app-text/evince/evince-2.28.1.ebuild
index 6bed8e79070a..5f94844f916e 100644
--- a/app-text/evince/evince-2.28.1.ebuild
+++ b/app-text/evince/evince-2.28.1.ebuild
@@ -1,6 +1,6 @@
- # Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.28.1.ebuild,v 1.1 2009/10/29 21:19:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/evince/evince-2.28.1.ebuild,v 1.2 2009/11/01 10:38:20 nirbheek Exp $
 
 EAPI="2"
 
@@ -88,6 +88,11 @@ src_prepare() {
 	# Make it libtool-1 compatible
 	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
 
+	# gconf-2.m4 is needed for autoconf; bug 291339
+	if ! use gnome; then
+		cp "${FILESDIR}/gconf-2.m4" m4/ || die "Copying gconf-2.m4 failed!"
+	fi
+
 	intltoolize --force --automake --copy || die "intltoolized failed"
 	eautoreconf
 }
diff --git a/app-text/evince/files/gconf-2.m4 b/app-text/evince/files/gconf-2.m4
new file mode 100644
index 000000000000..4a0936e44ed8
--- /dev/null
+++ b/app-text/evince/files/gconf-2.m4
@@ -0,0 +1,44 @@
+dnl AM_GCONF_SOURCE_2
+dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
+dnl  (i.e. pass to gconftool-2
+dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
+dnl  you should install foo.schemas files
+dnl
+
+AC_DEFUN([AM_GCONF_SOURCE_2],
+[
+  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
+    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  else
+    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
+  fi
+
+  AC_ARG_WITH([gconf-source],
+	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
+			     [Config database for installing schema files.]),
+	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
+
+  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
+  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
+
+  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+  fi
+
+  AC_ARG_WITH([gconf-schema-file-dir],
+	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
+			     [Directory for installing schema files.]),
+	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
+
+  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
+  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
+
+  AC_ARG_ENABLE(schemas-install,
+  	AC_HELP_STRING([--disable-schemas-install],
+		       [Disable the schemas installation]),
+     [case ${enableval} in
+       yes|no) ;;
+       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
+      esac])
+  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
+])