[dev-libs/Ice] bump and update live ebuild. untested for now.
This commit is contained in:
@@ -15,7 +15,7 @@ PHP_EXT_ZENDEXT="no"
|
||||
|
||||
PHP_EXT_OPTIONAL_USE=php
|
||||
|
||||
USE_PHP="php5-6"
|
||||
USE_PHP="php7-0"
|
||||
|
||||
EGIT_REPO_URI="https://github.com/zeroc-ice/ice.git"
|
||||
EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
|
||||
@@ -45,8 +45,8 @@ RDEPEND=">=dev-libs/expat-2.0.1
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
ruby? ( $(ruby_implementation_depend ruby23) )
|
||||
mono? ( dev-lang/mono )
|
||||
php? ( dev-lang/php:5.6 )
|
||||
php_namespaces? ( dev-lang/php:5.6 )
|
||||
php? ( dev-lang/php:7.0 )
|
||||
php_namespaces? ( dev-lang/php:7.0 )
|
||||
!dev-python/IcePy
|
||||
!dev-ruby/IceRuby"
|
||||
DEPEND="${RDEPEND}
|
||||
@@ -59,10 +59,6 @@ DEPEND="${RDEPEND}
|
||||
REQUIRED_USE="php_namespaces? ( php )"
|
||||
|
||||
# Maintainer notes:
|
||||
# - yes, we have to do the trickery with the move for the python functions
|
||||
# since the build and test frameworks deduce various settings from the path
|
||||
# and they can't be tricked by a symlink. And we also need
|
||||
# SUPPORT_PYTHON_ABIS=1 otherwise we can't get pyc/pyo anymore the sane way.
|
||||
# TODO: java bindings
|
||||
|
||||
S="${WORKDIR}/${PN}"
|
||||
@@ -74,8 +70,8 @@ src_unpack() {
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${PN}-3.6.2-no-arch-opts.patch"
|
||||
epatch "${FILESDIR}/${PN}-3.6.2-csharp.patch"
|
||||
epatch "${FILESDIR}/${PN}-3.6.3-no-arch-opts.patch"
|
||||
epatch "${FILESDIR}/${PN}-3.6.3-csharp.patch"
|
||||
sed -i \
|
||||
-e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \
|
||||
-e 's|-L\$\(libdir\)||' \
|
||||
@@ -108,26 +104,20 @@ src_prepare() {
|
||||
csharp/config/Make.rules.cs || die "sed failed"
|
||||
|
||||
# skip mono tests, bug #498484
|
||||
sed -i \
|
||||
-e '/SUBDIRS/s|\ test||' \
|
||||
csharp/Makefile || die "sed failed"
|
||||
# sed -i \
|
||||
# -e '/SUBDIRS/s|\ test||' \
|
||||
# csharp/Makefile || die "sed failed"
|
||||
|
||||
# skip udp test due to multicast
|
||||
# skip IceSSL tests due to requirement of internet connection
|
||||
sed -i \
|
||||
-e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceSSL --rfilter=IceGrid\/simple|' \
|
||||
cpp/Makefile || die "sed failed"
|
||||
# sed -i \
|
||||
# -e 's|allTests.py|allTests.py --rfilter=udp --rfilter=IceSSL --rfilter=IceGrid\/simple|' \
|
||||
# cpp/Makefile || die "sed failed"
|
||||
|
||||
# mainly broken .ice files
|
||||
sed -i \
|
||||
-e 's|allTests.py|allTests.py --rfilter=operations --rfilter=slicing\/objects|' \
|
||||
python/Makefile || die "sed failed"
|
||||
|
||||
if ! use test ; then
|
||||
sed -i \
|
||||
-e '/SUBDIRS/s|\ test||' \
|
||||
{csharp,python,ruby}/Makefile || die "sed failed"
|
||||
fi
|
||||
# sed -i \
|
||||
# -e 's|allTests.py|allTests.py --rfilter=operations --rfilter=slicing\/objects|' \
|
||||
# python/Makefile || die "sed failed"
|
||||
}
|
||||
|
||||
suitable_db_version() {
|
||||
@@ -167,9 +157,6 @@ src_configure() {
|
||||
|
||||
if use python ; then
|
||||
S=${S}/python python_copy_sources
|
||||
|
||||
# make a place for the build hackery
|
||||
rm -r "${WORKDIR}/${PN}"/python || die
|
||||
fi
|
||||
|
||||
if use ruby ; then
|
||||
@@ -214,9 +201,6 @@ src_compile() {
|
||||
mkdir -p "${WORKDIR}/${slot}"
|
||||
cp -r "${PHP_EXT_S}" "${WORKDIR}/${slot}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
|
||||
cd "${WORKDIR}/${slot}"
|
||||
sed -i \
|
||||
-e "s|php-config|${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config|" \
|
||||
php/src/IcePHP/Makefile || die "sed failed"
|
||||
ln -s "${S}/cpp"
|
||||
ln -s "${S}/config"
|
||||
ln -s "${S}/slice"
|
||||
@@ -225,7 +209,7 @@ src_compile() {
|
||||
if use php_namespaces ; then
|
||||
MAKE_RULES_PHP="USE_NAMESPACES=yes"
|
||||
fi
|
||||
emake -C php ${MAKE_RULES} ${MAKE_RULES_PHP} || die "emake php failed"
|
||||
emake -C php ${MAKE_RULES} ${MAKE_RULES_PHP} PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config" || die "emake php failed"
|
||||
done
|
||||
cd "${S}"
|
||||
fi
|
||||
@@ -233,11 +217,9 @@ src_compile() {
|
||||
if use python ; then
|
||||
building() {
|
||||
# build requires that the directory is named 'python'
|
||||
mv "${BUILD_DIR}" "${S}"/python || die
|
||||
emake -C python ${MAKE_RULES} || die "emake python-${EPYTHON} failed"
|
||||
mv "${S}"/python "${BUILD_DIR}"
|
||||
}
|
||||
BUILD_DIR=python python_foreach_impl building
|
||||
python_foreach_impl building
|
||||
fi
|
||||
|
||||
if use ruby ; then
|
||||
@@ -257,14 +239,12 @@ src_test() {
|
||||
|
||||
if use python ; then
|
||||
testing() {
|
||||
mv "${BUILD_DIR}" "${S}"/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"
|
||||
mv "${S}"/python "${BUILD_DIR}"
|
||||
}
|
||||
BUILD_DIR=python python_foreach_impl testing
|
||||
python_foreach_impl testing
|
||||
fi
|
||||
|
||||
if use ruby ; then
|
||||
@@ -314,14 +294,12 @@ src_install() {
|
||||
installation() {
|
||||
mkdir -p "${D}/$(python_get_sitedir)" || die
|
||||
|
||||
mv "${BUILD_DIR}" "${S}"/python || die
|
||||
emake -C python ${MAKE_RULES} \
|
||||
install_pythondir="\"${D}/$(python_get_sitedir)\"" \
|
||||
install_libdir="\"${D}/$(python_get_sitedir)\"" \
|
||||
install || die "emake python-${EPYTHON} install failed"
|
||||
mv "${S}"/python "${BUILD_DIR}"
|
||||
}
|
||||
BUILD_DIR=python python_foreach_impl installation
|
||||
python_foreach_impl installation
|
||||
fi
|
||||
|
||||
if use ruby ; then
|
||||
|
||||
Reference in New Issue
Block a user