diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-10-01 23:39:17 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-10-01 23:39:17 +0000 |
| commit | 4e5980bd7c9a614614cca87afb51f6d11f88cc76 (patch) | |
| tree | 671a4e075a21e84c5d773ddbc0a3764f358232f2 /net-libs | |
| parent | EAPI=5; add missing deps and fix build. (diff) | |
| download | gentoo-2-4e5980bd7c9a614614cca87afb51f6d11f88cc76.tar.gz gentoo-2-4e5980bd7c9a614614cca87afb51f6d11f88cc76.tar.bz2 gentoo-2-4e5980bd7c9a614614cca87afb51f6d11f88cc76.zip | |
Allow building using ruby20 (bug #482296, thanks to Mark David Dumlao).
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/webkit-gtk/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild | 12 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild | 12 |
3 files changed, 21 insertions, 9 deletions
diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog index 72cd07d7cdd4..cea39e74d398 100644 --- a/net-libs/webkit-gtk/ChangeLog +++ b/net-libs/webkit-gtk/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/webkit-gtk # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.221 2013/09/05 19:01:33 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.222 2013/10/01 23:39:17 tetromino Exp $ + + 01 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org> + webkit-gtk-1.10.2-r300.ebuild, webkit-gtk-2.0.4.ebuild: + Allow building using ruby20 (bug #482296, thanks to Mark David Dumlao). 05 Sep 2013; Michał Górny <mgorny@gentoo.org> webkit-gtk-1.10.2-r300.ebuild, webkit-gtk-1.8.3-r200.ebuild, webkit-gtk-1.8.3-r201.ebuild, 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 index 9d76c8feb39d..f6e0594aa838 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.10.2-r300.ebuild,v 1.11 2013/09/05 19:01:33 mgorny Exp $ +# $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 $ EAPI="5" @@ -54,8 +54,10 @@ RDEPEND=" DEPEND="${RDEPEND} ${PYTHON_DEPS} dev-lang/perl - || ( virtual/rubygems[ruby_targets_ruby19] - virtual/rubygems[ruby_targets_ruby18] ) + || ( + virtual/rubygems[ruby_targets_ruby20] + virtual/rubygems[ruby_targets_ruby19] + virtual/rubygems[ruby_targets_ruby18] ) app-accessibility/at-spi2-core >=dev-util/gtk-doc-am-1.10 dev-util/gperf @@ -219,7 +221,9 @@ src_configure() { "$(usex aqua "--with-font-backend=pango --with-target=quartz" "") # Aqua support in gtk3 is untested - if has_version "virtual/rubygems[ruby_targets_ruby19]"; then + if has_version "virtual/rubygems[ruby_targets_ruby20]"; then + myconf="${myconf} RUBY=$(type -P ruby20)" + elif has_version "virtual/rubygems[ruby_targets_ruby19]"; then myconf="${myconf} RUBY=$(type -P ruby19)" else myconf="${myconf} RUBY=$(type -P ruby18)" diff --git a/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild index b0fedf665649..14fcd4017d32 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.0.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ EAPI="5" @@ -62,8 +62,10 @@ RDEPEND=" DEPEND="${RDEPEND} ${PYTHON_DEPS} dev-lang/perl - || ( virtual/rubygems[ruby_targets_ruby19] - virtual/rubygems[ruby_targets_ruby18] ) + || ( + virtual/rubygems[ruby_targets_ruby20] + virtual/rubygems[ruby_targets_ruby19] + virtual/rubygems[ruby_targets_ruby18] ) >=app-accessibility/at-spi2-core-2.5.3 >=dev-util/gtk-doc-am-1.10 dev-util/gperf @@ -209,7 +211,9 @@ src_configure() { "$(usex aqua "--with-font-backend=pango --with-target=quartz" "") # Aqua support in gtk3 is untested - if has_version "virtual/rubygems[ruby_targets_ruby19]"; then + if has_version "virtual/rubygems[ruby_targets_ruby20]"; then + myconf="${myconf} RUBY=$(type -P ruby20)" + elif has_version "virtual/rubygems[ruby_targets_ruby19]"; then myconf="${myconf} RUBY=$(type -P ruby19)" else myconf="${myconf} RUBY=$(type -P ruby18)" |