1 |
commit: edbb40ba35792886cd67cc961e30239a4c4fe9b9 |
2 |
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 28 18:50:20 2012 +0000 |
4 |
Commit: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 28 18:50:20 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=edbb40ba |
7 |
|
8 |
net-libs/webkit-gtk: update RUBY configure arument |
9 |
|
10 |
Since commit bbe67a94 allowed using ruby19 as well as ruby18. |
11 |
|
12 |
--- |
13 |
net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild | 7 ++++++- |
14 |
net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild | 7 ++++++- |
15 |
2 files changed, 12 insertions(+), 2 deletions(-) |
16 |
|
17 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild |
18 |
index 5c32fff..bb432bc 100644 |
19 |
--- a/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild |
20 |
+++ b/net-libs/webkit-gtk/webkit-gtk-1.10.1-r300.ebuild |
21 |
@@ -188,10 +188,15 @@ src_configure() { |
22 |
--with-gtk=3.0 |
23 |
--enable-dependency-tracking |
24 |
--with-gstreamer=0.10 |
25 |
- RUBY=$(type -P ruby18) |
26 |
$(use aqua && echo "--with-font-backend=pango --with-target=quartz")" |
27 |
# Aqua support in gtk3 is untested |
28 |
|
29 |
+ if has_version "virtual/rubygems[ruby_targets_ruby19]"; then |
30 |
+ myconf="${myconf} RUBY=$(type -P ruby19)" |
31 |
+ else |
32 |
+ myconf="${myconf} RUBY=$(type -P ruby18)" |
33 |
+ fi |
34 |
+ |
35 |
econf ${myconf} |
36 |
} |
37 |
|
38 |
|
39 |
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild |
40 |
index a4795f1..06e82f6 100644 |
41 |
--- a/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild |
42 |
+++ b/net-libs/webkit-gtk/webkit-gtk-1.11.1-r300.ebuild |
43 |
@@ -195,10 +195,15 @@ src_configure() { |
44 |
--with-gtk=3.0 |
45 |
--enable-dependency-tracking |
46 |
--with-gstreamer=0.10 |
47 |
- RUBY=$(type -P ruby18) |
48 |
$(use aqua && echo "--with-font-backend=pango --with-target=quartz")" |
49 |
# Aqua support in gtk3 is untested |
50 |
|
51 |
+ if has_version "virtual/rubygems[ruby_targets_ruby19]"; then |
52 |
+ myconf="${myconf} RUBY=$(type -P ruby19)" |
53 |
+ else |
54 |
+ myconf="${myconf} RUBY=$(type -P ruby18)" |
55 |
+ fi |
56 |
+ |
57 |
econf ${myconf} |
58 |
} |