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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 69CDF15800D for ; Sun, 9 Jul 2023 05:42:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7343FE095E; Sun, 9 Jul 2023 05:42:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 557B6E096F for ; Sun, 9 Jul 2023 05:42:31 +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 0BF8C340E18 for ; Sun, 9 Jul 2023 05:42:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 63598A84 for ; Sun, 9 Jul 2023 05:42:28 +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: <1688881343.d74a346e8d0ed9535f2f77c50e47c41b438c9bb3.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/io-console/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/io-console/io-console-0.6.0-r1.ebuild dev-ruby/io-console/io-console-0.6.0.ebuild X-VCS-Directories: dev-ruby/io-console/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: d74a346e8d0ed9535f2f77c50e47c41b438c9bb3 X-VCS-Branch: master Date: Sun, 9 Jul 2023 05:42:28 +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: e54b7a77-088c-48b4-9867-7f6021824152 X-Archives-Hash: afdb39bfd05089dd2ef541b3c879c3bc commit: d74a346e8d0ed9535f2f77c50e47c41b438c9bb3 Author: Hans de Graaff gentoo org> AuthorDate: Sun Jul 9 05:28:39 2023 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Sun Jul 9 05:42:23 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d74a346e dev-ruby/io-console: only install expected files The gemspec file installs different files depending on the ruby engine. Match this to avoid loading the wrong files. Closes: https://bugs.gentoo.org/909442 Signed-off-by: Hans de Graaff gentoo.org> .../{io-console-0.6.0.ebuild => io-console-0.6.0-r1.ebuild} | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dev-ruby/io-console/io-console-0.6.0.ebuild b/dev-ruby/io-console/io-console-0.6.0-r1.ebuild similarity index 86% rename from dev-ruby/io-console/io-console-0.6.0.ebuild rename to dev-ruby/io-console/io-console-0.6.0-r1.ebuild index 6c1240d7498a..54a0ae2fb86d 100644 --- a/dev-ruby/io-console/io-console-0.6.0.ebuild +++ b/dev-ruby/io-console/io-console-0.6.0-r1.ebuild @@ -29,6 +29,10 @@ all_ruby_prepare() { # Avoid test that require a proper TTY sed -e '/test_\(bad_keyword\|failed_path\)/aomit "requires TTY"' \ -i test/io/console/test_io_console.rb || die + + # Remove ruby and ffi files in accordance with the gemspec. These + # are only used when using a different ruby engine like jruby. + rm -fr lib/io/console.rb lib/io/console/ffi || die } each_ruby_test() {