Pkg move app-office/akonadi-server -> kde-apps/akonadi

Will be part of KDE Applications 15.08 and will contain client code in
the future.

15 files changed, 17 insertions, 33 deletions

diff --git a/Documentation/package.accept_keywords/.kde-applications-live.base/more-deps b/Documentation/package.accept_keywords/.kde-applications-live.base/more-deps
index 4b254946cdc..7b19159665f 100644
--- a/Documentation/package.accept_keywords/.kde-applications-live.base/more-deps
+++ b/Documentation/package.accept_keywords/.kde-applications-live.base/more-deps
@@ -1,2 +1 @@
-~app-office/akonadi-server-9999 **
 ~net-libs/libkgapi-9999 **
diff --git a/Documentation/package.accept_keywords/.kde-applications-live/kdepim-live b/Documentation/package.accept_keywords/.kde-applications-live/kdepim-live
index 77f2b0a2e3f..ded5e4f356d 100644
--- a/Documentation/package.accept_keywords/.kde-applications-live/kdepim-live
+++ b/Documentation/package.accept_keywords/.kde-applications-live/kdepim-live
@@ -1,3 +1,4 @@
+~kde-apps/akonadi-9999 **
 ~kde-apps/akonadi-calendar-9999 **
 ~kde-apps/akonadi-search-9999 **
 ~kde-apps/gpgmepp-9999 **
diff --git a/Documentation/package.accept_keywords/.kde-applications-live/more-deps b/Documentation/package.accept_keywords/.kde-applications-live/more-deps
index 4b254946cdc..7b19159665f 100644
--- a/Documentation/package.accept_keywords/.kde-applications-live/more-deps
+++ b/Documentation/package.accept_keywords/.kde-applications-live/more-deps
@@ -1,2 +1 @@
-~app-office/akonadi-server-9999 **
 ~net-libs/libkgapi-9999 **
diff --git a/Documentation/package.accept_keywords/kde-applications-live.keywords b/Documentation/package.accept_keywords/kde-applications-live.keywords
index 09291fb720c..cfa51c9d1a2 100644
--- a/Documentation/package.accept_keywords/kde-applications-live.keywords
+++ b/Documentation/package.accept_keywords/kde-applications-live.keywords
@@ -74,6 +74,7 @@
 ~kde-apps/ktp-text-ui-9999 **
 ~kde-apps/plasma-telepathy-meta-9999 **
 ~kde-apps/signon-kwallet-extension-9999 **
+~kde-apps/akonadi-9999 **
 ~kde-apps/akonadi-calendar-9999 **
 ~kde-apps/akonadi-search-9999 **
 ~kde-apps/gpgmepp-9999 **
@@ -111,5 +112,4 @@
 ~kde-apps/ktimer-9999 **
 ~kde-apps/kwalletmanager-9999 **
 ~kde-apps/print-manager-9999 **
-~app-office/akonadi-server-9999 **
 ~net-libs/libkgapi-9999 **
diff --git a/Documentation/package.mask/kde-applications-live b/Documentation/package.mask/kde-applications-live
index 98e9bfb749c..f77ab688acf 100644
--- a/Documentation/package.mask/kde-applications-live
+++ b/Documentation/package.mask/kde-applications-live
@@ -74,6 +74,7 @@
 ~kde-apps/ktp-text-ui-9999
 ~kde-apps/plasma-telepathy-meta-9999
 ~kde-apps/signon-kwallet-extension-9999
+~kde-apps/akonadi-9999
 ~kde-apps/akonadi-calendar-9999
 ~kde-apps/akonadi-search-9999
 ~kde-apps/gpgmepp-9999
diff --git a/Documentation/package.unmask/kde-applications-live b/Documentation/package.unmask/kde-applications-live
index 98e9bfb749c..f77ab688acf 100644
--- a/Documentation/package.unmask/kde-applications-live
+++ b/Documentation/package.unmask/kde-applications-live
@@ -74,6 +74,7 @@
 ~kde-apps/ktp-text-ui-9999
 ~kde-apps/plasma-telepathy-meta-9999
 ~kde-apps/signon-kwallet-extension-9999
+~kde-apps/akonadi-9999
 ~kde-apps/akonadi-calendar-9999
 ~kde-apps/akonadi-search-9999
 ~kde-apps/gpgmepp-9999
diff --git a/app-office/akonadi-server/akonadi-server-15.08.49.9999.ebuild b/kde-apps/akonadi/akonadi-15.08.49.9999.ebuild
index f9b6592dc8e..e307fe24959 100644
--- a/app-office/akonadi-server/akonadi-server-15.08.49.9999.ebuild
+++ b/kde-apps/akonadi/akonadi-15.08.49.9999.ebuild
@@ -4,25 +4,14 @@
 
 EAPI=5
 
-if [[ $PV = *9999* ]]; then
-	EGIT_REPONAME="${PN/-server/}"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${P/-server/}"
-fi
-
 KDE_TESTS=true
 VIRTUALDBUS_TEST=true
 inherit kde5
 
-DESCRIPTION="The server part of Akonadi"
+DESCRIPTION="Storage service for PIM data"
 HOMEPAGE="http://pim.kde.org/akonadi"
-
+KEYWORDS=""
 LICENSE="LGPL-2.1"
-SLOT="0"
 IUSE="+mysql postgres sqlite test"
 
 REQUIRED_USE="|| ( sqlite mysql postgres )"
@@ -44,6 +33,7 @@ DEPEND="${CDEPEND}
 "
 RDEPEND="${CDEPEND}
 	postgres? ( dev-db/postgresql )
+	!app-office/akonadi-server
 "
 
 pkg_setup() {
diff --git a/app-office/akonadi-server/akonadi-server-9999.ebuild b/kde-apps/akonadi/akonadi-9999.ebuild
index f9b6592dc8e..e307fe24959 100644
--- a/app-office/akonadi-server/akonadi-server-9999.ebuild
+++ b/kde-apps/akonadi/akonadi-9999.ebuild
@@ -4,25 +4,14 @@
 
 EAPI=5
 
-if [[ $PV = *9999* ]]; then
-	EGIT_REPONAME="${PN/-server/}"
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-	S="${WORKDIR}/${P/-server/}"
-fi
-
 KDE_TESTS=true
 VIRTUALDBUS_TEST=true
 inherit kde5
 
-DESCRIPTION="The server part of Akonadi"
+DESCRIPTION="Storage service for PIM data"
 HOMEPAGE="http://pim.kde.org/akonadi"
-
+KEYWORDS=""
 LICENSE="LGPL-2.1"
-SLOT="0"
 IUSE="+mysql postgres sqlite test"
 
 REQUIRED_USE="|| ( sqlite mysql postgres )"
@@ -44,6 +33,7 @@ DEPEND="${CDEPEND}
 "
 RDEPEND="${CDEPEND}
 	postgres? ( dev-db/postgresql )
+	!app-office/akonadi-server
 "
 
 pkg_setup() {
diff --git a/app-office/akonadi-server/metadata.xml b/kde-apps/akonadi/metadata.xml
index a23f444b67d..a23f444b67d 100644
--- a/app-office/akonadi-server/metadata.xml
+++ b/kde-apps/akonadi/metadata.xml
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-15.08.49.9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-15.08.49.9999.ebuild
index e1d02531f23..2ffae932930 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-15.08.49.9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-15.08.49.9999.ebuild
@@ -13,6 +13,7 @@ IUSE="google"
 # TODO kolab, Qt5TextToSpeech
 
 COMMON_DEPEND="
+	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-calendar)
 	$(add_kdeapps_dep kalarmcal)
 	$(add_kdeapps_dep kcalcore)
@@ -45,7 +46,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
-	>=app-office/akonadi-server-5.0.41
 	dev-libs/libical:=
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
index e1d02531f23..2ffae932930 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-9999.ebuild
@@ -13,6 +13,7 @@ IUSE="google"
 # TODO kolab, Qt5TextToSpeech
 
 COMMON_DEPEND="
+	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep akonadi-calendar)
 	$(add_kdeapps_dep kalarmcal)
 	$(add_kdeapps_dep kcalcore)
@@ -45,7 +46,6 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
-	>=app-office/akonadi-server-5.0.41
 	dev-libs/libical:=
 	dev-qt/qtdbus:5
 	dev-qt/qtgui:5
diff --git a/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild b/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
index 9bd89cde403..fbc362e0bd8 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-15.08.49.9999.ebuild
@@ -37,12 +37,12 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep solid)
+	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kldap)
 	$(add_kdeapps_dep kmbox)
 	$(add_kdeapps_dep kmime)
-	>=app-office/akonadi-server-5.0.41
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-qt/qtdbus:5
diff --git a/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild b/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
index 9bd89cde403..fbc362e0bd8 100644
--- a/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-9999.ebuild
@@ -37,12 +37,12 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep solid)
+	$(add_kdeapps_dep akonadi)
 	$(add_kdeapps_dep kcalcore)
 	$(add_kdeapps_dep kcontacts)
 	$(add_kdeapps_dep kldap)
 	$(add_kdeapps_dep kmbox)
 	$(add_kdeapps_dep kmime)
-	>=app-office/akonadi-server-5.0.41
 	dev-libs/libxml2
 	dev-libs/libxslt
 	dev-qt/qtdbus:5
diff --git a/profiles/updates/3Q-2015 b/profiles/updates/3Q-2015
index 7ece384f986..f8e83c20394 100644
--- a/profiles/updates/3Q-2015
+++ b/profiles/updates/3Q-2015
@@ -1,3 +1,5 @@
 slotmove dev-util/kdevelop-pg-qt 0 5
 move kde-plasma/baloo-widgets kde-apps/baloo-widgets
 move kde-plasma/kio-extras kde-apps/kio-extras
+move app-office/akonadi-server kde-apps/akonadi
+slotmove kde-apps/akonadi 0 5
diff --git a/sets/kdepim-live b/sets/kdepim-live
index 57649e51536..3245c246bf2 100644
--- a/sets/kdepim-live
+++ b/sets/kdepim-live
@@ -1,3 +1,4 @@
+~kde-apps/akonadi-9999
 ~kde-apps/akonadi-calendar-9999
 ~kde-apps/akonadi-search-9999
 ~kde-apps/gpgmepp-9999