[gentoo-commits] repo/gentoo:master commit in: net-analyzer/testssl/, profiles/arch/x86/

[gentoo-commits] repo/gentoo:master commit in: net-analyzer/testssl/, profiles/arch/x86/

[Sam James]

commit:     170578a9d020b47b18d5f357e8df6381d8f87de1
Author:     Cristian Othón Martínez Vera <cfuga <AT> cfuga <DOT> mx>
AuthorDate: Thu Jul 31 15:49:00 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct  3 00:24:42 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=170578a9

net-analyzer/testssl: update bundled OpenSSL support

Upstream dropped Kerberos and x86 support for version 3.2.0 and up,
only left a Linux amd64 binary.

Signed-off-by: Cristian Othón Martínez Vera <cfuga <AT> cfuga.mx>
Part-of: https://github.com/gentoo/gentoo/pull/43268
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-analyzer/testssl/testssl-3.2.2.ebuild | 20 +++-----------------
 profiles/arch/x86/package.use.mask        |  9 +++++----
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/net-analyzer/testssl/testssl-3.2.2.ebuild b/net-analyzer/testssl/testssl-3.2.2.ebuild
index 138b19335120..47a4af1c6c89 100644
--- a/net-analyzer/testssl/testssl-3.2.2.ebuild
+++ b/net-analyzer/testssl/testssl-3.2.2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_PN}-${MY_PV}
 LICENSE="GPL-2 bundled-openssl? ( openssl )"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="bundled-openssl kerberos"
+IUSE="bundled-openssl"
 
 RDEPEND="
 	app-alternatives/awk
@@ -28,27 +28,13 @@ RDEPEND="
 		net-dns/bind
 		net-libs/ldns
 	)
-	bundled-openssl? (
-		kerberos? (
-			sys-libs/zlib
-			virtual/krb5
-		)
-	)
 	!bundled-openssl? ( dev-libs/openssl:0 )
 "
 
 QA_PREBUILT="opt/${PN}/*"
 
 pkg_setup() {
-	if use amd64; then
-		if use kerberos; then
-			BUNDLED_OPENSSL="openssl.Linux.x86_64.krb"
-		else
-			BUNDLED_OPENSSL="openssl.Linux.x86_64"
-		fi
-	elif use x86; then
-		BUNDLED_OPENSSL="openssl.Linux.i686"
-	fi
+	BUNDLED_OPENSSL="openssl.Linux.x86_64"
 }
 
 src_prepare() {
@@ -74,6 +60,6 @@ src_install() {
 
 	if use bundled-openssl; then
 		exeinto /opt/${PN}
-		use amd64 && doexe bin/${BUNDLED_OPENSSL}
+		doexe bin/${BUNDLED_OPENSSL}
 	fi
 }

diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index 8c1e0b73bf81..85cfe21b0d9d 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Cristian Othón Martínez Vera <cfuga@cfuga.mx> (2025-10-02)
+# Michael Palimaka <kensington@gentoo.org> (2018-10-12)
+# Unmask arch-specific USE flag available on x86
+<net-analyzer/testssl-3.1 -bundled-openssl
+
 # Nicolas PARLANT <nicolas.parlant@parhuet.fr> (2025-09-20)
 # Require dev-libs/libtsm, keyworded here
 >=media-gfx/fbida-2.14_p20241216 -fbcon
@@ -377,10 +382,6 @@ app-admin/conserver -freeipmi
 # Requires dev-db/mongodb which has dropped x86 support
 dev-php/pecl-mongodb test
 
-# Michael Palimaka <kensington@gentoo.org> (2018-10-12)
-# Unmask arch-specific USE flag available on x86
-net-analyzer/testssl -bundled-openssl
-
 # Jan Ziak <0xe2.0x9a.0x9b@gmail.com> (2018-03-14)
 # Expose SVGA backend for x86 users
 app-emulation/fuse -backend-svga