Version bump fixes bug #484572. Remove old.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 22 insertions, 43 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/Manifest b/app-office/akonadi-server/Manifest
index adb44cd148ff..6f9f0e6e2a38 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1,21 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX akonadi-server-1.10.2-datastore_query_fix.patch 939 SHA256 a934f8dec4a710021fa8fbe1cd19dec4ce5ee8132c4851ea994a777a7234a1bb SHA512 b6702cbf75f96ab1105f10f78a289c4a4befd471796328b28974e5581ba3e77b9d881feb5e4fdc27b5316db15a3630340f451501960f00541c72ba103a1b5289 WHIRLPOOL 106a1d581b957782a90c57bcf57879c33520d7e79dd05b59b844cfd86a41870e453419a1b1c2ebc81926bc54ed93efc81c5102a2c101f5f0c9f980b0debdc176
-DIST akonadi-1.10.2.tar.bz2 227993 SHA256 f3d50d5ab8070e7ceb9e64ac5eaa5f47a451071e27328219fe93bc9eeb3e32ca SHA512 0b4c66216276b446b1f9d3b280e86cb3c95196d45a929c5125175fa65989ace1d5f14561274998295b2c1fdbac11060da930604c0abe6542f5e899bf441d2d85 WHIRLPOOL bb0f75b794fe3f440c1071cb12685f0003c4b43f26319aa53cbe657b34f836f1ef2fb4d5288a43a18a39137da0f1cbafa54f8457550069f0268b66ba8a387e56
 DIST akonadi-1.9.2.tar.bz2 220599 SHA256 e712f3ee59731d613935df78df1cd65f80680d86d1f6642ff118061cd461bfd9 SHA512 9c281315cbb4801490acb0c6afa8bde6e42a73cfd0ba4ab0cb2b0b50a63ae55d350efcf8535b7f3251d93da0ba63c51e7920c250496fedcb3d90e1d8644c1b7f WHIRLPOOL 3415b70bc03ba451ae4e8216de0eeeb0f0c7f53c4f6433cc21f4725167f24493bee3f6dfe188f7d3633b4f5e4471d3a02ffc5407b90def86c439db6e711a1cce
-EBUILD akonadi-server-1.10.2-r1.ebuild 3165 SHA256 4a445348399098afa901bb099dc2eca77883e3bbd4d7243f0036ec3ccf643c9b SHA512 2aa8624323ec6766f280c08c6967f52793c3711345946c23d80e91763fe3d7c0fb47dc74955e659e93219f80811a199515efa399ff23e323eaeeea0ca6dc2b5d WHIRLPOOL d039784c13ab1de5c15f2b32d64fd5c80fe2bd8a190a5b38f936f3063281e9c96a3f10b6417def8a942c6101fa838fccf79b0fb43845ab2a9673e86785c3b1d6
+DIST akonadi-server-1.10.3.tar.bz2 228633 SHA256 a8f66eec479c235ec67e77befac50c42743f627663fe2bb49238e82e6fbfffb0 SHA512 836917f3fb8ec5388d7145402fb1b55ca00d14d78f92d0105fecc6c052e99d497e17a2484f581b9d2f20433220a9343e6b4bff8ad34e48767e6a42d309572c66 WHIRLPOOL 468908b64e66a826e17dc8f5dca3f907bfcd09669810f9f1aca96b7f812ebc2c0138a6f840a5e5f8d0734cc05eecddeebafe8affe32994c2ed7bb76c2c309b38
+EBUILD akonadi-server-1.10.3.ebuild 3115 SHA256 7ba0ee57056b2f3407578f8a89cb41a8d86c9fc2a4bdc15001917dc06b2fa928 SHA512 84b090f16006ba11756fe504bf6195be1bdebb83855a248a883ecf50d081cda0fd52ead6e7f668172b6a7049bac1cb70f8e6c38447bcaf31dbfdd924e549e150 WHIRLPOOL e2130870d56a61569048cf3db982ca492156b72ea43e2af3144d4c0764359681b53b7d8a9e4619d080b7cea62bcbd8922657ffe1d0160f5edaa9360f26297e1d
 EBUILD akonadi-server-1.9.2.ebuild 2696 SHA256 caf94b60f3a48ea160c29371625bbd566396da5842ef0c185fbe54b903f16d79 SHA512 3191fce465ae01f6525abc73d72226349313c93f0ef54deebce64d0cdf710e9784e284b83e0e3d0e3742001ad5b42a289e8f71fcd19bf05b573d041363db4b15 WHIRLPOOL a17e9c4bfba373515919ef55c8fa3a6c13530b56240035bbf57b0c3cf17df59954b00aa830e73f4e15ce22a7cc43faa44b33819a80cc90fc6b5dd23a38206bd8
-MISC ChangeLog 18569 SHA256 7058aed2c68beab34812935256e5a7a0af840cfc90e0e78d25c8bf1883352aa5 SHA512 554d513ab3616b5a8b913327a20860c97f2f2acb758858adfed4aed49fddd739e2035a2f31b8268625e5471aec099cd8eb7765f039111d3e6a00b2697432acbb WHIRLPOOL e6bdb9dca63b40bf5048743cdaa58259d716df81c654f6fe8b866eb907499fee662f7b84b02e35d8859daa784dcacce5ab39f8d73ae75f9d86e204b8b7049b08
+MISC ChangeLog 18821 SHA256 1e935a11e0a3309a2aaa4a0648102dc2955ced442ba1dc28279bbcd165230d1d SHA512 b316b526e941e4e536bfbb6c0eb4b928966cd525eaf646774d9de862c2c3a2cf62d0e463f4f0d46c814ac13a75d0c963033dc66950d0ffda0294d6160dd14c59 WHIRLPOOL 2c432943c482ef022947a1caae17c975734abf2b85181456b29e1dc540632b82aec999b64439741fe35d9a0a7e9f67680f36520bc4a2f5d9759e11888e26a27b
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSLIEDAAoJEMbwO6tnXQ0s8EgIAKLwGJT/ktFrVxQIIzQ3vdRP
-sARhVACzxBq7LH5RAVyz46M4Ly9r+/BDsva7DyLQ8I3d8eKcK+mcwJ6+h652KTyZ
-Wpt5p4bDqIqtai+nvr5GmSzwYssHSFDIJnjhUwMYeOG0WZRbVtT5MIjBfKbLeRIE
-TDmFGiReES0cz3QFZ1aTyX1QOU0D9zyNo/EzBpBmkeKIbtnQl2BDgOy0toYPJ38u
-fNyf4xMzwVbrTO/iCUQtJqVqw0p6Blk+ltOS4Qn5kQwQQOh34Q1xzML0/nLFPFF3
-bkCP67SQtViXsbZxlBEqvUzrRIVhjosPf+kIrD2ENxqbED7z5EsuzGw937wNHv8=
-=y7rN
+iQEcBAEBCAAGBQJSVdrFAAoJEO+t9ga+3I3aJP0H+wYQwA0weaEOzclCBNt7xeff
+N8p9sCFoc8GvNpBxQK4ArZXhDAZbi4bH/4/CUw2CA84WIRkAHRpUoHZyTlsdZwGw
+K2dRpb6e6e4rJgoJ9zYX5zhgio0BBPNPkwZMzKdu4IW7heuwz43cAo6D8F9ugh2+
+gnJLUxoQ3D5JTFoc57qTxx6jowzka1PGG80oN9oPmJ15jb/7De7JVZyHfqTV6J69
+T8xhHQDI2x7bnlzV7LdzzzNf98vLCOFpdQ5bPc3wvZoUsrGOFuHSQmGoGPg1Aaea
+RfMWfyEwCZxuvw2g0XuzaOYZ+hiVD0+ithp628YkayWx5W81v6wEueg2tsi4Ys4=
+=y09K
 -----END PGP SIGNATURE-----
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 );