Update to 1.0RC1, fix license QA on all ebuilds

6 files changed, 23 insertions, 12 deletions

diff --git a/net-www/mozilla-firefox/ChangeLog b/net-www/mozilla-firefox/ChangeLog
index 02083a48800c..e9d29f11c26b 100644
--- a/net-www/mozilla-firefox/ChangeLog
+++ b/net-www/mozilla-firefox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/mozilla-firefox
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.73 2004/10/03 20:57:34 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.74 2004/10/28 16:33:08 brad Exp $
+
+*mozilla-firefox-1.0_rc1 (28 Oct 2004)
+
+  28 Oct 2004; Brad Laue <brad@gentoo.org> +mozilla-firefox-1.0_rc1.ebuild:
+  New version, 1.0RC1.
 
   03 Oct 2004; Sven Wegener <swegener@gentoo.org> :
   Removed stray digest.
diff --git a/net-www/mozilla-firefox/files/digest-mozilla-firefox-1.0_pre b/net-www/mozilla-firefox/files/digest-mozilla-firefox-1.0_pre
deleted file mode 100644
index f21d59e42ebf..000000000000
--- a/net-www/mozilla-firefox/files/digest-mozilla-firefox-1.0_pre
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b81ebc5f01448313add23ed44c47cf5e firefox-1.0PR-source.tar.bz2 32396291
diff --git a/net-www/mozilla-firefox/files/digest-mozilla-firefox-1.0_rc1 b/net-www/mozilla-firefox/files/digest-mozilla-firefox-1.0_rc1
new file mode 100644
index 000000000000..a8e293a143dd
--- /dev/null
+++ b/net-www/mozilla-firefox/files/digest-mozilla-firefox-1.0_rc1
@@ -0,0 +1 @@
+MD5 7a0411859fc5d5f647e211c24beaf94b firefox-1.0rc1-source.tar.bz2 32706624
diff --git a/net-www/mozilla-firefox/mozilla-firefox-0.9.3.ebuild b/net-www/mozilla-firefox/mozilla-firefox-0.9.3.ebuild
index 82a3d0330105..087aa1a4ee31 100644
--- a/net-www/mozilla-firefox/mozilla-firefox-0.9.3.ebuild
+++ b/net-www/mozilla-firefox/mozilla-firefox-0.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-0.9.3.ebuild,v 1.9 2004/08/21 21:32:32 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-0.9.3.ebuild,v 1.10 2004/10/28 16:33:08 brad Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins eutils mozilla-launcher
 
@@ -16,7 +16,7 @@ SRC_URI="
 
 KEYWORDS="x86 ppc sparc alpha amd64 ia64"
 SLOT="0"
-LICENSE="MPL-1.1 | NPL-1.1"
+LICENSE="MPL-1.1 NPL-1.1"
 IUSE="java gtk2 ipv6 moznoxft truetype xinerama"
 
 RDEPEND="virtual/x11
diff --git a/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild b/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild
index dd4a43537276..04169eca6837 100644
--- a/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild
+++ b/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild,v 1.7 2004/10/03 19:07:58 sejo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-1.0_pre-r2.ebuild,v 1.8 2004/10/28 16:33:08 brad Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins eutils mozilla mozilla-launcher
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/firefox-${MY_PV}-source.tar.bz2 \
 
 KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
 SLOT="0"
-LICENSE="MPL-1.1 | NPL-1.1"
+LICENSE="MPL-1.1 NPL-1.1"
 IUSE="java gtk2 ipv6 moznoxft truetype xinerama"
 
 RDEPEND="virtual/x11
diff --git a/net-www/mozilla-firefox/mozilla-firefox-1.0_pre.ebuild b/net-www/mozilla-firefox/mozilla-firefox-1.0_rc1.ebuild
index 972063483669..7bb671a884da 100644
--- a/net-www/mozilla-firefox/mozilla-firefox-1.0_pre.ebuild
+++ b/net-www/mozilla-firefox/mozilla-firefox-1.0_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-1.0_pre.ebuild,v 1.6 2004/09/19 12:36:09 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-1.0_rc1.ebuild,v 1.1 2004/10/28 16:33:08 brad Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins eutils mozilla mozilla-launcher
 
@@ -8,12 +8,13 @@ S=${WORKDIR}/mozilla
 
 DESCRIPTION="The Mozilla Firefox Web Browser"
 HOMEPAGE="http://www.mozilla.org/projects/firefox/"
-MY_PV=${PV/_pre/PR}
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/0.10/firefox-${MY_PV}-source.tar.bz2"
+MY_PV=${PV/_rc1/rc1}
+SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/firefox-${MY_PV}-source.tar.bz2
+	http://ftp.mozilla.org/pub/firefox/releases/${MY_PV}/firefox-${MY_PV}-source.tar.bz2"
 
-KEYWORDS="x86 ppc sparc alpha amd64 ~ia64"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 SLOT="0"
-LICENSE="MPL-1.1 | NPL-1.1"
+LICENSE="MPL-1.1 NPL-1.1"
 IUSE="java gtk2 ipv6 moznoxft truetype xinerama"
 
 RDEPEND="virtual/x11
@@ -29,7 +30,7 @@ RDEPEND="virtual/x11
 	gtk2?  ( >=x11-libs/gtk+-2.1.1 >=dev-libs/libIDL-0.8.0 )
 	!gtk2? ( =x11-libs/gtk+-1.2* =gnome-base/orbit-0* )
 	java?  ( virtual/jre )
-	>=net-www/mozilla-launcher-1.7-r1"
+	>=net-www/mozilla-launcher-1.20"
 
 DEPEND="${RDEPEND}
 	virtual/libc
@@ -68,6 +69,11 @@ src_compile() {
 		--with-default-mozilla-five-home=/usr/lib/MozillaFirefox \
 		--enable-single-profile"
 
+	# hardened GCC uses -fstack-protector-all by default, and this breaks
+	# firefox.
+	has_hardened && append-flags -fno-stack-protector-all
+	replace-flags -fstack-protector-all -fstack-protector
+
 	####################################
 	#
 	#  Configure and build Firefox