summaryrefslogtreecommitdiff
path: root/dev-util/cmake
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-09-23 05:18:59 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-09-23 05:18:59 +0100
commit27fccc1801092355fdf16a4ffcbf7a58a163e335 (patch)
treee042e839dfaecb316faee1131254f0edc01f7af8 /dev-util/cmake
parent820b3cf4687f358703c643bacf3e5a06ccfa4402 (diff)
gentoo auto-resync : 23:09:2023 - 05:18:59
Diffstat (limited to 'dev-util/cmake')
-rw-r--r--dev-util/cmake/Manifest4
-rw-r--r--dev-util/cmake/cmake-3.27.6-r1.ebuild13
-rw-r--r--dev-util/cmake/cmake-9999.ebuild13
3 files changed, 20 insertions, 10 deletions
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index a83ee0ea0eea..fb0962417b49 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -28,7 +28,7 @@ DIST cmake-3.27.6-SHA-256.txt.asc 833 BLAKE2B e8089ea43f47776b7aec6b57b200c17429
DIST cmake-3.27.6.tar.gz 10982239 BLAKE2B 1aa876c0c4601261de30fa7829726f9423f3591ba6bfc17377cb846c025f9dc4d564a020b41dc2e24ba12b163c199803167fefd832cea723acdb6e10b6ac9b23 SHA512 268b5bd84800c37ce0e311cadf13c275a538d612844cc8687107549fe6341a6c3115560e3b9162836843016213d225f62db130bc251bf8aff50c69b9bd58e638
EBUILD cmake-3.26.4-r3.ebuild 8804 BLAKE2B fdb48b62ba66d6aa0f162bded4ef491f9476a6289ca61804eb18f328d8bafffbbb10f0134dfc8d10fb54032d3703444244d3ea7a62069505b2ee600a9b957e3b SHA512 faef92a7b8f1822c1df936e5bf89f533eb33d192dca09e140e157b6d4d8589ab73bb49189de998e91f53c4180e4c014e38b4d64bc5865a0c2d1e47dfc70a477d
EBUILD cmake-3.26.5-r2.ebuild 8805 BLAKE2B 1da0302fa4bd402e226a898ba1f43daf22ca6ad6d9f29850c57729448b9c83f6f39866e2f07f043849306bcf4568a85203c3b35be915428b712238d639aff5cf SHA512 ddb5480a9deba4eeaba8ee57d5a712887525544b720908ce5a5c3dfb5eb49c347b86f6f08d4cb85d2dc9cfad161761092c59900dee875ad07666ef0bb821da4a
-EBUILD cmake-3.27.6-r1.ebuild 9033 BLAKE2B 2b51d65a51e29b1b33a4e3d7c25f4ef439c09fd4f2914994fd956f22496caeaa97ced38d1dc75f20d95cf9b448e63e527465df6e7ca439387c86a44cbc4b29e2 SHA512 35e4f0f3975d7c1aff5c3b45d269cdd43839948472ea3131ced9fa40d10e4d107aa5cd8f9d8d26ee61e80f0acd056e034a43a677dc9c86c969969e61f4fc8bd0
+EBUILD cmake-3.27.6-r1.ebuild 9132 BLAKE2B f1142e9c7425d65ef6ace05df14a1651d8c0ae968a24e2bc8265fe70f972495408e70352aea6bc7e1e5c329fa4730f11f37112c993974a9ceec14c4777e620cb SHA512 7035fa3e835c4a34e8fc92dd443d7817202efbf24f52a09f788bd6888ae65246d16d023260313f9cff37a253d4504b58d1c3db7a4a2fd20bbac2d88e5c4ecdd2
EBUILD cmake-3.27.6.ebuild 9019 BLAKE2B e6b5634aa8c3f54dafc0df82d3f2ac3fc6220ca8034b8fbea516a8cf37a4ed3d2b7f99fa8c0fec06704e3fc237b6ade8f6f7af9db52c21b50eb549440b3c70dc SHA512 4930f6197e984e1d92de5daf777f62c7ec85d32672388af582f18ae3be0242eddaa170cef0a36db993415d23e4d2740df47a9f87e75ae705769eedf65e80617f
-EBUILD cmake-9999.ebuild 8848 BLAKE2B 2be4963c6d5550855a6b5eb7f98ccdf163b0671414bf8a9659cf5fc1c6649d291ae86332b0c754a529011aa9f3ed4a8018ae586748acb885db17341da21e6e1c SHA512 f2fdb5994585a2cb3e8ea96782ef36c57f29bb9f297b9201c501ccc47aac5dc86a964124b13094a7429249f46a83a2e8555df3af0861a1911b53210374705a1d
+EBUILD cmake-9999.ebuild 8947 BLAKE2B 083307c4486f18f6716658217634bef9854d2d955fe05bb43ec1168d728e09849337f146648002483a1efc7cb8353894794552528e9888a4f71874b6f5a915b1 SHA512 748622de8b1771ec7f5cc422b4de227cffcfdead272ea29f7999651cf9d445a84254e44968f23afb33d3ea514c890ff1b32a934810877912fe4e821fe6cffbc8
MISC metadata.xml 588 BLAKE2B 59754f6dd52986589583b875b48cdfb28f0d22e97fd6cdac9763ed2aa8981c692d81f6cfe73a93f7defde3e58fc0df60fba647760e9f20d00bd8141e4c39055e SHA512 ac463b9402727ba83b276fc206d2ea9101c6edc85142957c9be33bd8841c0396262ceaad545d133a84f6c294b5beee289e84c3226a1aac2d1f041dbfe08c047f
diff --git a/dev-util/cmake/cmake-3.27.6-r1.ebuild b/dev-util/cmake/cmake-3.27.6-r1.ebuild
index ae44c2129a3d..b122058f45cd 100644
--- a/dev-util/cmake/cmake-3.27.6-r1.ebuild
+++ b/dev-util/cmake/cmake-3.27.6-r1.ebuild
@@ -60,7 +60,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
-IUSE="${CMAKE_DOCS_USEFLAG} dap emacs gui ncurses test"
+IUSE="${CMAKE_DOCS_USEFLAG} dap emacs gui ncurses qt6 test"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -75,9 +75,14 @@ RDEPEND="
dap? ( dev-cpp/cppdap )
emacs? ( >=app-editors/emacs-23.1:* )
gui? (
- dev-qt/qtbase:6[gui,widgets]
+ !qt6? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+ qt6? ( dev-qt/qtbase:6[gui,widgets] )
)
- ncurses? ( sys-libs/ncurses:0= )
+ ncurses? ( sys-libs/ncurses:= )
"
DEPEND="${RDEPEND}"
BDEPEND+="
@@ -205,7 +210,7 @@ src_configure() {
-DBUILD_QtDialog=$(usex gui)
)
- use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=6 )
+ use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=$(usex qt6 6 5) )
cmake_src_configure
}
diff --git a/dev-util/cmake/cmake-9999.ebuild b/dev-util/cmake/cmake-9999.ebuild
index e594109025d5..f6edfcf41871 100644
--- a/dev-util/cmake/cmake-9999.ebuild
+++ b/dev-util/cmake/cmake-9999.ebuild
@@ -59,7 +59,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="BSD"
SLOT="0"
-IUSE="${CMAKE_DOCS_USEFLAG} dap emacs gui ncurses test"
+IUSE="${CMAKE_DOCS_USEFLAG} dap emacs gui ncurses qt6 test"
RESTRICT="!test? ( test )"
RDEPEND="
@@ -74,9 +74,14 @@ RDEPEND="
dap? ( dev-cpp/cppdap )
emacs? ( >=app-editors/emacs-23.1:* )
gui? (
- dev-qt/qtbase:6[gui,widgets]
+ !qt6? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+ qt6? ( dev-qt/qtbase:6[gui,widgets] )
)
- ncurses? ( sys-libs/ncurses:0= )
+ ncurses? ( sys-libs/ncurses:= )
"
DEPEND="${RDEPEND}"
BDEPEND+="
@@ -201,7 +206,7 @@ src_configure() {
-DBUILD_QtDialog=$(usex gui)
)
- use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=6 )
+ use gui && mycmakeargs+=( -DCMake_QT_MAJOR_VERSION=$(usex qt6 6 5) )
cmake_src_configure
}