[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2023-12-07 Thread Sam James
commit: 066302043166550e970a08293fde501ef5f910d1
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  7 02:04:06 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  7 12:18:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06630204

dev-util/cmake: add 3.28.0

Signed-off-by: Sam James  gentoo.org>

 dev-util/cmake/Manifest |   3 +
 dev-util/cmake/cmake-3.28.0.ebuild  | 294 
 dev-util/cmake/files/cmake-3.28.0-c99.patch |  90 +
 3 files changed, 387 insertions(+)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index e83e71ac2359..da1a1125902d 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -18,3 +18,6 @@ DIST cmake-3.27.8.tar.gz 10983480 BLAKE2B 
8c746d58fe07978bf0ccc92b31731bda46d139
 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-SHA-256.txt 1646 BLAKE2B 
d2ca3e3b06e0cb94d421d920e0a0b03c22d2ee170a452fbbac3688c41fd0306eb3c914495c2a94ede835d31872c29bb633c24827b5dcb1899a866a099dff1e78
 SHA512 
4f68c13e0f3bf51855a01f0d1258974aa352ae5a1f194a913ff0e637fbd9a2899d73bf889757faba27981a6629bc723ca27a4a64ab7e7c6a056fb80d14eaf058
+DIST cmake-3.28.0-SHA-256.txt.asc 833 BLAKE2B 
6a7e266dfc873be04e75881d982ad7bffe21600992ddd79cd68a4b8322aeb2f5760361810cdd74af719ce004cd233e76e521e5853eabcef5b4c73b7e055a97ac
 SHA512 
8c0fe1461d26ed2b7facbfd9294b3006d76ef00614416da4e22936808e53b76f029137d47c352223c8a4ed4ba385dcb9987acb5c1962cc3f2fa0783424059b17
+DIST cmake-3.28.0.tar.gz 11064707 BLAKE2B 
8e03436d7e2b16d5865cef4ed94d12ffdf134d12ad59c4296589bad1a2836916cbb17367f4adda99a9bd835af8b891fee34b2e00441dd22696e396e4109f61f2
 SHA512 
54f0fa5754693ab0a58314301da6957fbee410cf3c5906eaf5a5eabe9d371d8eda84eba42832c29d0a223d954b580c955811f62be38b33b817cab7199f884b60

diff --git a/dev-util/cmake/cmake-3.28.0.ebuild 
b/dev-util/cmake/cmake-3.28.0.ebuild
new file mode 100644
index ..9554c4047fc1
--- /dev/null
+++ b/dev-util/cmake/cmake-3.28.0.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Generate using 
https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
+# Set to 1 if prebuilt, 0 if not
+# (the construct below is to allow overriding from env for script)
+: ${CMAKE_DOCS_PREBUILT:=1}
+
+CMAKE_DOCS_PREBUILT_DEV=sam
+#CMAKE_DOCS_VERSION=$(ver_cut 1-3)
+CMAKE_DOCS_VERSION=3.27.0
+# Default to generating docs (inc. man pages) if no prebuilt; overridden later
+# See bug #784815
+CMAKE_DOCS_USEFLAG="+doc"
+
+# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
+# ... but seems fine as of 3.22.3?
+# 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
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/;
+if [[ ${PV} ==  ]] ; then
+   CMAKE_DOCS_PREBUILT=0
+
+   EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git;
+   inherit git-r3
+else
+   SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+   if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
+   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
+
+   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
+   )"
+
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2023-06-09 Thread Sam James
commit: 7074551d43f13d7401f1cb904505159acfa6c97d
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun  9 09:46:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun  9 09:47:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7074551d

dev-util/cmake: add 3.27.0_rc1

Signed-off-by: Sam James  gentoo.org>

 dev-util/cmake/Manifest|   2 +
 .../{cmake-.ebuild => cmake-3.27.0_rc1.ebuild} |  32 ++---
 dev-util/cmake/cmake-.ebuild   |  32 ++---
 ...so-for-modules-on-darwin-macos.-Use-.bund.patch |  35 ++
 ...proper-paths-to-make-cmake-find-our-tools.patch | 133 +
 ...7.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch |  31 +
 ...-the-correct-version-of-Qt-is-always-used.patch |  54 +
 ...rc1-0005-Respect-Gentoo-s-Python-eclasses.patch |  63 ++
 ...-distcc-warnings-to-avoid-confusing-CMake.patch |  26 
 dev-util/cmake/metadata.xml|   3 +
 10 files changed, 373 insertions(+), 38 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 2de6263de254..8165c7ac7bc2 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -14,3 +14,5 @@ DIST cmake-3.26.4-SHA-256.txt 1646 BLAKE2B 
a92cecbe635cb7a01be338ca9554de5603124
 DIST cmake-3.26.4-SHA-256.txt.asc 833 BLAKE2B 
c33f4d8cc1ba271a06b427e4bb5cb39e38f768c497aec6df07ffe9f7be997c5df88024e0de09902e6169cbad9020b20f024ef277cefc45b5cd172ed7a819e1bb
 SHA512 
d3ddbe0c31a1093dfd4bed26dae7959e5682d367695fd4f6f021e327b8335d33fcf7b0259149f449be82da224ee74c276b135ac2860917535fb5a19b4f0f6334
 DIST cmake-3.26.4-docs.tar.xz 507352 BLAKE2B 
9d7e4bb2292d22f93c5435e30317cb0701dc9c6ad6b397fc9108050217917f48ded84b2d6094782e2e8a502e693a8e45c5c659e65db3857dbcac261910890861
 SHA512 
95ef908381501bd8189113a7a520e70d81dbb4e1f416cfe38cbf7005e76f3571b964496d33980975835ff02634f85e1eb170a575e0ea30bfa749043cad84c605
 DIST cmake-3.26.4.tar.gz 10669686 BLAKE2B 
34508c724e0d4967e010917f6fac6f426b0d835c38cd197b64e70a18febee1c3efff5f5edc5cd7c5080881bd5c1d77d03243b5dcf8b47f238fa4ac4e5996072f
 SHA512 
fe817c8d5e247db3f0a9a58ee37c466a47220100d9e90711cd5d06c223cef87e41d1a756e75d1537e5f8cd010dcb8971cbeab4684b1ac12bcecf84bf7b720167
+DIST cmake-3.27.0-rc1.tar.gz 10973927 BLAKE2B 
30d17208a061d2bfbb4e9ef6cdeb526c0c0cf6d86c93821d380ff25e7ae430f80dfcc8992d0687882489e3453d543ba11a45fc47ac15ef8180f6dab6d85c20f8
 SHA512 
02ea3ed06ccc339980235371de0b3c823f92cdd46bc4de3b0bb5788cd1265c292e70dd824d2fd3740ec67fa63a5e2a903a32735f6073d8843465e300ccef5e6d
+DIST cmake-3.27.0_rc1-docs.tar.xz 520664 BLAKE2B 
332a6700af4a119c8859074d93d16a8a7109614abff6b8bcf90c9c3490f70a436f60ee627b8bb2b31a100916ea91c6d5fc63bc88c07acb1bed60c543e3fd3c7d
 SHA512 
0c97f632bf69d079f2ce22fa5d283e5b6f031d238f2810c51dab311d6c41c63773ce9741744e3bcb1fbb2afede6b354b0fef12a55d1410248a48977cbfd0f15a

diff --git a/dev-util/cmake/cmake-.ebuild 
b/dev-util/cmake/cmake-3.27.0_rc1.ebuild
similarity index 91%
copy from dev-util/cmake/cmake-.ebuild
copy to dev-util/cmake/cmake-3.27.0_rc1.ebuild
index 6b56560db350..a80e655595b5 100644
--- a/dev-util/cmake/cmake-.ebuild
+++ b/dev-util/cmake/cmake-3.27.0_rc1.ebuild
@@ -48,7 +48,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 ~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 )"
fi
@@ -60,7 +60,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="CMake"
 SLOT="0"
-IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test"
+IUSE="${CMAKE_DOCS_USEFLAG} dap emacs ncurses qt5 test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
@@ -72,6 +72,7 @@ RDEPEND="
>=net-misc/curl-7.21.5[ssl]
sys-libs/zlib
virtual/pkgconfig
+   dap? ( dev-cpp/cppdap )
emacs? ( >=app-editors/emacs-23.1:* )
ncurses? ( sys-libs/ncurses:0= )
qt5? (
@@ -93,23 +94,15 @@ SITEFILE="50${PN}-gentoo.el"
 
 PATCHES=(
# Prefix
-   "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-   "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-   "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-   # Handle gentoo packaging in find modules
-   "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-   # Next patch needs to be reworked
-   #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-   "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-   # Respect python eclasses
-   "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-   "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2021-10-14 Thread Lars Wendler
commit: cdd81e40ec220a0a7796a214e8758989cf99dd2b
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Oct 14 19:36:13 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Oct 14 19:37:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdd81e40

dev-util/cmake: Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 dev-util/cmake/Manifest|   1 -
 dev-util/cmake/cmake-3.21.2.ebuild | 232 -
 .../cmake/files/cmake-3.17.0_rc1-FindLAPACK.patch  |  56 -
 3 files changed, 289 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 78feaf4a5b2..bee7fa09772 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,4 +1,3 @@
 DIST cmake-3.20.5.tar.gz 9441947 BLAKE2B 
f073d7c3968c714be315f5014076c785790ed47e9a746f2d16bc59769fb6862009f67c2e118038c6c9d8390b709f2b4ed4a4dfc41a93996fedd9d7d77111b84a
 SHA512 
4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008
-DIST cmake-3.21.2.tar.gz 9630492 BLAKE2B 
7c73cad02ee9dbadd8cbf60994856ccb6fd3721cbb7a58d66638169cf99426d8ad732de912ee5c736466d64c145a68a102db93cb5d4d0dbde001681edbf7a200
 SHA512 
75649404564aaa6175a8c66ab19a10318066dbb667806c287e3cb125ac4c16c1629c160e355bcc50864a38d5488b1f7d1bc77acc602f5f3edd5f68691ae5080d
 DIST cmake-3.21.3.tar.gz 9630442 BLAKE2B 
dccf4878745f6ddb87ea5fd1a0b6c728e32778afd15e3074d057234dc898e399133343bb10826f8882323bfc9d53f22c98b51ab6e39af29da58c54ed0b9d14c1
 SHA512 
0571b78443906c5ad51fb0fafbd32d565caf628cc150b1190802cb819e8497c108ea6b7ecaa03133df2dbbceb730696d24b4df38468c92088c769ce4076d9e9f
 DIST cmake-3.22.0-rc1.tar.gz 9769355 BLAKE2B 
03398d2aca8c7f354d1b0d4f6447780cf8699ab388f342dea9266f0d2ecb0eeb38d5e51df9f6a9509d62db8b78b8774c76c82976cf1d263b1c572a00e96e698f
 SHA512 
ed2a7c0832fd6fef5909745b6d540d1eee4b7f6681dca6e2b5cd22ea1a2be795fc1cb3b25792719211d7fe94871aa12253f4ce088985652496b3fdcbfe20

diff --git a/dev-util/cmake/cmake-3.21.2.ebuild 
b/dev-util/cmake/cmake-3.21.2.ebuild
deleted file mode 100644
index b1cc1455ac6..000
--- a/dev-util/cmake/cmake-3.21.2.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails 
consistently w/ ninja
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-   toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/;
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=app-arch/libarchive-3.3.3:=
-   app-crypt/rhash
-   >=dev-libs/expat-2.0.1
-   >=dev-libs/jsoncpp-1.9.2-r2:0=
-   >=dev-libs/libuv-1.10.0:=
-   >=net-misc/curl-7.21.5[ssl]
-   sys-libs/zlib
-   virtual/pkgconfig
-   emacs? ( >=app-editors/emacs-23.1:* )
-   ncurses? ( sys-libs/ncurses:0= )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   doc? (
-   dev-python/requests
-   dev-python/sphinx
-   )
-   test? ( app-arch/libarchive[zstd] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-   # prefix
-   "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-   "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-   "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-   # handle gentoo packaging in find modules
-   "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-   # Next patch needs to be reworked
-   #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-   "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-   # respect python eclasses
-   "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-   "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-   "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-   # upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-   # disable running of cmake in bootstrap command
-   sed -i \
-   -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-   bootstrap || die "sed failed"
-
-   # execinfo.h on Solaris isn't quite what it is on Darwin
-   if [[ ${CHOST} == *-solaris* ]] ; then
-   sed -i -e 's/execinfo\.h/blablabla.h/' \
-   Source/kwsys/CMakeLists.txt || 

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2021-09-02 Thread Andreas Sturmlechner
commit: 24bbcc13b55adc06848aa413247879668ae6ec91
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep  1 07:54:04 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep  2 10:43:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24bbcc13

dev-util/cmake: Drop 3.18.5

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/cmake/Manifest|   1 -
 dev-util/cmake/cmake-3.18.5.ebuild | 214 -
 .../cmake/files/cmake-3.1.0-darwin-isysroot.patch  |  48 -
 3 files changed, 263 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 12801dd1c3c..902fc967b3c 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,4 +1,3 @@
-DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 
62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8
 SHA512 
c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
 DIST cmake-3.20.5.tar.gz 9441947 BLAKE2B 
f073d7c3968c714be315f5014076c785790ed47e9a746f2d16bc59769fb6862009f67c2e118038c6c9d8390b709f2b4ed4a4dfc41a93996fedd9d7d77111b84a
 SHA512 
4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008
 DIST cmake-3.21.1.tar.gz 9629567 BLAKE2B 
1f33117f6fe3491923d053e4d025741340eff477a7a34ef26a6185d7e8f197d159a4cb45b0d79af3298939f8970c27e663a6011fcf479405d458b294fdf3dd72
 SHA512 
1453b1f5139950f501c570c305257e4e5dacb8224944de8ed1489aae162c6dd75fe1cd5188d619c47e4e53ca5b846f07318ffb3ab004a0547f2c8b13f60083b4
 DIST cmake-3.21.2.tar.gz 9630492 BLAKE2B 
7c73cad02ee9dbadd8cbf60994856ccb6fd3721cbb7a58d66638169cf99426d8ad732de912ee5c736466d64c145a68a102db93cb5d4d0dbde001681edbf7a200
 SHA512 
75649404564aaa6175a8c66ab19a10318066dbb667806c287e3cb125ac4c16c1629c160e355bcc50864a38d5488b1f7d1bc77acc602f5f3edd5f68691ae5080d

diff --git a/dev-util/cmake/cmake-3.18.5.ebuild 
b/dev-util/cmake/cmake-3.18.5.ebuild
deleted file mode 100644
index f3b61204861..000
--- a/dev-util/cmake/cmake-3.18.5.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake" # Fixed in 3.19, see commit 491dddfb; bug 
#596460
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-   toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/;
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=app-arch/libarchive-3.3.3:=
-   app-crypt/rhash
-   >=dev-libs/expat-2.0.1
-   >=dev-libs/jsoncpp-1.9.2-r2:0=
-   >=dev-libs/libuv-1.10.0:=
-   >=net-misc/curl-7.21.5[ssl]
-   sys-libs/zlib
-   virtual/pkgconfig
-   emacs? ( >=app-editors/emacs-23.1:* )
-   ncurses? ( sys-libs/ncurses:0= )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   doc? (
-   dev-python/requests
-/dev/null
-
-   local ctestargs
-   [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose 
--output-on-failure"
-
-   # Excluded tests:
-   #BootstrapTest: we actually bootstrap it every time so why test it.
-   #BundleUtilities: bundle creation broken
-   #CMakeOnly.AllFindModules: pthread issues
-   #CTest.updatecvs: fails to commit as root
-   #Fortran: requires fortran
-   #RunCMake.CompilerLauncher: also requires fortran
-   #RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-   #debugedit binary is not in the expected location
-   #RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-   #it can't find a deb package that owns libc
-   #RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
-   #TestUpload: requires network access
-   "${BUILD_DIR}"/bin/ctest \
-   -j "$(makeopts_jobs)" \
-   --test-load "$(makeopts_loadavg)" \
-   ${ctestargs} \
-   -E 

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2021-06-15 Thread Lars Wendler
commit: 7912e5b1d106f936c519c21cb3a0a28d2421b526
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jun 15 12:22:09 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jun 15 12:22:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7912e5b1

dev-util/cmake: Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 dev-util/cmake/Manifest|   1 -
 dev-util/cmake/cmake-3.20.2-r1.ebuild  | 234 -
 dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch |  46 
 dev-util/cmake/files/cmake-3.20.2-sphinx-4.patch   |  29 ---
 4 files changed, 310 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 0ae2e94d565..a42e79847cf 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,6 +1,5 @@
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 
765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226
 SHA512 
99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 
62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8
 SHA512 
c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
 DIST cmake-3.19.7.tar.gz 9271358 BLAKE2B 
379b89c0d6bcfe81a397257cb3f95e4b4a8987566258f6d5b312e8ffd455fd07f09ed570c47111f9a519d76f43014b680e8242cddef13810ba87f9b9ec7e2e2f
 SHA512 
6af1fe3ea41906324d4c29f5f982281d92145d086f4a47fa2220b93483bc65d59b1e23f5b51d82305c630690be7c552827bb795560674b03620763e0917bf14a
-DIST cmake-3.20.2.tar.gz 9438694 BLAKE2B 
b1e1c091047d5ccae77d64ffda8201cfa7661f09fac2aceadfede8be09257cebdc8c2536f10ced82c700fd87174979344489fa6ab1b460e3ddfc41325ca6f19b
 SHA512 
675a92f84b437169aee86dbfa59715671b9195ddeffc6fea83c7803a70abe3116106ad0a627b9e4bef326bfb2a10fdf624ad341fd9d3d08e3d8a69c271cd2b32
 DIST cmake-3.20.3.tar.gz 9440009 BLAKE2B 
25098305b2fb9d719ffd3a25936207d98901651a6d9c6fe0757d4da3619274021025d7ce9f78b3813826c8b52347f12321db905083839d3882a2ba85a294561c
 SHA512 
ed2b8b04c759c4f7c5c363be33bf08e6677c710c1f937050a378ab5539136b919531e1c927b117b3d8d68d4bb613de8d92a3d4d50f3ab3bc98355febca779a1b
 DIST cmake-3.20.4.tar.gz 9440363 BLAKE2B 
b04cf6e41878b8626b13516ecbe9d27f0fe801437342217389b739f1549743be10620e06aa521de4ab7b1dcb8f0a8208bf8b3805cca54ac782c320d938c8d9b0
 SHA512 
f53902a917b8d7b949af305afed3b32fcf981c5c647a77ee7a3bcae1bb5620381a1eacdac4b86bd7e5ea0a7806ec5fbd9a4f4853553f78db4d41d7dd2867c99f

diff --git a/dev-util/cmake/cmake-3.20.2-r1.ebuild 
b/dev-util/cmake/cmake-3.20.2-r1.ebuild
deleted file mode 100644
index 627ca4f7a02..000
--- a/dev-util/cmake/cmake-3.20.2-r1.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails 
consistently w/ ninja
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-   toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/;
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris 
~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=app-arch/libarchive-3.3.3:=
-   app-crypt/rhash
-   >=dev-libs/expat-2.0.1
-   >=dev-libs/jsoncpp-1.9.2-r2:0=
-   >=dev-libs/libuv-1.10.0:=
-   >=net-misc/curl-7.21.5[ssl]
-   sys-libs/zlib
-   virtual/pkgconfig
-   emacs? ( >=app-editors/emacs-23.1:* )
-   ncurses? ( sys-libs/ncurses:0= )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   doc? (
-   dev-python/requests
-   dev-python/sphinx
-   )
-   test? ( app-arch/libarchive[zstd] )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-   # prefix
-   "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-   "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-   "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-   # handle gentoo packaging in find modules
-   "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-   # Next patch needs to be reworked
-   #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-   "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-   # respect python eclasses
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2021-02-26 Thread Andreas Sturmlechner
commit: d7167e80d683cbb5420930113daefdd3eb93c909
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Feb 26 15:30:59 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Feb 26 21:19:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7167e80

dev-util/cmake: Drop 3.17.4-r1

Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/cmake/Manifest|   1 -
 dev-util/cmake/cmake-3.17.4-r1.ebuild  | 223 -
 .../cmake/files/cmake-3.17.4-uv-check-return.patch |  46 -
 3 files changed, 270 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 43be67cfb53..0da9dc3439e 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,5 +1,4 @@
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 
765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226
 SHA512 
99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
-DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 
2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b
 SHA512 
6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e
 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 
62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8
 SHA512 
c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
 DIST cmake-3.19.5.tar.gz 9270284 BLAKE2B 
4620f5f2a08e16a90350559e539a701606a0e8b4ee358ae5d1668c1f1d43674ac75a06ae335e52363fad9750bde430938faa2497108c2db6038479058412969a
 SHA512 
de8645c7c03bd48987f6eefc19bc2856c2a939e537cf204e1c9749d5a3e21c71695080bee246e94871f82996ede9d1a8771972266434549b48df9924fbb4c6f2
 DIST cmake-3.19.6.tar.gz 9270931 BLAKE2B 
5480ea3f3d159cd6471623ec73dfd73ab20ceb21744b2acc8bdbd27b8be7338e2ab8ae81366bbc3af474be49723567421450dfd6b7c51c65f36494c04fe13946
 SHA512 
556655c0fd17d5c70d5c1725f49ccad0d8088e6cbb3370d48d5a548d49d0e066d21c69978ed9b49d786fbb8eb79e086e719882245c9261c692b9457ba23b76f9

diff --git a/dev-util/cmake/cmake-3.17.4-r1.ebuild 
b/dev-util/cmake/cmake-3.17.4-r1.ebuild
deleted file mode 100644
index 45b0de57b6c..000
--- a/dev-util/cmake/cmake-3.17.4-r1.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/;
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=app-arch/libarchive-3.3.3:=
-   app-crypt/rhash
-   >=dev-libs/expat-2.0.1
-   >=dev-libs/jsoncpp-1.9.2-r2:0=
-   >=dev-libs/libuv-1.10.0:=
-   >=net-misc/curl-7.21.5[ssl]
-   sys-libs/zlib
-   virtual/pkgconfig
-   emacs? ( >=app-editors/emacs-23.1:* )
-   ncurses? ( sys-libs/ncurses:0= )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   doc? (
-   dev-python/requests
-   dev-python/sphinx
-   )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-   # prefix
-   "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-   "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-   # Next patch requires new work from prefix people
-   #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-   # handle gentoo packaging in find modules
-   "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-   "${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-   "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-   # respect python eclasses
-   "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-   "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-   # upstream fixes (can usually be removed with a version bump)
-   "${FILESDIR}"/${P}-uv-check-return.patch # bug 726962
-)
-
-cmake_src_bootstrap() {
-   # disable running of cmake in bootstrap command
-   sed -i \
-   -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2020-12-18 Thread Fabian Groffen
commit: 3d7bc76da7f2d1f408e6ac7467697ac4aed5a1d3
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Dec 18 20:16:35 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Dec 18 20:19:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d7bc76d

dev-util/cmake-3.19.2: fix some issues when building with Clang, #757513

Changes by Jacob Floyd, to respect the Prefix local MacOSX.sdk and to
drop any isysroot crap when using Clang.

Bug: https://bugs.gentoo.org/757513
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 dev-util/cmake/cmake-3.19.2.ebuild  | 3 +++
 dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch | 8 +---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/dev-util/cmake/cmake-3.19.2.ebuild 
b/dev-util/cmake/cmake-3.19.2.ebuild
index 54a6d646dda..945b1c1e8b0 100644
--- a/dev-util/cmake/cmake-3.19.2.ebuild
+++ b/dev-util/cmake/cmake-3.19.2.ebuild
@@ -137,6 +137,9 @@ src_prepare() {
# where things are via GCC configuration and ldwrapper
sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
Modules/Platform/Apple-GNU-*.cmake || die
+   # disable isysroot usage with clang as well
+   sed -i -e '/_SYSROOT_FLAG/d' \
+   Modules/Platform/Apple-Clang.cmake || die
# don't set a POSIX standard, system headers don't like that, 
#757426
sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& 
!defined(__APPLE__)/' \
Source/cmLoadCommandCommand.cxx \

diff --git a/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch 
b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
index d03b17551f0..9a6054e9557 100644
--- a/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
+++ b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
@@ -17,7 +17,8 @@ Updated by Lars Wendler (cmake-3.9.0_rc2)
 Updated by Benda Xu (cmake-3.13.4)
 Updated by Lars Wendler (cmake-3.14.0_rc1)
 Updated by Lars Wendler (cmake-3.14.0_rc2)
-Updated by Lars Wendler (cmake-3.14.0_rc3
+Updated by Lars Wendler (cmake-3.14.0_rc3)
+Updated by Jacob Floyd (cmake-3.19.2)
 ---
  Modules/Platform/Darwin.cmake| 12 +++
  Modules/Platform/UnixPaths.cmake | 35 
@@ -39,16 +40,17 @@ index 5590433a3b..b04383e51d 100644
  endif()
  
  # Older OS X linkers do not report their framework search path
-@@ -140,6 +140,8 @@ endif()
+@@ -140,6 +140,9 @@ endif()
  
  # set up the default search directories for frameworks
  set(CMAKE_SYSTEM_FRAMEWORK_PATH
++  @gentoo_portage_epre...@macosx.sdk/System/Library/Frameworks
 +  @GENTOO_PORTAGE_EPREFIX@Frameworks
 +  @GENTOO_PORTAGE_EPREFIX@usr/lib
~/Library/Frameworks
)
  if(_CMAKE_OSX_SYSROOT_PATH)
-@@ -186,13 +188,15 @@ if(CMAKE_OSX_SYSROOT)
+@@ -186,13 +189,15 @@ if(CMAKE_OSX_SYSROOT)
endif()
  endif()
  



[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2020-12-17 Thread Andreas Sturmlechner
commit: 4795a8eeb1465af7dc34fd2ae6e30238b045f504
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec 17 13:11:27 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 17 13:31:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4795a8ee

dev-util/cmake: Drop 3.19.1-r1

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/cmake/Manifest|   1 -
 dev-util/cmake/cmake-3.19.1-r1.ebuild  | 226 -
 .../cmake-3.19.1-fix-spurious-include-target.patch | 198 --
 ...ake-3.19.1-use-FPHSA-outside-find_package.patch |  40 
 4 files changed, 465 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 6a764c6d6aa..0e2bbd07f02 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,5 +1,4 @@
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 
765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226
 SHA512 
99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
 DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 
2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b
 SHA512 
6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e
 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 
62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8
 SHA512 
c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
-DIST cmake-3.19.1.tar.gz 9256956 BLAKE2B 
00874fa3099fe55e7a8c16f5225d30c56e0569930e0f10d1829bb373f83c17cb11ba538918089bd94162dbb4cc736b2024bd0e1e7102f3d8c462bfe71c1b
 SHA512 
1a1c9a8546c80f8602babffc7fd398cea5d9163512ef74333f87e26a97ca35358bd0e90423768cfc971ebfed185e19d775737e557e0e982403b77a2ccbcd063a
 DIST cmake-3.19.2.tar.gz 9264414 BLAKE2B 
f45727fd6b6e0e324f618577abbc7fb1830f05f01a9afea4f8713f5f62ede3a612a020ef97385cdd6ede4b575a3b6f63deb57123a222b71e2906a42cba3b3d7f
 SHA512 
d811122af89d46174b8fdb2a26e8553200d9dc7eb6385ece4e4b3e7584880f73a799813d5a81e64e956fd2574b63264fa8944d862c74a076e9d61f5e6521e91a

diff --git a/dev-util/cmake/cmake-3.19.1-r1.ebuild 
b/dev-util/cmake/cmake-3.19.1-r1.ebuild
deleted file mode 100644
index 2726694149e..000
--- a/dev-util/cmake/cmake-3.19.1-r1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake" # TODO: Re-check with 3.19, see commit 
491dddfb; bug #596460
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-   toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/;
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=app-arch/libarchive-3.3.3:=
-   app-crypt/rhash
-   >=dev-libs/expat-2.0.1
-   >=dev-libs/jsoncpp-1.9.2-r2:0=
-   >=dev-libs/libuv-1.10.0:=
-   >=net-misc/curl-7.21.5[ssl]
-   sys-libs/zlib
-   virtual/pkgconfig
-   emacs? ( >=app-editors/emacs-23.1:* )
-   ncurses? ( sys-libs/ncurses:0= )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   doc? (
-   dev-python/requests
-   dev-python/sphinx
-   )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-   # prefix
-   "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-   "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-   "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-   # handle gentoo packaging in find modules
-   "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-   # Next patch needs to be reworked
-   #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-   "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-   # respect python eclasses
-   "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-   "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-   "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-   # upstream fixes (can usually be removed with a version bump)
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2020-12-17 Thread Andreas Sturmlechner
commit: 6b3170b4b49c98c4fd39edf942b2a9710278abd4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec 17 10:14:37 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 17 10:23:25 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b3170b4

dev-util/cmake: Drop 3.16.5

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/cmake/Manifest|   1 -
 dev-util/cmake/cmake-3.16.5.ebuild | 220 -
 .../cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch  |  55 --
 .../cmake/files/cmake-3.15.0_rc2-FindBLAS.patch|  37 
 4 files changed, 313 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index b0e5181cbd2..39f64e22405 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,5 +1,4 @@
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 
765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226
 SHA512 
99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
-DIST cmake-3.16.5.tar.gz 9111262 BLAKE2B 
5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876
 SHA512 
204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
 DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 
2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b
 SHA512 
6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e
 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 
62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8
 SHA512 
c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
 DIST cmake-3.19.1.tar.gz 9256956 BLAKE2B 
00874fa3099fe55e7a8c16f5225d30c56e0569930e0f10d1829bb373f83c17cb11ba538918089bd94162dbb4cc736b2024bd0e1e7102f3d8c462bfe71c1b
 SHA512 
1a1c9a8546c80f8602babffc7fd398cea5d9163512ef74333f87e26a97ca35358bd0e90423768cfc971ebfed185e19d775737e557e0e982403b77a2ccbcd063a

diff --git a/dev-util/cmake/cmake-3.16.5.ebuild 
b/dev-util/cmake/cmake-3.16.5.ebuild
deleted file mode 100644
index f53ac8c1d18..000
--- a/dev-util/cmake/cmake-3.16.5.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/;
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc 
x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris 
~x64-solaris ~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   app-crypt/rhash
-   >=app-arch/libarchive-3.3.3:=
-   >=dev-libs/expat-2.0.1
-   >=dev-libs/jsoncpp-1.9.2-r2:0=
-   >=dev-libs/libuv-1.10.0:=
-   >=net-misc/curl-7.21.5[ssl]
-   sys-libs/zlib
-   virtual/pkgconfig
-   emacs? ( >=app-editors/emacs-23.1:* )
-   ncurses? ( sys-libs/ncurses:0= )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   doc? (
-   dev-python/requests
-   dev-python/sphinx
-   )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-   # prefix
-   "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-   "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-   # Next patch requires new work from prefix people
-   #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-   # handle gentoo packaging in find modules
-   "${FILESDIR}"/${PN}-3.15.0_rc2-FindBLAS.patch
-   "${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
-   "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-   # respect python eclasses
-   "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-   "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-   # upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-   # disable running of cmake in boostrap command
-   sed -i \
-   -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2020-12-12 Thread Andreas Sturmlechner
commit: 755299aaafbf5b1dd243ab371375f742699fcceb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec 12 17:00:40 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 12 17:58:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=755299aa

dev-util/cmake: Fix spurious include target

Reported-by: Attila Tóth  atoth.sote.hu>
Closes: https://bugs.gentoo.org/759271
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/cmake/cmake-3.19.1-r1.ebuild  | 225 +
 .../cmake-3.19.1-fix-spurious-include-target.patch | 198 ++
 2 files changed, 423 insertions(+)

diff --git a/dev-util/cmake/cmake-3.19.1-r1.ebuild 
b/dev-util/cmake/cmake-3.19.1-r1.ebuild
new file mode 100644
index 000..97f173f95a8
--- /dev/null
+++ b/dev-util/cmake/cmake-3.19.1-r1.ebuild
@@ -0,0 +1,225 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake" # TODO: Re-check with 3.19, see commit 
491dddfb; bug #596460
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
+   toolchain-funcs virtualx xdg-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/;
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv 
~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=app-arch/libarchive-3.3.3:=
+   app-crypt/rhash
+   >=dev-libs/expat-2.0.1
+   >=dev-libs/jsoncpp-1.9.2-r2:0=
+   >=dev-libs/libuv-1.10.0:=
+   >=net-misc/curl-7.21.5[ssl]
+   sys-libs/zlib
+   virtual/pkgconfig
+   emacs? ( >=app-editors/emacs-23.1:* )
+   ncurses? ( sys-libs/ncurses:0= )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   doc? (
+   dev-python/requests
+   dev-python/sphinx
+   )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+   # prefix
+   "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+   "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+   "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
+
+   # handle gentoo packaging in find modules
+   "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+   # Next patch needs to be reworked
+   #"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+   "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+   # respect python eclasses
+   "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+   "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+   "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
+   # upstream fixes (can usually be removed with a version bump)
+   "${FILESDIR}"/${P}-fix-spurious-include-target.patch # bug 759271
+)
+
+cmake_src_bootstrap() {
+   # disable running of cmake in bootstrap command
+   sed -i \
+   -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+   bootstrap || die "sed failed"
+
+   # execinfo.h on Solaris isn't quite what it is on Darwin
+   if [[ ${CHOST} == *-solaris* ]] ; then
+   sed -i -e 's/execinfo\.h/blablabla.h/' \
+   Source/kwsys/CMakeLists.txt || die
+   fi
+
+   # bootstrap script isn't exactly /bin/sh compatible
+   tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+   --prefix="${T}/cmakestrap/" \
+   --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+   || die "Bootstrap failed"
+}
+
+cmake_src_test() {
+   # fix OutDir and SelectLibraryConfigurations tests
+   # these are altered thanks to our eclass
+   sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
+   
"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+   || die
+
+   pushd "${BUILD_DIR}" > /dev/null
+
+   local ctestargs
+   [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose 
--output-on-failure"
+
+   # Excluded tests:
+   #BootstrapTest: we actually bootstrap it every time so why test it.
+   #BundleUtilities: bundle creation broken
+   #CMakeOnly.AllFindModules: pthread issues
+   #CTest.updatecvs: fails to commit as root
+   #Fortran: requires fortran
+   #RunCMake.CommandLineTar: whatever...
+   #RunCMake.CompilerLauncher: also requires fortran
+   #RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+   #

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2020-07-22 Thread Lars Wendler
commit: 798815cd723550bb4b9141ded9e50c12a74ed3e2
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jul 22 16:26:02 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jul 22 16:26:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=798815cd

dev-util/cmake: Bump to version 3.18.0. Removed old

Filter out distcc warnings

Thanks-to: Felix W.  gmail.com>
Bug: https://bugs.gentoo.org/691544
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Lars Wendler  gentoo.org>

 dev-util/cmake/Manifest |  2 +-
 .../{cmake-3.18.0_rc4.ebuild => cmake-3.18.0.ebuild}|  2 ++
 .../files/cmake-3.18.0-filter_distcc_warning.patch  | 17 +
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index d8519593884..12c70370a97 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -2,4 +2,4 @@ DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 
765678bc92821207c53bfb4ac995a791b938f20
 DIST cmake-3.16.5.tar.gz 9111262 BLAKE2B 
5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876
 SHA512 
204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
 DIST cmake-3.17.2.tar.gz 9469251 BLAKE2B 
85818c6346ee600a0185687809b666a3186831d590680bba8a41d6d52cd3852ce84fdac240100a7b91f06897a779e1e44b67d9a8da4e806347c9a4a46dab354d
 SHA512 
4998ec3ac7367cec237187b1568a1935b402c39959c1869c9ae94e013060f6d2e03089eba34187f91063de169df78425dee2aa01acb925347aeb97f99bcad6a2
 DIST cmake-3.17.3.tar.gz 9470753 BLAKE2B 
a4c863e0cf7105eb47e1bba7641ab3431506f0a4f5c84a4de203cb996e629d1ee236d91ba5e1439f0123ab3c8b3871ef4e3b1c21940aa97c125cc7ab2a3f9873
 SHA512 
13479bd48ef8a8c95277a62b4f42e63152a5979292a98b5456022ca42ad3963cad75e917cc8b92a8485dbf5a2b59cde3fdc90fd9abdb806bc97c8570d03c1c69
-DIST cmake-3.18.0-rc4.tar.gz 8970935 BLAKE2B 
c3d86e409c88c7e51cc0a4fd54058c511974cd1bfe2162db591a91054aef623c7d0e0e33ec2af9d4831ee0160f7f8202c2a71afd0b23443573b20095b19fb04a
 SHA512 
cd9ced16a9aa6b5b551fb2c50c4b6765d2d5e2be3cd6b4f93fc72243c65755a4c7e51c6fe5abbba556ba971978cf483238f0c58c08083c92bdf66726a3207a08
+DIST cmake-3.18.0.tar.gz 8970116 BLAKE2B 
3eba331eaa6b1d85baa5898836fc6106f2b5fcb10af85121806c429f41d09d4fde49bf87ef833c0e538ae5ccdf994e9cc86efa39b571ebcd429459ea37205c66
 SHA512 
6cab76a792a7ed2120a50048312273b2870afef29351a3ebcbf76cbcb422f82be679c85211c19016a56ac7f63bbce6cea0478f491c973b8577e08168a1ba853d

diff --git a/dev-util/cmake/cmake-3.18.0_rc4.ebuild 
b/dev-util/cmake/cmake-3.18.0.ebuild
similarity index 98%
rename from dev-util/cmake/cmake-3.18.0_rc4.ebuild
rename to dev-util/cmake/cmake-3.18.0.ebuild
index 3834479c503..c95cd8652c8 100644
--- a/dev-util/cmake/cmake-3.18.0_rc4.ebuild
+++ b/dev-util/cmake/cmake-3.18.0.ebuild
@@ -66,6 +66,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
 
+   "${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch #691544
+
# upstream fixes (can usually be removed with a version bump)
 )
 

diff --git a/dev-util/cmake/files/cmake-3.18.0-filter_distcc_warning.patch 
b/dev-util/cmake/files/cmake-3.18.0-filter_distcc_warning.patch
new file mode 100644
index 000..07d89ee5e2b
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.18.0-filter_distcc_warning.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/691544
+
+Patch-by: Felix W. 
+
+Forward-ported from 3.16.5 to 3.18.0
+
+--- cmake-3.18.0/Source/Checks/cm_cxx_features.cmake
 cmake-3.18.0/Source/Checks/cm_cxx_features.cmake
+@@ -36,6 +36,8 @@
+ string(REGEX REPLACE "[^\n]*icpc: command line warning #10121: overriding 
[^\n]*" "" check_output "${check_output}")
+ # Filter out ld warnings.
+ string(REGEX REPLACE "[^\n]*ld: warning: [^\n]*" "" check_output 
"${check_output}")
++# Filter out distcc.
++string(REGEX REPLACE "[^\n]*distcc\\[[0-9]+\\][^\n]*[Ww]arning:[^\n]*" "" 
check_output "${check_output}")
+ # If using the feature causes warnings, treat it as broken/unavailable.
+ if(check_output MATCHES "(^|[ :])[Ww][Aa][Rr][Nn][Ii][Nn][Gg]")
+   set(CMake_HAVE_CXX_${FEATURE} OFF CACHE INTERNAL "TRY_COMPILE" FORCE)



[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2020-02-13 Thread Lars Wendler
commit: 5ee60120c93d850c679be26bfe52c210b0e907f0
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Feb 13 12:26:30 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Feb 13 12:27:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee60120

dev-util/cmake: Bump to version 3.17.0_rc1

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 dev-util/cmake/Manifest|   1 +
 dev-util/cmake/cmake-3.17.0_rc1.ebuild | 216 +
 .../cmake/files/cmake-3.17.0_rc1-FindBLAS.patch|  37 
 .../cmake/files/cmake-3.17.0_rc1-FindLAPACK.patch  |  56 ++
 4 files changed, 310 insertions(+)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index ae9f9882e38..6df488c8d66 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -2,3 +2,4 @@ DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 
765678bc92821207c53bfb4ac995a791b938f20
 DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 
257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99
 SHA512 
8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56
 DIST cmake-3.16.3.tar.gz 9111826 BLAKE2B 
578c070457074a611504c0113b12bdfc8831c7e2cd523dfb038279404712456032646b107ca4d7d8dbff227e4f326ab053d90e3925a22a68a37d5c4e0d818bb2
 SHA512 
ca9e0a142369735ef6469afb97f4463c981404bd59c7d48c1ef454dd705460a31a5dcffa4949b84b1ac723f5b7e79d67b250126fb42e1f15dab0ac2a17603672
 DIST cmake-3.16.4.tar.gz 9113021 BLAKE2B 
5aa34cadec4ed09e4d0c46f6983b88cf81ea719c47a0848a21be36911b223d9e609bdc7f5b52086762ab83e4230a3ec9e38d9c9e3c9c6f508aa2118e769e3783
 SHA512 
4aa36608bac3b9e29ea765003cdc684733c025d7b18fbae057f3be1f726a159d4b0231b8b1be269206aa7dbd7177fe0110d5bac8d72fb0f6ad392bb284b1fce3
+DIST cmake-3.17.0-rc1.tar.gz 9460071 BLAKE2B 
53157977becff23b87c7ab4e320babef53b199b709c5446cfbb230f19666e5a43ab89c00c69ce3f750d3d2da591372f63daa681bef1626b3ceeef9374502593f
 SHA512 
7ff9f21a488658275f6241dca4e311441827edbc11f44dd4772e114e6f99cb0e3f85d8a8051a23783e7aa47e19683f83b5cf236e75ca9a9724ea9cb2a1c1

diff --git a/dev-util/cmake/cmake-3.17.0_rc1.ebuild 
b/dev-util/cmake/cmake-3.17.0_rc1.ebuild
new file mode 100644
index 000..8f7b237f89e
--- /dev/null
+++ b/dev-util/cmake/cmake-3.17.0_rc1.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES_LIST=( none )
+inherit bash-completion-r1 elisp-common flag-o-matic multiprocessing \
+   toolchain-funcs virtualx xdg cmake
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/;
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   app-crypt/rhash
+   >=app-arch/libarchive-3.0.0:=
+   >=dev-libs/expat-2.0.1
+   >=dev-libs/jsoncpp-1.9.2-r2:0=
+   >=dev-libs/libuv-1.10.0:=
+   >=net-misc/curl-7.21.5[ssl]
+   sys-libs/zlib
+   virtual/pkgconfig
+   emacs? ( >=app-editors/emacs-23.1:* )
+   ncurses? ( sys-libs/ncurses:0= )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   doc? (
+   dev-python/requests
+   dev-python/sphinx
+   )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+   # prefix
+   "${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
+   "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+   # Next patch requires new work from prefix people
+   #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+   # handle gentoo packaging in find modules
+   "${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
+   "${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+   "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+   # respect python eclasses
+   "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+   "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+   # upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+   # disable running of cmake in boostrap command
+   sed -i \
+   -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+   bootstrap || die "sed failed"
+
+   # execinfo.h on Solaris isn't quite what it is on Darwin
+   if [[ ${CHOST} == *-solaris* ]] ; then
+   sed -i -e 's/execinfo\.h/blablabla.h/' \
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2019-07-04 Thread Andreas Sturmlechner
commit: c93701cbe5848d56531a9d950bfd97d908eed1e8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jul  4 17:58:29 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jul  4 19:36:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c93701cb

dev-util/cmake: Restore 3.13.4 for prefix

Bug: https://bugs.gentoo.org/689234
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/cmake/Manifest|   1 +
 dev-util/cmake/cmake-3.13.4.ebuild | 228 +
 dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch  |  43 
 .../cmake/files/cmake-3.11.0_rc2-FindBLAS.patch|  23 +++
 .../files/cmake-3.11.4-fix-boost-detection.patch   |  13 ++
 .../cmake/files/cmake-3.13.4-prefix-dirs.patch | 127 
 6 files changed, 435 insertions(+)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 1dd8f3caed0..fa988872699 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,3 +1,4 @@
+DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B 
c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a
 SHA512 
5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
 DIST cmake-3.14.3.tar.gz 8851085 BLAKE2B 
92da2c563f7ddc3b12457f63eead850eb99b123298632b5a9e8f80f3e32db20e2b25bc60778855400261d13d4ef42600162248f4a92907a0c581e202fc6620eb
 SHA512 
e257a96334f21f2b2f17e8d43aa32c2b069d13194604393c5ac9d3da193000d5328181c6cf861696186d022aba57679ee2d08073d8a7112727746b2b145a47e2
 DIST cmake-3.14.5.tar.gz 8854929 BLAKE2B 
3e783de1ce541039c80228a56fed4fd28e9ef2ea48f274995f6f26f8b149f1684aab6da518f27106f364a4f0a6f370334f3a85dd61f1bcce22c34337ef4afdaa
 SHA512 
9acd2de17db86052801194cac570bfc104320c249b83058aa59554b42c3d5af9c9293d1c069f3fe8512a80103d511186d840168cbc190ce9584ca99cb9b11e46
 DIST cmake-3.15.0-rc3.tar.gz 9255508 BLAKE2B 
d6d2a46f5d639e290913d1af0f353baf144003c9c3159fa1be900318fd935b2e89fe09ae78db0df291782ef7ff54e64017ea8ab4ee330dfb0e36e14d82ad20e6
 SHA512 
0a5403e3d13560800fec3b0a932d7d165e5a133fa5c45235f605a761c69aac399164ee4fb79ab4045914c351b9460dcdb3aaad5a0fd1eb8b0153d0fcdddb7f10

diff --git a/dev-util/cmake/cmake-3.13.4.ebuild 
b/dev-util/cmake/cmake-3.13.4.ebuild
new file mode 100644
index 000..9acfa35ba61
--- /dev/null
+++ b/dev-util/cmake/cmake-3.13.4.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common flag-o-matic gnome2-utils 
toolchain-funcs eapi7-ver virtualx xdg-utils cmake-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/;
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs system-jsoncpp ncurses qt5"
+
+RDEPEND="
+   app-crypt/rhash
+   >=app-arch/libarchive-3.0.0:=
+   >=dev-libs/expat-2.0.1
+   >=dev-libs/libuv-1.10.0:=
+   >=net-misc/curl-7.21.5[ssl]
+   sys-libs/zlib
+   virtual/pkgconfig
+   emacs? ( virtual/emacs )
+   ncurses? ( sys-libs/ncurses:0= )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}
+   doc? (
+   dev-python/requests
+   dev-python/sphinx
+   )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+   # prefix
+   "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+   "${FILESDIR}"/${PN}-3.13.4-prefix-dirs.patch
+   "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+   # handle gentoo packaging in find modules
+   "${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch
+   "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+   "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+   # respect python eclasses
+   "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+   "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+   # boost (#660980)
+   "${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch
+
+   # upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+   # Cleanup args to extract only JOBS.
+   # Because bootstrap does not know anything else.
+   grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< 
"${MAKEOPTS}" > /dev/null
+   if [[ $? -eq 0 ]] ; then
+   par_arg=$(grep 

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2019-06-14 Thread Andreas Sturmlechner
commit: 7229821dd914786b4307a0eeb4b40feb4e521917
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jun 14 17:51:45 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jun 14 20:42:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7229821d

dev-util/cmake: Drop old

Closes: https://bugs.gentoo.org/644860
Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 dev-util/cmake/Manifest|   5 -
 dev-util/cmake/cmake-3.11.4-r1.ebuild  | 221 
 dev-util/cmake/cmake-3.12.3.ebuild | 223 
 dev-util/cmake/cmake-3.13.4.ebuild | 228 -
 dev-util/cmake/cmake-3.14.4.ebuild | 224 
 dev-util/cmake/cmake-3.9.6.ebuild  | 214 ---
 dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch|  43 
 dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch  |  43 
 .../cmake/files/cmake-3.11.0_rc2-FindBLAS.patch|  23 ---
 .../files/cmake-3.11.4-fix-boost-detection.patch   |  13 --
 dev-util/cmake/files/cmake-3.11.4-libuv-1.21.patch |  28 ---
 .../cmake/files/cmake-3.13.4-prefix-dirs.patch | 127 
 .../files/cmake-3.8.0_rc2-FindBoost-python.patch   |  95 -
 .../files/cmake-3.9.0_rc2-FindImageMagick.patch|  47 -
 .../cmake/files/cmake-3.9.0_rc2-prefix-dirs.patch  | 126 
 dev-util/cmake/metadata.xml|   1 -
 16 files changed, 1661 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 44cf237f9af..a0243d340bd 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,7 +1,2 @@
-DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 
2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925
 SHA512 
c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
-DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 
3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9
 SHA512 
2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
-DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B 
c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a
 SHA512 
5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
 DIST cmake-3.14.3.tar.gz 8851085 BLAKE2B 
92da2c563f7ddc3b12457f63eead850eb99b123298632b5a9e8f80f3e32db20e2b25bc60778855400261d13d4ef42600162248f4a92907a0c581e202fc6620eb
 SHA512 
e257a96334f21f2b2f17e8d43aa32c2b069d13194604393c5ac9d3da193000d5328181c6cf861696186d022aba57679ee2d08073d8a7112727746b2b145a47e2
-DIST cmake-3.14.4.tar.gz 8853821 BLAKE2B 
8005387dbb9a0d2ceffda324d81e38710b51d9e1befa40322441722038a9a5bf04127edec1feb4ab9a75779e4cbac6eb0f8bd3e0d08b7d2427e88df095851d46
 SHA512 
1011ba6cc54680699e97a5e25c4be6055c04f47847225f87f91ada0b2ace2d6f709a3fa49a37fd5c2276118bf29f5ce9d6e24473bff6f3c90f25e92083a5c412
 DIST cmake-3.14.5.tar.gz 8854929 BLAKE2B 
3e783de1ce541039c80228a56fed4fd28e9ef2ea48f274995f6f26f8b149f1684aab6da518f27106f364a4f0a6f370334f3a85dd61f1bcce22c34337ef4afdaa
 SHA512 
9acd2de17db86052801194cac570bfc104320c249b83058aa59554b42c3d5af9c9293d1c069f3fe8512a80103d511186d840168cbc190ce9584ca99cb9b11e46
-DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B 
e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43
 SHA512 
9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c

diff --git a/dev-util/cmake/cmake-3.11.4-r1.ebuild 
b/dev-util/cmake/cmake-3.11.4-r1.ebuild
deleted file mode 100644
index 9df56641cf1..000
--- a/dev-util/cmake/cmake-3.11.4-r1.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils 
toolchain-funcs versionator virtualx xdg-utils cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/;
-SRC_URI="https://cmake.org/files/v$(get_version_component_range 
1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2019-03-01 Thread Lars Wendler
commit: bf6461ea2aa0343109435fd014d60f7394e7f574
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar  1 22:20:51 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar  1 22:21:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf6461ea

dev-util/cmake: Bump to version 3.14.0_rc3. Removed old.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 dev-util/cmake/Manifest|  2 +-
 ...cmake-3.14.0_rc2.ebuild => cmake-3.14.0_rc3.ebuild} |  2 +-
 ...x-dirs.patch => cmake-3.14.0_rc3-prefix-dirs.patch} | 18 ++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index c5b00985744..b6edbbdf95d 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -2,5 +2,5 @@ DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 
1db8c21abdcfac2612fa914d49f9edcf199240b
 DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 
2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925
 SHA512 
c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
 DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 
3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9
 SHA512 
2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
 DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B 
c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a
 SHA512 
5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
-DIST cmake-3.14.0-rc2.tar.gz 8846165 BLAKE2B 
8b36ec26167e4bd83f0bf9b58a4ca2f0f9ee9994eeb3593279a03faae03c2fe6097fb0a7b6e8a83902afd5833c3f7bbd7602e78f052fb5c5d75f5b7a4db8aafe
 SHA512 
941d6c562e620dcabd7d821a0eb96c05674d877c196a68cc9cb870a21de7c486f7ce848722892d9764c3826b7276f7fbe7afc36e3b8f784fccff2a8feda9de30
+DIST cmake-3.14.0-rc3.tar.gz 8845905 BLAKE2B 
496f478586b8db220364079e5e96cc27dc703879a9f28cc425047bcf6b62d09bda1077cdca5759793995d84258448ce2195cce6b41c0ad2ca401eeb5b20590d0
 SHA512 
2a783a21428c2e86ff081e35c0a3737b4594904cf560a14b84de11da9d85bd7ad0e1c03a2acbcd26c1e84cbbfbf6b5b273987f0196a121bfdbb94bbfcabd13ca
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B 
e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43
 SHA512 
9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c

diff --git a/dev-util/cmake/cmake-3.14.0_rc2.ebuild 
b/dev-util/cmake/cmake-3.14.0_rc3.ebuild
similarity index 99%
rename from dev-util/cmake/cmake-3.14.0_rc2.ebuild
rename to dev-util/cmake/cmake-3.14.0_rc3.ebuild
index 75999dc1849..ce96349c214 100644
--- a/dev-util/cmake/cmake-3.14.0_rc2.ebuild
+++ b/dev-util/cmake/cmake-3.14.0_rc3.ebuild
@@ -50,7 +50,7 @@ SITEFILE="50${PN}-gentoo.el"
 PATCHES=(
# prefix
"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-   "${FILESDIR}"/${PN}-3.14.0_rc2-prefix-dirs.patch
+   "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
# Next patch requires new work from prefix people
#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
 

diff --git a/dev-util/cmake/files/cmake-3.14.0_rc2-prefix-dirs.patch 
b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
similarity index 91%
rename from dev-util/cmake/files/cmake-3.14.0_rc2-prefix-dirs.patch
rename to dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
index 8b539bf5bab..d03b17551f0 100644
--- a/dev-util/cmake/files/cmake-3.14.0_rc2-prefix-dirs.patch
+++ b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
@@ -1,6 +1,6 @@
-From 3c7467e2e841b9dcff7546c2b140a7e9f57525a6 Mon Sep 17 00:00:00 2001
+From 8ab270bf43f038bba4f992031508b065fa83f390 Mon Sep 17 00:00:00 2001
 From: Lars Wendler 
-Date: Mon, 18 Feb 2019 10:13:45 +0100
+Date: Fri, 1 Mar 2019 23:11:41 +0100
 Subject: [PATCH] Set some proper paths to make cmake find our tools.
 
 The ebuild now adds an extra / at the end of $EPREFIX so that it is
@@ -17,6 +17,7 @@ Updated by Lars Wendler (cmake-3.9.0_rc2)
 Updated by Benda Xu (cmake-3.13.4)
 Updated by Lars Wendler (cmake-3.14.0_rc1)
 Updated by Lars Wendler (cmake-3.14.0_rc2)
+Updated by Lars Wendler (cmake-3.14.0_rc3
 ---
  Modules/Platform/Darwin.cmake| 12 +++
  Modules/Platform/UnixPaths.cmake | 35 
@@ -66,7 +67,7 @@ index 5590433a3b..b04383e51d 100644
"/Applications"
"${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
 diff --git a/Modules/Platform/UnixPaths.cmake 
b/Modules/Platform/UnixPaths.cmake
-index 46c24bbf9b..54210f6599 100644
+index 

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2019-02-18 Thread Lars Wendler
commit: c37139bb5f116d3135bc9f39c9194949e454d5d9
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Feb 18 09:23:51 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Feb 18 09:24:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c37139bb

dev-util/cmake: Bump to version 3.14.0_rc2. Removed old.

Package-Manager: Portage-2.3.61, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 dev-util/cmake/Manifest|  2 +-
 ...e-3.14.0_rc1.ebuild => cmake-3.14.0_rc2.ebuild} |  2 +-
 ...rs.patch => cmake-3.14.0_rc2-prefix-dirs.patch} | 26 +-
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 2311c74f356..c5b00985744 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -2,5 +2,5 @@ DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 
1db8c21abdcfac2612fa914d49f9edcf199240b
 DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 
2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925
 SHA512 
c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
 DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 
3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9
 SHA512 
2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
 DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B 
c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a
 SHA512 
5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
-DIST cmake-3.14.0-rc1.tar.gz 8844963 BLAKE2B 
1bb600c4fda4da411d3897f55696025d0ff14f80154eeb968c67a1e8dbb308f55d38a4a5a9c420038a1aef1fc181778801f954178d3b625faedd3fc51a18b5c7
 SHA512 
a7f1881100e1c4ca4944fca1f87ed2caac450983fda4b930954f0d25bf39091e28080e49862060d87ec86e61251c712056d8accddaeedb71715cb9fb01aa4559
+DIST cmake-3.14.0-rc2.tar.gz 8846165 BLAKE2B 
8b36ec26167e4bd83f0bf9b58a4ca2f0f9ee9994eeb3593279a03faae03c2fe6097fb0a7b6e8a83902afd5833c3f7bbd7602e78f052fb5c5d75f5b7a4db8aafe
 SHA512 
941d6c562e620dcabd7d821a0eb96c05674d877c196a68cc9cb870a21de7c486f7ce848722892d9764c3826b7276f7fbe7afc36e3b8f784fccff2a8feda9de30
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B 
e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43
 SHA512 
9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c

diff --git a/dev-util/cmake/cmake-3.14.0_rc1.ebuild 
b/dev-util/cmake/cmake-3.14.0_rc2.ebuild
similarity index 99%
rename from dev-util/cmake/cmake-3.14.0_rc1.ebuild
rename to dev-util/cmake/cmake-3.14.0_rc2.ebuild
index a35142fe072..75999dc1849 100644
--- a/dev-util/cmake/cmake-3.14.0_rc1.ebuild
+++ b/dev-util/cmake/cmake-3.14.0_rc2.ebuild
@@ -50,7 +50,7 @@ SITEFILE="50${PN}-gentoo.el"
 PATCHES=(
# prefix
"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-   "${FILESDIR}"/${PN}-3.14.0_rc1-prefix-dirs.patch
+   "${FILESDIR}"/${PN}-3.14.0_rc2-prefix-dirs.patch
# Next patch requires new work from prefix people
#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
 

diff --git a/dev-util/cmake/files/cmake-3.14.0_rc1-prefix-dirs.patch 
b/dev-util/cmake/files/cmake-3.14.0_rc2-prefix-dirs.patch
similarity index 87%
rename from dev-util/cmake/files/cmake-3.14.0_rc1-prefix-dirs.patch
rename to dev-util/cmake/files/cmake-3.14.0_rc2-prefix-dirs.patch
index a4890ffbb2f..8b539bf5bab 100644
--- a/dev-util/cmake/files/cmake-3.14.0_rc1-prefix-dirs.patch
+++ b/dev-util/cmake/files/cmake-3.14.0_rc2-prefix-dirs.patch
@@ -1,6 +1,6 @@
-From c5d74cb5b1cf87ee933f7547f62dbbb96134964d Mon Sep 17 00:00:00 2001
+From 3c7467e2e841b9dcff7546c2b140a7e9f57525a6 Mon Sep 17 00:00:00 2001
 From: Lars Wendler 
-Date: Sun, 10 Feb 2019 22:40:33 +0100
+Date: Mon, 18 Feb 2019 10:13:45 +0100
 Subject: [PATCH] Set some proper paths to make cmake find our tools.
 
 The ebuild now adds an extra / at the end of $EPREFIX so that it is
@@ -16,13 +16,14 @@ Updated by Michael Palimaka (cmake-3.0.0)
 Updated by Lars Wendler (cmake-3.9.0_rc2)
 Updated by Benda Xu (cmake-3.13.4)
 Updated by Lars Wendler (cmake-3.14.0_rc1)
+Updated by Lars Wendler (cmake-3.14.0_rc2)
 ---
- Modules/Platform/Darwin.cmake| 12 ++
- Modules/Platform/UnixPaths.cmake | 38 
- 2 files changed, 37 insertions(+), 13 deletions(-)
+ Modules/Platform/Darwin.cmake| 12 +++
+ Modules/Platform/UnixPaths.cmake | 35 
+ 2 files changed, 35 insertions(+), 12 deletions(-)
 
 diff --git 

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2019-02-10 Thread Lars Wendler
commit: 66879b3d33b9d32a92358da0f31e1e65fe20eed8
Author: Lars Wendler  gentoo  org>
AuthorDate: Sun Feb 10 22:15:47 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sun Feb 10 22:18:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66879b3d

dev-util/cmake: Bump to version 3.14.0_rc1

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 dev-util/cmake/Manifest|   1 +
 dev-util/cmake/cmake-3.14.0_rc1.ebuild | 229 +
 .../cmake/files/cmake-3.14.0_rc1-FindBLAS.patch|  37 
 .../cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch  |  55 +
 .../cmake/files/cmake-3.14.0_rc1-prefix-dirs.patch | 144 +
 5 files changed, 466 insertions(+)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index f49657256e9..75582bfc2c4 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -3,4 +3,5 @@ DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 
2bad70e9e8b1a4081daf79fbec46d7389f68592
 DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 
3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9
 SHA512 
2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
 DIST cmake-3.13.3.tar.gz 8616403 BLAKE2B 
1c0df89a8cbed3fe94e9fb1491d77b9b87b3ce4d4dad6e90cf7bd3a259ab4839f941f4f52fb8d1cd89711a2f022d72a638a6e907f8d047419508aebe5bd8255d
 SHA512 
3033c434b6880d76a1496c9b1a32835307296a68e4c677acbe09cadb6562088dc9b04fb314d28b4611a1f4ea4d5a1e41c94e7ccf135f21c372a0eadc25aba585
 DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B 
c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a
 SHA512 
5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
+DIST cmake-3.14.0-rc1.tar.gz 8844963 BLAKE2B 
1bb600c4fda4da411d3897f55696025d0ff14f80154eeb968c67a1e8dbb308f55d38a4a5a9c420038a1aef1fc181778801f954178d3b625faedd3fc51a18b5c7
 SHA512 
a7f1881100e1c4ca4944fca1f87ed2caac450983fda4b930954f0d25bf39091e28080e49862060d87ec86e61251c712056d8accddaeedb71715cb9fb01aa4559
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B 
e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43
 SHA512 
9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c

diff --git a/dev-util/cmake/cmake-3.14.0_rc1.ebuild 
b/dev-util/cmake/cmake-3.14.0_rc1.ebuild
new file mode 100644
index 000..a35142fe072
--- /dev/null
+++ b/dev-util/cmake/cmake-3.14.0_rc1.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common flag-o-matic gnome2-utils 
toolchain-funcs eapi7-ver virtualx xdg-utils cmake-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/;
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs system-jsoncpp ncurses qt5"
+
+RDEPEND="
+   app-crypt/rhash
+   >=app-arch/libarchive-3.0.0:=
+   >=dev-libs/expat-2.0.1
+   >=dev-libs/libuv-1.10.0:=
+   >=net-misc/curl-7.21.5[ssl]
+   sys-libs/zlib
+   virtual/pkgconfig
+   emacs? ( virtual/emacs )
+   ncurses? ( sys-libs/ncurses:0= )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}
+   doc? (
+   dev-python/requests
+   dev-python/sphinx
+   )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+   # prefix
+   "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+   "${FILESDIR}"/${PN}-3.14.0_rc1-prefix-dirs.patch
+   # Next patch requires new work from prefix people
+   #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+   # handle gentoo packaging in find modules
+   "${FILESDIR}"/${PN}-3.14.0_rc1-FindBLAS.patch
+   "${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
+   "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+   # respect python eclasses
+   "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+   "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+   # boost (#660980)
+   "${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch
+
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2019-02-03 Thread Benda XU
commit: aa74d8382b940a619abbdcb1020b1f8599ca264b
Author: Benda Xu  gentoo  org>
AuthorDate: Sun Jan 27 00:44:15 2019 +
Commit: Benda XU  gentoo  org>
CommitDate: Sun Feb  3 09:54:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa74d838

dev-util/cmake: remove host directories in Platform/UnixPaths.cmake

  Although needed in prefix-rpath, the host directories cause bugs for
  prefix-standalone and introduce duplications for gx86.

  gx86 duplication example:

...
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
  # Standard
  /usr/local /usr /
  /usr/local /usr /
...

Closes: https://bugs.gentoo.org/676372
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Benda Xu  gentoo.org>

 dev-util/cmake/cmake-3.13.4.ebuild |   3 +-
 .../cmake/files/cmake-3.13.4-prefix-dirs.patch | 127 +
 2 files changed, 129 insertions(+), 1 deletion(-)

diff --git a/dev-util/cmake/cmake-3.13.4.ebuild 
b/dev-util/cmake/cmake-3.13.4.ebuild
index 00a140db85d..9acfa35ba61 100644
--- a/dev-util/cmake/cmake-3.13.4.ebuild
+++ b/dev-util/cmake/cmake-3.13.4.ebuild
@@ -50,7 +50,7 @@ SITEFILE="50${PN}-gentoo.el"
 PATCHES=(
# prefix
"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-   "${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
+   "${FILESDIR}"/${PN}-3.13.4-prefix-dirs.patch
"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
 
# handle gentoo packaging in find modules
@@ -143,6 +143,7 @@ src_prepare() {
# Add gcc libs to the default link paths
sed -i \
-e 
"s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+   -e "$(usex prefix-guest "s|@GENTOO_HOST@||" 
"/@GENTOO_HOST@/d")" \
-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then

diff --git a/dev-util/cmake/files/cmake-3.13.4-prefix-dirs.patch 
b/dev-util/cmake/files/cmake-3.13.4-prefix-dirs.patch
new file mode 100644
index 000..bb60aaf3519
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.13.4-prefix-dirs.patch
@@ -0,0 +1,127 @@
+From b1f045122fb210728081ae2165197aebff4ee498 Mon Sep 17 00:00:00 2001
+From: Lars Wendler 
+Date: Fri, 9 Jun 2017 01:47:55 +0200
+Subject: [PATCH] Set some proper paths to make cmake find our tools.
+
+The ebuild now adds an extra / at the end of $EPREFIX so that it is
+never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
+correct)
+
+Original patch by Heiko Przybyl.
+Updated by Chris Reffett (cmake-2.8.8)
+Updated by Johannes Huber (cmake-2.8.9)
+Updated by Michael Palimaka (cmake-2.8.10)
+Updated by Chris Reffett (cmake-2.8.11)
+Updated by Michael Palimaka (cmake-3.0.0)
+Updated by Lars Wendler (cmake-3.9.0_rc2)
+---
+ Modules/Platform/Darwin.cmake| 12 
+ Modules/Platform/UnixPaths.cmake | 29 -
+ 2 files changed, 32 insertions(+), 9 deletions(-)
+
+Index: cmake-3.13.3/Modules/Platform/Darwin.cmake
+===
+--- cmake-3.13.3.orig/Modules/Platform/Darwin.cmake
 cmake-3.13.3/Modules/Platform/Darwin.cmake
+@@ -108,9 +108,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F)
+ set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F)
+ set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F)
+ 
+-# default to searching for frameworks first
++# default to searching for frameworks last
+ if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
+-  set(CMAKE_FIND_FRAMEWORK FIRST)
++  set(CMAKE_FIND_FRAMEWORK LAST)
+ endif()
+ 
+ # Older OS X linkers do not report their framework search path
+@@ -132,6 +132,8 @@ endif()
+ 
+ # set up the default search directories for frameworks
+ set(CMAKE_SYSTEM_FRAMEWORK_PATH
++  @GENTOO_PORTAGE_EPREFIX@Frameworks
++  @GENTOO_PORTAGE_EPREFIX@usr/lib
+   ~/Library/Frameworks
+   )
+ if(_CMAKE_OSX_SYSROOT_PATH)
+@@ -178,13 +180,15 @@ if(CMAKE_OSX_SYSROOT)
+   endif()
+ endif()
+ 
+-# default to searching for application bundles first
++# default to searching for application bundles last
+ if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
+-  set(CMAKE_FIND_APPBUNDLE FIRST)
++  set(CMAKE_FIND_APPBUNDLE LAST)
+ endif()
+ # set up the default search directories for application bundles
+ set(_apps_paths)
+ foreach(_path
++  @GENTOO_PORTAGE_EPREFIX@Applications
++  @GENTOO_PORTAGE_EPREFIX@usr/bin
+   "~/Applications"
+   "/Applications"
+   "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
+Index: cmake-3.13.3/Modules/Platform/UnixPaths.cmake
+===
+--- cmake-3.13.3.orig/Modules/Platform/UnixPaths.cmake
 cmake-3.13.3/Modules/Platform/UnixPaths.cmake
+@@ -23,7 +23,8 @@ get_filename_component(_CMAKE_INSTALL_DI
+ # search types.
+ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+   # Standard
+-  /usr/local /usr /
++  @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr 

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2018-07-19 Thread Lars Wendler
commit: d887fb4bc7efa2a3d4ad58f8a153ade5bc40b8d1
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Jul 19 09:30:07 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Jul 19 09:33:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d887fb4b

dev-util/cmake: Bump to version 3.12.0. Removed old.

Added boost detection fix patch.

Bug: https://bugs.gentoo.org/660980
Package-Manager: Portage-2.3.43, Repoman-2.3.10

 dev-util/cmake/Manifest |  2 +-
 .../cmake/{cmake-3.12.0_rc3.ebuild => cmake-3.12.0.ebuild}  |  7 +--
 dev-util/cmake/files/cmake-3.11.4-fix-boost-detection.patch | 13 +
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 1a8d358e96b..6320b7542e8 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,5 +1,5 @@
 DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 
1db8c21abdcfac2612fa914d49f9edcf199240b714104dba1d470c8e1e487d8e6cc5d486febae88d4a71eb9419064bcf94f9bb2c779771323221c1f117baa693
 SHA512 
1ba6381321cb34c3c050548a1346d3b92d590a196d8aff7435c079cd485d01f7a6cd650ad97d00931aff424fcdc195bbaa6d9d7db679bf02f72f586c7b528ae4
 DIST cmake-3.11.3.tar.gz 7954155 BLAKE2B 
949ee8c3dfae9d15eecdcd5c2a35fc278e84d1215858714112aea13aa5772f925a2a1b89bd39360e62b8638166038899e80ab48b6917e2c046876283d15d0218
 SHA512 
a91301bfb51bdf6a6c6ea71a26f05b6017eb375a4fc9c14934a83f2231d7af758bc67d8d9656111d1de56ec3df41dbcd61cb3cf50471bc0901f5bcccdf5267dc
 DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 
2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925
 SHA512 
c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
-DIST cmake-3.12.0-rc3.tar.gz 8089991 BLAKE2B 
306faa1f3ef03fe4e9c35f9f131ad0de9c47cae12fa918647fb52dd3a9b80346b199ce0cb432beb5a79c1789214a0573c4bd6a0a7844c5797c82635c087a2586
 SHA512 
ef106fd3afaa118bca4d0cd62e348d02eafa17ba0ac04360572123e1e4e65c8ba7a83e0be0e56c8b600b693f4f0dd9aaa8a1ce9311a58fe65f10a2a599895591
+DIST cmake-3.12.0.tar.gz 8089372 BLAKE2B 
73c36b65ce3a3e7377d4c7dc7ec6c9050adefab75a0c0f245d7b1f774951779a213de13fb8589f209bd9b74b912b3f6533fff7b16990a85ec0159ed6a1460a2b
 SHA512 
e1d5764023d6c8dd4e8d087614e0329a097f1bc587c08c7d22ce7600867bcd7f6750d513458c7c4042570a9526060b89778243e6ea6137efb1727e409ca031ab
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B 
e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43
 SHA512 
9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c

diff --git a/dev-util/cmake/cmake-3.12.0_rc3.ebuild 
b/dev-util/cmake/cmake-3.12.0.ebuild
similarity index 96%
rename from dev-util/cmake/cmake-3.12.0_rc3.ebuild
rename to dev-util/cmake/cmake-3.12.0.ebuild
index 050883851f5..08668397d3f 100644
--- a/dev-util/cmake/cmake-3.12.0_rc3.ebuild
+++ b/dev-util/cmake/cmake-3.12.0.ebuild
@@ -5,13 +5,13 @@ EAPI=6
 
 CMAKE_MAKEFILE_GENERATOR="emake"
 CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils 
toolchain-funcs versionator virtualx xdg-utils cmake-utils
+inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils 
toolchain-funcs eapi7-ver virtualx xdg-utils cmake-utils
 
 MY_P="${P/_/-}"
 
 DESCRIPTION="Cross platform Make"
 HOMEPAGE="https://cmake.org/;
-SRC_URI="https://cmake.org/files/v$(get_version_component_range 
1-2)/${MY_P}.tar.gz"
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 
 LICENSE="CMake"
 SLOT="0"
@@ -59,6 +59,9 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
 
+   # boost (#660980)
+   "${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch
+
# upstream fixes (can usually be removed with a version bump)
 )
 

diff --git a/dev-util/cmake/files/cmake-3.11.4-fix-boost-detection.patch 
b/dev-util/cmake/files/cmake-3.11.4-fix-boost-detection.patch
new file mode 100644
index 000..bcf229ad398
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.11.4-fix-boost-detection.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/660980
+
+--- cmake-3.11.4/Modules/FindBoost.cmake
 cmake-3.11.4/Modules/FindBoost.cmake
+@@ -1680,7 +1680,7 @@
+ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME 
"${COMPONENT_UNVERSIONED}${COMPONENT_PYTHON_VERSION_MAJOR}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
+ list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME 
"${COMPONENT_UNVERSIONED}-py${COMPONENT_PYTHON_VERSION_MAJOR}${COMPONENT_PYTHON_VERSION_MINOR}")
+ # Gentoo
+-list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT_NAME 

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2018-03-15 Thread Lars Wendler
commit: de922666c58be43baadc3e054a3f6192734a0bae
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Mar 15 13:50:42 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Mar 15 13:50:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de922666

dev-util/cmake: Removed old.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-util/cmake/Manifest|   1 -
 dev-util/cmake/cmake-3.8.2.ebuild  | 204 -
 .../files/cmake-2.8.12.1-FindImageMagick.patch |  23 ---
 dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch | 142 --
 .../cmake/files/cmake-3.1.0-FindPythonInterp.patch |  29 ---
 5 files changed, 399 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 3b0ba8919f1..cd940733b17 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,4 +1,3 @@
 DIST cmake-3.10.2.tar.gz 7824452 BLAKE2B 
cc579f27d7d5668d1f375e7263e0b62212be1191735189d34b1f0aa921861ead5d3872388eebbb5136a72e3dec3920f1ebfb0bf45b642cf92eef02e4c8665d49
 SHA512 
f58fdd025285c9ff5396c0bd0d9573fc8a498fcbe5c11b336cb8ad6154ca6bc875c1a5e22d6654ba98596791ecf89ae8adffb83450839fa1275756b0af5bf82b
 DIST cmake-3.11.0-rc3.tar.gz 7947100 BLAKE2B 
e68b44e574e9033dcd9e3bd82f10047f10a228ebeea18a8220d5fbf14c0a36417fd92787eb442b49eb056ba14c7a402f895b99338ef0c20afb66c0602386953f
 SHA512 
6678b2ec8f574b198e8b056292b2bea8996703ed5e22060c737fa5a4c43f48c1ef961e9e128add5960fdc4a4f616c4dc90102a981e63296e0deca2fc0750b936
-DIST cmake-3.8.2.tar.gz 7504706 BLAKE2B 
a2ba30370a41dabcba40a967aa58eb7a4ed4151371394eff436866b09fd040b5483d2dcc2dc588a75288a65aff979806d15016a5395db2b25db844b9e942cac1
 SHA512 
49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B 
e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43
 SHA512 
9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c

diff --git a/dev-util/cmake/cmake-3.8.2.ebuild 
b/dev-util/cmake/cmake-3.8.2.ebuild
deleted file mode 100644
index 6e3fe9a84c8..000
--- a/dev-util/cmake/cmake-3.8.2.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator 
cmake-utils virtualx flag-o-matic
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/;
-SRC_URI="https://cmake.org/files/v$(get_version_component_range 
1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs server system-jsoncpp ncurses qt5"
-
-RDEPEND="
-   app-crypt/rhash
-   >=app-arch/libarchive-3.0.0:=
-   >=dev-libs/expat-2.0.1
-   >=net-misc/curl-7.21.5[ssl]
-   sys-libs/zlib
-   virtual/pkgconfig
-   emacs? ( virtual/emacs )
-   ncurses? ( sys-libs/ncurses:0= )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   server? ( >=dev-libs/libuv-1.0.0:= )
-   system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-   doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-   # prefix
-   "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-   "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
-   "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-   # handle gentoo packaging in find modules
-   "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
-   "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
-   "${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
-   "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-   "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-   # respect python eclasses
-   "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-   "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
-
-   # upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-   # Cleanup args to extract only JOBS.
-   # Because bootstrap does not know anything else.
-   echo ${MAKEOPTS} | egrep -o 
'(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-   if [ $? -eq 0 ]; then
-   par_arg=$(echo ${MAKEOPTS} | egrep -o 
'(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o 
'[[:digit:]]+')
-   par_arg="--parallel=${par_arg}"
-   else
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2018-02-19 Thread Lars Wendler
commit: 00aa8c86613ba316ca16b3b353362a1a15c8a338
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Feb 19 13:07:51 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Feb 19 13:08:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00aa8c86

dev-util/cmake: Bump to version 3.11.0_rc1

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-util/cmake/Manifest|   1 +
 dev-util/cmake/cmake-3.11.0_rc1.ebuild | 214 +
 .../cmake-3.11.0_rc1-add_missing_pthread.patch |  21 ++
 3 files changed, 236 insertions(+)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 36887597435..c5f9a23473b 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,4 +1,5 @@
 DIST cmake-3.10.1.tar.gz 7824043 BLAKE2B 
004149841b128288845c2a3987b38e6d90b3dcc5ccb2002bc2915f9d8f30496ebf43d9a70fa6e26c7b64c0f41d85c753bd1bac8c1b5d7148b1d592dc98de189a
 SHA512 
14e9a7f01747b369cad3c4e4e83bc777c0c98ce69209456f60d086d2471302f66dc1c1d22fd04e11dcb64de4bfc7dacd9aca70ee0e5f006abd1df79ef642eeed
 DIST cmake-3.10.2.tar.gz 7824452 BLAKE2B 
cc579f27d7d5668d1f375e7263e0b62212be1191735189d34b1f0aa921861ead5d3872388eebbb5136a72e3dec3920f1ebfb0bf45b642cf92eef02e4c8665d49
 SHA512 
f58fdd025285c9ff5396c0bd0d9573fc8a498fcbe5c11b336cb8ad6154ca6bc875c1a5e22d6654ba98596791ecf89ae8adffb83450839fa1275756b0af5bf82b
+DIST cmake-3.11.0-rc1.tar.gz 7945667 BLAKE2B 
d2f36d20105eda2eddadcc0cc93d3de081fa7e41dfe3c9ecbc1d15ef658cd713894abdb300e34f5055ea37848339c0f1bce5952654fdd2525ed7a0405d7fb825
 SHA512 
0baa40a04184c33a04735e70ff782c76d0453baa00087480640c6e28c1461032b96bd3a3fa07bedc2855eea83349ef50ee2652ec810ad3314b86e80df8df62fb
 DIST cmake-3.8.2.tar.gz 7504706 BLAKE2B 
a2ba30370a41dabcba40a967aa58eb7a4ed4151371394eff436866b09fd040b5483d2dcc2dc588a75288a65aff979806d15016a5395db2b25db844b9e942cac1
 SHA512 
49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B 
e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43
 SHA512 
9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c

diff --git a/dev-util/cmake/cmake-3.11.0_rc1.ebuild 
b/dev-util/cmake/cmake-3.11.0_rc1.ebuild
new file mode 100644
index 000..a1fdde41672
--- /dev/null
+++ b/dev-util/cmake/cmake-3.11.0_rc1.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils 
toolchain-funcs versionator virtualx xdg-utils cmake-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/;
+SRC_URI="https://cmake.org/files/v$(get_version_component_range 
1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs server system-jsoncpp ncurses qt5"
+
+RDEPEND="
+   app-crypt/rhash
+   >=app-arch/libarchive-3.0.0:=
+   >=dev-libs/expat-2.0.1
+   >=dev-libs/libuv-1.0.0:=
+   >=net-misc/curl-7.21.5[ssl]
+   sys-libs/zlib
+   virtual/pkgconfig
+   emacs? ( virtual/emacs )
+   ncurses? ( sys-libs/ncurses:0= )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}
+   doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+   # prefix
+   "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+   "${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
+   "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+   # handle gentoo packaging in find modules
+   "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+   "${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
+   "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+   "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+   # respect python eclasses
+   "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+   "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+   "${FILESDIR}"/${PN}-3.11.0_rc1-add_missing_pthread.patch
+
+   # upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+   # Cleanup args to extract only JOBS.
+   # Because bootstrap does not know anything else.
+   echo ${MAKEOPTS} | egrep -o 
'(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+   if [ 

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2017-06-08 Thread Lars Wendler
commit: f7a1fccc75c12fb6da505e4179dbcc22c2d7f8d7
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jun  9 00:44:23 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jun  9 01:18:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a1fccc

dev-util/cmake: Bump to version 3.9.0_rc2

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-util/cmake/Manifest|   1 +
 dev-util/cmake/cmake-3.9.0_rc2.ebuild  | 201 +
 .../files/cmake-3.9.0_rc2-FindImageMagick.patch|  47 +
 .../files/cmake-3.9.0_rc2-FindPythonInterp.patch   |  43 +
 .../cmake/files/cmake-3.9.0_rc2-prefix-dirs.patch  | 126 +
 5 files changed, 418 insertions(+)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index c769d18a29f..94917802670 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -2,3 +2,4 @@ DIST cmake-3.7.2-x32.patch.xz 7204 SHA256 
d04cc6dc7ffbb8e16426e85f50e3f3c3037fb4
 DIST cmake-3.7.2.tar.gz 7361593 SHA256 
dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 SHA512 
b2ed0192e12267de19eb178c2dedc69d06fc33dfadd47efbe0ccf6969ad72d290fa4bff02861c379a8752337d67d2485d7e1ba947cb219f2e4041a53a195e88d
 WHIRLPOOL 
1861fe2887f4483856e1964ff1492e196624d3072ad1e21910fba29d0c0d654e7d5035571648386a77cd6cbe895f8cdfbb1f4cc1ad60d14015a01a22494456f7
 DIST cmake-3.8.1.tar.gz 7503955 SHA256 
ce5d9161396e06501b00e52933783150a87c33080d4bdcef461b5b7fd24ac228 SHA512 
2164f502900a803928f2df3168fb5094de05392fd62d30c55d08de89bdd4ba7323255e724cbca260202edf1691bd5c6be63c585f75ff9d36bd0d35b816c2fde0
 WHIRLPOOL 
6ef8f4bcd5186e6efb3aa95a6f09ab686ee21adbe049d74c75e6c2a60ecf2d61328a06b14e4a15eb421bd495dfee128c30a50c299c8681640e1deff546e9309c
 DIST cmake-3.8.2.tar.gz 7504706 SHA256 
da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d SHA512 
49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f
 WHIRLPOOL 
8768bffb365852414eda0349d71e59517c8047689303d7873a5889cb8b28c72cd636982a18b039f26daae33023f7e0ad91c3a9ab2d30c30e4b3a9b3cc525b78e
+DIST cmake-3.9.0-rc2.tar.gz 7672429 SHA256 
f6f62c4ac62b2310718d03ccb21bd9526c9aa841eaac02c056fc37d9d772f055 SHA512 
bc069830b7dbbddb9d046319f586494a9825e5926b69141778f16f24b135a51d2e4ecd7a5ef613cbd79105251f251970dc16063177517a398c5b199142dd6943
 WHIRLPOOL 
732d8fb82a03e3b5aa23dc74b8ef8885d4904d986dec8134d976216b377fa8f075b85fc6fe49bb7598b75e8683cde3eacef6aa258376ee5a9ec03fdb1b32ea27

diff --git a/dev-util/cmake/cmake-3.9.0_rc2.ebuild 
b/dev-util/cmake/cmake-3.9.0_rc2.ebuild
new file mode 100644
index 000..2f18f973e4b
--- /dev/null
+++ b/dev-util/cmake/cmake-3.9.0_rc2.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator 
cmake-utils virtualx flag-o-matic
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/;
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 
1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc64 ~s390 ~sh ~x86 
~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs server system-jsoncpp ncurses qt5"
+
+RDEPEND="
+   app-crypt/rhash
+   >=app-arch/libarchive-3.0.0:=
+   >=dev-libs/expat-2.0.1
+   >=net-misc/curl-7.21.5[ssl]
+   sys-libs/zlib
+   virtual/pkgconfig
+   emacs? ( virtual/emacs )
+   ncurses? ( sys-libs/ncurses:0= )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   server? ( >=dev-libs/libuv-1.0.0:= )
+   system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}
+   doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+   # prefix
+   "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+   "${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
+   "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+   # handle gentoo packaging in find modules
+   "${FILESDIR}"/${PN}-3.9.0_rc2-FindImageMagick.patch
+   "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+   "${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
+   "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+   "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+   # respect python eclasses
+   "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+   "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+   # upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+   # Cleanup args to extract only JOBS.
+   # 

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2017-03-23 Thread Lars Wendler
commit: c61eff3f68a45d5b25653c8022f97634fab20f36
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Mar 23 12:01:05 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Mar 23 12:20:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c61eff3f

dev-util/cmake: Attempt to fix FindBoost-python patch (bug #613442).

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 ...make-3.7.2-r10.ebuild => cmake-3.7.2-r1.ebuild} |  8 +-
 dev-util/cmake/cmake-3.7.2-r10.ebuild  |  2 +-
 ...-3.8.0_rc2.ebuild => cmake-3.8.0_rc2-r1.ebuild} |  2 +-
 .../files/cmake-3.8.0_rc2-FindBoost-python.patch   | 95 ++
 4 files changed, 99 insertions(+), 8 deletions(-)

diff --git a/dev-util/cmake/cmake-3.7.2-r10.ebuild 
b/dev-util/cmake/cmake-3.7.2-r1.ebuild
similarity index 96%
copy from dev-util/cmake/cmake-3.7.2-r10.ebuild
copy to dev-util/cmake/cmake-3.7.2-r1.ebuild
index d706bdb8a29..f2c467a0459 100644
--- a/dev-util/cmake/cmake-3.7.2-r10.ebuild
+++ b/dev-util/cmake/cmake-3.7.2-r1.ebuild
@@ -10,8 +10,7 @@ MY_P="${P/_/-}"
 
 DESCRIPTION="Cross platform Make"
 HOMEPAGE="http://www.cmake.org/;
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 
1-2)/${MY_P}.tar.gz
-https://dev.gentoo.org/~kensington/distfiles/${PN}-3.7.2-x32.patch.xz;
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 
1-2)/${MY_P}.tar.gz"
 
 LICENSE="CMake"
 SLOT="0"
@@ -52,7 +51,7 @@ PATCHES=(
# handle gentoo packaging in find modules
"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
-   "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
+   "${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
 
@@ -61,9 +60,6 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
 
# upstream fixes (can usually be removed with a version bump)
-
-   # testing 3.9 backports - bug #426936
-   "${WORKDIR}"/${PN}-3.7.2-x32.patch
 )
 
 cmake_src_bootstrap() {

diff --git a/dev-util/cmake/cmake-3.7.2-r10.ebuild 
b/dev-util/cmake/cmake-3.7.2-r10.ebuild
index d706bdb8a29..e2f29fb2645 100644
--- a/dev-util/cmake/cmake-3.7.2-r10.ebuild
+++ b/dev-util/cmake/cmake-3.7.2-r10.ebuild
@@ -52,7 +52,7 @@ PATCHES=(
# handle gentoo packaging in find modules
"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
-   "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
+   "${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
 

diff --git a/dev-util/cmake/cmake-3.8.0_rc2.ebuild 
b/dev-util/cmake/cmake-3.8.0_rc2-r1.ebuild
similarity index 99%
rename from dev-util/cmake/cmake-3.8.0_rc2.ebuild
rename to dev-util/cmake/cmake-3.8.0_rc2-r1.ebuild
index 60d04535120..b5e7affd517 100644
--- a/dev-util/cmake/cmake-3.8.0_rc2.ebuild
+++ b/dev-util/cmake/cmake-3.8.0_rc2-r1.ebuild
@@ -52,7 +52,7 @@ PATCHES=(
# handle gentoo packaging in find modules
"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
-   "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
+   "${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
 

diff --git a/dev-util/cmake/files/cmake-3.8.0_rc2-FindBoost-python.patch 
b/dev-util/cmake/files/cmake-3.8.0_rc2-FindBoost-python.patch
new file mode 100644
index 000..441650b72a2
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.8.0_rc2-FindBoost-python.patch
@@ -0,0 +1,95 @@
+From 7d3a5c466bf14a0c12edc6ece359012b723e39bc Mon Sep 17 00:00:00 2001
+From: Michael Palimaka 
+Date: Thu, 23 Mar 2017 11:36:39 +0100
+Subject: [PATCH] Fix detection of PYTHON_ABI-versioned Boost Python libraries
+
+Gentoo-bug: 400969
+Gentoo-bug: 613442
+---
+ Modules/FindBoost.cmake | 42 ++
+ 1 file changed, 42 insertions(+)
+
+diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
+index e795aadcc..11269c30b 100644
+--- a/Modules/FindBoost.cmake
 b/Modules/FindBoost.cmake
+@@ -1481,6 +1481,16 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
+   set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
+   set( _boost_docstring_debug   "Boost ${COMPONENT} library (debug)")
+ 
++  if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
++# If a certain version of python has already been selected ensure we 
select the corresponding boost python version.
++if(PYTHON_EXECUTABLE)
++  set(GENTOO_PYTHON_EXECUTABLE "${PYTHON_EXECUTABLE}")
++else()
++  set(GENTOO_PYTHON_EXECUTABLE "python")
++endif()
++execute_process(COMMAND "${GENTOO_PYTHON_EXECUTABLE}" -c "import sys; 

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2017-03-17 Thread Michael Palimaka
commit: 09b2d26e4cca8f790682aa0162d49f535d32c7ef
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Mar 18 02:52:23 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Mar 18 02:54:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09b2d26e

dev-util/cmake: remove 3.6.3

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 dev-util/cmake/Manifest|   1 -
 dev-util/cmake/cmake-3.6.3.ebuild  | 195 -
 .../files/cmake-3.6.1-find_library-lib32.patch | 476 -
 3 files changed, 672 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 04af972112a..54583c4443c 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,4 +1,3 @@
-DIST cmake-3.6.3.tar.gz 6919949 SHA256 
7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe SHA512 
bfcb51bc01f64a6ae5fb9401c037a529e4b2c0216eef68cf862a7495560dfc80589b34af94450baf4561d217dfb8075b14fbf63e3a668943a65e36ea61c5df48
 WHIRLPOOL 
ecf79bb1a4b18df07d15ed5cdeb513420a0b8d46f90154dbdf9a78d3294e202ade040e832f3479fca0889c4af3b3b50e0d9391120191bae390927888e6487b4a
 DIST cmake-3.7.2-x32.patch.xz 7204 SHA256 
d04cc6dc7ffbb8e16426e85f50e3f3c3037fb42a0e746d0604a412a00d31444e SHA512 
36140132ecbe05d07b167e2895c2909ed545371af0962cb8246beb61a400fad14f56394c90cc2319e4581d5e97116069bebe466b87451a9a83f04095ce9b0510
 WHIRLPOOL 
07f49188fc6d7f6eb005f8e82526c33401b7ee8ff7839c4620280774650f9be9af9aafefb6a1f9ff2648316123aa1232b53924ef9dda3ce2268f01560d53606a
 DIST cmake-3.7.2.tar.gz 7361593 SHA256 
dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 SHA512 
b2ed0192e12267de19eb178c2dedc69d06fc33dfadd47efbe0ccf6969ad72d290fa4bff02861c379a8752337d67d2485d7e1ba947cb219f2e4041a53a195e88d
 WHIRLPOOL 
1861fe2887f4483856e1964ff1492e196624d3072ad1e21910fba29d0c0d654e7d5035571648386a77cd6cbe895f8cdfbb1f4cc1ad60d14015a01a22494456f7
 DIST cmake-3.8.0-rc2.tar.gz 7504498 SHA256 
f6302ec906eeddd9d5bc1bb4cfc06ffeb49fe9f6cf7d25d64a3acfa05a577b9a SHA512 
4ca4ea7f941e3fa9c80614e9873044425b9b5970e94885deace6750d3e0eb19c4e6b82c6d82e3c666971e523311584814e95d0787c978238b17b3d8138aaa3ee
 WHIRLPOOL 
d9446a1162477b5a575671c682af28069208dd6c516aaa1ef7daf62cb72862a8ec6012c0b40b72eebcbd1b9d3664ea830d63dfd585e2a4391cd703d3cb9c3e88

diff --git a/dev-util/cmake/cmake-3.6.3.ebuild 
b/dev-util/cmake/cmake-3.6.3.ebuild
deleted file mode 100644
index 4bd1a8e867d..000
--- a/dev-util/cmake/cmake-3.6.3.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator 
cmake-utils virtualx
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/;
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 
1-2)/${MY_P}.tar.gz"
-
-LICENSE="CMake"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-
-RDEPEND="
-   >=app-arch/libarchive-3.0.0:=
-   >=dev-libs/expat-2.0.1
-   >=net-misc/curl-7.21.5[ssl]
-   sys-libs/zlib
-   virtual/pkgconfig
-   emacs? ( virtual/emacs )
-   ncurses? ( sys-libs/ncurses:0= )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-   doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-   # prefix
-   "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-   "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
-   "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-   # handle gentoo packaging in find modules
-   "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
-   "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
-   "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
-   "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-   "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-   # respect python eclasses
-   "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-   "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
-
-   # upstream fixes (can usually be removed with a version bump)
-   "${FILESDIR}"/${PN}-3.6.1-find_library-lib32.patch
-)
-
-cmake_src_bootstrap() {
-   # Cleanup args to extract only JOBS.
-   # Because bootstrap does not know anything else.
-   echo ${MAKEOPTS} | egrep -o 
'(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
-   if [ $? -eq 0 ]; then
-   par_arg=$(echo ${MAKEOPTS} | egrep -o 
'(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep 

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2017-01-01 Thread Johannes Huber
commit: 359f04ac6d228e77f725a04ec3a1706ee94e7e7e
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Jan  1 15:51:05 2017 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Jan  1 16:32:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=359f04ac

dev-util/cmake: Remove 3.3.1 (r1)

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-util/cmake/Manifest|   2 -
 dev-util/cmake/cmake-3.3.1-r1.ebuild   | 195 -
 .../cmake/files/cmake-2.8.10-darwin-bundle.patch   |  23 ---
 3 files changed, 220 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 3abe160..4db2d57 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,5 +1,3 @@
-DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 
22e6672bd9356a98a0eaf667e66d926f52c4e80e53e38cb8e5cd489993e5668f SHA512 
306cf4498cbad9f9c49a63c1870e04f33b5a91032508654a691fe116ec4821da98e9a1e35b6cb186bf9367ebdd9c42ac919e6fc44d2ba6938ad3bc1131b80655
 WHIRLPOOL 
1d30dd99ea6dc085f64c1b02ab0708f0c033e8d98f69ca431016da17eecc29f01489e5e253446bd542a4a9b770bcaee7b7a7bfa71e7520e7900094a9350c7f8f
-DIST cmake-3.3.1.tar.gz 6577869 SHA256 
cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 
bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faf0672b4578180de21b33f1
 WHIRLPOOL 
631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b
 DIST cmake-3.5.2.tar.gz 6863498 SHA256 
92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a SHA512 
7b08eb9f1b37993553f89c03eceedc465dc52b787dec99b78c74ebff2817d0aac9764e82ad835e8fc39f61cd2d2c0a3544d3f5ae299234ed52e9a940edf30b81
 WHIRLPOOL 
c255825aa024ba9feb51540ed2a36cfa73c6397356d18c5ff8f49258a4c30906c8ed5d7553e7d56f3c373418697f056f218f30aa409debab2303b0f9fa84
 DIST cmake-3.6.3.tar.gz 6919949 SHA256 
7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe SHA512 
bfcb51bc01f64a6ae5fb9401c037a529e4b2c0216eef68cf862a7495560dfc80589b34af94450baf4561d217dfb8075b14fbf63e3a668943a65e36ea61c5df48
 WHIRLPOOL 
ecf79bb1a4b18df07d15ed5cdeb513420a0b8d46f90154dbdf9a78d3294e202ade040e832f3479fca0889c4af3b3b50e0d9391120191bae390927888e6487b4a
 DIST cmake-3.7.1.tar.gz 7361172 SHA256 
449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1 SHA512 
0539d70ce3ac77042a45d638443b09fbf368e253622db980bc6fb15988743eacd031ab850a45c821ec3e9f0f5f886b9c9cb0668aeda184cd457b78abbfe7b629
 WHIRLPOOL 
8b632b4a3f44a7b56952926ad43db45ecd9f26f434816fe29a52c89542edfc2dfea72f4ec814d4faaf990ee535ad80e6238ba2e6d9ffa2ff94cfccd665b1d930

diff --git a/dev-util/cmake/cmake-3.3.1-r1.ebuild 
b/dev-util/cmake/cmake-3.3.1-r1.ebuild
deleted file mode 100644
index e3aeb00..
--- a/dev-util/cmake/cmake-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator 
cmake-utils virtualx
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/;
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 
1-2)/${MY_P}.tar.gz
-   
http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=b9ec9392da21a3421e48c6961976060d872faffb
 -> ${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch"
-
-LICENSE="CMake"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix 
~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos 
~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-
-RDEPEND="
-   >=app-arch/libarchive-3.0.0:=
-   >=dev-libs/expat-2.0.1
-   >=net-misc/curl-7.20.0-r1[ssl]
-   sys-libs/zlib
-   virtual/pkgconfig
-   emacs? ( virtual/emacs )
-   ncurses? ( sys-libs/ncurses:0= )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-   system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
-   doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
-   # prefix
-   "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
-   "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
-   "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-   # handle gentoo packaging in find modules
-   "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
-   "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
-   "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
-   "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
-
-   # respect python eclasses
-   

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2016-11-30 Thread Michał Górny
commit: beaae227169e69fea254a848ce1313f4491f53b1
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Nov 27 12:30:35 2016 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Nov 30 09:42:07 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beaae227

dev-util/cmake: Support indicating Gentoo build via CMAKE_GENTOO_BUILD

Support indicating Gentoo package build using a new CMAKE_GENTOO_BUILD
CMake variable, as an alternative to relying on CMAKE_BUILD_TYPE being
equal to Gentoo. This makes it possible to reduce reliance on a custom
build type in the future.

 dev-util/cmake/{cmake-3.7.0.ebuild => cmake-3.7.0-r1.ebuild} | 0
 dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch | 2 +-
 dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch  | 4 ++--
 dev-util/cmake/files/cmake-3.5.2-FindQt4.patch   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-util/cmake/cmake-3.7.0.ebuild 
b/dev-util/cmake/cmake-3.7.0-r1.ebuild
similarity index 100%
rename from dev-util/cmake/cmake-3.7.0.ebuild
rename to dev-util/cmake/cmake-3.7.0-r1.ebuild

diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch 
b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
index 2a83ff7..5f9c266 100644
--- a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
+++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch
@@ -7,7 +7,7 @@ index bffa9fb..8fc90ee 100644
)
  
 +# Gentoo portage requires that you use exactly the given python version
-+if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
++if (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo)
 +execute_process(COMMAND python -c "import sys; 
sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
 +OUTPUT_VARIABLE _Gentoo_Python_VERSION)
 +list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" 
_Gentoo_Python_INDEX)

diff --git a/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch 
b/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch
index 3abb2e4..bb3ca95 100644
--- a/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch
+++ b/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch
@@ -5,7 +5,7 @@
  set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS} 
${_PYTHON1_VERSIONS})
  endif()
 +
-+if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
++if (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo)
 +set(_Python_NAMES python)
 +endif()
 +
@@ -17,7 +17,7 @@
  
  # Search for newest python version if python executable isn't found
 -if(NOT PYTHON_EXECUTABLE)
-+if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo)
++if(NOT PYTHON_EXECUTABLE AND NOT (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE 
STREQUAL Gentoo))
  foreach(_CURRENT_VERSION IN LISTS _Python_VERSIONS)
set(_Python_NAMES python${_CURRENT_VERSION})
if(WIN32)

diff --git a/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch 
b/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch
index 845fc6e..2f2764d 100644
--- a/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch
+++ b/dev-util/cmake/files/cmake-3.5.2-FindQt4.patch
@@ -23,7 +23,7 @@ Gentoo-bug: 547222
 -PATH_SUFFIXES bin
 -DOC "The qmake executable for the Qt installation to use"
 -  )
-+  if(CMAKE_BUILD_TYPE STREQUAL Gentoo)
++  if(CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo)
 +find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME}
 +  PATHS
 +$ENV{EPREFIX}/usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin



[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2016-05-21 Thread Michael Palimaka
commit: aeefe0ac126a66ccdbb482cd24a035ca486aa54d
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat May 21 18:36:23 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat May 21 18:36:50 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeefe0ac

dev-util/cmake: fix build of Qt4-based applications on prefix

Gentoo-bug: 582242

Package-Manager: portage-2.2.28

 dev-util/cmake/cmake-3.5.2-r1.ebuild   | 198 +
 dev-util/cmake/files/cmake-3.5.2-FindQt4.patch |  45 ++
 2 files changed, 243 insertions(+)

diff --git a/dev-util/cmake/cmake-3.5.2-r1.ebuild 
b/dev-util/cmake/cmake-3.5.2-r1.ebuild
new file mode 100644
index 000..315190d
--- /dev/null
+++ b/dev-util/cmake/cmake-3.5.2-r1.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator 
cmake-utils virtualx
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/;
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 
1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux 
~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
+
+RDEPEND="
+   >=app-arch/libarchive-3.0.0:=
+   >=dev-libs/expat-2.0.1
+   >=net-misc/curl-7.21.5[ssl]
+   sys-libs/zlib
+   virtual/pkgconfig
+   emacs? ( virtual/emacs )
+   ncurses? ( sys-libs/ncurses:0= )
+   qt4? (
+   dev-qt/qtcore:4
+   dev-qt/qtgui:4
+   )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}
+   doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+   # prefix
+   "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+   "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
+   "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+   # handle gentoo packaging in find modules
+   "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
+   "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+   "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
+   "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+   "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+   # respect python eclasses
+   "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+   "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
+
+   # upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+   # Cleanup args to extract only JOBS.
+   # Because bootstrap does not know anything else.
+   echo ${MAKEOPTS} | egrep -o 
'(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+   if [ $? -eq 0 ]; then
+   par_arg=$(echo ${MAKEOPTS} | egrep -o 
'(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o 
'[[:digit:]]+')
+   par_arg="--parallel=${par_arg}"
+   else
+   par_arg="--parallel=1"
+   fi
+
+   # execinfo.h on Solaris isn't quite what it is on Darwin
+   if [[ ${CHOST} == *-solaris* ]] ; then
+   sed -i -e 's/execinfo\.h/blablabla.h/' 
Source/kwsys/CMakeLists.txt || die
+   fi
+
+   tc-export CC CXX LD
+
+   # bootstrap script isn't exactly /bin/sh compatible
+   ${CONFIG_SHELL:-sh} ./bootstrap \
+   --prefix="${T}/cmakestrap/" \
+   ${par_arg} \
+   || die "Bootstrap failed"
+}
+
+cmake_src_test() {
+   # fix OutDir and SelectLibraryConfigurations tests
+   # these are altered thanks to our eclass
+   sed -i -e 's:#IGNORE ::g' \
+   
"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+   || die
+
+   pushd "${BUILD_DIR}" > /dev/null
+
+   local ctestargs
+   [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose 
--output-on-failure"
+
+   # Excluded tests:
+   #BootstrapTest: we actualy bootstrap it every time so why test it.
+   #BundleUtilities: bundle creation broken
+   #CTest.updatecvs: which fails to commit as root
+   #Fortran: requires fortran
+   #Qt4Deploy, which tries to break sandbox and ignores prefix
+   #TestUpload, which requires network access
+   "${BUILD_DIR}"/bin/ctest ${ctestargs} \
+   -E 
"(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
+   || die "Tests failed"
+
+   

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2015-11-13 Thread Lars Wendler
commit: 91aeb46594f879c61dcda03227ee2421a520642e
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Nov 13 12:42:20 2015 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Nov 13 12:42:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91aeb465

dev-util/cmake: Bump to version 3.4.0

Package-Manager: portage-2.2.24
Signed-off-by: Lars Wendler  gentoo.org>

 dev-util/cmake/Manifest|   1 +
 dev-util/cmake/cmake-3.4.0.ebuild  | 197 +
 .../files/cmake-3.4.0_rc1-darwin-bundle.patch  |  25 +++
 3 files changed, 223 insertions(+)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index c8f6ded..9220650 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -3,3 +3,4 @@ DIST cmake-3.2.2.tar.gz 6438736 SHA256 
ade94e6e36038774565f2aed8866415443444fb7a
 DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 
22e6672bd9356a98a0eaf667e66d926f52c4e80e53e38cb8e5cd489993e5668f SHA512 
306cf4498cbad9f9c49a63c1870e04f33b5a91032508654a691fe116ec4821da98e9a1e35b6cb186bf9367ebdd9c42ac919e6fc44d2ba6938ad3bc1131b80655
 WHIRLPOOL 
1d30dd99ea6dc085f64c1b02ab0708f0c033e8d98f69ca431016da17eecc29f01489e5e253446bd542a4a9b770bcaee7b7a7bfa71e7520e7900094a9350c7f8f
 DIST cmake-3.3.1.tar.gz 6577869 SHA256 
cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 
bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faf0672b4578180de21b33f1
 WHIRLPOOL 
631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b
 DIST cmake-3.3.2.tar.gz 6578184 SHA256 
e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22 SHA512 
01bc0e6ca52a6836ef57360fb38dd92a4575bfa37bfe9625645db77fefd0c170383cfb07b61c6283bde96738ce1a5e18cb7569e7e0b7c98d4b99e86305c50180
 WHIRLPOOL 
7951dc18d695ca4554b287f91becd8ecb05324e10f9e2c9e34427d26db0d664ee7ab8a226eabed87d93087e41635059f96b1aaea503480f46a555cf3baae3ce7
+DIST cmake-3.4.0.tar.gz 6719859 SHA256 
a5b82bf6ace6c481cdb911fd5d372a302740cbefd387e05297cb37f7468d1cea SHA512 
3600faa8475840e350954c8273829c1fb6dc63984860455b792b520e20a8fd9864c96d7afd6b42a6937624edf49b73c8807aa230a3ee9c24aa7aec136022bc90
 WHIRLPOOL 
c9553caa44e90fb84702f7f361f59f25793cc93b8e288209eea531b77ece47ff820c82210dd60a3f42ead1f1c2998f5368554655dd383af60457efbe842e6ee4

diff --git a/dev-util/cmake/cmake-3.4.0.ebuild 
b/dev-util/cmake/cmake-3.4.0.ebuild
new file mode 100644
index 000..be5bbe9
--- /dev/null
+++ b/dev-util/cmake/cmake-3.4.0.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator 
cmake-utils virtualx
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="http://www.cmake.org/;
+SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 
1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux 
~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
+
+RDEPEND="
+   >=app-arch/libarchive-3.0.0:=
+   >=dev-libs/expat-2.0.1
+   >=net-misc/curl-7.20.0-r1[ssl]
+   sys-libs/zlib
+   virtual/pkgconfig
+   emacs? ( virtual/emacs )
+   ncurses? ( sys-libs/ncurses:0= )
+   qt4? (
+   dev-qt/qtcore:4
+   dev-qt/qtgui:4
+   )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtwidgets:5
+   )
+   system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}
+   doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+PATCHES=(
+   # prefix
+   "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+   "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
+   "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+   # handle gentoo packaging in find modules
+   "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
+   "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+   "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
+   "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+
+   # respect python eclasses
+   "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+   "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
+
+   # upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+   # Cleanup args to extract only JOBS.
+   # Because bootstrap does not know anything else.
+   echo ${MAKEOPTS} | egrep -o 

[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/, dev-util/cmake/files/

2015-10-12 Thread Michael Palimaka
commit: 6e641803972a998ee47be9354b3f2632c7624878
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Oct 12 12:14:12 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Oct 12 13:04:41 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e641803

dev-util/cmake: remove old

Package-Manager: portage-2.2.20.1

 dev-util/cmake/Manifest|   3 -
 dev-util/cmake/cmake-2.8.12.2-r2.ebuild| 203 -
 dev-util/cmake/cmake-2.8.12.2.ebuild   | 200 
 dev-util/cmake/cmake-3.0.2.ebuild  | 187 ---
 dev-util/cmake/cmake-3.1.0.ebuild  | 186 ---
 dev-util/cmake/cmake-3.2.3-r1.ebuild   | 196 
 dev-util/cmake/cmake-3.2.3.ebuild  | 194 
 dev-util/cmake/cmake-3.3.2.ebuild  | 199 
 .../files/cmake-2.8.11-FindBoost-python.patch  |  73 
 dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch |  38 
 dev-util/cmake/files/cmake-2.8.12.2-python34.patch |  34 
 .../files/cmake-3.2.3-musl-missing-include.patch   |  28 ---
 12 files changed, 1541 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 816cc84..c8f6ded 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,8 +1,5 @@
 DIST cmake-2.8.12.2.tar.gz 6068231 SHA256 
8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e SHA512 
a0fe8f6305052ba7894a7d58aa30f97b4be1f52eb7de650273a704929a6fbe81c7cebfa6e68a18c9e7d62f7ed02c944f74c2974da9aacc70e2cb186e0a1be44d
 WHIRLPOOL 
3635651a59a93c661db4df8c248e35bfd8a9869eb74faa33fa6d56c12039ef7bb37756fd4c55fb107a9b7c38d2616dc43eb41acc0c565cfad4a24db99c361c29
-DIST cmake-3.0.2.tar.gz 5490501 SHA256 
6b4ea61eadbbd9bec0ccb383c29d1f4496eacc121ef7acf37c7a24777805693e SHA512 
de267bd6c5b318e48fae64c28947de009fb2413bdc6b4454b5e4bbb7d50b78aaef5d7e9d9655cfb9299aa5704fd3e4bbabc6816d3f378f76856f56ab161efe02
 WHIRLPOOL 
4c2aa1c72edb700689a8a91bfdfe22977e46a87851d66eb0e187e1e35a1a928be12b477fc39455b877d55420bcb149be6430d6835e01e20f61b84d8d83c752d6
-DIST cmake-3.1.0.tar.gz 5955836 SHA256 
8bdc3fa3f2da81bc10c772a6b64cc9052acc2901d42e1e1b2588b40df224aad9 SHA512 
9e3288c793c01e0ce48af91c618dc7638623010dfb440fb293393d407b7882c181c9a0f4e3b0a14645b556007e69264e94488e832a421b5cfa96338e0808b030
 WHIRLPOOL 
99df3f9052fee303d02ef9f27ee0ce22a1db57c0963dc7177837dea95a114da7b5d2ea8fd7155df1c7c513dbfb469bba2e638fc84fc1f1a9783fa49cd0e1a061
 DIST cmake-3.2.2.tar.gz 6438736 SHA256 
ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78 SHA512 
b7460733ebf81e6c0cade84c26407f474e1b0a7372d19ccadf928a8578a53043fd76c507b45a00762161aaf6938a59df6110a1eb11a7678bfbc984b020e5d68b
 WHIRLPOOL 
7debc5ac607578feee1c322416ac132ad4ba00a40410e03ee5cba52290f2f15904e7d0f2b77da37c9e8caa379b0530339fb2cc87246209f7999f10e44637f2d2
-DIST cmake-3.2.3.tar.gz 6438938 SHA256 
a1ebcaf6d288eb4c966714ea457e3b9677cdfde78820d0f088712d7320850297 SHA512 
1fddea23c8e28cd6893879bd3bb349564ece815eaa5c68c3519dd62f0baa05eabbfc38168458ab91594cb0feeefd2ea761b6d292b679f8b9aa33e08a0b9d5b4c
 WHIRLPOOL 
5268cc735cbd523a2027e479ab43499589b8653972a5bed7425c451a9b5ecc5d27c867cd218144a1eb6df2d3126301d7d494cafa7b1ac7455dbb40e66bad30c6
 DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 
22e6672bd9356a98a0eaf667e66d926f52c4e80e53e38cb8e5cd489993e5668f SHA512 
306cf4498cbad9f9c49a63c1870e04f33b5a91032508654a691fe116ec4821da98e9a1e35b6cb186bf9367ebdd9c42ac919e6fc44d2ba6938ad3bc1131b80655
 WHIRLPOOL 
1d30dd99ea6dc085f64c1b02ab0708f0c033e8d98f69ca431016da17eecc29f01489e5e253446bd542a4a9b770bcaee7b7a7bfa71e7520e7900094a9350c7f8f
 DIST cmake-3.3.1.tar.gz 6577869 SHA256 
cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 
bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faf0672b4578180de21b33f1
 WHIRLPOOL 
631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b
 DIST cmake-3.3.2.tar.gz 6578184 SHA256 
e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22 SHA512 
01bc0e6ca52a6836ef57360fb38dd92a4575bfa37bfe9625645db77fefd0c170383cfb07b61c6283bde96738ce1a5e18cb7569e7e0b7c98d4b99e86305c50180
 WHIRLPOOL 
7951dc18d695ca4554b287f91becd8ecb05324e10f9e2c9e34427d26db0d664ee7ab8a226eabed87d93087e41635059f96b1aaea503480f46a555cf3baae3ce7

diff --git a/dev-util/cmake/cmake-2.8.12.2-r2.ebuild 
b/dev-util/cmake/cmake-2.8.12.2-r2.ebuild
deleted file mode 100644
index 95b4f8f..000
--- a/dev-util/cmake/cmake-2.8.12.2-r2.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils