gentoo resync : 27.03.2021

3 files changed, 28 insertions, 19 deletions

diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index 053d64cdad65..fb1d05c7805a 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,4 +1,4 @@
 DIST fail2ban-0.11.2.tar.gz 559552 BLAKE2B 0c61c1d5f6eb23d585533fbb84e69343cb305df188537a97002489318292c6056447c4c221c9d4d4cde6cca52f0c2fb877b597957f703e4d6707801a646e52b0 SHA512 46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97
-EBUILD fail2ban-0.11.2.ebuild 3348 BLAKE2B 884a823df13614a5f6b30d57dbbfbcd9174dc4063422fa9f0c7bf24834b385292f93f03beb9d4cb025c99262ac64492679f46eb4d9e7bb3c5f0894ce79082ac7 SHA512 93b38332ada7aafec33efc191655bda76f85237911a641e4465bc71dd90c763aefff51337fcd9cf5a91b6111c3882fa208e7bbc6519e3040624b50e2ea050412
-EBUILD fail2ban-9999.ebuild 3265 BLAKE2B ae5c6e8584db8e7f0bab76f26f58984991d568ff9e9bb2446a1359eb8dd6ead7ab769c2e9422452678beb89414908d303cd439b360ca23a937486549e8717325 SHA512 b065b962ed7a760229c9da5c9ab8676374041fe504bea5bb8cd4e8e2da1dce28550b2fa053cd15ba84989cd58305c62b7ddb820d834a4c97f94637d634255c73
+EBUILD fail2ban-0.11.2.ebuild 3360 BLAKE2B f4806417afda8f66638e07fec9a17624056adfaf877cf9fad86cbf89e2db8b8dac49662e95ce58fc9ee6d058069acad914e6f59c9f946d9246ec05ddf17e3c69 SHA512 dd0f15854720499bc81ea019936fa0c99e9eda8fd7cb216723c7023e2ae7eb2455a58a74335ab50873a95625b10836ad4d63873af96f8a7b27a9a386bc3dd28b
+EBUILD fail2ban-9999.ebuild 3267 BLAKE2B 329de02c44675b90e31da3711c65daaea4e5f84069d42b436e4ea9f84223a03c70999a33eb361bec732006bef5a4a8a181f46e2552aecdc65790009318d4a8fd SHA512 a1479ca1d45845119e5489750ec0d53d7e8bf82eacdf958173d4c85b33be421bfd57d8f94d73c77f85c216d4a8ecfddac646d484a2137ac08651876474036435
 MISC metadata.xml 356 BLAKE2B 28861bc6e3c62f2c21ea1480816f2645de929f009dccf7f6ecf9d8a10ed72214fa80acab6bd72ca314b6f3154096b0c0f0324b07fece238150c356aac17886e9 SHA512 5759cb73ed737bf25d4fc68dc12a722100e5d7aba222a082d49900e8cbc06cbd1bf5d7272fae9f6256d475fe29397f391fcbffda9eee4e73214ad941da27ce69
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2.ebuild
index 5e9fd5b53171..8f57fd666aa7 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 4a13926cd46f..0765abc8425a 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