Fix compilation with LDFLAGS="-Wl,--as-needed", thanks to Steffen Hau in bug 209274.

Package-Manager: portage-2.1.4.4

4 files changed, 37 insertions, 7 deletions

diff --git a/kde-base/superkaramba/ChangeLog b/kde-base/superkaramba/ChangeLog
index 9ea1198c622f..d4489e48eede 100644
--- a/kde-base/superkaramba/ChangeLog
+++ b/kde-base/superkaramba/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/superkaramba
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.64 2008/02/17 02:38:09 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/ChangeLog,v 1.65 2008/02/18 17:06:03 ingmar Exp $
+
+  18 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  +files/superkaramba-4.0.1-as-needed.patch, superkaramba-4.0.1.ebuild:
+  Fix compilation with LDFLAGS="-Wl,--as-needed", thanks to Steffen Hau in bug
+  209274.
 
   16 Feb 2008; Ingmar Vanhassel <ingmar@gentoo.org>
   -superkaramba-3.5.5.ebuild, -superkaramba-3.5.6.ebuild,
diff --git a/kde-base/superkaramba/Manifest b/kde-base/superkaramba/Manifest
index a9abb2893709..644abd29c3b6 100644
--- a/kde-base/superkaramba/Manifest
+++ b/kde-base/superkaramba/Manifest
@@ -3,16 +3,17 @@ Hash: SHA1
 
 AUX superkaramba-3.5.2-multilib-python.diff 750 RMD160 ae92c9d58e4f591e15deb838589cd4f029ef3590 SHA1 9970bd8e766f5566c8225ed14a8bf0bf1e06007d SHA256 9630fe0bc19aa79aa2b84b5758c98acf406344b95ad1258b3deace5951fbabab
 AUX superkaramba-3.5.7-network_sensor.patch 672 RMD160 42c974138f30873ed654bb072874a03b7e5424a2 SHA1 47359e471f3c88efd45021a219149edf2f9b2b84 SHA256 ceec6d676826ac82eee2e4a1b79ef7bd70f12369abdf3468149c0a5ab31ecd57
+AUX superkaramba-4.0.1-as-needed.patch 781 RMD160 706a2b6f1fc3bec7c9204b8458be27e0dfc858de SHA1 e9e4d25f70670175b93e3707b66aa67e90dbcfed SHA256 dbe2f718e0cded9a1bc60098bb3a6a0e9a0853e9bd17dcb883909ee355ec23d9
 DIST kdeutils-3.5.8.tar.bz2 3059172 RMD160 94267b9c08339c7310d65106110c9b9ef133d6f8 SHA1 55aac5ecb90ee8a9854603eb2415adb2da6f249c SHA256 7dcbe3361cc53f9dac4c1bf6f45952d3d2518bec56cd8c07b8e07b4c4f12d0ac
 DIST kdeutils-4.0.1.tar.bz2 2354537 RMD160 0b735e5c376ca9f8b20e61a3ea56f9fae9845677 SHA1 96d86984dbca18670ef7d496227c1b96906ea09c SHA256 9e590b5d1208ea6817eabd0c663591372d7cc95e85cc80fe5878cbdbe567e6fe
 EBUILD superkaramba-3.5.8.ebuild 608 RMD160 7e42662da7548d333d8314e0cc4b5b37a44d8f62 SHA1 add1c2982289c3001ddcbf9f9758fad8ecc6df2b SHA256 3f0ac6759ef5061d232220f8d9802094c42799e0d3a1b682b34d9ee6dc44afaf
-EBUILD superkaramba-4.0.1.ebuild 727 RMD160 a4fa77ece301110979d825cd129da274c3d4e29f SHA1 009369060ab6513115c9bfc868718ce595f2a501 SHA256 68d2a662276da11304bb92d87e0f5cb4f66b1dfdf02f72a8f619ae7d07c5a5bb
-MISC ChangeLog 8294 RMD160 82b2603f97b20fcac4a3a3be65bd52dad66ca536 SHA1 4af5c63f41881c88f4f07e1cd179bf235b7c4a3f SHA256 ae40af8afd2ad3fba322bf4641dd4c5b5fde533b75d098d0fedaddb09d3a3df7
+EBUILD superkaramba-4.0.1.ebuild 773 RMD160 7d319d66731618521eb692e3896220f896abc831 SHA1 6625ab254c353fe22e591695da2e8fd23eff93c1 SHA256 a6df65d2d5ace2c0677eb931c36ad94a80198f66fe681cfb2f9a2351c9e6c80a
+MISC ChangeLog 8508 RMD160 5540cfa61a59d639402394a5b938685dad6b7b9f SHA1 2f635b28ba31d809ce99b2c0f275e2575551a079 SHA256 f4cea7df2ca011033df55045ec0c777bcab77e4dbd7e3bf1b6668c3e0fd83c91
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHt531B18eXLOpYdkRAmCZAJ0fb/w8HRBSG7fbIIrg8leDKEOYjgCgnLRn
-BwX+V0ghQkmjqIyi+UnZVbQ=
-=k333
+iD8DBQFHubrKB18eXLOpYdkRAu0XAKCN0FVDLyT6C4QViYu4JsfyWYQYRwCfbkhr
+dOYQNOiSri9owqCJDvk3Mc0=
+=j/aR
 -----END PGP SIGNATURE-----
diff --git a/kde-base/superkaramba/files/superkaramba-4.0.1-as-needed.patch b/kde-base/superkaramba/files/superkaramba-4.0.1-as-needed.patch
new file mode 100644
index 000000000000..eb888ef6aad8
--- /dev/null
+++ b/kde-base/superkaramba/files/superkaramba-4.0.1-as-needed.patch
@@ -0,0 +1,22 @@
+Superkaramba doesn't compile with LDFLAGS="-Wl,--as-needed", this patch fixes that
+Patch by Steffen Hau <steffen@hauihau.de>
+
+--- superkaramba-4.0.1/superkaramba/src/CMakeLists.txt	2008-02-07 18:45:04.000000000 +0100
++++ superkaramba-4.0.1.new/superkaramba/src/CMakeLists.txt	2008-02-07 18:46:52.000000000 +0100
+@@ -82,6 +82,16 @@
+ KDE4_ADD_LIBRARY(superkaramba SHARED ${superkaramba_LIB_SRCS})
+ set_target_properties(superkaramba PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ 
++FIND_LIBRARY(LIBDL dl)
++IF(LIBDL)
++  LIST(APPEND PYTHON_LIBRARIES ${LIBDL})
++ENDIF(LIBDL)
++
++FIND_LIBRARY(LIBUTIL util)
++IF(LIBUTIL)
++  LIST(APPEND PYTHON_LIBRARIES ${LIBUTIL})
++ENDIF(LIBUTIL)
++
+ TARGET_LINK_LIBRARIES(superkaramba
+ ${KDE4_KIO_LIBS}
+ ${KDE4_KPTY_LIBS}
diff --git a/kde-base/superkaramba/superkaramba-4.0.1.ebuild b/kde-base/superkaramba/superkaramba-4.0.1.ebuild
index 6dd3238e4979..f8e6618be73f 100644
--- a/kde-base/superkaramba/superkaramba-4.0.1.ebuild
+++ b/kde-base/superkaramba/superkaramba-4.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-4.0.1.ebuild,v 1.2 2008/02/15 20:00:43 zlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/superkaramba/superkaramba-4.0.1.ebuild,v 1.3 2008/02/18 17:06:03 ingmar Exp $
 
 EAPI="1"
 
@@ -18,6 +18,8 @@ COMMONDEPEND="kde-base/qimageblitz
 DEPEND="${DEPEND} ${COMMONDEPEND}"
 RDEPEND="${RDEPEND} ${COMMONDEPEND}"
 
+PATCHES="${FILESDIR}/${P}-as-needed.patch"
+
 src_compile() {
 	mycmakeargs="${mycmakeargs}
 		$(cmake-utils_use_with python PythonLibs)"