| 1 |
commit: 91f88a3f621e203f630b876c7b13962148277945 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 5 01:24:04 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 5 01:24:15 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f88a3f |
| 7 |
|
| 8 |
dev-util/cmake: add 3.24.0 |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-util/cmake/Manifest | 3 +++ |
| 13 |
.../{cmake-9999.ebuild => cmake-3.24.0.ebuild} | 26 +++++++++++++--------- |
| 14 |
dev-util/cmake/cmake-9999.ebuild | 26 +++++++++++++--------- |
| 15 |
3 files changed, 33 insertions(+), 22 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest |
| 18 |
index f9f903c32580..8cb1725e3ef8 100644 |
| 19 |
--- a/dev-util/cmake/Manifest |
| 20 |
+++ b/dev-util/cmake/Manifest |
| 21 |
@@ -10,3 +10,6 @@ DIST cmake-3.23.2.tar.gz 9987716 BLAKE2B 6930deab4849eeb4451297006d7ace37483c4b9 |
| 22 |
DIST cmake-3.23.3-SHA-256.txt 1452 BLAKE2B aa2e2dfb2757210688a5a9131ca1fffdf6617a52219d373fd908c08e52b7d77f0e980086561a083cabaf8d9f3e24b15064bb74ad2737fcbfe11c8aba5814eb4e SHA512 22808c050e8927867fc5d2daa6999d9eed53e99015f89d1f5bef61397d1b2a9888728e86fdca8716c47f8133e02b3fa726d0cc97c0bb4ab5f5ff16a1fc0ae82f |
| 23 |
DIST cmake-3.23.3-SHA-256.txt.asc 833 BLAKE2B 10f61d7cfaa5c86d0e372f33d9ba0dbe7ae9cbfe17669107167b3ae72d0e337c63fb1c27a528dcda804323a1f0d4843b630e15427c33e0f5d5c568e27cea769d SHA512 75ff4b25fdd71bc05a7d6fec3c72ec5b8d6ed7ac980d533e6c820855c74a1a58f52d53c1a454dffe1a15568445c4c1c805891997e5709567c9e7709ba1c5e4d9 |
| 24 |
DIST cmake-3.23.3.tar.gz 9988050 BLAKE2B 55105ce380e5e9f1839fc38cc0eaefe505d58bffa60feab9813a36c7cac92f4fb6aa6b6aaad899f1e8d58cfa5ececb9e7335a470244ccc06848d833b1eddf224 SHA512 75f86abe60ef28ba9bd06546c0c24578921621fb4be942171e629366a759cf1469e430945addc85f8ce977920883c063ed26de1b78fd24dfd98d0eb604800632 |
| 25 |
+DIST cmake-3.24.0-SHA-256.txt 1646 BLAKE2B f41c0e2f280258c79c0d269a8249dc2a5e6615f50277f452f0b5b71f106f1cbcbb272bce4f28580f422cd8f294d040135abcd0d0a1e00cec3c3d3ceaef99286d SHA512 c1a0d16ba46dad95aacdf5e0985df1b75294e2fa664d15a8eabeae126b7e1517ce303c44746a58d339d2622d4dc8be263bd332af5b804ac614e64a2e633f6ec9 |
| 26 |
+DIST cmake-3.24.0-SHA-256.txt.asc 833 BLAKE2B 828f1130930635ad78b6829d8cb1780d9fb9a45edf1650e19a2869d18fd3225d869c664d28775a9b29934f1e3958dae542de3a37e5e3aa965b1704c512b2ee86 SHA512 dc0c495892716643f6ce1015240c373c6145ef070b35f7229d8f109a9bf4c771b49da6672ba765f69c293ed438e26afcab4bb6fa8a3c36f8b4ac91b49b6782bb |
| 27 |
+DIST cmake-3.24.0.tar.gz 10395167 BLAKE2B 72b75e3fa4ae1710f5e5d1ac4e356a723ec1b197c9121cd73273f079f7eb31e61fbd5acab228e9b5696c4f8ab85213da4a6cf8e35068f3ca776082742084ae6d SHA512 91507fc0643f2de20e37cd8d6a539d8cb38a80b604bf77de8e88c8446b6d7b6d02b7329d58966dc2412c6c75edcb9dfbdae02fe84965fefeb7ca47f87631fe17 |
| 28 |
|
| 29 |
diff --git a/dev-util/cmake/cmake-9999.ebuild b/dev-util/cmake/cmake-3.24.0.ebuild |
| 30 |
similarity index 95% |
| 31 |
copy from dev-util/cmake/cmake-9999.ebuild |
| 32 |
copy to dev-util/cmake/cmake-3.24.0.ebuild |
| 33 |
index 1f441d341fb6..1a912f345994 100644 |
| 34 |
--- a/dev-util/cmake/cmake-9999.ebuild |
| 35 |
+++ b/dev-util/cmake/cmake-3.24.0.ebuild |
| 36 |
@@ -16,10 +16,11 @@ MY_P="${P/_/-}" |
| 37 |
DESCRIPTION="Cross platform Make" |
| 38 |
HOMEPAGE="https://cmake.org/" |
| 39 |
if [[ ${PV} == 9999 ]] ; then |
| 40 |
- inherit git-r3 |
| 41 |
EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git" |
| 42 |
+ inherit git-r3 |
| 43 |
else |
| 44 |
SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" |
| 45 |
+ |
| 46 |
if [[ ${PV} != *_rc* ]] ; then |
| 47 |
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc |
| 48 |
inherit verify-sig |
| 49 |
@@ -35,6 +36,8 @@ else |
| 50 |
fi |
| 51 |
fi |
| 52 |
|
| 53 |
+S="${WORKDIR}/${MY_P}" |
| 54 |
+ |
| 55 |
LICENSE="CMake" |
| 56 |
SLOT="0" |
| 57 |
IUSE="doc emacs ncurses qt5 test" |
| 58 |
@@ -66,23 +69,21 @@ BDEPEND+=" |
| 59 |
test? ( app-arch/libarchive[zstd] ) |
| 60 |
" |
| 61 |
|
| 62 |
-S="${WORKDIR}/${MY_P}" |
| 63 |
- |
| 64 |
SITEFILE="50${PN}-gentoo.el" |
| 65 |
|
| 66 |
PATCHES=( |
| 67 |
- # prefix |
| 68 |
+ # Prefix |
| 69 |
"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch |
| 70 |
"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch |
| 71 |
"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch |
| 72 |
|
| 73 |
- # handle gentoo packaging in find modules |
| 74 |
+ # Handle gentoo packaging in find modules |
| 75 |
"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch |
| 76 |
# Next patch needs to be reworked |
| 77 |
#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch |
| 78 |
"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch |
| 79 |
|
| 80 |
- # respect python eclasses |
| 81 |
+ # Respect python eclasses |
| 82 |
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch |
| 83 |
"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch |
| 84 |
|
| 85 |
@@ -132,20 +133,21 @@ src_prepare() { |
| 86 |
cmake_src_prepare |
| 87 |
|
| 88 |
if [[ ${CHOST} == *-darwin* ]] ; then |
| 89 |
- # disable Xcode hooks, bug #652134 |
| 90 |
+ # Disable Xcode hooks, bug #652134 |
| 91 |
sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \ |
| 92 |
Source/CMakeLists.txt || die |
| 93 |
sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ |
| 94 |
-e '/cmGlobalXCodeGenerator.h/d' \ |
| 95 |
Source/cmake.cxx || die |
| 96 |
- # disable isysroot usage with GCC, we've properly instructed |
| 97 |
+ |
| 98 |
+ # Disable isysroot usage with GCC, we've properly instructed |
| 99 |
# where things are via GCC configuration and ldwrapper |
| 100 |
sed -i -e '/cmake_gnu_set_sysroot_flag/d' \ |
| 101 |
Modules/Platform/Apple-GNU-*.cmake || die |
| 102 |
- # disable isysroot usage with clang as well |
| 103 |
+ # Disable isysroot usage with clang as well |
| 104 |
sed -i -e '/_SYSROOT_FLAG/d' \ |
| 105 |
Modules/Platform/Apple-Clang.cmake || die |
| 106 |
- # don't set a POSIX standard, system headers don't like that, #757426 |
| 107 |
+ # Don't set a POSIX standard, system headers don't like that, #757426 |
| 108 |
sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ |
| 109 |
Source/cmLoadCommandCommand.cxx \ |
| 110 |
Source/cmStandardLexer.h \ |
| 111 |
@@ -193,7 +195,7 @@ src_compile() { |
| 112 |
} |
| 113 |
|
| 114 |
src_test() { |
| 115 |
- # fix OutDir and SelectLibraryConfigurations tests |
| 116 |
+ # Fix OutDir and SelectLibraryConfigurations tests |
| 117 |
# these are altered thanks to our eclass |
| 118 |
sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ |
| 119 |
"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ |
| 120 |
@@ -244,6 +246,7 @@ src_install() { |
| 121 |
|
| 122 |
pkg_postinst() { |
| 123 |
use emacs && elisp-site-regen |
| 124 |
+ |
| 125 |
if use qt5; then |
| 126 |
xdg_icon_cache_update |
| 127 |
xdg_desktop_database_update |
| 128 |
@@ -253,6 +256,7 @@ pkg_postinst() { |
| 129 |
|
| 130 |
pkg_postrm() { |
| 131 |
use emacs && elisp-site-regen |
| 132 |
+ |
| 133 |
if use qt5; then |
| 134 |
xdg_icon_cache_update |
| 135 |
xdg_desktop_database_update |
| 136 |
|
| 137 |
diff --git a/dev-util/cmake/cmake-9999.ebuild b/dev-util/cmake/cmake-9999.ebuild |
| 138 |
index 1f441d341fb6..1a912f345994 100644 |
| 139 |
--- a/dev-util/cmake/cmake-9999.ebuild |
| 140 |
+++ b/dev-util/cmake/cmake-9999.ebuild |
| 141 |
@@ -16,10 +16,11 @@ MY_P="${P/_/-}" |
| 142 |
DESCRIPTION="Cross platform Make" |
| 143 |
HOMEPAGE="https://cmake.org/" |
| 144 |
if [[ ${PV} == 9999 ]] ; then |
| 145 |
- inherit git-r3 |
| 146 |
EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git" |
| 147 |
+ inherit git-r3 |
| 148 |
else |
| 149 |
SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" |
| 150 |
+ |
| 151 |
if [[ ${PV} != *_rc* ]] ; then |
| 152 |
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc |
| 153 |
inherit verify-sig |
| 154 |
@@ -35,6 +36,8 @@ else |
| 155 |
fi |
| 156 |
fi |
| 157 |
|
| 158 |
+S="${WORKDIR}/${MY_P}" |
| 159 |
+ |
| 160 |
LICENSE="CMake" |
| 161 |
SLOT="0" |
| 162 |
IUSE="doc emacs ncurses qt5 test" |
| 163 |
@@ -66,23 +69,21 @@ BDEPEND+=" |
| 164 |
test? ( app-arch/libarchive[zstd] ) |
| 165 |
" |
| 166 |
|
| 167 |
-S="${WORKDIR}/${MY_P}" |
| 168 |
- |
| 169 |
SITEFILE="50${PN}-gentoo.el" |
| 170 |
|
| 171 |
PATCHES=( |
| 172 |
- # prefix |
| 173 |
+ # Prefix |
| 174 |
"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch |
| 175 |
"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch |
| 176 |
"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch |
| 177 |
|
| 178 |
- # handle gentoo packaging in find modules |
| 179 |
+ # Handle gentoo packaging in find modules |
| 180 |
"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch |
| 181 |
# Next patch needs to be reworked |
| 182 |
#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch |
| 183 |
"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch |
| 184 |
|
| 185 |
- # respect python eclasses |
| 186 |
+ # Respect python eclasses |
| 187 |
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch |
| 188 |
"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch |
| 189 |
|
| 190 |
@@ -132,20 +133,21 @@ src_prepare() { |
| 191 |
cmake_src_prepare |
| 192 |
|
| 193 |
if [[ ${CHOST} == *-darwin* ]] ; then |
| 194 |
- # disable Xcode hooks, bug #652134 |
| 195 |
+ # Disable Xcode hooks, bug #652134 |
| 196 |
sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \ |
| 197 |
Source/CMakeLists.txt || die |
| 198 |
sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ |
| 199 |
-e '/cmGlobalXCodeGenerator.h/d' \ |
| 200 |
Source/cmake.cxx || die |
| 201 |
- # disable isysroot usage with GCC, we've properly instructed |
| 202 |
+ |
| 203 |
+ # Disable isysroot usage with GCC, we've properly instructed |
| 204 |
# where things are via GCC configuration and ldwrapper |
| 205 |
sed -i -e '/cmake_gnu_set_sysroot_flag/d' \ |
| 206 |
Modules/Platform/Apple-GNU-*.cmake || die |
| 207 |
- # disable isysroot usage with clang as well |
| 208 |
+ # Disable isysroot usage with clang as well |
| 209 |
sed -i -e '/_SYSROOT_FLAG/d' \ |
| 210 |
Modules/Platform/Apple-Clang.cmake || die |
| 211 |
- # don't set a POSIX standard, system headers don't like that, #757426 |
| 212 |
+ # Don't set a POSIX standard, system headers don't like that, #757426 |
| 213 |
sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \ |
| 214 |
Source/cmLoadCommandCommand.cxx \ |
| 215 |
Source/cmStandardLexer.h \ |
| 216 |
@@ -193,7 +195,7 @@ src_compile() { |
| 217 |
} |
| 218 |
|
| 219 |
src_test() { |
| 220 |
- # fix OutDir and SelectLibraryConfigurations tests |
| 221 |
+ # Fix OutDir and SelectLibraryConfigurations tests |
| 222 |
# these are altered thanks to our eclass |
| 223 |
sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ |
| 224 |
"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ |
| 225 |
@@ -244,6 +246,7 @@ src_install() { |
| 226 |
|
| 227 |
pkg_postinst() { |
| 228 |
use emacs && elisp-site-regen |
| 229 |
+ |
| 230 |
if use qt5; then |
| 231 |
xdg_icon_cache_update |
| 232 |
xdg_desktop_database_update |
| 233 |
@@ -253,6 +256,7 @@ pkg_postinst() { |
| 234 |
|
| 235 |
pkg_postrm() { |
| 236 |
use emacs && elisp-site-regen |
| 237 |
+ |
| 238 |
if use qt5; then |
| 239 |
xdg_icon_cache_update |
| 240 |
xdg_desktop_database_update |
Archives