[dev-libs/Ice] update to 3.6.4 state

This commit is contained in:
2017-04-28 22:31:44 +02:00
parent 32598a9b3b
commit 40c57d79b2
2 changed files with 14 additions and 16 deletions

View File

@@ -3,7 +3,7 @@
EAPI=6
PYTHON_COMPAT=( python{2_7,3_5} pypy )
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
RUBY_OPTIONAL="yes"
USE_RUBY="ruby23"
@@ -14,7 +14,7 @@ PHP_EXT_ZENDEXT="no"
PHP_EXT_OPTIONAL_USE=php
USE_PHP="php7-0"
USE_PHP="php7-0 php7-1"
EGIT_REPO_URI="https://github.com/zeroc-ice/ice.git"
EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
@@ -37,14 +37,12 @@ RDEPEND=">=dev-libs/expat-2.0.1
!libressl? ( dev-libs/openssl:0= )
libressl? ( dev-libs/libressl:0= )
|| (
sys-libs/db:5.3[cxx]
sys-libs/db:5.1[cxx]
$(for slot in ${BERKDB_SLOTS[@]} ; do printf '%s\n' "sys-libs/db:${slot}[cxx]" ; done)
)
dev-cpp/libmcpp
python? ( ${PYTHON_DEPS} )
ruby? ( $(ruby_implementation_depend ruby23) )
mono? ( dev-lang/mono )
php? ( dev-lang/php:7.0 )
!dev-python/IcePy
!dev-ruby/IceRuby"
DEPEND="${RDEPEND}
@@ -62,7 +60,7 @@ PHP_EXT_S="${S}/php"
PATCHES=(
"${FILESDIR}/${PN}-3.6.3-no-arch-opts.patch"
"${FILESDIR}/${PN}-3.6.3-csharp.patch"
"${FILESDIR}/${PN}-3.6.4-csharp.patch"
)
pkg_setup() {
@@ -130,8 +128,8 @@ src_prepare() {
src_configure() {
suitable_db_version() {
local ver tested_slots=(5.3 5.1)
for ver in "${tested_slots[@]}"; do
local ver
for ver in "${BERKDB_SLOTS[@]}"; do
if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
echo "${ver}"
return 0