[gentoo-commits] repo/gentoo:master commit in: net-libs/wvstreams/

[Mikle Kolyada]

commit:     bf9bf0dd7bcc0d60d43ae7b2a32660ebb2d43cff
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun May  2 10:56:02 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun May  2 10:56:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf9bf0dd

net-libs/wvstreams: remove libressl support

Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild | 8 +++-----
 net-libs/wvstreams/wvstreams-99999.ebuild        | 7 +++----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild b/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
index 0769d3c5d00..75080fb06cb 100644
--- a/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.6.1_p14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ppc sparc x86"
-IUSE="boost +dbus debug doc libressl pam"
+IUSE="boost +dbus debug doc pam"
 
 #Tests fail if openssl is not compiled with -DPURIFY. Gentoo's isn't. FAIL!
 RESTRICT="test"
@@ -27,8 +27,7 @@ RDEPEND="
 	sys-libs/readline:0=
 	sys-libs/zlib
 	dbus? ( >=sys-apps/dbus-1.4.20 )
-	!libressl? ( >=dev-libs/openssl-1.1:0= )
-	libressl? ( dev-libs/libressl:0= )
+	>=dev-libs/openssl-1.1:0=
 	pam? ( sys-libs/pam )
 "
 DEPEND="
@@ -52,7 +51,6 @@ src_prepare() {
 	default
 
 	eapply $(awk '{ print "'"${WORKDIR}"'/debian/patches/" $0; }' < "${WORKDIR}"/debian/patches/series)
-	eapply "${FILESDIR}"/${P}-libressl.patch # bug 687096
 
 	eautoreconf
 }

diff --git a/net-libs/wvstreams/wvstreams-99999.ebuild b/net-libs/wvstreams/wvstreams-99999.ebuild
index 5933265d2de..f7736a033dd 100644
--- a/net-libs/wvstreams/wvstreams-99999.ebuild
+++ b/net-libs/wvstreams/wvstreams-99999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,14 +12,13 @@ EGIT_REPO_URI="https://github.com/apenwarr/wvstreams"
 LICENSE="GPL-2"
 SLOT="0/5.0"
 KEYWORDS=""
-IUSE="+dbus debug doc libressl pam static-libs +zlib"
+IUSE="+dbus debug doc pam static-libs +zlib"
 
 RDEPEND="
 	sys-libs/readline:0=
 	sys-libs/zlib
 	dbus? ( >=sys-apps/dbus-1.4.20 )
-	!libressl? ( <dev-libs/openssl-1.1:0= )
-	libressl? ( dev-libs/libressl:0= )
+	<dev-libs/openssl-1.1:0=
 	pam? ( sys-libs/pam )
 "
 DEPEND="