updated to latest webkit-gtk version

2 files changed, 315 insertions, 0 deletions

diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 3be88df..c344958 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -31,6 +31,7 @@ DIST webkitgtk-2.4.3.tar.xz 9841564 SHA256 9862c3eac1d12cc6e52cc39060a1284163950
 DIST webkitgtk-2.4.4a.tar.xz 10093300 SHA256 3741c8724ddf8d7330c148fce95b59554dd4d87989a5ff272c64d46949d7b75f SHA512 162a0a664f84102f5a9a7545e284b365d6a5e0680e6ea4abee49648d1a8fc09a00d552c6a7cddadb09493faf2156568bd65ccd5a8eed345efc3c8ef4c9191f00 WHIRLPOOL a2d3989ba586fed2e3ee7a20ddce0239670509ff0a67bd9a7ec5eaf1a9f20cc239a800f5231276e23b32e65ad4c680484c39b2b23bd5b94a9a92dd4481cfedb8
 DIST webkitgtk-2.4.6.tar.xz 9862200 SHA256 6fef4aa8d4a2668e03ea15472a71396ea7b776bbe56ad9459a4124b823c11457 SHA512 4b6f1e92b30879eb3bebb722d15aa8f265a562d2e3bfa3bdfe52eb2fa652f2cf4787ee74fcb775e0c8f5fbfa2ce65ce51aeace9ded1fc4abef1e974381f55b90 WHIRLPOOL 9abaa24183d5642348679e518946d55be91a9ae93a37c23d7903b3d1de327d19a690e774db4fd883a08f17f08617c15283ed9507934ff4af08ed4dab811baa65
 DIST webkitgtk-2.4.7.tar.xz 9826208 SHA256 f5cf26e39abf1d6b2d25f1398348fef6bbe6c03fb4f99e11c569091c05197d38 SHA512 1ba2371b34e40e078f6d85774e171f559e4f269ac80f63c56e2e7612e2ec3a41db0f5999af028b1b93657634fcdfcc3612e1a55eeeec2578fe448bd0861b0729 WHIRLPOOL 1cd8382e91efdce9d3654fe16de2f664b1f874ed7e9f811e5d652dd96e7269a48492f44ccbb1cd46e36d41b92188466b68a6e3e009e8dd037dce35ec9582f3d8
+DIST webkitgtk-2.4.8.tar.xz 9827632 SHA256 68f11559cb178679ca92acc9e3a3d7febede7acb7b98afd7fb761875bbc6bd23 SHA512 31b8b87142730aa27e5bd4fe85b0de2116fd492ef469592512c185d60df428a9913d6c2738ce57439bf9db10864ed9c121ddbc2a4da2f715818a70885c81c0de WHIRLPOOL 851e3973c00096dd3a98e64bfa9f9f0f278c3513656af9a9aa72442cd6c594119adefafa6c06d05e431ec77bf6e9f1e10432e9b6895d777adfe2952843602ef2
 EBUILD webkit-gtk-2.2.2.ebuild 9319 SHA256 c6a83bd39f1950a81e42ba829ab3a2c63ac6cf99285294b2f85f5991de67c060 SHA512 02766da78a7aa5cd31b44f07a9faab8ba120c517299ab993ffb4c57f9bf2a0281aaa5d617be0733a57540b55b039f3a4186eb77c40c70f484a6de06186cc3df8 WHIRLPOOL c691c7ccbde6c3f345af8053c5e46ed1e410abbdf65b8894695d6affd5a5611eaa1d4ca63c2bb577fd7fddf0cd985b291d88836f8b126c30105f7ff7313a6305
 EBUILD webkit-gtk-2.2.4-r200.ebuild 9169 SHA256 52f77a8c13cc892e9ecc53dc6dea9ae7525891ae37c13f705a05664278837265 SHA512 d8e77fbc76528a47c147efc2fb7fdab0a2a12138c4ac039af16c78eb62a8e7fd7c6f2559e3a4e246dce5745066d0918ceffb012847968888d24c958848401724 WHIRLPOOL 6ee4177e52b932c15cba0bdd60b8f776f0a1cf601639ffab9d3cfbc474f98a0c8540ebefe53b1fe02985df3717d2994dd481c647887db3d95815325fa517d7e5
 EBUILD webkit-gtk-2.2.6.ebuild 8887 SHA256 bb6eb67de9cb0a48f6e120370400d92f8e100336e04afe2a560de65ec2ed7502 SHA512 60245e4882a37deb6aecdb3b7e3b69b37b3f5a67d983c08e52e7464c37754e1aab339ac5a1ffe4aa8c87ba3cd98adb1b9bdd0262a03f93f5c1efa4f574063c63 WHIRLPOOL 7ba5d5a946ab2d21267ad210638cf37ecff4c2de6caca75901c11aeaa7f683d5dd2ba216968ee8f3dbe37ce644178a998df7d02580c1859e4538ecc8891a18de
@@ -38,3 +39,4 @@ EBUILD webkit-gtk-2.4.3.ebuild 9227 SHA256 33ea5699c83fd8443d377142837eb6f735e41
 EBUILD webkit-gtk-2.4.4-r1.ebuild 10064 SHA256 d6c5543bea59c8f81ae68340e55fbb88f6be4563351bae11e68c1f5510f50505 SHA512 c419e89876412405862af7cb166159b2a43fbb23f4498c97aa41d6edaab72da761523621b7aab57fa2ca38ccb69d8bec508aa38bdfe17c639e261a2167cf2474 WHIRLPOOL 15d4a6a34438ea96195e3954b050f234116d36b7067a71fe0629ae81517e876473b84675ae155d3effc9f0d9522163d9fd6f0f276340f09a3461a89fa3c57e8b
 EBUILD webkit-gtk-2.4.6.ebuild 10449 SHA256 1edede238c7cd575c2df4ddaf1fc58944f5860b68e3713d6682ec8aeb5f98084 SHA512 4b9fad43e34e369f9448ecd1d4f02f1f81628b94070e1c8db46fd9c77dad391051056eed69f4436172e5ea9f23931b22cac564c6dfaa922604766ef0d77b3903 WHIRLPOOL 2916f69b8163a6bde68fb37f9fd4386c71803f27e6051a316464581fd9b9e317905b82e97b05cc5e9ce41ed470d89ed0a290f8db8e541b483c160f9cad0b2392
 EBUILD webkit-gtk-2.4.7.ebuild 10515 SHA256 22e6b21f07aee587045b51e754711963617b99f347625f780c5dba42edc8fc21 SHA512 030a3b3e5de7ac7793ec6a406f3352574ee185c6f4ab1aad82517a56fbc2bc2ede3b63696122970d2c7b25b4e32e36a6c1c070912874cd77e74778abb44ff2f6 WHIRLPOOL b9b647fe5765205ba6522b1b2699b694174b837490bb2bb0eeec181fca5d8437e40fcef92079c2fa5a5978ddcce43c97285e7ee752eaf21437d96c90f5b20bd9
+EBUILD webkit-gtk-2.4.8.ebuild 10301 SHA256 87d749be071e3639b59b94b9f7052fb64c52fc7cabea4353749b4f83a66695c1 SHA512 855e89431ed2c15d3778ddff77ccd6abe0fa4ed5286a56ed9889875d2ff0f080c5f43f581dc1054025c80c24209e6c52a786404ddf6e718407bd0239659375ca WHIRLPOOL e2490e4db66ab6ca0b46ce896bb5e170c0915efee888c83cd3fc17b9637f91acfbf55cadec78d32dc2aa01438eb318fc1b1ec33354697e4d551c5833cf8900e1
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild
new file mode 100644
index 0000000..1257bf3
--- /dev/null
+++ b/net-libs/webkit-gtk/webkit-gtk-2.4.8.ebuild
@@ -0,0 +1,313 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit autotools check-reqs eutils flag-o-matic gnome2 pax-utils python-any-r1 toolchain-funcs versionator virtualx
+
+MY_P="webkitgtk-${PV}"
+DESCRIPTION="Open source web browser engine"
+HOMEPAGE="http://www.webkitgtk.org/"
+SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2+ BSD"
+SLOT="3/25" # soname version of libwebkit2gtk-3.0
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+
+IUSE="aqua coverage debug +egl +geoloc gles2 +gstreamer +introspection +jit libsecret +opengl spell wayland +webgl +X"
+# bugs 372493, 416331
+REQUIRED_USE="
+	geoloc? ( introspection )
+	introspection? ( gstreamer )
+	gles2? ( egl )
+	webgl? ( ^^ ( gles2 opengl ) )
+	!webgl? ( ?? ( gles2 opengl ) )
+	|| ( aqua wayland X )
+"
+
+# use sqlite, svg by default
+# Aqua support in gtk3 is untested
+# gtk2 is needed for plugin process support
+# gtk3-3.10 required for wayland
+RDEPEND="
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	media-libs/harfbuzz:=[icu(+)]
+	media-libs/libwebp:=
+	virtual/jpeg:0=
+	>=media-libs/libpng-1.4:0=
+	>=x11-libs/cairo-1.10:=[X]
+	>=dev-libs/glib-2.36.0:2
+	>=x11-libs/gtk+-3.6.0:3[aqua=,introspection?]
+	>=dev-libs/icu-3.8.1-r1:=
+	>=net-libs/libsoup-2.42.0:2.4[introspection?]
+	dev-db/sqlite:3=
+	>=x11-libs/pango-1.30.0.0
+	x11-libs/libXrender
+	x11-libs/libXt
+	>=x11-libs/gtk+-2.24.10:2
+
+	egl? ( media-libs/mesa[egl] )
+	geoloc? ( >=app-misc/geoclue-2.1.5:2.0 )
+	gles2? ( media-libs/mesa[gles2] )
+	gstreamer? (
+		>=media-libs/gstreamer-1.2:1.0
+		>=media-libs/gst-plugins-base-1.2:1.0 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32.0 )
+	libsecret? ( app-crypt/libsecret )
+	opengl? ( virtual/opengl )
+	spell? ( >=app-text/enchant-0.22:= )
+	wayland? ( >=x11-libs/gtk+-3.10:3[wayland] )
+	webgl? ( || ( x11-libs/cairo[gles2]
+		x11-libs/cairo[opengl] )
+		x11-libs/libXcomposite
+		x11-libs/libXdamage )
+"
+
+# paxctl needed for bug #407085
+# Need real bison, not yacc
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/perl
+	|| (
+		virtual/rubygems[ruby_targets_ruby20]
+		virtual/rubygems[ruby_targets_ruby21]
+		virtual/rubygems[ruby_targets_ruby19]
+	)
+	>=app-accessibility/at-spi2-core-2.5.3
+	>=dev-libs/atk-2.8.0
+	>=dev-util/gtk-doc-am-1.10
+	dev-util/gperf
+	>=sys-devel/bison-2.4.3
+	>=sys-devel/flex-2.5.33
+	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )
+	sys-devel/gettext
+	>=sys-devel/make-3.82-r4
+	virtual/pkgconfig
+
+	geoloc? ( dev-util/gdbus-codegen )
+	introspection? ( jit? ( sys-apps/paxctl ) )
+	test? (
+		dev-lang/python:2.7
+		dev-python/pygobject:3[python_targets_python2_7]
+		x11-themes/hicolor-icon-theme
+		jit? ( sys-apps/paxctl ) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
+
+pkg_pretend() {
+	nvidia_check || die #463960
+
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
+		check-reqs_pkg_pretend
+	fi
+
+	if ! test-flag-CXX -std=c++11; then
+		die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags"
+	fi
+}
+
+pkg_setup() {
+	nvidia_check || die #463960
+
+	# Check whether any of the debugging flags is enabled
+	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
+		if is-flagq "-ggdb" && [[ ${WEBKIT_GTK_GGDB} != "yes" ]]; then
+			replace-flags -ggdb -g
+			ewarn "Replacing \"-ggdb\" with \"-g\" in your CFLAGS."
+			ewarn "Building ${PN} with \"-ggdb\" produces binaries which are too"
+			ewarn "large for current binutils releases (bug #432784) and has very"
+			ewarn "high temporary build space and memory requirements."
+			ewarn "If you really want to build ${PN} with \"-ggdb\", add"
+			ewarn "WEBKIT_GTK_GGDB=yes"
+			ewarn "to your make.conf file."
+		fi
+		einfo "You need to have at least 18GB of temporary build space available"
+		einfo "to build ${PN} with debugging CFLAGS. Note that it might still"
+		einfo "not be enough, as the total space requirements depend on the flags"
+		einfo "(-ggdb vs -g1) and enabled features."
+		check-reqs_pkg_setup
+	fi
+
+	[[ ${MERGE_TYPE} = "binary" ]] || python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# 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.6.1-darwin-quartz.patch
+
+	# Leave optimization level to user CFLAGS
+	# FORTIFY_SOURCE is enabled by default in Gentoo
+	sed -e 's/-O[012]//g' \
+		-e 's/-D_FORTIFY_SOURCE=2//g' \
+		-i Source/autotools/SetupCompilerFlags.m4 || die
+
+	# Failing tests
+	# * webinspector -> https://bugs.webkit.org/show_bug.cgi?id=50744
+	# * keyevents is interactive
+	# * mimehandling test sometimes fails under Xvfb (works fine manually), bug #???
+	# * webdatasource test needs a network connection and intermittently fails with icedtea-web
+	# * webplugindatabase intermittently fails with icedtea-web, bug #????
+	sed -e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebinspector/ d' \
+		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testkeyevents/ d' \
+		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testmimehandling/ d' \
+		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebdatasource/ d' \
+		-e '/Programs\/TestWebKitAPI\/WebKitGtk\/testwebplugindatabase/ d' \
+		-i Tools/TestWebKitAPI/GNUmakefile.am || die
+
+	# bug #459978, upstream bug #113397
+	epatch "${FILESDIR}/${PN}-1.11.90-gtk-docize-fix.patch"
+
+	# Deadlock causing infinite compilations with nvidia-drivers:
+	# https://bugs.gentoo.org/show_bug.cgi?id=463960
+	# http://osdyson.org/issues/161
+	# https://bugs.webkit.org/show_bug.cgi?id=125651
+	epatch "${FILESDIR}"/${PN}-2.2.5-gir-nvidia-hangs.patch
+
+	# Debian patches to fix support for some arches
+	# https://bugs.webkit.org/show_bug.cgi?id=129540
+	epatch "${FILESDIR}"/${PN}-2.2.5-{hppa,ia64}-platform.patch
+	# https://bugs.webkit.org/show_bug.cgi?id=129542
+	epatch "${FILESDIR}"/${PN}-2.4.1-ia64-malloc.patch
+
+	# Fix building on ppc (from OpenBSD, only needed on slot 3)
+	# https://bugs.webkit.org/show_bug.cgi?id=130837
+	epatch "${FILESDIR}"/${PN}-2.4.4-atomic-ppc.patch
+
+	epatch "${FILESDIR}"/${PN}-2.4.4-jpeg-9a.patch #481688
+
+	# Fix building with --disable-webgl, bug #500966
+	# https://bugs.webkit.org/show_bug.cgi?id=131267
+	epatch "${FILESDIR}"/${PN}-2.4.7-disable-webgl.patch
+
+	# Fix building with --disable-accelerated-compositing, bug #525072
+	# https://bugs.webkit.org/show_bug.cgi?id=137640
+	epatch "${FILESDIR}"/${PN}-2.4.7-disable-accelerated-compositing.patch
+
+	AT_M4DIR=Source/autotools eautoreconf
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Respect CC, otherwise fails on prefix #395875
+	tc-export CC
+
+	# Arches without JIT support also need this to really disable it in all places
+	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
+
+	# It doesn't compile on alpha without this in LDFLAGS, bug #???
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Sigbuses on SPARC with mcpu and co., bug #???
+	use sparc && filter-flags "-mvis"
+
+	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
+	# --no-keep-memory doesn't work on ia64, bug #502492
+	if ! use ia64; then
+		append-ldflags "-Wl,--no-keep-memory"
+	fi
+	if ! $(tc-getLD) --version | grep -q "GNU gold"; then
+		append-ldflags "-Wl,--reduce-memory-overheads"
+	fi
+
+	local myconf=""
+
+	if has_version "virtual/rubygems[ruby_targets_ruby21]"; then
+		myconf="${myconf} RUBY=$(type -P ruby21)"
+	elif has_version "virtual/rubygems[ruby_targets_ruby20]"; then
+		myconf="${myconf} RUBY=$(type -P ruby20)"
+	else
+		myconf="${myconf} RUBY=$(type -P ruby19)"
+	fi
+
+	# TODO: Check Web Audio support
+	# should somehow let user select between them?
+	#
+	# * Aqua support in gtk3 is untested
+	# * dependency-tracking is required so parallel builds won't fail
+	gnome2_src_configure \
+		$(use_enable aqua quartz-target) \
+		$(use_enable coverage) \
+		$(use_enable debug) \
+		$(use_enable egl) \
+		$(use_enable geoloc geolocation) \
+		$(use_enable gles2) \
+		$(use_enable gstreamer video) \
+		$(use_enable gstreamer web-audio) \
+		$(use_enable introspection) \
+		$(use_enable jit) \
+		$(use_enable libsecret credential_storage) \
+		$(use_enable opengl glx) \
+		$(use_enable spell spellcheck) \
+		$(use_enable webgl) \
+		$(use_enable webgl accelerated-compositing) \
+		$(use_enable wayland wayland-target) \
+		$(use_enable X x11-target) \
+		--with-gtk=3.0 \
+		--enable-dependency-tracking \
+		--disable-gtk-doc \
+		${myconf}
+}
+
+src_compile() {
+	# Try to avoid issues like bug #463960
+	unset DISPLAY
+	gnome2_src_compile
+}
+
+src_test() {
+	# Tests expect an out-of-source build in WebKitBuild
+	ln -s . WebKitBuild || die "ln failed"
+
+	# Prevents test failures on PaX systems
+	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
+
+	unset DISPLAY
+	# Tests need virtualx, bug #294691, bug #310695
+	# Parallel tests sometimes fail
+	Xemake -j1 check
+}
+
+src_install() {
+	DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install
+
+	# https://bugs.webkit.org/show_bug.cgi?id=129242
+	MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+
+	newdoc Source/WebKit/gtk/ChangeLog ChangeLog.gtk
+	newdoc Source/JavaScriptCore/ChangeLog ChangeLog.JavaScriptCore
+	newdoc Source/WebCore/ChangeLog ChangeLog.WebCore
+
+	# Prevents crashes on PaX systems, bug #522808
+	use jit && pax-mark m "${ED}usr/bin/jsc-3" "${ED}usr/libexec/WebKitWebProcess"
+	pax-mark m "${ED}usr/libexec/WebKitPluginProcess"
+}
+
+nvidia_check() {
+	if [[ ${MERGE_TYPE} != "binary" ]] &&
+	   use introspection &&
+	   has_version 'x11-drivers/nvidia-drivers' &&
+	   [[ $(eselect opengl show 2> /dev/null) = "nvidia" ]]
+	then
+		eerror "${PN} freezes while compiling if x11-drivers/nvidia-drivers is"
+		eerror "used as the system OpenGL library. We are very sorry about that."
+		eerror "You should temporarily select Mesa as the system OpenGL library:"
+		eerror " # eselect opengl set xorg-x11"
+		eerror " and then run emerge again."
+		eerror "See https://bugs.gentoo.org/463960 for more details."
+		eerror
+		return 1
+	fi
+}