Also add configure fix to latest unmasked version.

Package-Manager: portage-2.2_pre5

4 files changed, 28 insertions, 8 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 158fbb0ae0e7..d07ae5c38d89 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,11 @@
 # 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.262 2008/04/10 10:27:38 remi Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.263 2008/04/20 02:18:33 vapier Exp $
+
+  20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/nautilus-2.20.0-fix_broken_configure.patch,
+  nautilus-2.20.0-r1.ebuild:
+  Also add configure fix to latest unmasked version.
 
   10 Apr 2008; Rémi Cardona <remi@gentoo.org>
   +files/nautilus-2.22.2-fix_broken_configure.patch, nautilus-2.22.2.ebuild:
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 5b57e2bab777..733a30741fd1 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -4,6 +4,7 @@ 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
+AUX nautilus-2.20.0-fix_broken_configure.patch 437 RMD160 9bacd41cc689561f2d31e104100a2f6d542ca0f0 SHA1 bc170c178f72527e307e4c13c53aa674e979637a SHA256 a396a5192041c32ca0d44d080230ed70e85e9f6e0f8191977ea9edbbf7edeaf2
 AUX nautilus-2.20.0-small-font-crasher.patch 492 RMD160 0ee8dacd7d83db84864c477b59a375563c016591 SHA1 6306c38a91d6d6f8fcf609a5f3bacabc7bb86eda SHA256 b1d4b3ebd00569df1aa8e40e8f5bb5199f73167267b81c18c165991748713eb4
 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
@@ -18,15 +19,15 @@ DIST nautilus-2.22.1.tar.bz2 5139139 RMD160 2781ffc661f3b5ff44f63ade9258496ea791
 DIST nautilus-2.22.2.tar.bz2 5032921 RMD160 26787ee2e62e49acf5a03d4792e16a00034dd751 SHA1 fe20dfbfbd21e06dcb4fbb471cdb957c2d96f5cf SHA256 0abf783260ce3c60ffe28c14cb932384b2a1f67b92ba1a1d017a1e8880d05433
 EBUILD nautilus-2.18.1-r1.ebuild 2305 RMD160 b5a84e47b839c5a164707cad8edb67ca4f49fe55 SHA1 1be7eaebbd037bbabb01740515705e93e3b48a92 SHA256 7ecb1c790ee242f62bcc8a25e1da7988b5e50fd2af3fffc9a72bbbd059e5e7af
 EBUILD nautilus-2.18.3-r1.ebuild 2375 RMD160 2d1076296dfbfcb6de666e5349f36a3f9b5e5605 SHA1 534f4c3b70c254605f13c2530c47d6d8cef731c4 SHA256 eec77ac35f3383ae41b28806a510728a4b2786cd3b36bfe7a5287a2031b695f7
-EBUILD nautilus-2.20.0-r1.ebuild 2853 RMD160 58c71214c44ff35dd82b96157e6ddd16f239832c SHA1 45ceda164b3eb0a80ebf34a71a09fbe34a909d30 SHA256 dc89ed3b9bf69c2b607ded503a6904a22b7803e31762184c178d8c85d40bc1c4
+EBUILD nautilus-2.20.0-r1.ebuild 2964 RMD160 76dba02ab2886d3c655a2722024bd30161f72444 SHA1 d9d8156025de2342e6f73ea89b6455083d4182ff SHA256 dfa60ad31c56184611645499990aa8103f22c0ca23ca3c7f71770a4c6703f97a
 EBUILD nautilus-2.22.1.ebuild 1931 RMD160 23d7165c98dbbbb819ec60dca3fceae0b284126e SHA1 630345340c0c9e19cdef4a7bf690edbc9b258fd7 SHA256 b6e8eb64f7cfd2395b44e96a2669c1d20167c4b0209504e1ded52934a8e54d65
 EBUILD nautilus-2.22.2.ebuild 1965 RMD160 39e25052fa91a431d3edd7b79ef4138f49885a14 SHA1 f6b2041d54806435a879624961961b9d99188568 SHA256 2231520d7b06c0004c5f1b457f7e887887a29c4f96b6337ae5f1a7108a7101da
-MISC ChangeLog 36020 RMD160 ea851766a7d93b518132c94ed2daf2a97d390563 SHA1 2fe48086f397dc21262bc3288c09d085d143e8de SHA256 abd07acdc96c7197672c3c8d8489cd7be44b2d569bcfdadbabffda745bab409b
+MISC ChangeLog 36208 RMD160 5a2049a15ec410fd5df1c058a17f30de9b4b97e5 SHA1 2d6ac0820df95b53eab3dc83b37f1135a9e8d945 SHA256 d92ea1b09a19b8db3d561f16a025a1efda40efdc549f847278a7cdbc584e42e7
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFICp4mj9hvisErhMIRAqBVAJsHFiy7RaE4KefZIIWlmQuE7kYZgQCfQJrF
-4xq/K0A12usFJ8w3Q8Ev22w=
-=DUly
+iD8DBQFICqf/j9hvisErhMIRAmVtAJ9QMb9pKGAgo5o/HuTPmQlUyHteogCdHa/x
+/5q5uTiIYlMPvmjppKi8EtA=
+=PYsF
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/nautilus-2.20.0-fix_broken_configure.patch b/gnome-base/nautilus/files/nautilus-2.20.0-fix_broken_configure.patch
new file mode 100644
index 000000000000..bdf4941fca88
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.20.0-fix_broken_configure.patch
@@ -0,0 +1,11 @@
+--- nautilus-2.20.0/configure.in
++++ nautilus-2.20.0/configure.in
+@@ -42,7 +42,7 @@
+ AC_SUBST(BONOBO_REQUIRED, [bonobo_minver])
+ AC_SUBST(EEL_REQUIRED, [eel_minver])
+ AC_SUBST(ESOUND_REQUIRED, [esound_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.20.0-r1.ebuild b/gnome-base/nautilus/nautilus-2.20.0-r1.ebuild
index 7bc4838af98f..25879598125b 100644
--- a/gnome-base/nautilus/nautilus-2.20.0-r1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.20.0-r1.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.20.0-r1.ebuild,v 1.10 2008/04/20 01:35:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.20.0-r1.ebuild,v 1.11 2008/04/20 02:18:33 vapier Exp $
 
 inherit virtualx eutils gnome2 autotools
 
@@ -68,6 +68,9 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-thumbnail-flashing.patch"
 	epatch "${FILESDIR}/${P}-small-font-crasher.patch"
 
+	# Fix for autoconf 2.62, see Gnome Bug #527315
+	epatch "${FILESDIR}/${PN}-2.20.0-fix_broken_configure.patch"
+
 	eautoreconf
 }