Version bump, bug 441952

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0xB1E955DB

3 files changed, 117 insertions, 15 deletions

diff --git a/app-office/akonadi-server/ChangeLog b/app-office/akonadi-server/ChangeLog
index 0aac21cdc538..9a8026c7652c 100644
--- a/app-office/akonadi-server/ChangeLog
+++ b/app-office/akonadi-server/ChangeLog
@@ -1,6 +1,12 @@
 # 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.90 2012/08/13 15:56:03 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/akonadi-server/ChangeLog,v 1.91 2012/11/06 02:17:21 reavertm Exp $
+
+*akonadi-server-1.8.1 (06 Nov 2012)
+
+  06 Nov 2012; Maciej Mrozowski <reavertm@gentoo.org>
+  +akonadi-server-1.8.1.ebuild:
+  Version bump, bug 441952
 
   13 Aug 2012; Tomáš Chvátal <scarabeus@gentoo.org>
   -akonadi-server-1.7.2.ebuild, akonadi-server-1.8.0.ebuild:
diff --git a/app-office/akonadi-server/Manifest b/app-office/akonadi-server/Manifest
index 57715633fead..23c57d01d863 100644
--- a/app-office/akonadi-server/Manifest
+++ b/app-office/akonadi-server/Manifest
@@ -2,23 +2,15 @@
 Hash: SHA256
 
 DIST akonadi-1.8.0.tar.bz2 213413 SHA256 1644040ccc62c39325127cd32d19e846f62ffb1efa90b8d5e6a137a2545fa66d SHA512 9f995d90d84c8fa7bf51691b4bdabda69e64578dc7a2f0ee0b20979ef3da9e2128625c34b4ce84e5feb79c61615df7299905b2eeded9abcbe8deb22817e1821e WHIRLPOOL 492d184fa20a09e1f68438da8519e176731b1c2d66e01b8a2dfc940da24f167ae33bd00a51900444a18a6203a2165e4e70ef4a1c2db34ac4cc0660744f7a9230
+DIST akonadi-1.8.1.tar.bz2 213787 SHA256 2b33812801ede762bb9c60d7ab9b0cd98d5552b0c58e28f215ffdc941b48c347 SHA512 8b33d9b2ee845e6ab8e01879f36b5a33c3ef1901490718859646f5b8a7ceffd6def1e788a218741023408991fef4c6cbb4769f125927801951515171ddbc6a7c WHIRLPOOL f20493ff6f1e3ae024dc47dfe7cb8f386fb4ce812cd30bd8132e09b75dc09fc884f41b9545ec46f6828b4582b7ee84f64c9586763eb5f221d3eb02da9e5e86f4
 EBUILD akonadi-server-1.8.0.ebuild 2641 SHA256 eea2b07c2c2658b301e108482f6887a197db3f10294b383f53a6bc58262c2b82 SHA512 bf05a069c8a15cb49f607d37c63a340a3ea4bd28441caf531934d73642025efae95a465d1b1fbc13c94275be02b2108efb33647fdcf53219d31374cb461787e8 WHIRLPOOL adc01309b9dcf3bc9cdbc98204ee199b6663d27a5d56cb37337ccbe18cc31ab4e6242d0fafbf0b6a9a5db845b6f07c6e8ebecd41765fd09dc4a935e16b150889
-MISC ChangeLog 13328 SHA256 9f0beccc38158d528b1fe87445b8362c8bbd8088d6be0153c487ac69284413bf SHA512 a5c27f86707f1701f8ad51483463e2e05f034aabfbaaaf2ced1263e22921b496bb390e257670840f5cfaf36e5fd40f45ebfd26981c4606677fc7c812cee3c4d7 WHIRLPOOL 7289924e7133f9fdbcd190d32b6e5714c3131dfd02e8a2a2d9432a2d7e1f085b3dfac8a747b31aed4696b11a7eb544cdf060bd8dbe8b66de921b6b21f3b9240d
+EBUILD akonadi-server-1.8.1.ebuild 2644 SHA256 d35b99e64df66c3d628b0675a1616cc7ea5d965368a91abed479280d564b2822 SHA512 c101c32122eb2acaca124b799dbd1b4b54949738ecb6b7e13afceb47fbf20d08008a6ed0fd3bf21f160e5ef5598eab296b2af9898342184f54df8337fc4294db WHIRLPOOL bc7ed8c0023016e949db89e307f63ed5982dc1fe9edf8aead13aa9d659d0d3153e7eedd9809264fd66f964f0a0a87b605084334672de31af6e5f7d902b3bea2e
+MISC ChangeLog 13478 SHA256 3b1946cd25740a0ffea419499ba3d267907c79b92ad0f66f744c6d3f64b8649a SHA512 bc730285d7b2aa214bbee152f19357b321500945bc9b917f0b28be4b5afe684067401a14a68129aa0a44766aba4f51c94a1e07116c8f195253f57033e48b7e1b WHIRLPOOL b8a79053c0ee06b9bc6509f5f513442012e2c085f7ad4e5ef5c9d1e16507621f34c3b366964be9ca1ba05dedff7c474b09ec4c42650299796d9ee8267fea8fa6
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQKSOZAAoJEOSiRoyO7jvoR1UQAK4CIM3zny0BcFuARPEWUhGK
-R6PXCcQKtpL7Od8ygARdg0YMAr+ypiznRczBygHu2qzb+8B29kCxc90o0dCvdsUh
-b8jj2FpcKz72opjchcEzUpovEKKqHl5NV8BpkC/wI26X6Z8EIQC2EA/jEaMKnb/x
-SGkEaTEsFD51PJu7FY9ACiTyljZCOs6fuBLPdQ4Bu0z16yKzoAYJ/8+zhN33ysYK
-Plwlaf9GHRAwJGLygx3c1kYRcY7OfeUwZkBCovTnQ2OJfIQ3y1T1nLKjhV+U1J+A
-0iWkNQDbAkejmf3nXK86XZN5gzEZrOgJBaH+mD+zI1s4vhg38NtPDc1KlbPFccQD
-GvISY23wETjwS+2gscHpF0TvVKRoBH8iQmyEQOfrS4P4JpKKoNz5/B/RcObXvk+c
-vGzGPopFUDlJlV5QFH6AseNaIPlly6clrM9wU/MbC4S7O06913FlLJzgR9EHFac1
-9DsrnzCiEMLFBcQm5fDsIrwdLbgeWnL11yv5QoElPW9yTEkv21qxuhXqq+LKyYUw
-vxy3FgCRYtqOlMPE37dieVdEDzACfzhY2CDS+NHTOHopr+JaJUDEdA9Q0npptWxl
-h8HLREeQyifaNOOYLGR//k7r7AF+yJgmpufvEz/Qzv4aDbgoKyWndwOjZq1cvZpV
-ENL7kexMMjsh1x3AnnQS
-=+DYN
+iEYEAREIAAYFAlCYczEACgkQFuHa/bHpVduQDgCghjzcGc1inc2sfsIaFTnmIkYM
+7J4AoI+PDI5DuTaNcCYWtnZU604f7A+H
+=RVxS
 -----END PGP SIGNATURE-----
diff --git a/app-office/akonadi-server/akonadi-server-1.8.1.ebuild b/app-office/akonadi-server/akonadi-server-1.8.1.ebuild
new file mode 100644
index 000000000000..52ae50b77374
--- /dev/null
+++ b/app-office/akonadi-server/akonadi-server-1.8.1.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.8.1.ebuild,v 1.1 2012/11/06 02:17:21 reavertm 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}"
+}