gentoo auto-resync : 15:03:2024 - 06:47:25

3 files changed, 107 insertions, 13 deletions

diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index b6e39c441a21..382b5959a71a 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -2,6 +2,7 @@ AUX opensc.module 390 BLAKE2B 4c5ea159ed2038af51c9ca3e903b23db1acdfa8a6c79be7f92
 DIST opensc-0.24.0.tar.gz 2440952 BLAKE2B afacdd151d169dd1840ecd6df1cec99a9805598d7b7af81e17b648f146cd1b3ad1d3dcae19ed94cf8ce0dbbd5b4285af9653af5ef5739d53908ce30a49544adb SHA512 0fd2ea858874ae0b85c8fe8c4b920988693a47ca95b26449a1e95f86e17b76000f236c1f75d63ee133306e01a965155da5e14c1b8a59053b85026ecb58fb97bb
 DIST opensc-0.25.0.tar.gz 2406137 BLAKE2B 07c7de7fa1c258a90b1acbfbc01383f204ad88169ae1d3681f240e881ab80652dc9b04ba452a433576847caa5ef49d35608b3f895e965fec9e79da231ecabab2 SHA512 c220607a543b1fcf7c89e051e7c7ca3908abab6c022818b01a6219becdbad217708fb3c5fe2fe2218ac82be0f174c5694e5fa07c6e0ae540cf3171462a23eee6
 EBUILD opensc-0.24.0.ebuild 1875 BLAKE2B 9b20b04338f11a4d83b44440162afaefd9289e6cce39e4d4e500cc9a0f9e61182aa117c5386d890456c1e50422fe0e3cc4ba1dd6172a4345247e2e5ef536d4ab SHA512 d75bd4cd69a41338e0616e6a31e8e19d435ee42c0bd03ad595bcd186c765e1ead02e51b49679fae625e7a6bcab402c33f44192ce2f97216fcd3d7e13a51527fa
+EBUILD opensc-0.25.0-r1.ebuild 2266 BLAKE2B dfc9b021c2da06edd14aa6e8ef8ffffee2a8838fd7d55e6eb7e0b2420d5bc5799a7710e8e19982e1fada5eb03ad1ff848c9ef284617d583b0447801d19e32d1c SHA512 2715f9099109ecd1494b511cbd475b4ea03488d38e8ad2f84832a1cb50516c6bff1f339fa227471f4cf4532a65987ee76adfc6df4f830fb1f3055e409361d28d
 EBUILD opensc-0.25.0.ebuild 1881 BLAKE2B 89d86dedc8fdc230ec8fd44c45d02064aae594c91f2194d8a170948a8887be23802af5b642367990969c640c08404958823caeccf1bb521f46afaf1c0122e573 SHA512 28d35731a06304a80abc7496c35326918397b8125c1ba0006a49ed532710a9a4bd1ff1e11bb75779961273910088e5cd83ab300168765deab56022a9d9638980
-EBUILD opensc-9999.ebuild 1881 BLAKE2B ae0acc8bcc7081ceea38b6a59ed04dd6acf37bf4e86f3979ac317e5bd8dffba6cfdb0480cfc574ca23d5ab5f491ea2b301ce4b2ae86835e8210af391cdfe11c6 SHA512 8ce8e223359c15a15159a006ecfa2b1c4f10063902450c4fa120902cc1193a0478e87cd0678241b0f4e96aa7cb870267d4d80e44e1e13c952a322412801dba26
+EBUILD opensc-9999.ebuild 2266 BLAKE2B dfc9b021c2da06edd14aa6e8ef8ffffee2a8838fd7d55e6eb7e0b2420d5bc5799a7710e8e19982e1fada5eb03ad1ff848c9ef284617d583b0447801d19e32d1c SHA512 2715f9099109ecd1494b511cbd475b4ea03488d38e8ad2f84832a1cb50516c6bff1f339fa227471f4cf4532a65987ee76adfc6df4f830fb1f3055e409361d28d
 MISC metadata.xml 1305 BLAKE2B 8560829a2784e38e10b41f5e083568a7fafd19e9fe185b1675c787b2514ea01a18b3fa6c7d0018b6e45638512d02e9bec12fbc5df4e50bf49db6558ef89a9af8 SHA512 8b477d96f6acb7a808e24af1d4b29e16e06b83eaf29799dbc6b74181ded74de47d7527712e21412bfb92a26e1d03974368a2c1790208785230280a18d21aff06
diff --git a/dev-libs/opensc/opensc-0.25.0-r1.ebuild b/dev-libs/opensc/opensc-0.25.0-r1.ebuild
new file mode 100644
index 000000000000..7646bcd741c3
--- /dev/null
+++ b/dev-libs/opensc/opensc-0.25.0-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools bash-completion-r1
+
+DESCRIPTION="Libraries and applications to access smartcards"
+HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OpenSC/OpenSC.git"
+else
+	SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0/11"
+IUSE="ctapi doc openct notify pace +pcsc-lite readline secure-messaging ssl test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="zlib? ( sys-libs/zlib )
+	readline? ( sys-libs/readline:0= )
+	ssl? ( dev-libs/openssl:0= )
+	openct? ( >=dev-libs/openct-0.5.0 )
+	pace? ( dev-libs/openpace:= )
+	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
+	notify? ( dev-libs/glib:2 )"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	test? (
+		dev-util/cmocka
+		dev-libs/softhsm
+	)"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+	pcsc-lite? ( !openct !ctapi )
+	openct? ( !pcsc-lite !ctapi )
+	ctapi? ( !pcsc-lite !openct )
+	|| ( pcsc-lite openct ctapi )"
+
+src_prepare() {
+	# This test is known to fail, for a long time upstream has carried
+	# version-specific patches which they would update on every version bump.
+	# There doesn't appear to be a permanent solution yet.
+	sed -i "/test-pkcs11-tool-unwrap-wrap-test.sh/d" "tests/Makefile.am" || die
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# don't want to run upstream's clang-tidy checks
+	export ac_cv_path_CLANGTIDY=""
+
+	econf \
+		--with-completiondir="$(get_bashcompdir)" \
+		--disable-strict \
+		--enable-man \
+		$(use_enable ctapi) \
+		$(use_enable doc) \
+		$(use_enable notify) \
+		$(use_enable openct) \
+		$(use_enable pace openpace) \
+		$(use_enable pcsc-lite pcsc) \
+		$(use_enable readline) \
+		$(use_enable secure-messaging sm) \
+		$(use_enable ssl openssl) \
+		$(use_enable test cmocka) \
+		$(use_enable zlib)
+}
+
+src_test() {
+	P11LIB="${ESYSROOT}/usr/$(get_libdir)/softhsm/libsofthsm2.so" default
+}
+
+src_install() {
+	default
+
+	insinto /etc/pkcs11/modules/
+	doins "${FILESDIR}"/opensc.module
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/opensc/opensc-9999.ebuild b/dev-libs/opensc/opensc-9999.ebuild
index a470c4913c37..7646bcd741c3 100644
--- a/dev-libs/opensc/opensc-9999.ebuild
+++ b/dev-libs/opensc/opensc-9999.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit bash-completion-r1 libtool
+inherit autotools bash-completion-r1
 
 DESCRIPTION="Libraries and applications to access smartcards"
 HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki"
 
 if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/OpenSC/OpenSC.git"
 else
 	SRC_URI="https://github.com/OpenSC/OpenSC/releases/download/${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="0/11"
 IUSE="ctapi doc openct notify pace +pcsc-lite readline secure-messaging ssl test zlib"
 RESTRICT="!test? ( test )"
 
@@ -31,7 +31,10 @@ RDEPEND="zlib? ( sys-libs/zlib )
 DEPEND="${RDEPEND}
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
-	test? ( dev-util/cmocka )"
+	test? (
+		dev-util/cmocka
+		dev-libs/softhsm
+	)"
 BDEPEND="virtual/pkgconfig"
 
 REQUIRED_USE="
@@ -41,13 +44,12 @@ REQUIRED_USE="
 	|| ( pcsc-lite openct ctapi )"
 
 src_prepare() {
+	# This test is known to fail, for a long time upstream has carried
+	# version-specific patches which they would update on every version bump.
+	# There doesn't appear to be a permanent solution yet.
+	sed -i "/test-pkcs11-tool-unwrap-wrap-test.sh/d" "tests/Makefile.am" || die
 	default
-
-	if [[ ${PV} == *9999 ]]; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
+	eautoreconf
 }
 
 src_configure() {
@@ -71,6 +73,10 @@ src_configure() {
 		$(use_enable zlib)
 }
 
+src_test() {
+	P11LIB="${ESYSROOT}/usr/$(get_libdir)/softhsm/libsofthsm2.so" default
+}
+
 src_install() {
 	default