6 files changed, 28 insertions, 17 deletions
diff --git a/app-admin/fam/ChangeLog b/app-admin/fam/ChangeLog
index df9fbc2af81f..b4575133c24d 100644
--- a/app-admin/fam/ChangeLog
+++ b/app-admin/fam/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-admin/fam
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.35 2005/11/28 18:35:27 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/ChangeLog,v 1.36 2005/12/16 10:45:39 flameeyes Exp $
+
+  16 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> fam-2.7.0-r2.ebuild,
+  fam-2.7.0-r3.ebuild, fam-2.7.0-r4.ebuild:
+  Move elibtoolize at the end of src_unpack so that it's called with the final
+  autotools support. See bug #106176.
 
   28 Nov 2005; Hanno Boeck <hanno@gentoo.org> +files/fam-2.7.0-gcc41.patch,
   fam-2.7.0-r4.ebuild:
diff --git a/app-admin/fam/fam-2.7.0-r2.ebuild b/app-admin/fam/fam-2.7.0-r2.ebuild
index 5274fd7f537f..7c6b39582b74 100644
--- a/app-admin/fam/fam-2.7.0-r2.ebuild
+++ b/app-admin/fam/fam-2.7.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r2.ebuild,v 1.14 2005/10/02 11:34:24 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r2.ebuild,v 1.15 2005/12/16 10:45:39 flameeyes Exp $
 
 inherit libtool eutils gnuconfig
 
@@ -27,12 +27,12 @@ src_unpack() {
 	# Fix permission problems with user* in FEATURES (#35307)
 	chmod u+w ${S}/configure
 
+	gnuconfig_update
+	libtoolize --copy --force
+
 	# Please do not remove this again - fixes $S and $D in libtool linker
 	# scripts (.la files)
 	cd ${S}; elibtoolize
-
-	gnuconfig_update
-	libtoolize --copy --force
 }
 
 src_install() {
diff --git a/app-admin/fam/fam-2.7.0-r3.ebuild b/app-admin/fam/fam-2.7.0-r3.ebuild
index 364112f24014..f1ae07c20079 100644
--- a/app-admin/fam/fam-2.7.0-r3.ebuild
+++ b/app-admin/fam/fam-2.7.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r3.ebuild,v 1.2 2005/10/02 11:34:24 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r3.ebuild,v 1.3 2005/12/16 10:45:39 flameeyes Exp $
 
 inherit libtool eutils gnuconfig
 
@@ -31,12 +31,12 @@ src_unpack() {
 	# Fix permission problems with user* in FEATURES (#35307)
 	chmod u+w ${S}/configure
 
+	gnuconfig_update
+	libtoolize --copy --force
+
 	# Please do not remove this again - fixes $S and $D in libtool linker
 	# scripts (.la files)
 	cd ${S}; elibtoolize
-
-	gnuconfig_update
-	libtoolize --copy --force
 }
 
 src_install() {
diff --git a/app-admin/fam/fam-2.7.0-r4.ebuild b/app-admin/fam/fam-2.7.0-r4.ebuild
index aaee29154224..2635edc12f53 100644
--- a/app-admin/fam/fam-2.7.0-r4.ebuild
+++ b/app-admin/fam/fam-2.7.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r4.ebuild,v 1.3 2005/11/28 18:35:27 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/fam/fam-2.7.0-r4.ebuild,v 1.4 2005/12/16 10:45:39 flameeyes Exp $
 
 inherit libtool eutils gnuconfig
 
@@ -37,12 +37,12 @@ src_unpack() {
 	# Fix permission problems with user* in FEATURES (#35307)
 	chmod u+w ${S}/configure
 
-	# Please do not remove this again - fixes $S and $D in libtool linker
-	# scripts (.la files)
-	cd ${S}; elibtoolize
-
 	gnuconfig_update
 	libtoolize --copy --force
+
+	# Please do not remove this again - fixes $S and $D in libtool linker
+	# scripts (.la files)
+	elibtoolize
 }
 
 src_install() {
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 1abfe7bf9ed0..8b53c3e1a91e 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.197 2005/12/08 18:02:56 killerfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.198 2005/12/16 10:48:04 flameeyes Exp $
+
+  16 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  subversion-1.3.0_rc4.ebuild:
+  Move elibtoolize at the end of src_unpack so that it's called with the final
+  autotools support. See bug #106176.
 
   08 Dec 2005; Rene Nussbaumer <killerfox@gentoo.org>
   subversion-1.2.3-r3.ebuild:
diff --git a/dev-util/subversion/subversion-1.3.0_rc4.ebuild b/dev-util/subversion/subversion-1.3.0_rc4.ebuild
index fc665b685938..d4cf51ad156f 100644
--- a/dev-util/subversion/subversion-1.3.0_rc4.ebuild
+++ b/dev-util/subversion/subversion-1.3.0_rc4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.3.0_rc4.ebuild,v 1.4 2005/12/08 14:02:15 pauldv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.3.0_rc4.ebuild,v 1.5 2005/12/16 10:48:04 flameeyes Exp $
 
 inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module
 
@@ -66,12 +66,13 @@ src_unpack() {
 	epatch ${FILESDIR}/subversion-hotbackup-config.patch
 
 	export WANT_AUTOCONF=2.5
-	elibtoolize
 	autoconf
 	(cd apr; autoconf)
 	(cd apr-util; autoconf)
 	sed -i -e 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo "exported" \2,' Makefile.in
 
+	elibtoolize
+
 	use emacs && cp ${FILESDIR}/vc-svn.el ${S}/contrib/client-side/vc-svn.el
 }