diff options
| author |   Sam James <sam@gentoo.org> | 2022-08-05 06:24:16 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-08-05 06:29:41 +0100 |
| commit | 252ff30e11fddb9b8af3b9f05d1f1949dca9bdb3 (patch) | |
| tree | 01b60b29906f5193b793e787067cc69c00f0f0d3 | |
| parent | sys-cluster/charliecloud: drop 0.27 (diff) | |
| download | gentoo-252ff30e11fddb9b8af3b9f05d1f1949dca9bdb3.tar.gz gentoo-252ff30e11fddb9b8af3b9f05d1f1949dca9bdb3.tar.bz2 gentoo-252ff30e11fddb9b8af3b9f05d1f1949dca9bdb3.zip | |
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 <sam@gentoo.org>
| -rw-r--r-- | dev-util/cmake/cmake-3.24.0.ebuild | 12 | ||||
| -rw-r--r-- | 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 |