5 files changed, 59 insertions, 44 deletions
diff --git a/app-admin/stow/Manifest b/app-admin/stow/Manifest
index 272515f53bc2..5b130944a5ec 100644
--- a/app-admin/stow/Manifest
+++ b/app-admin/stow/Manifest
@@ -1,2 +1,4 @@
-DIST stow-2.2.2.tar.gz 579324 BLAKE2B fc4ab7f386e8245b361cee5fc0decd91caec543ec6178c82720866c33a974ba9d68e999a68c3b7357d873ab1b58bb8b022bf02dad029972f42c317ffc288bd04 SHA512 8a3e5da6b5cb4c1ee1b512bae5a9859f83659d5de05f7a9af1dd09df2a32f6b8c6d43b79736db91232c43621d542041d4ef92eb088925796adad0676f200a9b5
-DIST stow-2.3.1.tar.gz 654191 BLAKE2B 9fd54fd3ff76aa7b72ed973cd6d70b8dc747fa3bb1ecc6bedd221b308d7d141a21a2f077c67efb432f2c7c4fb6bd126639038b196946206bf4a7f95040477ab2 SHA512 e9a7de1a6f10eaf7cdbe6737e0a8be1498e2eac46b6c57e65b83759b061efd1c0db45f7cba123e35428307e3aebe5baef9ea8bd4b5eb6ec5e1b159117a760441
+DIST stow-2.3.1.tar.bz2 556921 BLAKE2B cd946dd1537bec063e21c91cc60c0c8f3a8a5609960536020e7e4b970ff2daa628151258487492b1b44fb5539e1d75a8955152fdfbe91384b7e174ab420a9cf6 SHA512 3d6cec3d50e2dc0ffa92646c45015ced3fca32cef9dd24418fada3fc2e4472a1f335877debb3a1284812aef281a432925c3a3e7afa112d92f127facd3150079c
+DIST stow-2.3.1.tar.bz2.sig 833 BLAKE2B a236d67fca2dabb965021b7ef23ec680ffd48c1b23d3637cf4bd2c31da58b55ad9d190ee88c7f9bb8ce676f85a0bb133b963bc8252fea7c8d5bd5c0042c65681 SHA512 0a0ad10781c29ee6cd69dc8cb05592e779e5cb53412b8bc6c7bce12846c1e1480e2763eaaab329f2cf945a263d15217adb102387247bc2bec313856b3d7535c4
+DIST stow-2.4.0.tar.bz2 635343 BLAKE2B 578d3cf5084a97110eb90faed96d7ae1b167176795b7c4a3a65d5fc43a59983f5106fbb9d8ea136df92363e041f81c72483cd748cef9e051c2089795af53a6a6 SHA512 c479a0ba5d6af9a2a4860f4bf4095dbd586794e781766c22e6cda657bbf984915f4661e03825db02a300412aa49305e06b8107ffc96077bd64ba4e7a1eb27314
+DIST stow-2.4.0.tar.bz2.sig 833 BLAKE2B df8665e5d8189177138313de95ed1edcd1a38deca753f064cb9e6e1e5447c55467330c4d8f8ffefd05be12528788738e4ecd427db14bf36fdd070161b69a7422 SHA512 02bb9549a1d27c532f7dfbd42d5a6dcd92d0de7692f8e43c74ebd662c63e6cae656edc045379eb81e9908f88ee89100edd8b9fe416e4c13399357579c4836f66
diff --git a/app-admin/stow/metadata.xml b/app-admin/stow/metadata.xml
index ceeed1534bdd..bf29ceda8819 100644
--- a/app-admin/stow/metadata.xml
+++ b/app-admin/stow/metadata.xml
@@ -1,8 +1,11 @@
 <?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>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-	</maintainer>
+  <maintainer type="person">
+    <email>sam@gentoo.org</email>
+    <name>Sam James</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="savannah">stow</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-admin/stow/stow-2.2.2-r1.ebuild b/app-admin/stow/stow-2.2.2-r1.ebuild
deleted file mode 100644
index 5fc1dffc1261..000000000000
--- a/app-admin/stow/stow-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit perl-functions
-
-DESCRIPTION="GNU Stow is a symlink farm manager"
-HOMEPAGE="https://www.gnu.org/software/stow/"
-SRC_URI="mirror://gnu/stow/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-lang/perl
-	test? (
-		dev-perl/IO-stringy
-		virtual/perl-Test-Harness
-		dev-perl/Test-Output
-	)"
-RDEPEND="dev-lang/perl:="
-
-src_configure() {
-	perl_set_version
-	econf "--with-pmdir=${VENDOR_LIB}"
-}
diff --git a/app-admin/stow/stow-2.3.1.ebuild b/app-admin/stow/stow-2.3.1.ebuild
index f6f37faefd1d..2c8d731bfc35 100644
--- a/app-admin/stow/stow-2.3.1.ebuild
+++ b/app-admin/stow/stow-2.3.1.ebuild
@@ -1,27 +1,32 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit perl-functions
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/adamspiers.asc
+inherit perl-functions verify-sig
 
 DESCRIPTION="GNU Stow is a symlink farm manager"
-HOMEPAGE="https://www.gnu.org/software/stow/"
-SRC_URI="mirror://gnu/stow/${P}.tar.gz"
+HOMEPAGE="https://www.gnu.org/software/stow/ https://git.savannah.gnu.org/cgit/stow.git"
+SRC_URI="mirror://gnu/stow/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnu/stow/${P}.tar.bz2.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~mips ~ppc ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="dev-lang/perl
+RDEPEND="dev-lang/perl:="
+DEPEND="${RDEPEND}"
+BDEPEND="
 	test? (
 		dev-perl/IO-stringy
 		virtual/perl-Test-Harness
 		dev-perl/Test-Output
-	)"
-RDEPEND="dev-lang/perl:="
+	)
+	verify-sig? ( sec-keys/openpgp-keys-adamspiers )
+"
 
 src_configure() {
 	perl_set_version
diff --git a/app-admin/stow/stow-2.4.0.ebuild b/app-admin/stow/stow-2.4.0.ebuild
new file mode 100644
index 000000000000..a69e14905be7
--- /dev/null
+++ b/app-admin/stow/stow-2.4.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/adamspiers.asc
+inherit perl-functions verify-sig
+
+DESCRIPTION="GNU Stow is a symlink farm manager"
+HOMEPAGE="https://www.gnu.org/software/stow/ https://git.savannah.gnu.org/cgit/stow.git"
+SRC_URI="mirror://gnu/stow/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnu/stow/${P}.tar.bz2.sig )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-lang/perl:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	test? (
+		dev-perl/IO-stringy
+		virtual/perl-Test-Harness
+		dev-perl/Test-Output
+	)
+	verify-sig? ( sec-keys/openpgp-keys-adamspiers )
+"
+
+src_configure() {
+	perl_set_version
+	econf "--with-pmdir=${VENDOR_LIB}"
+}