[gentoo-commits] repo/gentoo:master commit in: app-office/akonadi-server/, profiles/updates/

2016-10-30 Thread Johannes Huber 
commit: e70621a798a47848215fba0184bd627762f9247f
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Oct 30 11:33:20 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Oct 30 12:55:13 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e70621a7

Slotmove app-office/akonadi-server 0 -> 4

 app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild | 2 +-
 profiles/updates/4Q-2016  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild 
b/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild
index 5a3b160..4e5f29f 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild
@@ -27,7 +27,7 @@ DESCRIPTION="The server part of Akonadi"
 HOMEPAGE="https://pim.kde.org/akonadi";
 
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="4"
 IUSE="+mysql postgres sqlite test"
 
 REQUIRED_USE="|| ( sqlite mysql postgres )"

diff --git a/profiles/updates/4Q-2016 b/profiles/updates/4Q-2016
index 46380ee..215057e 100644
--- a/profiles/updates/4Q-2016
+++ b/profiles/updates/4Q-2016
@@ -3,3 +3,4 @@ move dev-ml/qcheck dev-ml/iTeML
 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

[gentoo-commits] repo/gentoo:master commit in: app-office/akonadi-server/

2016-10-30 Thread Johannes Huber 
commit: be56a240eada6eae19bff0acc4b95e2b27782b08
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Oct 30 11:38:12 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Oct 30 12:55:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be56a240

app-office/akonadi-server: Drop live support

Slot 4 is dead by upstream.

Package-Manager: portage-2.3.2

 .../akonadi-server-1.13.1_pre20160203-r1.ebuild| 24 --
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git 
a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild 
b/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild
index 4e5f29f..6613ad6 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild
@@ -4,30 +4,22 @@
 
 EAPI=6
 
-if [[ ${PV} = ** ]]; then
-   scm_eclass=git-r3
-   EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
-   SRC_URI=""
-   KEYWORDS=""
+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/}"
 else
-   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/}"
-   else
-   
SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
-   S="${WORKDIR}/${P/-server/}"
-   fi
-   KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+   SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+   S="${WORKDIR}/${P/-server/}"
 fi
-
-inherit cmake-utils ${scm_eclass}
+inherit cmake-utils
 
 DESCRIPTION="The server part of Akonadi"
 HOMEPAGE="https://pim.kde.org/akonadi";
 
 LICENSE="LGPL-2.1"
 SLOT="4"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="+mysql postgres sqlite test"
 
 REQUIRED_USE="|| ( sqlite mysql postgres )"

[gentoo-commits] repo/gentoo:master commit in: app-office/akonadi-server/, kde-apps/kdepimlibs/, kde-apps/akonadi/, ...

2016-10-30 Thread Johannes Huber 
commit: e4b662605db25fbc24a21ccc168c398699d61ac5
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun Oct 30 12:54:36 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun Oct 30 12:55:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4b66260

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

 app-office/akonadi-server/Manifest|  1 -
 app-office/akonadi-server/metadata.xml|  8 
 kde-apps/akonadi/Manifest |  1 +
 .../akonadi/akonadi-1.13.1_pre20160203-r1.ebuild  | 11 ++-
 kde-apps/akonadi/akonadi-16.08.2.ebuild   |  1 -
 .../akonadi/files/akonadi-1.13.0-mysql56-crash.patch  |  0
 .../akonadi/files/akonadi-1.13.1-mysql.conf.patch |  0
 .../akonadiconsole/akonadiconsole-4.14.11_pre20160211.ebuild  |  2 +-
 .../kdepim-common-libs-4.14.11_pre20160211.ebuild |  2 +-
 .../kdepim-runtime/kdepim-runtime-4.14.11_pre20160211.ebuild  |  2 +-
 kde-apps/kdepimlibs/kdepimlibs-4.14.10-r1.ebuild  |  3 +--
 kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r1.ebuild  |  3 +--
 kde-apps/kmail/kmail-4.14.11_pre20160211.ebuild   |  6 +++---
 kde-apps/ktnef/ktnef-4.14.11_pre20160211.ebuild   |  2 +-
 kde-misc/plasma-lionmail/plasma-lionmail-0_p20121020.ebuild   |  2 +-
 profiles/base/package.use.mask|  5 -
 profiles/targets/desktop/kde/package.use  |  2 +-
 profiles/targets/desktop/plasma/package.use   |  2 +-
 profiles/updates/4Q-2016  |  1 +
 19 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/app-office/akonadi-server/Manifest 
b/app-office/akonadi-server/Manifest
deleted file mode 100644
index 4a7a66b..
--- 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
index 2fdbf33..
--- a/app-office/akonadi-server/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-   
-   k...@gentoo.org
-   Gentoo KDE Project
-   
-

diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index 14878e4..d0fc050 100644
--- 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 6613ad6..a4f5fbe 100644
--- 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

[gentoo-commits] repo/gentoo:master commit in: app-office/akonadi-server/

2016-07-16 Thread Johannes Huber 
commit: 5ebcc221996534aeb1595e1948f8f12ce4cf0095
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat Jul 16 16:51:49 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat Jul 16 16:52:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ebcc221

app-office/akonadi-server: Remove 1.13.0

Package-Manager: portage-2.3.0

 app-office/akonadi-server/Manifest |   1 -
 .../akonadi-server/akonadi-server-1.13.0-r2.ebuild | 137 -
 2 files changed, 138 deletions(-)

diff --git a/app-office/akonadi-server/Manifest 
b/app-office/akonadi-server/Manifest
index ccf4860..4a7a66b 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1,2 +1 @@
-DIST akonadi-1.13.0.tar.bz2 294198 SHA256 
8c7f690002ea22c139f3a64394aef2e816e00ca47fd971af7d54a66087356dd2 SHA512 
4bf2026c3807b5493c9f63d0c2bff2e6db00fbe97a4e2c2f707aaa3bf4a848b70dd9657d8fa1743690e8eeefd967de4895c1329c6bb817a1d023fe398285222f
 WHIRLPOOL 
edc18247dd864af48395f4e3187f6a52cdaf4737959b317e3decb10caf138b97258a661eeb11a2ad11f2365fdd053a7c6fe63097ba71c24a12417ee71de54afb
 DIST akonadi-server-1.13.1_pre20160203.tar.gz 384556 SHA256 
4243b32e529be6aadc38dc4463cb6e7cede9442c05cfc04ba679dde28f37aa96 SHA512 
0ef8213f504ad1e500a2c1ce19a7575cd1fd8b7ffc7e5fb0bd2437639d8c458c47bbfea7734fcd3e200136a661331dde32af0b064f0b25d324138ce6e35d15f3
 WHIRLPOOL 
69eff1889a19f8d5714d7e71a106871172cd25c651ea30046ab81270cf7e46c7a1983cf20fd8d5fd8ad243d70e881be705d57b0b93b54248d086e7b253a4873a

diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild 
b/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
deleted file mode 100644
index 8ce6f72..000
--- a/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ $PV = ** ]]; then
-   scm_eclass=git-r3
-   EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
-   SRC_URI=""
-   KEYWORDS="ppc ppc64"
-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
-
-inherit cmake-utils ${scm_eclass}
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="https://pim.kde.org/akonadi";
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+mysql postgres +qt4 qt5 sqlite test"
-
-REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
-
-CDEPEND="
-   dev-libs/boost:=
-   x11-misc/shared-mime-info
-   qt4? (
-   >=dev-qt/qtcore-4.8.5:4
-   >=dev-qt/qtdbus-4.8.5:4
-   >=dev-qt/qtgui-4.8.5:4
-   >=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
-   >=dev-qt/qttest-4.8.5:4
-   )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtsql:5[mysql?,postgres?]
-   dev-qt/qttest:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   )
-   sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${CDEPEND}
-   dev-libs/libxslt
-   >=dev-util/automoc-0.9.88
-   test? ( sys-apps/dbus )
-"
-RDEPEND="${CDEPEND}
-   mysql? ( virtual/mysql )
-   postgres? ( dev-db/postgresql[server] )
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-mysql56-crash.patch" )
-
-pkg_pretend() {
-   if [[ ${MERGE_TYPE} != binary ]]; then
-   [[ $(gcc-major-version) -lt 4 ]] || \
-   ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) 
-lt 7 ]] ) \
-   && die "Sorry, but gcc-4.6 and earlier won't work (see 
bug #520102)."
-   fi
-}
-
-pkg_setup() {
-   # Set default storage backend in order: MySQL, SQLite PostgreSQL
-   # reverse driver check to keep the order
-   if use postgres; then
-   DRIVER="QPSQL"
-   AVAILABLE+=" ${DRIVER}"
-   fi
-
-   if use sqlite; then
-   DRIVER="QSQLITE3"
-   AVAILABLE+=" ${DRIVER}"
-   fi
-
-   if use mysql; then
-   DRIVER="QMYSQL"
-   AVAILABLE+=" ${DRIVER}"
-   fi
-
-   # Notify about MySQL is recommend by upstream
-   if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-   ewarn
-   ewarn "We strongly recommend you change your Akonadi database 
backend to MySQL in your"
-   ewarn "user configuration. This is the backend recommended by 
KDE upstream."
-   ewarn "In particular, kde-base/kmail-4.10 does not work 
properly with the sqlite"
-   ewarn "backend anymore."
-   ewarn "You can select the backend in your 
~/.config/akonadi/akonadiserverrc."
-   ewarn "Available drivers are:${AVAILABLE}"
-   ewarn
-

[gentoo-commits] repo/gentoo:master commit in: app-office/akonadi-server/

2016-06-15 Thread Michael Palimaka 
commit: 2a58d431ca3260686d01bf7187bc3352bfd9c1ff
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Jun 15 18:29:48 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Jun 15 18:40:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a58d431

app-office/akonadi-server: x86 stable

Gentoo-bug: 584652

Package-Manager: portage-2.3.0_rc1

 app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild 
b/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild
index 22e6082..5a3b160 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
S="${WORKDIR}/${P/-server/}"
fi
-   KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+   KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 inherit cmake-utils ${scm_eclass}

[gentoo-commits] repo/gentoo:master commit in: app-office/akonadi-server/

2016-06-11 Thread Agostino Sarubbo 
commit: fbdcb129583d97a28564b56bad486391321a536d
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Jun 11 10:54:25 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Jun 11 10:54:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbdcb129

app-office/akonadi-server: amd64 stable wrt bug #584652

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild 
b/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild
index cff46c6..22e6082 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild
@@ -18,7 +18,7 @@ else

SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
S="${WORKDIR}/${P/-server/}"
fi
-   KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux 
~x86-linux"
+   KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
 
 inherit cmake-utils ${scm_eclass}

[gentoo-commits] repo/gentoo:master commit in: app-office/akonadi-server/

2016-05-31 Thread Johannes Huber 
commit: e73c47d547584466468cef5536bef7602a834666
Author: Johannes Huber  gentoo  org>
AuthorDate: Tue May 31 11:05:05 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Tue May 31 11:05:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e73c47d5

app-office/akonadi-server: Drop ppc/ppc64 to testing

No stable reverse dependencies left due to
bfa4140c1969992bb8d5b7e38565bb1a99003095

Package-Manager: portage-2.3.0_rc1

 app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild 
b/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
index b59b611..8ce6f72 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ if [[ $PV = ** ]]; then
KEYWORDS="ppc ppc64"
 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"
+   KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
S="${WORKDIR}/${P/-server/}"
 fi

[gentoo-commits] repo/gentoo:master commit in: app-office/akonadi-server/files/, app-office/akonadi-server/

2016-03-08 Thread Michael Palimaka 
commit: 086d38b7bccc6890437cf096ba0440f968584ea6
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Wed Feb  3 16:18:09 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Mar  8 14:16:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=086d38b7

app-office/akonadi-server: Add 1.13.1 snapshot

 app-office/akonadi-server/Manifest |   1 +
 .../akonadi-server-1.13.1_pre20160203-r1.ebuild| 134 +
 .../files/akonadi-server-1.13.1-mysql.conf.patch   |  38 ++
 3 files changed, 173 insertions(+)

diff --git a/app-office/akonadi-server/Manifest 
b/app-office/akonadi-server/Manifest
index 67ce388..ccf4860 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1 +1,2 @@
 DIST akonadi-1.13.0.tar.bz2 294198 SHA256 
8c7f690002ea22c139f3a64394aef2e816e00ca47fd971af7d54a66087356dd2 SHA512 
4bf2026c3807b5493c9f63d0c2bff2e6db00fbe97a4e2c2f707aaa3bf4a848b70dd9657d8fa1743690e8eeefd967de4895c1329c6bb817a1d023fe398285222f
 WHIRLPOOL 
edc18247dd864af48395f4e3187f6a52cdaf4737959b317e3decb10caf138b97258a661eeb11a2ad11f2365fdd053a7c6fe63097ba71c24a12417ee71de54afb
+DIST akonadi-server-1.13.1_pre20160203.tar.gz 384556 SHA256 
4243b32e529be6aadc38dc4463cb6e7cede9442c05cfc04ba679dde28f37aa96 SHA512 
0ef8213f504ad1e500a2c1ce19a7575cd1fd8b7ffc7e5fb0bd2437639d8c458c47bbfea7734fcd3e200136a661331dde32af0b064f0b25d324138ce6e35d15f3
 WHIRLPOOL 
69eff1889a19f8d5714d7e71a106871172cd25c651ea30046ab81270cf7e46c7a1983cf20fd8d5fd8ad243d70e881be705d57b0b93b54248d086e7b253a4873a

diff --git 
a/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild 
b/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild
new file mode 100644
index 000..cff46c6
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.13.1_pre20160203-r1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+if [[ ${PV} = ** ]]; then
+   scm_eclass=git-r3
+   EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
+   SRC_URI=""
+   KEYWORDS=""
+else
+   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/}"
+   else
+   
SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+   S="${WORKDIR}/${P/-server/}"
+   fi
+   KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux 
~x86-linux"
+fi
+
+inherit cmake-utils ${scm_eclass}
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="https://pim.kde.org/akonadi";
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+mysql postgres sqlite test"
+
+REQUIRED_USE="|| ( sqlite mysql postgres )"
+
+CDEPEND="
+   dev-libs/boost:=
+   >=dev-qt/qtcore-4.8.5:4
+   >=dev-qt/qtdbus-4.8.5:4
+   >=dev-qt/qtgui-4.8.5:4
+   >=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
+   >=dev-qt/qttest-4.8.5:4
+   x11-misc/shared-mime-info
+   sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${CDEPEND}
+   dev-libs/libxslt
+   >=dev-util/automoc-0.9.88
+   test? ( sys-apps/dbus )
+"
+RDEPEND="${CDEPEND}
+   mysql? ( virtual/mysql )
+   postgres? ( dev-db/postgresql[server] )
+"
+
+RESTRICT="test"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-1.13.0-mysql56-crash.patch"
+   "${FILESDIR}/${PN}-1.13.1-mysql.conf.patch"
+)
+
+pkg_pretend() {
+   if [[ ${MERGE_TYPE} != binary ]]; then
+   [[ $(gcc-major-version) -lt 4 ]] || \
+   ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) 
-lt 7 ]] ) \
+   && die "Sorry, but gcc-4.6 and earlier won't work (see 
bug #520102)."
+   fi
+}
+
+pkg_setup() {
+   # Set default storage backend in order: MySQL, SQLite PostgreSQL
+   # reverse driver check to keep the order
+   if use postgres; then
+   DRIVER="QPSQL"
+   AVAILABLE+=" ${DRIVER}"
+   fi
+
+   if use sqlite; then
+   DRIVER="QSQLITE3"
+   AVAILABLE+=" ${DRIVER}"
+   fi
+
+   if use mysql; then
+   DRIVER="QMYSQL"
+   AVAILABLE+=" ${DRIVER}"
+   fi
+
+   # Notify about MySQL is recommend by upstream
+   if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+   ewarn
+   ewarn "We strongly recommend you change your Akonadi database 
backend to MySQL in your"
+   ewarn "user configuration. This is the backend recommended by 
KDE upstream. PostgreSQL"
+   ewarn "is also known to work very well but requires manual dump 
and import on major"
+   ewarn "upgrades of the DB."
+   ewarn "You can select the backend in your 
~/.config/akonadi/akonadiserverrc."
+

[gentoo-commits] repo/gentoo:master commit in: app-office/akonadi-server/

2015-10-30 Thread Michael Palimaka 
commit: ff91151495008bd60938a1c8632f289bf35393b8
Author: Michael Palimaka  gentoo  org>
AuthorDate: Fri Oct 30 14:29:48 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Fri Oct 30 14:30:34 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff911514

app-office/akonadi-server: remove old

Package-Manager: portage-2.2.20.1

 .../akonadi-server/akonadi-server-1.13.0-r1.ebuild | 136 -
 1 file changed, 136 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild 
b/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
deleted file mode 100644
index 5d2c52c..000
--- a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ $PV = ** ]]; then
-   scm_eclass=git-r3
-   EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
-   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
-
-inherit cmake-utils ${scm_eclass}
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="https://pim.kde.org/akonadi";
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+mysql postgres +qt4 qt5 sqlite test"
-
-REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
-
-CDEPEND="
-   dev-libs/boost:=
-   x11-misc/shared-mime-info
-   qt4? (
-   >=dev-qt/qtcore-4.8.5:4
-   >=dev-qt/qtdbus-4.8.5:4
-   >=dev-qt/qtgui-4.8.5:4
-   >=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
-   >=dev-qt/qttest-4.8.5:4
-   )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtsql:5[mysql?,postgres?]
-   dev-qt/qttest:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   )
-   sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${CDEPEND}
-   dev-libs/libxslt
-   >=dev-util/automoc-0.9.88
-   test? ( sys-apps/dbus )
-"
-RDEPEND="${CDEPEND}
-   postgres? ( dev-db/postgresql[server] )
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-mysql56-crash.patch" )
-
-pkg_pretend() {
-   if [[ ${MERGE_TYPE} != binary ]]; then
-   [[ $(gcc-major-version) -lt 4 ]] || \
-   ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) 
-lt 7 ]] ) \
-   && die "Sorry, but gcc-4.6 and earlier won't work (see 
bug #520102)."
-   fi
-}
-
-pkg_setup() {
-   # Set default storage backend in order: MySQL, SQLite PostgreSQL
-   # reverse driver check to keep the order
-   if use postgres; then
-   DRIVER="QPSQL"
-   AVAILABLE+=" ${DRIVER}"
-   fi
-
-   if use sqlite; then
-   DRIVER="QSQLITE3"
-   AVAILABLE+=" ${DRIVER}"
-   fi
-
-   if use mysql; then
-   DRIVER="QMYSQL"
-   AVAILABLE+=" ${DRIVER}"
-   fi
-
-   # Notify about MySQL is recommend by upstream
-   if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-   ewarn
-   ewarn "We strongly recommend you change your Akonadi database 
backend to MySQL in your"
-   ewarn "user configuration. This is the backend recommended by 
KDE upstream."
-   ewarn "In particular, kde-base/kmail-4.10 does not work 
properly with the sqlite"
-   ewarn "backend anymore."
-   ewarn "You can select the backend in your 
~/.config/akonadi/akonadiserverrc."
-   ewarn "Available drivers are:${AVAILABLE}"
-   ewarn
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DINSTALL_QSQLITE_IN_QT_PREFIX=ON
-   -DWITH_SOPRANO=FALSE
-   $(cmake-utils_use test AKONADI_BUILD_TESTS)
-   $(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
-   $(cmake-utils_use qt5 QT5_BUILD)
-   )
-
-   cmake-utils_src_configure
-}
-
-src_test() {
-   export $(dbus-launch)
-   cmake-utils_src_test
-}
-
-src_install() {
-   # Who knows, maybe it accidentally fixes our permission issues
-   cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-   insinto /usr/share/config/akonadi
-   doins "${T}"/akonadiserverrc
-
-   cmake-utils_src_install
-}
-
-pkg_postinst() {
-   elog "${DRIVER} has been set as your default akonadi storage backend."
-   elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-   elog "Available drivers are: ${AVAILABLE}"
-}

[gentoo-commits] repo/gentoo:master commit in: app-office/akonadi-server/

2015-10-30 Thread Agostino Sarubbo 
commit: 93870a535bf272c06b8484a7a6b56ed304b0d548
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Oct 30 10:12:42 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Oct 30 10:15:06 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93870a53

app-office/akonadi-server: ppc stable wrt bug #563528

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc"

 app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild 
b/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
index 855eff1..b59b611 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
@@ -8,10 +8,10 @@ if [[ $PV = ** ]]; then
scm_eclass=git-r3
EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
SRC_URI=""
-   KEYWORDS="ppc64"
+   KEYWORDS="ppc ppc64"
 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"
+   KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
S="${WORKDIR}/${P/-server/}"
 fi

[gentoo-commits] repo/gentoo:master commit in: app-office/akonadi-server/

2015-10-25 Thread Jeroen Roovers 
commit: 0567cb274e9018ae23368f659f266e00e968d449
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Oct 26 05:29:55 2015 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Oct 26 05:31:06 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0567cb27

app-office/akonadi-server: Stable for PPC64 (bug #563528).

Package-Manager: portage-2.2.23
RepoMan-Options: --ignore-arches

 app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild 
b/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
index 7068ab3..855eff1 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
@@ -8,10 +8,10 @@ if [[ $PV = ** ]]; then
scm_eclass=git-r3
EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
SRC_URI=""
-   KEYWORDS=""
+   KEYWORDS="ppc64"
 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"
+   KEYWORDS="amd64 ~arm ~ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
S="${WORKDIR}/${P/-server/}"
 fi

[gentoo-commits] repo/gentoo:master commit in: app-office/akonadi-server/

2015-10-25 Thread Mikle Kolyada 
commit: bbd7ee02cd9f197d54345c87e215bec8da1e3a85
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Oct 25 10:50:08 2015 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Oct 25 10:50:08 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbd7ee02

app-office/akonadi-server: x86 stable wrt bug #563528

Package-Manager: portage-2.2.20.1

 app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild 
b/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
index 05a4839..7068ab3 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
@@ -11,7 +11,7 @@ if [[ $PV = ** ]]; then
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"
+   KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
S="${WORKDIR}/${P/-server/}"
 fi

[gentoo-commits] repo/gentoo:master commit in: app-office/akonadi-server/

2015-10-23 Thread Agostino Sarubbo 
commit: c80cbd9c03e0a4f1a87d589aae875f90b7702228
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Oct 23 09:04:37 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Oct 23 09:04:37 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c80cbd9c

app-office/akonadi-server: amd64 stable wrt bug #563528

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild 
b/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
index 4f92f42..05a4839 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
@@ -11,7 +11,7 @@ if [[ $PV = ** ]]; then
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"
+   KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
S="${WORKDIR}/${P/-server/}"
 fi

[gentoo-commits] repo/gentoo:master commit in: app-office/akonadi-server/

2015-10-19 Thread Alex Brandt 
commit: 0dd0974894b6c7f1f9b9791513016c7322a15351
Author: Alex Brandt  gentoo  org>
AuthorDate: Mon Oct 19 19:49:36 2015 +
Commit: Alex Brandt  gentoo  org>
CommitDate: Mon Oct 19 19:49:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dd09748

app-office/akonadi-server: add virtual/mysql dependence

Found out that app-office/akonadi-server lost its dependence on mysql early due
to an implicit dependence through dev-qt/qtsql.  I've revbumped and added the
RDEPEND as needed.

Also, I will shortly be opening a bug to re-stabilize these KEYWORDS:

amd64 ppc ppc64 x86

This seems to be related to the mysqlclient split.

Package-Manager: portage-2.2.23

 .../akonadi-server/akonadi-server-1.13.0-r2.ebuild | 137 +
 1 file changed, 137 insertions(+)

diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild 
b/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
new file mode 100644
index 000..4f92f42
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.13.0-r2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+if [[ $PV = ** ]]; then
+   scm_eclass=git-r3
+   EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
+   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
+
+inherit cmake-utils ${scm_eclass}
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="https://pim.kde.org/akonadi";
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="+mysql postgres +qt4 qt5 sqlite test"
+
+REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
+
+CDEPEND="
+   dev-libs/boost:=
+   x11-misc/shared-mime-info
+   qt4? (
+   >=dev-qt/qtcore-4.8.5:4
+   >=dev-qt/qtdbus-4.8.5:4
+   >=dev-qt/qtgui-4.8.5:4
+   >=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
+   >=dev-qt/qttest-4.8.5:4
+   )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtdbus:5
+   dev-qt/qtgui:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtsql:5[mysql?,postgres?]
+   dev-qt/qttest:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   )
+   sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="${CDEPEND}
+   dev-libs/libxslt
+   >=dev-util/automoc-0.9.88
+   test? ( sys-apps/dbus )
+"
+RDEPEND="${CDEPEND}
+   mysql? ( virtual/mysql )
+   postgres? ( dev-db/postgresql[server] )
+"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-mysql56-crash.patch" )
+
+pkg_pretend() {
+   if [[ ${MERGE_TYPE} != binary ]]; then
+   [[ $(gcc-major-version) -lt 4 ]] || \
+   ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) 
-lt 7 ]] ) \
+   && die "Sorry, but gcc-4.6 and earlier won't work (see 
bug #520102)."
+   fi
+}
+
+pkg_setup() {
+   # Set default storage backend in order: MySQL, SQLite PostgreSQL
+   # reverse driver check to keep the order
+   if use postgres; then
+   DRIVER="QPSQL"
+   AVAILABLE+=" ${DRIVER}"
+   fi
+
+   if use sqlite; then
+   DRIVER="QSQLITE3"
+   AVAILABLE+=" ${DRIVER}"
+   fi
+
+   if use mysql; then
+   DRIVER="QMYSQL"
+   AVAILABLE+=" ${DRIVER}"
+   fi
+
+   # Notify about MySQL is recommend by upstream
+   if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+   ewarn
+   ewarn "We strongly recommend you change your Akonadi database 
backend to MySQL in your"
+   ewarn "user configuration. This is the backend recommended by 
KDE upstream."
+   ewarn "In particular, kde-base/kmail-4.10 does not work 
properly with the sqlite"
+   ewarn "backend anymore."
+   ewarn "You can select the backend in your 
~/.config/akonadi/akonadiserverrc."
+   ewarn "Available drivers are:${AVAILABLE}"
+   ewarn
+   fi
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DINSTALL_QSQLITE_IN_QT_PREFIX=ON
+   -DWITH_SOPRANO=FALSE
+   $(cmake-utils_use test AKONADI_BUILD_TESTS)
+   $(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
+   $(cmake-utils_use qt5 QT5_BUILD)
+   )
+
+   cmake-utils_src_configure
+}
+
+src_test() {
+   export $(dbus-launch)
+   cmake-utils_src_test
+}
+
+src_install() {
+   # Who knows, maybe it accidentally fixes our permission issues
+   cat <<-EOF > "${T}"/akonadiserverrc
+[%General]
+Driver=${DRIVER}
+EOF
+   insinto /usr/share/config/akonadi
+   doins "${T}"/akonadiserverrc
+
+   cmake-utils_src_install
+}
+
+pkg_posti

[gentoo-commits] repo/gentoo:master commit in: app-office/akonadi-server/

2015-09-23 Thread Michael Palimaka 
commit: 176cbaab4e18dc6baf69a7d2c98beec2ecc3f424
Author: Michael Palimaka  gentoo  org>
AuthorDate: Wed Sep 23 12:57:45 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Wed Sep 23 12:59:10 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=176cbaab

app-office/akonadi-server: remove old.

Package-Manager: portage-2.2.20.1

 .../akonadi-server/akonadi-server-1.13.0.ebuild| 134 -
 1 file changed, 134 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.13.0.ebuild 
b/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
deleted file mode 100644
index 84d6bf0..000
--- a/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-if [[ $PV = ** ]]; then
-   scm_eclass=git-r3
-   EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
-   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
-
-inherit cmake-utils ${scm_eclass}
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="https://pim.kde.org/akonadi";
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="+mysql postgres +qt4 qt5 sqlite test"
-
-REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
-
-CDEPEND="
-   dev-libs/boost:=
-   x11-misc/shared-mime-info
-   qt4? (
-   >=dev-qt/qtcore-4.8.5:4
-   >=dev-qt/qtdbus-4.8.5:4
-   >=dev-qt/qtgui-4.8.5:4
-   >=dev-qt/qtsql-4.8.5:4[mysql?,postgres?]
-   >=dev-qt/qttest-4.8.5:4
-   )
-   qt5? (
-   dev-qt/qtcore:5
-   dev-qt/qtdbus:5
-   dev-qt/qtgui:5
-   dev-qt/qtnetwork:5
-   dev-qt/qtsql:5[mysql?,postgres?]
-   dev-qt/qttest:5
-   dev-qt/qtwidgets:5
-   dev-qt/qtxml:5
-   )
-   sqlite? ( dev-db/sqlite:3 )
-"
-DEPEND="${CDEPEND}
-   dev-libs/libxslt
-   >=dev-util/automoc-0.9.88
-   test? ( sys-apps/dbus )
-"
-RDEPEND="${CDEPEND}
-   postgres? ( dev-db/postgresql[server] )
-"
-
-RESTRICT="test"
-
-pkg_pretend() {
-   if [[ ${MERGE_TYPE} != binary ]]; then
-   [[ $(gcc-major-version) -lt 4 ]] || \
-   ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) 
-lt 7 ]] ) \
-   && die "Sorry, but gcc-4.6 and earlier won't work (see 
bug #520102)."
-   fi
-}
-
-pkg_setup() {
-   # Set default storage backend in order: MySQL, SQLite PostgreSQL
-   # reverse driver check to keep the order
-   if use postgres; then
-   DRIVER="QPSQL"
-   AVAILABLE+=" ${DRIVER}"
-   fi
-
-   if use sqlite; then
-   DRIVER="QSQLITE3"
-   AVAILABLE+=" ${DRIVER}"
-   fi
-
-   if use mysql; then
-   DRIVER="QMYSQL"
-   AVAILABLE+=" ${DRIVER}"
-   fi
-
-   # Notify about MySQL is recommend by upstream
-   if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
-   ewarn
-   ewarn "We strongly recommend you change your Akonadi database 
backend to MySQL in your"
-   ewarn "user configuration. This is the backend recommended by 
KDE upstream."
-   ewarn "In particular, kde-base/kmail-4.10 does not work 
properly with the sqlite"
-   ewarn "backend anymore."
-   ewarn "You can select the backend in your 
~/.config/akonadi/akonadiserverrc."
-   ewarn "Available drivers are:${AVAILABLE}"
-   ewarn
-   fi
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DINSTALL_QSQLITE_IN_QT_PREFIX=ON
-   -DWITH_SOPRANO=FALSE
-   $(cmake-utils_use test AKONADI_BUILD_TESTS)
-   $(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
-   $(cmake-utils_use qt5 QT5_BUILD)
-   )
-
-   cmake-utils_src_configure
-}
-
-src_test() {
-   export $(dbus-launch)
-   cmake-utils_src_test
-}
-
-src_install() {
-   # Who knows, maybe it accidentally fixes our permission issues
-   cat <<-EOF > "${T}"/akonadiserverrc
-[%General]
-Driver=${DRIVER}
-EOF
-   insinto /usr/share/config/akonadi
-   doins "${T}"/akonadiserverrc
-
-   cmake-utils_src_install
-}
-
-pkg_postinst() {
-   elog "${DRIVER} has been set as your default akonadi storage backend."
-   elog "You can override it in your ~/.config/akonadi/akonadiserverrc."
-   elog "Available drivers are: ${AVAILABLE}"
-}

[gentoo-commits] repo/gentoo:master commit in: app-office/akonadi-server/

2015-09-23 Thread Agostino Sarubbo 
commit: 384852a8097124421c88fb0402a918a121692163
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Sep 23 12:50:29 2015 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Sep 23 12:51:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=384852a8

app-office/akonadi-server: ppc64 stable wrt bug #555334

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc64"

 app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild 
b/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
index 97f54f7..5d2c52c 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ $PV = ** ]]; then
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"
+   KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
S="${WORKDIR}/${P/-server/}"
 fi

[gentoo-commits] repo/gentoo:master commit in: app-office/akonadi-server/

2015-08-12 Thread Johannes Huber 
commit: ea0edc0e24ddcf5872781b704230fe4e42bb12cf
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Aug 12 19:06:31 2015 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Aug 12 19:06:48 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea0edc0e

app-office/akonadi-server: Drop soprano USE flag

Part of the Nepomuk removal, was only needed for KDE PIM with Nepomuk support.

Package-Manager: portage-2.2.20.1

 app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild | 8 +++-
 app-office/akonadi-server/akonadi-server-1.13.0.ebuild| 6 ++
 app-office/akonadi-server/metadata.xml| 3 ---
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild 
b/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
index ee76b60..761effd 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.0-r1.ebuild
@@ -8,7 +8,7 @@ if [[ $PV = ** ]]; then
scm_eclass=git-r3
EGIT_REPO_URI=( "git://anongit.kde.org/akonadi" )
SRC_URI=""
-   KEYWORDS="amd64 ppc"
+   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"
@@ -22,7 +22,7 @@ HOMEPAGE="http://pim.kde.org/akonadi";
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+mysql postgres +qt4 qt5 soprano sqlite test"
+IUSE="+mysql postgres +qt4 qt5 sqlite test"
 
 REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
 
@@ -45,9 +45,7 @@ CDEPEND="
dev-qt/qttest:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
-   soprano? ( dev-libs/soprano[-qt4,qt5] )
)
-   soprano? ( dev-libs/soprano )
sqlite? ( dev-db/sqlite:3 )
 "
 DEPEND="${CDEPEND}
@@ -105,8 +103,8 @@ pkg_setup() {
 src_configure() {
local mycmakeargs=(
-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
+   -DWITH_SOPRANO=FALSE
$(cmake-utils_use test AKONADI_BUILD_TESTS)
-   $(cmake-utils_use_with soprano)
$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
$(cmake-utils_use qt5 QT5_BUILD)
)

diff --git a/app-office/akonadi-server/akonadi-server-1.13.0.ebuild 
b/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
index 235b20b..4d16b22 100644
--- a/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.13.0.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="http://pim.kde.org/akonadi";
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+mysql postgres +qt4 qt5 soprano sqlite test"
+IUSE="+mysql postgres +qt4 qt5 sqlite test"
 
 REQUIRED_USE="^^ ( qt4 qt5 ) || ( sqlite mysql postgres )"
 
@@ -45,9 +45,7 @@ CDEPEND="
dev-qt/qttest:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
-   soprano? ( dev-libs/soprano[-qt4,qt5] )
)
-   soprano? ( dev-libs/soprano )
sqlite? ( dev-db/sqlite:3 )
 "
 DEPEND="${CDEPEND}
@@ -103,8 +101,8 @@ pkg_setup() {
 src_configure() {
local mycmakeargs=(
-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
+   -DWITH_SOPRANO=FALSE
$(cmake-utils_use test AKONADI_BUILD_TESTS)
-   $(cmake-utils_use_with soprano)
$(cmake-utils_use sqlite AKONADI_BUILD_QSQLITE)
$(cmake-utils_use qt5 QT5_BUILD)
)

diff --git a/app-office/akonadi-server/metadata.xml 
b/app-office/akonadi-server/metadata.xml
index 3142906..a23f444 100644
--- a/app-office/akonadi-server/metadata.xml
+++ b/app-office/akonadi-server/metadata.xml
@@ -2,7 +2,4 @@
 http://www.gentoo.org/dtd/metadata.dtd";>
 
kde
-   
-   Enable deprecated 
dev-libs/soprano, needed for nepomuk search
-