net-libs/webkitgtk: Fix SVG compilation

svn path=/sunrise/; revision=5966

diff --git a/net-libs/webkitgtk/ChangeLog b/net-libs/webkitgtk/ChangeLog
index 65bd9082c301e992300fa387817bc6af92c4a654..857395031277020ca357e783680c10a5d4df68e7 100644 (file)
--- a/net-libs/webkitgtk/ChangeLog
+++ b/net-libs/webkitgtk/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  03 Apr 2008; Luca Bruno (Lethalman) <lethalman88@gmail.com>
+  -webkitgtk-31370.ebuild, webkitgtk-31535.ebuild:
+  Fix SVG compilation
+
   02 Apr 2008; Markus Ullmann <jokey@gentoo.org> +webkitgtk-31535.ebuild:
   Version bump
 

diff --git a/net-libs/webkitgtk/Manifest b/net-libs/webkitgtk/Manifest
index c2a979bb287c1deb73ef02f2d02d1b0afe77090d..6140e041d08d8be94465ba073c8f5227b179c0cb 100644 (file)
--- a/net-libs/webkitgtk/Manifest
+++ b/net-libs/webkitgtk/Manifest
@@ -1,6 +1,4 @@
-DIST WebKit-r31370.tar.bz2 9229020 RMD160 3b15260eae38aebc1663c54dad6dcb0f1a1f09d5 SHA1 12628b522bedb93759893824f17501898969cd68 SHA256 99a6a11c812abf2295d088b0094e21e4eff0e4c16d36a9feb6760337703a49ae
 DIST WebKit-r31535.tar.bz2 9242331 RMD160 b2fc837f44138b2b144e7f1c8314c5e5a20414ef SHA1 a5e5261849164221ed77bf834082967616b0c4bb SHA256 bd1a88bc14317ca06e189ce5d7d507b9d6490a06c3dde71e101b1ba600b396ef
-EBUILD webkitgtk-31370.ebuild 1126 RMD160 6284934a12a930d97be894f6e7de6e4e8382f990 SHA1 50bc1b9c107dad93d2435c223e86e7b45eb938cc SHA256 e9986e305f043067e09a81be9a490fa22a8d07fd64803a1ce63da17a5b1c13ba
-EBUILD webkitgtk-31535.ebuild 1193 RMD160 69b0e1e002b00280dcd9a7633a63c13469e63e59 SHA1 e4e685a0b48a1b1ea0f46f0505eb1c889560b168 SHA256 e19a7869a3be206a2c984610359de82b51da0134501b6377eab34f1c27b9b152
-MISC ChangeLog 1796 RMD160 33bbb2845b7a6f61f7f974b07f890772d21cf167 SHA1 1009a0084ecbec0d9c65470d5e3de62dfbf8d3d3 SHA256 512e1f287195e9048af6eac568709d3e14e8910ae53d2ead22b00210982f1a3b
+EBUILD webkitgtk-31535.ebuild 1235 RMD160 d8d579a6f7b2ed448b2f3be8940ac1d7a654dd9b SHA1 01bb6ac065cadd66ddfaf960f52a193776610b42 SHA256 463f0bdc4fb4aee84e921923f95ebb2763d4e13d0ca66f260b524916186a139f
+MISC ChangeLog 1932 RMD160 647fa5257f6cbdcce2f183e7506297946f6594a7 SHA1 cf7621986c61dcdec69027f7e18e274f403a5aaf SHA256 e752bf972369653487a8a2c4bf6a9b4098e3ae59d11cb31bbc3544cbae63b218
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42

diff --git a/net-libs/webkitgtk/webkitgtk-31370.ebuild b/net-libs/webkitgtk/webkitgtk-31370.ebuild
deleted file mode 100644 (file)
index 14477f7..0000000
--- a/net-libs/webkitgtk/webkitgtk-31370.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit autotools
-
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkit.org/"
-MY_P="WebKit-r${PV}"
-SRC_URI="http://nightly.webkit.org/files/trunk/src/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2 LGPL-2.1 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug gstreamer sqlite svg"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND=">=x11-libs/gtk+-2.0
-       dev-libs/icu
-       >=net-misc/curl-7.15
-       media-libs/jpeg
-       media-libs/libpng
-       dev-libs/libxslt
-       dev-libs/libxml2
-       sqlite? ( >=dev-db/sqlite-3 )
-       gstreamer? (
-               >=media-libs/gstreamer-0.10
-               >=media-libs/gst-plugins-base-0.10
-               >=gnome-base/gnome-vfs-2.0
-               )"
-
-DEPEND="${RDEPEND}
-       sys-devel/bison
-       dev-util/gperf
-       >=sys-devel/flex-2.5.33"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       eautoreconf
-}
-
-src_compile() {
-       econf \
-               $(use_enable sqlite database) \
-               $(use_enable sqlite icon-database) \
-               $(use_enable svg)
-               $(use_enable debug)
-               $(use_enable gstreamer video)
-
-       emake || die "emake failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "Install failed"
-}

diff --git a/net-libs/webkitgtk/webkitgtk-31535.ebuild b/net-libs/webkitgtk/webkitgtk-31535.ebuild
index 8866e9d82d034519b6668de962d9c96eb791bf5a..1975d8e1382a2424dce3d9e1823e9de96f6bbf6c 100644 (file)
--- a/net-libs/webkitgtk/webkitgtk-31535.ebuild
+++ b/net-libs/webkitgtk/webkitgtk-31535.ebuild
@@ -12,9 +12,7 @@ SRC_URI="http://nightly.webkit.org/files/trunk/src/${MY_P}.tar.bz2"
 LICENSE="LGPL-2 LGPL-2.1 BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-#Note: SVG support is broken atm
-#IUSE="debug gstreamer sqlite svg"
-IUSE="debug gstreamer sqlite"
+IUSE="debug gstreamer sqlite svg"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -49,8 +47,11 @@ src_compile() {
                $(use_enable sqlite database) \
                $(use_enable sqlite icon-database) \
                $(use_enable debug) \
-               $(use_enable gstreamer video)
-#              $(use_enable svg)
+               $(use_enable gstreamer video) \
+               $(use_enable svg) \
+               $(use_enable svg svg-fonts) \
+               $(use_enable svg svg-as-image) \
+               $(use_enable svg svg-use-element)
 
        emake || die "emake failed"
 }