Add more useful suggestions in pkg_postinst() (bug #504926 by Jaakko Perttilä).

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

3 files changed, 25 insertions, 12 deletions

diff --git a/net-analyzer/fail2ban/ChangeLog b/net-analyzer/fail2ban/ChangeLog
index 991379e4c600..628b6465f380 100644
--- a/net-analyzer/fail2ban/ChangeLog
+++ b/net-analyzer/fail2ban/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/fail2ban
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.130 2014/03/17 00:43:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/ChangeLog,v 1.131 2014/03/18 16:51:01 jer Exp $
+
+  18 Mar 2014; Jeroen Roovers <jer@gentoo.org> fail2ban-0.9.0-r1.ebuild:
+  Add more useful suggestions in pkg_postinst() (bug #504926 by Jaakko
+  Perttilä).
 
 *fail2ban-0.9.0-r1 (17 Mar 2014)
 
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index ea87a629f473..fb1d90f09265 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -7,13 +7,13 @@ DIST fail2ban-0.8.12.tar.gz 221688 SHA256 d03db61265b7ca6e74f087953e8b0b81f26086
 DIST fail2ban-0.9.0.tar.gz 274108 SHA256 981d2461a75d818934e2dcacf618ad9460ac4a6c05956f845f4d51c4d88000e0 SHA512 92b031a904cd3ed9fe88a60c5cfbe7b0cfc614055f6fbcc6953a9dfa560cdd38f3e8e9664bbb38622fdb62450d69c0f4343c7204f7bfd13aea2eb59646be232d WHIRLPOOL 772c16bd949d6ae2758d78a3ff5ab87faf71d1d6f5d2332e71dddd7ad7684a29974dae064200e60a72a1ceb39df2547ff70681bdc646b24f1d029119d2e82d22
 EBUILD fail2ban-0.8.12-r1.ebuild 2356 SHA256 5c14e748d5feff5a1c529f6944ea7bedc6f167da8bc09fcb07798c4585d71eda SHA512 429228b2cdc9b67e8a497c0ce8290dee53c1d86fb3130b6b9a0dcbe55edebd34101b333dc4614cc1860ac9801eb19ec2bb1722a13a92f8217e9e5604a317d443 WHIRLPOOL 4a556ce88d81d179daa88a84b2ba758b6052e3e9dd5cd76536530913276f39bc39eab18b1634139c841c5822b439e0883c39516458a55baa975a9f3a6b63b2af
 EBUILD fail2ban-0.8.12.ebuild 2344 SHA256 6eded75d8921b2e1f8a81f5e0516ebe8a50a256f7b57fa9d04d598ada5adaeaf SHA512 d95b08ff044dea2e9a8aadb6a9650940d8f9728c07930fa80a075b731a9de76e386596685b0996a3e1a63232c5c8339a210195794876f3b0d1e0722b12aaf3f4 WHIRLPOOL 6ab7f91a763083018b173fbe06b632a5cca89a6849b08f7ec7cdd5fad7b6fc87814ac2489408e228bde92286c78ef8d3d1a3af98aab20bb9d99c4b45f8af59d2
-EBUILD fail2ban-0.9.0-r1.ebuild 2611 SHA256 b6a46aa3bd0e456d2e0f7955761060d089bf6ef2728611f187c9477547c493c0 SHA512 7d4960f836b76a6972ee786209a00fe37c5b932d55ec9d7f636021af9dc02058678ded846b0c49a5c22d14665fe857438f9a211a293fd9cc7563ab28f52990c6 WHIRLPOOL d36daf66f32b6f9afe4084d077501dbca0dc61bd1e4f59589c8105df59c30ed46232327b0cf6dcd69e1dbad3a8d9c1f4299a69c60a3abac5d8ca85840d6ea7c4
-MISC ChangeLog 19246 SHA256 4ee932165e63dd7fd3ee76b5e3532cf4fe61926f9dfad00c2caabac59440e731 SHA512 c4edf95106104ad2528551eb2029a48e9b3cd688fefcac88974d5b9ffc974c0e19cd1989b51920a6a8b24c4ed3705ebc51750657ea9bb767379221ade471ce02 WHIRLPOOL d07dcccb4d7683ce14a2e1e115fcde6c2c62114a37464d1c3c4fa90f98cb274461e07022ddbfce6df94365256010d9315f3f27a33d64eb29edd7cc6f20a1d922
+EBUILD fail2ban-0.9.0-r1.ebuild 2986 SHA256 c53d8a421b34b9f222d8286a973619a981e973d366bbe11ab66643821a9fbace SHA512 b26586ad5426ffd48406e4002e7ce23d8888a256c2baabb8fe2fa5d12cbf4e82e58c0252f721324fbfe989aab3853368b17a88bd67576ad5d75ca3c0f84a19b5 WHIRLPOOL 8eec439e4741532503f713ed240a5502d4d9bdf6fbf5aa729b30cafd0c85e32989b0d8cbdc823da10e9913074001ea481550075bd0133dccd4964effce42673b
+MISC ChangeLog 19405 SHA256 f10024bc0e38c6da8d60270c815e6e1ff2a30a1b7ef292237560fe4c9e4188f3 SHA512 68a66e264df94feb0c9847550a0d8e620817062a0b0ea1d53aa159eff3d13871a557ac1b5d71943595a328af2f26e703abe60adf1b3ed093fed32fcc06f84698 WHIRLPOOL 1f4eff2a7b96518ab57f04e4427af6a382674fdc7b8e1a887f3019b65f8727e3731b8d43d8a199d112c613582ea6c4e30ce8520919af7effbc15a39e6b22e581
 MISC metadata.xml 161 SHA256 442ce683981a7e51854e06ffdc2bdbbd956decf0d7a1f0c1ca056439a7230ebd SHA512 24f0086dfd65743d480e231efa20106ecd3980449864d6158b7e92542a0f4cfe58d3dbcbabd0042201beb43f5a57f6d30a912037cfcdc56ed56ac0532362c5da WHIRLPOOL de3b36cfc647f36b482a403ce526a395d38a69100917ee50aa5cbd888708678a6d4f67aae3381ef373b5ccb1df196503a2554765598491bd71da9c0415f24a80
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMmRSsACgkQVWmRsqeSphMs+ACeJoykfrU1Xhu7qQbJgi+3lghn
-UCcAn3n0svI95bVqlD9mKlX2AM9+ABGT
-=dB5M
+iEYEAREIAAYFAlMoeXYACgkQVWmRsqeSphP52wCfR23R7Y16jQApvflzfzcfVt9r
+vmAAn1GvlylpyzjVnIwTZWcjkUpwDpMq
+=e5hD
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/fail2ban/fail2ban-0.9.0-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.0-r1.ebuild
index 34c414800f1c..5502e58d14e2 100644
--- a/net-analyzer/fail2ban/fail2ban-0.9.0-r1.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.9.0-r1.ebuild,v 1.1 2014/03/17 00:43:21 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fail2ban/fail2ban-0.9.0-r1.ebuild,v 1.2 2014/03/18 16:51:01 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
@@ -78,10 +78,19 @@ pkg_postinst() {
 		elog "You are upgrading from version 0.6.x, please see:"
 		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
 	fi
-	if ! has_version ${CATEGORY}/${PN} && \
-		! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
-		elog "For most jail.conf configurations, it is recommended you install either"
-		elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
-		elog "to control how log file modifications are detected"
+	if ! has_version ${CATEGORY}/${PN}; then
+		if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin; then
+			elog "For most jail.conf configurations, it is recommended you install either"
+			elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
+			elog "to control how log file modifications are detected"
+		fi
+		if ! has_version dev-lang/python[sqlite]; then
+			elog "If you want to use ${PN}'s persistent database, then reinstall"
+			elog "dev-lang/python with USE=sqlite"
+		fi
+		if has_version sys-apps/systemd[-python]; then
+			elog "If you want to track logins through sys-apps/systemd's"
+			elog "journal backend, then reinstall sys-apps/systemd with USE=python"
+		fi
 	fi
 }