Remove old. Rev bump fix available driver array fill, bug #395165.

Thanks to jer to show the root path of the solution.

Package-Manager: portage-2.2.0_alpha81/cvs/Linux i686

7 files changed, 226 insertions, 163 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index 9217468ea0a6..18af55e5ee27 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-office/akonadi-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.64 2011/12/07 22:06:37 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.65 2011/12/20 23:43:57 johu Exp $
+
+*akonadi-server-1.6.2-r1 (20 Dec 2011)
+*akonadi-server-1.5.2-r1 (20 Dec 2011)
+
+  20 Dec 2011; Johannes Huber <johu@gentoo.org> +akonadi-server-1.5.2-r1.ebuild,
+  +akonadi-server-1.6.2-r1.ebuild, -akonadi-server-1.3.1.ebuild,
+  -files/akonadi-server-1.6.0_Fix_crash_on_agent_launcher_exit.patch,
+  metadata.xml:
+  Remove old. Rev bump fix available driver array fill, bug #395165. Thanks to
+  jer to show the root path of the solution.
 
   07 Dec 2011; Markos Chandras <hwoarang@gentoo.org>
   akonadi-server-1.6.2.ebuild:
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index a2c337c7fc54..e3ce74aae078 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1,29 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX akonadi-server-1.6.0_Fix_crash_on_agent_launcher_exit.patch 2328 RMD160 0d5f6bed9d0b6991d676c032a7c8da4bf2d53acf SHA1 73a55c8fd032c6da4ad0357c315367ae6f60898c SHA256 82774345dcf7389deed1c255b7ada28d2955c999c6130b8a86fd62e8b3db5c50
-DIST akonadi-1.3.1.tar.bz2 193500 RMD160 487408ad3ac49983b9151aba358225f203ed19a1 SHA1 b6e97634878fe52785f3dec7d6394a18579d4a50 SHA256 4b9e99c20d0195ef7e477b399fed21e0533b9863f66a0650bfbddf18b73676dd
 DIST akonadi-1.5.2.tar.bz2 209050 RMD160 51c4658fef5e9d638b2446d7e62f57d339225a7f SHA1 c5d24a2c553ec26e975ab51f98cf74a8a64af633 SHA256 4a4299ff360998c897a528f557013519cceb29be88ee4f235dd88aad41964e68
 DIST akonadi-1.6.2.tar.bz2 211347 RMD160 d4f923054a794ecbb03fd6a13db4c9e69a57975c SHA1 f02302686f6e50be240d1e73280c00a10c8ccf11 SHA256 29e5cffbc806b30ded70ba486e71a2aaf0e7b9ea1a798881b2e9bf25535b1696
-EBUILD akonadi-server-1.3.1.ebuild 2141 RMD160 bf10172fc5f6eb070507494de46d78580c57b2b3 SHA1 dce06f51eb90c7f6c63aa38a46318a1010d0a424 SHA256 6dcd91428ef63669eecfc86b112ea98c56ed8396304ce8eb2548206a2edb95d1
+EBUILD akonadi-server-1.5.2-r1.ebuild 2622 RMD160 0510d289a63d2a00cfcf9c95bfac3ddea3cfa9e3 SHA1 9c5e3af43ffec1d7e5b4e1a05216af5845c1b093 SHA256 ad04e58ffe3a43074f1243371c0955bb0f8d53a4e665936679d846d28d604e11
 EBUILD akonadi-server-1.5.2.ebuild 2584 RMD160 4f6887690b628625bf47de41f23950c92bc1b381 SHA1 c0b02f63b700c88ba6689aaf15c35f21d32f5f4e SHA256 34062df58567a7f3056c25db5d9679a1d8639b26ae9874b5bc60cf0cd475a6a1
+EBUILD akonadi-server-1.6.2-r1.ebuild 2625 RMD160 6b8210280982c0651fede863e62b1aceedd1f1c9 SHA1 04b5d20a1833d01e154e0b835b046b46e5c09387 SHA256 81af2af1e9713bdbe469008f5d5ea8fc18c207a8d4f0f1de521f6a8b01b8806a
 EBUILD akonadi-server-1.6.2.ebuild 2575 RMD160 31aa58d7f177a37c28b83cea3a98dc38ee83dd40 SHA1 5c336de05f0d0a84c5c9a60cc69a26f5e4dce739 SHA256 239a79126a4acc93f5a63605234a9ea14359d7a12de727dbdeef8b8d704af8e1
-MISC ChangeLog 9761 RMD160 b0dfb2a41d9fa0e489f9155ac97d43cda80a7e99 SHA1 1cd45f2e5dcbc743c987180a785fe806edd71767 SHA256 bacad40f150389a61ebf89252fbf285d3d053db3ab8f6fa9aca5cb50ecbf892b
-MISC metadata.xml 236 RMD160 c5cc6cb9745f9f6e3c7358482117892cbc866eb2 SHA1 d1bd263bd36cfc701e7ae12fb77e24d3f6556a88 SHA256 3bf214b7d5dabbbd8f2d607f6166647d91c5d0b7f166a4d5615da31995da06b6
+MISC ChangeLog 10193 RMD160 7391b94fa65807448b67aeb30e1edaa93cb8896e SHA1 c2f89a1a1da685f62729bf9c3a8aa3455f6ccc42 SHA256 41afdfbfc40a8e061beeb937be7f0b0a65c590cbf4f3ef47aef12954406c7504
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO3+NuAAoJEPqDWhW0r/LC5kcP/2emLp4nIvMLb1UBplYcZqU1
-Km9BBbN7VCfGVikY8SOGdlGxO2ykvPA5iTHlgJH2ZsZLh1qvByGaCwJGpZe8S+w6
-DurvKSgLdJX8ntcpB7jvnZzAQAPs/kCGmEm4vSW8yLaZat0LIzilylkEfXRJzYg4
-qhGW78hdlhgI8vGAIQwhortFXYWtVao4unQMTYH3vsjGbxcKlqxpbPPxXA/9fgdR
-IGsf46fAmhnpEJ2KOdf2Nz9hCgtnwm744caGQzwUS9Vnr/cykTHDvXO6SZoYoucc
-IuCkB+zULOA/+F0n8OSO+j4wY6aA1vFuMshFWAeOjkITVOUXu+fJRFEVrFrrJHGT
-S36Quo4KVIKtUjU/HAs2gdktO1S3WfYDVHz48Y4jBgQghSL5SWNHOJV4lhsShB3o
-yjMuElVMoKo2MqanM+3mlWku0J2vDD7bqT9Tlc+5qUUsmSultAh596c8A3NQg9I9
-yutTa/F6VMByTSUe3WpxN4QCgM0702nuZ41Fmevd3rAzenDysY6PcJSb//u5/IRf
-0MFzMckl8bB1o8pircN4sl80v2unjKrpqF1j9tvq8EV7YFMcYgW8nkCJ/jGh+OtG
-AcCAFXRsWoeza0rTzJI+SV2hCw9VcWHFGTF0pgTeAnG+t1CCU0N9XPZW0Klt2KAF
-T35PGUaRsaf3iwcvjBGc
-=ZYFe
+iQEcBAEBCgAGBQJO8R46AAoJEO+t9ga+3I3awMcIAIyc+uIkewUMd77cx4Jkqvwd
+ZvuQzIXNMKt56CEq7z+rIotEWgQ6mEsKBOsjtWDGoOBCkOLb2rkUHgTmpgw8auuD
+C4u/ix5PTXct4ntpp180UwfFzCHKLjSm5zyBJrGlYfjR6R6hZcymJdWgFGLcjqMP
+BgjTnTN7rfHVGEo08X3UkGrOdpFGaGuSh/7NLr4EPLrvnjOLKgioBejn2X0TL/mL
+21XCtAmnkUE9z6oS50wN4hw80tg6FdjOlvkWFFKg+uEzYYsTN3bUvDyd3YSOGmPF
+lAG61T0TqNL1BWoqtS87YBsHWwH47k/9W5aknaDVql2QQBV542xV0zqjjwytGZc=
+=QuAJ
 -----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.3.1.ebuild b/app-office/akonadi-server/akonadi-server-1.3.1.ebuild
deleted file mode 100644
index bbd307d0e697..000000000000
--- a/app-office/akonadi-server/akonadi-server-1.3.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2011 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.3.1.ebuild,v 1.12 2011/10/17 17:08:57 jer Exp $
-
-EAPI="2"
-
-inherit cmake-utils
-
-DESCRIPTION="The server part of Akonadi"
-HOMEPAGE="http://pim.kde.org/akonadi"
-SRC_URI="http://download.akonadi-project.org/${P/-server/}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="+mysql postgres sqlite +server"
-
-CDEPEND="
-	dev-libs/boost
-	>=dev-libs/soprano-2.2
-	>=x11-libs/qt-gui-4.5.0:4[dbus]
-	>=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?,sqlite?]
-	>=x11-libs/qt-test-4.5.0:4
-	x11-misc/shared-mime-info
-"
-DEPEND="${CDEPEND}
-	dev-libs/libxslt
-	>=dev-util/automoc-0.9.88
-"
-RDEPEND="${CDEPEND}
-	server? (
-		postgres? ( dev-db/postgresql-server )
-	)
-"
-
-S="${WORKDIR}/${P/-server/}"
-
-src_install() {
-	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
-	if use mysql; then
-		driver="QMYSQL"
-	elif use postgres; then
-		driver="QPSQL"
-	elif use sqlite; then
-		driver="QSQLITE"
-	fi
-	# 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 || die "doins failed"
-
-	cmake-utils_src_install
-}
-
-pkg_postinst() {
-	if use mysql || use postgres || use sqlite; then
-		local func=elog
-		( use postgres || use sqlite ) && func=ewarn
-		echo
-		${func} "${driver} has been set as your default akonadi storage backend."
-		${func} "You can override it in your ~/.config/akonadi/akonadiserverrc."
-		${func} "Available drivers are:"
-		${func} "QMYSQL, QPSQL (testing), QSQLITE (experimental)"
-		${func} "Be advised that QMYSQL is the one fully tested and officially supported."
-		use sqlite && ewarn "If you experience random data losses using QSQLITE driver, you have been warned."
-		echo
-	else
-		echo
-		ewarn "You have decided to build akonadi-server with"
-		ewarn "'mysql', 'postgres' and 'sqlite' USE flags disabled."
-		ewarn "akonadi-server will not be functional."
-		echo
-	fi
-}
diff --git a/app-office/akonadi-server/akonadi-server-1.5.2-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..8ce25e093020
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.5.2-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2011 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.5.2-r1.ebuild,v 1.1 2011/12/20 23:43:57 johu Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="mysql postgres +sqlite test"
+
+CDEPEND="
+	dev-libs/boost
+	>=dev-libs/soprano-2.2
+	>=x11-libs/qt-gui-4.5.0:4[dbus]
+	>=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
+	>=x11-libs/qt-test-4.5.0:4
+	x11-misc/shared-mime-info
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+"
+RDEPEND="${CDEPEND}
+	postgres? ( dev-db/postgresql-server )
+"
+
+REQUIRED_USE="|| ( sqlite mysql postgres )"
+
+S=${WORKDIR}/${P/-server/}
+
+pkg_setup() {
+	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
+	# reverse driver check to keep the order
+
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	# Notify about driver name change
+	if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
+		ewarn
+		ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
+		ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
+	fi
+
+	# Notify about MySQL not being default anymore
+	if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
+		ewarn
+		ewarn "MySQL driver is not enabled by default in Gentoo anymore."
+		ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
+		ewarn "${CATEGORY}/${PN}."
+		ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DAKONADI_USE_STRIGI_SEARCH=OFF"
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use sqlite INSTALL_QSQLITE_IN_QT_PREFIX)
+	)
+
+	cmake-utils_src_configure
+}
+
+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() {
+	echo
+	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.6.2-r1.ebuild b/app-office/akonadi-server/akonadi-server-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..84d57aa61941
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.6.2-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2011 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.6.2-r1.ebuild,v 1.1 2011/12/20 23:43:57 johu Exp $
+
+EAPI=4
+
+inherit cmake-utils
+
+DESCRIPTION="The server part of Akonadi"
+HOMEPAGE="http://pim.kde.org/akonadi"
+SRC_URI="mirror://kde/stable/${PN/-server/}/src/${P/-server/}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="mysql postgres +sqlite test"
+
+CDEPEND="
+	dev-libs/boost
+	>=dev-libs/soprano-2.6.51
+	>=x11-libs/qt-gui-4.5.0:4[dbus]
+	>=x11-libs/qt-sql-4.5.0:4[mysql?,postgres?]
+	>=x11-libs/qt-test-4.5.0:4
+	x11-misc/shared-mime-info
+"
+DEPEND="${CDEPEND}
+	dev-libs/libxslt
+	>=dev-util/automoc-0.9.88
+"
+RDEPEND="${CDEPEND}
+	postgres? ( dev-db/postgresql-server )
+"
+
+REQUIRED_USE="|| ( sqlite mysql postgres )"
+
+S=${WORKDIR}/${P/-server/}
+
+pkg_setup() {
+	# Set default storage backend in order: SQLite, MySQL, PostgreSQL
+	# reverse driver check to keep the order
+
+	if use postgres; then
+		DRIVER="QPSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${DRIVER}"
+	fi
+
+	# Notify about driver name change
+	if use sqlite && has_version "<=${CATEGORY}/${PN}-1.4.0[sqlite]"; then
+		ewarn
+		ewarn "SQLite driver name changed from QSQLITE to QSQLITE3."
+		ewarn "Please edit your ~/.config/akonadi/akonadiserverrc."
+	fi
+
+	# Notify about MySQL not being default anymore
+	if ! use mysql && has_version "<=${CATEGORY}/${PN}-1.4.0[mysql]"; then
+		ewarn
+		ewarn "MySQL driver is not enabled by default in Gentoo anymore."
+		ewarn "If you intend to use it, please enable mysql USE flag and reinstall"
+		ewarn "${CATEGORY}/${PN}."
+		ewarn "Otherwise select different driver in your ~/.config/akonadi/akonadiserverrc."
+		ewarn "Available drivers are:${AVAILABLE}"
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DAKONADI_USE_STRIGI_SEARCH=OFF"
+		$(cmake-utils_use test AKONADI_BUILD_TESTS)
+		$(cmake-utils_use sqlite INSTALL_QSQLITE_IN_QT_PREFIX)
+	)
+
+	cmake-utils_src_configure
+}
+
+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() {
+	echo
+	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/files/akonadi-server-1.6.0_Fix_crash_on_agent_launcher_exit.patch b/app-office/akonadi-server/files/akonadi-server-1.6.0_Fix_crash_on_agent_launcher_exit.patch
deleted file mode 100644
index 49228ef8b8f0..000000000000
--- a/app-office/akonadi-server/files/akonadi-server-1.6.0_Fix_crash_on_agent_launcher_exit.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-commit c8e45b10c32679bf070af5b7ad9a22b91eb9a02c
-Author: Sergio Martins <iamsergio@gmail.com>
-Date:   Mon Sep 12 13:48:33 2011 +0100
-
-    Fix crash on agent_launcher exit.
-    
-    Don't unload plugins here. They will be unloaded on application exit,
-    so it's redundant.
-    
-    Seems they are being unloaded too early, before QThreadStorage
-    cleanup occurs:
-    
-    ==18802== Invalid read of size 8
-    ==18802==    at 0x53178AE: QThreadStorage<QFontCache*>::deleteData(void*) (in
-    /data/installation/qt/qt-4.7/lib/libQtGui.so.4.7.1)
-    ==18802==    by 0x5E8F8CF: QThreadStorageData::set(void*)
-    (qthreadstorage.cpp:165)
-    ==18802==    by 0x5317940: void
-    qThreadStorage_setLocalData<QFontCache>(QThreadStorageData&, QFontCache**)
-    (qthreadstorage.h:92)
-    ==18802==    by 0x53165BA:
-    QThreadStorage<QFontCache*>::setLocalData(QFontCache*) (qthreadstorage.h:148)
-    ==18802==    by 0x531407A: QFontCache::cleanup() (qfont.cpp:2632)
-    ==18802==    by 0x5406536: QFont::cleanup() (qfont_x11.cpp:182)
-    ==18802==    by 0x5104E35: qt_cleanup() (qapplication_x11.cpp:2647)
-    ==18802==    by 0x50603B2: QApplication::~QApplication()
-    (qapplication.cpp:1172)
-    ==18802==    by 0x41B1F6: main (agentlauncher.cpp:28)
-    ==18802==  Address 0x11a090b0 is not stack'd, malloc'd or (recently) free'd
-    
-    CCBUG: 261788
-
-diff --git a/agentserver/agentpluginloader.cpp b/agentserver/agentpluginloader.cpp
-index 2d62d3b..456a124 100644
---- a/agentserver/agentpluginloader.cpp
-+++ b/agentserver/agentpluginloader.cpp
-@@ -25,13 +25,8 @@ using namespace Akonadi;
- 
- AgentPluginLoader::~AgentPluginLoader()
- {
--  QHash<QString, QPluginLoader*>::iterator it = m_pluginLoaders.begin();
--  while ( it != m_pluginLoaders.end() ) {
--    it.value()->unload();
--    ++it;
--  }
--
-   qDeleteAll( m_pluginLoaders );
-+  m_pluginLoaders.clear();
- }
- 
- QPluginLoader *AgentPluginLoader::load( const QString &pluginName )
-diff --git a/agentserver/agentpluginloader.h b/agentserver/agentpluginloader.h
-index 77f5de9..c8c815f 100644
---- a/agentserver/agentpluginloader.h
-+++ b/agentserver/agentpluginloader.h
-@@ -26,7 +26,7 @@ class AgentPluginLoader
- {
-   public:
-     /**
--      Unloads and deletes all instantiated QPluginLoaders.
-+      Deletes all instantiated QPluginLoaders.
-      */
-     ~AgentPluginLoader();
- 
diff --git a/app-office/akonadi-server/metadata.xml b/app-office/akonadi-server/metadata.xml
index f580a202f05f..8d1e86a9cefb 100644
--- a/app-office/akonadi-server/metadata.xml
+++ b/app-office/akonadi-server/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>kde</herd>
-<use>
-	<flag name="server">Use locally installed database server.</flag>
-</use>
 </pkgmetadata>