gentoo resync : 12.10.2017

2 files changed, 112 insertions, 2 deletions

diff --git a/kde-apps/akonadi/Manifest b/kde-apps/akonadi/Manifest
index ba53beed4103..8f7e9d6507d1 100644
--- a/kde-apps/akonadi/Manifest
+++ b/kde-apps/akonadi/Manifest
@@ -3,9 +3,9 @@ AUX akonadi-1.13.1-mysql.conf.patch 1554 SHA256 4890d4350af6c593a16bf70ac82740c0
 AUX akonadi-17.03.80-mysql56-crash.patch 2064 SHA256 453087eda54e76bbad01609dc79dd50b4c2fd052bf4bf84df01c1236905f2d40 SHA512 35e89ac8fa7640354a0a0f50abff06ec34075722e4e8f3b6297da7384a3deef62f7826c1a7a08aef72329ab0b6ef3b20b1bbec231674e20733fa15fd388195f7 WHIRLPOOL c49d0626538f71ead3fe3099056a0c9e37ebda2119e3a96d064fe14712847355d151326f8b3c3fad5049f171ae6b69e4bf217a740ab9ee5042a09d27633f38d7
 DIST akonadi-1.13.1_pre20160203.tar.gz 384556 SHA256 4243b32e529be6aadc38dc4463cb6e7cede9442c05cfc04ba679dde28f37aa96 SHA512 0ef8213f504ad1e500a2c1ce19a7575cd1fd8b7ffc7e5fb0bd2437639d8c458c47bbfea7734fcd3e200136a661331dde32af0b064f0b25d324138ce6e35d15f3 WHIRLPOOL 69eff1889a19f8d5714d7e71a106871172cd25c651ea30046ab81270cf7e46c7a1983cf20fd8d5fd8ad243d70e881be705d57b0b93b54248d086e7b253a4873a
 DIST akonadi-17.04.3.tar.xz 1302964 SHA256 89e0476892a9b43ae0686e059f6caa0e2bba47955920e3424f5315b1cba7ad31 SHA512 1e7380bdadb9d73b20fcbe1a5b5a44246c273da8aca92bf12a9dcc2b0c69c58f2f107a7a42af81c25c0697305ad4e401252a492e7bdd47285a9d523f4b3b0090 WHIRLPOOL 8a9d52b368f7f852c08271ccb98af2000b1863923cc500915acd0d62b8ea0636e6d9aa1bcaec79150b00b4b501d96cdb447f988c7dd374da05446c43ceff2559
-DIST akonadi-17.08.1.tar.xz 1427180 SHA256 dcdc0b6069df48f3cc8e0a9e008e042c7173b2ed340103b7820bc517ef8312da SHA512 46e014377a908c7bde849fa55f1ba4990657e7011455423772236719cc86705f0d51420818e9cdbe2dffd49ad9c5b7aca9153416ce9ee7b4af3f9309741c1e4e WHIRLPOOL a4ba83daa71973ece8604c4fedb4f44ba1163641f2876313c05912de6b5cd5f764320c24a26e2f56bd053689eb1bd1ffcb9c31498cddf294f51a3347973506f8
+DIST akonadi-17.08.2.tar.xz 1427700 SHA256 85509bfb47f29e05b7985d72be633b7dab38dbaf49a3aab1eee6b9b88762a9b1 SHA512 892e3616fc0b83ec50b6dada6aa0345eb8c09324e941933f059a20d1f5ba9bc30f90a90798933cb7df3e711bd98a28b21b8f882a136ff7d60cccd4bc552e3846 WHIRLPOOL 2c697a6f0e7dc0267abab63851fcff62930fd3f869b0903ae01d5755ff69f6464aa9ae66e2f8069f5afca1b9681a581bf9f13861ace01f5d54caf61f90b214c6
 EBUILD akonadi-1.13.1_pre20160203-r1.ebuild 3145 SHA256 953bfa84348c50039dd6cb6761e2050c05cd96b35d90a9a6b3cc6cb57dd5adde SHA512 3ed71f6027512abddf44ac8abcbee8e32204a210146c04786d9c30754d45943766d4c2ab326dbaa6c7f65e2375b1e986e86dd9a26756c25b1a3f8601d9d44e76 WHIRLPOOL 9d5e3bd3356e513bbed106dcf2033096a4ca69d04e6e721acbb3461c139bfbea3bdb7cc9c4a444475f8631fe55d80b414e991a196c4cae45d14dead8f9123f59
 EBUILD akonadi-17.04.3-r1.ebuild 2959 SHA256 7dae37f6233751bc64798ab531934947d765cdb0c250b9be85eabc2f94682960 SHA512 a156ca7a0e586b508de581ae2c3b25acde99c572326834408c8f7f5e9562720da155e3166263c869357f6ebad157cece97a1ff64d9cce1cafd95a982e5cf2b2f WHIRLPOOL 757545a09c159c7ec3e48ae2e35570f90484b01cad1a4ccf8a06dda42769b926d8a4993c723dbd71f8841a6ff29c61ef408016832f5310070180730a737dd2a9
-EBUILD akonadi-17.08.1-r1.ebuild 2975 SHA256 988661ce0661022e369f919a9f184fc00417f1c50c34755d310a7bc4f7dfce94 SHA512 9986744a8bcc261a5c2419e2aaf3f99aa6076b4782a6a8a6b6e3689cc197e7b54c814dc0c5dbfa5cf6303c2fd741826efe498c03ffdffdf615e8f3b1768a78ec WHIRLPOOL 54ab5714d9226eddf33d5421948695d5053d6820baa21bc95448d520e5042310ad2fa3a8af4663ec9d4b12bbbe9ec2023595169e2d2aaad8595d8e1c42c5084e
+EBUILD akonadi-17.08.2.ebuild 2956 SHA256 52e86194880f22e9a68809319cbb2d76f6611688de23aae9b9f35073ddfab0b9 SHA512 c33db647ce08a1ea02c00d390aa877d4ddd5b5beb146c650955adf0e5a8b5e62541de316d3b6060a8ff69a729aa38124bb26e1f4f19746822b39e44c8c0e4507 WHIRLPOOL 717690df27611432f8ad9f8e812e9af4754fa00245ec8b5389937fbb5871ce87cda9280ce5e172479d7ac92fe3419ccbb2ea13912514a5c04e89b3efda39aeef
 MISC ChangeLog 1969 SHA256 0665b8d166f2de4d48fa38c5c91132a3f3a97fa78d0b073ff05ed3618409cd30 SHA512 90eb0910ad93c7e83449c905f0a0aa8df09160566983e33573e5e11e6c07fc36428f8c03af7ec5710787c8c5f0ff2cb958ed4b0b120e183b1866b5cf5c0402c8 WHIRLPOOL f2ea1244463c80ed6d4a0ebc57044e54437fa6121130cf52709a849c9760f3f208a81d1d936fe001a6f1621df990debe11fe5eb6ae57fdadc601cde93494beab
 MISC metadata.xml 410 SHA256 2ba0d449c1ac22d2e4bbdc59e83241960165df420004d9cb6014db1496544717 SHA512 28d1be9310a2e9b91f2b93089bd2588da14b0aded9a057f9885782153df3222cd62c885d03374dd59216e408c1e0717074c03445e38b3dfdc7b3ed0b3dd739fa WHIRLPOOL d66537a577a72e90365c45b70d414cbd62b1446bb52264848ca3988cdbca4c4a466b5a8364235b6a9d3d018edca08c96baabde1618067e3531a08390cd15e136
diff --git a/kde-apps/akonadi/akonadi-17.08.2.ebuild b/kde-apps/akonadi/akonadi-17.08.2.ebuild
new file mode 100644
index 000000000000..570fcee42d36
--- /dev/null
+++ b/kde-apps/akonadi/akonadi-17.08.2.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_DESIGNERPLUGIN="true"
+KDE_TEST="forceoptional"
+VIRTUALDBUS_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Storage service for PIM data and libraries for PIM apps"
+HOMEPAGE="https://community.kde.org/KDE_PIM/akonadi"
+
+KEYWORDS="~amd64 ~arm ~x86"
+LICENSE="LGPL-2.1+"
+IUSE="+mysql postgres sqlite tools xml"
+
+REQUIRED_USE="|| ( mysql postgres sqlite ) test? ( tools )"
+
+# drop qtgui subslot operator when QT_MINIMAL >= 5.9.0
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui '' '' '5=')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsql 'mysql?,postgres?' 5.7.1-r1)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	x11-misc/shared-mime-info
+	sqlite? ( dev-db/sqlite:3 )
+	xml? ( dev-libs/libxml2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	dev-libs/libxslt
+	test? ( sys-apps/dbus )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepimlibs
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )
+"
+
+# some akonadi tests time out, that probably needs more work as it's ~700 tests
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-17.03.80-mysql56-crash.patch" )
+
+pkg_setup() {
+	# Set default storage backend in order: MySQL, PostgreSQL, SQLite
+	# reverse driver check to keep the order
+	use sqlite && DRIVER="QSQLITE3"
+	use postgres && DRIVER="QPSQL"
+	use mysql && DRIVER="QMYSQL"
+
+	if use sqlite || has_version "<${CATEGORY}/${P}[sqlite]"; then
+		ewarn "We strongly recommend you change your Akonadi database backend to either MySQL"
+		ewarn "or PostgreSQL in your user configuration."
+		ewarn "In particular, kde-apps/kmail does not work properly with the sqlite backend."
+	fi
+
+	kde5_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DAKONADI_BUILD_QSQLITE=$(usex sqlite)
+		-DBUILD_TOOLS=$(usex tools)
+		$(cmake-utils_use_find_package xml LibXml2)
+	)
+
+	kde5_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
+
+	kde5_src_install
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "You can select the storage backend in ~/.config/akonadi/akonadiserverrc."
+	elog "Available drivers are:"
+	use mysql && elog "  QMYSQL"
+	use postgres && elog "  QPSQL"
+	use sqlite && elog "  QSQLITE3"
+	elog "${DRIVER} has been set as your default akonadi storage backend."
+}