[gentoo-commits] proj/kde:master commit in: dev-util/cmake/, dev-util/cmake/files/
commit: b5c52ea43e2581f642ad800eccaa4db30e7e7e84 Author: Michael Palimaka gentoo org> AuthorDate: Thu Apr 9 17:47:48 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Apr 9 17:47:48 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b5c52ea4 [dev-util/cmake] Moved to main tree. dev-util/cmake/cmake-3.2.1.ebuild | 192 - dev-util/cmake/files/50cmake-gentoo.el | 4 - .../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 --- .../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 --- .../files/cmake-2.8.12.1-FindImageMagick.patch | 23 --- dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch| 43 - .../cmake/files/cmake-3.0.0-FindBoost-python.patch | 93 -- dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch | 142 --- dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch | 43 - .../cmake/files/cmake-3.1.0-FindPythonInterp.patch | 29 .../cmake/files/cmake-3.1.0-darwin-isysroot.patch | 48 -- dev-util/cmake/files/cmake.vim | 3 - dev-util/cmake/metadata.xml| 5 - 13 files changed, 672 deletions(-) diff --git a/dev-util/cmake/cmake-3.2.1.ebuild b/dev-util/cmake/cmake-3.2.1.ebuild deleted file mode 100644 index 97a8121..000 --- a/dev-util/cmake/cmake-3.2.1.ebuild +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.1.0.ebuild,v 1.1 2015/01/16 20:35:46 johu Exp $ - -EAPI=5 - -CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx - -DESCRIPTION="Cross platform Make" -HOMEPAGE="http://www.cmake.org/"; -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz" - -LICENSE="CMake" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~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 ncurses qt4 qt5" - -REQUIRED_USE="?? ( qt4 qt5 )" - -RDEPEND=" - >=app-arch/libarchive-2.8.0:= - >=dev-libs/expat-2.0.1 - >=dev-libs/jsoncpp-0.6.0_rc2 - >=net-misc/curl-7.20.0-r1[ssl] - sys-libs/zlib - virtual/pkgconfig - emacs? ( virtual/emacs ) - ncurses? ( sys-libs/ncurses ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx ) -" - -SITEFILE="50${PN}-gentoo.el" - -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - -PATCHES=( - # prefix - "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch - - # handle gentoo packaging in find modules - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch - "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch - - # respect python eclasses - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.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
[gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
commit: a1c2506d564ca4527b029d542eef35d38d466570 Author: Michael Palimaka gentoo org> AuthorDate: Wed Apr 1 13:19:31 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Apr 1 13:19:31 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a1c2506d [dev-util/cmake] Version bump wrt bug #543700. Package-Manager: portage-2.2.18 dev-util/cmake/cmake-3.2.1.ebuild | 192 + dev-util/cmake/files/50cmake-gentoo.el | 4 + .../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 +++ .../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 +++ .../files/cmake-2.8.12.1-FindImageMagick.patch | 23 +++ dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch| 43 + .../cmake/files/cmake-3.0.0-FindBoost-python.patch | 93 ++ dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch | 142 +++ dev-util/cmake/files/cmake-3.0.2-FindLAPACK.patch | 43 + .../cmake/files/cmake-3.1.0-FindPythonInterp.patch | 29 .../cmake/files/cmake-3.1.0-darwin-isysroot.patch | 48 ++ dev-util/cmake/files/cmake.vim | 3 + dev-util/cmake/metadata.xml| 5 + 13 files changed, 672 insertions(+) diff --git a/dev-util/cmake/cmake-3.2.1.ebuild b/dev-util/cmake/cmake-3.2.1.ebuild new file mode 100644 index 000..97a8121 --- /dev/null +++ b/dev-util/cmake/cmake-3.2.1.ebuild @@ -0,0 +1,192 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-3.1.0.ebuild,v 1.1 2015/01/16 20:35:46 johu Exp $ + +EAPI=5 + +CMAKE_REMOVE_MODULES="no" +inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx + +DESCRIPTION="Cross platform Make" +HOMEPAGE="http://www.cmake.org/"; +SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz" + +LICENSE="CMake" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~mips ~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 ncurses qt4 qt5" + +REQUIRED_USE="?? ( qt4 qt5 )" + +RDEPEND=" + >=app-arch/libarchive-2.8.0:= + >=dev-libs/expat-2.0.1 + >=dev-libs/jsoncpp-0.6.0_rc2 + >=net-misc/curl-7.20.0-r1[ssl] + sys-libs/zlib + virtual/pkgconfig + emacs? ( virtual/emacs ) + ncurses? ( sys-libs/ncurses ) + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) +" +DEPEND="${RDEPEND} + doc? ( dev-python/sphinx ) +" + +SITEFILE="50${PN}-gentoo.el" + +CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" + +PATCHES=( + # prefix + "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch + "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch + "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch + + # handle gentoo packaging in find modules + "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch + "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch + "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch + "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch + + # respect python eclasses + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch + "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.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: + #
[gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
commit: 3b0721973def80758010c73f486239fe16eded80 Author: Johannes Huber gentoo org> AuthorDate: Sun Jul 27 10:23:55 2014 + Commit: Johannes Huber gentoo org> CommitDate: Sun Jul 27 10:23:55 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3b072197 [dev-util/cmake] Moved to tree Package-Manager: portage-2.2.10 --- dev-util/cmake/cmake-3.0.0.ebuild | 183 - dev-util/cmake/files/50cmake-gentoo.el | 4 - .../files/cmake-2.6.3-no-duplicates-in-rpath.patch | 19 --- .../cmake/files/cmake-2.8.10-darwin-bundle.patch | 23 --- .../cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 -- dev-util/cmake/files/cmake-2.8.10-libform.patch| 51 -- .../files/cmake-2.8.10.2-FindPythonInterp.patch| 22 --- .../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 --- .../cmake/files/cmake-2.8.12.1-FindFreetype.patch | 43 - .../files/cmake-2.8.12.1-FindImageMagick.patch | 23 --- .../cmake/files/cmake-2.8.8-FindPkgConfig.patch| 18 -- dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch| 43 - .../cmake/files/cmake-3.0.0-FindBoost-python.patch | 93 --- dev-util/cmake/files/cmake-3.0.0-FindLAPACK.patch | 44 - dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch | 142 dev-util/cmake/files/cmake.vim | 3 - dev-util/cmake/metadata.xml| 5 - 17 files changed, 790 deletions(-) diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild deleted file mode 100644 index 63b4bf6..000 --- a/dev-util/cmake/cmake-3.0.0.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=5 - -CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx - -DESCRIPTION="Cross platform Make" -HOMEPAGE="http://www.cmake.org/"; -SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${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="emacs ncurses qt4 qt5" - -REQUIRED_USE="?? ( qt4 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 - emacs? ( virtual/emacs ) - ncurses? ( sys-libs/ncurses ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" -RDEPEND="${DEPEND}" - -SITEFILE="50${PN}-gentoo.el" - -CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - -PATCHES=( - "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch - "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch - "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch - "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch - "${FILESDIR}"/${PN}-2.8.10-libform.patch - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch - "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch - "${FILESDIR}"/${PN}-3.0.0-FindLAPACK.patch - "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch - "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.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 - -
[gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
commit: ab814d7a8726e7231ac5abf2f6fc6ab066888e17 Author: Michael Palimaka gentoo org> AuthorDate: Thu Jun 19 15:39:47 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Jun 19 15:39:47 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ab814d7a [dev-util/cmake] Drop ~ppc-aix KEYWORD and patch. According to upstream, the issue should be fixed. However, I don't have the hardware to test, so dropping the keyword for now. Package-Manager: portage-2.2.10 --- dev-util/cmake/cmake-3.0.0.ebuild | 3 +- .../files/cmake-2.6.3-fix_broken_lfs_on_aix.patch | 39 -- 2 files changed, 1 insertion(+), 41 deletions(-) diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild index 87a18e7..63b4bf6 100644 --- a/dev-util/cmake/cmake-3.0.0.ebuild +++ b/dev-util/cmake/cmake-3.0.0.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar LICENSE="CMake" SLOT="0" -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" +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="emacs ncurses qt4 qt5" REQUIRED_USE="?? ( qt4 qt5 )" @@ -43,7 +43,6 @@ 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.8-FindPkgConfig.patch "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch diff --git a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch b/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch deleted file mode 100644 index 02c3011..000 --- a/dev-util/cmake/files/cmake-2.6.3-fix_broken_lfs_on_aix.patch +++ /dev/null @@ -1,39 +0,0 @@ -http://public.kitware.com/Bug/view.php?id=7933 - -diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx Wed Sep 24 20:34:37 2008 -+++ cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx Tue Nov 4 11:18:32 2008 -@@ -38,6 +38,13 @@ - int main() { return 0; } - #endif - -+#ifdef TEST_KWSYS_LFS_SUPPORT -+#define _LARGE_FILES -+#include -+int main() { return 0; } -+#endif -+ -+ - #ifdef TEST_KWSYS_IOS_HAVE_STD - #include - void f(std ::ostream*) {} -diff -ur cmake-2.6.2/bootstrap cmake-2.6.2-p/bootstrap cmake-2.6.2/bootstrap Wed Sep 24 20:34:33 2008 -+++ cmake-2.6.2-p/bootstrapTue Nov 4 11:17:11 2008 -@@ -1005,6 +1005,16 @@ - echo "${cmake_cxx_compiler} does not have stl iterator_traits" - fi - -+if cmake_try_run "${cmake_cxx_compiler}" \ -+ "${cmake_cxx_flags} -DTEST_KWSYS_LFS_SUPPORT" \ -+ "${cmake_source_dir}/Source/kwsys/kwsysPlatformTestsCXX.cxx" >> cmake_bootstrap.log 2>&1; then -+ KWSYS_LFS_AVAILABLE=1 -+ echo "LFS support available" -+else -+ KWSYS_LFS_AVAILABLE=0 -+ echo "LFS support unavailable, disabled" -+fi -+ - if [ "x${KWSYS_STL_HAS_ITERATOR_TRAITS}" = "x0" ]; then - if cmake_try_run "${cmake_cxx_compiler}" \ - "${cmake_cxx_flags} -DTEST_KWSYS_STL_HAS_ITERATOR_CATEGORY -DKWSYS_STL_HAVE_STD=${KWSYS_STL_HAVE_STD}" \
[gentoo-commits] proj/kde:master commit in: dev-util/cmake/
commit: 3e134b52390ddf04cbf6b54a614422421d00fb8e Author: Michael Palimaka gentoo org> AuthorDate: Thu Jun 19 14:04:54 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Jun 19 14:04:54 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3e134b52 [dev-util/cmake] Remove comment. FreeType patches are merged upstream. Package-Manager: portage-2.2.10 --- dev-util/cmake/cmake-3.0.0.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild index a5d8d75..6b31ad5 100644 --- a/dev-util/cmake/cmake-3.0.0.ebuild +++ b/dev-util/cmake/cmake-3.0.0.ebuild @@ -42,7 +42,6 @@ SITEFILE="50${PN}-gentoo.el" CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" -# "${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch PATCHES=( "${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch "${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
[gentoo-commits] proj/kde:master commit in: dev-util/cmake/
commit: 9c3209368f85c7af16e6927e3b3efc0739d51b86 Author: Michael Palimaka gentoo org> AuthorDate: Thu Jun 19 14:05:40 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Jun 19 14:05:40 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9c320936 [dev-util/cmake] Whitespace. Package-Manager: portage-2.2.10 --- dev-util/cmake/cmake-3.0.0.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild index 6b31ad5..87a18e7 100644 --- a/dev-util/cmake/cmake-3.0.0.ebuild +++ b/dev-util/cmake/cmake-3.0.0.ebuild @@ -140,6 +140,7 @@ src_configure() { $(cmake-utils_use_find_package qt5 Qt5Widgets) ) fi + cmake-utils_src_configure } @@ -154,6 +155,7 @@ src_test() { src_install() { cmake-utils_src_install + if use emacs; then elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc elisp-site-file-install "${FILESDIR}/${SITEFILE}"
[gentoo-commits] proj/kde:master commit in: dev-util/cmake/
commit: 7bd15e9e22f3d01750a4ab839798c305bcadc67b Author: Michael Palimaka gentoo org> AuthorDate: Thu Jun 19 13:54:45 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Jun 19 13:54:45 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7bd15e9e [dev-util/cmake] Remove java workarounds. It appears that Java handling has changed and this is no longer an issue. Package-Manager: portage-2.2.10 --- dev-util/cmake/cmake-3.0.0.ebuild | 10 -- 1 file changed, 10 deletions(-) diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild index 39651af..a5d8d75 100644 --- a/dev-util/cmake/cmake-3.0.0.ebuild +++ b/dev-util/cmake/cmake-3.0.0.ebuild @@ -108,11 +108,6 @@ cmake_src_test() { popd > /dev/null } -pkg_setup() { - # bug 387227 - addpredict /proc/self/coredump_filter -} - src_prepare() { cmake-utils_src_prepare @@ -131,11 +126,6 @@ src_prepare() { } src_configure() { - # make things work with gentoo java setup - # in case java-config cannot be run, the variable just becomes unset - # per bug #315229 - export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null) - local mycmakeargs=( -DCMAKE_USE_SYSTEM_LIBRARIES=ON -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
[gentoo-commits] proj/kde:master commit in: dev-util/cmake/
commit: 387e1a3eed9bbbef52581fb94a619127190d6a7e Author: Michael Palimaka gentoo org> AuthorDate: Thu Jun 19 12:47:37 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Jun 19 12:47:37 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=387e1a3e [dev-util/cmake] emacs is required at build time to compile elisp files. Package-Manager: portage-2.2.10 --- dev-util/cmake/cmake-3.0.0.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild index 2a8c694..39651af 100644 --- a/dev-util/cmake/cmake-3.0.0.ebuild +++ b/dev-util/cmake/cmake-3.0.0.ebuild @@ -24,6 +24,7 @@ DEPEND=" >=net-misc/curl-7.20.0-r1[ssl] sys-libs/zlib virtual/pkgconfig + emacs? ( virtual/emacs ) ncurses? ( sys-libs/ncurses ) qt4? ( dev-qt/qtcore:4 @@ -35,9 +36,7 @@ DEPEND=" dev-qt/qtwidgets:5 ) " -RDEPEND="${DEPEND} - emacs? ( virtual/emacs ) -" +RDEPEND="${DEPEND}" SITEFILE="50${PN}-gentoo.el"
[gentoo-commits] proj/kde:master commit in: dev-util/cmake/
commit: 2202b44fafd6790a34a8d640cc7478affc44f75a Author: Michael Palimaka gentoo org> AuthorDate: Thu Jun 19 12:44:26 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Jun 19 12:44:31 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2202b44f [dev-util/cmake] Remove editor support files in /usr/share/cmake. They're already installed to the correct package-specific directory. Package-Manager: portage-2.2.10 --- dev-util/cmake/cmake-3.0.0.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild index 94f238d..2a8c694 100644 --- a/dev-util/cmake/cmake-3.0.0.ebuild +++ b/dev-util/cmake/cmake-3.0.0.ebuild @@ -181,7 +181,8 @@ src_install() { doins "${FILESDIR}/${PN}.vim" dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} - rm -rf "${D}/usr/share/cmake/completions" || die + + rm -rf "${D}/usr/share/cmake/{completions,editors}" || die } pkg_postinst() {
[gentoo-commits] proj/kde:master commit in: dev-util/cmake/
commit: 4178b02c35f925ff147c6eab443447ae8ee48777 Author: Michael Palimaka gentoo org> AuthorDate: Thu Jun 19 12:43:04 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Jun 19 12:43:04 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4178b02c [dev-util/cmake] Fix emacs files directory. Package-Manager: portage-2.2.10 --- dev-util/cmake/cmake-3.0.0.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild index 1f4c068..94f238d 100644 --- a/dev-util/cmake/cmake-3.0.0.ebuild +++ b/dev-util/cmake/cmake-3.0.0.ebuild @@ -157,7 +157,7 @@ src_configure() { src_compile() { cmake-utils_src_compile - use emacs && elisp-compile Docs/cmake-mode.el + use emacs && elisp-compile Auxiliary/cmake-mode.el } src_test() { @@ -167,7 +167,7 @@ src_test() { src_install() { cmake-utils_src_install if use emacs; then - elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc + elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc elisp-site-file-install "${FILESDIR}/${SITEFILE}" fi
[gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
commit: 431060f44d9736052138f911452f74f27271ebf7 Author: Michael Palimaka gentoo org> AuthorDate: Wed Jun 18 14:44:47 2014 + Commit: Michael Palimaka gentoo org> CommitDate: Wed Jun 18 14:44:47 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=431060f4 [dev-util/cmake] Version bump. Package-Manager: portage-2.2.10 --- dev-util/cmake/cmake-3.0.0.ebuild | 193 + dev-util/cmake/files/50cmake-gentoo.el | 4 + .../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-bundle.patch | 23 +++ .../cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 ++ dev-util/cmake/files/cmake-2.8.10-libform.patch| 51 ++ .../files/cmake-2.8.10.2-FindPythonInterp.patch| 22 +++ .../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 +++ .../cmake/files/cmake-2.8.12.1-FindFreetype.patch | 43 + .../files/cmake-2.8.12.1-FindImageMagick.patch | 23 +++ .../cmake/files/cmake-2.8.8-FindPkgConfig.patch| 18 ++ dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch| 43 + .../cmake/files/cmake-3.0.0-FindBoost-python.patch | 93 ++ dev-util/cmake/files/cmake-3.0.0-FindLAPACK.patch | 44 + dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch | 142 +++ dev-util/cmake/files/cmake.vim | 3 + dev-util/cmake/metadata.xml| 5 + 18 files changed, 839 insertions(+) diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild new file mode 100644 index 000..1f4c068 --- /dev/null +++ b/dev-util/cmake/cmake-3.0.0.ebuild @@ -0,0 +1,193 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +CMAKE_REMOVE_MODULES="no" +inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx + +DESCRIPTION="Cross platform Make" +HOMEPAGE="http://www.cmake.org/"; +SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz" + +LICENSE="CMake" +SLOT="0" +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" +IUSE="emacs ncurses qt4 qt5" + +REQUIRED_USE="?? ( qt4 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 ) + qt4? ( + dev-qt/qtcore:4 + dev-qt/qtgui:4 + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ) +" +RDEPEND="${DEPEND} + emacs? ( virtual/emacs ) +" + +SITEFILE="50${PN}-gentoo.el" + +CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" + +# "${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch +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.8-FindPkgConfig.patch + "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch + "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch + "${FILESDIR}"/${PN}-2.8.10-libform.patch + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch + "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch + "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch + "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch + "${FILESDIR}"/${PN}-3.0.0-FindLAPACK.patch + "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch + "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.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 ar
[gentoo-commits] proj/kde:master commit in: dev-util/cmake/files/, dev-util/cmake/
commit: 1ba36b9dead51008e9fb3f0eccb53ebdb7ac9bd5 Author: Johannes Huber gentoo org> AuthorDate: Tue May 6 12:23:55 2014 + Commit: Johannes Huber gentoo org> CommitDate: Tue May 6 12:23:55 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1ba36b9d [dev-util/cmake] Moved to tree Package-Manager: portage-2.2.10 --- dev-util/cmake/cmake-2.8.12.2-r1.ebuild| 200 - dev-util/cmake/files/50cmake-gentoo.el | 4 - .../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-bundle.patch | 23 --- .../cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 -- dev-util/cmake/files/cmake-2.8.10-desktop.patch| 13 -- dev-util/cmake/files/cmake-2.8.10-libform.patch| 51 -- .../files/cmake-2.8.10.2-FindPythonInterp.patch| 22 --- .../files/cmake-2.8.10.2-FindPythonLibs.patch | 24 --- dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch | 48 - .../files/cmake-2.8.11-more-no_host_paths.patch| 130 -- .../files/cmake-2.8.11.2-hppa-bootstrap.patch | 20 --- .../cmake/files/cmake-2.8.12.1-FindFreetype.patch | 43 - .../files/cmake-2.8.12.1-FindImageMagick.patch | 23 --- .../files/cmake-2.8.12.2-FindBoost-python.patch| 77 .../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 -- dev-util/cmake/files/cmake.vim | 3 - dev-util/cmake/metadata.xml| 5 - 21 files changed, 883 deletions(-) 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 0581bb0..000 --- a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -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 ~hppa ~ia64 ~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 qt4 qt5" - -REQUIRED_USE="?? ( qt4 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 ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - 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.patch - "${FILESDIR}"/${PN}-2.8.10-desktop.patch - "${FILESDIR}"/${PN}-2.8.10-libform.patch - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonInterp.patch - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-2.8.11-FindBLAS.patch - "${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch - "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch - "${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch - "${FILESDIR}"/${PN}-2.8.12.2-hppa-bootstrap.patch - "${FILESDIR}"/${PN}-2.8.12.2-FindBoost-python.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.tx
[gentoo-commits] proj/kde:master commit in: dev-util/cmake/
commit: d6dff72e70a457e03f985e05e649b7cc556cf21f Author: Johannes Huber gentoo org> AuthorDate: Tue Mar 11 10:13:39 2014 + Commit: Johannes Huber gentoo org> CommitDate: Tue Mar 11 10:13:39 2014 + URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d6dff72e [dev-util/cmake] Cleanup header Package-Manager: portage-2.2.8-r1 --- dev-util/cmake/cmake-2.8.12.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild index c0a59db..0581bb0 100644 --- a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild +++ b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.12.2.ebuild,v 1.2 2014/02/05 16:10:57 kensington Exp $ +# $Header: $ EAPI=5