| 1 |
commit: a49701f5b7760b062cb8b977d27702f43da1df7b |
| 2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 27 04:53:51 2012 +0000 |
| 4 |
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 27 04:53:51 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a49701f5 |
| 7 |
|
| 8 |
net-libs/webkit-gtk: sync with gx86 |
| 9 |
|
| 10 |
Do not use python-r1.eclass: webkit-gtk needs python only at build time, |
| 11 |
so use-expanded PYTHON_TARGETS do not make sense here. |
| 12 |
|
| 13 |
--- |
| 14 |
net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild | 20 +++++++++----------- |
| 15 |
1 files changed, 9 insertions(+), 11 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
index d49cb5a..aa2db30 100644 |
| 19 |
--- a/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild |
| 20 |
+++ b/net-libs/webkit-gtk/webkit-gtk-1.11.2-r300.ebuild |
| 21 |
@@ -3,9 +3,8 @@ |
| 22 |
# $Header: $ |
| 23 |
|
| 24 |
EAPI="5" |
| 25 |
-PYTHON_COMPAT=( python2_{5,6,7} ) |
| 26 |
|
| 27 |
-inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils python-single-r1 virtualx |
| 28 |
+inherit autotools check-reqs eutils flag-o-matic gnome2-utils pax-utils virtualx |
| 29 |
|
| 30 |
MY_P="webkitgtk-${PV}" |
| 31 |
DESCRIPTION="Open source web browser engine" |
| 32 |
@@ -29,14 +28,14 @@ RDEPEND=" |
| 33 |
app-crypt/libsecret |
| 34 |
dev-libs/libxml2:2 |
| 35 |
dev-libs/libxslt |
| 36 |
- virtual/jpeg |
| 37 |
+ virtual/jpeg:= |
| 38 |
>=media-libs/libpng-1.4:0= |
| 39 |
- >=x11-libs/cairo-1.10 |
| 40 |
+ >=x11-libs/cairo-1.10:= |
| 41 |
>=dev-libs/glib-2.32:2 |
| 42 |
>=x11-libs/gtk+-3.4:3[aqua=,introspection?] |
| 43 |
>=dev-libs/icu-3.8.1-r1:= |
| 44 |
>=net-libs/libsoup-2.39.2:2.4[introspection?] |
| 45 |
- dev-db/sqlite:3 |
| 46 |
+ dev-db/sqlite:3= |
| 47 |
>=x11-libs/pango-1.21 |
| 48 |
x11-libs/libXrender |
| 49 |
>=x11-libs/gtk+-2.13:2 |
| 50 |
@@ -46,7 +45,7 @@ RDEPEND=" |
| 51 |
media-libs/gstreamer:1.0 |
| 52 |
media-libs/gst-plugins-base:1.0 ) |
| 53 |
introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) |
| 54 |
- spell? ( >=app-text/enchant-0.22 ) |
| 55 |
+ spell? ( >=app-text/enchant-0.22:= ) |
| 56 |
webgl? ( |
| 57 |
virtual/opengl |
| 58 |
x11-libs/libXcomposite |
| 59 |
@@ -55,7 +54,7 @@ RDEPEND=" |
| 60 |
# paxctl needed for bug #407085 |
| 61 |
DEPEND="${RDEPEND} |
| 62 |
dev-lang/perl |
| 63 |
- ${PYTHON_DEPS} |
| 64 |
+ =dev-lang/python-2* |
| 65 |
|| ( virtual/rubygems[ruby_targets_ruby19] |
| 66 |
virtual/rubygems[ruby_targets_ruby18] ) |
| 67 |
app-accessibility/at-spi2-core |
| 68 |
@@ -92,8 +91,6 @@ pkg_setup() { |
| 69 |
einfo "it may still not be enough, as the total space requirements " |
| 70 |
einfo "depends on the debugging flags (-ggdb vs -g1) and enabled features." |
| 71 |
fi |
| 72 |
- # Needed for CodeGeneratorInspector.py |
| 73 |
- python-single-r1_pkg_setup |
| 74 |
} |
| 75 |
|
| 76 |
src_prepare() { |
| 77 |
@@ -190,10 +187,11 @@ src_configure() { |
| 78 |
--disable-gles2 |
| 79 |
--with-gtk=3.0 |
| 80 |
--with-gstreamer=1.0 |
| 81 |
- --with-accelerated-compositing |
| 82 |
+ --enable-accelerated-compositing |
| 83 |
--enable-dependency-tracking |
| 84 |
--disable-gtk-doc |
| 85 |
- $(use aqua && echo "--with-font-backend=pango --with-target=quartz")" |
| 86 |
+ PYTHON=$(type -P python2) |
| 87 |
+ "$(usex aqua "--with-font-backend=pango --with-target=quartz" "") |
| 88 |
# Aqua support in gtk3 is untested |
| 89 |
|
| 90 |
if has_version "virtual/rubygems[ruby_targets_ruby19]"; then |
Archives