gentoo resync : 20.10.2021

3 files changed, 2 insertions, 61 deletions

diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index 231912f4cf23..6ced9fd285b9 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -1,9 +1,7 @@
 AUX sshguard-2.4.1-conf.patch 1203 BLAKE2B db97df31d61de23622faaaffdef23c5f55dac3fbe6947f6ec9b2dd3129cefac047acaf1134fb2259bb1d643f7a4bc61f699bfbd8e7523fa42f0f775b22a8b233 SHA512 54279f52e84ab5d32c4af5d2953ca6927b9c4dee2b4b9dda50c11cbf83f5051cc5c02ee25b8822e3e2b035fb7a0620d17706f84b028cc4f249b2cd733f41272f
 AUX sshguard.confd 634 BLAKE2B f083e6d4f7df6cefae89ef382a82cd7c5863c6a2ded34aee61ab028f8320c35552b80d5d8222ed35adb13a70cf6096eb5d88749f5b5ff72ca483f27fd1c0de56 SHA512 72b2a9c995bcb604516525f8190eaf35fa57e18274f83a8d00fd5b223b598c0c4ffd8b7ce89b1139c89380e5a7181c8024a6041375c445edb29c8f8b49abee50
 AUX sshguard.initd-r2 389 BLAKE2B b4098e0baf82e1c1f1978d6b3916fe9f2e67891d02b7b842492558f9b44c1c0c23204d88c036f49e069c42b0fbbdba31d8292419a2d22e603f29926228a8a223 SHA512 951ea1479836d1b318c35be03c340e5101aa3663bf2581cd0d928de2fea36f0b7906e50d9abf1b6b11fa682427e8d72b45bc95bb8f40a85fb471bfe354108108
-DIST sshguard-2.4.1.tar.gz 723940 BLAKE2B 04e72b9959ef3ead418d2a6fe8029b0806a4d91c91f7cd36c236c7203cca1afc67305b21de0b1dee1594b188564f201ff2770d54d4c57c54b4d23db15e0298a0 SHA512 bae7485d963454f2a6dc4b7d96506b03fb49013fe3ab3d81e315ea88bd8067e7a2305cdf25e411720ac014a68ee9635cdbcef65a7dc806b7fc942f099a9d5ba8
 DIST sshguard-2.4.2.tar.gz 835431 BLAKE2B f76cbe41ced4d23448ba09750d073a47dae263616c34ec2e2efd7d6367339d352925958b5d9d711a3c4a8c2da10fae2474384a3de14434c0dff19bd645325058 SHA512 f2fe35180af8698d4b2053e9ffbf17df9f033b0c2fcc045caa085467d14174e17aa266d2ef3ce9536037e54f7d3ea42de9e32e7faee65612894294793082862a
-EBUILD sshguard-2.4.1-r1.ebuild 1093 BLAKE2B 25f612896845751aa576aac877f1fae43e81fffe2830de361eb8f597034d1b60e5429d2e37ac87f29ea6f416a8710b2c7227827af71e8394b7a97da7ffd14fde SHA512 1a32abb81945b0fa36e8a8828dd95d328ce11df7d2d8d975daf523f5bd1af44f7e4b62c30f41e10a925cb0cc72e39590ff0cfc73b66d1d2b3cf4480113d5d90e
-EBUILD sshguard-2.4.2.ebuild 1102 BLAKE2B a0876a7bc5d376349e75991d336ac4a4c36f9fa59b8bcf6de1d64882a4732aaa5fade62c5fa252ea1741fd2b3d871d7dfd539bee7cf4ace21c20b03b723c5df7 SHA512 a0313a3a0b8d32a76823bb81db6d56d0224993055604b55ca4ccb52facb6781c3d3e420c8efef92002b5ba1b8b05b42bbc8fa4b25f885391d4792dc9fe873479
+EBUILD sshguard-2.4.2.ebuild 1100 BLAKE2B 1864b9b41ba272ed972776e14ba16877abf1921f48b0d55372563c023fdf5379c43cf13addeb9f8cabda96c3df18f3ee6a43c00fffee2fdd7224d4424d8a72ea SHA512 fb8ffd279ed992a6ad0d09b8157c430d6f6b8bc28c595e804ba2b86ccee0cf0a3e01288f1489b172e9f8d349ecd9ebaa7f00fce126ef2e43724082e87564bdaf
 EBUILD sshguard-99999.ebuild 1095 BLAKE2B c5d6d6d4450f4d98fe6f4486f05b93105ed46297068f960f82ca7df8410c15e8a731f7570f9afa7657b085f52df7fdf2c3796e83915c435967b9a00df44d1fec SHA512 3f3b35389987a9bd004425b3fe15a3ace3abdc6370341ae2af66cd7688b90106810e0e6da349179140c02b5a36f3a44246cd40f62c5596a23b8c711df95d77b9
 MISC metadata.xml 460 BLAKE2B 193bed37ae4de27932a759960d393d8efbe3e0be7e0a8f6a1d689e1236dde51461abfb1e23486669a850eeb4caba74dc9163a255b09d4c6de27a7e3aa6e2f9d1 SHA512 6d7439e739cc935c698e09ac3cae99c43121a60d4879b8df483cccd6347348e0c3c084b13223fe3f6bbecb18845e116243082e0dedcd1aa8ca21e67aa43b6ae7
diff --git a/app-admin/sshguard/sshguard-2.4.1-r1.ebuild b/app-admin/sshguard/sshguard-2.4.1-r1.ebuild
deleted file mode 100644
index dee670ce9642..000000000000
--- a/app-admin/sshguard/sshguard-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-DESCRIPTION="protects hosts from brute force attacks against ssh"
-HOMEPAGE="https://www.sshguard.net/"
-
-if [[ "${PV}" == 99999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}"
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-DEPEND="
-	sys-devel/flex
-"
-RDEPEND="
-	virtual/logger
-"
-DOCS=(
-	CHANGELOG.rst
-	CONTRIBUTING.rst
-	README.rst
-	examples/net.sshguard.plist
-	examples/whitelistfile.example
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4.1-conf.patch
-)
-
-src_prepare() {
-	default
-	sed -i -e "/ExecStartPre/s:/usr/sbin:/sbin:g" \
-		-e "/ExecStart/s:/usr/local/sbin:/usr/sbin:g" \
-		"${S}"/examples/${PN}.service || die
-	eautoreconf
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd-r2 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	insinto /etc
-	newins examples/sshguard.conf.sample sshguard.conf
-
-	systemd_dounit "${S}"/examples/sshguard.service
-}
diff --git a/app-admin/sshguard/sshguard-2.4.2.ebuild b/app-admin/sshguard/sshguard-2.4.2.ebuild
index f85c4011fd60..4333d820bc82 100644
--- a/app-admin/sshguard/sshguard-2.4.2.ebuild
+++ b/app-admin/sshguard/sshguard-2.4.2.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == 99999 ]] ; then
 	EGIT_REPO_URI="https://bitbucket.org/${PN}/${PN}"
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 LICENSE="BSD"