Fix a compilation issue using the 32-bit userland with 64-bit kernel on PowerPC

Package-Manager: portage-2.0.52-r1

diff --git a/www-client/mozilla/ChangeLog b/www-client/mozilla/ChangeLog
index bb5e480f17723b2482cb42201ba2398e799fcbc9..ace4464c2a7c0577086fe25eafa460714dd5080a 100644 (file)
--- a/www-client/mozilla/ChangeLog
+++ b/www-client/mozilla/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/mozilla
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/ChangeLog,v 1.85 2005/09/29 13:29:37 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/ChangeLog,v 1.86 2005/10/02 00:57:42 hansmi Exp $
+
+  02 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
+  mozilla-1.7.12-r2.ebuild:
+  Fix a compilation issue using the 32-bit userland with 64-bit kernel on
+  PowerPC.
 
   29 Sep 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   mozilla-1.7.12-r2.ebuild:

diff --git a/www-client/mozilla/Manifest b/www-client/mozilla/Manifest
index cce2937fd4fb16882a3593c92c9cb84781a966db..e29e4a198611c99961f593081bf44de4de445d40 100644 (file)
--- a/www-client/mozilla/Manifest
+++ b/www-client/mozilla/Manifest
@@ -1,49 +1,39 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 efb11836f2b5c8f484f743a401229c53 mozilla-1.7.11-r2.ebuild 12246
 MD5 5ac1d6e61327816f403bd186db788f7a mozilla-1.7.11-r3.ebuild 12321
-MD5 1a242e5dd432f1fc4b5396b7593c1cb8 mozilla-1.7.10-r1.ebuild 12594
-MD5 b4aa045a13b06a9b40da7cd4d8d304a2 ChangeLog 52896
-MD5 636de05acc256dbae4fed5efe5bf5f92 mozilla-1.7.12-r2.ebuild 11746
+MD5 585e249f746a24ae127ff7a39b12133e mozilla-1.7.10-r3.ebuild 12179
 MD5 d93266fa522c8503a5c3c8563b799968 mozilla-1.7.11.ebuild 12172
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 3b67ccfa872adfb9099bd8abe32776a2 ChangeLog 53062
+MD5 1a03d7da73038a57a4993f59b2742f55 mozilla-1.7.12-r2.ebuild 12154
 MD5 afa167a2e95520ba2899ca04145f7a87 mozilla-1.7.11-r1.ebuild 12179
-MD5 efb11836f2b5c8f484f743a401229c53 mozilla-1.7.11-r2.ebuild 12246
-MD5 585e249f746a24ae127ff7a39b12133e mozilla-1.7.10-r3.ebuild 12179
+MD5 1a242e5dd432f1fc4b5396b7593c1cb8 mozilla-1.7.10-r1.ebuild 12594
 MD5 00cce95a37df57816d9bf357e04c3b73 mozilla-1.7.10-r2.ebuild 11834
-MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r2 428
-MD5 b7c78ba7ca0c519d0f3d2b80ab4cdd74 files/mozilla-1.7.6-ppc64.patch 3651
-MD5 a86b94268e23e2bb90882f4b393efbb9 files/digest-mozilla-1.7.10-r3 428
 MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r1 432
-MD5 bedafc238f92edd9cb98fae3d1af96df files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch 620
-MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11 428
 MD5 8f8d70da6eb8cf07acbbb85fb0f08636 files/mozilla-hppa.patch 7863
-MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
+MD5 a86b94268e23e2bb90882f4b393efbb9 files/digest-mozilla-1.7.10-r3 428
+MD5 f7930e7f2cba691a9b6654b61ba1217e files/mozilla-1.7.12-libart-freetype.patch 2412
+MD5 b7c78ba7ca0c519d0f3d2b80ab4cdd74 files/mozilla-1.7.6-ppc64.patch 3651
 MD5 787437939618daf271673626f6414b15 files/mozilla-1.7.11-GLSA105396.patch 4049
+MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
 MD5 730bebc28f073d8c08d32c78252445d5 files/mozilla-1.7.12-rpath.patch 1752
 MD5 1f71cb3a30531a90fb7d1d3445588ba6 files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch 465
+MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
+MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818
+MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r1 428
 MD5 f48be110754a5106f06cd313c22c4337 files/svg-cairo-0.3.0-fix.patch 1063
-MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
-MD5 f7930e7f2cba691a9b6654b61ba1217e files/mozilla-1.7.12-libart-freetype.patch 2412
-MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r3 428
-MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
-MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
-MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r2 432
-MD5 5b22d0e1ea93923e3e66787c286ad86f files/mozilla-1.7.8-objectframefix.diff 673
+MD5 bedafc238f92edd9cb98fae3d1af96df files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch 620
 MD5 3beb280426b5afc68a2a132edf1b58f7 files/digest-mozilla-1.7.12-r2 360
+MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r2 428
 MD5 278524216669b594ea5b6468a180ed73 files/mozilla-stackgrowth.patch 931
-MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r1 428
-MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/mozilla-1.7.6-gcc4.patch 1818
-MD5 07f9a980afa2dde67554657c00b8be18 files/mozilla-rpath-1.patch 1716
 MD5 eb21396de389b3ef0277d5f95d59c348 files/mozilla-1.7.8-amd64.patch 4020
-MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
+MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11-r3 428
+MD5 5b22d0e1ea93923e3e66787c286ad86f files/mozilla-1.7.8-objectframefix.diff 673
+MD5 f928943477be0f114ef393d3a4c28e80 files/digest-mozilla-1.7.10-r2 432
+MD5 07f9a980afa2dde67554657c00b8be18 files/mozilla-rpath-1.patch 1716
+MD5 4be28298e258904448e10462fcb67c72 files/digest-mozilla-1.7.11 428
+MD5 b99dabe3c40cfafe2e63bdef95815596 files/10mozilla 105
+MD5 e4adf41536cf80df5f8f5f6ff9bd88a7 files/mozilla-rebuild-databases.pl 2310
 MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153
+MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDO+yHKRy60XGEcJIRAm0HAKCY8sA2ztBytgx3+Gx8VdcCRSPsPACfQvbo
-Ovl4MbG+4fFTUcAwx4x1zUg=
-=oIoy
------END PGP SIGNATURE-----

diff --git a/www-client/mozilla/mozilla-1.7.12-r2.ebuild b/www-client/mozilla/mozilla-1.7.12-r2.ebuild
index f301377bd0019aaea7c7f04cb594565bc9cb0809..7cbc0298943b46c38daa6fe795f280fc5759241b 100644 (file)
--- a/www-client/mozilla/mozilla-1.7.12-r2.ebuild
+++ b/www-client/mozilla/mozilla-1.7.12-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/www-client/mozilla/mozilla-1.7.12-r2.ebuild,v 1.7 2005/09/29 13:29:37 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/mozilla-1.7.12-r2.ebuild,v 1.8 2005/10/02 00:57:42 hansmi Exp $
 
 unset ALLOWED_FLAGS  # Stupid extra-functions.sh ... bug 49179
 MOZ_FREETYPE2="no"   # Need to disable for newer .. remove here and in mozconfig
@@ -102,6 +102,16 @@ src_unpack() {
        sed -i -e '1s,usr/local/bin,usr/bin,' ${S}/security/nss/cmd/smimetools/smime
        eend $? || die "sed failed"
 
+       # Fix a compilation issue using the 32-bit userland with 64-bit kernel on
+       # PowerPC, because with that configuration, mozilla detects a ppc64 system.
+       # -- hansmi, 2005-10-02
+       if use ppc && [[ "${PROFILE_ARCH}" == ppc64 ]]; then
+               sed -i -e "s#OS_TEST=\`uname -m\`\$#OS_TEST=${ARCH}#" \
+                       ${S}/configure.in
+               sed -i -e "s#OS_TEST :=.*uname -m.*\$#OS_TEST:=${ARCH}#" \
+                       ${S}/security/coreconf/arch.mk
+       fi
+
        # Needed by some of the patches
        WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
 }