11 files changed, 29 insertions, 344 deletions
diff --git a/dev-cpp/jwt-cpp/Manifest b/dev-cpp/jwt-cpp/Manifest
deleted file mode 100644
index 7ed5fadf110f..000000000000
--- a/dev-cpp/jwt-cpp/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST jwt-cpp-0.4.0.tar.gz 64383 BLAKE2B 48de501a1fff851ada5ffc0554309f6f05943d6b6a459c8f002f8bcebb9be40d878fc7f39c2f4da7031b784421dd0530d8e50d5eadbdb924c5485fdcd2f04b85 SHA512 8a82accb396db8fb2f1a32b14459f6ff3f5d4c6dcb54dfe1a10751da093381c2dcfb92c6e1f4f2ae42ca0f25c96c02ea35f37b723afaaf6b2d458c1a6f4e6b62
-DIST jwt-cpp-0.6.0.tar.gz 275126 BLAKE2B 4bf9bed9b2aa9584b497b2ab4d1d2582d9b5e4ded402200ea3f70b0e6752338fd4e2ef9c5836c728a6907a0190209c7baeaecd26032ce64dc6bf12a23594f27b SHA512 b6d5ebb3a7eeb6fef9a1d41c707251d1ab05bf47920c280d5203f1b9ee5bf6f8e914cd2ffaed66550cfa6d78c34465d4cf86517a759d5f8739b429faf1c2c0ef
diff --git a/dev-cpp/jwt-cpp/jwt-cpp-0.4.0.ebuild b/dev-cpp/jwt-cpp/jwt-cpp-0.4.0.ebuild
deleted file mode 100644
index 611f754fde50..000000000000
--- a/dev-cpp/jwt-cpp/jwt-cpp-0.4.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 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/Thalhammer/jwt-cpp.git"
-else
-	SRC_URI="https://github.com/Thalhammer/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="header only library for creating and validating JSON Web Tokens in C++11"
-HOMEPAGE="https://thalhammer.github.io/jwt-cpp/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc +picojson test"
-
-DEPEND="${RDEPEND}
-	dev-libs/openssl
-	picojson? ( dev-cpp/picojson )"
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-	test? ( dev-cpp/gtest )
-"
-RESTRICT="
-	!picojson? ( test )
-	!test? ( test )"
-
-src_prepare() {
-	# Unbundle dev-cpp/picojson and fix include paths.
-	# See also: https://github.com/Thalhammer/jwt-cpp/issues/213
-	rm -vrf include/picojson || die
-	find -name '*.h' -type f -print0 | xargs -0 sed -r -e "s:picojson/picojson\.h:picojson.h:g" -i || die
-	# Prevent installation of bundled dev-cpp/picojson.
-	sed -i -e 's:^\s*install.*include/picojson.*$::' CMakeLists.txt || die
-	# Fix installation paths for .cmake files.
-	sed -i -e 's:DESTINATION ${CMAKE_INSTALL_PREFIX}/jwt-cpp:DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jwt-cpp:' CMakeLists.txt || die
-	sed -i -e 's:DESTINATION jwt-cpp:DESTINATION ${CMAKE_INSTALL_PREFIX}/share/jwt-cpp:' CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-			# Not useful for now, asks for non-existent CMake module.
-			#-DJWT_EXTERNAL_PICOJSON="$(usex picojson)"
-			# Examples are not installed and for development only.
-			-DBUILD_TESTS="$(usex test)"
-			)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		doxygen || die
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	use doc && local HTML_DOCS=(docs/html/.)
-	einstalldocs
-}
-
-src_test() {
-	"${BUILD_DIR}"/tests/jwt-cpp-test || die
-}
diff --git a/dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild b/dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild
deleted file mode 100644
index 29d69816be64..000000000000
--- a/dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 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/Thalhammer/jwt-cpp.git"
-else
-	SRC_URI="https://github.com/Thalhammer/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="header only library for creating and validating JSON Web Tokens in C++11"
-HOMEPAGE="https://thalhammer.github.io/jwt-cpp/"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="doc +picojson test"
-
-DEPEND="${RDEPEND}
-	dev-cpp/nlohmann_json
-	dev-libs/openssl
-	picojson? ( dev-cpp/picojson )"
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-	test? ( dev-cpp/gtest )
-"
-RESTRICT="
-	!picojson? ( test )
-	!test? ( test )"
-DOCS=( README.md docs/{faqs,ssl,traits}.md )
-
-src_prepare() {
-	# Unbundle dev-cpp/nlohmann_json.
-	rm -vrf include/nhlomann || die
-	# Unbundle dev-cpp/picojson and fix include paths.
-	# See also: https://github.com/Thalhammer/jwt-cpp/issues/213
-	rm -vrf include/picojson || die
-	find -name '*.h' -type f -print0 | xargs -0 sed -r -e "s:picojson/picojson\.h:picojson.h:g" -i || die
-	# Prevent installation of bundled dev-cpp/picojson.
-	sed -i -e 's:^\s*install.*picojson/picojson\.h.*$::' CMakeLists.txt || die
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-			-DJWT_DISABLE_PICOJSON="$(usex picojson OFF ON)"
-			# Not useful for now, asks for non-existent CMake module.
-			#-DJWT_EXTERNAL_PICOJSON="$(usex picojson)"
-			# Examples are not installed and for development only.
-			-DJWT_BUILD_EXAMPLES=NO
-			-DJWT_BUILD_TESTS="$(usex test)"
-			-DJWT_CMAKE_FILES_INSTALL_DIR="${EPREFIX}"/usr/share/cmake
-			)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; then
-		doxygen || die
-	fi
-}
-
-src_install() {
-	cmake_src_install
-	use doc && local HTML_DOCS=(doxy/html/.)
-	einstalldocs
-}
-
-src_test() {
-	"${BUILD_DIR}"/tests/jwt-cpp-test || die
-}
diff --git a/dev-cpp/jwt-cpp/metadata.xml b/dev-cpp/jwt-cpp/metadata.xml
deleted file mode 100644
index def62ff1136d..000000000000
--- a/dev-cpp/jwt-cpp/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="person">
-  <email>o.freyermuth@googlemail.com</email>
-  <name>Oliver Freyermuth</name>
- </maintainer>
- <upstream>
-  <bugs-to>https://github.com/Thalhammer/jwt-cpp/issues</bugs-to>
- </upstream>
- <use>
-  <flag name="picojson">Enable use of <pkg>dev-cpp/picojson</pkg></flag>
- </use>
- <origin>gentoo-guru-overlay</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-cpp/scitokens-cpp/Manifest b/dev-cpp/scitokens-cpp/Manifest
index 864a326231cf..3c5aca40b9d3 100644
--- a/dev-cpp/scitokens-cpp/Manifest
+++ b/dev-cpp/scitokens-cpp/Manifest
@@ -1,3 +1 @@
-DIST scitokens-cpp-0.7.3.tar.gz 99699 BLAKE2B d5d4f4559a2668d391abf6f8139d4c1e6c99d7acfd26e730db19e91306096c6c67379ab920bfa130222908962f8ab62bd2e7dcade247d9f07431343346a88cb4 SHA512 b9d48e337bf4edf14d8ae231988b48e36736aa948b82dc8336a9adb8db91870a8d0bce25a4555fd728cf80c0bd0303bef5df6434f6ea031a8dce2edd99e0ad7e
-DIST scitokens-cpp-1.0.0.tar.gz 309098 BLAKE2B ebe919bd5a4dada2fa08e881358caf597aeae9309d75977d8479b5859bb5d0d396cc890f4048ed3295c7e3cf483440fca40dd0bd7f1d54a608d547b72d3e6b5f SHA512 db0679be6bed7117ced05618a5cbd8c52f427e10e221a8094780ebaa1585caeae57a44fc2a76691bf33bbcf34dd1353b27caca8a9381dd3c3aa16a8ef6a14285
 DIST scitokens-cpp-1.0.1.tar.gz 309430 BLAKE2B cfb0a25bde68076334d37d0b47adcb2f1b794bf60330f612c3bfbe2588e420a2b427e9e9916ee14c2c348ed4448d781fad2068d35560b45740b81144aa12e6a6 SHA512 592d8c473ecdeed49c5552239d98e4da57313c8914b3c97c74a6bc4b1f4929b4490a33695e741972a8c83f6097d644fc4df94b3ca54d811c64dcf542b6467ea9
diff --git a/dev-cpp/scitokens-cpp/files/scitokens-cpp-0.7.1-fix-external-gtest.patch b/dev-cpp/scitokens-cpp/files/scitokens-cpp-0.7.1-fix-external-gtest.patch
deleted file mode 100644
index 91a508c0d0e4..000000000000
--- a/dev-cpp/scitokens-cpp/files/scitokens-cpp-0.7.1-fix-external-gtest.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Bug: https://github.com/scitokens/scitokens-cpp/pull/89
-Bug: https://github.com/scitokens/scitokens-cpp/pull/90
-
-diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 22f86a6..2083bff 100644
---- a/test/CMakeLists.txt
-+++ b/test/CMakeLists.txt
-@@ -1,6 +1,8 @@
- 
- add_executable(scitokens-gtest main.cpp)
--add_dependencies(scitokens-gtest gtest)
-+if( NOT SCITOKENS_EXTERNAL_GTEST )
-+    add_dependencies(scitokens-gtest gtest)
-+    include_directories("${PROJECT_SOURCE_DIR}/vendor/gtest/googletest/include")
-+endif()
--include_directories("${PROJECT_SOURCE_DIR}/vendor/gtest/googletest/include")
- 
- if(SCITOKENS_EXTERNAL_GTEST)
diff --git a/dev-cpp/scitokens-cpp/metadata.xml b/dev-cpp/scitokens-cpp/metadata.xml
index bd8010368f0f..8cb7923156d1 100644
--- a/dev-cpp/scitokens-cpp/metadata.xml
+++ b/dev-cpp/scitokens-cpp/metadata.xml
@@ -2,11 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>o.freyermuth@googlemail.com</email>
-  <name>Oliver Freyermuth</name>
+  <email>amadio@gentoo.org</email>
+  <name>Guilherme Amadio</name>
  </maintainer>
- <upstream>
-  <bugs-to>https://github.com/scitokens/scitokens-cpp/issues</bugs-to>
- </upstream>
- <origin>gentoo-guru-overlay</origin>
+ <longdescription lang="en">
+  SciTokens provide a token format for distributed authorization. The tokens are
+  self-describing, can be verified in a distributed fashion (no need to contact
+  the issuer to determine if the token is valid). This is convenient for a
+  federated environment where several otherwise-independent storage endpoints
+  want to delegate trust for an issuer for managing a storage allocation.
+  </longdescription>
+ 
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
 \ No newline at end of file
diff --git a/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.3.ebuild b/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.3.ebuild
deleted file mode 100644
index d6173e21e950..000000000000
--- a/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 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"
-fi
-
-DESCRIPTION=" A C++ implementation of the SciTokens library with a C library interface"
-HOMEPAGE="https://scitokens.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-DEPEND="${RDEPEND}
-	<dev-cpp/jwt-cpp-0.5.0
-	dev-db/sqlite
-	dev-libs/openssl
-	net-misc/curl
-	sys-apps/util-linux
-	test? ( dev-cpp/gtest )"
-BDEPEND="virtual/pkgconfig"
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/"${PN}"-0.7.1-fix-external-gtest.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
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-			-DSCITOKENS_BUILD_UNITTESTS="$(usex test)"
-			-DSCITOKENS_EXTERNAL_GTEST=YES
-			)
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_run_in "${BUILD_DIR}" ctest --verbose || die
-}
diff --git a/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.0.ebuild b/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.0.ebuild
deleted file mode 100644
index acf2c661deb2..000000000000
--- a/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.0.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"
-fi
-
-DESCRIPTION=" A C++ implementation of the SciTokens library with a C library interface"
-HOMEPAGE="https://scitokens.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-
-DEPEND="${RDEPEND}
-	>=dev-cpp/jwt-cpp-0.6.0
-	dev-db/sqlite
-	dev-libs/openssl
-	net-misc/curl
-	sys-apps/util-linux
-	test? ( dev-cpp/gtest )"
-BDEPEND="virtual/pkgconfig"
-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
-}
-
-src_test() {
-	cmake_run_in "${BUILD_DIR}" ctest --verbose || die
-}
diff --git a/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.1.ebuild b/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.1.ebuild
index acf2c661deb2..e6a43dfceee1 100644
--- a/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.1.ebuild
+++ b/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.1.ebuild
@@ -1,57 +1,34 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 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"
-fi
-
-DESCRIPTION=" A C++ implementation of the SciTokens library with a C library interface"
-HOMEPAGE="https://scitokens.org/"
+DESCRIPTION="A 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"
 
-DEPEND="${RDEPEND}
-	>=dev-cpp/jwt-cpp-0.6.0
-	dev-db/sqlite
-	dev-libs/openssl
-	net-misc/curl
-	sys-apps/util-linux
-	test? ( dev-cpp/gtest )"
-BDEPEND="virtual/pkgconfig"
-RESTRICT="!test? ( test )"
+RESTRICT="test" # testing requires network
 
-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
-}
+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=YES
-			)
+		-DSCITOKENS_BUILD_UNITTESTS=$(usex test)
+		-DSCITOKENS_EXTERNAL_GTEST=1
+	)
 	cmake_src_configure
 }
-
-src_test() {
-	cmake_run_in "${BUILD_DIR}" ctest --verbose || die
-}
diff --git a/dev-cpp/tbb/tbb-2021.9.0.ebuild b/dev-cpp/tbb/tbb-2021.9.0.ebuild
index 2b915f2be22a..2e24080c2a1e 100644
--- a/dev-cpp/tbb/tbb-2021.9.0.ebuild
+++ b/dev-cpp/tbb/tbb-2021.9.0.ebuild
@@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
 # https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
 # libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
 SLOT="0/12.5-2.5-3.5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"