Bump to 1.6.1, optional partly-broken webgl support, build and install API docs with USE=doc, generate an xz tarball and use that

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

5 files changed, 343 insertions, 8 deletions

diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog
index 55432e55ee9c..252a560691c1 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-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.121 2011/09/24 13:53:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.122 2011/09/30 13:52:33 nirbheek Exp $
+
+*webkit-gtk-1.6.1-r300 (30 Sep 2011)
+*webkit-gtk-1.6.1-r200 (30 Sep 2011)
+
+  30 Sep 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +webkit-gtk-1.6.1-r200.ebuild, +webkit-gtk-1.6.1-r300.ebuild, metadata.xml:
+  Bump to 1.6.1, optional partly-broken webgl support, build and install API
+  docs with USE=doc, generate an xz tarball and use that
 
   24 Sep 2011; Pacho Ramos <pacho@gentoo.org> webkit-gtk-1.4.3-r300.ebuild,
   -files/webkit-gtk-1.4.3-underlinking.patch:
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 06bf401b4cd8..5f6f5c060420 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -10,17 +10,30 @@ AUX webkit-gtk-1.4.1-libpng15.patch 2571 RMD160 427d9746f365f27c66be0c73a41c7034
 DIST webkit-1.2.7.tar.gz 6615990 RMD160 f36b3ae05693e0eeb4d1936ceee52b6fe1517e57 SHA1 e9afc573d2459794c3749ba404f2187f9dcc9ed3 SHA256 228a80b3f0132db1342708e8ef7738996f05e30393e0187acf4cab987283718b
 DIST webkit-1.4.2.tar.gz 8504310 RMD160 e1de3cd5576d7ccc771475cda8c0e3b59aba1af7 SHA1 675ae0bfef56b8519f3f00b04fc7baf72215bd3b SHA256 dee6336b5366e952f67a18a66dca2edce95a8e70f591dbc7fc30cf30b5fdb9ba
 DIST webkit-1.4.3.tar.gz 8512387 RMD160 43d1fd1cfd0cbf9fc83b107f05442e2d531c03aa SHA1 a24adee9583d66ebc93ac61ce9881947a54c569d SHA256 b808ace6b3edad76aba57cc746a430051abfedf301c969628b989a1128dd37e4
+DIST webkit-gtk-1.6.1.tar.xz 6416248 RMD160 ab63ea133ed2bd471c5faf012d4d284c324d6ff3 SHA1 13b976e736f09950ceeb6f1b0af00c52e9d8d475 SHA256 ca29992afb70d97301b8cf991ce58bf53523a71b5eb91134d998a458824a0339
 EBUILD webkit-gtk-1.2.7.ebuild 3407 RMD160 29ef994a54ba6e32f0530b45c3927eb2940a96a1 SHA1 739722c6edde3ba56719cceedf2d1b9b9e9ce477 SHA256 8971d4fe3c00c321cc6f82f18a7de84bfb81709da4d1913a6aa756e32089b9cf
 EBUILD webkit-gtk-1.4.2-r200.ebuild 3672 RMD160 0be69c14bbd395a8e1940b2ca9469e27d4963c3b SHA1 ba9d7ff375539bccf9cc96970b8627ca8a4c623b SHA256 0e19f480dbdbde9bc93d4e43ac9a50984a1446a3fcd325642e0c26fb192394ac
 EBUILD webkit-gtk-1.4.2-r300.ebuild 3744 RMD160 24a4953d4953077b0d32c000bce4d900efa0cf92 SHA1 5eb1b725d5c42c0d58e4b0c279b4283af007b1a7 SHA256 33212de6d2d14ca705e9fcb88b9909a28ab43a9b4b23a2ba98c884ada69ca4a7
 EBUILD webkit-gtk-1.4.3-r200.ebuild 3669 RMD160 7aa23fce2bbfb55de31a47d3c6954b7b9aad4a84 SHA1 cd15e18cb0a6cbe175b3585252908ea953b0a5b1 SHA256 8977f50d8949702d37305d56780c9fcde2a24d245bdc05168af20d36760a92cf
 EBUILD webkit-gtk-1.4.3-r300.ebuild 3741 RMD160 840086a04bf632860ba526225d415e0ac9f52972 SHA1 a269d6923995850cf8228f0222b405a96f34b37f SHA256 d742de60ad3e143601858f26f1ab9e30a20277bf9d147fa80eaf9bea00b728ca
-MISC ChangeLog 23846 RMD160 a8fd971541352a91d3a74dea904f6ebea653980f SHA1 4815abe960370ee40fbf13de709a3945e05a66a2 SHA256 060d04e50b71db7d8c752832ceb38381e36992e1aaef7da58e656caab87e2c3a
-MISC metadata.xml 439 RMD160 ed901542890ff2bf45ff3302f79b48cc0ba9e5f8 SHA1 746abe4ff5e3911f962a40f23fe1c521d32adca8 SHA256 57260da7cdd67c9be679d44a3deba705ff381fde47433b5d22ccd1402ecabdf3
+EBUILD webkit-gtk-1.6.1-r200.ebuild 4178 RMD160 5fe6f89c0ee09e69a43a81b9343b007643cd66e1 SHA1 463e74ebcadb4ccef80ec28a24e7f762510c3083 SHA256 ed401ed3a61f95e01e9970562eec6e5cf8784f97fc64baa68abfcce9a202a4fe
+EBUILD webkit-gtk-1.6.1-r300.ebuild 4607 RMD160 4bbf1076fdf882bf3a65d1a25eec902d6a2b9476 SHA1 b29428a8e47d82823e76cd3a8fb1879444900938 SHA256 da1c4dde2a531631b146ce496f7a25dffb2dc756cdde24cd2676360ccfff2021
+MISC ChangeLog 24191 RMD160 777a4ab552944463f0da9f684d3614cd10371c1f SHA1 3b7c47d3b2fff40dbd1471ea9c1447ddea7580c6 SHA256 9ae0f093f99db47ca2961bbecfdc874d8467d444b2be890a1e4b178fbf48cff7
+MISC metadata.xml 539 RMD160 422a84bfd5fd0ca7d32825e204b0a435a980ecd5 SHA1 33fe25bdc890c5e034d5dc02a82b028283e0cc03 SHA256 eb78ad3163ace16c943a2620ef1659d33913985b8a9584a2d734f021a82f7887
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk594M4ACgkQCaWpQKGI+9S1GACcCnFzQ2vUrDF6KOptskNpdU8c
-nPQAn2gqxhBupCs7hmHuz7FbyiakYBmH
-=+zU7
+iQIcBAEBAgAGBQJOhcmlAAoJEO/kOhxWD91kTesP/3Nj8LiyhMO9FcTJU/NP8H7d
+VuuK4aYkNyd/noGJtSDs73BzTzmQuA8tw+YR+6Wi+YrXA88OXoTyC3cfga4dQeWa
+OB4kCngd51hkkKYo17228xp1dWq+RgBDvZnvQgsJUeclIxW1fXCuTDYpXktDlur4
+zdUha4KEbnNSIEL3H6KUDl5fXKTq9L1HixFlvfzn5RQRplDSomhIqmOjzFv/9klR
+ypNLbDyVJvTCFTCpGR5uO+1/rQ2Aa080LD9x5Y4nfAecCG8yJVjKn80Sssl1iXLR
+LosLyWL4kMKPIh1bItl/kTQeG6+THlNywtwPB8EaVHPqAmKkf86vpSXCBk75ewrK
+pPSZwfB3tFYLq/2T0SNTBWWXIggGDzqbgyc2C+pG0YYkje3eZResfujJ3lCJ0Sqj
+568cOKt2UA69IfbFJytGpawTnWkQYtfW7svlJsJnxEyz3GAnW7s8KJFl7xOz99Bl
+LDeQK+ZXPCH6bS6qLEF6Lk0t7sFgC3VL8lqCWVswyWj84/dilIY9Fk+b1BWVAI3X
+jXu/n+VKPsddMfZmieHuwPlipLKm9KvYW0zPbyOFM3xqSx2XAtkMImuWZ5fl4hfA
+vST875+sL9KBPoDAWzP7MNuN/N8yI5pjZ//r992KBh4mqW6L0xdMYCjwTF7VFYKY
+uPNvjyHnqhiVRm5x0P6p
+=1nJI
 -----END PGP SIGNATURE-----
diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index 2e12fe94946e..db2d36fc015b 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -5,8 +5,10 @@
   <use>
 	<flag name="coverage">Enable code coverage support</flag>
 	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-	for introspection</flag>
+		for introspection</flag>
 	<flag name="jit">Enable JIT javascript compiler (disabling it will
-	cause performance penalty)</flag>
+		cause performance penalty)</flag>
+	<flag name="webgl">Build support for the WebGL HTML API using
+		<pkg>virtual/opengl</pkg></flag>
   </use>
 </pkgmetadata>
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r200.ebuild
new file mode 100644
index 000000000000..46ec4732f9cb
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r200.ebuild
@@ -0,0 +1,149 @@
+# 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.6.1-r200.ebuild,v 1.1 2011/09/30 13:52:33 nirbheek Exp $
+
+EAPI="4"
+
+inherit autotools eutils flag-o-matic eutils virtualx
+
+MY_P="webkit-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+# Upstream is still shipping silly gzip files
+#SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+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 +gstreamer +introspection +jit spell webgl"
+# bug 372493
+REQUIRED_USE="introspection? ( gstreamer )"
+
+# 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-1.10
+	>=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.30:0.10 )
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+
+	spell? ( >=app-text/enchant-0.22 )
+
+	webgl? ( virtual/opengl )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.33
+	sys-devel/gettext
+	virtual/yacc
+	dev-util/gperf
+	dev-util/pkgconfig
+	dev-util/gtk-doc-am
+	test? ( x11-themes/hicolor-icon-theme )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
+
+	# 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"
+
+	# Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
+	mkdir -p DerivedSources/ANGLE
+
+	# 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
+	# WebKit2 can only be built with gtk3
+	# API documentation (gtk-doc) is built in webkit-gtk:3, always disable here
+	myconf="
+		$(use_enable coverage)
+		$(use_enable debug)
+		$(use_enable debug debug-features)
+		$(use_enable spell spellcheck)
+		$(use_enable introspection)
+		$(use_enable gstreamer video)
+		$(use_enable jit)
+		$(use_enable webgl)
+		--enable-web-sockets
+		--with-gtk=2.0
+		--disable-gtk-doc
+		--disable-webkit2
+		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+
+	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
+	# Parallel tests sometimes fail
+	Xemake -j1 check XDG_DATA_HOME="${T}/.local"
+}
+
+src_install() {
+	default
+
+	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
+	newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po
+	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
+	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
+
+	# Remove .la files
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild
new file mode 100644
index 000000000000..025a3c75c086
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild
@@ -0,0 +1,163 @@
+# 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.6.1-r300.ebuild,v 1.1 2011/09/30 13:52:33 nirbheek Exp $
+
+EAPI="4"
+
+inherit autotools eutils flag-o-matic eutils virtualx
+
+MY_P="webkit-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+# Upstream is still shipping silly gzip files
+#SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+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 webgl"
+# bug 372493
+REQUIRED_USE="introspection? ( gstreamer )"
+
+# use sqlite, svg by default
+# dependency on >=x11-libs/gtk+-2.13:2 for gail
+# Aqua support in gtk3 is untested
+# gtk2 is needed for plugin process support
+RDEPEND="
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	virtual/jpeg
+	>=media-libs/libpng-1.4:0
+	>=x11-libs/cairo-1.10
+	>=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.30:0.10 )
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+
+	spell? ( >=app-text/enchant-0.22 )
+
+	webgl? ( virtual/opengl )
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/flex-2.5.33
+	sys-devel/gettext
+	virtual/yacc
+	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="ChangeLog NEWS" # other ChangeLog files handled by src_install
+
+	# 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"
+
+	# Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
+	mkdir -p DerivedSources/ANGLE
+
+	# 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: files for generating DerivedSources/WebKit2/* are missing, see
+	#      https://bugs.webkit.org/show_bug.cgi?id=66527
+	myconf="
+		$(use_enable coverage)
+		$(use_enable debug)
+		$(use_enable debug debug-features)
+		$(use_enable doc gtk-doc)
+		$(use_enable spell spellcheck)
+		$(use_enable introspection)
+		$(use_enable gstreamer video)
+		$(use_enable jit)
+		$(use_enable webgl)
+		--enable-web-sockets
+		--with-gtk=3.0
+		--disable-webkit2
+		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+		# Aqua support in gtk3 is untested
+
+	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"
+
+	# ${PN} neither ships, nor builds documentation on its own
+	if use doc; then
+		emake -C "${S}/Source/WebKit/gtk/docs"
+	fi
+}
+
+src_test() {
+	unset DISPLAY
+	# Tests need virtualx, bug #294691, bug #310695
+	# Set XDG_DATA_HOME for introspection tools, bug #323669
+	# Parallel tests sometimes fail
+	Xemake -j1 check XDG_DATA_HOME="${T}/.local"
+}
+
+src_install() {
+	default
+
+	# ${PN} doesn't install documentation on its own
+	if use doc; then
+		emake DESTDIR=${D} -C "${S}/Source/WebKit/gtk/docs" install
+	fi
+
+	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
+	newdoc Source/WebKit/gtk/po/ChangeLog ChangeLog.gtk-po
+	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
+	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
+
+	# Remove .la files
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}