From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 47E941382C5 for ; Thu, 26 Apr 2018 13:47:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A9EBE08EB; Thu, 26 Apr 2018 13:47:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0D703E08EB for ; Thu, 26 Apr 2018 13:47:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 95284335C30 for ; Thu, 26 Apr 2018 13:47:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 19D87281 for ; Thu, 26 Apr 2018 13:47:14 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1524750306.781388a6d8bc37beb41f60b0e3087b8ed2fe1b91.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/Ice/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/Ice/Ice-3.6.3-r1.ebuild X-VCS-Directories: dev-libs/Ice/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 781388a6d8bc37beb41f60b0e3087b8ed2fe1b91 X-VCS-Branch: master Date: Thu, 26 Apr 2018 13:47:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6f437671-9935-46bf-9a8d-99e269785487 X-Archives-Hash: 0e8f6acd826fa2753fb0afcfb58538ec commit: 781388a6d8bc37beb41f60b0e3087b8ed2fe1b91 Author: Robert Förster gmake de> AuthorDate: Sun Apr 15 10:51:04 2018 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Thu Apr 26 13:45:06 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=781388a6 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 a2eb14ae312..4955f0858ef 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