From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6D5C6158003 for ; Sat, 26 Feb 2022 18:37:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0933E08C8; Sat, 26 Feb 2022 18:37:37 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 89939E08C8 for ; Sat, 26 Feb 2022 18:37:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6B9683431C7 for ; Sat, 26 Feb 2022 18:37:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B1C712CB for ; Sat, 26 Feb 2022 18:37:34 +0000 (UTC) From: "Oliver Freyermuth" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Oliver Freyermuth" Message-ID: <1645900652.38a6090ee31dc7234bbd9ce5b173861bafc5bb2a.freyermuth@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: dev-cpp/jwt-cpp/ X-VCS-Repository: repo/proj/guru X-VCS-Files: dev-cpp/jwt-cpp/Manifest dev-cpp/jwt-cpp/jwt-cpp-0.4.0.ebuild dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild X-VCS-Directories: dev-cpp/jwt-cpp/ X-VCS-Committer: freyermuth X-VCS-Committer-Name: Oliver Freyermuth X-VCS-Revision: 38a6090ee31dc7234bbd9ce5b173861bafc5bb2a X-VCS-Branch: dev Date: Sat, 26 Feb 2022 18:37:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 83a20e62-8fb8-4978-8f78-30bc007d0428 X-Archives-Hash: 440ba3725c00fd09a9629be62b898e40 commit: 38a6090ee31dc7234bbd9ce5b173861bafc5bb2a Author: Oliver Freyermuth googlemail com> AuthorDate: Sat Feb 26 18:37:32 2022 +0000 Commit: Oliver Freyermuth googlemail com> CommitDate: Sat Feb 26 18:37:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=38a6090e 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 googlemail.com> dev-cpp/jwt-cpp/Manifest | 1 + .../{jwt-cpp-0.6.0.ebuild => jwt-cpp-0.4.0.ebuild} | 18 +++++++----------- dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dev-cpp/jwt-cpp/Manifest b/dev-cpp/jwt-cpp/Manifest index 056eade7e..7ed5fadf1 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.6.0.ebuild b/dev-cpp/jwt-cpp/jwt-cpp-0.4.0.ebuild similarity index 73% copy from dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild copy to dev-cpp/jwt-cpp/jwt-cpp-0.4.0.ebuild index f877455f8..9b41ae22f 100644 --- a/dev-cpp/jwt-cpp/jwt-cpp-0.6.0.ebuild +++ b/dev-cpp/jwt-cpp/jwt-cpp-0.4.0.ebuild @@ -22,34 +22,30 @@ 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] )" RESTRICT="!picojson? ( 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 + 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=( - -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 - -DJWT_BUILD_TESTS="$(usex test)" - -DJWT_CMAKE_FILES_INSTALL_DIR="${EPREFIX}"/usr/share/cmake + -DBUILD_TESTS="$(usex test)" ) cmake_src_configure } @@ -63,7 +59,7 @@ src_compile() { src_install() { cmake_src_install - use doc && local HTML_DOCS=(doxy/html/.) + use doc && local HTML_DOCS=(docs/html/.) einstalldocs } 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 f877455f8..fe1a3e1ff 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