summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-01-19 19:27:19 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-01-19 19:27:19 +0000
commit98eb40bbf3708254431d7239fa3dc5137a2f5b11 (patch)
tree939ca4dd3e1818b2abf427fda40870a65f79d393
parent5d0b82d02220085a717c53f54b29a8f6d4d00dd6 (diff)
dev-qt/qtwebkit : don't use ruby-single.eclass
-rw-r--r--dev-qt/qtwebkit/qtwebkit-5.212.0_pre20190629-r10.ebuild16
1 files changed, 4 insertions, 12 deletions
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
}