| 1 |
commit: 92f3b866eaf6514215fb89afdb40c37f778128af |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 5 04:07:10 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 5 04:07:58 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92f3b866 |
| 7 |
|
| 8 |
dev-util/cmake: provide pre-generated man pages |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/784815 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-util/cmake/Manifest | 1 + |
| 14 |
dev-util/cmake/cmake-3.24.0.ebuild | 23 ++++++++++++++++++++++- |
| 15 |
dev-util/cmake/cmake-9999.ebuild | 23 ++++++++++++++++++++++- |
| 16 |
3 files changed, 45 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest |
| 19 |
index 8cb1725e3ef8..40cd2fe7e71e 100644 |
| 20 |
--- a/dev-util/cmake/Manifest |
| 21 |
+++ b/dev-util/cmake/Manifest |
| 22 |
@@ -12,4 +12,5 @@ DIST cmake-3.23.3-SHA-256.txt.asc 833 BLAKE2B 10f61d7cfaa5c86d0e372f33d9ba0dbe7a |
| 23 |
DIST cmake-3.23.3.tar.gz 9988050 BLAKE2B 55105ce380e5e9f1839fc38cc0eaefe505d58bffa60feab9813a36c7cac92f4fb6aa6b6aaad899f1e8d58cfa5ececb9e7335a470244ccc06848d833b1eddf224 SHA512 75f86abe60ef28ba9bd06546c0c24578921621fb4be942171e629366a759cf1469e430945addc85f8ce977920883c063ed26de1b78fd24dfd98d0eb604800632 |
| 24 |
DIST cmake-3.24.0-SHA-256.txt 1646 BLAKE2B f41c0e2f280258c79c0d269a8249dc2a5e6615f50277f452f0b5b71f106f1cbcbb272bce4f28580f422cd8f294d040135abcd0d0a1e00cec3c3d3ceaef99286d SHA512 c1a0d16ba46dad95aacdf5e0985df1b75294e2fa664d15a8eabeae126b7e1517ce303c44746a58d339d2622d4dc8be263bd332af5b804ac614e64a2e633f6ec9 |
| 25 |
DIST cmake-3.24.0-SHA-256.txt.asc 833 BLAKE2B 828f1130930635ad78b6829d8cb1780d9fb9a45edf1650e19a2869d18fd3225d869c664d28775a9b29934f1e3958dae542de3a37e5e3aa965b1704c512b2ee86 SHA512 dc0c495892716643f6ce1015240c373c6145ef070b35f7229d8f109a9bf4c771b49da6672ba765f69c293ed438e26afcab4bb6fa8a3c36f8b4ac91b49b6782bb |
| 26 |
+DIST cmake-3.24.0-docs.tar.xz 490472 BLAKE2B f7dcbee55473add99406d8956657098f78e49eb30df96d73dfc8affc2ee4aca19159956189511e1cea821974e4741fd7b1c5d28f6e8f9cc31ace80c6c504b27d SHA512 dc69388e8ab20eae3c447e95f7d1b0c153a537ae81d18ac4dc4117a7df5348a2a9f35ce8c6c18c3fabe34f7d9ce3dc3f90f2323789c65c089679abe9e359f1f6 |
| 27 |
DIST cmake-3.24.0.tar.gz 10395167 BLAKE2B 72b75e3fa4ae1710f5e5d1ac4e356a723ec1b197c9121cd73273f079f7eb31e61fbd5acab228e9b5696c4f8ab85213da4a6cf8e35068f3ca776082742084ae6d SHA512 91507fc0643f2de20e37cd8d6a539d8cb38a80b604bf77de8e88c8446b6d7b6d02b7329d58966dc2412c6c75edcb9dfbdae02fe84965fefeb7ca47f87631fe17 |
| 28 |
|
| 29 |
diff --git a/dev-util/cmake/cmake-3.24.0.ebuild b/dev-util/cmake/cmake-3.24.0.ebuild |
| 30 |
index 68485b4312d0..ee2c9abfd92f 100644 |
| 31 |
--- a/dev-util/cmake/cmake-3.24.0.ebuild |
| 32 |
+++ b/dev-util/cmake/cmake-3.24.0.ebuild |
| 33 |
@@ -3,6 +3,16 @@ |
| 34 |
|
| 35 |
EAPI=8 |
| 36 |
|
| 37 |
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs |
| 38 |
+# Set to 1 if prebuilt, 0 if not |
| 39 |
+# (the construct below is to allow overriding from env for script) |
| 40 |
+CMAKE_DOCS_PREBUILT=${CMAKE_DOCS_PREBUILT:-1} |
| 41 |
+CMAKE_DOCS_PREBUILT_DEV=sam |
| 42 |
+CMAKE_DOCS_VERSION=$(ver_cut 1-3) |
| 43 |
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later |
| 44 |
+# See bug #784815 |
| 45 |
+CMAKE_DOCS_USEFLAG="+doc" |
| 46 |
+ |
| 47 |
# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja |
| 48 |
# ... but seems fine as of 3.22.3? |
| 49 |
# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. |
| 50 |
@@ -16,6 +26,8 @@ MY_P="${P/_/-}" |
| 51 |
DESCRIPTION="Cross platform Make" |
| 52 |
HOMEPAGE="https://cmake.org/" |
| 53 |
if [[ ${PV} == 9999 ]] ; then |
| 54 |
+ CMAKE_DOCS_PREBUILT=0 |
| 55 |
+ |
| 56 |
EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git" |
| 57 |
inherit git-r3 |
| 58 |
else |
| 59 |
@@ -25,6 +37,10 @@ else |
| 60 |
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc |
| 61 |
inherit verify-sig |
| 62 |
|
| 63 |
+ if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then |
| 64 |
+ SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" |
| 65 |
+ fi |
| 66 |
+ |
| 67 |
SRC_URI+=" verify-sig? ( |
| 68 |
https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt |
| 69 |
https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc |
| 70 |
@@ -40,7 +56,7 @@ S="${WORKDIR}/${MY_P}" |
| 71 |
|
| 72 |
LICENSE="CMake" |
| 73 |
SLOT="0" |
| 74 |
-IUSE="doc emacs ncurses qt5 test" |
| 75 |
+IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test" |
| 76 |
RESTRICT="!test? ( test )" |
| 77 |
|
| 78 |
RDEPEND=" |
| 79 |
@@ -227,6 +243,11 @@ src_test() { |
| 80 |
src_install() { |
| 81 |
cmake_src_install |
| 82 |
|
| 83 |
+ # If USE=doc, there'll be newly generated docs which we install instead. |
| 84 |
+ if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then |
| 85 |
+ doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/docs/*.[0-8] |
| 86 |
+ fi |
| 87 |
+ |
| 88 |
if use emacs; then |
| 89 |
elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc |
| 90 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
| 91 |
|
| 92 |
diff --git a/dev-util/cmake/cmake-9999.ebuild b/dev-util/cmake/cmake-9999.ebuild |
| 93 |
index 1a912f345994..918d1d56fccd 100644 |
| 94 |
--- a/dev-util/cmake/cmake-9999.ebuild |
| 95 |
+++ b/dev-util/cmake/cmake-9999.ebuild |
| 96 |
@@ -3,6 +3,16 @@ |
| 97 |
|
| 98 |
EAPI=8 |
| 99 |
|
| 100 |
+# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs |
| 101 |
+# Set to 1 if prebuilt, 0 if not |
| 102 |
+# (the construct below is to allow overriding from env for script) |
| 103 |
+CMAKE_DOCS_PREBUILT=${CMAKE_DOCS_PREBUILT:-1} |
| 104 |
+CMAKE_DOCS_PREBUILT_DEV=sam |
| 105 |
+CMAKE_DOCS_VERSION=$(ver_cut 1-3) |
| 106 |
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later |
| 107 |
+# See bug #784815 |
| 108 |
+CMAKE_DOCS_USEFLAG="+doc" |
| 109 |
+ |
| 110 |
# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja |
| 111 |
# ... but seems fine as of 3.22.3? |
| 112 |
# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. |
| 113 |
@@ -16,6 +26,8 @@ MY_P="${P/_/-}" |
| 114 |
DESCRIPTION="Cross platform Make" |
| 115 |
HOMEPAGE="https://cmake.org/" |
| 116 |
if [[ ${PV} == 9999 ]] ; then |
| 117 |
+ CMAKE_DOCS_PREBUILT=0 |
| 118 |
+ |
| 119 |
EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git" |
| 120 |
inherit git-r3 |
| 121 |
else |
| 122 |
@@ -25,6 +37,10 @@ else |
| 123 |
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc |
| 124 |
inherit verify-sig |
| 125 |
|
| 126 |
+ if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then |
| 127 |
+ SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )" |
| 128 |
+ fi |
| 129 |
+ |
| 130 |
SRC_URI+=" verify-sig? ( |
| 131 |
https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt |
| 132 |
https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc |
| 133 |
@@ -40,7 +56,7 @@ S="${WORKDIR}/${MY_P}" |
| 134 |
|
| 135 |
LICENSE="CMake" |
| 136 |
SLOT="0" |
| 137 |
-IUSE="doc emacs ncurses qt5 test" |
| 138 |
+IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test" |
| 139 |
RESTRICT="!test? ( test )" |
| 140 |
|
| 141 |
RDEPEND=" |
| 142 |
@@ -227,6 +243,11 @@ src_test() { |
| 143 |
src_install() { |
| 144 |
cmake_src_install |
| 145 |
|
| 146 |
+ # If USE=doc, there'll be newly generated docs which we install instead. |
| 147 |
+ if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then |
| 148 |
+ doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/docs/*.[0-8] |
| 149 |
+ fi |
| 150 |
+ |
| 151 |
if use emacs; then |
| 152 |
elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc |
| 153 |
elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
Archives