fixed --as-needed compile failure (another one). Thanks to Krzysztof Nowicki for suggested fix (#187318)

Package-Manager: portage-2.1.4

4 files changed, 49 insertions, 13 deletions

diff --git a/dev-util/kdesvn/ChangeLog b/dev-util/kdesvn/ChangeLog
index d3940884f6f9..7c59d5fca81f 100644
--- a/dev-util/kdesvn/ChangeLog
+++ b/dev-util/kdesvn/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/kdesvn
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/ChangeLog,v 1.34 2007/11/30 15:11:18 george Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/ChangeLog,v 1.35 2008/01/19 19:34:15 george Exp $
+
+  19 Jan 2008; George Shapovalov <george@gentoo.org>
+  +files/kdesvn-0.14.1-as-needed.patch, kdesvn-0.14.1.ebuild:
+  fixed --as-needed compile failure (another one). Thanks to Krzysztof Nowicki
+  for suggested fix (#187318)
 
 *kdesvn-0.14.1 (30 Nov 2007)
 
diff --git a/dev-util/kdesvn/Manifest b/dev-util/kdesvn/Manifest
index b221a7be4331..0279ede096eb 100644
--- a/dev-util/kdesvn/Manifest
+++ b/dev-util/kdesvn/Manifest
@@ -1,3 +1,7 @@
+AUX kdesvn-0.14.1-as-needed.patch 1472 RMD160 c296806fb3c46c595b3ef750f112b21c0a9e3270 SHA1 ba060a7b4458616dbae90fee84a068cc203b7ac7 SHA256 80eac278c295f565dc8b2e0558d19817dbd1b17a5311172196746b4e1975f9e1
+MD5 01a684e35c2d9af2efa3b2ce71428244 files/kdesvn-0.14.1-as-needed.patch 1472
+RMD160 c296806fb3c46c595b3ef750f112b21c0a9e3270 files/kdesvn-0.14.1-as-needed.patch 1472
+SHA256 80eac278c295f565dc8b2e0558d19817dbd1b17a5311172196746b4e1975f9e1 files/kdesvn-0.14.1-as-needed.patch 1472
 DIST kdesvn-0.11.2.tar.bz2 1204456 RMD160 16fb3d059a698fee53e717db593a7428c2593fc9 SHA1 499f7b6e3977198bdbbee2f2416d21eb7e6b4833 SHA256 ff2d25ed5ffec374d7ec26895dc0339e23c15f19e0ca4e216d0982061efd6c83
 DIST kdesvn-0.12.1.tar.bz2 1237520 RMD160 7206998e691cd0c0745a2387bd37f845283bf6c6 SHA1 4c56e97c588646c795dc6bf7669a5d6fba3ca2d8 SHA256 a20932070625c7af1786b5a3ab44d1a4d51802d05ade2e13cc2e680aefdca1c1
 DIST kdesvn-0.13.0.tar.bz2 1243539 RMD160 332d3851227c50e69dee68cb8351ff5fd5ed417f SHA1 24a0a443f0e6ca6585d3ff3fc77e9abd0a5eac3d SHA256 eac9b85d1f99c3048145bd46c3537870f92fb079e46c14b424ffb6c93642f249
@@ -20,18 +24,18 @@ EBUILD kdesvn-0.14.0.ebuild 1263 RMD160 01b3fac2e17db025b7ec176da0780eb49d3a8d14
 MD5 a76d880b1e09338048b847f0582887db kdesvn-0.14.0.ebuild 1263
 RMD160 01b3fac2e17db025b7ec176da0780eb49d3a8d14 kdesvn-0.14.0.ebuild 1263
 SHA256 1d0c1d84bd24e752eb2caa6528c7067195442ece45522c26205691abf20e6a4f kdesvn-0.14.0.ebuild 1263
-EBUILD kdesvn-0.14.1.ebuild 1263 RMD160 0f38d1cf2aa08d96b4247a069cdedccd401c930c SHA1 37a1a66e7b5e7eb79b91fabe39b23f18746b3f66 SHA256 1cea55caaa473738695497282d9501f8ea76b0625c9dd80776ec25d3aabf446f
-MD5 1ee48715b9ca9d7a7c5bc0152965a6d5 kdesvn-0.14.1.ebuild 1263
-RMD160 0f38d1cf2aa08d96b4247a069cdedccd401c930c kdesvn-0.14.1.ebuild 1263
-SHA256 1cea55caaa473738695497282d9501f8ea76b0625c9dd80776ec25d3aabf446f kdesvn-0.14.1.ebuild 1263
+EBUILD kdesvn-0.14.1.ebuild 1312 RMD160 10a4fe416246ca4f1e87a20533d5205772a6efb4 SHA1 34b65e389a9b216d67f51efa137d43063625bb3f SHA256 c526334302c7068a059f595692fab93258cf8354b309062d203c743ef51ca4fc
+MD5 4f6e4244491bcc3130ef9b632fcbfaee kdesvn-0.14.1.ebuild 1312
+RMD160 10a4fe416246ca4f1e87a20533d5205772a6efb4 kdesvn-0.14.1.ebuild 1312
+SHA256 c526334302c7068a059f595692fab93258cf8354b309062d203c743ef51ca4fc kdesvn-0.14.1.ebuild 1312
 EBUILD kdesvn-0.9.3.ebuild 748 RMD160 14e1b117fe2facdb2ee1a81e8e79cfcd56c9e829 SHA1 ecfc45661d9c55e5c4d5b01fbbef76042c4b4885 SHA256 29ba43fbdea363f173d506da480c8f03fbd8366568f3cee102ae18515b19326d
 MD5 60400a2b320be4ecf297322d38e19fd6 kdesvn-0.9.3.ebuild 748
 RMD160 14e1b117fe2facdb2ee1a81e8e79cfcd56c9e829 kdesvn-0.9.3.ebuild 748
 SHA256 29ba43fbdea363f173d506da480c8f03fbd8366568f3cee102ae18515b19326d kdesvn-0.9.3.ebuild 748
-MISC ChangeLog 5461 RMD160 818d5334b3404cce99d348711a5af3be42a847b3 SHA1 24afbdaac897f070cc4de9c58c6af160e51ae7e1 SHA256 c8a101277c97e5491062c86e15c2730703e0ad3d5b5e012986e7cb951b87c4c6
-MD5 6537c60119adf8c866310a39c1cd2dd6 ChangeLog 5461
-RMD160 818d5334b3404cce99d348711a5af3be42a847b3 ChangeLog 5461
-SHA256 c8a101277c97e5491062c86e15c2730703e0ad3d5b5e012986e7cb951b87c4c6 ChangeLog 5461
+MISC ChangeLog 5686 RMD160 7d29b80de8bd03343e465f757b60e04a70cbce7b SHA1 1e03f9349c50ef28b66ce81ce85d5d51f84b3d9a SHA256 75fb5839bc57257cdc64bbd90389268d7d66e481728f02b7775460524fc25c58
+MD5 01b3fe09dd176a8bb31cfc3606ab932b ChangeLog 5686
+RMD160 7d29b80de8bd03343e465f757b60e04a70cbce7b ChangeLog 5686
+SHA256 75fb5839bc57257cdc64bbd90389268d7d66e481728f02b7775460524fc25c58 ChangeLog 5686
 MISC metadata.xml 260 RMD160 cc17d54209f19901d99ae48eb2f90e5fce1cc73d SHA1 ea54b5efc7844e62b8e956f031fa7514bc70037a SHA256 c3afdca26aec5ef6f9eca89709b3338438757517ce4246e205d292e875dbba7c
 MD5 497715c8297789c2c36e27a017cb5320 metadata.xml 260
 RMD160 cc17d54209f19901d99ae48eb2f90e5fce1cc73d metadata.xml 260
diff --git a/dev-util/kdesvn/files/kdesvn-0.14.1-as-needed.patch b/dev-util/kdesvn/files/kdesvn-0.14.1-as-needed.patch
new file mode 100644
index 000000000000..090f282a8a59
--- /dev/null
+++ b/dev-util/kdesvn/files/kdesvn-0.14.1-as-needed.patch
@@ -0,0 +1,25 @@
+diff -Naur kdesvn-0.14.1/src/svnqt/CMakeLists.txt kdesvn-0.14.1.new/src/svnqt/CMakeLists.txt
+--- kdesvn-0.14.1/src/svnqt/CMakeLists.txt	2007-08-31 16:24:28.000000000 +0200
++++ kdesvn-0.14.1.new/src/svnqt/CMakeLists.txt	2007-12-30 20:52:19.000000000 +0100
+@@ -132,7 +132,7 @@
+ SET(ALL_LINKFLAGS ${APR_EXTRA_LIBFLAGS})
+ SET(ALL_LINKFLAGS "${ALL_LINKFLAGS} ${APU_EXTRA_LIBFLAGS}")
+ SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
+-TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_LIBRARIES} ${SUBVERSION_ALL_LIBS})
++TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_LIBRARIES} ${SUBVERSION_ALL_LIBS} ${APR_LIBS} ${APU_LIBS})
+ 
+ IF (WIN32)
+     TARGET_LINK_LIBRARIES( ${svnqt-name} wsock32.lib  )
+diff -Naur kdesvn-0.14.1/src/svnqt/cmakemodules/FindSubversion.cmake kdesvn-0.14.1.new/src/svnqt/cmakemodules/FindSubversion.cmake
+--- kdesvn-0.14.1/src/svnqt/cmakemodules/FindSubversion.cmake	2007-06-11 13:43:33.000000000 +0200
++++ kdesvn-0.14.1.new/src/svnqt/cmakemodules/FindSubversion.cmake	2007-12-30 20:52:00.000000000 +0100
+@@ -64,6 +64,9 @@
+   EXEC_PROGRAM(${APR_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APR_EXTRA_LIBFLAGS)
+   EXEC_PROGRAM(${APU_CONFIG} ARGS "--ldflags --libs --link-ld" OUTPUT_VARIABLE APU_EXTRA_LIBFLAGS)
+ 
++  EXEC_PROGRAM(${APR_CONFIG} ARGS "--link-ld" OUTPUT_VARIABLE APR_LIBS)
++  EXEC_PROGRAM(${APU_CONFIG} ARGS "--link-ld" OUTPUT_VARIABLE APU_LIBS)
++
+ ENDIF (UNIX)
+ 
+ #search libaries for Windows
diff --git a/dev-util/kdesvn/kdesvn-0.14.1.ebuild b/dev-util/kdesvn/kdesvn-0.14.1.ebuild
index a00f6d89a1f7..d482019108f7 100644
--- a/dev-util/kdesvn/kdesvn-0.14.1.ebuild
+++ b/dev-util/kdesvn/kdesvn-0.14.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/kdesvn-0.14.1.ebuild,v 1.1 2007/11/30 15:11:18 george Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdesvn/kdesvn-0.14.1.ebuild,v 1.2 2008/01/19 19:34:15 george Exp $
 
-inherit eutils versionator toolchain-funcs kde-functions
+inherit base eutils versionator toolchain-funcs kde-functions
 
 My_PV=$(get_version_component_range 1-2)
 
@@ -21,6 +21,8 @@ DEPEND=">=dev-util/subversion-1.3
 
 need-kde 3.3
 
+PATCHES="${FILESDIR}/${P}-as-needed.patch"
+
 src_compile() {
 	local myconf
 	if use debug ; then