gentoo resync : 10.11.2017

2 files changed, 15 insertions, 12 deletions

diff --git a/kde-apps/kmail/Manifest b/kde-apps/kmail/Manifest
index 7da14d8b8466..a14bc8b3c41c 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,9 +1,9 @@
 AUX kmail-4.4.2017.04-gcc6.patch 1431 SHA256 774f68728aa0f2362941c0314f62cda3f9039f4d155fa1beddbbe5a7ed7e409e SHA512 f7f8424dc824a11993c3ff33c9cc1649ffecd975a097c130bf367223c63f695bae548779760a7ce484e03b0b0adabdc0ebb084f3cea0c50091e7592dce9fe25f WHIRLPOOL 194a806c20ea56e3b52949bf8618b0a83e9efe8ec909e058dce58362f7bc4f3ae2cc341e106d68d8f67cf39fac0b205dcf74b339de0969b709a4970de90ad067
 DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
 DIST kmail-17.04.3.tar.xz 4374744 SHA256 ab5bf6a5ca881b2286a5eee48d2a496cda7d82752d811c078510a286e6dc8356 SHA512 73e88d622cd68c27b087ed388109020dee1364acf702230a2e1e40ceb185afeede2dc7ab1c28338ab3b88a8046836ab66f278932e14cef09472fd7472fb5fa9f WHIRLPOOL 35064cb09a7b4475df9606df3a3590581096656997be5c83c3593ef631656e3474d8551b6b58073cdf526dbbb121b94f0ab7bac528edde7731d6ec9125c97a28
-DIST kmail-17.08.2.tar.xz 4735516 SHA256 a960fc8d8e30c633e1b87ad1eabf306f02e478b485da951f7186aaee90f6bd3b SHA512 f912f518a1f5d4de3d46470638231d0c542af75eb28be50ee7a7eb7d1fad90a7c538d9227b46b8165a74af0eec47526ca9718f530238a813edd97c042909f3d4 WHIRLPOOL f7e7155bcd33afc302bed05c65ce8bb40181ecab693292f6cf32839f8ed08491e9b485ed611a3247117e2b7f5bda451151a280a8e1833fa5574bdd987192d5c1
+DIST kmail-17.08.3.tar.xz 4735776 SHA256 ace11536c9f206fe1f6fed1ffe4227b8cc90d843dcbbaa8382e04c4b15c077c5 SHA512 6b3579469ffc106bf22b22d541373ce2cb5f1fcadf4158c660c22d38d6bab5983eabba38c87c26a61951860b00d02c99daa546a599317db71b16d7e4718e3ed7 WHIRLPOOL 0fd3d26bc87f2f2505dd7b3a24b6f52080d3e5cf7f2a89fff6f57b163c5775a51a843cd49c1e7410743555e08203abf6f09004bc5117400067a8610ecc2f3513
 EBUILD kmail-17.04.3.ebuild 2928 SHA256 09d8a421c6bb8c8f0e0b182cb2b599f20bf6f03664bbd3248f86d3f8efe0b5a2 SHA512 cc8cfecc085bccabbc2283421418cf1f26276d632b36a697ff484e65fb07117be3c24af1f6a3d389e58ac665c7d808ba4d793665b7853d0d426b535f66ff8434 WHIRLPOOL 1cc42ee86b4c0b950966a147becbdc2936a8e935d1436e52befd8a28c6030ec7d4451f3b36ada12291186b77fd0afbdb31e1204dc1d5ff398026432eafd079e4
-EBUILD kmail-17.08.2.ebuild 2911 SHA256 e308875d8d10ebb0ad07dce629fafefc6c114981c97e8082f78e36a689f5a93b SHA512 67b01060a6ff381c7bfae036af6b048efa51f1975311bed9044dadd258355b40c9a34f00b8355e027ddb5ee7613eab4a60222b0db6811a9e49d27e24599cac04 WHIRLPOOL ab715b1bed03ddbcb4e1d5ad483d79df42e2cf0f2726dcb16c9b9f5db281c479871bd3afdbe929dd2dfe067070255400b8eb87ba3de2f13c8bc44f56e7734d27
+EBUILD kmail-17.08.3.ebuild 3162 SHA256 3dfd50a29b8730bedf12cbd008e271be96186ca41317c85adba1d2c859dcf64a SHA512 322e14a81197e1a79635df298c279e92c9e0b4462db4c37c50820958e82dbd2bc2bdf4228b651a57c552c2baa3724e4b5cf0a23abf179c36edb1a28db707635a WHIRLPOOL 7945f514705baf1f246277796b124e81cdc3eb9f5528ca7f40d788a9f6c0a28819319c80533f71a7ce86f512a53594d246570fede19d487016988040000d3beb
 EBUILD kmail-4.4.2017.04.ebuild 1459 SHA256 41a24e4e39ab8911cd8ee37cf791bd66c7e913c7c97ffe8419d42c642ddd8298 SHA512 6aa97cad41a9412c20db0b682d3a3b8626d1ef79b5e11908aa4bfe583675474899051b0bd12b667f1677b6d236bfd1c74c9a74b204e6de723f1ddab4da98ccd9 WHIRLPOOL 53336b736137b0a7f6f2c4fe83f6916822a2745f6229fd086063d8485641b72a493b49f96f329ef7dfac362173f099feab871f3c016a136adc0f170b40050a77
 MISC ChangeLog 7331 SHA256 22fc6b3b6e19755f280ccc86a187a52e0ab155a5744a9ecbe0ca66ddfcbe5b88 SHA512 29f89ee117d2e11efccd2ffa418e2bd894ba4a33469cf7ca7ad820e2eae42fa215cd869b9c5d193a3f45bef3330fb3da04bafb732d15e8eed96a1ef8296a0990 WHIRLPOOL 3e85bfea250357882b0cfbcecbfacef348abce312d44466b2873eed7d70d93d0fcad0ad7905e6bdaf0a7ccc34e76371193f9a7f3e7bd104625f0471b5cb10a5d
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/kde-apps/kmail/kmail-17.08.2.ebuild b/kde-apps/kmail/kmail-17.08.3.ebuild
index a99434dbf5cc..668d37b9c8e8 100644
--- a/kde-apps/kmail/kmail-17.08.2.ebuild
+++ b/kde-apps/kmail/kmail-17.08.3.ebuild
@@ -93,15 +93,18 @@ src_prepare() {
 pkg_postinst() {
 	kde5_pkg_postinst
 
-	if ! has_version "kde-apps/kdepim-addons:${SLOT}" ; then
-		echo
-		elog "Install kde-apps/kdepim-addons:${SLOT} for fancy e-mail headers and various useful plugins."
-		echo
-	fi
+	pkg_is_installed() {
+		echo "${1} ($(has_version ${1} || echo "not ")installed)"
+	}
 
-	if ! has_version "kde-apps/kleopatra:${SLOT}" ; then
-		echo
-		elog "Install kde-apps/kleopatra:${SLOT} to get a crypto config and certificate details GUI."
-		echo
-	fi
+	elog "KMail supports the following runtime dependencies:"
+	elog "  Virus detection:"
+	elog "    $(pkg_is_installed app-antivirus/clamav)"
+	elog "  Spam filtering:"
+	elog "    $(pkg_is_installed mail-filter/bogofilter)"
+	elog "    $(pkg_is_installed mail-filter/spamassassin)"
+	elog "  Fancy e-mail headers and various useful plugins:"
+	elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
+	elog "  Crypto config and certificate details GUI:"
+	elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
 }