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 <[email protected]>
johu · Jul 25, 2019 · 1b3ea30 · 1b3ea30
1 parent e47f327
commit 1b3ea30
Showing 1 changed file with 20 additions and 6 deletions.
diff --git 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"