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

[dev-libs/Ice] bump 3.6.4 to ruby24 only, bump live to ruby25 only and drop python34 from live, add a patch from upstream git for php7.2 to 3.6.4

Browse Source
This commit is contained in:
Robert Förster
2018-04-13 19:27:23 +02:00
parent f29580905a
commit 5e9e86aced
3 changed files with 123 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,12 @@
# Copyright 1999-2017 Gentoo Foundation
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
RUBY_OPTIONAL="yes"
USE_RUBY="ruby24"
USE_RUBY="ruby25"
PHP_EXT_NAME="IcePHP"
PHP_EXT_INI="yes"
@@ -14,7 +14,7 @@ PHP_EXT_ZENDEXT="no"
PHP_EXT_OPTIONAL_USE=php
USE_PHP="php7-1 php7-2"
USE_PHP="php7-2"
EGIT_REPO_URI="https://github.com/zeroc-ice/ice.git"
EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
@@ -45,7 +45,7 @@ RDEPEND=">=dev-libs/expat-2.0.1
)
dev-cpp/libmcpp
python? ( ${PYTHON_DEPS} )
ruby? ( $(ruby_implementation_depend ruby23) )
ruby? ( $(ruby_implementation_depend ruby25) )
mono? ( dev-lang/mono )
!dev-python/IcePy
!dev-ruby/IceRuby"
@@ -64,7 +64,7 @@ PHP_EXT_S="${S}/php"
PATCHES=(
"${FILESDIR}/${PN}-3.6.3-no-arch-opts.patch"
"${FILESDIR}/${PN}-3.6.3-db6.patch"
"${FILESDIR}/${PN}-3.6.4-db6.patch"
"${FILESDIR}/${PN}-3.6.4-csharp.patch"
)
@@ -104,11 +104,12 @@ src_prepare() {
csharp/Makefile || die "sed failed"
# skip udp test due to multicast
# IceGrid/admin fails, no idea why
# skip IceGrid/admin bug #649850
# skip IceSSL tests due to requirement of internet connection
# skip IceStorm/single bug #636834
# IceUtil/stacktrace fails with USE=debug
sed -i \
-e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceUtil\/stacktrace|' \
-e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceUtil\/stacktrace|' \
cpp/Makefile || die "sed failed"
# mainly broken .ice files
@@ -158,25 +159,25 @@ src_configure() {
fi
if use ruby; then
SITERUBY="$(ruby23 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
SITERUBYARCH="$(ruby23 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
SITERUBY="$(ruby25 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
SITERUBYARCH="$(ruby25 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
MAKE_RULES_RUBY=(
"install_rubydir=\"${ED%/}/${SITERUBY}\""
"install_libdir=\"${ED%/}/${SITERUBYARCH}\""
)
# make it use ruby23 only
# make it use ruby25 only
sed -i \
-e 's|RUBY = ruby|\023|' \
-e 's|RUBY = ruby|\025|' \
ruby/config/Make.rules || die "sed failed"
sed -i \
-e 's|env ruby|\023|' \
-e 's|env ruby|\025|' \
ruby/config/s2rb.rb || die "sed failed"
sed -i \
-e 's|env ruby|\023|' \
-e 's|env ruby|\025|' \
ruby/scripts/slice2rb || die "sed failed"
sed -i \
-e 's|output.write("ruby|\023|' \
-e 's|output.write("ruby|\025|' \
scripts/TestUtil.py || die "sed failed"
fi