From f6ca3c290d0f7ca222de15d7283287249c26c164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Sun, 17 Apr 2016 22:31:32 +0200
Subject: [PATCH] [dev-libs/Ice] try getting tests to work without having to
 eselect the right ruby version

---
 dev-libs/Ice/Ice-3.6.2.ebuild    | 11 +++--------
 dev-libs/Ice/Ice-3.6.9999.ebuild | 11 +++--------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/dev-libs/Ice/Ice-3.6.2.ebuild b/dev-libs/Ice/Ice-3.6.2.ebuild
index d2508d3..11546c1 100644
--- a/dev-libs/Ice/Ice-3.6.2.ebuild
+++ b/dev-libs/Ice/Ice-3.6.2.ebuild
@@ -63,14 +63,6 @@ REQUIRED_USE="php_namespaces? ( php )"
 S="${WORKDIR}/${P/I/i}"
 PHP_EXT_S="${S}/php"
 
-pkg_setup() {
-	if use test && use ruby && [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]; then
-		eerror "/usr/bin/ruby is currently not included in Ice's ruby targets: ${RUBY_TARGETS}."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-}
-
 src_unpack() {
 	# prevent ruby-ng.eclass from messing with src_unpack
 	default
@@ -189,6 +181,9 @@ src_configure() {
 		sed -i \
 			-e 's|env ruby|\023|' \
 			ruby/scripts/slice2rb || die "sed failed"
+		sed -i \
+			-e 's|output.write\(\"ruby|\023|' \
+			scripts/TestUtil.py || die "sed failed"
 	fi
 
 	MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${ED}/usr/$(get_libdir)\" GAC_DIR=${EPREFIX}/usr/$(get_libdir)
diff --git a/dev-libs/Ice/Ice-3.6.9999.ebuild b/dev-libs/Ice/Ice-3.6.9999.ebuild
index 8b1928c..1be3dfa 100644
--- a/dev-libs/Ice/Ice-3.6.9999.ebuild
+++ b/dev-libs/Ice/Ice-3.6.9999.ebuild
@@ -68,14 +68,6 @@ REQUIRED_USE="php_namespaces? ( php )"
 S="${WORKDIR}/${PN}"
 PHP_EXT_S="${S}/php"
 
-pkg_setup() {
-	if use test && use ruby && [[ $RUBY_TARGETS != *$( eselect ruby show | awk 'NR==2' | tr  -d ' '  )* ]]; then
-		eerror "/usr/bin/ruby is currently not included in Ice's ruby targets: ${RUBY_TARGETS}."
-		eerror "Please update it via `eselect ruby`"
-		die
-	fi
-}
-
 src_unpack() {
 	# prevent ruby-ng.eclass from messing with src_unpack
 	git-r3_src_unpack
@@ -194,6 +186,9 @@ src_configure() {
 		sed -i \
 			-e 's|env ruby|\023|' \
 			ruby/scripts/slice2rb || die "sed failed"
+		sed -i \
+			-e 's|output.write\(\"ruby|\023|' \
+			scripts/TestUtil.py || die "sed failed"
 	fi
 
 	MAKE_RULES_CS="GACINSTALL=yes GAC_ROOT=\"${ED}/usr/$(get_libdir)\" GAC_DIR=${EPREFIX}/usr/$(get_libdir)