move code that updates the environment to src_compile since portage doesnt properly preserve env across functions #111821

Package-Manager: portage-2.0.53_rc7

2 files changed, 29 insertions, 24 deletions

diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 32f10df3a0d3..daa7cb2694e1 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,34 +1,34 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 7a45d471b2608afbcfac7b22f86726ce strace-4.5.7.ebuild 1139
-MD5 c9d8ca6c43099729a9c981ed49e94ce3 strace-4.5.9.ebuild 1429
-MD5 4474209bd9ff4ef6827bc37e512e6885 strace-4.5.2.ebuild 1311
-MD5 0ad191371a52a40b85dfb14db954593a strace-4.5.11.ebuild 1675
-MD5 85f383eadb2ed8c50c1a494e679bd2a2 strace-4.5.1.ebuild 1294
-MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 83c277c2c033acefaa5e264cb769a95a strace-4.5.12.ebuild 2048
 MD5 6b6c635f851bd91bd63539e100a72d92 ChangeLog 8279
+MD5 38e4a65d3a6a6e39695752ba68b2db78 files/digest-strace-4.5.1 65
+MD5 fdb191f71c367e18de7f236b17d51401 files/digest-strace-4.5.11 66
+MD5 9b1d73be67c2e1359d1490b62a2bb84e files/digest-strace-4.5.12 66
 MD5 b2d46a601a4bd117795f40178cf40612 files/digest-strace-4.5.2 65
-MD5 fcfff1ba9d728511b9b5f0aed7dacfba files/strace-4.5.8-ia64.patch 2855
-MD5 df94e08f4b2b33edc62a8e700bdb37ca files/strace-dont-use-REG_SYSCALL-for-sh.patch 630
-MD5 a60a27ad25c9a4be8f74cac3b50d26e1 files/strace-4.5.12-quota.patch 2947
-MD5 3d30271a2e23ac6401b2b54f99b91e5c files/strace-4.5.2-s390-april2004.diff 11986
-MD5 3eb9b0a09aef20e2fd45e7f6e73557d1 files/strace-4.5.11-fbsd.patch 4767
+MD5 332b30ad46b6f4ee72387a779580f321 files/digest-strace-4.5.7 65
 MD5 4cab7a7a05a80b3cc46421302239ab92 files/digest-strace-4.5.9 65
-MD5 661ca5a1974846c6f778c6c47d8b382e files/strace-undef-syscall.patch 656
+MD5 b7c93d383818fc6aa8ac330514b866e0 files/strace-4.5.1-2.6.patch 5756
 MD5 cbd6857cb3c5b57e1364ca621fb1a5b3 files/strace-4.5.11-alpha-stat64.patch 1418
+MD5 3eb9b0a09aef20e2fd45e7f6e73557d1 files/strace-4.5.11-fbsd.patch 4767
 MD5 7e0d1d3bda2b52b999b759872430d7f3 files/strace-4.5.12-libaio.patch 542
-MD5 332b30ad46b6f4ee72387a779580f321 files/digest-strace-4.5.7 65
-MD5 b7c93d383818fc6aa8ac330514b866e0 files/strace-4.5.1-2.6.patch 5756
-MD5 38e4a65d3a6a6e39695752ba68b2db78 files/digest-strace-4.5.1 65
+MD5 a60a27ad25c9a4be8f74cac3b50d26e1 files/strace-4.5.12-quota.patch 2947
+MD5 3d30271a2e23ac6401b2b54f99b91e5c files/strace-4.5.2-s390-april2004.diff 11986
+MD5 fcfff1ba9d728511b9b5f0aed7dacfba files/strace-4.5.8-ia64.patch 2855
+MD5 df94e08f4b2b33edc62a8e700bdb37ca files/strace-dont-use-REG_SYSCALL-for-sh.patch 630
 MD5 ff683dfacf57a09947ca5e6c4406249d files/strace-superh-update.patch 300
-MD5 9b1d73be67c2e1359d1490b62a2bb84e files/digest-strace-4.5.12 66
-MD5 fdb191f71c367e18de7f236b17d51401 files/digest-strace-4.5.11 66
+MD5 661ca5a1974846c6f778c6c47d8b382e files/strace-undef-syscall.patch 656
+MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 85f383eadb2ed8c50c1a494e679bd2a2 strace-4.5.1.ebuild 1294
+MD5 0ad191371a52a40b85dfb14db954593a strace-4.5.11.ebuild 1675
+MD5 9d5a85be9f376a319c54281d8bf41bb8 strace-4.5.12.ebuild 2092
+MD5 4474209bd9ff4ef6827bc37e512e6885 strace-4.5.2.ebuild 1311
+MD5 7a45d471b2608afbcfac7b22f86726ce strace-4.5.7.ebuild 1139
+MD5 c9d8ca6c43099729a9c981ed49e94ce3 strace-4.5.9.ebuild 1429
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDK0D8LLFUmVNQ7rkRAnh6AJ9BOHA1Ig036KPPHop5BvmYdr+h9QCghXp8
-dK58/M3kAU911hnvtOBDBVQ=
-=mmOP
+iD8DBQFDb+MhgIKl8Uu19MoRAm92AJ9BBqpgUdui/3EX8OPq7ZnXS/LWZQCdFTtX
+fXGwXUMz3JLuW9KCFLFLqFw=
+=eICn
 -----END PGP SIGNATURE-----
diff --git a/dev-util/strace/strace-4.5.12.ebuild b/dev-util/strace/strace-4.5.12.ebuild
index 42023b7eef0a..b42b1729bfb2 100644
--- a/dev-util/strace/strace-4.5.12.ebuild
+++ b/dev-util/strace/strace-4.5.12.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/strace/strace-4.5.12.ebuild,v 1.3 2005/08/24 02:11:15 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/strace/strace-4.5.12.ebuild,v 1.4 2005/11/07 23:27:48 vapier Exp $
 
 inherit flag-o-matic
 
@@ -37,7 +37,9 @@ src_unpack() {
 	# Remove some obsolete ia64-related hacks from the strace source
 	# (08 Feb 2005 agriffis)
 	epatch "${FILESDIR}"/strace-4.5.8-ia64.patch
+}
 
+src_compile() {
 	# This is ugly but linux26-headers-2.6.8.1-r2 (and other versions) has some
 	# issues with definition of s64 and friends.  This seems to solve
 	# compilation in this case (08 Feb 2005 agriffis)
@@ -48,7 +50,10 @@ src_unpack() {
 	filter-lfs-flags
 
 	use static && append-ldflags -static
-	use libaio || export ac_cv_header_libaio_h=no
+	use aio || export ac_cv_header_libaio_h=no
+
+	econf || die
+	emake || die
 }
 
 src_install() {