From 2c8fe3dd4747bd3ad67f99d52e77f73dd87bf5da Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Sat, 3 Aug 2019 08:22:21 +0200 Subject: [PATCH] www-servers/uwsgi: avoid using obsolete ruby targets Only use ruby targets that are still available, rather than those listed in USE_RUBY. Fixes: https://bugs.gentoo.org/687762 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Hans de Graaff --- www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild | 10 ++++------ www-servers/uwsgi/uwsgi-2.0.17.1.ebuild | 10 ++++------ www-servers/uwsgi/uwsgi-2.0.17.ebuild | 10 ++++------ www-servers/uwsgi/uwsgi-2.0.18.ebuild | 10 ++++------ 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild index f3a4990dac34..972eee8c2333 100644 --- a/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild +++ b/www-servers/uwsgi/uwsgi-2.0.17.1-r1.ebuild @@ -389,12 +389,10 @@ pkg_postinst() { use python && python_foreach_impl python_pkg_postinst if use ruby ; then - for ruby in $USE_RUBY; do - if use ruby_targets_${ruby} ; then - elog " '--plugins rack_${ruby/.}' for ${ruby}" - elog " '--plugins fiber_${ruby/.}' for ${ruby} fibers" - elog " '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads" - fi + for ruby in $(ruby_get_use_implementations) ; do + elog " '--plugins rack_${ruby/.}' for ${ruby}" + elog " '--plugins fiber_${ruby/.}' for ${ruby} fibers" + elog " '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads" done fi } diff --git a/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild index 29267552f1da..dbf4130313b5 100644 --- a/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild +++ b/www-servers/uwsgi/uwsgi-2.0.17.1.ebuild @@ -399,12 +399,10 @@ pkg_postinst() { use python && python_foreach_impl python_pkg_postinst if use ruby ; then - for ruby in $USE_RUBY; do - if use ruby_targets_${ruby} ; then - elog " '--plugins rack_${ruby/.}' for ${ruby}" - elog " '--plugins fiber_${ruby/.}' for ${ruby} fibers" - elog " '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads" - fi + for ruby in $(ruby_get_use_implementations) ; do + elog " '--plugins rack_${ruby/.}' for ${ruby}" + elog " '--plugins fiber_${ruby/.}' for ${ruby} fibers" + elog " '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads" done fi } diff --git a/www-servers/uwsgi/uwsgi-2.0.17.ebuild b/www-servers/uwsgi/uwsgi-2.0.17.ebuild index 07c27595255d..91962faabb4b 100644 --- a/www-servers/uwsgi/uwsgi-2.0.17.ebuild +++ b/www-servers/uwsgi/uwsgi-2.0.17.ebuild @@ -404,12 +404,10 @@ pkg_postinst() { use python && python_foreach_impl python_pkg_postinst if use ruby ; then - for ruby in $USE_RUBY; do - if use ruby_targets_${ruby} ; then - elog " '--plugins rack_${ruby/.}' for ${ruby}" - elog " '--plugins fiber_${ruby/.}' for ${ruby} fibers" - elog " '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads" - fi + for ruby in $(ruby_get_use_implementations) ; do + elog " '--plugins rack_${ruby/.}' for ${ruby}" + elog " '--plugins fiber_${ruby/.}' for ${ruby} fibers" + elog " '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads" done fi } diff --git a/www-servers/uwsgi/uwsgi-2.0.18.ebuild b/www-servers/uwsgi/uwsgi-2.0.18.ebuild index badd0a9e1c3c..918ff7c51ab4 100644 --- a/www-servers/uwsgi/uwsgi-2.0.18.ebuild +++ b/www-servers/uwsgi/uwsgi-2.0.18.ebuild @@ -390,12 +390,10 @@ pkg_postinst() { use python && python_foreach_impl python_pkg_postinst if use ruby ; then - for ruby in $USE_RUBY; do - if use ruby_targets_${ruby} ; then - elog " '--plugins rack_${ruby/.}' for ${ruby}" - elog " '--plugins fiber_${ruby/.}' for ${ruby} fibers" - elog " '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads" - fi + for ruby in $(ruby_get_use_implementations) ; do + elog " '--plugins rack_${ruby/.}' for ${ruby}" + elog " '--plugins fiber_${ruby/.}' for ${ruby} fibers" + elog " '--plugins rbthreads_${ruby/.}' for ${ruby} rbthreads" done fi } -- 2.26.2