Dessa/gentoo
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

[dev-libs/Ice] add py3k8 for testing and fix ruby again

Browse Source
This commit is contained in:
Robert Förster 2019-12-10 17:45:38 +01:00
parent 57ea1198ee
commit acffbda455
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dev-libs/Ice/Ice-3.6.9999.ebuild
View File

@ -3,7 +3,7 @@
EAPI=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" RUBY_OPTIONAL="yes"
USE_RUBY="ruby26" USE_RUBY="ruby26"
@ -46,7 +46,7 @@ RDEPEND=">=dev-libs/expat-2.0.1
) )
dev-cpp/libmcpp dev-cpp/libmcpp
python? ( ${PYTHON_DEPS} ) python? ( ${PYTHON_DEPS} )
ruby? ( $(ruby_implementation_depend ruby25) ) ruby? ( $(ruby_implementation_depend ruby26) )
mono? ( dev-lang/mono )" mono? ( dev-lang/mono )"
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
readline? ( sys-libs/readline:0= ) readline? ( sys-libs/readline:0= )
@ -164,25 +164,25 @@ src_configure() {
fi fi
if use ruby; then if use ruby; then
SITERUBY="$(ruby25 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" SITERUBY="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
SITERUBYARCH="$(ruby25 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')" SITERUBYARCH="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
MAKE_RULES_RUBY=( MAKE_RULES_RUBY=(
"install_rubydir=\"${ED}/${SITERUBY}\"" "install_rubydir=\"${ED}/${SITERUBY}\""
"install_libdir=\"${ED}/${SITERUBYARCH}\"" "install_libdir=\"${ED}/${SITERUBYARCH}\""
) )
# make it use ruby25 only # make it use ruby26 only
sed -i \ sed -i \
-e 's|RUBY = ruby|\025|' \ -e 's|RUBY = ruby|\026|' \
ruby/config/Make.rules || die "sed failed" ruby/config/Make.rules || die "sed failed"
sed -i \ sed -i \
-e 's|env ruby|\025|' \ -e 's|env ruby|\026|' \
ruby/config/s2rb.rb || die "sed failed" ruby/config/s2rb.rb || die "sed failed"
sed -i \ sed -i \
-e 's|env ruby|\025|' \ -e 's|env ruby|\026|' \
ruby/scripts/slice2rb || die "sed failed" ruby/scripts/slice2rb || die "sed failed"
sed -i \ sed -i \
-e 's|output.write("ruby|\025|' \ -e 's|output.write("ruby|\026|' \
scripts/TestUtil.py || die "sed failed" scripts/TestUtil.py || die "sed failed"
fi fi