gentoo auto-resync : 15:06:2023 - 13:38:09

13 files changed, 195 insertions, 58 deletions

diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index ba3f7d33e222..dc57b7034074 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/cpp-httplib/Manifest b/dev-cpp/cpp-httplib/Manifest
index a72d8adab280..b75badf783e4 100644
--- a/dev-cpp/cpp-httplib/Manifest
+++ b/dev-cpp/cpp-httplib/Manifest
@@ -1,9 +1,7 @@
 DIST cpp-httplib-0.12.2.tar.gz 638460 BLAKE2B 91d039d39a43a73f052d63d0e1073350965bfa3b9653f0cab7d9353ed2d1acf91d2e3c20415f2a9398e64776baaedcb498b9de90046e785637de5382c41bb9ed SHA512 dda47f76eaf5b4daa35f1295e482f1d81dd8823ae06339b9f4c93e4fbe7b54ae28760d3083b5d5cff212f1a679616adfa47dbb9d06c6810fac4b58197f575429
 DIST cpp-httplib-0.12.3.tar.gz 639107 BLAKE2B 15db0056069cbda5359c6279ebc84520039e809f32cd8314c180dd761324a76fccaae0e80f39d0b69563903bd667799425c7e85708962b2763416a3c8bbd09bb SHA512 3465e5c843ad4087bababadf8fe9f3e6961213301540053bb47f242f958280f43c85b03b8cf6f955a6b91bf9511a81669feeb9989344caf2a1e42ff587b3a460
-DIST cpp-httplib-0.12.4.tar.gz 639390 BLAKE2B 7c245930994934b5859d87e9dc192a4c43349d72ab45da2c4f31ec997b3a85b8babcd4abc552957f194834ca560339eb7b76dd92c86f7aa13d478cef6f742263 SHA512 3935e55f4b02bab51cae167381c6692577ff22f717387146187eafae1b015915078813b5f74521e92b4e6e6fe418f378d3059cf4850458c4f20946ad6910ecc6
-DIST cpp-httplib-0.12.5.tar.gz 639439 BLAKE2B 7456ec4324d6e46a6de8551adcab2d4c4c9424ef340f34b8e37432593680a9750e92a676fdd29a34d06ce434cefb6b503f69f1a33c4ae88706ee5d3eafe9e5c1 SHA512 3fec5f93cd72359e56b9a04a5f27fd68aaebbc6c6ab5c33ba13fad19b8e78ec752ba265edf14864954b84036653d00671a4f675359bb2eac2791aa43066c671d
+DIST cpp-httplib-0.12.6.tar.gz 641145 BLAKE2B 56a1a9c2d048a608664cce1ea3737d8633d6dbc124b4a5b2b5a33f81d678efdd2b8b0c79fb88c23dd861f1c6264eddba32349740142e3765d61f811dd50d9909 SHA512 63f0172bb7f4b02f3640634f25801bc1e34d85f53c9915e6402d825891793de26faa7551dff88a44c23af39e3592b7863454d9c070b5bd0e546cb987bca14885
 EBUILD cpp-httplib-0.12.2.ebuild 1314 BLAKE2B 0808b2ca95a457f39219d3916999a61e1dc78d45984a20c34cbe0e04c0aa2305356644958a5ad3f363247ef597e400c64f55b940db8dba952398e32dd507f95d SHA512 e171b800ca1164e6e00765956456af2ee3d9de2f0b702b05c6b2ab23faad97b1ad8950a25a0ff206b61af123ab6106042da49486adf3242f011b28bba8223d03
 EBUILD cpp-httplib-0.12.3.ebuild 1315 BLAKE2B fdba99c8ecda5a9fda38f501bb844326574273b75e8e6fad5a69fff7c1e35574867d778b910be3f08c6f6b5d7141439f8a0d72f5083d2f8e3afd23eafe42a3fb SHA512 0205304ec89b3341ac3deab628ae08133358ef8d92cf0a5fb5f872f64145b4158b3ae1f05cd0694595414b69fab6a0b8ac7391c83d73aa6f5346491fe4cceb02
-EBUILD cpp-httplib-0.12.4.ebuild 1342 BLAKE2B baf94a8a18db413a4e2c7feeb6b372df4b386d36eefe82e08ef229f366264495f421ce541a105e281b3991a44d99b23e2061795f799f84312a4896408eca2328 SHA512 13bfa258c952f86c3469b6e2a794aa57bf6acc47bb52354a33e97df078c3f3b88bd8ab153f46f25211c12feac2866a9f9a1353e8104eb7c93b779d6cd2c851ee
-EBUILD cpp-httplib-0.12.5.ebuild 1342 BLAKE2B baf94a8a18db413a4e2c7feeb6b372df4b386d36eefe82e08ef229f366264495f421ce541a105e281b3991a44d99b23e2061795f799f84312a4896408eca2328 SHA512 13bfa258c952f86c3469b6e2a794aa57bf6acc47bb52354a33e97df078c3f3b88bd8ab153f46f25211c12feac2866a9f9a1353e8104eb7c93b779d6cd2c851ee
+EBUILD cpp-httplib-0.12.6.ebuild 1342 BLAKE2B baf94a8a18db413a4e2c7feeb6b372df4b386d36eefe82e08ef229f366264495f421ce541a105e281b3991a44d99b23e2061795f799f84312a4896408eca2328 SHA512 13bfa258c952f86c3469b6e2a794aa57bf6acc47bb52354a33e97df078c3f3b88bd8ab153f46f25211c12feac2866a9f9a1353e8104eb7c93b779d6cd2c851ee
 MISC metadata.xml 744 BLAKE2B c3cbea51dafa4c3faa9ad130a2cb493ec87489a574dea464d884b15188c54bd60cb9e6dc30fa8f453bff041d374a3e9ff3f20a78580bdc8fad2bf26b0e3b3c90 SHA512 361401b649e07b2a4d577788d8552fc744271fa8e14e8a53083fa5aeea8a39f183eb6c736c941e10878ef24700a1e2a80201bc36ed646406586835cacdeee1a2
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.12.5.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.12.5.ebuild
deleted file mode 100644
index d0d8042448a0..000000000000
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.12.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit cmake-multilib python-any-r1 toolchain-funcs
-
-DESCRIPTION="C++ HTTP/HTTPS server and client library"
-HOMEPAGE="https://github.com/yhirose/cpp-httplib/"
-SRC_URI="https://github.com/yhirose/cpp-httplib/archive/v${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/$(ver_cut 1-2)"  # soversion
-KEYWORDS="~amd64 ~loong ~x86"
-
-IUSE="brotli ssl test zlib"
-REQUIRED_USE="test? ( brotli ssl zlib )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	brotli? ( app-arch/brotli:=[${MULTILIB_USEDEP}] )
-	ssl? ( dev-libs/openssl:=[${MULTILIB_USEDEP}] )
-	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}"
-
-src_configure() {
-	local -a mycmakeargs=(
-		-DHTTPLIB_COMPILE=yes
-		-DBUILD_SHARED_LIBS=yes
-		-DHTTPLIB_USE_BROTLI_IF_AVAILABLE=no
-		-DHTTPLIB_USE_OPENSSL_IF_AVAILABLE=no
-		-DHTTPLIB_USE_ZLIB_IF_AVAILABLE=no
-		-DHTTPLIB_REQUIRE_BROTLI=$(usex brotli)
-		-DHTTPLIB_REQUIRE_OPENSSL=$(usex ssl)
-		-DHTTPLIB_REQUIRE_ZLIB=$(usex zlib)
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	cmake-multilib_src_configure
-}
-
-multilib_src_test() {
-	cp -p -R --reflink=auto "${S}/test" ./test || die
-
-	GTEST_FILTER='-*.*_Online' emake -C test "CXX=$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -I."
-}
diff --git a/dev-cpp/cpp-httplib/cpp-httplib-0.12.4.ebuild b/dev-cpp/cpp-httplib/cpp-httplib-0.12.6.ebuild
index d0d8042448a0..d0d8042448a0 100644
--- a/dev-cpp/cpp-httplib/cpp-httplib-0.12.4.ebuild
+++ b/dev-cpp/cpp-httplib/cpp-httplib-0.12.6.ebuild
diff --git a/dev-cpp/jwt-cpp/Manifest b/dev-cpp/jwt-cpp/Manifest
new file mode 100644
index 000000000000..0ea92cc67532
--- /dev/null
+++ b/dev-cpp/jwt-cpp/Manifest
@@ -0,0 +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
+MISC metadata.xml 783 BLAKE2B 6c1156aa5c7466acf0dc97db88e228d0dd1a15e9938df61c9ca4d1b4d80fa38aacbc2e3034c91deb4a4b7a4076c61511a34f8f72d4d077987577666c393a7fcc SHA512 3ca38fd435697019e10b292019355786d92e258ba8deb37f035a2d767c0bab9450560a03619b660f383cce794c24bc7bbd6ac23a0a902ca7654afccc432b8121
diff --git a/dev-cpp/jwt-cpp/files/jwt-cpp-0.6.0-gcc13.patch b/dev-cpp/jwt-cpp/files/jwt-cpp-0.6.0-gcc13.patch
new file mode 100644
index 000000000000..3fef24536a86
--- /dev/null
+++ b/dev-cpp/jwt-cpp/files/jwt-cpp-0.6.0-gcc13.patch
@@ -0,0 +1,14 @@
+From: Hannu Lounento <hannu.lounento@vaisala.com>
+Bug: https://github.com/Thalhammer/jwt-cpp/pull/287
+
+Fix build with GCC 13.
+
+--- a/include/jwt-cpp/base.h
++++ b/include/jwt-cpp/base.h
+@@ -3,6 +3,7 @@
+ 
+ #include <array>
++#include <cstdint>
+ #include <stdexcept>
+ #include <string>
+ 
diff --git a/dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild b/dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild
new file mode 100644
index 000000000000..8d2bc1f2fe86
--- /dev/null
+++ b/dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild
@@ -0,0 +1,82 @@
+# 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/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"
+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="
+	dev-cpp/nlohmann_json
+	dev-libs/openssl
+	picojson? ( dev-cpp/picojson )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+	test? ( dev-cpp/gtest )
+"
+RESTRICT="
+	!picojson? ( test )
+	!test? ( test )
+"
+PATCHES=(
+	"${FILESDIR}"/"${PN}"-0.6.0-gcc13.patch
+)
+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)"
+			# 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_test() {
+	"${BUILD_DIR}"/tests/jwt-cpp-test || die
+}
+
+src_install() {
+	cmake_src_install
+	use doc && local HTML_DOCS=(doxy/html/.)
+	einstalldocs
+}
diff --git a/dev-cpp/jwt-cpp/metadata.xml b/dev-cpp/jwt-cpp/metadata.xml
new file mode 100644
index 000000000000..1d76ea260c5a
--- /dev/null
+++ b/dev-cpp/jwt-cpp/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>o.freyermuth@googlemail.com</email>
+    <name>Oliver Freyermuth</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>amadio@gentoo.org</email>
+    <name>Guilherme Amadio</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <bugs-to>https://github.com/Thalhammer/jwt-cpp/issues</bugs-to>
+    <remote-id type="github">Thalhammer/jwt-cpp</remote-id>
+  </upstream>
+  <use>
+    <flag name="picojson">Enable use of <pkg>dev-cpp/picojson</pkg></flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-cpp/picojson/Manifest b/dev-cpp/picojson/Manifest
index c22228f5ed9f..825aedf44607 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 537 BLAKE2B b7f21fc7be41fe1a6b5cee0cbbc2292e450ca9a37de9235430887afc6d6b696cfb339fc06136341ce1d4757f72049185a069efdcd9e95ee768d9b21225bf9f7d SHA512 ef96a60cb2aa353d6bbb17b1d624b68f295023edaa32feb5b7afd5b93bd723fd475cd0dace19d9aa89bcfab12ab960ee30710dd2a6139aa5437af7051cb5d58f
+EBUILD picojson-1.3.0.ebuild 542 BLAKE2B adae64a1d337c4883377117e9f0712b474d5e766002acb5041ac0c329a8380a7e0fd50ad45bdd9278930256a5fa527868f2b3752dab55d96e749d64cc5d663ba SHA512 36b7ed26a2ab75046ea78cd67dde5ee42043429fa89ad5d144239907ec437e414169673e07439c5926a33a07071cb4be4ca5b16d4c218e25f79e1e4dd2e2bb70
 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 ca57d8fb939c..69aa38b5ea25 100644
--- a/dev-cpp/picojson/picojson-1.3.0.ebuild
+++ b/dev-cpp/picojson/picojson-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"
+KEYWORDS="~amd64 ~x86"
 
 src_compile() {
 	:
diff --git a/dev-cpp/scitokens-cpp/Manifest b/dev-cpp/scitokens-cpp/Manifest
index ef4f62c65e71..915ac93c6e9e 100644
--- a/dev-cpp/scitokens-cpp/Manifest
+++ b/dev-cpp/scitokens-cpp/Manifest
@@ -1,3 +1,4 @@
 DIST scitokens-cpp-1.0.1.tar.gz 309430 BLAKE2B cfb0a25bde68076334d37d0b47adcb2f1b794bf60330f612c3bfbe2588e420a2b427e9e9916ee14c2c348ed4448d781fad2068d35560b45740b81144aa12e6a6 SHA512 592d8c473ecdeed49c5552239d98e4da57313c8914b3c97c74a6bc4b1f4929b4490a33695e741972a8c83f6097d644fc4df94b3ca54d811c64dcf542b6467ea9
+EBUILD scitokens-cpp-1.0.1-r1.ebuild 1381 BLAKE2B 209d7920c68ea521fa5ca97681fa7a5d93b389f77569defe4bee1d503976ecfa90b0a6d7c573dee4f3939fd0d9db377edac73b002f8e3bd2ef4707912e33e924 SHA512 c456caf304230116937ac084069351449c6c64c071e6716ee3156988cd48ae462ede7d4c0e40cfa1056e477bb0c3a9e932bcad491102a86e8bb1a70eab9567fc
 EBUILD scitokens-cpp-1.0.1.ebuild 777 BLAKE2B ece63bbedbd9d5db682a490edaf2b25f1355f232a0af262b464ae5b72f72d9eb9ac6808d970bcc936e6bfad0ab3151a73231b9333fa2d74f76489dfc4e944a36 SHA512 a2f3caac29fa5e9f5531d71634a7509f8577f6f76eeff66a893797b3778bf3eca87b0343755ff50dc0e45c408b95bb43ca8f4bac90f0c030268572d2d19b675a
-MISC metadata.xml 787 BLAKE2B 69c8acc6bf065505f53697758868150f6b9ee723118fa83402522087772e3c76bdbb6a8206f4979c616e6ecade0a550d65b5c57e9ca4490a041351bae8e935d2 SHA512 312f619805e8fe7067f8ddad537e13d52c4ed0e2e9a9daba70187693febf800c61c3b5ec0b23d607b847daea1ff6d423aca4316f9a7116f06e909a8afe80e702
+MISC metadata.xml 1067 BLAKE2B a3af60b824b07a0db1f2497b7a8d8dea6a4c5a0a225be98e0bd2c35e701197210d0905c213fda060536cacf68e7b0181bad0f849c3dc9eac709af8c1c1df9169 SHA512 e87768329cb90205fb98cba59ddb911414c202cf03de358030aca79766b9834b3a3be4f00ba1a50f5171281852b85b5dc0211a6b7943c4cf0de94e794dd4827a
diff --git a/dev-cpp/scitokens-cpp/metadata.xml b/dev-cpp/scitokens-cpp/metadata.xml
index f04332ace873..ec035d6ed7af 100644
--- a/dev-cpp/scitokens-cpp/metadata.xml
+++ b/dev-cpp/scitokens-cpp/metadata.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>o.freyermuth@googlemail.com</email>
+    <name>Oliver Freyermuth</name>
+  </maintainer>
   <maintainer type="person">
     <email>amadio@gentoo.org</email>
     <name>Guilherme Amadio</name>
   </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <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
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
new file mode 100644
index 000000000000..19a7d9f94ecc
--- /dev/null
+++ b/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.1-r1.ebuild
@@ -0,0 +1,57 @@
+# 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=" 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="
+	dev-cpp/jwt-cpp
+	dev-db/sqlite
+	dev-libs/openssl:0=
+	net-misc/curl:0=
+	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
+}