[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/

[Sam James]

commit:     05db41626668d3f2d4a79bf6876f44bf06b0dee9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  3 17:47:39 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb  3 17:47:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05db4162

dev-util/cmake: add 3.26.0_rc1 (unkeyworded)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/cmake/Manifest                                       | 2 ++
 dev-util/cmake/{cmake-9999.ebuild => cmake-3.26.0_rc1.ebuild} | 7 ++++---
 dev-util/cmake/cmake-9999.ebuild                              | 7 ++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 7a7bf9d61135..1e12ca339a97 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -6,3 +6,5 @@ DIST cmake-3.25.2-SHA-256.txt 1646 BLAKE2B 
10289acf1a74e45ad1109bb0759ce82024553
 DIST cmake-3.25.2-SHA-256.txt.asc 833 BLAKE2B 
823c1132836529c3ca1c9060f504ad9904169621e3284c489b92f6334454ffa82791d336c78a27e705eca686e63131aed249c44e61b5f7fb915e80cca0155edc
 SHA512 
16d5f8e0071db7f29b2f502b8a26e71e73519980555f64a548f1b3d5e917ec377cdfa49a4750dffde952e6b818dd37d000992bf67b553902b2117809f02b9486
 DIST cmake-3.25.2-docs.tar.xz 500144 BLAKE2B 
9f45daf51c3acddce8e273649cd7445d00324883f2feccc98632a35d2ba72e7f6fd286f65bc362969f41d13cd5f34881aac8a229c9f6533caf0d86e1092075a8
 SHA512 
191daffb9a244fac79700bb0d21b3d65c7b94685dafd589122d37017660d13768e3e3257170bbfe46871efc59da6e7e2fcad0ce860cf87f1dc149c80df73cf91
 DIST cmake-3.25.2.tar.gz 10561266 BLAKE2B 
ca093cf0b2a0254494965c8b46ab188024b6d745cd56461451f4fa023fbb4f2cca7077877f1698c082d8a3b52c898d6f793657d8da3879f19f7b24139cbab7f0
 SHA512 
20146d06a1722c36249192944a58e4780aad334d2bc5ce2a3d8c4f24656630c5b71ca0ae7ed53587e3d46f488bd773452fa60c3fc7045fe54db2dbc6ffd86390
+DIST cmake-3.26.0-rc1.tar.gz 10666314 BLAKE2B 
1fcc779757447f3c07e41160f2f16648e902fff66ece3099bf5c5c57b6cca75e55e7b35c5eca0dc128146aec5d0064f5a35fecca0015beca6fa0102585c6e808
 SHA512 
6280fd7f3f04da291350441847d4be001bcc56d7e31a08739327958a26721a88cab2de608e53b28154324dc857aeb67dca0f2cd5243b4b3269744628273d6386
+DIST cmake-3.26.0_rc1-docs.tar.xz 507308 BLAKE2B 
83cc5c43acdd7b38961b68c3b477ef070553230823a0a1636222b8ac4e5d268beab4f6bfbaf7d631c07135011a5c1842db227306fbbe5542a629fd03d039c324
 SHA512 
d2a366e8c56035ad697f71d30b37bd9b096c07edb7c84e0b8c271ba1daf1cdc4f59caa1fadf9ad9fad597dcbbd2a0b80f0bf7cd5a23f6888d2d8794d604cf617

diff --git a/dev-util/cmake/cmake-9999.ebuild 
b/dev-util/cmake/cmake-3.26.0_rc1.ebuild
similarity index 98%
copy from dev-util/cmake/cmake-9999.ebuild
copy to dev-util/cmake/cmake-3.26.0_rc1.ebuild
index 9491df325a39..a2b661bbcdbe 100644
--- a/dev-util/cmake/cmake-9999.ebuild
+++ b/dev-util/cmake/cmake-3.26.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,8 @@ EAPI=8
 : ${CMAKE_DOCS_PREBUILT:=1}
 
 CMAKE_DOCS_PREBUILT_DEV=sam
-CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+#CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+CMAKE_DOCS_VERSION=${PV}
 # Default to generating docs (inc. man pages) if no prebuilt; overridden later
 # See bug #784815
 CMAKE_DOCS_USEFLAG="+doc"
@@ -133,7 +134,7 @@ cmake_src_bootstrap() {
 src_unpack() {
        if [[ ${PV} == 9999 ]] ; then
                git-r3_src_unpack
-       elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then
+       elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; then
                default
        else
                cd "${DISTDIR}" || die

diff --git a/dev-util/cmake/cmake-9999.ebuild b/dev-util/cmake/cmake-9999.ebuild
index 9491df325a39..a2b661bbcdbe 100644
--- a/dev-util/cmake/cmake-9999.ebuild
+++ b/dev-util/cmake/cmake-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,8 @@ EAPI=8
 : ${CMAKE_DOCS_PREBUILT:=1}
 
 CMAKE_DOCS_PREBUILT_DEV=sam
-CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+#CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+CMAKE_DOCS_VERSION=${PV}
 # Default to generating docs (inc. man pages) if no prebuilt; overridden later
 # See bug #784815
 CMAKE_DOCS_USEFLAG="+doc"
@@ -133,7 +134,7 @@ cmake_src_bootstrap() {
 src_unpack() {
        if [[ ${PV} == 9999 ]] ; then
                git-r3_src_unpack
-       elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then
+       elif [[ ${PV} == *_rc* ]] || ! use verify-sig ; then
                default
        else
                cd "${DISTDIR}" || die