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

[Sergei Trofimovich]

commit:     de39265e2a626114ffd9afeade22fc42bd2718f7
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat May  1 20:22:49 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat May  1 20:44:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de39265e

net-ftp/proftpd: drop deleted dev-libs/libressl

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild | 7 ++-----
 net-ftp/proftpd/proftpd-1.3.7a.ebuild    | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild 
b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
index 7bef13f65e4..6af77bfacde 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso 
dynmasq exec ifsession ifversion ident ipv6
-       kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam 
+pcre postgres qos radius
+       kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre 
postgres qos radius
        ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota 
sqlite ssl tcpd test unique-id vroot"
 # TODO: geoip
 REQUIRED_USE="ban? ( ctrls )
@@ -50,10 +50,7 @@ CDEPEND="acl? ( virtual/acl )
        mysql? ( dev-db/mysql-connector-c:0= )
        nls? ( virtual/libiconv )
        ncurses? ( sys-libs/ncurses:0= )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0= )
-               libressl? ( dev-libs/libressl:= )
-       )
+       ssl? ( dev-libs/openssl:0= )
        pam? ( sys-libs/pam )
        pcre? ( dev-libs/libpcre )
        postgres? ( dev-db/postgresql:= )

diff --git a/net-ftp/proftpd/proftpd-1.3.7a.ebuild 
b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
index d7a64183012..c9477255fb6 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso 
dynmasq exec ifsession ifversion ident ipv6
-       kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam 
+pcre postgres qos radius
+       kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre 
postgres qos radius
        ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota 
sqlite ssl tcpd test unique-id vroot"
 # TODO: geoip
 REQUIRED_USE="ban? ( ctrls )
@@ -50,10 +50,7 @@ CDEPEND="acl? ( virtual/acl )
        mysql? ( dev-db/mysql-connector-c:0= )
        nls? ( virtual/libiconv )
        ncurses? ( sys-libs/ncurses:0= )
-       ssl? (
-               !libressl? ( dev-libs/openssl:0= )
-               libressl? ( dev-libs/libressl:= )
-       )
+       ssl? ( dev-libs/openssl:0= )
        pam? ( sys-libs/pam )
        pcre? ( dev-libs/libpcre )
        postgres? ( dev-db/postgresql:= )