gentoo auto-resync : 11:03:2024 - 00:45:38

5 files changed, 2 insertions, 181 deletions

diff --git a/dev-cpp/scitokens-cpp/Manifest b/dev-cpp/scitokens-cpp/Manifest
index edb49284834c..0209c81b6920 100644
--- a/dev-cpp/scitokens-cpp/Manifest
+++ b/dev-cpp/scitokens-cpp/Manifest
@@ -1,10 +1,6 @@
 AUX scitokens-cpp-1.1.0-invalid-vector-access.patch 904 BLAKE2B a2bdf20f09ed3e44ce46a4a253a9a24da2a5a549b480653863dadf650df12ee30301d6dec1731f7cc1e292eb14279b1c369ba7990fceccbeed291a2e5e14c08f SHA512 f5bb785c1eb59f0509aac70efd162079c286a8142045bc9856ec92d197bfdafb0ba743618ddd9708b6dcaadbb73f77a4162c0d9823ff19d5a90d7c77af69421b
-DIST scitokens-cpp-1.0.2.tar.gz 311221 BLAKE2B 8f77f4f5ded34f7c572567c980ef0dabaf7e36d4395d41046a1bd8e1343299309ea81efb23b0120532cba365463a9ad2c5ff857f85be5df922830541513c11cd SHA512 c15784342eb70eb0ec1cd87d5a1e89446b8aa3bb070bfdef58960c2d94739b05d186ee33807ebc066a450a0211b3dd7c04ea613fd4870d7a2d0f8fe30e8a7453
 DIST scitokens-cpp-1.1.0.tar.gz 311446 BLAKE2B a515d834df04125ae9167cb4656def7df43c9f1ba6d701379257cdd0fd51b61a119e6222591fbe9c1d7ac7000b1b4590d12e9f9238810c0791397a9d9846f6f7 SHA512 e71474afbde45149fbd642918e802f7430603a14add7171525fd08fdfbfb9dc4ae5b151341d2c11b294f352cdf76315e5c1f089daca12a1c9db304f6b2c89276
 DIST scitokens-cpp-1.1.1.tar.gz 311677 BLAKE2B ea880a50b5e3e6f17c4bb11b7021df5e22cb4bb496fc17395a9886ebd359bc7f2522a0b1dd89e8aaa477a1302613f5da6d0a40f903e056736abc35ca1230518e SHA512 f5b42078fce6c1e812eedb456cf1275eaddfae5715193fd566f1f7a598b5632f81f3893efb220c57ff89d233c375c68785c8a6a1c3d3db6d3757979d87916265
-EBUILD scitokens-cpp-1.0.2-r1.ebuild 1411 BLAKE2B fbe42fae716e70e8f4af0207154eac8a84b0737c08310d3bd54f64c14fdd26b4f8349bf2c8c76bfb673a27ab59c1ac2d299e539c0cebce30acd50dfdbc97370c SHA512 0a6732c66b6243e642c7b283a6704ee7f1b8e48fc08bc1cd1b0bbf87a6cd444cfb30429f1d56da7768c0c9f85765d16e7eb0ec6f225a7da04d63c8654dd86e77
-EBUILD scitokens-cpp-1.0.2-r2.ebuild 1482 BLAKE2B b9a671a263b9e76ffdef36bd19bace3433d37cc006806306bff190431f11c71cd609a5adb18eb960de477c7e42e1cd20f4dab1c067cd77393f53e2c0964d4345 SHA512 ae69498dfa64945b2997a4b43e3907818b1a67059b806d731395ca359f174b88bf87004672ba015c9d28f76407aed24809c35f13cd0a727b65477179b0ae98c5
-EBUILD scitokens-cpp-1.1.0-r1.ebuild 1482 BLAKE2B b9a671a263b9e76ffdef36bd19bace3433d37cc006806306bff190431f11c71cd609a5adb18eb960de477c7e42e1cd20f4dab1c067cd77393f53e2c0964d4345 SHA512 ae69498dfa64945b2997a4b43e3907818b1a67059b806d731395ca359f174b88bf87004672ba015c9d28f76407aed24809c35f13cd0a727b65477179b0ae98c5
-EBUILD scitokens-cpp-1.1.0.ebuild 1413 BLAKE2B d9e5646f1e42e1395afb8af809f0846476f1f48c7c5a8e517132abce364248cc20904d621597c1e9773a8f2cba500a2b3abf2a82e315e1728b4c3a3180cb64ff SHA512 69e13b094ad62de9137a8383fb836ea7ea6f183547d2a51dddc265674990c33bb6053725dafe50339489403ee6c35969a30e244c2cb008fa7f520c06b67e1f7b
+EBUILD scitokens-cpp-1.1.0-r1.ebuild 1480 BLAKE2B cd199977beaf9c872bc00c6dc344b4450ced455bfaa1bbff646b15c6a3300359a8c66c52a0daca6f9b4882530eeb581d19d81e695f8ab2a341680aefa0ab2b6c SHA512 42daaafb71e5afa224df2bcaf6314cb101a6865277d70901c98bc206871133ec699dbd46a73c7ac36a34690f20e9fa6ef71caf3371ab5a614b051be03c5dc34d
 EBUILD scitokens-cpp-1.1.1.ebuild 1413 BLAKE2B d9e5646f1e42e1395afb8af809f0846476f1f48c7c5a8e517132abce364248cc20904d621597c1e9773a8f2cba500a2b3abf2a82e315e1728b4c3a3180cb64ff SHA512 69e13b094ad62de9137a8383fb836ea7ea6f183547d2a51dddc265674990c33bb6053725dafe50339489403ee6c35969a30e244c2cb008fa7f520c06b67e1f7b
 MISC metadata.xml 1067 BLAKE2B a3af60b824b07a0db1f2497b7a8d8dea6a4c5a0a225be98e0bd2c35e701197210d0905c213fda060536cacf68e7b0181bad0f849c3dc9eac709af8c1c1df9169 SHA512 e87768329cb90205fb98cba59ddb911414c202cf03de358030aca79766b9834b3a3be4f00ba1a50f5171281852b85b5dc0211a6b7943c4cf0de94e794dd4827a
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
deleted file mode 100644
index 91251a33990d..000000000000
--- a/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 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-0.7.0[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.2-r2.ebuild b/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.2-r2.ebuild
deleted file mode 100644
index afb857eab047..000000000000
--- a/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2024 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-0.7.0[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 )"
-
-PATCHES=(
-		"${FILESDIR}"/${PN}-1.1.0-invalid-vector-access.patch
-)
-
-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.1.0-r1.ebuild b/dev-cpp/scitokens-cpp/scitokens-cpp-1.1.0-r1.ebuild
index afb857eab047..80259264e946 100644
--- a/dev-cpp/scitokens-cpp/scitokens-cpp-1.1.0-r1.ebuild
+++ b/dev-cpp/scitokens-cpp/scitokens-cpp-1.1.0-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"
diff --git a/dev-cpp/scitokens-cpp/scitokens-cpp-1.1.0.ebuild b/dev-cpp/scitokens-cpp/scitokens-cpp-1.1.0.ebuild
deleted file mode 100644
index c12cad405a66..000000000000
--- a/dev-cpp/scitokens-cpp/scitokens-cpp-1.1.0.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2024 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-0.7.0[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
-}