Build cstester only if tests are requested; then, require karbon; bug 380293

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

3 files changed, 24 insertions, 18 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/Manifest b/app-office/calligra/Manifest
index e6bc041c3772..9bc53b20af95 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -4,23 +4,23 @@ Hash: SHA512
 AUX calligra-2.3.74-jpeglcms-2.patch 1014 RMD160 cd9532d322789aa655448fb89ffed5835d4e24ae SHA1 fd6770d6b88c360e6a5d0426d6ae0c1f19614720 SHA256 f4593796592cc5973685b1a9b25ca1e4f20b3ed3a64043582324eaa89b301de2
 AUX calligra-2.3.74-jpeglcms.patch 723 RMD160 07b5d22e1e2e27dd658c7ec8e10e093e11108f17 SHA1 11cae52b535f8d665ae48d8fa32aa35f7e745ecc SHA256 5cfcb207b7d963fd3c593b5c43bff5774238c69da7a95df20aadd017fa7b6cc1
 DIST calligra-2.3.74.tar.bz2 105902759 RMD160 95154039344ac07ec75323821afff8d2e60159ed SHA1 b1ac9f3036f5d52aacd7a9caaa168f7ef5eae8dc SHA256 686a8f5f7eac49c40c53cbdb8cfbb102e765790dd0cfe2d1843975c55921e447
-EBUILD calligra-2.3.74.ebuild 5528 RMD160 775ce140786c7cc3fdd0b8f1ff45d66bcf0fd652 SHA1 78e0df0875542692bfdce3f65730fc0b3d9cb433 SHA256 b446871cf7d063b9ef55ac4eaa35a95eeb7152fb66ffa520c5b9850aa6ab06e6
-MISC ChangeLog 1171 RMD160 34875dbc6ba2635b1cb8f73fa2bfc7c627bfaf6d SHA1 f2006c6dba7c9ee48f783a49db2efb5c15b27436 SHA256 f8cb2ee2e3cba141a10c4028d27a9eeae8f60a712f6cbf0b8c90fbd271f099cd
+EBUILD calligra-2.3.74.ebuild 5626 RMD160 e2d99aea615eab8c0baa2a019d15c4c663703c99 SHA1 878736ee9745290fdcf87634461bee10a0cdc48f SHA256 6b21cf35ae71a67adf795c598006af10ace2305f510414ba50e7d675808543a8
+MISC ChangeLog 1334 RMD160 caf39f42ece2b8374270823d72ac12cdcdc9e9a5 SHA1 8bfe776af2045c187bcb29b8aa8f029a6ada84bb SHA256 a7789fe4436ec66c93efad863e12e3a2ca559e10e1b6fe8492b021c98f3be3c6
 MISC metadata.xml 1413 RMD160 9e5d04607a8a3f6af1d9a4daa3a224d8baa6b772 SHA1 6db8d64d20d9af877e625e630e3a437651bee3a3 SHA256 5a28be7ce31d48f02f258becf5ebded580b0cf387bf353eb24ce2fccc5746659
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOV/nbAAoJENwGBM22xffe6ZEQAKFdIAkMLmaglrYRK9k1R9Be
-6FLNvDclO8WrB5ag76N49TRLZhRHtPXObH/8HpGbH/FQrXpzpWjGA2A+axV7zTXs
-Tc3gOBCEJrXq7JqAyIAG1mjmFr29GLcG+WrqmO5oDhxan0fyMR7vFmhvKp0ahq8P
-ClzAsbflhfY4p/HCKOMPPBZrN9vCTQ7pvqFIfp5GhrA6LePXJ89duL2kUb2bKUX3
-kaKgZdKO0BdxwKGboLgygK0VsddOPSSowm/78ViYcuRw7S8vvQkrnjVODktvpxue
-81Hf9AJPnIzUYR8QVg/GkwDz/dn4hQtgwMnznSMHeYByNKeHDDcX6zA1C35sRfrQ
-527a8k6eDyx7X4AwOv9EjckVzypc1/043/Ge9z+joYLOvhseBMgb9v9ZrAcj5/jZ
-lSi9CkKRJogMJh6avDleP/yhtN+hMQB71DCBTfE4jh8E5QzaLoAkoCNYreYfCzJP
-PtZAzWkPZajhz2FbdcL4eoBPQ0OqkwOum58Ka0bsNweitzMwx4mYTRE4A38iGjzx
-EJgYMHohuG5UQeMhFABuAdzamgPUiNihDuLYR5bfr0UdgbO2/JSuGGMFi4yQxD8L
-KQLuYIMwU4S8HYrWSHfinltJAd5WZgL0hb/hfJjyT48Ri6MvRvH67OQ1ijiaZFS5
-k7x3qho26aQFfqKfV4VN
-=lcg4
+iQIcBAEBCgAGBQJOWAZSAAoJENwGBM22xffea+8P/33xYWf6ixwdLU3yt27nT7Mi
+dxwHLvl0CttkNjVrZI5dEMf9Rzp4vIu9CHeZduucDf5B+39h/Qo+T7S9u6eoVAoK
+5a+VyKnpt0UqA2/xYj7lOA2l9Mkhg+qi4GqXg9JWBw80c0FtSHJPEDcPMllEyA9D
+pBSbFAG3cDdFloNJB6kFzwa4LfwhknJ02JwdjdqZ+z1SDObhz/0q7E2WwEB0ohAI
+0DE4TpQ7Zs5msKshWHQzeMetI1lxVY838o5g9sTRk4MgWpPm0oRG26mEAdf/so7l
+UbYnXJ10ab7iwAxDhKGE5oztte/El8sNVsHoDl4rsxu4cn3FWA3fXq2BViqCJlfF
+VH0L8kLZdpsQOvFgIT/eR77ir9hW8sl3W9+iE4yvrZjLIiCG7QYt7NH6CTlUTFPb
+n6iE69kM1ppJjyYxNoB4oNlpGSLqaxsrY4OdomIk2Jp4ZGIisd/n1G76Uv5324KU
+vpDQrTyPIIAPzzIe+ts5LEVdT3n1ckMNe8RQXlGr3UCryIP4QmIxtwZ55aRMkFx1
+X96gpIjstMP+HQQ5XBrUu28cYs0LlxH65Oo1hqBcmWYS25KyM/MfdRTLMzg1XNlz
+1Bu0FePeKMeMM2shlQKxjAJ0IVL3WFJvBzB9bm9c1YkqGEfdg5gxvU+TpP7MtjqO
+rTg6uOGCOXAfGbaZadXB
+=IGhN
 -----END PGP SIGNATURE-----
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