Version bump fixes bug #484572. Remove old.

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

3 files changed, 11 insertions, 31 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index 4504754cf0b6..1485d245bad6 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,13 @@
 # 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.124 2013/09/08 13:54:37 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.125 2013/10/09 20:37:48 johu Exp $
+
+*akonadi-server-1.10.3 (09 Oct 2013)
+
+  09 Oct 2013; Johannes Huber <johu@gentoo.org> +akonadi-server-1.10.3.ebuild,
+  -akonadi-server-1.10.2-r1.ebuild,
+  -files/akonadi-server-1.10.2-datastore_query_fix.patch:
+  Version bump fixes bug #484572. Remove old.
 
   08 Sep 2013; Michael Palimaka <kensington@gentoo.org>
   akonadi-server-1.10.2-r1.ebuild, akonadi-server-1.9.2.ebuild:
diff --git a/app-office/akonadi-server/akonadi-server-1.10.2-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.10.3.ebuild
index 50101b4f396b..06bd997d256b 100644
--- a/app-office/akonadi-server/akonadi-server-1.10.2-r1.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.10.3.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.2-r1.ebuild,v 1.2 2013/09/08 13:54:37 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/akonadi-server-1.10.3.ebuild,v 1.1 2013/10/09 20:37:48 johu Exp $
 
 EAPI=5
 
@@ -10,12 +10,12 @@ if [[ $PV = *9999* ]]; then
 	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+	SRC_URI="mirror://kde/stable/${PN/-server/}/src/${PN/-server/}-${PV}-1.tar.bz2 -> ${P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${P/-server/}"
 fi
 
-inherit cmake-utils ${scm_eclass} eutils
+inherit cmake-utils ${scm_eclass}
 
 DESCRIPTION="The server part of Akonadi"
 HOMEPAGE="http://pim.kde.org/akonadi"
@@ -59,10 +59,6 @@ RDEPEND="${CDEPEND}
 	postgres? ( dev-db/postgresql-server )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-datastore_query_fix.patch
-)
-
 pkg_setup() {
 	# Set default storage backend in order: MySQL, SQLite PostgreSQL
 	# reverse driver check to keep the order
diff --git a/app-office/akonadi-server/files/akonadi-server-1.10.2-datastore_query_fix.patch b/app-office/akonadi-server/files/akonadi-server-1.10.2-datastore_query_fix.patch
deleted file mode 100644
index d119a3aae077..000000000000
--- a/app-office/akonadi-server/files/akonadi-server-1.10.2-datastore_query_fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-commit d76aeb18fbc346e89481ce9b3157b4518e8485f7
-Author: Volker Krause <vkrause@kde.org>
-Date:   Wed Jul 31 17:14:10 2013 +0200
-
-    Don't crash the server if all items already have the desired flags.
-    
-    This case subsequently hits an assert in the query builder for an empty
-    IN condition.
-
-diff --git a/server/src/storage/datastore.cpp b/server/src/storage/datastore.cpp
-index 41a0927..40b8fe8 100644
---- a/server/src/storage/datastore.cpp
-+++ b/server/src/storage/datastore.cpp
-@@ -235,6 +235,9 @@ bool DataStore::doAppendItemsFlag( const PimItem::List &items, const Flag &flag,
-     appendItems << item;
-   }
- 
-+  if ( appendItems.isEmpty() )
-+    return true; // all items have the desired flags already
-+
-   QueryBuilder qb2( PimItemFlagRelation::tableName(), QueryBuilder::Insert );
-   qb2.setColumnValue( PimItemFlagRelation::leftColumn(), appendIds );
-   qb2.setColumnValue( PimItemFlagRelation::rightColumn(), flagIds );