From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id AA0D11388BF for ; Sun, 10 Jan 2016 07:28:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6401A21C023; Sun, 10 Jan 2016 07:28:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C173621C023 for ; Sun, 10 Jan 2016 07:28:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EC355340890 for ; Sun, 10 Jan 2016 07:28:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EAEE5D0D for ; Sun, 10 Jan 2016 07:28:23 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1452410141.c5d5e8dcb1f5ec231f1bbc4e47dcbe2dc8e50e1b.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/thor/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/thor/thor-0.19.1.ebuild X-VCS-Directories: dev-ruby/thor/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: c5d5e8dcb1f5ec231f1bbc4e47dcbe2dc8e50e1b X-VCS-Branch: master Date: Sun, 10 Jan 2016 07:28:23 +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: 0916302c-d7b5-47b3-91d5-13df7a2d0751 X-Archives-Hash: 770610c3aad1b510de133e3dfcc72810 commit: c5d5e8dcb1f5ec231f1bbc4e47dcbe2dc8e50e1b Author: Hans de Graaff gentoo org> AuthorDate: Sun Jan 10 07:15:41 2016 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sun Jan 10 07:15:41 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5d5e8dc dev-ruby/thor: add ruby22 Package-Manager: portage-2.2.26 dev-ruby/thor/thor-0.19.1.ebuild | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dev-ruby/thor/thor-0.19.1.ebuild b/dev-ruby/thor/thor-0.19.1.ebuild index 368089e..49bbfde 100644 --- a/dev-ruby/thor/thor-0.19.1.ebuild +++ b/dev-ruby/thor/thor-0.19.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby20 ruby21 ruby22" RUBY_FAKEGEM_RECIPE_DOC="rdoc" RUBY_FAKEGEM_RECIPE_TEST="rspec" @@ -23,7 +23,10 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" IUSE="doc" -ruby_add_bdepend " +# fakeweb is not compatible with ruby22. Upstream has switched to +# webmock but leads to circular dependencies via childlabor's +# dependencies, so skip tests for ruby22 for now. +USE_RUBY="ruby20 ruby21" ruby_add_bdepend " test? ( >=dev-ruby/fakeweb-1.3 dev-ruby/childlabor @@ -46,3 +49,14 @@ all_ruby_prepare() { # bug 430402 sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die } + +each_ruby_test() { + case ${RUBY} in + *ruby22) + einfo "Skipping tests due to circular dependencies" + ;; + *) + ruby-ng_rspec spec || die + ;; + esac +}