Move from KDE overlay wrt bug 487604

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x42618354

3 files changed, 212 insertions, 10 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index e0a45625e0f0..7a260f7163bc 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.255 2013/10/19 12:18:57 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.256 2013/10/21 03:27:53 creffett Exp $
+
+*cmake-2.8.12 (21 Oct 2013)
+
+  21 Oct 2013; Chris Reffett <creffett@gentoo.org> +cmake-2.8.12.ebuild:
+  Move from KDE overlay wrt bug 487604
 
   19 Oct 2013; Johannes Huber <johu@gentoo.org> -cmake-2.8.11.1.ebuild,
   -files/cmake-2.8.10-FindPythonLibs.patch, -files/cmake-2.8.10-tests.patch,
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index bba6e74a4cf4..0396fda07ec6 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -25,18 +25,18 @@ AUX cmake-2.8.8-FindPkgConfig.patch 658 SHA256 3261fce9682f476f121aa3d30126e4f8d
 AUX cmake.vim 217 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf WHIRLPOOL 088ae1f0a4f32ea872deaf1d4e8d21d6853d3cecb903ea8abfb06c85de8c200757c2cfb34ec25cd0d8ef2a3c12b3cc9472e9ef0b5ce3f702502100806e0e73fc
 DIST cmake-2.8.10.2.tar.gz 5768373 SHA256 ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1 SHA512 e79759f4429977bb4292c9dc8a9d216ca7c21dca5fefce1fa223d7847a1128c8a3a11e1b6adaac40b2f30e0d6f504508a2845f888a319acc29c2ef6beff55df2 WHIRLPOOL f7327282d352ec04afb6349abc74aa3205ceb57efcb013650f18025e36010a27ca28725cd06e29e7bc5ff3196a4c8abeafcb733fba9c6bcc02159a5c6b8e90eb
 DIST cmake-2.8.11.2.tar.gz 5887016 SHA256 b32acb483afdd14339941c6e4ec25f633d916a7a472653a0b00838771a6c0562 SHA512 05ac2293300bf15fdcf98f07dfa7b9862b117cd0d6f7e30c1995ecb8a3bfd94e2b7e778caaa05bc46bd88eca5afe7f6be38b1904275a9a2aeae562bfdbaeec94 WHIRLPOOL 28365c3d091eb41fdbd428d3f9de37ed547c68415bd726874587af1cefd81ed6dce8255527dbee9d3019a65cf1b1416b9f09dfb744befba4c1428da8f88e3907
+DIST cmake-2.8.12.tar.gz 6064138 SHA256 d885ba10b2406ede59aa31a928df33c9d67fc01433202f7dd586999cfd0e0287 SHA512 39d771fb4730693b19c567b7646f41ffa3d45f488a410b9e3724f42cca1139ce091fd7b8f26c09480d0100ceb49d23177bc01cd3665fdcfb53f29bf76a2dbd13 WHIRLPOOL 42d0c1dc825ba25bc73fb9068011fa71ea088922c96d12e471cae1a25c7f89825962b698373d4d96a03b29c4683e1d5ef3306ab4c1150c14db560d165e4a92f8
 EBUILD cmake-2.8.10.2-r2.ebuild 5062 SHA256 ea6ebc14c28c352ae27758386775d8db2ec411d1f244f932e8ae1c57532413b0 SHA512 8fe2c50a8809f926ce2aa3222500cc354aa646c6a7ec139a2b04465b43ea2c97afe3568e573dfb726126a69747f340be971f1e83734c2fa469ce4d847d389ff9 WHIRLPOOL eb1c197d62354d8e3dcad0a87235b6c8a0b0738213fa313151c643354fe8600f786a177f06a9ef8ad5c0f8508025a150f3f94ba3bc70f5507451ba68eaeb2992
 EBUILD cmake-2.8.11.2.ebuild 5360 SHA256 9f2b0a11e218fc4ccfbde8131fe1a3eea22513ed8cd2c0a742f6dfb3e31fd94f SHA512 3df12b19b43a55c0d7cb96819b6449387f1612ba84518471c543c1c18a4e1d7bafb9c3b8716122c0631be27713b9c8e5c3998080a956b334c18b30bd8f309fe8 WHIRLPOOL 4adae2aab30b77c2c2b3d88536a93be3610a1421da968e5a5e8fc64ed0e3e7c76cce4c45a3f0f0e82137b6f7d51ebdb6c1e592e4b08fb844be6c569e41d13ffe
-MISC ChangeLog 41046 SHA256 1383e0c3c5595766688f2cace0de972bd58ae4ee80b600abdae62979c2330dac SHA512 7dad1bf7d3c5052f97f59cfceeefcee8a7835927a619e241854e334a520bcc4ec5971970f4967adc85481860298b65a10e32660925052b86a611ca932b5bd0e1 WHIRLPOOL 5f86aa556f4f8406e5ca401c141baca818b3be7f79d450b2889c7291325de8c1e4c32d0eae2458b09a578cfa7ff045716f4da50529fb7f698f35edeb606fb78e
+EBUILD cmake-2.8.12.ebuild 5233 SHA256 0444c340abb954d219aa0a03cf923c88c1013efa840834ff034fda5745f8eab4 SHA512 66915c3a42e49cde75b964ce1926a75cf42bb73ee1211dbb3e4be69541ea8e9fa667e5453c393f5b44b502183bbba389e1bcb9944dc66bfa115f74bf815bfe8c WHIRLPOOL 5c63d76ec16a52667ccef90c6ba8d29fb29ee7893773610fa137fe2c0d07a65bab8176dda8c43e6f4c5ed9c78c7180d2bb8d6ceecafda18560aee44d090114cf
+MISC ChangeLog 41192 SHA256 23bb92205d068caa1347aadfc208d1bfb3801cc4aee8616e6c5c9603fbe05d6a SHA512 3dc68396a13b10033818edfddcaaa5a366f022f2bed3b3010fa5706b619d1c609bb901a09f44116671ee219c6a4ca4946955622ac8d38178147788ce63e4bd91 WHIRLPOOL 1cb83d7f06137a35dc61c106d43a62ad35ea4263c10baa99e34837fb2211fe3564fe8d65ab98c48f4c1674936f17e808441f082e467f203f20ef27fee152c193
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSYni2AAoJEO+t9ga+3I3aqCcH/RlsoZtT/GOm37gr5sUxUUnf
-OWKBEcv8Fnmo4nsyyRq5H9UVwu0ZP+k+wuL8ELsdWg7UdK/9yReH6Lg0IZC2QkGa
-nB7qKZYexo9cypr3O6pAMYtLXdAmCDOkpQFof1FX3emm5CvnvMU7u9ubXdPZEE0c
-NMq+nTTLq5hsG3uC6K8Rrngvk/L1U3yoKtorqvc5sYcpAWEmnjMW3GlWbLfKSU+A
-hlBQEQizSKoul77iRLZq7Lx20IGaVVS4Nwn0YyYVdsL4bku2y81n8+d2cRkjxEnW
-d3rdtWFFo5acwughmJFC7r6dhA/gYlfFfdEkEBhVccB1EZN9Edwrn1wL0bFSPPA=
-=hdog
+iKYEAREIAGYFAlJkn0NfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1Q4WQCgpW5oI1xIa0wB3XXBbILfoltf
+mVgAoKj3q/Z9X1iA1Ex4NXssE6eLMmMC
+=huGq
 -----END PGP SIGNATURE-----
diff --git a/dev-util/cmake/cmake-2.8.12.ebuild b/dev-util/cmake/cmake-2.8.12.ebuild
new file mode 100644
index 000000000000..9001762975a3
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.12.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2013 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.ebuild,v 1.1 2013/10/21 03:27:53 creffett Exp $
+
+EAPI=5
+
+CMAKE_REMOVE_MODULES="no"
+inherit 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 vim-syntax"
+
+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 )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+VIMFILE="${PN}.vim"
+
+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-FindBoost-python.patch
+	"${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.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
+
+	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.
+	#    CTest.updatecvs, which fails to commit as root
+	#    Qt4Deploy, which tries to break sandbox and ignores prefix
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+pkg_setup() {
+	# bug 387227
+	addpredict /proc/self/coredump_filter
+}
+
+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() {
+	# 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
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		$(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 Docs/cmake-mode.el
+}
+
+src_test() {
+	VIRTUALX_COMMAND="cmake_src_test" virtualmake
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use emacs; then
+		elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins Docs/cmake-syntax.vim
+
+		insinto /usr/share/vim/vimfiles/indent
+		doins Docs/cmake-indent.vim
+
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${FILESDIR}/${VIMFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}