Version bump.

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

3 files changed, 120 insertions, 9 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index d1ff6cde553b..e9aac8a8ffba 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/akonadi-server
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.82 2012/03/28 06:34:12 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.83 2012/04/06 23:20:35 johu Exp $
+
+*akonadi-server-1.7.2 (06 Apr 2012)
+
+  06 Apr 2012; Johannes Huber <johu@gentoo.org> +akonadi-server-1.7.2.ebuild:
+  Version bump.
 
   28 Mar 2012; Johannes Huber <johu@gentoo.org> -akonadi-server-1.6.2-r1.ebuild,
   -akonadi-server-1.7.0.ebuild:
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index 9e03fea7ad1d..101e32a0c745 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA512
 
 DIST akonadi-1.7.1.tar.bz2 210853 RMD160 39ddd2e37437ea5bbc912f5994684a1413bad06e SHA1 a6057bd1a1740568ed86ee9dfaf325e3c3f77662 SHA256 6e6042257df8f212d63a06423e6d391bbf26259d985613e88759b62c993ee8ac
+DIST akonadi-1.7.2.tar.bz2 210944 RMD160 f6c0b4173fd7ea4b60a9e311984e35ce638e8ec7 SHA1 6aef88b46f8f7ce2dbdfb3641bce2d0bb733f181 SHA256 4b7217a847c6859a529f07bf456127dab4aac69694982ca449a80da510832b1f
 EBUILD akonadi-server-1.7.1.ebuild 2638 RMD160 9edd77d84f91c6e7bf56316b72c72c5aa9f8c6d0 SHA1 bece6bdeb167a9cecc49c1e714f576586800e9c9 SHA256 1c70a6d5cbf237862014511e1e81376740a82452af422f8b97a6174a479464ee
-MISC ChangeLog 12320 RMD160 03aee24900222ad20d07762d164853685c74aa30 SHA1 e268397a9f1e6040bbad95ee8850431036ec445f SHA256 f27d5a04fdfd4ddcf6eb20c84f3852884d358df2a4bd00c2215383250cec48d4
+EBUILD akonadi-server-1.7.2.ebuild 2640 RMD160 eff0ad0bc0ad7c91f513821a508d5c2d93c14b1e SHA1 476181b4416b7460b38cd9bd7749d3dc3ccfcfde SHA256 71385f32a80ef6a9a51bdf15f3bcc8a2dd8c1e48f765ff18f4c792fe9232d8ff
+MISC ChangeLog 12452 RMD160 15c1c4f05059ce30be9082253c4772d61d2d13ce SHA1 2d0bd34aa00987a6535cbcc200231f72d69a79fe SHA256 cec5ef7424efb184f05c5abc6acc751493d3131187ebf0d4b89946512a405456
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPcrD2AAoJEO+t9ga+3I3aFfUH/2D59KKKRLXTWzU6npVwd33q
-9EJnoFk5d8xte8lBju/5IgVydsnLpByZQdDPtx86jd8T7nQhmLzKsoaDnlZx0l/O
-D+7P98w2l5mFKbf9fYGjXYi32WWTyQy+z6qBT4KU1lGAGo5Qi7U3DUbjBM1r66po
-r0Eo2DOcuviXJLLzRCofq7rVqyjQyfJzkajI5iWGFYSoeJGu3UyOH+gL+nVOF7PL
-Sdg+bGdpy2pa6qT5jj4WyfpNqo61+iLlMsHqWNq7EzA1O4hkp4bhSK0YyFANtojo
-/BCG5FbFfoAlcZeNMFNO/serHW59YMWKYpxhAecozFES4JHY+EVhlvB2B5bIhL8=
-=tNj/
+iQEcBAEBCgAGBQJPf3psAAoJEO+t9ga+3I3aVqEIANJyFJpOtSrs8djxV7I3BWR8
+9FVO4hG0fKRaPyVxX+sf4Wl/NSTO1QqdpLL2IqtaWv148lSvatO3dIhIdbiYWvYU
+PgdHEmG10RV5nkB7EPxcQ5Ap1Dyn5jJ2ljEwC4FDLGvRZzuJDdyXnio4JeWNKySz
+8JnAIFbzkQgloib+FRwxRlcM8AcPdDYFzkTG2MLfyFvuksMU03ac03zojALuGY7d
+wrOx8AeesuMqC5079aAQHE59jQ1+s2bkwlBxXVO89UIE+paG6UzGP8ads4KmyAMi
+QoHqrRo4XuIGmfRsJY8cwceU9oIbb1vR7l4qVdQzbNpyM++8k1QcYktLUeyDxHg=
+=S9L0
 -----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.7.2.ebuild b/app-office/akonadi-server/akonadi-server-1.7.2.ebuild
new file mode 100644
index 000000000000..0d845fcdea64
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.7.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2012 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.7.2.ebuild,v 1.1 2012/04/06 23:20:35 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/}
+
+RESTRICT=test
+# bug 401139
+
+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 AKONADI_BUILD_QSQLITE)
+	)
+
+	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}"
+}