From e6a9bef46a3be2162d2bd41d2fa6af934f144ec1 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Sun, 20 Sep 2026 05:34:00 +0100
Subject: [PATCH] dev-build/libtool: add 2.6.2

Bug: https://bugs.gentoo.org/980099
Signed-off-by: Sam James <sam@gentoo.org>
---
 dev-build/libtool/Manifest                    |  3 +-
 ...tool-2.6.0.ebuild => libtool-2.6.2.ebuild} | 29 ++++++++++++++-----
 dev-build/libtool/libtool-9999.ebuild         | 26 +++++++++++++----
 3 files changed, 45 insertions(+), 13 deletions(-)
 rename dev-build/libtool/{libtool-2.6.0.ebuild => libtool-2.6.2.ebuild} (85%)

diff --git a/dev-build/libtool/Manifest b/dev-build/libtool/Manifest
index d1c7c08acf4ae..ab8cceddd8c29 100644
--- a/dev-build/libtool/Manifest
+++ b/dev-build/libtool/Manifest
@@ -1,2 +1,3 @@
 DIST libtool-2.5.4.tar.xz 1056924 BLAKE2B 47de3c49a690d44d7ddd5e3b5e4090c91dc5fbb9c40fc4a3963e150fb7329326ee3e21b8c149974726171c4b0380028e0efc7a369c4f04357eea46f69852e1cc SHA512 eed207094bcc444f4bfbb13710e395e062e3f1d312ca8b186ab0cbd22dc92ddef176a0b3ecd43e02676e37bd9e328791c59a38ef15846d4eae15da4f20315724
-DIST libtool-2.6.0.tar.xz 1086020 BLAKE2B 33346f21fc5ad0e2925b2b12e3aa4715546683181c0323912f31ce9e3e7ac9ee103e2bd608d3d8b45fd82c59c6f2e082ac7baf3946d12169f05c760920ad1117 SHA512 79af0baf14d598b3091fc770b004a80ffb7ecf0cc8440b5947a41d3c8e603566783008deb3248235d87088810b69824003defed3e66dccb6c03c635095c9fb41
+DIST libtool-2.6.2.tar.xz 1093564 BLAKE2B c9d806815748b8b2ad9fc01a4bc38fedc3feda76eb8ef36707477a94b82ac413ceb8c9f3ea376b568d7a9ffc31ff292905579341741029babaea082637ec5144 SHA512 7517648aaa704a87a35ce23c47dd6415c1ac81056aadb076960cd93c0ee31c431ab95aa85a4cc1eaaee1dcf860a90898fb6514f0bb4aa70b940757c8301260cf
+DIST libtool-2.6.2.tar.xz.sig 833 BLAKE2B a4993867f9086823327f657d6f25f3dacff2042d265e44db29be3e20c9a5d2ec18eef4c8da4bd6dd735edb09082f8fedae0e2f4d21b89a83b96d1a790db84a66 SHA512 9a7d70dd5a3316286e99e2b7b6db48fcafe33b783a023177df9c9796c6056700ff0cf563bcfe59eaaf196e61b29553e58b7def89086f08c9a205a5fa8478e2b2
diff --git a/dev-build/libtool/libtool-2.6.0.ebuild b/dev-build/libtool/libtool-2.6.2.ebuild
similarity index 85%
rename from dev-build/libtool/libtool-2.6.0.ebuild
rename to dev-build/libtool/libtool-2.6.2.ebuild
index 55d747089de7c..6d0fdb17c98e0 100644
--- a/dev-build/libtool/libtool-2.6.0.ebuild
+++ b/dev-build/libtool/libtool-2.6.2.ebuild
@@ -13,12 +13,29 @@ inherit autotools flag-o-matic prefix multiprocessing
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git"
 	inherit git-r3
-elif true || ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then
-	# 2.6.0 is an alpha release
-	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
+elif ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libtool.asc
+	inherit verify-sig
+	# Note that sometimes alpha versions have different versioning
+	# than this, so check on bumps!
+	SRC_URI="
+		https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz
+		verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz.sig )
+	"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-libtool )"
 else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libtool.asc
+	inherit verify-sig
+
+	SRC_URI="
+		mirror://gnu/${PN}/${P}.tar.xz
+		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
+	"
+
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-libtool )"
 fi
 
 DESCRIPTION="A shared library tool for developers"
@@ -34,14 +51,12 @@ RDEPEND="
 	>=dev-build/automake-1.13:*
 "
 DEPEND="${RDEPEND}"
-[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
+[[ ${PV} == *9999 ]] && BDEPEND+=" sys-apps/help2man"
 
 # Note that we have more patches in https://gitweb.gentoo.org/proj/elt-patches.git/
 # for package builds. The patches here are just those which are definitely fine
 # for the system-wide libtool installation as well.
 PATCHES=(
-	# bug #109105
-	"${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch
 	# bug #581314
 	"${FILESDIR}"/${PN}-2.4.6-ppc64le.patch
 
diff --git a/dev-build/libtool/libtool-9999.ebuild b/dev-build/libtool/libtool-9999.ebuild
index 4a3cad397c038..6d0fdb17c98e0 100644
--- a/dev-build/libtool/libtool-9999.ebuild
+++ b/dev-build/libtool/libtool-9999.ebuild
@@ -14,10 +14,28 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git"
 	inherit git-r3
 elif ! [[ $(( $(ver_cut 2) % 2 )) -eq 0 ]] ; then
-	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libtool.asc
+	inherit verify-sig
+	# Note that sometimes alpha versions have different versioning
+	# than this, so check on bumps!
+	SRC_URI="
+		https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz
+		verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${P}.tar.xz.sig )
+	"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-libtool )"
 else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libtool.asc
+	inherit verify-sig
+
+	SRC_URI="
+		mirror://gnu/${PN}/${P}.tar.xz
+		verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
+	"
+
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-libtool )"
 fi
 
 DESCRIPTION="A shared library tool for developers"
@@ -33,14 +51,12 @@ RDEPEND="
 	>=dev-build/automake-1.13:*
 "
 DEPEND="${RDEPEND}"
-[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
+[[ ${PV} == *9999 ]] && BDEPEND+=" sys-apps/help2man"
 
 # Note that we have more patches in https://gitweb.gentoo.org/proj/elt-patches.git/
 # for package builds. The patches here are just those which are definitely fine
 # for the system-wide libtool installation as well.
 PATCHES=(
-	# bug #109105
-	"${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch
 	# bug #581314
 	"${FILESDIR}"/${PN}-2.4.6-ppc64le.patch