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

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

2023-09-11 Thread Sam James

commit: 6e764dd986e19eeb65e440de5b1b8734f5b3adc5
Author: Paul Zander  gmail  com>
AuthorDate: Sat Sep  9 12:15:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Sep 11 23:53:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e764dd9

dev-util/cmake: remove extra whitespaces from pkg-config call

Due to poor parsing cmake adds extra whitespaces to the package name and
package version, breaking pkgconf-2.0.3.

This fixes this incorrect behaviour.

Upstream merge request is at 
https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8789.

Closes: https://bugs.gentoo.org/913644
Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32700
Signed-off-by: Sam James  gentoo.org>

 dev-util/cmake/cmake-3.27.4-r1.ebuild  | 291 +
 ...ig-ignore-whitespace-separators-in-versio.patch |  38 +++
 2 files changed, 329 insertions(+)

diff --git a/dev-util/cmake/cmake-3.27.4-r1.ebuild 
b/dev-util/cmake/cmake-3.27.4-r1.ebuild
new file mode 100644
index ..f89c4e78a7d9
--- /dev/null
+++ b/dev-util/cmake/cmake-3.27.4-r1.ebuild
@@ -0,0 +1,291 @@
+# 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="${BROOT}"/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 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
+
+   BDEPEND="verify-sig? ( 
>=sec-keys/openpgp-keys-bradking-20230817 )"
+   fi
+fi
+
+[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
+
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="${CMAKE_DOCS_USEFLAG} dap emacs ncurses qt5 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=app-arch/libarchive-3.3.3:=
+   app-crypt/rhash: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
+   dap? ( dev-cpp/cppdap )
+   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] )
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+   # Prefix
+   
"${FILESDIR}"/${PN}-3.27.0_rc1-0001-Don-t-use-.so-for-modules-on-darwin-macos.-Use-.bund.patch
+   
"${FILESDIR}"/${PN}-3.27.0_rc1-0002-Set-some-proper-paths-to-make-cmake-find-our-tools.patch
+   # Misc
+   "${FILESDIR}"/${PN}-3.27.0_rc1-0003-Prefer-pkgconfig-in-FindBLAS.patch
+   
"${FILESDIR}"/${PN}-3.27.0_rc1-0004-Ensure-that-the-correct-version-of-Qt-is-always-used.patch
+   
"${FILESDIR}"/${PN}-3.27.0_rc1-0005-Respect-Gentoo-s-Python-eclasses.patch
+   
"${FILESDIR}"/${PN}-3.27.0_rc1-0006-Filter-out-distcc-warnings-to-avoid-confusing-CMake.patch
+   # pkgconf
+   # fixes https://github.co

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

2021-05-26 Thread Lars Wendler

commit: 2358d1d626fc0d6dbaf3ddab9932671498d27099
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed May 26 11:30:59 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed May 26 11:32:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2358d1d6

dev-util/cmake: Revbump to add boost-1.76 support

Bug: https://bugs.gentoo.org/791712
Signed-off-by: Lars Wendler  gentoo.org>

 ...{cmake-3.20.2.ebuild => cmake-3.20.2-r1.ebuild} |  1 +
 dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch | 46 ++
 2 files changed, 47 insertions(+)

diff --git a/dev-util/cmake/cmake-3.20.2.ebuild 
b/dev-util/cmake/cmake-3.20.2-r1.ebuild
similarity index 99%
rename from dev-util/cmake/cmake-3.20.2.ebuild
rename to dev-util/cmake/cmake-3.20.2-r1.ebuild
index 95de22ba838..627ca4f7a02 100644
--- a/dev-util/cmake/cmake-3.20.2.ebuild
+++ b/dev-util/cmake/cmake-3.20.2-r1.ebuild
@@ -71,6 +71,7 @@ PATCHES=(
 
# upstream fixes (can usually be removed with a version bump)
"${FILESDIR}"/${P}-sphinx-4.patch # bug 789375
+   "${FILESDIR}"/${P}-boost-1.76.patch # bug 791712
 )
 
 cmake_src_bootstrap() {

diff --git a/dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch 
b/dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch
new file mode 100644
index 000..898f8a75d7e
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.20.2-boost-1.76.patch
@@ -0,0 +1,46 @@
+From 79be37b94e7353ec056e6343ba293ce1b60627d4 Mon Sep 17 00:00:00 2001
+From: Brad King 
+Date: Fri, 7 May 2021 08:51:40 -0400
+Subject: [PATCH] FindBoost: Add support for Boost 1.76
+
+Update the list of known versions.
+
+Run the command
+
+cmake -DBOOST_DIR=/path/to/boost_1_76_0 \
+  -P Utilities/Scripts/BoostScanDeps.cmake
+
+to extract dependencies from the 1.76.0 source tree.
+They are the same as 1.75's dependencies, so just update
+the version check for warning about newer versions.
+
+Fixes: #22167
+---
+ Modules/FindBoost.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
+index f8887ad2be..d31f925cb6 100644
+--- a/Modules/FindBoost.cmake
 b/Modules/FindBoost.cmake
+@@ -1350,7 +1350,7 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
+   set(_Boost_TIMER_DEPENDENCIES chrono)
+   set(_Boost_WAVE_DEPENDENCIES filesystem serialization thread chrono 
date_time atomic)
+   set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
+-  if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.76.0 AND NOT 
Boost_NO_WARN_NEW_VERSIONS)
++  if(Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.77.0 AND NOT 
Boost_NO_WARN_NEW_VERSIONS)
+ message(WARNING "New Boost version may have incorrect or missing 
dependencies and imported targets")
+   endif()
+ endif()
+@@ -1622,7 +1622,7 @@ else()
+   # _Boost_COMPONENT_HEADERS.  See the instructions at the top of
+   # _Boost_COMPONENT_DEPENDENCIES.
+   set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
+-"1.75.0" "1.75" "1.74.0" "1.74"
++"1.76.0" "1.76" "1.75.0" "1.75" "1.74.0" "1.74"
+ "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" 
"1.69"
+ "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65"
+ "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" 
"1.60"
+-- 
+GitLab
+

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

2021-05-14 Thread Andreas Sturmlechner

commit: 6296367630f611bfbdcb389afd9e13141dcaa1d8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri May 14 18:17:10 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri May 14 18:22:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62963676

dev-util/cmake: Fix IUSE=doc with >=dev-python/sphinx-4.0.0

Closes: https://bugs.gentoo.org/789375
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/cmake/cmake-3.20.2.ebuild   |  1 +
 dev-util/cmake/files/cmake-3.20.2-sphinx-4.patch | 29 
 2 files changed, 30 insertions(+)

diff --git a/dev-util/cmake/cmake-3.20.2.ebuild 
b/dev-util/cmake/cmake-3.20.2.ebuild
index b1cc1455ac6..95de22ba838 100644
--- a/dev-util/cmake/cmake-3.20.2.ebuild
+++ b/dev-util/cmake/cmake-3.20.2.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
 
# upstream fixes (can usually be removed with a version bump)
+   "${FILESDIR}"/${P}-sphinx-4.patch # bug 789375
 )
 
 cmake_src_bootstrap() {

diff --git a/dev-util/cmake/files/cmake-3.20.2-sphinx-4.patch 
b/dev-util/cmake/files/cmake-3.20.2-sphinx-4.patch
new file mode 100644
index 000..dabe39e0b37
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.20.2-sphinx-4.patch
@@ -0,0 +1,29 @@
+From bb9c69ed7052614546d34d98a9cf1218e4a45bdc Mon Sep 17 00:00:00 2001
+From: Brad King 
+Date: Fri, 14 May 2021 10:26:11 -0400
+Subject: [PATCH] Utilities/Sphinx: Update man page config for Sphinx 4
+
+Sphinx 4 by default generates `man/#/foo.#`, but older versions generate
+`man/foo.#` as our install rules expect.  Update our Sphinx config file
+to tell Sphinx 4 to use the old layout.
+
+Fixes: #22192
+---
+ Utilities/Sphinx/conf.py.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in
+index 5def681dc4..c383828bd7 100644
+--- a/Utilities/Sphinx/conf.py.in
 b/Utilities/Sphinx/conf.py.in
+@@ -53,6 +53,7 @@ for fpath in cmake_manuals:
+ except Exception as e:
+ sys.stderr.write("ERROR: %s\n" % str(e))
+ man_show_urls = False
++man_make_section_directory = False
+ 
+ html_show_sourcelink = True
+ html_static_path = ['@conf_path@/static']
+-- 
+GitLab
+

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

2020-12-12 Thread Andreas Sturmlechner

commit: 814b6b0d056d858c629720ca1a97400688d2542f
Author: Adrian Grigo  yahoo  com  au>
AuthorDate: Tue Dec  8 03:19:22 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 12 17:58:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=814b6b0d

dev-util/cmake: Backport FPHSA fix

Changes to Find Package Handle Standard Args in 3.19.0 result in
an error when compiling openvdb-7.1.0.

This is a known problem in cmake and the fix has been merged into
3.19.2 upstream.

See https://gitlab.kitware.com/cmake/cmake/-/issues/21505

To produce the bug:
emerge dev-util/cmake-3.19.0 or 3.19.1 (the bug not exist in <= 3.18)
emerge media-gfx/openvdb-7.1.0-r1

Compilation fails with
find_package_check_version(): Cannot be used outside a 'Find Module'

To fix the bug:
Apply the patch provided in this bug fix to cmake, then repeat the
above steps and compilation of openvdb succeeds.

The patch ensures that the CMAKE_FPHSA_PACKAGE_NAME package is made
available outside find_package.

Thanks to Dennis Schridde for finding the upstream fix, produced by
Marc Chevrier.

* committer-comment: use Gentoo bug ref; git format-patch 14ecf9c2f

Signed-off-by: Adrian Grigo  yahoo.com.au>
Closes: https://bugs.gentoo.org/755743
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Closes: https://github.com/gentoo/gentoo/pull/18560
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-util/cmake/cmake-3.19.1-r1.ebuild  |  1 +
 ...ake-3.19.1-use-FPHSA-outside-find_package.patch | 40 ++
 2 files changed, 41 insertions(+)

diff --git a/dev-util/cmake/cmake-3.19.1-r1.ebuild 
b/dev-util/cmake/cmake-3.19.1-r1.ebuild
index 97f173f95a8..2726694149e 100644
--- a/dev-util/cmake/cmake-3.19.1-r1.ebuild
+++ b/dev-util/cmake/cmake-3.19.1-r1.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
 
# upstream fixes (can usually be removed with a version bump)
"${FILESDIR}"/${P}-fix-spurious-include-target.patch # bug 759271
+   "${FILESDIR}"/${P}-use-FPHSA-outside-find_package.patch # bug 755743
 )
 
 cmake_src_bootstrap() {

diff --git 
a/dev-util/cmake/files/cmake-3.19.1-use-FPHSA-outside-find_package.patch 
b/dev-util/cmake/files/cmake-3.19.1-use-FPHSA-outside-find_package.patch
new file mode 100644
index 000..8cde769ce8f
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.19.1-use-FPHSA-outside-find_package.patch
@@ -0,0 +1,40 @@
+From 14ecf9c2f6edfae4033d9311f79d79d0d07fc1cf Mon Sep 17 00:00:00 2001
+From: Marc Chevrier 
+Date: Wed, 25 Nov 2020 16:36:12 +0100
+Subject: [PATCH] FPHSA: ensure it can be used outside 'find_package'
+
+Fixes: #21505
+---
+ Modules/FindPackageHandleStandardArgs.cmake | 9 +++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/Modules/FindPackageHandleStandardArgs.cmake 
b/Modules/FindPackageHandleStandardArgs.cmake
+index 7af017136d..7e172779e4 100644
+--- a/Modules/FindPackageHandleStandardArgs.cmake
 b/Modules/FindPackageHandleStandardArgs.cmake
+@@ -275,8 +275,10 @@ function(FIND_PACKAGE_CHECK_VERSION version result)
+ unset (${FPCV_RESULT_MESSAGE_VARIABLE} PARENT_SCOPE)
+   endif()
+ 
+-  if (CMAKE_FIND_PACKAGE_NAME)
+-set (package ${CMAKE_FIND_PACKAGE_NAME})
++  if (_CMAKE_FPHSA_PACKAGE_NAME)
++set (package "${_CMAKE_FPHSA_PACKAGE_NAME}")
++  elseif (CMAKE_FIND_PACKAGE_NAME)
++set (package "${CMAKE_FIND_PACKAGE_NAME}")
+   else()
+ message (FATAL_ERROR "find_package_check_version(): Cannot be used 
outside a 'Find Module'")
+   endif()
+@@ -436,6 +438,9 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME 
_FIRST_ARG)
+   "will be used.")
+   endif()
+ 
++  # to propagate package name to FIND_PACKAGE_CHECK_VERSION
++  set(_CMAKE_FPHSA_PACKAGE_NAME "${_NAME}")
++
+   # now that we collected all arguments, process them
+ 
+   if("x${FPHSA_FAIL_MESSAGE}" STREQUAL "xDEFAULT_MSG")
+-- 
+GitLab
+

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

2020-11-28 Thread Fabian Groffen

commit: 88ae28941466e41fff5dbb2c2a8a35e7625a681c
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 28 15:22:11 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 28 15:22:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88ae2894

dev-util/cmake-3.19.1: fix compilation for Darwin GCC

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 dev-util/cmake/cmake-3.19.1.ebuild |  7 +--
 dev-util/cmake/files/cmake-3.19.1-darwin-gcc.patch | 14 ++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/dev-util/cmake/cmake-3.19.1.ebuild 
b/dev-util/cmake/cmake-3.19.1.ebuild
index 5dc94575a14..09d448bde37 100644
--- a/dev-util/cmake/cmake-3.19.1.ebuild
+++ b/dev-util/cmake/cmake-3.19.1.ebuild
@@ -54,8 +54,7 @@ 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
+   "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
 
# handle gentoo packaging in find modules
"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
@@ -134,6 +133,10 @@ src_prepare() {
if [[ ${CHOST} == *-darwin* ]] ; then
sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
Source/cmGlobalXCodeGenerator.cxx || die
+   # disable isysroot usage with GCC, we've properly instructed
+   # where things are via GCC configuration and ldwrapper
+   sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+   Modules/Platform/Apple-GNU-C{,XX}.cmake || die
fi
 
# Add gcc libs to the default link paths

diff --git a/dev-util/cmake/files/cmake-3.19.1-darwin-gcc.patch 
b/dev-util/cmake/files/cmake-3.19.1-darwin-gcc.patch
new file mode 100644
index 000..0f0a6b681bc
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.19.1-darwin-gcc.patch
@@ -0,0 +1,14 @@
+grob...@gentoo.org: fix compilation on macOS using GCC
+
+compiler says it all: include memory if you use unique_ptr
+
+--- a/Source/cmMachO.h.orig2020-11-24 14:50:26.0 +0100
 b/Source/cmMachO.h 2020-11-28 16:05:11.509620124 +0100
+@@ -6,6 +6,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ #if !defined(CMAKE_USE_MACH_PARSER)
+ #  error "This file may be included only if CMAKE_USE_MACH_PARSER is enabled."

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

2020-09-06 Thread Andreas Sturmlechner

commit: 756046b3193fbc055435914b252bed4eabf3c766
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep  5 16:10:47 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  6 16:45:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=756046b3

dev-util/cmake: Tolerate nullptr from uv_default_loop

See also: https://discourse.cmake.org/t/cmake-3-16-5-segmentation-violation/1316

Thanks-to:  gmail.com>
Bug: https://bugs.gentoo.org/726962
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...{cmake-3.17.4.ebuild => cmake-3.17.4-r1.ebuild} |  1 +
 .../cmake/files/cmake-3.17.4-uv-check-return.patch | 46 ++
 2 files changed, 47 insertions(+)

diff --git a/dev-util/cmake/cmake-3.17.4.ebuild 
b/dev-util/cmake/cmake-3.17.4-r1.ebuild
similarity index 99%
rename from dev-util/cmake/cmake-3.17.4.ebuild
rename to dev-util/cmake/cmake-3.17.4-r1.ebuild
index a65d699eeb8..3af2be355a2 100644
--- a/dev-util/cmake/cmake-3.17.4.ebuild
+++ b/dev-util/cmake/cmake-3.17.4-r1.ebuild
@@ -67,6 +67,7 @@ PATCHES=(
"${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() {

diff --git a/dev-util/cmake/files/cmake-3.17.4-uv-check-return.patch 
b/dev-util/cmake/files/cmake-3.17.4-uv-check-return.patch
new file mode 100644
index 000..ab4a45a3ec1
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.17.4-uv-check-return.patch
@@ -0,0 +1,46 @@
+From 0fddcc1e5bd8e4672b09e2478edb72e5c0338f1b Mon Sep 17 00:00:00 2001
+From: Brad King 
+Date: Wed, 1 Jul 2020 16:23:56 -0400
+Subject: [PATCH] cmake: Tolerate nullptr from uv_default_loop
+
+`uv_default_loop()` can return `nullptr` when running on a Linux kernel
+configured without `CONFIG_EVENTFD`.
+
+Fixes: #20899
+---
+ Source/cmSystemTools.cxx | 4 +++-
+ Source/cmakemain.cxx | 4 +++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
+index be799b0402..2f08b840cd 100644
+--- a/Source/cmSystemTools.cxx
 b/Source/cmSystemTools.cxx
+@@ -823,7 +823,9 @@ void cmSystemTools::InitializeLibUV()
+   // Perform libuv one-time initialization now, and then un-do its
+   // global _fmode setting so that using libuv does not change the
+   // default file text/binary mode.  See libuv issue 840.
+-  uv_loop_close(uv_default_loop());
++  if (uv_loop_t* loop = uv_default_loop()) {
++uv_loop_close(loop);
++  }
+ #  ifdef _MSC_VER
+   _set_fmode(_O_TEXT);
+ #  else
+diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
+index 75280fb8a5..e0c17f8d54 100644
+--- a/Source/cmakemain.cxx
 b/Source/cmakemain.cxx
+@@ -717,6 +717,8 @@ int main(int ac, char const* const* av)
+ #ifndef CMAKE_BOOTSTRAP
+   cmDynamicLoader::FlushCache();
+ #endif
+-  uv_loop_close(uv_default_loop());
++  if (uv_loop_t* loop = uv_default_loop()) {
++uv_loop_close(loop);
++  }
+   return ret;
+ }
+-- 
+GitLab
+

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

2019-11-19 Thread Lars Wendler

commit: 9d483abb28d8c4c794652234a48230e8691f896e
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Nov 19 12:42:40 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Nov 19 12:42:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d483abb

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

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

 dev-util/cmake/Manifest|  2 +-
 ...e-3.16.0_rc3.ebuild => cmake-3.16.0_rc4.ebuild} |  2 +-
 .../files/cmake-3.16.0_rc4-darwin-bundle.patch | 41 ++
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 2ae2af3874b..c07984d761f 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -3,4 +3,4 @@ DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 
257a9a89fe880f8945f47a4bb1980e66f0f28ee
 DIST cmake-3.14.7.tar.gz 8861587 BLAKE2B 
c1aa136fde8cd22592f15318a8ad7c37ef6e8895df3e097362077e8e1bf2125ba8f1a431a11ec40e7ab0d9e818452460f516aafac46cef4cc3b184bea12dbb09
 SHA512 
2f0e37cab2bde521452a30fffebf24429cea8a68c675f6970b0ea46dae5743fb80c0fe1d3ad174d226d968ac0760ecd33710232740a9b4b2f071df9e648cfec4
 DIST cmake-3.15.4.tar.gz 9270648 BLAKE2B 
b1c46ce76a549c78caa5c95be38fdbdcca685b1fade0a1687971d3b1cbb10953ec62b12401f67c389b096c87a6fa895ff339e1646e449472df76660b76e7d1ed
 SHA512 
4058b89d35d243146f4f521356d483a850cbade316b60cf896c90da5d6b6504bc35224c0702fa525d90fe97a5311c7a895466e5eb2edb4cd4306a3cc45182650
 DIST cmake-3.15.5.tar.gz 9271925 BLAKE2B 
9e30227600542edb4dc3dbafc1874db718816270d045fafe140037b8eb39e5d066d1ccd5b2f6c817babfa43a0e3ff7c5d58d243b97f616ec504cafc428872b67
 SHA512 
c71a50fe864772dbef16ef472c1ead88e8e322c8451bc395c454af9baa7c7eb6e1bd9abdca0745f979fbacf97f1e1ceaa84c0fcc412cf1e3bcd835aff32199b6
-DIST cmake-3.16.0-rc3.tar.gz 9102878 BLAKE2B 
af0a74ec617804c0a8680f0325274927dbcea5aa375223dccd3ce43f6b6c77ef0c456b89bb4f5e4e22e856f7dd9f3e1dead62d2b029749e2252e2a9898647283
 SHA512 
137faa9c4b90ec23b95660b12310f5a11374c461b9149fb93e5ce8ed319d453f10e12ff5a3c9df2cfc3408998bdeddf4ffb3d3b62702575a740ddd5b650905a4
+DIST cmake-3.16.0-rc4.tar.gz 9107275 BLAKE2B 
659210919781883e3c40f0b5ecb638a2c50b302f10a8dd3d2d79d850f1edcaf58387fde0e151f7f71a33e75dd8636e8bfa88751739f3e1c0a5c4f21c7d05f4f4
 SHA512 
833c2aec8d19b8402bff2c7790914d2be325c3ae334038d554435214b3f702b4501cc0942e1894b745261e4932dd74ade4a790ccd917bad83bbb2435b9395572

diff --git a/dev-util/cmake/cmake-3.16.0_rc3.ebuild 
b/dev-util/cmake/cmake-3.16.0_rc4.ebuild
similarity index 99%
rename from dev-util/cmake/cmake-3.16.0_rc3.ebuild
rename to dev-util/cmake/cmake-3.16.0_rc4.ebuild
index d9456163e0e..7380a3a30f8 100644
--- a/dev-util/cmake/cmake-3.16.0_rc3.ebuild
+++ b/dev-util/cmake/cmake-3.16.0_rc4.ebuild
@@ -51,7 +51,7 @@ SITEFILE="50${PN}-gentoo.el"
 
 PATCHES=(
# prefix
-   "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+   "${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

diff --git a/dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch 
b/dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch
new file mode 100644
index 000..5aac1be55da
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.16.0_rc4-darwin-bundle.patch
@@ -0,0 +1,41 @@
+From ce929588adf61ee24bb6850f4b9a58cc7ea224c7 Mon Sep 17 00:00:00 2001
+From: Lars Wendler 
+Date: Tue, 19 Nov 2019 12:28:53 +0100
+Subject: [PATCH] Don't use .so for modules on darwin/macos. Use .bundle
+ instead.
+
+Patch by Heiko Przybyl
+
+Forward-ported from 2.8.10 to 3.4.0-rc1
+Forward-ported from 3.4.0-rc1 to 3.16.0-rc4
+
+Signed-off-by: Lars Wendler 
+---
+ Modules/Platform/Darwin.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
+index 1482d76ae6..6a432963b6 100644
+--- a/Modules/Platform/Darwin.cmake
 b/Modules/Platform/Darwin.cmake
+@@ -43,7 +43,7 @@ endif()
+ set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
+ set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
+ set(CMAKE_SHARED_MODULE_PREFIX "lib")
+-set(CMAKE_SHARED_MODULE_SUFFIX ".so")
++set(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
+ set(CMAKE_MODULE_EXISTS 1)
+ set(CMAKE_DL_LIBS "")
+ 
+@@ -67,7 +67,7 @@ foreach(lang C CXX OBJC OBJCXX)
+ endforeach()
+ 
+ set(CMAKE_PLATFORM_HAS_INSTALLNAME 1)
+-set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".so" ".a")
++set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".bundle" ".a")
+ 
+ # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old 
build tree
+ # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL 
isn't in the cache
+-- 
+2.24.0
+

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

2019-06-22 Thread Lars Wendler

commit: 674ddc76cad685d358e7129404244beb9be75135
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Jun 22 14:48:48 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Jun 22 14:49:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=674ddc76

dev-util/cmake: Bump to version 3.15.0_rc2

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

 dev-util/cmake/Manifest|   1 +
 dev-util/cmake/cmake-3.15.0_rc2.ebuild | 224 +
 .../cmake/files/cmake-3.15.0_rc2-FindBLAS.patch|  37 
 3 files changed, 262 insertions(+)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index a0243d340bd..204d0c8adf4 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,2 +1,3 @@
 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-rc2.tar.gz 9253778 BLAKE2B 
141fa60dcf18cb2ea0d97eca88da61ffdf5e0551172ab01c87e2637dc543218f19edd156e0d288458d2797474523b34830d70d38daa759e7b15318ca86e4
 SHA512 
397232f6d9742df9fd11fa02f5377613039bf62c6782e835a06a0c0e3a4da0742d608a2bf110d750336ce68b19fed1482b5df14ab9bef933c2054468d9488387

diff --git a/dev-util/cmake/cmake-3.15.0_rc2.ebuild 
b/dev-util/cmake/cmake-3.15.0_rc2.ebuild
new file mode 100644
index 000..b8f071ece70
--- /dev/null
+++ b/dev-util/cmake/cmake-3.15.0_rc2.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx 
xdg 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 test"
+
+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}"
+BDEPEND="
+   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_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() {
+   # 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 -Eo 
'(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | 
grep -o '[[:digit:]]+')
+   par_arg="--parallel=${par_arg}"
+   else
+   par_arg="--parallel=1"
+   fi
+
+   # 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/files/, dev-util/cmake/

2018-06-24 Thread Andreas Sturmlechner

commit: 71da15f49a47695ddcb668170a7fbacae924e49b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 24 09:33:04 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 24 09:34:30 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71da15f4

dev-util/cmake: Fix src_configure with >=libuv-1.21

Thanks-to: Thomas Deutschmann  gentoo.org>
Closes: https://bugs.gentoo.org/658898
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-util/cmake/cmake-3.11.4.ebuild |  1 +
 dev-util/cmake/cmake-3.12.0_rc1.ebuild |  1 +
 dev-util/cmake/files/cmake-3.11.4-libuv-1.21.patch | 28 ++
 3 files changed, 30 insertions(+)

diff --git a/dev-util/cmake/cmake-3.11.4.ebuild 
b/dev-util/cmake/cmake-3.11.4.ebuild
index 050883851f5..b9e25d10709 100644
--- a/dev-util/cmake/cmake-3.11.4.ebuild
+++ b/dev-util/cmake/cmake-3.11.4.ebuild
@@ -60,6 +60,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
 
# upstream fixes (can usually be removed with a version bump)
+   "${FILESDIR}"/${P}-libuv-1.21.patch
 )
 
 cmake_src_bootstrap() {

diff --git a/dev-util/cmake/cmake-3.12.0_rc1.ebuild 
b/dev-util/cmake/cmake-3.12.0_rc1.ebuild
index 050883851f5..2cc5baaef0e 100644
--- a/dev-util/cmake/cmake-3.12.0_rc1.ebuild
+++ b/dev-util/cmake/cmake-3.12.0_rc1.ebuild
@@ -60,6 +60,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
 
# upstream fixes (can usually be removed with a version bump)
+   "${FILESDIR}"/${PN}-3.11.4-libuv-1.21.patch
 )
 
 cmake_src_bootstrap() {

diff --git a/dev-util/cmake/files/cmake-3.11.4-libuv-1.21.patch 
b/dev-util/cmake/files/cmake-3.11.4-libuv-1.21.patch
new file mode 100644
index 000..664c39aae90
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.11.4-libuv-1.21.patch
@@ -0,0 +1,28 @@
+From 92c4b3d900a24512967a960f108d985c819fdf00 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa 
+Date: Sat, 23 Jun 2018 20:30:07 +0200
+Subject: [PATCH] FindLibUV: Also check uv/version.h for version detection
+
+Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory.
+Make FindLibUV aware of the file's new location for configuration to work.
+
+Upstream change: https://github.com/libuv/libuv/pull/1429
+---
+ Source/Modules/FindLibUV.cmake | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Source/Modules/FindLibUV.cmake b/Source/Modules/FindLibUV.cmake
+index ba13d75..0554d62 100644
+--- a/Source/Modules/FindLibUV.cmake
 b/Source/Modules/FindLibUV.cmake
+@@ -63,6 +63,8 @@ mark_as_advanced(LibUV_INCLUDE_DIR)
+ set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[ 
\t]+[0-9]+")
+ if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")
+   file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX 
"${_LibUV_H_REGEX}")
++elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h")
++  file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX 
"${_LibUV_H_REGEX}")
+ elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv.h")
+   file(STRINGS "${LibUV_INCLUDE_DIR}/uv.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
+ else()
+--
+libgit2 0.27.0

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

2018-03-12 Thread Lars Wendler

commit: e92084cc3d3ce917eee875e3e16da54cc6f329a5
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Fri Mar  9 20:05:35 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Mar 12 15:32:27 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e92084cc

dev-util/cmake: simplify FindBLAS patch

Most of the previous Gentoo patch has been upstreamed.
Closes: https://github.com/gentoo/gentoo/pull/7409

 dev-util/cmake/cmake-3.11.0_rc3.ebuild |  2 +-
 .../cmake/files/cmake-3.11.0_rc2-FindBLAS.patch| 23 ++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/dev-util/cmake/cmake-3.11.0_rc3.ebuild 
b/dev-util/cmake/cmake-3.11.0_rc3.ebuild
index ebda7cc29dd..61e5d006511 100644
--- a/dev-util/cmake/cmake-3.11.0_rc3.ebuild
+++ b/dev-util/cmake/cmake-3.11.0_rc3.ebuild
@@ -51,7 +51,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
 
# handle gentoo packaging in find modules
-   "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
+   "${FILESDIR}"/${PN}-3.11.0_rc2-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

diff --git a/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch 
b/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch
new file mode 100644
index 000..6bad45b2087
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.11.0_rc2-FindBLAS.patch
@@ -0,0 +1,23 @@
+--- a/Modules/FindBLAS.cmake
 b/Modules/FindBLAS.cmake
+@@ -4,6 +4,10 @@
+ #
+ # Find BLAS library
+ #
++# Version modified for Gentoo Linux.
++# If a valid PkgConfig configuration is found, this overrides and cancels
++# all further checks.
++#
+ # This module finds an installed fortran library that implements the
+ # BLAS linear-algebra interface (see http://www.netlib.org/blas/).  The
+ # list of libraries searched for is taken from the autoconf macro file,
+@@ -50,6 +54,9 @@
+ # (To distribute this file outside of CMake, substitute the full
+ #  License text for the above reference.)
+ 
++# first, try PkgConfig
++set(BLA_PREFER_PKGCONFIG On)
++
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
+ include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
+

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

2018-02-28 Thread Lars Wendler

commit: 4f0c647821840622bc6461cef29935ef609eb9d5
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Feb 28 09:05:32 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Feb 28 09:28:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f0c6478

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

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-util/cmake/Manifest|  2 +-
 ...e-3.11.0_rc1.ebuild => cmake-3.11.0_rc2.ebuild} |  1 -
 .../files/cmake-3.11.0_rc1-system_thread.patch | 44 --
 3 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index caa381b5c4d..34bb5f2785a 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,4 +1,4 @@
 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.11.0-rc2.tar.gz 7946761 BLAKE2B 
7ef3df8bd1e356a43f71e806f4b63bf3d2ed9363782a1224846ad8c710ff01695ae2391db400d0f2d29ec12e20ee36da2e8019300bcb6e14d051b2e21c83d663
 SHA512 
4b91455f787c04e4b792129d6168d9c45d74b50582eaf3f738a9a0ddd690c0e359bbd3ad218470c2acbdfd09f4465dd9084433b0a20c033c3177abfb8af381ef
 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_rc2.ebuild
similarity index 99%
rename from dev-util/cmake/cmake-3.11.0_rc1.ebuild
rename to dev-util/cmake/cmake-3.11.0_rc2.ebuild
index 85d191ee0dc..e6c5395608b 100644
--- a/dev-util/cmake/cmake-3.11.0_rc1.ebuild
+++ b/dev-util/cmake/cmake-3.11.0_rc2.ebuild
@@ -62,7 +62,6 @@ PATCHES=(
 
 
# upstream fixes (can usually be removed with a version bump)
-   "${FILESDIR}"/${PN}-3.11.0_rc1-system_thread.patch
 )
 
 cmake_src_bootstrap() {

diff --git a/dev-util/cmake/files/cmake-3.11.0_rc1-system_thread.patch 
b/dev-util/cmake/files/cmake-3.11.0_rc1-system_thread.patch
deleted file mode 100644
index b2ac2be99d4..000
--- a/dev-util/cmake/files/cmake-3.11.0_rc1-system_thread.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 94eee5e683b80e0ffd8e0c4fd3a45b03f0f37b18 Mon Sep 17 00:00:00 2001
-From: Brad King 
-Date: Thu, 22 Feb 2018 12:57:29 -0500
-Subject: [PATCH] CMakeLib: Link to system thread libraries to support 
std::thread
-
-Some environments require linking to thread libraries for `std::thread`.
-Express this direct dependency of CMakeLib explicitly.  Previously this
-was done indirectly through our bundled libuv, but that does not work
-when using a system libuv.
-
-Fixes: #17757

- CMakeLists.txt| 2 ++
- Source/CMakeLists.txt | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e4d2a9a..6623959 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -310,6 +310,8 @@ endmacro()
- # Simply to improve readability of the main script.
- #---
- macro (CMAKE_BUILD_UTILITIES)
-+  find_package(Threads)
-+
-   #-
-   # Create the kwsys library for CMake.
-   set(KWSYS_NAMESPACE cmsys)
-diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
-index e7c0732..a0010a2 100644
 a/Source/CMakeLists.txt
-+++ b/Source/CMakeLists.txt
-@@ -765,6 +765,7 @@ target_link_libraries(CMakeLib cmsys
-   ${CMAKE_LIBUV_LIBRARIES}
-   ${CMAKE_LIBRHASH_LIBRARIES}
-   ${CMake_KWIML_LIBRARIES}
-+  ${CMAKE_THREAD_LIBS_INIT}
-   )
- 
- if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES 
"sparc")
---
-libgit2 0.26.0
-

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

2018-02-27 Thread Lars Wendler

commit: 65187c84488d7759ccd0be31071d3425efc02a6e
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Feb 27 10:06:07 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Feb 27 10:06:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65187c84

dev-util/cmake: Replaced pthread patch with official upstream fix.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-util/cmake/cmake-3.11.0_rc1.ebuild |  2 +-
 .../cmake-3.11.0_rc1-add_missing_pthread.patch | 21 ---
 .../files/cmake-3.11.0_rc1-system_thread.patch | 44 ++
 3 files changed, 45 insertions(+), 22 deletions(-)

diff --git a/dev-util/cmake/cmake-3.11.0_rc1.ebuild 
b/dev-util/cmake/cmake-3.11.0_rc1.ebuild
index a1fdde41672..85d191ee0dc 100644
--- a/dev-util/cmake/cmake-3.11.0_rc1.ebuild
+++ b/dev-util/cmake/cmake-3.11.0_rc1.ebuild
@@ -60,9 +60,9 @@ PATCHES=(
"${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)
+   "${FILESDIR}"/${PN}-3.11.0_rc1-system_thread.patch
 )
 
 cmake_src_bootstrap() {

diff --git a/dev-util/cmake/files/cmake-3.11.0_rc1-add_missing_pthread.patch 
b/dev-util/cmake/files/cmake-3.11.0_rc1-add_missing_pthread.patch
deleted file mode 100644
index 3a4c4352c6f..000
--- a/dev-util/cmake/files/cmake-3.11.0_rc1-add_missing_pthread.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 cmake-3.11.0-rc1/Source/CMakeLists.txt
-+++ cmake-3.11.0-rc1/Source/CMakeLists.txt
-@@ -765,6 +765,7 @@
-   ${CMAKE_LIBUV_LIBRARIES}
-   ${CMAKE_LIBRHASH_LIBRARIES}
-   ${CMake_KWIML_LIBRARIES}
-+  pthread
-   )
- 
- if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES 
"sparc")
 cmake-3.11.0-rc1/Tests/CMakeLib/CMakeLists.txt
-+++ cmake-3.11.0-rc1/Tests/CMakeLib/CMakeLists.txt
-@@ -30,7 +30,7 @@
- 
- create_test_sourcelist(CMakeLib_TEST_SRCS CMakeLibTests.cxx ${CMakeLib_TESTS})
- add_executable(CMakeLibTests ${CMakeLib_TEST_SRCS})
--target_link_libraries(CMakeLibTests CMakeLib)
-+target_link_libraries(CMakeLibTests CMakeLib pthread)
- 
- set_property(TARGET CMakeLibTests PROPERTY C_CLANG_TIDY "")
- set_property(TARGET CMakeLibTests PROPERTY CXX_CLANG_TIDY "")

diff --git a/dev-util/cmake/files/cmake-3.11.0_rc1-system_thread.patch 
b/dev-util/cmake/files/cmake-3.11.0_rc1-system_thread.patch
new file mode 100644
index 000..b2ac2be99d4
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.11.0_rc1-system_thread.patch
@@ -0,0 +1,44 @@
+From 94eee5e683b80e0ffd8e0c4fd3a45b03f0f37b18 Mon Sep 17 00:00:00 2001
+From: Brad King 
+Date: Thu, 22 Feb 2018 12:57:29 -0500
+Subject: [PATCH] CMakeLib: Link to system thread libraries to support 
std::thread
+
+Some environments require linking to thread libraries for `std::thread`.
+Express this direct dependency of CMakeLib explicitly.  Previously this
+was done indirectly through our bundled libuv, but that does not work
+when using a system libuv.
+
+Fixes: #17757
+---
+ CMakeLists.txt| 2 ++
+ Source/CMakeLists.txt | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e4d2a9a..6623959 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -310,6 +310,8 @@ endmacro()
+ # Simply to improve readability of the main script.
+ #---
+ macro (CMAKE_BUILD_UTILITIES)
++  find_package(Threads)
++
+   #-
+   # Create the kwsys library for CMake.
+   set(KWSYS_NAMESPACE cmsys)
+diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
+index e7c0732..a0010a2 100644
+--- a/Source/CMakeLists.txt
 b/Source/CMakeLists.txt
+@@ -765,6 +765,7 @@ target_link_libraries(CMakeLib cmsys
+   ${CMAKE_LIBUV_LIBRARIES}
+   ${CMAKE_LIBRHASH_LIBRARIES}
+   ${CMake_KWIML_LIBRARIES}
++  ${CMAKE_THREAD_LIBS_INIT}
+   )
+ 
+ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES 
"sparc")
+--
+libgit2 0.26.0
+

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

2017-12-14 Thread Lars Wendler

commit: ed193001e830fd646c085303e659032d1cb43922
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Dec 14 19:38:11 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Dec 14 19:38:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed193001

dev-util/cmake: Removed old.

Package-Manager: Portage-2.3.18, Repoman-2.3.6

 dev-util/cmake/Manifest|   2 -
 dev-util/cmake/cmake-3.7.2.ebuild  | 200 ---
 dev-util/cmake/cmake-3.9.5.ebuild  | 214 -
 .../cmake/files/cmake-3.0.0-FindBoost-python.patch |  93 -
 4 files changed, 509 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index f76ac8b7799..8c40fb1dc29 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,6 +1,4 @@
 DIST cmake-3.10.0.tar.gz 7822668 BLAKE2B 
8d649924281b68add8120c8f8a4871e0a0671316ce51cc9dcc557d06e696e6f08cf90c253c3edaa902fabc7a9b121ce095e9eaf37478feac1a1cf2dbc503
 SHA512 
0bf05f5aacb17007d5beb0909263e31717102b685701eef45c20408895cc9dfd54c96ebc8eee148845c8ffb1d3db687e68a58d4e08395425e14ca0413ee84765
 DIST cmake-3.10.1.tar.gz 7824043 BLAKE2B 
004149841b128288845c2a3987b38e6d90b3dcc5ccb2002bc2915f9d8f30496ebf43d9a70fa6e26c7b64c0f41d85c753bd1bac8c1b5d7148b1d592dc98de189a
 SHA512 
14e9a7f01747b369cad3c4e4e83bc777c0c98ce69209456f60d086d2471302f66dc1c1d22fd04e11dcb64de4bfc7dacd9aca70ee0e5f006abd1df79ef642eeed
-DIST cmake-3.7.2.tar.gz 7361593 BLAKE2B 
92d406236488028ba4a75d8935c66f2e11cc45a81786bd53bdcab039a8174f5dea44553646c18d4c2a840e66695b94b6f5524bed8ce4b8a28f6fcf69b2a08d8f
 SHA512 
b2ed0192e12267de19eb178c2dedc69d06fc33dfadd47efbe0ccf6969ad72d290fa4bff02861c379a8752337d67d2485d7e1ba947cb219f2e4041a53a195e88d
 DIST cmake-3.8.2.tar.gz 7504706 BLAKE2B 
a2ba30370a41dabcba40a967aa58eb7a4ed4151371394eff436866b09fd040b5483d2dcc2dc588a75288a65aff979806d15016a5395db2b25db844b9e942cac1
 SHA512 
49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f
-DIST cmake-3.9.5.tar.gz 7705155 BLAKE2B 
d2d723574bff80e481ccbbe279ebce3d84a7049163d401a8dc965bd2f9e32dc3a9eb97e55721368d4edbd1b9d6db3ca4fd459dc9b2094f6aee8bf10c6cff273c
 SHA512 
71a0848a0c7048c210fe16fbd2b0c2870bd4c2140098225e94fac13a53059f4ae610139115ab8c153989886baa087d506b9ffbc7b91ddc157b0c85e3223828a0
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B 
e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43
 SHA512 
9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c

diff --git a/dev-util/cmake/cmake-3.7.2.ebuild 
b/dev-util/cmake/cmake-3.7.2.ebuild
deleted file mode 100644
index c6248dac592..000
--- a/dev-util/cmake/cmake-3.7.2.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2017 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 ~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
-   >=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.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 f

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

2017-10-05 Thread Lars Wendler

commit: 50718920c31ffd682eeac840c4a4ff42bc971114
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Oct  5 08:46:25 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Oct  5 08:46:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50718920

dev-util/cmake: Removed old.

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-util/cmake/Manifest|   1 -
 dev-util/cmake/cmake-3.9.2.ebuild  | 215 -
 .../cmake/files/cmake-3.9.1-boost-1.65.0.patch |  74 ---
 3 files changed, 290 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 021161714cb..423fafaa539 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,5 +1,4 @@
 DIST cmake-3.7.2.tar.gz 7361593 SHA256 
dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 SHA512 
b2ed0192e12267de19eb178c2dedc69d06fc33dfadd47efbe0ccf6969ad72d290fa4bff02861c379a8752337d67d2485d7e1ba947cb219f2e4041a53a195e88d
 WHIRLPOOL 
1861fe2887f4483856e1964ff1492e196624d3072ad1e21910fba29d0c0d654e7d5035571648386a77cd6cbe895f8cdfbb1f4cc1ad60d14015a01a22494456f7
 DIST cmake-3.8.2.tar.gz 7504706 SHA256 
da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d SHA512 
49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f
 WHIRLPOOL 
8768bffb365852414eda0349d71e59517c8047689303d7873a5889cb8b28c72cd636982a18b039f26daae33023f7e0ad91c3a9ab2d30c30e4b3a9b3cc525b78e
-DIST cmake-3.9.2.tar.gz 7703777 SHA256 
954a5801a456ee48e76f01107c9a4961677dd0f3e115275bbd18410dc22ba3c1 SHA512 
9528d9f39d00bb282cf36b4126c09f6884751ac68ab924893884eecbb77ea99b0e560b30e30d46faaa89417e7386f4b376e6c7c61ccf2f23948765f8607f943c
 WHIRLPOOL 
49d7ca2875c404b5783fda1785304ec04328a4cf8531bd8c2aefa85d485a20f287aeeba6533fd35d0d47057349322844e5ec980e19750da65f7b306931a74785
 DIST cmake-3.9.3.tar.gz 7705238 SHA256 
8eaf75e1e932159aae98ab5e7491499545554be62a08cbcbc7c75c84b999f28a SHA512 
30058cf4c154221846d1cd22eaf44a297d2a2d020a443f3e6f40384dfb86ee9a639a1299aa9f187f230505b2a6ee0fe69fbf5e80410711a6ac3d7a07b37f8dfc
 WHIRLPOOL 
68d85783cf880984ce912e873f31500c87352cce69bad6da5a6086ce5bad2dd3d4a75ef2eae485649af7c380205aac9411f1dbdff155763d0e69d12d1eba4784
 DIST cmake-3.9.4.tar.gz 7705052 SHA256 
b5d86f12ae0072db520fdbdad67405f799eb728b610ed66043c20a92b4906ca1 SHA512 
d9172f86df7ddefd0ecf1cd271add8b8af2d712a47ded530e9ff2c26e39087bc11a099125f17add6b563d176f27a68f4998bb53ae390b3f12894d658dfc8eee5
 WHIRLPOOL 
c1cc16977ce1c1a4ac58692694a608bb5996c19db677bb6d25db1e017586ad1d676bb1f086af4016b8017cfe845ed7c6795fad7f1e7b5ab0b4d9b414452d661f

diff --git a/dev-util/cmake/cmake-3.9.2.ebuild 
b/dev-util/cmake/cmake-3.9.2.ebuild
deleted file mode 100644
index 5ff11523d79..000
--- a/dev-util/cmake/cmake-3.9.2.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2017 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 ~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
-   "

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

2017-09-07 Thread Michael Palimaka

commit: adf272995594c38a66c95a15c6d52b31f24db023
Author: Michael Palimaka  gentoo  org>
AuthorDate: Thu Sep  7 12:06:11 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Thu Sep  7 12:09:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adf27299

dev-util/cmake: backport patch from upstream solving failure to find 
boost-1.65.0

Bug: https://bugs.gentoo.org/629972
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-util/cmake/cmake-3.9.1-r1.ebuild   | 205 +
 .../cmake/files/cmake-3.9.1-boost-1.65.0.patch |  74 
 2 files changed, 279 insertions(+)

diff --git a/dev-util/cmake/cmake-3.9.1-r1.ebuild 
b/dev-util/cmake/cmake-3.9.1-r1.ebuild
new file mode 100644
index 000..5aa69e31bfc
--- /dev/null
+++ b/dev-util/cmake/cmake-3.9.1-r1.ebuild
@@ -0,0 +1,205 @@
+# Copyright 1999-2017 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 ~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)
+   "${FILESDIR}"/${PN}-3.9.1-boost-1.65.0.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 -o 
'[[:digit:]]+')
+   par_arg="--parallel=${par_arg}"
+   else
+   par_arg="--parallel=1"
+   fi
+
+   # 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/' 
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 bre

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

2017-03-14 Thread Michael Palimaka

commit: 3ab2bb98c345907a62d7efeb01b904ba220992c2
Author: Michael Palimaka  gentoo  org>
AuthorDate: Tue Mar 14 07:29:53 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Mar 14 07:30:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ab2bb98

dev-util/cmake: move large patch to devspace

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 dev-util/cmake/Manifest|   1 +
 dev-util/cmake/cmake-3.7.2-r10.ebuild  |   5 +-
 dev-util/cmake/files/cmake-3.7.2-x32.patch | 843 -
 3 files changed, 4 insertions(+), 845 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index d1a1ada4ad0..04af972112a 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,3 +1,4 @@
 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.7.2-r10.ebuild 
b/dev-util/cmake/cmake-3.7.2-r10.ebuild
index dd1df55049b..d706bdb8a29 100644
--- a/dev-util/cmake/cmake-3.7.2-r10.ebuild
+++ b/dev-util/cmake/cmake-3.7.2-r10.ebuild
@@ -10,7 +10,8 @@ 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"
+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";
 
 LICENSE="CMake"
 SLOT="0"
@@ -62,7 +63,7 @@ PATCHES=(
# upstream fixes (can usually be removed with a version bump)
 
# testing 3.9 backports - bug #426936
-   "${FILESDIR}"/${PN}-3.7.2-x32.patch
+   "${WORKDIR}"/${PN}-3.7.2-x32.patch
 )
 
 cmake_src_bootstrap() {

diff --git a/dev-util/cmake/files/cmake-3.7.2-x32.patch 
b/dev-util/cmake/files/cmake-3.7.2-x32.patch
deleted file mode 100644
index 0164a39d0ef..000
--- a/dev-util/cmake/files/cmake-3.7.2-x32.patch
+++ /dev/null
@@ -1,843 +0,0 @@
-Backports from 3.9
-
-Gentoo-bug: 426936
-
-From 503f25d490e56dfc1d3dc894e1fc1bd3e7e89e81 Mon Sep 17 00:00:00 2001
-From: Christian Schmidbauer 
-Date: Sat, 25 Feb 2017 19:47:49 +0100
-Subject: [PATCH] find_library: Allow custom lib suffix be used as find path
-
-Add a new `CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX` variable to allow use
-of a custom suffix on `lib` directory names.  This is a more general
-option than that added by commit v3.7.0-rc1~504^2 (Teach find_library
-and find_package to search lib32 paths, 2016-06-10).  It allows the find
-path to be more deterministic on custom setups.
-
-See discussion in #10287 and #15994.

- Help/command/find_library.rst  |  7 ++
- Help/manual/cmake-variables.7.rst  |  1 +
- Help/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.rst |  2 ++
- Help/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.rst |  2 ++
- .../release/dev/find_library-custom-lib-suffix.rst |  6 +
- .../CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX.rst   | 11 +
- Source/cmFindLibraryCommand.cxx| 28 --
- Tests/CMakeOnly/find_library/CMakeLists.txt| 15 +++-
- .../CMakeOnly/find_library/lib/A/libXYZ/libtest2.a |  0
- Tests/CMakeOnly/find_library/lib/XYZ/libtest1.a|  0
- .../CMakeOnly/find_library/libXYZ/A/lib/libtest4.a |  0
- .../find_library/libXYZ/A/libXYZ/libtest5.a|  0
- Tests/CMakeOnly/find_library/libXYZ/A/libtest6.a   |  0
- Tests/CMakeOnly/find_library/libXYZ/libtest7.a |  0
- 14 files chan

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

2017-03-13 Thread Michael Palimaka

commit: 2ae782f68b91c67347e50dde0fd9dc0ced13746e
Author: Michael Palimaka  gentoo  org>
AuthorDate: Mon Mar 13 12:10:51 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Mon Mar 13 12:11:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ae782f6

dev-util/cmake: backport x32 support patches from upstream for testing

Gentoo-bug: 426936
Package-Manager: Portage-2.3.4, Repoman-2.3.2

 dev-util/cmake/cmake-3.7.2-r10.ebuild  | 202 +++
 dev-util/cmake/files/cmake-3.7.2-x32.patch | 843 +
 2 files changed, 1045 insertions(+)

diff --git a/dev-util/cmake/cmake-3.7.2-r10.ebuild 
b/dev-util/cmake/cmake-3.7.2-r10.ebuild
new file mode 100644
index 000..dd1df55049b
--- /dev/null
+++ b/dev-util/cmake/cmake-3.7.2-r10.ebuild
@@ -0,0 +1,202 @@
+# 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 ~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
+   >=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.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)
+
+   # testing 3.9 backports - bug #426936
+   "${FILESDIR}"/${PN}-3.7.2-x32.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 -o 
'[[:digit:]]+')
+   par_arg="--parallel=${par_arg}"
+   else
+   par_arg="--parallel=1"
+   fi
+
+   # 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/' 
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
+   #Qt5Autogen, which breaks for

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

2016-12-16 Thread Johannes Huber

commit: 621bc9f987833bcaff088097cadda032ba108a0d
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Dec 17 07:07:34 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Dec 17 07:08:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=621bc9f9

dev-util/cmake: Remove 3.7.0 (r1)

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-util/cmake/Manifest |   1 -
 dev-util/cmake/cmake-3.7.0-r1.ebuild| 197 
 dev-util/cmake/files/cmake-2.8.10-libform.patch |  51 --
 3 files changed, 249 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 30f021a..f2556fd 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -3,5 +3,4 @@ DIST 
cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e
 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.0.tar.gz 7359368 SHA256 
ed63e05c41aeb6c036e503114ab15847f29c312f9f21f5f1a7060a4b4ec2fb31 SHA512 
badeb81ea5b2a765d0ae222d6c7612eba570f46b3645ac8a22e1cf5ea52648239c707e80d51c1d31f8e5b15167e37e6b4d9f6308280560b11feddc3d2fa745cd
 WHIRLPOOL 
38bf6f2861544024282e6d1fc97824c32ebb824256ebc2513ad4b4698f66803354de75d1692a63515b2b0f587cadc52d3c9e6a1b367360b561f34f1452495566
 DIST cmake-3.7.1.tar.gz 7361172 SHA256 
449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1 SHA512 
0539d70ce3ac77042a45d638443b09fbf368e253622db980bc6fb15988743eacd031ab850a45c821ec3e9f0f5f886b9c9cb0668aeda184cd457b78abbfe7b629
 WHIRLPOOL 
8b632b4a3f44a7b56952926ad43db45ecd9f26f434816fe29a52c89542edfc2dfea72f4ec814d4faaf990ee535ad80e6238ba2e6d9ffa2ff94cfccd665b1d930

diff --git a/dev-util/cmake/cmake-3.7.0-r1.ebuild 
b/dev-util/cmake/cmake-3.7.0-r1.ebuild
deleted file mode 100644
index 7bda50d..
--- a/dev-util/cmake/cmake-3.7.0-r1.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# 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"
-[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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
-   >=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.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
-   "${

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

2016-12-15 Thread Lars Wendler

commit: d2e40496ffd4f2bdd6c1ccf6ff76609826d7ef5d
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Dec 15 16:48:13 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Dec 15 16:48:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2e40496

dev-util/cmake: Removed last remaining 2.x version.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-util/cmake/Manifest|   1 -
 dev-util/cmake/cmake-2.8.12.2-r1.ebuild| 195 -
 .../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch  |  39 -
 .../files/cmake-2.6.3-no-duplicates-in-rpath.patch |  19 --
 .../cmake/files/cmake-2.8.10-darwin-isysroot.patch |  50 --
 dev-util/cmake/files/cmake-2.8.10-desktop.patch|  13 --
 .../files/cmake-2.8.10.2-FindPythonInterp.patch|  22 ---
 dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch   |  48 -
 .../files/cmake-2.8.11-more-no_host_paths.patch| 130 --
 .../cmake/files/cmake-2.8.12.1-FindFreetype.patch  |  43 -
 .../files/cmake-2.8.12.2-FindBoost-python.patch|  77 
 .../cmake/files/cmake-2.8.12.2-FindCurses.patch|  42 -
 .../files/cmake-2.8.12.2-hppa-bootstrap.patch  |  27 ---
 dev-util/cmake/files/cmake-2.8.7-FindLAPACK.patch  |  44 -
 .../cmake/files/cmake-2.8.8-FindPkgConfig.patch|  18 --
 15 files changed, 768 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 2847789..30f021a 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,4 +1,3 @@
-DIST cmake-2.8.12.2.tar.gz 6068231 SHA256 
8c6574e9afabcb9fc66f463bb1f2f051958d86c85c37fccf067eb1a44a120e5e SHA512 
a0fe8f6305052ba7894a7d58aa30f97b4be1f52eb7de650273a704929a6fbe81c7cebfa6e68a18c9e7d62f7ed02c944f74c2974da9aacc70e2cb186e0a1be44d
 WHIRLPOOL 
3635651a59a93c661db4df8c248e35bfd8a9869eb74faa33fa6d56c12039ef7bb37756fd4c55fb107a9b7c38d2616dc43eb41acc0c565cfad4a24db99c361c29
 DIST cmake-3.2.2.tar.gz 6438736 SHA256 
ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78 SHA512 
b7460733ebf81e6c0cade84c26407f474e1b0a7372d19ccadf928a8578a53043fd76c507b45a00762161aaf6938a59df6110a1eb11a7678bfbc984b020e5d68b
 WHIRLPOOL 
7debc5ac607578feee1c322416ac132ad4ba00a40410e03ee5cba52290f2f15904e7d0f2b77da37c9e8caa379b0530339fb2cc87246209f7999f10e44637f2d2
 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

diff --git a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild 
b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
deleted file mode 100644
index 24d7780..
--- a/dev-util/cmake/cmake-2.8.12.2-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_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-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"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 
sparc x86 ~ppc-aix ~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"
-SLOT="0"
-IUSE="emacs ncurses qt5"
-
-DEPEND="
-   >=app-arch/libarchive-2.8.0:=
-   >=dev-libs/expat-2.0.1
-   >=net-misc/curl-7.20.0-r1[ssl]
-   sys-libs/zlib
-   virtual/pkgconfig
-   ncurses? ( sys-libs/ncurses:0= )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtgui:5
-   dev-qt/qtwidgets:5
-   )
-"
-RDEPEND="${DEPEND}
-   emacs? ( virtual/emacs )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
-   "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
-   "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch
-   "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch
-   "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
-   "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.

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

2016-08-28 Thread Michał Górny

commit: 08ad139374c65516481275579264319c74b4afcb
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Aug 28 14:45:49 2016 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Aug 28 16:19:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08ad1393

dev-util/cmake: Backport find_library() lib32 fix, #338492

 dev-util/cmake/cmake-3.6.1-r1.ebuild   | 199 +
 .../files/cmake-3.6.1-find_library-lib32.patch | 476 +
 2 files changed, 675 insertions(+)

diff --git a/dev-util/cmake/cmake-3.6.1-r1.ebuild 
b/dev-util/cmake/cmake-3.6.1-r1.ebuild
new file mode 100644
index ..aded1dc
--- /dev/null
+++ b/dev-util/cmake/cmake-3.6.1-r1.ebuild
@@ -0,0 +1,199 @@
+# 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)
+   "${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 -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/files/, dev-util/cmake/

2016-07-14 Thread Johannes Huber

commit: f966538219d8d85fa903bec626e122b5f8cdbceb
Author: Johannes Huber  gentoo  org>
AuthorDate: Fri Jul 15 05:40:48 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Fri Jul 15 05:41:08 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9665382

dev-util/cmake: Remove 3.3.2, 3.4.3

Package-Manager: portage-2.3.0

 dev-util/cmake/Manifest|   2 -
 dev-util/cmake/cmake-3.3.2-r1.ebuild   | 200 -
 dev-util/cmake/cmake-3.4.3.ebuild  | 198 
 dev-util/cmake/files/cmake-3.3.2-FindQt4.patch |  45 --
 4 files changed, 445 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 7206d93..36997d8 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -2,7 +2,5 @@ DIST cmake-2.8.12.2.tar.gz 6068231 SHA256 
8c6574e9afabcb9fc66f463bb1f2f051958d86
 DIST cmake-3.2.2.tar.gz 6438736 SHA256 
ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78 SHA512 
b7460733ebf81e6c0cade84c26407f474e1b0a7372d19ccadf928a8578a53043fd76c507b45a00762161aaf6938a59df6110a1eb11a7678bfbc984b020e5d68b
 WHIRLPOOL 
7debc5ac607578feee1c322416ac132ad4ba00a40410e03ee5cba52290f2f15904e7d0f2b77da37c9e8caa379b0530339fb2cc87246209f7999f10e44637f2d2
 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.3.tar.gz 6722311 SHA256 
b73f8c1029611df7ed81796bf5ca8ba0ef41c6761132340c73ffe42704f980fa SHA512 
a326c39cfe9f5408b4586ddd291cabfa400a2442947fb46d94dd6c44db3087c48c84a9a22ca5ed38707467448150383935ed59c669fbbfb20a968d4031eaaa11
 WHIRLPOOL 
fdb3b47a242523919a56a63bf8e778e875f5721c997cdc1a6098f24eec57dadecc44d13b35d74ef1276aebf6f5299c89d4c91ce03c282d081b03ebba29c1ddad
 DIST cmake-3.5.2.tar.gz 6863498 SHA256 
92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a SHA512 
7b08eb9f1b37993553f89c03eceedc465dc52b787dec99b78c74ebff2817d0aac9764e82ad835e8fc39f61cd2d2c0a3544d3f5ae299234ed52e9a940edf30b81
 WHIRLPOOL 
c255825aa024ba9feb51540ed2a36cfa73c6397356d18c5ff8f49258a4c30906c8ed5d7553e7d56f3c373418697f056f218f30aa409debab2303b0f9fa84
 DIST cmake-3.6.0.tar.gz 6897636 SHA256 
fd05ed40cc40ef9ef99fac7b0ece2e0b871858a82feade48546f5d2940147670 SHA512 
4e519fa30a6fee2fb0ef8df667504dfaba1f965c263fd4f42d17348c45cff33777de9a8c552b13da0bb4b9f1300a142f204a844eac03bdf431e826e8d7ba3505
 WHIRLPOOL 
4d2842efa7ae6bdfe5d1e0b773f8649a6dec7d23364f89570d442db2f4da033acd0023dd5cf80004a024b5c1ec142db284357a21c993bc84d0a07d8e0fb76c77

diff --git a/dev-util/cmake/cmake-3.3.2-r1.ebuild 
b/dev-util/cmake/cmake-3.3.2-r1.ebuild
deleted file mode 100644
index 90cc7bd..000
--- a/dev-util/cmake/cmake-3.3.2-r1.ebuild
+++ /dev/null
@@ -1,200 +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 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 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
-

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

2016-03-09 Thread Lars Wendler

commit: ff0d55b9c06d21de48664968b368490471a5d428
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Mar  9 20:18:26 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Mar  9 20:20:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff0d55b9

dev-util/cmake: Bump to version 3.5.0

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

 dev-util/cmake/Manifest|   1 +
 dev-util/cmake/cmake-3.5.0.ebuild  | 198 +
 .../files/cmake-2.8.12.1-FindImageMagick.patch |   4 +-
 dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch|   4 +-
 dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch  |   4 +-
 .../cmake/files/cmake-3.1.0-FindPythonInterp.patch |   4 +-
 .../cmake/files/cmake-3.1.0-darwin-isysroot.patch  |   4 +-
 dev-util/cmake/files/cmake-3.3.2-FindQt4.patch |   4 +-
 8 files changed, 211 insertions(+), 12 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 2e48950..d079502 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -5,3 +5,4 @@ DIST cmake-3.3.1.tar.gz 6577869 SHA256 
cd65022c6a0707f1c7112f99e9c981677fdd5518f
 DIST cmake-3.3.2.tar.gz 6578184 SHA256 
e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22 SHA512 
01bc0e6ca52a6836ef57360fb38dd92a4575bfa37bfe9625645db77fefd0c170383cfb07b61c6283bde96738ce1a5e18cb7569e7e0b7c98d4b99e86305c50180
 WHIRLPOOL 
7951dc18d695ca4554b287f91becd8ecb05324e10f9e2c9e34427d26db0d664ee7ab8a226eabed87d93087e41635059f96b1aaea503480f46a555cf3baae3ce7
 DIST cmake-3.4.2.tar.gz 6722152 SHA256 
da7cc34e1ce1d82e67a32ab081c02c2845534cd8bf2e09d88077a1b282e97392 SHA512 
a06a3f1d2d2dcbc3c1d432bd7416632393b4f5219b89dc0ba000acefe6f0d713c35878344884ea9d9e595a6387b362c97a2432acd92c385cbddb4e7b916723bb
 WHIRLPOOL 
42f66e4273367e821b4b06b630f84919a68bc0d4a2be2085a0f24fb79e1b20fb208abe78a1806570401ba6ca24ad1077b1be27c3e7a774491c8beb63f7d501af
 DIST cmake-3.4.3.tar.gz 6722311 SHA256 
b73f8c1029611df7ed81796bf5ca8ba0ef41c6761132340c73ffe42704f980fa SHA512 
a326c39cfe9f5408b4586ddd291cabfa400a2442947fb46d94dd6c44db3087c48c84a9a22ca5ed38707467448150383935ed59c669fbbfb20a968d4031eaaa11
 WHIRLPOOL 
fdb3b47a242523919a56a63bf8e778e875f5721c997cdc1a6098f24eec57dadecc44d13b35d74ef1276aebf6f5299c89d4c91ce03c282d081b03ebba29c1ddad
+DIST cmake-3.5.0.tar.gz 6861686 SHA256 
92c83ad8a4fd6224cf6319a60b399854f55b38ebe9d297c942408b792b1a9efa SHA512 
4fef712560f1975f8d19e897c7b1903811f7bad9314602961b5b32ac58f367bf1308f96cc5edaceb99ac9084b1e0517e4ecb4b5996d2ad53b6aec305ae879b09
 WHIRLPOOL 
bd7f8adfd91cfa0a240e1d3935163d3c978ebdb83f54a3c6c7bcab3b2ad2ad7ac175c247a896511b0736de13f93e19dc89ef68766498ace4163177a4d0aab442

diff --git a/dev-util/cmake/cmake-3.5.0.ebuild 
b/dev-util/cmake/cmake-3.5.0.ebuild
new file mode 100644
index 000..f3eb642
--- /dev/null
+++ b/dev-util/cmake/cmake-3.5.0.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.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
+   "${FILESDIR}"/${PN}-3.3.2-FindQt4.patch
+
+   # respect python eclasses
+   "${FILESDIR}"/${PN}-2.8.

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

2015-10-10 Thread Michael Palimaka

commit: 0ee1361bd482a7f8fb88b72c8975fdaebc4c4348
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sat Oct 10 17:26:35 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Oct 10 17:36:09 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ee1361b

dev-util/cmake: add patch to ensure the correct version of Qt is always used

Gentoo-bug: 547222

Package-Manager: portage-2.2.20.1

 dev-util/cmake/cmake-3.3.2-r1.ebuild   | 200 +
 dev-util/cmake/files/cmake-3.3.2-FindQt4.patch |  45 ++
 2 files changed, 245 insertions(+)

diff --git a/dev-util/cmake/cmake-3.3.2-r1.ebuild 
b/dev-util/cmake/cmake-3.3.2-r1.ebuild
new file mode 100644
index 000..683b1fa
--- /dev/null
+++ b/dev-util/cmake/cmake-3.3.2-r1.ebuild
@@ -0,0 +1,200 @@
+# 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
+   
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="~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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}-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
+   "${FILESDIR}"/${PN}-3.3.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)
+   "${DISTDIR}"/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.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 -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
+   #

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

23 matches

Site Navigation

Mail list logo

Footer information