summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-04-07 18:15:09 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-04-07 18:15:09 +0000
commit60acc79e129ac7f2f2d9d4afc8f053c11d46e812 (patch)
tree7726dbc7397ab4d124c1beb5fb58dd11213dafa6 /dev-util
parentRemove unused variable from eant doc. (diff)
downloadgentoo-2-60acc79e129ac7f2f2d9d4afc8f053c11d46e812.tar.gz
gentoo-2-60acc79e129ac7f2f2d9d4afc8f053c11d46e812.tar.bz2
gentoo-2-60acc79e129ac7f2f2d9d4afc8f053c11d46e812.zip
Inherit virtualx.eclass to fix bug #362389
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/cmake/ChangeLog5
-rw-r--r--dev-util/cmake/cmake-2.8.4.ebuild10
2 files changed, 11 insertions, 4 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog
index 660fda2e898f..2469641c935e 100644
--- a/dev-util/cmake/ChangeLog
+++ b/dev-util/cmake/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-util/cmake
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.162 2011/03/27 14:34:18 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.163 2011/04/07 18:15:09 scarabeus Exp $
+
+ 07 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> cmake-2.8.4.ebuild:
+ Inherit virtualx.eclass to fix bug #362389
27 Mar 2011; Tobias Klausmann <klausman@gentoo.org> cmake-2.8.4.ebuild:
Stable on alpha, bug #357771
diff --git a/dev-util/cmake/cmake-2.8.4.ebuild b/dev-util/cmake/cmake-2.8.4.ebuild
index 2012da3d3eb1..b267122f148b 100644
--- a/dev-util/cmake/cmake-2.8.4.ebuild
+++ b/dev-util/cmake/cmake-2.8.4.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.4.ebuild,v 1.11 2011/03/27 14:34:18 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.4.ebuild,v 1.12 2011/04/07 18:15:09 scarabeus Exp $
EAPI=3
-inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils
+inherit elisp-common toolchain-funcs eutils versionator flag-o-matic base cmake-utils virtualx
MY_P="${PN}-$(replace_version_separator 3 - ${MY_PV})"
@@ -115,7 +115,7 @@ src_compile() {
use emacs && elisp-compile Docs/cmake-mode.el
}
-src_test() {
+_run_test() {
# fix OutDir test
# this is altered thanks to our eclass
sed -i -e 's:#IGNORE ::g' "${S}"/Tests/OutDir/CMakeLists.txt || die
@@ -130,6 +130,10 @@ src_test() {
popd > /dev/null
}
+src_test() {
+ VIRTUALX_COMMAND="_run_test" virtualmake
+}
+
src_install() {
cmake-utils_src_install
if use emacs; then