5 files changed, 98 insertions, 0 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 4596d89e66a0..1a9a0c3842a4 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
index fe54c778a0a3..dd596d50f3ef 100644
--- a/dev-libs/libksba/Manifest
+++ b/dev-libs/libksba/Manifest
@@ -1,4 +1,7 @@
 AUX libksba-1.6.0-no-fgrep-ksba-config.patch 636 BLAKE2B 5a24f231225d77835b62c3acc1fe5f36b9c9cc8d99d0ab0e86c3de34d49211f660105a8f9b4fe9e3b0ba0fec5ce9a6bceaebb31bbcbd80d7e623be69f17aa8a4 SHA512 8393052c0d1338e51cac150db5aa4f6b9607f437a13c0d58be22e9f7975f031d757790accb053db0c621a76ebc1b1603721f6d79f90f0d515aecf525e5b65999
 DIST libksba-1.6.0.tar.bz2 662120 BLAKE2B 59bee23f764ab3e0f79fae6074ffe568845b6089ff29b8c5112973490ff5e1436834d5d0b50954ba9fbd6be655f47043a6345181c5c7e552322ceb331d030780 SHA512 a7c76d41dfd8ec6383ac2de3c53848cd9f066b538f6f3cd43175e3c8095df51b96d0a24a573481c0c4856b09b7c224e2b562d88f5c0801e7acfb582ea2739c2b
+DIST libksba-1.6.1.tar.bz2 667546 BLAKE2B 6fad243c8eace31188264515cfe146afdfe9155ded571614dc1a9a8e2e357cb301d471cdbd084e1db59e888ed4eea7270755723c98c5bd7bb6ef857aedf4cd75 SHA512 cb1113204ce5a3344103e03c541238bfddf40b79579cf97b5707c03b064afcda362db16467739afe8342e5bd42dd367b6f9e51f46ef8de1126293773d23b7cf4
+DIST libksba-1.6.1.tar.bz2.sig 119 BLAKE2B e80f6706a81b927cb2dcce5def046d5395668b078f6da605476943446607aae580dc775aa21fa11f29b4ce7c7abaa09462e702610b0976eb5fc633c741d8dbed SHA512 574e2cb49c47fa6ac62f30a5b6c06b636d12ec0c1fba02ef0cbb8e50225143925ee9ebb9b4c3112a5f470a62cc2b01687d93ee0037235297c94fdf7ef63fa704
 EBUILD libksba-1.6.0-r1.ebuild 1129 BLAKE2B 02bc3e3ca7d5ff452f0adabbde65371df3eee9ad17fa8972b7440637dcfcc1caf9830b1b70645fd6bc95c49de6a9dd0f8d0f90009bf169af9f4e64bc2e1d06fb SHA512 211797f35a8f267e511fafc946fab54a4aaf8bcd52c6df6ea1d46c6c7f58d952adb92f175f940c49dd2b58443ce985b196256e2e39a247f94334aae54967c1df
+EBUILD libksba-1.6.1.ebuild 1337 BLAKE2B a04dabece502895887e9593bd75adab5351036018922feca1819ccad22435bfd575178d43f21eda1ce00f98c48301156c3dfa2bd63356a5cf75825a0b789134f SHA512 89f5cabc2341a8bc2de8a60d3f4f11e2bd8d2dca34ee8291d45e763ad98839b451b956383b86dac5d6b42d0b3681d1f0c1fa3d2e2547621cb1494f2e559c2028
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/dev-libs/libksba/libksba-1.6.1.ebuild b/dev-libs/libksba/libksba-1.6.1.ebuild
new file mode 100644
index 000000000000..6a9a5c5f0e56
--- /dev/null
+++ b/dev-libs/libksba/libksba-1.6.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
+inherit toolchain-funcs verify-sig
+
+DESCRIPTION="X.509 and CMS (PKCS#7) library"
+HOMEPAGE="https://www.gnupg.org/related_software/libksba"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
+
+LICENSE="LGPL-3+ GPL-2+ GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.8"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-no-fgrep-ksba-config.patch
+)
+
+src_configure() {
+	export CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+	local myeconfargs=(
+		$(use_enable static-libs static)
+
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# People need to use ksba-config for --cflags and --libs
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index b1dca7294e9e..42b762a9fcd5 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,3 +1,5 @@
 DIST popt-1.18.tar.gz 580569 BLAKE2B c9c42eb12aa21764cde5e9b4a8b30125b547ae690b4d9d0d40b45bd3c1f7ae0b09d5086a588cf37e7bed71fe770ff840c0fd40ecf4ce5b7c1e874b938b6e0324 SHA512 86422e8762adda3d02d46c20ac74ffe389d4f991d552b6fea729f007345b6426cbeb71160284e2deaa2ce44ce754a9e6cf6ccbd64bff9bc2253df40cdc2f79a5
+DIST popt-1.19.tar.gz 596676 BLAKE2B 8f8965e2d339f0413e8d1da421ea7556526f39f089a822063d6fdc35b781a7c7ea84a91d6af3e25902c1f045f564ef956fc69cd4625e6cc008c9e3ca34923a9d SHA512 5d1b6a15337e4cd5991817c1957f97fc4ed98659870017c08f26f754e34add31d639d55ee77ca31f29bb631c0b53368c1893bd96cf76422d257f7997a11f6466
 EBUILD popt-1.18.ebuild 1057 BLAKE2B ad6668d5d593b1b7501d4851edeec5934fa6e4de2ef4a309ef43330655e54a5952e78e5f9c4521c0eefadfbfcec1c953c8e2868ff116660989ed36896a3b3646 SHA512 b706249c10d63749176de4d37cad198c134ee2cbb98d06a871f5cc3cf0e1f6b837755f3e66c55ae674d3805d4d89596f309fb5eb2f30ee688a05db333b7a1f63
+EBUILD popt-1.19.ebuild 1229 BLAKE2B 46bc37c7d411a9b42aa587ed934f4a3fe89bd55feaab9319d51605e632b5aa1bc9cafe86ea09268766028e592d6963967721f71086288d948f401941060ccf3e SHA512 9dda8932df6851db52df6753baa28fc530b5c5144c7e9c3998baf0aa9f5d5e90aa3e37b37904180322cf5afa438726fae238f0c3a2b9a0d4b63f5db88cebab93
 MISC metadata.xml 412 BLAKE2B 6fc4208a8032652bfc2f48606c900686475617e828264bb8c4adca481c0de8f73a67b39e418143c6e75e8dec185d15f6050b3b7bf7e2f3ba14bffd17a59b2418 SHA512 aa4b2d96f2588e7fd24fc7a7f793209b431c9628e1ac05f79bdb52edd1582fcf21e93491e2ee241ed8b3aab2b83a1b047c819d030413e013b0d90d4cd4ba2393
diff --git a/dev-libs/popt/popt-1.19.ebuild b/dev-libs/popt/popt-1.19.ebuild
new file mode 100644
index 000000000000..483bb167bd28
--- /dev/null
+++ b/dev-libs/popt/popt-1.19.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal libtool
+
+DESCRIPTION="Parse Options - Command line parser"
+HOMEPAGE="https://github.com/rpm-software-management/popt"
+SRC_URI="http://ftp.rpm.org/${PN}/releases/${PN}-1.x/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls static-libs"
+
+RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( >=sys-devel/gettext-0.19.8 )"
+
+src_prepare() {
+	default
+
+	# Unclear what the background to this is, perhaps
+	# https://git.exherbo.org/arbor.git/commit/?id=5545d22d3493279acf7a55246179f818ef22f5fa
+	sed -i -e 's:lt-test1:test1:' tests/testit.sh || die
+
+	elibtoolize
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-werror
+		$(use_enable static-libs static)
+		$(use_enable nls)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}