Version bump

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

3 files changed, 213 insertions, 15 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 291eb6f564ca..d46328cc4a02 100644
--- 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.309 2015/05/31 13:22:44 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.310 2015/06/04 12:51:16 polynomial-c Exp $
+
+*cmake-3.2.3 (04 Jun 2015)
+
+  04 Jun 2015; Lars Wendler <polynomial-c@gentoo.org> +cmake-3.2.3.ebuild:
+  Version bump with kind permission from mrueg.
 
   31 May 2015; Johannes Huber <johu@gentoo.org> -cmake-3.2.1.ebuild:
   Remove offending version wrt bug #546516.
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index aa164e22b7a7..cd3b98b459a8 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -33,28 +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.2.tar.gz 6438736 SHA256 ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78 SHA512 b7460733ebf81e6c0cade84c26407f474e1b0a7372d19ccadf928a8578a53043fd76c507b45a00762161aaf6938a59df6110a1eb11a7678bfbc984b020e5d68b WHIRLPOOL 7debc5ac607578feee1c322416ac132ad4ba00a40410e03ee5cba52290f2f15904e7d0f2b77da37c9e8caa379b0530339fb2cc87246209f7999f10e44637f2d2
+DIST cmake-3.2.3.tar.gz 6438938 SHA256 a1ebcaf6d288eb4c966714ea457e3b9677cdfde78820d0f088712d7320850297 SHA512 1fddea23c8e28cd6893879bd3bb349564ece815eaa5c68c3519dd62f0baa05eabbfc38168458ab91594cb0feeefd2ea761b6d292b679f8b9aa33e08a0b9d5b4c WHIRLPOOL 5268cc735cbd523a2027e479ab43499589b8653972a5bed7425c451a9b5ecc5d27c867cd218144a1eb6df2d3126301d7d494cafa7b1ac7455dbb40e66bad30c6
 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.2.ebuild 5250 SHA256 35e9b9bed8efc4bdcf9f9eb7cf3dc1038d9b17ea5d2a843cf365a5a8334b21e3 SHA512 e879ac79a24ba5a2f3dbfd2f04c5e01697b35b6e28f7a339a7dfb70441b51ac67b2f4b71e2c4e6014956b18061bd1858a7bc12f80fe088e0e7b01c659d390ca9 WHIRLPOOL b802694af69f3f38ddd28627877d9ddfe6f24b3e7d9cab058b6b836ca6118cc8edf755c9a7826c5ab98521e59d373324317a6881bca139f7c9b050d0993b55aa
-MISC ChangeLog 50189 SHA256 7ea79fd381af8d28dfdae3aec94f6386d0667d019d63807b7d3b810909fee1ed SHA512 ac27e98e2fdf04d8e63ca45f908c22826d770bbb7d951d0ed0704cc5d2a6a7957a760293fa60144e7cf40c21dc274764d019fbe124ee8fd69b3e4713a08bba30 WHIRLPOOL 7220bf499c688c6073f7ea1b5da19625d4cf6b6a05a80978900b33fbbfc74ec8780ddec2a4bc61e08b92b2a9d26c11dd92ff79f63d32caba8c954b5e307b4807
+EBUILD cmake-3.2.3.ebuild 5252 SHA256 ebb7e10e9b2946c43f907297a86cab5c5c4ced99eb646c8e1e1fe434c74643a8 SHA512 c53d6ed5e47a4a99d8d0c77707044c64acdc7ad1ecb8a5c5f810ddb36670c7ffc842b718b9b46db3726af5cfa04c9bfb8d16bef31a3259adce2c3afea222e97d WHIRLPOOL 0261aee51ae1f62d5951e9c24ef76e1f8ad3754d1b53a1f393a4b6742373677bfc9f12ecb21ba1902083e68a26acdce50e01a6e7f531bbdc7e05d4f95d57a06f
+MISC ChangeLog 50349 SHA256 a2b74adc4d983220940ef698c1ae2d1e98a1d1deca393f2e1ab96c8db2935223 SHA512 ec81b43db87fb1694189f4432e05be5764aaad45060aef3d8eb5a05bdc6c5e52d845aa892d73b8b7104aa2373d237e21b87c83b1921c7faf7eda1d31b9df4679 WHIRLPOOL 8df76316511146fab79db4659e455162e6e322057b948e852a8e78048d1a8c0ff4a212261dd773ef36e81410c6589c0b3ff49428f089e8b32879cb258aa25386
 MISC metadata.xml 280 SHA256 9c11fcc54fc2212abdf8d07008cdb7cd8c1352fb59aeabebf58ee6aa89fdd8c5 SHA512 7b3012e7dcac7f1a9d0bf66616fd5c43884d236d1d617993a6ad8b142af0a0609c7c87fd6f1f60e0187c4138246e63733bdce51ddc0ccf31523427e96b9c737c WHIRLPOOL 122044a3ae23a55d2a218478e9c309e9c373e0f00f22a1d97d4c9178cbfa63f4a250a1eff9e2ba6f7e3c80c457fc232e5219ce685347103324bb2b15c59cf4a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVawspAAoJEGVpnaTzz9K9d/MQAMMm1PQxFeF9eSGbWG6fjy/d
-VxSSRVJY+MNNFVZxehhd7Zm6tz4Lr5trXL2dV6Kv+2kkJXbnV+c3Nu44Iztk3sae
-auuDacrOMOuZab7RHskrm0VMQVwGfDmGp6zgNBFk8QLpdUHW62JlSj2yWavNdCYk
-pwyq77XuvXf+NWejFDrAE1y5y6CgjH2gLLW+ejTeX2hPZvgdK1JVJr5qdZ/Ml/zx
-USzn8At+BSVzfi8nI1iSk8F8skee56TEkFNHlrFPZ7R5ZER0KWKuttoqMtsW+A9I
-geCtWEkrfrUNW4ONpWUS/FYdeo84RZcf3Mo0zdn03Qhul4ib3Ywf63MbOBKeNooA
-cAq+foALM/gS2SUvOyvUCr2N7sYBeq/wpFrTY4Fo3nJ0Czx3zGGXDlUOAvZHACm6
-RVHilgHzcK2hRceqNC7MQzSHe8BMzJVu2a1mrDdn00XxFpEyVE2wogVLwivcyJAQ
-jtUsg/ACupcsH1uY+7entDdT63UjWvTKGKxeOM8hETNbgcfzHUJgM7j366oUySum
-7guSJ27FSNNWOLRXV+toiamIivq5/aOUHAPdhrCbmzSddqCUKKnBHUtckh6PJtfD
-f5qkF+Fvkb9dKWCAxK5pIKDg5XJ7NhBTrbpaaJO0ThzeIc88EzyUfK4XGebOEOwp
-1L7enzMMqzzhpdYIvLeV
-=d1Mn
+iQIcBAEBCAAGBQJVcEnFAAoJEPiazRVxLXTFM8MP/AxGNugk+4cG1qb3uw7M83Rw
+2eR7MAbsT+YpK1CmLn9GwKfTj6JSlcYpeT3zGOaZDGXfsSgGcqMu8CRL5oYkCE1E
+JLWTMyrU1XSUzMgqlrXCNiJlUBDRrTvfNfCFlCSUR+aUhS+suhHwiBO6NCPM6OVq
+e0V53P3mrrJsLtPsd+hJP0gHHjH2weLVYogO5he51neMelEGAN1kaMxR8OcbAsIw
+t9WzjGT+/iz0Ytzu7ZZ8Cz+ZHZcyXV2wIc1H1z/bTyhCAvYc133D0XqvpKw9/yTf
+R+SyYIkMQLxeCGPfLMgvNAi05dMU6wimsJtrh8wc28tiJi7qQcYgyDCmvmbtE4u3
+Lq/HDod+3CpIRDE0jPtYHuJj4glXUdQSRVhBUov5dH3ajfhXQ4fk551w0LzvjVJI
+pAOjvrIdTEleH942uv9c5+mB2kv4lUo4h6CTEkPbH8IeSjmYJURHTsTHKKMRcjW3
+Jmwo5y6YimPan9vSXWXUPvPV1Bt1A0PA5ZriDWLbbqmRFS0apjcP6lajyS5JJB4z
+yXSImtPOP3GnqX8GNlsNK5n39CTta4C+nKARHdvmNku99lZeMpieF0HuOMhezTNQ
+20n/I1I4UbMa3we6qBR8nu8Z06+YainHY115qKvK+rCuhB9sAYkoByw3lLsRVpX+
+4o9KH1AM1yyxKs1gzpeW
+=sIMf
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-3.2.3.ebuild b/dev-util/cmake/cmake-3.2.3.ebuild
new file mode 100644
index 000000000000..afdfca73c554
--- /dev/null
+++ b/dev-util/cmake/cmake-3.2.3.ebuild
@@ -0,0 +1,191 @@
+# 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.3.ebuild,v 1.1 2015/06/04 12:51:16 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 system-jsoncpp ncurses 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
+	)
+	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+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
+		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-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
+}