Call has_multilib_profile from pkg_setup instead of global scope.

Package-Manager: portage-2.0.51.22

5 files changed, 36 insertions, 25 deletions

diff --git a/net-www/netscape-flash/ChangeLog b/net-www/netscape-flash/ChangeLog
index 9eaabe7b0b6e..3a6c5ffe0037 100644
--- a/net-www/netscape-flash/ChangeLog
+++ b/net-www/netscape-flash/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/netscape-flash
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/ChangeLog,v 1.29 2005/05/03 18:49:01 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/ChangeLog,v 1.30 2005/08/11 20:25:42 flameeyes Exp $
+
+  11 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
+  netscape-flash-6.0.79.ebuild, netscape-flash-6.0.81.ebuild,
+  netscape-flash-7.0.25.ebuild:
+  Call has_multilib_profile from pkg_setup instead of global scope.
 
   03 May 2005; Herbie Hopkins <herbs@gentoo.org>
   netscape-flash-7.0.25.ebuild:
diff --git a/net-www/netscape-flash/Manifest b/net-www/netscape-flash/Manifest
index 464bed2d4c7d..a29268d67829 100644
--- a/net-www/netscape-flash/Manifest
+++ b/net-www/netscape-flash/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ed0d7c1f88417c91836ca8820ed56d6a netscape-flash-6.0.81.ebuild 1513
-MD5 a18ec0550b4cd80b68a137f0b52efd68 netscape-flash-6.0.79.ebuild 1358
-MD5 83aebb40beaa19376bbcb583d63f64a1 netscape-flash-7.0.25.ebuild 1536
-MD5 e7d3465b8365861bcab88f2303650a3d ChangeLog 4531
+MD5 8c4958d42f12cabd046deecfc99ba1ef ChangeLog 4751
+MD5 c0b7d5dc430c3492628e1088d52b18a9 netscape-flash-6.0.81.ebuild 1533
+MD5 1f0e3b26bbf9e1f9832408e627cbf3b9 netscape-flash-7.0.25.ebuild 1560
+MD5 d2a6cc4c1fe1cdf774c1216dc43b7e33 netscape-flash-6.0.79.ebuild 1378
+MD5 12d4887a4d1906a8d8a558f6607ad579 files/digest-netscape-flash-7.0.25 142
 MD5 49a191691f09c2436f41c87d3ca8b276 files/digest-netscape-flash-6.0.79 144
 MD5 553a045f5175d5cb331b737777e17cc0 files/digest-netscape-flash-6.0.81 144
-MD5 12d4887a4d1906a8d8a558f6607ad579 files/digest-netscape-flash-7.0.25 142
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFCd8e32G5bA0cA/ScRAtHzAKDkoelIW3LSJ25irYu5WyoQXpS2VACcCcr1
-/HXNj8snHo++vaPU+lbfleE=
-=fVgH
+iD4DBQFC+7Rjj5H05b2HAEkRAlOIAJdjhGm8XeFH/YtOcpZA4Y+UAO17AJ9FTZXR
+RjV8DfsvYr3+aM6By4iMwA==
+=PuGt
 -----END PGP SIGNATURE-----
diff --git a/net-www/netscape-flash/netscape-flash-6.0.79.ebuild b/net-www/netscape-flash/netscape-flash-6.0.79.ebuild
index 4d9fa77f8cfb..fabddfc79501 100644
--- a/net-www/netscape-flash/netscape-flash-6.0.79.ebuild
+++ b/net-www/netscape-flash/netscape-flash-6.0.79.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-www/netscape-flash/netscape-flash-6.0.79.ebuild,v 1.5 2005/03/26 23:25:03 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/netscape-flash-6.0.79.ebuild,v 1.6 2005/08/11 20:25:42 flameeyes Exp $
 
 inherit nsplugins
 
@@ -25,10 +25,12 @@ DEPEND="!net-www/gplflash
 
 RESTRICT="nostrip"
 
-# This is a binary x86 package => ABI=x86
-# Please keep this in future versions
-# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
-has_multilib_profile && ABI="x86"
+pkg_setup() {
+	# This is a binary x86 package => ABI=x86
+	# Please keep this in future versions
+	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
+	has_multilib_profile && ABI="x86"
+}
 
 src_install() {
 	exeinto /opt/netscape/plugins
diff --git a/net-www/netscape-flash/netscape-flash-6.0.81.ebuild b/net-www/netscape-flash/netscape-flash-6.0.81.ebuild
index decd04789856..fc72aa2ab36a 100644
--- a/net-www/netscape-flash/netscape-flash-6.0.81.ebuild
+++ b/net-www/netscape-flash/netscape-flash-6.0.81.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-www/netscape-flash/netscape-flash-6.0.81.ebuild,v 1.5 2005/03/26 23:25:03 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/netscape-flash-6.0.81.ebuild,v 1.6 2005/08/11 20:25:42 flameeyes Exp $
 
 inherit nsplugins
 
@@ -28,10 +28,12 @@ DEPEND="!net-www/gplflash
 
 RESTRICT="nostrip"
 
-# This is a binary x86 package => ABI=x86
-# Please keep this in future versions
-# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
-has_multilib_profile && ABI="x86"
+pkg_setup() {
+	# This is a binary x86 package => ABI=x86
+	# Please keep this in future versions
+	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
+	has_multilib_profile && ABI="x86"
+}
 
 src_install() {
 	exeinto /opt/netscape/plugins
diff --git a/net-www/netscape-flash/netscape-flash-7.0.25.ebuild b/net-www/netscape-flash/netscape-flash-7.0.25.ebuild
index 655ab0c8ae4c..21821f8869ae 100644
--- a/net-www/netscape-flash/netscape-flash-7.0.25.ebuild
+++ b/net-www/netscape-flash/netscape-flash-7.0.25.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-www/netscape-flash/netscape-flash-7.0.25.ebuild,v 1.8 2005/05/03 18:49:01 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/netscape-flash/netscape-flash-7.0.25.ebuild,v 1.9 2005/08/11 20:25:42 flameeyes Exp $
 
 inherit nsplugins
 
@@ -28,10 +28,12 @@ DEPEND="!net-www/gplflash
 
 RESTRICT="nostrip"
 
-# This is a binary x86 package => ABI=x86
-# Please keep this in future versions
-# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
-has_multilib_profile && ABI="x86"
+pkg_setup() {
+	# This is a binary x86 package => ABI=x86
+	# Please keep this in future versions
+	# Danny van Dyk <kugelfang@gentoo.org> 2005/03/26
+	has_multilib_profile && ABI="x86"
+}
 
 src_install() {
 	exeinto /opt/netscape/plugins