app-crypt/sbsigntool: renamed to app-crypt/sbsigntools

Also changed all required dependencies.

Package-Manager: Portage-2.3.41, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/9112

9 files changed, 12 insertions, 8 deletions

diff --git a/app-crypt/efitools/efitools-1.7.0.ebuild b/app-crypt/efitools/efitools-1.7.0.ebuild
index 63c9fbec0513..c47c9b03a9e0 100644
--- a/app-crypt/efitools/efitools-1.7.0.ebuild
+++ b/app-crypt/efitools/efitools-1.7.0.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	sys-apps/help2man
 	>=sys-boot/gnu-efi-3.0u
-	app-crypt/sbsigntool
+	app-crypt/sbsigntools
 	virtual/pkgconfig
 	dev-perl/File-Slurp"
 
diff --git a/app-crypt/efitools/efitools-1.8.1.ebuild b/app-crypt/efitools/efitools-1.8.1.ebuild
index 6ede95860eb5..94d636eec260 100644
--- a/app-crypt/efitools/efitools-1.8.1.ebuild
+++ b/app-crypt/efitools/efitools-1.8.1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	sys-apps/util-linux"
 
 DEPEND="${RDEPEND}
-	app-crypt/sbsigntool
+	app-crypt/sbsigntools
 	dev-perl/File-Slurp
 	static? ( ${LIB_DEPEND} )
 	sys-apps/help2man
diff --git a/app-crypt/sbsigntool/Manifest b/app-crypt/sbsigntools/Manifest
index 8df64ea7cc74..a054ddc31c94 100644
--- a/app-crypt/sbsigntool/Manifest
+++ b/app-crypt/sbsigntools/Manifest
@@ -1,3 +1,3 @@
 DIST sbsigntool-0.8-ccan.tar.gz 113537 BLAKE2B 8fbf27463d30c1895930628a145be2d521ae4f6adb7af3299bf2f5f4319fd643df0a07347ef6851bd41d233af4c3fc5f77002771af1c43aa0f20665aef2390b8 SHA512 6857096879f116f1802eb6b44789cbea7bb24440bc0f16503aeadf5f276fa45943f322f844dbb9abee717655205d82b830143be3a7f4424fd4146b9360674a09
-DIST sbsigntool-0.9.1.tar.gz 56497 BLAKE2B 22791bd4b490f36963a19e82da3ce7b93a56d948bf44d1ffdb62fa3291a3f815b2c19d68f9180b607c2b1438f656367ec1f9002f0b1225734d16a9aadc6d20ec SHA512 ae16232327c098bbc60a9701185d856d851cb7fa8f62be64d3c8f75c8b274b8521fcc4212226189def05db980690878ee6ac9a9b418166c92442aaf35e790d29
 DIST sbsigntool_0.6.orig.tar.gz 212375 BLAKE2B fab9141c7fbfa01ec24f975503ac83be4ae0664251a1311afb3d95124fec3750ce20a5ffab35b6965d4ee4585ab4ee91f25ae49488214a983b6fc006071d0968 SHA512 ed314d1cb7278cf5f27d4c3cd17f2195678419a7f9e47770429b6f95df35f7df035331e60c45970183ddd9b150a9b752f876c777929598b0525872b3255af95c
+DIST sbsigntools-0.9.1.tar.gz 56497 BLAKE2B 22791bd4b490f36963a19e82da3ce7b93a56d948bf44d1ffdb62fa3291a3f815b2c19d68f9180b607c2b1438f656367ec1f9002f0b1225734d16a9aadc6d20ec SHA512 ae16232327c098bbc60a9701185d856d851cb7fa8f62be64d3c8f75c8b274b8521fcc4212226189def05db980690878ee6ac9a9b418166c92442aaf35e790d29
diff --git a/app-crypt/sbsigntool/files/0002-image.c-clear-image-variable.patch b/app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch
index dfe183e66cd2..dfe183e66cd2 100644
--- a/app-crypt/sbsigntool/files/0002-image.c-clear-image-variable.patch
+++ b/app-crypt/sbsigntools/files/0002-image.c-clear-image-variable.patch
diff --git a/app-crypt/sbsigntool/files/0003-Fix-for-multi-sign.patch b/app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch
index f42c69616d13..f42c69616d13 100644
--- a/app-crypt/sbsigntool/files/0003-Fix-for-multi-sign.patch
+++ b/app-crypt/sbsigntools/files/0003-Fix-for-multi-sign.patch
diff --git a/app-crypt/sbsigntool/files/sbsigntool-0.9.1-openssl-1.1.0-compat.patch b/app-crypt/sbsigntools/files/sbsigntools-0.9.1-openssl-1.1.0-compat.patch
index 2f9364f246ee..2f9364f246ee 100644
--- a/app-crypt/sbsigntool/files/sbsigntool-0.9.1-openssl-1.1.0-compat.patch
+++ b/app-crypt/sbsigntools/files/sbsigntools-0.9.1-openssl-1.1.0-compat.patch
diff --git a/app-crypt/sbsigntool/metadata.xml b/app-crypt/sbsigntools/metadata.xml
index 20001d6eb7ad..20001d6eb7ad 100644
--- a/app-crypt/sbsigntool/metadata.xml
+++ b/app-crypt/sbsigntools/metadata.xml
diff --git a/app-crypt/sbsigntool/sbsigntool-0.6-r2.ebuild b/app-crypt/sbsigntools/sbsigntools-0.6-r2.ebuild
index 464a4e833fb6..519693684dce 100644
--- a/app-crypt/sbsigntool/sbsigntool-0.6-r2.ebuild
+++ b/app-crypt/sbsigntools/sbsigntools-0.6-r2.ebuild
@@ -3,11 +3,13 @@
 
 EAPI="5"
 
+MY_PN="${PN::-1}"
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
 HOMEPAGE="https://launchpad.net/ubuntu/+source/sbsigntool"
-SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
+SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${MY_PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -23,6 +25,8 @@ DEPEND="${RDEPEND}
 	sys-libs/binutils-libs
 	virtual/pkgconfig"
 
+S="${WORKDIR}/${MY_PN}-${PV}"
+
 src_prepare() {
 	local iarch
 	case ${ARCH} in
diff --git a/app-crypt/sbsigntool/sbsigntool-0.9.1-r1.ebuild b/app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild
index 70e47576c088..f87b1609d9d3 100644
--- a/app-crypt/sbsigntool/sbsigntool-0.9.1-r1.ebuild
+++ b/app-crypt/sbsigntools/sbsigntools-0.9.1-r1.ebuild
@@ -3,12 +3,14 @@
 
 EAPI="6"
 
+MY_PN="${PN::-1}"
+
 inherit eutils autotools
 
 DESCRIPTION="Utilities for signing and verifying files for UEFI Secure Boot"
 HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/"
-SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/${PN}s.git/snapshot/${PN}s-${PV}.tar.gz -> ${P}.tar.gz
-	https://dev.gentoo.org/~tamiko/distfiles/${PN}-0.8-ccan.tar.gz"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/jejb/${PN}.git/snapshot/${P}.tar.gz
+	https://dev.gentoo.org/~tamiko/distfiles/${MY_PN}-0.8-ccan.tar.gz"
 
 LICENSE="GPL-3 LGPL-3 LGPL-2.1 CC0-1.0"
 SLOT="0"
@@ -24,8 +26,6 @@ DEPEND="${RDEPEND}
 	sys-libs/binutils-libs
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}s-${PV}"
-
 PATCHES=(
 	"${FILESDIR}"/${P}-openssl-1.1.0-compat.patch
 )