9 files changed, 6 insertions, 100 deletions
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index af66c8615120..2ce5c45bc2d8 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/jwt-cpp/Manifest b/dev-cpp/jwt-cpp/Manifest
index 0ea92cc67532..0964604d5b57 100644
--- a/dev-cpp/jwt-cpp/Manifest
+++ b/dev-cpp/jwt-cpp/Manifest
@@ -1,4 +1,4 @@
 AUX jwt-cpp-0.6.0-gcc13.patch 284 BLAKE2B e7ed4329fe924206433c0e6e44136f8e06ded871f7e6fe85c3506901a58b316e9f79690776840ec826ff0f211b5ff72b9c2e68b946e34512afb8deefc99b331c SHA512 8311df0a0c46f5b422acdbb789600c0c1e26a2f87ffe80eb6b968da6a1b62cebe427b8c09ffb5586d48bb26afb1308af6c9524d6d2eb36dafc6849372cab3979
 DIST jwt-cpp-0.6.0.tar.gz 275126 BLAKE2B 4bf9bed9b2aa9584b497b2ab4d1d2582d9b5e4ded402200ea3f70b0e6752338fd4e2ef9c5836c728a6907a0190209c7baeaecd26032ce64dc6bf12a23594f27b SHA512 b6d5ebb3a7eeb6fef9a1d41c707251d1ab05bf47920c280d5203f1b9ee5bf6f8e914cd2ffaed66550cfa6d78c34465d4cf86517a759d5f8739b429faf1c2c0ef
-EBUILD jwt-cpp-0.6.0.ebuild 1988 BLAKE2B 7972ddf9ab53b277b7de34d9d36e739f7898bf4d55d02afefe661d48705ece07b2e82d54cd1e8d4dae0f339e4d8b763e83a3861dd956479be8cbfcf9b99809b6 SHA512 5c8406f025e08b017b1b88f3cb920f81a9c3dcc4dfb6b724d32102540ce749fe7f59bfa04b10ce52e38a4864891dd6c93228e4cbeeb33d815a9e8eb0d81afa80
+EBUILD jwt-cpp-0.6.0.ebuild 1986 BLAKE2B 112885ffd64c3eddeec26bb5d937ff819011ea60d44dcfa21157ae417faa5fc7a0381c5b933e7fd44489fd68b44c6cf9d44640c6827fb2fc034808503019e9f4 SHA512 cbaaa90e58ce1e5df3416e11c21032037ab3fe91fc5ca8c373a31ba0819ec2999b90a0a368d32a88b94d403ef87517a9e44e650dc1f18eb18b568eeff8921f91
 MISC metadata.xml 783 BLAKE2B 6c1156aa5c7466acf0dc97db88e228d0dd1a15e9938df61c9ca4d1b4d80fa38aacbc2e3034c91deb4a4b7a4076c61511a34f8f72d4d077987577666c393a7fcc SHA512 3ca38fd435697019e10b292019355786d92e258ba8deb37f035a2d767c0bab9450560a03619b660f383cce794c24bc7bbd6ac23a0a902ca7654afccc432b8121
diff --git a/dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild b/dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild
index 8d2bc1f2fe86..82107fc5f404 100644
--- a/dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild
+++ b/dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/Thalhammer/jwt-cpp.git"
 else
 	SRC_URI="https://github.com/Thalhammer/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="header only library for creating and validating JSON Web Tokens in C++11"
diff --git a/dev-cpp/picojson/Manifest b/dev-cpp/picojson/Manifest
index 825aedf44607..1916f337e814 100644
--- a/dev-cpp/picojson/Manifest
+++ b/dev-cpp/picojson/Manifest
@@ -1,3 +1,3 @@
 DIST picojson-1.3.0.tar.gz 14695 BLAKE2B 9643a17abd8b53e7191fbab924c36428c71f265cf785f6759d66735a0501cb2b77ef385b4b4c35d8d1512bd9f3b31ee6b38b84e15b7eb6b0dc737f4253f384ef SHA512 76d5a6b3b9e1151198eee707faffcbbba28a2842daccf03d99a5d02ae017f9517ef3ac9da4acc74a4fc1357feaf19e14a15c34698a1d4cb65acb6d23b566b284
-EBUILD picojson-1.3.0.ebuild 542 BLAKE2B adae64a1d337c4883377117e9f0712b474d5e766002acb5041ac0c329a8380a7e0fd50ad45bdd9278930256a5fa527868f2b3752dab55d96e749d64cc5d663ba SHA512 36b7ed26a2ab75046ea78cd67dde5ee42043429fa89ad5d144239907ec437e414169673e07439c5926a33a07071cb4be4ca5b16d4c218e25f79e1e4dd2e2bb70
+EBUILD picojson-1.3.0.ebuild 540 BLAKE2B 0ff0970411c136591086c5d9561c9fb7714bba7f32c74b9cf9bd78a3a2a812c0f7b868308b29f3be30ec4d904784cccce89887f7ef32659ff05d84cd122fbbbe SHA512 46b65c6e33618d86ab9da93b28ef0a551bd34e3d690833e6048b785ec12487dc635d3e43bda801dd21c8cc1e09ea34a897ee38111438c71f42338e40ba20bb15
 MISC metadata.xml 330 BLAKE2B eaaa58294ba12b1d95538ee4abf31a5e0fded6976858ac8ddeda537bbf9afbccad3f5f0861e132d9ef30c50188c5124845900ab2377ac1d290033bd3932feb06 SHA512 aacc42f91cdc3a6b8f8a31d95b9084c02d2782f0101a46a81283f37b4cea81438c6fb046f733f36e03d4f4da0b4c3e9d8d1066748177317d304108f8ede4af53
diff --git a/dev-cpp/picojson/picojson-1.3.0.ebuild b/dev-cpp/picojson/picojson-1.3.0.ebuild
index 69aa38b5ea25..1e865d6a25f0 100644
--- a/dev-cpp/picojson/picojson-1.3.0.ebuild
+++ b/dev-cpp/picojson/picojson-1.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kazuho/picojson/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 src_compile() {
 	:
diff --git a/dev-cpp/scitokens-cpp/Manifest b/dev-cpp/scitokens-cpp/Manifest
index a38fe6095bf7..b858b7a6d97e 100644
--- a/dev-cpp/scitokens-cpp/Manifest
+++ b/dev-cpp/scitokens-cpp/Manifest
@@ -1,6 +1,3 @@
-DIST scitokens-cpp-1.0.1.tar.gz 309430 BLAKE2B cfb0a25bde68076334d37d0b47adcb2f1b794bf60330f612c3bfbe2588e420a2b427e9e9916ee14c2c348ed4448d781fad2068d35560b45740b81144aa12e6a6 SHA512 592d8c473ecdeed49c5552239d98e4da57313c8914b3c97c74a6bc4b1f4929b4490a33695e741972a8c83f6097d644fc4df94b3ca54d811c64dcf542b6467ea9
 DIST scitokens-cpp-1.0.2.tar.gz 311221 BLAKE2B 8f77f4f5ded34f7c572567c980ef0dabaf7e36d4395d41046a1bd8e1343299309ea81efb23b0120532cba365463a9ad2c5ff857f85be5df922830541513c11cd SHA512 c15784342eb70eb0ec1cd87d5a1e89446b8aa3bb070bfdef58960c2d94739b05d186ee33807ebc066a450a0211b3dd7c04ea613fd4870d7a2d0f8fe30e8a7453
-EBUILD scitokens-cpp-1.0.1-r1.ebuild 1406 BLAKE2B ece69ad335c397ec20a477dbe848ea1f86b7ab9b7a87e19550a37b53d77c1fa2f6ef33eb6d6078bde3725beb2a0fb7a3e766f78ce4486c90d54961066bed677a SHA512 8092a3fe73e5431ae80f18eaa0efc7077003f0f57da7ea658a83575c7bc35f48cdbf61e82be09d2e88c1b5d1b3d719d079ad62602ec702cb7e608f75eb60d40f
-EBUILD scitokens-cpp-1.0.1.ebuild 775 BLAKE2B 086c67fc0770efe20db4312b382806a08e3e59587ea22673ac278f8a0cde211f2254a746f3c8a32f29bab255c3d1b8eafdb3c9b4206be1358952b0429967d9f7 SHA512 4b8b72639de5c5915b2619555d6c157609da4a72a8f5fc7b730e811b87a1609e323627135ca1624ef374376ffb7becc22ed3dcd8d87c4aad3f4893b39311aef4
-EBUILD scitokens-cpp-1.0.2-r1.ebuild 1406 BLAKE2B ece69ad335c397ec20a477dbe848ea1f86b7ab9b7a87e19550a37b53d77c1fa2f6ef33eb6d6078bde3725beb2a0fb7a3e766f78ce4486c90d54961066bed677a SHA512 8092a3fe73e5431ae80f18eaa0efc7077003f0f57da7ea658a83575c7bc35f48cdbf61e82be09d2e88c1b5d1b3d719d079ad62602ec702cb7e608f75eb60d40f
+EBUILD scitokens-cpp-1.0.2-r1.ebuild 1404 BLAKE2B 4330cd02e728052d6656af16e63b8f7449573088c2d4b4b6a3dfc0ed6560c0887f58fe1fd595b7b220627e3b2c45b9ea8d4271e767ce141e008fc0fb26dcef10 SHA512 6c56e37ec5bf5f1385f50e69492fd39b0974fbd8fed7aa2990a9c3d417fc15fcb2021d466be49144702037c8158e3b6a07acd88a923c13bb56c8297d4d134df7
 MISC metadata.xml 1067 BLAKE2B a3af60b824b07a0db1f2497b7a8d8dea6a4c5a0a225be98e0bd2c35e701197210d0905c213fda060536cacf68e7b0181bad0f849c3dc9eac709af8c1c1df9169 SHA512 e87768329cb90205fb98cba59ddb911414c202cf03de358030aca79766b9834b3a3be4f00ba1a50f5171281852b85b5dc0211a6b7943c4cf0de94e794dd4827a
diff --git a/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.1-r1.ebuild b/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.1-r1.ebuild
deleted file mode 100644
index 8f7d8ed53bee..000000000000
--- a/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/scitokens/scitokens-cpp"
-else
-	SRC_URI="https://github.com/scitokens/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="C++ implementation of the SciTokens library with a C library interface"
-HOMEPAGE="https://scitokens.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-DEPEND="
-	dev-cpp/jwt-cpp[picojson]
-	dev-db/sqlite
-	dev-libs/openssl:0=
-	net-misc/curl:0=
-	kernel_linux? ( sys-apps/util-linux )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( dev-cpp/gtest )
-"
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	# Unbundle dev-cpp/gtest, dev-cpp/jwt-cpp
-	rm -r vendor || die
-	# Fix include path for picojson.
-	find src/ \( -name '*.cpp' -o -name '*.h' \) -type f -print0 | \
-		xargs -0 sed -r -e "s:picojson/picojson\.h:picojson.h:g" -i || die
-	# Disable network-based tests relying on external services.
-	if use test; then
-		sed -i	-e '/^TEST_F/s#RefreshTest#DISABLED_RefreshTest#' \
-			-e '/^TEST_F/s#RefreshExpiredTest#DISABLED_RefreshExpiredTest#' test/main.cpp || die
-	fi
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DSCITOKENS_BUILD_UNITTESTS="$(usex test)"
-		-DSCITOKENS_EXTERNAL_GTEST=YES
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.1.ebuild b/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.1.ebuild
deleted file mode 100644
index e78e7a103c72..000000000000
--- a/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="C++ implementation of the SciTokens library with a C library interface"
-HOMEPAGE="https://github.com/scitokens/scitokens-cpp"
-SRC_URI="https://github.com/scitokens/scitokens-cpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RESTRICT="test" # testing requires network
-
-DEPEND="
-		dev-db/sqlite
-		dev-libs/openssl:0=
-		net-misc/curl:0=
-		kernel_linux? ( sys-apps/util-linux )
-"
-RDEPEND="${DEPEND}"
-BDEPEND="test? ( dev-cpp/gtest )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DSCITOKENS_BUILD_UNITTESTS=$(usex test)
-		-DSCITOKENS_EXTERNAL_GTEST=1
-	)
-	cmake_src_configure
-}
diff --git a/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.2-r1.ebuild b/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.2-r1.ebuild
index 8f7d8ed53bee..87e656009e80 100644
--- a/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.2-r1.ebuild
+++ b/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.2-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/scitokens/scitokens-cpp"
 else
 	SRC_URI="https://github.com/scitokens/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="C++ implementation of the SciTokens library with a C library interface"