Version bump, remove old.

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

3 files changed, 8 insertions, 22 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index db4c23614c9c..ce51157e7a1a 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/akonadi-server
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.121 2013/07/24 11:39:27 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.122 2013/07/25 21:07:11 johu Exp $
+
+*akonadi-server-1.10.2 (25 Jul 2013)
+
+  25 Jul 2013; Johannes Huber <johu@gentoo.org> +akonadi-server-1.10.2.ebuild,
+  -akonadi-server-1.10.1-r1.ebuild, -files/akonadi-server-1.10.1-fix_psql.patch:
+  Version bump, remove old.
 
 *akonadi-server-1.10.1-r1 (24 Jul 2013)
 
diff --git a/app-office/akonadi-server/akonadi-server-1.10.1-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.10.2.ebuild
index 296e00b14841..5428f75d3c9d 100644
--- a/app-office/akonadi-server/akonadi-server-1.10.1-r1.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.10.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.10.1-r1.ebuild,v 1.1 2013/07/24 11:39:27 mschiff Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.10.2.ebuild,v 1.1 2013/07/25 21:07:11 johu Exp $
 
 EAPI=5
 
@@ -91,7 +91,6 @@ pkg_setup() {
 }
 
 src_configure() {
-	epatch "${FILESDIR}"/${P}-fix_psql.patch
 	local mycmakeargs=(
 		-DAKONADI_USE_STRIGI_SEARCH=OFF
 		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
diff --git a/app-office/akonadi-server/files/akonadi-server-1.10.1-fix_psql.patch b/app-office/akonadi-server/files/akonadi-server-1.10.1-fix_psql.patch
deleted file mode 100644
index 8cade4427f91..000000000000
--- a/app-office/akonadi-server/files/akonadi-server-1.10.1-fix_psql.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit f7bf081598dd58667751df0c1a3b601e095e6dfb
-Author: Andras Mantia <amantia@kde.org>
-Date:   Wed Jul 24 12:48:05 2013 +0300
-
-    Fix (again) Akonadi for PostgreSql.
-    (cherry picked from commit 5b606c460834d63cf2953137748b66834c9ddb55)
-
-diff --git a/server/src/storage/datastore.cpp b/server/src/storage/datastore.cpp
-index 553d963..41a0927 100644
---- a/server/src/storage/datastore.cpp
-+++ b/server/src/storage/datastore.cpp
-@@ -238,6 +238,7 @@ bool DataStore::doAppendItemsFlag( const PimItem::List &items, const Flag &flag,
-   QueryBuilder qb2( PimItemFlagRelation::tableName(), QueryBuilder::Insert );
-   qb2.setColumnValue( PimItemFlagRelation::leftColumn(), appendIds );
-   qb2.setColumnValue( PimItemFlagRelation::rightColumn(), flagIds );
-+  qb2.setIdentificationColumn( QString() );
-   if ( !qb2.exec() ) {
-     akDebug() << "Failed to execute query:" << qb2.query().lastError();
-     return false;