From 3e7ffd514182ff2d00382c58d40e96b20ad0c947 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Sat, 22 Oct 2016 14:37:00 +0200
Subject: [PATCH] [dev-libs/Ice] remove release, in tree, sync 3.6 live ebuild
 with in-tree changes

---
 dev-libs/Ice/Ice-3.6.3.ebuild    | 316 -------------------------------
 dev-libs/Ice/Ice-3.6.9999.ebuild | 220 ++++++++++++---------
 dev-libs/Ice/Manifest            |   2 -
 3 files changed, 126 insertions(+), 412 deletions(-)
 delete mode 100644 dev-libs/Ice/Ice-3.6.3.ebuild
 delete mode 100644 dev-libs/Ice/Manifest

diff --git a/dev-libs/Ice/Ice-3.6.3.ebuild b/dev-libs/Ice/Ice-3.6.3.ebuild
deleted file mode 100644
index f4cbd86..0000000
--- a/dev-libs/Ice/Ice-3.6.3.ebuild
+++ /dev/null
@@ -1,316 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby22"
-
-PHP_EXT_NAME="IcePHP"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-
-PHP_EXT_OPTIONAL_USE=php
-
-USE_PHP="php7-0"
-
-inherit toolchain-funcs versionator php-ext-source-r2 python-r1 mono-env ruby-ng db-use
-
-DESCRIPTION="ICE middleware C++ library and generator tools"
-HOMEPAGE="http://www.zeroc.com/"
-SRC_URI="https://github.com/zeroc-ice/ice/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	doc? ( http://download.zeroc.com/Ice/$(get_version_component_range 1-2)/${P}.pdf )"
-LICENSE="GPL-2"
-SLOT="0/36"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples libressl +ncurses mono php python ruby test debug"
-
-RDEPEND=">=dev-libs/expat-2.0.1
-	>=app-arch/bzip2-1.0.5
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	|| (
-		sys-libs/db:5.3[cxx]
-		sys-libs/db:5.1[cxx]
-	)
-	dev-cpp/libmcpp
-	python? ( ${PYTHON_DEPS} )
-	ruby? ( $(ruby_implementation_depend ruby22) )
-	mono? ( dev-lang/mono )
-	php? ( dev-lang/php:7.0 )
-	!dev-python/IcePy
-	!dev-ruby/IceRuby"
-DEPEND="${RDEPEND}
-	ncurses? ( sys-libs/ncurses:0= sys-libs/readline:0= )
-	test? (
-		${PYTHON_DEPS}
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)"
-
-# Maintainer notes:
-# TODO: java bindings, multiple ruby versions (supports 2.{1,2,3})
-
-S="${WORKDIR}/${P/I/i}"
-PHP_EXT_S="${S}/php"
-
-pkg_setup() {
-	# prevent ruby-ng.eclass from messing with pkg_setup
-	:;
-}
-
-src_unpack() {
-	# prevent ruby-ng.eclass from messing with src_unpack
-	default
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-no-arch-opts.patch"
-	epatch "${FILESDIR}/${P}-csharp.patch"
-	sed -i \
-		-e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \
-		-e 's|-L\$\(libdir\)||' \
-		cpp/config/Make.rules || die "sed failed"
-
-	sed -i \
-		-e 's|\(install_phpdir[[:space:]]*\):=|\1?=|' \
-		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
-		php/config/Make.rules.php || die "sed failed"
-
-	sed -i \
-		-e 's|\(install_pythondir[[:space:]]*\)=|\1?=|' \
-		-e 's|\(install_rubydir[[:space:]]*\)=|\1?=|' \
-		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
-		{python,ruby}/config/Make.rules || die "sed failed"
-
-	sed -i \
-		-e 's|-O2 ||g' \
-		-e 's|-Werror ||g' \
-		cpp/config/Make.rules.Linux || die "sed failed"
-
-	sed -i \
-		-e 's|install-common||' \
-		{cpp,csharp,php,python,ruby}/Makefile || die "sed failed"
-
-	sed -i \
-		-e 's|-f -root|-f -gacdir $(GAC_DIR) -root|' \
-		-e 's|\(install_libdir[[:space:]]*\):=|\1?=|' \
-		-e 's|\(install_pkgconfigdir[[:space:]]*\):=|\1?=|' \
-		csharp/config/Make.rules.cs || die "sed failed"
-
-	# skip mono tests, bug #498484
-	sed -i \
-		-e '/SUBDIRS/s|\ test||' \
-		csharp/Makefile || die "sed failed"
-
-	# IceUtil/stacktrace fails with USE=debug
-	# skip udp test due to multicast
-	# skip IceSSL tests due to requirement of internet connection
-	# IceStorm/stress fails without USE=debug
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceSSL --rfilter=IceStorm\/stress|' \
-		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"
-
-	# fails even on unicode locale
-	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
-		ruby/Makefile || die "sed failed"
-}
-
-suitable_db_version() {
-	local tested_slots="5.3 5.1"
-	for ver in ${tested_slots}; do
-		if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
-			echo ${ver}
-			return 0
-		fi
-	done
-	die "No suitable BerkDB versions found, aborting"
-}
-
-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\"
-		embedded_runpath_prefix=\"${EPREFIX}/usr\"
-		LP64=yes
-		new_dtags=yes
-		NOTEST=$(usex test no yes)"
-
-	use ncurses && OPTIONS="${MAKE_RULES} USE_READLINE=yes" || MAKE_RULES="${MAKE_RULES} USE_READLINE=no"
-	use debug && OPTIONS="${MAKE_RULES} OPTIMIZE=no" || MAKE_RULES="${MAKE_RULES} OPTIMIZE=yes"
-
-	local BERKDB_VERSION="$(suitable_db_version)"
-	MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})"
-	sed -i \
-		-e "s|g++|$(tc-getCXX)|" \
-		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
-		-e "s|\(CXXFLAGS[[:space:]]*=\)|\1 ${CXXFLAGS}|" \
-		-e "s|\(LDFLAGS[[:space:]]*=\)|\1 ${LDFLAGS}|" \
-		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
-		cpp/config/Make.rules{,.Linux} python/config/Make.rules || die "sed failed"
-
-	if use python ; then
-		S=${S}/python python_copy_sources
-	fi
-
-	if use ruby ; then
-		SITERUBY="$(ruby22 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
-		MAKE_RULES_RB="install_rubydir=\"${ED}/${SITERUBY}\"
-			install_libdir=\"${ED}/${SITERUBY}\""
-
-		# make it use ruby22 only
-		sed -i \
-			-e 's|RUBY = ruby|\022|' \
-			ruby/config/Make.rules || die "sed failed"
-		sed -i \
-			-e 's|env ruby|\022|' \
-			ruby/config/s2rb.rb || die "sed failed"
-		sed -i \
-			-e 's|env ruby|\022|' \
-			ruby/scripts/slice2rb || die "sed failed"
-		sed -i \
-			-e 's|output.write("ruby|\022|' \
-			scripts/TestUtil.py || die "sed failed"
-	fi
-
-	MAKE_RULES_CS="GACINSTALL=yes 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\""
-	if has_version ">dev-lang/mono-4"; then
-		MAKE_RULES_CS="${MAKE_RULES_CS} MCS=mcs"
-	fi
-
-	use test && python_setup
-}
-
-src_compile() {
-	# Do not remove this export or build will break!
-	tc-export CXX
-
-	emake -C cpp ${MAKE_RULES} || die "emake failed"
-
-	if use php; then
-		local slot
-		for slot in $(php_get_slots); do
-			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}"
-			ln -s "${S}/cpp"
-			ln -s "${S}/config"
-			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"
-		done
-		cd "${S}"
-	fi
-
-	if use python ; then
-		building() {
-			emake -C "${BUILD_DIR}" ${MAKE_RULES} PYTHON=${EPYTHON} || die "emake python-${EPYTHON} failed"
-		}
-		S=${S}/python python_foreach_impl building
-	fi
-
-	if use ruby ; then
-		emake -C ruby ${MAKE_RULES} ${MAKE_RULES_RB} || die "emake rb failed"
-	fi
-
-	if use mono ; then
-		emake -C csharp ${MAKE_RULES} ${MAKE_RULES_CS} || die "emake csharp failed"
-	fi
-}
-
-src_test() {
-	export LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake -C cpp ${MAKE_RULES} test || die "emake cpp test failed"
-
-	# php tests require the extension loaded and are therefore skipped
-
-	if use python ; then
-		testing() {
-			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"
-		}
-		S=${S}/python python_foreach_impl testing
-	fi
-
-	if use ruby ; then
-		emake -C ruby ${MAKE_RULES} ${MAKE_RULES_RB} test || die "emake ruby test failed"
-	fi
-
-	if use mono ; then
-		# skip mono tests, bug #498484
-		ewarn "Tests for C# are currently disabled."
-#		emake -C csharp ${MAKE_RULES} ${MAKE_RULES_CS} test || die "emake csharp test failed"
-	fi
-}
-
-src_install() {
-	dodoc CHANGELOG*.md README.md
-
-	insinto /usr/share/${P}
-	doins -r slice
-
-	emake -C cpp ${MAKE_RULES} install || die "emake install failed"
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples-cpp
-		doins cpp/config/*.cfg
-	fi
-
-	if use doc ; then
-		dodoc "${DISTDIR}/${P}.pdf"
-	fi
-
-	if use php ; then
-		insinto "/usr/share/php/${PN}"
-		doins $(cd php/lib; find "${S}"/php/lib/ -name '*.php' -print)
-		for dir in $( cd "${D}/usr/share/${P}/slice" ; ls -1 ); do
-			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}/*
-		done
-
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env ${slot}
-			insinto "${EXT_DIR}"
-			newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
-		done
-		php-ext-source-r2_createinifiles
-
-		cd "${S}"
-	fi
-
-	if use python ; then
-		installation() {
-			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 || die "emake python-${EPYTHON} install failed"
-		}
-		S=${S}/python python_foreach_impl installation
-	fi
-
-	if use ruby ; then
-		dodir "${SITERUBY}"
-		emake -C ruby ${MAKE_RULES} ${MAKE_RULES_RB} install || die "emake ruyb install failed"
-	fi
-
-	if use mono ; then
-		emake -C csharp ${MAKE_RULES} ${MAKE_RULES_CS} install || die "emake csharp install failed"
-	fi
-}
diff --git a/dev-libs/Ice/Ice-3.6.9999.ebuild b/dev-libs/Ice/Ice-3.6.9999.ebuild
index b9e3718..f3b519b 100644
--- a/dev-libs/Ice/Ice-3.6.9999.ebuild
+++ b/dev-libs/Ice/Ice-3.6.9999.ebuild
@@ -21,7 +21,7 @@ EGIT_REPO_URI="https://github.com/zeroc-ice/ice.git"
 EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}"
 EGIT_BRANCH="3.6"
 
-inherit toolchain-funcs versionator php-ext-source-r2 python-r1 mono-env ruby-ng db-use git-r3
+inherit db-use eutils mono-env php-ext-source-r2 python-r1 ruby-ng toolchain-funcs versionator git-r3
 
 # for mono-env
 unset SRC_URI
@@ -61,19 +61,24 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PN}"
 PHP_EXT_S="${S}/php"
 
+PATCHES=(
+	"${FILESDIR}/${P}-no-arch-opts.patch"
+	"${FILESDIR}/${P}-csharp.patch"
+)
+
 pkg_setup() {
 	# prevent ruby-ng.eclass from messing with pkg_setup
-	:;
+	return
 }
 
 src_unpack() {
 	# prevent ruby-ng.eclass from messing with src_unpack
-	git-r3_src_unpack
+	default
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.6.3-no-arch-opts.patch"
-	epatch "${FILESDIR}/${PN}-3.6.3-csharp.patch"
+	epatch -p1 "${PATCHES[@]}"
+
 	sed -i \
 		-e 's|\(install_configdir[[:space:]]*\):=|\1?=|' \
 		-e 's|-L\$\(libdir\)||' \
@@ -129,32 +134,33 @@ src_prepare() {
 		ruby/Makefile || die "sed failed"
 }
 
-suitable_db_version() {
-	local tested_slots="5.3 5.1"
-	for ver in ${tested_slots}; do
-		if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
-			echo ${ver}
-			return 0
-		fi
-	done
-	die "No suitable BerkDB versions found, aborting"
-}
-
 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\"
-		embedded_runpath_prefix=\"${EPREFIX}/usr\"
-		LP64=yes
-		new_dtags=yes
-		NOTEST=$(usex test no yes)"
+	suitable_db_version() {
+		local ver tested_slots=(5.3 5.1)
+		for ver in "${tested_slots[@]}"; do
+			if [[ -n $(db_findver sys-libs/db:${ver}) ]]; then
+				echo "${ver}"
+				return 0
+			fi
+		done
+		die "No suitable BerkDB versions found, aborting"
+	}
 
-	use ncurses && OPTIONS="${MAKE_RULES} USE_READLINE=yes" || MAKE_RULES="${MAKE_RULES} USE_READLINE=no"
-	use debug && OPTIONS="${MAKE_RULES} OPTIMIZE=no" || MAKE_RULES="${MAKE_RULES} OPTIMIZE=yes"
+	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\""
+		"embedded_runpath_prefix=\"${EPREFIX}/usr\""
+		"LP64=yes"
+		"new_dtags=yes"
+		"NOTEST=$(usex !test)"
+		"USE_READLINE=$(usex ncurses)"
+		"OPTIMIZE=$(usex !debug)"
+	)
 
 	local BERKDB_VERSION="$(suitable_db_version)"
-	MAKE_RULES="${MAKE_RULES} DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})"
+	MAKE_RULES+=("DB_FLAGS=-I$(db_includedir ${BERKDB_VERSION})")
 	sed -i \
 		-e "s|g++|$(tc-getCXX)|" \
 		-e "s|\(CFLAGS[[:space:]]*=\)|\1 ${CFLAGS}|" \
@@ -163,14 +169,17 @@ src_configure() {
 		-e "s|\(DB_LIBS[[:space:]]*=\) \-ldb_cxx|\1 -ldb_cxx-$(db_findver sys-libs/db:${BERKDB_VERSION})|" \
 		cpp/config/Make.rules{,.Linux} python/config/Make.rules || die "sed failed"
 
-	if use python ; then
-		S=${S}/python python_copy_sources
+	if use python; then
+		local S="${S}/python"
+		python_copy_sources
 	fi
 
-	if use ruby ; then
-		SITERUBY="$(ruby22 -r rbconfig -e 'print RbConfig::CONFIG["sitelibdir"]')"
-		MAKE_RULES_RB="install_rubydir=\"${ED}/${SITERUBY}\"
-			install_libdir=\"${ED}/${SITERUBY}\""
+	if use ruby; then
+		SITERUBY="$(ruby22 -r rbconfig -e 'print RbConfig::CONFIG[\"sitelibdir\"]')"
+		MAKE_RULES_RUBY=(
+			"install_rubydir=\"${ED%/}/${SITERUBY}\""
+			"install_libdir=\"${ED%/}/${SITERUBY}\""
+		)
 
 		# make it use ruby23 only
 		sed -i \
@@ -187,11 +196,16 @@ src_configure() {
 			scripts/TestUtil.py || die "sed failed"
 	fi
 
-	MAKE_RULES_CS="GACINSTALL=yes 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\""
+	MAKE_RULES_MONO=(
+		"GACINSTALL=yes"
+		"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\""
+	)
+
 	if has_version ">dev-lang/mono-4"; then
-		MAKE_RULES_CS="${MAKE_RULES_CS} MCS=mcs"
+		MAKE_RULES_MONO+=("MCS=mcs")
 	fi
 
 	use test && python_setup
@@ -201,117 +215,135 @@ src_compile() {
 	# Do not remove this export or build will break!
 	tc-export CXX
 
-	emake -C cpp ${MAKE_RULES} || die "emake failed"
+	emake -C cpp "${MAKE_RULES[@]}"
 
 	if use php; then
-		local slot
-		for slot in $(php_get_slots); do
-			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}"
-			ln -s "${S}/cpp"
-			ln -s "${S}/config"
-			ln -s "${S}/slice"
-			ln -s "${S}/Makefile"
+		local i
+		for i in $(php_get_slots); do
+			mkdir -p "${WORKDIR}/${i}" || die
+			cp -r "${PHP_EXT_S}" "${WORKDIR}/${i}/" || die "Failed to copy source ${PHP_EXT_S} to PHP target directory"
 
-			emake -C php ${MAKE_RULES} USE_NAMESPACES=yes PHP_CONFIG="${EPREFIX}/usr/$(get_libdir)/${slot}/bin/php-config" || die "emake php failed"
+			pushd "${WORKDIR}/${i}" >/dev/null || die
+			ln -s "${S}/cpp" || die
+			ln -s "${S}/config" || die
+			ln -s "${S}/slice" || die
+			ln -s "${S}/Makefile" || die
+
+			emake -C php "${MAKE_RULES[@]}" USE_NAMESPACES=yes "PHP_CONFIG=\"${EPREFIX}/usr/$(get_libdir)/${i}/bin/php-config\""
+			popd >/dev/null || die
 		done
-		cd "${S}"
 	fi
 
-	if use python ; then
+	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}"
 		}
-		S=${S}/python python_foreach_impl building
+		local S="${S}/python"
+		python_foreach_impl building
 	fi
 
-	if use ruby ; then
-		emake -C ruby ${MAKE_RULES} ${MAKE_RULES_RB} || die "emake rb failed"
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}"
 	fi
 
-	if use mono ; then
-		emake -C csharp ${MAKE_RULES} ${MAKE_RULES_CS} || die "emake csharp failed"
+	if use mono; then
+		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}"
 	fi
 }
 
 src_test() {
-	export LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	emake -C cpp ${MAKE_RULES} test || die "emake cpp test failed"
+	local -x LD_LIBRARY_PATH="${S}/cpp/$(get_libdir)${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
+	emake -C cpp "${MAKE_RULES[@]}" test
 
 	# php tests require the extension loaded and are therefore skipped
 
-	if use python ; then
+	if use python; then
 		testing() {
-			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"
+			emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				PYTHON="${EPYTHON}" \
+				install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
+				install_libdir="\"${D%/}/$(python_get_sitedir)\"" test
 		}
-		S=${S}/python python_foreach_impl testing
+		local S="${S}/python"
+		python_foreach_impl testing
 	fi
 
-	if use ruby ; then
-		emake -C ruby ${MAKE_RULES} ${MAKE_RULES_RB} test || die "emake ruby test failed"
+	if use ruby; then
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" test
 	fi
 
-	if use mono ; then
+	if use mono; then
 		# skip mono tests, bug #498484
 		ewarn "Tests for C# are currently disabled."
-#		emake -C csharp ${MAKE_RULES} ${MAKE_RULES_CS} test || die "emake csharp test failed"
+		#emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" test
 	fi
 }
 
 src_install() {
-	dodoc CHANGELOG*.md README.md
+	local DOCS=( CHANGELOG*.md README.md )
+	einstalldocs
 
 	insinto /usr/share/${P}
 	doins -r slice
 
-	emake -C cpp ${MAKE_RULES} install || die "emake install failed"
+	emake -C cpp "${MAKE_RULES[@]}" install
 
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples-cpp
-		doins cpp/config/*.cfg
+	if use examples; then
+		docinto examples-cpp
+		dodoc cpp/config/*.cfg
+		docompress -x /usr/share/doc/${PF}/examples-cpp
 	fi
 
-	if use php ; then
+	if use php; then
 		insinto "/usr/share/php/${PN}"
-		doins $(cd php/lib; find "${S}"/php/lib/ -name '*.php' -print)
-		for dir in $( cd "${D}/usr/share/${P}/slice" ; ls -1 ); do
-			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}/*
+
+		local i
+		while IFS="" read -d $'\0' -r i; do
+			doins "${i}"
+		done < <(find "${S}/php/lib/" -name '*.php' -print0)
+
+		pushd "${ED%/}/usr/share/${P}/slice" >/dev/null || die
+
+		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}"/*
 		done
 
-		local slot
-		for slot in $(php_get_slots); do
-			php_init_slot_env ${slot}
+		for i in $(php_get_slots); do
+			php_init_slot_env "${i}"
 			insinto "${EXT_DIR}"
-			newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension"
+			newins "php/lib/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so"
 		done
 		php-ext-source-r2_createinifiles
 
-		cd "${S}"
+		popd >/dev/null || die
 	fi
 
-	if use python ; then
+	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 || die "emake python-${EPYTHON} install failed"
+			emake -C "${BUILD_DIR}" \
+				"${MAKE_RULES[@]}" \
+				install_pythondir="\"${D%/}/$(python_get_sitedir)\"" \
+				install_libdir="\"${D%/}/$(python_get_sitedir)\"" \
+				install
 		}
-		S=${S}/python python_foreach_impl installation
+		local S="${S}/python"
+		python_foreach_impl installation
 	fi
 
-	if use ruby ; then
+	if use ruby; then
 		dodir "${SITERUBY}"
-		emake -C ruby ${MAKE_RULES} ${MAKE_RULES_RB} install || die "emake ruyb install failed"
+		emake -C ruby "${MAKE_RULES[@]}" "${MAKE_RULES_RUBY[@]}" install
 	fi
 
-	if use mono ; then
-		emake -C csharp ${MAKE_RULES} ${MAKE_RULES_CS} install || die "emake csharp install failed"
+	if use mono; then
+		emake -C csharp "${MAKE_RULES[@]}" "${MAKE_RULES_MONO[@]}" install
 	fi
 }
diff --git a/dev-libs/Ice/Manifest b/dev-libs/Ice/Manifest
deleted file mode 100644
index d69937f..0000000
--- a/dev-libs/Ice/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST Ice-3.6.3.pdf 8844957 SHA256 bf6edd649d44dcac1951d7d62b112fb535b8f29f58973cfdcd5cabf8940bb3b9 SHA512 44638a315b0da9c26519c053c48ab8ee216c43410f53844465535a972ae01031f1603769e9b3169fdf9358de67e0d0c7e238b2918b5d5b1c4cb95cb922fa922a WHIRLPOOL 65087b4c643e2c7f2cf66b3b9fb433823f75c8b5a44b838d39077f2dab85c57ff4e022931ec8ba21cbc6deda2e55257f6c0d2d0a360d50e9b1a615253ad7ed0a
-DIST Ice-3.6.3.tar.gz 5512741 SHA256 82ff74e6d24d9fa396dbb4d9697dc183b17bc9c3f6f076fecdc05632be80a2dc SHA512 6e17d21f55a8504af87a64c498a0c4d2084ed96a85c7a66d00319324774f671ace6afa03108d8d4e9bedf5fcfc2f3dba247949a27deecacdd0d298bd0bfe0a45 WHIRLPOOL 4e2d50aaf62f805a0c5471ab907c7680607de5fe101c96a740a3bc1b8ddc7ea93d768ba5886b26772647eb173417195bd808399192b2d2c7d5adb40cf38fc95f