summaryrefslogtreecommitdiff
path: root/dev-build
diff options
context:
space:
mode:
Diffstat (limited to 'dev-build')
-rw-r--r--dev-build/Manifest.gzbin7709 -> 7703 bytes
-rw-r--r--dev-build/cmake/Manifest12
-rw-r--r--dev-build/cmake/cmake-3.31.6-r1.ebuild (renamed from dev-build/cmake/cmake-4.0.0_rc1.ebuild)9
-rw-r--r--dev-build/cmake/cmake-4.0.0_rc4.ebuild (renamed from dev-build/cmake/cmake-4.0.0_rc3.ebuild)22
-rw-r--r--dev-build/cmake/cmake-9999.ebuild35
-rw-r--r--dev-build/cmake/files/cmake-3.31.6-Prefer-pkgconfig-in-FindBLAS.patch28
-rw-r--r--dev-build/meson/Manifest2
-rw-r--r--dev-build/meson/meson-1.6.1.ebuild2
8 files changed, 72 insertions, 38 deletions
diff --git a/dev-build/Manifest.gz b/dev-build/Manifest.gz
index 745936ce562b..f8934c9fb174 100644
--- a/dev-build/Manifest.gz
+++ b/dev-build/Manifest.gz
Binary files differ
diff --git a/dev-build/cmake/Manifest b/dev-build/cmake/Manifest
index 9b6260987790..d08cd99e3aef 100644
--- a/dev-build/cmake/Manifest
+++ b/dev-build/cmake/Manifest
@@ -6,6 +6,7 @@ AUX cmake-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.p
AUX cmake-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch 2339 BLAKE2B d9d1a8326dd9018e5d8138997f0d52eacbd953b6da51e04a1232974a3371c5349c285c5fb8b8e9b3786f4be0f20062ebe19f3a15ed802982bf1c4e95e78220a7 SHA512 06aa209c6057b7f9c0bbdd0086c01adc44bd613d57b97f90811c6ef8e65dfb51a37effe154672067d82ece2fc8f39d488d3f31f97848b150a6a0d1628c435bb4
AUX cmake-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch 1207 BLAKE2B 4cd68da953268521965e04810e9b76a97dbc68c6c7e81cb23e0257166886787519122e425991c9bc9c9fd2d4d23a6a221206a8a3edc888adf58b1fe312cea149 SHA512 da5e897e7b8cc0973fb36ad82ac145c3cc790eadd10c1b7283decec67ede42d3ce132b1a71a3daa362941bd24208d9a3923af7331faac93ebda96df6aaf297dc
AUX cmake-3.30.3-cudahostld.patch 1248 BLAKE2B 085a8d01ed89eeee852a7adc12101046a6cbba19486c7e1b311dd67211f9f9d60e03a54509c66808dde7419a8f45f5ec8ac3b974fdd8013ee96152b6e3457ad9 SHA512 495afc75274a939e78cf5492c383cb586b6c14fc3c598fe40e2dd25f6883cb678e33ff3b8915f6f90490b8a9cd62746053407e2ba58dc88719a93f97a36fdf66
+AUX cmake-3.31.6-Prefer-pkgconfig-in-FindBLAS.patch 861 BLAKE2B 252158e031cd6f0af74cc294cb7829c11c6c4a72a2fb3c405f146a98362f5121b9351997a2818740fed3966fa29a98cd2a61f44f5da7b9107dc15df03597d697 SHA512 063a6c7cbf68c6c9b7931114a5d85683515dfa67aca2b3f3501f7af820f0b36e99f6588744089df31b7a3a487268b5047dd36090feece0bd986484f5240bf658
AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
DIST cmake-3.28.0-docs.tar.xz 525776 BLAKE2B b643f76012768f0100c51f0dd146230eba25b634ab4f9abd9c739b0b257e4b1d54aa01be8d2dcd27a7b1d9822bf13eb8af16ff3c6984eeefdeb58988a164bc26 SHA512 474dc77e44240de921013219bd7cdc4aee80214fbf38d60dc2ddb53c0fda8a11c466c01bbee2abbd32b711ec7524678515e39a79a5634354a6cb38f9683e229f
DIST cmake-3.28.5-SHA-256.txt 1646 BLAKE2B 763cbec9ede58cc43a7435e3fe97a9a9f28b201712f52d98ecdf8035887232fe6000675c9bab90f275ff6d44406839f04352784a921dcbc9d65c5e2440b53f52 SHA512 0fdeed277d113e4642c11b87b98305da43213bd89566e3aaaf427a11e168d9e6754632c2fd76fae542d29fddfa8b67c3c0df19f741c53fdd3aea8ce7bec73ff3
@@ -22,14 +23,15 @@ DIST cmake-3.31.5.tar.gz 11706495 BLAKE2B 16375229d7344b10db40c76fe2fc8a3f906266
DIST cmake-3.31.6-SHA-256.txt 1646 BLAKE2B f5d3bb67759b4b227bd38eb7de8405052fd55cef528d3a4d4754d77815cdb018831fadcb51e590186faa5e7911bd6d9ceba29d971a7d125435df06132276a00d SHA512 8e3d939ccab2260380fce92c31ba8244c7b4d19c7245d5bc9607e9352f2e7fa1e0e4ecc8555f8418f9659f53c142111dd34aba0739d947f387e5a88345dd6b46
DIST cmake-3.31.6-SHA-256.txt.asc 833 BLAKE2B a99307a7e8011a1df30a2f364ae68b2f5d286d0d98f8a9b5d27283aa109963d6989218a8b3787666d7aa3a7e37e4d6468077c16b6550727efd1295f8c0504caa SHA512 c7a728110790a85ba89dace68c9bd4c22c81ae4482a758297fdb49e7eb11ccf0056d0d4fcf100be71eed7cc2ae3f633722df801dba2d61dd0fafb476d5b09128
DIST cmake-3.31.6.tar.gz 11710589 BLAKE2B ea1bee1a98568407dfc164f82bf0e3ab082124bbbb12cfa18489bdbe9964418ee30fb62b4915bc06645bcd2cf1e17bfb9c210812da070acbba848db186d06044 SHA512 839d06b6ebd0bf78cbe8f7ae3a7c00026e70d759a81ac51aa103f35ad985ac69be9e667aae7b5fe48c5e0c41baec791259279679dbdf2ddd8b63a48382a8a2a0
-DIST cmake-4.0.0-rc1.tar.gz 11822440 BLAKE2B 644177b912908bf54861aae9b01c14512ab02a99a7699e95dd775d9661abff556400dbedd841258211baf86bef68271e019052470a13d06ce8392104eab245a8 SHA512 7b08a425907e5eef820ca4db8732825bbd7880ac8a4566c103b9ebfe8d3407aa048213e2c4bd685c5f728d5aa975f4a46fc4f76509b7484a0e9cd604e2b81973
-DIST cmake-4.0.0-rc3.tar.gz 11824249 BLAKE2B 1fa96d5e5703e7261edd6b7305b6752d2d1aebfe55ee7dba718969979d3b1c45a2bfed67fdc45001d42a6afc5eab8c22faca88dc3231b40ffb93ab555a5cb6c9 SHA512 69814a171a5210b8d54e5c1e80e713b5f208f90e145eeaada1be8508c209a660e4cad03aa0b174b17844e922288a9490dddca164e99409e37821e5ab3b5c4dee
+DIST cmake-4.0.0-rc4-SHA-256.txt 2099 BLAKE2B 9a902a5ceb3a4c8a1886fc2df05f5b229f76670781e77fc423be723f5455d0b323b5babd242f72bc737ea75e657bae1cbf67e54b50c2ecd385d0e8baa8812ece SHA512 0691a37482e90b27be913c925100c1485768221824e6e91f992671dacf18f6c318c7d2dc67551e391e6c7e0b1ee418ad9b88ed82309456b0bc3c86b53981173b
+DIST cmake-4.0.0-rc4-SHA-256.txt.asc 833 BLAKE2B a9118933d4daebe4afd8e0a54afbcdb32f961248fa70c9f468bcf5743a6aa5e30f6083d78b1b51550e6e1388e99926e0f0ef07a1853cf62d7d7d169430e73b3a SHA512 a4db155a0e3df77332420e806e333d9435f927b82a4b03eabb263346cb632f62a44168e45f5a7a0aa2e12ab54fd2edb049544be8796997898734f1ed7454a6f8
+DIST cmake-4.0.0-rc4.tar.gz 11825037 BLAKE2B cca7e01a79bedea65622754c1e920f621b4ce1e4637a11e7d3b880d26fc074d52766593c4441a32898ec9c61a1ed9fd27ac47c95985ec22e8c355bbbc3025e68 SHA512 a2325e22f23bd62a048b6e9e9c2b6c069260b510169686ee69e45fe1596b53947bef449b32c14471ecc94840d8275e5fe3de89dd63b2aa9e7bdcbd7972e5a457
DIST cmake-4.0.0_rc1-docs.tar.xz 577536 BLAKE2B 74a742ffef8e1af1652746e1c177d4198155145a039635e6a0ea40af463f3a2d45b6c6ce7d3a9b1fee24f0c1cfd1c3aa95c27669ca3c6281d54e701fc0ece202 SHA512 74c20067d3b82493024b2f2711b55b93998ce3b5f35ab5a154f33a8268a35a29d01127c55ce6b85b80ff252d15284ed1065e1338422124f6722a4190a984637c
EBUILD cmake-3.28.5.ebuild 8722 BLAKE2B f6e341a4652c2a42cd495a670c19ed03520d609ca9df03f0b9c79934f34e7e54af3419758bdcc5fc0963c3046660d116aaf6c5a156c3bfe046e8924b17fc7478 SHA512 03f33e94c1fe7dfc53bba884f901cfeecf6f3dc60606f8e0c45814838f309e950d9239d49c62dc0079ec126dce600033d54acf4439193cb0a6e7e5186a64a2d0
EBUILD cmake-3.30.6.ebuild 9178 BLAKE2B 56a8101652aecb0687b770339dac6bca0331965cd5688f5b7f59c8e479c33bca9c4e4d5609471b1db94233e98786904f304cd53f9dafdc5520f2820739d64e95 SHA512 ac3a52e8bec3985b476c3603e2dd026fc552a92f670ccfa48f4411dcbf480737d85d6c0c0b7b6d61d4bfe9a9f1752b59c964928ad450219bef830ce5c803b792
EBUILD cmake-3.31.5.ebuild 9747 BLAKE2B ee45238a0d2df8151d070183aec708c432241c18a1f8a41d80c6e210cf056e4374cd7d7f0bb31b71dbe82093c67beebbb8585fd3d0b7002d3eab65fe5faf473c SHA512 7cdfe1cecebe0b5ac62acb9dcc3164c150bdea6e2b3e52d09e106bd8e2569902c6978a4f89a45a4ba9ec9343d18ebea6de58789fa9a91a5ebd323910b4fe2b07
+EBUILD cmake-3.31.6-r1.ebuild 9745 BLAKE2B d98da2054bc4924ebf393aebf82fbd95916328ec64550a367c9f028932efc3548e2fbc79fe9eb14c0619c759131cf3e750950bba136becb1451f7462dd730612 SHA512 9d0d7190d67d77a74e778ac309cef38a0dcbd25abae4cf894d5f9b2305e701d009a9eab316c5762edf235f8e83b4e02aba6c2726f07c7f846b9bd694587d59c1
EBUILD cmake-3.31.6.ebuild 9754 BLAKE2B 9b2365cd3b55a528bf73c605aedd86b1c0adbd9b92affde31a799c1592f368691b27155ca103677a780e914d9d4ed61d8a53ab38c93c0ca657b7ea4d09f45d4c SHA512 bd75f924fee400676141fc3d7d415a7282f4e4aee5ef66a11cb13f36c57d5377fd4334ac8f2d1853b32a29ef622b8d569da8b3dd9ccbb2a970d7283046150d4d
-EBUILD cmake-4.0.0_rc1.ebuild 9935 BLAKE2B 820522f6d66ef54d05263c33fa4bbe52c7b45de3bef7410d59bf68d4d446b4f45d802f4a5d14d99ae7d3180808c36ab2c9f141e3b7c69f1dce1f71d813a21018 SHA512 8686cf05174ca02e393a30df41d1dee8c00903e86ddbc8eddf4eb132954d3e4810dc7e938af1dc610eb046637801048992ad9749c71625d7b8e1bc7b1e934b67
-EBUILD cmake-4.0.0_rc3.ebuild 9965 BLAKE2B 383085b130ce0d80f59a912905bdafb7e6216e6c6c57e234bcb99799cafdceb126ad71b1532f54a3bc62b09f0b7b7f307e24fd1ee6723707181178d306b2ee3c SHA512 388836e2b1d2a9d71df62668f10414903f2e8862c89c7f772239508e493cb8c02b58a2d8574ab62dbff12c99e9e44b77a71b782f31c0484c7d1129036d315945
-EBUILD cmake-9999.ebuild 9823 BLAKE2B ad6c17d49ab8b6cce09488dca06ddad3fe8dc3904070c5ff2aea1cd83b55a6fee8bd579247a43959783ee885e7c2cf1eddfe9cb1002c29225ae7c42bd36ad4de SHA512 b467c07ec58780d59db1bd8848394a23c02690ece1725ff0bd97d848a7bf741cbeafb92dbbf65b7861daf84218881bab44ee367a547f411d08fdeb7329045158
+EBUILD cmake-4.0.0_rc4.ebuild 10067 BLAKE2B 2195d89b4107fda269fdc846ccf2a158d80d54dcf13b2d5c04996f4687386e0feef6d0253b27670997a505028b25a47795384bc0169ccb47ef02e1505b00ea12 SHA512 a03cce5c117f9411877e75c06fa1fc418bbd8fb0dfaf0dbe38dbb262a741e5440ae2ddde6c4320eb33e8c86c62978726a54718f0ea7a5b4308fe27ffb113d6b5
+EBUILD cmake-9999.ebuild 10067 BLAKE2B 2195d89b4107fda269fdc846ccf2a158d80d54dcf13b2d5c04996f4687386e0feef6d0253b27670997a505028b25a47795384bc0169ccb47ef02e1505b00ea12 SHA512 a03cce5c117f9411877e75c06fa1fc418bbd8fb0dfaf0dbe38dbb262a741e5440ae2ddde6c4320eb33e8c86c62978726a54718f0ea7a5b4308fe27ffb113d6b5
MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f
diff --git a/dev-build/cmake/cmake-4.0.0_rc1.ebuild b/dev-build/cmake/cmake-3.31.6-r1.ebuild
index 1a457fe0e9b5..91497ec73ba9 100644
--- a/dev-build/cmake/cmake-4.0.0_rc1.ebuild
+++ b/dev-build/cmake/cmake-3.31.6-r1.ebuild
@@ -9,8 +9,7 @@ EAPI=8
: ${CMAKE_DOCS_PREBUILT:=1}
CMAKE_DOCS_PREBUILT_DEV=sam
-CMAKE_DOCS_VERSION=${PV}
-#CMAKE_DOCS_VERSION=$(ver_cut 1-2).0
+CMAKE_DOCS_VERSION=$(ver_cut 1-2).0
# Default to generating docs (inc. man pages) if no prebuilt; overridden later
# See bug #784815
CMAKE_DOCS_USEFLAG="+doc"
@@ -92,7 +91,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch
"${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch
# Misc
- "${FILESDIR}"/${PN}-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch
+ "${FILESDIR}"/${PN}-3.31.6-Prefer-pkgconfig-in-FindBLAS.patch
"${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch
"${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch
# Cuda
@@ -218,10 +217,6 @@ src_prepare() {
# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
filter-lto
- # 4.0.0_rc1 is missing this, fails to configure
- # https://gitlab.kitware.com/cmake/cmake/-/issues/26712
- touch .clang-tidy Utilities/.clang-tidy || die
-
if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
cmake_src_bootstrap
diff --git a/dev-build/cmake/cmake-4.0.0_rc3.ebuild b/dev-build/cmake/cmake-4.0.0_rc4.ebuild
index 9f2461698f96..41639c300a5d 100644
--- a/dev-build/cmake/cmake-4.0.0_rc3.ebuild
+++ b/dev-build/cmake/cmake-4.0.0_rc4.ebuild
@@ -40,19 +40,21 @@ else
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=/usr/share/openpgp-keys/bradking.asc
- inherit verify-sig
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc
+ inherit verify-sig
- 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
- )"
+ SRC_URI+=" verify-sig? (
+ https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}-SHA-256.txt
+ https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}-SHA-256.txt.asc
+ https://github.com/Kitware/CMake/releases/download/v${PV/_/-}/${MY_P}-SHA-256.txt
+ https://github.com/Kitware/CMake/releases/download/v${PV/_/-}/${MY_P}-SHA-256.txt.asc
+ )"
+ if [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
- BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20240902 )"
fi
+
+ BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20240902 )"
fi
[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
@@ -93,7 +95,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch
"${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch
# Misc
- "${FILESDIR}"/${PN}-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch
+ "${FILESDIR}"/${PN}-3.31.6-Prefer-pkgconfig-in-FindBLAS.patch
"${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch
"${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch
# Cuda
diff --git a/dev-build/cmake/cmake-9999.ebuild b/dev-build/cmake/cmake-9999.ebuild
index 5a40196b5ee1..41639c300a5d 100644
--- a/dev-build/cmake/cmake-9999.ebuild
+++ b/dev-build/cmake/cmake-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,7 +9,9 @@ EAPI=8
: ${CMAKE_DOCS_PREBUILT:=1}
CMAKE_DOCS_PREBUILT_DEV=sam
-CMAKE_DOCS_VERSION=$(ver_cut 1-2).0
+CMAKE_DOCS_VERSION=4.0.0_rc1
+#CMAKE_DOCS_VERSION=${PV}
+#CMAKE_DOCS_VERSION=$(ver_cut 1-2).0
# Default to generating docs (inc. man pages) if no prebuilt; overridden later
# See bug #784815
CMAKE_DOCS_USEFLAG="+doc"
@@ -38,19 +40,21 @@ else
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=/usr/share/openpgp-keys/bradking.asc
- inherit verify-sig
+ VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/bradking.asc
+ inherit verify-sig
- 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
- )"
+ SRC_URI+=" verify-sig? (
+ https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}-SHA-256.txt
+ https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}-SHA-256.txt.asc
+ https://github.com/Kitware/CMake/releases/download/v${PV/_/-}/${MY_P}-SHA-256.txt
+ https://github.com/Kitware/CMake/releases/download/v${PV/_/-}/${MY_P}-SHA-256.txt.asc
+ )"
+ if [[ ${PV} != *_rc* ]] ; then
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-
- BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20240902 )"
fi
+
+ BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-bradking-20240902 )"
fi
[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
@@ -91,7 +95,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch
"${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch
# Misc
- "${FILESDIR}"/${PN}-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch
+ "${FILESDIR}"/${PN}-3.31.6-Prefer-pkgconfig-in-FindBLAS.patch
"${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch
"${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch
# Cuda
@@ -217,6 +221,10 @@ src_prepare() {
# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
filter-lto
+ # 4.0.0_rc1 is missing this, fails to configure
+ # https://gitlab.kitware.com/cmake/cmake/-/issues/26712
+ touch .clang-tidy Utilities/.clang-tidy || die
+
if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
cmake_src_bootstrap
@@ -249,8 +257,7 @@ src_test() {
"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
|| die
- # TODO: Still relevant after https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10070?
- unset CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS
+ unset CLICOLOR CLICOLOR_FORCE CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS
pushd "${BUILD_DIR}" > /dev/null || die
diff --git a/dev-build/cmake/files/cmake-3.31.6-Prefer-pkgconfig-in-FindBLAS.patch b/dev-build/cmake/files/cmake-3.31.6-Prefer-pkgconfig-in-FindBLAS.patch
new file mode 100644
index 000000000000..0f8611771828
--- /dev/null
+++ b/dev-build/cmake/files/cmake-3.31.6-Prefer-pkgconfig-in-FindBLAS.patch
@@ -0,0 +1,28 @@
+diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
+index 6d60c9d86a..b6664dfe26 100644
+--- a/Modules/FindBLAS.cmake
++++ b/Modules/FindBLAS.cmake
+@@ -7,6 +7,11 @@ FindBLAS
+
+ Find Basic Linear Algebra Subprograms (BLAS) library
+
++Version modified for Gentoo Linux.
++If a valid PkgConfig configuration is found, this overrides and cancels
++all further checks. The upstream behavior can be restored by defining
++GENTOO_REMOVE_CMAKE_BLAS_HACK
++
+ This module finds an installed Fortran library that implements the
+ `BLAS linear-algebra interface`_.
+
+@@ -281,6 +286,11 @@ function(_add_blas_target)
+ endif()
+ endfunction()
+
++# first, try PkgConfig
++if(NOT DEFINED GENTOO_REMOVE_CMAKE_BLAS_HACK)
++ set(BLA_PREFER_PKGCONFIG ON)
++endif()
++
+ if(CMAKE_Fortran_COMPILER_LOADED)
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
+ else()
diff --git a/dev-build/meson/Manifest b/dev-build/meson/Manifest
index beb7f58fa1a4..1eb493739620 100644
--- a/dev-build/meson/Manifest
+++ b/dev-build/meson/Manifest
@@ -25,7 +25,7 @@ EBUILD meson-1.2.3.ebuild 3279 BLAKE2B faf4ee6ad678f436ce37af1ec074207eee2f2033c
EBUILD meson-1.3.2.ebuild 3411 BLAKE2B 71d25e070379acab0e87c57fab8226afb5f7939e7761317f4351a3f3fa6b47fba484c08cc33ca63eaec3e070d7b4760a4c6fc0bcf1370002c35926c73f339e78 SHA512 c2e470732e9b2598f8c9ce30d635e17b4cacfc2ce1be280c0d5f1ece91ec392078f6ab2f50e09e228b28cc2d3ce7cae7c98b20b9f4f3fe68713b162be8dc9c4f
EBUILD meson-1.4.2.ebuild 5079 BLAKE2B 71538d46f5f2d0f34ae4ae2082ff5fa1d37413b769642aa577211502792a234fbdda2c119adcc4e2bab81c64b86bdb9721050c64d2cb3db4083bf403d1e38354 SHA512 d19349b37b49c7c131e89ed3c6f17c52be298295cf9d99d2245cc50dc4d51707fe738b96bea13411f3c4b553c84c6af685c978377526ff3aab4c5706b9e06b3b
EBUILD meson-1.5.2.ebuild 4924 BLAKE2B a3598d55c0e9b01de353d65c3ad38b6eaf24fa925d63cf5a139384110fc51166f7e7775bd28f0c0744aa24b02f832d28622f66cb0c4240862db9fa5dc38bbe11 SHA512 8454f814170720760d82d0e3ad9e6b23932f011518e53ad3f6da19d17007a2e7437d0c75339c0dc811dc699987d588f35d8be5d717f5853ae8d1202200e16a83
-EBUILD meson-1.6.1.ebuild 5640 BLAKE2B 2278f11e6ca37b019bbc96871d84685fa9908a2ef310bc8fd20d4dc6b768ae3a17de9405ef18fd32a59ae0394e3861212ede251c0d6201f74e64d8c5576f9371 SHA512 0d60ddf0684cd70af11f42189d02fd36044112a8b9c9c708982003b33517ddd57308a240f18892e6bb15bec7965b9733bd07fc1a4a50af13fe99d9aaf8c3a6a6
+EBUILD meson-1.6.1.ebuild 5636 BLAKE2B 849765d4247676edc472ecede3c23cec90ab37b6085c189dbeabfdbdda6e9d0ded6d0ccb6821730b8018a53d7ee492419436acf637db688fa82f427324c2a71c SHA512 ecc37d0290061659e7e53dde3d612c63e7d9914284a4db1a524d9f8607d075fef5af290d5b26b419d7e97995811fd8f8e58603af54b6e0e25b866e645ccf36ab
EBUILD meson-1.7.0.ebuild 5645 BLAKE2B 210681b0c2a15a556579c4625170764d0ba3f464fdc66d8453488387058ab106f7a5892dd5386a5cab651e2d714d99708d76d419d78928bcbf1be640ece16b54 SHA512 2efe70a2de6560efdd0e9a42f716f6647b568c482cc54101d2ec9ac4e4bc6656d3b39b4ce40dcfcb46ed8dd47345ce43aa56fc46b9179ed6384e5460cf81b41e
EBUILD meson-9999.ebuild 5653 BLAKE2B 3e798e7da36d5eaf4eabfd18a6f6afbfb671f493373c395fad3bc167f063b3ce5194606e7483fcdf976394ab86bcf78044c3de3738273b2028f0a66aaf8ec4d8 SHA512 5de5de66e1ffbb48eec59b9c86f0a8a069a31ef7e06c1b7f9a5e3220fc224d8359d7c7b0cb2e7149bd4d30cfc75cd21b502c0375b2bc195367e905888e28d1d2
MISC metadata.xml 542 BLAKE2B 9d1667f9893c64c33e7a86a7b92c9dd85007d3e513608ec615c217e6ca58b3161c789f816e89d25f75d2ef17ed9336b4640d058bfd0e5c574d0d386755debb1d SHA512 2ab3497c1509db6687f250344eabf49dd09062b69bceda96f3e61c1cbb26f9c2ed0c7c9366dc3ea7b64df1e35214b486656af85b96b7100ce856cc1eb41df6c2
diff --git a/dev-build/meson/meson-1.6.1.ebuild b/dev-build/meson/meson-1.6.1.ebuild
index db12e34d1b0c..5d15af9e3c93 100644
--- a/dev-build/meson/meson-1.6.1.ebuild
+++ b/dev-build/meson/meson-1.6.1.ebuild
@@ -33,7 +33,7 @@ else
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/jpakkane.gpg
if [[ ${PV} != *_rc* ]] ; then
- KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
fi
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-24 18:21:02 +0000