Version bump. Stability fixes, includes libpng-1.5 patch.

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

4 files changed, 281 insertions, 5 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index dca98539edd7..947590abb0d0 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.114 2011/07/24 15:13:00 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.115 2011/07/24 21:39:34 eva Exp $
+
+*webkit-gtk-1.4.2-r300 (24 Jul 2011)
+*webkit-gtk-1.4.2-r200 (24 Jul 2011)
+
+  24 Jul 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  +webkit-gtk-1.4.2-r200.ebuild, +webkit-gtk-1.4.2-r300.ebuild:
+  Version bump. Stability fixes, includes libpng-1.5 patch.
 
   24 Jul 2011; Gilles Dartiguelongue <eva@gentoo.org> -webkit-gtk-1.2.5.ebuild,
   -webkit-gtk-1.2.6.ebuild:
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 4400ee58769f..6436b64650a5 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -9,15 +9,18 @@ AUX webkit-gtk-1.2.7-libpng15.patch 1657 RMD160 19cec5b29437313372b9b25d43029105
 AUX webkit-gtk-1.4.1-libpng15.patch 2571 RMD160 427d9746f365f27c66be0c73a41c7034754e2522 SHA1 0481a4039c79414449262392758a63e97157ff93 SHA256 c014d8380270a73d96069f5eac343fab40d1a1112b03c32e5e6365da89ab7705
 DIST webkit-1.2.7.tar.gz 6615990 RMD160 f36b3ae05693e0eeb4d1936ceee52b6fe1517e57 SHA1 e9afc573d2459794c3749ba404f2187f9dcc9ed3 SHA256 228a80b3f0132db1342708e8ef7738996f05e30393e0187acf4cab987283718b
 DIST webkit-1.4.1.tar.gz 8494373 RMD160 da77eea6b7abb0e1ffeb322d747386a2c4b7cc9c SHA1 5813112e94315db747c68d6b45ca763a45774357 SHA256 d0db4f6c8e4dd73ebb7fd34c8ca21b0b3b245ac7162d884e789a2104ca631c64
+DIST webkit-1.4.2.tar.gz 8504310 RMD160 e1de3cd5576d7ccc771475cda8c0e3b59aba1af7 SHA1 675ae0bfef56b8519f3f00b04fc7baf72215bd3b SHA256 dee6336b5366e952f67a18a66dca2edce95a8e70f591dbc7fc30cf30b5fdb9ba
 EBUILD webkit-gtk-1.2.7.ebuild 3407 RMD160 3a6cd547f0f87d89004f7f52eb357dfcfde27845 SHA1 27bd1afe3ebc2a488e60565664d4fe7f87f3fb15 SHA256 5d69d1974dd40598e47ef676af136f0a63ce866b241fbef32d0256796256061d
 EBUILD webkit-gtk-1.4.1-r200.ebuild 3662 RMD160 ede4e830b21aad6b2ae5752cba2a6a036a686973 SHA1 d2cbec00bc75d5e7ec6127f67642ce98062b0bec SHA256 ffce5657d6b35e3f79cbeb0626c733fc1b7205cdda581349a474605c00895bc2
 EBUILD webkit-gtk-1.4.1-r300.ebuild 3734 RMD160 768fcb8a9c33381d638428a6deff6e05244a8c91 SHA1 899a884f61eaf597ff573fdca3932fea397ecbaa SHA256 135b05807d831e2dddd3fc54d2bafa9c22108206c3fa862e83d3d085db191260
-MISC ChangeLog 22278 RMD160 e9755da2b73c2e4c3dcf05624199c54965d570ce SHA1 bec70e1b63b560215f56e2041413cc51d98dcad3 SHA256 5c0b76f52929527417d495dc4a08542170787af1bd4878a223ab937bedf35e49
+EBUILD webkit-gtk-1.4.2-r200.ebuild 3596 RMD160 a7ab531e83987fdad87436afc73bd5a37654b653 SHA1 70f54c464c6d28644b916c28f7c4484ac0588aa0 SHA256 1645a594522ef089dabed2bc3798ca6df956d10c18c84e81bf6dd37a6c535259
+EBUILD webkit-gtk-1.4.2-r300.ebuild 3668 RMD160 af0f36a54d1f604d9dc2c2e853ff36579b350447 SHA1 7f8c2a6b4c69eeb7783086edb595ae30f93ca730 SHA256 277c10771f4a376c167dbc39085e7158c95a633045a8d35251d6be3542e3bc93
+MISC ChangeLog 22532 RMD160 88a249d0433359e8a166ab683a9c882b4615a5ba SHA1 9eda403e0fa0767c4d0e293b4c2ad928d8025254 SHA256 c00400c3cac2d61c282d39c3e8f31bc8f6adb17e38b693d18c3f0be42efab44d
 MISC metadata.xml 439 RMD160 ed901542890ff2bf45ff3302f79b48cc0ba9e5f8 SHA1 746abe4ff5e3911f962a40f23fe1c521d32adca8 SHA256 57260da7cdd67c9be679d44a3deba705ff381fde47433b5d22ccd1402ecabdf3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4sNoEACgkQ1fmVwcYIWAYKbQCgp6Qi2Dgjgm9TqKHi+ELAUngD
-8WIAoJuNViIHQWcV6nM2OQFJWiBaceoL
-=O6xg
+iEYEARECAAYFAk4skRwACgkQ1fmVwcYIWAY8XwCdFYJZb312o6tOZTfNogipWyfB
+jY4AoMzk44BLQArLGaWho4qx+Q1SpVhc
+=45zK
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.4.2-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.4.2-r200.ebuild
new file mode 100644
index 000000000000..c27988d1011b
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-1.4.2-r200.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2011 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.4.2-r200.ebuild,v 1.1 2011/07/24 21:39:34 eva Exp $
+
+EAPI="4"
+
+inherit autotools flag-o-matic eutils virtualx
+
+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="2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+# geoclue
+IUSE="aqua coverage debug doc spell +gstreamer +introspection +jit"
+
+# use sqlite, svg by default
+# dependency on >=x11-libs/gtk+-2.13:2 for gail
+RDEPEND="
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	virtual/jpeg
+	>=media-libs/libpng-1.4:0
+	x11-libs/cairo
+	>=dev-libs/glib-2.27.90:2
+	>=x11-libs/gtk+-2.13:2[aqua=,introspection?]
+	>=dev-libs/icu-3.8.1-r1
+	>=net-libs/libsoup-2.33.6:2.4[introspection?]
+	dev-db/sqlite:3
+	>=x11-libs/pango-1.12
+	x11-libs/libXrender
+
+	gstreamer? (
+		media-libs/gstreamer:0.10
+		>=media-libs/gst-plugins-base-0.10.25:0.10 )
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+
+	spell? ( >=app-text/enchant-0.22 )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.33
+	sys-devel/gettext
+	dev-util/gperf
+	dev-util/pkgconfig
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	test? ( x11-themes/hicolor-icon-theme )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	DOCS="Source/WebKit/gtk/NEWS Source/WebKit/gtk/ChangeLog"
+
+	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
+	# https://bugs.webkit.org/show_bug.cgi?id=19775
+	use sparc && epatch "${FILESDIR}"/${PN}-1.1.15.2-unaligned.patch
+
+	# intermediate MacPorts hack while upstream bug is not fixed properly
+	# https://bugs.webkit.org/show_bug.cgi?id=28727
+	use aqua && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
+
+	# Fix build on Darwin8 (10.4 Tiger)
+	# XXX: Fails to apply
+	#epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch
+
+	# Don't force -O2
+	sed -i 's/-O2//g' "${S}"/configure.ac
+
+	# Don't build tests if not needed, part of bug #343249
+	# XXX: Fails to apply
+	#epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
+
+	# Prevent maintainer mode from being triggered during make
+	AT_M4DIR=Source/autotools eautoreconf
+}
+
+src_configure() {
+	# It doesn't compile on alpha without this in LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Sigbuses on SPARC with mcpu and co.
+	use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	local myconf
+
+	# XXX: Check Web Audio support
+	# XXX: webgl fails compilation
+	# XXX: WebKit2 is the new out-of-process model, doesn't work yet
+	myconf="
+		$(use_enable coverage)
+		$(use_enable debug)
+		$(use_enable spell spellcheck)
+		$(use_enable introspection)
+		$(use_enable gstreamer video)
+		$(use_enable jit)
+		--disable-webgl
+		--with-gtk=2.0
+		--disable-webkit2
+		--disable-web-sockets
+		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+		# Disable web-sockets per bug #326547
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Fix sandbox error with USE="introspection"
+	# https://bugs.webkit.org/show_bug.cgi?id=35471
+	emake XDG_DATA_HOME="${T}/.local"
+}
+
+src_test() {
+	unset DISPLAY
+	# Tests need virtualx, bug #294691, bug #310695
+	# Set XDG_DATA_HOME for introspection tools, bug #323669
+	Xemake check XDG_DATA_HOME="${T}/.local"
+}
+
+src_install() {
+	default
+
+	# Remove .la files
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.4.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.4.2-r300.ebuild
new file mode 100644
index 000000000000..253b9f070bda
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-1.4.2-r300.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2011 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.4.2-r300.ebuild,v 1.1 2011/07/24 21:39:34 eva Exp $
+
+EAPI="4"
+
+inherit autotools flag-o-matic eutils virtualx
+
+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="3"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+# geoclue
+IUSE="aqua coverage debug doc +gstreamer +introspection +jit spell"
+
+# use sqlite, svg by default
+# dependency on >=x11-libs/gtk+-2.13:2 for gail
+# Aqua support in gtk3 is untested
+RDEPEND="
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	virtual/jpeg
+	>=media-libs/libpng-1.4:0
+	x11-libs/cairo
+	>=dev-libs/glib-2.27.90:2
+	>=x11-libs/gtk+-3.0:3[aqua=,introspection?]
+	>=dev-libs/icu-3.8.1-r1
+	>=net-libs/libsoup-2.33.6:2.4[introspection?]
+	dev-db/sqlite:3
+	>=x11-libs/pango-1.12
+	x11-libs/libXrender
+
+	gstreamer? (
+		media-libs/gstreamer:0.10
+		>=media-libs/gst-plugins-base-0.10.25:0.10 )
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+
+	spell? ( >=app-text/enchant-0.22 )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.33
+	sys-devel/gettext
+	dev-util/gperf
+	dev-util/pkgconfig
+	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1.10 )
+	test? ( x11-themes/hicolor-icon-theme )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	DOCS="Source/WebKit/gtk/NEWS Source/WebKit/gtk/ChangeLog"
+
+	# FIXME: Fix unaligned accesses on ARM, IA64 and SPARC
+	# https://bugs.webkit.org/show_bug.cgi?id=19775
+	use sparc && epatch "${FILESDIR}"/${PN}-1.2.3-fix-pool-sparc.patch
+
+	# intermediate MacPorts hack while upstream bug is not fixed properly
+	# https://bugs.webkit.org/show_bug.cgi?id=28727
+	use aqua && epatch "${FILESDIR}"/${PN}-1.2.5-darwin-quartz.patch
+
+	# Fix build on Darwin8 (10.4 Tiger)
+	# XXX: Fails to apply
+	#epatch "${FILESDIR}"/${PN}-1.2.5-darwin8.patch
+
+	# Don't force -O2
+	sed -i 's/-O2//g' "${S}"/configure.ac
+
+	# Don't build tests if not needed, part of bug #343249
+	# XXX: Fails to apply
+	#epatch "${FILESDIR}/${PN}-1.2.5-tests-build.patch"
+
+	# Prevent maintainer mode from being triggered during make
+	AT_M4DIR=Source/autotools eautoreconf
+}
+
+src_configure() {
+	# It doesn't compile on alpha without this in LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Sigbuses on SPARC with mcpu and co.
+	use sparc && filter-flags "-mcpu=*" "-mvis" "-mtune=*"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	local myconf
+
+	# XXX: Check Web Audio support
+	# XXX: webgl fails compilation
+	# XXX: WebKit2 is the new out-of-process model, doesn't work yet
+	myconf="
+		$(use_enable coverage)
+		$(use_enable debug)
+		$(use_enable spell spellcheck)
+		$(use_enable introspection)
+		$(use_enable gstreamer video)
+		$(use_enable jit)
+		--disable-webgl
+		--with-gtk=3.0
+		--disable-webkit2
+		--disable-web-sockets
+		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+		# Aqua support in gtk3 is untested
+		# Disable web-sockets per bug #326547
+
+	econf ${myconf}
+}
+
+src_compile() {
+	# Fix sandbox error with USE="introspection"
+	# https://bugs.webkit.org/show_bug.cgi?id=35471
+	emake XDG_DATA_HOME="${T}/.local"
+}
+
+src_test() {
+	unset DISPLAY
+	# Tests need virtualx, bug #294691, bug #310695
+	# Set XDG_DATA_HOME for introspection tools, bug #323669
+	Xemake check XDG_DATA_HOME="${T}/.local"
+}
+
+src_install() {
+	default
+
+	# Remove .la files
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}