Version bump

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 29ce36cb368412280ce2fb00751d4e4374eaa0f0..fe37582eb4eab48e8c8b5d5bc77d3082857440c1 100644 (file)
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.304 2015/04/14 15:14:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.305 2015/05/08 14:37:50 polynomial-c Exp $
+
+*cmake-3.2.2 (08 May 2015)
+
+  08 May 2015; Lars Wendler <polynomial-c@gentoo.org> +cmake-3.2.2.ebuild:
+  Version bump with kind permission from mrueg.
 
   14 Apr 2015; Mike Gilbert <floppym@gentoo.org> cmake-3.2.1.ebuild:
   Fix mgorny's change; wrong variable name.

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index acb805c57ce433a752f1c1f4fa65481bff838f19..2c5b1fd292dd083c0502b99dc22a24ff665280b4 100644 (file)
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -33,18 +33,30 @@ DIST cmake-2.8.12.2.tar.gz 6068231 SHA256 8c6574e9afabcb9fc66f463bb1f2f051958d86
 DIST cmake-3.0.2.tar.gz 5490501 SHA256 6b4ea61eadbbd9bec0ccb383c29d1f4496eacc121ef7acf37c7a24777805693e SHA512 de267bd6c5b318e48fae64c28947de009fb2413bdc6b4454b5e4bbb7d50b78aaef5d7e9d9655cfb9299aa5704fd3e4bbabc6816d3f378f76856f56ab161efe02 WHIRLPOOL 4c2aa1c72edb700689a8a91bfdfe22977e46a87851d66eb0e187e1e35a1a928be12b477fc39455b877d55420bcb149be6430d6835e01e20f61b84d8d83c752d6
 DIST cmake-3.1.0.tar.gz 5955836 SHA256 8bdc3fa3f2da81bc10c772a6b64cc9052acc2901d42e1e1b2588b40df224aad9 SHA512 9e3288c793c01e0ce48af91c618dc7638623010dfb440fb293393d407b7882c181c9a0f4e3b0a14645b556007e69264e94488e832a421b5cfa96338e0808b030 WHIRLPOOL 99df3f9052fee303d02ef9f27ee0ce22a1db57c0963dc7177837dea95a114da7b5d2ea8fd7155df1c7c513dbfb469bba2e638fc84fc1f1a9783fa49cd0e1a061
 DIST cmake-3.2.1.tar.gz 6437801 SHA256 759f1cf6b1a26b037726a9acca6da501235c20ad3671df29d43f29052ef1502c SHA512 b405a81503ff92629a74ec0510d55cb12499ee4c44e83896242119550cb6a53c7eb3ebf3caee913c0a89d284f976d2369e978be3f775bacc0e570a89a217042f WHIRLPOOL 406c86ccad5d3d27d08693f29cab6574015e1da31e83ec119e86679f589845425680e2d253aa902afb322741d72753d397d9360f2a1eb7e66da2ae1e8b7b5df7
+DIST cmake-3.2.2.tar.gz 6438736 SHA256 ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78 SHA512 b7460733ebf81e6c0cade84c26407f474e1b0a7372d19ccadf928a8578a53043fd76c507b45a00762161aaf6938a59df6110a1eb11a7678bfbc984b020e5d68b WHIRLPOOL 7debc5ac607578feee1c322416ac132ad4ba00a40410e03ee5cba52290f2f15904e7d0f2b77da37c9e8caa379b0530339fb2cc87246209f7999f10e44637f2d2
 EBUILD cmake-2.8.12.2-r1.ebuild 5611 SHA256 7c3ca0c73ed4629f4a0bb138a0773f573123579cc9b1d91a78fe7f0bff653309 SHA512 b859f031eb69ec485486030162ee5f9bcec7df12472a17fff554e6fb8a31e618467972a979e5013c384baaa7c1d4e7515bc33c645dcbe5950d756bcee9b14146 WHIRLPOOL aa3d32ddf65ae0386ea4fb58ea258984e51a380b0e3e58b5a7c300dc871c9c2bbd55bdeea1f7f2d4ce0922be2109a8572585bf59f154ca09f3bc72dbcba4a920
 EBUILD cmake-2.8.12.2-r2.ebuild 5702 SHA256 e92cff9b67120db42d8b2b408aa42fe3a59354ad8ec8b0498792529e52fcfeb3 SHA512 a255c33e431a4b427b02ab17a648dfadb7b348de85b9b6a036d6b465f8c77da2536d75f8542581b1e01fae42bff301c128e5f88468f268a162ee64e078e8032d WHIRLPOOL fcb0da2025ad4bce2c1c566ae4e11bd8d646d25ab89c25a4cca84fec196cb1c557dfd665b075de3bb8d57306a5513f4f0200e72831772b5ebefb3e3ec22f78fb
 EBUILD cmake-2.8.12.2.ebuild 5551 SHA256 589273d08366fd0a979406f3f9f46a8b84764472f2b5e8dad64aa1bd2d574776 SHA512 10a02c2ace51ed3c80a6a65cd2032547c8feee32fd7b45c30d0548926cebf605b61232fbfed2420bee0bf86a8fbd48237e2c15758ac83c18c28c6504944d2e73 WHIRLPOOL 359dae6d17a23382a514b5891cb6df1c867f51fb5952482fb0d5bf504e19ae9342be667ad9c17f89f0478bc2bd9f1ec630da0f831769bfd524c3fba3673d2d52
 EBUILD cmake-3.0.2.ebuild 5156 SHA256 6c841ac46ae5769e22ac16b6af6b1cf234266d3d640507cf0379619ed2582649 SHA512 05f7cee174b3373ca62bafbaee1461e84418a4065895c69c5462f667a0236bbd2d90f4f5a4eb624dc24335c1481f689f223b6d8f84be633939840781ef0058fc WHIRLPOOL 1504c0f74e9d463a590338c4eeac5430c011a6f390f0121a88efc8b2cf88033133f86c7c6836faf66a943974898e01aedb34561c98f750341265f57cf7e1ca93
 EBUILD cmake-3.1.0.ebuild 5099 SHA256 b8af207aee127c21224279e8bdbf9a5cf62760f74d3e192c50719bfad0e5a63b SHA512 5ae290035da81569ac4019e327881fbe42aeca31f25bb62740f3afef8ef1b5308e66fabb5a9f5c4159d5065112131efc606d85e1e456bddfcaa60344c2543956 WHIRLPOOL 0fb06a7127411a0ced9eb316dc602714c21b80dd560c3234ec43e4e8bfd21da77c7fd972737ab07f5713f99efa60862a68ae1dce48bed7dc949dbb22bad6e88b
 EBUILD cmake-3.2.1.ebuild 5293 SHA256 ad25a667d7c8e07cdb3553ff1cf6c4ca21398c6a7ae92a3d05183dbb9a126f23 SHA512 cd8243ca9e35681df6e1837497f8f743be733c1269de0444728922a3c56a104ff596beb5b0239f9a69e66ad8aceee0b0f5c445ae6f422d722fe3fea373bda0a7 WHIRLPOOL 20f3462453efe6dd10579315ae2f63d95e0065af045f3475b4b29fb1be8c2184567e37e308b70db486407728399b99d06e279c5997ffaf99c56018ce55d8026d
-MISC ChangeLog 49343 SHA256 445408df51c8e8e3b656b15a0c39c33e6f9cd98c570d50a4a14b5b2b3abd87b5 SHA512 16ecbf63f19464e522a20a7ade5038e3aaae0e8d847fe27d4e2bff105516162f3803675f8168cdc1faa273ffea89000abcaa598111eb81abe7ccb50f07ed0801 WHIRLPOOL f1bd8db32129856b79a4d17747e2897dade165be15360b07fc304c8802b606e7495865ddea6f0bb76c0fa92e580fd3b51c52e9ca90920115cac0db62275f9049
+EBUILD cmake-3.2.2.ebuild 5298 SHA256 f957aad290a4c73edab77e4ed3333aa51418cc1aaa0a912e84ccc51cd9b78c01 SHA512 bef6192040fd231cb6f3743afa81eaaaf1ec0d7b0ce1c16bc476bd22b803cbba54e1f37182fe1a4bd807a847a16bb068b83533477e8f73a25a84631add09132b WHIRLPOOL cf0da8227e0791a49b7b8fedc0b2748bd9d4adbc81bfb2dd813ab94b80957976bd2643e66060a4ffe1e71c7be173f8e498379cfb26dfbf849f3ba4e5449bc733
+MISC ChangeLog 49500 SHA256 ba4c6a49986a7978edcb2e781c400d9395e25847d8d1eaf025b407ff1bfdb785 SHA512 2101d8bcf5edc8b58acc9b60f30259b493aaac978f88fa337e5463646bdbe607dc22941e25e56ac90e210211789105cd4e4c3bb9e7c5c4d4acdd2f87596419c7 WHIRLPOOL bbcb23b2a78bd0343bd1553a2dd8b04d2ac493cfc922f5205855996a5578f17d2449aab38ad05ea07d91bec3108d55a80e27eac82618f08d480e66c8262c8856
 MISC metadata.xml 358 SHA256 77e9931c9dcc148b60da6f5b9fa3424d3ddf1d393c2d5cb519e7ed488cf75e57 SHA512 ad506c358d613fc3b78c9776a7e811281c710df8d84c041b966660845385e826b75d677a370ef77f550362ab5a8012af4076183e725539529ce2da5b4d8316f3 WHIRLPOOL ba4f93d32f3b4ceadf4b3588c082c213425fd342ee712ff690080fab42484e2619e51382f508c88599424be96a91f3c736aa7e0b63f49cf60fdce9e1f4c3c1ca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlUtLs4ACgkQC77qH+pIQ6SuGQEAy05BMpwE22upPd8MXtYPVXpW
-0XzIJxEExOgBzNBE/W8BAIaVzyrOodWdCu09E/HXLagu+k0RJLmz2bPv43NzrYD/
-=90CK
+iQIcBAEBCAAGBQJVTMo/AAoJEPiazRVxLXTFxmsP/0TQsJxROv1z2snNuPyMsxSb
+xxErXlC9yqK5L+5R5nzsry6xh/gDFXU8wzELPs3roz6sXue9bk4ul5Ta48sQ0RHU
+P5n2ZUSHtW5HTqg+ysMVN7JgAjOU77NqSXIad3DEslb10NOpKhROPuoGbiy9Kpp7
+xzDkDLg1OL4CBwLZO7dkgvoHZATf7Jbw9JgIjL6GibZizpUR0X/kiwn+ZpOANiOD
+BfvHJarXnsgIIqkYzMny8gwV/fDloTA/HZ3e6f2UHdrCSVukaXGD0HpF5gXlahJD
+HTHxqOFsEVcvejNFyY145JyTkj5ytO92ftLGLGWuNkZ8ajzMotoo2SQ/jb0YJIin
+ZM+dpdGlrGKVfzvdK2e7V/FVEfToBqA4BbeheMe9lQkfbhZ2dQpxTnhngQcReQvy
+Msk/bb6pEptY47+ZcE6oIeOS+RK7oBjaRO7LsltJX4/iBgYnt7r7YFxCKUHBgktY
+1XI3r/LSbPhHeyoDLK6zC25ECq6K/bwGBbHBxMOmxbgg+AayT9tmLYnsDPQwiU4r
+iuaow3wvcYo/keM//S0cRUnPR6C4+B8qOkaqYHgEvEPyaT9z8UnzqRk1xAF2ud7h
+EXqlsyB/44hNqOE3JwEzdoEq2GfbyELl03cjFfHoSxep4imG05gb1sA6EDEbVnVH
+oKTMmrt5AgXnpt9LLVDU
+=2Pg6
 -----END PGP SIGNATURE-----

diff --git a/dev-util/cmake/cmake-3.2.2.ebuild b/dev-util/cmake/cmake-3.2.2.ebuild
new file mode 100644 (file)
index 0000000..b00582b
--- /dev/null
+++ b/dev-util/cmake/cmake-3.2.2.ebuild
@@ -0,0 +1,193 @@
+# 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.2.2.ebuild,v 1.1 2015/05/08 14:37:50 polynomial-c 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 internal-jsoncpp ncurses qt4 qt5"
+
+REQUIRED_USE="?? ( qt4 qt5 )"
+
+RDEPEND="
+       >=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
+       )
+       !internal-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2 )
+"
+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 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"
+
+       popd > /dev/null
+}
+
+src_prepare() {
+       cmake-utils_src_prepare
+
+       # disable running of cmake in boostrap command
+       sed -i \
+               -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+               bootstrap || die "sed failed"
+
+       # Add gcc libs to the default link paths
+       sed -i \
+               -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+               -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+               Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+
+       cmake_src_bootstrap
+}
+
+src_configure() {
+       local mycmakeargs=(
+               -DCMAKE_USE_SYSTEM_LIBRARIES=ON
+               $(cmake-utils_useno internal-jsoncpp CMAKE_USE_SYSTEM_LIBRARY_JSONCPP)
+               -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+               -DCMAKE_DOC_DIR=/share/doc/${PF}
+               -DCMAKE_MAN_DIR=/share/man
+               -DCMAKE_DATA_DIR=/share/${PN}
+               -DSPHINX_MAN=$(usex doc)
+               -DSPHINX_HTML=$(usex doc)
+               $(cmake-utils_use_build ncurses CursesDialog)
+       )
+
+       if use qt4 || use qt5 ; then
+               mycmakeargs+=(
+                       -DBUILD_QtDialog=ON
+                       $(cmake-utils_use_find_package qt5 Qt5Widgets)
+               )
+       fi
+
+       cmake-utils_src_configure
+}
+
+src_compile() {
+       cmake-utils_src_compile
+       use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+       VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+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}"
+       fi
+
+       insinto /usr/share/vim/vimfiles/syntax
+       doins Auxiliary/cmake-syntax.vim
+
+       insinto /usr/share/vim/vimfiles/indent
+       doins Auxiliary/cmake-indent.vim
+
+       insinto /usr/share/vim/vimfiles/ftdetect
+       doins "${FILESDIR}/${PN}.vim"
+
+       dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+       rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_postinst() {
+       use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+       use emacs && elisp-site-regen
+}