From 1b3ea3098b1549304fdc60b103ba3a5e444e51b6 Mon Sep 17 00:00:00 2001 From: Hans de Graaff Date: Sun, 21 Jul 2019 09:44:29 +0200 Subject: [PATCH] ruby-ng.eclass: remove 2-arg calling of depend methods in EAPI 7 No longer allow the deprecated 2 argument calls to the ruby*depend methods in EAPI 7. These are already deprecated for a long time. Signed-off-by: Hans de Graaff --- eclass/ruby-ng.eclass | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass index 9fb6965a0790..a0c03ab6027e 100644 --- a/eclass/ruby-ng.eclass +++ b/eclass/ruby-ng.eclass @@ -208,9 +208,16 @@ ruby_add_rdepend() { case $# in 1) ;; 2) - [[ "${GENTOO_DEV}" == "yes" ]] && eqawarn "You can now use the usual syntax in ruby_add_rdepend for $CATEGORY/$PF" - ruby_add_rdepend "$(_ruby_wrap_conditions "$1" "$2")" - return + case ${EAPI} in + 4|5|6) + [[ "${GENTOO_DEV}" == "yes" ]] && eqawarn "You can now use the usual syntax in ruby_add_rdepend for $CATEGORY/$PF" + ruby_add_rdepend "$(_ruby_wrap_conditions "$1" "$2")" + return + ;; + *) + die "Use the usual depend syntax with a single argument in ruby_add_rdepend" + ;; + esac ;; *) die "bad number of arguments to $0" @@ -243,9 +250,16 @@ ruby_add_bdepend() { case $# in 1) ;; 2) - [[ "${GENTOO_DEV}" == "yes" ]] && eqawarn "You can now use the usual syntax in ruby_add_bdepend for $CATEGORY/$PF" - ruby_add_bdepend "$(_ruby_wrap_conditions "$1" "$2")" - return + case ${EAPI} in + 4|5|6) + [[ "${GENTOO_DEV}" == "yes" ]] && eqawarn "You can now use the usual syntax in ruby_add_bdepend for $CATEGORY/$PF" + ruby_add_bdepend "$(_ruby_wrap_conditions "$1" "$2")" + return + ;; + *) + die "Use the usual depend syntax with a single argument in ruby_add_bdepend" + ;; + esac ;; *) die "bad number of arguments to $0" -- 2.26.2