Version bump - warm up your compilers!

7 files changed, 174 insertions, 38 deletions

diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index 084990f1b899..8d039fc80a19 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.121 2003/10/03 03:48:04 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.122 2003/10/17 09:20:03 brad Exp $
+
+*mozilla-1.5 (17 Oct 2003)
+
+  17 Oct 2003; Brad Laue <brad@gentoo.org> mozilla-1.5.ebuild:
+  Version bump - Mozilla 1.5
 
   02 Oct 2003; Brad House <brad_mssw@gentoo.org> mozilla-1.4-r4.ebuild,
   files/mozilla-1.4-amd64.patch:
diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
index 659a10cf7ad2..bd8183dc24a7 100644
--- a/net-www/mozilla/Manifest
+++ b/net-www/mozilla/Manifest
@@ -1,21 +1,17 @@
-MD5 8f45d8f99364ea7cd2ca2c10867d3ab6 ChangeLog 20818
-MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 154ebaf2e6acafdea4cff284f437e64a mozilla-1.0.1-r3.ebuild 15204
 MD5 6f2e3b3b3f671e0ab6da6e4faa842b6b mozilla-1.1-r1.ebuild 14814
 MD5 92cb7ee0c212272c0ec9567badb5a6d4 mozilla-1.2.1-r5.ebuild 20909
-MD5 abeda014e863c44f7be8f84d2a893f68 mozilla-1.3-r2.ebuild 16742
-MD5 f810ca6b8ba1a1d856f76d32ba9df998 mozilla-1.4-r1.ebuild 16431
+MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
+MD5 ab5ccf0a0687eedd12e6ec51b8dd15ab ChangeLog 20934
 MD5 df0e60b98580cfbd2168e18eff35d6f8 mozilla-1.4-r3.ebuild 16714
+MD5 abeda014e863c44f7be8f84d2a893f68 mozilla-1.3-r2.ebuild 16742
 MD5 10bf98a9f1e0ff625702f3be7a3cf385 mozilla-1.4-r4.ebuild 17258
+MD5 22cf9cd6e3053e3ad499794493e9b90e mozilla-1.5.ebuild 17295
 MD5 2245cc4f37902e2c6dd188f72874fbb3 files/10mozilla 60
 MD5 cf872ecce56e05c488ae7f41b50dec31 files/digest-mozilla-1.0.1-r3 281
 MD5 eccaf421f7e91faad5f835cadca4263e files/digest-mozilla-1.1-r1 202
 MD5 08ca97500d420d77f99f60d5eeb54c1f files/digest-mozilla-1.2.1-r5 268
 MD5 3cbe151665ba43403e657607949244e8 files/digest-mozilla-1.3-r2 201
-MD5 22abc05aa3adaba490148f6040e0500a files/digest-mozilla-1.4-r1 201
-MD5 965c8430aca20b99db6430555624b4d2 files/digest-mozilla-1.4-r3 201
-MD5 3fc638d05bf40a6d7a5d3296ee2a0449 files/digest-mozilla-1.4-r4 201
-MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
 MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148
 MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134
@@ -30,7 +26,11 @@ MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
 MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
 MD5 5b01d0425f9ef7bbe0765985e6041c6b files/mozilla.sh 6684
 MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
+MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
+MD5 965c8430aca20b99db6430555624b4d2 files/digest-mozilla-1.4-r3 201
+MD5 3fc638d05bf40a6d7a5d3296ee2a0449 files/digest-mozilla-1.4-r4 201
 MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-1.4-amd64.patch 35052
+MD5 14ab5596f8ab82d99af369a72d6c7d6e files/digest-mozilla-1.5 201
 MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
 MD5 83da5242120c74b0ca6cceae9d6cf237 files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 2838
 MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
@@ -45,3 +45,5 @@ MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch
 MD5 1655fea18e9fc538b41d88561d6080c7 files/1.3/mozilla-1.3-fix-gtkim.patch 921
 MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387
 MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
+MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
+MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
diff --git a/net-www/mozilla/files/digest-mozilla-1.4-r1 b/net-www/mozilla/files/digest-mozilla-1.4-r1
deleted file mode 100644
index 92a4aeb8421d..000000000000
--- a/net-www/mozilla/files/digest-mozilla-1.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 a4644caeeeb323d0d8b59758b67d4454 mozilla-source-1.4.tar.bz2 31867608
-MD5 d404097e4e06eba11f760de59da1f824 enigmail-0.76.3.tar.gz 211412
-MD5 e74a2050826326a24631be4d8ed3d902 ipc-1.0.3.tar.gz 234922
diff --git a/net-www/mozilla/files/digest-mozilla-1.5 b/net-www/mozilla/files/digest-mozilla-1.5
new file mode 100644
index 000000000000..244f95892956
--- /dev/null
+++ b/net-www/mozilla/files/digest-mozilla-1.5
@@ -0,0 +1,3 @@
+MD5 9d59651eac39a95da756d38fe5385896 mozilla-source-1.5.tar.bz2 29464409
+MD5 6524ba86e4b3fbf85306bf3cedcf3924 enigmail-0.76.7.tar.gz 223867
+MD5 6cd6efb8cea6bb24fde3e02ba7f46676 ipc-1.0.4.tar.gz 134269
diff --git a/net-www/mozilla/files/enigmail/Makefile-enigmail b/net-www/mozilla/files/enigmail/Makefile-enigmail
new file mode 100644
index 000000000000..c6a95caba45d
--- /dev/null
+++ b/net-www/mozilla/files/enigmail/Makefile-enigmail
@@ -0,0 +1,45 @@
+#!gmake
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "MPL"); you may not use this file
+# except in compliance with the MPL. You may obtain a copy of
+# the MPL at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the MPL is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the MPL for the specific language governing
+# rights and limitations under the MPL.
+# 
+# The Original Code is Enigmail.
+# 
+# The Initial Developer of the Original Code is Ramalingam Saravanan.
+# Portions created by Ramalingam Saravanan <svn@xmlterm.org> are
+# Copyright (C) 2001 Ramalingam Saravanan. All Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License (the "GPL"), in which case
+# the provisions of the GPL are applicable instead of
+# those above. If you wish to allow use of your version of this
+# file only under the terms of the GPL and not to allow
+# others to use your version of this file under the MPL, indicate
+# your decision by deleting the provisions above and replace them
+# with the notice and other provisions required by the GPL.
+# If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+DEPTH		= ../..
+topsrcdir	= ../..
+srcdir		= .
+VPATH		= .
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = public src build ui package
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk
diff --git a/net-www/mozilla/files/enigmail/Makefile-ipc b/net-www/mozilla/files/enigmail/Makefile-ipc
new file mode 100644
index 000000000000..99c2231f3d0c
--- /dev/null
+++ b/net-www/mozilla/files/enigmail/Makefile-ipc
@@ -0,0 +1,51 @@
+#!gmake
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "MPL"); you may not use this file
+# except in compliance with the MPL. You may obtain a copy of
+# the MPL at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the MPL is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the MPL for the specific language governing
+# rights and limitations under the MPL.
+# 
+# The Original Code is protoZilla.
+# 
+# The Initial Developer of the Original Code is Ramalingam Saravanan.
+# Portions created by Ramalingam Saravanan <svn@xmlterm.org> are
+# Copyright (C) 2001 Ramalingam Saravanan. All Rights Reserved.
+# 
+# Contributor(s):
+# 
+# Alternatively, the contents of this file may be used under the
+# terms of the GNU General Public License (the "GPL"), in which case
+# the provisions of the GPL are applicable instead of
+# those above. If you wish to allow use of your version of this
+# file only under the terms of the GPL and not to allow
+# others to use your version of this file under the MPL, indicate
+# your decision by deleting the provisions above and replace them
+# with the notice and other provisions required by the GPL.
+# If you do not delete the provisions above, a recipient
+# may use your version of this file under either the MPL or the
+# GPL.
+#
+
+DEPTH		= ../..
+topsrcdir	= ../..
+srcdir		= .
+VPATH		= .
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS            = public src
+
+ifdef BUILD_IPC
+DIRS		+= build
+endif
+
+ifdef ENABLE_TESTS
+DIRS		+= tests
+endif
+
+include $(topsrcdir)/config/rules.mk
diff --git a/net-www/mozilla/mozilla-1.4-r1.ebuild b/net-www/mozilla/mozilla-1.5.ebuild
index 3a1a53ebbcf7..d7995cb15063 100644
--- a/net-www/mozilla/mozilla-1.4-r1.ebuild
+++ b/net-www/mozilla/mozilla-1.5.ebuild
@@ -1,20 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.4-r1.ebuild,v 1.5 2003/09/06 01:54:08 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.5.ebuild,v 1.1 2003/10/17 09:20:03 brad Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug"
 # Internal USE flags that I do not really want to advertise ...
-IUSE="${IUSE} mozsvg mozcalendar mozaccess mozp3p mozxmlterm"
+IUSE="${IUSE} mozcalendar mozaccess mozp3p mozxmlterm"
 IUSE="${IUSE} moznoirc moznomail moznocompose moznoxft"
 
 inherit flag-o-matic gcc eutils nsplugins
 
-# Crashes on start when compiled with -fomit-frame-pointer
-filter-flags "-fomit-frame-pointer"
-
-# Sparc support ...
-replace-sparc64-flags
-
 # Recently there has been a lot of stability problem in Gentoo-land.  Many
 # things can be the cause to this, but I believe that it is due to gcc3
 # still having issues with optimizations, or with it not filtering bad
@@ -36,14 +30,38 @@ replace-sparc64-flags
 #
 # <azarah@gentoo.org> (13 Oct 2002)
 strip-flags
+#
+# Crashes on start when compiled with -fomit-frame-pointer
+filter-flags "-fomit-frame-pointer"
+filter-flags -ffast-math
+append-flags -s -fforce-addr
+
+# Sparc support ...
+replace-sparc64-flags
+
+#fix to avoid gcc-3.3.x micompilation issues.
+if [ "`use ppc`" -a "$(gcc-major-version)" -eq "3" -a "$(gcc-minor-version)" -eq "3" ]
+then
+
+append-flags -fno-strict-aliasing
+
+fi
 
 # We set -O in ./configure to -O1, as -O2 cause crashes on startup ...
 # (bug #13287)
-export CFLAGS="${CFLAGS//-O?}"
-export CXXFLAGS="${CFLAGS//-O?}"
 
-EMVER="0.76.2"
-IPCVER="1.0.3"
+if [ "${ARCH}" = "amd64" ]
+then
+	# Anything more than this causes segfaults on startup on amd64
+	export CFLAGS="-Wall -O -fPIC -pipe"
+	export CXXFLAGS=${CFLAGS}
+else
+	export CFLAGS="${CFLAGS//-O?}"
+	export CXXFLAGS="${CFLAGS//-O?}"
+fi
+
+EMVER="0.76.7"
+IPCVER="1.0.4"
 
 PATCH_VER="1.0"
 
@@ -54,11 +72,11 @@ S="${WORKDIR}/mozilla"
 DESCRIPTION="The Mozilla Web Browser"
 SRC_URI="ftp://ftp.mozilla.org/pub/mozilla/releases/${PN}${MY_PV2}/src/${PN}-source-${MY_PV2}.tar.bz2
 	crypt? ( http://downloads.mozdev.org/enigmail/src/enigmail-${EMVER}.tar.gz
-	         http://enigmail.mozdev.org/dload/src/ipc-${IPCVER}.tar.gz )"
+			 http://enigmail.mozdev.org/dload/src/ipc-${IPCVER}.tar.gz )"
 #	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
 HOMEPAGE="http://www.mozilla.org"
 
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 
@@ -129,6 +147,10 @@ src_unpack() {
 		then
 			cd ${S}; epatch ${FILESDIR}/${PN}-alpha-xpcom-subs-fix.patch
 		fi
+		if [ "${ARCH}" = "amd64" ]
+		then
+			cd ${S}; epatch ${FILESDIR}/${PN}-1.4-amd64.patch
+		fi
 	fi
 
 	epatch ${FILESDIR}/1.2/${PN}-1.2b-default-plugin-less-annoying.patch.bz2
@@ -148,6 +170,8 @@ src_unpack() {
 	then
 		mv -f ${WORKDIR}/ipc ${S}/extensions/
 		mv -f ${WORKDIR}/enigmail ${S}/extensions/
+		cp ${FILESDIR}/enigmail/Makefile-enigmail ${S}/extensions/enigmail/Makefile
+		cp ${FILESDIR}/enigmail/Makefile-ipc ${S}/extensions/ipc/Makefile
 	fi
 
 	# Fix build with Linux 2.6
@@ -257,7 +281,7 @@ src_compile() {
 	then
 		myext="${myext},xmlterm"
 	fi
-	if [ -n "`use mozaccess-builtin`" ]
+	if [ -n "`use mozaccess`" ]
 	then
 		myext="${myext},access-builtin"
 	fi
@@ -269,15 +293,14 @@ src_compile() {
 	then
 		myext="${myext},-irc"
 	fi
-
-	if [ -n "`use mozsvg`" ]
-	then
-		export MOZ_INTERNAL_LIBART_LGPL="1"
-		myconf="${myconf} --enable-svg"
-	else
-		myconf="${myconf} --disable-svg"
-	fi
-	# re-enable calendar for 1.4, builds autonomously (no dependencies anymore)
+# Disable SVG until it's properly implemented
+#	if [ -n "`use mozsvg`" ]
+#	then
+#		export MOZ_INTERNAL_LIBART_LGPL="1"
+#		myconf="${myconf} --enable-svg"
+#	else
+#		myconf="${myconf} --disable-svg"
+#	fi
 	if [ -n "`use mozcalendar`" ]
 	then
 		myconf="${myconf} --enable-calendar"
@@ -312,7 +335,8 @@ src_compile() {
 	then
 		# mozilla wont link with X11 on alpha, for some crazy reason.
 		# set it to link explicitly here.
-		sed -i 's/\(EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS).*$\)/\1 -lX11/' ${S}/gfx/src/gtk/Makefile.in
+		sed -i 's/\(EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS).*$\)/\1 -L/usr/X11R6/lib -lX11/' \
+			${S}/gfx/src/gtk/Makefile.in
 	fi
 
 	# *********************************************************************
@@ -327,6 +351,15 @@ src_compile() {
 	# Get it to work without warnings on gcc3
 	export CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
 
+	# On amd64 we statically set 'safe' CFLAGS. Use those only.
+	# using the standard -O2 will cause segfaults on startup for amd64
+	if [ "${ARCH}" = "amd64" ]
+	then
+		ENABLE_OPTIMIZE="${CFLAGS}"
+	else
+		ENABLE_OPTIMIZE="-O2"
+	fi
+
 	cd ${S}
 	einfo "Configuring Mozilla..."
 	./configure --prefix=/usr/lib/mozilla \
@@ -340,7 +373,7 @@ src_compile() {
 		--enable-xsl \
 		--enable-crypto \
 		--enable-extensions="${myext}" \
-		--enable-optimize="-O2" \
+		--enable-optimize="${ENABLE_OPTIMIZE}" \
 		--with-default-mozilla-five-home=/usr/lib/mozilla \
 		${myconf} || die