Re-add because it is in the stabilization list

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

3 files changed, 124 insertions, 2 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index acb40334bf2b..eb33c26f5365 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,10 @@
 # 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.52 2011/05/07 10:19:30 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.53 2011/05/08 20:54:59 dilfridge Exp $
+
+  08 May 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +akonadi-server-1.5.2.ebuild:
+  Re-add because it is in the stabilization list
 
 *akonadi-server-1.5.3 (07 May 2011)
 
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index bf9962ae8c95..aeb79a686cca 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 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.5.3.tar.bz2 209082 RMD160 be3213f03dff13bdfeb16f78398a405af0b269ac SHA1 37764e0e5bc4769ce691e32a771966278e6c1084 SHA256 0c2a903f5c4de0c077e776de1fabf00e6c8acbebb7ea76442397fd8c4a684e8c
 EBUILD akonadi-server-1.3.1.ebuild 2150 RMD160 dc2be0043c0c6ed61cc0f336ca48176a5e6d4bf9 SHA1 64cb63a490ab8309d5101fdc3771a44ff29c4c27 SHA256 6b02302e1b7ab386950a600d5454bf12f79ce7f8e52c778e638a7040a296878f
+EBUILD akonadi-server-1.5.2.ebuild 2600 RMD160 7d51f045b165f69f80bc5774de7546fd3ea6cf64 SHA1 0b2636c2193a53f5c9e18de948da846339e00b64 SHA256 d55656f1e7f47fe7aaba06d3d62f99768e778fbe129e463139a82d600176544f
 EBUILD akonadi-server-1.5.3.ebuild 2600 RMD160 e12709b79c36ac0cec9ce06b95d95f93172756d2 SHA1 b0ab56df66ee098a8df546770fbc2c1567064d0c SHA256 fb0062433afc364bf0e9ec050c4cf84fa72de5da9bbf0e4415e30ddea5cad240
-MISC ChangeLog 7911 RMD160 b3b2d3d31fb2ec0ec8af63f343a415307298b2eb SHA1 5c00899e0222665b8e0e082d69b706824f510c4d SHA256 478ed6d9e10f25c4995e8e96b30b78c8f7dde973f1ce3f43fdf8fca7e3480028
+MISC ChangeLog 8050 RMD160 d5c1ae7eb1b36544354cac5c3c179c85105739e2 SHA1 d071d455dc627ec68bf3726ed0c188bd803d907d SHA256 c68750c7e82f98a2a2d1d247f65873a6f0dda088f14a4d1cf8c1654249aa9f26
 MISC metadata.xml 236 RMD160 c5cc6cb9745f9f6e3c7358482117892cbc866eb2 SHA1 d1bd263bd36cfc701e7ae12fb77e24d3f6556a88 SHA256 3bf214b7d5dabbbd8f2d607f6166647d91c5d0b7f166a4d5615da31995da06b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJNxwgTAAoJENwGBM22xffeTwQP+wa3xctZxxGJBLCyjWLv2WaM
+xD95aCZaG0XoIZCpLCWFJDbwzqMDbGmUyGuDz/+udX8Ca+oTUos7rU9tZklvDrHQ
+gNzEKNnCUhearZb9C5kmZrcTwMF2eKRKz3j5f8LM3PDpUKR1KMKXkeSC1gX5uHsv
+u2dOIkSdzUnG0IMF/KwBqNFOU1xUnWBhEE4SnbWEZ7pkjk62khilUFcZ8quOlqRv
+hz763CCJ3LOktcnMu7rlerpb/aHdXCrNV1M1+MneQAx2VYF6mxyhEs+7/o+MTZzy
+RQjwcgz/Mx3AQ9Dwr2W0/8UlBOvy6Vm1I06dRoMy8oB8pBYMc735fSiLcPUibZVP
+yDNYmJ6nb2ntNiP8Jr85fLK3suyCTcHFil93whIMVSPzlNPlbQj8LTCq0F6OU1+M
+KS9AjXplt6ZnSNfjmgF4pwGNHprXuGaUbgpwhKldBkA/LXrfGySAHKFoycZx2mqY
+kB0F/ituHMe0jFIBTZO43Hex9oahzc0dr7fiRoxwkkR3nuv8bde1p68pPfb3mGL5
+fLgYe3X2sCtGk8sOa1vxRsLSh8e1FOPINb/e/LDhZEl9NiZXgjPOUY3tzV72TVy7
+fzAlE/lfWEZeUFhfGptk+MnbajvBFkRI1XZZuGb88ZRuxO4H5LQ6b1NUYz8A8ftu
+srcdq7cA5GQpIm67iKnN
+=Qz1C
+-----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.5.2.ebuild b/app-office/akonadi-server/akonadi-server-1.5.2.ebuild
new file mode 100644
index 000000000000..831a96a5744e
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.5.2.ebuild
@@ -0,0 +1,96 @@
+# 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.ebuild,v 1.3 2011/05/08 20:54:59 dilfridge Exp $
+
+EAPI=4
+
+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 ~hppa ~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
+	if use sqlite; then
+		DRIVER="QSQLITE3"
+		AVAILABLE+=" ${driver}"
+	elif use mysql; then
+		DRIVER="QMYSQL"
+		AVAILABLE+=" ${driver}"
+	elif use postgres; then
+		DRIVER="QPSQL"
+		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 || die "doins failed"
+
+	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}"
+}