Version bump, remove old.

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

5 files changed, 26 insertions, 157 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index 4448d12b395e..8412e72f8140 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.119 2013/07/14 14:36:30 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.120 2013/07/23 17:39:21 johu Exp $
+
+*akonadi-server-1.10.1 (23 Jul 2013)
+
+  23 Jul 2013; Johannes Huber <johu@gentoo.org> +akonadi-server-1.10.1.ebuild,
+  -akonadi-server-1.10.0-r1.ebuild, -akonadi-server-1.10.0.ebuild,
+  -files/akonadi-server-1.10.0-fix-pgsql.patch:
+  Version bump, remove old.
 
   14 Jul 2013; Manuel Rüger <mrueg@gentoo.org> akonadi-server-1.10.0-r1.ebuild,
   akonadi-server-1.10.0.ebuild:
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index 0865eba6dc8f..dae55e37c828 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1,8 +1,20 @@
-AUX akonadi-server-1.10.0-fix-pgsql.patch 924 SHA256 d0b5316cd06ed793dff59be1f8c9f37ac8742414e2041584ddacaff996d41556 SHA512 53c899121ec508029286be320a8101794a0e535fc40de94a82c7e501899cdb720c02b847bf79ed8bc5464a067175b784f647f7fc6fb32266310143ea47b821d3 WHIRLPOOL df7f0d96c38fa264a3b2d8140f41ebb7fcdf787bc1f222b971d1a1c6b276ca324d61d32f2528c67aa07432ea4b61134204f18d25ffa2a03f904ab923267d5d9d
-DIST akonadi-1.10.0.tar.bz2 227714 SHA256 ae64b965da72ce7332b2409f1c6d7475b28c2414aafca1c9bbca60fb8d632a9e SHA512 08a41b1caeb17fb2ba3faa4a81310315d0695c526d8b47b61f0c6f2ad414700ba5c31fe85f936cb218e7e96f72ee4cebdf06291f6b81e4f23d2c651b4d3daf6e WHIRLPOOL ab980907de4c0039c5123eb46c58370cd87082d1c885f8813ce45a017e5a2e7e535e9c63fddc0993daaf20c57570132419feb71e98297faef540a57e35b8fce3
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+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.0-r1.ebuild 3147 SHA256 747c8316d0f83130aebcd9f3959cab921a87478a769b7d2faffdca74d43710d9 SHA512 c60b972b7764a6373383863991337b8cef2cb6edae0f1fa46f3209e7f388abbbeea872aeb74517ff3b19c89597664bccafafdc394516674284c118e83bc715b2 WHIRLPOOL 13908905fd5cc371f11733d583373f5ef439f0077e2dd9dde0eef763d8f73636b5a3e28822af5539cf877b69343eb26fd76b6402363e9bc9cfd2b552351d9d6c
-EBUILD akonadi-server-1.10.0.ebuild 3100 SHA256 a72e2f26e7f117588bf28f989acfc26d7c5dc642060144121d4d2a575741a595 SHA512 5e8e839915aef277568596d7894bf23de54edcc615ca3b51c798f63039979e0d2dc838dec397c956331811d936430545cd2d6ae8fc65b58c30d8b86a971e4571 WHIRLPOOL ab895c1e6b31770d622487f0334f152b1c40af091d68c6c336cdda0efc9be7c9bb415cd85704a11adcdd899a2df3ea50f15840fee8cd0f1f25e79fe506300cac
+EBUILD akonadi-server-1.10.1.ebuild 3099 SHA256 30f80d4e59f2f652f9968e88d651649d36d4d07570dba3aeebbaf554d78d044a SHA512 8e28d03dffc4bab1b9739ca521813f7cd48dc0c9f3f4adf5de85f5f359e63d63e3c55b6a13a3f207a6694d4dd01f5e8e3cb600017679c06fe9b9fe6c9a4a0e94 WHIRLPOOL 63c9e315792485907c47234b476abf1087d2fa7ba3e03faa7418c24ef040811f4da47f708a246a8ecae33bf6c5e6cb6f46cf821aab2db2ca593e293346e8fab1
 EBUILD akonadi-server-1.9.2.ebuild 2677 SHA256 257a0b1eb51370989fee353d085cf60c014ff492f17aa827616461e94625d06b SHA512 2e7e51f572797e8c444f6671b372a96654f8a7ebd37c2264f80d7638ed10500ccbd46b6f533ffeb54e95797d7fef5b1806db3493d0e2281fba6420f107bf640f WHIRLPOOL b4e6815390ef291cc5ffb9cb5568d740ff3a92ce2148747131cfab3649bf675ed8f5a29afa984b65336faa310266eab56aab89abc95a05c282ffae4af80b990f
-MISC ChangeLog 17391 SHA256 e1fa281d4af2809c3c927159c4e41f071ec7dd48e128648993043721b25f570d SHA512 509e4258f2ce5b615eca56123e0a417ce5793d04c7da04d5e0470e0d41d7fbf57c53e6a5290375332965b2976af3ad1e77d676566e64f1eda450b5f50dbf217d WHIRLPOOL ffb947daa621b4bd8932d84c48d9dc86ff580bffa01fc2457a6bfebf84a49f4077a1a418394b2753bd7a571975d6bd6a0027632037983051e5a0b486f233afbe
+MISC ChangeLog 17651 SHA256 e57426cabbfe9d47fb75f917538e266796fbf9b1f147790ded83f852580804ba SHA512 9a1f320ff3fd0d5fac9c8e5d46aff1c8610dff1e8e53943601cc0eb30cf5a1a102a4534bf8d9e91f9989ba9548a6d11fcd0b681f80da4983bfcbcf190b59f218 WHIRLPOOL dc0a9a1e5423735dab68023d4816398b1324e4f3ff838ed27faf7ac8a47245ada036d0ce8048ad5d815548c13fbdd567b5eee8d5ba27ff934cf8e964219ca9db
 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
+-----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.10.0-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.10.0-r1.ebuild
deleted file mode 100644
index affcb200acfd..000000000000
--- a/app-office/akonadi-server/akonadi-server-1.10.0-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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.0-r1.ebuild,v 1.2 2013/07/14 14:36:30 mrueg Exp $
-
-EAPI=5
-
-if [[ $PV = *9999* ]]; then
-	scm_eclass=git-2
-	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="http://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:=
-	>=dev-libs/soprano-2.6.51
-	x11-misc/shared-mime-info
-	qt4? (
-		>=dev-qt/qtcore-4.5.0:4
-		>=dev-qt/qtdbus-4.5.0:4
-		>=dev-qt/qtgui-4.5.0:4[dbus(+)]
-		>=dev-qt/qtsql-4.5.0:4[mysql?,postgres?]
-		>=dev-qt/qttest-4.5.0:4
-	)
-	qt5? (
-		>=dev-libs/soprano-2.6.51[-qt4,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 )
-"
-
-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() {
-	epatch "${FILESDIR}/${P}-fix-pgsql.patch"
-
-	local mycmakeargs=(
-		-DAKONADI_USE_STRIGI_SEARCH=OFF
-		-DINSTALL_QSQLITE_IN_QT_PREFIX=ON
-		$(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}"
-}
diff --git a/app-office/akonadi-server/akonadi-server-1.10.0.ebuild b/app-office/akonadi-server/akonadi-server-1.10.1.ebuild
index 5f02b9e4418d..4a41f066b7e0 100644
--- a/app-office/akonadi-server/akonadi-server-1.10.0.ebuild
+++ b/app-office/akonadi-server/akonadi-server-1.10.1.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.0.ebuild,v 1.2 2013/07/14 14:36:30 mrueg Exp $
+# $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 $
 
 EAPI=5
 
diff --git a/app-office/akonadi-server/files/akonadi-server-1.10.0-fix-pgsql.patch b/app-office/akonadi-server/files/akonadi-server-1.10.0-fix-pgsql.patch
deleted file mode 100644
index 253b405aae72..000000000000
--- a/app-office/akonadi-server/files/akonadi-server-1.10.0-fix-pgsql.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit fdedc830ca5061f45cd2412c11566ca84806c427
-Author: Andras Mantia <amantia@kde.org>
-Date:   Fri Jul 12 15:03:36 2013 +0300
-
-    Unbreak akonadi on Postgres
-
-diff --git a/server/src/storage/datastore.cpp b/server/src/storage/datastore.cpp
-index f5a1bc6..93e1ff2 100644
---- a/server/src/storage/datastore.cpp
-+++ b/server/src/storage/datastore.cpp
-@@ -208,8 +208,9 @@ bool DataStore::setItemsFlags( const PimItem::List &items, const QVector<Flag> &
-   }
- 
-   QueryBuilder qb2( PimItemFlagRelation::tableName(), QueryBuilder::Insert );
--  qb2.setColumnValue( PimItemFlagRelation::leftFullColumnName(), insIds );
--  qb2.setColumnValue( PimItemFlagRelation::rightFullColumnName(), insFlags );
-+  qb2.setColumnValue( PimItemFlagRelation::leftColumn(), insIds );
-+  qb2.setColumnValue( PimItemFlagRelation::rightColumn(), insFlags );
-+  qb2.setIdentificationColumn( QString() );
-   if ( !qb2.exec() ) {
-     return false;
-   }