summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikle Kolyada <zlogene@gentoo.org>2021-05-02 14:20:02 +0300
committerMikle Kolyada <zlogene@gentoo.org>2021-05-02 14:22:17 +0300
commit23865857941f753d1d0d3680632ff43ae29c0046 (patch)
tree0c3dc49b6499fb57130fb69dc57bf72da0e4805d /net-nds/openldap/openldap-2.4.58.ebuild
parentwww-client/microsoft-edge-dev: remove old (diff)
downloadgentoo-23865857941f753d1d0d3680632ff43ae29c0046.tar.gz
gentoo-23865857941f753d1d0d3680632ff43ae29c0046.tar.bz2
gentoo-23865857941f753d1d0d3680632ff43ae29c0046.zip
net-nds/openldap: remove libressl support
Package-Manager: Portage-3.0.18, Repoman-3.0.2 Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
Diffstat (limited to 'net-nds/openldap/openldap-2.4.58.ebuild')
-rw-r--r--net-nds/openldap/openldap-2.4.58.ebuild14
1 files changed, 4 insertions, 10 deletions
diff --git a/net-nds/openldap/openldap-2.4.58.ebuild b/net-nds/openldap/openldap-2.4.58.ebuild
index f2095a16dd2a..02f6d9096b6b 100644
--- a/net-nds/openldap/openldap-2.4.58.ebuild
+++ b/net-nds/openldap/openldap-2.4.58.ebuild
@@ -27,7 +27,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~
IUSE_DAEMON="crypt samba tcpd experimental minimal"
IUSE_BACKEND="+berkdb"
IUSE_OVERLAY="overlays perl"
-IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 libressl +syslog selinux static-libs test"
+IUSE_OPTIONAL="gnutls iodbc sasl ssl odbc debug ipv6 +syslog selinux static-libs test"
IUSE_CONTRIB="smbkrb5passwd kerberos kinit pbkdf2 sha2"
IUSE_CONTRIB="${IUSE_CONTRIB} -cxx"
IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}"
@@ -50,8 +50,7 @@ for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done
COMMON_DEPEND="
ssl? (
!gnutls? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+ >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
)
gnutls? (
>=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}]
@@ -68,16 +67,14 @@ COMMON_DEPEND="
iodbc? ( dev-db/libiodbc ) )
perl? ( dev-lang/perl:=[-build(-)] )
samba? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
)
berkdb? (
<sys-libs/db-6.0:=
|| ( ${BDB_PKGS} )
)
smbkrb5passwd? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
+ dev-libs/openssl:0=
kerberos? ( app-crypt/heimdal )
)
kerberos? (
@@ -177,9 +174,6 @@ PATCHES=(
# unbundle lmdb
"${FILESDIR}"/${PN}-2.4.42-mdb-unbundle.patch
- # bug #622464
- "${FILESDIR}"/${PN}-2.4.47-libressl.patch
-
# fix some compiler warnings
"${FILESDIR}"/${PN}-2.4.47-warnings.patch
)