gnome-base/nautilus: Fix for autoconf 2.62, see Gnome Bug #527315

Package-Manager: portage-2.1.5_rc2

4 files changed, 25 insertions, 14 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 032465b93ccb..158fbb0ae0e7 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.261 2008/04/09 23:32:03 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.262 2008/04/10 10:27:38 remi Exp $
+
+  10 Apr 2008; Rémi Cardona <remi@gentoo.org>
+  +files/nautilus-2.22.2-fix_broken_configure.patch, nautilus-2.22.2.ebuild:
+  Fix for autoconf 2.62, see Gnome Bug #527315
 
 *nautilus-2.22.2 (10 Apr 2008)
 
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index c1d52bdc9cf2..72482e6096d4 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX nautilus-2.16.0-idl_include.patch 575 RMD160 8ee41c84f597683e2d34eea5acdb43f5592d3262 SHA1 738a2e9bb13aab07ed256e37af3ddc10fa2dfe0e SHA256 07cd75e4cf1c34c5fcd3f4d2257ae1d9c578cb2c2f014e69280e511de28862f0
 AUX nautilus-2.18.3-gtk2.12-compatibility.patch 971 RMD160 54636bdc4742cbe9874722df01336a295ee00191 SHA1 12f46a4dc023062d09e27753b53ef250fad0ec81 SHA256 87515b6a66a688fcc7f833f01a86c0ab2677aa238402765c5433e093bafcf278
 AUX nautilus-2.20.0-async-thumbnail-framing.patch 911 RMD160 c7886957cb703ef97b3210d4d84f9b21a261c634 SHA1 93c2ccfac58fb1832cdc726f2a7c19f423a1ac45 SHA256 80afad12814bc55540e0a98535a81b4fc9a409b7bfc58a06f0bd35a6b2cb89db
@@ -8,6 +5,7 @@ AUX nautilus-2.20.0-small-font-crasher.patch 492 RMD160 0ee8dacd7d83db84864c477b
 AUX nautilus-2.20.0-sound-preview-cleanup.patch 13013 RMD160 19f50049d52145d2f80326d96ededbed9f895671 SHA1 8a6e8e2340c9c5f64a02438ed5025fe3a5c2b164 SHA256 6b0e7f8c5b50b5ef54d6a075c90324be9b18164aa951fca612c58d31c7d63a38
 AUX nautilus-2.20.0-statfs.patch 470 RMD160 860c6179e0b2796b1bb44fb53caf38b243602de7 SHA1 586f1e438c8ffcd176b056992679b5c6e94fd533 SHA256 0d5cb2624ed32a1eb37ae9619604b2935ba56e22453aeabda36df75b79772623
 AUX nautilus-2.20.0-thumbnail-flashing.patch 4787 RMD160 d9cf1ace6cf1f367cfdd66317ee1bbfb96957b76 SHA1 db9503f51aefbe541aeb39541733543dcea551f2 SHA256 bec9d2a07c8b04137b50591b753e4913583dc673c889f44de40ddbadff5ab6ec
+AUX nautilus-2.22.2-fix_broken_configure.patch 609 RMD160 d5472a486da24afd15b45a7faf6975478cd29fd1 SHA1 84928f7ab3681ceac0537296d9d9dd96840c686b SHA256 e651559bdca5f3ba92278223ba01858e8984664d7c0c856698324ed9dc324e56
 AUX nautilus-2.22.2-no-esound.patch 2035 RMD160 6aa244b5962384a895bcbab386feb5058dc8e0fe SHA1 c134acdbfb566126a1788f1fc3fefdb6505bab1e SHA256 6abc000bf8f9e54b579ece3bf7ce2dbe7b1e4e660c79f0b148106d840e5d76d5
 DIST nautilus-2.18.1.tar.bz2 4325821 RMD160 3cdef422befc96bbd921f2f4788d302cf9249204 SHA1 c1922ebee16a5ecb51f27af24e19142b48120820 SHA256 b42e90788c14a4aecd748963135bf54fef20d7a19a448f7393d446028f73ec3b
 DIST nautilus-2.18.3.tar.bz2 4331118 RMD160 2069e1e9bb00c1ef6d942b114f8acda4776a06b0 SHA1 3f8eb87aa12080b67cb1f472655c10f03b440d4d SHA256 8ecc2b27f9e8e7f12ee2a84ae54d71d60c769e559f9952f8d792447e6f657c16
@@ -19,13 +17,6 @@ EBUILD nautilus-2.18.1-r1.ebuild 2305 RMD160 b5a84e47b839c5a164707cad8edb67ca4f4
 EBUILD nautilus-2.18.3-r1.ebuild 2374 RMD160 2852b0729446fccb353c3c2113edb741efe9e1f8 SHA1 61e745b88c08cad7def2f1317f32ee86eee5f949 SHA256 45d7a0dea50256f91cc671679aaf3ab273138b620739cd646e0425c0495871af
 EBUILD nautilus-2.20.0-r1.ebuild 2852 RMD160 870a3b07d593409b7b3cb785a64a58bcb012832a SHA1 99b7fc0d3af14e6c5fb3a4b02d2b3e051c264e79 SHA256 9e63abebe3d1cca2ef484610316c3d01d1f9a8a7b8e904f081257178c195a8cc
 EBUILD nautilus-2.22.1.ebuild 1931 RMD160 0d82d123e69a48e327faec70fcf82c0183bb0e03 SHA1 5cf69a84962e9c46ca68332db1571b3647ca899c SHA256 daa6ede365e48ee4bec509dd8557ef7a4463569cd1a07cf2af50314faa7743ef
-EBUILD nautilus-2.22.2.ebuild 1854 RMD160 f56cb9680f8333ec53bc56c370aed2186883ddb2 SHA1 d593dcf850d234f841635d7755de3c3a56a6bcf9 SHA256 ea08d68ff6b08736b12431752d8c2858dd22c26138b4601de35e9acae1f7b239
-MISC ChangeLog 35847 RMD160 af8fd11ba48b4c0f832d282037184a3dd40138f5 SHA1 e5b531a646648b13812134e7059f16a753624ab3 SHA256 d452161b0a96e50538077d47f0a945c97aaf997b911d33ed7ca5d8d3d4322274
+EBUILD nautilus-2.22.2.ebuild 1966 RMD160 059bd7979c0ed60a99dc6479013c7ccf8c32d81c SHA1 cc9f61601e99c37a9e48510fa5ea3aeafbdfb585 SHA256 f79f88d1909a91d105b557a41ee90261347bf3bc9b9d4240a4bb4d0268143f3a
+MISC ChangeLog 36020 RMD160 ea851766a7d93b518132c94ed2daf2a97d390563 SHA1 2fe48086f397dc21262bc3288c09d085d143e8de SHA256 abd07acdc96c7197672c3c8d8489cd7be44b2d569bcfdadbabffda745bab409b
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkf9biMACgkQ1fmVwcYIWAbv6QCgi5OxaLWYL94pnRChOzTWvIcT
-G9sAn1cEWufpKsEgGotjSnD3Oo8/0P/7
-=XADv
------END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/nautilus-2.22.2-fix_broken_configure.patch b/gnome-base/nautilus/files/nautilus-2.22.2-fix_broken_configure.patch
new file mode 100644
index 000000000000..68c75cc74d7f
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.22.2-fix_broken_configure.patch
@@ -0,0 +1,13 @@
+Index: nautilus-2.22.2/configure.in
+===================================================================
+--- nautilus-2.22.2.orig/configure.in
++++ nautilus-2.22.2/configure.in
+@@ -42,7 +42,7 @@ AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL
+ AC_SUBST(BONOBO_ACTIVATION_REQUIRED, [bonobo_activation_minver])
+ AC_SUBST(BONOBO_REQUIRED, [bonobo_minver])
+ AC_SUBST(EEL_REQUIRED, [eel_minver])
+-AC_SUBST(GLIB_REQUIRED [glib_minver])
++AC_SUBST(GLIB_REQUIRED, [glib_minver])
+ AC_SUBST(GNOME_DESKTOP_REQUIRED, [gnome_desktop_minver])
+ AC_SUBST(GNOME_REQUIRED, [gnome_minver])
+ AC_SUBST(GNOME_UI_REQUIRED, [gnome_ui_minver])
diff --git a/gnome-base/nautilus/nautilus-2.22.2.ebuild b/gnome-base/nautilus/nautilus-2.22.2.ebuild
index ef7d1d48cfc7..143fa9e46e42 100644
--- a/gnome-base/nautilus/nautilus-2.22.2.ebuild
+++ b/gnome-base/nautilus/nautilus-2.22.2.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-base/nautilus/nautilus-2.22.2.ebuild,v 1.1 2008/04/09 23:32:03 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.22.2.ebuild,v 1.2 2008/04/10 10:27:38 remi Exp $
 
 inherit virtualx eutils gnome2 autotools
 
@@ -50,6 +50,9 @@ src_unpack() {
 	# Disable compilation with esound
 	epatch "${FILESDIR}/${P}-no-esound.patch"
 
+	# Fix for autoconf 2.62, see Gnome Bug #527315
+	epatch "${FILESDIR}/${PN}-2.22.2-fix_broken_configure.patch"
+
 	eautoreconf
 }