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

[dev-libs/Ice] bump to py3k5 and ruby23 as per upstream, some python hackery (which probably doesn't even work)

This commit is contained in:
Robert Förster 2016-04-02 02:01:16 +02:00
parent f7d5e4f162
commit 7bacc55c56
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,10 +4,10 @@
EAPI=5 EAPI=5
PYTHON_COMPAT=( python{2_7,3_4} pypy ) PYTHON_COMPAT=( python{2_7,3_5} pypy )
RUBY_OPTIONAL="yes" RUBY_OPTIONAL="yes"
USE_RUBY="ruby22" USE_RUBY="ruby23"
PHP_EXT_NAME="IcePHP" PHP_EXT_NAME="IcePHP"
PHP_EXT_INI="yes" PHP_EXT_INI="yes"
@ -43,7 +43,7 @@ RDEPEND=">=dev-libs/expat-2.0.1
) )
dev-cpp/libmcpp dev-cpp/libmcpp
python? ( ${PYTHON_DEPS} ) python? ( ${PYTHON_DEPS} )
ruby? ( $(ruby_implementation_depend ruby22) ) ruby? ( $(ruby_implementation_depend ruby23) )
mono? ( dev-lang/mono ) mono? ( dev-lang/mono )
php? ( dev-lang/php:5.6 ) php? ( dev-lang/php:5.6 )
php_namespaces? ( dev-lang/php:5.6 ) php_namespaces? ( dev-lang/php:5.6 )
@ -180,19 +180,19 @@ src_configure() {
fi fi
if use ruby ; then if use ruby ; then
SITERUBY="$(ruby22 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" SITERUBY="$(ruby23 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
MAKE_RULES_RB="install_rubydir=\"${ED}/${SITERUBY}\" MAKE_RULES_RB="install_rubydir=\"${ED}/${SITERUBY}\"
install_libdir=\"${ED}/${SITERUBY}\"" install_libdir=\"${ED}/${SITERUBY}\""
# make it use ruby22 only # make it use ruby23 only
sed -i \ sed -i \
-e 's|RUBY = ruby|\022|' \ -e 's|RUBY = ruby|\023|' \
ruby/config/Make.rules || die "sed failed" ruby/config/Make.rules || die "sed failed"
sed -i \ sed -i \
-e 's|env ruby|\022|' \ -e 's|env ruby|\023|' \
ruby/config/s2rb.rb || die "sed failed" ruby/config/s2rb.rb || die "sed failed"
sed -i \ sed -i \
-e 's|env ruby|\022|' \ -e 's|env ruby|\023|' \
ruby/scripts/slice2rb || die "sed failed" ruby/scripts/slice2rb || die "sed failed"
fi fi
@ -242,7 +242,7 @@ src_compile() {
building() { building() {
emake -C "${BUILD_DIR}" ${MAKE_RULES} || die "emake python-${EPYTHON} failed" emake -C "${BUILD_DIR}" ${MAKE_RULES} || die "emake python-${EPYTHON} failed"
} }
BUILD_DIR=python python_foreach_impl building python_foreach_impl building
fi fi
if use ruby ; then if use ruby ; then
@ -263,15 +263,14 @@ src_test() {
if use python ; then if use python ; then
testing() { testing() {
# tests require that the directory is named 'python' # tests require that the directory is named 'python'
ln -f -s ../"${BUILD_DIR}"/python python/python || die ln -s "${BUILD_DIR}" python || die
cd "${S}"/python emake -C python ${MAKE_RULES} \
emake -C . ${MAKE_RULES} \
install_pythondir="\"${D}/$(python_get_sitedir)\"" \ install_pythondir="\"${D}/$(python_get_sitedir)\"" \
install_libdir="\"${D}/$(python_get_sitedir)\"" \ install_libdir="\"${D}/$(python_get_sitedir)\"" \
test || die "emake python-${EPYTHON} test failed" test || die "emake python-${EPYTHON} test failed"
cd "${S}" rm python
} }
BUILD_DIR=python python_foreach_impl testing python_foreach_impl testing
fi fi
if use ruby ; then if use ruby ; then