Version bump, in package.mask initially for further testing.

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

3 files changed, 165 insertions, 2 deletions

diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index b724e7687ee2..056198038323 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/cmake
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.106 2009/07/28 16:30:34 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.107 2009/10/01 13:35:02 cryos Exp $
+
+*cmake-2.8.0_rc1 (01 Oct 2009)
+
+  01 Oct 2009; Marcus D. Hanwell <cryos@gentoo.org> +cmake-2.8.0_rc1.ebuild:
+  Version bump, in package.mask initially for further testing.
 
 *cmake-2.6.4-r2 (28 Jul 2009)
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index a3200d55593d..4a35858e6802 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -8,10 +8,12 @@ AUX cmake.vim 217 RMD160 3ac23077646d31e9c29ff32ae2eba20b63c07809 SHA1 527b989ae
 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
+DIST cmake-2.8.0-rc1.tar.gz 3524542 RMD160 7e80e6bd62ff70589e6ddde314170fdbf6ee79d0 SHA1 2a5b04bc5a1ffec194127985f0f23b258076d7b3 SHA256 078c24275a3aa62d1a7440cf19c4be9ac4095cb1db1913adeb9c5f2cf63bfd74
 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
 EBUILD cmake-2.6.4-r1.ebuild 3485 RMD160 d5563d0db93b1936e350feb9755b318d5cb94bb2 SHA1 b446894b3e0efb73532a0d4e95d47c3b31a7684e SHA256 bb7e274284bcac0981bcc3fa749a8a71a211b2d3096f7c079e91513a3264d84f
 EBUILD cmake-2.6.4-r2.ebuild 3742 RMD160 4c0de89e7799c3a71f89de0a8b4d9ac4f9ea0960 SHA1 fd5c2c29fbc17df09377559be54381414fe6250a SHA256 0044956f38d508fc77909ce8e7def61f5df80f73698fe2eead79a7978a9a8b27
 EBUILD cmake-2.6.4.ebuild 3436 RMD160 a15fa36719f3581fa67c9d7e64c3ac5d55719a6e SHA1 0200e57a666461d4840164a52221b80e4f72636b SHA256 619d8daff2df4ec92265550c42717f2e3301497d37f4d0fc0c638af359da6d67
-MISC ChangeLog 16044 RMD160 a82fb8ad6e6e85d360930d8312d4d578c8b53973 SHA1 0f004d3ecb777257d536837759c009ffe0640035 SHA256 df8e11f9081aebd4485e355582be6e4bcbf72d65b46282191a46a2b872ca4482
+EBUILD cmake-2.8.0_rc1.ebuild 3683 RMD160 52bf7c061a355085e2cb490456df6fa6d3939396 SHA1 4aa141445313e21c30286aaa6c725a3772dea9b8 SHA256 20d08eff45ca82b7ee14e507c1ee2ba16758815271594d82a4b4f15e48b80b68
+MISC ChangeLog 16214 RMD160 2867ccea8f86c1e4380756313ba63eb91bf63b13 SHA1 b018bbb5bf8c5ad37b53f7a90bbf75854e8b863f SHA256 349a5ee446eaa5bf8ce31c5802d5a0218041f57b0bcb0d0aaf54149f9def9ce6
 MISC metadata.xml 243 RMD160 1f3291b8046f981ffc71b1d2d58ceac2106b06c1 SHA1 ceb365206a68962f212f46c526f0cf8daf73c090 SHA256 335e49103b0cbe4a0839a735a83e52914202f8978232230506f31dcfc257d182
diff --git a/dev-util/cmake/cmake-2.8.0_rc1.ebuild b/dev-util/cmake/cmake-2.8.0_rc1.ebuild
new file mode 100644
index 000000000000..75e1f69f527e
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.0_rc1.ebuild
@@ -0,0 +1,156 @@
+# 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.8.0_rc1.ebuild,v 1.1 2009/10/01 13:35:02 cryos Exp $
+
+EAPI="2"
+
+inherit elisp-common toolchain-funcs eutils versionator flag-o-matic cmake-utils
+
+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 python3 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.27[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"
+)
+
+pkg_setup() {
+	if use python3; then
+		ewarn "Support for Python 3 is experimental."
+		ewarn "Please include patches in bug reports!"
+		ebeep 6
+	fi
+}
+
+src_prepare() {
+	base_src_prepare
+
+	use python3 && epatch "${FILESDIR}/${PN}-python-3.patch"
+}
+
+src_configure() {
+	local qt_arg par_arg
+
+	if [[ "$(gcc-major-version)" -eq "3" ]] ; then
+		append-flags "-fno-stack-protector"
+	fi
+
+	bootstrap=0
+	has_version ">=dev-util/cmake-2.6.1" || bootstrap=1
+	if [[ ${bootstrap} = 0 ]]; then
+		# Required version of CMake found, now test if it works
+		cmake --version &> /dev/null
+		if ! [[ $? = 0 ]]; then
+			bootstrap=1
+		fi
+	fi
+
+	if [[ ${bootstrap} = 1 ]]; 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() {
+	einfo "Please note that test \"58 - SimpleInstall-Stage2\" might fail."
+	einfo "If any package installs with cmake, it means test failed but cmake work."
+	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
+}