Bump to 1.1.8, also fix bug 259061

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 91 insertions, 2 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index be059134f1f8..e9d147983ece 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/webkit-gtk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.28 2009/05/24 13:56:31 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.29 2009/05/30 20:09:33 nirbheek Exp $
+
+*webkit-gtk-1.1.8 (30 May 2009)
+
+  30 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +webkit-gtk-1.1.8.ebuild:
+  Bump to 1.1.8, also fix bug 259061
 
   24 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
   webkit-gtk-1.1.7.ebuild:
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index a85b017348ae..9c5b7260f624 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -3,8 +3,10 @@ AUX webkit-gtk-0_p42162-gcc44-aliasing.patch 26682 RMD160 6e74cd94ff6cd26b521df3
 DIST WebKit-r40220.tar.bz2 10307835 RMD160 5700977d5a9a23680e58b1e3952ecb2fe1430e9a SHA1 2aa2bd3a9c60f53a1a1ef0bf810ea2c59b0a80e2 SHA256 223154d0e247336cd3cf808b030cfb00739103b7a258050e71703903df922020
 DIST WebKit-r42162.tar.bz2 10587869 RMD160 19d39fe4025dc6c5dc048bb0111dbab4adab09f6 SHA1 059e0d94a9bd4cfc589fc79a49f660571ce0d88d SHA256 c160a5cd8d95d257582a3d71803890868c03901953c929a2178b1a34d8f8f6a5
 DIST webkit-1.1.7.tar.gz 6205024 RMD160 63dea479e23b62ae6d0abb0e5559c35eed34466d SHA1 77d27ab8f0d74ddda349ea9e4416d27d9adb8b61 SHA256 1aaae2bc36ba7ffb27690647e1631f336c0aee56bad2fd91ee6ea906ff17945f
+DIST webkit-1.1.8.tar.gz 6232745 RMD160 6c0cda8cbcf88c7d7104e0bcc6b910eada9213c0 SHA1 3b858495e293c0998a2652993a93ccbedff71839 SHA256 984929e42c6904893f5cd73f6506f858a3859d2ee1a56d69b4f7e9f62a0d2ffa
 EBUILD webkit-gtk-0_p40220.ebuild 1813 RMD160 6dcf4fac3db324268097c60dd9bc6e5e23b0abd1 SHA1 3d2530d3bf1a9f12c1ad4f083a010c50a969fc2a SHA256 df18dcfbefd31c4f9eabece22bff4dc6c2b7b293072fb53a65b020dda341d6fd
 EBUILD webkit-gtk-0_p42162.ebuild 1879 RMD160 5b0f82767da4b3daad4618527e60447e3bb2863b SHA1 ffdf289eb75a5d504b5c34d3fab416ce548193fc SHA256 4045ae42765b8a2394af085cb371570977af9b446c00c90b316fcc607192e9ba
 EBUILD webkit-gtk-1.1.7.ebuild 1966 RMD160 9ffaf403e0987743564692874d45c032951dcb00 SHA1 30b067da607985115868015f283ee03fc04c6711 SHA256 0865ae435fdff7c25befd23a9b8167f364a9e1d43000a7dcd59eaf999034f582
-MISC ChangeLog 7547 RMD160 a6196a2e31e379e3355ff93fbf25929ebaad12f3 SHA1 a975434e2ae43193ecb4e27f3d5f9fc95890e2bc SHA256 0decbba433cfd69e40675d8b1eee687d3e2d4b2f52f32181e1bee95aed6b7a0d
+EBUILD webkit-gtk-1.1.8.ebuild 2043 RMD160 000083188163acaf2eeca08e5249e4c072d1c28a SHA1 cbafadaeaf59c48e8f9e43556df601f06c8eb4af SHA256 0675a43b07c777b8454c58b2e656191abd2d19f5d1a78b010964f1564a14dd01
+MISC ChangeLog 7700 RMD160 daffcb363b0da467cac6935dec6d38343ff575bf SHA1 20b391e5c5461882a3f1237629a710b340e7a742 SHA256 e304ee056b249e4bea9061f7c428cb5a5fc6bd73db813162a8625f4ffb4bbda0
 MISC metadata.xml 531 RMD160 285606a7b4b22a9fd2f4374009b6bc920daa36f2 SHA1 abc9aa9a98cdd9eed2323509a8a9c92e9dc731e9 SHA256 c378730cdc83d29b2c94aee6dedece01b4f97a8fac3da2135510c32eea05a246
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.1.8.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.1.8.ebuild
new file mode 100644
index 000000000000..ee3bdc463e48
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-1.1.8.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.8.ebuild,v 1.1 2009/05/30 20:09:33 nirbheek Exp $
+
+EAPI="2"
+
+MY_P="webkit-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2 LGPL-2.1 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+# geoclue
+IUSE="coverage debug doc gnome-keyring +gstreamer pango"
+
+# use sqlite, svg by default
+RDEPEND="
+	dev-libs/libxml2
+	dev-libs/libxslt
+	media-libs/jpeg
+	media-libs/libpng
+	x11-libs/cairo
+
+	>=x11-libs/gtk+-2.10
+	>=dev-libs/icu-3.8.1-r1
+	>=net-libs/libsoup-2.25.90
+	>=dev-db/sqlite-3
+	>=app-text/enchant-0.22
+
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.26.0 )
+	gstreamer? (
+		media-libs/gstreamer:0.10
+		media-libs/gst-plugins-base:0.10 )
+	pango? ( x11-libs/pango )
+	!pango? (
+		media-libs/freetype:2
+		media-libs/fontconfig )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-util/gperf
+	dev-util/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.10 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -ie 's/-O2//g' "${S}"/configure* || die "sed failed"
+}
+
+src_configure() {
+	# It doesn't compile on alpha without this in LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	local myconf
+
+	myconf="--enable-svg-filters
+		$(use_enable gnome-keyring gnomekeyring)
+		$(use_enable gstreamer video)
+		$(use_enable debug)
+		$(use_enable coverage)"
+
+	# USE-flag controlled font backend because upstream default is freetype
+	# Remove USE-flag once font-backend becomes pango upstream
+	if use pango; then
+		ewarn "You have enabled the incomplete pango backend"
+		ewarn "Please file any and all bugs *upstream*"
+		myconf="${myconf} --with-font-backend=pango"
+	else
+		myconf="${myconf} --with-font-backend=freetype"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+	dodoc WebKit/gtk/{NEWS,ChangeLog} || die "dodoc failed"
+}