public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/
@ 2012-11-09 16:50 Michael Palimaka
  0 siblings, 0 replies; 19+ messages in thread
From: Michael Palimaka @ 2012-11-09 16:50 UTC (permalink / raw
  To: gentoo-commits

commit:     7c48f835d4708af19f5aa7bcad7c38df19d3f762
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  9 16:47:47 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Nov  9 16:48:54 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7c48f835

[dev-util/cmake] Version bump.

* Upstream has changed the version format slightly for this sort of release.
* Exclude all tests directly through CTest, so we can drop the patch.
* Stop excluding a test that no longer exists.

Package-Manager: portage-2.1.11.31

---
 dev-util/cmake/cmake-2.8.10.1.ebuild |  177 ++++++++++++++++++++++++++++++++++
 1 files changed, 177 insertions(+), 0 deletions(-)

diff --git a/dev-util/cmake/cmake-2.8.10.1.ebuild b/dev-util/cmake/cmake-2.8.10.1.ebuild
new file mode 100644
index 0000000..c929653
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.10.1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.9-r1.ebuild,v 1.1 2012/10/02 10:23:44 kensington Exp $
+
+EAPI=4
+
+CMAKE_REMOVE_MODULES="no"
+inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base 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"
+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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="emacs ncurses qt4 vim-syntax"
+
+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? (
+		x11-libs/qt-core:4
+		x11-libs/qt-gui:4
+	)
+"
+RDEPEND="${DEPEND}
+	emacs? ( virtual/emacs )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+"
+
+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.0-darwin-default-install_name.patch
+	"${FILESDIR}"/${PN}-2.8.7-FindBLAS.patch
+	"${FILESDIR}"/${PN}-2.8.7-FindBoost-python.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-desktop.patch
+	"${FILESDIR}"/${PN}-2.8.10-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-2.8.10-libform.patch
+	"${FILESDIR}"/${PN}-2.8.10-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:]]+' | 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 test
+	# this is altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
+
+	pushd "${CMAKE_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
+	"${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+pkg_setup() {
+	einfo "Fixing java access violations ..."
+	# bug 387227
+	addpredict /proc/self/coredump_filter
+}
+
+src_prepare() {
+	base_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)
+		$(cmake-utils_use_build qt4 QtDialog)
+	)
+	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
+}


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/
@ 2014-06-19 14:05 Michael Palimaka
  0 siblings, 0 replies; 19+ messages in thread
From: Michael Palimaka @ 2014-06-19 14:05 UTC (permalink / raw
  To: gentoo-commits

commit:     3e134b52390ddf04cbf6b54a614422421d00fb8e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 19 14:04:54 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 19 14:04:54 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3e134b52

[dev-util/cmake] Remove comment.

FreeType patches are merged upstream.

Package-Manager: portage-2.2.10

---
 dev-util/cmake/cmake-3.0.0.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild
index a5d8d75..6b31ad5 100644
--- a/dev-util/cmake/cmake-3.0.0.ebuild
+++ b/dev-util/cmake/cmake-3.0.0.ebuild
@@ -42,7 +42,6 @@ SITEFILE="50${PN}-gentoo.el"
 
 CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
 
-#	"${FILESDIR}"/${PN}-2.8.12.1-FindFreetype.patch
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
 	"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/
@ 2014-06-19 14:05 Michael Palimaka
  0 siblings, 0 replies; 19+ messages in thread
From: Michael Palimaka @ 2014-06-19 14:05 UTC (permalink / raw
  To: gentoo-commits

commit:     9c3209368f85c7af16e6927e3b3efc0739d51b86
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 19 14:05:40 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 19 14:05:40 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9c320936

[dev-util/cmake] Whitespace.

Package-Manager: portage-2.2.10

---
 dev-util/cmake/cmake-3.0.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild
index 6b31ad5..87a18e7 100644
--- a/dev-util/cmake/cmake-3.0.0.ebuild
+++ b/dev-util/cmake/cmake-3.0.0.ebuild
@@ -140,6 +140,7 @@ src_configure() {
 			$(cmake-utils_use_find_package qt5 Qt5Widgets)
 		)
 	fi
+
 	cmake-utils_src_configure
 }
 
@@ -154,6 +155,7 @@ src_test() {
 
 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}"


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/
@ 2014-06-19 13:55 Michael Palimaka
  0 siblings, 0 replies; 19+ messages in thread
From: Michael Palimaka @ 2014-06-19 13:55 UTC (permalink / raw
  To: gentoo-commits

commit:     7bd15e9e22f3d01750a4ab839798c305bcadc67b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 19 13:54:45 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 19 13:54:45 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7bd15e9e

[dev-util/cmake] Remove java workarounds.

It appears that Java handling has changed and this is no longer an issue.

Package-Manager: portage-2.2.10

---
 dev-util/cmake/cmake-3.0.0.ebuild | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild
index 39651af..a5d8d75 100644
--- a/dev-util/cmake/cmake-3.0.0.ebuild
+++ b/dev-util/cmake/cmake-3.0.0.ebuild
@@ -108,11 +108,6 @@ cmake_src_test() {
 	popd > /dev/null
 }
 
-pkg_setup() {
-	# bug 387227
-	addpredict /proc/self/coredump_filter
-}
-
 src_prepare() {
 	cmake-utils_src_prepare
 
@@ -131,11 +126,6 @@ src_prepare() {
 }
 
 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


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/
@ 2014-06-19 12:47 Michael Palimaka
  0 siblings, 0 replies; 19+ messages in thread
From: Michael Palimaka @ 2014-06-19 12:47 UTC (permalink / raw
  To: gentoo-commits

commit:     387e1a3eed9bbbef52581fb94a619127190d6a7e
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 19 12:47:37 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 19 12:47:37 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=387e1a3e

[dev-util/cmake] emacs is required at build time to compile elisp files.

Package-Manager: portage-2.2.10

---
 dev-util/cmake/cmake-3.0.0.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild
index 2a8c694..39651af 100644
--- a/dev-util/cmake/cmake-3.0.0.ebuild
+++ b/dev-util/cmake/cmake-3.0.0.ebuild
@@ -24,6 +24,7 @@ DEPEND="
 	>=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
@@ -35,9 +36,7 @@ DEPEND="
 		dev-qt/qtwidgets:5
 	)
 "
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )
-"
+RDEPEND="${DEPEND}"
 
 SITEFILE="50${PN}-gentoo.el"
 


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/
@ 2014-06-19 12:45 Michael Palimaka
  0 siblings, 0 replies; 19+ messages in thread
From: Michael Palimaka @ 2014-06-19 12:45 UTC (permalink / raw
  To: gentoo-commits

commit:     2202b44fafd6790a34a8d640cc7478affc44f75a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 19 12:44:26 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 19 12:44:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2202b44f

[dev-util/cmake] Remove editor support files in /usr/share/cmake.

They're already installed to the correct package-specific directory.

Package-Manager: portage-2.2.10

---
 dev-util/cmake/cmake-3.0.0.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild
index 94f238d..2a8c694 100644
--- a/dev-util/cmake/cmake-3.0.0.ebuild
+++ b/dev-util/cmake/cmake-3.0.0.ebuild
@@ -181,7 +181,8 @@ src_install() {
 	doins "${FILESDIR}/${PN}.vim"
 
 	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-	rm -rf "${D}/usr/share/cmake/completions" || die
+
+	rm -rf "${D}/usr/share/cmake/{completions,editors}" || die
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/
@ 2014-06-19 12:44 Michael Palimaka
  0 siblings, 0 replies; 19+ messages in thread
From: Michael Palimaka @ 2014-06-19 12:44 UTC (permalink / raw
  To: gentoo-commits

commit:     4178b02c35f925ff147c6eab443447ae8ee48777
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 19 12:43:04 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 19 12:43:04 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4178b02c

[dev-util/cmake] Fix emacs files directory.

Package-Manager: portage-2.2.10

---
 dev-util/cmake/cmake-3.0.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/cmake/cmake-3.0.0.ebuild b/dev-util/cmake/cmake-3.0.0.ebuild
index 1f4c068..94f238d 100644
--- a/dev-util/cmake/cmake-3.0.0.ebuild
+++ b/dev-util/cmake/cmake-3.0.0.ebuild
@@ -157,7 +157,7 @@ src_configure() {
 
 src_compile() {
 	cmake-utils_src_compile
-	use emacs && elisp-compile Docs/cmake-mode.el
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
 }
 
 src_test() {
@@ -167,7 +167,7 @@ src_test() {
 src_install() {
 	cmake-utils_src_install
 	if use emacs; then
-		elisp-install ${PN} Docs/cmake-mode.el Docs/cmake-mode.elc
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/
@ 2014-03-11 10:21 Johannes Huber
  0 siblings, 0 replies; 19+ messages in thread
From: Johannes Huber @ 2014-03-11 10:21 UTC (permalink / raw
  To: gentoo-commits

commit:     d6dff72e70a457e03f985e05e649b7cc556cf21f
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 11 10:13:39 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Mar 11 10:13:39 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d6dff72e

[dev-util/cmake] Cleanup header

Package-Manager: portage-2.2.8-r1

---
 dev-util/cmake/cmake-2.8.12.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
index c0a59db..0581bb0 100644
--- a/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
+++ b/dev-util/cmake/cmake-2.8.12.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 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.2.ebuild,v 1.2 2014/02/05 16:10:57 kensington Exp $
+# $Header: $
 
 EAPI=5
 


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/
@ 2013-10-17 19:16 Johannes Huber
  0 siblings, 0 replies; 19+ messages in thread
From: Johannes Huber @ 2013-10-17 19:16 UTC (permalink / raw
  To: gentoo-commits

commit:     cee0fda61028298418a2cbdcbc013b1b9e5cc23f
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 17 19:16:13 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Oct 17 19:16:13 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cee0fda6

[dev-util/cmake] Use non deprecated BUILD_DIR var.

Package-Manager: portage-2.2.7

---
 dev-util/cmake/cmake-2.8.12.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/cmake/cmake-2.8.12.ebuild b/dev-util/cmake/cmake-2.8.12.ebuild
index 24231c9..bfd1f2c 100644
--- a/dev-util/cmake/cmake-2.8.12.ebuild
+++ b/dev-util/cmake/cmake-2.8.12.ebuild
@@ -98,7 +98,7 @@ cmake_src_test() {
 		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
 		|| die
 
-	pushd "${CMAKE_BUILD_DIR}" > /dev/null
+	pushd "${BUILD_DIR}" > /dev/null
 
 	local ctestargs
 	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
@@ -108,7 +108,7 @@ cmake_src_test() {
 	#    CTest.updatecvs, which fails to commit as root
 	#    Qt4Deploy, which tries to break sandbox and ignores prefix
 	#    TestUpload, which requires network access
-	"${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
+	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
 		-E "(BootstrapTest|CTest.UpdateCVS|Qt4Deploy|TestUpload)" \
 		|| die "Tests failed"
 


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/
@ 2013-06-09 11:47 Johannes Huber
  0 siblings, 0 replies; 19+ messages in thread
From: Johannes Huber @ 2013-06-09 11:47 UTC (permalink / raw
  To: gentoo-commits

commit:     45c2eca70f4f6ef548a3607ea992f292a52b0aba
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 11:46:38 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 11:47:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=45c2eca7

[dev-util/cmake] Version bump.

Package-Manager: portage-2.2.0_alpha177

---
 dev-util/cmake/{cmake-2.8.11.ebuild => cmake-2.8.11.1.ebuild} | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dev-util/cmake/cmake-2.8.11.ebuild b/dev-util/cmake/cmake-2.8.11.1.ebuild
similarity index 99%
rename from dev-util/cmake/cmake-2.8.11.ebuild
rename to dev-util/cmake/cmake-2.8.11.1.ebuild
index 4b075c6..d6c2707 100644
--- a/dev-util/cmake/cmake-2.8.11.ebuild
+++ b/dev-util/cmake/cmake-2.8.11.1.ebuild
@@ -72,8 +72,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.11-more-no_host_paths.patch
 )
 
-RESTRICT="test"
-
 cmake_src_bootstrap() {
 	# Cleanup args to extract only JOBS.
 	# Because bootstrap does not know anything else.


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/
@ 2013-06-01 15:58 Michael Palimaka
  0 siblings, 0 replies; 19+ messages in thread
From: Michael Palimaka @ 2013-06-01 15:58 UTC (permalink / raw
  To: gentoo-commits

commit:     c55d1514eb1aa4df3607d0ab9778a73c2228617a
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 15:54:56 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jun  1 15:54:56 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c55d1514

[dev-util/cmake] Remove local qt5 USE flag since it is now global.

Package-Manager: portage-2.1.12.2

---
 dev-util/cmake/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dev-util/cmake/metadata.xml b/dev-util/cmake/metadata.xml
index f5a3d63..a23f444 100644
--- a/dev-util/cmake/metadata.xml
+++ b/dev-util/cmake/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>
-	<use>
-		<flag name="qt5">Adds support for the Qt GUI/Application Toolkit version 5.x</flag>
-	</use>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/
@ 2013-05-22 14:12 Chris Reffett
  0 siblings, 0 replies; 19+ messages in thread
From: Chris Reffett @ 2013-05-22 14:12 UTC (permalink / raw
  To: gentoo-commits

commit:     4e03b201aafa677062cda6384c6f35c1ae34b19a
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 13:57:03 2013 +0000
Commit:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Wed May 22 13:57:27 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4e03b201

[dev-util/cmake] Bump to 2.8.11

Package-Manager: portage-2.2.0_alpha173

---
 ...cmake-2.8.11_rc3.ebuild => cmake-2.8.11.ebuild} |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-util/cmake/cmake-2.8.11_rc3.ebuild b/dev-util/cmake/cmake-2.8.11.ebuild
similarity index 100%
rename from dev-util/cmake/cmake-2.8.11_rc3.ebuild
rename to dev-util/cmake/cmake-2.8.11.ebuild


^ permalink raw reply	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/
@ 2013-03-11 18:18 Michael Palimaka
  0 siblings, 0 replies; 19+ messages in thread
From: Michael Palimaka @ 2013-03-11 18:18 UTC (permalink / raw
  To: gentoo-commits

commit:     439868f3c71255b18ec77da1a8ee058748f31a79
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 18:17:36 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 18:17:36 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=439868f3

[dev-util/cmake] Prune inherits. Remove cruft.

Package-Manager: portage-2.1.11.55

---
 dev-util/cmake/cmake-2.8.10.2-r2.ebuild |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
index 8c5612f..84291ad 100644
--- a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
+++ b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
@@ -1,11 +1,11 @@
 # 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.10.2-r1.ebuild,v 1.1 2013/01/01 19:25:58 creffett Exp $
+# $Header: $
 
 EAPI=5
 
 CMAKE_REMOVE_MODULES="no"
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
+inherit elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
 
 DESCRIPTION="Cross platform Make"
 HOMEPAGE="http://www.cmake.org/"
@@ -110,13 +110,12 @@ cmake_src_test() {
 }
 
 pkg_setup() {
-	einfo "Fixing java access violations ..."
 	# bug 387227
 	addpredict /proc/self/coredump_filter
 }
 
 src_prepare() {
-	base_src_prepare
+	cmake-utils_src_prepare
 
 	# disable running of cmake in boostrap command
 	sed -i \


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/
@ 2013-01-16 10:35 Michael Palimaka
  0 siblings, 0 replies; 19+ messages in thread
From: Michael Palimaka @ 2013-01-16 10:35 UTC (permalink / raw
  To: gentoo-commits

commit:     97dc20a5e2a6cd98fdb44534e73bc159423c034d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 16 10:31:46 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jan 16 10:31:46 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=97dc20a5

[dev-util/cmake] Use libarchive subslots.

Package-Manager: portage-2.1.11.42
RepoMan-Options: --force

---
 dev-util/cmake/cmake-2.8.10.2-r2.ebuild |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
index 964136e..7c50be3 100644
--- a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
+++ b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.10.2-r1.ebuild,v 1.1 2013/01/01 19:25:58 creffett Exp $
 
-EAPI=4
+EAPI=5
 
 CMAKE_REMOVE_MODULES="no"
 inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
@@ -17,7 +17,7 @@ SLOT="0"
 IUSE="emacs ncurses qt4 vim-syntax"
 
 DEPEND="
-	>=app-arch/libarchive-2.8.0
+	>=app-arch/libarchive-2.8.0:=
 	>=dev-libs/expat-2.0.1
 	>=net-misc/curl-7.20.0-r1[ssl]
 	sys-libs/zlib


^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/
@ 2012-05-02 21:13 Johannes Huber
  0 siblings, 0 replies; 19+ messages in thread
From: Johannes Huber @ 2012-05-02 21:13 UTC (permalink / raw
  To: gentoo-commits

commit:     2fee0a8bc0bbc36510d489a1f67978e9c1a19eb0
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed May  2 20:50:56 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed May  2 20:50:56 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2fee0a8b

[dev-util/cmake] Remove obsolete comment.

(Portage version: 2.2.0_alpha101/git/Linux i686, unsigned Manifest commit)

---
 dev-util/cmake/cmake-2.8.8.ebuild |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/dev-util/cmake/cmake-2.8.8.ebuild b/dev-util/cmake/cmake-2.8.8.ebuild
index 1386340..cab3e53 100644
--- a/dev-util/cmake/cmake-2.8.8.ebuild
+++ b/dev-util/cmake/cmake-2.8.8.ebuild
@@ -44,9 +44,6 @@ S="${WORKDIR}/${MY_P}"
 
 CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
 
-# TODO "${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
-# needs replacement in 2.8.8.
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
 	"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
@@ -61,6 +58,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.8-more-no_host_paths.patch
 	"${FILESDIR}"/${PN}-2.8.8-tests.patch
 )
+
 cmake_src_bootstrap() {
 	# Cleanup args to extract only JOBS.
 	# Because bootstrap does not know anything else.



^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/
@ 2012-05-01 11:21 Johannes Huber
  0 siblings, 0 replies; 19+ messages in thread
From: Johannes Huber @ 2012-05-01 11:21 UTC (permalink / raw
  To: gentoo-commits

commit:     4836c96f54726abb8947601ef8315a73b9d1ac7f
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue May  1 11:19:35 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue May  1 11:19:35 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4836c96f

[dev-util/cmake] Cleanup header.

(Portage version: 2.2.0_alpha101/git/Linux x86_64, unsigned Manifest commit)

---
 dev-util/cmake/cmake-2.8.8.ebuild |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dev-util/cmake/cmake-2.8.8.ebuild b/dev-util/cmake/cmake-2.8.8.ebuild
index c203b12..11db0c4 100644
--- a/dev-util/cmake/cmake-2.8.8.ebuild
+++ b/dev-util/cmake/cmake-2.8.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.7-r5.ebuild,v 1.1 2012/03/09 01:22:06 dilfridge Exp $
+# $Header: $
 
 EAPI=4
 



^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/
@ 2012-04-22 17:04 Chris Reffett
  0 siblings, 0 replies; 19+ messages in thread
From: Chris Reffett @ 2012-04-22 17:04 UTC (permalink / raw
  To: gentoo-commits

commit:     b25a0c87a347e7cf825e6d055abb68320c0c7107
Author:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
AuthorDate: Sun Apr 22 17:03:42 2012 +0000
Commit:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Sun Apr 22 17:03:42 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b25a0c87

[dev-util/cmake] Restrict tests until we patch test 62 to not destroy /usr/local/

(Portage version: 2.2.0_alpha100/git/Linux x86_64, unsigned Manifest commit)

---
 dev-util/cmake/cmake-2.8.8.ebuild |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/dev-util/cmake/cmake-2.8.8.ebuild b/dev-util/cmake/cmake-2.8.8.ebuild
index f3f6ff7..7f49779 100644
--- a/dev-util/cmake/cmake-2.8.8.ebuild
+++ b/dev-util/cmake/cmake-2.8.8.ebuild
@@ -18,6 +18,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 SLOT="0"
 IUSE="emacs ncurses qt4 vim-syntax"
 
+#Test 62 wiped out /usr/local/, restricting until that's fixed
+RESTRICT="test"
+
 DEPEND="
 	>=app-arch/libarchive-2.8.0
 	>=net-misc/curl-7.20.0-r1[ssl]



^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/
@ 2012-01-21 23:37 Johannes Huber
  0 siblings, 0 replies; 19+ messages in thread
From: Johannes Huber @ 2012-01-21 23:37 UTC (permalink / raw
  To: gentoo-commits

commit:     4ef2eec1a7cbd2c3635d36eecdf8ffcc6e2d249f
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 23:33:46 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 23:33:46 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4ef2eec1

[dev-util/cmake] Moved to tree.

(Portage version: 2.2.0_alpha84/git/Linux i686, unsigned Manifest commit)

---
 dev-util/cmake/cmake-2.8.7.ebuild |  175 -------------------------------------
 1 files changed, 0 insertions(+), 175 deletions(-)

diff --git a/dev-util/cmake/cmake-2.8.7.ebuild b/dev-util/cmake/cmake-2.8.7.ebuild
deleted file mode 100644
index 43b68db..0000000
--- a/dev-util/cmake/cmake-2.8.7.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.6-r4.ebuild,v 1.6 2012/01/04 16:36:22 ranger Exp $
-
-EAPI=4
-
-CMAKE_REMOVE_MODULES="no"
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
-
-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 ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="emacs ncurses qt4 vim-syntax"
-
-DEPEND="
-	>=app-arch/libarchive-2.8.0
-	>=net-misc/curl-7.20.0-r1[ssl]
-	>=dev-libs/expat-2.0.1
-	dev-util/pkgconfig
-	sys-libs/zlib
-	ncurses? ( sys-libs/ncurses )
-	qt4? ( x11-libs/qt-gui:4 )
-"
-RDEPEND="${DEPEND}
-	emacs? ( virtual/emacs )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)
-"
-
-SITEFILE="50${PN}-gentoo.el"
-VIMFILE="${PN}.vim"
-
-S="${WORKDIR}/${MY_P}"
-
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-
-# Fixme:
-# Boost patchset is foobared and should respect eselect / slotting
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
-	"${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
-	"${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
-	"${FILESDIR}"/${PN}-2.8.1-libform.patch
-	"${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
-	"${FILESDIR}"/${PN}-2.8.6-FindBoost.patch
-	"${FILESDIR}"/${PN}-2.8.6-FindBLAS-2.patch
-	"${FILESDIR}"/${PN}-2.8.6-FindLAPACK-2.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:]]+' | egrep -o '[[:digit:]]+')
-		par_arg="--parallel=${par_arg}"
-	else
-		par_arg="--parallel=1"
-	fi
-
-	tc-export CC CXX LD
-
-	./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		${par_arg} \
-		|| die "Bootstrap failed"
-}
-
-cmake_src_test() {
-	# fix OutDir test
-	# this is altered thanks to our eclass
-	sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
-
-	pushd "${CMAKE_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.
-	#    SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test
-	#        as it was never intended to be used this way.
-	"${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
-		-E BootstrapTest SimpleCOnly_sdcc \
-		|| die "Tests failed"
-
-	popd > /dev/null
-}
-
-pkg_setup() {
-	einfo "Fixing java access violations ..."
-	# bug 387227
-	addpredict /proc/self/coredump_filter
-}
-
-src_prepare() {
-	base_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)
-		$(cmake-utils_use_build qt4 QtDialog)
-	)
-	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
-}



^ permalink raw reply related	[flat|nested] 19+ messages in thread
* [gentoo-commits] proj/kde:master commit in: dev-util/cmake/
@ 2012-01-13 13:07 Johannes Huber
  0 siblings, 0 replies; 19+ messages in thread
From: Johannes Huber @ 2012-01-13 13:07 UTC (permalink / raw
  To: gentoo-commits

commit:     cf4fc467cf5b48b8e9c226d3a4798900d8fa14b9
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 13 12:58:55 2012 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jan 13 12:58:55 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cf4fc467

[dev-util/cmake] Version bump 2.8.7.

(Portage version: 2.2.0_alpha84/git/Linux x86_64, unsigned Manifest commit)

---
 dev-util/cmake/cmake-2.8.7.ebuild |  175 +++++++++++++++++++++++++++++++++++++
 1 files changed, 175 insertions(+), 0 deletions(-)

diff --git a/dev-util/cmake/cmake-2.8.7.ebuild b/dev-util/cmake/cmake-2.8.7.ebuild
new file mode 100644
index 0000000..43b68db
--- /dev/null
+++ b/dev-util/cmake/cmake-2.8.7.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.6-r4.ebuild,v 1.6 2012/01/04 16:36:22 ranger Exp $
+
+EAPI=4
+
+CMAKE_REMOVE_MODULES="no"
+inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
+
+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 ~x86 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="emacs ncurses qt4 vim-syntax"
+
+DEPEND="
+	>=app-arch/libarchive-2.8.0
+	>=net-misc/curl-7.20.0-r1[ssl]
+	>=dev-libs/expat-2.0.1
+	dev-util/pkgconfig
+	sys-libs/zlib
+	ncurses? ( sys-libs/ncurses )
+	qt4? ( x11-libs/qt-gui:4 )
+"
+RDEPEND="${DEPEND}
+	emacs? ( virtual/emacs )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+"
+
+SITEFILE="50${PN}-gentoo.el"
+VIMFILE="${PN}.vim"
+
+S="${WORKDIR}/${MY_P}"
+
+CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+
+# Fixme:
+# Boost patchset is foobared and should respect eselect / slotting
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.3-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-2.6.3-no-duplicates-in-rpath.patch
+	"${FILESDIR}"/${PN}-2.6.3-fix_broken_lfs_on_aix.patch
+	"${FILESDIR}"/${PN}-2.8.0-darwin-default-install_name.patch
+	"${FILESDIR}"/${PN}-2.8.1-libform.patch
+	"${FILESDIR}"/${PN}-2.8.4-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-2.8.3-more-no_host_paths.patch
+	"${FILESDIR}"/${PN}-2.8.6-FindBoost.patch
+	"${FILESDIR}"/${PN}-2.8.6-FindBLAS-2.patch
+	"${FILESDIR}"/${PN}-2.8.6-FindLAPACK-2.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:]]+' | egrep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	tc-export CC CXX LD
+
+	./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir test
+	# this is altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
+
+	pushd "${CMAKE_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.
+	#    SimpleCOnly_sdcc: sdcc choke on global cflags so just skip the test
+	#        as it was never intended to be used this way.
+	"${CMAKE_BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E BootstrapTest SimpleCOnly_sdcc \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+pkg_setup() {
+	einfo "Fixing java access violations ..."
+	# bug 387227
+	addpredict /proc/self/coredump_filter
+}
+
+src_prepare() {
+	base_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)
+		$(cmake-utils_use_build qt4 QtDialog)
+	)
+	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
+}



^ permalink raw reply related	[flat|nested] 19+ messages in thread

end of thread, other threads:[~2014-06-19 14:06 UTC | newest]

Thread overview: 19+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-09 16:50 [gentoo-commits] proj/kde:master commit in: dev-util/cmake/ Michael Palimaka
  -- strict thread matches above, loose matches on Subject: below --
2014-06-19 14:05 Michael Palimaka
2014-06-19 14:05 Michael Palimaka
2014-06-19 13:55 Michael Palimaka
2014-06-19 12:47 Michael Palimaka
2014-06-19 12:45 Michael Palimaka
2014-06-19 12:44 Michael Palimaka
2014-03-11 10:21 Johannes Huber
2013-10-17 19:16 Johannes Huber
2013-06-09 11:47 Johannes Huber
2013-06-01 15:58 Michael Palimaka
2013-05-22 14:12 Chris Reffett
2013-03-11 18:18 Michael Palimaka
2013-01-16 10:35 Michael Palimaka
2012-05-02 21:13 Johannes Huber
2012-05-01 11:21 Johannes Huber
2012-04-22 17:04 Chris Reffett
2012-01-21 23:37 Johannes Huber
2012-01-13 13:07 Johannes Huber

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox