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

[dev-libs/Ice] fix stray php rule, some repoman nits

Browse Source
This commit is contained in:
Robert Förster 2016-01-27 03:34:48 +01:00
parent 53ec9cf897
commit 898bdbd4a8
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dev-libs/Ice/Ice-3.6.1.ebuild
View File

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation # Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
@ -159,7 +159,6 @@ src_configure() {
if has_version ">dev-lang/mono-4"; then if has_version ">dev-lang/mono-4"; then
MAKE_RULES_CS="${MAKE_RULES_CS} MCS=mcs" MAKE_RULES_CS="${MAKE_RULES_CS} MCS=mcs"
fi fi
MAKE_RULES_PHP="USE_NAMESPACES=yes"
use test && python_setup use test && python_setup
} }
@ -183,13 +182,13 @@ src_compile() {
sed -i \ sed -i \
-e "s|php-config|${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config|" \ -e "s|php-config|${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config|" \
php/src/IcePHP/Makefile || die "sed failed" php/src/IcePHP/Makefile || die "sed failed"
ln -s ${S}/cpp ln -s "${S}/cpp"
ln -s ${S}/config ln -s "${S}/config"
ln -s ${S}/slice ln -s "${S}/slice"
ln -s ${S}/Makefile ln -s "${S}/Makefile"
if use php_namespaces ; then if use php_namespaces ; then
MAKE_RULES_PHP="${MAKE_RULES_PHP} USE_NAMESPACES=yes" MAKE_RULES_PHP="USE_NAMESPACES=yes"
fi fi
emake -C php ${MAKE_RULES} ${MAKE_RULES_PHP} || die "emake php failed" emake -C php ${MAKE_RULES} ${MAKE_RULES_PHP} || die "emake php failed"
done done
@ -233,8 +232,8 @@ src_install() {
if use php ; then if use php ; then
insinto "/usr/share/php/${PN}" insinto "/usr/share/php/${PN}"
doins $(cd php/lib; find ${S}/php/lib/ -name '*.php' -print) doins $(cd php/lib; find ${S}/php/lib/ -name '*.php' -print)
for dir in $( cd ${D}/usr/share/${P}/slice ; ls -1 ); do for dir in $( cd "${D}/usr/share/${P}/slice" ; ls -1 ); do
mkdir -p ${D}/usr/share/php/${dir} mkdir -p "${D}/usr/share/php/${dir}""
LD_LIBRARY_PATH="${D}/usr/$(get_libdir):${LD_LIBRARY_PATH}" ${D}/usr/bin/slice2php -I${D}/usr/share/${P}/slice/ --all --output-dir ${D}/usr/share/php/${dir} --ice ${D}/usr/share/${P}/slice/${dir}/* LD_LIBRARY_PATH="${D}/usr/$(get_libdir):${LD_LIBRARY_PATH}" ${D}/usr/bin/slice2php -I${D}/usr/share/${P}/slice/ --all --output-dir ${D}/usr/share/php/${dir} --ice ${D}/usr/share/${P}/slice/${dir}/*
done done