[gentoo-commits] gentoo-x86 commit in dev-util/cmake: cmake-2.8.0_rc1.ebuild ChangeLog cmake-2.6.4-r3.ebuild metadata.xml cmake-2.6.4-r2.ebuild

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    09/10/01 18:10:14

  Modified:             cmake-2.8.0_rc1.ebuild ChangeLog metadata.xml
  Added:                cmake-2.6.4-r3.ebuild
  Removed:              cmake-2.6.4-r2.ebuild
  Log:
  FindPythonLibs.cmake should use currently active Python version (bug #287143). Remove no longer needed "python3" USE flag.
  (Portage version: 14469-svn/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-util/cmake/cmake-2.8.0_rc1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/cmake-2.8.0_rc1.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/cmake-2.8.0_rc1.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/cmake-2.8.0_rc1.ebuild?r1=1.1&r2=1.2

Index: cmake-2.8.0_rc1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.0_rc1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cmake-2.8.0_rc1.ebuild	1 Oct 2009 13:35:02 -0000	1.1
+++ cmake-2.8.0_rc1.ebuild	1 Oct 2009 18:10:14 -0000	1.2
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.0_rc1.ebuild,v 1.2 2009/10/01 18:10:14 arfrever Exp $
 
 EAPI="2"
 
@@ -15,7 +15,7 @@
 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"
+IUSE="emacs qt4 vim-syntax"
 
 DEPEND="
 	>=net-misc/curl-7.16.4
@@ -46,20 +46,6 @@
 	"${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
 



1.108                dev-util/cmake/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.108&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/ChangeLog?rev=1.108&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/ChangeLog?r1=1.107&r2=1.108

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- ChangeLog	1 Oct 2009 13:35:02 -0000	1.107
+++ ChangeLog	1 Oct 2009 18:10:14 -0000	1.108
@@ -1,6 +1,15 @@
 # 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.107 2009/10/01 13:35:02 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.108 2009/10/01 18:10:14 arfrever Exp $
+
+*cmake-2.6.4-r3 (01 Oct 2009)
+
+  01 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  -cmake-2.6.4-r2.ebuild, +cmake-2.6.4-r3.ebuild, cmake-2.8.0_rc1.ebuild,
+  -files/cmake-python-3.patch, files/cmake-FindPythonLibs.patch,
+  metadata.xml:
+  FindPythonLibs.cmake should use currently active Python version (bug
+  #287143). Remove no longer needed "python3" USE flag.
 
 *cmake-2.8.0_rc1 (01 Oct 2009)
 



1.4                  dev-util/cmake/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/metadata.xml?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/metadata.xml?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/metadata.xml?r1=1.3&r2=1.4

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/metadata.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- metadata.xml	28 Jul 2009 16:30:34 -0000	1.3
+++ metadata.xml	1 Oct 2009 18:10:14 -0000	1.4
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
-	<use>
-		<flag name="python3">Enable experimental support for Python 3</flag>
-	</use>
 </pkgmetadata>



1.1                  dev-util/cmake/cmake-2.6.4-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/cmake-2.6.4-r3.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/cmake-2.6.4-r3.ebuild?rev=1.1&content-type=text/plain

Index: cmake-2.6.4-r3.ebuild
===================================================================
# 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-r3.ebuild,v 1.1 2009/10/01 18:10:14 arfrever 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.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"
	"${FILESDIR}/${P}-FindBoost.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
}