summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2011-08-26 20:46:55 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2011-08-26 20:46:55 +0000
commit1912e40265f05082e4d5a583eee3155cd8d96528 (patch)
tree05abb73d2c63fda839db4d1c8e975772b3738ce3 /app-office
parentMarked ~x86-linux, bug #375233 (diff)
downloadgentoo-2-1912e40265f05082e4d5a583eee3155cd8d96528.tar.gz
gentoo-2-1912e40265f05082e4d5a583eee3155cd8d96528.tar.bz2
gentoo-2-1912e40265f05082e4d5a583eee3155cd8d96528.zip
Build cstester only if tests are requested; then, require karbon; bug 380293
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'app-office')
-rw-r--r--app-office/calligra/ChangeLog6
-rw-r--r--app-office/calligra/calligra-2.3.74.ebuild6
2 files changed, 9 insertions, 3 deletions
diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index 3d20dd19c6c4..64624708f524 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/calligra
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.6 2011/08/26 19:53:41 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.7 2011/08/26 20:46:55 dilfridge Exp $
+
+ 26 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ calligra-2.3.74.ebuild:
+ Build cstester only if tests are requested; then, require karbon; bug 380293
26 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
calligra-2.3.74.ebuild:
diff --git a/app-office/calligra/calligra-2.3.74.ebuild b/app-office/calligra/calligra-2.3.74.ebuild
index e5dbded67bd3..23ca37ec4b27 100644
--- a/app-office/calligra/calligra-2.3.74.ebuild
+++ b/app-office/calligra/calligra-2.3.74.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.74.ebuild,v 1.4 2011/08/26 19:53:41 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.74.ebuild,v 1.5 2011/08/26 20:46:55 dilfridge Exp $
# note: files that need to be checked for dependencies etc:
# CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -24,7 +24,7 @@ SLOT="4"
[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~x86"
IUSE="+crypt +eigen +exif fftw +fontconfig freetds +gif glew +glib +gsf
gsl +iconv +jpeg jpeg2k +kdcraw kdepim +lcms marble mysql +mso +okular openctl openexr
-+pdf postgres +semantic-desktop +ssl sybase tiff +threads +truetype
++pdf postgres +semantic-desktop +ssl sybase test tiff +threads +truetype
+wmf word-perfect xbase +xml +xslt"
# please do not sort here, order is same as in CMakeLists.txt
@@ -39,6 +39,7 @@ REQUIRED_USE="
calligra_features_krita? ( eigen exif lcms )
calligra_features_plan? ( kdepim )
calligra_features_tables? ( eigen )
+ test? ( calligra_features_karbon )
"
RDEPEND="
@@ -183,6 +184,7 @@ src_configure() {
for cal_ft in ${CAL_FTS}; do
mycmakeargs+=( $(cmake-utils_use_build calligra_features_${cal_ft} ${cal_ft}) )
done
+ mycmakeargs+=( $(cmake-utils_use_build test cstester) )
# filters