Fixed BUG #85654.

Package-Manager: portage-2.0.51.19

6 files changed, 45 insertions, 10 deletions

diff --git a/www-client/mozilla-bin/ChangeLog b/www-client/mozilla-bin/ChangeLog
index 6c0485748c94..7ae0d618c4d9 100644
--- a/www-client/mozilla-bin/ChangeLog
+++ b/www-client/mozilla-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/mozilla-bin
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/ChangeLog,v 1.7 2005/03/25 10:50:56 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/ChangeLog,v 1.8 2005/03/30 20:05:36 kugelfang Exp $
+
+  30 Mar 2005; Danny van Dyk <kugelfang@gentoo.org>
+  mozilla-bin-1.7.2.ebuild, mozilla-bin-1.7.3.ebuild,
+  mozilla-bin-1.7.5.ebuild, mozilla-bin-1.7.6-r1.ebuild:
+  Fixed BUG #85654. Plugins are now installed under lib32 on amd64.
 
   25 Mar 2005; <blubb@gentoo.org> mozilla-bin-1.7.6-r1.ebuild:
   stable on amd64 wrt bug #84074
diff --git a/www-client/mozilla-bin/Manifest b/www-client/mozilla-bin/Manifest
index 3bbc486013ef..bd9003f4cc72 100644
--- a/www-client/mozilla-bin/Manifest
+++ b/www-client/mozilla-bin/Manifest
@@ -1,12 +1,22 @@
-MD5 cd322274cf8756e4e8198fd3bba57bd5 ChangeLog 2372
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0d51874adfe82518d2995df9b804701c ChangeLog 2608
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 8262141effb1727b0975fd755946aa42 mozilla-bin-1.7.2.ebuild 2112
-MD5 74503fe0e1bb46dfcae4a1a90776c6eb mozilla-bin-1.7.3.ebuild 2108
-MD5 b95cabd6e875d564c3a44b6c1adb85fd mozilla-bin-1.7.5.ebuild 2108
-MD5 272ec6e7d05d8fc5fb431bfb66426166 mozilla-bin-1.7.6-r1.ebuild 2399
+MD5 e4f9cfa8c44ab1b43955852a72ab4581 mozilla-bin-1.7.2.ebuild 2279
+MD5 4a1f583d59d6381bf8f45d7dd9c55dab mozilla-bin-1.7.3.ebuild 2275
+MD5 b7fadf818a399132345c8693a096622a mozilla-bin-1.7.5.ebuild 2275
+MD5 5bb7c6482fdd417ddb4c0ebf60136e34 mozilla-bin-1.7.6-r1.ebuild 2568
 MD5 20d752803fe0a78a4167a6100d4209cb files/digest-mozilla-bin-1.7.2 85
 MD5 3ac1f23690d1f3208ac0d9ef0e680e23 files/digest-mozilla-bin-1.7.3 85
 MD5 018ecd12fcb5cd65246173770adb9638 files/digest-mozilla-bin-1.7.5 85
 MD5 ae88c11f0026aa7f8462f1f5da667795 files/digest-mozilla-bin-1.7.6-r1 85
 MD5 6d52ff4ce4567db1cad08ea40157a65d files/mozilla-bin-icon.png 2350
 MD5 4eac4e98b875ba3b652d6626756f5517 files/mozilla-bin.desktop 184
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFCSwgI5mJXAu5GbtIRAnfBAJ4xCTv0dy9NsC0m/MPMhWucJeQyXgCfQqjE
+HJy8cucITUsx+NCoHAEesNQ=
+=YrHX
+-----END PGP SIGNATURE-----
diff --git a/www-client/mozilla-bin/mozilla-bin-1.7.2.ebuild b/www-client/mozilla-bin/mozilla-bin-1.7.2.ebuild
index 6ccba53cb460..fe99d62f12f1 100644
--- a/www-client/mozilla-bin/mozilla-bin-1.7.2.ebuild
+++ b/www-client/mozilla-bin/mozilla-bin-1.7.2.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/www-client/mozilla-bin/mozilla-bin-1.7.2.ebuild,v 1.2 2005/03/23 20:04:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/mozilla-bin-1.7.2.ebuild,v 1.3 2005/03/30 20:05:36 kugelfang Exp $
 
 inherit nsplugins eutils mozilla-launcher
 
@@ -37,6 +37,11 @@ RDEPEND="virtual/x11
 	virtual/x11
 	>=www-client/mozilla-launcher-1.13"
 
+# 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() {
 	# Install mozilla in /opt
 	dodir /opt
diff --git a/www-client/mozilla-bin/mozilla-bin-1.7.3.ebuild b/www-client/mozilla-bin/mozilla-bin-1.7.3.ebuild
index 7502b13fb75c..5bec1eeef89f 100644
--- a/www-client/mozilla-bin/mozilla-bin-1.7.3.ebuild
+++ b/www-client/mozilla-bin/mozilla-bin-1.7.3.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/www-client/mozilla-bin/mozilla-bin-1.7.3.ebuild,v 1.2 2005/03/23 20:04:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/mozilla-bin-1.7.3.ebuild,v 1.3 2005/03/30 20:05:36 kugelfang Exp $
 
 inherit nsplugins eutils mozilla-launcher
 
@@ -37,6 +37,11 @@ RDEPEND="virtual/x11
 	virtual/x11
 	>=www-client/mozilla-launcher-1.13"
 
+# 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() {
 	# Install mozilla in /opt
 	dodir /opt
diff --git a/www-client/mozilla-bin/mozilla-bin-1.7.5.ebuild b/www-client/mozilla-bin/mozilla-bin-1.7.5.ebuild
index 9c1443d6f607..ee48339feff8 100644
--- a/www-client/mozilla-bin/mozilla-bin-1.7.5.ebuild
+++ b/www-client/mozilla-bin/mozilla-bin-1.7.5.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/www-client/mozilla-bin/mozilla-bin-1.7.5.ebuild,v 1.2 2005/03/23 20:04:48 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/mozilla-bin-1.7.5.ebuild,v 1.3 2005/03/30 20:05:36 kugelfang Exp $
 
 inherit nsplugins eutils mozilla-launcher
 
@@ -37,6 +37,11 @@ RDEPEND="virtual/x11
 	virtual/x11
 	>=www-client/mozilla-launcher-1.13"
 
+# 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() {
 	# Install mozilla in /opt
 	dodir /opt
diff --git a/www-client/mozilla-bin/mozilla-bin-1.7.6-r1.ebuild b/www-client/mozilla-bin/mozilla-bin-1.7.6-r1.ebuild
index 692d1a91f1d8..04029dd04e9a 100644
--- a/www-client/mozilla-bin/mozilla-bin-1.7.6-r1.ebuild
+++ b/www-client/mozilla-bin/mozilla-bin-1.7.6-r1.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/www-client/mozilla-bin/mozilla-bin-1.7.6-r1.ebuild,v 1.4 2005/03/25 10:50:56 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-bin/mozilla-bin-1.7.6-r1.ebuild,v 1.5 2005/03/30 20:05:36 kugelfang Exp $
 
 inherit nsplugins eutils mozilla-launcher
 
@@ -37,6 +37,11 @@ RDEPEND="virtual/x11
 	virtual/x11
 	>=www-client/mozilla-launcher-1.28"
 
+# 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() {
 	# Install mozilla in /opt
 	dodir /opt