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 430131381FB for ; Thu, 27 Dec 2012 04:55:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E908C21C13D; Thu, 27 Dec 2012 04:55:15 +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 605F421C13D for ; Thu, 27 Dec 2012 04:55:15 +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 4F54C33BF33 for ; Thu, 27 Dec 2012 04:55:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id DF38DE543D for ; Thu, 27 Dec 2012 04:55:12 +0000 (UTC) From: "Alexandre Rostovtsev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Rostovtsev" Message-ID: <1356584031.a49701f5b7760b062cb8b977d27702f43da1df7b.tetromino@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/webkit-gtk-1.11.2-r300.ebuild X-VCS-Directories: net-libs/webkit-gtk/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: a49701f5b7760b062cb8b977d27702f43da1df7b X-VCS-Branch: master Date: Thu, 27 Dec 2012 04:55:12 +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: c23c8682-ea74-4897-a242-56ee151ac4a5 X-Archives-Hash: a4150e4c4032f2114647ae9423d9b4b5 commit: a49701f5b7760b062cb8b977d27702f43da1df7b Author: Alexandre Rostovtsev gentoo org> AuthorDate: Thu Dec 27 04:53:51 2012 +0000 Commit: Alexandre Rostovtsev gentoo org> CommitDate: Thu Dec 27 04:53:51 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a49701f5 net-libs/webkit-gtk: sync with gx86 Do not use python-r1.eclass: webkit-gtk needs python only at build time, so use-expanded PYTHON_TARGETS do not make sense here. --- net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild index d49cb5a..aa2db30 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild @@ -3,9 +3,8 @@ # $Header: $ EAPI="5" -PYTHON_COMPAT=( python2_{5,6,7} ) -inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-single-r1 virtualx +inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils virtualx MY_P="webkitgtk-${PV}" DESCRIPTION="Open source web browser engine" @@ -29,14 +28,14 @@ RDEPEND=" app-crypt/libsecret dev-libs/libxml2:2 dev-libs/libxslt - virtual/jpeg + virtual/jpeg:= >=media-libs/libpng-1.4:0= - >=x11-libs/cairo-1.10 + >=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 + dev-db/sqlite:3= >=x11-libs/pango-1.21 x11-libs/libXrender >=x11-libs/gtk+-2.13:2 @@ -46,7 +45,7 @@ RDEPEND=" media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) - spell? ( >=app-text/enchant-0.22 ) + spell? ( >=app-text/enchant-0.22:= ) webgl? ( virtual/opengl x11-libs/libXcomposite @@ -55,7 +54,7 @@ RDEPEND=" # paxctl needed for bug #407085 DEPEND="${RDEPEND} dev-lang/perl - ${PYTHON_DEPS} + =dev-lang/python-2* || ( virtual/rubygems[ruby_targets_ruby19] virtual/rubygems[ruby_targets_ruby18] ) app-accessibility/at-spi2-core @@ -92,8 +91,6 @@ pkg_setup() { 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-single-r1_pkg_setup } src_prepare() { @@ -190,10 +187,11 @@ src_configure() { --disable-gles2 --with-gtk=3.0 --with-gstreamer=1.0 - --with-accelerated-compositing + --enable-accelerated-compositing --enable-dependency-tracking --disable-gtk-doc - $(use aqua && echo "--with-font-backend=pango --with-target=quartz")" + PYTHON=$(type -P python2) + "$(usex aqua "--with-font-backend=pango --with-target=quartz" "") # Aqua support in gtk3 is untested if has_version "virtual/rubygems[ruby_targets_ruby19]"; then