Fix underlinking, bug 369443

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

4 files changed, 44 insertions, 4 deletions

diff --git a/app-office/kmymoney/ChangeLog b/app-office/kmymoney/ChangeLog
index 86050b9154ac..56f62197b391 100644
--- a/app-office/kmymoney/ChangeLog
+++ b/app-office/kmymoney/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/kmymoney
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.19 2011/03/13 16:04:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.20 2011/08/06 20:20:58 dilfridge Exp $
+
+  06 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> kmymoney-4.5.3.ebuild,
+  +files/kmymoney-4.5.3-underlinking.patch:
+  Fix underlinking, bug 369443
 
   13 Mar 2011; Markos Chandras <hwoarang@gentoo.org> kmymoney-4.5.3.ebuild:
   Stable on amd64 wrt bug #358517
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index abcf339d9a67..8e605f2f957d 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,4 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX kmymoney-4.5.3-underlinking.patch 960 RMD160 fc4f54a5d5094668e6c37553661a12523f9ec79d SHA1 385fb9bd22625ddeb7b2545fe4e92d29b8ba42e5 SHA256 33d04cd3fc549871264ee02e9532e0afe07e2e9223008feac6c57e87d4bf6849
 DIST kmymoney-4.5.3.tar.bz2 14937401 RMD160 896e2efcfe7ec400327f74d40b9393eaf38cbce5 SHA1 3333d19d2c84eae45b1be3aeb3d90780f2beb9e1 SHA256 a9b37275cf3cdcd5ce865d94391df44c7822639b830fccb9962a54b7fcf76ffb
-EBUILD kmymoney-4.5.3.ebuild 1737 RMD160 45859da16787966279ed49d41cd4dc391f102cba SHA1 429865243f35430eee313331443dec3a0c96f89f SHA256 59e86a7753d742558e02b9fd9082a9a13d55332cf61bbab0ff547dc0baa8a976
-MISC ChangeLog 2889 RMD160 a902fd9a7af11f129701fcb451f51fb735b72d65 SHA1 96cfdeea34813f59a3525645e40eb2a7b1b240e6 SHA256 3077389792a1cbb4b3eb80e924a2680251849f2d83fa96ebd6f32d2cff58ff25
+EBUILD kmymoney-4.5.3.ebuild 1789 RMD160 c031816a32d50e03694c8ea57f2e2df4020450b5 SHA1 48fdc7e30572f47d41652fa31027723fb0278a87 SHA256 3a2a194601332f3af474305d9694f0546b9a4dfe771e9bc918d0078d388f4a67
+MISC ChangeLog 3046 RMD160 e87d19994a80e1102afee02eb909d9968568dd54 SHA1 13aedef72bb86f216ae0b6eb880dea41c8498242 SHA256 dba9cbc923a228d54c16d742ce930df8c12a01039bfff91d21f01316e5c1e2c6
 MISC metadata.xml 327 RMD160 337c462e38007a529ca6c979b341426898a9af04 SHA1 62bfe203a842760f95655a42acdd1da8f4436637 SHA256 af0c2dc62649bae5e9a0b375d7106bee7952dda0b258ad375e2cf1551c75246f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOPaJHAAoJEEb+UGWnxTyHBKgP/R0eM1G7ENkiAdimYhIMSNPJ
+D7F2xhOigxulzRFbUIHYN3TgvsGSBv3URAaRLYwUeXGnN95hP0mEopu2mNVjomRN
+ESv0JB4rGteSWMVX3hD99eKcGfVvxRZOkjYcPoBK1HdhzEcjLhKvOCduTA3IpTPn
+UbtM1N5aC8zHMY62IksWZcYtE5RpCSiKl16vyGhNtdVkPZpNUG0Iff4I1JsnrS5a
+Nu/WK99BJJ0OrDRrA3h2O4Z0vKV6kJUS0GC9SfsCxcj+4pi7MJ1bYagP7sdm/HTD
+4hn4NJMVyzMgVoPNauE6Vx+vKfI2XcH2iMZLCAlbkLsLDDaPGtoOb9s30GWXniII
+iZF74id8jvBP9fMpuyylKoyKG8DDIEa6geGj8ED7+E9EKEYwVs9ZQSNDZr00koxs
+GFCMcmHMeJdpXc8OshrdCgYMpQLrLAHFg337N4ZI4KGKZFgxf17HaVH5S5I2XAkW
+5+3Lzc/GN0KlMwxkEppAR4UQ1SGeummRtNHC1EmssL1BZR90mAxvMDQyuEFR67R1
+k56w1pu2RufvKWEmrlsGJCtWMldVFFmv2SncC/c2pndC8KfCgefDCNhfTfzN+r6p
+hXhlQC2ULL87xkfN3U8fTo0UKocQ7Fnt0Ffh7z3Bnz1Nl9URN1p9D3jFcVJ9sBZD
+BQgMorhD0HY9DGzbcsVc
+=+S+E
+-----END PGP SIGNATURE-----
diff --git a/app-office/kmymoney/files/kmymoney-4.5.3-underlinking.patch b/app-office/kmymoney/files/kmymoney-4.5.3-underlinking.patch
new file mode 100644
index 000000000000..77c2d2f6225f
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-4.5.3-underlinking.patch
@@ -0,0 +1,13 @@
+diff -urN kmymoney-4.5.3.orig/kmymoney/mymoney/storage/CMakeLists.txt kmymoney-4.5.3/kmymoney/mymoney/storage/CMakeLists.txt
+--- kmymoney-4.5.3.orig/kmymoney/mymoney/storage/CMakeLists.txt	2011-02-12 10:05:48.000000000 +0100
++++ kmymoney-4.5.3/kmymoney/mymoney/storage/CMakeLists.txt	2011-08-06 22:12:57.501609127 +0200
+@@ -33,7 +33,8 @@
+   kde4_add_unit_test( mymoneydatabasemgrtest TESTNAME kmymoney-mymoneydatabasemgrtest ${mymoneydatabasemgrtest_SRCS} )
+   ADD_DEPENDENCIES( mymoneydatabasemgrtest kmymoney_base kmymoney_common kmm_storage )
+ 
+-  target_link_libraries( mymoneydatabasemgrtest kmymoney_base kmymoney_common kmm_storage ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTTEST_LIBRARY} )
++  target_link_libraries( mymoneydatabasemgrtest kmymoney_base kmymoney_common kmm_storage ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTSQL_LIBRARY} 
++    ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} )
+ ENDIF(NOT WIN32)
+ 
+   # MyMoneyMap
diff --git a/app-office/kmymoney/kmymoney-4.5.3.ebuild b/app-office/kmymoney/kmymoney-4.5.3.ebuild
index da05891d44fb..9e752a531689 100644
--- a/app-office/kmymoney/kmymoney-4.5.3.ebuild
+++ b/app-office/kmymoney/kmymoney-4.5.3.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/kmymoney/kmymoney-4.5.3.ebuild,v 1.4 2011/03/27 22:45:50 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-4.5.3.ebuild,v 1.5 2011/08/06 20:20:58 dilfridge Exp $
 
 EAPI=3
 
@@ -45,6 +45,8 @@ DEPEND="${COMMON_DEPEND}
 	test? ( dev-util/cppunit )
 "
 
+PATCHES=( "${FILESDIR}/${P}-underlinking.patch" )
+
 src_configure() {
 	mycmakeargs=(
 		-DUSE_QT_DESIGNER=OFF