gentoo auto-resync : 30:10:2023 - 09:41:01

4 files changed, 2 insertions, 96 deletions

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"