public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: dev-cpp/scitokens-cpp/files/, dev-cpp/scitokens-cpp/
Date: Sat, 10 Jun 2023 10:56:16 +0000 (UTC)	[thread overview]
Message-ID: <1686227764.b6118433dbefb6b01ad199f0a0bbcb071736727c.flow@gentoo> (raw)

commit:     b6118433dbefb6b01ad199f0a0bbcb071736727c
Author:     Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq <DOT> in>
AuthorDate: Thu Jun  8 12:34:56 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Jun  8 12:36:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b6118433

dev-cpp/scitokens-cpp: treeclean duplicate

Signed-off-by: Anna (cybertailor) Vyalkova <cyber+gentoo <AT> sysrq.in>

 dev-cpp/scitokens-cpp/Manifest                     |  3 --
 .../scitokens-cpp-0.7.1-fix-external-gtest.patch   | 18 -------
 dev-cpp/scitokens-cpp/metadata.xml                 | 12 -----
 dev-cpp/scitokens-cpp/scitokens-cpp-0.7.3.ebuild   | 55 ---------------------
 dev-cpp/scitokens-cpp/scitokens-cpp-1.0.0.ebuild   | 57 ----------------------
 dev-cpp/scitokens-cpp/scitokens-cpp-1.0.1.ebuild   | 57 ----------------------
 6 files changed, 202 deletions(-)

diff --git a/dev-cpp/scitokens-cpp/Manifest b/dev-cpp/scitokens-cpp/Manifest
deleted file mode 100644
index 864a32623..000000000
--- a/dev-cpp/scitokens-cpp/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-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 91a508c0d..000000000
--- 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
deleted file mode 100644
index acdc23294..000000000
--- a/dev-cpp/scitokens-cpp/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>o.freyermuth@googlemail.com</email>
-    <name>Oliver Freyermuth</name>
-  </maintainer>
-  <upstream>
-    <bugs-to>https://github.com/scitokens/scitokens-cpp/issues</bugs-to>
-    <remote-id type="github">scitokens/scitokens-cpp</remote-id>
-  </upstream>
-</pkgmetadata>

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 d6173e21e..000000000
--- 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 acf2c661d..000000000
--- 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
deleted file mode 100644
index acf2c661d..000000000
--- a/dev-cpp/scitokens-cpp/scitokens-cpp-1.0.1.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
-}


             reply	other threads:[~2023-06-10 10:56 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-10 10:56 Florian Schmaus [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-06-23 18:34 [gentoo-commits] repo/proj/guru:master commit in: dev-cpp/scitokens-cpp/files/, dev-cpp/scitokens-cpp/ Haelwenn Monnier

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1686227764.b6118433dbefb6b01ad199f0a0bbcb071736727c.flow@gentoo \
    --to=flow@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox