Fix underlinking, bug 369641

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

4 files changed, 40 insertions, 18 deletions

diff --git a/kde-base/kalarm/ChangeLog b/kde-base/kalarm/ChangeLog
index 44738bd2af5a..c4d9e7ce7d61 100644
--- a/kde-base/kalarm/ChangeLog
+++ b/kde-base/kalarm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kalarm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.184 2011/08/11 19:56:13 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.185 2011/08/11 20:05:44 dilfridge Exp $
+
+  11 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kalarm-4.4.11.1-r1.ebuild, +files/kalarm-4.4.11.1-underlinking.patch:
+  Fix underlinking, bug 369641
 
   11 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -kalarm-4.4.11.1.ebuild:
diff --git a/kde-base/kalarm/Manifest b/kde-base/kalarm/Manifest
index 99c714ac3100..d0280f03504b 100644
--- a/kde-base/kalarm/Manifest
+++ b/kde-base/kalarm/Manifest
@@ -2,28 +2,29 @@
 Hash: SHA512
 
 AUX kalarm-4.4.11.1-crash.patch 1442 RMD160 92407f1ad2be9cd1de41ad2200d8757355f531c2 SHA1 3dafcd2fae1946fe4976c8bfbf123747105c3da1 SHA256 22cb1522b6ea83267a869d3f9b6c2d3c13e4513895d2cd57e57f0ebe92bc8dc8
+AUX kalarm-4.4.11.1-underlinking.patch 1110 RMD160 4934817743e4716c87ef92f2865c3d8f83e2715f SHA1 0616780a041821f73e6cc3ce215c665edd021399 SHA256 5a92807fae1445d97dec3d70695737aa40bd9bbb55fcfd03c294217a39cfaffc
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
 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 kalarm-4.4.11.1-r1.ebuild 793 RMD160 59ee993a0766009e216593d369a4efdbd449a1d7 SHA1 add6ce0b78ab85073b0091eea2e8f350ea41e248 SHA256 3339a7d08ff2bb411709b971bfeec2583f03d12c46f066438aafc54dcd915812
+EBUILD kalarm-4.4.11.1-r1.ebuild 846 RMD160 ec9f6b5c2a5b0384bd10e33711aee589efc00891 SHA1 c75c8019c163f02009164feb27e44f4943d5af99 SHA256 c472a9c784a45f61eae076a9af088b0f178550ee34906bebf8db7748cff1bcc5
 EBUILD kalarm-4.6.1.ebuild 604 RMD160 b3411d49cf4e9f6f415b33dece214472fa739817 SHA1 146f650993d7e43f5ff37e6f6e851e7285db7b9c SHA256 02ed71c5d1aee4f49b724e1c8d614f12203486fd60599b399725b63e4151d43c
 EBUILD kalarm-4.7.0.ebuild 601 RMD160 1c48e3396ab2e55c89aef3b8c46146cf9788ea75 SHA1 4c5695d87ce7ea66cf7cccb83239dfd42fcc55c4 SHA256 3a930d7a12ba25aa4269c2666997af0871e350920927cfb42704d07ab86ad1af
-MISC ChangeLog 21756 RMD160 7c575e614709d8e5d9da3d125778a1c840942962 SHA1 c848343f321fe0c95721eb13aa5e7b753d23c177 SHA256 98ddb42f4354c02f918b56f1326fdf9708d8cd59eee6f2a3823c8b1654b4523d
+MISC ChangeLog 21917 RMD160 0fef5b391091ef1a8ccb5883592bc1dd8ed78ed5 SHA1 a08bce040f2567bbb1f93d2990f14e1a4528d021 SHA256 bb76fc6669f7049d42d05903e09aba8ddab9d03cfeee64d2bdede2fa487f4387
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJORDPsAAoJENwGBM22xffe3rQQAKHuOYGe/qpMN3TQGafLIhCd
-TQHOA7Dm1bYFKdDNwNG/jDkte1UQbQvDpsZW54ucTXJsK0qrrBBPzpTZlW/DiEgk
-jCtcYp6GoaQIkBPi8ZAkqOhIWBTuGu6WtKSGPnPgdQRubGbRawfIBTonw+EG/ltl
-UR97BLC6A2gvD1tSh38bYRAIjZv6T7QewYNlpdLscmL0iuZUDFkrTuOxYMBak+bZ
-wZry44PU85B7GMcYxQeVPN4B03j1Gp+8vG8k93jqk13bEDM/gRxCeln5zXk8zkTa
-BBDAeGg1lzS4pXLt+J8XIbMIL50nQRD/uchGigpSDpcsBrBHejFy8D7h1GLJgKT0
-9sCX3iHVO1sd0iDWL10nJ0f4VrUEanRndQFJpoGrN3kSjhLls3KlTVCM3RpmXpJM
-McqnYSBoMu7dhG1fvN+clzyoRopJunQJazvHZfaOEukKZ2NhOzcKepaoaNmAoPox
-UsWMRkLBBEegSGbFuHyb+VEowBSIJkN+d0a8R1+8Df3BW2f6NqmT6oiy3vfLiCdm
-qcVXnZqL0iRcOUcUkvb4l/Pv2k6GuLr3F+z2NrVaC7oTKH6MI4lM4oDdpMq9ptKo
-ZpdOrwIbvMeUbS0ej2XuiNi6tF2leYDaWDiDILR21+7+Ve8HK5iqDXp6MBbORZem
-lK8A+vjeIlmXlfBMYIuy
-=YkHk
+iQIcBAEBCgAGBQJORDYoAAoJENwGBM22xffe4bsP/iJ9am2Ch3nxlDAK8nUKrUSJ
+x41W3GTTIBH9yb76KkJEHIPfQa9V3pHBFAMgc3JuR5PLvH0S8A4kGrnGjlRbFnC4
+rtEN8XZ4r8XfW3fqIwkpxmDwCtx8QY7n4+kY2HoD6VdiEi4BVMvwWJKIrvP2OJ5k
+8KGkE112DFPvxBDrGi7MEDYn8bQ+nC9VR+y82JihMWHTFsF23ObxxUCqqSBvVkIi
+LIij7+O2y94vsFbjtQ7/Jf36iwy1NSjJXHVaqVpinzFONjZw8eB0Pd4ZnhiQM8vu
+tZJEcD06Q3JVoafSh7RQHAUONZb3r3HQaN8zzjv5g7l6NFib2hOOrje4PQ4AHCI3
+g9TUBL88xhxL1yo7p2hZawzL5Vkjg9wsoJYLpe5N91o0b+CFAnhVEhysKEF0dCCt
+NgsDhlX4S7Pvij0P2DDcgNdEy+80y3DpvM6jBlDOUqv5jAl8JRExSoFf/phV4hYR
+Y8d8bvNHChebMBb4lPCAJnZJGzJTpJWiX05Yu/EcXVLTScO4ZlW5OkE4o6C8PqA1
+Zc32gHpJhl0LbpDmzM3FTsN0GUBCWtRl3SyTOnaPa5lIMaLg3oByKsI/rVdC3CeC
+JFGIYgS+ovYMZ1leGP1j/xHAjOD2H4Lg7n8cYB25I0PjrCXVp613rUaIUTX9g1AB
+csIhXuziJoXYS7VSGPH8
+=pIIe
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kalarm/files/kalarm-4.4.11.1-underlinking.patch b/kde-base/kalarm/files/kalarm-4.4.11.1-underlinking.patch
new file mode 100644
index 000000000000..87eadc8a38b8
--- /dev/null
+++ b/kde-base/kalarm/files/kalarm-4.4.11.1-underlinking.patch
@@ -0,0 +1,14 @@
+diff -ruN kalarm-4.4.11.1.orig/kalarm/CMakeLists.txt kalarm-4.4.11.1/kalarm/CMakeLists.txt
+--- kalarm-4.4.11.1.orig/kalarm/CMakeLists.txt	2011-04-20 22:03:31.000000000 +0200
++++ kalarm-4.4.11.1/kalarm/CMakeLists.txt	2011-08-11 22:03:27.096295681 +0200
+@@ -130,7 +130,9 @@
+ 
+ set_target_properties(kalarm_bin PROPERTIES OUTPUT_NAME kalarm)
+ 
+-target_link_libraries(kalarm_bin ${KDE4_KUTILS_LIBS} kalarm_resources kalarm_calendar ${KDEPIMLIBS_KCAL_LIBS} ${KDE4_KABC_LIBRARY} ${KDE4_KMIME_LIBRARY} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KHOLIDAYS_LIBS} ${KDE4_PHONON_LIBS} ${X11_X11_LIB} kdepim)
++target_link_libraries(kalarm_bin ${KDE4_KUTILS_LIBS} kalarm_resources kalarm_calendar ${KDEPIMLIBS_KCAL_LIBS} ${KDE4_KABC_LIBRARY} 
++                      ${KDE4_KMIME_LIBRARY} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KHOLIDAYS_LIBS} 
++                      ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDE4_PHONON_LIBS} ${X11_X11_LIB} kdepim)
+ 
+ install(TARGETS kalarm_bin ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ #endif (UNIX)
diff --git a/kde-base/kalarm/kalarm-4.4.11.1-r1.ebuild b/kde-base/kalarm/kalarm-4.4.11.1-r1.ebuild
index d6e950db9feb..126af1c21180 100644
--- a/kde-base/kalarm/kalarm-4.4.11.1-r1.ebuild
+++ b/kde-base/kalarm/kalarm-4.4.11.1-r1.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/kalarm/kalarm-4.4.11.1-r1.ebuild,v 1.4 2011/06/01 19:37:09 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.4.11.1-r1.ebuild,v 1.5 2011/08/11 20:05:44 dilfridge Exp $
 
 EAPI=4
 
@@ -24,7 +24,10 @@ KMEXTRACTONLY="
 	kmail/
 "
 
-PATCHES=( "${FILESDIR}/${PN}-4.4.11.1-crash.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.11.1-crash.patch"
+	"${FILESDIR}/${PN}-4.4.11.1-underlinking.patch"
+)
 
 src_configure() {
 	mycmakeargs=(