Fix build without semantik-desktop, bug 361637

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

4 files changed, 45 insertions, 4 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 517c749ed11c..82bf6a74b544 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.736 2011/04/06 14:19:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.737 2011/04/07 07:55:13 dilfridge Exp $
+
+  07 Apr 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kdelibs-4.6.2.ebuild, +files/kdelibs-4.6.2-nonepomuk.patch:
+  Fix build without semantik-desktop, bug 361637
 
 *kdelibs-4.6.2 (06 Apr 2011)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 62853833e864..60985735aef3 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX dist/01_gentoo_set_xdg_menu_prefix.patch 606 RMD160 37290ce06adf1cf43b0006c02804d7fe762ed609 SHA1 8e86e06a70438c12085a595fd66e2354141fb056 SHA256 9c64b093340d7d25ce6c28d298cd62f3f4da141b762c663df9cd9b5b7722f7d3
 AUX dist/02_gentoo_append_xdg_config_dirs-1.patch 1041 RMD160 aa41988215dc8ede62c5f1e685eb24d597c1ec46 SHA1 b715c25a4bbfbaafaba2275057071efbb187523c SHA256 849e8cf1ca67eeae9dfd063eed676176f84e13d6e6b7244789c805c93e34edb9
 AUX dist/02_gentoo_append_xdg_config_dirs.patch 919 RMD160 1406b23f317710bf039aa6020f55781b6f2c2f6a SHA1 cc589b31277e5bb6322df0240389fa8423d8d942 SHA256 e0be8da02ea48eb6ad4dcb0d723bf2a619cc7ed57dd41f456018116fb05162f6
@@ -27,6 +30,7 @@ AUX kdelibs-4.6.0-kateacc.patch 1639 RMD160 239e2fb92dc2efa1e66b669a6e6cf29f9937
 AUX kdelibs-4.6.0-logoutcrash.patch 769 RMD160 999f0adf323e0adbe6359c0533bfc8f7bd1b5a9f SHA1 270f24d9682c32c9f69b3e6e13696888724c5169 SHA256 0eb003283c6956c989bece7ff64a4e099b291916e674e6947a582b6a32fc2c46
 AUX kdelibs-4.6.1-cve20111168.patch 648 RMD160 e9ab4d57bf2c33761aaac2ac7527a69b5e0aae96 SHA1 730534a337c88ef2a7c716f5d118f445d06898e7 SHA256 eaf04067911121a141036c5f2e22a810a566e9eec8f982c3573c0a2a51cc3014
 AUX kdelibs-4.6.1-sslproxy.patch 867 RMD160 7d0abcf3a1e9736d210b270159c78ba9c25c590b SHA1 8de74e66f71f8ce379c5a9a64195333892918e0a SHA256 bb8407da2c02beaf09a102474932288ecf54201088998f7f3b5f8c07c392d953
+AUX kdelibs-4.6.2-nonepomuk.patch 736 RMD160 3f6ab4acd649d47f045e2445544df3b84e7a700e SHA1 1f5af0271c6a5135bf0bc0acbd6f11abf256c81b SHA256 f27ec69f92e197bff33ecd6f25e3e47303e7599cdc28302477bca52ebe94b2a4
 AUX kdelibs-4.6.2-safestrigi.patch 28477 RMD160 0493c62e057ec2e8b01baa91289f4668b0d8c087 SHA1 a69387c5ed4c72d39f40a0e27041002319be192c SHA256 56ff0b19b298b08511c229e0023292a2a05f34e76c99118ddbe6449e18b8c0f0
 DIST kdelibs-4.4.5.tar.bz2 14088335 RMD160 533a627116524d5365ba45f5eb17c972426f59c1 SHA1 73e37abee48536b85782d1a17f1b282313b16c4d SHA256 11d79203e70ba104bf5414cb2a4e8919793ffb5b201592f28fc8ae325c8c6085
 DIST kdelibs-4.6.2.tar.bz2 12917847 RMD160 3a6f2a95f12d15c2ebfe2c5fb1e8f1fb3f51277f SHA1 b4794a9a69492ce4725abd9eb5d00d3a50e46603 SHA256 61d8d73d56f2e0198e590d1c6f5615dea9aa955fa69676265852744a1133b561
@@ -35,6 +39,23 @@ EBUILD kdelibs-4.4.5-r2.ebuild 9348 RMD160 c49aabc622b1bdb285bb1734dc54516f4a5bf
 EBUILD kdelibs-4.4.5-r3.ebuild 9389 RMD160 623d5b887f84431bf568fc87cd69daa2e7cfcd28 SHA1 b9b4ffe449c7a73ae7b0a00acb2e0fb5d00a85d9 SHA256 49970c6e40ce296c329067244f42ac0746b57ea571ed96e9972f78197fe990fb
 EBUILD kdelibs-4.4.5-r4.ebuild 9431 RMD160 2844a2000bb885b30a1597f8274ecd15f57e7efd SHA1 9d1bdcaecbae0e80a1980f1f51c7fa6ca0fb8d34 SHA256 3d15b70c3e72410e05b519de40f53f125c0f633d0c14d591c70f8b7171874ea4
 EBUILD kdelibs-4.4.5.ebuild 9261 RMD160 fa5cde9fa6918f1b00e99104f38e9906ec3a513f SHA1 731b5f1f193edfae407a40d1563fd731502abc3c SHA256 fae1b2fc955ae6eabc80e3f6c87a2b457a06fc47cd864e7a3c35c6a88a19b884
-EBUILD kdelibs-4.6.2.ebuild 9661 RMD160 3f1cb4506cb503801eca0183f9d431af503172a5 SHA1 3962196f05a5719f5bcac0f997008315b25f1488 SHA256 7b4958d6b5af9599c7075b50491ed83690e4649ee8bc1252d05fd2dfb3562dd6
-MISC ChangeLog 122837 RMD160 8027b5290334c96db7f03850669dcfbcb606f326 SHA1 3bf803fc01f73a01f5043f27e33c96680fbe6975 SHA256 518e97be67fe540080cd0f5ba1caa3463c9c1443d2d80a43a99ec67c9a0a49be
+EBUILD kdelibs-4.6.2.ebuild 9704 RMD160 a3abff624aaeefe18ac892251f88ccda6157d9e0 SHA1 bf24e9717cd9af0aa21f5d12afa5c2ac28fff125 SHA256 23936904d49ffe4ac4500bed5c87995fa67d2d9fae868486fa349298da51ff0f
+MISC ChangeLog 123006 RMD160 1e2b58f13b5307d7b9149c68833146c2e910150b SHA1 8368c4aedb229f92fbb590d5ac73a1747ed6674f SHA256 794adb9e2878320f7dba325c8544cca08c43afd8cece54e0cf95e96da9931349
 MISC metadata.xml 250 RMD160 1cf3a68b9ec97616d8ad515fba750a045cd261e5 SHA1 e13cc9329dd1557d621d84e042a3cfac56490548 SHA256 01ebccaddc9d829aec527fdcfd6d81dc72b5034d0eb59881838ecc10131c12a7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJNnW6kAAoJENwGBM22xffedOgQAJ1NuGiMeRRt8DPI24DLLswJ
+P09P9AkEB9ftfm93WV2R+hwtHxL+sEV42UzuTuI6NgRDhnw59lqWZtM9pw2cAo/3
+KM2lbmXMKBnmG1VahUvvf96Vwh4V0hdUgqTMuYgkcGBWWRwFwZZIWFKOw/Qmp+kW
+7hspg2hDeWaYdUB61dqTE30pqRTYXYg4CInAJfzsQaRpKyxi+Ai537usQH9vjBTt
+w3H+icdI0XBZZ92ZRXcQhrYqhTYw/KTW/LxhHywK3pzyF8xLiTsILUl3A7f+3+AW
+tRq490XxnOxctk4dhJ1kit5waPhu6spBSBrkrFf/GR3BsCeaMJ9jfDFEKocDbopL
+QuX2aqKPC+MgRhfYJq0PkU3zPfHDHUSCoXVm4j1Q6LQ4zdcbLRXFa2D75dE11oyO
+4Qy9NZkbURrEDt8j8jOG5ANVR1hZPQiAu9mbhzzZd6tqKmfEYXN1BGg4cEWVeSQx
+Rya5j4MjXe4lfcObu4+N2wHMzmkW5gP+NBCP5vvA1MtxwqsuDj7DQ/LRzIBfUG2G
+4b98Xx+yfO7BfPQAc2k90rgWy748bV/9ZHx84GAPI/G7R+1j2izMokPX34k96PRE
+tQ2siue0vPuHz4dztr85ytN0iDKk0JEvDcT5o3KieuvPm9U142qugwht618KIfFU
+XxnWzZ7bq4gwjky9G8mj
+=Xhby
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/kdelibs-4.6.2-nonepomuk.patch b/kde-base/kdelibs/files/kdelibs-4.6.2-nonepomuk.patch
new file mode 100644
index 000000000000..2e34050b1413
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.6.2-nonepomuk.patch
@@ -0,0 +1,15 @@
+diff -urNp kdelibs-4.6.1.org/kparts/CMakeLists.txt kdelibs-4.6.1/kparts/CMakeLists.txt
+--- kdelibs-4.6.1.org/kparts/CMakeLists.txt	2011-02-25 23:53:31.000000000 +0200
++++ kdelibs-4.6.1/kparts/CMakeLists.txt	2011-04-02 00:41:54.884508059 +0300
+@@ -2,7 +2,10 @@ project(kparts)
+ 
+ add_subdirectory( tests )
+ 
+-include_directories(${KDE4_KIO_INCLUDES} ${kparts_BINARY_DIR} ${nepomuk_SOURCE_DIR} ${nepomuk_SOURCE_DIR}/core ${nepomuk_SOURCE_DIR}/types)
++include_directories(${KDE4_KIO_INCLUDES} ${kparts_BINARY_DIR})
++if(HAVE_NEPOMUK)
++include_directories(${nepomuk_SOURCE_DIR} ${nepomuk_SOURCE_DIR}/core ${nepomuk_SOURCE_DIR}/types)
++endif(HAVE_NEPOMUK)
+ if(Soprano_FOUND)
+ include_directories(${SOPRANO_INCLUDE_DIR})
+ endif(Soprano_FOUND)
diff --git a/kde-base/kdelibs/kdelibs-4.6.2.ebuild b/kde-base/kdelibs/kdelibs-4.6.2.ebuild
index a4ac4e324862..e5f06f528ba9 100644
--- a/kde-base/kdelibs/kdelibs-4.6.2.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.6.2.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/kdelibs/kdelibs-4.6.2.ebuild,v 1.1 2011/04/06 14:19:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.6.2.ebuild,v 1.2 2011/04/07 07:55:13 dilfridge Exp $
 
 EAPI=3
 
@@ -137,6 +137,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.90-xslt.patch"
 	"${FILESDIR}/${PN}-4.6.0-kateacc.patch"
 	"${FILESDIR}/${PN}-4.6.2-safestrigi.patch"
+	"${FILESDIR}/${PN}-4.6.2-nonepomuk.patch"
 )
 
 src_prepare() {