Rename USE flag akonadi->semantic-desktop in kde-base/kdepimlibs

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/kde-base/akonadi/ChangeLog b/kde-base/akonadi/ChangeLog
index ba84030f771e88b90c691b4fc1a3f72740cd8a68..b82410b99f482b645ca9b87c62f9e030c0e1b95c 100644 (file)
--- a/kde-base/akonadi/ChangeLog
+++ b/kde-base/akonadi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/akonadi
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.59 2010/05/03 21:08:48 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/ChangeLog,v 1.60 2010/06/05 14:54:01 reavertm Exp $
+
+  05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> akonadi-4.4.2.ebuild,
+  akonadi-4.4.3.ebuild:
+  Rename USE flag akonadi->semantic-desktop
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -akonadi-4.4.1.ebuild:
   Drop KDE SC 4.4.1

diff --git a/kde-base/akonadi/akonadi-4.4.2.ebuild b/kde-base/akonadi/akonadi-4.4.2.ebuild
index 1aa111b063af40e584b32bd782ff664f63cdd558..12a3a4cd90eaa23c02e4e98bc7b135017040c548 100644 (file)
--- a/kde-base/akonadi/akonadi-4.4.2.ebuild
+++ b/kde-base/akonadi/akonadi-4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.4.2.ebuild,v 1.1 2010/03/30 19:18:54 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.4.2.ebuild,v 1.2 2010/06/05 14:54:01 reavertm Exp $
 
 EAPI="3"
 
@@ -12,9 +12,9 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-li
 IUSE="debug"
 
 DEPEND="
-       >=app-office/akonadi-server-1.2.1
+       >=app-office/akonadi-server-1.3.1
        $(add_kdebase_dep kdelibs 'semantic-desktop')
-       $(add_kdebase_dep kdepimlibs 'akonadi')
+       $(add_kdebase_dep kdepimlibs 'semantic-desktop')
        $(add_kdebase_dep libkdepim)
 "
 RDEPEND="${DEPEND}

diff --git a/kde-base/akonadi/akonadi-4.4.3.ebuild b/kde-base/akonadi/akonadi-4.4.3.ebuild
index 7caa37fbeb8771c89a6d5388848e3f6e30202b9b..065bf9a390999dfcab387a4c9d16a7f5f82c2418 100644 (file)
--- a/kde-base/akonadi/akonadi-4.4.3.ebuild
+++ b/kde-base/akonadi/akonadi-4.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.4.3.ebuild,v 1.2 2010/05/03 20:11:15 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akonadi/akonadi-4.4.3.ebuild,v 1.3 2010/06/05 14:54:01 reavertm Exp $
 
 EAPI="3"
 
@@ -12,9 +12,9 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-li
 IUSE="debug"
 
 DEPEND="
-       >=app-office/akonadi-server-1.2.1
+       >=app-office/akonadi-server-1.3.1
        $(add_kdebase_dep kdelibs 'semantic-desktop')
-       $(add_kdebase_dep kdepimlibs 'akonadi')
+       $(add_kdebase_dep kdepimlibs 'semantic-desktop')
        $(add_kdebase_dep libkdepim)
 "
 RDEPEND="${DEPEND}

diff --git a/kde-base/kaddressbook/ChangeLog b/kde-base/kaddressbook/ChangeLog
index 7dfb6399c7667bd9afc5e39704f7b107771a8024..3a81dd27ec0a2083b74af6dbc9f200bb0921f9e7 100644 (file)
--- a/kde-base/kaddressbook/ChangeLog
+++ b/kde-base/kaddressbook/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kaddressbook
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.153 2010/05/04 07:38:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/ChangeLog,v 1.154 2010/06/05 14:57:44 reavertm Exp $
+
+  05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  kaddressbook-4.4.2.ebuild, kaddressbook-4.4.3.ebuild:
+  Rename USE flag akonadi->semantic-desktop
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kaddressbook-4.4.1-r1.ebuild:

diff --git a/kde-base/kaddressbook/kaddressbook-4.4.2.ebuild b/kde-base/kaddressbook/kaddressbook-4.4.2.ebuild
index 9e499d82229b21aa5db85b9c75fa52e8dd3152a7..489f2fa4533da49ee2354dc7062d5a92e48957be 100644 (file)
--- a/kde-base/kaddressbook/kaddressbook-4.4.2.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.4.2.ebuild,v 1.1 2010/03/30 19:27:15 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.4.2.ebuild,v 1.2 2010/06/05 14:57:44 reavertm Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ IUSE="debug +handbook"
 
 DEPEND="
        $(add_kdebase_dep kdelibs 'semantic-desktop')
-       $(add_kdebase_dep kdepimlibs 'akonadi')
+       $(add_kdebase_dep kdepimlibs 'semantic-desktop')
        $(add_kdebase_dep libkdepim)
        $(add_kdebase_dep libkleo)
 "

diff --git a/kde-base/kaddressbook/kaddressbook-4.4.3.ebuild b/kde-base/kaddressbook/kaddressbook-4.4.3.ebuild
index 0c13e48afc31a2ba546d99c538aef99cc7743e17..1ba4c6588907a4956e9139abff31d5b3ec1eae8b 100644 (file)
--- a/kde-base/kaddressbook/kaddressbook-4.4.3.ebuild
+++ b/kde-base/kaddressbook/kaddressbook-4.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.4.3.ebuild,v 1.1 2010/05/03 20:17:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kaddressbook/kaddressbook-4.4.3.ebuild,v 1.2 2010/06/05 14:57:44 reavertm Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ IUSE="debug +handbook"
 
 DEPEND="
        $(add_kdebase_dep kdelibs 'semantic-desktop')
-       $(add_kdebase_dep kdepimlibs 'akonadi')
+       $(add_kdebase_dep kdepimlibs 'semantic-desktop')
        $(add_kdebase_dep libkdepim)
        $(add_kdebase_dep libkleo)
 "

diff --git a/kde-base/kalarm/ChangeLog b/kde-base/kalarm/ChangeLog
index 99ecf24e254d18063f0d7ac20b28cafdc00bf689..ce1d6bd1af8b714d75125887bb12b9bfd51d2679 100644 (file)
--- a/kde-base/kalarm/ChangeLog
+++ b/kde-base/kalarm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kalarm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.144 2010/05/03 21:13:56 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.145 2010/06/05 14:57:55 reavertm Exp $
+
+  05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> kalarm-4.4.2.ebuild,
+  kalarm-4.4.3.ebuild:
+  Rename USE flag akonadi->semantic-desktop
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kalarm-4.4.1.ebuild:
   Drop KDE SC 4.4.1

diff --git a/kde-base/kalarm/kalarm-4.4.2.ebuild b/kde-base/kalarm/kalarm-4.4.2.ebuild
index 8bd419475f90e77ff75d4ba1e9345653ee7c5c61..811af8f0518b28833020173887fc4bd35fd875f1 100644 (file)
--- a/kde-base/kalarm/kalarm-4.4.2.ebuild
+++ b/kde-base/kalarm/kalarm-4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.4.2.ebuild,v 1.1 2010/03/30 19:27:45 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.4.2.ebuild,v 1.2 2010/06/05 14:57:55 reavertm Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-li
 IUSE="debug +handbook"
 
 RDEPEND="
-       $(add_kdebase_dep kdepimlibs 'akonadi')
+       $(add_kdebase_dep kdepimlibs 'semantic-desktop')
        $(add_kdebase_dep libkdepim)
 "
 DEPEND="${RDEPEND}

diff --git a/kde-base/kalarm/kalarm-4.4.3.ebuild b/kde-base/kalarm/kalarm-4.4.3.ebuild
index 1fb3f2c9f2b52b404662eeec6fc05443e0c9aa47..cb4aa527222597daaab2a8b6359fbcb747d7b649 100644 (file)
--- a/kde-base/kalarm/kalarm-4.4.3.ebuild
+++ b/kde-base/kalarm/kalarm-4.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.4.3.ebuild,v 1.1 2010/05/03 20:17:44 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.4.3.ebuild,v 1.2 2010/06/05 14:57:55 reavertm Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-li
 IUSE="debug +handbook"
 
 RDEPEND="
-       $(add_kdebase_dep kdepimlibs 'akonadi')
+       $(add_kdebase_dep kdepimlibs 'semantic-desktop')
        $(add_kdebase_dep libkdepim)
 "
 DEPEND="${RDEPEND}

diff --git a/kde-base/kdepim-runtime/ChangeLog b/kde-base/kdepim-runtime/ChangeLog
index aa4bea8082ec6e688a571e65794b33da6be52cfc..c54f9cfdf8fe36c7a60d122bb51f92dca664dcc5 100644 (file)
--- a/kde-base/kdepim-runtime/ChangeLog
+++ b/kde-base/kdepim-runtime/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepim-runtime
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.8 2010/05/03 21:33:37 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/ChangeLog,v 1.9 2010/06/05 15:00:13 reavertm Exp $
+
+  05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  kdepim-runtime-4.4.2.ebuild, kdepim-runtime-4.4.3.ebuild:
+  Rename USE flag akonadi->semantic-desktop
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -kdepim-runtime-4.4.1.ebuild:

diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.4.2.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.4.2.ebuild
index aa2296ec22c89820b56cb5a8d5fcec0a00fd32a5..5214b6101e71c8e05d33c41e32a4f7e7aa581c34 100644 (file)
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.4.2.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.2.ebuild,v 1.1 2010/03/30 20:49:29 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.2.ebuild,v 1.2 2010/06/05 15:00:13 reavertm Exp $
 
 EAPI="3"
 
@@ -23,7 +23,7 @@ DEPEND="
        dev-libs/libxml2:2
        dev-libs/libxslt
        $(add_kdebase_dep kdelibs 'semantic-desktop')
-       $(add_kdebase_dep kdepimlibs 'akonadi')
+       $(add_kdebase_dep kdepimlibs 'semantic-desktop')
        $(add_kdebase_dep libkdepim)
        x11-misc/shared-mime-info
 "

diff --git a/kde-base/kdepim-runtime/kdepim-runtime-4.4.3.ebuild b/kde-base/kdepim-runtime/kdepim-runtime-4.4.3.ebuild
index 1f4c93e5550a68a578024355231b69867f6effc9..b9b959558e6422d4e7703fe79a381185f8c8c449 100644 (file)
--- a/kde-base/kdepim-runtime/kdepim-runtime-4.4.3.ebuild
+++ b/kde-base/kdepim-runtime/kdepim-runtime-4.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.3.ebuild,v 1.1 2010/05/03 20:42:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-runtime/kdepim-runtime-4.4.3.ebuild,v 1.2 2010/06/05 15:00:13 reavertm Exp $
 
 EAPI="3"
 
@@ -23,7 +23,7 @@ DEPEND="
        dev-libs/libxml2:2
        dev-libs/libxslt
        $(add_kdebase_dep kdelibs 'semantic-desktop')
-       $(add_kdebase_dep kdepimlibs 'akonadi')
+       $(add_kdebase_dep kdepimlibs 'semantic-desktop')
        $(add_kdebase_dep libkdepim)
        x11-misc/shared-mime-info
 "

diff --git a/kde-base/kdepimlibs/ChangeLog b/kde-base/kdepimlibs/ChangeLog
index 94b1980dfb797e29a013c9d8da2e6966c8077d97..d4682ead0366ef40ae70812ecb5f199c9bf592ca 100644 (file)
--- a/kde-base/kdepimlibs/ChangeLog
+++ b/kde-base/kdepimlibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdepimlibs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.71 2010/05/03 21:33:02 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/ChangeLog,v 1.72 2010/06/05 14:49:58 reavertm Exp $
+
+  05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  kdepimlibs-4.4.2.ebuild, kdepimlibs-4.4.3.ebuild:
+  Rename USE flag akonadi->semantic-desktop
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kdepimlibs-4.4.1.ebuild:
   Drop KDE SC 4.4.1

diff --git a/kde-base/kdepimlibs/kdepimlibs-4.4.2.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.4.2.ebuild
index 41ad6b472fb751c043cedd87088cf9da2486a68c..42c5df5a4f9fa4137d6d9e7d43bbb275185a9fc7 100644 (file)
--- a/kde-base/kdepimlibs/kdepimlibs-4.4.2.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.4.2.ebuild,v 1.1 2010/03/30 20:48:26 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.4.2.ebuild,v 1.2 2010/06/05 14:49:58 reavertm Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.kde.org/"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 LICENSE="LGPL-2.1"
-IUSE="+akonadi debug +handbook ldap"
+IUSE="debug +handbook ldap +semantic-desktop"
 
 # some akonadi tests timeout, that probaly needs more work as its ~700 tests
 RESTRICT="test"
@@ -23,7 +23,11 @@ DEPEND="
        dev-libs/libgpg-error
        >=dev-libs/libical-0.43
        dev-libs/cyrus-sasl
-       akonadi? ( >=app-office/akonadi-server-1.3.1 )
+       semantic-desktop? (
+               >=app-office/akonadi-server-1.3.1
+               media-sound/phonon
+               x11-misc/shared-mime-info
+       )
        ldap? ( net-nds/openldap )
 "
 RDEPEND="${DEPEND}"
@@ -38,12 +42,14 @@ add_blocker kontactinterfaces
 src_prepare() {
        kde4-base_src_prepare
 
-       if ! use akonadi; then
-               sed -e '/find_package(Akonadi/s/^/# DISABLED /' \
-                       -e '/macro_log_feature(Akonadi_FOUND/s/TRUE/FALSE/' \
-                       -e '/add_subdirectory(akonadi)/s/^/# DISABLED /' \
-                       -e '/add_subdirectory(mailtransport)/s/^/# DISABLED /' \
-                       -i CMakeLists.txt || die "failed to disable akonadi"
+       # Disable hardcoded checks
+       sed -r -e '/find_package\((Akonadi)/{/macro_optional_/!s/find/macro_optional_&/}' \
+               -e '/macro_log_feature\((Akonadi)_FOUND/s/ TRUE / FALSE /' \
+               -e '/add_subdirectory\((akonadi|mailtransport)/{/macro_optional_/!s/add/macro_optional_&/}' \
+               -i CMakeLists.txt || die
+       if ! use semantic-desktop; then
+               # More reliable than -DBUILD_akonadi=OFF
+               rm -r akonadi mailtransport || die
        fi
 }
 
@@ -51,6 +57,7 @@ src_configure() {
        mycmakeargs=(
                $(cmake-utils_use_build handbook doc)
                $(cmake-utils_use_with ldap)
+               $(cmake-utils_use_with semantic-desktop Akonadi)
        )
 
        kde4-base_src_configure

diff --git a/kde-base/kdepimlibs/kdepimlibs-4.4.3.ebuild b/kde-base/kdepimlibs/kdepimlibs-4.4.3.ebuild
index 3293b7fb0ead8e6ffb748487cac8b0f95564b7e3..63dc05fd552954b66152290bff86b847c67c1fb5 100644 (file)
--- a/kde-base/kdepimlibs/kdepimlibs-4.4.3.ebuild
+++ b/kde-base/kdepimlibs/kdepimlibs-4.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.4.3.ebuild,v 1.1 2010/05/03 20:41:44 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepimlibs/kdepimlibs-4.4.3.ebuild,v 1.2 2010/06/05 14:49:58 reavertm Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.kde.org/"
 
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 LICENSE="LGPL-2.1"
-IUSE="+akonadi debug +handbook ldap"
+IUSE="debug +handbook ldap +semantic-desktop"
 
 # some akonadi tests timeout, that probaly needs more work as its ~700 tests
 RESTRICT="test"
@@ -23,7 +23,11 @@ DEPEND="
        dev-libs/libgpg-error
        >=dev-libs/libical-0.43
        dev-libs/cyrus-sasl
-       akonadi? ( >=app-office/akonadi-server-1.3.1 )
+       semantic-desktop? (
+               >=app-office/akonadi-server-1.3.1
+               media-sound/phonon
+               x11-misc/shared-mime-info
+       )
        ldap? ( net-nds/openldap )
 "
 RDEPEND="${DEPEND}"
@@ -38,12 +42,14 @@ add_blocker kontactinterfaces
 src_prepare() {
        kde4-base_src_prepare
 
-       if ! use akonadi; then
-               sed -e '/find_package(Akonadi/s/^/# DISABLED /' \
-                       -e '/macro_log_feature(Akonadi_FOUND/s/TRUE/FALSE/' \
-                       -e '/add_subdirectory(akonadi)/s/^/# DISABLED /' \
-                       -e '/add_subdirectory(mailtransport)/s/^/# DISABLED /' \
-                       -i CMakeLists.txt || die "failed to disable akonadi"
+       # Disable hardcoded checks
+       sed -r -e '/find_package\((Akonadi)/{/macro_optional_/!s/find/macro_optional_&/}' \
+               -e '/macro_log_feature\((Akonadi)_FOUND/s/ TRUE / FALSE /' \
+               -e '/add_subdirectory\((akonadi|mailtransport)/{/macro_optional_/!s/add/macro_optional_&/}' \
+               -i CMakeLists.txt || die
+       if ! use semantic-desktop; then
+               # More reliable than -DBUILD_akonadi=OFF
+               rm -r akonadi mailtransport || die
        fi
 }
 
@@ -51,6 +57,7 @@ src_configure() {
        mycmakeargs=(
                $(cmake-utils_use_build handbook doc)
                $(cmake-utils_use_with ldap)
+               $(cmake-utils_use_with semantic-desktop Akonadi)
        )
 
        kde4-base_src_configure

diff --git a/kde-base/kdepimlibs/metadata.xml b/kde-base/kdepimlibs/metadata.xml
index 730f33214846631a0964204e7860807d5b422523..8d1e86a9cefb2981ec3d76074dc128c9474d4910 100644 (file)
--- a/kde-base/kdepimlibs/metadata.xml
+++ b/kde-base/kdepimlibs/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>kde</herd>
-<use>
-       <flag name="akonadi">Build support for Akonadi resources.</flag>
-</use>
 </pkgmetadata>

diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index b61196a1be8a8fa07196b22e0e189474e5c7e4b2..7ec4c8e7dc48b4499c95f12e5ed8244cb1f20669 100644 (file)
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdeplasma-addons
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.58 2010/05/25 13:23:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.59 2010/06/05 14:57:15 reavertm Exp $
+
+  05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  kdeplasma-addons-4.4.2-r1.ebuild, kdeplasma-addons-4.4.3.ebuild:
+  Rename USE flag akonadi->semantic-desktop
 
   25 May 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   kdeplasma-addons-4.4.2-r1.ebuild, kdeplasma-addons-4.4.3.ebuild:

diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.2-r1.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.2-r1.ebuild
index 4b8b8ebb0d4ceb21ffd891075623ebec708eba25..d58cb928c8a0bc3c50472ce2f9ae9c9901ea5526 100644 (file)
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.2-r1.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.2-r1.ebuild,v 1.2 2010/05/25 13:23:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.2-r1.ebuild,v 1.3 2010/06/05 14:57:15 reavertm Exp $
 
 EAPI="3"
 
@@ -26,7 +26,7 @@ COMMON_DEPEND="
        exif? ( $(add_kdebase_dep libkexiv2) )
        qalculate? ( sci-libs/libqalculate )
        qwt? ( x11-libs/qwt:5 )
-       rss? ( $(add_kdebase_dep kdepimlibs 'akonadi') )
+       rss? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
        scim? ( app-i18n/scim )
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.3.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.3.ebuild
index 25c9fce7fbcbd4d2920d690826779a8e202ab7d6..1e7ae30f0890239c4be31dee411d677b0e84425a 100644 (file)
--- a/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.3.ebuild
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.3.ebuild,v 1.3 2010/05/25 13:23:29 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.4.3.ebuild,v 1.4 2010/06/05 14:57:15 reavertm Exp $
 
 EAPI="3"
 
@@ -26,7 +26,7 @@ COMMON_DEPEND="
        exif? ( $(add_kdebase_dep libkexiv2) )
        qalculate? ( sci-libs/libqalculate )
        qwt? ( x11-libs/qwt:5 )
-       rss? ( $(add_kdebase_dep kdepimlibs 'akonadi') )
+       rss? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
        scim? ( app-i18n/scim )
 "
 DEPEND="${COMMON_DEPEND}

diff --git a/kde-base/klinkstatus/ChangeLog b/kde-base/klinkstatus/ChangeLog
index a93d259b617dff785182ead9fc03cca8a8ffad3f..e9db3b7597355aaa263692dca030a6c9fba741ca 100644 (file)
--- a/kde-base/klinkstatus/ChangeLog
+++ b/kde-base/klinkstatus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/klinkstatus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/ChangeLog,v 1.146 2010/05/03 21:48:00 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/ChangeLog,v 1.147 2010/06/05 15:00:44 reavertm Exp $
+
+  05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  klinkstatus-4.4.2.ebuild, klinkstatus-4.4.3.ebuild:
+  Rename USE flag akonadi->semantic-desktop
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org>
   -klinkstatus-4.4.1.ebuild:

diff --git a/kde-base/klinkstatus/klinkstatus-4.4.2.ebuild b/kde-base/klinkstatus/klinkstatus-4.4.2.ebuild
index 550f56b5ea2d19c5e1149eb89a364180c67703d8..9c50364a27064541413892712f21ae72bde1f1e6 100644 (file)
--- a/kde-base/klinkstatus/klinkstatus-4.4.2.ebuild
+++ b/kde-base/klinkstatus/klinkstatus-4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-4.4.2.ebuild,v 1.1 2010/03/30 21:11:53 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-4.4.2.ebuild,v 1.2 2010/06/05 15:00:44 reavertm Exp $
 
 EAPI="3"
 KMNAME="kdewebdev"
@@ -11,7 +11,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-li
 IUSE="debug +handbook tidy"
 
 DEPEND="
-       $(add_kdebase_dep kdepimlibs 'akonadi')
+       $(add_kdebase_dep kdepimlibs 'semantic-desktop')
        tidy? ( app-text/htmltidy )
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-base/klinkstatus/klinkstatus-4.4.3.ebuild b/kde-base/klinkstatus/klinkstatus-4.4.3.ebuild
index 0f79cbc9d9e29efbd48e84ef50ce73c4b48c0194..becb1d751e503c12450ab58098b79fb470075338 100644 (file)
--- a/kde-base/klinkstatus/klinkstatus-4.4.3.ebuild
+++ b/kde-base/klinkstatus/klinkstatus-4.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-4.4.3.ebuild,v 1.1 2010/05/03 20:58:37 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klinkstatus/klinkstatus-4.4.3.ebuild,v 1.2 2010/06/05 15:00:44 reavertm Exp $
 
 EAPI="3"
 KMNAME="kdewebdev"
@@ -11,7 +11,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-li
 IUSE="debug +handbook tidy"
 
 DEPEND="
-       $(add_kdebase_dep kdepimlibs 'akonadi')
+       $(add_kdebase_dep kdepimlibs 'semantic-desktop')
        tidy? ( app-text/htmltidy )
 "
 RDEPEND="${DEPEND}"

diff --git a/kde-base/kmail/ChangeLog b/kde-base/kmail/ChangeLog
index f7240a2bbf6aad9974a4a22052def535b0cbd287..5eab66cca8bd2a18f34a29b8b5ade5a1acc7bf17 100644 (file)
--- a/kde-base/kmail/ChangeLog
+++ b/kde-base/kmail/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kmail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.206 2010/05/03 21:49:08 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/ChangeLog,v 1.207 2010/06/05 14:56:10 reavertm Exp $
+
+  05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org> kmail-4.4.2.ebuild,
+  kmail-4.4.3.ebuild:
+  Rename USE flag akonadi->semantic-desktop
 
   03 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -kmail-4.4.1.ebuild:
   Drop KDE SC 4.4.1

diff --git a/kde-base/kmail/kmail-4.4.2.ebuild b/kde-base/kmail/kmail-4.4.2.ebuild
index f7d5b11c850ec0e8a36ff3af1af9b10eca43e35f..2204f19596e6db0d26fe1d9bd624f6885aefc060 100644 (file)
--- a/kde-base/kmail/kmail-4.4.2.ebuild
+++ b/kde-base/kmail/kmail-4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.2.ebuild,v 1.2 2010/04/14 18:42:56 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.2.ebuild,v 1.3 2010/06/05 14:56:10 reavertm Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ IUSE="ayatana debug +handbook"
 
 DEPEND="
        $(add_kdebase_dep kdelibs 'semantic-desktop')
-       $(add_kdebase_dep kdepimlibs 'akonadi')
+       $(add_kdebase_dep kdepimlibs 'semantic-desktop')
        $(add_kdebase_dep libkdepim)
        $(add_kdebase_dep libkleo)
        $(add_kdebase_dep libkpgp)

diff --git a/kde-base/kmail/kmail-4.4.3.ebuild b/kde-base/kmail/kmail-4.4.3.ebuild
index 77eae806def6e2e76d3d1c0a9d9420624efbc747..c3220057ac242e580d2fd89fd5622c2aec425e78 100644 (file)
--- a/kde-base/kmail/kmail-4.4.3.ebuild
+++ b/kde-base/kmail/kmail-4.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.3.ebuild,v 1.1 2010/05/03 20:59:57 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kmail/kmail-4.4.3.ebuild,v 1.2 2010/06/05 14:56:10 reavertm Exp $
 
 EAPI="3"
 
@@ -13,7 +13,7 @@ IUSE="ayatana debug +handbook"
 
 DEPEND="
        $(add_kdebase_dep kdelibs 'semantic-desktop')
-       $(add_kdebase_dep kdepimlibs 'akonadi')
+       $(add_kdebase_dep kdepimlibs 'semantic-desktop')
        $(add_kdebase_dep libkdepim)
        $(add_kdebase_dep libkleo)
        $(add_kdebase_dep libkpgp)

diff --git a/kde-base/korganizer/ChangeLog b/kde-base/korganizer/ChangeLog
index db63bc71d2387d9e52f7f10ad65e4ca26f0f2548..828a847fd3f480cade2ac66e358fd0570403a6c3 100644 (file)
--- a/kde-base/korganizer/ChangeLog
+++ b/kde-base/korganizer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/korganizer
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.161 2010/06/02 10:36:31 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/ChangeLog,v 1.162 2010/06/05 14:57:01 reavertm Exp $
+
+  05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  korganizer-4.4.2.ebuild, korganizer-4.4.3.ebuild:
+  Rename USE flag akonadi->semantic-desktop
 
   02 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
   korganizer-4.4.3.ebuild:

diff --git a/kde-base/korganizer/korganizer-4.4.2.ebuild b/kde-base/korganizer/korganizer-4.4.2.ebuild
index e2d21213af352b5305a883443ac485fef3d95677..bf8f7f66b8f6a4526affabda9b9d4938f93b7488 100644 (file)
--- a/kde-base/korganizer/korganizer-4.4.2.ebuild
+++ b/kde-base/korganizer/korganizer-4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.4.2.ebuild,v 1.1 2010/03/30 21:24:57 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.4.2.ebuild,v 1.2 2010/06/05 14:57:01 reavertm Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-li
 IUSE="debug +handbook"
 
 DEPEND="
-       $(add_kdebase_dep kdepimlibs 'akonadi')
+       $(add_kdebase_dep kdepimlibs 'semantic-desktop')
        $(add_kdebase_dep libkdepim)
        sys-libs/zlib
 "

diff --git a/kde-base/korganizer/korganizer-4.4.3.ebuild b/kde-base/korganizer/korganizer-4.4.3.ebuild
index dd0f13b651629f05a07561a58cb30e93e2ddedba..71d1ccc2604ca2edb5fb1b54b16636ef0c23e7b9 100644 (file)
--- a/kde-base/korganizer/korganizer-4.4.3.ebuild
+++ b/kde-base/korganizer/korganizer-4.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.4.3.ebuild,v 1.2 2010/06/02 10:36:31 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/korganizer/korganizer-4.4.3.ebuild,v 1.3 2010/06/05 14:57:01 reavertm Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-li
 IUSE="debug +handbook"
 
 DEPEND="
-       $(add_kdebase_dep kdepimlibs 'akonadi')
+       $(add_kdebase_dep kdepimlibs 'semantic-desktop')
        $(add_kdebase_dep libkdepim)
        sys-libs/zlib
 "

diff --git a/kde-base/libkdepim/ChangeLog b/kde-base/libkdepim/ChangeLog
index 7421a5f9b7911f9dd72ed0a08faaebdaf3a1309d..d71a7a77adc453731bd763bbfbb92d1e74285aa7 100644 (file)
--- a/kde-base/libkdepim/ChangeLog
+++ b/kde-base/libkdepim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/libkdepim
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.157 2010/05/04 05:46:01 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/ChangeLog,v 1.158 2010/06/05 14:58:33 reavertm Exp $
+
+  05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  libkdepim-4.4.2.ebuild, libkdepim-4.4.3.ebuild:
+  Rename USE flag akonadi->semantic-desktop
 
   04 May 2010; Alexey Shvetsov <alexxy@gentoo.org> -libkdepim-4.4.1.ebuild:
   Drop KDE SC 4.4.1

diff --git a/kde-base/libkdepim/libkdepim-4.4.2.ebuild b/kde-base/libkdepim/libkdepim-4.4.2.ebuild
index b82c13a0397e7c1dd36f17204cb4440dde2ffe41..2d7c3c48a02f7e88ce317e6c2696eabb5789c17a 100644 (file)
--- a/kde-base/libkdepim/libkdepim-4.4.2.ebuild
+++ b/kde-base/libkdepim/libkdepim-4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-4.4.2.ebuild,v 1.1 2010/03/30 21:52:27 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-4.4.2.ebuild,v 1.2 2010/06/05 14:58:33 reavertm Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-li
 IUSE="debug"
 
 DEPEND="
-       $(add_kdebase_dep kdepimlibs 'akonadi')
+       $(add_kdebase_dep kdepimlibs 'semantic-desktop')
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-base/libkdepim/libkdepim-4.4.3.ebuild b/kde-base/libkdepim/libkdepim-4.4.3.ebuild
index e7cf7b6063fa0bc55a8880293acaa94ca04de4e7..705097d4dc94ace22a63872088accd51e8bedcbb 100644 (file)
--- a/kde-base/libkdepim/libkdepim-4.4.3.ebuild
+++ b/kde-base/libkdepim/libkdepim-4.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-4.4.3.ebuild,v 1.1 2010/05/03 21:33:25 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/libkdepim/libkdepim-4.4.3.ebuild,v 1.2 2010/06/05 14:58:33 reavertm Exp $
 
 EAPI="3"
 
@@ -12,7 +12,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-li
 IUSE="debug"
 
 DEPEND="
-       $(add_kdebase_dep kdepimlibs 'akonadi')
+       $(add_kdebase_dep kdepimlibs 'semantic-desktop')
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-base/plasma-workspace/ChangeLog b/kde-base/plasma-workspace/ChangeLog
index 1bbaca4cbaa51022b0cdef2e516ef0fd036c2f5b..e0b349238845e6a043148743d5302972ca61351a 100644 (file)
--- a/kde-base/plasma-workspace/ChangeLog
+++ b/kde-base/plasma-workspace/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/plasma-workspace
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.67 2010/05/04 06:14:14 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/ChangeLog,v 1.68 2010/06/05 14:57:55 reavertm Exp $
+
+  05 Jun 2010; Maciej Mrozowski <reavertm@gentoo.org>
+  plasma-workspace-4.4.2.ebuild, plasma-workspace-4.4.3.ebuild:
+  Rename USE flag akonadi->semantic-desktop
 
   04 May 2010; Maciej Mrozowski <reavertm@gentoo.org>
   plasma-workspace-4.4.2.ebuild, plasma-workspace-4.4.3.ebuild:

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild
index 8570c2de413f5470c8f822db5272eb4cba674b45..c6b0ef80daebeae1031ddd19f58ce623298a5fee 100644 (file)
--- a/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.2.ebuild,v 1.4 2010/05/04 01:16:03 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.4.2.ebuild,v 1.5 2010/06/05 14:57:55 reavertm Exp $
 
 EAPI="3"
 
@@ -32,7 +32,7 @@ COMMONDEPEND="
                >=dev-python/sip-4.7.1
                $(add_kdebase_dep pykde4)
        )
-       rss? ( $(add_kdebase_dep kdepimlibs 'akonadi') )
+       rss? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
        xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${COMMONDEPEND}

diff --git a/kde-base/plasma-workspace/plasma-workspace-4.4.3.ebuild b/kde-base/plasma-workspace/plasma-workspace-4.4.3.ebuild
index c960dd4c337f5f02100e1dd9121ceeccd10a82c9..6ee1ebe32b8feb7dd2cea55f13e9c1c98f61bdc1 100644 (file)
--- a/kde-base/plasma-workspace/plasma-workspace-4.4.3.ebuild
+++ b/kde-base/plasma-workspace/plasma-workspace-4.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.4.3.ebuild,v 1.3 2010/05/04 01:16:03 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma-workspace/plasma-workspace-4.4.3.ebuild,v 1.4 2010/06/05 14:57:55 reavertm Exp $
 
 EAPI="3"
 
@@ -32,7 +32,7 @@ COMMONDEPEND="
                >=dev-python/sip-4.7.1
                $(add_kdebase_dep pykde4)
        )
-       rss? ( $(add_kdebase_dep kdepimlibs 'akonadi') )
+       rss? ( $(add_kdebase_dep kdepimlibs 'semantic-desktop') )
        xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${COMMONDEPEND}