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 326B1158094 for ; Fri, 5 Aug 2022 05:29:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BE3BE0E27; Fri, 5 Aug 2022 05:29:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B77AE0E27 for ; Fri, 5 Aug 2022 05:29:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0213F340BB4 for ; Fri, 5 Aug 2022 05:29:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6FEA5559 for ; Fri, 5 Aug 2022 05:29:47 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1659677381.252ff30e11fddb9b8af3b9f05d1f1949dca9bdb3.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/cmake/cmake-3.24.0.ebuild dev-util/cmake/cmake-9999.ebuild X-VCS-Directories: dev-util/cmake/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 252ff30e11fddb9b8af3b9f05d1f1949dca9bdb3 X-VCS-Branch: master Date: Fri, 5 Aug 2022 05:29:47 +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: 5fa40cef-a193-4ca6-86f8-f2a19cb5b5b8 X-Archives-Hash: 436e7c3b74d183a96c150f9df256e2b7 commit: 252ff30e11fddb9b8af3b9f05d1f1949dca9bdb3 Author: Sam James gentoo org> AuthorDate: Fri Aug 5 05:24:16 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Aug 5 05:29:41 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=252ff30e dev-util/cmake: tidy up, fix path I'm guessing the path got out of sync with the script (distfile locally with what I uploaded). Signed-off-by: Sam James gentoo.org> dev-util/cmake/cmake-3.24.0.ebuild | 12 ++++++------ dev-util/cmake/cmake-9999.ebuild | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dev-util/cmake/cmake-3.24.0.ebuild b/dev-util/cmake/cmake-3.24.0.ebuild index d7ad96e3405c..f4e5d02e2642 100644 --- a/dev-util/cmake/cmake-3.24.0.ebuild +++ b/dev-util/cmake/cmake-3.24.0.ebuild @@ -33,14 +33,14 @@ if [[ ${PV} == 9999 ]] ; then else SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" + if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then + SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" + fi + if [[ ${PV} != *_rc* ]] ; then VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc inherit verify-sig - if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then - SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" - fi - SRC_URI+=" verify-sig? ( https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc @@ -132,7 +132,7 @@ cmake_src_bootstrap() { src_unpack() { if [[ ${PV} == 9999 ]] ; then git-r3_src_unpack - elif ! use verify-sig || [[ ${PV} == *_rc ]] ; then + elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then default else cd "${DISTDIR}" || die @@ -247,7 +247,7 @@ src_install() { # If USE=doc, there'll be newly generated docs which we install instead. if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then - doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/docs/*.[0-8] + doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8] fi if use emacs; then diff --git a/dev-util/cmake/cmake-9999.ebuild b/dev-util/cmake/cmake-9999.ebuild index 41f44120e709..f31888a13431 100644 --- a/dev-util/cmake/cmake-9999.ebuild +++ b/dev-util/cmake/cmake-9999.ebuild @@ -33,14 +33,14 @@ if [[ ${PV} == 9999 ]] ; then else SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" + if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then + SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" + fi + if [[ ${PV} != *_rc* ]] ; then VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc inherit verify-sig - if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then - SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" - fi - SRC_URI+=" verify-sig? ( https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc @@ -132,7 +132,7 @@ cmake_src_bootstrap() { src_unpack() { if [[ ${PV} == 9999 ]] ; then git-r3_src_unpack - elif ! use verify-sig || [[ ${PV} == *_rc ]] ; then + elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then default else cd "${DISTDIR}" || die @@ -247,7 +247,7 @@ src_install() { # If USE=doc, there'll be newly generated docs which we install instead. if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then - doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/docs/*.[0-8] + doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8] fi if use emacs; then