gentoo auto-resync : 01:02:2023 - 21:05:47

14 files changed, 14 insertions, 107 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 00470494b8ca..9dddd3e7f5a8 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/cxxopts/Manifest b/dev-libs/cxxopts/Manifest
index 9dbe1a526c64..b7ff260ba45e 100644
--- a/dev-libs/cxxopts/Manifest
+++ b/dev-libs/cxxopts/Manifest
@@ -1,5 +1,3 @@
-DIST cxxopts-2.2.1.tar.gz 89561 BLAKE2B d7fb74cff9b9381d90827fd3e3bcc7dab8b4dc100b9ff12d98ff4c73400c187c04c270d8c5a019c88e553f8c46c59eda1e5076a1aec944e7d8af5ca6de2326db SHA512 bad2928b4e06efcfa09728dd946426e4fd39715b687c0a5c7b6308dd366cb490fdd8491c9a9778242d97d5be4a383bf9d1c209efe298c6c43bb1eb9daa103f05
 DIST cxxopts-3.0.0.tar.gz 97020 BLAKE2B 129b055dd03ce9e4a146d36587063f7155b47456d81e395ae6eeab8012e8d6cfcb410c305353f2ac2ec66a2f3e8d6169e1a0d27c53dcb35388b967d3c9cc86f1 SHA512 239479a3b35ddef6fc380ac9371e1cf7e3aea066f03e1ea538151fa2fff4296838daa976d55e988d8f87f40c0ae027767bcb214754177499413af1081315565c
-EBUILD cxxopts-2.2.1-r1.ebuild 739 BLAKE2B a2bfac6b66d5dcb52a3c600a70f6db44d435426456b6788af57e345c90ff50669a5f38a59c637f180b9145dd8a82b41f28f22f71d29d0aaf50f443642c382530 SHA512 47462252ee046feeaaf5d20a2ad76d7f36c315427c569b5c30bf166b4d826f32de5b75716ac4babd56c90ca4111834d0fbbba0a4f47a30606c04576ba2e92f17
 EBUILD cxxopts-3.0.0.ebuild 798 BLAKE2B 35a8a811ffa693666ff72def3aa0a6aeb2ff92a41385706847ac2bc61cac31c552d93688c792560a7190e14392dd323be32b04f8abb18c07ee61b9590fb49f47 SHA512 c656f4ad9cb800470aec85c170eb57ab1e29aeb67ea3e58b3d15bf1b3a78b83776a78edd9e3f64b1f6df15d3834266ffc5addd39a146b3d136212760cfecd1c6
 MISC metadata.xml 250 BLAKE2B 0b272f56e53b7d76c6d5c253fbe5d7c4c9a1d7b58c21e2f59b8323a5f5cd2791c64651fdfa243a8f560ac9c0a0ff38fcffdc24290fa6d18100da0cadffc19845 SHA512 076f0dbffbab6987cfab48a5ff3631789190c570c35515cc77de5757760f19a8ad615f642e7d61b12344ffc77c599e6ff8b79b67329e69929fdd19a7c80723ff
diff --git a/dev-libs/cxxopts/cxxopts-2.2.1-r1.ebuild b/dev-libs/cxxopts/cxxopts-2.2.1-r1.ebuild
deleted file mode 100644
index 96b57b0c39e8..000000000000
--- a/dev-libs/cxxopts/cxxopts-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Lightweight C++ command line option parser"
-HOMEPAGE="https://github.com/jarro2783/cxxopts"
-SRC_URI="https://github.com/jarro2783/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-DOCS=(
-	README.md
-	CHANGELOG.md
-)
-
-src_prepare() {
-	sed -r -e 's:-Werror[[:space:]]*::' -i CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local -a mycmakeopts=(
-		-DCXXOPTS_BUILD_EXAMPLES=OFF
-		-DCXXOPTS_BUILD_TESTS=$(usex test 'ON' 'OFF')
-		-DCXXOPTS_ENABLE_INSTALL=ON
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/ell/Manifest b/dev-libs/ell/Manifest
index 3a88d9631238..c6c544af783f 100644
--- a/dev-libs/ell/Manifest
+++ b/dev-libs/ell/Manifest
@@ -2,7 +2,7 @@ DIST ell-0.54.tar.xz 562496 BLAKE2B d5aa705d0a72068c18b4f7f2b40c80069fc4d8a746a4
 DIST ell-0.55.tar.xz 562716 BLAKE2B b49acda837e22dec8469423dd47b397471975acdb0df034f0d85163daf0eb393b9bb75b1dd81c6e8a395e271bb0b8da01939df3497983aae5b6d270a70dcd5fc SHA512 f71b7d20a37009842ae54b72463e4c34509d00f0c344ae3b39acabe784fee83027d04b3f272f51dbc519f82ab794837b9a24ca90da55b97c757725d030c1874e
 DIST ell-0.56.tar.xz 563096 BLAKE2B 3be874ddddab558911d5ea4e4fb0b32c1557b8577435f39ee88d7302bbb0efbd24671f6c426bbeaba2704ba45b865320e6f2e31f6a9c4d86e82dc8ed38ebae9f SHA512 7255470331927f67ebd1297e6c524c9c244234cf00923016c77d90bad5e4e381605c70373a7be4ecf9c1e72ec85fbc1671960dd31fb6eec279f2299e81c66ac1
 EBUILD ell-0.54.ebuild 1175 BLAKE2B 0725c7bec06368247ba9f365c8d6e6f9ea7649d0348d458158b0547c5fb1993789e2465bf2fc2c1c407a0c88488309e27210f3a59f7c7e0e15222fc96d0e8046 SHA512 4a7387f689ef514e39a78b7a323c4cc1096c183df9c1ee1d8ca04efea946f1ab21460faa6c4928d1a6166a8da00c86209b2416eb3adfc37b23a53b9e07aa0861
-EBUILD ell-0.55.ebuild 1179 BLAKE2B ac4b474e2eb5fa6de0af92b4fdf794e69353af88b82c751a2752a55317aaf1496f298f6cb9260d1e60304bda469bafe373f537da6c2d69126fb1243a67f32247 SHA512 cd22bc330e0df9ef529ff379e086b165e0d210326def360a0e1f363683ff2cef93a581e9543eb274c1d4b5b17990089f2194d4f32f11cfdca0c412890000ddea
+EBUILD ell-0.55.ebuild 1178 BLAKE2B 1230e8102454b68f3b87a616090aa3dd85bab9c4f2f78f858caf6d828ff3357995f7f6b7f430f4a78eb5a8ae436b028571bc5c6146ee551eaf28e85aefcc77bf SHA512 4437a86e98f45d8a88e3b3eaa1bbb1e88083a98d983acd2f33436245e4d941a58b96869251a0110f283a06424269b706579c59c90e281473b2fb2e2284fbd57a
 EBUILD ell-0.56.ebuild 1181 BLAKE2B ea1e8d57acdf4be79b60a48f6daf017a907524a7333e87fc5e6d9f4d7c5a9401e048927108de73509d0624e3c9ab65fc906d732ab3b99bf04ce0afb015bf4fc8 SHA512 2f7402b95da0e45596462ead53e6184865f96e9325f2d4fb7b590454a976e7dc827c7ce45d7ccbed951257441ebbb72df50559f0d1d94a8677e714e4a7e1c4c2
 EBUILD ell-9999.ebuild 1181 BLAKE2B bcebe8f38618d85d8fddd3c401b76096bdbcb7f2798540f6582c1e56af78cdebf02f4295d60208254a6d2232bb6061372b6eb2dc12331b8384c668012da91430 SHA512 76571ec809fa9584c1d72dbae3f859db318ce061751a1e7d72e05febd9c715c918da5c30637c8dcfbca81ab038c54401b6f49f0e4cce2a720a24185c6915699a
 MISC metadata.xml 251 BLAKE2B a9af03a4a233a890a554ab68f1876580e3720a72c1f946ea6dbb82c49afd94243ea4017cd8a392fa2adea53c588646fd0ebccb948dde0340ec2ff05c0381fb99 SHA512 0837c31655f6a725b0fad20c8998a3a4645dc8049e14980b0097776cf59b4288276489dfddc149893f29844175eeb187a54af7d28690de4afe18ef9fd4c1f98f
diff --git a/dev-libs/ell/ell-0.55.ebuild b/dev-libs/ell/ell-0.55.ebuild
index 78d149e9931b..a865da2e6d3f 100644
--- a/dev-libs/ell/ell-0.55.ebuild
+++ b/dev-libs/ell/ell-0.55.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/ell/ell.git"
 else
 	SRC_URI="https://mirrors.edge.kernel.org/pub/linux/libs/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 LICENSE="LGPL-2.1"
 SLOT="0"
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index c951dc113d7d..53bb8ba3f13b 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -5,5 +5,5 @@ DIST pcre2-10.40.tar.bz2.sig 310 BLAKE2B 9609111a64b66893b12e36d1cbc77b64d6a0cc3
 DIST pcre2-10.42.tar.bz2 1799866 BLAKE2B 40aa096745548c489a00ead87a191a4d24ecd924a5b8f00401c1273176de15ccb23510882467c8e2b5c1256b97db46fba5fcdfbd9f0d61d86a29d74bb4bca7a0 SHA512 72fbde87fecec3aa4b47225dd919ea1d55e97f2cbcf02aba26e5a0d3b1ffb58c25a80a9ef069eb99f9cf4e41ba9604ad06a7ec159870e1e875d86820e12256d3
 DIST pcre2-10.42.tar.bz2.sig 310 BLAKE2B 2125d7e23f7e75847573e3caeb8d55da5d8e0df3d166bf8b638b998aebacaefb4e88df7e813d6977af2dc7d82c93b7179ad0043c4f46fc4e06d99d214b0b7fcf SHA512 22ce3c7903835b1cf835ac6cfa725badecc982f1504382e62525c88307b2e3bd8951f2221fdd3d73920843e69f714b6df99fe741069e610f1f809087512a31f7
 EBUILD libpcre2-10.40-r1.ebuild 2967 BLAKE2B 0c087143613d9e99ab1af30739b9cd8c27e1f9c574e4095cc4bf8493dcb28b0c5c9fb3e5d8c489c1a15808f1be29bb5442489c4d230a902dab67e5586f7af993 SHA512 ff546db5cbf866d3d2a15982e1b7dee4a2d00ac815cb5125911d726969482d31360895a943fb66b7ba4e79d500d00d4e47942a341a05e21f22d166a89b92bf40
-EBUILD libpcre2-10.42.ebuild 2513 BLAKE2B 073101ecedbb55f1197f704f54c7a8ec5f0a29ff4f3a9397f9c112c4b2b1acf27c1f30a0d8c656e77ba55ca683ac4dacbc2a7c63cd68ed41c4dc855d792f5da5 SHA512 5efdf5e18d03021abb488d4809a9753133a34d666cd9ba350fd0dc905229696522b8194cfe4158ead417efc3157cd0525487896257c683fe45f4c261f26ce94d
+EBUILD libpcre2-10.42.ebuild 2512 BLAKE2B c44df75f4d381bce3179efe02d4e6c944f3505db5530fe196b4fe16cdf56086954035a08f76578f215e4f8a54929020a75434cfc5fffcede613bb7d2238d0f9b SHA512 ab3707f37ec7c50312fd642fe23726abe8b3d7513b3759d30b4671906518e7ba7e971c500f25a47e0002284e0690453487e88128c63cadce7b3a54b7aa7b511d
 MISC metadata.xml 1087 BLAKE2B 693e7f9a4d9cac7b2aa5f24804826f79135a0475770b8ef5058b09542c3b19d30ddef438029dc0358b997ebc032ab103432b1274723c81882f1b5359455c765a SHA512 74dcb822827b8cc3e86c525ab3e2ee302d39ee00d5b4515f9fd6f4a157ae1522a2edbd08b97c2950d9370878f41eb59e414a145d6beae430dab57ea10df68460
diff --git a/dev-libs/libpcre2/libpcre2-10.42.ebuild b/dev-libs/libpcre2/libpcre2-10.42.ebuild
index 36611df4065d..4576a28073fb 100644
--- a/dev-libs/libpcre2/libpcre2-10.42.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.42.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0/3" # libpcre2-posix.so version
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~loong ~m68k ~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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~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="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/openpace/Manifest b/dev-libs/openpace/Manifest
index a145369fdbe6..5f4ba97a972b 100644
--- a/dev-libs/openpace/Manifest
+++ b/dev-libs/openpace/Manifest
@@ -2,5 +2,5 @@ AUX openpace-1.1.2-openssl-3.0-1.patch 630 BLAKE2B abe24552c9a8fb48b20636c7c63b5
 AUX openpace-1.1.2-openssl-3.0-2.patch 2175 BLAKE2B faba644f0c755c265dd0ee6f3aaa1174822bb5d096d8622c7bcd6efce36b850dcd8bff73907b9f9d0fab9b600420fc385f76b3ba957ae9cb869bb7ccecae87f3 SHA512 1e6a9607540c8d20612552c82ba87e72251294196f24b52a1ec1ab8f8b05504486260563d68b8875f731db4eb58f75bf8e511bec473daaf49a43001c6e4fa06d
 AUX openpace-1.1.2-openssl-3.0-3.patch 589 BLAKE2B 7274798a790a266efca33b3c804e8944669974b3216631c0d9b5ea9c142c55b9e1cce56248994e11d3b0fe61765f7c8ef6755550f0cf437d47d6e3f4e5dde30d SHA512 2dce1b61dfdb22947cb64521f61820a4de064e3f143e0fc0b7d1059ec3595e0d674a6fb02234e1856c5a3a29722a52820d8709e7a2b23fd1682d18954e6836da
 DIST openpace-1.1.2.tar.gz 3040254 BLAKE2B 4320b0ec01e80379f8c6b1812af6e7b09a8305a448caf432735554d05380b2f29133e92bffab62ad31077c410eceb5d0c68d65343394ebc24aa92dbefe321549 SHA512 812852300cee2ba021809b6c1caa686ecb7fe3eb23bcc7f4c0ce34258460f685bd70027f62f046643710bc549c0037af80d26d7089dd71341818ec7ec1db8d94
-EBUILD openpace-1.1.2.ebuild 995 BLAKE2B ad020e6360c45b508b47be8fb2f323f0ece8fd63ba188fedd2bcbf71f75d8786a275f49f676efdc59d42a5c68d08b8fe7698022fa8454e1a98c3e54c34f6cced SHA512 f57d3cbce53ef4413bf7c36f970f2b9fd7e9692d015e730149208e132984f267069e02e4290b0dcd0b357f0b37ed01a1e8aa75adabf2888c7e0d6e9ff33f9dc7
+EBUILD openpace-1.1.2.ebuild 1002 BLAKE2B 2c1b5a8110698f7ece5fe82eeb72d434f89f9dc9dfea710a8ccef5eac22f5224792674f8b546b87732177fe793ce64b7f385842bcd44d61aaba0e01b5ffbdf14 SHA512 58885a7244d161d9dc3213c86e834bfd7c1b45d83171dd144f9dcdcf80295221e54971469ac51f9e8e43c1414dbe6090730989c850d0dae39ad469424f866ed4
 MISC metadata.xml 331 BLAKE2B 4152c2350a69f9d5907917ef5d385da95cedcade149594c682724de55c823da8667a14880342142024a511a3f9aac9dc56d672e7c44888756e742c560b906cf5 SHA512 80bb084ebf352a333c438a6a7cac48387d5a0e285ad7859dc76111d85950cb8ecf6fc80e07befde77c02a44bde8f19f375b48147e76749e602e3bf58a4d3f46b
diff --git a/dev-libs/openpace/openpace-1.1.2.ebuild b/dev-libs/openpace/openpace-1.1.2.ebuild
index 71a45675d0f0..9943443da1b1 100644
--- a/dev-libs/openpace/openpace-1.1.2.ebuild
+++ b/dev-libs/openpace/openpace-1.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/frankmorgner/${PN}/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="GPL-3"
 SLOT="0/3"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 BDEPEND="
 	dev-util/gengetopt
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 20fae234b931..6b4dc38cf555 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -2,5 +2,5 @@ AUX opensc.module 390 BLAKE2B 4c5ea159ed2038af51c9ca3e903b23db1acdfa8a6c79be7f92
 DIST opensc-0.22.0.tar.gz 2287020 BLAKE2B 74e4bb6843b640c5a397b820a52180a34159c330f5ecb81af166096f23e2499ef1a4d555b5d71613da57ba121d0f984dcfdc2ba9491f26f826a423725a2321e2 SHA512 70ad5f1219f2ec2a5529a30d8e9955510c77c87d0bc857d5951c7227c75cf9de1c6071f43dd3816a2034123ebd902709793ff776e84d5379fdd54c811ccfaaee
 DIST opensc-0.23.0.tar.gz 2366469 BLAKE2B c0f74379a70347a58be27684ae2cf833e6f35328b566af2c6daa8276174864406fa176acf7ba84931970fe07e3dd8d6eccf7884f079cb0110c4d6ff9a76792dc SHA512 cd102cd64e719c59153960a4921b7525055045f16e6f6ffa8c9def6ce999a9c5098267b41f8753b41107f626bea20c34561002f5d38eddb4ce6b371913a17a1b
 EBUILD opensc-0.22.0.ebuild 1590 BLAKE2B 2c7a622f626c78be1310af078205ee09f95a4abee16e4469f119296a340c573a32033399c84ec0dae6e4e524249a9288dfd59c9059bc5d983f68177841cf37d1 SHA512 624397c0bccce33471d9d1e665303262906240faf9d63d264156a6a8ee93b7e3be1682c7ec3221972dcca12affe8594c75030d0296286ede8fde225840d07daa
-EBUILD opensc-0.23.0.ebuild 1708 BLAKE2B d737d9ef9a2e3c6adfe351af0d7edfcad8a01599a67ac82d235dc2e1f96050e06d1369f7e176f54989afb0cbf45127b6beab4c97438fe83170a9af6b7dcbe56f SHA512 c33839c178b9a248a3609c13eb30edcad731ace29242d68038d0215a8b53c79fe7152df040e8df00607625f4d0eaecdde791dca11c262774ccec467732701832
-MISC metadata.xml 1309 BLAKE2B 3b8582f3491a909bd4c2f4f5b1bc7e6d111abf9d3908ea3c913dbde122a4668750a14b3717662f22989db86d468efac3a234b94a8a2ea58214cb8a9033798066 SHA512 65c9ad2a9b6e053b44af40f3b8d489a63437c13ec9c8efe966d5d3a3445a2bb1992b440702ce957e664c7464a0af35adbf056db1690875ada58e25a903be90a5
+EBUILD opensc-0.23.0.ebuild 1703 BLAKE2B 0284057863776df2a51c8877a5faf3f75ab12c8b5cde1367202bcea2a5ea080d3a3e49d10700df653db0fbfcaf19ced1d1cb9e19daf57a0f2f10183a451f66ea SHA512 38ed155ed7ffff130704d8def43547e8755ccd18f26229f1d93a94e66fc668dc08df505b79a4d45651e1c096abaeee79de629e6585eccb19da7a416dd366e98e
+MISC metadata.xml 1305 BLAKE2B 8560829a2784e38e10b41f5e083568a7fafd19e9fe185b1675c787b2514ea01a18b3fa6c7d0018b6e45638512d02e9bec12fbc5df4e50bf49db6558ef89a9af8 SHA512 8b477d96f6acb7a808e24af1d4b29e16e06b83eaf29799dbc6b74181ded74de47d7527712e21412bfb92a26e1d03974368a2c1790208785230280a18d21aff06
diff --git a/dev-libs/opensc/metadata.xml b/dev-libs/opensc/metadata.xml
index 58a0aa27c2a1..67d2c026ef02 100644
--- a/dev-libs/opensc/metadata.xml
+++ b/dev-libs/opensc/metadata.xml
@@ -19,7 +19,7 @@
 		<flag name="ctapi">Use CT-API for accessing Smartcard hardware</flag>
 		<flag name="notify">Enable notifications</flag>
 		<flag name="openct">Use <pkg>dev-libs/openct</pkg> (and CT-API) for accessing Smartcard hardware</flag>
-		<flag name="openpace">Use <pkg>dev-libs/openpace</pkg> for EAC version 2 support</flag>
+		<flag name="pace">Use <pkg>dev-libs/openpace</pkg> for EAC version 2 support</flag>
 		<flag name="pcsc-lite">Use <pkg>sys-apps/pcsc-lite</pkg> (and PC/SC API) for accessing Smartcard hardware</flag>
 		<flag name="secure-messaging">Enable secure messaging</flag>
 	</use>
diff --git a/dev-libs/opensc/opensc-0.23.0.ebuild b/dev-libs/opensc/opensc-0.23.0.ebuild
index 1a356b477973..663f56e2d091 100644
--- a/dev-libs/opensc/opensc-0.23.0.ebuild
+++ b/dev-libs/opensc/opensc-0.23.0.ebuild
@@ -12,14 +12,14 @@ SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="ctapi doc openct openpace notify +pcsc-lite readline secure-messaging ssl test zlib"
+IUSE="ctapi doc openct notify pace +pcsc-lite readline secure-messaging ssl test zlib"
 RESTRICT="!test? ( test )"
 
 RDEPEND="zlib? ( sys-libs/zlib )
 	readline? ( sys-libs/readline:0= )
 	ssl? ( dev-libs/openssl:0= )
 	openct? ( >=dev-libs/openct-0.5.0 )
-	openpace? ( dev-libs/openpace:= )
+	pace? ( dev-libs/openpace:= )
 	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
 	notify? ( dev-libs/glib:2 )"
 DEPEND="${RDEPEND}
@@ -49,9 +49,9 @@ src_configure() {
 		--enable-man \
 		$(use_enable ctapi) \
 		$(use_enable doc) \
-		$(use_enable notify ) \
+		$(use_enable notify) \
 		$(use_enable openct) \
-		$(use_enable openpace ) \
+		$(use_enable pace openpace) \
 		$(use_enable pcsc-lite pcsc) \
 		$(use_enable readline) \
 		$(use_enable secure-messaging sm) \
diff --git a/dev-libs/s2n/Manifest b/dev-libs/s2n/Manifest
index cd48984552c8..2a95353f462b 100644
--- a/dev-libs/s2n/Manifest
+++ b/dev-libs/s2n/Manifest
@@ -1,6 +1,4 @@
 AUX s2n-0.10.21-remove_Werror.patch 1292 BLAKE2B 208aab54784a956003c0f23564d07124476149f9a36fce40c6404ea79956479ba2a589bcb75808adae67c4f50ba78ac5fb72d21429248a515c9c84bf5faf5930 SHA512 4f8cbdfeeb7dfa514750083e1be4481f5ffe1e30ff88915b5c7eff2494ae534c454da51a0c56d720be66b5ce50900135a4e17f66a517ec437a027b01c9fc0fd0
-DIST s2n-0.10.21.tar.gz 6150129 BLAKE2B cf598ef02b4aa9a2a69f11a47b2a691055575b7398ba0a833081da704ebc7564d30abda5f2ad9ff9858ec2f553b1f332e913494b9e195e2a754f008bab5c11d2 SHA512 26957edf36af088af2cb355dad9281fefd9d54ce8c3c2c26f5682aee8d64338a3677aa81f3a07563b27a938cad2c57e0a86a478c9619cc93552674451d501909
 DIST s2n-1.0.0.tar.gz 6211951 BLAKE2B 3714f26ab0dbd53b878c73e0ae0abf9e8a4b85b16a62dd44a3e6264fba1afdfdd7bbffc3b38b494c5cc805b8a9dfe02009d109e308ff13b4752a56594299f374 SHA512 ab5ccc3e73e7f395ef86a5e637b9c2d18110c14b2913990d12e02286f6562497f7e9d45912e9076216e5f595d7932d58a31642e344a5e472259386983ad44bac
-EBUILD s2n-0.10.21-r1.ebuild 1405 BLAKE2B 7753f0760192d00b82d295e18ab1ea003d06c40304985fa88a4c6de4a4b268be74cce87f4a57db1161ef9c69f7c24f0b284e31becd905159ada72d9eefe2e4bb SHA512 32486eb0d7409b924ae52e8bb2f5fe588006bdf019ac7b0b623ec105888ff80ab877885f00b8052ac45f2fa17ef39e6a613e5b1e0c15356970dea6e7a2f7401a
 EBUILD s2n-1.0.0.ebuild 1464 BLAKE2B 6e9f8dd8eacb367179f8befe9ccdd7f30d3bc630f7c1a5db625bba4a14c4aefad07f0e7299bf97e119df8a829d82821180c6ca32625828a759875f6323ddf23c SHA512 dfc7be95cbd3f5c25ab2eb7b0b5ca85e44af2dbdba159a32ab8c2559a75f45a3eaa44fafa8710702091da7c1aa50505112edc4b0f53655538fe342b2249dbd1f
 MISC metadata.xml 1569 BLAKE2B e80ea6463de43d3de9170ef9b37abe41fb718ad2c6cbdce4c22c5ccdabcb336c7e579f2644c6aa22eb1cc1bc66d43e16ec528e5e3f0ebc04789f80f3a9e8bc3d SHA512 c90833b553ddb8f199faf7588dc3ff6d94565591b84e54c67f4340364cdd5eb775103c3a29450bfcb28f149111bcd5c2bad4a8933f3a948f1d8f1729b2b35e88
diff --git a/dev-libs/s2n/s2n-0.10.21-r1.ebuild b/dev-libs/s2n/s2n-0.10.21-r1.ebuild
deleted file mode 100644
index 90d26fa86c8c..000000000000
--- a/dev-libs/s2n/s2n-0.10.21-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="simple, small, fast and secure C99 implementation of the TLS/SSL protocols"
-HOMEPAGE="https://github.com/awslabs/s2n"
-SRC_URI="https://github.com/awslabs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/openssl:0=[static-libs=]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-remove_Werror.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Fix
-	# QA Notice: The following files contain writable and executable sections (...)
-	sed \
-		-e '$a\\n#if defined(__linux__) && defined(__ELF__)\n.section .note.GNU-stack,"",%progbits\n#endif' \
-		-i "${S}"/pq-crypto/sike_r2/fp_x64_asm.S || die "sed failed"
-
-	# Fix shared library building, needed for USE="test"
-	# See: https://github.com/awslabs/s2n/issues/2401
-	if use test; then
-		sed -i -e 's, -fvisibility=hidden,,' "${S}"/CMakeLists.txt || die "sed failed"
-		# Remove s2n_self_talk_nonblocking_test, it is broken.
-		# See: https://github.com/awslabs/s2n/issues/2051#issuecomment-744543724
-		rm "${S}"/tests/unit/s2n_self_talk_nonblocking_test.c
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=$(usex !static-libs)
-		-DBUILD_TESTING=$(usex test)
-	)
-	cmake_src_configure
-}