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