From 38a6090ee31dc7234bbd9ce5b173861bafc5bb2a Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Sat, 26 Feb 2022 19:37:32 +0100 Subject: [PATCH 1/4] dev-cpp/jwt-cpp: Add version 0.4.0. This older version is required by some dependencies. Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Oliver Freyermuth --- dev-cpp/jwt-cpp/Manifest | 1 + dev-cpp/jwt-cpp/jwt-cpp-0.4.0.ebuild | 68 ++++++++++++++++++++++++++++ dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild | 2 +- 3 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 dev-cpp/jwt-cpp/jwt-cpp-0.4.0.ebuild diff --git a/dev-cpp/jwt-cpp/Manifest b/dev-cpp/jwt-cpp/Manifest index 056eade7e2..7ed5fadf11 100644 --- a/dev-cpp/jwt-cpp/Manifest +++ b/dev-cpp/jwt-cpp/Manifest @@ -1 +1,2 @@ +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 new file mode 100644 index 0000000000..9b41ae22f8 --- /dev/null +++ b/dev-cpp/jwt-cpp/jwt-cpp-0.4.0.ebuild @@ -0,0 +1,68 @@ +# 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" + KEYWORDS="" +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] )" +RESTRICT="!picojson? ( 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 index f877455f80..fe1a3e1ffe 100644 --- a/dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild +++ b/dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild @@ -44,7 +44,7 @@ src_prepare() { src_configure() { local mycmakeargs=( -DJWT_DISABLE_PICOJSON="$(usex picojson OFF ON)" - # Not useful for now, asks for non-existend CMake module. + # 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 From 5106fac2bce9729fc3365cea98ee903b1447734f Mon Sep 17 00:00:00 2001 From: Oliver Freyermuth Date: Sat, 26 Feb 2022 19:44:15 +0100 Subject: [PATCH 2/4] dev-cpp/scitokens-cpp: New package (0.7.0). Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Oliver Freyermuth --- dev-cpp/scitokens-cpp/Manifest | 1 + dev-cpp/scitokens-cpp/metadata.xml | 12 +++++ .../scitokens-cpp/scitokens-cpp-0.7.0.ebuild | 48 +++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 dev-cpp/scitokens-cpp/Manifest create mode 100644 dev-cpp/scitokens-cpp/metadata.xml create mode 100644 dev-cpp/scitokens-cpp/scitokens-cpp-0.7.0.ebuild diff --git a/dev-cpp/scitokens-cpp/Manifest b/dev-cpp/scitokens-cpp/Manifest new file mode 100644 index 0000000000..c935ffbbef --- /dev/null +++ b/dev-cpp/scitokens-cpp/Manifest @@ -0,0 +1 @@ +DIST scitokens-cpp-0.7.0.tar.gz 98971 BLAKE2B 3429ff89b5a5202f9892fc68fc558c8b64276977a396981af845f05f8eb3f638602cedd30ea97f3ab5e6d188de7249247854dd6281aeb138d6e304b5aa006bb9 SHA512 1be8a84b7d88c10ab7336c3c6bc8d7e7be5feb3253ef618cba1f3ed908aad3fc480f30dd2a292aa2774ec88ceba370af3fa7d96f228cba3df8f78b6face6991b diff --git a/dev-cpp/scitokens-cpp/metadata.xml b/dev-cpp/scitokens-cpp/metadata.xml new file mode 100644 index 0000000000..6168f62c8d --- /dev/null +++ b/dev-cpp/scitokens-cpp/metadata.xml @@ -0,0 +1,12 @@ + + + + + o.freyermuth@googlemail.com + Oliver Freyermuth + + + https://github.com/scitokens/scitokens-cpp/issues + scitokens/scitokens-cpp + + diff --git a/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.0.ebuild b/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.0.ebuild new file mode 100644 index 0000000000..85b3de8644 --- /dev/null +++ b/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.0.ebuild @@ -0,0 +1,48 @@ +# 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" + KEYWORDS="" +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} + Date: Sat, 26 Feb 2022 19:55:55 +0100 Subject: [PATCH 3/4] dev-cpp/scitokens-cpp: Add missing dependencies. Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Oliver Freyermuth --- dev-cpp/scitokens-cpp/scitokens-cpp-0.7.0.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.0.ebuild b/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.0.ebuild index 85b3de8644..a926a4b9f5 100644 --- a/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.0.ebuild +++ b/dev-cpp/scitokens-cpp/scitokens-cpp-0.7.0.ebuild @@ -25,7 +25,10 @@ DEPEND="${RDEPEND} Date: Sun, 27 Feb 2022 11:05:17 +0100 Subject: [PATCH 4/4] media-sound/spotify-adblock: add QA_FLAGS_IGNORED Rust programs don't respect LDFLAGS/CFLAGS Closes: https://bugs.gentoo.org/834149 Closes: https://bugs.gentoo.org/834150 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Nicola Smaniotto --- media-sound/spotify-adblock/spotify-adblock-1.0.1.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/media-sound/spotify-adblock/spotify-adblock-1.0.1.ebuild b/media-sound/spotify-adblock/spotify-adblock-1.0.1.ebuild index 11d03833e5..40891426c4 100644 --- a/media-sound/spotify-adblock/spotify-adblock-1.0.1.ebuild +++ b/media-sound/spotify-adblock/spotify-adblock-1.0.1.ebuild @@ -41,6 +41,8 @@ RDEPEND=" media-sound/spotify " +QA_FLAGS_IGNORED="usr/bin/${PN}" + src_install(){ # executable SPOTIFY_HOME=/opt/spotify/spotify-client