Version bump, applied patch from bug 266383.

Package-Manager: portage-2.2_rc32/cvs/Linux x86_64

3 files changed, 150 insertions, 2 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index a6fa06fb9c8f..c67b33681282 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/cmake
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.91 2009/04/13 00:43:01 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.92 2009/05/02 23:34:01 cryos Exp $
+
+*cmake-2.6.4 (02 May 2009)
+
+  02 May 2009; Marcus D. Hanwell <cryos@gentoo.org> +cmake-2.6.4.ebuild:
+  Version bump, applied patch from bug 266383.
 
   13 Apr 2009; Tomas Chvatal <scarabeus@gentoo.org> cmake-2.6.3-r1.ebuild:
   Fix the has_version check. Current eclass does not support cmake 2.4...
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 4627c3b658bb..12d2234965e8 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -5,7 +5,9 @@ AUX cmake-FindPythonLibs.patch 530 RMD160 3e012fbf78d649d6c8111d72d384da3b1b8382
 AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989aec74eb260c16f93baf189c2e6794b3d8 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5
 DIST cmake-2.6.2.tar.gz 3543548 RMD160 df7ed9bba605bf31494aa1b835dee264b5fcb6bd SHA1 48d33afaf23d40f2ea9aa2f5018c7213983222c2 SHA256 b3f5a9dfa97fb82cb1b7d78a62d949f93c8d4317af36674f337d27066fa6b7e9
 DIST cmake-2.6.3.tar.gz 3594959 RMD160 14f0e878844f55a1b3d02837e98087dcaabb16be SHA1 bf34e1661954d808ac3a3eb9d394b69e4d3b1a98 SHA256 3c3af80526a32bc2afed616e8f486b847144f2fa3a8e441908bd39c38b146450
+DIST cmake-2.6.4.tar.gz 3285371 RMD160 e4217067537f76e52317514cb5bb0cf38733d16a SHA1 c7e295683e061c2ed19773a1f0444972f75db092 SHA256 9cdd2152e37b05d0d40d334a1bb2dfc0250021797360f971c6ea3d457ac9fdf2
 EBUILD cmake-2.6.2-r1.ebuild 2818 RMD160 5b03134876644ed67781aa17d31ada00526a4775 SHA1 ccbe554e8bd842419f6ec019dcc564df3c98db09 SHA256 f8bced49dbcb701e34035744a5e4cd4e36f620f8f3c4d147ebc5e1948f6fbc5c
 EBUILD cmake-2.6.3-r1.ebuild 3076 RMD160 e71edf10b1f6bd24be7473a193e99781c9eb22b3 SHA1 628cdfb02a481a1874397fea63477b33d2f58e71 SHA256 5d1997a9584838717976c963bbfd9819724147d642a216dd963209ddfa06d1f4
-MISC ChangeLog 13999 RMD160 102ad8737cee50e25a8bb5133a081816eefb8af7 SHA1 7ea1fbb70a9e4ab294462b2a537ad99add6208ae SHA256 6297fa70ce6cb694c63296a58d1913e01a3b262dd407f1771a5560ec3c751aba
+EBUILD cmake-2.6.4.ebuild 3280 RMD160 d8aed05611d368f96327910de3ebf4c4f9fb0116 SHA1 4c6b79401baa0a34ae9eaef0114abf04b991ff83 SHA256 35b2a739be751c90d30c2e25d73ff83432fbfa753b25439865bcf8325179455a
+MISC ChangeLog 14144 RMD160 3166daf116905ce0c151b9045c684c61b2840cff SHA1 4f6da502ba15480da09da3fdd2ae371ad7d43c52 SHA256 57e692a809196cd1519d1a3ebaeb51e33311fad5ecad0d2e47863f8a58377a36
 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
diff --git a/dev-util/cmake/cmake-2.6.4.ebuild b/dev-util/cmake/cmake-2.6.4.ebuild
new file mode 100644
index 000000000000..9436b4973b69
--- /dev/null
+++ b/dev-util/cmake/cmake-2.6.4.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.6.4.ebuild,v 1.1 2009/05/02 23:34:01 cryos Exp $
+
+EAPI="2"
+
+inherit elisp-common toolchain-funcs eutils versionator flag-o-matic cmake-utils
+
+MY_PV="${PV/rc/RC-}"
+MY_P="${PN}-$(replace_version_separator 3 - ${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 ~sparc-fbsd ~x86 ~x86-fbsd"
+SLOT="0"
+IUSE="emacs qt4 vim-syntax"
+
+DEPEND="
+	>=net-misc/curl-7.16.4
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/libxml2-2.6.28
+	>=dev-libs/xmlrpc-c-1.06.09[curl]
+	emacs? ( virtual/emacs )
+	qt4? ( x11-libs/qt-gui:4 )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-gentoo.el"
+VIMFILE="${PN}.vim"
+
+S="${WORKDIR}/${MY_P}"
+
+CMAKE_IN_SOURCE_BUILD=1
+
+PATCHES=(
+	"${FILESDIR}/${PN}-FindJNI.patch"
+	"${FILESDIR}/${PN}-FindPythonLibs.patch"
+	"${FILESDIR}/${PN}-FindPythonInterp.patch"
+)
+
+src_configure() {
+	local qt_arg par_arg
+
+	if [[ "$(gcc-major-version)" -eq "3" ]] ; then
+		append-flags "-fno-stack-protector"
+	fi
+
+	bootstrp=0
+	has_version ">=dev-util/cmake-2.6.1" || bootstrp=1
+	if [[ ${bootstrp} = 0 ]]; then
+		# Required version of CMake found, now test if it works
+		cmake --version &> /dev/null
+		if ! [[ $? = 0 ]]; then
+			bootstrp=1
+		fi
+	fi
+
+	if [[${bootstrp}]]; then
+		tc-export CC CXX LD
+
+		if use qt4; then
+			qt_arg="--qt-gui"
+		else
+			qt_arg="--no-qt-gui"
+		fi
+
+		echo $MAKEOPTS | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+		if [ $? -eq 0 ]; then
+			par_arg=$(echo $MAKEOPTS | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+')
+			par_arg="--parallel=${par_arg}"
+		else
+			par_arg="--parallel=1"
+		fi
+
+		./bootstrap \
+			--system-libs \
+			--prefix=/usr \
+			--docdir=/share/doc/${PF} \
+			--datadir=/share/${PN} \
+			--mandir=/share/man \
+			"$qt_arg" \
+			"$par_arg" || die "./bootstrap failed"
+	else
+		# this is way much faster so we should preffer it if some cmake is
+		# around.
+		use qt4 && qt_arg="ON" || qt_arg="OFF"
+		mycmakeargs="-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+			-DCMAKE_DOC_DIR=/share/doc/${PF}
+			-DCMAKE_MAN_DIR=/share/man
+			-DCMAKE_DATA_DIR=/share/${PN}
+			-DBUILD_CursesDialog=ON
+			-DBUILD_QtDialog=${qt_arg}"
+		cmake-utils_src_configure
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use emacs; then
+		elisp-compile Docs/cmake-mode.el || die "elisp compile failed"
+	fi
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use emacs; then
+		elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc || die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins "${S}"/Docs/cmake-syntax.vim
+
+		insinto /usr/share/vim/vimfiles/indent
+		doins "${S}"/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
+}