commit: 1357442a0e83b714c19ba720915ebd78ed1d27a4 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Tue Nov 10 22:20:47 2015 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Tue Nov 10 22:21:35 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1357442a
net-ftp/proftpd: add libressl support, bug #565372 by Marek Behun Reported-by: Marek Behun Bug: https://bugs.gentoo.org/565372 Package-Manager: portage-2.2.24 ...roftpd-1.3.5a.ebuild => proftpd-1.3.5a-r1.ebuild} | 20 +++++++++++--------- net-ftp/proftpd/proftpd-1.3.5a.ebuild | 2 +- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/net-ftp/proftpd/proftpd-1.3.5a.ebuild b/net-ftp/proftpd/proftpd-1.3.5a-r1.ebuild similarity index 94% copy from net-ftp/proftpd/proftpd-1.3.5a.ebuild copy to net-ftp/proftpd/proftpd-1.3.5a-r1.ebuild index 21963cf..313faba 100644 --- a/net-ftp/proftpd/proftpd-1.3.5a.ebuild +++ b/net-ftp/proftpd/proftpd-1.3.5a-r1.ebuild @@ -27,17 +27,16 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" +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 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 openssl pam +pcre postgres qos radius + 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 ratio readme rewrite selinux sftp shaper sitemisc snmp softquota sqlite ssl tcpd test trace unique_id vroot xinetd" # TODO: geoip REQUIRED_USE="ban? ( ctrls ) msg? ( ctrls ) - sftp? ( openssl ) - shaper? ( ctrls ) - ssl? ( openssl )" + sftp? ( ssl ) + shaper? ( ctrls )" CDEPEND="acl? ( virtual/acl ) caps? ( sys-libs/libcap ) @@ -47,8 +46,11 @@ CDEPEND="acl? ( virtual/acl ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( virtual/mysql ) nls? ( virtual/libiconv ) - ncurses? ( sys-libs/ncurses ) - openssl? ( dev-libs/openssl:0= ) + ncurses? ( sys-libs/ncurses:0= ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) pam? ( virtual/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql:= ) @@ -196,7 +198,7 @@ src_configure() { $(use_enable memcache) \ $(use_enable ncurses) \ $(use_enable nls) \ - $(use_enable openssl) \ + $(use_enable ssl openssl) \ $(use_enable pam auth-pam) \ $(use_enable pcre) \ $(use_enable test tests) \ diff --git a/net-ftp/proftpd/proftpd-1.3.5a.ebuild b/net-ftp/proftpd/proftpd-1.3.5a.ebuild index 21963cf..0585b99 100644 --- a/net-ftp/proftpd/proftpd-1.3.5a.ebuild +++ b/net-ftp/proftpd/proftpd-1.3.5a.ebuild @@ -47,7 +47,7 @@ CDEPEND="acl? ( virtual/acl ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( virtual/mysql ) nls? ( virtual/libiconv ) - ncurses? ( sys-libs/ncurses ) + ncurses? ( sys-libs/ncurses:0= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) pcre? ( dev-libs/libpcre )
