--- /usr/portage/dev-libs/Ice/Ice-3.4.2.ebuild	2012-07-05 15:01:08.000000000 +0200
+++ Ice-3.4.2.ebuild	2012-10-18 11:58:50.000000000 +0200
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-libs/Ice/Ice-3.4.2.ebuild,v 1.7 2012/07/05 12:32:54 ago Exp $
 
-EAPI="2"
+EAPI="4"
 
 PYTHON_DEPEND="python? 2"
 SUPPORT_PYTHON_ABIS="1"
@@ -18,7 +18,7 @@
 	doc? ( http://www.zeroc.com/download/Ice/$(get_version_component_range 1-2)/${P}.pdf.gz )"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 x86"
+KEYWORDS="amd64 ~arm ~ia64 x86 ~x64-macos ~x86-linux"
 IUSE="doc examples +ncurses mono python ruby test debug"
 
 RDEPEND=">=dev-libs/expat-2.0.1
@@ -38,11 +38,13 @@
 # - 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
-#   with EAPI=2 which is needed since ruby-ng does not support EAPI=3.
+#   SUPPORT_PYTHON_ABIS=1 otherwise we can't get pyc/pyo anymore the sane way.
 # TODO: php bindings
 # TODO: java bindings
 
+#overwrite ruby-ng.eclass default
+S="${WORKDIR}/${P}"
+
 pkg_setup() {
 	if use python || use test; then
 		python_pkg_setup
@@ -90,10 +92,10 @@
 }
 
 src_configure() {
-	MAKE_RULES="prefix=\"${D}/usr\"
-		install_docdir=\"${D}/usr/share/doc/${PF}\"
-		install_configdir=\"${D}/usr/share/Ice-${PV}/config\"
-		embedded_runpath_prefix=\"\"
+	MAKE_RULES="prefix=\"${ED}/usr\"
+		install_docdir=\"${ED}/usr/share/doc/${PF}\"
+		install_configdir=\"${ED}/usr/share/Ice-${PV}/config\"
+		embedded_runpath_prefix=\"${EPREFIX}/usr\"
 		LP64=yes"
 
 	use ncurses && OPTIONS="${MAKE_RULES} USE_READLINE=yes" || MAKE_RULES="${MAKE_RULES} USE_READLINE=no"
@@ -115,8 +117,8 @@
 
 	if use ruby ; then
 		SITERUBY="$(ruby18 -r rbconfig -e 'print Config::CONFIG["sitedir"]')"
-		MAKE_RULES_RB="install_rubydir=\"${D}/${SITERUBY}\"
-			install_libdir=\"${D}/${SITERUBY}\""
+		MAKE_RULES_RB="install_rubydir=\"${ED}/${SITERUBY}\"
+			install_libdir=\"${ED}/${SITERUBY}\""
 
 		# make it use ruby18 only
 		sed -i \
@@ -124,7 +126,7 @@
 			rb/config/Make.rules || die "sed failed"
 	fi
 
-	MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${D}/usr/$(get_libdir)\" GAC_DIR=/usr/$(get_libdir)"
+	MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${ED}/usr/$(get_libdir)\" GAC_DIR=${EPREFIX}/usr/$(get_libdir)"
 
 }
 
@@ -196,7 +198,7 @@
 			doins -r py.orig/demo/*
 		fi
 
-		cd "${D}/$(python_get_sitedir -f)"
+		cd "${ED}/$(python_get_sitedir -f)"
 		PYTHON_MODULES=(*.py)
 		PYTHON_MODULES+=(IceBox IceGrid IcePatch2 IceStorm)
 		cd "${S}"
@@ -219,7 +221,7 @@
 		emake -C cs ${MAKE_RULES} ${MAKE_RULES_CS} install || die "emake cs install failed"
 
 		# TODO: anyone has an idea what those are for?
-		rm "${D}"/usr/bin/*.xml
+		rm "${ED}"/usr/bin/*.xml
 
 		docinto cs
 		dodoc cs/CHANGES cs/README