Add PostgreSQL fix. Drop old ebuild.

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x296C6CCA35A64134

4 files changed, 35 insertions, 11 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index 8412e72f8140..db4c23614c9c 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.120 2013/07/23 17:39:21 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.121 2013/07/24 11:39:27 mschiff Exp $
+
+*akonadi-server-1.10.1-r1 (24 Jul 2013)
+
+  24 Jul 2013; Marc Schiffbauer <mschiff@gentoo.org>
+  +akonadi-server-1.10.1-r1.ebuild, +files/akonadi-server-1.10.1-fix_psql.patch,
+  -akonadi-server-1.10.1.ebuild:
+  Add PostgreSQL fix. Drop old ebuild.
 
 *akonadi-server-1.10.1 (23 Jul 2013)
 
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index dae55e37c828..c948b025b498 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1,20 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX akonadi-server-1.10.1-fix_psql.patch 913 SHA256 988a759d0099f7542b4a28b416e807bb3d41d27ef88f210b10e5101f5d4f11da SHA512 afd9f4b9542e31396f0778f8eb0b20d7dcf97d1287ee9db70869476c1429579915724c74ad788502e537814e6b0c1671c8650773db4e2dbd4793969883fa0071 WHIRLPOOL 5556673dd94facc100859a6e0e14150c2fd7d5b4ae28a7b1d52a06547088646bbcde79b6d6119b2fb38e686548a8f4474497fea8594daee0f49699cfb09e4064
 DIST akonadi-1.10.1.tar.bz2 228078 SHA256 8a5e260e0af5b0f747414cb873f4086ef041bf6a79a9e0858a9079740d16c148 SHA512 1347a0c08dcd7a98a12b7d3f3f5754e06e94b1d9d0d5100c138cafc03308fe07648328e9b7ebc7e3975e4510842c7bbf445b66e4618f1e1db476d07f25efcd45 WHIRLPOOL abca762796d129077e9be516e6845b17cf3101c227b428eaa3d938a1cdeb98a28f48333353f5b363ac998fcc5096150618add7300ae1ed30905f918449529106
 DIST akonadi-1.9.2.tar.bz2 220599 SHA256 e712f3ee59731d613935df78df1cd65f80680d86d1f6642ff118061cd461bfd9 SHA512 9c281315cbb4801490acb0c6afa8bde6e42a73cfd0ba4ab0cb2b0b50a63ae55d350efcf8535b7f3251d93da0ba63c51e7920c250496fedcb3d90e1d8644c1b7f WHIRLPOOL 3415b70bc03ba451ae4e8216de0eeeb0f0c7f53c4f6433cc21f4725167f24493bee3f6dfe188f7d3633b4f5e4471d3a02ffc5407b90def86c439db6e711a1cce
-EBUILD akonadi-server-1.10.1.ebuild 3099 SHA256 30f80d4e59f2f652f9968e88d651649d36d4d07570dba3aeebbaf554d78d044a SHA512 8e28d03dffc4bab1b9739ca521813f7cd48dc0c9f3f4adf5de85f5f359e63d63e3c55b6a13a3f207a6694d4dd01f5e8e3cb600017679c06fe9b9fe6c9a4a0e94 WHIRLPOOL 63c9e315792485907c47234b476abf1087d2fa7ba3e03faa7418c24ef040811f4da47f708a246a8ecae33bf6c5e6cb6f46cf821aab2db2ca593e293346e8fab1
+EBUILD akonadi-server-1.10.1-r1.ebuild 3147 SHA256 51ee8ea6f579262b9fdc51114a4fb73b0636d3b3dcc869ae967c9685b3da8d32 SHA512 f6bd0199658071d9fea638d42eed95fff517176f455fc238c875b7916a948e00e80840af7f236b78e659b8c9de1854a98fa0b14cee1a6c94aa204a236a36667c WHIRLPOOL a45a60f7f8c7f21bff7b8e804d62df2bf7d8b89615a3266d8d7c019b4f32ff18713ccad4634b63ae6df875112c6868a57829ac3a6a156947cc0bf423ae46047f
 EBUILD akonadi-server-1.9.2.ebuild 2677 SHA256 257a0b1eb51370989fee353d085cf60c014ff492f17aa827616461e94625d06b SHA512 2e7e51f572797e8c444f6671b372a96654f8a7ebd37c2264f80d7638ed10500ccbd46b6f533ffeb54e95797d7fef5b1806db3493d0e2281fba6420f107bf640f WHIRLPOOL b4e6815390ef291cc5ffb9cb5568d740ff3a92ce2148747131cfab3649bf675ed8f5a29afa984b65336faa310266eab56aab89abc95a05c282ffae4af80b990f
-MISC ChangeLog 17651 SHA256 e57426cabbfe9d47fb75f917538e266796fbf9b1f147790ded83f852580804ba SHA512 9a1f320ff3fd0d5fac9c8e5d46aff1c8610dff1e8e53943601cc0eb30cf5a1a102a4534bf8d9e91f9989ba9548a6d11fcd0b681f80da4983bfcbcf190b59f218 WHIRLPOOL dc0a9a1e5423735dab68023d4816398b1324e4f3ff838ed27faf7ac8a47245ada036d0ce8048ad5d815548c13fbdd567b5eee8d5ba27ff934cf8e964219ca9db
+MISC ChangeLog 17902 SHA256 db05a8f10c46529afd789bb64a708d9e8ba40c68d133f0c0c0d35e1bf5861dfc SHA512 4f35108e53d29d658cdd8f9e7b0da1cf9bd4d1a47518833f132520c7d2e1ec35dbf161a3a50ea88223a4bebe5dadeeacdec65a600c8555ace8dbe15b8f70303e WHIRLPOOL 257fe875f81521c20d17d72d6f60635ce23daf59cba86cb8d82365f692651fbabf3b4e72cb32c394a889d80973ab87d51f57886b94b26e3e7d6fb6617e4af1b3
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJR7r/HAAoJEO+t9ga+3I3aZf4H/0l7Jp9lDO+s+axqpUm1SiGD
-/U2uf6a68yKPxSw1Si5mwAs0fdk6MLrqCY13Oq19fl1m2zgpIxK395FyyIeoSA+h
-OQvx1dGaYomP84/PVwVLhCzFDt+OCouvo9sGfKTHzLNj6tAaEzDarSKM0KNttobw
-WZSILcT3cjERIM64DrN0l3hFKhIQsUFJGF2HxNBBlLEKJnxe3w+DwqOwosvmK4Kx
-UBtEMFJIbmBF04Elv9s96QG4nB07fUmpLiRIMdVu+16kcu/jW4tb/uWBlqq6IEq9
-yZJldRPR/jJD1eCixKI7LTDU1tjhqhWl+OBwqP7OvjQ1gm+4fzsyAuaN0rSaJEs=
-=DiCZ
+iD8DBQFR77zzKWxsyjWmQTQRCA8uAJ9VnLulJsfo1i0b9qD8oKXNBb+VkgCeLCFW
+s1HKgeg7gFRpn1Nmo1BbPYg=
+=IaA2
 -----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.10.1.ebuild b/app-office/akonadi-server/akonadi-server-1.10.1-r1.ebuild
index 4a41f066b7e0..296e00b14841 100644
--- a/app-office/akonadi-server/akonadi-server-1.10.1.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.10.1-r1.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.ebuild,v 1.1 2013/07/23 17:39:21 johu Exp $
+# $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 $
 
 EAPI=5
 
@@ -91,6 +91,7 @@ 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
new file mode 100644
index 000000000000..8cade4427f91
--- /dev/null
+++ b/app-office/akonadi-server/files/akonadi-server-1.10.1-fix_psql.patch
@@ -0,0 +1,19 @@
+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;