Version bump, drop hildon use flag as there's no ebuild for that framework yet, bug #229021 for reference. Thanks to Brian Johnson

Package-Manager: portage-2.2_rc4/cvs/Linux 2.6.26-gentoo i686

4 files changed, 17 insertions, 81 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index a9aecbd062dd..a7b96e6143a2 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.6 2008/07/06 12:27:15 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.7 2008/07/30 16:54:45 jokey Exp $
+
+*webkit-gtk-0_p35417 (30 Jul 2008)
+
+  30 Jul 2008; Markus Ullmann <jokey@gentoo.org>
+  -webkit-gtk-0_p34382.ebuild, -webkit-gtk-0_p34469.ebuild,
+  +webkit-gtk-0_p35417.ebuild:
+  Version bump, drop hildon use flag as there's no ebuild for that framework
+  yet, bug #229021 for reference. Thanks to Brian Johnson
 
 *webkit-gtk-0_p35024 (06 Jul 2008)
 
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index c6086f7d9a76..b58f7962ad78 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,20 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST WebKit-r34382.tar.bz2 9179915 RMD160 408d8f9b08881f9f801b550c1820085f0fd35198 SHA1 8a6b6d8cfb874370f23149901fc8eb73a084ea0e SHA256 29bd4b158332a686467ab6a84093964639cddc94262bd1ebfbfdfb0003836ec4
-DIST WebKit-r34469.tar.bz2 9203768 RMD160 c377e8cd3ebb368d97661c2980d7ceb0081dee41 SHA1 5b1acf53ca1dbda5285ce8c92ec65981e36e3819 SHA256 5fca7c19248f5d3575618ca120663b75d0176c11b19161978c2d1de9d1003153
 DIST WebKit-r34753.tar.bz2 9219417 RMD160 0b881dd63c7b4a18e726c9f1cc64867dfe1e6ef8 SHA1 9261944062368f417729d30aad0abc241c158af6 SHA256 22089e1e4497b511717b145b867fda26e11644b4bdc06392eab535e62077744a
 DIST WebKit-r35024.tar.bz2 16235688 RMD160 5aaac56040ab7d30be381a3244ed8470a9b67d1a SHA1 4df74efa58d770701ab30e14190eaada2d6e48ec SHA256 374f4193b2ba56d9db9e76e1986a6c510e53e6031a83c9adfacce929139a7643
-EBUILD webkit-gtk-0_p34382.ebuild 1642 RMD160 8598b8aeafced7e90335617bd82a21c04514f77c SHA1 74844bb0361942e17ea60f96f42888b7d6a07b87 SHA256 fe65d469475e2450c92363da44673890444bd3cdbf2ff18f701bc7a3fa95804e
-EBUILD webkit-gtk-0_p34469.ebuild 1663 RMD160 8f302072ee6f55041cd32652d4f77ad57e1e85de SHA1 865c7a08ed489314d0d89c7c6c70be7ccffbf328 SHA256 46bd19857e984e1c2f961e4b5b13c692831f2e4c94207a5b9f599c01726568e2
+DIST WebKit-r35417.tar.bz2 9278582 RMD160 e744fbad666aee582b64cb3297589a3583319754 SHA1 087818786035c796ad7081515c765179d57c066f SHA256 effd9103536c65137ee148b3d5dd4ba6d826f428070da6b363eb52417d19bb32
 EBUILD webkit-gtk-0_p34753.ebuild 1663 RMD160 5d0145ef392ddf4455376c688b982df31d326730 SHA1 6d84a97567631e7a985e0cc4c485b60459282163 SHA256 2fc55749c92948fb220e3afbfb14c3238e6cac617ef8fd2a5f821c86d4f52e6f
 EBUILD webkit-gtk-0_p35024.ebuild 1663 RMD160 ce37c971201a499a3295ed54d6634d67e7726b35 SHA1 e2ab8cd174b42c304cd84b44553812753647071e SHA256 ca695e65f7bfd6c95f4696fe9a00c1317117084ff1da8c5b0472272e81fe6f56
-MISC ChangeLog 3989 RMD160 866cc187b071f00e159da2324dc0295e8d954a64 SHA1 5db91fbbc9cba7dbbfd1a4e47db180907df5e310 SHA256 e29f295b789209451eb6dd88933201880d74869f1b61ba94a46c3e4a5ab5db3f
+EBUILD webkit-gtk-0_p35417.ebuild 1643 RMD160 4ecf92b1a2657911bae4a685aa7e7b332ad78f24 SHA1 bd3a45a134528f4ccb882c7a92b35c479b8c073f SHA256 8957290711316aa7c8b5edc05a47476e71bf5143526b6e76a12556843fc815af
+MISC ChangeLog 4301 RMD160 7893408d2e26636b9bb4280c96bf908e1694c425 SHA1 af26e5a82666cdddcc6c81ee20812f914b0222df SHA256 5500efa566c460de6a185aae260fb6361b8427d6e1730d1bee81fb53acf35ba7
 MISC metadata.xml 251 RMD160 f98b79c78c9a648314ee514bc8521a31a8018b3d SHA1 f58b9ae8d4a67e568288a4cf7d0037f228ba3fc4 SHA256 2ecb6b4fcce7435885895d82f44bd288b8ab797c7d6476eaac494d44a56f8886
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhwujMACgkQr2QksT29OyALIgCeIZ1+vBRTcKFlfJ+JdnM60N3m
-mL4Aniuq/xGZq0a1mbZOPr7KgM+81NEP
-=K9Ru
+iEYEARECAAYFAkiQnN8ACgkQz974XjDVpblJzgCg1pYSVj6LPOoGlUoSopRMpP6e
+I6YAoNdPOVZ5Q8O7cK/+qrWxCM8UUyaP
+=mwLV
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/webkit-gtk-0_p34382.ebuild b/net-libs/webkit-gtk/webkit-gtk-0_p34382.ebuild
deleted file mode 100644
index 72b28a30d5cb..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-0_p34382.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-0_p34382.ebuild,v 1.1 2008/06/08 19:28:44 jokey Exp $
-
-inherit autotools
-
-MY_P="WebKit-r${PV/0\_p}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkit.org/"
-SRC_URI="http://nightly.webkit.org/files/trunk/src/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2 LGPL-2.1 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="coverage debug dom-storage gstreamer hildon pango soup sqlite svg svg-experimental xslt"
-
-RDEPEND=">=x11-libs/gtk+-2.8
-	dev-libs/icu
-	>=net-misc/curl-7.15
-	media-libs/jpeg
-	media-libs/libpng
-	dev-libs/libxml2
-	sqlite? ( >=dev-db/sqlite-3 )
-	gstreamer? (
-		>=media-libs/gst-plugins-base-0.10
-		>=gnome-base/gnome-vfs-2.0
-		)
-	soup? ( >=net-libs/libsoup-2.4 )
-	xslt? ( dev-libs/libxslt )
-	pango? ( x11-libs/pango )"
-
-DEPEND="${RDEPEND}
-	dev-util/gperf
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	eautoreconf
-}
-
-src_compile() {
-	local myconf
-		use pango && myconf="${myconf} --with-font-backend=pango"
-		use soup && myconf="${myconf} --with-http-backend=soup"
-
-	econf \
-		$(use_enable sqlite database) \
-		$(use_enable sqlite icon-database) \
-		$(use_enable dom-storage) \
-		$(use_enable gstreamer video) \
-		$(use_enable svg-experimental) \
-		$(use_enable svg) \
-		$(use_enable debug) \
-		$(use_with hildon) \
-		$(use_enable xslt) \
-		$(use_enable coverage) \
-		${myconf} \
-		|| die "configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-0_p34469.ebuild b/net-libs/webkit-gtk/webkit-gtk-0_p35417.ebuild
index 13eba0be9f96..c742aff972f4 100644
--- a/net-libs/webkit-gtk/webkit-gtk-0_p34469.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-0_p35417.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-0_p34469.ebuild,v 1.2 2008/06/11 12:35:49 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-0_p35417.ebuild,v 1.1 2008/07/30 16:54:45 jokey Exp $
 
 inherit autotools
 
@@ -25,7 +25,7 @@ RDEPEND=">=x11-libs/gtk+-2.8
 		>=media-libs/gst-plugins-base-0.10
 		>=gnome-base/gnome-vfs-2.0
 		)
-	soup? ( >=net-libs/libsoup-2.4 )
+	soup? ( >=net-libs/libsoup-2.23.1 )
 	xslt? ( dev-libs/libxslt )
 	pango? ( x11-libs/pango )"
 
@@ -56,7 +56,6 @@ src_compile() {
 		$(use_enable gstreamer video) \
 		$(use_enable svg) \
 		$(use_enable debug) \
-		$(use_with hildon) \
 		$(use_enable xslt) \
 		$(use_enable coverage) \
 		${myconf} \