Call has_multilib_profile from pkg_setup instead of global scope.

Package-Manager: portage-2.0.51.22

4 files changed, 24 insertions, 16 deletions

diff --git a/app-text/acroread/ChangeLog b/app-text/acroread/ChangeLog
index faffb6ca3328..ed20224eb036 100644
--- a/app-text/acroread/ChangeLog
+++ b/app-text/acroread/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/acroread
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.58 2005/08/04 22:50:16 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/ChangeLog,v 1.59 2005/08/11 20:21:39 flameeyes Exp $
+
+  11 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> acroread-5.10.ebuild,
+  acroread-7.0.0.2-r2.ebuild:
+  Call has_multilib_profile from pkg_setup instead of global scope.
 
   04 Aug 2005; Herbie Hopkins <herbs@gentoo.org> acroread-7.0.0.2-r2.ebuild:
   Don't disable security plugin on amd64 any more since we have openldap in
diff --git a/app-text/acroread/Manifest b/app-text/acroread/Manifest
index 73c983daa041..ac757eb4b1c7 100644
--- a/app-text/acroread/Manifest
+++ b/app-text/acroread/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ba88c2ff0e08c00288227c411a819ca8 acroread-7.0.0.2-r2.ebuild 2657
-MD5 5b5f9119fe3b2a9644cd0730e9ed9ded acroread-5.10.ebuild 2488
-MD5 e58b89abab562f73d287a6234557956a ChangeLog 10507
+MD5 16adb6d3099c0f25e3ffe8d216013dd1 ChangeLog 10685
+MD5 520bad9028981b2837696c4f7a4f84b4 acroread-5.10.ebuild 2511
+MD5 1c354fb50b3efd928ed8cf97e23620df acroread-7.0.0.2-r2.ebuild 2680
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
-MD5 26bef9104ff02da783b459c37981f406 files/digest-acroread-7.0.0.2-r2 553
 MD5 d0981fc5a58874b78a6f2a2b73d3e43d files/digest-acroread-5.10 63
+MD5 26bef9104ff02da783b459c37981f406 files/digest-acroread-7.0.0.2-r2 553
 MD5 00414d6be2296740cc5225ca93a3d035 files/acroread-scim.patch 488
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC8pu22G5bA0cA/ScRAq6eAKCjEjwlbM2JxYnyoyaCCpGWsNuQrQCgp44a
-gTjBdbg7qQ/BvYd9x489MyU=
-=u3PT
+iD8DBQFC+7Nrj5H05b2HAEkRAlwEAJ4g6aoGe6MObD4rBoMypirtDCdsJgCeJVyu
+Yl5nFB+ZWY+2j4tqYtkOWoQ=
+=nGTd
 -----END PGP SIGNATURE-----
diff --git a/app-text/acroread/acroread-5.10.ebuild b/app-text/acroread/acroread-5.10.ebuild
index e1d20e4bf6f7..65dfc2baf98f 100644
--- a/app-text/acroread/acroread-5.10.ebuild
+++ b/app-text/acroread/acroread-5.10.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-text/acroread/acroread-5.10.ebuild,v 1.7 2005/03/28 15:54:53 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-5.10.ebuild,v 1.8 2005/08/11 20:21:39 flameeyes Exp $
 
 inherit nsplugins eutils
 
@@ -25,9 +25,11 @@ INSTALLDIR=/opt/Acrobat5
 
 S="${WORKDIR}/installers"
 
-# x86 binary package, ABI=x86
-# Danny van Dyk <kugelfang@gentoo.org> 2005/03/25
-has_multilib_profile && ABI="x86"
+pkg_setup() {
+	# x86 binary package, ABI=x86
+	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/25
+	has_multilib_profile && ABI="x86"
+}
 
 pkg_setup() {
 	if ! use noplugin ; then
diff --git a/app-text/acroread/acroread-7.0.0.2-r2.ebuild b/app-text/acroread/acroread-7.0.0.2-r2.ebuild
index f4a36b4e7760..4e55de4bad35 100644
--- a/app-text/acroread/acroread-7.0.0.2-r2.ebuild
+++ b/app-text/acroread/acroread-7.0.0.2-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-text/acroread/acroread-7.0.0.2-r2.ebuild,v 1.5 2005/08/04 22:50:16 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/acroread/acroread-7.0.0.2-r2.ebuild,v 1.6 2005/08/11 20:21:39 flameeyes Exp $
 
 inherit nsplugins eutils rpm versionator
 
@@ -32,9 +32,11 @@ INSTALLDIR=/opt/Acrobat7
 
 S=${WORKDIR}/usr/local/Adobe/Acrobat7.0
 
-# x86 binary package, ABI=x86
-# Danny van Dyk <kugelfang@gentoo.org> 2005/03/25
-has_multilib_profile && ABI="x86"
+pkg_setup() {
+	# x86 binary package, ABI=x86
+	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/25
+	has_multilib_profile && ABI="x86"
+}
 
 src_unpack() {
 	rpm_src_unpack