Enable svg via cairo, #59827. Remove some stuff from RDEPEND which is repeated in...

diff --git a/net-www/mozilla-firefox/ChangeLog b/net-www/mozilla-firefox/ChangeLog
index 86a8abe1f482ee859adb81c7a4d3f74bbe6b2603..8598a0edc8bfbeef983d9cde34b673dd33683145 100644 (file)
--- a/net-www/mozilla-firefox/ChangeLog
+++ b/net-www/mozilla-firefox/ChangeLog
@@ -1,6 +1,12 @@
 # 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.82 2004/11/16 16:06:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla-firefox/ChangeLog,v 1.83 2004/11/16 23:50:05 agriffis Exp $
+
+  16 Nov 2004; Aron Griffis <agriffis@gentoo.org>
+  mozilla-firefox-1.0-r3.ebuild:
+  Enable svg via cairo, #59827. Remove some stuff from RDEPEND which is
+  repeated in mozconfig.eclass. Remove IUSE which is present in
+  mozconfig.eclass *and* which isn't used in this ebuild directly
 
   16 Nov 2004; Aron Griffis <agriffis@gentoo.org>
   mozilla-firefox-1.0-r2.ebuild, mozilla-firefox-1.0-r3.ebuild:

diff --git a/net-www/mozilla-firefox/Manifest b/net-www/mozilla-firefox/Manifest
index 6329f2158136cb488880ad33bae3bec09cc1208e..a12cb089858d874d89e1cb5c3d17bcf783e50d61 100644 (file)
--- a/net-www/mozilla-firefox/Manifest
+++ b/net-www/mozilla-firefox/Manifest
@@ -1,15 +1,16 @@
-MD5 659487cc72d780cd9f3f3c32dec3592d ChangeLog 13551
+MD5 4bcb76c1b99eceb6de026abfb1a5a043 ChangeLog 13837
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 c543ce361b2035afbb9db4010f9f776e mozilla-firefox-0.9.3.ebuild 8425
+MD5 4bcd75902aafdef30244f66f6d835a52 mozilla-firefox-1.0-r2.ebuild 5479
 MD5 1886b4b2093f8116f5f8639402dc8df1 mozilla-firefox-1.0.ebuild 5060
 MD5 faaa52e819364f34c1b174f0c47a6d86 mozilla-firefox-1.0_pre-r2.ebuild 5073
 MD5 809453352ef124b51ec8e4c96fd23e69 mozilla-firefox-1.0_rc1.ebuild 5147
 MD5 6c89295fc5264c6798ee06f9e2f5c936 mozilla-firefox-1.0_rc2.ebuild 5066
-MD5 4bcd75902aafdef30244f66f6d835a52 mozilla-firefox-1.0-r2.ebuild 5479
-MD5 f9e4b94d7af03fad1fc89ee7084c6108 mozilla-firefox-1.0-r3.ebuild 5835
+MD5 16029a1d847b550e729956ffe5d7bd16 mozilla-firefox-1.0-r3.ebuild 5679
 MD5 606e82226379fd5ae6cd1d0d1faff7ff files/10MozillaFirefox 31
 MD5 0c7804fd13815f9a0e7a1ef0eab6a871 files/digest-mozilla-firefox-0.9.3 75
 MD5 47c899122e30bc898b5a899ed0e10129 files/digest-mozilla-firefox-1.0 73
+MD5 47c899122e30bc898b5a899ed0e10129 files/digest-mozilla-firefox-1.0-r2 73
 MD5 bef773177860190ef5d6cce7ec70c613 files/digest-mozilla-firefox-1.0_pre-r2 77
 MD5 fa885b490a3c76594784843a1c06ee3a files/digest-mozilla-firefox-1.0_rc1 76
 MD5 e5cc0a5838a73f3fdaf38f4e3c368c26 files/digest-mozilla-firefox-1.0_rc2 76
@@ -20,9 +21,8 @@ MD5 c6308c086c87ed2e1e4f3d136efdd770 files/firefox-0.9-nsFormHistory-crash-fix.p
 MD5 23d1fbd03cc6dd346a4e4ce8f2d88ebf files/mozilla-1.3-alpha-stubs.patch 4646
 MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-firebird-amd64.patch 35052
 MD5 88371b8f812caf799a1ede2b1b07c079 files/mozilla-firefox-mousebuttons.patch 17099
-MD5 47c899122e30bc898b5a899ed0e10129 files/digest-mozilla-firefox-1.0-r2 73
-MD5 c74e0d96f205a0766fb3d5316d9df434 files/digest-mozilla-firefox-1.0-r3 234
 MD5 b16efe0e4066720b718d67348aeee757 files/mozilla-firefox-1.0-4ft2.patch 22294
+MD5 c74e0d96f205a0766fb3d5316d9df434 files/digest-mozilla-firefox-1.0-r3 234
 MD5 3961b39c763ff8f98b56098ac0cdbecc files/mozilla-firefox-1.0-kp_separator.patch 444
 MD5 bff260036c5dcca45da3218517fb33d8 files/icon/firefox-icon.png 3979
 MD5 2cdd03eb2752bc01ba07ad837e926f39 files/icon/mozillafirefox.desktop 168

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 c5b7cda282ccbcdf55d8e972c359c51c21bcf444..e42301079f7ef67004a63bd0747ca94b90efc30c 100644 (file)
--- 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.3 2004/11/16 16:06:12 agriffis Exp $
+# $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 $
 
 inherit makeedit flag-o-matic gcc nsplugins eutils mozconfig mozilla-launcher
 
@@ -14,24 +14,14 @@ SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MY_PV}/source
 LICENSE="MPL-1.1 NPL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE="java ipv6 moznoxft truetype xinerama"
+IUSE="java mozsvg"
 
 RDEPEND="virtual/x11
-       !moznoxft? ( virtual/xft )
-       >=sys-libs/zlib-1.1.4
-       >=media-libs/jpeg-6b
        >=media-libs/libmng-1.0.0
-       >=media-libs/libpng-1.2.1
-       >=sys-apps/portage-2.0.36
-       dev-libs/expat
-       app-arch/zip
-       app-arch/unzip
        java?  ( virtual/jre )
-       >=net-www/mozilla-launcher-1.20"
+       mozsvg? ( x11-libs/cairo )"
 
 DEPEND="${RDEPEND}
-       virtual/libc
-       dev-util/pkgconfig
        java? ( >=dev-java/java-config-0.2.0 )"
 
 # Needed by src_compile() and src_install().
@@ -75,6 +65,8 @@ src_compile() {
        mozconfig_use_extension mozdevelop venkman
        mozconfig_use_enable gnome gnomevfs
        mozconfig_use_extension gnome gnomevfs
+       mozconfig_use_enable mozsvg svg
+       mozconfig_use_enable mozsvg svg-renderer-cairo
        mozconfig_annotate '' --with-default-mozilla-five-home=/usr/lib/MozillaFirefox
 
        # Finalize and report settings