[gentoo-commits] repo/gentoo:master commit in: net-irc/rbot/

["Ulrich Müller" <ulm@gentoo.org>]

commit:     77d6212dcb6dc56546ebd37944bff21bbfc56420
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  7 11:20:11 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jan  7 11:20:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77d6212d

net-irc/rbot: Test LINGUAS rather than linguas_* USE flags.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild | 10 +++-------
 net-irc/rbot/rbot-0.9.15_p20160325.ebuild    | 10 +++-------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild b/net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild
index 9d5251d93d3..c176e4cd985 100644
--- a/net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild
+++ b/net-irc/rbot/rbot-0.9.15_p20160325-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,10 +19,6 @@ IUSE="spell aspell timezone translator shorturl nls figlet
 ILINGUAS="zh_CN zh_TW ru nl de fi fr it ja"
 RUBY_S="${PN}-${GITHUB_COMMIT}"
 
-for lang in $ILINGUAS; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
 RUBY_PATCHES=( rbot-rakefile-gettext.patch )
 
 RDEPEND+="
@@ -128,7 +124,7 @@ all_ruby_compile() {
 	# need to add them later.
 	if use nls; then
 		strip-linguas ${ILINGUAS}
-		if [[ -n ${LINGUAS} ]]; then
+		if [[ -n ${LINGUAS+set} ]]; then
 			# As the the language name used by the rbot data files does
 			# not correspond to the ISO codes we usually use for LINGUAS,
 			# the following list of local varables will work as a
@@ -143,7 +139,7 @@ all_ruby_compile() {
 			local lang_rbot_ja="japanese"
 
 			for lang in ${ILINGUAS}; do
-				use linguas_${lang} && continue
+				has ${lang} ${LINGUAS} && continue
 
 				lang_varname="lang_rbot_${lang}"
 				lang_rbot=${!lang_varname}

diff --git a/net-irc/rbot/rbot-0.9.15_p20160325.ebuild b/net-irc/rbot/rbot-0.9.15_p20160325.ebuild
index 48af140afb3..ee7d5458ae7 100644
--- a/net-irc/rbot/rbot-0.9.15_p20160325.ebuild
+++ b/net-irc/rbot/rbot-0.9.15_p20160325.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,10 +19,6 @@ IUSE="spell aspell timezone translator shorturl nls figlet
 ILINGUAS="zh_CN zh_TW ru nl de fi fr it ja"
 RUBY_S="${PN}-${GITHUB_COMMIT}"
 
-for lang in $ILINGUAS; do
-	IUSE="${IUSE} linguas_${lang}"
-done
-
 RUBY_PATCHES=( rbot-rakefile-gettext.patch )
 
 RDEPEND+="
@@ -118,7 +114,7 @@ all_ruby_compile() {
 	# need to add them later.
 	if use nls; then
 		strip-linguas ${ILINGUAS}
-		if [[ -n ${LINGUAS} ]]; then
+		if [[ -n ${LINGUAS+set} ]]; then
 			# As the the language name used by the rbot data files does
 			# not correspond to the ISO codes we usually use for LINGUAS,
 			# the following list of local varables will work as a
@@ -133,7 +129,7 @@ all_ruby_compile() {
 			local lang_rbot_ja="japanese"
 
 			for lang in ${ILINGUAS}; do
-				use linguas_${lang} && continue
+				has ${lang} ${LINGUAS} && continue
 
 				lang_varname="lang_rbot_${lang}"
 				lang_rbot=${!lang_varname}