[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

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

commit:     a5240a93fb985c1fa274b92943bca6d0d761ed3c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 21:13:26 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 22:00:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5240a93

net-ftp/proftpd: Remove linguas_* from IUSE.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-ftp/proftpd/metadata.xml          | 5 -----
 net-ftp/proftpd/proftpd-1.3.5e.ebuild | 7 +++----
 net-ftp/proftpd/proftpd-1.3.6.ebuild  | 7 +++----
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index 4331411c0cb..7434ca7e638 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -23,11 +23,6 @@ server.</longdescription>
 		<flag name="ident">Enable support for the mod_ident module</flag>
 		<flag name="ifsession">Enable support for the ifsession module</flag>
 		<flag name="ifversion">Enable support for the mod_ifversion module</flag>
-		<flag name="linguas_bg_BG">Language support for bg_BG</flag>
-		<flag name="linguas_fr_FR">Language support for fr_FR</flag>
-		<flag name="linguas_it_IT">Language support for it_IT</flag>
-		<flag name="linguas_ja_JP">Language support for ja_JP</flag>
-		<flag name="linguas_ru_RU">Language support for ru_RU</flag>
 		<flag name="log_forensic">Enable support for the mod_log_forensic module, log only suspicious actions.</flag>
 		<flag name="memcache">Enable support for the mod_memcache module, for using memcached servers</flag>
 		<flag name="msg">Enable support for the mod_msg module, allows system users to send messages to connected clients via the ftpdctl program.</flag>

diff --git a/net-ftp/proftpd/proftpd-1.3.5e.ebuild b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
index ef4a85a80e1..6978a2d8258 100644
--- a/net-ftp/proftpd/proftpd-1.3.5e.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5e.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=6
@@ -28,8 +28,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6
-	kerberos ldap libressl linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
-	linguas_ru_RU linguas_zh_CN linguas_zh_TW log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
+	kerberos ldap libressl log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
 	ratio readme rewrite selinux sftp shaper sitemisc snmp softquota sqlite ssl tcpd test trace unique_id vroot xinetd"
 # TODO: geoip
 REQUIRED_USE="ban? ( ctrls )
@@ -210,7 +209,7 @@ src_test() {
 
 src_install() {
 	default
-	[[ -z ${LINGUAS} ]] && rm -r "${ED}"/usr/share/locale
+	[[ -z ${LINGUAS-set} ]] && rm -r "${ED}"/usr/share/locale
 	rm -rf "${ED}"/var/run
 
 	newinitd "${FILESDIR}"/proftpd.initd proftpd

diff --git a/net-ftp/proftpd/proftpd-1.3.6.ebuild b/net-ftp/proftpd/proftpd-1.3.6.ebuild
index fffba1c6c26..9acb7fd2075 100644
--- a/net-ftp/proftpd/proftpd-1.3.6.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6.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=6
@@ -28,8 +28,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6
-	kerberos ldap libressl linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
-	linguas_ru_RU linguas_zh_CN linguas_zh_TW log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
+	kerberos ldap libressl log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
 	ratio readme rewrite selinux sftp shaper sitemisc snmp softquota sqlite ssl tcpd test unique_id vroot xinetd"
 # TODO: geoip
 REQUIRED_USE="ban? ( ctrls )
@@ -234,7 +233,7 @@ src_test() {
 
 src_install() {
 	default
-	[[ -z ${LINGUAS} ]] && rm -r "${ED}"/usr/share/locale
+	[[ -z ${LINGUAS-set} ]] && rm -r "${ED}"/usr/share/locale
 	rm -rf "${ED}"/var/run
 
 	newinitd "${FILESDIR}"/proftpd.initd proftpd