6 files changed, 86 insertions, 4 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index f7ad98492936..b2559e7dbe4d 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/argtable/Manifest b/dev-libs/argtable/Manifest
index f4e722e31073..3c69d5886a29 100644
--- a/dev-libs/argtable/Manifest
+++ b/dev-libs/argtable/Manifest
@@ -1,4 +1,6 @@
 AUX argtable-2.13-Fix-implicit-function-declaration.patch 400 BLAKE2B 1d6efef6be2889c66d62dab4891881e701fbce79e118e0699f8acf91c901d1d1dffbabf92f9fe1353be06cdf00176813b9dbb071da500c57fc1dfe4656d85079 SHA512 f360192676e4840db4502037425f5f5ce9dfd88ea2d852c6677027258e6ebe3007169e56d5aa9c9b1766281231cf809a4e10253beabe1c4981c22aa33e62515e
+AUX argtable-2.13-Fix-undeclared-library-function.patch 636 BLAKE2B 96d223ee64f057ea29506c6d2e7002e16ba4e691ae4cc4d32abc1d64ff22fda91b0e61879c78807930f65f957fa2bf1900a15232d146c495acb6ea5d4e16430a SHA512 7b02b1de15f98ab2f5c61697e6e5edf2cc3beca1a0c3cd014431622fe356ce4cbe400a5aeec75f5cf14c0baed7b49f1b6b0abf1ba6d05b27bf0c2db5b3c6b4b4
 DIST argtable2-13.tar.gz 3326444 BLAKE2B 8c78d56c2e1a53747cf480808064cb006644db50a2cb38adddd71eff07d4d7f6e5467c54eec4e5cbb729a7f639927b2d3283c6995bde54134d7a85e39788b87c SHA512 3d8303f3ba529e3241d918c0127a16402ece951efb964d14a06a3a7d29a252812ad3c44e96da28798871e9923e73a2cfe7ebc84139c1397817d632cae25c4585
 EBUILD argtable-2.13-r3.ebuild 1023 BLAKE2B d86b5003c912781a9b53e03bb5ebd50e22ecc596cec9a6fa12c80c74fc527c2f8dd0206bdbedac73e47324bc4734a8386ff8a16c71bb63be37fdd8b442795b4d SHA512 49479c97ada665f44f5ec586c9d72635774a971b02e065c7a59398b2b5111de2ed0fd12a89c90826c8470fbbbe23d04bfca01870da540b40e1973d2dea7d7c78
+EBUILD argtable-2.13-r4.ebuild 1092 BLAKE2B 9b40d94e200cad8856b35ff3be94255825c27e95447e8eca0f66a496fc3379e63dc5e56f45365425cda9ea3ad9fce3323e107f166b3eac64712494269b8867cb SHA512 993db603dee149c238f310ae9be866763a0f5dc95454f281b378d968d780a02468a4a8b94d3abb0b85b68cb812e29a820c3ea7813822ff544fcc2abcc8ba80e1
 MISC metadata.xml 244 BLAKE2B fad63c2df07a5f9df8d76bdfefec496412e15b28921c5928e66d2ff1a4df11656d9b9a1e9e54eb35cbd69b7c46162236ca12bfb664540777bcfba27c04e5edd8 SHA512 fa47cca1b7f704deed476452a6d37d764d727f10039e8bfdfe62ce57b92e37ea2c39c1b2a26a97057ce14171f55e0076d8034e9520f13f481f29bf620863185d
diff --git a/dev-libs/argtable/argtable-2.13-r4.ebuild b/dev-libs/argtable/argtable-2.13-r4.ebuild
new file mode 100644
index 000000000000..f5b108d4161e
--- /dev/null
+++ b/dev-libs/argtable/argtable-2.13-r4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV="$(ver_rs 1 '-')"
+MY_P=${PN}${MY_PV}
+
+DESCRIPTION="An ANSI C library for parsing GNU-style command-line options with minimal fuss"
+HOMEPAGE="https://argtable.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc debug examples static-libs"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.13-Fix-implicit-function-declaration.patch
+	"${FILESDIR}"/${PN}-2.13-Fix-undeclared-library-function.patch
+)
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	rm -rf "${ED}"/usr/share/doc/${PF}/
+
+	if use doc ; then
+		cd "${S}"/doc || die
+		dodoc *.pdf *.ps
+		docinto html
+		dodoc *.html *.gif
+	fi
+
+	if use examples ; then
+		cd "${S}"/example || die
+		docinto examples
+		dodoc Makefile *.[ch] README.txt
+	fi
+
+	find "${ED}" -name "*.la" -delete || die "failed to delete .la files"
+}
diff --git a/dev-libs/argtable/files/argtable-2.13-Fix-undeclared-library-function.patch b/dev-libs/argtable/files/argtable-2.13-Fix-undeclared-library-function.patch
new file mode 100644
index 000000000000..7f42d43727a5
--- /dev/null
+++ b/dev-libs/argtable/files/argtable-2.13-Fix-undeclared-library-function.patch
@@ -0,0 +1,28 @@
+From 519609d844f1e5bbf37407de8e43fa2d2be03262 Mon Sep 17 00:00:00 2001
+From: Brahmajit Das <brahmajit.xyz@gmail.com>
+Date: Sun, 7 May 2023 00:03:40 +0530
+Subject: [PATCH] Fix undeclared library function strcmp
+
+Bug: https://bugs.gentoo.org/885609
+--- a/tests/fntests.c
++++ b/tests/fntests.c
+@@ -1,5 +1,6 @@
+ #include "../src/argtable2.h"
+ #include <assert.h>
++#include <string.h>
+
+ /* for memory leak debugging */
+ #ifdef DMALLOC
+--- a/tests/test_file.c
++++ b/tests/test_file.c
+@@ -21,6 +21,7 @@ USA.
+
+ #include "../src/argtable2.h"
+ #include <stdlib.h>
++#include <string.h>
+
+ /* for memory leak debugging */
+ #ifdef DMALLOC
+--
+2.40.1
+
diff --git a/dev-libs/pkcs11-helper/Manifest b/dev-libs/pkcs11-helper/Manifest
index 3d6ebb38df3a..c72be753c13b 100644
--- a/dev-libs/pkcs11-helper/Manifest
+++ b/dev-libs/pkcs11-helper/Manifest
@@ -1,4 +1,4 @@
 AUX pkcs11-helper-1.29.0-incompatible-func-ptr-clang16.patch 792 BLAKE2B c0bd5925600a01707bc622916593fbafc784665ee1445b49f6a58212a35730d53301184ef943b4759a0e095b3a7e88b9f728b82d86dc2c0b5a52e2a749547ab9 SHA512 ddc5c9199c5be72c0866ecd3ce6c9300bf6986524968874574f949653efffb350967ab3b559ff494a144d9ecdb25f7b22ec1a7d1ef073b178022beb2a053b0a5
 DIST pkcs11-helper-1.29.0.tar.bz2 422549 BLAKE2B fec72ac82f1545fc50f80b5b28db12906df32fa3bc65f80541d8bee7f1d1c8062f1f0516344237424022c01d4f390e8a72e3e0262250f3b6c51df92c768d81ee SHA512 c530f5a4b5826a02bfe787a1293a7595d5a0d6348daa16675bd10c6d6734b1f24a3cc73b5b89433cf1edf8815f8b7298fdfd1ed686f096bb5edfb425e9430eb2
-EBUILD pkcs11-helper-1.29.0-r1.ebuild 1041 BLAKE2B 814fbbda2266003409376788cde8b12d775ade7015178601dafedac6302c436813906d0ddee4a451d24a61d995546ca46c7d325e2f2e6a3d10f3960ac518522d SHA512 7ef63b5f465f561ebc3e7ac5e6e763dc2db00bbe007d2473aaf4ce6a18114a403371c58fe4f437ad62ab32453e493f5ba58e453e1e410b5e0e574166ce3b5223
+EBUILD pkcs11-helper-1.29.0-r1.ebuild 1159 BLAKE2B 70316d7c04428deca5b6dbc380d04a902bfcbef1ca1554f0b6db8317e47c29007bb53d1421d723e38dc86d45de9702a8259868a0fbddcb306ca057fa1b140006 SHA512 bd2769da9859122576f649e99eec354641f26e18bd16e2ed70161ffd3ec4a4b216b6c65f92151bf51dacb5f57edb68fdfe3159cb6945e962fe6f6b378abc6d50
 MISC metadata.xml 435 BLAKE2B 7740f428a33cecd516c6cfb96de878c8080b2cba0b42c78cc34bac42d128619cf4a42b966aafe30bfc13a045ad0017285ecff9d60d237eadd715fcdf6029c8b8 SHA512 2a9c9d99cfcac14b7c201d5d931f5d1fe0d544328f32db5048a9cd15f0a99ef4016e4b5ec4391500cb5a9e3c00205c72211c61c1fc13cda330faf6b7eb9eeea9
diff --git a/dev-libs/pkcs11-helper/pkcs11-helper-1.29.0-r1.ebuild b/dev-libs/pkcs11-helper/pkcs11-helper-1.29.0-r1.ebuild
index fa7ca082dda3..fa9b65fb42cf 100644
--- a/dev-libs/pkcs11-helper/pkcs11-helper-1.29.0-r1.ebuild
+++ b/dev-libs/pkcs11-helper/pkcs11-helper-1.29.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,9 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.bz2"
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="doc gnutls nss"
+IUSE="doc gnutls nss test"
+# Fails trying to load /usr/lib/pkcs11/provider.so?
+RESTRICT="!test? ( test ) test"
 
 RDEPEND=">=dev-libs/openssl-0.9.7:=
 	gnutls? ( >=net-libs/gnutls-1.4.4:= )
@@ -29,7 +31,8 @@ src_configure() {
 		--disable-crypto-engine-mbedtls \
 		$(use_enable doc) \
 		$(use_enable gnutls crypto-engine-gnutls) \
-		$(use_enable nss crypto-engine-nss)
+		$(use_enable nss crypto-engine-nss) \
+		$(use_enable test tests)
 }
 
 src_install() {