Call has_multilib_profile from pkg_setup instead of global scope.

(Portage version: 2.0.51.22)

7 files changed, 32 insertions, 14 deletions

diff --git a/games-arcade/gish-demo/ChangeLog b/games-arcade/gish-demo/ChangeLog
index a4386419570d..15b0f66f41e1 100644
--- a/games-arcade/gish-demo/ChangeLog
+++ b/games-arcade/gish-demo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-arcade/gish-demo
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/gish-demo/ChangeLog,v 1.2 2005/04/19 21:47:57 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/gish-demo/ChangeLog,v 1.3 2005/08/11 20:32:37 flameeyes Exp $
+
+  11 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> gish-demo-1.0.0.ebuild:
+  Call has_multilib_profile from pkg_setup instead of global scope.
 
   19 Apr 2005; Herbie Hopkins <herbs@gentoo.org> gish-demo-1.0.0.ebuild:
   Multilib fixes, added ~amd64 keyword.
diff --git a/games-arcade/gish-demo/gish-demo-1.0.0.ebuild b/games-arcade/gish-demo/gish-demo-1.0.0.ebuild
index a97345e7bc96..6a60f9e09b86 100644
--- a/games-arcade/gish-demo/gish-demo-1.0.0.ebuild
+++ b/games-arcade/gish-demo/gish-demo-1.0.0.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/games-arcade/gish-demo/gish-demo-1.0.0.ebuild,v 1.2 2005/04/19 21:47:57 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/gish-demo/gish-demo-1.0.0.ebuild,v 1.3 2005/08/11 20:32:37 flameeyes Exp $
 
 inherit games eutils
 
@@ -23,8 +23,10 @@ RDEPEND="virtual/libc
 		>=app-emulation/emul-linux-x86-sdl-2.1
 	)"
 
-# Binary x86 package
-has_multilib_profile && ABI="x86"
+pkg_setup() {
+	# Binary x86 package
+	has_multilib_profile && ABI="x86"
+}
 
 S=${WORKDIR}/gishdemo
 
diff --git a/media-libs/libswf/ChangeLog b/media-libs/libswf/ChangeLog
index 47f68ac91c71..ee1a3ea7e5a8 100644
--- a/media-libs/libswf/ChangeLog
+++ b/media-libs/libswf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libswf
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libswf/ChangeLog,v 1.13 2005/06/21 19:24:24 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libswf/ChangeLog,v 1.14 2005/08/11 20:30:40 flameeyes Exp $
+
+  11 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> libswf-0.99.ebuild:
+  Call has_multilib_profile from pkg_setup instead of global scope.
 
   21 Jun 2005; Danny van Dyk <kugelfang@gentoo.org> libswf-0.99.ebuild:
   Fixed keywords. This package is natively x86 and doesn't run on hppa or ppc!
diff --git a/media-libs/libswf/libswf-0.99.ebuild b/media-libs/libswf/libswf-0.99.ebuild
index c25cfe9a5940..0ae5a80c6d6e 100644
--- a/media-libs/libswf/libswf-0.99.ebuild
+++ b/media-libs/libswf/libswf-0.99.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/media-libs/libswf/libswf-0.99.ebuild,v 1.19 2005/06/21 19:24:24 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libswf/libswf-0.99.ebuild,v 1.20 2005/08/11 20:30:40 flameeyes Exp $
 
 inherit multilib
 
@@ -14,7 +14,9 @@ LICENSE="as-is"
 KEYWORDS="x86 -sparc -ppc -hppa -mips amd64"
 IUSE=""
 
-has_multilib_profile && ABI=x86
+pkg_config() {
+	has_multilib_profile && ABI="x86"
+}
 
 DEPEND="virtual/libc
 	app-arch/unzip"
diff --git a/net-misc/icaclient/ChangeLog b/net-misc/icaclient/ChangeLog
index a0889d4b074e..cd1115f5dbb8 100644
--- a/net-misc/icaclient/ChangeLog
+++ b/net-misc/icaclient/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/icaclient
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/ChangeLog,v 1.22 2005/06/30 17:15:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/ChangeLog,v 1.23 2005/08/11 20:34:55 flameeyes Exp $
+
+  11 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  icaclient-8.0-r3.ebuild, icaclient-9.0.ebuild:
+  Call has_multilib_profile from pkg_setup instead of global scope.
 
   30 Jun 2005; Aron Griffis <agriffis@gentoo.org> icaclient-8.0-r3.ebuild:
   Fix use invocation: [ use gnome ] will never work
diff --git a/net-misc/icaclient/icaclient-8.0-r3.ebuild b/net-misc/icaclient/icaclient-8.0-r3.ebuild
index 5657defeba43..aa9cfd9440dd 100644
--- a/net-misc/icaclient/icaclient-8.0-r3.ebuild
+++ b/net-misc/icaclient/icaclient-8.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/net-misc/icaclient/icaclient-8.0-r3.ebuild,v 1.5 2005/06/30 17:15:14 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-8.0-r3.ebuild,v 1.6 2005/08/11 20:34:55 flameeyes Exp $
 
 inherit multilib
 
@@ -22,8 +22,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/usr"
 
-# Binary x86 package
-has_multilib_profile && ABI="x86"
+pkg_setup() {
+	# Binary x86 package
+	has_multilib_profile && ABI="x86"
+}
 
 pkg_nofetch() {
 	einfo "Please download ${A} yourself from www.citrix.com"
diff --git a/net-misc/icaclient/icaclient-9.0.ebuild b/net-misc/icaclient/icaclient-9.0.ebuild
index abb89c26165f..afa462d94f97 100644
--- a/net-misc/icaclient/icaclient-9.0.ebuild
+++ b/net-misc/icaclient/icaclient-9.0.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/net-misc/icaclient/icaclient-9.0.ebuild,v 1.2 2005/06/28 23:14:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/icaclient/icaclient-9.0.ebuild,v 1.3 2005/08/11 20:34:55 flameeyes Exp $
 
 inherit multilib
 
@@ -22,8 +22,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/usr"
 
-# Binary x86 package
-has_multilib_profile && ABI="x86"
+pkg_setup() {
+	# Binary x86 package
+	has_multilib_profile && ABI="x86"
+}
 
 pkg_nofetch() {
 	einfo "Please download ${A} yourself from www.citrix.com"