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

[dev-libs/Ice] move targets forward

This commit is contained in:
Robert Förster 2020-05-14 14:31:29 +02:00
parent 1aa6e8035e
commit c265c8d7f7
3 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dev-libs/Ice/Ice-3.6.5.ebuild
View File

@ -3,10 +3,10 @@
EAPI=7 EAPI=7
PYTHON_COMPAT=( python{2_7,3_{6,7,8}} ) PYTHON_COMPAT=( python3_{6,7,8} )
RUBY_OPTIONAL="yes" RUBY_OPTIONAL="yes"
USE_RUBY="ruby25" USE_RUBY="ruby26"
PHP_EXT_NAME="IcePHP" PHP_EXT_NAME="IcePHP"
PHP_EXT_INI="yes" PHP_EXT_INI="yes"
@ -14,7 +14,7 @@ PHP_EXT_ZENDEXT="no"
PHP_EXT_OPTIONAL_USE=php PHP_EXT_OPTIONAL_USE=php
USE_PHP="php7-3" USE_PHP="php7-4"
# This variable does not belong to any eclass. It is solely used in this ebuild # This variable does not belong to any eclass. It is solely used in this ebuild
BERKDB_SLOTS=( 6.2 6.1 5.3 5.1 4.8 ) BERKDB_SLOTS=( 6.2 6.1 5.3 5.1 4.8 )
@ -41,7 +41,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= )
@ -159,25 +159,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 ruby/config/Make.rules || die
sed -i \ sed -i \
-e 's|env ruby|\025|' \ -e 's|env ruby|\026|' \
ruby/config/s2rb.rb || die ruby/config/s2rb.rb || die
sed -i \ sed -i \
-e 's|env ruby|\025|' \ -e 's|env ruby|\026|' \
ruby/scripts/slice2rb || die ruby/scripts/slice2rb || die
sed -i \ sed -i \
-e 's|output.write("ruby|\025|' \ -e 's|output.write("ruby|\026|' \
scripts/TestUtil.py || die scripts/TestUtil.py || die
fi fi

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

@ -14,7 +14,7 @@ PHP_EXT_ZENDEXT="no"
PHP_EXT_OPTIONAL_USE=php PHP_EXT_OPTIONAL_USE=php
USE_PHP="php7-3" USE_PHP="php7-4"
EGIT_REPO_URI="https://github.com/zeroc-ice/ice.git" EGIT_REPO_URI="https://github.com/zeroc-ice/ice.git"
EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}" EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"

16
dev-libs/Ice/Ice-3.7.9999.ebuild
View File

@ -3,10 +3,10 @@
EAPI=7 EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} ) PYTHON_COMPAT=( python3_{7,8} )
RUBY_OPTIONAL="yes" RUBY_OPTIONAL="yes"
USE_RUBY="ruby26" USE_RUBY="ruby27"
PHP_EXT_NAME="IcePHP" PHP_EXT_NAME="IcePHP"
PHP_EXT_INI="yes" PHP_EXT_INI="yes"
@ -101,22 +101,22 @@ src_configure() {
fi fi
if use ruby; then if use ruby; then
SITERUBY="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" SITERUBY="$(ruby27 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
SITERUBYARCH="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')" SITERUBYARCH="$(ruby27 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
MAKE_RULES_RUBY=( MAKE_RULES_RUBY=(
"install_rubydir=\"${ED}/${SITERUBY}\"" "install_rubydir=\"${ED}/${SITERUBY}\""
"install_rubylibdir=\"${ED}/${SITERUBYARCH}\"" "install_rubylibdir=\"${ED}/${SITERUBYARCH}\""
) )
# make it use ruby26 only # make it use ruby27 only
sed -i \ sed -i \
-e 's|RUBY = ruby|\026|' \ -e 's|RUBY = ruby|\027|' \
ruby/config/Make.rules || die "sed failed" ruby/config/Make.rules || die "sed failed"
sed -i \ sed -i \
-e 's|env ruby|\026|' \ -e 's|env ruby|\027|' \
ruby/config/s2rb.rb || die "sed failed" ruby/config/s2rb.rb || die "sed failed"
sed -i \ sed -i \
-e 's|env ruby|\026|' \ -e 's|env ruby|\027|' \
ruby/scripts/slice2rb || die "sed failed" ruby/scripts/slice2rb || die "sed failed"
fi fi