5 files changed, 11 insertions, 72 deletions
diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index 7fbac4e3d7c5..adfbb50991e0 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -1,2 +1 @@
-DIST sshguard-2.4.1.tar.gz 723940 BLAKE2B 04e72b9959ef3ead418d2a6fe8029b0806a4d91c91f7cd36c236c7203cca1afc67305b21de0b1dee1594b188564f201ff2770d54d4c57c54b4d23db15e0298a0 SHA512 bae7485d963454f2a6dc4b7d96506b03fb49013fe3ab3d81e315ea88bd8067e7a2305cdf25e411720ac014a68ee9635cdbcef65a7dc806b7fc942f099a9d5ba8
-DIST sshguard-2.4.2.tar.gz 835431 BLAKE2B f76cbe41ced4d23448ba09750d073a47dae263616c34ec2e2efd7d6367339d352925958b5d9d711a3c4a8c2da10fae2474384a3de14434c0dff19bd645325058 SHA512 f2fe35180af8698d4b2053e9ffbf17df9f033b0c2fcc045caa085467d14174e17aa266d2ef3ce9536037e54f7d3ea42de9e32e7faee65612894294793082862a
+DIST sshguard-2.4.3.tar.gz 1118756 BLAKE2B 8e3bd297c5712b4a411de6581e96a21db03203974cedba443bf16dd042e3b1b54c68cbacfa5af1610e738e1f847f1f0fae4792b52b618946f8b13fb0f5d4e338 SHA512 eeecea1007c1a21a28835a6d29c2cbffc647b3ab09a3525600e91b978d4ebdda9e6a7e2884da26bb1d7f64de561ac8bd1788bb776730d37b7a4fa49b22885b4a
diff --git a/app-admin/sshguard/metadata.xml b/app-admin/sshguard/metadata.xml
index 683fe7aa81ea..cb67516a6d39 100644
--- a/app-admin/sshguard/metadata.xml
+++ b/app-admin/sshguard/metadata.xml
@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
 		<email>dlan@gentoo.org</email>
 		<name>Yixun Lan</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>netmon@gentoo.org</email>
-		<name>Gentoo network monitoring and analysis project</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sshguard</remote-id>
+		<remote-id type="bitbucket">sshguard/sshguard</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-admin/sshguard/sshguard-2.4.2.ebuild b/app-admin/sshguard/sshguard-2.4.2.ebuild
deleted file mode 100644
index ee4653a215e3..000000000000
--- a/app-admin/sshguard/sshguard-2.4.2.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.1-r1.ebuild b/app-admin/sshguard/sshguard-2.4.3.ebuild
index dee670ce9642..d0bd1ebaa85d 100644
--- a/app-admin/sshguard/sshguard-2.4.1-r1.ebuild
+++ b/app-admin/sshguard/sshguard-2.4.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools systemd
 DESCRIPTION="protects hosts from brute force attacks against ssh"
@@ -12,14 +12,14 @@ 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 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 LICENSE="BSD"
 SLOT="0"
 
 DEPEND="
-	sys-devel/flex
+	app-alternatives/lex
 "
 RDEPEND="
 	virtual/logger
diff --git a/app-admin/sshguard/sshguard-99999.ebuild b/app-admin/sshguard/sshguard-99999.ebuild
index ee4653a215e3..d2b3282e1a88 100644
--- a/app-admin/sshguard/sshguard-99999.ebuild
+++ b/app-admin/sshguard/sshguard-99999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools systemd
 DESCRIPTION="protects hosts from brute force attacks against ssh"
@@ -12,14 +12,14 @@ 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 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="BSD"
 SLOT="0"
 
 DEPEND="
-	sys-devel/flex
+	app-alternatives/lex
 "
 RDEPEND="
 	virtual/logger