Build koabstraction only if possible, bug 402655

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

4 files changed, 54 insertions, 18 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index 66e8fce7be1e..baf8eabc21c9 100644
--- a/app-office/calligra/ChangeLog
+++ b/app-office/calligra/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/calligra
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.21 2012/02/24 20:52:30 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.22 2012/02/24 21:53:46 dilfridge Exp $
+
+  24 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org>
+  calligra-2.3.87.ebuild, +files/calligra-2.3.87-koabstr.patch:
+  Build koabstraction only if possible, bug 402655
 
   24 Feb 2012; Andreas K. Huettel <dilfridge@gentoo.org>
   -calligra-2.3.86.ebuild, calligra-2.3.87.ebuild, calligra-9999.ebuild:
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index c6667def7614..c82ad35b3f7d 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -2,26 +2,27 @@
 Hash: SHA512
 
 AUX calligra-2.3.85-asneeded.patch 603 RMD160 0164db10d2fa72422d3dc2a2c6a83994d0905e7a SHA1 4cc5eae6e718e9c4b26bdb1cd890b1333f8798e4 SHA256 9fe8d3a032dd8cfa99a1e2dec0a0667a4a14a0970b8d40b19c91a44a14e3d476
+AUX calligra-2.3.87-koabstr.patch 1136 RMD160 393a97976d28a5743e108df621f8bd6f93565c62 SHA1 e90722a174718c96221beb2f7ef4ff01ad116397 SHA256 ee3af9bc928ecc3ec03caaac2acf48cb5af05e5e0a3c6e3ee896e87a2573456a
 AUX calligra-2.3.87-marble.patch 1169 RMD160 671458c9889b8f90bffc7d3e5e19e78d4ba31892 SHA1 10a73f5fb282cb03a995b59d0e155e633dca9e6f SHA256 523563109957fcdc72518961f86c6faadd9d8ef1dfeef4c32effe86d332c818d
 DIST calligra-2.3.87.tar.bz2 123191120 RMD160 b10cbd7c553e34c014ad14f5e4272061ec3ad93d SHA1 d398e78c553c4d512c57236a92732765aa82abc5 SHA256 3bdda4c35eb467f7599eef3d4fd4712be157846dc16a873cd9d3afc1b99839ab
-EBUILD calligra-2.3.87.ebuild 5765 RMD160 bf436b63457ddc0ba9b438e370d944ffe68c2945 SHA1 b068ca227032f9425a8701f72622a413389f054e SHA256 f7dfdd0646d41fba1efa003f784061e2734243e721123a338f91737b0b215d1a
+EBUILD calligra-2.3.87.ebuild 5800 RMD160 109f8fe99c05464b12f3619dc08372d3bd84b060 SHA1 dd733122b24e5db62a587f1873b1379da0282b6a SHA256 fd680c252daee34a032fad30905bce9eb14b62429724e2a619b673c6ef3a789b
 EBUILD calligra-9999.ebuild 5718 RMD160 fe03dc815b12dbe316bb8d05d5257c792f9bff76 SHA1 4564e325dced19eed1b3e5fcd2cb04e3b90a528d SHA256 973cb6fc06bc5e7c15fc163527e0be56ea311b01623319dfb017944e413d5da6
-MISC ChangeLog 3726 RMD160 2d1db37d6ab1963d0d7fb5d218043db53141e53e SHA1 0d11e4164e0d89a484256f4399a8ddd5a833a418 SHA256 27b4fadf367aa0e01b8257ce603f36f5496535ee8cf1124cd71086ca579832dd
+MISC ChangeLog 3899 RMD160 fb7bb77fe29e34292aeda0a41830e817591ac09d SHA1 3dde698efbc7bd7d189764c81e4753135b83cf42 SHA256 3cfb30717729e6ed150ac598719f0497543b4f0a147b9f5ab34a3ec873880287
 MISC metadata.xml 1491 RMD160 f8ff74f843ae8df2be457f5376f8d1ad08604c09 SHA1 56f2b25dfd6524b43aed66a177a515e80f04cde2 SHA256 9e6668563b25b690da423ea91dbac27e6289ee117cb6cb026c2657c476555c69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPR/kCAAoJENwGBM22xffergcP/R6jb1ZqbixiHC020EBV4e8L
-6TefkRy440FbU+DPgxH9Objz+aGy4cB119lP3aauSLMhgPDzkvlDyhHafdi8ZeLc
-e2LOASLHVQFQRboyvmq+OKEUZy75ocwDKF0WrO7InuhFMWHpbQGEWB9B3x12KvSL
-qqEuJfGfwAUoRjIMsTuv1fIMS78FzWmc7wOOU4ocj8ef3/ebLXN+8JmdlsxIe2M1
-1qUAnb4CgvNmrIi8IEnY+gHQe3bwQVc6YHyKGPobMN+mZvFRc5uARO9/AbgSCD5u
-hKOJS7/jHdnojms6l8GsUWL6aQWLr8/XtITvhe9yLD4JKcxsQlg3G+W3uKVCgEKh
-MavVza820OvgaQmRYagGrqaYy+4xAMVVJUl00O5lzMbKEmi2CyD6ZqD7en0uVWw1
-JBv6fdh+xbKUeLqIO7GXeNwKGoBvPoo250InMhiBdCUuO5XfdSceS1oMP5xhRe9u
-I53U1Ko/nFz2fXZpbC3lMnnb8WYKIy2cLooECJgxlpL+oucvVOtl6Y3v0DP5TXlx
-a63y8Zg4MfygWgUWcQvZLGcXCtvfhymZcFknN8yPtav46YXzER9rkjhqAYeqa7HK
-+gYqYBrnOzRHpLME9P4LGpMZpTk1AQqH1bKt/CCrXv/JNDsNjkEz9EhYuignqMP+
-VjVPpseZQgclHeWzw7/s
-=tYBt
+iQIcBAEBCgAGBQJPSAdZAAoJENwGBM22xffetjsP/1UtgFd6LcJZzJbuCKMwyKGa
+4p/0Vbraqg86V+K4FF2S8+MAc+VTIQIrJ7YoLaVG0MlFre2zz9AziF2aBLn1kzh/
+ZvV8kzPVO7+R3ws7KcSpcZbEIyq6ucSlUsirqtyAySQ7ZslQwSQXxKOPKGAPcqH/
+xbo7Ql8ZnM7FncM8Eu98gxAuJFtl7ZUpGD0TMesZoJJiSqVut/dKcaHMX0j94ASU
+Qqo8jQle0S5AhO0QYmL21WAV2NsxKl57So3EQA9nTAB09BOd/TneS8B69hvaj/MU
++LLB17wEDhTQK/brq/75i0GciGLxThUiOPzSxX6MTiqcHLUpIME4vxKTI/XmhwHx
+6rO3wmh8RegbQcn2Sg6fFBg0wMGHEe+xJEjx+e9A+4gE8tVA2ttD9krLRpfmIKrb
+iqcOP77MOkL2gNRp0/3qMxPnRt+dDB3J/9i4nAw3VVFt+hYNfBU/AnlvQU+/mUPu
+0paoaL4P3D5PV4EurE9yfQ2bvJpP1tPfaqEYy9iDGSkV8qOx0GCTGfDzU3pZZEzj
+wZlG0gPmw4lUetjsvhh2zDv47CcfjU6MC7S6xYx/X05MbK/JrezNvgBE9+AP/Oob
+XZoPCBuFm/n1a61TaavCsFpvdL99Bz45TEJ082p49RlRReBk/YkyG0cYnuwKYQ21
+/ww6nS3N7z1i7L4bRUGh
+=1nQ3
 -----END PGP SIGNATURE-----
diff --git a/app-office/calligra/calligra-2.3.87.ebuild b/app-office/calligra/calligra-2.3.87.ebuild
index c623e9da1dbd..67ec1a60e354 100644
--- a/app-office/calligra/calligra-2.3.87.ebuild
+++ b/app-office/calligra/calligra-2.3.87.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/app-office/calligra/calligra-2.3.87.ebuild,v 1.2 2012/02/24 20:52:30 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.87.ebuild,v 1.3 2012/02/24 21:53:46 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -115,7 +115,10 @@ DEPEND="${RDEPEND}"
 RESTRICT=test
 # bug 394273
 
-PATCHES=( "${FILESDIR}/${P}-marble.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-marble.patch"
+	"${FILESDIR}/${P}-koabstr.patch"
+)
 
 src_configure() {
 	local cal_ft
diff --git a/app-office/calligra/files/calligra-2.3.87-koabstr.patch b/app-office/calligra/files/calligra-2.3.87-koabstr.patch
new file mode 100644
index 000000000000..83e4da932f0e
--- /dev/null
+++ b/app-office/calligra/files/calligra-2.3.87-koabstr.patch
@@ -0,0 +1,28 @@
+From b4c55f40811cdb7ae990eeeca26757ad85ba42c8 Mon Sep 17 00:00:00 2001
+From: Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
+Date: Fri, 24 Feb 2012 22:24:14 +0100
+Subject: [PATCH] Only build koabstraction if words, tables and stage are really built (not just can be built)
+
+---
+ CMakeLists.txt |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8701780..5d8434e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -600,9 +600,9 @@ if(SHOULD_BUILD_ACTIVE)
+ endif(SHOULD_BUILD_ACTIVE)
+ 
+ 
+-if(NOT SHOULD_BUILD_TABLES OR NOT SHOULD_BUILD_WORDS OR NOT SHOULD_BUILD_STAGE)
++if(NOT SHOULD_BUILD_TABLES OR NOT BUILD_tables OR NOT SHOULD_BUILD_WORDS OR NOT BUILD_words OR NOT SHOULD_BUILD_STAGE OR NOT BUILD_stage)
+     set(SHOULD_BUILD_KOABSTRACTION FALSE)
+-endif(NOT SHOULD_BUILD_TABLES OR NOT SHOULD_BUILD_WORDS OR NOT SHOULD_BUILD_STAGE)
++endif(NOT SHOULD_BUILD_TABLES OR NOT BUILD_tables OR NOT SHOULD_BUILD_WORDS OR NOT BUILD_words OR NOT SHOULD_BUILD_STAGE OR NOT BUILD_stage)
+ 
+ if(SHOULD_BUILD_KOABSTRACTION)
+     # koabstraction depends on kotext & flake
+-- 
+1.7.3.4
+