Anarchy's Changes: Fixed bug #152641 for 1.5.0.7 & 2.0. Removed 1.0.x series. Removed 2.x RCs. Cleaned up old files.

(Portage version: 2.1.2_pre3-r8)

3 files changed, 27 insertions, 3 deletions

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index ddb62052efa6..98a5517ecfc0 100644
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.202 2006/10/25 11:39:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.203 2006/10/25 15:27:27 cardoe Exp $
+
+  25 Oct 2006; Doug Goldstein <cardoe@gentoo.org>
+  -files/1.5/mozilla-firefox-1.5-history.patch, -files/10MozillaFirefox,
+  -files/1.5/mozilla-firefox-1.5-mork.patch,
+  -files/mozilla-1.7.12-gtk2xft-link-pangoxft.patch,
+  -files/firefox-bus-error.patch, -mozilla-firefox-1.0.7-r4.ebuild,
+  mozilla-firefox-1.5.0.7.ebuild, -mozilla-firefox-2.0_rc3.ebuild,
+  mozilla-firefox-2.0.ebuild:
+  Anarchy's Changes: Fixed bug #152641 for 1.5.0.7 & 2.0. Removed 1.0.x
+  series. Removed 2.x RCs. Cleaned up old files.
 
   25 Oct 2006; Jeroen Roovers <jer@gentoo.org> mozilla-firefox-2.0.ebuild:
   Marked ~hppa (bug #152738).
diff --git a/www-client/mozilla-firefox/mozilla-firefox-1.5.0.7.ebuild b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.7.ebuild
index e922325a4bd6..441984ec603b 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-1.5.0.7.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-1.5.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5.0.7.ebuild,v 1.8 2006/10/03 02:11:44 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-1.5.0.7.ebuild,v 1.9 2006/10/25 15:27:27 cardoe Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 
@@ -78,6 +78,14 @@ linguas() {
 	done
 }
 
+pkg_setup() {
+	if ! built_with_use x11-libs/cairo X; then
+	eerror "Cairo is not built with X useflag."
+	eerror "Please add 'X' to your USE flags, and re-emerge cairo."
+	die "Cairo needs X"
+	fi
+}
+
 src_unpack() {
 	unpack firefox-${PV}-source.tar.bz2  ${P}-patches-${PVER}.tar.bz2
 
diff --git a/www-client/mozilla-firefox/mozilla-firefox-2.0.ebuild b/www-client/mozilla-firefox/mozilla-firefox-2.0.ebuild
index 8866326fe271..11d2673ed4c8 100644
--- a/www-client/mozilla-firefox/mozilla-firefox-2.0.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.ebuild,v 1.2 2006/10/25 11:39:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-2.0.ebuild,v 1.3 2006/10/25 15:27:27 cardoe Exp $
 
 inherit flag-o-matic toolchain-funcs eutils mozconfig-2 mozilla-launcher makeedit multilib fdo-mime mozextension autotools
 
@@ -75,6 +75,12 @@ linguas() {
 }
 
 pkg_setup(){
+	if ! built_with_use x11-libs/cairo X; then
+		eerror "Cairo is not built with X useflag."
+		eerror "Please add 'X' to your USE flags, and re-emerge cairo."
+		die "Cairo needs X"
+	fi
+
 	if use mozbranding; then
 		einfo "You are enabling official branding. You may not redistribute this build"
 		einfo "to any users on your network or the internet. Doing so puts yourself into"