commit: 5ad85c6533e8cc080fbfd474823e642f5ff2cf21
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 22 22:57:10 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 23 04:48:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ad85c65
net-analyzer/fail2ban: cosmetic changes, no PYTHON_MULTI_USEDEP
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-analyzer/fail2ban/fail2ban-0.11.2.ebuild | 23 ++++++++++++++---------
net-analyzer/fail2ban/fail2ban-9999.ebuild | 20 ++++++++++++--------
2 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
index 5e9fd5b5317..8f57fd666aa 100644
--- a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
@@ -23,10 +23,13 @@ RDEPEND="
virtual/logger
virtual/mta
selinux? ( sec-policy/selinux-fail2ban )
- systemd? ( $(python_gen_cond_dep '|| (
- dev-python/python-systemd[${PYTHON_MULTI_USEDEP}]
- sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}]
- )' 'python*' ) )
+ systemd? (
+ $(python_gen_cond_dep '
+ || (
+ dev-python/python-systemd[${PYTHON_USEDEP}]
+ sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+ )' 'python*' )
+ )
"
DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
@@ -51,14 +54,16 @@ python_compile() {
python_install_all() {
distutils-r1_python_install_all
- rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
+ rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die
- # not FILESDIR
+ # Not ${FILESDIR}
newconfd files/gentoo-confd ${PN}
newinitd files/gentoo-initd ${PN}
+
sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in >
"${T}/${PN}.service" || die
systemd_dounit "${T}/${PN}.service"
dotmpfiles files/${PN}-tmpfiles.conf
+
doman man/*.{1,5}
# Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
@@ -91,20 +96,20 @@ pkg_postinst() {
elog
"http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8";
fi
- if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin;
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
+ 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. If you do not use the"
elog "persistent database feature, then you should set"
elog "dbfile = :memory: in fail2ban.conf accordingly."
fi
- if has_version sys-apps/systemd[-python]; then
+ 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
diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild
b/net-analyzer/fail2ban/fail2ban-9999.ebuild
index 4a13926cd46..0765abc8425 100644
--- a/net-analyzer/fail2ban/fail2ban-9999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild
@@ -22,10 +22,12 @@ RDEPEND="
virtual/logger
virtual/mta
selinux? ( sec-policy/selinux-fail2ban )
- systemd? ( $(python_gen_cond_dep '|| (
- dev-python/python-systemd[${PYTHON_MULTI_USEDEP}]
- sys-apps/systemd[python(-),${PYTHON_MULTI_USEDEP}]
- )' 'python*' ) )
+ systemd? (
+ $(python_gen_cond_dep '|| (
+ dev-python/python-systemd[${PYTHON_USEDEP}]
+ sys-apps/systemd[python(-),${PYTHON_USEDEP}]
+ )' 'python*' )
+ )
"
DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
@@ -52,12 +54,14 @@ python_install_all() {
rm -rf "${D}"/usr/share/doc/${PN} "${D}"/run || die
- # not FILESDIR
+ # not ${FILESDIR}
newconfd files/gentoo-confd ${PN}
newinitd files/gentoo-initd ${PN}
+
sed -e "s:@BINDIR@:${EPREFIX}/usr/bin:g" files/${PN}.service.in >
"${T}/${PN}.service" || die
systemd_dounit "${T}/${PN}.service"
dotmpfiles files/${PN}-tmpfiles.conf
+
doman man/*.{1,5}
# Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
@@ -90,20 +94,20 @@ pkg_postinst() {
elog
"http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8";
fi
- if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin;
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
+ 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. If you do not use the"
elog "persistent database feature, then you should set"
elog "dbfile = :memory: in fail2ban.conf accordingly."
fi
- if has_version sys-apps/systemd[-python]; then
+ 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
