diff options
Diffstat (limited to 'dev-build/cmake')
| -rw-r--r-- | dev-build/cmake/Manifest | 9 | ||||
| -rw-r--r-- | dev-build/cmake/cmake-3.30.2.ebuild (renamed from dev-build/cmake/cmake-3.27.9.ebuild) | 56 |
2 files changed, 30 insertions, 35 deletions
diff --git a/dev-build/cmake/Manifest b/dev-build/cmake/Manifest index ee7f87f8593e..60c92ebf95ea 100644 --- a/dev-build/cmake/Manifest +++ b/dev-build/cmake/Manifest @@ -7,10 +7,6 @@ AUX cmake-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch 2339 BLAKE2B d9 AUX cmake-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch 1207 BLAKE2B 4cd68da953268521965e04810e9b76a97dbc68c6c7e81cb23e0257166886787519122e425991c9bc9c9fd2d4d23a6a221206a8a3edc888adf58b1fe312cea149 SHA512 da5e897e7b8cc0973fb36ad82ac145c3cc790eadd10c1b7283decec67ede42d3ce132b1a71a3daa362941bd24208d9a3923af7331faac93ebda96df6aaf297dc AUX cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch 1600 BLAKE2B e2d381c5d81a5d8b5668eab8e1fb31f7c4d489c5900a4102983c1f573d5660c1281af5d8e1bf4d6b55839f609046e0ca6ba9781affe2a66b373833696dc45675 SHA512 c2e04ed6594892fa4a35cd67f0442184be76b5b9248e30cb6f316efccb5861c493e9151edf7ff2d40a03d18a871a612647e10c3b674cfc5dfa9859e5c149c3d3 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf -DIST cmake-3.27.0-docs.tar.xz 521348 BLAKE2B 319c84195c37b1944bb5d3fde1aeae75623fc90a734c1ba74d730cd5678bff75806f7aa8aa8171fd7878a09b3316c9c0ee23c0c055e869a4385f54987f86d801 SHA512 e9c300526f9fe4e450e921308b7af42f4b8972f2f546f7bbf2dffb4ca696793fe09f1610636b05c82b1cf74ed8ef95377bec69e15f8c9197d6960e674e0d5400 -DIST cmake-3.27.9-SHA-256.txt 1646 BLAKE2B abfef38f8994d7684a44caaa4a5efa1ac8fbe38bd8e8c98bf341cf813f77ee54bea58f7b3ab7f68b3f5d992519396fd15a1f72a1d9587f593d80b8d2f8ba36e7 SHA512 310c45281735cf9812d9d1cf22a656c5b44e596ef7032a8b7b09900ef838e74b884599b42ed2f5469946f371d431b7d4b1e44f6cd49dfb36ea49d88b187b4804 -DIST cmake-3.27.9-SHA-256.txt.asc 833 BLAKE2B 57d52fc2f3233662af13eb362ec82626c4821267f55f1313907513b61cee5b8481936da2b03c908c507b3e0919e4811e90c6cb47568420a8b2187c7942de9f1e SHA512 cad2007e356eac480b2cb93778f90152788e33be2e565b38535a2d205794054e5d67d4ed7db0765a05017aedc5f1af21556535a084014fe6c446bc13258253da -DIST cmake-3.27.9.tar.gz 10984490 BLAKE2B 66f8fb6e301ed19f993fde6c4f9e336124be6373d49b58d130ce59f4e5225cd27e02813856636b51c2521403c3a56c200ce646de5c35be2b25b5e6240c98bdb4 SHA512 56ce723b0b6d09b420a2f89ba1636cdfb1bc305bc2df91ae716f866bee07f5d702d75efbddfbaf724f47382df809107fe1e6d046314cd2f1ff07bca34ad6340a 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 DIST cmake-3.28.5-SHA-256.txt.asc 833 BLAKE2B bde735a577b556bc30ae1a5de0df8533243c955cc5d222537b3323e7108900af2f01799a4bfa843d953b141cc76a19aed77bfba15cf4e2c3cc36a0e7e844e853 SHA512 d495afd2ce4e16f8d3ecc0b319d59c3634aae71c26110d14225f9dd628bfe173cdd94818c69c930ef5cfff3b331445e192db0082188e0822155184e3f6f80e7d @@ -31,12 +27,15 @@ DIST cmake-3.30.0.tar.gz 11500060 BLAKE2B 62b3f3d5ed92f7f118991f36ba7098ff20c202 DIST cmake-3.30.1-SHA-256.txt 1646 BLAKE2B 39c8a32acb873f3b2b35af543006ef4ebc976f1939f4a857e55048654c60c23ee79cde0f1c625a7388f612d5ad594fa4ddfc89e4bb6e13764ffc78ce2e70f0e4 SHA512 bf3ba7218d504c75474b048b7c8b5db3928994fa269ea3762e68a751905403f87946c3dfdfbf63836d87f5180c905ed57b0d287bec97b04ee0e81f1f420a8c5f DIST cmake-3.30.1-SHA-256.txt.asc 833 BLAKE2B 5232626cc85bbcf0f44a9df4904ede8935c4d028b9604c9749a04b6eb2d51f648c817412b7870ae7f3e635dd88a44143568985d4ed2322d5239c5935e073a92b SHA512 b2a7b344a2d6350e55721860e7579a70c767b94b04a88b73a9fb1e9830658689561f9467d09eed87b2dce00106917543cf69ede5c7ed66a529359a1f6427dbc5 DIST cmake-3.30.1.tar.gz 11500521 BLAKE2B 0e604ecc6b7da1c1c1baa81488a033aef6fa39cbddaaf43364193dda3e30d02a072f58a75573723e71653a2d1b34d09a7e1d0cc98280d76801d262bf54ffe77d SHA512 e3b38d309554a4239b8048434d770d3ac4533280a82c1bec65c37c9b0996cdf1753185e38deb4fb5da890ddc3d39c1d5c075e2ab0f7e0c52d61f5d556851fd20 -EBUILD cmake-3.27.9.ebuild 9089 BLAKE2B 3bbf419b7ef32fd8201f149674a1d9adc3fb099d18f8b2d45407da7c1e2175b91aa133665eca9790d31c96d90509c5f58ffbad49b7e767daa97d6af1f8b3ca71 SHA512 0b839ae2ead8d254c0416374545bb906ef4cdd7d6b0cb059ecb084efbb472d98910958d6c653dd714a2f18ec7e7e9032439df792d4cbccb2988321a6e0908e53 +DIST cmake-3.30.2-SHA-256.txt 1646 BLAKE2B b36e1e099261d80bde7c57564d3030bc99b12ed3f6a70f69de16d81f6e6da567e3cfa792d010921017a02eaf238b056e7eb2cf330e6c6711aa3a4bd835732b57 SHA512 7991c834ed2e384d863793725fbe0b6195824f4e14a665ddd71348ecfa8bd03dddb46d0e9f26cc75b7d9e0a2eb90bdec01b7e79f32ff1a9cc9a8fcdd1d060de3 +DIST cmake-3.30.2-SHA-256.txt.asc 833 BLAKE2B cf99bfec2bd4cc8c828162353ceac9ebae2d7ad02c5df77873a751df7314eb56266525c755ba2f9015e043c9bb6c8218251b47744741c02fb81a80f93809ab32 SHA512 d7f07fcdd02b1846bafff4a3e08e38a2cce38131358a783097555d7934dddc82a67c3a6b84cbd8731171d82e293ff18f7e5e66d0d3bbb7d200da3904089e923d +DIST cmake-3.30.2.tar.gz 11500719 BLAKE2B 85873311000831d2a8acb2c9d7f107e7fcef9dcd56f47307bd384a26c1b63d8f15b41989944e41969d6637139d916101fe236d3fe448a76f5b18b7809570ad5d SHA512 2b4c4ebb2213e19a08b9bf5a3cf0427dd2bfc44c7d86734abf5524c311bbce7e79f76d08e4df87a1e4508fe9fa05a28333068dc3bab308ef9724a9beeb39daab EBUILD cmake-3.28.5.ebuild 8728 BLAKE2B 82fc985ff8c7e0ec1fb5f69e5c9c6005d6fa869a397df3047a73f638aacc593cabd41268f1049f3dafdf0001204814a6349a5a52c4790cd753ff5e5dac42534b SHA512 31c34a401630dc7c6ffa04c73316db469ddae4db4b5ced5bd4fadc46ff8715898578b513668523fc4629811d13f6ecebfe5137f8699f2ed8c1917fc5e5ab422e EBUILD cmake-3.29.3.ebuild 8569 BLAKE2B 69e20587b9e1cac49c9dd36f47c659af7bb24ebe0f1979cb3d0fec52b9beeeea23cd7ef1334d5e74bd22f2fe09ed4968489ba6bc54e1c0b539f8a2049a932b13 SHA512 58b7d7aa6783d37d077b9e92939c1ec69e314ecd8d569b1329b7ed43d4ff86cf63a21ba09db216c86f5024c2d4b3b725f58d934437d895b9ca3dbe0cbe9a64a0 EBUILD cmake-3.29.6.ebuild 8837 BLAKE2B 33dd1c3b29de57b3d15837689b02e5ec553055893e40cd4060ed491814279c271a9ca1933b371b9208587bfcad2d263de6571181654e10a13fdfb5d140ab285e SHA512 4983005e8147c9b636036ebc3bf68cb0ccaded183aa439fb3f0030bd51add42f8b4f76d3865e62154f02e951d089f03061c2a86f89bc9668beae4a39f75825ad EBUILD cmake-3.29.7.ebuild 8837 BLAKE2B 33dd1c3b29de57b3d15837689b02e5ec553055893e40cd4060ed491814279c271a9ca1933b371b9208587bfcad2d263de6571181654e10a13fdfb5d140ab285e SHA512 4983005e8147c9b636036ebc3bf68cb0ccaded183aa439fb3f0030bd51add42f8b4f76d3865e62154f02e951d089f03061c2a86f89bc9668beae4a39f75825ad EBUILD cmake-3.30.0.ebuild 9138 BLAKE2B fce20eb8317ce99a17c767409268427d79ce3fb47b2c392d19f986afdd431f43412884b643da62edca1c2ba94f9ad382afcde8510f44877e5ce8a83715f5aeec SHA512 44049dc0817a578cde3be0ab57534f3d836e22a630b943b2a40da39a5bc0c8cb372649c4c7a4e769c4bd7f78f27fbc97d43ce15ea0e8d08e6e564aa78bdf4ac4 EBUILD cmake-3.30.1.ebuild 9138 BLAKE2B fce20eb8317ce99a17c767409268427d79ce3fb47b2c392d19f986afdd431f43412884b643da62edca1c2ba94f9ad382afcde8510f44877e5ce8a83715f5aeec SHA512 44049dc0817a578cde3be0ab57534f3d836e22a630b943b2a40da39a5bc0c8cb372649c4c7a4e769c4bd7f78f27fbc97d43ce15ea0e8d08e6e564aa78bdf4ac4 +EBUILD cmake-3.30.2.ebuild 9138 BLAKE2B fce20eb8317ce99a17c767409268427d79ce3fb47b2c392d19f986afdd431f43412884b643da62edca1c2ba94f9ad382afcde8510f44877e5ce8a83715f5aeec SHA512 44049dc0817a578cde3be0ab57534f3d836e22a630b943b2a40da39a5bc0c8cb372649c4c7a4e769c4bd7f78f27fbc97d43ce15ea0e8d08e6e564aa78bdf4ac4 EBUILD cmake-9999.ebuild 9233 BLAKE2B b64d1e1c46336eabb80e23391533aa8b97a62c49a9a99a101cf61a1f0c0de83cdb9be0e86eda7a96012392675015dc89e56a4e81a72a9f44932dec8e90857ca7 SHA512 26cb6fe0a21a1cbe7eda849639bb1532009510c05d483f42397c70dea2b030786478fd7b94011b2744ab78cfeeda18acb4c6aa8f8de4673e01256e77d0039b88 MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f diff --git a/dev-build/cmake/cmake-3.27.9.ebuild b/dev-build/cmake/cmake-3.30.2.ebuild index 2ab3b437332e..7957c7bb58b2 100644 --- a/dev-build/cmake/cmake-3.27.9.ebuild +++ b/dev-build/cmake/cmake-3.30.2.ebuild @@ -19,8 +19,8 @@ CMAKE_DOCS_USEFLAG="+doc" # TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759. CMAKE_MAKEFILE_GENERATOR="emake" CMAKE_REMOVE_MODULES_LIST=( none ) -inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \ - toolchain-funcs virtualx xdg-utils +inherit bash-completion-r1 cmake flag-o-matic multiprocessing \ + toolchain-funcs xdg-utils MY_P="${P/_/-}" @@ -47,7 +47,7 @@ else https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt.asc )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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 ~ia64 ~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-20230817 )" fi @@ -59,7 +59,7 @@ S="${WORKDIR}/${MY_P}" LICENSE="BSD" SLOT="0" -IUSE="${CMAKE_DOCS_USEFLAG} dap emacs gui ncurses qt6 test" +IUSE="${CMAKE_DOCS_USEFLAG} dap gui ncurses qt6 test" RESTRICT="!test? ( test )" RDEPEND=" @@ -72,7 +72,6 @@ RDEPEND=" sys-libs/zlib virtual/pkgconfig dap? ( dev-cpp/cppdap ) - emacs? ( >=app-editors/emacs-23.1:* ) gui? ( !qt6? ( dev-qt/qtcore:5 @@ -102,12 +101,8 @@ PATCHES=( "${FILESDIR}"/${PN}-3.27.0_rc1-0003-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 - "${FILESDIR}"/${PN}-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch # Upstream fixes (can usually be removed with a version bump) - # pkgconf - # fixes https://github.com/pkgconf/pkgconf/issues/317 - "${FILESDIR}"/${PN}-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch ) cmake_src_bootstrap() { @@ -157,6 +152,14 @@ src_prepare() { sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \ -e '/cmGlobalXCodeGenerator.h/d' \ Source/cmake.cxx || die + # Disable system integration, bug #933744 + sed -i -e 's/__APPLE__/__DISABLED__/' \ + Source/cmFindProgramCommand.cxx \ + Source/CPack/cmCPackGeneratorFactory.cxx || die + sed -i -e 's/__MAC_OS_X_VERSION_MIN_REQUIRED/__DISABLED__/' \ + Source/cmMachO.cxx || die + sed -i -e 's:CPack/cmCPack\(Bundle\|DragNDrop\|PKG\|ProductBuild\)Generator.cxx::' \ + Source/CMakeLists.txt || die # Disable isysroot usage with GCC, we've properly instructed # where things are via GCC configuration and ldwrapper @@ -182,13 +185,9 @@ src_prepare() { -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" - if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - cmake_src_bootstrap - fi -} + ## in theory we could handle these flags in src_configure, as we do in many other packages. But we *must* + ## handle them as part of bootstrapping, sadly. -src_configure() { # Fix linking on Solaris [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl @@ -196,6 +195,13 @@ src_configure() { # https://gitlab.kitware.com/cmake/cmake/-/issues/20740 filter-lto + if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then + CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" + cmake_src_bootstrap + fi +} + +src_configure() { local mycmakeargs=( -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DCMake_ENABLE_DEBUGGER=$(usex dap) @@ -214,11 +220,6 @@ src_configure() { cmake_src_configure } -src_compile() { - cmake_src_compile - use emacs && elisp-compile Auxiliary/cmake-mode.el -} - src_test() { # Fix OutDir and SelectLibraryConfigurations tests # these are altered thanks to our eclass @@ -226,6 +227,8 @@ src_test() { "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ || die + unset CLICOLOR CLICOLOR_FORCE CMAKE_COMPILER_COLOR_DIAGNOSTICS CMAKE_COLOR_DIAGNOSTICS + pushd "${BUILD_DIR}" > /dev/null || die # Excluded tests: @@ -246,7 +249,9 @@ src_test() { -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \ ) - virtx cmake_src_test + local -x QT_QPA_PLATFORM=offscreen + + cmake_src_test } src_install() { @@ -257,11 +262,6 @@ src_install() { doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8] fi - if use emacs; then - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - insinto /usr/share/vim/vimfiles/syntax doins Auxiliary/vim/syntax/cmake.vim @@ -275,8 +275,6 @@ src_install() { } pkg_postinst() { - use emacs && elisp-site-regen - if use gui; then xdg_icon_cache_update xdg_desktop_database_update @@ -285,8 +283,6 @@ pkg_postinst() { } pkg_postrm() { - use emacs && elisp-site-regen - if use gui; then xdg_icon_cache_update xdg_desktop_database_update |