[dev-libs/Ice] sync live, add 3.6.4 for testing

This commit is contained in:
2018-01-24 16:40:07 +01:00
parent 015253224c
commit 26d32e5453
5 changed files with 337 additions and 50 deletions

View File

@@ -6,7 +6,7 @@ EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
RUBY_OPTIONAL="yes"
USE_RUBY="ruby23"
USE_RUBY="ruby24"
PHP_EXT_NAME="IcePHP"
PHP_EXT_INI="yes"
@@ -14,7 +14,7 @@ PHP_EXT_ZENDEXT="no"
PHP_EXT_OPTIONAL_USE=php
USE_PHP="php7-0 php7-1"
USE_PHP="php7-1 php7-2"
EGIT_REPO_URI="https://github.com/zeroc-ice/ice.git"
EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
@@ -82,21 +82,9 @@ src_prepare() {
default
sed -i \
-e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \
-e 's|-L\$\(libdir\)||' \
cpp/config/Make.rules || die "sed failed"
sed -i \
-e 's|\(install_phpdir[[:space:]]*\):=|\1?=|' \
-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
php/config/Make.rules.php || die "sed failed"
sed -i \
-e 's|\(install_pythondir[[:space:]]*\)=|\1?=|' \
-e 's|\(install_rubydir[[:space:]]*\)=|\1?=|' \
-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
{python,ruby}/config/Make.rules || die "sed failed"
sed -i \
-e 's|-O2 ||g' \
-e 's|-Werror ||g' \
@@ -108,8 +96,6 @@ src_prepare() {
sed -i \
-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
-e 's|\(install_pkgconfigdir[[:space:]]*\):=|\1?=|' \
csharp/config/Make.rules.cs || die "sed failed"
# skip mono tests, bug #498484
@@ -117,12 +103,12 @@ src_prepare() {
-e '/SUBDIRS/s|\ test||' \
csharp/Makefile || die "sed failed"
# IceUtil/stacktrace fails with USE=debug
# skip udp test due to multicast
# skip IceSSL tests due to requirement of internet connection
# IceGrid/admin fails, no idea why
# skip IceSSL tests due to requirement of internet connection
# IceUtil/stacktrace fails with USE=debug
sed -i \
-e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceSSL --rfilter=IceGrid\/admin|' \
-e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceUtil\/stacktrace|' \
cpp/Makefile || die "sed failed"
# mainly broken .ice files
@@ -257,7 +243,7 @@ src_test() {
if use python; then
testing() {
emake -C "${BUILD_DIR}" \
PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \
"${MAKE_RULES[@]}" \
PYTHON="${EPYTHON}" \
install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \