Fix underlinking of tests, bug 372063

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

4 files changed, 39 insertions, 18 deletions

diff --git a/app-office/libalkimia/ChangeLog b/app-office/libalkimia/ChangeLog
index 0203d48826de..a085383cda3c 100644
--- a/app-office/libalkimia/ChangeLog
+++ b/app-office/libalkimia/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libalkimia
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libalkimia/ChangeLog,v 1.2 2011/08/01 21:06:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libalkimia/ChangeLog,v 1.3 2011/08/06 17:27:50 dilfridge Exp $
+
+  06 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  libalkimia-4.3.1.ebuild, +files/libalkimia-4.3.1-underlinking.patch:
+  Fix underlinking of tests, bug 372063
 
 *libalkimia-4.3.1 (01 Aug 2011)
 
diff --git a/app-office/libalkimia/Manifest b/app-office/libalkimia/Manifest
index 75f5c27c0959..44fa5b065104 100644
--- a/app-office/libalkimia/Manifest
+++ b/app-office/libalkimia/Manifest
@@ -3,26 +3,27 @@ Hash: SHA512
 
 AUX libalkimia-4.3.0-doc.patch 1129 RMD160 e31d7bdc8f446aa3bcf2badeae10682c867e8cd0 SHA1 f69e54d50c6f862529cfdb30ec0f227fecfaec0d SHA256 26ae21c26246daf0811cf7268d8f47a42c178c463348dde470e670787ea1a892
 AUX libalkimia-4.3.1-doc.patch 1167 RMD160 509a46e8e7622023115812f74c65a261a1c3a3e7 SHA1 797f8cec153ccbb7f50fec324c2cbde75fbbbcd2 SHA256 1d9597994d5f857464fee9ff7c10ed77570f2d82c56b358421b4b1b3158062d8
+AUX libalkimia-4.3.1-underlinking.patch 1009 RMD160 a2f0ad16ac34158b59596fab06208907ecf32ffc SHA1 7cd95273eafdc4370cf3385d77727120a9306200 SHA256 9022ec790e28a32e7bffc1f57993ce09cbb1ddc0601861a1c6308717ce351350
 DIST 137323-libalkimia-4.3.0.tar.bz2 25264 RMD160 e0dcb35bd327d01c4bc8c96c2a3739ccb36f88dd SHA1 5028a0d4d9e20f9672ac0a4de2cd2a516ce76cb4 SHA256 ea888c5ab72b165f732146275898b5a4e082e65f8d690905e3edf95f33ba997a
 DIST 137323-libalkimia-4.3.1.tar.bz2 30529 RMD160 94d4e1a6d9e03ca8d5dbf70f51d7f20af31b246f SHA1 a8381bf4def252425aca31d0929e31b1aa82d0b5 SHA256 69a46d017350c2c5cc8d77d419cb4caf1d9d323a5bbc82c9d44113c6817bb2d0
 EBUILD libalkimia-4.3.0.ebuild 789 RMD160 490de3db6c46ff6bb0b2d385ae602c5f12958cef SHA1 622f0992750738d67ef2dd58a603f3e20f2d16d4 SHA256 c8a3605fd9a4b220b13e777d47d0e6453c00f8218f6f219b3a616c956b2e878c
-EBUILD libalkimia-4.3.1.ebuild 789 RMD160 5354fa5fdda527b2fa63fd9f8ef5736afef26a3e SHA1 0b87faae33abb7b78a477c797fc97e82cd6ca0fe SHA256 83a2883a758445fcad6f57b9852ce5f76818627b5baaf4686dba66bb2c67e303
-MISC ChangeLog 572 RMD160 e27850f96e83094ae6deb58ce017674125bd9bbc SHA1 64917bb5388e403a1c7ddf9ad717f6382c21c360 SHA256 ee7316a312d78d1040b2dfb6701de547169b26d80e7715a431bcc2434d5c13e3
+EBUILD libalkimia-4.3.1.ebuild 836 RMD160 506493e91e4e85150cebf33d3f33b200a3d90827 SHA1 f8f03123394be1a8a888eb78668c6efb1af95fe3 SHA256 ab295d984345af4c06856b684adae0595b479eb3e65f7a9c9d240fd5a74e3fb0
+MISC ChangeLog 741 RMD160 28c182af61fad42892cc63a6cb7d6dc72c645ae1 SHA1 58d8614e4262cff2ad4ad9c3eb1ee4a79da1e9f7 SHA256 17cfcdd899856da28f9d91155f90426684ae51291dc720d2dd0a00ec426e148c
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJONxV/AAoJENwGBM22xffe550P/2FTgrVuTZrn6XzcHCz55OaY
-caC0It5eIZcukjXLocCoxhMQgASmeSGlG/h0TMRV/DOHNg+8Hfe7GOmOzDESP2Dh
-2fN7rtCEYq+rr1D0rHeuyLejBQqwaECo+5yLCnM/8VAI/SZnd3abvXn/OiwfYWtF
-vABeB9P5iK3y21O2MyevczdLKRuEgqRfeH3afDbqoVNxNX/3rF4OIixlm24+CdWK
-oEvW29NkuAG0jXIGJ090Cq5svsc6tKnBMiDJnu6DTzZQmK6sCNIZ6P1OGby5jAI2
-bpBJR+orXyMsWDshYW9BvzJo50S1yzpjcZcYXiFEXjn32AMiSAtoQE4OE7tW+rNA
-6poDaybfOU9h/HiSzg1YshFhCcO+M6jGBhWJ8SJQUsxH3xTNtwL7BO+GyJTGdoPr
-nYxtiUCMHh96r6ZL7juSuTmFMNELA+M/Kq/fNIbpsBiKtCiNu8IB3iM1rMejLEQ5
-8D/BollwmvXcuyUxoBWTKmyl5UWuxISOid5VGDEX+bK+Kxh8xSYIxyvQQJGNB1fA
-LJr2ebsfQ/oSsiEk7VU1x5/y1CaicpNMsdlBeg0EgCHqlMaMCpYpg4JfU8IFiQaV
-XXq/MQ9IScigXKKgkTyKYAoY3ojRR7++AMXHam5GWj1mIwWSnhZJVF5tUMbaS+TM
-on52Dp9g5cU9tV5tlsR1
-=RmxM
+iQIcBAEBCgAGBQJOPXmrAAoJEEb+UGWnxTyHMu4P/1HBhpnrgJdGs4Q+pbchOe4p
+sukqGpRpAwBGl82ozRGCOb0oWsCG45LbEzh2Xm7JyOI6EEWTSiAX6T9a6Y9+ifpX
+g91YfbpbU4mwS8d5/V/k61qYTy9a3vFVunOVztlh5K5uwcFQtAJ9sZlI3zltFZYM
+LSDK/m/diTM4fxd2mz5HjzNlg4cdSf6gCTOOBGd/NqgGNXXc2OEGA4KiuMbFKnsc
+qIV6vgKqt/re6yiGVoTaVDg8yIlxSipLauV0J71myghxXkDtFZ785035FpHoGs3X
+j12pDBOmhFQLgBCNG7ey7U5WsFkhzwlB15OBz/sI1Qf9h69Hl9QOA4GFEpsR1/cJ
+f4dyKmMJNeLssS3HdtrNLsN2LnE0tfAP9bHVryov1laVivrn05MiVHYUQ0mBWSIw
+18S/6t2WUogoeTsnu1BUaZ1DH5zQbc/gx2vkQV2KHlBUSunEHAUTZhkrz215xjPZ
+Whp1KQNIjZ7yjaAeJ162y9b1glJ06Dd8X9h4km7eJz30FZS1akLre2fy1Fl21nZm
++hMNmn8rb5Uak+nrUk3NUrd+XxMZX+oq8/pUVTazg9ooMqEDr3OZFDcukU+2CoYV
+87P8zPiqTb1R1BKrOaPb9clVwsvNKGK3u095jhKxQVMM04R80ARivvLtjttXL9Qd
+uCzLHt2WjNv+v5wEaaX5
+=g9D8
 -----END PGP SIGNATURE-----
diff --git a/app-office/libalkimia/files/libalkimia-4.3.1-underlinking.patch b/app-office/libalkimia/files/libalkimia-4.3.1-underlinking.patch
new file mode 100644
index 000000000000..8a8f3fdb1297
--- /dev/null
+++ b/app-office/libalkimia/files/libalkimia-4.3.1-underlinking.patch
@@ -0,0 +1,13 @@
+diff -ruN libalkimia-4.3.1.orig/CMakeLists.txt libalkimia-4.3.1/CMakeLists.txt
+--- libalkimia-4.3.1.orig/CMakeLists.txt	2011-08-01 12:14:46.000000000 +0200
++++ libalkimia-4.3.1/CMakeLists.txt	2011-08-06 19:25:21.979577122 +0200
+@@ -106,7 +106,7 @@
+ kde4_add_unit_test( alkvaluetest TESTNAME alkimia-alkvalue ${alkvaluetest_SRCS} )
+ kde4_add_unit_test( alkquoteitemtest TESTNAME alkimia-alkquoteitem ${alkquoteitemtest_SRCS} )
+ kde4_add_unit_test( alkcompanytest TESTNAME alkimia-alkcompany ${alkcompanytest_SRCS} )
+-target_link_libraries( alkvaluetest alkimia ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} )
+-target_link_libraries( alkquoteitemtest alkimia ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} )
++target_link_libraries( alkvaluetest alkimia ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${GMP_LIBRARIES})
++target_link_libraries( alkquoteitemtest alkimia ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTTEST_LIBRARY} )
+ target_link_libraries( alkcompanytest alkimia ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} )
+ 
diff --git a/app-office/libalkimia/libalkimia-4.3.1.ebuild b/app-office/libalkimia/libalkimia-4.3.1.ebuild
index 35e99ccb3e6d..2ab6f1359479 100644
--- a/app-office/libalkimia/libalkimia-4.3.1.ebuild
+++ b/app-office/libalkimia/libalkimia-4.3.1.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/libalkimia/libalkimia-4.3.1.ebuild,v 1.1 2011/08/01 21:06:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libalkimia/libalkimia-4.3.1.ebuild,v 1.2 2011/08/06 17:27:50 dilfridge Exp $
 
 EAPI=4
 
@@ -20,7 +20,10 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( app-doc/doxygen )"
 
-PATCHES=( "${FILESDIR}/${PN}-4.3.1-doc.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.3.1-doc.patch"
+	"${FILESDIR}/${PN}-4.3.1-underlinking.patch"
+)
 
 src_configure() {
 	mycmakeargs=( $(cmake-utils_use_build doc) )