gentoo resync : 04.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-04 22:28:33 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-04 22:28:33 +0100
commit: a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch)
tree: 8c764c1cc0576389ce22abd317bceba71ea5732d /app-crypt
parent: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff)
67 files changed, 127 insertions, 468 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index fde0c0a74ffa..efaef9d65ac0 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/acme-sh/Manifest b/app-crypt/acme-sh/Manifest
index 2ec2be5b12a0..8c3a7198d78a 100644
--- a/app-crypt/acme-sh/Manifest
+++ b/app-crypt/acme-sh/Manifest
@@ -1,6 +1,6 @@
 AUX 99acme-sh 62 BLAKE2B b9542b99b2e720e0930139f7dd56efc63e596156dca1649624f6f4c27a7d57555bb13deb3b5714aa06477e9ca79996b5f891c8a91ea808d853cc7e5d5655b0a0 SHA512 b7fc9402e3bea3ca846bdb82d6f21d1b7023bb2ace8d5ffd146959cd12e3270243fd22e3a7dde9b6cefae8f2cbca369b35d2da4ea9f1e60a2f61ae81612d8bc5
 AUX acme.sh 63 BLAKE2B 50c3284c0172ff0a0dc57fcfbaba57a6518d7c043b5d052f2710b28229b9b13313e7ca7c8b644ea273eb2f4991246631e70e6184fb5489005be12b77b8efa229 SHA512 7ec0764c86db5c68c42189a8af708e769189df201fdf017bd0d8d9e322ab71c2f422be382d170a1f4b876a1e5a6629eb55df0c564abfebab665e27e58660ff6e
-DIST acme.sh-2.8.8.tar.gz 218582 BLAKE2B bcd2fbc0ff984d7bbcf4e0ee4c1f08f868ebc4b31a5d217587cdeb5810b8991698de52dd082219194c762ef245324e981eb2a044b213e2713c0d12370be1c19b SHA512 cf601965cd5542dbd11668330d0a4e428e89ccc3af92d4d04ea3936c8a31979a5c00aa8e18a31fde07812242dddcebbfdbc06f1c29260b917dfa19f88d12fd72
-EBUILD acme-sh-2.8.8-r1.ebuild 1176 BLAKE2B b20e0c245dbf3b7f42487b920882aa266fff5d944e358a272389d5d90b4276c7feb52fba39a08d069444d854b758f1ae55e4e4cac09f0243ae86c8e0fae8bf80 SHA512 46f1a2cf03b03245dbd5bf212ab9714c6fdd80de9191bb74eb4e21a560eea53d8d90aa4a7fdd25b2eedbe9b472be88a72f000ad63bbe5e9cd0450a0b552c6ac3
+DIST acme.sh-2.8.9.tar.gz 233430 BLAKE2B fa2c16007bc07dd597443103ebf3afa4986e3885b2b3e0a545cf79408741709171ee67fe019e2abf7891d08cef9d2560a438695dd32c72eb729ea2bea2900221 SHA512 94f771fcbc5b12a2a9992659884d16b543d70db52bccf20eddad931b4a5c233c0fd7362ce525e0cbebfdbd841824b815f5b419572f97b549fea7f2663c92c0a8
+EBUILD acme-sh-2.8.9.ebuild 1176 BLAKE2B b20e0c245dbf3b7f42487b920882aa266fff5d944e358a272389d5d90b4276c7feb52fba39a08d069444d854b758f1ae55e4e4cac09f0243ae86c8e0fae8bf80 SHA512 46f1a2cf03b03245dbd5bf212ab9714c6fdd80de9191bb74eb4e21a560eea53d8d90aa4a7fdd25b2eedbe9b472be88a72f000ad63bbe5e9cd0450a0b552c6ac3
 EBUILD acme-sh-9999.ebuild 1068 BLAKE2B 30c215e09a39861eaf708402590c9a5b26585d60627bf743cfa39d3ca50012df52e53a2b350cc67d9980446af22b61678a845b3dd1d007d63fc4ab8eef4de8b7 SHA512 3184802d442b94dbfd38b23a244879cf9f863d4e2371051b6925e8ab1de4077c697f48b1625ff36447c004a679f45df0419b9560d165519e06c96a6250768aa0
 MISC metadata.xml 676 BLAKE2B ff6e0af7a7e7ff2a4571e5a3bda9a8b300c74e2b5b526a364c920372d7be42ec1986c7dd464c539905d8cba59e73645e0d1079fd0129919d53d1c0c833ec86f9 SHA512 94d61b537880bffcfe15e79a1bd82d96ad7f39e180a19d61a0fc0c1e2489e1f48f378ac8683bc8e790d2edc7fcb761a0e5498885b7ae4deeb9e2165e4534e45a
diff --git a/app-crypt/acme-sh/acme-sh-2.8.8-r1.ebuild b/app-crypt/acme-sh/acme-sh-2.8.9.ebuild
index a6b09a058aa2..a6b09a058aa2 100644
--- a/app-crypt/acme-sh/acme-sh-2.8.8-r1.ebuild
+++ b/app-crypt/acme-sh/acme-sh-2.8.9.ebuild
diff --git a/app-crypt/cardpeek/Manifest b/app-crypt/cardpeek/Manifest
index aa9789191853..ad99ed3b5a7d 100644
--- a/app-crypt/cardpeek/Manifest
+++ b/app-crypt/cardpeek/Manifest
@@ -1,3 +1,3 @@
 DIST cardpeek-0.8.4.tar.gz 1520613 BLAKE2B f31a0298ab8423b384b0ad62abb0599da75fd968385e9e6c9a5982e6fbaf7bec8a6098e3e7a5c30ce6634c65e05db084772f4a33c7ef5d6fdcdee0022cc56b86 SHA512 f6eebc7a17f270dd56529ee36815fee72b2f9d62b24d6cc90060f20c7604b9b99ab76858d9c04c60aaec838b02b8db76476a91ee22a4e10f01f852cd1f536efb
-EBUILD cardpeek-0.8.4.ebuild 607 BLAKE2B b06e12aa486b40ba7f61e8fbfab1d52f0b47568389a36c65ad45e86431ebd463977c52cd325c04b6b1c38ce966ace6a40620de880ed391828e32d1712c5c56fd SHA512 4dd08041350eaabb3efc0d3fb9da025232783fd2c4128467e60157bcebbea1659a4a9a3e57c9d809a6a979f342f8770686775a9b7d4fa4a66b4929320552a09e
+EBUILD cardpeek-0.8.4.ebuild 540 BLAKE2B c5305f93d527a88e6e1187399b572a8e4d34aabfc648c36cd87e45400b5b25d85a9db7ce390b877306991e84940ac5693603664948689a7ad5c8f8e7ff323698 SHA512 6c260d266ea5ecf04f1b8fedae391ed6c80a8fb9de17f375d279e8004d2c28f3f932ca96e3a14255c067ff4b6c5d6c36a52361a05b0867407c0048ecab105c41
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/cardpeek/cardpeek-0.8.4.ebuild b/app-crypt/cardpeek/cardpeek-0.8.4.ebuild
index 502219dfe65b..c479212f4682 100644
--- a/app-crypt/cardpeek/cardpeek-0.8.4.ebuild
+++ b/app-crypt/cardpeek/cardpeek-0.8.4.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,6 @@ SRC_URI="http://downloads.pannetrat.com/install/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="libressl"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
@@ -22,7 +21,6 @@ RDEPEND="${LUA_DEPS}
 	sys-apps/pcsc-lite
 	x11-libs/gtk+:3
 	net-misc/curl
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
diff --git a/app-crypt/chntpw/Manifest b/app-crypt/chntpw/Manifest
index 72e7605afe2e..c0fd8fc5f0b7 100644
--- a/app-crypt/chntpw/Manifest
+++ b/app-crypt/chntpw/Manifest
@@ -1,3 +1,3 @@
 DIST chntpw-source-140201.zip 1404098 BLAKE2B 86c93861983613496fcd82879a5b000537d4a7ee2add466aa26c67feabefdb5363f610234f99615139997a04aedb448468ef8b29cc6c4bf49b2e295f41308644 SHA512 a26d747f6e077d1bb3e9b8077781f8c37dd978e07b7426495862f15c9004572b706c34736fc4d1ed8856b1a43335d726b4d87c688f7f9a11fd6cc3a74d71a7fa
-EBUILD chntpw-140201.ebuild 1042 BLAKE2B 334226c57e2f0bcf26f3907b936cc12a2bb885792c4480d4a55b1e83fea77c9a0bc48ac8eaad9c723ecb300bab1402b80a4e210a812c16d6e7b3280566bd2b37 SHA512 333679b3725aa63551a48a71fe5e29b3e9e1e20a519ee40d81c3b623c96716c0f9576533a4b715e134f28a22c56b449fee222331c1181f4a977b19827148eb6f
+EBUILD chntpw-140201.ebuild 982 BLAKE2B 86020bf5ff92813cad215a8c176acc0200210df989fa2d6e02203d803c6a3ae2fc14e7d462d8eeba74f4cad6e2d599d562a48f4d54de99d602bb835a87040155 SHA512 529292d8b615ca2fc92e57cd503ad36bc310130d16057c0119dc482258527e1196cb09999d907636818e73eaeef2e4000c3c4767271cc31317c7b4594cd35582
 MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-crypt/chntpw/chntpw-140201.ebuild b/app-crypt/chntpw/chntpw-140201.ebuild
index 2f7012a6fa98..9e452d567995 100644
--- a/app-crypt/chntpw/chntpw-140201.ebuild
+++ b/app-crypt/chntpw/chntpw-140201.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
@@ -12,10 +12,9 @@ SRC_URI="https://pogostick.net/~pnh/ntpasswd/${PN}-source-${PV}.zip"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="libressl static"
+IUSE="static"
 
-RDEPEND="!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+RDEPEND="dev-libs/openssl:0="
 DEPEND="${RDEPEND}
 	app-arch/unzip
 	static? ( dev-libs/openssl:0[static-libs] )"
diff --git a/app-crypt/easy-rsa/Manifest b/app-crypt/easy-rsa/Manifest
index 0cee9664791d..32a284ef0d08 100644
--- a/app-crypt/easy-rsa/Manifest
+++ b/app-crypt/easy-rsa/Manifest
@@ -4,9 +4,9 @@ DIST easy-rsa-3.0.5.tar.gz 638366 BLAKE2B 990ef0cc7effd80d06d15dbb2dc3ef9a0a282a
 DIST easy-rsa-3.0.6.tar.gz 663190 BLAKE2B 2c7f526c3ddddf13b4c6193bcd52bc992b9e81db28dec8cd9b5f44aba231eed18b6f25c64a42072a6409a5dd23db21fa8ccefc210ce924c68ad3a79475d2eaa1 SHA512 ce553b483ed2facab71d9bc212c4a454c6ed4a6489a0b963c4fc190916c71d048955e1e24d3e58a39438a51a83a02bf696bb2b9292c6ff665113043509062eb1
 DIST easy-rsa-3.0.7.tar.gz 3863830 BLAKE2B e76db344912296d4659ae61e094595a0ebb30258e2819908f80028a771bf49b5ee02293ba4bd46c19926828724f27b149d2727a2f898fa7fbe48abdb16dbee86 SHA512 4e7dadafd9e3f8381029cf4a20f0a6fe58c6bee0571e0f8ff9711e1dae386bbfd81b5d8bbec58f415e367d613b90465a4635e8f924668ad73de555fe8bb8c82c
 DIST easy-rsa-3.0.8.tar.gz 3864366 BLAKE2B 8bbb16a8885a2141c59f590882002f5e4fa5c52c77130ac56b7ee5b1817a6c3acdecac2d8db4f4f4bce39f62b469afaf60b5d56f46c1ea9472afe36a5fb7a818 SHA512 db23262ba2cd1b7fec17340ebe11504741baff23098ea9b4b1118077abf8ff3091b1299f9624a6dd788b2e1c169d9820ba41d11b091949f3f6c96ee8e0509231
-EBUILD easy-rsa-3.0.4.ebuild 818 BLAKE2B 842533554129c0442ae6c872e279ad762d381d1805ec3d61d91cfd0f957f4db49f5a066e4e9cab35101e88f00be3901911f247282e129417ec6c880b6674c489 SHA512 599e7a6088cf2d3e7daaa528aac0fcae6b3a797a9076caff7795848198c046470f13c1c31dd3f5a5f5d7e91e52781a28fcb4bc92c6426c0899b55d1b567a7f5d
-EBUILD easy-rsa-3.0.5.ebuild 792 BLAKE2B c1afdd8045bc6cfe7a467ca042d9475928451218114c379ac8b2518c2e1e0646ffb7187faaf0c9b4de66b4fbd7f6986762f43861ed2c36397882c6058529c524 SHA512 7a79c86e97c0ca33e23527fccbf307af79ce60f36b535ef8edd252f4b817f05307a5856ee7632c73281bdffb3a077b4feaeb3217f4f93c245000ad973cfa900f
-EBUILD easy-rsa-3.0.6.ebuild 793 BLAKE2B aca0cf601bc61d476683d7c01d74be82095250b847bff9f264bcbd97fa83387ab705cedcfe0ec1748b0f03ca402cc1e706b1813985705e536e56c31b5eb083d5 SHA512 e6753769a785640971fa91df04ec59f72ee439f81ec13a1f6dabde3d63acf1b3008304e2e64c11d4161ee64c820f15cf250378f57de1bce361c51e647bd4a0cf
-EBUILD easy-rsa-3.0.7.ebuild 793 BLAKE2B aca0cf601bc61d476683d7c01d74be82095250b847bff9f264bcbd97fa83387ab705cedcfe0ec1748b0f03ca402cc1e706b1813985705e536e56c31b5eb083d5 SHA512 e6753769a785640971fa91df04ec59f72ee439f81ec13a1f6dabde3d63acf1b3008304e2e64c11d4161ee64c820f15cf250378f57de1bce361c51e647bd4a0cf
-EBUILD easy-rsa-3.0.8.ebuild 799 BLAKE2B 66ffdfb46e299d5c192e83ad39bbf80c0370a225bb853bedbb494151a976efa1e3482ce527777cd63b391eb07521c659ab25f5892ed655a60b1bb0a3256bbced SHA512 1e1ff3516be3c69011ec66e7a1a27f067a78636a4a292f40b828568db96db8e550ec1b2ca58fec2e26d2bff77130969557886046fae87edd169080f30ea4b0a3
+EBUILD easy-rsa-3.0.4.ebuild 754 BLAKE2B 5320048ea820a0c8dab45444ae87e41ea5fcca20c6972fe958961eeec6db48d49d1936e3b46100d5afe74151aca0feb6ef6e77c55902c935b5e26a041514bcd3 SHA512 aa948a66c372ff294459e3e0cb42d660d47f2fc369d7061a5e7b594f52e838bd84be2cd34ae0929ac6526f4c6bdee45ec3ec8d21ee293b75eb23bb7910c1462e
+EBUILD easy-rsa-3.0.5.ebuild 728 BLAKE2B 004d82cb884a346ffc147df7d3963195d36d4445f4869d2454aad6500be2c9fd724abe8abbdc504708214505d99006ae1d4fecb93c84540d651dfd4bd065021a SHA512 636b944bbc1b49cd8e3bf65d684cb805c05501ff018d0bf7907854e1c2136fdae3e4a019bd6d17ab5b4193848cb9baa0f5ead51b504e3512f649eb29aa29bc91
+EBUILD easy-rsa-3.0.6.ebuild 726 BLAKE2B 7877107a820558a01423c4e7060d92c44e645fe5ca2d2a8ac715a758d3c0bb3ee5cbc2ab573d49df79a7ba32ed6fc51825abba661be2d4490d43c273492857a7 SHA512 a618400d47f9fd8628099b4c20a282e552bb00e759976c6c628cfe75a7f70cc6d47c17916a0201e29ea86490947ffe2031055b12d636d5125ea47ab2f38da282
+EBUILD easy-rsa-3.0.7.ebuild 726 BLAKE2B 7877107a820558a01423c4e7060d92c44e645fe5ca2d2a8ac715a758d3c0bb3ee5cbc2ab573d49df79a7ba32ed6fc51825abba661be2d4490d43c273492857a7 SHA512 a618400d47f9fd8628099b4c20a282e552bb00e759976c6c628cfe75a7f70cc6d47c17916a0201e29ea86490947ffe2031055b12d636d5125ea47ab2f38da282
+EBUILD easy-rsa-3.0.8.ebuild 732 BLAKE2B c19125a13a7c688f30617f25f921e3943cfcc5cb90fbb6cbff653d1e340d74d9d42af1881f7e31041268fda3a35add44f7b8295e744233995abfe9757a5e5844 SHA512 de6ddd4740ced90a4c8a3965a3fbb92c3913acd630ed8589f4601a249cd8ee6952e83a802b2fd46335a4465e55bdc77a39f36a25676b0dc3f2ec6476f9f78e92
 MISC metadata.xml 321 BLAKE2B 453742eb4f4eebfc23e6d9889fe78d2894c3f49bde81f56827c271dbf8281a2b6016205843a0aabd5ea574776785327a83b017389bcf41aeb5f5402c04e7a97b SHA512 e643d4681855376cdc17865fc1b4106a56861f7bc080ccf808a485594e3ca35fcfa72fcd2ad49af69275d569468c1684ebe784cb16e47cc528187bdeaba6a051
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.4.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.4.ebuild
index 6d770f3626cc..4e24f9daeecf 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.4.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.4.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
@@ -12,10 +12,8 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/releases/download/v${PV}/${MY_P}.tg
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="libressl"
 
-DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-	libressl? ( dev-libs/libressl )"
+DEPEND=">=dev-libs/openssl-0.9.6:0"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.5.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.5.ebuild
index fd0685a80695..6fd7eb5f4af8 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.5.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.5.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
@@ -10,10 +10,8 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sparc x86"
-IUSE="libressl"
 
-DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0 )
-	libressl? ( dev-libs/libressl )"
+DEPEND=">=dev-libs/openssl-0.9.6:0"
 RDEPEND="${DEPEND}"
 
 src_install() {
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
index 89d2d7bea845..00a7d25b0394 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.6.ebuild
@@ -10,10 +10,8 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="libressl"
 
-DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0= )
-	libressl? ( dev-libs/libressl:0= )"
+DEPEND=">=dev-libs/openssl-0.9.6:0="
 RDEPEND="${DEPEND}"
 
 src_install() {
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild
index 89d2d7bea845..00a7d25b0394 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.7.ebuild
@@ -10,10 +10,8 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="libressl"
 
-DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0= )
-	libressl? ( dev-libs/libressl:0= )"
+DEPEND=">=dev-libs/openssl-0.9.6:0="
 RDEPEND="${DEPEND}"
 
 src_install() {
diff --git a/app-crypt/easy-rsa/easy-rsa-3.0.8.ebuild b/app-crypt/easy-rsa/easy-rsa-3.0.8.ebuild
index e6a124b4fe80..551894f3a47a 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.0.8.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.0.8.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
@@ -10,10 +10,8 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="libressl"
 
-DEPEND="!libressl? ( >=dev-libs/openssl-0.9.6:0= )
-	libressl? ( dev-libs/libressl:0= )"
+DEPEND=">=dev-libs/openssl-0.9.6:0="
 RDEPEND="${DEPEND}"
 
 src_install() {
diff --git a/app-crypt/efitools/Manifest b/app-crypt/efitools/Manifest
index 7bbdb98f7156..f61c038b563a 100644
--- a/app-crypt/efitools/Manifest
+++ b/app-crypt/efitools/Manifest
@@ -1,7 +1,6 @@
 AUX 1.7.0-Make.rules.patch 296 BLAKE2B ca12dbe2f0bb60cffcbe2646a99f421e1f7f9d3b9eab0c96481cbbcfe064efc81afb25e8819746051e3f47b325eb97d213b7ebf95df60a195a5d16d68332f42d SHA512 a8d6245b09e80e2c9082589e62c2687234ee7838d19255e07aadfd05ddffdb1817e38eac434e71d5f0e19b7f9a88a51126349ae4aa324a634769050dbf433f0d
-AUX efitools-1.8.1-libressl-compatibility.patch 495 BLAKE2B 8c4aa46f422012b36601cac7d797a7e0de7ca3bc59d5799f1a63b6f6a8ac0a2edf87b50ecc4bc9eba21778ceab3e4fab23280dde92b2ce6e8294268a2886f720 SHA512 27a5331f00fc3d8f18187120940b6e46c6267c0478663378a28c5beb80a761422162e002836a4f0db096a6386cbb2e2c5e328e9355638aab82b9556c992b9e0f
 DIST efitools-1.8.1.tar.gz 115319 BLAKE2B 3aad65defc203055122027cc3a48f50912d2f08b592841780fdc1bf337d75774116e698c4270865275ce7fe64988cd84105138ca979d81818f0065d7ae90f1d0 SHA512 114ef8e52160f5a5239ec306dbd587610849bce771ba8145ed092afd79e44f3ecee93cc1d97e2d5fdb880cc825bbbe928b3ef6701fd3b1fa444053894be1098a
 DIST efitools-1.9.2.tar.gz 116037 BLAKE2B b3540932eb112e362fd0eed47090360603807dcaec8c6a10058618f8252eeb5dcbbd703d313cb6fadae62c1312815080cf2c77fc86f9dfc9f9afca24ad97f584 SHA512 77e0ad7e865814ed388ff6daabe0f4b49ba51672bf2cbb98b7905e209cbd28f9ede2f73213ce45af8a978c1e67dba24ec88a1188661317cc22317b47e575cde8
-EBUILD efitools-1.8.1.ebuild 1349 BLAKE2B ffc55485773daf9bfab8069f8c6b1cce41daef3bcd6d5df82868aeec8e0c8fc83f69b2b4cf9565b66f8e03ada9042637902d54516772ff850d79c17423c595b4 SHA512 e686d262e3973b1fe727d960d3b97bb284b1d3795644a2dccb89204b377db0e30d2b435174ed5d622f00da2256994a4c997fe92fdc2954dfe1964d25a1ab0ef5
-EBUILD efitools-1.9.2.ebuild 1352 BLAKE2B 11335277bff81f0a7cbca7626b0951c835e781afdef9db2ac56e8163f16b67afbbe4db692bde9defbc2d442ab30f30207acf4d9d69f3bf2c10e3a1b96474b626 SHA512 336c0495a76a0ddae566708b637aaa69708ad3d86d90ba111cb1e59e3a53edaa33232bea59f1e4e99cf6ecd9448dc40cf2ed63d0a02e3aa18aeb0ae1387a7dba
+EBUILD efitools-1.8.1.ebuild 1221 BLAKE2B 5de949efc7615fb61d26dc892b2aef1f74fe6b0d7073cbaf88f870139cec0b1d1e951112a33ce3e379f1f4f90bc2553947e37bfe52bd3548cba99ad8c205ea26 SHA512 54f49ec77e7de52c0b246675a1456170a660d7df5c91bfb67ca141c5660faa2b58950acbccc048d51185fa1cd5a4d3b3b0146368674d4fcd924b01edf9f4cdaa
+EBUILD efitools-1.9.2.ebuild 1220 BLAKE2B 64e06d7244edd356d11fd8ecea5236debc67e9c2b05e3c7cccf1a1adf0cbbf589b7a1e6e238241fa8601ccb7084ef25d355e7f19d3412aa355c4eff9a128511e SHA512 b7b839580735fa7f2286f8c6a1df558d4e7c6fde394bb8f357ce2c2dfa45467ad4377473da1410721cf4a822544a894c759ec17a9db4da6d9cbfb9c66c11c3b7
 MISC metadata.xml 217 BLAKE2B 42ce05c77b1d33a62b5cd9e26a0dbc801edf537bd1482da9f3680a430e3714cd9adea45649fd6bec858e3de1863d0c855451ae8fe1e4b8aa2c6b2ae9a8e343a3 SHA512 b9ca3681462c901c78bdc3ee840596fb6f5151d6b555abd1b74c570fa83e9b5b964cc0988538c892bbf70d2963add9d39af56a6fe353ca7641a6f3aede49be82
diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild b/app-crypt/efitools/efitools-1.8.1.ebuild
index 94d636eec260..3d0ff6e70f24 100644
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,10 +12,9 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snaps
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="libressl static"
+IUSE="static"
 
-LIB_DEPEND="!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-	libressl? ( dev-libs/libressl:0=[static-libs(+)] )"
+LIB_DEPEND="dev-libs/openssl:0=[static-libs(+)]"
 
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	sys-apps/util-linux"
@@ -30,7 +29,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/1.7.0-Make.rules.patch"
-	"${FILESDIR}/${P}-libressl-compatibility.patch"
 )
 
 src_prepare() {
diff --git a/app-crypt/efitools/efitools-1.9.2.ebuild b/app-crypt/efitools/efitools-1.9.2.ebuild
index 542f32ac0915..5bdfdc911029 100644
--- a/app-crypt/efitools/efitools-1.9.2.ebuild
+++ b/app-crypt/efitools/efitools-1.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,10 +12,9 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git/snaps
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~x86"
-IUSE="libressl static"
+IUSE="static"
 
-LIB_DEPEND="!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-	libressl? ( dev-libs/libressl:0=[static-libs(+)] )"
+LIB_DEPEND="dev-libs/openssl:0=[static-libs(+)]"
 
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	sys-apps/util-linux"
@@ -30,7 +29,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}/1.7.0-Make.rules.patch"
-	"${FILESDIR}/${PN}-1.8.1-libressl-compatibility.patch"
 )
 
 src_prepare() {
diff --git a/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch b/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch
deleted file mode 100644
index 876baae16f81..000000000000
--- a/app-crypt/efitools/files/efitools-1.8.1-libressl-compatibility.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cert-to-efi-hash-list.c	2018-04-21 20:59:24.814748503 +0200
-+++ b/cert-to-efi-hash-list.c	2018-04-21 20:59:51.868581307 +0200
-@@ -135,7 +135,7 @@
-         X509 *cert = PEM_read_bio_X509(cert_bio, NULL, NULL, NULL);
- 	unsigned char *cert_buf = NULL;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 	int cert_len = i2d_X509_CINF(cert->cert_info, &cert_buf);
- #else
- 	int cert_len = i2d_re_X509_tbs(cert, &cert_buf);
diff --git a/app-crypt/gnupg-pkcs11-scd/Manifest b/app-crypt/gnupg-pkcs11-scd/Manifest
index f1e2d1df13d9..2b63a6c9a623 100644
--- a/app-crypt/gnupg-pkcs11-scd/Manifest
+++ b/app-crypt/gnupg-pkcs11-scd/Manifest
@@ -1,6 +1,6 @@
 AUX gnupg-pkcs11-scd-proxy.confd 38 BLAKE2B 56951cac6c364a75191cbcf5b074e537bf9783e32defe4c571a64e00754565666c4f379956ff4b1db713d496ebb838ff599d2b25223fb66652dd7d727812ef4f SHA512 15a4e6534e5069a9f02050e0d7dc5a27609065fafa789985a2ab448033811c9099fbc00ded558b98797b6191c5ced94cbd1bda626a1dab85cde747a856ed1ecf
 AUX gnupg-pkcs11-scd-proxy.initd 716 BLAKE2B 05f2057b6a2bc1824eef62139a70b193152bdf9b92c97244d5574d81d010a19978b2905f952539f0eded8b64e045053c7b0995aa2594dbcbee3eb8e44b149cd5 SHA512 b1719720150d7380c96e987bfa0f7932bdd30aa9462f9c11d9ac06ed58efbb0ef8c60df27b50dceed812a238ee01007abccd99edf7dbea0efcf0de2d35d032bf
 DIST gnupg-pkcs11-scd-0.9.2.tar.bz2 147337 BLAKE2B 52784721bd91929c9d6efdae599893f5425d02e5621ded69d5bc2b5dfa5dd56ca6e0989d99879a2de245e53ba7add3fdacd58fb3b1200135b0a0e618163ade2d SHA512 6afb9f0c50976636df611a0204edb0ec75aa194ba332314e3c2d7228ecf798e5f79923202f8f189b1e4aefa236a46165a5e3f0e0d98320dc4fac2bd9ac38249e
-EBUILD gnupg-pkcs11-scd-0.9.2-r1.ebuild 1043 BLAKE2B 18e2f5f53cdc0d93dd8f43ce1e9f591b2b0a17a2cfb0a2719d190e9348654bd94b18d8c2f91d64392216097eb322f9ac0286a2ee7e30c8c3d10cf00dc8712052 SHA512 a73cc837de381c4d65576ed103398937041e0e1b03ee0d98a139fa0c1674d1dfdab84db64d13bec73cb0be20c898ab7f4c2096ecc7785ddac978a4e0074cfa2e
-EBUILD gnupg-pkcs11-scd-0.9.2.ebuild 1102 BLAKE2B c7f17b024300a005205d45ef191127789b668b57583c3d07a6879d5bb76e7b859e0953de030720936812737dba72100945d0d0512481b74c31950ae27d109543 SHA512 6d66aa3080e6fb8bcbd337c690dedea8623f6cb2e8c4906519a38ed9520461be6ab13bf9126f4fc1468152f5fc4ba5646b31b39608f1effcf160e9d3e1fd15a8
+EBUILD gnupg-pkcs11-scd-0.9.2-r1.ebuild 983 BLAKE2B a3e470da5e40017e38dda4f4033cb425717a4c45fc44967754935daeea8c2995b95be6cfc1cf7274e487d3caf4bf2150660e2bd45420ed198700cb6074a41629 SHA512 90c24f353f117428e2507d875173b98fabd4ae7fe056ba39f717b80ca0691992003427bed926632e118d5a036c09c287e4f16146980e1796361d18a6e618b10c
+EBUILD gnupg-pkcs11-scd-0.9.2.ebuild 1042 BLAKE2B b45b0a1edb07670ecd2d3d6ed2b94fac38188f98d9b013d347eea8a5bc2e1e799c4500c93ab9f5362514a08d2aa2578f7fdfa828e91e37fb9228c81969700b72 SHA512 1e6dfc071b27e67fed25d50ead332140db94443efe842cfa359cdd6e58eb3e847bc85ade3e25cd72e16d29e38b35faa4b217b87413c4ad08361aad91fd222623
 MISC metadata.xml 387 BLAKE2B b1d4e542415419708bf38f73f9b5c945e008bc8a8f5f022702a6d2a757e7608c87ca91a811c82e044ce6321685ad0734230a1e5bac74b5abe9c1040f48a2539c SHA512 a374050bc876f9cdf983c80b07e24b4cc5a4fbbcebd88aff1e353d287187c6099ec81867ca39a0495bc777b3c80d3d855b4ca2391757308de8adfd269f201576
diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2-r1.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2-r1.ebuild
index 29e037a3b448..2a2d4d1fcdf9 100644
--- a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2-r1.ebuild
+++ b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2-r1.ebuild
@@ -10,11 +10,10 @@ SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libressl proxy"
+IUSE="proxy"
 
 DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	dev-libs/libassuan:=
 	dev-libs/libgcrypt:=
 	dev-libs/libgpg-error:=
diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2.ebuild
index 114c9a5db876..5c5f9dd439b7 100644
--- a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2.ebuild
+++ b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,11 +12,10 @@ SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libressl proxy"
+IUSE="proxy"
 
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	dev-libs/libassuan:=
 	>=dev-libs/libgcrypt-1.2.2:=
 	>=dev-libs/libgpg-error-1.3:=
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 460b447e9e6a..cca04135b078 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -15,6 +15,6 @@ AUX heimdal_tinfo.patch 711 BLAKE2B 730ef4b1ba79d80c7257d1bd04783584cf616b2e51d6
 AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16bdf6f554c585572ed9d3835bed976c8953fc92d0f42270c6a0767e943ec5efa5b79f6f4cf89 SHA512 4dad6837344e30c6988355551b5b82bce748dad7aa7648204ba7852540ad3a546b5344926789d60e78d57ff20dff87b680b790dc8d86c8dec1008feb0d809e38
 DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
-EBUILD heimdal-7.6.0.ebuild 4531 BLAKE2B aa697968e923d2b6670ca074a335b0ec99d2c4d00671b060afce81b84094be5e3e2cef75f53bc2afccd5c916b238c92b864b79211c811153b494ac08beec53ee SHA512 a556b8fce894f2a6a08e4522a7bbd085803f7ba409ec09454aa321dc7b47db5799561460a354f9286522caed36141e992cd4d1e5cedde86f008d46503bd57895
-EBUILD heimdal-7.7.0-r1.ebuild 4576 BLAKE2B 33db2ce9444bfacc98893e3fa5d0098bd535898e14b76b6a0dc63ab95fd71658efe4c0d378f1fd8722b28565557035f4a8aa0dd8cd2b6c2155209155b9f05594 SHA512 4d419220f0705f424c4274ae902d9278cee1966a74b67416ff5ee4ef454e5b3b56822848b4bd012d237a79fe121fb596a41f45dbb82225cec719a7666cd916ef
+EBUILD heimdal-7.6.0.ebuild 4451 BLAKE2B c767a1140eb4a6dcc7e0d2b106412331d4ebf0102942cb0e4161741683da86fbb892169f2d8f9aa3284e0eb3327c3f70555131a45a867ae0646c8c6a0bea1ba4 SHA512 a9623bb6d7d2d264aca88763c7591abb0ed6392a8d6d6ddacd0dfd27373c90d1d5ef983d9e17d6e392f737c57702b38b4896044aa89067b7eeec05bfd529c3b9
+EBUILD heimdal-7.7.0-r1.ebuild 4496 BLAKE2B fb6748500785fc36a21cd022898af247d951cd25e57a46c433e43c9d9975586ee6fb6ac60a1c0f32218341e6e6fe44df730b85ae993b53035689bc9f7601da13 SHA512 063a4da50de81af190872ef93c4344ab3f36092a916828e33380f916641b2872e1bc57017ef404b3d93cf8570e078c6b3c69cd7a61151a5786b72a5e91c36444
 MISC metadata.xml 570 BLAKE2B 827b4e549ff73259b932cc8587625fd9dcd73553d7bee3726baae0d1de8d8e8f8d67fdd649d605099301f426b88fc654341005976a3373d61482c81dec67db5b SHA512 069fa36a8f551ae0fdfd3a6f3dfd6cbfb3bf56c2ceba6ecd5184c4686d885ce5aa83622090f7fa1df44924a7ac3bf63fed4b9b19e70254d2a6d883d483500ad8
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index cb90fe7d33b9..b6582b76a925 100644
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.ebuild
@@ -16,13 +16,12 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="afs +berkdb caps gdbm hdb-ldap ipv6 libressl +lmdb otp selinux ssl static-libs test X"
+IUSE="afs +berkdb caps gdbm hdb-ldap ipv6 +lmdb otp selinux ssl static-libs test X"
 RESTRICT="!test? ( test )"
 
 CDEPEND="
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+		>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
 	)
 	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
 	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
index 64901aeb7306..4b1f82f5c523 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
@@ -16,13 +16,12 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
-IUSE="afs +berkdb caps gdbm hdb-ldap libressl +lmdb otp selinux ssl static-libs test X"
+IUSE="afs +berkdb caps gdbm hdb-ldap +lmdb otp selinux ssl static-libs test X"
 RESTRICT="!test? ( test )"
 
 CDEPEND="
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+		>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
 	)
 	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
 	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
diff --git a/app-crypt/kstart/Manifest b/app-crypt/kstart/Manifest
index 68fea2abab05..919275cb4547 100644
--- a/app-crypt/kstart/Manifest
+++ b/app-crypt/kstart/Manifest
@@ -1,3 +1,3 @@
 DIST kstart-4.2.tar.gz 296651 BLAKE2B 127bf28ef538681d188ae79ed67cedaa7d9022c1fe6741b3486ce7d5901c4a77d0aec7d00164240a79ffc70b56dd7fdeaf42e76dd2b02effe79bcad41ad8e271 SHA512 7ce9c1f964c0d469b4b8a5de88ae83186e99116959941c4e7f69c59165d0c22aac432ac26dd5fe54f7c2f725048bb55b787107aea8408e2fd6c9ad02dcb31552
-EBUILD kstart-4.2.ebuild 661 BLAKE2B a317453fee5da7a9601e7c9b6ce4f04670a6e66f52e644b329bfa7712d94921aec81c239300ee986fc61077b417384cbd4ab13185d51242a157ca29d29d75a33 SHA512 90f6cfc5bc0b693e5af1f14d7c13d0fac4f6cf345c8ae1af9f6bd19b7ba3cae83194d9d0d253e702ca3275f24e7ae36d2ff058a66ad1714220f9efafe6507a63
+EBUILD kstart-4.2.ebuild 663 BLAKE2B 0732109be0c35d1517247151805af28863124cdab144aa9d76da0b7124a38c24050d0f3bb38159a8649982574da830ff2687f1f9b2431b929601fbbcae1b768c SHA512 2720add693aa5acbddacf27d1c167ea3622aeb757dec1721154cc1e2c0769872ef6700427ce6eb69977d5ff598afed2b12b3e14fb26dadb68b048f7f595c5648
 MISC metadata.xml 807 BLAKE2B 9c7c0283dce5943b74d5d57b21fdfb11cd2f9b994ca1930e62997576e20e3a74cb468565824c44051b67fd87b44f70f08defcd834d2dc03e98b5de62289cf08c SHA512 d854205e8829d141c3cd94cc00db039fce23376cb4f75c2498ae46d714765103890329526d2fe85f2eeff238fe2620f616686e78c62c9a115051d5fc161d19b5
diff --git a/app-crypt/kstart/kstart-4.2.ebuild b/app-crypt/kstart/kstart-4.2.ebuild
index b4634629b712..1eec3057a2ce 100644
--- a/app-crypt/kstart/kstart-4.2.ebuild
+++ b/app-crypt/kstart/kstart-4.2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-DESCRIPTION="Modified versions of kinit for refreshing kerberos tickets
-automatically"
+DESCRIPTION="Modified versions of kinit for refreshing kerberos tickets automatically"
 HOMEPAGE="https://www.eyrie.org/~eagle/software/kstart/"
 SRC_URI="https://archives.eyrie.org/software/kerberos/${P}.tar.gz"
 
@@ -15,7 +14,7 @@ IUSE="afs"
 
 DEPEND="virtual/krb5
 		afs? ( net-fs/openafs )"
-RDEPEND="$DEPEND"
+RDEPEND="${DEPEND}"
 
 src_configure() {
 	econf \
diff --git a/app-crypt/libu2f-server/Manifest b/app-crypt/libu2f-server/Manifest
index dff82de8a70d..1eb74083beb7 100644
--- a/app-crypt/libu2f-server/Manifest
+++ b/app-crypt/libu2f-server/Manifest
@@ -1,5 +1,5 @@
 AUX libu2f-server-1.1.0-disable-help2man-gengetopt-checks.patch 1137 BLAKE2B fc1d8287d590acf1385747091195e4401f9c3cba2ad6c0911f2ca549504569250567ef5e1b64124b5545460ba53e7e61354c4393051c275212b40c5a70764dd9 SHA512 cae13f6c9738be740055d0d26a7913f84bee0edf3df06d8a4e3da39dbcd7dd24ca19af638c1f00c3e45d68389e9ae842ab2a92ccd690a04af610646705edd498
 AUX libu2f-server-1.1.0-jsonc014.patch 1137 BLAKE2B 84d26d1439662ee15e72aae0f8789be6326d2fc4eb987d1ab961ce3200750414d9e5173c1f6ec16d210ce0a9d7aa4fd274d84967cef611e1638a1f2404da1e38 SHA512 eaeea076939f52f0c28a24825b56c67fb05be4d1c392f1cadf10452cc465edc5c711c998ef836cabf81886b89641492f9df7c9fe9ae03fe2f05bfcda2f65bdac
 DIST libu2f-server-1.1.0.tar.xz 269128 BLAKE2B 084b177a878e8216f2ee5af9eeee11e691edcd12b7ed1b1c57f74bcc45f0418a0d44a9e72423c41b4104aa9f69807a0289172d08d21d168c6be5b36ee8c70bc3 SHA512 ebdb7c8c20727f37f4e31d8f16df7966603374f78478ada723a7b9bec1b0b0622caf6d12a65067ac8651f6088aaad61b2ad6ed51b9d6ef0dc45f031c974d8ff9
-EBUILD libu2f-server-1.1.0.ebuild 1253 BLAKE2B ea8d8530aa01e1f411280be1bd82c92e7a5659b4982ee3f5b7829140db0c69021a7d37636a374bf42140f2d1898e24fb6691e10490d6a97a8ed8a33809760e25 SHA512 44d37de15b2435b9330121cd0146aeae6495d5bf1f1dd49a7991307fe24ce5dd2c9b094bc090474c7ccef0785191380a20214ebeab1b47d8a4191cec7de43976
+EBUILD libu2f-server-1.1.0.ebuild 1174 BLAKE2B 577b4354eb5750d937cf09d0fec86e377efe7723af597e72aa86086e8caba0c3ad24e928b87a755d817f6fe7bafe9c185bbef20d827d6e39e6fea8e89061a0a2 SHA512 3424fa86980abad63a16de3577a951b65bd8973f9df261701cc8c3c5a6634561f77db7f580b146e3e15240369bc0350aff90f3b1ea2e2faff60e6908ab293c9c
 MISC metadata.xml 351 BLAKE2B 9b08643cd9cfab47436281dd57bca31e713980d3cb0b5d20fcd9a915bc5adbcf589ac4df9f03929a8f57e7a11393602afe05d025d10bb04d425bacc1f4765324 SHA512 6a1aeb9117473d5c2ea5de3a3043de7926bb70e2cc00ac8c13b4d3a27b7fd3c7ca6611bc4f4ed9faeb611f228f5a8ffc657e924fdf800133d62a70b48e408f22
diff --git a/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild b/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
index a16820c036ea..b90c56b31204 100644
--- a/app-crypt/libu2f-server/libu2f-server-1.1.0.ebuild
+++ b/app-crypt/libu2f-server/libu2f-server-1.1.0.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,12 +12,11 @@ SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz"
 LICENSE="BSD-2"
 SLOT="0/0.1"
 KEYWORDS="amd64 x86"
-IUSE="libressl static-libs test"
+IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-	libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
+	dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 	dev-libs/hidapi[${MULTILIB_USEDEP}]
 	dev-libs/json-c:=[${MULTILIB_USEDEP}]
 "
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index 1a00e04aae7a..55f832e7bcfc 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -1,8 +1,6 @@
 AUX CVE-2020-28196.patch 3128 BLAKE2B 52674cb21a589b1f72b2ba110657952cd2946d08df58417eb86f75663e5ded48a49bb4e6bed87598b74209ae03ff3dca2f80fe9305f7e44070806f02c8ecafcc SHA512 98fa20ad32610dfa9fd6b9e1657e8c6d7e8905d266ef8953e4d6fdb344f0005ee356a9cca7d5aaa1c5333073b7e464c26201302138e0bf8f1f696c818024ba9d
 AUX kpropd.xinetd 194 BLAKE2B cfc40af2e75b0ce5a71e0dfdcfe076d13d996b25d2cb50d4282bc88d7b33b317a202d57df0bb4a2b47113f0d38cb508614e122e4a3bb7dfd2397e2daa3178396 SHA512 c9bbd13f2fadfd2a925bfae834ba61f227cd4386b4c4466b5227d93c792f4549778ef4d6e08353372df99804459277c71f61b41ec71f3afcc600d73c5705f72f
 AUX mit-krb5-1.12_warn_cflags.patch 448 BLAKE2B cd9793866173b394bab3497d19653ca3296924cc49aaf540499b149254265af1d995b4d7493b76185ce35d123e70827cb5fcb221efc6499b86a346cfad7478ab SHA512 42364d9cd8c0a6fd28ae661eeac4d0dd3f2001fe290bf9731ee99c2c786a6488805fc93057d59e201e2cef1e5280af4c170187aa5603f4cf542906abc0fccc2b
-AUX mit-krb5-1.16.3-libressl-r1.patch 3815 BLAKE2B b3ad56fee5fd5ace5e5ef0b1002c2f69c14383ca156182c65f4b1d2a5b8010d30677aabab271726c0fa9cbccf4734a3dda54cc492c9b1e5e1bdc7e8757292a73 SHA512 1298cadf15e5f1512af66c6584cff99b1d8f7c9764cb91e1e606fd331da1747b5fd7080c928a373369ab3817acadfa214121fee694a0ac515c0f4d6a623fb834
-AUX mit-krb5-1.18-libressl.patch 1495 BLAKE2B d57e6a9694a3ad97d08b4b7130c8d08308c2b275389949a4b53b6690d13890f74215d4b95026fc47423f6e9c9c71365efb983f6d55d17e53a978e7803dc6ce83 SHA512 63ef239b7f2e5823a3449f48c30904fed451874e7cd7bd14ffa681ce1ad1681fcd51414227c1c837fc5a01c7fe79b1259ed6de2cf4ee07d3de76e5be17b62a2d
 AUX mit-krb5-1.18.2-autoconf-2.70.patch 986 BLAKE2B e5d542be9618a37c4efd87bc82bedb59d04595dc33584e1df842db64ce5de2ab8daea72d1a101347f6f0ec72d213fe10e9f90f4fc911cb30bf9571d353ee9543 SHA512 2fc8aa3c9cb0c3ccbeeb853ced2ed27e2b16191518f1fb5764ef0c1ec0a1a5fa47e60a0086ced58c240f6ebf1264d25f55cf048068e6d8cbea1a11ef8d4d9191
 AUX mit-krb5-1.18.2-krb5-config.patch 409 BLAKE2B 90290aa717c929d97d38f542753fba7fd4a85aa5d960b1bf8acf9898dfaa16fa9433d2ec5cc985757ae6bfc356cf46fabbb1632f5005f8a93a2ed22699ccaad0 SHA512 2faf5a39b9d7c8bca71d23d0226c2fa8fd9759366c9c2385b8479481b4fcf546d506ee3a4bc1caaf855e8cdfe1abb1b11536bdf9bd06e3c5d9b776bd7926a104
 AUX mit-krb5-config_LDFLAGS-r1.patch 458 BLAKE2B adf95690d6bb698dbdb6bf9c4220f3498a332186b059986c5a699aeec81b3342931ca664244fbcb76a61f9a5177972f0e47535035dbf88c949691d5d80d58084 SHA512 4c7ff3f63c9615dae1dbbf03795fede34d54d043acfd91f77f7fef7534253ea308a59657fa93d09f99d1d5ff5d21b58eb6b86bfbe6d65aa82ca1fa187b65d1dc
@@ -22,7 +20,7 @@ AUX mit-krb5kpropd_at.service 162 BLAKE2B ccd1dea2419656a95ea1e5068457ea45a765a8
 DIST krb5-1.18.2.tar.gz 8713927 BLAKE2B f0eb34e67adcb86f347c59ec6ef74970a57530cc56336a84909f852cd6135079ea89828e77c906a272f54e0faf6a4a0497f2b648446eb9d048d1c51e4ec513af SHA512 7cbb1b28e677fea3e0794e93951f3caaa2c49bb1175dd187951e72a466cc69d96c3b833d838000fe911c1a437d96a558e550f27c53a8b332fb9dfc7cbb7ec44c
 DIST krb5-1.18.3.tar.gz 8715312 BLAKE2B 4f6ad4a529e7578e83d82b43c2cada33bce1dca5081ec826ee06a713f82520b783f72ec56d2ce289e10d1ddcfaa079491e43f21c035b214d244bb80e6b2a1c9f SHA512 cf0bf6cf8f622fa085954e6da998d952cf64dc7ccc319972ed81ea0542089cabf2d0e8243df84da01ad6f40584768ca2f02d108630c6741fa7b3d7d98c887c01
 DIST krb5-1.19.1.tar.gz 8738142 BLAKE2B 902dd08fe4b81b1cb0ec2bf1b95eeece0f8a87b87bae865272c7bf5dd028c01997ec4c5d24df605328db85e7cbfe9a38dd804b363b651aefa7b4eaec958a280c SHA512 36bf33802119ada4650a8f69f1daca95aaf882dc96bfa7061f0340a5decd588c31fc10108ddadf1042934e0e2c3bbd975deec565b0a7f0fc2baf8b8cc6d97491
-EBUILD mit-krb5-1.18.2-r3.ebuild 4501 BLAKE2B e2f325c8a14b1e51a4708d985faea22380d03a4ce6ff264c02c8861e69917adcd85731014ad6e187850416f1fc1393e8cbd6627354782240f7b55c58240a5502 SHA512 19357d72dcf1a9f0d739194cedfdcb8ba4022a31527952f8fb637e7268f64953770c5434cd4477627c59b45ae5d367b569b2536fcb960333066593ea7f46535e
-EBUILD mit-krb5-1.18.3-r1.ebuild 4425 BLAKE2B 882d05e11f6fac8466defe58176f0c70a67319ab05909f0dec32f5f29d471ea9780b2fa39c6b001488751492a8141cafbbd9dc1a1f0a6146b24f5ad58798e292 SHA512 29caa7dd8a1b3f1cece63cfff348e851809da318dc85550df7c9cd924abdcc3bd1e6a6ef1f3d2d170b4aa2d0a9f778fd298d838862fcc431857e289c93e2d77c
+EBUILD mit-krb5-1.18.2-r3.ebuild 4333 BLAKE2B 5357161368800a8392491cd3d4c6ed551ca9a144d65e63b378ae8069ebd9777d23418f6eaea486fe912be16998f8bd42f5b11a52c5c8970df19d8e790b6638f6 SHA512 5e76d1e223f94302b492cd7bb0e8e82574d9babe1e1a7c7a7a6926ac8aaf61d6679de8d4385cabdf798d84a4271588cf8cd1f8c33fa8ba408daaa76653d852f1
+EBUILD mit-krb5-1.18.3-r1.ebuild 4257 BLAKE2B dd314bd6bd890037d7bda9a0a9e76c7747718aa6a451cf78f4e27b1350d363a62335d3cbb0e8667f44aae6737afda3670611529e3ff4b497d720dc834b2445ab SHA512 43abc1ba64a8c0f6922f4d3d7c39202ae04a681e85742c1acaeb6d107510fe585b24f48ce77f58124d0623e43706fef3c6bb90b5284827540239852a323a23c4
 EBUILD mit-krb5-1.19.1.ebuild 4252 BLAKE2B 0c30d532e25dda48b00080027a36baa576306e886f359c5248838c5cd2834137c2aebb835eab2a2c4621d5e09eda67859d021ef9ff68db61aebced461a5a80bd SHA512 6fe8ae104ca40c0097f375feab6726b8b1ad5568fe0e9801dd070960e2bad2e6a0b855a686b8b3496c5f0c9ee09cc69e50950f3ae6668e1bb0b7446f8a43c0e4
 MISC metadata.xml 823 BLAKE2B b1e312e7d7d1dde62a6260572d68c5c9df90a00c9ca7d43939df0ce7c6e528ac8dfcf839827938f783c241c19255660e1e7806210aaf407a6e86cbaeef24295a SHA512 844715444284f5c7f1a73ed15c0ebe0b5dd8c96c3aa7e6450f465e2a2086509c04d637f139ede5e427972d4b1bb298255388f50978b41de875b47ee40251451e
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.16.3-libressl-r1.patch b/app-crypt/mit-krb5/files/mit-krb5-1.16.3-libressl-r1.patch
deleted file mode 100644
index ca74b88bb0f3..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-1.16.3-libressl-r1.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 58263cbf3106f4c9c9a2252794093014a2f9c01f Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan.strogin@gmail.com>
-Date: Thu, 25 Apr 2019 03:48:10 +0300
-Subject: [PATCH] Fix build for LibreSSL 2.9.x
-
-asn1_mac.h is removed from LibreSSL 2.9.0, but static_ASN1_*() methods
-are not defined. Define them.
-
-Upstream-Status: Pending
-[Needs to be amended if
-https://github.com/libressl-portable/openbsd/pull/109 is accepted]
-Signed-off-by: Stefan Strogin <stefan.strogin@gmail.com>
----
- .../preauth/pkinit/pkinit_crypto_openssl.c    | 13 ++++++++----
- .../preauth/pkinit/pkinit_crypto_openssl.h    | 20 ++++++++++++++++++-
- 2 files changed, 28 insertions(+), 5 deletions(-)
-
-diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-index 2064eb7bd..81d5d3cf2 100644
---- a/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-+++ b/plugins/preauth/pkinit/pkinit_crypto_openssl.c
-@@ -188,14 +188,16 @@ pkinit_pkcs11_code_to_text(int err);
-     (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- 
--/* 1.1 standardizes constructor and destructor names, renaming
-- * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
-+/* 1.1 (and LibreSSL 2.7) standardizes constructor and destructor names,
-+ * renaming EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
- 
-+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL
- #define EVP_MD_CTX_new EVP_MD_CTX_create
- #define EVP_MD_CTX_free EVP_MD_CTX_destroy
- #define ASN1_STRING_get0_data ASN1_STRING_data
-+#endif
- 
- /* 1.1 makes many handle types opaque and adds accessors.  Add compatibility
-  * versions of the new accessors we use for pre-1.1. */
-@@ -203,6 +205,7 @@ pkinit_pkcs11_code_to_text(int err);
- #define OBJ_get0_data(o) ((o)->data)
- #define OBJ_length(o) ((o)->length)
- 
-+#if !defined(LIBRESSL_VERSION_NUMBER) || LIBRESSL_VERSION_NUMBER < 0x2070000fL
- #define DH_set0_pqg compat_dh_set0_pqg
- static int compat_dh_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g)
- {
-@@ -235,6 +238,7 @@ static void compat_dh_get0_key(const DH *dh, const BIGNUM **pub,
-     if (priv != NULL)
-         *priv = dh->priv_key;
- }
-+#endif /* LIBRESSL_VERSION_NUMBER */
- 
- /* Return true if the cert c includes a key usage which doesn't include u.
-  * Define using direct member access for pre-1.1. */
-@@ -3040,7 +3044,8 @@ cleanup:
-     return retval;
- }
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || \
-+  LIBRESSL_VERSION_NUMBER >= 0x2090000fL
- 
- /*
-  * We need to decode DomainParameters from RFC 3279 section 2.3.3.  We would
-diff --git a/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h b/src/plugins/preauth/pkinit/pkinit_crypto_openssl.h
-index 7411348fa..ac91408c4 100644
---- a/plugins/preauth/pkinit/pkinit_crypto_openssl.h
-+++ b/plugins/preauth/pkinit/pkinit_crypto_openssl.h
-@@ -46,7 +46,25 @@
- #include <openssl/asn1.h>
- #include <openssl/pem.h>
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || \
-+  LIBRESSL_VERSION_NUMBER >= 0x2090000fL
-+
-+#ifndef static_ASN1_SEQUENCE_END_name
-+#define static_ASN1_ITEM_start(itname) \
-+	static const ASN1_ITEM itname##_it = {
-+#define static_ASN1_SEQUENCE_END_name(stname, tname) \
-+	;\
-+	static_ASN1_ITEM_start(tname) \
-+		ASN1_ITYPE_SEQUENCE,\
-+		V_ASN1_SEQUENCE,\
-+		tname##_seq_tt,\
-+		sizeof(tname##_seq_tt) / sizeof(ASN1_TEMPLATE),\
-+		NULL,\
-+		sizeof(stname),\
-+		#stname \
-+	ASN1_ITEM_end(tname)
-+#endif /* !defined(static_ASN1_SEQUENCE_END_name) */
-+
- #include <openssl/asn1t.h>
- #else
- #include <openssl/asn1_mac.h>
--- 
-2.21.0
-
diff --git a/app-crypt/mit-krb5/files/mit-krb5-1.18-libressl.patch b/app-crypt/mit-krb5/files/mit-krb5-1.18-libressl.patch
deleted file mode 100644
index 1522d42a730f..000000000000
--- a/app-crypt/mit-krb5/files/mit-krb5-1.18-libressl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From e3e3bc2a20795becda6e130d511fe59f04635624 Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <steils@gentoo.org>
-Date: Sat, 15 Feb 2020 10:27:20 +0200
-Subject: [PATCH] Fix compilation for LibreSSL 3.0.2
-
-RSA_PKCS1_OpenSSL() is provided in LibreSSL the master branch,
-expected to be in the next release.
-See: https://github.com/libressl-portable/openbsd/commit/3a8c41f3a84868337fde01ec1122198ec60bdc8e
-
-Bug: https://bugs.gentoo.org/709640
-Signed-off-by: Stefan Strogin <steils@gentoo.org>
----
- tests/softpkcs11/main.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/tests/softpkcs11/main.c b/tests/softpkcs11/main.c
-index 1cccdfb43..a5099fbe4 100644
---- a/tests/softpkcs11/main.c
-+++ b/tests/softpkcs11/main.c
-@@ -47,7 +47,6 @@
- 
- #if OPENSSL_VERSION_NUMBER < 0x10100000L
- #define EVP_PKEY_get0_RSA(key) ((key)->pkey.rsa)
--#define RSA_PKCS1_OpenSSL RSA_PKCS1_SSLeay
- #define RSA_get0_key compat_rsa_get0_key
- static void
- compat_rsa_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e,
-@@ -62,6 +61,11 @@ compat_rsa_get0_key(const RSA *rsa, const BIGNUM **n, const BIGNUM **e,
- }
- #endif
- 
-+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || \
-+    defined(LIBRESSL_VERSION_NUMBER) && (LIBRESSL_VERSION_NUMBER <= 0x3000200fL)
-+#define RSA_PKCS1_OpenSSL RSA_PKCS1_SSLeay
-+#endif
-+
- #define OPENSSL_ASN1_MALLOC_ENCODE(T, B, BL, S, R)      \
-     {                                                   \
-         unsigned char *p;                               \
--- 
-2.25.0
-
diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild
index 8482b1acd95e..a80fe2ba685f 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.18.2-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
+IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd"
 
 # Test suite requires network access
 RESTRICT="test"
@@ -33,8 +33,7 @@ DEPEND="
 	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
 	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
 	pkinit? (
-		!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}]
 	)
 	xinetd? ( sys-apps/xinetd )
 	"
@@ -60,9 +59,7 @@ S=${WORKDIR}/${MY_P}/src
 PATCHES=(
 	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
 	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
-	"${FILESDIR}/${PN}-1.16.3-libressl-r1.patch"
 	"${FILESDIR}/${PN}_dont_create_run.patch"
-	"${FILESDIR}/${PN}-1.18-libressl.patch"
 	"${FILESDIR}/CVE-2020-28196.patch"
 	"${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
 	"${FILESDIR}/${PN}-1.18.2-autoconf-2.70.patch"
diff --git a/app-crypt/mit-krb5/mit-krb5-1.18.3-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.18.3-r1.ebuild
index b17423863743..a20eb9604cba 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.18.3-r1.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.18.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
 LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="cpu_flags_x86_aes doc +keyutils libressl lmdb nls openldap +pkinit selinux +threads test xinetd"
+IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux +threads test xinetd"
 
 # Test suite requires network access
 RESTRICT="test"
@@ -33,8 +33,7 @@ DEPEND="
 	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
 	openldap? ( >=net-nds/openldap-2.4.38-r1[${MULTILIB_USEDEP}] )
 	pkinit? (
-		!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}]
 	)
 	xinetd? ( sys-apps/xinetd )
 	"
@@ -60,9 +59,7 @@ S=${WORKDIR}/${MY_P}/src
 PATCHES=(
 	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
 	"${FILESDIR}/${PN}-config_LDFLAGS-r1.patch"
-	"${FILESDIR}/${PN}-1.16.3-libressl-r1.patch"
 	"${FILESDIR}/${PN}_dont_create_run.patch"
-	"${FILESDIR}/${PN}-1.18-libressl.patch"
 	"${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
 )
 
diff --git a/app-crypt/ophcrack/Manifest b/app-crypt/ophcrack/Manifest
index 7beca4f2ec81..48e6deb7660f 100644
--- a/app-crypt/ophcrack/Manifest
+++ b/app-crypt/ophcrack/Manifest
@@ -1,4 +1,4 @@
 AUX ophcrack-ar.patch 242 BLAKE2B f268c2a0c0900c3ea6a3e4fc1c99530a090e413fbba9e4ff7c339ae6b5db49ad546eb58cd42a64f81d669c38ed9a4de25cfcfb29ee17af1c88b4372aee4fda51 SHA512 bb4f8154abe676ccec48536b50513b45253828334db040f28fe71e5b9d3d7abb6b34693ec234f10ce8c26592d07ccdd678a68b96b6a80ca9137c18a9e0598bfc
 DIST ophcrack-3.8.0.tar.bz2 293033 BLAKE2B f20bf79d5cafffaab0667b073e8d9dbcfbae0a16f4139b6304c3f6fc80a24f6ca673db9cd53e28ff277ec35821539f3960265aa28467795e25c45049acca3f31 SHA512 c66276b72299744d3e0c9fc14220c7f568e383bd324c1ede228bda5d51da78db817388421c9f5f8cd2f18687e7e53cfb0c65bcc0354b3d55ac16324c61f62dbd
-EBUILD ophcrack-3.8.0.ebuild 931 BLAKE2B 0ac696acd38741fdbc42d4c3094730aa04ec453cf58309be136ba976ae4393f8eccc2ecadf5d0d6704abb670234aba49e82600888e91f0afde58261d78f9a916 SHA512 762251c25d3f189d275402b2205de6f644011c530e2b283ce9237592d5d9c8f59867127cf82777801e396d4ed1ee89cc20d3baa6f67b586b1d3ef2bd4b746ac7
+EBUILD ophcrack-3.8.0.ebuild 871 BLAKE2B 4f740c360a7fb1ca4cac9a338b21306b04bc23f4d330b3c42c456a04403b42ed6a3650af51a5c048c89ffe5a99c47cb5f3e35e48b552022023004b02dfc89ee4 SHA512 2f304a4aba514fd0bbbe5f58370ce7ae9db01102946c254f4955c39b58fd183a12fc7568aedfcb8d6f735b23cc834d493115b4af67d5f46efed939e1444f3b6d
 MISC metadata.xml 474 BLAKE2B 06c67b21ed59a24074d06b4003873ef05bc4ef8632d4602e3ac5f0956698c40e8a7662b6aeddb7bea28055ed03e27900a3fe4f692d765cb25ba5d9c3ca62722e SHA512 3381c3cb01e39377a085137392802e0666cd4dd421cdcda2db6af2cae01d7b0a7319886699d99553b9a4aed732b402d923c51a0b053cfa564d2228de605991e3
diff --git a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild b/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
index d3623f2b5da6..e6f536daf1ab 100644
--- a/app-crypt/ophcrack/ophcrack-3.8.0.ebuild
+++ b/app-crypt/ophcrack/ophcrack-3.8.0.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
@@ -12,11 +12,10 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.bz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug libressl qt5 +tables"
+IUSE="debug qt5 +tables"
 
 DEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	dev-libs/expat
 	net-libs/netwib
 	qt5? (
diff --git a/app-crypt/osslsigncode/Manifest b/app-crypt/osslsigncode/Manifest
index 48106f8b6d17..890aa83b25fe 100644
--- a/app-crypt/osslsigncode/Manifest
+++ b/app-crypt/osslsigncode/Manifest
@@ -1,3 +1,3 @@
 DIST osslsigncode-2.0.tar.gz 57951 BLAKE2B 67057c07bb667a546e3a8abc49e8a20a0ef42ae77edacd2e88486a4357e8e8e789307e1c2abd2e13d18401621ba5607bb42af46ed8451546a26bb6855a07e652 SHA512 aec7b101afd96925fbd70ac67a6752997f0dab3987151c0658e5f011d8a6be6f53518d7a4aba6dff696c722a1e669100143a87d07c3f59364cd62693e9f3e4e5
-EBUILD osslsigncode-2.0.ebuild 661 BLAKE2B 6f1a7d79ad04c62a74675e0f0d8d96a7cc315d00d39c6bbc431433b51066016e2830794184a1e9ff6b5862024f382edab3233f2e7ce16158559c077d5410a6d6 SHA512 dc9e8de629017762d7599223597b583200a521a16739edff3d0137e237fa96c829eebc84e129656844ed74169d0c1dbf7e30b0fed828cb864585c24fe3d76a15
+EBUILD osslsigncode-2.0.ebuild 601 BLAKE2B 8136f606f96547c0a0065ba4d3bf7f3e9d191f768bd0069738b5a5dd52a6b39668bbfbb1acd330cf9dcfcff10103e99c3577e66d324c94a2a54ae9414b130946 SHA512 5431e4d15ade5a789cdc42698911cf3715171dc67d7af046549b4b3619b0a9b5a4c3d8b829fc7f26156d6e71d2ef69c69af1026e74ea96e090723a3421fc418e
 MISC metadata.xml 249 BLAKE2B e2269cf35520934d37b0cace5aaa64dc71ba9917bb90ef01e3ddb5e0208ffd0e2c650008fe88df51ebf6c5c304dbf7670608712f4229cacf62f9c7a747fb8f00 SHA512 9d2ea5145e05b199a7c1cff11164a7eaa9179fec4149b5a0c6f17c5c689d041d68243f4e1cc550617f9649f72ca77d7cadf3d488d1c6cab31bdbdb3fdc26aa9a
diff --git a/app-crypt/osslsigncode/osslsigncode-2.0.ebuild b/app-crypt/osslsigncode/osslsigncode-2.0.ebuild
index f88975d1bc93..5f3e86ad8cc5 100644
--- a/app-crypt/osslsigncode/osslsigncode-2.0.ebuild
+++ b/app-crypt/osslsigncode/osslsigncode-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,11 +12,10 @@ SRC_URI="https://github.com/mtrojnar/osslsigncode/archive/2.0.tar.gz -> ${P}.tar
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="curl libressl"
+IUSE="curl"
 
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	curl? ( net-misc/curl )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
diff --git a/app-crypt/pkcrack/Manifest b/app-crypt/pkcrack/Manifest
index 43e9a2c71f96..315906f04221 100644
--- a/app-crypt/pkcrack/Manifest
+++ b/app-crypt/pkcrack/Manifest
@@ -1,4 +1,4 @@
 AUX pkcrack-1.2.2-build.patch 2539 BLAKE2B 54ce5effd250832aaf04977b4baa9a212cc80cf1fb4b50a7629314a7e716c2ced9a758f20631c0c783e25611ece51d19048880b9f63790140a8914a9661f1214 SHA512 48b71bc2d5aa850603eb1872c200465e655fcb527323ebc9d1728311fcf9fa15722f7b80a6809c7960ec0f4fcf3d4e65561880f61feb4dcbe35dedf15c198f20
 DIST pkcrack-1.2.2.tar.gz 174208 BLAKE2B fed476a9d681bb9e565d05ef636f58d6643c4f8897725c56b66e64123e9435f9bf28e550f0249794e81e9f968683ab81c19baa1ee51478e1b91509e8e318725a SHA512 5c64fb9ae09dedc70fb20cd689f432059fcd64f689072b529b4045c3241760fee273ee921da081bc08be2e0594d27101c5d89d99cb2b84e16f80c011419b7200
-EBUILD pkcrack-1.2.2-r1.ebuild 1073 BLAKE2B 8099424d0b171590c6475a77cba3a79dbc096d98a2cd6382ca85315578600cf69c8550336902a73a37bbd7929ccd99fb4dfbcb309cae1780f664970d0af6d5b8 SHA512 ccde8352eb50adb9a2424ce30569259f692487f29f869298e9f175a6805b8e50fca2fd627188e4f97261ef99ff1132ebde20a9db10e35fabec04dc95c59a2db4
+EBUILD pkcrack-1.2.2-r1.ebuild 1077 BLAKE2B 3ec1a3eac544c67659276c412dfe9311643aa1f6d6c8489413ea4beb0d226e2cec08834a0de1e9daee0a96be7e5ff8717c0cf4ebabff4489f50a75aefbb1077b SHA512 2d18e8fe2dac4a843ce79de13669d378bb535e773245369c39cf9d99396ccfd37d152a83b44bcd622534ff6ce4fc504c28ce0f01773b6479cf9cc95dae54e3cb
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
index 4354930c7646..202b59ce9a9f 100644
--- a/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
+++ b/app-crypt/pkcrack/pkcrack-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -46,10 +46,10 @@ src_install() {
 	einstalldocs
 	cd src
 	dobin pkcrack zipdecrypt findkey makekey
-	newbin extract "$PN-extract"
+	newbin extract "${PN}-extract"
 }
 
 pkg_postinst() {
-	ewarn "Due to file collision, extract utility was renamed to $PN-extract,"
+	ewarn "Due to file collision, extract utility was renamed to ${PN}-extract,"
 	ewarn "see bug#247394"
 }
diff --git a/app-crypt/pkcs11-dump/Manifest b/app-crypt/pkcs11-dump/Manifest
index 8adfb91e3ec1..d1e21e654aa2 100644
--- a/app-crypt/pkcs11-dump/Manifest
+++ b/app-crypt/pkcs11-dump/Manifest
@@ -1,3 +1,3 @@
 DIST pkcs11-dump-0.3.4.tar.bz2 255715 BLAKE2B 61545d1b929f47799fa1c3f2591b245b7dadf70df786d7c3574109e66cab407449ec158e2bf29fcdce2238bc316029293ee9f37586367da971f1a8aa777bc015 SHA512 b38dbe8d7b04d7227592c90f6de815da7a030014df2f5f18d8c81587a742c587424a0eea3a1c8ec6e5c8c8f6dccc144130b91c57bef3d5882ee161629a97781b
-EBUILD pkcs11-dump-0.3.4.ebuild 492 BLAKE2B 721d41e557a7d1d6bf0bab3cb064c5cc401cb5d0e12d343fda4afa85b4b103648646244f52c078412d89dad5940b6dd580c72e24ee8358fc516e30fa385b2b7e SHA512 b63b2e3ed5fc56682e42ab76292141d6e1f0a4f5f23bb8c0159cd6779580fdb70109652d8c1bd3a2d5862422a22173f237a9da5d372b8c068aac17ac3310f505
+EBUILD pkcs11-dump-0.3.4.ebuild 421 BLAKE2B 12fa9a0016a25c5e9b68efff9979f0535a2e56ba896dc8ba734abf04f5535707a669f90b8281badacf00cf091eef9f7b65ae16c7a578cc677337de27122aebb3 SHA512 b60fed2aa502442fb3038de175df265ac8e813e9e5fd3cd4115b3c41736cb8232d47ff59116ab8d1bdc633524761ca9a0fced0ca3c49a1e3901fd5ec6832d42a
 MISC metadata.xml 307 BLAKE2B c3761947b71d701b45ebc6d4fd4037ea0b166c37b4a36a63b90ba6212da18a01af423f63da55073f4a6868848451aa6003a2b6029d6ac5177e04fd27d1427bec SHA512 aa1c7499786a9fbcd5ed05f88175e7ebfefc8adb56ab4cffcb515e8a35d67b42e237cb4af66e41f1af5031e41a3764c3e462c3ed8e7379e5233034f401242b37
diff --git a/app-crypt/pkcs11-dump/pkcs11-dump-0.3.4.ebuild b/app-crypt/pkcs11-dump/pkcs11-dump-0.3.4.ebuild
index 03d0686f84ff..e25474affeb2 100644
--- a/app-crypt/pkcs11-dump/pkcs11-dump-0.3.4.ebuild
+++ b/app-crypt/pkcs11-dump/pkcs11-dump-0.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,10 +12,7 @@ SLOT="0"
 
 KEYWORDS="~amd64"
 
-IUSE="libressl"
-
 RDEPEND="
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 9c49bdcc6526..8a13c035bf5c 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -5,7 +5,7 @@ AUX unquote-cc.patch 791 BLAKE2B a872b7a8e8d2e04f5cf3dda0b4f4aa5e0177878942f9836
 DIST rhash-1.3.6-src.tar.gz 328097 BLAKE2B c74993d183f0f2e479f0bd5831a9f653b9bd17bbed4d1ba896f6e33db98b7141175cd3c688dc41dfd8ec4b98acb51255ae5b795435cbc9dfb5ab77573cb25543 SHA512 54f7f238ed1fdc01c29cc1338fa86be90b69beff0df8f20d24ce9cb3c48c7f4668b84a3fe0d4d8b04b54bc8145485d493435edf3219de3a637af0f9c007c85c6
 DIST rhash-1.4.0-src.tar.gz 406433 BLAKE2B 2af437cd3a049bb9473825026f8a6476c81b4400a47638c62ee3ecb3d3984f7f9fe97def91488094a2919e5baad967d3f49ec7d95363896e270251ad085bacac SHA512 2f02487fffe8d1bc70c4454829bbd250a15fbd09db5ef85c54d3e8ad1008e84616ea54483292deae45047a27964e27b26d9b3da8447e7c37dac1e2ce18a63a07
 DIST rhash-1.4.1-src.tar.gz 413274 BLAKE2B 2027bccc677e8a1766f0624e67f475713653ddb4be457f9c8434c45019bc730934ca860e69f8b8e1fec349e724b1a366df0f5fb98501c825b44f9b8105068ff7 SHA512 30bbef7ce7815ee4ac062c537206a0b895845f61de4b1fdc0c0494f66284d9f3c1b06f812ea913fa35a3342d230d25d0986a1db644c7b4464bc1185997beb638
-EBUILD rhash-1.3.6-r1.ebuild 1896 BLAKE2B 53b74b3f4ce0c752121e027b3daf5c2ee55b67f1bfc060c9bb05e08b467c5d70500ec7bf32fc09d7cd639a0fa452069eb27c14809b989ba2f1e2500a04237b4f SHA512 eab05a2c123ded4b5ae5df7b2270810a22b26683c9354ff6dcf55e77341c7029c88699f92b1e59efe44e120ede061c9ed703901841551df258639604499cfe1f
-EBUILD rhash-1.4.0.ebuild 1934 BLAKE2B 34ab1bfe7b69a38f92c3eb4b3d86253a638fe1e6185ff394f800281ca5f073d938464348cbcfa756f2f570ce043de6d1f28437e9b975a7042144f196b842bdc0 SHA512 c034859f7681bfae06503384d293463e93f08cfc40d7c767b6765ff31060408219229fe408e0d8203f07abce50d109ddeacfef3b623f8123e0fc79bc15209ebc
-EBUILD rhash-1.4.1.ebuild 1966 BLAKE2B 06ea00deb5b5dbdc0bbccc91662291e9400d835f5f47d59fe178a9fa67642d3962f6c4a99b573d5c77ffd25f0e2566c84515724ca7cb4d8526e278bd5b565610 SHA512 501942f02fce48f6e0b5a7fe1a473637d57a20f92678872dd5caa97f53e6b42b096d5f8097e8eb05d663aae053f569d12367b4d8f636489422e26547bcee0dfd
+EBUILD rhash-1.3.6-r1.ebuild 1815 BLAKE2B 25d7980d3736edd66242acec9de12ef8bc434993a083dd2e12b3f382ca90aefbb42d4e96b35b6c42c106184e6956c8e33aac424d2272e1ae7eb77ead02f4d5af SHA512 15307b2110d89a05d3afdb6ee43a87f3ec33c921d7796cc73831d2d60c7e25df7531a73badb5a9721aa010b58dba74f1536bea7b7c9ec283e2a7ad1e430af1c4
+EBUILD rhash-1.4.0.ebuild 1853 BLAKE2B e2307251210a5bd8f37c2c4f2fb1a3c3987a9f8b9b72d454e71620a81d5de46ab70f5e7b31520827fe13ed82c1fda46b06bdc1e0c54bb77e5b24a37ef026172c SHA512 ff01f491ef52ec9372e825eef2b7504ae5c0f10494968c9d51c00427f1cb9ec51f229c8926c666b7cb3198f9c278d5cd90452ec4978e825efa2f949ab65bc11e
+EBUILD rhash-1.4.1.ebuild 1885 BLAKE2B 65d6c7be3d3db04a2f43f1c1f4614ff3e812e56895ed7e0e0f8824e28a718224614366d08def5d1cb8f480744061b28ef00f08fe61e1859756af5cafeb0e282a SHA512 01e111abd4f61534bc6fef1ed0b76a085e377b698b0350855218e772927bc8adc557cc4e37928c9860649f775995a7e4da296bdb722b4589a5af13e3a4ef3f6b
 MISC metadata.xml 816 BLAKE2B bb6057383b42281881b70331deed4070724bf10bdd00eb8329d3f3133329aa47d8d64ea66c70500dbeb8f92995f527b012dfeadd96d5c2a1eb73ff0ceb20f43a SHA512 ef3d1b671c08f7f1e1394675f626fc399a7a07dbefaa1a4ef1201052db524f2063efca3470b0d4f58a03cb8a49bb086e37b0bb8357cfc761107b1d6563e79263
diff --git a/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
index 4afea509f752..9dfdd81943a2 100644
--- a/app-crypt/rhash/rhash-1.3.6-r1.ebuild
+++ b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
@@ -12,12 +12,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="debug nls libressl ssl static-libs"
+IUSE="debug nls ssl static-libs"
 
 RDEPEND="
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 )"
 
 DEPEND="${RDEPEND}
diff --git a/app-crypt/rhash/rhash-1.4.0.ebuild b/app-crypt/rhash/rhash-1.4.0.ebuild
index 84b05ebc648f..4efaf57147b0 100644
--- a/app-crypt/rhash/rhash-1.4.0.ebuild
+++ b/app-crypt/rhash/rhash-1.4.0.ebuild
@@ -12,12 +12,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="debug nls libressl ssl static-libs"
+IUSE="debug nls ssl static-libs"
 
 RDEPEND="
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 )"
 
 DEPEND="
diff --git a/app-crypt/rhash/rhash-1.4.1.ebuild b/app-crypt/rhash/rhash-1.4.1.ebuild
index b69637e86bf1..4aa5c894ec98 100644
--- a/app-crypt/rhash/rhash-1.4.1.ebuild
+++ b/app-crypt/rhash/rhash-1.4.1.ebuild
@@ -12,12 +12,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug nls libressl ssl static-libs"
+IUSE="debug nls ssl static-libs"
 
 RDEPEND="
 	ssl? (
-		!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+		dev-libs/openssl:0=[${MULTILIB_USEDEP}]
 )"
 
 DEPEND="
diff --git a/app-crypt/simple-tpm-pk11/Manifest b/app-crypt/simple-tpm-pk11/Manifest
index 70a202566785..83175cd217cf 100644
--- a/app-crypt/simple-tpm-pk11/Manifest
+++ b/app-crypt/simple-tpm-pk11/Manifest
@@ -1,3 +1,3 @@
 DIST simple-tpm-pk11-0.06.tar.gz 28993 BLAKE2B b592acf3d9fe334993ed1e72152ee2c0a25ea3be777035c2d113323522f7d99e6c564bd7c4de0725b0f04f5b6dad90c5a35ede815d28f40a3fb53a6cc9e2bee6 SHA512 72df0637cefdb0d81f741480cdfe24ac0d6a05a93d729f5e2180adf49b5d7ddb0b60d8c6f7d5e79a67bf4cea202067390c8d4532c906273408f7de4fcc5e66e8
-EBUILD simple-tpm-pk11-0.06.ebuild 947 BLAKE2B 62dd3828660d735379a55f04ace2642fb45dfd0d13d4aec16c1defd8dc2ba98e6583b657dfa71f0ebb5f4adceb3d16e0f3d024a1ca3eed035c2251cbc30e966f SHA512 239f471bdc2c303bfa889c4495f5ea9282355e0e33883fd71ecbf90ec77c6d287629d7a4d747c45479cf5208dbb6a93cbb1fd70503b04695fc1e176a6a07f362
+EBUILD simple-tpm-pk11-0.06.ebuild 882 BLAKE2B 205739cc139761ecca35fad72bb1678c05820ecd1d353a48063363e96be7a02a848095c31890a97aec53e07381b9cb93df93cb101a520bea66be5562e6c0eabd SHA512 e99db2ce4ad995f8edd31cff1c690c7d10307b29892e89b4ae49f5abaa2f8ae1ee787bd36e6d0d9bb49b5d57b4eafd5b3bb5d8123217c78da8c0a1a80ddabb90
 MISC metadata.xml 321 BLAKE2B 9c1c93503ca5eb24ab6d0e3dd069579d7cf822370225650d20e24b6138b6528dcb7e5529edd13a0608f0eb0b2214a951b1e4ce4c5cddd5600193bc708e28c4ad SHA512 63c4d2aa10132a2aca7da87d702c32e37f2205dc99ff6c743662a0fba6026602d5865e1a27a8f51e68976c7543829512f21f4cf29bbee61bed7d0d6c3c00a8f0
diff --git a/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild b/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild
index 5cf849aa0d26..64abb36d4de1 100644
--- a/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild
+++ b/app-crypt/simple-tpm-pk11/simple-tpm-pk11-0.06.ebuild
@@ -18,14 +18,13 @@ else
 	KEYWORDS="~amd64"
 fi
 
-IUSE="libressl"
 RESTRICT="test" # needs to communicate with the TPM and gtest is all broken
 
 DEPEND="app-crypt/tpm-tools[pkcs11]
 	dev-libs/opencryptoki[tpm]
 	app-crypt/trousers
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0=
+	"
 RDEPEND="${DEPEND}
 	net-misc/openssh[-X509]"
 
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index e9c69b43aba9..f1d94d0d0d69 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -2,5 +2,5 @@ AUX swtpm-0.5.0-build-sys-Remove-WError.patch 431 BLAKE2B 8b0d63dcab783a322c72aa
 AUX swtpm-0.5.0-disable-test-dependencies.patch 696 BLAKE2B 7cbfb36e82b88d125dabaab8508803cde8b4fe414b1bf0e193421a7632597baa3142dcefa1bd53c7ebe6fea529ad827fc65bfd42bd617c415043b795d5c36c15 SHA512 32931311e8a4c57ae167379db5ff3decc5c1b3b891f180e6ee4991a9cf366ac26049c2e3eabc434eef3890635317f2f2cb1a80cf827a4c3e44fe76943665e85c
 AUX swtpm-0.5.0-fix-localca-path.patch 1318 BLAKE2B 1d8c7367cdc92232d13b4169e387afcd7247ffbdc785cad0d4e40ca9ee7710036f4a7debc1c6112afe255b19422a32b76f72efba04840136f28a72d241aa091e SHA512 e327b581dd1cf9bf92d400fc2574a585ea8708ba6b7e2c89fe368cfc990e464773900488736944b0f97cfd6e65b6aebf39e55ef22428fcc2510c8205ef77d738
 DIST swtpm-0.5.2.tar.gz 309436 BLAKE2B 0518e59b052c9224d5db1c2720f74ff15717468f73b1665e67c017581dd2b52d7a4cf28f94a932eb6068de3bc50f2e5710b8c447e4a08e6b4a31019db542d910 SHA512 4554f1b7a534829f9fbef4a09e190f1d5e91692d270f4f668bd6ef79799a4186a38db172e37a18be9f203466e2d7c9cdf3a350c0020d25ff6126128085ebe3a3
-EBUILD swtpm-0.5.2.ebuild 1778 BLAKE2B 6e1ee3a3b5bf294ed8bb63466d63e4e6f89d7a55dca83f3c30ad305fdf0bc766dcd87251693806f93f0a1bfd8697f612df77c2ecb46c1c5ba2c83c56e48471b5 SHA512 109bab163b9fca1815cc7535f93cb38c0ade8389f76778d57dbb00f4b60a02096b12f6d9cd2468fbbffc698d160fbb6ea8b270d72f261b5fa238167ba6b063b0
+EBUILD swtpm-0.5.2.ebuild 1671 BLAKE2B 77939c42e9a89167ed20027d27d13aa3b200d53b4d71d98fa67d8b2c10eb40e33ac90c060d83a27681ca4d289eadab7000ce125d02fd37f5f6c4acee821e7504 SHA512 6c1a9763855f4ac13233199e14e473ad941e88770541a925f05ce60707c4ab2c7a56f6b29390c4fb760a41516d8baac7575674d713d3893d1078c165c3d9a01b
 MISC metadata.xml 490 BLAKE2B efa6dc113d2c387e4fdf3b35a694c8edc3505129fdbf732f6441a68ce3195f9b45db52881a06ff3660a8309986a6298706d6aac22ec918d4c45ae45e6a401efe SHA512 cb8186df9ed31b7fb526bcca4eaeb97335385143bf303f9e42b3005d9f37e24838e9e3b874cbaa7663d0777513b52fbe1738c7c52b208c9c8dde5d5260f738e8
diff --git a/app-crypt/swtpm/swtpm-0.5.2.ebuild b/app-crypt/swtpm/swtpm-0.5.2.ebuild
index 7cf67bd70dff..0042a1df1f80 100644
--- a/app-crypt/swtpm/swtpm-0.5.2.ebuild
+++ b/app-crypt/swtpm/swtpm-0.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="fuse gnutls libressl seccomp test"
+IUSE="fuse gnutls seccomp test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -26,14 +26,8 @@ COMMON_DEPEND="
 		dev-libs/libtasn1:=
 		>=net-libs/gnutls-3.1.0[tools]
 	)
-	!libressl? (
-		dev-libs/openssl:0=
-		dev-libs/libtpms[-libressl]
-	)
-	libressl? (
-		dev-libs/libressl:0=
-		dev-libs/libtpms[libressl]
-	)
+	dev-libs/openssl:0=
+	dev-libs/libtpms
 	seccomp? ( sys-libs/libseccomp )
 "
 
diff --git a/app-crypt/tc-play/Manifest b/app-crypt/tc-play/Manifest
index f739d28b031f..4d60fd2b06f7 100644
--- a/app-crypt/tc-play/Manifest
+++ b/app-crypt/tc-play/Manifest
@@ -1,4 +1,4 @@
 AUX tc-play-2.0-build.patch 677 BLAKE2B 1b0f8372a6e94a7ff2cc3c1236855d6d1973172b78586e6ee72f29723841aa700ece23be1c985b00c37196da20ea18c1b30f13d0e00fa8de6bf603cfce769110 SHA512 0f41f59b8fe4376f5d48dcb3e3ca76698b141924b6f0b3768eb46238f6d597f2a8cf3c6aa840bba57ecfd61337182eb48e627fc1a04b348849e8bc5346c82e9b
 DIST tc-play-2.0.tar.gz 1015525 BLAKE2B 1481eecc8aaf2cb9698eed96a9cdabaa2b74daf11865dd29a6fab7e66fb76aa2f6e544fe7ac53a2510415ee6ddf3c5732c774a26708fe354113eb9de6a9b62d9 SHA512 17408b2a664eb6822c77ede4f38ca67cdf643512014619d830a2c024bb8971811eded4edd65f6398d6112a3b57cd11a5b414357878c817c9cc2aac9d851946d7
-EBUILD tc-play-2.0-r1.ebuild 1153 BLAKE2B 0df2277e3499661225ea83f24ed5473b321c5d6e6f2a52bd4371fe8fc1ff4d1fb191d7bdd704b6ab95acf956b71ceff8310f2e00170823adff889562bbd19594 SHA512 fe0388c49dd139cf7cd6f1f65bcfa7d855a42576f57d374dc49bdb3a2197aa1ebcde9f5bd572abcc35dac0a3b0afe701dfa30d96bf2de459a2107c38f67b4282
+EBUILD tc-play-2.0-r1.ebuild 1089 BLAKE2B 64a2d9fdd8f0373cdafc82f377229455ba55b2e82b34be71d9fe2383150937c720a672f5d90e7a50fe5a2245b4a7ffc1f394b2126814e5d0cd6c6a261c5fc8c3 SHA512 2ac2ae7977d49908af62a823cf7d54000078463cc91abc4c372c2e4c181a883b46120d3320b471c5cdf12de7f017ecd65c730fbc7b7f93cfed6c6c5514e78e97
 MISC metadata.xml 251 BLAKE2B 76f6eaf0ebfcb190eb467addc7fc768de01e2e9666de3b7597c1cc208e2e03c459924758d50dc72d0017b240ed489f31b824f9d27ed962552870597c8c2bf591 SHA512 8e0f23146bd61c8f9c60d29c77a589306fa5f33c54fed7dbd8555b09f56c1c83ed4f80aaf54900bb2de962c578ad04557bb12ea70356a17a9250baf551e1e3a1
diff --git a/app-crypt/tc-play/tc-play-2.0-r1.ebuild b/app-crypt/tc-play/tc-play-2.0-r1.ebuild
index e0576be90fa5..b8022d5f11a9 100644
--- a/app-crypt/tc-play/tc-play-2.0-r1.ebuild
+++ b/app-crypt/tc-play/tc-play-2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bwalex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="gnutls libressl"
+IUSE="gnutls"
 
 DEPEND="
 	dev-libs/libgpg-error
@@ -21,8 +21,7 @@ DEPEND="
 	dev-libs/libgcrypt:0
 	gnutls? ( net-libs/gnutls )
 	!gnutls? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)"
 RDEPEND="${DEPEND}"
 
diff --git a/app-crypt/tpm-tools/Manifest b/app-crypt/tpm-tools/Manifest
index 60fe11e5a7bf..1d95906cb0e6 100644
--- a/app-crypt/tpm-tools/Manifest
+++ b/app-crypt/tpm-tools/Manifest
@@ -1,6 +1,6 @@
 AUX tpm-tools-1.3.9.1-openssl-1.1.patch 6028 BLAKE2B bd7a7b3dc748618004cbbfb7dc51a6f4e3f1c53654193b227c4b3eccd75fbb6d22ed46241a3e201399daa418d58cdd5b124cc2a467f8f59b4b33f54394035602 SHA512 caf3f9a3f82073d71618305132b883ab51ba3220d30ce5c160b9785bcb2e7268cf47621381530d39e1641e0b27bfeb30dcbfd62ae235d82d07942824f533cc7a
 DIST tpm-tools-1.3.9.1.tar.gz 482859 BLAKE2B ee915679e23bead04672bf719ce59bb6f20b550be39855b5304caeff554bf54d3cfe9104d464af7762388995e51d2bed0f9bedad83e42146cb7457382d09f4b2 SHA512 63a9c0e761cd890cc0a218de79a9c0169e151aba7824c19bf6b7ec894cf41c4950de1f63bd849aa93a4bdff36cf0fe557bc17113912b6d77f57f2bf1190b6a08
 DIST tpm-tools-1.3.9.2.tar.gz 431930 BLAKE2B bbea3848765d9907c6faa1b5f4a60002e94243040985ce503f392bc8d7392bea41b54317b15fd227b5d73d589cf2c330729532448751d4375484375725310dfa SHA512 b684716c71702140591d89eb03d3724ed5b448e7ba2881bc44de9d44ffc23a9f7dfcf4351eec24e5438cc883f49a7dafee82bb19f90800610cf764ce74e60ccb
-EBUILD tpm-tools-1.3.9.1-r1.ebuild 1014 BLAKE2B 709a67933038725f0d5f13c01f022784036980b4fefce6c6409b5dfbf1e688cda1602a44ca38ce6db09a1cb56a84e15366e0f70c241cf6aee2bd6ac9f47595f4 SHA512 96f5e4867454ed666a95fb843a1540514d6114bb40e7df7b6b11f5781851bbae7cf473e7ae0fc5ee361d72d620f57382cde33ee8d777bcbd5e9ffccf68e39d61
-EBUILD tpm-tools-1.3.9.2.ebuild 1157 BLAKE2B 5814481a8573971f5d89f795b02fb09a7c559772f55302a2004d4e45d3e65128448d0e454497f0696e319d632ea972500e29f865dbedc7c530b27b349a71f788 SHA512 4a34636c6382cdee294d9ff29f127a6d44df6d6e8041fd1b4d4952b641256ca03f8557193463ce4d10c6383322b8fb2d91692fb9fe4104c68252e58d0cf087c1
+EBUILD tpm-tools-1.3.9.1-r1.ebuild 954 BLAKE2B f53bed313b12de4bd985c76d168a110a5f2e66448afb39636f8ccbef173810ec2ce60d0a01a39fb289cdc82b723237e58091b4f561668b77e28144d141592969 SHA512 045475346c2c8778ce588cf8fe893c24eca0c9d6ecf27161a2807f35d47737ba75f16d44d7b3c244b5ce35dc382a24c52ba3bd9c72e48bff9dfd8d488465a40e
+EBUILD tpm-tools-1.3.9.2.ebuild 1097 BLAKE2B 3e282abba4f574492567fcdd94862d6d7d5bdfe2bd31d9098a53f2c65871d18ecd4a4ab946a0cfb0f5ecdf54bb65a4db20dc6815538de615b4394213ed231554 SHA512 615fadc763d95435872c4080c03f0bca4fd812809bb5e197f86e3e8f5a64c66092f93efb91555669c7445cc0cb2a2585571d75f29390b86ffd8536acd4ba06f7
 MISC metadata.xml 654 BLAKE2B c388739d8b8fb85ee839287ea4e62fa2b2c1b3fc62f3cf7bc82b4a81b5efb6182fa64155ac3888abf6633ed91467742e592454293efbb73bd4f705c4a86b652b SHA512 474f94adb9ab6dcd659a9ddcc55d4a39231be947056f0e4140394302abc41d864543351ae733c6ae8fc02561b52f51df00fc588cf6df2010089ff05ec2be26f0
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
index 90690f256485..2f87a05d5456 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.1-r1.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.1-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
@@ -12,11 +12,10 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~m68k ~s390 x86"
-IUSE="libressl nls pkcs11 debug"
+IUSE="nls pkcs11 debug"
 
 DEPEND=">=app-crypt/trousers-0.3.0
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	pkcs11? ( dev-libs/opencryptoki )"
 RDEPEND="${DEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
diff --git a/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild b/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
index 27bfb41b11f5..5c3f6dd63c64 100644
--- a/app-crypt/tpm-tools/tpm-tools-1.3.9.2.ebuild
+++ b/app-crypt/tpm-tools/tpm-tools-1.3.9.2.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
@@ -12,11 +12,10 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 LICENSE="CPL-1.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~s390 ~x86"
-IUSE="libressl nls pkcs11 debug"
+IUSE="nls pkcs11 debug"
 
 DEPEND=">=app-crypt/trousers-0.3.0
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
+	dev-libs/openssl:0=
 	pkcs11? ( dev-libs/opencryptoki )"
 RDEPEND="${DEPEND}"
 BDEPEND="nls? ( sys-devel/gettext )"
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 41e85eaaaf46..d436c7a6c4c4 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,8 +1,6 @@
 AUX tpm2-tools-4.3.0-Remove-WError.patch 360 BLAKE2B 440f48fca6e8aaf9b2c0fd094011738c467a22dc31bd94b53f6788b8fa52c00c5d7ebe074434be60b6370dcf1e94ee4d57bcfc93857fcf03dbdff30c8e157445 SHA512 0d246d1446b5b2ebca0e12467c746a731897311448840a7aac35b57d22edcdec0c9f424d1c95c9614d969a57dba458bbbad8826516cc05329b47d2dad05318fe
-AUX tpm2-tools-4.3.0-libressl.patch 978 BLAKE2B be1cbcf06f6db5e4e916ae708d9e70d6ebf52f296e3328bdb05200aaa6b7a62610909675c7b1f72ab4448ebc8b08180f436fde21dda7cf65aa07d1e112e97d28 SHA512 6d6b6c3d433d92398c341823f163128ab6eca96d328a0efe50f690dcefd854b8a1b7a00ba99bb4fb8978b53674464d76bfca55d079a48088833499263a0ced51
-AUX tpm2-tools-5.0-libressl.patch 1473 BLAKE2B 3ac960f6fa0ae111bb540bac3ccddc3d4265d3d8c39500a1bd47c3e5b229bdf2765ed320a69a34accf6bbe9a2cb003ee306c061739c0af8d6171b9dea8ec9305 SHA512 b919e236da02a81c8b9a0498667ef345ab4dc1d3d56f28bb84f5f177919ea2173fcdc91b4538e85e7899f293fadd982a35bb36a92da8b28650f0b686c9dca575
 DIST tpm2-tools-4.3.0.tar.gz 881544 BLAKE2B 0415f30845658e84e97a964abebc3082e45fb880c10bec405cd89c7bfa373ace10b669c4af78e7e47f2d2bb62fc7cc34b2e54e392a95c8f9b8956b8c92af6aee SHA512 4e622bbc8642ba7fd93a7343900560fe3779cba03e363d16f391fc8929724a11913d238e3986de06982cbced27c3c2ca8c7e73d75796407b8646c101ccf393a8
 DIST tpm2-tools-5.0.tar.gz 990855 BLAKE2B 5d39bbef0bc6f0d84f37c64c697260343a9f9e134bce015a6b529176195adb907672f35b85382b0a4785e40e368030ac347083086c3799bdfe86dced1ac69848 SHA512 ea57a28a61e28b78cae7067ff58facd8754fafab7a2689fd93f8b3374073b6ac30301a75f8ff5c654800ab469ee6604d0b8a86c310631b9545b816ecaa05968e
-EBUILD tpm2-tools-4.3.0-r1.ebuild 1169 BLAKE2B 8e0636426eb9aa2f39464c9c191e58b7af188b6dd01c8b40586abc393425425a427eb481d8c7dfbf335aa63e84d1962f7280f4589fc158e4021c80b20bf7a1eb SHA512 b5df4e5816e4d5135d94d650fdfb4bcddaebf370187da397ad72d9ecb816693cc274dd96989f60f3e1a713da60aed1deb397ec955227be7a161c49c734704762
-EBUILD tpm2-tools-5.0-r1.ebuild 1167 BLAKE2B 059a93934c3154258b9fc32fb7f002d54e4feeee76e0e6d22cce8828ae61a244e0aaa85682b30824e9c7dffa16f0293bf32aacbead026d8fd2ce6efd78c8c8f9 SHA512 d0afe0b7c39ee438de039432ad226bb65d1f98a9687ee4c81955288fc7e3e24f3c395ba6c07a0d6d685d26ac376b982befb0c9bb7386260031aac4a1bf330796
+EBUILD tpm2-tools-4.3.0-r1.ebuild 1052 BLAKE2B bf435ee4ce938f58cf82a835e4940c2044ee179a574e575fad1124222216c4d1147d302b9fbe95165303326758e7145112e120f7d1f70c0750fc62b75d4db1c2 SHA512 85155fc93543892a19be80b0826f20fb38be8cfe84ed2e4ae957e2c36bd075126b635fe54f848785aa866c0a22e1e7e19378a22361c30d3fba4f922299cc3048
+EBUILD tpm2-tools-5.0-r1.ebuild 1052 BLAKE2B 42570effe76926a3c413d3515393329b3825a5fb7dc554132e08e0a50628b4e102bae85229ae878ea0abf2a9d3c1587b112d1f66c20b70da502ce22bad2ab38d SHA512 f4cf500e38fca6b2617f19a515ccc48c7829f939a997681c2c97576b6ebd5e4737b004224939021f43682a0568c522212d8788388221b2369fbe43e158aabb8c
 MISC metadata.xml 559 BLAKE2B 6c0842aa4bbd95d2047bf3ce11c99fad96491481bbe52cdd81d0d02085d97799129ab5a249925c88c20afc1fba8890fb1809a1809a2c2c23e62bb36673031c98 SHA512 6fe7716a5db796b958fee79d65fa04b32196985f503bfb11ff4790c95f118fb5ca14cc9b4ef59b94caadc60c30453b629c6b93918fde505404646a0165947f5c
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-libressl.patch b/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-libressl.patch
deleted file mode 100644
index 88948546353f..000000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-libressl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/lib/tpm2_identity_util.c b/lib/tpm2_identity_util.c
-index a3b0e387..9519ca7b 100644
---- a/lib/tpm2_identity_util.c
-+++ b/lib/tpm2_identity_util.c
-@@ -17,7 +17,7 @@
- 
- // Identity-related functionality that the TPM normally does, but using OpenSSL
- 
--#if defined(LIBRESSL_VERSION_NUMBER)
-+#if 0
- static int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
-         const unsigned char *from, int flen, const unsigned char *param, int plen,
-         const EVP_MD *md, const EVP_MD *mgf1md) {
-diff --git a/lib/tpm2_openssl.c b/lib/tpm2_openssl.c
-index 6d29c0d4..bd375ce3 100644
---- a/lib/tpm2_openssl.c
-+++ b/lib/tpm2_openssl.c
-@@ -14,7 +14,7 @@
- #include "tpm2_openssl.h"
- 
- /* compatibility function for OpenSSL versions < 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- static int BN_bn2binpad(const BIGNUM *a, unsigned char *to, int tolen) {
-     int r;
-     int topad;
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.0-libressl.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.0-libressl.patch
deleted file mode 100644
index b41c9f50e272..000000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.0-libressl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/lib/tpm2_identity_util.c b/lib/tpm2_identity_util.c
-index a3b0e387..9519ca7b 100644
---- a/lib/tpm2_identity_util.c
-+++ b/lib/tpm2_identity_util.c
-@@ -17,7 +17,7 @@
- 
- // Identity-related functionality that the TPM normally does, but using OpenSSL
- 
--#if defined(LIBRESSL_VERSION_NUMBER)
-+#if 0
- static int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
-         const unsigned char *from, int flen, const unsigned char *param, int plen,
-         const EVP_MD *md, const EVP_MD *mgf1md) {
-diff --git a/lib/tpm2_openssl.c b/lib/tpm2_openssl.c
-index e769d6df..54f124c9 100644
---- a/lib/tpm2_openssl.c
-+++ b/lib/tpm2_openssl.c
-@@ -15,7 +15,7 @@
- #include "tpm2_systemdeps.h"
- 
- /* compatibility function for OpenSSL versions < 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- static int BN_bn2binpad(const BIGNUM *a, unsigned char *to, int tolen) {
-     int r;
-     int topad;
-diff --git a/lib/tpm2_openssl.h b/lib/tpm2_openssl.h
-index 46c8f9c0..71206309 100644
---- a/lib/tpm2_openssl.h
-+++ b/lib/tpm2_openssl.h
-@@ -17,7 +17,7 @@
- #define LIB_TPM2_OPENSSL_OPENSSL_PRE11
- #endif
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L
-+#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER)
- #define EC_POINT_set_affine_coordinates_tss(group, tpm_pub_key, bn_x, bn_y, dmy) \
-         EC_POINT_set_affine_coordinates(group, tpm_pub_key, bn_x, bn_y, dmy)
- 
diff --git a/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild
index f9edff247c56..01663f80cd57 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-4.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+fapi libressl"
+IUSE="+fapi"
 
 # Integration test are now run as part of the testing suite, which will fail
 # because none of the supported TPM emulators are in Portage. In a future
@@ -21,13 +21,11 @@ RESTRICT="test"
 
 RDEPEND="net-misc/curl:=
 	>=app-crypt/tpm2-tss-2.4.0:=[fapi?]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	sys-devel/autoconf-archive"
 PATCHES=(
-	"${FILESDIR}/${PN}-4.3.0-libressl.patch"
 	"${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
 )
 
@@ -42,5 +40,5 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable fapi) \
-		$(use_enable !libressl hardening)
+		--enable-hardening
 }
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild
index 375c04e216eb..344be726c386 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/tpm2-software/${PN}/releases/download/${PV}/${P}.tar
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+fapi libressl"
+IUSE="+fapi"
 
 # Integration test are now run as part of the testing suite, which will fail
 # because none of the supported TPM emulators are in Portage. In a future
@@ -21,13 +21,11 @@ RESTRICT="test"
 
 RDEPEND="net-misc/curl:=
 	>=app-crypt/tpm2-tss-3.0.1:=[fapi?]
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	dev-libs/openssl:0="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig
 	sys-devel/autoconf-archive"
 PATCHES=(
-	"${FILESDIR}/${PN}-5.0-libressl.patch"
 	"${FILESDIR}/${PN}-4.3.0-Remove-WError.patch"
 )
 
@@ -42,5 +40,5 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable fapi) \
-		$(use_enable !libressl hardening)
+		--enable-hardening
 }
diff --git a/app-crypt/trousers/Manifest b/app-crypt/trousers/Manifest
index a9fbdc6851d7..d9bb1c92fd17 100644
--- a/app-crypt/trousers/Manifest
+++ b/app-crypt/trousers/Manifest
@@ -5,11 +5,9 @@ AUX tcsd.service 131 BLAKE2B db7995ca078c6008daba2bee50b892d5ae0fceb184c966f6757
 AUX trousers-0.3.13-nouseradd.patch 606 BLAKE2B 7e4a479fe1bdc75f743263c1321f2d99cfe99d04d8196b57a158bd2ce75335526b2001c2af8aa0f8b17ddfefa304685e237385be0bc4113d5ca366dd464fa85d SHA512 a6c9074e535429f09ce5e850d943378348b54bed479b7fef0fff7bb18ab2547421407900aa35533749a764275a241ddbd083c4e2f3d6a9ad6f9b1d40d090f783
 AUX trousers-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch 746 BLAKE2B 91dec77a329a4931487cdff54ab8c77ae302af6bc741da3db61bc34b416d29615808799c8a4c5b39a293021dc1cc16642461037fcb367507ceadcc4456565715 SHA512 704a87fd4b5e50356ac6a0ad68aec04eebb2030d9818c9e23a40f2e621d6e2d5e5660b81997b459e67a8059a0d88a254a41baa833806ce99268ee24b1190ae0b
 AUX trousers-0.3.14-fno-common.patch 385 BLAKE2B 7ed20c894c4687275804adf8d820227e5b246f02880d38b29dc6a17d12a4932059f237913f8d1841d56ee32c652cf732c01e77cd1235255b8e2fc28bc9a78027 SHA512 cf771b065d972b9974c93ec67a471a8ed3da737178a14b2d14537ee7948544bcbf071201d42d6e2b1333a3c30e8104cd1dbb344327a424597e5046e50137a692
-AUX trousers-0.3.14-libressl.patch 877 BLAKE2B 6416ecf1cf99678299e4ac39756920de61e598ec9b9c91c17cf8eddfa10af145b813756e2fae3b39fef8682eeb2ee722b3979d52570f41b99708fb4ba2cebe2d SHA512 3aba9ec7554d4fdb941063f771b40c5700efefdbb6e5df186824e93a6b2c61801acb4be60cdbe71dcee9360c0f59229e5d17f1a18aa981132807b5e74efc2d59
 AUX trousers-0.3.14-tcsd-fixes.patch 2203 BLAKE2B 8085cfd36817e35d54d39a012037945440fcae6e5040f7a7fd35a3c814df93264382a87eb06758b6042b64bef851ab3d5f5e424c2b946c0d1eaa92ebb97a733f SHA512 cc2827ed501cc29dcadd00537161804a62918c9dc703b2a773227aaf74a695d026b44c70848819a78b01cc785831117ae9dfa1d4c30133241b97dd32e8e838ba
-AUX trousers-0.3.15-libressl.patch 1018 BLAKE2B b762dfb984f84644e04076aeab8317555961103e0eb9c19e6b9fc5b5635054f0d53121e94d4887cd804628dcedff4c62362298a1bf7f520ff6c5eff6db769745 SHA512 9b0b01a326cc0149ace71f045a38a065e2ca61d640321b253dfc905c81913c97788922214cfe949e871dbf98c5487c61e023032a137b2ee70a4c45f7e1f03484
 DIST trousers-0.3.14.tar.gz 1378438 BLAKE2B 3dc2824fa2ca1b1f1181f98d59e85276e7d38af4bfc07ee8246431d9ccb300a8e0820b318643d4cf5d757d2a49492c8686e2fe9de03484263d2189d4bbaa32d0 SHA512 bf87f00329cf1d76a12cf6b6181fa22f90e76af3c5786e6e2db98438d2d3f0c0e05364374664173f45e3a2f6c0e2364948d0b958a7845cb23fcb340150cd9b21
 DIST trousers-0.3.15.tar.gz 4699936 BLAKE2B 53c60498ed6a9d3d87295b00676e5d0d82452918c35af6b98c7979ffa2dc04dd817e7cd3f4a33ca17c30b90eab53d80b2bb25306fe9db7bda2125019edfed280 SHA512 769c7d891c6306c1b3252448f86e3043ee837e566c9431f5b4353512113e2907f6ce29c91e8044c420025b79c5f3ff2396ddce93f73b1eb2a15ea1de89ac0fdb
-EBUILD trousers-0.3.14-r3.ebuild 1673 BLAKE2B 4c86cb8c9764179850cb778094a3dcdcbd4775955858981e8d5ce958217f51e2d6529059e31f61149156d517fe2f3179f7d85ae9a4724f3c2f1aa9c34da6bd84 SHA512 555038110e4fe3ff35c5fbfb9d1f35e3f72345dbbd31381b0de9a4f09404c1241456088d185c5dc2d94eda55d54277820d9a8145493b8499f1734bfb7f6413e2
-EBUILD trousers-0.3.15.ebuild 1597 BLAKE2B a402299093ac80756a929fd82b503c5ee718969fb4676a83d58a027ae3b2174bdc988d6a7e505ba64a5e9057143d7e2601e8698ca078bc2f8a4734aabc1d3c3d SHA512 1ff94752e3051e2d469e0f73f094ac7336b41b809cabaf8781925889da8f0d23bf52cabb9c0553c75c4a176a2351f58d8a32cba53acffff4ace5366ce913d29f
+EBUILD trousers-0.3.14-r3.ebuild 1580 BLAKE2B 7dcebd1140aee67cc63e4665afd2bb030bc44339ada7dcc6f9f5dbc2bd1f010c3eef573ae3ca35e8fbcf1450ce6e2a3539bc13479c3f5dbffcd81f96f774e107 SHA512 c62b0f19be4be398c94220be992c933595ed4c6182bf135458d8090695ed831be1f219ec778edf524dae7383e0b83f731bd829b57c7007f0535e0cba273fd827
+EBUILD trousers-0.3.15.ebuild 1504 BLAKE2B b7dc45d5813c0715e8250658a20848759645732a1028ed13313e71971b6c172708eeb6f729a07e788808da854b3873e78d64ad494f88e6bd3bac2fe6c7f63e3c SHA512 6ffc7fbf06f80fe96583f9cc9f42a4a88b84aa47e9110f8d548943c240ab13fd58cf416ac3d6b3b5ebaa6de6cd47d88e0f1a70c887ae9e0caf148b2fb55b9ff6
 MISC metadata.xml 541 BLAKE2B 11de571e9140dcd8c4b9c8778415d17c3c71a12f36ec96d74fa3f562d8d4f189a02e138a8ea9146d8df02e1e539237bf22a042f97c1b83e231f0302833d532e7 SHA512 4befaa1a46b211424a26034a22b068fc6443c66fd7ccc1dcef6657b86710cfbfc4533f5fd0f88484e463dc2f0d9f154248e07329455216a76c0f72b45e53d373
diff --git a/app-crypt/trousers/files/trousers-0.3.14-libressl.patch b/app-crypt/trousers/files/trousers-0.3.14-libressl.patch
deleted file mode 100644
index 9ee7c167e219..000000000000
--- a/app-crypt/trousers/files/trousers-0.3.14-libressl.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b8b1cda430270f03dc556cf9cf7d2fd478101525 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Wed, 7 Dec 2016 09:36:34 +0200
-Subject: [PATCH] tspi: support libressl
-
-Bug: https://sourceforge.net/p/trousers/bugs/222/
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- src/trspi/crypto/openssl/rsa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/trspi/crypto/openssl/rsa.c b/src/trspi/crypto/openssl/rsa.c
-index 2b1205f..3e56015 100644
---- a/src/trspi/crypto/openssl/rsa.c
-+++ b/src/trspi/crypto/openssl/rsa.c
-@@ -38,7 +38,7 @@
- #define DEBUG_print_openssl_errors()
- #endif
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100001L
-+#if OPENSSL_VERSION_NUMBER < 0x10100001L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
- static int
- RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
- {
--- 
-2.7.3
-
diff --git a/app-crypt/trousers/files/trousers-0.3.15-libressl.patch b/app-crypt/trousers/files/trousers-0.3.15-libressl.patch
deleted file mode 100644
index e4aee00d8d97..000000000000
--- a/app-crypt/trousers/files/trousers-0.3.15-libressl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 88e90ee4c36f0decdf7c15e271bccb8b0809a21a Mon Sep 17 00:00:00 2001
-From: Stefan Strogin <stefan@steils.org>
-Date: Tue, 24 Nov 2020 11:08:13 +0200
-Subject: [PATCH] trousers: do not re-declare RSA_set0_key with LibreSSL
-
-The method RSA_set0_key is provided by LibreSSL since 2.7.0, that means
-in all currently supported versions.
-
-Upstream-Status: Submitted
-[https://sourceforge.net/p/trousers/trousers/merge-requests/2/]
-Signed-off-by: Stefan Strogin <stefan@steils.org>
----
- src/trspi/crypto/openssl/rsa.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/trspi/crypto/openssl/rsa.c b/src/trspi/crypto/openssl/rsa.c
-index 24f13e7..cf46c08 100644
---- a/src/trspi/crypto/openssl/rsa.c
-+++ b/src/trspi/crypto/openssl/rsa.c
-@@ -38,7 +38,7 @@
- #define DEBUG_print_openssl_errors()
- #endif
- 
--#if (OPENSSL_VERSION_NUMBER < 0x10100001L) || defined(LIBRESSL_VERSION_NUMBER)
-+#if (OPENSSL_VERSION_NUMBER < 0x10100001L)
- static int
- RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d)
- {
--- 
-2.29.2
-
diff --git a/app-crypt/trousers/trousers-0.3.14-r3.ebuild b/app-crypt/trousers/trousers-0.3.14-r3.ebuild
index 70af34e9a2eb..72418a365fc0 100644
--- a/app-crypt/trousers/trousers-0.3.14-r3.ebuild
+++ b/app-crypt/trousers/trousers-0.3.14-r3.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 LICENSE="CPL-1.0 GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~m68k ~ppc ppc64 ~s390 x86"
-IUSE="doc libressl selinux" # gtk
+IUSE="doc selinux" # gtk
 
 # gtk support presently does NOT compile.
 #	gtk? ( >=x11-libs/gtk+-2 )
@@ -20,15 +20,14 @@ IUSE="doc libressl selinux" # gtk
 DEPEND="acct-group/tss
 	acct-user/tss
 	>=dev-libs/glib-2
-	!libressl? ( >=dev-libs/openssl-0.9.7:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	>=dev-libs/openssl-0.9.7:0=
+	"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-tcsd )"
 BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
-	"${FILESDIR}/${P}-libressl.patch"
 	"${FILESDIR}/${P}-fno-common.patch"
 	"${FILESDIR}/${P}-Makefile.am-Mark-tddl.a-nodist.patch"
 	"${FILESDIR}/${P}-tcsd-fixes.patch"
diff --git a/app-crypt/trousers/trousers-0.3.15.ebuild b/app-crypt/trousers/trousers-0.3.15.ebuild
index 041250710cb6..103c18d5498e 100644
--- a/app-crypt/trousers/trousers-0.3.15.ebuild
+++ b/app-crypt/trousers/trousers-0.3.15.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/trousers/${PN}/${P}.tar.gz"
 LICENSE="CPL-1.0 GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc ~ppc64 ~s390 ~x86"
-IUSE="doc libressl selinux" # gtk
+IUSE="doc selinux" # gtk
 
 # gtk support presently does NOT compile.
 #	gtk? ( >=x11-libs/gtk+-2 )
@@ -20,8 +20,8 @@ IUSE="doc libressl selinux" # gtk
 DEPEND="acct-group/tss
 	acct-user/tss
 	>=dev-libs/glib-2
-	!libressl? ( >=dev-libs/openssl-0.9.7:0= )
-	libressl? ( dev-libs/libressl:0= )"
+	>=dev-libs/openssl-0.9.7:0=
+	"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-tcsd )"
 BDEPEND="virtual/pkgconfig"
@@ -29,7 +29,6 @@ BDEPEND="virtual/pkgconfig"
 PATCHES=(
 	"${FILESDIR}/${PN}-0.3.13-nouseradd.patch"
 	"${FILESDIR}/${PN}-0.3.14-Makefile.am-Mark-tddl.a-nodist.patch"
-	"${FILESDIR}/${P}-libressl.patch"
 )
 
 DOCS="AUTHORS ChangeLog NICETOHAVES README TODO"
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index 96243ae4185f..5502bd36f494 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -3,7 +3,7 @@ AUX xca-2.1.2-bug-733000.patch 1027 BLAKE2B 2bdd30afcfd0f2bf49c2f259ae3f08ea2cab
 AUX xca-2.3.0-bug-733000.patch 949 BLAKE2B 32444301ee1a3e4cd9e31e0911df6fbb99866b3d81ebb880ae46816c9939f8ccf6f3e13bb2052c6619e567f2beb34e903ba438ba6815bbcca03f0cd5a38e4bca SHA512 515e1d1333e722bc22750ef084e0c01056687b28e4b3e78695da2273be3e1e5cb7dc56c5dbf4fb5a6f46bc1835b44a7697d5548223fe9e93c3ad183f1c333d70
 DIST xca-2.1.2.tar.gz 1086563 BLAKE2B d48727fffad16d840633af6e0ee38a279978a5b865eb6f391a3d852a0105817254ea0a4780875f2956e1f7e9931e6930c6ffbe82b117dbf8ad0058ec9d6f5c88 SHA512 1f104a22b83b802576b4820b7139971da50f9b3dd70aca8e1199e996bad4379b8681bb31b197b84a3dfa49cef4ae093f6622d15fac9667547ff47af43c1e5f07
 DIST xca-2.3.0.tar.gz 1354154 BLAKE2B 31a4ac96819e8d2f7e5f623cc343f0cbff18c931ed0699dbe093dcb963c3431a3943c4dcd8f3d727896104c05a565d062b9678169bf2a8d3f7cf7748c311b53b SHA512 35522aa308e1022a739f3255f13fcf63f481000f9b7411027a009a185e33ddceeb5cf9b55406a4899d2393c7e5ace10354ff24b3b2b0c3045d110f679756b0b8
-EBUILD xca-2.1.2-r1.ebuild 1484 BLAKE2B 11e7c94703b86123a93b7fa7f76f76c8bff680f15307206aec81f00beb26f8eb159eb0ce11eb4064d6a96fcca8298aefb4fc9dd483c998af8f6d818e2836002e SHA512 6d1f1a34562bbd093d99812e5e663b09061d2e5f4619fcc372c0fd524db97651a65da2c48159913b05d580339ab4625e6d4646433645da00090fe42d85a481f5
-EBUILD xca-2.1.2.ebuild 1444 BLAKE2B b349a5611dfffcd352eb3382cc731059424a37c553c5a859eb32c27bce8de5375f96ba4537d2945d96cecd2b0603200f45f8139a512c36dd1e9ab83ff3e25a3d SHA512 a87593bd09dab9e2afb41340f6e8d4383ae68a1ba9f8d5d122246b09c148efb62e25719823409b34d3d48103d4dc45e4d0b66aa3f87390b45d8ab25f5f72cabb
-EBUILD xca-2.3.0.ebuild 1548 BLAKE2B dcbbccbb3bf824f1024d914fc4f7af8cdb15e34a4da9c6044a159d9a4295bcd0e2f0257380aef995a782b5440171b80aebc9e6414579ca67b2e5e352474bd526 SHA512 d897a1ec8fb0904032b3de376b8b6fb5061e5eb6f5d0df90751d80c06b9e316a8d2c4b8b6a1ca3e02e291afc463bb2c263623c816e488a239b4eb1d631486f81
+EBUILD xca-2.1.2-r1.ebuild 1416 BLAKE2B 6c47b9688bbe8b54aca6edbbac615a2f1557d8837d4403e3c4abc2159d3533e1f81f55478c08c76be6e92f603db66bf1be8c7498e7fcc3e015eaa6cae1788b53 SHA512 03874b6887280ba383165399fb48bcadaf17a438fb3a697f326d6e9be19edb81729ccdf8f86a996bde1bfc74b99efc44858e4347bb7a3656d9a2b7b0c3705e79
+EBUILD xca-2.1.2.ebuild 1376 BLAKE2B b249dc3c5b82b70088e9409db84b054a554cf68244acbab981fc052316f551b0bf8a66158ad2d5c2da5d04e185cda8182011dc4de2afb355202048dbc8d98222 SHA512 3d2b284d556247e5ddd77cb66ce04f355a74da03762f7a24f6c726a76fbada6a326cfd462ee17116c62bb4d02b936dd57b2d40c5e0f4437e4226b526c3b1dd3a
+EBUILD xca-2.3.0.ebuild 1480 BLAKE2B a5efc1596061b2915d9284bb174a1e152d072f6a01aacf15001556526e20fa1211d68012818c9e36fd60869f25783279a5b33c61db52d1973f0d2b2c7f5db6b0 SHA512 3b200a401fdcf7dba039afb72026e7da2417a6760c30f9be3786d454094d294f5524e40918700bcfefe2b72563424a54db5767235cc0dceb4ff96cc32d761b53
 MISC metadata.xml 350 BLAKE2B 825e045b03a40c1b9a3c5af631d1748532ad4c84e83d0efd1d4866c5cc1284afab67f1e3e00a2c31a376a19d4e4608404a5830ab1a8a738079a3b6128f5c9bad SHA512 fd4e95bcd679b22bdfa620896e81e0a63bc6f084c60bf42caa853f9dcef2c797ff640801f206caceb6969ee4e347492200b37af4920c50c9764a3bac48910cf3
diff --git a/app-crypt/xca/xca-2.1.2-r1.ebuild b/app-crypt/xca/xca-2.1.2-r1.ebuild
index 28e0f2da477f..755e7ee6ef44 100644
--- a/app-crypt/xca/xca-2.1.2-r1.ebuild
+++ b/app-crypt/xca/xca-2.1.2-r1.ebuild
@@ -12,15 +12,14 @@ SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bindist doc libressl"
+IUSE="bindist doc"
 
 RDEPEND="
 	dev-libs/libltdl:0=
 	dev-qt/qtgui:5
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
-	!libressl? ( dev-libs/openssl:0=[bindist=] )
-	libressl? ( >=dev-libs/libressl-2.7.0:0= )
+	dev-libs/openssl:0=[bindist=]
 	doc? ( app-text/linuxdoc-tools )"
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5"
diff --git a/app-crypt/xca/xca-2.1.2.ebuild b/app-crypt/xca/xca-2.1.2.ebuild
index 42650c37c676..6ef6c2e59091 100644
--- a/app-crypt/xca/xca-2.1.2.ebuild
+++ b/app-crypt/xca/xca-2.1.2.ebuild
@@ -12,15 +12,14 @@ SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bindist doc libressl"
+IUSE="bindist doc"
 
 RDEPEND="
 	dev-libs/libltdl:0=
 	dev-qt/qtgui:5
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
-	!libressl? ( dev-libs/openssl:0=[bindist=] )
-	libressl? ( >=dev-libs/libressl-2.7.0:0= )
+	dev-libs/openssl:0=[bindist=]
 	doc? ( app-text/linuxdoc-tools )"
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5"
diff --git a/app-crypt/xca/xca-2.3.0.ebuild b/app-crypt/xca/xca-2.3.0.ebuild
index c7ef3f20b62d..e2c67855d292 100644
--- a/app-crypt/xca/xca-2.3.0.ebuild
+++ b/app-crypt/xca/xca-2.3.0.ebuild
@@ -12,15 +12,14 @@ SRC_URI="https://github.com/chris2511/${PN}/releases/download/RELEASE.${PV}/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bindist doc libressl"
+IUSE="bindist doc"
 
 RDEPEND="
 	dev-libs/libltdl:0=
 	dev-qt/qtgui:5
 	dev-qt/qtsql:5[sqlite]
 	dev-qt/qtwidgets:5
-	!libressl? ( dev-libs/openssl:0=[bindist=] )
-	libressl? ( >=dev-libs/libressl-2.7.0:0= )
+	dev-libs/openssl:0=[bindist=]
 	doc? ( app-text/linuxdoc-tools )"
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5"
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-04 22:28:33 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-04 22:28:33 +0100
commit	a978c074e4272bb901fbe4a10de0a7b2af574f17 (patch)
tree	8c764c1cc0576389ce22abd317bceba71ea5732d /app-crypt
parent	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff)