Require recent xorg-x11 which provides xrender.pc

4 files changed, 24 insertions, 8 deletions

diff --git a/net-www/mozilla-firefox/ChangeLog b/net-www/mozilla-firefox/ChangeLog
index 4fa1f83f98ec..a96315f2bfcd 100644
--- a/net-www/mozilla-firefox/ChangeLog
+++ b/net-www/mozilla-firefox/ChangeLog
@@ -1,6 +1,10 @@
 # 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.84 2004/11/17 14:32:16 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.85 2004/11/19 02:38:28 agriffis Exp $
+
+  18 Nov 2004; Aron Griffis <agriffis@gentoo.org>
+  mozilla-firefox-1.0-r3.ebuild:
+  Require recent xorg-x11 which provides xrender.pc
 
   17 Nov 2004; Brad Laue <brad@gentoo.org> mozilla-firefox-1.0.ebuild:
   1.0 stable on x86. Revisions based on a new build mechanism to follow shortly.
diff --git a/net-www/mozilla-firefox/mozilla-firefox-1.0-r3.ebuild b/net-www/mozilla-firefox/mozilla-firefox-1.0-r3.ebuild
index e42301079f7e..db7de8d0b890 100644
--- a/net-www/mozilla-firefox/mozilla-firefox-1.0-r3.ebuild
+++ b/net-www/mozilla-firefox/mozilla-firefox-1.0-r3.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-r3.ebuild,v 1.4 2004/11/16 23:50:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/mozilla-firefox-1.0-r3.ebuild,v 1.5 2004/11/19 02:38:28 agriffis Exp $
 
 inherit makeedit flag-o-matic gcc nsplugins eutils mozconfig mozilla-launcher
 
@@ -16,10 +16,14 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 IUSE="java mozsvg"
 
-RDEPEND="virtual/x11
+# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
+# and is required to build with support for cairo.
+RDEPEND="java? ( virtual/jre )
 	>=media-libs/libmng-1.0.0
-	java?  ( virtual/jre )
-	mozsvg? ( x11-libs/cairo )"
+	mozsvg? (
+		>=x11-base/xorg-x11-6.7.0-r2
+		x11-libs/cairo 
+	)"
 
 DEPEND="${RDEPEND}
 	java? ( >=dev-java/java-config-0.2.0 )"
diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index e9fe18ab947b..076637b1090e 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.209 2004/11/18 14:04:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.210 2004/11/19 02:42:48 agriffis Exp $
+
+  18 Nov 2004; Aron Griffis <agriffis@gentoo.org> mozilla-1.7.3-r3.ebuild:
+  Require recent xorg-x11 which provides xrender.pc
 
 *mozilla-1.7.3-r3 (18 Nov 2004)
 
diff --git a/net-www/mozilla/mozilla-1.7.3-r3.ebuild b/net-www/mozilla/mozilla-1.7.3-r3.ebuild
index 6c8c76092296..280215b63ecc 100644
--- a/net-www/mozilla/mozilla-1.7.3-r3.ebuild
+++ b/net-www/mozilla/mozilla-1.7.3-r3.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/mozilla-1.7.3-r3.ebuild,v 1.1 2004/11/18 14:04:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.7.3-r3.ebuild,v 1.2 2004/11/19 02:42:48 agriffis Exp $
 
 unset ALLOWED_FLAGS  # stupid extra-functions.sh ... bug 49179
 inherit flag-o-matic gcc eutils nsplugins mozilla-launcher mozconfig makeedit
@@ -27,8 +27,13 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~ia64"
 SLOT="0"
 LICENSE="MPL-1.1 NPL-1.1"
 
+# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
+# and is required to build with support for cairo.
 RDEPEND="java? ( virtual/jre )
-	mozsvg? ( x11-libs/cairo )
+	mozsvg? (
+		>=x11-base/xorg-x11-6.7.0-r2
+		x11-libs/cairo
+	)
 	crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )"
 
 DEPEND="${RDEPEND}