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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C68AA158020 for ; Sat, 24 Dec 2022 06:35:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85F42E088C; Sat, 24 Dec 2022 06:35:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6AD5CE0882 for ; Sat, 24 Dec 2022 06:35:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6D19033C1C2 for ; Sat, 24 Dec 2022 06:35:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C5EB37F0 for ; Sat, 24 Dec 2022 06:35:15 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1671863511.832afd7ae658f16851fa0f31c151e5ad5f5ea1a9.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/typhoeus/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/typhoeus/typhoeus-1.4.0-r1.ebuild X-VCS-Directories: dev-ruby/typhoeus/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 832afd7ae658f16851fa0f31c151e5ad5f5ea1a9 X-VCS-Branch: master Date: Sat, 24 Dec 2022 06:35:15 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4e7db4f6-91dd-4596-ace9-dc65c623c87e X-Archives-Hash: 1d370ce31c2f0b5d0d5b23380ed4b9cc commit: 832afd7ae658f16851fa0f31c151e5ad5f5ea1a9 Author: Sam James gentoo org> AuthorDate: Sat Dec 24 05:43:08 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Dec 24 06:31:51 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=832afd7a dev-ruby/typhoeus: fix faraday test dep The second option in || ( A B ) had no slot, so it allowed Faraday 2, even though it's not supported. Change to :0 as a minimal change to make it correct, although we could just drop it as :0 is masked now. Without this, faraday 1.x is not pulled in, just faraday 2, and we get ``` [...] Gem::MissingSpecVersionError: Could not find 'faraday' (< 2) - did find: [faraday-2.7.2] ``` on tests. Signed-off-by: Sam James gentoo.org> dev-ruby/typhoeus/typhoeus-1.4.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ruby/typhoeus/typhoeus-1.4.0-r1.ebuild b/dev-ruby/typhoeus/typhoeus-1.4.0-r1.ebuild index 115b05f2878c..b6c62ee9b3be 100644 --- a/dev-ruby/typhoeus/typhoeus-1.4.0-r1.ebuild +++ b/dev-ruby/typhoeus/typhoeus-1.4.0-r1.ebuild @@ -23,7 +23,7 @@ IUSE="" ruby_add_rdepend ">=dev-ruby/ethon-0.9.0" -ruby_add_bdepend "test? ( dev-ruby/json || ( dev-ruby/faraday:1 >=dev-ruby/faraday-0.9 ) >=dev-ruby/sinatra-1.3 >=dev-ruby/redis-3.0 >=dev-ruby/dalli-2.7.9 )" +ruby_add_bdepend "test? ( dev-ruby/json || ( dev-ruby/faraday:1 >=dev-ruby/faraday-0.9:0 ) >=dev-ruby/sinatra-1.3 >=dev-ruby/redis-3.0 >=dev-ruby/dalli-2.7.9 )" all_ruby_prepare() { sed -e '/bundler/I s:^:#:' -i Rakefile spec/spec_helper.rb || die