From 98eb40bbf3708254431d7239fa3dc5137a2f5b11 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 19 Jan 2020 19:27:19 +0000 Subject: dev-qt/qtwebkit : don't use ruby-single.eclass --- dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629-r10.ebuild | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'dev-qt/qtwebkit') diff --git a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629-r10.ebuild b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629-r10.ebuild index 25f37123..f17fd778 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629-r10.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629-r10.ebuild @@ -4,9 +4,8 @@ EAPI=7 PYTHON_COMPAT=( python2_7 ) -USE_RUBY="ruby24 ruby25 ruby26 ruby27" MY_P="${PN}-${PV/_pre20190629/-alpha3}" # present as upgrade over previous snapshot -inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils ruby-single toolchain-funcs +inherit check-reqs cmake flag-o-matic python-any-r1 qmake-utils toolchain-funcs DESCRIPTION="WebKit rendering library for the Qt5 framework (deprecated)" HOMEPAGE="https://www.qt.io/" @@ -28,11 +27,13 @@ QT_MIN_VER="5.9.1:5" BDEPEND=" ${PYTHON_DEPS} ${RUBY_DEPS} + dev-lang/ruby:2.5 dev-lang/perl dev-util/gperf >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig + virtual/rubygems " DEPEND=" dev-db/sqlite:3 @@ -119,18 +120,9 @@ src_configure() { -DENABLE_WEBKIT2=$(usex qml) $(cmake_use_find_package webp WebP) -DENABLE_X11_TARGET=$(usex X) + -DRUBY_EXECUTABLE=$(type -P ruby25) ) - if has_version "virtual/rubygems[ruby_targets_ruby27]"; then - mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby27) ) - elif has_version "virtual/rubygems[ruby_targets_ruby26]"; then - mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby26) ) - elif has_version "virtual/rubygems[ruby_targets_ruby25]"; then - mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby25) ) - else - mycmakeargs+=( -DRUBY_EXECUTABLE=$(type -P ruby24) ) - fi - cmake_src_configure } -- cgit v1.2.3