Make semantic-desktop optional again for plasma-workspace, patch by Fabiano <fabianoengler at gmail dot com>, bug 350850

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

5 files changed, 30 insertions, 46 deletions

diff --git a/kde-base/libkworkspace/Manifest b/kde-base/libkworkspace/Manifest
index a84dd5f1b7b1..872f19b57aa8 100644
--- a/kde-base/libkworkspace/Manifest
+++ b/kde-base/libkworkspace/Manifest
@@ -1,28 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST kdebase-workspace-4.4.5.tar.bz2 77036766 RMD160 3f6e9ceb0df277b73ca6ec38de6c85f578077640 SHA1 d0defe431a760503f8fbb9ee2413b666b3c84cd7 SHA256 53475dacd95955ef01378d4de7e46602be13e81a1afac73fbed449bb367c20e6
 DIST kdebase-workspace-4.5.5.tar.bz2 65688854 RMD160 351f05ae6a1b67b35de7460e1e4353ba3d16720e SHA1 38457b606bfc0b39842fb451566ddf49d145da82 SHA256 4d9090fe3b261debfce7b1db4799d7884097960464709866f6da840557d98091
 DIST kdebase-workspace-4.6.0.tar.bz2 69493217 RMD160 115e0a25d19d462985babbcc729654e27302d936 SHA1 c192f712d16617e625acc84fcd9e0546df887a70 SHA256 f4ff79d98ae1f254b2448637c76de6565132ba99feacab5faa226c1335d95382
 EBUILD libkworkspace-4.4.5.ebuild 789 RMD160 38b69abe7ab9243021b7ce38170c769a1f4e8b75 SHA1 b7c9ba6c8da1f1f40371afcd3c32b41e5fd3d312 SHA256 5ec7ea96f5e1feb63702690b32311c35ea3634bcbf0d5f0ec4b075900ed30d3b
 EBUILD libkworkspace-4.5.5.ebuild 977 RMD160 70568644f25d9faf70c4bdf9c2372ded8f171b6c SHA1 a5f19893cb7e04eda4266ec599b22903252aff26 SHA256 fc0f1c45585786f32564130cfe3183292e95dc3fcd71a72ef64cd03ae131ba04
-EBUILD libkworkspace-4.6.0.ebuild 936 RMD160 d99265350dfe22e46ced5dc7efc845695bcec6ad SHA1 4769d22cc63f65cf79389d22a56f4f9479c1b11e SHA256 c84ae08e35f02ed0ef66fa0df3d41d4e7705c97dd088d93c65fcbe57a21cfb74
-MISC ChangeLog 11535 RMD160 bae448b07001a6bc49f10f59b996d90710a27943 SHA1 87edb7e432e1ac4c42c9364edb713a47f61ce440 SHA256 cb84fd716b69028bda866ea0a1cb607b8baef413ffece9584d6ab482793264dc
+EBUILD libkworkspace-4.6.0.ebuild 792 RMD160 f3e45845ed192774892a066eab55309f9a8e4723 SHA1 03037821663e2ce527eeeb53a7e6748e31b3c569 SHA256 80552468ef4f94cb9e650abcc30470626b2d089d1277ff8d3d00077ec1152a32
+MISC ChangeLog 11698 RMD160 b002c1fbffd9e65318eb669d635d0015bf22f5ad SHA1 77eec5e6b3f51dc831b5b3bc887b33f2560a6a39 SHA256 469e1da41279830d0a28422d0cc6156001eda0c187868cf2f797d05b6baf5419
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNQIUmAAoJEOf+E+/4L5Lm1swQAJT2X9K1AdPewE+BcZS7Nvml
-ZKuTuGmzKHyL+qcbkHEFl0X7f/aeyaMmKHssWld3pTEU15jFkvQvB7LJRLlEqb1S
-UbWgp8W21JhFAshMyDYWdvmA1i37WMOqToaTfbyExcctUhmGLZ8jo4ypG4vlIuhq
-ijfwerZ3WHZnuqAXjzy2MVNDcf5sKyRjFTQfhalUlKdlANwYAhNUe+sEukAS1QTG
-CNVeDc9VsURrEGnU+TBkIrL4b3MaQb4VPThb+vxiDp0Wzwd4hB+vJv+//mImnjRW
-oiUufptv3pVdIEg5KsYfQUv3XXS+tRPXYQcKsqNcxNvo2jsGotsB3PeCCJCFCWmD
-+lcqG3pQHPZf+eAgCnh4MaE44kYEOEJx/jEL2A8CHlYOGryXPFQT9b6u3r5+YRCd
-sppmQ2sTu7veQwyIAhK8e3CrLY9iF0Ll6B0ZB1vfzAu7jAV96JH5FQw9I3ZH0s4W
-sRpfIm+gs+02z2sN3TJiDpzLXXWR9ihi1ZX3/yAq1BWlt/BAF/u4cWhZz2pwOLTV
-teYRCvIowPvjJtUxFzppWJ2ZXSOLSBTafE8i0BJEJmdMj+2q+wRhYt0kVII946jx
-MNuT3Y5n/Cf2P5xSphIpJjSq+Yl2VHWmR2SdNSg6yslxKvdUiLNQY7u6YyyXE1jJ
-lyTDaLT7vuKPSItiDBv7
-=u52w
------END PGP SIGNATURE-----
diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index e22887df552a..8320dee766bb 100644
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/plasma-workspace
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.89 2011/01/26 20:29:09 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.90 2011/02/04 13:28:34 tampakrap Exp $
+
+  04 Feb 2011; Theo Chatzimichos <tampakrap@gentoo.org>
+  plasma-workspace-4.6.0.ebuild,
+  +files/plasma-workspace-4.6.0-optional_akonadi-server.patch:
+  Make semantic-desktop optional again for plasma-workspace, patch by Fabiano
+  <fabianoengler at gmail dot com>, bug 350850
 
 *plasma-workspace-4.6.0 (26 Jan 2011)
 
diff --git a/kde-base/plasma-workspace/Manifest b/kde-base/plasma-workspace/Manifest
index 8182fde8bd00..45846989f6e9 100644
--- a/kde-base/plasma-workspace/Manifest
+++ b/kde-base/plasma-workspace/Manifest
@@ -1,29 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX plasma-workspace-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157
+AUX plasma-workspace-4.6.0-optional_akonadi-server.patch 781 RMD160 feff5a1fd798c2578f192dde2c4978296ac53e6c SHA1 f5ea63a4a4ef4dc3bf62d0fa933bb0554c2086c0 SHA256 f0730ea0fd0116410102c13a28bf9120630c29dadecfaae52942596d6ff4b67c
 DIST kdebase-workspace-4.4.5.tar.bz2 77036766 RMD160 3f6e9ceb0df277b73ca6ec38de6c85f578077640 SHA1 d0defe431a760503f8fbb9ee2413b666b3c84cd7 SHA256 53475dacd95955ef01378d4de7e46602be13e81a1afac73fbed449bb367c20e6
 DIST kdebase-workspace-4.5.5.tar.bz2 65688854 RMD160 351f05ae6a1b67b35de7460e1e4353ba3d16720e SHA1 38457b606bfc0b39842fb451566ddf49d145da82 SHA256 4d9090fe3b261debfce7b1db4799d7884097960464709866f6da840557d98091
 DIST kdebase-workspace-4.6.0.tar.bz2 69493217 RMD160 115e0a25d19d462985babbcc729654e27302d936 SHA1 c192f712d16617e625acc84fcd9e0546df887a70 SHA256 f4ff79d98ae1f254b2448637c76de6565132ba99feacab5faa226c1335d95382
 EBUILD plasma-workspace-4.4.5.ebuild 2909 RMD160 06e2be7bd9bc3c28c510c7880e69d4aec15ba415 SHA1 59a3bc64bedef03958d9844cead6ed65d8c37e71 SHA256 39714c6a68948f4b4ad804ebdc94572d7d266249a71c2e9338850ca60cd2c59c
 EBUILD plasma-workspace-4.5.5.ebuild 3175 RMD160 6ff6d1cf4c741305eaf8286275132e3aa2f500f2 SHA1 bec8af5ae4407d361f8b36d14da3fc2fb98ee4ef SHA256 a98820da6fac11cdd282ee7a9a0e5b92c9e286de7ad254121ae68854c0d0c941
-EBUILD plasma-workspace-4.6.0.ebuild 3231 RMD160 cb01ca5d312c26b1a04f7161bf2483881b2bcb1d SHA1 419af28f01188a8b14f733eea837b3490be0de57 SHA256 db55948f7e6253773cb1e916ea6f9984322612a11e31c6eb358c4361cfaa1084
-MISC ChangeLog 12944 RMD160 34d16d106ca1e2e4f38714078ede636fa62d926b SHA1 8bf4511bb5cfe416a8b12882c4051f196e911ce6 SHA256 88ab49bc36cdb4add242cd0bd66cbe051805214d00d8a74fe8d6f4f09b3a9f04
+EBUILD plasma-workspace-4.6.0.ebuild 3284 RMD160 86194f66b0765077d3d901e2eb278f67cbba99de SHA1 ff767a3055d67ef8d2127c1163b225c103571575 SHA256 ad40555f6d6fe1cdbda1332a0f1263a8eb960f1b79a7645fbd17c138b6877073
+MISC ChangeLog 13225 RMD160 cf2c8e6eaca7df97c4c97fd37eb057509cfcf298 SHA1 df5ab02b84556f775f53d3449d95937618f6f8b4 SHA256 fa7f0a34b12911a35222786e5325f4d4e10f01d0b7b96aec346066482b24f7f8
 MISC metadata.xml 426 RMD160 c97840bcdd9f62d76728bc99edf3807c6a3bb155 SHA1 050bfc476b5f6e9ad5096050ca5d1e88b79e7d7d SHA256 861524f41b7fb32a40b8d88ae98f6ec76b657bfc251b9133a40bdd48c2fd430c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNQITzAAoJEOf+E+/4L5LmwFEP/3thkJUfFNwhHy/S7C8R9Yza
-J/1EXJC0lmrC7Psru0SC/aQqLW1ZWnb+PiIGQxVmfzDJhxXLDNtNoIVYeZoggoG3
-CNoLFiWlZW9vJWeFFlNqqAIrJA8gTx8voQRhReJftMQJAmHMxEnKQ7yX2XXnLtj3
-FMoEdUFl2nfgbeiqIPsJe+NZNY0+R1Lbg1xOtuZoE0gNdorAqRgCqZFn9jcE4O0Q
-YLg0RsB8J0Xh9M27ZAS/dC9IHrjOCPOlf4xL6zzIvAqsnV3AdFiNGRJNncmfePis
-ZLderPAbb9oDToHe0uaLlGbE/ElfC8v3F2ZGAV5bYzcBt0IPEbrcGBun6B8wF2lB
-JDIohNJlJU250cz0yh0TQ8daunhjngKtPcVnd1BSP2O259x+Yf/hLitnOiZMBe3+
-XTRkR3ANk6UsHSxqNMjwDuf3U7NyuEj58In4KaWymn7OG1S8CJMI8TFg9h4Ap//7
-fJdj2X9BjXvHI/T9/eXHeqiZhtXA4jlFD9oHBjJE1AjpXric4RzZVauffaJQ3cXY
-darlB7rAHuSgiDve0rnJKbTx+cHsA6QRGr9e7qOIQGsME6B0TQWpdxD5jc0h4UnP
-q+jI8Md2b6XhaAaQ5M6IgwTHr0QvW0d89+hbAge0gvCa8CCEt951k4suv51LmDTN
-lZJRnpVZmlirvGSL4aLK
-=w5+Z
------END PGP SIGNATURE-----
diff --git a/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch b/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch
new file mode 100644
index 000000000000..de333bca99a2
--- /dev/null
+++ b/kde-base/plasma-workspace/files/plasma-workspace-4.6.0-optional_akonadi-server.patch
@@ -0,0 +1,16 @@
+diff -r -u plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt
+--- plasma-workspace-4.6.0-orig/plasma/generic/dataengines/CMakeLists.txt	2011-02-03 18:58:47.884000165 -0500
++++ plasma-workspace-4.6.0/plasma/generic/dataengines/CMakeLists.txt	2011-02-03 19:24:21.511000165 -0500
+@@ -28,8 +28,10 @@
+ macro_log_feature(KDEPIMLIBS_FOUND "kdepimlibs" "KDE PIM libraries" "http://www.kde.org" FALSE "" "Needed for building several plasma dataengines")
+ 
+ if(KDEPIMLIBS_FOUND)
+-   add_subdirectory(akonadi)
+-   add_subdirectory(calendar)
++   if(AKONADI_FOUND)
++      add_subdirectory(akonadi)
++      add_subdirectory(calendar)
++   endif(AKONADI_FOUND)
+    add_subdirectory(rss)
+ endif(KDEPIMLIBS_FOUND)
+ 
diff --git a/kde-base/plasma-workspace/plasma-workspace-4.6.0.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.6.0.ebuild
index 53771a7a75d6..0a43bfef0456 100644
--- a/kde-base/plasma-workspace/plasma-workspace-4.6.0.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.6.0.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/plasma-workspace/plasma-workspace-4.6.0.ebuild,v 1.1 2011/01/26 20:29:09 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.6.0.ebuild,v 1.2 2011/02/04 13:28:34 tampakrap Exp $
 
 EAPI="3"
 
@@ -69,6 +69,7 @@ KMLOADLIBS="libkworkspace libplasmaclock libplasmagenericshell libtaskmanager"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+	"${FILESDIR}/${P}-optional_akonadi-server.patch"
 )
 
 pkg_setup() {