From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C21C61381FB for ; Tue, 25 Dec 2012 23:56:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D27321C00F; Tue, 25 Dec 2012 23:55:58 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0C0821C00F for ; Tue, 25 Dec 2012 23:55:57 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DB7B333D8CE for ; Tue, 25 Dec 2012 23:55:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 78845E543D for ; Tue, 25 Dec 2012 23:55:55 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1356479745.9f66223deed143581fc3cf553f52cc05143eba5d.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/ X-VCS-Repository: proj/gnome X-VCS-Files: net-libs/webkit-gtk/metadata.xml net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild X-VCS-Directories: net-libs/webkit-gtk/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 9f66223deed143581fc3cf553f52cc05143eba5d X-VCS-Branch: master Date: Tue, 25 Dec 2012 23:55:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9b001dff-365d-4daf-b3e4-c759dbd636a1 X-Archives-Hash: ac88106eba029bf1598fac527ef9d61d commit: 9f66223deed143581fc3cf553f52cc05143eba5d Author: Gilles Dartiguelongue gentoo org> AuthorDate: Tue Dec 25 23:24:28 2012 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Tue Dec 25 23:55:45 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=9f66223d net-libs/webkit-gtk: moved 1.10 to gx86 * Sync 1.11 with gx86 changes. --- net-libs/webkit-gtk/metadata.xml | 10 +- net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild | 238 --------------------- net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild | 53 ++--- 3 files changed, 27 insertions(+), 274 deletions(-) diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml index 4232b5d..f18e5d4 100644 --- a/net-libs/webkit-gtk/metadata.xml +++ b/net-libs/webkit-gtk/metadata.xml @@ -3,14 +3,12 @@ gnome - Enable code coverage support - Enable geolocation support through + Enable code coverage support + Enable geolocation support through app-misc/geoclue - Use dev-libs/gobject-introspection - for introspection - Build support for the WebGL HTML API using + Build support for the WebGL HTML API using virtual/opengl - Enable WebKit2 API that splits web content rendering + Enable WebKit2 API that splits web content rendering and application UI into separate processes diff --git a/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild deleted file mode 100644 index 8ab781d..0000000 --- a/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2012 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.8.1-r301.ebuild,v 1.5 2012/06/20 06:34:59 ssuominen Exp $ - -EAPI="4" - -# Don't define PYTHON_DEPEND: python only needed at build time -inherit autotools check-reqs flag-o-matic gnome2-utils pax-utils python 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" -#SRC_URI="mirror://gentoo/${P}.tar.xz" - -LICENSE="LGPL-2+ BSD" -SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" -# geoclue -IUSE="aqua coverage debug doc +geoloc +gstreamer +introspection +jit spell +webgl" -# bugs 372493, 416331 -REQUIRED_USE="introspection? ( geoloc 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.32:2 - >=x11-libs/gtk+-3.4:3[aqua=,introspection?] - >=dev-libs/icu-3.8.1-r1 - >=net-libs/libsoup-2.39.2:2.4[introspection?] - dev-db/sqlite:3 - >=x11-libs/pango-1.21 - x11-libs/libXrender - >=x11-libs/gtk+-2.13:2 - - geoloc? ( app-misc/geoclue ) - - 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 - x11-libs/libXcomposite ) -" -# paxctl needed for bug #407085 -DEPEND="${RDEPEND} - dev-lang/perl - =dev-lang/python-2* - || ( virtual/rubygems[ruby_targets_ruby19] - virtual/rubygems[ruby_targets_ruby18] ) - sys-devel/bison - >=sys-devel/flex-2.5.33 - sys-devel/gettext - dev-util/gperf - virtual/pkgconfig - dev-util/gtk-doc-am - app-accessibility/at-spi2-core - - >=sys-devel/make-3.82-r4 - - doc? ( >=dev-util/gtk-doc-1.10 ) - introspection? ( jit? ( sys-apps/paxctl ) ) - test? ( - x11-themes/hicolor-icon-theme - jit? ( sys-apps/paxctl ) ) -" -# Need real bison, not yacc - -S="${WORKDIR}/${MY_P}" - -CHECKREQS_DISK_BUILD="6G" - -pkg_pretend() { - if is-flagq "-g*" ; then - check-reqs_pkg_pretend - fi -} - -pkg_setup() { - # Check whether any of the debugging flags is enabled - if is-flagq "-g*" ; then - check-reqs_pkg_setup - einfo "You have at least 6GB of temporary build space available, but " - einfo "it may still not be enough, as the total space requirements " - einfo "depends on the debugging flags (-ggdb vs -g1) and enabled features." - fi - # Needed for CodeGeneratorInspector.py - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - DOCS="ChangeLog NEWS" # other ChangeLog files handled by src_install - - # 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 - - # Drop DEPRECATED flags - LC_ALL=C sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' GNUmakefile.am || die - - # Don't force -O2 - sed -i 's/-O2//g' "${S}"/configure.ac || die - - # Build-time segfaults under PaX with USE="introspection jit", bug #404215 - if use introspection && use jit; then - epatch "${FILESDIR}/${PN}-1.6.3-paxctl-introspection.patch" - cp "${FILESDIR}/gir-paxctl-lt-wrapper" "${S}/" || die - fi - - # We need to reset some variables to prevent permissions problems and failures - # like https://bugs.webkit.org/show_bug.cgi?id=35471 and bug #323669 - gnome2_environment_reset - - # XXX: failing tests - # https://bugs.webkit.org/show_bug.cgi?id=50744 - # testkeyevents is interactive - # mimehandling test sometimes fails under Xvfb (works fine manually) - # datasource test needs a network connection and intermittently fails with - # icedtea-web - sed -e '/Programs\/unittests\/testwebinspector/ d' \ - -e '/Programs\/unittests\/testkeyevents/ d' \ - -e '/Programs\/unittests\/testmimehandling/ d' \ - -e '/Programs\/unittests\/testwebdatasource/ d' \ - -i Source/WebKit/gtk/GNUmakefile.am || die - if ! use gstreamer; then - # webkit2's TestWebKitWebView requires