[dev-libs/Ice] sync up
This commit is contained in:
parent
849b11842f
commit
c0c759f6a6
|
|
@ -14,7 +14,7 @@ PHP_EXT_ZENDEXT="no"
|
|||
|
||||
PHP_EXT_OPTIONAL_USE=php
|
||||
|
||||
USE_PHP="php7-2"
|
||||
USE_PHP="php7-3"
|
||||
|
||||
EGIT_REPO_URI="https://github.com/zeroc-ice/ice.git"
|
||||
EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
|
||||
|
|
@ -130,10 +130,10 @@ src_configure() {
|
|||
}
|
||||
|
||||
MAKE_RULES=(
|
||||
"prefix=\"${ED%/}/usr\""
|
||||
"install_docdir=\"${ED%/}/usr/share/doc/${PF}\""
|
||||
"install_configdir=\"${ED%/}/usr/share/${P}/config\""
|
||||
"install_mandir=\"${ED%/}/usr/share/man/man1\""
|
||||
"prefix=\"${ED}/usr\""
|
||||
"install_docdir=\"${ED}/usr/share/doc/${PF}\""
|
||||
"install_configdir=\"${ED}/usr/share/${P}/config\""
|
||||
"install_mandir=\"${ED}/usr/share/man/man1\""
|
||||
"embedded_runpath_prefix=\"${EPREFIX}/usr\""
|
||||
"LP64=yes"
|
||||
"new_dtags=yes"
|
||||
|
|
@ -161,8 +161,8 @@ src_configure() {
|
|||
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}\""
|
||||
"install_rubydir=\"${ED}/${SITERUBY}\""
|
||||
"install_libdir=\"${ED}/${SITERUBYARCH}\""
|
||||
)
|
||||
|
||||
# make it use ruby25 only
|
||||
|
|
@ -182,10 +182,10 @@ src_configure() {
|
|||
|
||||
MAKE_RULES_MONO=(
|
||||
"GACINSTALL=yes"
|
||||
"GAC_ROOT=\"${ED%/}/usr/$(get_libdir)\""
|
||||
"GAC_ROOT=\"${ED}/usr/$(get_libdir)\""
|
||||
"GAC_DIR=\"${EPREFIX}/usr/$(get_libdir)\""
|
||||
"install_libdir=\"${ED%/}/usr/$(get_libdir)\""
|
||||
"install_pkgconfigdir=\"${ED%/}/usr/$(get_libdir)/pkgconfig\""
|
||||
"install_libdir=\"${ED}/usr/$(get_libdir)\""
|
||||
"install_pkgconfigdir=\"${ED}/usr/$(get_libdir)/pkgconfig\""
|
||||
)
|
||||
|
||||
if has_version ">dev-lang/mono-4"; then
|
||||
|
|
@ -246,8 +246,8 @@ src_test() {
|
|||
PYTHONPATH="${BUILD_DIR}"/python emake -C "${BUILD_DIR}" \
|
||||
"${MAKE_RULES[@]}" \
|
||||
PYTHON="${EPYTHON}" \
|
||||
install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
|
||||
install_libdir="\"${D%/}/$(python_get_sitedir)\"" test
|
||||
install_pythondir="\"${D}/$(python_get_sitedir)\"" \
|
||||
install_libdir="\"${D}/$(python_get_sitedir)\"" test
|
||||
}
|
||||
local S="${S}/python"
|
||||
python_foreach_impl testing
|
||||
|
|
@ -287,15 +287,15 @@ src_install() {
|
|||
doins "${i}"
|
||||
done < <(find "${S}/php/lib/" -name '*.php' -print0)
|
||||
|
||||
pushd "${ED%/}/usr/share/${P}/slice" >/dev/null || die
|
||||
pushd "${ED}/usr/share/${P}/slice" >/dev/null || die
|
||||
|
||||
local -x LD_LIBRARY_PATH="${ED%/}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
|
||||
local -x LD_LIBRARY_PATH="${ED}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
|
||||
for i in *; do
|
||||
mkdir -p "${ED%/}/usr/share/php/${i}" || die
|
||||
"${ED%/}"/usr/bin/slice2php \
|
||||
-I"${ED%/}/usr/share/${P}/slice/" --all \
|
||||
--output-dir "${ED%/}/usr/share/php/${i}" \
|
||||
--ice "${ED%/}/usr/share/${P}/slice/${i}"/*
|
||||
mkdir -p "${ED}/usr/share/php/${i}" || die
|
||||
"${ED}"/usr/bin/slice2php \
|
||||
-I"${ED}/usr/share/${P}/slice/" --all \
|
||||
--output-dir "${ED}/usr/share/php/${i}" \
|
||||
--ice "${ED}/usr/share/${P}/slice/${i}"/*
|
||||
done
|
||||
|
||||
for i in $(php_get_slots); do
|
||||
|
|
@ -310,12 +310,12 @@ src_install() {
|
|||
|
||||
if use python; then
|
||||
installation() {
|
||||
mkdir -p "${D%/}/$(python_get_sitedir)" || die
|
||||
mkdir -p "${D}/$(python_get_sitedir)" || die
|
||||
|
||||
emake -C "${BUILD_DIR}" \
|
||||
"${MAKE_RULES[@]}" \
|
||||
install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
|
||||
install_libdir="\"${D%/}/$(python_get_sitedir)\"" \
|
||||
install_pythondir="\"${D}/$(python_get_sitedir)\"" \
|
||||
install_libdir="\"${D}/$(python_get_sitedir)\"" \
|
||||
install
|
||||
}
|
||||
local S="${S}/python"
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python{2_7,3_6} pypy )
|
||||
PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
|
||||
|
||||
RUBY_OPTIONAL="yes"
|
||||
USE_RUBY="ruby25"
|
||||
USE_RUBY="ruby26"
|
||||
|
||||
PHP_EXT_NAME="IcePHP"
|
||||
PHP_EXT_INI="yes"
|
||||
|
|
@ -20,7 +20,7 @@ EGIT_REPO_URI="https://github.com/zeroc-ice/ice.git"
|
|||
EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
|
||||
EGIT_BRANCH="3.7"
|
||||
|
||||
inherit php-ext-source-r3 python-r1 ruby-ng toolchain-funcs versionator git-r3
|
||||
inherit php-ext-source-r3 python-r1 ruby-ng toolchain-funcs git-r3
|
||||
|
||||
DESCRIPTION="ICE middleware C++ library and generator tools"
|
||||
HOMEPAGE="https://zeroc.com/products/ice"
|
||||
|
|
@ -37,9 +37,7 @@ RDEPEND=">=dev-libs/expat-2.0.1
|
|||
dev-db/lmdb
|
||||
dev-cpp/libmcpp
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
ruby? ( $(ruby_implementation_depend ruby23) )
|
||||
!dev-python/IcePy
|
||||
!dev-ruby/IceRuby"
|
||||
ruby? ( $(ruby_implementation_depend ruby23) )"
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
${PYTHON_DEPS}
|
||||
|
|
@ -86,10 +84,10 @@ src_prepare() {
|
|||
|
||||
src_configure() {
|
||||
MAKE_RULES=(
|
||||
"prefix=\"${ED%/}/usr\""
|
||||
"install_docdir=\"${ED%/}/usr/share/doc/${PF}\""
|
||||
"install_configdir=\"${ED%/}/usr/share/${P}/config\""
|
||||
"install_mandir=\"${ED%/}/usr/share/man\""
|
||||
"prefix=\"${ED}/usr\""
|
||||
"install_docdir=\"${ED}/usr/share/doc/${PF}\""
|
||||
"install_configdir=\"${ED}/usr/share/${P}/config\""
|
||||
"install_mandir=\"${ED}/usr/share/man\""
|
||||
"embedded_runpath_prefix=\"${EPREFIX}/usr\""
|
||||
"new_dtags=yes"
|
||||
"OPTIMIZE=$(usex !debug)"
|
||||
|
|
@ -102,22 +100,22 @@ 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="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
|
||||
SITERUBYARCH="$(ruby26 -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')"
|
||||
MAKE_RULES_RUBY=(
|
||||
"install_rubydir=\"${ED%/}/${SITERUBY}\""
|
||||
"install_rubylibdir=\"${ED%/}/${SITERUBYARCH}\""
|
||||
"install_rubydir=\"${ED}/${SITERUBY}\""
|
||||
"install_rubylibdir=\"${ED}/${SITERUBYARCH}\""
|
||||
)
|
||||
|
||||
# make it use ruby23 only
|
||||
# make it use ruby26 only
|
||||
sed -i \
|
||||
-e 's|RUBY = ruby|\023|' \
|
||||
-e 's|RUBY = ruby|\026|' \
|
||||
ruby/config/Make.rules || die "sed failed"
|
||||
sed -i \
|
||||
-e 's|env ruby|\023|' \
|
||||
-e 's|env ruby|\026|' \
|
||||
ruby/config/s2rb.rb || die "sed failed"
|
||||
sed -i \
|
||||
-e 's|env ruby|\023|' \
|
||||
-e 's|env ruby|\026|' \
|
||||
ruby/scripts/slice2rb || die "sed failed"
|
||||
fi
|
||||
|
||||
|
|
@ -211,15 +209,15 @@ src_install() {
|
|||
doins "${i}"
|
||||
done < <(find "${S}/php/lib/" -name '*.php' -print0)
|
||||
|
||||
pushd "${ED%/}/usr/share/${P}/slice" >/dev/null || die
|
||||
pushd "${ED}/usr/share/${P}/slice" >/dev/null || die
|
||||
|
||||
local -x LD_LIBRARY_PATH="${ED%/}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
|
||||
local -x LD_LIBRARY_PATH="${ED}/usr/$(get_libdir):${LD_LIBRARY_PATH}"
|
||||
for i in *; do
|
||||
mkdir -p "${ED%/}/usr/share/php/${i}" || die
|
||||
"${ED%/}"/usr/bin/slice2php \
|
||||
-I"${ED%/}/usr/share/${P}/slice/" --all \
|
||||
--output-dir "${ED%/}/usr/share/php/${i}" \
|
||||
--ice "${ED%/}/usr/share/${P}/slice/${i}"/*
|
||||
mkdir -p "${ED}/usr/share/php/${i}" || die
|
||||
"${ED}"/usr/bin/slice2php \
|
||||
-I"${ED}/usr/share/${P}/slice/" --all \
|
||||
--output-dir "${ED}/usr/share/php/${i}" \
|
||||
--ice "${ED}/usr/share/${P}/slice/${i}"/*
|
||||
done
|
||||
|
||||
for i in $(php_get_slots); do
|
||||
|
|
@ -234,11 +232,11 @@ src_install() {
|
|||
|
||||
if use python; then
|
||||
installation() {
|
||||
mkdir -p "${D%/}/$(python_get_sitedir)" || die
|
||||
mkdir -p "${D}/$(python_get_sitedir)" || die
|
||||
|
||||
emake -C "${BUILD_DIR}" \
|
||||
"${MAKE_RULES[@]}" \
|
||||
install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
|
||||
install_pythondir="\"${D}/$(python_get_sitedir)\"" \
|
||||
install
|
||||
}
|
||||
local S="${S}/python"
|
||||
|
|
|
|||
Loading…
Reference in New Issue