Backport fixes from 1.7.6-r1 for USE=ldap build #85648

Package-Manager: portage-2.0.51.19

3 files changed, 24 insertions, 13 deletions

diff --git a/www-client/mozilla/ChangeLog b/www-client/mozilla/ChangeLog
index 9f25faf5352e..2e8214435095 100644
--- a/www-client/mozilla/ChangeLog
+++ b/www-client/mozilla/ChangeLog
@@ -1,6 +1,9 @@
 # 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.6 2005/03/23 22:41:20 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/ChangeLog,v 1.7 2005/03/24 02:20:36 agriffis Exp $
+
+  24 Mar 2005; <agriffis@gentoo.org> mozilla-1.7.5-r1.ebuild:
+  Backport fixes from 1.7.6-r1 for USE=ldap build #85648
 
   23 Mar 2005; Aron Griffis <agriffis@gentoo.org> mozilla-1.7.6-r1.ebuild:
   Don't force CC, CXX, LD on the make cmdline so that we can build with
diff --git a/www-client/mozilla/Manifest b/www-client/mozilla/Manifest
index 2309e6fe8b5a..b77f22bd9bfb 100644
--- a/www-client/mozilla/Manifest
+++ b/www-client/mozilla/Manifest
@@ -1,7 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 f4cfd3036c600006c95306a4be697e51 mozilla-1.7.5.ebuild 10545
 MD5 425585a58b4880f940920827d25a11ae mozilla-1.7.6-r1.ebuild 11474
-MD5 1dfab4467773d8ba88fa6984ec37da50 mozilla-1.7.5-r1.ebuild 11495
-MD5 23a6a0599681101df4ca5e9c7e78dce3 ChangeLog 40909
+MD5 fd3ea2353612d3f2621bc24442c45ae9 mozilla-1.7.5-r1.ebuild 11156
+MD5 71ed509ed72a82233c50a957adff577b ChangeLog 41029
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 b19c38da8865b9ee5555aeb826d1d360 files/digest-mozilla-1.7.5 203
 MD5 e79634ee1e611182b6c227daa362b20d files/mozilla-1.7.3-4ft2.patch 22360
@@ -19,3 +22,10 @@ MD5 0172084e349ca0f03d8cbe294054223e files/digest-mozilla-1.7.6-r1 203
 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
 MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
 MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCQiOpBXaUFmZvwyMRAsoAAKCH1Z2bM7UwoJxfPBGPm6Fur8JjUwCeLiQP
+bJNP56w2KC3vKj6ok+fOn8Q=
+=tmB8
+-----END PGP SIGNATURE-----
diff --git a/www-client/mozilla/mozilla-1.7.5-r1.ebuild b/www-client/mozilla/mozilla-1.7.5-r1.ebuild
index e2d673d780e8..235253df2e5a 100644
--- a/www-client/mozilla/mozilla-1.7.5-r1.ebuild
+++ b/www-client/mozilla/mozilla-1.7.5-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/mozilla-1.7.5-r1.ebuild,v 1.2 2005/03/23 21:42:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/mozilla-1.7.5-r1.ebuild,v 1.3 2005/03/24 02:20:36 agriffis Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozconfig makeedit multilib
@@ -147,16 +147,14 @@ src_compile() {
 	####################################
 
 	# ./configure picks up the mozconfig stuff
-	export LD="$(tc-getLD)"
-	export CC="$(tc-getCC)"
-	export CXX="$(tc-getCXX)"
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
 	./configure || die "configure failed"
 
 	# This removes extraneous CFLAGS from the Makefiles to reduce RAM
 	# requirements while compiling
 	edit_makefiles
 
-	emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die "emake failed"
+	emake || die "emake failed"
 
 	####################################
 	#
@@ -172,11 +170,11 @@ src_compile() {
 		cd ${S}/security/coreconf || die "cd coreconf failed"
 		echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
 			>>headers.mk
-		emake -j1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die "make security headers failed"
+		emake -j1 || die "make security headers failed"
 
 		cd ${S}/security/nss || die "cd nss failed"
-		emake -j1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" moz_import || die "make moz_import failed"
-		emake -j1 CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die "make nss failed"
+		emake -j1 moz_import || die "make moz_import failed"
+		emake -j1 || die "make nss failed"
 	fi
 
 	####################################
@@ -189,10 +187,10 @@ src_compile() {
 	if use crypt && ! use moznomail; then
 		einfo "Building Enigmail plugin..."
 		cd ${S}/extensions/ipc || die "cd ipc failed"
-		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die "make ipc failed"
+		emake || die "make ipc failed"
 
 		cd ${S}/extensions/enigmail || die "cd enigmail failed"
-		emake CXX="$(tc-getCXX)" CC="$(tc-getCC)" LD="$(tc-getLD)" || die "make enigmail failed"
+		emake || die "make enigmail failed"
 	fi
 }