From acffbda45570a4ac4360441ce08f5f99dc55633b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster?= Date: Tue, 10 Dec 2019 17:45:38 +0100 Subject: [PATCH] [dev-libs/Ice] add py3k8 for testing and fix ruby again --- dev-libs/Ice/Ice-3.6.9999.ebuild | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-libs/Ice/Ice-3.6.9999.ebuild b/dev-libs/Ice/Ice-3.6.9999.ebuild index 7c0c0bd..64c7bf7 100644 --- a/dev-libs/Ice/Ice-3.6.9999.ebuild +++ b/dev-libs/Ice/Ice-3.6.9999.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python{2_7,3_6,3_7} pypy ) +PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} pypy ) RUBY_OPTIONAL="yes" USE_RUBY="ruby26" @@ -46,7 +46,7 @@ RDEPEND=">=dev-libs/expat-2.0.1 ) dev-cpp/libmcpp python? ( ${PYTHON_DEPS} ) - ruby? ( $(ruby_implementation_depend ruby25) ) + ruby? ( $(ruby_implementation_depend ruby26) ) mono? ( dev-lang/mono )" DEPEND="${RDEPEND} readline? ( sys-libs/readline:0= ) @@ -164,25 +164,25 @@ src_configure() { fi if use ruby; then - SITERUBY="$(ruby25 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" - SITERUBYARCH="$(ruby25 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')" + SITERUBY="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" + SITERUBYARCH="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')" MAKE_RULES_RUBY=( "install_rubydir=\"${ED}/${SITERUBY}\"" "install_libdir=\"${ED}/${SITERUBYARCH}\"" ) - # make it use ruby25 only + # make it use ruby26 only sed -i \ - -e 's|RUBY = ruby|\025|' \ + -e 's|RUBY = ruby|\026|' \ ruby/config/Make.rules || die "sed failed" sed -i \ - -e 's|env ruby|\025|' \ + -e 's|env ruby|\026|' \ ruby/config/s2rb.rb || die "sed failed" sed -i \ - -e 's|env ruby|\025|' \ + -e 's|env ruby|\026|' \ ruby/scripts/slice2rb || die "sed failed" sed -i \ - -e 's|output.write("ruby|\025|' \ + -e 's|output.write("ruby|\026|' \ scripts/TestUtil.py || die "sed failed" fi