Fix build with tests enabled

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

4 files changed, 36 insertions, 17 deletions

diff --git a/app-office/calligra/ChangeLog b/app-office/calligra/ChangeLog
index 420390867830..953392e6e132 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.15 2011/12/10 14:46:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/ChangeLog,v 1.16 2011/12/11 01:23:12 dilfridge Exp $
+
+  11 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  calligra-2.3.85.ebuild, +files/calligra-2.3.85-asneeded.patch:
+  Fix build with tests enabled
 
 *calligra-2.3.85 (10 Dec 2011)
 
diff --git a/app-office/calligra/Manifest b/app-office/calligra/Manifest
index 10f6eabd0692..6dfa0ab728c3 100644
--- a/app-office/calligra/Manifest
+++ b/app-office/calligra/Manifest
@@ -1,29 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX calligra-2.3.85-asneeded.patch 603 RMD160 0164db10d2fa72422d3dc2a2c6a83994d0905e7a SHA1 4cc5eae6e718e9c4b26bdb1cd890b1333f8798e4 SHA256 9fe8d3a032dd8cfa99a1e2dec0a0667a4a14a0970b8d40b19c91a44a14e3d476
 DIST calligra-2.3.83.tar.bz2 101025152 RMD160 88e0489f02eaa1a5a54f2c00d749b2b6b53298e6 SHA1 ee07ba8d856d85955c8c8e811e666eb91b86e5f9 SHA256 538f126e1b2fc5c73fbfdba71d134f560a804acee2ea598e1c3fde8c92ae6570
 DIST calligra-2.3.84.tar.bz2 103848582 RMD160 7dc52e44ac2bb6a2cb838e7d188a55458718a0a9 SHA1 0af76057c1eca55fff2541be3d0c47b911a1063f SHA256 eb916fcaec549175b6e01b122dba576e61515348a483bbf97bb1149967d4f090
 DIST calligra-2.3.85.tar.bz2 103240902 RMD160 92ff5ee2969e106969ca86d35b3c6761224f10c1 SHA1 d7d5101a693d80cf641ae64a0aeca8806c33ee1d SHA256 ab84169cf07298b56825d495c86339e4457dc89741ffd6af9bbf7a0963802ac3
 EBUILD calligra-2.3.83.ebuild 5595 RMD160 83cc983d4be64fdb88367ee3467aad36e185d3e2 SHA1 f4e5c15aaa3208beaf3a0e5ced07c230d8e718b0 SHA256 7c6209a6ad626d744bcd4fd6a3ccc2a5b0177f6c5d69b8e889b3f95f9d9d1e89
 EBUILD calligra-2.3.84.ebuild 5603 RMD160 af7fd79efa22e3352db07c8503960d9aa66ed231 SHA1 a357189d4961741d2b8c9d809e3fc9b159676685 SHA256 ccd1683d968cdf9e5eda3db1229fa88b311aeae7407ea6ce2868ad534cef9896
-EBUILD calligra-2.3.85.ebuild 5585 RMD160 daa102182c732994849781fa5185e5bf43a3a677 SHA1 228b34e6c8ea51e0b0f6cc563870767dd8d74a8b SHA256 e8a3bcd2fab51fbe9d3689078d2d8d8d5704253c80a4c19ee5356a54c8667be5
+EBUILD calligra-2.3.85.ebuild 5633 RMD160 a760429430ad583cd7438d4c222a011f123f8324 SHA1 3a9e2ddf377fd9484e5e4a9ae6d3d5c4bd72bcb8 SHA256 8ee64e29371e7835bb1ef3805afb311c75337405c503a0465f4e96bd5f89aa55
 EBUILD calligra-9999.ebuild 5583 RMD160 dd183454c0426a0ea71fb08a3ac44d31cf733a60 SHA1 2765695cadfcc1ab9718f9bacd83c9f7a2f3a425 SHA256 fa7071207563a015be3cdbb5419f6ba5dfe0813137d5a4707e2c282f6451d2ef
-MISC ChangeLog 2764 RMD160 923e5a93d206f548b8d979b40cfbda0e1aeb174b SHA1 0c6f24f1338dc593266c2e6f4c03f91b3032e3c0 SHA256 4a6c7b74484a11275c82e44b0d41381290c41d384a8cd412850c25ecd0245755
+MISC ChangeLog 2918 RMD160 98a8c25dd3047aa8a1732724a9373c2fd66b29f7 SHA1 b89977dd4709b32eb6fd2626303bba20fc9553d6 SHA256 82d7673966f63f27bd330a574445ee3dee4ec9d68c5fa37f3aea3af50a8c53ee
 MISC metadata.xml 1413 RMD160 9e5d04607a8a3f6af1d9a4daa3a224d8baa6b772 SHA1 6db8d64d20d9af877e625e630e3a437651bee3a3 SHA256 5a28be7ce31d48f02f258becf5ebded580b0cf387bf353eb24ce2fccc5746659
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO43DdAAoJENwGBM22xffe7FwP/2M3BRfHexol2McVCtWXDY38
-p0561JINEwjbl7mx9+lOhvWlBhFVunah4itVKu2zm/0mwe5ShA8FAly4FeKsJFQh
-GwTCnkzgYFbHr04zdJ5UpGWPBRZXoKzM9RQX833I0Z+iZSCdytkQ5fIcuuX9+5Vb
-fBjI7EsXMvwUOyCcKMOp3mlXGw1uwtawn8AQmMd3lmAJkkRkZ+2+1cNLB0gdBJh/
-rSNumvv3xpJ+cV57GYBzG10bq6Inw/6O+eyglBR95M2kmHXFs4dLgwp8fXSWPNSR
-RyxvIYG7E22gLgyVDpBrgWCVI58jRHDCz/MqMQOG/FOC08r77JsPanGtenwBHkAm
-35wFAao9t4E2UApg0Wp0Ss4kKr8Vw8OD91TUdUXuRfF2KL713sglco55IQp1QhZ+
-bqFBYI5gFwaohMnb+L50XT8rSpnYrmYPArKpyQ0LMin7fZynVQnitsVIM3SA60vb
-+uaSGpsxZ4/x4CBrFusWxkTqoocwqquHOIniYMGL88r/e73wWN5cph4GCo4rdm8D
-BQ8iMn8kWocwihP62WKzR2YRsyLjXMH7YS0ZNd18S9567JFHN23p9NdqjKhJvn1n
-SMpkgtbMwIaa4EO6DcsTozGlJAVZTpG2YPMSdRZmEcSjqRsz5KImD0ivRlDpfdNc
-zkSPzzTnaf1Vf4ij3ar3
-=tGb3
+iQIcBAEBCgAGBQJO5AYNAAoJENwGBM22xffeEQEP/35xcHoecili9AL4VbtX/wxV
+3Ywiw6asb8u6YqLV1m5dUfbrQgKlEzqiRGfe1yiH1IudxqTrvpZfN6/whemffl8n
+e/cdeYjwSOmQrRomHEc2/7iHeTiASsRydv1HAwnjlROL0f06UsCoSGSBiHdYOzz0
+ML5bBk69VgsfiIHw4kztPfKEeCe3U+f6Da6JtiuwU5UE7GyjrpwtYbJwUs0vWFYH
+7injyWKEA+OR+ucepofL7YWv2qlh8u6X+EbsNXkKagdDeZrw0eigJwdq5eeMPXdx
+wMqbEWGV4NsiEawC75cl1cDWAkDax1MkPHSTw/NkHNSryW2fOjnlggG5pocsuBJV
+rmB4r/+f+yfAkS6awgH/LefbUVfq5HE5ibBmu5A9Hhseb2um0lbQ7+quC/ORyctW
+EJ9j1ShGoSz7jvFdXL4mg6XjpLh+sB6dMGokD9Ni5QuiiYcBFdnMk/z5O51rRdmT
+yM2DMDe7EflYiVMV3TMaXhxrCh2J9pwlicLoYYehsvomQEwS/KzHe0kGs0zsWxoB
+JD0rHLyIYJJTQ5OIPuR+S6fp3ZBO8joyh9SAV5gK1nwCeSJzVTQLzfvauA/qkvYW
+mXLXDx2AIEGn4OoOKS7yJYWkLNAkblTogN+HPcnRfr+bvCMIybgOQd2bAFOu19Pc
+VcWRkBQap+KSdbW3Qicf
+=XkKH
 -----END PGP SIGNATURE-----
diff --git a/app-office/calligra/calligra-2.3.85.ebuild b/app-office/calligra/calligra-2.3.85.ebuild
index aa578d19a18c..8245723b407b 100644
--- a/app-office/calligra/calligra-2.3.85.ebuild
+++ b/app-office/calligra/calligra-2.3.85.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.85.ebuild,v 1.1 2011/12/10 14:46:39 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/calligra/calligra-2.3.85.ebuild,v 1.2 2011/12/11 01:23:12 dilfridge Exp $
 
 # note: files that need to be checked for dependencies etc:
 # CMakeLists.txt, kexi/CMakeLists.txt kexi/migration/CMakeLists.txt
@@ -108,6 +108,10 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-asneeded.patch"
+)
+
 src_configure() {
 	local cal_ft
 
diff --git a/app-office/calligra/files/calligra-2.3.85-asneeded.patch b/app-office/calligra/files/calligra-2.3.85-asneeded.patch
new file mode 100644
index 000000000000..7c87fd8468d2
--- /dev/null
+++ b/app-office/calligra/files/calligra-2.3.85-asneeded.patch
@@ -0,0 +1,10 @@
+diff --git a/filters/tables/excel/sidewinder/CMakeLists.txt b/filters/tables/excel/sidewinder/CMakeLists.txt
+index 8e5d889..6e232ab 100644
+--- a/filters/tables/excel/sidewinder/CMakeLists.txt
++++ b/filters/tables/excel/sidewinder/CMakeLists.txt
+@@ -43,4 +43,4 @@ add_definitions(-DSWINDER_XLS2RAW)
+ 
+ kde4_add_executable(sidewinder TEST ${sidewinder_SRCS})
+ 
+-target_link_libraries(sidewinder calligratablesodf ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${ZLIB_LIBRARIES} mso koodf)
++target_link_libraries(sidewinder mso calligratablesodf ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${ZLIB_LIBRARIES} koodf)