| 1 |
commit: 252ff30e11fddb9b8af3b9f05d1f1949dca9bdb3 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 5 05:24:16 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 5 05:29:41 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=252ff30e |
| 7 |
|
| 8 |
dev-util/cmake: tidy up, fix path |
| 9 |
|
| 10 |
I'm guessing the path got out of sync with the script (distfile |
| 11 |
locally with what I uploaded). |
| 12 |
|
| 13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-util/cmake/cmake-3.24.0.ebuild | 12 ++++++------ |
| 16 |
dev-util/cmake/cmake-9999.ebuild | 12 ++++++------ |
| 17 |
2 files changed, 12 insertions(+), 12 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-util/cmake/cmake-3.24.0.ebuild b/dev-util/cmake/cmake-3.24.0.ebuild |
| 20 |
index d7ad96e3405c..f4e5d02e2642 100644 |
| 21 |
--- a/dev-util/cmake/cmake-3.24.0.ebuild |
| 22 |
+++ b/dev-util/cmake/cmake-3.24.0.ebuild |
| 23 |
@@ -33,14 +33,14 @@ if [[ ${PV} == 9999 ]] ; then |
| 24 |
else |
| 25 |
SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" |
| 26 |
|
| 27 |
+ if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then |
| 28 |
+ SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" |
| 29 |
+ fi |
| 30 |
+ |
| 31 |
if [[ ${PV} != *_rc* ]] ; then |
| 32 |
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc |
| 33 |
inherit verify-sig |
| 34 |
|
| 35 |
- if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then |
| 36 |
- SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" |
| 37 |
- fi |
| 38 |
- |
| 39 |
SRC_URI+=" verify-sig? ( |
| 40 |
https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt |
| 41 |
https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc |
| 42 |
@@ -132,7 +132,7 @@ cmake_src_bootstrap() { |
| 43 |
src_unpack() { |
| 44 |
if [[ ${PV} == 9999 ]] ; then |
| 45 |
git-r3_src_unpack |
| 46 |
- elif ! use verify-sig || [[ ${PV} == *_rc ]] ; then |
| 47 |
+ elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then |
| 48 |
default |
| 49 |
else |
| 50 |
cd "${DISTDIR}" || die |
| 51 |
@@ -247,7 +247,7 @@ src_install() { |
| 52 |
|
| 53 |
# If USE=doc, there'll be newly generated docs which we install instead. |
| 54 |
if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then |
| 55 |
- doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/docs/*.[0-8] |
| 56 |
+ doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8] |
| 57 |
fi |
| 58 |
|
| 59 |
if use emacs; then |
| 60 |
|
| 61 |
diff --git a/dev-util/cmake/cmake-9999.ebuild b/dev-util/cmake/cmake-9999.ebuild |
| 62 |
index 41f44120e709..f31888a13431 100644 |
| 63 |
--- a/dev-util/cmake/cmake-9999.ebuild |
| 64 |
+++ b/dev-util/cmake/cmake-9999.ebuild |
| 65 |
@@ -33,14 +33,14 @@ if [[ ${PV} == 9999 ]] ; then |
| 66 |
else |
| 67 |
SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" |
| 68 |
|
| 69 |
+ if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then |
| 70 |
+ SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" |
| 71 |
+ fi |
| 72 |
+ |
| 73 |
if [[ ${PV} != *_rc* ]] ; then |
| 74 |
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc |
| 75 |
inherit verify-sig |
| 76 |
|
| 77 |
- if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then |
| 78 |
- SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" |
| 79 |
- fi |
| 80 |
- |
| 81 |
SRC_URI+=" verify-sig? ( |
| 82 |
https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt |
| 83 |
https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc |
| 84 |
@@ -132,7 +132,7 @@ cmake_src_bootstrap() { |
| 85 |
src_unpack() { |
| 86 |
if [[ ${PV} == 9999 ]] ; then |
| 87 |
git-r3_src_unpack |
| 88 |
- elif ! use verify-sig || [[ ${PV} == *_rc ]] ; then |
| 89 |
+ elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then |
| 90 |
default |
| 91 |
else |
| 92 |
cd "${DISTDIR}" || die |
| 93 |
@@ -247,7 +247,7 @@ src_install() { |
| 94 |
|
| 95 |
# If USE=doc, there'll be newly generated docs which we install instead. |
| 96 |
if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then |
| 97 |
- doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/docs/*.[0-8] |
| 98 |
+ doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8] |
| 99 |
fi |
| 100 |
|
| 101 |
if use emacs; then |
Archives