5 files changed, 3 insertions, 130 deletions
diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest
index b650f65d4fac..f8d35e476ee8 100644
--- a/net-libs/libesmtp/Manifest
+++ b/net-libs/libesmtp/Manifest
@@ -1,8 +1,5 @@
-AUX libesmtp-1.0.6-openssl-1.1-api-compatibility.patch 2243 BLAKE2B 03cf78375e04d781c1deb15ec76ba35b2800dd2b739c9ad330cfc9a25c05f59b684a5cbe8e436288a98e84b2ebab2c08abfdfd81e000f9a3c4053411254ab89c SHA512 9c5e9ea6d6b09dd48225edc17a9003ea863d91e06ec3856ce22d89b1b908f1c8bfccb7a1090dc5b1ff26a62c35a48806805115000eba3a478cab632181c905a1
 AUX libesmtp-1.1.0-fix-soname.patch 672 BLAKE2B 2bb9a535b94e444af19597f0ca0c06b07aca2c42e0b21510c27aec76c47fa70fa12e5b26656dc6a685b3ca95b40ba630dc93cd205f348224f4c7508ae6f4376d SHA512 881fe2a531f0f50baa449c3b9faa8c99ea4ce6d1bf3a82d5f5f7e8ca530233a5668f8a498390cd91769972420750dd73988db76c53acd4734ec45bb528b9b2af
-DIST libesmtp-1.0.6.tar.bz2 365506 BLAKE2B 9ce8c9f210e6c41c95bba55a7aec79c176c4582f5dafc1aba4fbf9adb411b75ab89d400ac7a12b7d5d24ede414cb8e2ca306299a2e156515e611d074142cf5e8 SHA512 c122fc5995b76771cce2db58c9e59597cc3a76d273feb6fc26b869f118e91bdf98a5721ee2d1de8175c376af018b5806b0379bbeba2f5da95108916028fd8dda
 DIST libesmtp-1.1.0.tar.gz 169134 BLAKE2B 94ef87c65101557f6d60a6bcd7a8b0de638c24d46536ddf602da05c09858780b0a50f9fd8dae1e54a5e9a7826d45fa6da10bad751a9be50475a8f441c94ad455 SHA512 fc2a9d9922a1807cce8c8cee627ea8fd3a79c33f0987c5a487080b1a1659fd504bc45da2f919d30eced33ab3e950105383a46ecf3365493134adc1183eb99e53
-EBUILD libesmtp-1.0.6-r3.ebuild 957 BLAKE2B 5279f6b740d8edcb07f731eb26041e3b5a229dc5960e38070e1b348d32bb205d667377c347b9714631cb82b385a09716b97dd097f06b25f59e203fa05dc3aef5 SHA512 a7e378fe2263209bb204fae15074eaa0af492e0ddb0a9d8e862120d02622b384cea9730c984b7579ad6870d0491392c4c7456a6328d311ca03b19c9aa4f33fcf
-EBUILD libesmtp-1.1.0-r1.ebuild 1277 BLAKE2B 7a04f8d272a517db0897fc03b0015c7a54c43433bca1f2b8524325bfa9517bdcec79535f5e2357de5c6bdcb776213fa266ec89bfbba9b2be3dd44cc6933f3d0e SHA512 154d92d47c34e5adce2f5ab2d28e6e2ad6cf32fd6e82d38ac3c2e9efd0c72d0dfed58bd97809d8523af9436b3f90f67192b0270bfebba4e8cf946ebb102d843b
+EBUILD libesmtp-1.1.0-r1.ebuild 1284 BLAKE2B a827b146d0f2207079c3b01bec67128355743ddfc32a7d49561d5e23a0248e158f087bc0bc52b635f7af542d0a7288f31e1db8fcfc5bd405abaa7026cc940826 SHA512 773e6587877a42412fbd4d6e55e866bec0c43c870f43a747254f35a4164f1475c6a5ea4d8b33cb0334ade03736093af8a5ee2839f4bf81135adcd73d05f06636
 EBUILD libesmtp-9999.ebuild 961 BLAKE2B bf1d5b91f7d31f016aa779b13821dc47af17a926c3457e6ea20455dfc6159654f455c648ca11375d0b38469fe5279bfdabdf04aa4ec398eecb386aa1f12ca7f2 SHA512 01375e20aa83e2f0732891d609c9b55df0b116d7a9b36a2e4a1022326aa75133890276faf13fba046369fa981d892f1891f2c02b5262f652f25d3b7985c57b2d
-MISC metadata.xml 330 BLAKE2B 960a34feef0d9e57b37adc3e5776686215c7476dc5331f39b247786ecec58407e74aae1898d60d54209e00573e5486e3b042ebabfb686d4840172371ed1d5509 SHA512 97671749440b8ca99218706c398b65e45fdd0c6a4529877aafad2deb0598c7a7fdd7b6aa84079b194c345b4eee550551aa5d2af60216f95fa0701f6b4ac3c1d6
+MISC metadata.xml 249 BLAKE2B 20d113200f0d39a86e8439d9b043475fcf35fa39ff5dfa8b5fa24efc726d8f8604a80f06f1354262b698636792dc25d035bb0d973385afe844d44c94b0f04db2 SHA512 e4041b2e3a04814f1800aff425b101149aa93b2fa87a3a95fb71c5a1db314426361775773392b7dcb22345a8059e655e9f9522b2627e3de178aa00ed2fc14841
diff --git a/net-libs/libesmtp/files/libesmtp-1.0.6-openssl-1.1-api-compatibility.patch b/net-libs/libesmtp/files/libesmtp-1.0.6-openssl-1.1-api-compatibility.patch
deleted file mode 100644
index bc3e3f356848..000000000000
--- a/net-libs/libesmtp/files/libesmtp-1.0.6-openssl-1.1-api-compatibility.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 556f220..2c0693d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -303,7 +303,7 @@ if test x$with_openssl != xno ; then
- 	)
- fi
- if test x$with_openssl != xno ; then
--	AC_CHECK_LIB(ssl, SSL_library_init, [
-+	AC_CHECK_LIB(ssl, SSL_new, [
- 				with_openssl=yes
- 				LIBS="-lssl -lcrypto $LIBS"
- 		     ], [
-diff --git a/smtp-tls.c b/smtp-tls.c
-index 9a66806..cfc6589 100644
---- a/smtp-tls.c
-+++ b/smtp-tls.c
-@@ -57,6 +57,7 @@ static void *ctx_password_cb_arg;
- #ifdef USE_PTHREADS
- #include <pthread.h>
- static pthread_mutex_t starttls_mutex = PTHREAD_MUTEX_INITIALIZER;
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
- static pthread_mutex_t *openssl_mutex;
- 
- static void
-@@ -70,6 +71,7 @@ openssl_mutexcb (int mode, int n,
-     pthread_mutex_unlock (&openssl_mutex[n]);
- }
- #endif
-+#endif
- 
- static int
- starttls_init (void)
-@@ -77,6 +79,10 @@ starttls_init (void)
-   if (tls_init)
-     return 1;
- 
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-+  /* starting from OpenSSL 1.1.0, OpenSSL uses a new threading API and does its own locking */
-+  /* also initialization has been reworked and is done automatically */
-+  /* so there's not much to do here any more */
- #ifdef USE_PTHREADS
-   /* Set up mutexes for the OpenSSL library */
-   if (openssl_mutex == NULL)
-@@ -94,9 +100,10 @@ starttls_init (void)
-       CRYPTO_set_locking_callback (openssl_mutexcb);
-     }
- #endif
--  tls_init = 1;
-   SSL_load_error_strings ();
-   SSL_library_init ();
-+#endif
-+  tls_init = 1;
-   return 1;
- }
- 
-@@ -201,7 +208,15 @@ starttls_create_ctx (smtp_session_t session)
-      3207.  Servers typically support SSL as well as TLS because some
-      versions of Netscape do not support TLS.  I am assuming that all
-      currently deployed servers correctly support TLS.  */
-+#if OPENSSL_VERSION_NUMBER < 0x10100000
-   ctx = SSL_CTX_new (TLSv1_client_method ());
-+#else
-+  ctx = SSL_CTX_new (TLS_client_method ());
-+  if (!SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION)) {
-+        /* FIXME: set an error code AND free the allocated ctx */
-+        return NULL;
-+  }
-+#endif
- 
-   /* Load our keys and certificates.  To avoid messing with configuration
-      variables etc, use fixed paths for the certificate store.  These are
diff --git a/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild b/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
deleted file mode 100644
index 8e13d2d8b76f..000000000000
--- a/net-libs/libesmtp/libesmtp-1.0.6-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="lib that implements the client side of the SMTP protocol"
-HOMEPAGE="http://brianstafford.info/libesmtp/"
-SRC_URI="http://brianstafford.info/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1 GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug ntlm ssl static-libs threads"
-
-RDEPEND="
-	ssl? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS ChangeLog NEWS Notes README TODO )
-
-PATCHES=(
-	"${FILESDIR}/${P}-openssl-1.1-api-compatibility.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-all \
-		$(use_enable static-libs static) \
-		$(use_enable ntlm) \
-		$(use_enable threads pthreads) \
-		$(use_enable debug) \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	default
-
-	docinto xml
-	dodoc doc/api.xml
-}
diff --git a/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild b/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild
index 3e5af3196398..1cbf381e2640 100644
--- a/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild
@@ -14,7 +14,7 @@ else
 	SRC_URI="https://github.com/libesmtp/libESMTP/archive/v${PV/_}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/libESMTP-${PV}"
 
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1 GPL-2"
diff --git a/net-libs/libesmtp/metadata.xml b/net-libs/libesmtp/metadata.xml
index a70818477078..a42c167adff5 100644
--- a/net-libs/libesmtp/metadata.xml
+++ b/net-libs/libesmtp/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<!-- maintainer-needed -->
-	<use>
-		<flag name="ntlm">Enable support for NTLM authentication</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">libesmtp/libESMTP</remote-id>
 	</upstream>