| 1 |
commit: a5240a93fb985c1fa274b92943bca6d0d761ed3c |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 5 21:13:26 2018 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 5 22:00:44 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5240a93 |
| 7 |
|
| 8 |
net-ftp/proftpd: Remove linguas_* from IUSE. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 11 |
|
| 12 |
net-ftp/proftpd/metadata.xml | 5 ----- |
| 13 |
net-ftp/proftpd/proftpd-1.3.5e.ebuild | 7 +++---- |
| 14 |
net-ftp/proftpd/proftpd-1.3.6.ebuild | 7 +++---- |
| 15 |
3 files changed, 6 insertions(+), 13 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml |
| 18 |
index 4331411c0cb..7434ca7e638 100644 |
| 19 |
--- a/net-ftp/proftpd/metadata.xml |
| 20 |
+++ b/net-ftp/proftpd/metadata.xml |
| 21 |
@@ -23,11 +23,6 @@ server.</longdescription> |
| 22 |
<flag name="ident">Enable support for the mod_ident module</flag> |
| 23 |
<flag name="ifsession">Enable support for the ifsession module</flag> |
| 24 |
<flag name="ifversion">Enable support for the mod_ifversion module</flag> |
| 25 |
- <flag name="linguas_bg_BG">Language support for bg_BG</flag> |
| 26 |
- <flag name="linguas_fr_FR">Language support for fr_FR</flag> |
| 27 |
- <flag name="linguas_it_IT">Language support for it_IT</flag> |
| 28 |
- <flag name="linguas_ja_JP">Language support for ja_JP</flag> |
| 29 |
- <flag name="linguas_ru_RU">Language support for ru_RU</flag> |
| 30 |
<flag name="log_forensic">Enable support for the mod_log_forensic module, log only suspicious actions.</flag> |
| 31 |
<flag name="memcache">Enable support for the mod_memcache module, for using memcached servers</flag> |
| 32 |
<flag name="msg">Enable support for the mod_msg module, allows system users to send messages to connected clients via the ftpdctl program.</flag> |
| 33 |
|
| 34 |
diff --git a/net-ftp/proftpd/proftpd-1.3.5e.ebuild b/net-ftp/proftpd/proftpd-1.3.5e.ebuild |
| 35 |
index ef4a85a80e1..6978a2d8258 100644 |
| 36 |
--- a/net-ftp/proftpd/proftpd-1.3.5e.ebuild |
| 37 |
+++ b/net-ftp/proftpd/proftpd-1.3.5e.ebuild |
| 38 |
@@ -1,4 +1,4 @@ |
| 39 |
-# Copyright 1999-2017 Gentoo Foundation |
| 40 |
+# Copyright 1999-2018 Gentoo Foundation |
| 41 |
# Distributed under the terms of the GNU General Public License v2 |
| 42 |
|
| 43 |
EAPI=6 |
| 44 |
@@ -28,8 +28,7 @@ LICENSE="GPL-2" |
| 45 |
SLOT="0" |
| 46 |
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" |
| 47 |
IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6 |
| 48 |
- kerberos ldap libressl linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR |
| 49 |
- linguas_ru_RU linguas_zh_CN linguas_zh_TW log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius |
| 50 |
+ kerberos ldap libressl log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius |
| 51 |
ratio readme rewrite selinux sftp shaper sitemisc snmp softquota sqlite ssl tcpd test trace unique_id vroot xinetd" |
| 52 |
# TODO: geoip |
| 53 |
REQUIRED_USE="ban? ( ctrls ) |
| 54 |
@@ -210,7 +209,7 @@ src_test() { |
| 55 |
|
| 56 |
src_install() { |
| 57 |
default |
| 58 |
- [[ -z ${LINGUAS} ]] && rm -r "${ED}"/usr/share/locale |
| 59 |
+ [[ -z ${LINGUAS-set} ]] && rm -r "${ED}"/usr/share/locale |
| 60 |
rm -rf "${ED}"/var/run |
| 61 |
|
| 62 |
newinitd "${FILESDIR}"/proftpd.initd proftpd |
| 63 |
|
| 64 |
diff --git a/net-ftp/proftpd/proftpd-1.3.6.ebuild b/net-ftp/proftpd/proftpd-1.3.6.ebuild |
| 65 |
index fffba1c6c26..9acb7fd2075 100644 |
| 66 |
--- a/net-ftp/proftpd/proftpd-1.3.6.ebuild |
| 67 |
+++ b/net-ftp/proftpd/proftpd-1.3.6.ebuild |
| 68 |
@@ -1,4 +1,4 @@ |
| 69 |
-# Copyright 1999-2017 Gentoo Foundation |
| 70 |
+# Copyright 1999-2018 Gentoo Foundation |
| 71 |
# Distributed under the terms of the GNU General Public License v2 |
| 72 |
|
| 73 |
EAPI=6 |
| 74 |
@@ -28,8 +28,7 @@ LICENSE="GPL-2" |
| 75 |
SLOT="0" |
| 76 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 77 |
IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6 |
| 78 |
- kerberos ldap libressl linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR |
| 79 |
- linguas_ru_RU linguas_zh_CN linguas_zh_TW log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius |
| 80 |
+ kerberos ldap libressl log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius |
| 81 |
ratio readme rewrite selinux sftp shaper sitemisc snmp softquota sqlite ssl tcpd test unique_id vroot xinetd" |
| 82 |
# TODO: geoip |
| 83 |
REQUIRED_USE="ban? ( ctrls ) |
| 84 |
@@ -234,7 +233,7 @@ src_test() { |
| 85 |
|
| 86 |
src_install() { |
| 87 |
default |
| 88 |
- [[ -z ${LINGUAS} ]] && rm -r "${ED}"/usr/share/locale |
| 89 |
+ [[ -z ${LINGUAS-set} ]] && rm -r "${ED}"/usr/share/locale |
| 90 |
rm -rf "${ED}"/var/run |
| 91 |
|
| 92 |
newinitd "${FILESDIR}"/proftpd.initd proftpd |
Archives