preserve some macros, use eautoreconf, fixes #144350

Package-Manager: portage-2.1.1_pre5-r1

3 files changed, 22 insertions, 17 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index 1677e5430db6..a66c3fb1309e 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.208 2006/08/16 14:22:21 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.209 2006/08/18 22:59:37 allanonjl Exp $
+
+  18 Aug 2006; John N. Laliberte <allanonjl@gentoo.org>
+  gnome-vfs-1.0.5-r4.ebuild:
+  preserve some macros, use eautoreconf, fixes #144350
 
   16 Aug 2006; Markus Rothe <corsair@gentoo.org> gnome-vfs-2.14.2.ebuild:
   Stable on ppc64
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index aef756a9d295..1ae9b91f3af9 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -54,10 +54,10 @@ DIST gnome-vfs-1.0.5.tar.gz 1048954 RMD160 76fbf8e590e41d2cac39faef9edc85e2df02c
 DIST gnome-vfs-2.12.1.1.tar.bz2 1726588 RMD160 b96cd620ce60131c0ff467fd277d89ac76419e09 SHA1 48e484663f0d0f5e2a858d2f6e6a5a702e831734 SHA256 c6294cb9553a0d059ac307427b8ac89048103d48255996a879686a74024cd01c
 DIST gnome-vfs-2.12.2.tar.bz2 1558218 RMD160 831d83c791631e7273fdebec1047da6055757104 SHA1 fa8248e18cb8b44f617a5b1bb776df37628828ea SHA256 46f80ead7c52a8c5a3fa7beac2d42385c6bc9552fa28aa5068e1a251d708e177
 DIST gnome-vfs-2.14.2.tar.bz2 1816194 RMD160 e0a67e3576d72a86c898208a93ad8ee52f72f870 SHA1 ffd2e5f229495f55587d8499e5f2b8b8a76e5448 SHA256 15da9d174d2373826a6921c8af2aac18aa64c6d93ac201903c9fb432e142bba7
-EBUILD gnome-vfs-1.0.5-r4.ebuild 2157 RMD160 9aba5043e0859f8b9c2d9e749ed961a36d4393e2 SHA1 ee733796f12b5bb2ba2cedb70618af446be0d01d SHA256 cfdde0b063a2bfb649e10e98ae597d86ca9a9fb73a3cfc762122af5598cad510
-MD5 741604f50f8d50c6a98529a601a9b79e gnome-vfs-1.0.5-r4.ebuild 2157
-RMD160 9aba5043e0859f8b9c2d9e749ed961a36d4393e2 gnome-vfs-1.0.5-r4.ebuild 2157
-SHA256 cfdde0b063a2bfb649e10e98ae597d86ca9a9fb73a3cfc762122af5598cad510 gnome-vfs-1.0.5-r4.ebuild 2157
+EBUILD gnome-vfs-1.0.5-r4.ebuild 2353 RMD160 f67118f302bb75b9d45cf72eeb0af24167604046 SHA1 b2a2d59144e253072f618d60fbefd800c695bb23 SHA256 69d58ae0312b71117d6a18a98562565a73672635d7a842f219a11bbd3c1c66c4
+MD5 0ab98d8b1c0b25c5e107287db9adb023 gnome-vfs-1.0.5-r4.ebuild 2353
+RMD160 f67118f302bb75b9d45cf72eeb0af24167604046 gnome-vfs-1.0.5-r4.ebuild 2353
+SHA256 69d58ae0312b71117d6a18a98562565a73672635d7a842f219a11bbd3c1c66c4 gnome-vfs-1.0.5-r4.ebuild 2353
 EBUILD gnome-vfs-2.12.1.1-r1.ebuild 2161 RMD160 f6d195e3ceeeaeafac91b848b536ae68eb26883f SHA1 8e87e02375cf0d84bf9049097dc5150b6fea3cac SHA256 80da8db22c5c9da32f5f03926e924a19b9902799d56f35d75a61666dafec6449
 MD5 72157111f2d012cdcfff224a8cac70ce gnome-vfs-2.12.1.1-r1.ebuild 2161
 RMD160 f6d195e3ceeeaeafac91b848b536ae68eb26883f gnome-vfs-2.12.1.1-r1.ebuild 2161
@@ -74,10 +74,10 @@ EBUILD gnome-vfs-2.14.2.ebuild 1866 RMD160 d67e69a61afae1d737f24ccf0466bef1e0489
 MD5 1bc0166b4786d568b1e989079caa0663 gnome-vfs-2.14.2.ebuild 1866
 RMD160 d67e69a61afae1d737f24ccf0466bef1e04892c4 gnome-vfs-2.14.2.ebuild 1866
 SHA256 687c7f6511862c5c88d6c676b5391a4b1159a24bc70b4c2a4572178f2a775461 gnome-vfs-2.14.2.ebuild 1866
-MISC ChangeLog 26253 RMD160 e067b60b8718a5c875d26cd8d834319a43ced999 SHA1 a998cc00f2df8ebc89f37b89f490b391e8ba6002 SHA256 c5011debb5cec869a1a0d3350411cc7b6b652a709e14c15a4297a5b57ad1b308
-MD5 944126a6c3fa9faf9656f5b410d41b2e ChangeLog 26253
-RMD160 e067b60b8718a5c875d26cd8d834319a43ced999 ChangeLog 26253
-SHA256 c5011debb5cec869a1a0d3350411cc7b6b652a709e14c15a4297a5b57ad1b308 ChangeLog 26253
+MISC ChangeLog 26396 RMD160 79c7c65fb1e750a5f5674482e1a83201344122d8 SHA1 9ffd0aedda215858dff30d258705fe3d716ad89c SHA256 ba11112e8896477f5558ba3bfc7b2ac70987a45966c45c299685b858b3c67244
+MD5 b313c4ebc6e7a4e96836a4ce51820749 ChangeLog 26396
+RMD160 79c7c65fb1e750a5f5674482e1a83201344122d8 ChangeLog 26396
+SHA256 ba11112e8896477f5558ba3bfc7b2ac70987a45966c45c299685b858b3c67244 ChangeLog 26396
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
diff --git a/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild b/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild
index dcbcd944a07d..0a1cefac3bf4 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild,v 1.13 2006/08/15 14:28:11 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-1.0.5-r4.ebuild,v 1.14 2006/08/18 22:59:37 allanonjl Exp $
 
-inherit eutils libtool toolchain-funcs
+inherit eutils libtool toolchain-funcs autotools
 
 DESCRIPTION="GNOME Virtual File System"
 HOMEPAGE="http://www.gnome.org/"
@@ -29,9 +29,9 @@ DEPEND="${RDEPEND}
 # gnome-common is for m4 macros needed for patches ...
 
 src_unpack() {
-	unpack ${A}
-
+	unpack "${A}"
 	cd "${S}"
+
 	# Add missing macros for charset conversion
 	epatch "${FILESDIR}"/1.0/${P}-codeset.patch
 	# Use GNOME2 Gconf keys for proxy settings
@@ -53,11 +53,12 @@ src_unpack() {
 	# CAN-2005-0706 (#84936)
 	epatch "${FILESDIR}"/${PN}-2-CAN-2005-0706.patch
 
-	autoheader || die
-	aclocal -I /usr/share/aclocal/gnome-macros || die
-	autoconf || die
+	# preserve some macros
+	sed -n -e '/AC_DEFUN(XML_I18N_TOOLS_NEWER_THAN_0_9/,/# Like AC_CONFIG_HEADER,/p' aclocal.m4 > old_macros.m4
+
+	sed -n -e '/# Check whether LC_MESSAGES/,/dnl AM_PATH_GCONF/p' aclocal.m4 >> old_macros.m4
 
-	elibtoolize
+	AT_M4DIR=". /usr/share/aclocal/gnome-macros" eautoreconf
 }
 
 src_compile() {