gentoo resync : 04.05.2021

12 files changed, 17 insertions, 86 deletions

diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index 36dd86deb579..59da56db5ba2 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index 4a3f280edc2f..179d8a919edd 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,4 +1,3 @@
-AUX freeradius-3.0.18-libressl.patch 2503 BLAKE2B 45b5ca45af2bb145f5876892d02686f0896fb0cdafdf0deb00789e5c927c74b4a6793b9084208a3ae282947241d949ef1a84c621bbd7c9c90907624062d1a1cd SHA512 4dd638736c23af2428481ff6f1dd247f29ee11205bc88b9f59347a9d0baa504f67bc4139c854e52a8ca95a39ab70e72c54bcc58a18f752b07f62bf029626204a
 AUX freeradius-3.0.20-py3-fixes.patch 15422 BLAKE2B 29f10c53b02603c2c854c0100056c01e02c1282a78731e67453101dc6be49d64f57e1f39b8a32459034939a1d47c74bca48270f119095deaa067942b2c2d3b5c SHA512 5a565aa55fab059995870c78f176fa525fca4bd8732c2a2ecc4f625a6635979a51b3fc53999fb7741bc2da37a6260afa43350f61490f0b3548ced5bc81dfdaea
 AUX freeradius-3.0.20-systemd-service.patch 2162 BLAKE2B 3aa32e5a15efa223aab7880b0cb651edca6695a3727b4df7692f656d1f34366a2a16c364c2a5b544a0ad04bca795be269d4d7dc37bc4c3c6d28387bc3e411ad8 SHA512 8a9f5ecaf559132932ed2e46151ff41e5570df3e844f33ee49004ace0aa7b458a6000ec0d1ed01c34b6236c3dde2ca72cb1031b4badcfa4d6826dbf16ca28259
 AUX radius.conf-r4 465 BLAKE2B 1c17f57c088be0612b3db23e8a909d7e1f6fc114d3ff31ee1c82f199e3962db57f3042498cf135b3a29c8a730695ed99612e490e0b3253f0644462d28f61215d SHA512 4142869fb61b2938232002c9cb5b843590785560da7db4f2b2a9c9d55c76d0e2d4a6cb946a5347dfa505cd82f5e86c7315cf71f3443a86632090cf4bd025748a
@@ -7,6 +6,6 @@ AUX radius.init-r3 734 BLAKE2B ba6918cf5da5ad29ca8062045c3318c2bb30e0a803bc6e6bb
 AUX radius.init-r4 753 BLAKE2B 18c83f704ac30d14d56ce8a2f5e3176dcd1aab83cc4525b728e3080e81470a9b4124af49459c69070d9c3ed67a95c7593b6d01f0259403fa9ceee43abd541f7c SHA512 8b05604a72a6a0dea3e654f36b13e1ed517d0c277d128475bcca768204d720b3cd9730e5776371818b8deb0f9fd099458bf5a3276ea9b61e3dbacafaaa527892
 DIST freeradius-server-3.0.20.tar.gz 5002727 BLAKE2B f481ad22105694a4af3f0f0c1b4f6e395e8da0fe65274e32ebeed07e3c9b1869029e6ffbc655cfa41d5de2a1dcba54acee33a7a10d28bfbfce791b7ccd0fc57a SHA512 513ed0a5d9e6b9a8d89a9b02c86ff528a9ff14d928f4c1040ca44702465abd711588fe6afa35554cb2c8e8bd7f19dd5be3dbc78445c62c7b00bf5cbc4c621312
 DIST freeradius-server-3.0.21.tar.gz 5028506 BLAKE2B 3ccf9704a1f8b1ec5f6f066a475083fe7cefa793e8f53ecd287866fc505a832bf8031a4d07c2e07f79da6c6fb82e6a3435b0154d1f135167ebddfc9b8d401544 SHA512 85af1c305e99a56400b04be5c966900e7df8beb7b54626d6aa0cb300dc124817e43b424f9b27d86966bb76cca87dce741812ed8d681a568c7d7b63b3b53a9dfa
-EBUILD freeradius-3.0.20-r1.ebuild 7626 BLAKE2B 4e2a9cb5d8039b9f5e541b8fc4d5de56b154c95506fdb29fb7c01ef8439426ebfc19f517e098026c9571bf7ebe055f7c667150cfe4f9d489708c0591218e45e5 SHA512 f0ab313d62eec7facacdef399a73c3ace318a4207dbd8fe75323ab51664b31f0e77e0fc7adce637d24252165edb0ea886d3bebb8f288f7850c92caa572356938
-EBUILD freeradius-3.0.21-r1.ebuild 7478 BLAKE2B fc6116ecb6644e0e47ab86fa372db61d331e6d5ef27ba5f01d8f64e3bb220ff7bd755ac3b15ae7a4b75767ba384f170ffc623354489acabfe07a6fc4a14b61f5 SHA512 2ada19e2d51b44f6d784a78d1a6414695b6b63d4a99139c90e0b7e2a584000932f0c8b3094d42f7e597c8f78239d1b8d1ea511cbb089597e9e3ee1a94d72efe8
+EBUILD freeradius-3.0.20-r1.ebuild 7522 BLAKE2B 8a4af6f6a3eac63ce3e3ee9e92298a09c19a7ff5aa3ab32e48c8581c3c9ac74ae2856d80b771cf0998161e1a7a4e79924c52186fdd481f156f583bcf12d9a218 SHA512 8d632a2ec8793b4a6712ac71b5e84594bb0175a53546170de6eb6d013cb46530bb2561b57a7a130da182c2e3c03de3776eb4fc733248fe1c7ae12b05d17b2dd7
+EBUILD freeradius-3.0.21-r1.ebuild 7417 BLAKE2B 2017eb36e370a7117699b163a5d3dd2a3e951d7d852707545499984054c16ff8e80104645622a90ac4ee0221abeee703c956d6f8047fea16c8e1031ba2645bb6 SHA512 c57617e02d3b5cf3c3b749af414bf3d24ec998ac861fb2fec771fd52096746c4052cf13f3929af07a79570f06bd5a23a9d62edf8aed3db652c0083df98adbaff
 MISC metadata.xml 894 BLAKE2B 462f2bc696550e919723d5a6435c11a8b217b183aef0f623737bbf446f43153da33840478bc10c45277d253d82e4186a4a85661565edcc37d03b924f60220fc9 SHA512 0cadbf858cab18860ad4934c0d1163bc149f3616395420568357c1cd959b635d5c5835216fde2cd799718010e16e13fc3acc746108a49b9c5d19cc5b64581347
diff --git a/net-dialup/freeradius/files/freeradius-3.0.18-libressl.patch b/net-dialup/freeradius/files/freeradius-3.0.18-libressl.patch
deleted file mode 100644
index 129e251d87b3..000000000000
--- a/net-dialup/freeradius/files/freeradius-3.0.18-libressl.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 39e4ac0cf8d415b41dc2ff1fc329de0522b135ca Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Wed, 24 Apr 2019 09:16:12 +0300
-Subject: [PATCH] Fix build to LibreSSL
-
-Upstream-Status: Inappropriate
-[https://github.com/FreeRADIUS/freeradius-server/commit/9652affe38f41ba2484e013cf9d2c0bcb8c80d67]
-Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
----
- src/main/tls.c                                    | 9 ++++++---
- src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c | 3 ++-
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/src/main/tls.c b/src/main/tls.c
-index 9726953234..840724bf61 100644
---- a/src/main/tls.c
-+++ b/src/main/tls.c
-@@ -1579,7 +1579,8 @@ done:
- 	return 0;
- }
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+  (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2090100fL)
- static SSL_SESSION *cbtls_get_session(SSL *ssl, unsigned char *data, int len, int *copy)
- #else
- static SSL_SESSION *cbtls_get_session(SSL *ssl, const unsigned char *data, int len, int *copy)
-@@ -3379,14 +3380,16 @@ post_ca:
- 		 */
- 		SSL_CTX_sess_set_cache_size(ctx, conf->session_cache_size);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L
-+/* Not implemented in LibreSSL 2.9.1 */
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
- 		SSL_CTX_set_num_tickets(ctx, 1);
- #endif
- 
- 	} else {
- 		SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF);
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L
-+/* Not implemented in LibreSSL 2.9.1 */
-+#if OPENSSL_VERSION_NUMBER >= 0x10101000L && !defined(LIBRESSL_VERSION_NUMBER)
- 		/*
- 		 *	This controls the number of stateful or stateless tickets
- 		 *	generated with TLS 1.3.  In OpenSSL 1.1.1 it's also
-diff --git a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c
-index fa9c58f3c3..a53341fc20 100644
---- a/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c
-+++ b/src/modules/rlm_eap/types/rlm_eap_fast/eap_fast.c
-@@ -44,7 +44,8 @@ static int openssl_get_keyblock_size(REQUEST *request, SSL *ssl)
- {
- 	const EVP_CIPHER *c;
- 	const EVP_MD *h;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
-+  (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2090100fL)
- 	int md_size;
- 
- 	if (ssl->enc_read_ctx == NULL || ssl->enc_read_ctx->cipher == NULL ||
--- 
-2.21.0
-
diff --git a/net-dialup/freeradius/freeradius-3.0.20-r1.ebuild b/net-dialup/freeradius/freeradius-3.0.20-r1.ebuild
index c51cbce499e3..2912599acd81 100644
--- a/net-dialup/freeradius/freeradius-3.0.20-r1.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.20-r1.ebuild
@@ -20,7 +20,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 IUSE="
-	debug firebird iodbc kerberos ldap libressl memcached mysql mongodb odbc oracle pam
+	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
 	pcap postgres python readline redis rest samba sqlite ssl systemd
 "
 RESTRICT="test firebird? ( bindist )"
@@ -56,8 +56,7 @@ RDEPEND="acct-group/radius
 	samba? ( net-fs/samba )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[-bindist] )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=[-bindist]
 	)
 	systemd? ( sys-apps/systemd )"
 DEPEND="${RDEPEND}"
@@ -67,7 +66,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.0.18-libressl.patch
 	"${FILESDIR}"/${P}-systemd-service.patch
 	# Fix rlm_python3 build
 	# Backport from rlm_python changes to rlm_python3
diff --git a/net-dialup/freeradius/freeradius-3.0.21-r1.ebuild b/net-dialup/freeradius/freeradius-3.0.21-r1.ebuild
index 0dac0d7ae67d..2706b9bc43ef 100644
--- a/net-dialup/freeradius/freeradius-3.0.21-r1.ebuild
+++ b/net-dialup/freeradius/freeradius-3.0.21-r1.ebuild
@@ -20,7 +20,7 @@ LICENSE="GPL-2"
 SLOT="0"
 
 IUSE="
-	debug firebird iodbc kerberos ldap libressl memcached mysql mongodb odbc oracle pam
+	debug firebird iodbc kerberos ldap memcached mysql mongodb odbc oracle pam
 	pcap postgres python readline redis rest samba sqlite ssl systemd
 "
 RESTRICT="test firebird? ( bindist )"
@@ -56,8 +56,7 @@ RDEPEND="acct-group/radius
 	samba? ( net-fs/samba )
 	sqlite? ( dev-db/sqlite:3 )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[-bindist] )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=[-bindist]
 	)
 	systemd? ( sys-apps/systemd )"
 DEPEND="${RDEPEND}"
diff --git a/net-dialup/minicom/Manifest b/net-dialup/minicom/Manifest
index f42a7613d44e..45f1af9f59d2 100644
--- a/net-dialup/minicom/Manifest
+++ b/net-dialup/minicom/Manifest
@@ -8,5 +8,5 @@ AUX minirc.dfl 66 BLAKE2B fa087c52ace0bcc5915e58074b96f8d6b0304690dccdb5d2710a2d
 DIST minicom-2.7.1.tar.gz 863544 BLAKE2B 473dbf9695e16fdf23581b831d1b76f32a5b9f47cf82c6430386646a4ad04a58d61bea08ba032d0c4f779fd19d90d12270df317b719bad6cba63d921c197c87c SHA512 eb9679ac3a3d3585ea06c54407567898e50b981378656e7f8a241071c91054ff0928cc9023d2c79d1936588cdffa9426f4962b556e8daa1783add0c5ac59b5af
 DIST minicom-2.8.tar.gz 948015 BLAKE2B 007a2975a996e2dd2390b1cf20e1a70c4bb1b57d224211d30e8d83a9d02a45c147df34bf409961a20ad3746cb6b5551c1e0702a05bb0a0a3f7f042d251b553be SHA512 5ced0ff79cec11464154561130ddc6a38865170d4e4d80185ada540ba173fe89e35703b6d7fd0cf86caef6e020fcad1d7b1fdb4d4f55e3ddb906aea6a4b81b36
 EBUILD minicom-2.7.1.ebuild 1346 BLAKE2B e90609e4c0ace7d210b644e2c02deaaf60686dd779e6df1ca3a2b724e33f8a707a230aaff594ff0e6dc295d89546bf2e2e27d9174334b852327b5e8b4f747cf3 SHA512 caf7634c4d8e11d209d9a18130f4c40be955aa98c62b9352ad8ef6b0cd2ba433985e970820b4591a8f5ee67348af21c460e6d7e0edb6400fb23ed6629caddbea
-EBUILD minicom-2.8.ebuild 1145 BLAKE2B 2eeddbed0a202a568c155d2eeced18bc5a34ec241e55cca075f47d56ed0e3f41eae252d6528a73c9305735b1a46e78ea581590239d8967174f1875119be0c3e2 SHA512 5157a5c2a8fb8778197cf1a6f92c73c750883ac78314078ecbbd250a9fa18fb611e3ffb613037fd43cfea10aba6698ef6b96eb9bb09df857ccbda568f4f956e5
+EBUILD minicom-2.8.ebuild 1138 BLAKE2B a68ee6e814783bc28a767ac7b229f04f5cd873e97172bafc59fae15a5c7e39debc4d6d6910e2082b22912eb160598480e0940c3510764fbece446bccb274f7ee SHA512 784635a81ce14df079e2c2a798c79b3ff2d2077653880229845b6da8d7fc4f71c91b702e76919ac9b331fa30fd2a82b2bc5275bcf2cdb429784a79480125bf0c
 MISC metadata.xml 528 BLAKE2B 27054d12adea950b06487f94202ee6d3857d72e3e26c2472108d54f77dafa6d96db09da30cc45f7acb76e00c420557b6dcde2c151ec60215cb730b6e19d38b0e SHA512 aaf1eb74fb2f17818d2d0ce41ecb7411689a0724dbe4849c73c6effac38f98070d19ba38a139c7f45f0ffccb8943853a6570fc36061b00230931d192b3bedf72
diff --git a/net-dialup/minicom/minicom-2.8.ebuild b/net-dialup/minicom/minicom-2.8.ebuild
index dad212bacba1..6b1839b3b1e2 100644
--- a/net-dialup/minicom/minicom-2.8.ebuild
+++ b/net-dialup/minicom/minicom-2.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 DEPEND="sys-libs/ncurses:="
diff --git a/net-dialup/ppp/Manifest b/net-dialup/ppp/Manifest
index a9d1ba5fb7d1..9dc4c4b4b2ce 100644
--- a/net-dialup/ppp/Manifest
+++ b/net-dialup/ppp/Manifest
@@ -5,6 +5,6 @@ DIST ppp-2.4.8.tar.gz 697530 BLAKE2B 235114288699db45501bc7d9ce8f36c0b5684ab0dab
 DIST ppp-2.4.9-patches-02.tar.xz 18056 BLAKE2B d2632811b7146214ad4cf59bee2834abda59b04c44990d5c135d85fad883371b4813e145e11a6bdff449670acda2e2ef3647c54387800f23111e975b54c5e08c SHA512 5978aa12cd669f858acf2ca9d604d9e830c4d2bd21ed1473823d4da02866d693724d0682c0d65fa4569b89d6b6e430505d307556a61f4ff927590d1357d52e93
 DIST ppp-2.4.9.tar.gz 719904 BLAKE2B 7ba3eb8c98fec5599635dbd302399617e1075f3a1df090f1a94ce2bb8a5c7631e6eea82246adc33711aba5fe95e7ba7c982e2cbf1fb0d71e45f877d9b092ffb7 SHA512 c309f8f69f534c05547cd2f66dade0e0f198ea4c2928a7e899e660280786b3e965437a67b8c5bb81c59d0fa1818b4eb7b701d2dce015a420d380422d2bca4e1a
 DIST ppp-dhcpc.tgz 33497 BLAKE2B ca59130012f007cf45af6bcfa468c112b0d521c8b11f42d42c566dd9de55bd6d6f1b1ceb83cbae18cfe79cb5cb36ba6c6858a4718915acc6987295008aca53da SHA512 aeaf791b14f5a09c0e2079072a157e65132cbff46e608bc0724e6a5827a01da934f5006e2774eb7105f83e607a52cb4987238f4385cf6f5cc86cbe305a556738
-EBUILD ppp-2.4.8-r1.ebuild 7074 BLAKE2B 9558373d9c3085d467129a7db9e5cd71e4152db277bee60f2fed3e38fb5984161f3376d0984784780cd5f2b655cb3010f49e48bcb51f50ba1a75f4b5a79c84ce SHA512 417915cce1745ced30a0a1c0e443b42069b1fee3949ddd55e88bab5540d74ce4db08d8aac02c43d32db23b6d38886410c478262a1f16c3731037710305024b5d
-EBUILD ppp-2.4.9-r2.ebuild 7405 BLAKE2B 4e379cd4066dc2a1997e9f3374bb44b204877d7d8eefe95314b9b0ed7fc5e2f3aab93c6431e99e2348e680b916fe585cc8c0b75833557ce540ed2e54a42087f2 SHA512 62158924481e240d27133d488911bac39f57323fa92e5d01d3b0c62f30390a1093266103e18f9a6018f9c3c4224735c004fae506dd8e08eb56c7e6f8acdb374c
+EBUILD ppp-2.4.8-r1.ebuild 7015 BLAKE2B 7a7126901db6011fd17456491e9b06265efdd7fd24a2840def858231676effc5a190495170d2d189cad12629439253ef758a65a76a79bc33c25031339633fd03 SHA512 9aa9ae8f861b7928b21757a1c82129da3a0177d70ce36f5c73f1dd713ba746a9aecb719151b07701034aee98646a3ecb58e23206d4e86a4b43278dfe573e4687
+EBUILD ppp-2.4.9-r2.ebuild 7346 BLAKE2B 502b35a70f9becc6734844853791b45f8bace36b5a51314c93667465ce55a3444b2db1355e9a4b0c8202323b651255d62c9eff78c1d59f32b115fa4d5e0b453b SHA512 73bb88f7d27acdcea9e3cebe521f83c2159e41d0e312bc760b68c7951a153a861a8cb2890e122c3103f899b7652ccf514d645bf2a434f2e133a99d5851cccdb6
 MISC metadata.xml 1248 BLAKE2B 2c0facefb3f71aa967481dbd0b0f212d17bf2827b94ed40a9a253c053c9e9d3700aa1bdf8610abead16f290f93551139f4a9022b38e3c6dcbcc5ed61fba7f34b SHA512 e309d63a5611ee607b820803e82e9b4da4ebb33cd010660ce701d261726c4f635b0c4ad98bd80c20d01eb1d9004dfa076fbd59521a2bbe66d7dae78eeae65f6e
diff --git a/net-dialup/ppp/ppp-2.4.8-r1.ebuild b/net-dialup/ppp/ppp-2.4.8-r1.ebuild
index 387ac5a6dbd3..94962cff0306 100644
--- a/net-dialup/ppp/ppp-2.4.8-r1.ebuild
+++ b/net-dialup/ppp/ppp-2.4.8-r1.ebuild
@@ -15,15 +15,14 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="activefilter atm dhcp eap-tls gtk ipv6 libressl pam radius"
+IUSE="activefilter atm dhcp eap-tls gtk ipv6 pam radius"
 
 DEPEND="
 	activefilter? ( net-libs/libpcap )
 	atm? ( net-dialup/linux-atm )
 	pam? ( sys-libs/pam )
 	gtk? ( x11-libs/gtk+:2 )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
+	dev-libs/openssl:0=
 "
 RDEPEND="${DEPEND}
 	!<net-misc/netifrc-0.7.1"
diff --git a/net-dialup/ppp/ppp-2.4.9-r2.ebuild b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
index a1bdb87aefff..e09649890def 100644
--- a/net-dialup/ppp/ppp-2.4.9-r2.ebuild
+++ b/net-dialup/ppp/ppp-2.4.9-r2.ebuild
@@ -15,15 +15,14 @@ SRC_URI="https://github.com/paulusmack/ppp/archive/${P}.tar.gz
 LICENSE="BSD GPL-2"
 SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="activefilter atm dhcp +eap-tls gtk ipv6 libressl pam radius"
+IUSE="activefilter atm dhcp +eap-tls gtk ipv6 pam radius"
 
 DEPEND="
 	activefilter? ( net-libs/libpcap )
 	atm? ( net-dialup/linux-atm )
 	pam? ( sys-libs/pam )
 	gtk? ( x11-libs/gtk+:2 )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
+	dev-libs/openssl:0=
 "
 RDEPEND="${DEPEND}
 	!<net-misc/netifrc-0.7.1-r2"
diff --git a/net-dialup/rp-pppoe/Manifest b/net-dialup/rp-pppoe/Manifest
index 5b6d520ddc20..90f7dfca1e88 100644
--- a/net-dialup/rp-pppoe/Manifest
+++ b/net-dialup/rp-pppoe/Manifest
@@ -20,5 +20,5 @@ DIST rp-pppoe-3.14-patches-01.tar.xz 4708 BLAKE2B d0c294490f5c4c8f3f81fccb8234d5
 DIST rp-pppoe-3.14.tar.gz 224688 BLAKE2B bfac215d206ce53ead2a10d5440f8243cce4763f7ef15d52f7bd609e8eebdebf5bc52204350988cb1d1b69d1df9092aca77173333e753e8bb9752ead8618569c SHA512 0fa26e9478d387d4752ab85837dab9d1464f27c1ca832bad265deb01b5c3565aa341e3c75278b43a56aed466f02861af11b3bc64bae932a13cb103c4f0b91a29
 EBUILD rp-pppoe-3.12-r1.ebuild 2628 BLAKE2B 0912e916aaa4eaa3fcd1c61a10150cd4b6afb52e21cfb8ebe42f9ed2cebdc9a5f1378a57b6e67b118b660e4553629b5bb5cfaf862dcf3781e1d93a365840dd6b SHA512 9c1eeb5bc9b7e30e89d6467fb7519e308e3d70dc1c09b1bbdb5fd5edee5e1a39fedd557677efcae7e39e7cd55b2847ff4468064d628496e750123d7aa5d189ce
 EBUILD rp-pppoe-3.13.ebuild 2901 BLAKE2B 1dfcb9aed579522e18c5c776e6679e902958e387772122517f9a80d852956b6c06efd5fa821555110901de69e4d72073e9ddcaaee7d6502a2fe74ece0cf52b8e SHA512 0679726862627bccb3027c6182de44948946d876c0ce1be9ce765f53ee23f52920b9e5dffe4bbeb1584047ad30a8f3c6691966a1d31707b392faa1a8e65fcd85
-EBUILD rp-pppoe-3.14.ebuild 2319 BLAKE2B 86abf4dc3464a88e97bdb13ac8090a62180b4207c4448af5df213b90a55bb1f381645ea722786b5fd9657219177e37b601fe8ee0df7746d8b23b8fb132402fcc SHA512 a7f6f0d5ad247db53aa92aeb0a5ef0d7237f200ccb140516243bd79f750e3b4cd46196f0f46c1863ee45af3a98671df8aea3a302d81361f54b1c9c06145d6b70
+EBUILD rp-pppoe-3.14.ebuild 2318 BLAKE2B d205ef0cf011a4e804228b2fd3254dd9bfc4409df172a1bafefe4d1e0f3a636142b50aa224e7d19f12eda02fd310a5351f568ae3de773fc5a45887e9517d3688 SHA512 83fe0f8b0a4be95189068ec8c462d08edae236cb0b32e86b74ad584b2c49dd2a4544fced2d7501cf364f16bc6e88ed71412bbc595fd4a49236271d90b5902452
 MISC metadata.xml 370 BLAKE2B 00e0195d903d9fe379c0c8662f4019dd55a53f7027ade12f314f8007f9edbb6b4a5e5bccef2897d97ee3d2164a169efcad607548dbf53d363b72a360b57444b3 SHA512 ebfae7addd585ee6f01b45921b1ba6a1c824c6e34f8f6a3c6d2fd917d7b17aceffca5f6a4ca1c7b135a34c679394417b73a23e067daed8a2c4b71fa63536c849
diff --git a/net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild b/net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild
index eaaeb1d3a7c8..0cb88fcc6767 100644
--- a/net-dialup/rp-pppoe/rp-pppoe-3.14.ebuild
+++ b/net-dialup/rp-pppoe/rp-pppoe-3.14.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
@@ -16,7 +16,7 @@ SRC_URI="https://dianne.skoll.ca/projects/rp-pppoe/download/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="tk"
 
 RDEPEND="