From 781388a6d8bc37beb41f60b0e3087b8ed2fe1b91 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Sun, 15 Apr 2018 12:51:04 +0200
Subject: [PATCH] dev-libs/Ice: fix USE=ruby, restrict tests for now

Closes: https://bugs.gentoo.org/636834
Closes: https://bugs.gentoo.org/649850
Closes: https://bugs.gentoo.org/654070
Package-Manager: Portage-2.3.28, Repoman-2.3.9
---
 dev-libs/Ice/Ice-3.6.3-r1.ebuild | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/dev-libs/Ice/Ice-3.6.3-r1.ebuild b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
index a2eb14ae3125..4955f0858ef8 100644
--- a/dev-libs/Ice/Ice-3.6.3-r1.ebuild
+++ b/dev-libs/Ice/Ice-3.6.3-r1.ebuild
@@ -30,6 +30,7 @@ LICENSE="GPL-2"
 SLOT="0/36"
 KEYWORDS="amd64 ~arm x86"
 IUSE="doc examples libressl +ncurses mono php python ruby test debug"
+RESTRICT="test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND=">=dev-libs/expat-2.0.1
@@ -114,12 +115,14 @@ src_prepare() {
 		-e '/SUBDIRS/s|\ test||' \
 		csharp/Makefile || die "sed failed"
 
-	# IceUtil/stacktrace fails with USE=debug
 	# skip udp test due to multicast
+	# skip IceGrid/admin bug #649850
 	# skip IceSSL tests due to requirement of internet connection
+	# skip IceStorm/single bug #636834
 	# IceStorm/stress fails without USE=debug
+	# IceUtil/stacktrace fails with USE=debug
 	sed -i \
-		-e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceSSL --rfilter=IceStorm\/stress|' \
+		-e 's|allTests.py|allTests.py --rfilter=IceUtil\/stacktrace --rfilter=udp --rfilter=IceGrid\/admin --rfilter=IceSSL --rfilter=IceStorm\/single --rfilter=IceStorm\/stress|' \
 		cpp/Makefile || die "sed failed"
 
 	# mainly broken .ice files
@@ -131,6 +134,11 @@ src_prepare() {
 	sed -i \
 		-e 's|allTests.py|allTests.py --rfilter=Slice\/unicodePaths|' \
 		ruby/Makefile || die "sed failed"
+
+	# fix for x86 IceBox test
+	sed -i \
+		-e 's|"32"|""|' \
+		scripts/TestUtil.py || die "sed failed"
 }
 
 src_configure() {
@@ -182,16 +190,16 @@ src_configure() {
 
 		# make it use ruby23 only
 		sed -i \
-			-e 's|RUBY = ruby|\022|' \
+			-e 's|RUBY = ruby|\023|' \
 			ruby/config/Make.rules || die "sed failed"
 		sed -i \
-			-e 's|env ruby|\022|' \
+			-e 's|env ruby|\023|' \
 			ruby/config/s2rb.rb || die "sed failed"
 		sed -i \
-			-e 's|env ruby|\022|' \
+			-e 's|env ruby|\023|' \
 			ruby/scripts/slice2rb || die "sed failed"
 		sed -i \
-			-e 's|output.write("ruby|\022|' \
+			-e 's|output.write("ruby|\023|' \
 			scripts/TestUtil.py || die "sed failed"
 	fi
 
-- 
2.26.2