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

(Portage version: 2.2_rc4/cvs/Linux 2.6.26-gentoo i686)

3 files changed, 11 insertions, 73 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/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} \