Fix underlinking, bug 369307

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

4 files changed, 66 insertions, 18 deletions

diff --git a/kde-base/kdepim-wizards/ChangeLog b/kde-base/kdepim-wizards/ChangeLog
index ae1a14a52f48..817bd399f617 100644
--- a/kde-base/kdepim-wizards/ChangeLog
+++ b/kde-base/kdepim-wizards/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdepim-wizards
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.177 2011/07/27 14:04:29 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.178 2011/08/06 17:14:37 dilfridge Exp $
+
+  06 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kdepim-wizards-4.4.11.1.ebuild,
+  +files/kdepim-wizards-4.4.11.1-underlinking.patch:
+  Fix underlinking, bug 369307
 
 *kdepim-wizards-4.7.0 (27 Jul 2011)
 
diff --git a/kde-base/kdepim-wizards/Manifest b/kde-base/kdepim-wizards/Manifest
index e91f86aa0381..ef2238291577 100644
--- a/kde-base/kdepim-wizards/Manifest
+++ b/kde-base/kdepim-wizards/Manifest
@@ -1,30 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
+AUX kdepim-wizards-4.4.11.1-underlinking.patch 1948 RMD160 8561be0fd018843eca1f892bbde8afc2dbdac56c SHA1 6aa607bb2d8683e31f7743468614ea08e61d14ae SHA256 dd448e43af52d3a6b42c3ed1151a35b22990287aa1875faf76656fec48aa04ba
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
 DIST kdepim-4.6.0.tar.bz2 43382034 RMD160 5de759c9e37e0afd92bc035ee0a28662502e36c9 SHA1 283ea87b68a4750194d785361f6534af59edacf9 SHA256 2a4f50dc82a819ffbd8923c71deb35b5502136408918ee70c57fb49ce93f64d7
 DIST kdepim-4.6.1.tar.bz2 44179437 RMD160 8a750bae0ef93002d85add4b0e25162764eb47c8 SHA1 aa4dc75d33b3aa105e3f3b2f41e9d87b57cbf20a SHA256 06976de3f759c9eba0838e40a94722b7e46e355b530f2e7ead68a4e15d19714e
 DIST kdepim-4.7.0.tar.bz2 15591517 RMD160 ffc955c77e3e925bee946a403fd3deff12962037 SHA1 d8a131d886b923b397a50439028ea45880aa9404 SHA256 1a3fd80ca8bd3a4c2b9a31593e2c1893cc1b5da8eaf35971ed4b0a9703261690
-EBUILD kdepim-wizards-4.4.11.1.ebuild 982 RMD160 b80a2adc7a282fa07acb040eb075f2e678acba79 SHA1 5630a85c17ed16c42b1b100fba01286f07d402ba SHA256 f0c65f9c019f2379ee83f700a586725e13eb77bc7499e33418dff572a94bceb0
+EBUILD kdepim-wizards-4.4.11.1.ebuild 1036 RMD160 732b68d6c4e5726a588f72ac2e35bee16ab6902e SHA1 109db092600eab1f857f8a69e317c02df1e8081b SHA256 b8ea538ede4c9dc70552da5edc71644d83f09dc53fe7c3ea760e8657e4ad1453
 EBUILD kdepim-wizards-4.6.0.ebuild 812 RMD160 23eb36bf25b154c8837dca0809bc816f96234de8 SHA1 1872012af59ce2855a3086a692c8c4386f2cae92 SHA256 5c909b31e196b389da1fc078810b75b8e23a2a5c259a1c93b30b5a3ceaea94db
 EBUILD kdepim-wizards-4.6.1.ebuild 812 RMD160 6a9a711cfa1c7542297205ab319cceb62b04ab66 SHA1 91a52d9bf5ead8c160cefbe28e4e0e6763d24314 SHA256 884336079e435190c6a617fb98fd32aed2f0bfa1af5782589582b7066c357739
 EBUILD kdepim-wizards-4.7.0.ebuild 809 RMD160 4d1fb4d416c62007f49e8cd123bea8efe963160d SHA1 f730e721bbf1693acc62ae41c31407c7433cf6a1 SHA256 c49f187c56da7ef2fed66c0006c28a359c667bfe09c129acc1489e12bf88224a
-MISC ChangeLog 22884 RMD160 12dcea740cffe5c6295e798dde0cabd18d338c82 SHA1 ea24a4907730fe9937ed22a0ad2278953e90acce SHA256 ed38c3800cbfc8bf4ed2c2e2dbd247262437c8de800c5717b5fa50609929d260
+MISC ChangeLog 23063 RMD160 a6aed10386566f1343867d17432ba02bf7e412dc SHA1 1791776c21d852dd36577cacefee4e074665ec73 SHA256 fe98faf93ba8801564b9894cd648387e05f2a23467214c53d038c6a45422540e
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOMBuPAAoJEOf+E+/4L5LmU5oQAI15CSKHbwZiqhmPeMRoxa5a
-4RbF8s9U/Yg1ktB1R7mLnak2nMtZqStW9SNohO07sMVomyFOg9UC/cDzLCu5GjH8
-O5RWNHpF85ESN+uNJ7/8C3m4k96wyK8ZFu41pavLRvTEeFRPeUo+d/9FZe2C6hSu
-wTn+96lbZ1jNXQ24IU9+viokrop1oW8C/xwLad/fxne04I8ZXHC7ByShjGJ3nOiA
-rERvYb88uN+foa3E1bG4cZW/quVCbOM0lnIQyUSIc/NsOIoK3/ZHJ7Y6JB+fBgPR
-PSdhkJb8tUiG5QKCgROZXYe19H3QyRMrnBZJq3H3/9mT8t2k4YEzDdMuaYOmi8y9
-Gi+e5K5q4eTNhgDWBR3UyMXdhSRNw/4uQJ9UkfQ9Cc4lntTSStDISJ+pwgj/QjDo
-918wXZADZUl2HjDaJX1eHYF4HsBZr3OzeSkXA9usrmOahrdcQ8IojvZW4zaWpu6D
-ps8ErJZop1U8bwJEXfFqh06YBLgIWlwlZ0+5rJc44fVPJqQrkDESEICMTTRMjy1a
-eX5pP7k+Noxb7lDH7lZvKySx+k5HbrG70nySebdOco5dgr7na/bJXhYz++btTVa1
-nZ29x7oCcibwSpJpTb9xCuWsVaadXlWJ+SWVOUc6yfzEG5aEGECpZ7z7DCckYF/i
-pjmmJy9FOPuiY1tjoH7x
-=I2K1
+iQIcBAEBCgAGBQJOPXacAAoJEEb+UGWnxTyHzMMP/0CD33fdH9EBGHbIKL1PJoPi
+hgqnicbt8hyfFlKfvZ+F/p2CAQUHdm0aVesYJXdDEo78HIFNF7n4X9kR8M1tvVES
+oN1kzdWyK4MGd7bmWZ4lVkInOENOdrtRsaA9V5dkNE1F5uDY7GmsUxyoaoowhUfr
+oZs/OhIYLno75lo28YMWvIEOlXvo3w6iZoQkf7YkHr0D5xrkWbd15Q+KTH4wreyp
+RnDMYWGcbyQVA3tTm3eHHcv87uXVHf3e04wPN00JrJRZwE5P7K74ckb62495/5ZI
+Q4T43SkuzB3I1qtfZ22qhJUmkjpkSgz5H93n2pGmDKU0D32RSBc08RPIFv3Mm2FF
+ecn0Wn2rmhuGnK31K6w0J4b9gHpMGKslc3tbujPUpo2rvXGTRrBQPkRy9fvuWCRP
+v8vGdGMxXGkmGJ4tf6naaOiCnKFk6dMxtd19RoQKeRwKeHydOcix+6zn5fQXsaqd
+BFdXyivSSFlaYsQ3NygFQWO1xrYYjnfZiWoUM7XIil+xiNoXE1yEfOiI1Yz1KFJo
+RD7Ci0lLkFd719eK8JJ0k9pd3lsT7/ZroTfuS4L11JPz4q1bNr3T5eZyiL9J35GL
+urV0GDULcUjxU/rS8g3rhoqTKLz12/vDMeybIbR2W0RxyJj5BtgyWbIFtFnyTugh
+19iupMJsLUs8SOnpWgIr
+=dPLe
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepim-wizards/files/kdepim-wizards-4.4.11.1-underlinking.patch b/kde-base/kdepim-wizards/files/kdepim-wizards-4.4.11.1-underlinking.patch
new file mode 100644
index 000000000000..780c5d6a5afa
--- /dev/null
+++ b/kde-base/kdepim-wizards/files/kdepim-wizards-4.4.11.1-underlinking.patch
@@ -0,0 +1,40 @@
+diff -ruN kdepim-wizards-4.4.11.1.orig/wizards/CMakeLists.txt kdepim-wizards-4.4.11.1/wizards/CMakeLists.txt
+--- kdepim-wizards-4.4.11.1.orig/wizards/CMakeLists.txt	2011-04-20 22:03:31.000000000 +0200
++++ kdepim-wizards-4.4.11.1/wizards/CMakeLists.txt	2011-08-06 19:11:11.852576714 +0200
+@@ -22,7 +22,7 @@
+ 
+   kde4_add_executable(groupwarewizard ${groupwarewizard_SRCS})
+ 
+-  target_link_libraries(groupwarewizard ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS}
++  target_link_libraries(groupwarewizard ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS}
+   kabcgroupwise kcalgroupwise
+   kcal_slox kabc_slox
+   kabckolab knoteskolab
+@@ -44,7 +44,8 @@
+ 
+   kde4_add_executable(groupwisewizard ${groupwisewizard_SRCS})
+ 
+-  target_link_libraries(groupwisewizard ${KDEPIMLIBS_KPIMIDENTITIES_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KIDENTITIES_LIBS} kabcgroupwise kcalgroupwise ${KDEPIMLIBS_KCAL_LIBS} kdepim )
++  target_link_libraries(groupwisewizard ${KDEPIMLIBS_KPIMIDENTITIES_LIBS} ${QT_QTGUI_LIBRARY} 
++    ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KIDENTITIES_LIBS} kabcgroupwise kcalgroupwise ${KDEPIMLIBS_KCAL_LIBS} kdepim )
+ 
+   install(TARGETS groupwisewizard  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+@@ -60,7 +61,8 @@
+ 
+   kde4_add_executable(sloxwizard ${sloxwizard_SRCS})
+ 
+-  target_link_libraries(sloxwizard ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} kcal_slox kabc_slox ${KDEPIMLIBS_KCAL_LIBS} ${KDEPIMLIBS_KABC_LIBS} kdepim )
++  target_link_libraries(sloxwizard ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} kcal_slox kabc_slox ${KDEPIMLIBS_KCAL_LIBS} 
++    ${KDEPIMLIBS_KABC_LIBS} kdepim )
+ 
+   install(TARGETS sloxwizard  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+@@ -83,6 +85,7 @@
+ kde4_add_executable(kolabwizard ${kolabwizard_SRCS})
+ 
+ target_link_libraries(kolabwizard
++  ${QT_QTGUI_LIBRARY}
+   ${QT_QT3SUPPORT_LIBRARY}
+   ${KDEPIMLIBS_KCAL_LIBS}
+   ${KDEPIMLIBS_KABC_LIBS}
diff --git a/kde-base/kdepim-wizards/kdepim-wizards-4.4.11.1.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-4.4.11.1.ebuild
index 7f2c21674f59..010caed883aa 100644
--- a/kde-base/kdepim-wizards/kdepim-wizards-4.4.11.1.ebuild
+++ b/kde-base/kdepim-wizards/kdepim-wizards-4.4.11.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/kde-base/kdepim-wizards/kdepim-wizards-4.4.11.1.ebuild,v 1.5 2011/06/01 19:39:56 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-4.4.11.1.ebuild,v 1.6 2011/08/06 17:14:37 dilfridge Exp $
 
 EAPI=4
 
@@ -27,6 +27,8 @@ KMEXTRACTONLY="
 	kresources/slox/
 "
 
+PATCHES=( "${FILESDIR}/${P}-underlinking.patch" )
+
 src_prepare() {
 	ln -s "${EKDEDIR}"/include/kdepim-kresources/{kabcsloxprefs.h,kcalsloxprefs.h} \
 		kresources/slox/ \