From 73835927e69cdfb29faf249c83b1d569c7849df4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Fri, 21 Oct 2016 14:17:08 +0200
Subject: [PATCH] [dev-libs/Ice] repoman nits

---
 dev-libs/Ice/Ice-3.6.3.ebuild    | 9 ++++-----
 dev-libs/Ice/Ice-3.6.9999.ebuild | 9 ++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/dev-libs/Ice/Ice-3.6.3.ebuild b/dev-libs/Ice/Ice-3.6.3.ebuild
index ac8355a..f4cbd86 100644
--- a/dev-libs/Ice/Ice-3.6.3.ebuild
+++ b/dev-libs/Ice/Ice-3.6.3.ebuild
@@ -135,7 +135,6 @@ suitable_db_version() {
 	die "No suitable BerkDB versions found, aborting"
 }
 
-
 src_configure() {
 	MAKE_RULES="prefix=\"${ED}/usr\"
 		install_docdir=\"${ED}/usr/share/doc/${PF}\"
@@ -210,14 +209,14 @@ src_compile() {
 			ln -s "${S}/slice"
 			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
 		cd "${S}"
 	fi
 
 	if use python ; then
 		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
 	fi
@@ -239,7 +238,7 @@ src_test() {
 
 	if use python ; then
 		testing() {
-			emake -C ${BUILD_DIR} ${MAKE_RULES} PYTHON=${EPYTHON} \
+			emake -C "${BUILD_DIR}" ${MAKE_RULES} PYTHON=${EPYTHON} \
 				install_pythondir="\"${D}/$(python_get_sitedir)\"" \
 				install_libdir="\"${D}/$(python_get_sitedir)\"" \
 				test || die "emake python-${EPYTHON} test failed"
@@ -298,7 +297,7 @@ src_install() {
 		installation() {
 			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_libdir="\"${D}/$(python_get_sitedir)\"" \
 				install || die "emake python-${EPYTHON} install failed"
diff --git a/dev-libs/Ice/Ice-3.6.9999.ebuild b/dev-libs/Ice/Ice-3.6.9999.ebuild
index 9574dc5..b9e3718 100644
--- a/dev-libs/Ice/Ice-3.6.9999.ebuild
+++ b/dev-libs/Ice/Ice-3.6.9999.ebuild
@@ -140,7 +140,6 @@ suitable_db_version() {
 	die "No suitable BerkDB versions found, aborting"
 }
 
-
 src_configure() {
 	MAKE_RULES="prefix=\"${ED}/usr\"
 		install_docdir=\"${ED}/usr/share/doc/${PF}\"
@@ -169,7 +168,7 @@ src_configure() {
 	fi
 
 	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}\"
 			install_libdir=\"${ED}/${SITERUBY}\""
 
@@ -222,7 +221,7 @@ src_compile() {
 
 	if use python ; then
 		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
 	fi
@@ -244,7 +243,7 @@ src_test() {
 
 	if use python ; then
 		testing() {
-			emake -C ${BUILD_DIR} ${MAKE_RULES} PYTHON=${EPYTHON} \
+			emake -C "${BUILD_DIR}" ${MAKE_RULES} PYTHON=${EPYTHON} \
 				install_pythondir="\"${D}/$(python_get_sitedir)\"" \
 				install_libdir="\"${D}/$(python_get_sitedir)\"" \
 				test || die "emake python-${EPYTHON} test failed"
@@ -299,7 +298,7 @@ src_install() {
 		installation() {
 			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_libdir="\"${D}/$(python_get_sitedir)\"" \
 				install || die "emake python-${EPYTHON} install failed"