Added patch from the kde-testing overlay.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 x86_64

3 files changed, 79 insertions, 5 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 9833fc2f8568..571ab3cc6e30 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.541 2008/10/02 11:56:19 keytoaster Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.542 2008/10/02 11:58:21 keytoaster Exp $
+
+  02 Oct 2008; Tobias Heinlein <keytoaster@gentoo.org>
+  +files/kdelibs-4.1.1-cmake-modules.patch:
+  Added patch from the kde-testing overlay.
 
 *kdelibs-4.1.2 (02 Oct 2008)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index d170b4608b00..1a46f44a271d 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -10,6 +10,7 @@ AUX kdelibs-3.5.9-cursor.patch 427 RMD160 e0d7d41196cdbbb7cfd15c6b4ce94d88142e8a
 AUX kdelibs-4.0.2-X11-optional.patch 6103 RMD160 ff7c315d65204253cc3ed2fa90e45b5dbef709d8 SHA1 2093a73b17246d39b0518a8ccb1162caed263aee SHA256 398bde6b24e7fb3bf7325ef1f4409f02839baee52ac20bb041f623acd1900b5e
 AUX kdelibs-4.0.2-alsa-optional.patch 1742 RMD160 ea660d1148488fdac27970587535ec29acd3878f SHA1 53a3d7658ca700a7e8b642e7f66b69b8d25774c8 SHA256 b9107dd43916c015a9392ada81bdfebeff91d2c136eeaa01fb1c89ddd89fd914
 AUX kdelibs-4.0.3-CVS-2008-1670.patch 739 RMD160 348782a28e75435c4b36548879d2d8d243fc0436 SHA1 c08f374abc2f44cd1ece01881b510ef83241f186 SHA256 41e219e50b652800a2ca892e70baeb40ee6e7cf0f981d098dbdf2ca0926ddf5f
+AUX kdelibs-4.1.1-cmake-modules.patch 2905 RMD160 d7043d4153927ab655c4d7630389024983c6b95a SHA1 9d232044bf51f98656a48092082a5aafcb9d4699 SHA256 8836e0c8267054b2dedcf1c879e57bde67ff83c1b824337dec81d96a3d69754e
 DIST kde-3.5.9-seli-xinerama.tar.bz2 15150 RMD160 09f9dc74e52d1507a73d1140654021d2baedde3a SHA1 cb8eaba630ee7c8f93c634512d52a9d1603d5405 SHA256 769b0135b327b3274aa45d78ae882811073041fdbfd55267106b1a3f42115966
 DIST kdelibs-3.5-patchset-14.tar.bz2 23248 RMD160 223ad8aa6d3dab3a6e23a89e00eaf2e90bab399e SHA1 5d50fff6b6a26d8abffa4dda7360b42e0fc29eac SHA256 50d1517fbb3b70890b1858533a77fb0e6e1e72612e155ebe5350e8fea7405273
 DIST kdelibs-3.5-patchset-15.tar.bz2 6707 RMD160 55958374bfc4ba27caf573e13337677c35cbe2c0 SHA1 e0a35642adfcf223ce7490b21af1fa2c3d922b93 SHA256 4a25bc340ce2567ea017456b4aa2292b288779d59d0dd012bd50f5189fe739ec
@@ -30,12 +31,12 @@ EBUILD kdelibs-3.5.9.ebuild 6042 RMD160 5402e42899c0e55787f8b7f5650143dcbc4410d7
 EBUILD kdelibs-4.0.4.ebuild 6106 RMD160 359d839f456bccae1744e69e208433c4308c6287 SHA1 827e17ac4eda6a511a3af0e2798c89f8eca35ac2 SHA256 169991e54aff16bac9ade88269da7ce20dfbb60b80b68cb19b06fdbea4536755
 EBUILD kdelibs-4.0.5.ebuild 6112 RMD160 7d16be93f8556088cfbdb71f45a8bb4253944a0f SHA1 ff8c5cc2d6146e3c8d320d17df39784e049802f6 SHA256 00339d01839c54f949d9f267a40cc8ac08566b6b5a832c213d6565054af3f248
 EBUILD kdelibs-4.1.2.ebuild 5478 RMD160 9475a9fc89d56baf527e601df9f07017f74cc7ba SHA1 265cb6d6ffecc9c18e36b4baa127547d4f80d37b SHA256 15cc28b69e3eb8a537340c2e3743b7fc3017a085fdda01bafe49d4729ad4a0c8
-MISC ChangeLog 88976 RMD160 ed1a2b3bb540bdcc2c6e3f303d5c5510ea05dfdc SHA1 57df39c0823475ebc9218cf71c4b95a966ea5d8a SHA256 f08bfcc1948f300cd872cdf4ff91f6e5f0f9773f74913d40bdce5ef3b6787b64
+MISC ChangeLog 89120 RMD160 2001adccdbc4d1054db521cb902914b861a39a9a SHA1 b5c638ede31ca0ba8aab452e297ef70ec98f05ff SHA256 94992eada284ace26d3c657f65c4f38a1d921e7a5bb2a3aae95040fd34dc5e11
 MISC metadata.xml 602 RMD160 f3461a81b06ab9dce821783b4e361e0e9696bbf3 SHA1 09bee1c8127363de0066a652d7093759ca36631a SHA256 188f0ca9e181009fd720cbe1fff57f124c80524033c6cb591ea2789d755410e1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjktu0ACgkQt3UOBHx+2m/B5wCggL6/rFQu7S916hVZu6vbS9Sq
-SGcAn1kJ9TZn3/RkFUAXFg2/XH1iRn/s
-=enAq
+iEYEARECAAYFAkjkt2QACgkQt3UOBHx+2m8tTACeLxj+wRs02Zx7+h4aLen25bvH
+rIcAnjm9W1ocFSjJ32wS7I0GMqUKBApl
+=9FOj
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/kdelibs-4.1.1-cmake-modules.patch b/kde-base/kdelibs/files/kdelibs-4.1.1-cmake-modules.patch
new file mode 100644
index 000000000000..95d792887616
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.1.1-cmake-modules.patch
@@ -0,0 +1,69 @@
+diff -Naur a/cmake/modules/FindKdcraw.cmake b/cmake/modules/FindKdcraw.cmake
+--- a/cmake/modules/FindKdcraw.cmake	2008-05-21 13:06:10.000000000 +0200
++++ b/cmake/modules/FindKdcraw.cmake	2008-09-22 16:33:42.000000000 +0200
+@@ -69,14 +69,22 @@
+     if(KDCRAW_VERSION_GOOD_FOUND)
+         set(KDCRAW_DEFINITIONS "${_KDCRAWCflags}")
+     
++        # first try pkgconfig dir, fallback to cmake defaults
+         FIND_PATH(KDCRAW_INCLUDE_DIR libkdcraw/version.h
++        PATHS
+         ${_KDCRAWIncDir}
++        ${KDE4_INCLUDE_DIR}
++        NO_DEFAULT_PATH
+         )
++        FIND_PATH(KDCRAW_INCLUDE_DIR libkdcraw/version.h)
+     
+         FIND_LIBRARY(KDCRAW_LIBRARIES NAMES kdcraw
+         PATHS
+         ${_KDCRAWLinkDir}
++        ${KDE4_LIB_DIR}
++        NO_DEFAULT_PATH
+         )
++        FIND_LIBRARY(KDCRAW_LIBRARIES NAMES kdcraw)
+     
+         if (KDCRAW_INCLUDE_DIR AND KDCRAW_LIBRARIES)
+             set(KDCRAW_FOUND TRUE)
+diff -Naur a/cmake/modules/FindKexiv2.cmake b/cmake/modules/FindKexiv2.cmake
+--- a/cmake/modules/FindKexiv2.cmake	2008-05-21 13:06:10.000000000 +0200
++++ b/cmake/modules/FindKexiv2.cmake	2008-09-22 16:32:47.000000000 +0200
+@@ -68,14 +68,22 @@
+     if(KEXIV2_VERSION_GOOD_FOUND)
+         set(KEXIV2_DEFINITIONS "${_KEXIV2Cflags}")
+     
++        # first try specific paths, use cmake defaults as fallback
+         FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h
++        PATHS
+         ${_KEXIV2IncDir}
++        ${KDE4_INCLUDE_DIR}
++        NO_DEFAULT_PATH
+         )
++        FIND_PATH(KEXIV2_INCLUDE_DIR libkexiv2/version.h)
+     
+         FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2
+         PATHS
+         ${_KEXIV2LinkDir}
++        ${KDE4_LIB_DIR}
++        NO_DEFAULT_PATH
+         )
++        FIND_LIBRARY(KEXIV2_LIBRARIES NAMES kexiv2)
+     
+         if (KEXIV2_INCLUDE_DIR AND KEXIV2_LIBRARIES)
+             set(KEXIV2_FOUND TRUE)
+diff -Naur a/cmake/modules/FindKipi.cmake b/cmake/modules/FindKipi.cmake
+--- a/cmake/modules/FindKipi.cmake	2008-05-21 13:06:10.000000000 +0200
++++ b/cmake/modules/FindKipi.cmake	2008-09-22 16:21:37.000000000 +0200
+@@ -68,8 +68,11 @@
+     if(KIPI_VERSION_GOOD_FOUND)
+         set(KIPI_DEFINITIONS ${_KIPICflags})
+ 
+-        find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${KDE4_INCLUDE_DIR} ${_KIPIIncDir})
+-        find_library(KIPI_LIBRARIES NAMES kipi PATHS ${KDE4_LIB_DIR} ${_KIPILinkDir})
++        # as suggested by cmake documentation, first try specific path, then default to searching everything else
++        find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h PATHS ${_KIPIIncDir} ${KDE4_INCLUDE_DIR} NO_DEFAULT_PATH)
++        find_path(KIPI_INCLUDE_DIR NAMES libkipi/version.h)
++        find_library(KIPI_LIBRARIES NAMES kipi PATHS ${_KIPILinkDir} ${KDE4_LIB_DIR} NO_DEFAULT_PATH)
++        find_library(KIPI_LIBRARIES NAMES kipi)
+ 
+         if (KIPI_INCLUDE_DIR AND KIPI_LIBRARIES)
+             set(KIPI_FOUND TRUE)