Bump to 1.1.7 (from gnome overlay). Lots of new features, libsoup support, gnome-keyring support, etc. Add gnome as herd.

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

4 files changed, 88 insertions, 14 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index e5dd8668fdf5..b8002f56caa7 100644
--- a/net-libs/webkit-gtk/ChangeLog
+++ b/net-libs/webkit-gtk/ChangeLog
@@ -1,6 +1,13 @@
 # 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.25 2009/05/15 08:43:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.26 2009/05/23 17:48:45 nirbheek Exp $
+
+*webkit-gtk-1.1.7 (23 May 2009)
+
+  23 May 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +webkit-gtk-1.1.7.ebuild, metadata.xml:
+  Bump to 1.1.7 (from gnome overlay). Lots of new features, libsoup support,
+  gnome-keyring support, etc. Add gnome as herd.
 
   15 May 2009; Alexis Ballier <aballier@gentoo.org>
   webkit-gtk-0_p40220.ebuild, webkit-gtk-0_p42162.ebuild:
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index bf4d09e5a6bd..f0795dd1e3cf 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX webkit-gtk-0_p40220-gcc44-aliasing.patch 31876 RMD160 19f850df93fd81d1a736dbcc5441d0193929ef35 SHA1 293465980ececa6f2dbdd55787edf2676f628edf SHA256 6aee86b94b443a088502a35d25ffc7f17fa36f6e89dd082dcca11042a7af110f
 AUX webkit-gtk-0_p42162-gcc44-aliasing.patch 26682 RMD160 6e74cd94ff6cd26b521df3e474527835f2319821 SHA1 bff55f18d164ec53ab636a7ff60fe6acf60b882a SHA256 914348d8818b26b140b9d3e636dc3487e5ba26456c2f1c44f02b5ce082b1251f
 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
 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
-MISC ChangeLog 6958 RMD160 3a2103854f44e33ab03acd68f13cd72c9186a729 SHA1 efe8abb975e8165ff56622064c2de50bc7d1f700 SHA256 3165e9e2e171cc132933d3e23f43531733aa500c381f0ee3f35c457302bc9370
-MISC metadata.xml 533 RMD160 ff61aeef26bfef5b2f6ba6de2ad8c4c55548e84b SHA1 6b47fbec6901f23ec311ec2bd5b6e62c996b406c SHA256 c38f1b44c497e5dc6fc4d33cab656255fee3a0f705624d59f7058c7ad43304ff
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoNKz0ACgkQvFcC4BYPU0qkUQCeL+RrYqXGIErlESL5xe+ZfN2q
-rAQAoJddliLfi7jlDCm3PcwxciiCuxVk
-=42Qo
------END PGP SIGNATURE-----
+EBUILD webkit-gtk-1.1.7.ebuild 1861 RMD160 7b3be1d9a8acf483d51d00f370d47dc072575f7f SHA1 fa38c03c97fd7e55aaf54c3aef895949e5c5d1a9 SHA256 1b6aecb6644d24dcb68b690eaa658f249f13ef3c908125a6d357b5b68c5b14b5
+MISC ChangeLog 7214 RMD160 1abbabfad6eb3a85df1fac2ee7d038c84c669e87 SHA1 7a7d9060c47d2a96394c749fa3861e2267b457b6 SHA256 7080c84eb0441fa94d70caf2fb6439a1c535de42e1dbbb27395681ed0c4209f8
+MISC metadata.xml 531 RMD160 285606a7b4b22a9fd2f4374009b6bc920daa36f2 SHA1 abc9aa9a98cdd9eed2323509a8a9c92e9dc731e9 SHA256 c378730cdc83d29b2c94aee6dedece01b4f97a8fac3da2135510c32eea05a246
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 7f3827aca704..16c9d0c70c80 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>no-herd</herd>
+  <herd>gnome</herd>
   <maintainer>
     <email>jokey@gentoo.org</email>
     <name>Markus Ullmann</name>
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.1.7.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.1.7.ebuild
new file mode 100644
index 000000000000..604a4d1d790d
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-1.1.7.ebuild
@@ -0,0 +1,75 @@
+# 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.7.ebuild,v 1.1 2009/05/23 17:48:45 nirbheek Exp $
+
+EAPI="1"
+
+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_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
+		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"
+}