commit: c75fbe2daccad257c9beed1a98dc14a539c3f80f Author: Naohiro Aota <naota <AT> gentoo <DOT> org> AuthorDate: Wed Nov 29 03:05:38 2023 +0000 Commit: Naohiro Aota <naota <AT> gentoo <DOT> 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 <naota <AT> 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 \