From c70ab54441aca875bf2bd8cf0d368016066ea354 Mon Sep 17 00:00:00 2001 From: Maciej Mrozowski Date: Sat, 5 Jun 2010 15:00:44 +0000 Subject: [PATCH] Rename USE flag akonadi->semantic-desktop in kde-base/kdepimlibs Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- kde-base/akonadi/ChangeLog | 6 ++++- kde-base/akonadi/akonadi-4.4.2.ebuild | 6 ++--- kde-base/akonadi/akonadi-4.4.3.ebuild | 6 ++--- kde-base/kaddressbook/ChangeLog | 6 ++++- .../kaddressbook/kaddressbook-4.4.2.ebuild | 4 +-- .../kaddressbook/kaddressbook-4.4.3.ebuild | 4 +-- kde-base/kalarm/ChangeLog | 6 ++++- kde-base/kalarm/kalarm-4.4.2.ebuild | 4 +-- kde-base/kalarm/kalarm-4.4.3.ebuild | 4 +-- kde-base/kdepim-runtime/ChangeLog | 6 ++++- .../kdepim-runtime-4.4.2.ebuild | 4 +-- .../kdepim-runtime-4.4.3.ebuild | 4 +-- kde-base/kdepimlibs/ChangeLog | 6 ++++- kde-base/kdepimlibs/kdepimlibs-4.4.2.ebuild | 25 ++++++++++++------- kde-base/kdepimlibs/kdepimlibs-4.4.3.ebuild | 25 ++++++++++++------- kde-base/kdepimlibs/metadata.xml | 3 --- kde-base/kdeplasma-addons/ChangeLog | 6 ++++- .../kdeplasma-addons-4.4.2-r1.ebuild | 4 +-- .../kdeplasma-addons-4.4.3.ebuild | 4 +-- kde-base/klinkstatus/ChangeLog | 6 ++++- kde-base/klinkstatus/klinkstatus-4.4.2.ebuild | 4 +-- kde-base/klinkstatus/klinkstatus-4.4.3.ebuild | 4 +-- kde-base/kmail/ChangeLog | 6 ++++- kde-base/kmail/kmail-4.4.2.ebuild | 4 +-- kde-base/kmail/kmail-4.4.3.ebuild | 4 +-- kde-base/korganizer/ChangeLog | 6 ++++- kde-base/korganizer/korganizer-4.4.2.ebuild | 4 +-- kde-base/korganizer/korganizer-4.4.3.ebuild | 4 +-- kde-base/libkdepim/ChangeLog | 6 ++++- kde-base/libkdepim/libkdepim-4.4.2.ebuild | 4 +-- kde-base/libkdepim/libkdepim-4.4.3.ebuild | 4 +-- kde-base/plasma-workspace/ChangeLog | 6 ++++- .../plasma-workspace-4.4.2.ebuild | 4 +-- .../plasma-workspace-4.4.3.ebuild | 4 +-- 34 files changed, 129 insertions(+), 74 deletions(-) diff --git a/kde-base/akonadi/ChangeLog b/kde-base/akonadi/ChangeLog index ba84030f771e..b82410b99f48 100644 --- 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 akonadi-4.4.2.ebuild, + akonadi-4.4.3.ebuild: + Rename USE flag akonadi->semantic-desktop 03 May 2010; Alexey Shvetsov -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 1aa111b063af..12a3a4cd90ea 100644 --- 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 7caa37fbeb87..065bf9a39099 100644 --- 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 7dfb6399c766..3a81dd27ec0a 100644 --- 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 + kaddressbook-4.4.2.ebuild, kaddressbook-4.4.3.ebuild: + Rename USE flag akonadi->semantic-desktop 04 May 2010; Alexey Shvetsov -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 9e499d82229b..489f2fa4533d 100644 --- 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 0c13e48afc31..1ba4c6588907 100644 --- 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 99ecf24e254d..ce1d6bd1af8b 100644 --- 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 kalarm-4.4.2.ebuild, + kalarm-4.4.3.ebuild: + Rename USE flag akonadi->semantic-desktop 03 May 2010; Alexey Shvetsov -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 8bd419475f90..811af8f0518b 100644 --- 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 1fb3f2c9f2b5..cb4aa5272225 100644 --- 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 aa4bea8082ec..c54f9cfdf8fe 100644 --- 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 + kdepim-runtime-4.4.2.ebuild, kdepim-runtime-4.4.3.ebuild: + Rename USE flag akonadi->semantic-desktop 03 May 2010; Alexey Shvetsov -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 aa2296ec22c8..5214b6101e71 100644 --- 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 1f4c93e5550a..b9b959558e64 100644 --- 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 94b1980dfb79..d4682ead0366 100644 --- 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 + kdepimlibs-4.4.2.ebuild, kdepimlibs-4.4.3.ebuild: + Rename USE flag akonadi->semantic-desktop 03 May 2010; Alexey Shvetsov -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 41ad6b472fb7..42c5df5a4f9f 100644 --- 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 3293b7fb0ead..63dc05fd5529 100644 --- 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 730f33214846..8d1e86a9cefb 100644 --- a/kde-base/kdepimlibs/metadata.xml +++ b/kde-base/kdepimlibs/metadata.xml @@ -2,7 +2,4 @@ kde - - Build support for Akonadi resources. - diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog index b61196a1be8a..7ec4c8e7dc48 100644 --- 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 + 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 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 4b8b8ebb0d4c..d58cb928c8a0 100644 --- 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 25c9fce7fbcb..1e7ae30f0890 100644 --- 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 a93d259b617d..e9db3b759735 100644 --- 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 + klinkstatus-4.4.2.ebuild, klinkstatus-4.4.3.ebuild: + Rename USE flag akonadi->semantic-desktop 03 May 2010; Alexey Shvetsov -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 550f56b5ea2d..9c50364a2706 100644 --- 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 0f79cbc9d9e2..becb1d751e50 100644 --- 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 f7240a2bbf6a..5eab66cca8bd 100644 --- 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 kmail-4.4.2.ebuild, + kmail-4.4.3.ebuild: + Rename USE flag akonadi->semantic-desktop 03 May 2010; Alexey Shvetsov -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 f7d5b11c850e..2204f19596e6 100644 --- 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 77eae806def6..c3220057ac24 100644 --- 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 db63bc71d238..828a847fd3f4 100644 --- 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 + korganizer-4.4.2.ebuild, korganizer-4.4.3.ebuild: + Rename USE flag akonadi->semantic-desktop 02 Jun 2010; Maciej Mrozowski 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 e2d21213af35..bf8f7f66b8f6 100644 --- 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 dd0f13b65162..71d1ccc2604c 100644 --- 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 7421a5f9b791..d71a7a77adc4 100644 --- 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 + libkdepim-4.4.2.ebuild, libkdepim-4.4.3.ebuild: + Rename USE flag akonadi->semantic-desktop 04 May 2010; Alexey Shvetsov -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 b82c13a0397e..2d7c3c48a02f 100644 --- 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 e7cf7b6063fa..705097d4dc94 100644 --- 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 1bbaca4cbaa5..e0b349238845 100644 --- 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 + plasma-workspace-4.4.2.ebuild, plasma-workspace-4.4.3.ebuild: + Rename USE flag akonadi->semantic-desktop 04 May 2010; Maciej Mrozowski 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 8570c2de413f..c6b0ef80daeb 100644 --- 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 c960dd4c337f..6ee1ebe32b8f 100644 --- 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} -- 2.26.2