| 1 |
tetromino 13/10/01 23:39:17 |
| 2 |
|
| 3 |
Modified: webkit-gtk-1.10.2-r300.ebuild ChangeLog |
| 4 |
webkit-gtk-2.0.4.ebuild |
| 5 |
Log: |
| 6 |
Allow building using ruby20 (bug #482296, thanks to Mark David Dumlao). |
| 7 |
|
| 8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.12 net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild?rev=1.12&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild?rev=1.12&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild?r1=1.11&r2=1.12 |
| 16 |
|
| 17 |
Index: webkit-gtk-1.10.2-r300.ebuild |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild,v |
| 20 |
retrieving revision 1.11 |
| 21 |
retrieving revision 1.12 |
| 22 |
diff -u -r1.11 -r1.12 |
| 23 |
--- webkit-gtk-1.10.2-r300.ebuild 5 Sep 2013 19:01:33 -0000 1.11 |
| 24 |
+++ webkit-gtk-1.10.2-r300.ebuild 1 Oct 2013 23:39:17 -0000 1.12 |
| 25 |
@@ -1,6 +1,6 @@ |
| 26 |
# Copyright 1999-2013 Gentoo Foundation |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild,v 1.11 2013/09/05 19:01:33 mgorny Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild,v 1.12 2013/10/01 23:39:17 tetromino Exp $ |
| 30 |
|
| 31 |
EAPI="5" |
| 32 |
|
| 33 |
@@ -54,8 +54,10 @@ |
| 34 |
DEPEND="${RDEPEND} |
| 35 |
${PYTHON_DEPS} |
| 36 |
dev-lang/perl |
| 37 |
- || ( virtual/rubygems[ruby_targets_ruby19] |
| 38 |
- virtual/rubygems[ruby_targets_ruby18] ) |
| 39 |
+ || ( |
| 40 |
+ virtual/rubygems[ruby_targets_ruby20] |
| 41 |
+ virtual/rubygems[ruby_targets_ruby19] |
| 42 |
+ virtual/rubygems[ruby_targets_ruby18] ) |
| 43 |
app-accessibility/at-spi2-core |
| 44 |
>=dev-util/gtk-doc-am-1.10 |
| 45 |
dev-util/gperf |
| 46 |
@@ -219,7 +221,9 @@ |
| 47 |
"$(usex aqua "--with-font-backend=pango --with-target=quartz" "") |
| 48 |
# Aqua support in gtk3 is untested |
| 49 |
|
| 50 |
- if has_version "virtual/rubygems[ruby_targets_ruby19]"; then |
| 51 |
+ if has_version "virtual/rubygems[ruby_targets_ruby20]"; then |
| 52 |
+ myconf="${myconf} RUBY=$(type -P ruby20)" |
| 53 |
+ elif has_version "virtual/rubygems[ruby_targets_ruby19]"; then |
| 54 |
myconf="${myconf} RUBY=$(type -P ruby19)" |
| 55 |
else |
| 56 |
myconf="${myconf} RUBY=$(type -P ruby18)" |
| 57 |
|
| 58 |
|
| 59 |
|
| 60 |
1.222 net-libs/webkit-gtk/ChangeLog |
| 61 |
|
| 62 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.222&view=markup |
| 63 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?rev=1.222&content-type=text/plain |
| 64 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/ChangeLog?r1=1.221&r2=1.222 |
| 65 |
|
| 66 |
Index: ChangeLog |
| 67 |
=================================================================== |
| 68 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v |
| 69 |
retrieving revision 1.221 |
| 70 |
retrieving revision 1.222 |
| 71 |
diff -u -r1.221 -r1.222 |
| 72 |
--- ChangeLog 5 Sep 2013 19:01:33 -0000 1.221 |
| 73 |
+++ ChangeLog 1 Oct 2013 23:39:17 -0000 1.222 |
| 74 |
@@ -1,6 +1,10 @@ |
| 75 |
# ChangeLog for net-libs/webkit-gtk |
| 76 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 77 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.221 2013/09/05 19:01:33 mgorny Exp $ |
| 78 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.222 2013/10/01 23:39:17 tetromino Exp $ |
| 79 |
+ |
| 80 |
+ 01 Oct 2013; Alexandre Rostovtsev <tetromino@g.o> |
| 81 |
+ webkit-gtk-1.10.2-r300.ebuild, webkit-gtk-2.0.4.ebuild: |
| 82 |
+ Allow building using ruby20 (bug #482296, thanks to Mark David Dumlao). |
| 83 |
|
| 84 |
05 Sep 2013; Michał Górny <mgorny@g.o> webkit-gtk-1.10.2-r300.ebuild, |
| 85 |
webkit-gtk-1.8.3-r200.ebuild, webkit-gtk-1.8.3-r201.ebuild, |
| 86 |
|
| 87 |
|
| 88 |
|
| 89 |
1.5 net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild |
| 90 |
|
| 91 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild?rev=1.5&view=markup |
| 92 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild?rev=1.5&content-type=text/plain |
| 93 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild?r1=1.4&r2=1.5 |
| 94 |
|
| 95 |
Index: webkit-gtk-2.0.4.ebuild |
| 96 |
=================================================================== |
| 97 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild,v |
| 98 |
retrieving revision 1.4 |
| 99 |
retrieving revision 1.5 |
| 100 |
diff -u -r1.4 -r1.5 |
| 101 |
--- webkit-gtk-2.0.4.ebuild 5 Sep 2013 19:01:33 -0000 1.4 |
| 102 |
+++ webkit-gtk-2.0.4.ebuild 1 Oct 2013 23:39:17 -0000 1.5 |
| 103 |
@@ -1,6 +1,6 @@ |
| 104 |
# Copyright 1999-2013 Gentoo Foundation |
| 105 |
# Distributed under the terms of the GNU General Public License v2 |
| 106 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild,v 1.4 2013/09/05 19:01:33 mgorny Exp $ |
| 107 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild,v 1.5 2013/10/01 23:39:17 tetromino Exp $ |
| 108 |
|
| 109 |
EAPI="5" |
| 110 |
|
| 111 |
@@ -62,8 +62,10 @@ |
| 112 |
DEPEND="${RDEPEND} |
| 113 |
${PYTHON_DEPS} |
| 114 |
dev-lang/perl |
| 115 |
- || ( virtual/rubygems[ruby_targets_ruby19] |
| 116 |
- virtual/rubygems[ruby_targets_ruby18] ) |
| 117 |
+ || ( |
| 118 |
+ virtual/rubygems[ruby_targets_ruby20] |
| 119 |
+ virtual/rubygems[ruby_targets_ruby19] |
| 120 |
+ virtual/rubygems[ruby_targets_ruby18] ) |
| 121 |
>=app-accessibility/at-spi2-core-2.5.3 |
| 122 |
>=dev-util/gtk-doc-am-1.10 |
| 123 |
dev-util/gperf |
| 124 |
@@ -209,7 +211,9 @@ |
| 125 |
"$(usex aqua "--with-font-backend=pango --with-target=quartz" "") |
| 126 |
# Aqua support in gtk3 is untested |
| 127 |
|
| 128 |
- if has_version "virtual/rubygems[ruby_targets_ruby19]"; then |
| 129 |
+ if has_version "virtual/rubygems[ruby_targets_ruby20]"; then |
| 130 |
+ myconf="${myconf} RUBY=$(type -P ruby20)" |
| 131 |
+ elif has_version "virtual/rubygems[ruby_targets_ruby19]"; then |
| 132 |
myconf="${myconf} RUBY=$(type -P ruby19)" |
| 133 |
else |
| 134 |
myconf="${myconf} RUBY=$(type -P ruby18)" |
Archives