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

[dev-libs/Ice] repoman nits

This commit is contained in:
Robert Förster 2016-10-21 14:17:08 +02:00
parent a61b360b12
commit 73835927e6
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dev-libs/Ice/Ice-3.6.3.ebuild
View File

@ -135,7 +135,6 @@ suitable_db_version() {
die "No suitable BerkDB versions found, aborting" die "No suitable BerkDB versions found, aborting"
} }
src_configure() { src_configure() {
MAKE_RULES="prefix=\"${ED}/usr\" MAKE_RULES="prefix=\"${ED}/usr\"
install_docdir=\"${ED}/usr/share/doc/${PF}\" install_docdir=\"${ED}/usr/share/doc/${PF}\"
@ -210,14 +209,14 @@ src_compile() {
ln -s "${S}/slice" ln -s "${S}/slice"
ln -s "${S}/Makefile" ln -s "${S}/Makefile"
emake -C php ${MAKE_RULES} USE_NAMESPACES=yes PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config" || die "emake php failed" emake -C php ${MAKE_RULES} USE_NAMESPACES=yes PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config" || die "emake php failed"
done done
cd "${S}" cd "${S}"
fi fi
if use python ; then if use python ; then
building() { building() {
emake -C ${BUILD_DIR} ${MAKE_RULES} PYTHON=${EPYTHON} || die "emake python-${EPYTHON} failed" emake -C "${BUILD_DIR}" ${MAKE_RULES} PYTHON=${EPYTHON} || die "emake python-${EPYTHON} failed"
} }
S=${S}/python python_foreach_impl building S=${S}/python python_foreach_impl building
fi fi
@ -239,7 +238,7 @@ src_test() {
if use python ; then if use python ; then
testing() { testing() {
emake -C ${BUILD_DIR} ${MAKE_RULES} PYTHON=${EPYTHON} \ emake -C "${BUILD_DIR}" ${MAKE_RULES} PYTHON=${EPYTHON} \
install_pythondir="\"${D}/$(python_get_sitedir)\"" \ install_pythondir="\"${D}/$(python_get_sitedir)\"" \
install_libdir="\"${D}/$(python_get_sitedir)\"" \ install_libdir="\"${D}/$(python_get_sitedir)\"" \
test || die "emake python-${EPYTHON} test failed" test || die "emake python-${EPYTHON} test failed"
@ -298,7 +297,7 @@ src_install() {
installation() { installation() {
mkdir -p "${D}/$(python_get_sitedir)" || die mkdir -p "${D}/$(python_get_sitedir)" || die
emake -C ${BUILD_DIR} ${MAKE_RULES} \ emake -C "${BUILD_DIR}" ${MAKE_RULES} \
install_pythondir="\"${D}/$(python_get_sitedir)\"" \ install_pythondir="\"${D}/$(python_get_sitedir)\"" \
install_libdir="\"${D}/$(python_get_sitedir)\"" \ install_libdir="\"${D}/$(python_get_sitedir)\"" \
install || die "emake python-${EPYTHON} install failed" install || die "emake python-${EPYTHON} install failed"

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

@ -140,7 +140,6 @@ suitable_db_version() {
die "No suitable BerkDB versions found, aborting" die "No suitable BerkDB versions found, aborting"
} }
src_configure() { src_configure() {
MAKE_RULES="prefix=\"${ED}/usr\" MAKE_RULES="prefix=\"${ED}/usr\"
install_docdir=\"${ED}/usr/share/doc/${PF}\" install_docdir=\"${ED}/usr/share/doc/${PF}\"
@ -169,7 +168,7 @@ src_configure() {
fi fi
if use ruby ; then if use ruby ; then
SITERUBY="$(ruby23 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')" SITERUBY="$(ruby22 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
MAKE_RULES_RB="install_rubydir=\"${ED}/${SITERUBY}\" MAKE_RULES_RB="install_rubydir=\"${ED}/${SITERUBY}\"
install_libdir=\"${ED}/${SITERUBY}\"" install_libdir=\"${ED}/${SITERUBY}\""
@ -222,7 +221,7 @@ src_compile() {
if use python ; then if use python ; then
building() { building() {
emake -C ${BUILD_DIR} ${MAKE_RULES} PYTHON=${EPYTHON} || die "emake python-${EPYTHON} failed" emake -C "${BUILD_DIR}" ${MAKE_RULES} PYTHON=${EPYTHON} || die "emake python-${EPYTHON} failed"
} }
S=${S}/python python_foreach_impl building S=${S}/python python_foreach_impl building
fi fi
@ -244,7 +243,7 @@ src_test() {
if use python ; then if use python ; then
testing() { testing() {
emake -C ${BUILD_DIR} ${MAKE_RULES} PYTHON=${EPYTHON} \ emake -C "${BUILD_DIR}" ${MAKE_RULES} PYTHON=${EPYTHON} \
install_pythondir="\"${D}/$(python_get_sitedir)\"" \ install_pythondir="\"${D}/$(python_get_sitedir)\"" \
install_libdir="\"${D}/$(python_get_sitedir)\"" \ install_libdir="\"${D}/$(python_get_sitedir)\"" \
test || die "emake python-${EPYTHON} test failed" test || die "emake python-${EPYTHON} test failed"
@ -299,7 +298,7 @@ src_install() {
installation() { installation() {
mkdir -p "${D}/$(python_get_sitedir)" || die mkdir -p "${D}/$(python_get_sitedir)" || die
emake -C ${BUILD_DIR} ${MAKE_RULES} \ emake -C "${BUILD_DIR}" ${MAKE_RULES} \
install_pythondir="\"${D}/$(python_get_sitedir)\"" \ install_pythondir="\"${D}/$(python_get_sitedir)\"" \
install_libdir="\"${D}/$(python_get_sitedir)\"" \ install_libdir="\"${D}/$(python_get_sitedir)\"" \
install || die "emake python-${EPYTHON} install failed" install || die "emake python-${EPYTHON} install failed"