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

diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
deleted file mode 100644 (file)
index 4a7a66b..0000000
--- a/app-office/akonadi-server/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST akonadi-server-1.13.1_pre20160203.tar.gz 384556 SHA256 4243b32e529be6aadc38dc4463cb6e7cede9442c05cfc04ba679dde28f37aa96 SHA512 0ef8213f504ad1e500a2c1ce19a7575cd1fd8b7ffc7e5fb0bd2437639d8c458c47bbfea7734fcd3e200136a661331dde32af0b064f0b25d324138ce6e35d15f3 WHIRLPOOL 69eff1889a19f8d5714d7e71a106871172cd25c651ea30046ab81270cf7e46c7a1983cf20fd8d5fd8ad243d70e881be705d57b0b93b54248d086e7b253a4873a

diff --git a/app-office/akonadi-server/metadata.xml b/app-office/akonadi-server/metadata.xml
deleted file mode 100644 (file)
index 2fdbf33..0000000
--- a/app-office/akonadi-server/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-       <maintainer type="project">
-               <email>kde@gentoo.org</email>
-               <name>Gentoo KDE Project</name>
-       </maintainer>
-</pkgmetadata>

diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 14878e44f356f1243909ec90c999b3b039767644..d0fc05054b1176fbffaae4417f03987bba18d0fd 100644 (file)
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -1 +1,2 @@
+DIST akonadi-1.13.1_pre20160203.tar.gz 384556 SHA256 4243b32e529be6aadc38dc4463cb6e7cede9442c05cfc04ba679dde28f37aa96 SHA512 0ef8213f504ad1e500a2c1ce19a7575cd1fd8b7ffc7e5fb0bd2437639d8c458c47bbfea7734fcd3e200136a661331dde32af0b064f0b25d324138ce6e35d15f3 WHIRLPOOL 69eff1889a19f8d5714d7e71a106871172cd25c651ea30046ab81270cf7e46c7a1983cf20fd8d5fd8ad243d70e881be705d57b0b93b54248d086e7b253a4873a
 DIST akonadi-16.08.2.tar.xz 1021860 SHA256 e60d64528a10e6484d54850c12866bea6efd891ee9d304f5e4afb424fb502d90 SHA512 7a83f2f9c4396e3e68ec44e7da6f25aa05d2acba63d4e48ffaebea900f803b1bce6b0c76685d8b3a28acb2b5e08b532a67ab8108858ecd2622b821174c5f0cea WHIRLPOOL 3976a119cfd8ae566103580d799db03cfcca51f43f01e303b98abca5743bc4dd23d832f55df52e357492b2d0a8fba3bf5b74daa3b9109437de931e3c3f1ce811

diff --git a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild b/kde-apps/akonadi/akonadi-1.13.1_pre20160203-r1.ebuild
similarity index 90%
rename from app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild
rename to kde-apps/akonadi/akonadi-1.13.1_pre20160203-r1.ebuild
index 6613ad6e8758f041da2fc7199d0236323894e144..a4f5fbea7bd7b5b532857a8eedb94d00314d5707 100644 (file)
--- a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild
+++ b/kde-apps/akonadi/akonadi-1.13.1_pre20160203-r1.ebuild
@@ -5,12 +5,13 @@
 EAPI=6
 
 if [[ ${PV} = *_pre* ]]; then
-       COMMIT_ID="18ed37d89b8185ac15a8bfe245de8a88d17f2c64"
-       SRC_URI="https://quickgit.kde.org/?p=akonadi.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${P}.tar.gz"
-       S="${WORKDIR}/${PN/-server/}"
+       # KDE quickgit https certificate issue
+       # COMMIT_ID="18ed37d89b8185ac15a8bfe245de8a88d17f2c64"
+       # SRC_URI="https://quickgit.kde.org/?p=${PN}.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${P}.tar.gz"
+       SRC_URI="https://dev.gentoo.org/~johu/distfiles/${P}.tar.gz"
+       S="${WORKDIR}/${PN}"
 else
-       SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-       S="${WORKDIR}/${P/-server/}"
+       SRC_URI="mirror://kde/stable/${PN}/src/${P}.tar.bz2"
 fi
 inherit cmake-utils
 

diff --git a/kde-apps/akonadi/akonadi-16.08.2.ebuild b/kde-apps/akonadi/akonadi-16.08.2.ebuild
index 486b50898d9d5f122e8db089fa0939eb88faf633..770f895e8e6be519d2355936632c6fbce0c93b2e 100644 (file)
--- a/kde-apps/akonadi/akonadi-16.08.2.ebuild
+++ b/kde-apps/akonadi/akonadi-16.08.2.ebuild
@@ -51,7 +51,6 @@ DEPEND="${COMMON_DEPEND}
 RDEPEND="${COMMON_DEPEND}
        mysql? ( virtual/mysql )
        postgres? ( dev-db/postgresql )
-       !app-office/akonadi-server:4
        !kde-apps/kdepimlibs
 "
 

diff --git a/app-office/akonadi-server/files/akonadi-server-1.13.0-mysql56-crash.patch b/kde-apps/akonadi/files/akonadi-1.13.0-mysql56-crash.patch
similarity index 100%
rename from app-office/akonadi-server/files/akonadi-server-1.13.0-mysql56-crash.patch
rename to kde-apps/akonadi/files/akonadi-1.13.0-mysql56-crash.patch

diff --git a/app-office/akonadi-server/files/akonadi-server-1.13.1-mysql.conf.patch b/kde-apps/akonadi/files/akonadi-1.13.1-mysql.conf.patch
similarity index 100%
rename from app-office/akonadi-server/files/akonadi-server-1.13.1-mysql.conf.patch
rename to kde-apps/akonadi/files/akonadi-1.13.1-mysql.conf.patch

diff --git a/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160211.ebuild b/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160211.ebuild
index 68d714e6872345d60cbb623da5948dda5a6c4465..f1412490b551f6d9c787f717f55adfe7bcec65d5 100644 (file)
--- a/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160211.ebuild
+++ b/kde-apps/akonadiconsole/akonadiconsole-4.14.11_pre20160211.ebuild
@@ -16,9 +16,9 @@ KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="debug"
 
 DEPEND="
-       >=app-office/akonadi-server-1.12.90:4
        $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
        $(add_kdeapps_dep kdepim-common-libs)
+       kde-apps/akonadi:4
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211.ebuild b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211.ebuild
index fb1eb2931868ecfb433bccac86e275aa6db62804..29545780bb0a8cefddb2bf5236f7ed8774d49823 100644 (file)
--- a/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211.ebuild
+++ b/kde-apps/kdepim-common-libs/kdepim-common-libs-4.14.11_pre20160211.ebuild
@@ -21,8 +21,8 @@ DEPEND="
        $(add_kdebase_dep baloo '' 4.14.3)
        $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
        app-crypt/gpgme
-       >=app-office/akonadi-server-1.12.90:4
        dev-libs/grantlee:0
+       kde-apps/akonadi:4
        google? ( net-libs/libkgapi:4 )
 "
 RDEPEND="${DEPEND}

diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-4.14.11_pre20160211.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-4.14.11_pre20160211.ebuild
index a1be9143ae01a3efa996f89a58d52495535ea268..8abef2016e6dfe2514d50eb48f093e4090f7c154 100644 (file)
--- a/kde-apps/kdepim-runtime/kdepim-runtime-4.14.11_pre20160211.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-4.14.11_pre20160211.ebuild
@@ -21,10 +21,10 @@ RESTRICT="test"
 
 DEPEND="
        $(add_kdeapps_dep kdepimlibs 'akonadi(+)' ${PV})
-       >=app-office/akonadi-server-1.12.90:4
        dev-libs/boost:=
        dev-libs/libxml2:2
        dev-libs/libxslt
+       kde-apps/akonadi:4
        x11-misc/shared-mime-info
        google? ( >=net-libs/libkgapi-2.0:4 )
 "

diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r1.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r1.ebuild
index 8e8d64bb4d749975d58e361ae1f326bdac3bb431..b9c12d07b555865e0e5e8fe90d880dc3e66a1b8e 100644 (file)
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r1.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r1.ebuild
@@ -18,14 +18,13 @@ IUSE="debug ldap prison"
 RESTRICT="test"
 
 DEPEND="
-       !kde-misc/akonadi-social-utils
        >=app-crypt/gpgme-1.1.6
-       >=app-office/akonadi-server-1.12.90:4
        >=dev-libs/boost-1.35.0-r5:=
        dev-libs/libgpg-error
        >=dev-libs/libical-0.48-r2:=
        dev-libs/cyrus-sasl
        >=dev-libs/qjson-0.8.1
+       kde-apps/akonadi:4
        media-libs/phonon[qt4]
        x11-misc/shared-mime-info
        prison? ( media-libs/prison:4 )

diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r1.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r1.ebuild
index 5a445ae864e17544c967af1e90e892ff25544941..20a99308518ea786743568eedee29fb05ea1a5ee 100644 (file)
--- a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r1.ebuild
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r1.ebuild
@@ -23,12 +23,12 @@ RESTRICT="test"
 
 DEPEND="
        >=app-crypt/gpgme-1.1.6
-       >=app-office/akonadi-server-1.12.90:4
        >=dev-libs/boost-1.35.0-r5:=
        dev-libs/libgpg-error
        >=dev-libs/libical-0.48-r2:=
        dev-libs/cyrus-sasl
        >=dev-libs/qjson-0.8.1
+       kde-apps/akonadi:4
        media-libs/phonon[qt4]
        x11-misc/shared-mime-info
        prison? ( media-libs/prison:4 )
@@ -38,7 +38,6 @@ DEPEND="
 # bug #418071
 RDEPEND="${DEPEND}
        !<kde-apps/kdepim-runtime-4.4.11.1-r2:4
-       !kde-misc/akonadi-social-utils
 "
 
 PATCHES=(

diff --git a/kde-apps/kmail/kmail-4.14.11_pre20160211.ebuild b/kde-apps/kmail/kmail-4.14.11_pre20160211.ebuild
index c920bd79a1102113d63f7f7ed808c5008c023ff1..7b526d903cf7c9071c6291671db08465c47422eb 100644 (file)
--- a/kde-apps/kmail/kmail-4.14.11_pre20160211.ebuild
+++ b/kde-apps/kmail/kmail-4.14.11_pre20160211.ebuild
@@ -97,14 +97,14 @@ pkg_postinst() {
                echo
        fi
 
-       if has_version "app-office/akonadi-server[sqlite]"; then
+       if has_version "kde-apps/akonadi[sqlite]"; then
                ewarn
                ewarn "We strongly recommend you set your Akonadi database backend to QMYSQL in your"
                ewarn "user configuration. This is the backend recommended by KDE upstream."
                ewarn "Reports indicate that kde-apps/kmail-4.10 does not work properly with the sqlite"
                ewarn "backend anymore."
-               if has_version "app-office/akonadi-server[-mysql]"; then
-                       ewarn "FOR THAT, YOU WILL HAVE TO RE-BUILD app-office/akonadi-server WITH mysql USEFLAG ENABLED."
+               if has_version "kde-apps/akonadi[-mysql]"; then
+                       ewarn "FOR THAT, YOU WILL HAVE TO RE-BUILD kde-apps/akonadi WITH mysql USEFLAG ENABLED."
                fi
                ewarn "You can select the backend in your ~/.config/akonadi/akonadiserverrc."
                ewarn

diff --git a/kde-apps/ktnef/ktnef-4.14.11_pre20160211.ebuild b/kde-apps/ktnef/ktnef-4.14.11_pre20160211.ebuild
index 19285758871bbd1dfa832341d293928095538335..762d023f0892cfb9fe46a0320c3fed658167a215 100644 (file)
--- a/kde-apps/ktnef/ktnef-4.14.11_pre20160211.ebuild
+++ b/kde-apps/ktnef/ktnef-4.14.11_pre20160211.ebuild
@@ -18,8 +18,8 @@ LICENSE="LGPL-2.1"
 IUSE="debug"
 
 DEPEND="
-       app-office/akonadi-server:4
        $(add_kdeapps_dep kdepimlibs 'akonadi(+)')
+       kde-apps/akonadi:4
 "
 RDEPEND="${DEPEND}"
 

diff --git a/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild b/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild
index 178c1f9eb2a9e01b7397eb3ef140cc075ad8d826..ed4fd104eeda401308f3ca17e2bc58922b9e734e 100644 (file)
--- a/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild
+++ b/kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild
@@ -18,7 +18,7 @@ IUSE="debug"
 DEPEND="
        $(add_kdebase_dep kdelibs)
        $(add_kdeapps_dep kdepimlibs)
-       app-office/akonadi-server:4
+       kde-apps/akonadi:4
        dev-qt/qtcore:4
        dev-qt/qtgui:4
        dev-qt/qtwebkit:4

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 06d62183ffaecc103d27caefecfb89912506cd78..cb942be6ff9238f52b9669c1055b97b53bc68dcb 100644 (file)
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -277,11 +277,6 @@ app-office/libreoffice telepathy
 sys-devel/gcc awt
 dev-java/gcj-jdk awt
 
-# Johannes Huber <johu@gentoo.org> (18 Aug 2015)
-# No consumer for Qt5 build, qt4/qt5 switch causes conflicts.
-# Qt5 only version will come back with kde-apps/akonadi.
-app-office/akonadi-server qt5
-
 # Heather Cynede <cynede@gentoo.org> (13 Aug 2015)
 # mono currently fails with doc most likely because of xattr
 # Gentoo bug: 554484

diff --git a/profiles/targets/desktop/kde/package.use b/profiles/targets/desktop/kde/package.use
index 1eabf0c8b315d484b2de3830c3adb2b97936f7d6..4f6486118a8a744b2fb4b40721bdc692ddcc30a9 100644 (file)
--- a/profiles/targets/desktop/kde/package.use
+++ b/profiles/targets/desktop/kde/package.use
@@ -33,7 +33,7 @@ dev-libs/libgit2 threads
 # Required by kde-base/pykde4
 dev-python/PyQt4 script sql webkit
 
-# Required by app-office/akonadi-server
+# Required by kde-apps/akonadi
 dev-qt/qtsql mysql
 
 # Required by media-gfx/graphviz which is required by kde-apps/kcachegrind

diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index 57ebd9819669a86d2291b68bf141836d9bf3bba6..99d17092249f381a581ee361f5ea2332a94b79dc 100644 (file)
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -8,7 +8,7 @@ dev-util/cmake -qt4 -qt5
 # Not required, but makes life easier with Qt; bug 457934
 app-arch/unzip natspec
 
-# Required by app-office/akonadi-server
+# Required by kde/akonadi
 dev-qt/qtsql mysql
 
 # Required by dev-qt/qtcore

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 215057e363e2deaa8fbc70ce1fc7d6478928bb7b..86f25568084cf596e18f09b79a13bdc10104e183 100644 (file)
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -4,3 +4,4 @@ move x11-apps/xvfb-run x11-misc/xvfb-run
 move kde-plasma/plasma-mediacenter media-video/plasma-mediacenter
 move kde-misc/plasma-nm kde-plasma/plasma-nm
 slotmove app-office/akonadi-server 0 4
+move app-office/akonadi-server kde-apps/akonadi