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 91A93158099 for ; Wed, 29 Nov 2023 05:07:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC9412BC046; Wed, 29 Nov 2023 05:07:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 ABC542BC03D for ; Wed, 29 Nov 2023 05:07:10 +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 DC484335D16 for ; Wed, 29 Nov 2023 05:07:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 490E113D5 for ; Wed, 29 Nov 2023 05:07:08 +0000 (UTC) From: "Naohiro Aota" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Naohiro Aota" Message-ID: <1701234389.c75fbe2daccad257c9beed1a98dc14a539c3f80f.naota@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/mikutter/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/mikutter/mikutter-5.0.4.ebuild net-misc/mikutter/mikutter-9999.ebuild X-VCS-Directories: net-misc/mikutter/ X-VCS-Committer: naota X-VCS-Committer-Name: Naohiro Aota X-VCS-Revision: c75fbe2daccad257c9beed1a98dc14a539c3f80f X-VCS-Branch: master Date: Wed, 29 Nov 2023 05:07:08 +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: 1f05d790-6d1f-4a50-8926-8f6c8ccf7412 X-Archives-Hash: 2d5fcb054facb42d1bc1b2a06603c404 commit: c75fbe2daccad257c9beed1a98dc14a539c3f80f Author: Naohiro Aota gentoo org> AuthorDate: Wed Nov 29 03:05:38 2023 +0000 Commit: Naohiro Aota gentoo org> CommitDate: Wed Nov 29 05:06:29 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c75fbe2d net-misc/mikutter: use RUBY_TARGETS_PREFERENCE to choose a ruby variant USE_RUBY may contain already obsolete ruby variant. Instead, we can use RUBY_TARGETS_PREFERENCE to select existing supported one. Closes: https://bugs.gentoo.org/914717 Signed-off-by: Naohiro Aota gentoo.org> net-misc/mikutter/mikutter-5.0.4.ebuild | 11 +++++------ net-misc/mikutter/mikutter-9999.ebuild | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/net-misc/mikutter/mikutter-5.0.4.ebuild b/net-misc/mikutter/mikutter-5.0.4.ebuild index c09e571b2a2b..2744c003d1d1 100644 --- a/net-misc/mikutter/mikutter-5.0.4.ebuild +++ b/net-misc/mikutter/mikutter-5.0.4.ebuild @@ -68,12 +68,11 @@ all_ruby_unpack() { } all_ruby_install() { - local rubyversion - local r + local ruby - for r in $USE_RUBY; do - if use ruby_targets_${r}; then - rubyversion=${r} + for ruby in ${RUBY_TARGETS_PREFERENCE}; do + if use ruby_targets_${ruby}; then + break fi done @@ -81,7 +80,7 @@ all_ruby_install() { doexe mikutter.rb insinto /usr/share/mikutter doins -r core plugin - sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \ + sed -e "s/ruby19/${ruby}/" "${FILESDIR}"/mikutter \ | newbin - mikutter dodoc README make_desktop_entry mikutter Mikutter \ diff --git a/net-misc/mikutter/mikutter-9999.ebuild b/net-misc/mikutter/mikutter-9999.ebuild index c09e571b2a2b..2744c003d1d1 100644 --- a/net-misc/mikutter/mikutter-9999.ebuild +++ b/net-misc/mikutter/mikutter-9999.ebuild @@ -68,12 +68,11 @@ all_ruby_unpack() { } all_ruby_install() { - local rubyversion - local r + local ruby - for r in $USE_RUBY; do - if use ruby_targets_${r}; then - rubyversion=${r} + for ruby in ${RUBY_TARGETS_PREFERENCE}; do + if use ruby_targets_${ruby}; then + break fi done @@ -81,7 +80,7 @@ all_ruby_install() { doexe mikutter.rb insinto /usr/share/mikutter doins -r core plugin - sed -e "s/ruby19/${rubyversion}/" "${FILESDIR}"/mikutter \ + sed -e "s/ruby19/${ruby}/" "${FILESDIR}"/mikutter \ | newbin - mikutter dodoc README make_desktop_entry mikutter Mikutter \