summaryrefslogtreecommitdiff
path: root/app-crypt
diff options
context:
space:
mode:
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/Manifest.gzbin25269 -> 25247 bytes
-rw-r--r--app-crypt/acme-sh/Manifest6
-rw-r--r--app-crypt/acme-sh/acme-sh-3.0.7.ebuild54
-rw-r--r--app-crypt/acme-sh/acme-sh-3.0.9.ebuild (renamed from app-crypt/acme-sh/acme-sh-3.0.8.ebuild)0
-rw-r--r--app-crypt/acme/Manifest2
-rw-r--r--app-crypt/acme/acme-2.11.0.ebuild2
-rw-r--r--app-crypt/ccid/Manifest7
-rw-r--r--app-crypt/ccid/ccid-1.5.1.ebuild45
-rw-r--r--app-crypt/ccid/ccid-1.5.4.ebuild55
-rw-r--r--app-crypt/ccid/ccid-1.5.5.ebuild2
-rw-r--r--app-crypt/ccid/files/ccid-1.5.4-remove-flex-configure-dependency.patch71
-rw-r--r--app-crypt/certbot/Manifest3
-rw-r--r--app-crypt/certbot/certbot-2.11.0-r3.ebuild65
-rw-r--r--app-crypt/certbot/certbot-2.11.0.ebuild2
-rw-r--r--app-crypt/debian-archive-keyring/Manifest6
-rw-r--r--app-crypt/debian-archive-keyring/debian-archive-keyring-2021.1.1.ebuild26
-rw-r--r--app-crypt/debian-archive-keyring/debian-archive-keyring-2023.3.ebuild26
-rw-r--r--app-crypt/debian-archive-keyring/debian-archive-keyring-2023.4.ebuild4
-rw-r--r--app-crypt/easy-rsa/Manifest8
-rw-r--r--app-crypt/easy-rsa/easy-rsa-3.1.6.ebuild25
-rw-r--r--app-crypt/easy-rsa/easy-rsa-3.1.7.ebuild25
-rw-r--r--app-crypt/easy-rsa/easy-rsa-3.2.1.ebuild (renamed from app-crypt/easy-rsa/easy-rsa-3.1.2.ebuild)6
-rw-r--r--app-crypt/glep63-check/Manifest2
-rw-r--r--app-crypt/glep63-check/glep63-check-11.ebuild2
-rw-r--r--app-crypt/gnupg-pkcs11-scd/Manifest5
-rw-r--r--app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.10.0.ebuild22
-rw-r--r--app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.11.0.ebuild60
-rw-r--r--app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-9999.ebuild60
-rw-r--r--app-crypt/gnupg/Manifest12
-rw-r--r--app-crypt/gnupg/files/gnupg-2.2.45-fix-status-output-LISTTRUSTED.patch30
-rw-r--r--app-crypt/gnupg/files/gnupg-2.4.6-c99.patch28
-rw-r--r--app-crypt/gnupg/gnupg-2.2.45.ebuild182
-rw-r--r--app-crypt/gnupg/gnupg-2.4.5-r2.ebuild2
-rw-r--r--app-crypt/gnupg/gnupg-2.4.6-r1.ebuild199
-rw-r--r--app-crypt/gnupg/gnupg-2.5.1.ebuild9
-rw-r--r--app-crypt/gpgme/Manifest2
-rw-r--r--app-crypt/gpgme/gpgme-1.23.2-r2.ebuild2
-rw-r--r--app-crypt/heimdal/Manifest3
-rw-r--r--app-crypt/heimdal/files/heimdal-7.8.0-autoconf-2.72.patch19
-rw-r--r--app-crypt/heimdal/heimdal-7.8.0-r3.ebuild1
-rw-r--r--app-crypt/jitterentropy/Manifest2
-rw-r--r--app-crypt/jitterentropy/jitterentropy-3.6.0.ebuild48
-rw-r--r--app-crypt/keysmith/Manifest6
-rw-r--r--app-crypt/keysmith/keysmith-24.08.1.ebuild2
-rw-r--r--app-crypt/keysmith/keysmith-24.08.3.ebuild (renamed from app-crypt/keysmith/keysmith-24.05.2.ebuild)6
-rw-r--r--app-crypt/loop-aes-losetup/Manifest2
-rw-r--r--app-crypt/loop-aes-losetup/loop-aes-losetup-2.40.1.ebuild2
-rw-r--r--app-crypt/mit-krb5/Manifest1
-rw-r--r--app-crypt/mit-krb5/mit-krb5-1.21.3-r1.ebuild155
-rw-r--r--app-crypt/moolticute/Manifest8
-rw-r--r--app-crypt/moolticute/moolticute-1.00.1-r1.ebuild (renamed from app-crypt/moolticute/moolticute-1.00.1.ebuild)6
-rw-r--r--app-crypt/moolticute/moolticute-1.01.0-r1.ebuild (renamed from app-crypt/moolticute/moolticute-1.01.0.ebuild)6
-rw-r--r--app-crypt/moolticute/moolticute-1.03.0-r1.ebuild (renamed from app-crypt/moolticute/moolticute-1.03.0.ebuild)6
-rw-r--r--app-crypt/moolticute/moolticute-9999.ebuild6
-rw-r--r--app-crypt/onak/Manifest6
-rw-r--r--app-crypt/onak/files/onak-0.6.3-cmake.patch51
-rw-r--r--app-crypt/onak/metadata.xml7
-rw-r--r--app-crypt/onak/onak-0.5.0.ebuild50
-rw-r--r--app-crypt/onak/onak-0.6.3.ebuild63
-rw-r--r--app-crypt/p11-kit/Manifest4
-rw-r--r--app-crypt/p11-kit/p11-kit-0.25.3-r2.ebuild2
-rw-r--r--app-crypt/p11-kit/p11-kit-0.25.5.ebuild73
-rw-r--r--app-crypt/pinentry/Manifest12
-rw-r--r--app-crypt/pinentry/files/pinentry-1.2.1-automagic-capslock.patch99
-rw-r--r--app-crypt/pinentry/files/pinentry-1.2.1-include-memory.patch313
-rw-r--r--app-crypt/pinentry/files/pinentry-1.3.0-ifdef-qt.patch125
-rw-r--r--app-crypt/pinentry/pinentry-1.2.1-r7.ebuild111
-rw-r--r--app-crypt/pinentry/pinentry-1.2.1-r8.ebuild111
-rw-r--r--app-crypt/pinentry/pinentry-1.3.0-r3.ebuild144
-rw-r--r--app-crypt/pinentry/pinentry-1.3.1.ebuild2
-rw-r--r--app-crypt/qca/Manifest4
-rw-r--r--app-crypt/qca/qca-2.3.9.ebuild2
-rw-r--r--app-crypt/qca/qca-9999.ebuild2
-rw-r--r--app-crypt/rhash/Manifest7
-rw-r--r--app-crypt/rhash/rhash-1.4.3.ebuild89
-rw-r--r--app-crypt/rhash/rhash-1.4.4-r1.ebuild2
-rw-r--r--app-crypt/rhash/rhash-1.4.5.ebuild (renamed from app-crypt/rhash/rhash-1.4.4.ebuild)14
-rw-r--r--app-crypt/ssss/Manifest2
-rw-r--r--app-crypt/ssss/ssss-0.5.7-r2.ebuild (renamed from app-crypt/ssss/ssss-0.5.7-r1.ebuild)6
-rw-r--r--app-crypt/tpm2-tools/Manifest13
-rw-r--r--app-crypt/tpm2-tools/files/tpm2-tools-5.6-bashism.patch47
-rw-r--r--app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch123
-rw-r--r--app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog.sh-Fix-accidental-deletions.patch68
-rw-r--r--app-crypt/tpm2-tools/files/tpm2-tools-5.7-tests-Eliminate-dependency-on-which.patch42
-rw-r--r--app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild66
-rw-r--r--app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild81
-rw-r--r--app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild87
-rw-r--r--app-crypt/tpm2-tools/tpm2-tools-5.7.ebuild3
-rw-r--r--app-crypt/ubuntu-keyring/Manifest2
-rw-r--r--app-crypt/ubuntu-keyring/ubuntu-keyring-2023.11.28.1.ebuild4
-rw-r--r--app-crypt/veracrypt/Manifest2
-rw-r--r--app-crypt/veracrypt/veracrypt-1.26.15.ebuild111
-rw-r--r--app-crypt/xca/Manifest3
-rw-r--r--app-crypt/xca/files/xca-2.8.0-man-page.patch25
-rw-r--r--app-crypt/xca/xca-2.8.0.ebuild68
-rw-r--r--app-crypt/yubioath-flutter-bin/Manifest2
-rw-r--r--app-crypt/yubioath-flutter-bin/yubioath-flutter-bin-7.1.0.ebuild82
-rw-r--r--app-crypt/zulucrypt/Manifest5
-rw-r--r--app-crypt/zulucrypt/files/zulucrypt-5.5.0_pre20180223-fno-common.patch11
-rw-r--r--app-crypt/zulucrypt/zulucrypt-7.0.0.ebuild (renamed from app-crypt/zulucrypt/zulucrypt-5.5.0_pre20180223.ebuild)28
100 files changed, 1506 insertions, 2004 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 3ebc7b3285ec..83802d5286a3 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
Binary files differ
diff --git a/app-crypt/acme-sh/Manifest b/app-crypt/acme-sh/Manifest
index 6ba2c3b66ec3..58ee623ece05 100644
--- a/app-crypt/acme-sh/Manifest
+++ b/app-crypt/acme-sh/Manifest
@@ -1,8 +1,6 @@
AUX 99acme-sh 62 BLAKE2B b9542b99b2e720e0930139f7dd56efc63e596156dca1649624f6f4c27a7d57555bb13deb3b5714aa06477e9ca79996b5f891c8a91ea808d853cc7e5d5655b0a0 SHA512 b7fc9402e3bea3ca846bdb82d6f21d1b7023bb2ace8d5ffd146959cd12e3270243fd22e3a7dde9b6cefae8f2cbca369b35d2da4ea9f1e60a2f61ae81612d8bc5
AUX acme.sh 63 BLAKE2B 50c3284c0172ff0a0dc57fcfbaba57a6518d7c043b5d052f2710b28229b9b13313e7ca7c8b644ea273eb2f4991246631e70e6184fb5489005be12b77b8efa229 SHA512 7ec0764c86db5c68c42189a8af708e769189df201fdf017bd0d8d9e322ab71c2f422be382d170a1f4b876a1e5a6629eb55df0c564abfebab665e27e58660ff6e
-DIST acme.sh-3.0.7.tar.gz 284269 BLAKE2B 2e3d81446772049660d3a7b8005b82a890238d33ef16211b304ecd9b996063de9e788095ff958422f90d2e20615f84943d6085959ac2f27d6ad51a8eeffb2800 SHA512 83d080b461662bf2c5cfa9cb51aaf41d7f873f54908e2e5f94d7e3fe8e3f6953d73aafb66adc97455aa958f37c72ef77ba475c7d7cbb3ca3c5bbffb4937c4bae
-DIST acme.sh-3.0.8.tar.gz 296583 BLAKE2B becc2402edb9cfb867662b91dd0925c151b21cc56d9c956513678ede22cab1ddcb0cdf424131d301f349a10245a5566fcfcf87f16b927b5c7fb9211e9f070de5 SHA512 e18e75557a4b10a71a726bbef6383c7bc9276b7dcdcc80756da3136b2d9f819e787ef477fec326d05d96dbc90c114fb2a418889aaac996717a6c456cd131d30b
-EBUILD acme-sh-3.0.7.ebuild 1243 BLAKE2B 66fa9b2d39a67325894309a219c46ff44b188b78c76f738798f88015677385c99796ec66a5cc2259ddd006788c6b47c44f2f68eb86a308eb25a6b8f27189187b SHA512 1433edae7c84faae981932dcd9267e2907a8b91ef3aa859d0b7a703dea3c34420fc6bb1f825765b085fb306524b3e9c8ae1fe31b4a758a8706685adc7524da4a
-EBUILD acme-sh-3.0.8.ebuild 1243 BLAKE2B db82acf106c7a67f5bb4010bf7a3c66c8c1e9d04a3eab69f67f4e38e1c7cf4e73316d0aaf7273b4ff295e9ef6900bcf7b43a853e5aebb26e175901a2b1957a45 SHA512 8bf311915f6c4deced60b2e219f3da18050d083d35b78208dcd8556a35887e8a45c4873938a162d22abb54ec14705b44800e2744e60c265eed8fbf35a0137d0b
+DIST acme.sh-3.0.9.tar.gz 298025 BLAKE2B 166e311c63801cb6b4c8aade7afff63cba48ad74932c64b16a0ceb330176465548d9d99da5216b3c00146c59d37b48b24fb4c4bb1220bc5b7ea652d9000fddb1 SHA512 5f7431051de74ec1feca90d743233ddcec2a955e789e5237730498930c910d2a728c3f5e447a09f470a007ed9a4c90de329be58867d15a0fd13f6f18dca49bd0
+EBUILD acme-sh-3.0.9.ebuild 1243 BLAKE2B db82acf106c7a67f5bb4010bf7a3c66c8c1e9d04a3eab69f67f4e38e1c7cf4e73316d0aaf7273b4ff295e9ef6900bcf7b43a853e5aebb26e175901a2b1957a45 SHA512 8bf311915f6c4deced60b2e219f3da18050d083d35b78208dcd8556a35887e8a45c4873938a162d22abb54ec14705b44800e2744e60c265eed8fbf35a0137d0b
EBUILD acme-sh-9999.ebuild 1125 BLAKE2B f12d96d5937e7369877dd27265f486c51d694b6d764d0e9ae3b85ce284e01d10e9e2715384409e1930a88d586d84a95db46bccd85e01a8b777e668f3a250b0fa SHA512 1c96737632ff0cbaa9b636d01134807e140c9122ce695fcf301df5ba55acf06c0ab2b5a04c103e1a6fb3cc1d3a5d72111cf3df955fa765c349d6f3a9edc8fbb3
MISC metadata.xml 677 BLAKE2B 783e74dfc78dc11568fe72316c5bd100d18fd5c90987d9c21386930f98713d6be5de74d395ed919a8dd7986f0bada50d16c24a670ba856318d103b186a514046 SHA512 6a34e252d900761bc12fe5b1f8d8b8277fded6685f8495a307de4906a19d797f2a4eb9b84676ae1f5f43720c092e3f3d081ec243dff19efa626d4d538974efc1
diff --git a/app-crypt/acme-sh/acme-sh-3.0.7.ebuild b/app-crypt/acme-sh/acme-sh-3.0.7.ebuild
deleted file mode 100644
index 321de0c3a864..000000000000
--- a/app-crypt/acme-sh/acme-sh-3.0.7.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="${PN/-/.}"
-MY_P="${MY_PN}-${PV}"
-
-inherit optfeature
-
-DESCRIPTION="A pure Unix shell script implementing ACME client protocol"
-HOMEPAGE="https://github.com/acmesh-official/acme.sh"
-SRC_URI="https://github.com/acmesh-official/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-IUSE="selinux"
-
-RDEPEND="
- dev-libs/openssl:0
- net-misc/curl
- net-misc/socat
- selinux? ( sec-policy/selinux-certbot )
-"
-
-src_install() {
- newdoc deploy/README.md README-deploy.md
- newdoc dnsapi/README.md README-dnsapi.md
- rm {deploy,dnsapi}/README.md || die
- einstalldocs
-
- exeinto /usr/share/acme.sh
- doexe acme.sh
-
- insinto /usr/share/acme.sh
- doins -r deploy dnsapi notify
-
- keepdir /etc/acme-sh
- doenvd "${FILESDIR}"/99acme-sh
-
- insinto /etc/bash/bashrc.d
- doins "${FILESDIR}"/acme.sh
-
- dosym ../share/acme.sh/acme.sh usr/bin/acme.sh
-}
-
-pkg_postinst() {
- optfeature_header "For webserver mode, install a supported web server:"
- optfeature "using apache2 webserver mode" www-servers/apache
- optfeature "using nginx webserver mode" www-servers/nginx
-}
diff --git a/app-crypt/acme-sh/acme-sh-3.0.8.ebuild b/app-crypt/acme-sh/acme-sh-3.0.9.ebuild
index 541a699d4997..541a699d4997 100644
--- a/app-crypt/acme-sh/acme-sh-3.0.8.ebuild
+++ b/app-crypt/acme-sh/acme-sh-3.0.9.ebuild
diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest
index 9d626c8571da..bdcf555ea3b2 100644
--- a/app-crypt/acme/Manifest
+++ b/app-crypt/acme/Manifest
@@ -1,6 +1,6 @@
DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd
DIST certbot-2.11.0.gh.tar.gz 2322114 BLAKE2B d266483d1ffc9f9274df3d5e389ed961758e77e9455a7324132bb2bfe4896db663642a98ac7250d35fbbd60d6aef0d6d2a58f98ad17130958dcfcd61283c2479 SHA512 ba47fc98faaf47278c58e107356371c06039f70ad539d2ca1ac39462bb45c7a6c55ed525d8bd8b11cd35cf807f3423e19309022751a492ba19ded79cfbb6d7f4
EBUILD acme-2.10.0.ebuild 1531 BLAKE2B 15f0041fcccb610f9fc9b4ca24ebcf871b5577bdc82e266c7fb4efe929dc431bd4020ee903510399fea14972d0a20590ca3471d6ec7c5f02e6cd0e4c0e406372 SHA512 b63e983e64a5a65f5c5f19a579c57ee8269ae8840e3c2afd2c16b2d4bc57290425d49d7882de4b1afcf7a5bfaf51bdea524e4f93d127d13eb2452a38e3f65270
-EBUILD acme-2.11.0.ebuild 1535 BLAKE2B 33a51a7dac9b7af72bcedeec816cbe5142a948f2d86c1843020c356c020a9b835a38fea1b557148c9b1b3727753d391c31e13a5533553e0c030c6d5fb93c5ce9 SHA512 1d88d4a3814ee9204b57d2f2623bdf7afc29d9c3cceece965802cfb03361e30bab6f4e8cf66bb31b41e3353e63d0f4383c1e17ab1b4789aaa196e2367e647193
+EBUILD acme-2.11.0.ebuild 1531 BLAKE2B 15f0041fcccb610f9fc9b4ca24ebcf871b5577bdc82e266c7fb4efe929dc431bd4020ee903510399fea14972d0a20590ca3471d6ec7c5f02e6cd0e4c0e406372 SHA512 b63e983e64a5a65f5c5f19a579c57ee8269ae8840e3c2afd2c16b2d4bc57290425d49d7882de4b1afcf7a5bfaf51bdea524e4f93d127d13eb2452a38e3f65270
EBUILD acme-9999.ebuild 1535 BLAKE2B 33a51a7dac9b7af72bcedeec816cbe5142a948f2d86c1843020c356c020a9b835a38fea1b557148c9b1b3727753d391c31e13a5533553e0c030c6d5fb93c5ce9 SHA512 1d88d4a3814ee9204b57d2f2623bdf7afc29d9c3cceece965802cfb03361e30bab6f4e8cf66bb31b41e3353e63d0f4383c1e17ab1b4789aaa196e2367e647193
MISC metadata.xml 401 BLAKE2B 30a2ac1f03749a8e3bb98723c57f47ab6bcf7bfa58c2b6e21c309fae279feca0d3612df6c2a1dafaf27b4f0781c583a140322feac1a1cf2c13e50861cad129ea SHA512 d8e725b71ca81ce4ca6565ed58271b283c25394448f0f48f726f232122577c33d5b2d726e117419b2fae99f9dae29a8080bb9564eccbca13368c83988cf3da01
diff --git a/app-crypt/acme/acme-2.11.0.ebuild b/app-crypt/acme/acme-2.11.0.ebuild
index 7cc340a48d80..92f4d9253ea9 100644
--- a/app-crypt/acme/acme-2.11.0.ebuild
+++ b/app-crypt/acme/acme-2.11.0.ebuild
@@ -22,7 +22,7 @@ else
https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-> ${PARENT_P}.gh.tar.gz
"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
fi
DESCRIPTION="An implementation of the ACME protocol"
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 1f23e1cb06b3..445284bb8a71 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,9 +1,4 @@
-AUX ccid-1.5.4-remove-flex-configure-dependency.patch 2363 BLAKE2B 168934efb2350a4c9a385dbb9823ac32f2538227b4f81677462735e7d3e8909243742321677996d42980d3f0038e6c759b882a34a849fcc1613776154dbd3b48 SHA512 fa2b06a2dc425c0c937fdf674724c29afe1056e524b3a1a7708cfbc49f94ad01cf553750164828d1bfbce4a9009703aee49240c44a0ecec3de38ae125cda9993
AUX ccid-1.5.5-remove-flex-configure-dependency.patch 2353 BLAKE2B 18496a0dbcfc6987f05615b6c4bf44f07975ae818016470082de68b85eacb8d308147a2e9b1d6aaf69f6a0237d38811bfd2a5597cb5f7f78e5c1ca02043ca82f SHA512 49039d0b4170a226c305bf21cd9069535eedc6436d1ee0fce1b643f5d45d1a35ece16c6f7274ca02f10ee0057bb8d6a88098f2cadbcec6ca2e4035c4cc59af9d
-DIST ccid-1.5.1.tar.bz2 702586 BLAKE2B 7b9e3c6daf03c186f34ac9b13bd960293a6481f9237ee52937ece1040bd3a79b7dab318e1244205a7feae992261ab5e82292d80ae023a4f621e0e7af7cdb9df5 SHA512 492bde96f5752e2a5316693c44e35e2d041785a00d15e094905c0aafad392f5329009d12801899367276328a582936ee53a1c5239c1813c4536001cb8a608f2e
-DIST ccid-1.5.4.tar.bz2 706834 BLAKE2B 8b7f08145808ac94d085eef62c204f8146892cb11f2ce811e46e674272cab016d602afb945c6e808ce3957a80e847c0de2815fedaf15fc8c935cafaccf102762 SHA512 4b30f4768aebf49486a1b1e959615fa077bd393bfdd9e52c15bdc8d6ed63ce27fa7cf82a067d1f80d8b3534c66194036925d3fea5af64b6a775779d38267c757
DIST ccid-1.5.5.tar.bz2 708374 BLAKE2B a82986ead2dbb3241ef419ad16eb0fac835c5ab4fa988e5ee53cd1608a30a9381210a6fd013b6a059ca2835d55b4a41afa4064575e91b8eb356bff6d01d19add SHA512 9d2aebe645a5880bfad7d420ddab96811d1fd989c79afa28f5471ae53f36b6d45ee5e13b32ac4afcf59fc762ae835db7e6312ad6642b263158c2d9a30c7651bd
-EBUILD ccid-1.5.1.ebuild 934 BLAKE2B 9b1d00a0c97768b5affcc9c83e1a8077953fa34bc96b780c6d2499286d51e8f48883b916b7a1b0c1bdaf9c3a9b24d0ea199577a40cfe0c503325b3abfbc48a65 SHA512 83d1e60666f245d3121da229aba60a43138dc4f4adf6ef7e80e4cdd749ef908e51c306f6030bd8f75a8d2c64972509fda6561263a74d0f1e9be3d6b2cb245d08
-EBUILD ccid-1.5.4.ebuild 1058 BLAKE2B c5aee5cc066fbb25f7dd44095d6af055ff84adad104e62268856cf4c8f48cd3ce3ebc4ab84015083d3281706be173bad063f942f2c29b1d959815b31f8b7e5dc SHA512 11a3751bf63e07e13ce399996d6cebb5c5e2007706dae981eb5224bba5715bd745d8cd0a7bd06b7d9aa88072b0e0185355c9cc751108c918ccfde289093d38cb
-EBUILD ccid-1.5.5.ebuild 1063 BLAKE2B c49cdcf3617b3b1a682c280904c0ff0435f331444be32e11957ec1f6aba8f8d68ddaeb0c11e6ae3e15657118bd3874e971751b4dd8774ed2efd3076aa1891e70 SHA512 2dce422ffac251f5752429d9c8dac4baf04f1a8b93d95ee71bad83832efa1a2e7cf9c8cf3d4cfb4de6b0e0b79c7447830f2141f0b87074a014db9026e9d7532f
+EBUILD ccid-1.5.5.ebuild 1058 BLAKE2B c5aee5cc066fbb25f7dd44095d6af055ff84adad104e62268856cf4c8f48cd3ce3ebc4ab84015083d3281706be173bad063f942f2c29b1d959815b31f8b7e5dc SHA512 11a3751bf63e07e13ce399996d6cebb5c5e2007706dae981eb5224bba5715bd745d8cd0a7bd06b7d9aa88072b0e0185355c9cc751108c918ccfde289093d38cb
MISC metadata.xml 551 BLAKE2B 6290f9b5be875fb339b7414b02595a034946c7f612fc4f6b5f7edba4f88697181af0ed26231cd27ade41f5536aa62df26ee2bea002fc69cd716a648f45268cf5 SHA512 e7a7f47db4aba8712a7ea5c7efd63c76e0f5712588bca7dd9b8e7755f51cad0298a087ee7bedfcdc51b84866671f1436e2228359f1f2fbfe647f2e6a9f1e2ae5
diff --git a/app-crypt/ccid/ccid-1.5.1.ebuild b/app-crypt/ccid/ccid-1.5.1.ebuild
deleted file mode 100644
index 10523364f72e..000000000000
--- a/app-crypt/ccid/ccid-1.5.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit udev
-
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
-SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-IUSE="twinserial +usb"
-
-RDEPEND="
- >=sys-apps/pcsc-lite-1.8.3
- twinserial? ( dev-lang/perl )
- usb? ( virtual/libusb:1 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-src_configure() {
- econf \
- LEX=: \
- $(use_enable twinserial) \
- $(use_enable usb libusb)
-}
-
-src_install() {
- default
- udev_newrules src/92_pcscd_ccid.rules 92-pcsc-ccid.rules
-}
-
-pkg_postinst() {
- udev_reload
- einfo "Check https://github.com/LudovicRousseau/CCID/blob/master/INSTALL"
- einfo "for more info about how to configure and use ccid"
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/app-crypt/ccid/ccid-1.5.4.ebuild b/app-crypt/ccid/ccid-1.5.4.ebuild
deleted file mode 100644
index e5153164d98b..000000000000
--- a/app-crypt/ccid/ccid-1.5.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools udev
-
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
-SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-IUSE="twinserial +usb"
-
-RDEPEND="
- >=sys-apps/pcsc-lite-1.8.3
- twinserial? ( dev-lang/perl )
- usb? ( virtual/libusb:1 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-remove-flex-configure-dependency.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- LEX=: \
- $(use_enable twinserial) \
- $(use_enable usb libusb)
-}
-
-src_install() {
- default
- udev_newrules src/92_pcscd_ccid.rules 92-pcsc-ccid.rules
-}
-
-pkg_postinst() {
- udev_reload
- einfo "Check https://github.com/LudovicRousseau/CCID/blob/master/INSTALL"
- einfo "for more info about how to configure and use ccid"
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/app-crypt/ccid/ccid-1.5.5.ebuild b/app-crypt/ccid/ccid-1.5.5.ebuild
index 2a6414eadb4a..e5153164d98b 100644
--- a/app-crypt/ccid/ccid-1.5.5.ebuild
+++ b/app-crypt/ccid/ccid-1.5.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
IUSE="twinserial +usb"
RDEPEND="
diff --git a/app-crypt/ccid/files/ccid-1.5.4-remove-flex-configure-dependency.patch b/app-crypt/ccid/files/ccid-1.5.4-remove-flex-configure-dependency.patch
deleted file mode 100644
index b0c8122b6ec6..000000000000
--- a/app-crypt/ccid/files/ccid-1.5.4-remove-flex-configure-dependency.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 5bd94d9670ad10df9f14349dfa098d0a2e40ab08 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz93@gmail.com>
-Date: Mon, 10 Jun 2024 22:02:37 -0400
-Subject: [PATCH] make building work again when flex is not installed
-
-This explicitly reverts commit eec7cdf03dda2bd26e320ead73b91da5a9d86443
-because it was a bad idea.
-
-The motivating bug report was https://github.com/LudovicRousseau/PCSC/issues/124
-and the issue there occurred when building from a git clone, running
-./bootstrap && ./configure && make, and having:
-
-- configure succeed
-- make "succeeeds" at having $LEX run, do nothing and fail to generate
- required sources
-- compiling nonexistent files fail with highly confusing errors
-
-The autoconf manual has always documented the correct way to handle this
-is to check if lex is unavailable, and set it to the famous automake
-wrapper "missing", which checks if a program is missing at build time
-rather than at ./configure time, and fails the build if the rule cannot
-be run. This means:
-
-When building from a git clone, if flex is not available then
-- configure succeeds
-- make fails to run $LEX, and tells you to install flex
-
-The previous attempt to fix the highly confusing error instead resulted
-in configure erroring out, and saying flex is required, even when it is
-*not* required because a `make dist` tarball was used, which contains
-pregenerated tokenparser.c for the express purpose of making flex
-unnecessary.
-
-See autoconf documentation on $LEX:
-https://www.gnu.org/software/autoconf/manual/autoconf-2.72/html_node/Particular-Programs.html#index-AC_005fPROG_005fLEX-1
-
-And automake documentation on why to use "missing":
-https://www.gnu.org/software/automake/manual/html_node/maintainer_002dmode.html
-
-Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
----
- configure.ac | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d291f2b..a5af2eb 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,10 +33,10 @@ AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- AC_PROG_LN_S
- AC_PROG_LEX([noyywrap])
--if test $LEX = ":"
--then
-- AC_MSG_ERROR([no lex or flex found])
--fi
-+AS_IF([test $LEX = ":"], [
-+ AM_MISSING_PROG(MISSINGLEX, [flex])
-+ LEX=$MISSINGLEX]
-+)
- AM_PROG_AR
- PKG_PROG_PKG_CONFIG
-
-@@ -354,4 +354,3 @@ AC_CONFIG_FILES(Makefile
- examples/Makefile)
-
- AC_OUTPUT
--
---
-2.44.2
-
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 52eebdc8d382..21d2922d0f3b 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,6 +1,7 @@
DIST certbot-2.10.0.gh.tar.gz 2322931 BLAKE2B cb84815ec2db2b4b365f2f2bdee1749263b540a1b67f9195280bdb122307337d294beb403bc05b236a94ed0782b0d093e2b8527a65cb69cac949fa627388e8bd SHA512 444981952140376808a9aa475a692df91e60fffc6d45902a3f809bc07311a7d6597ad56e712d3dae234450eb1c735db431182e784bc748511e68bf4f5f2d6cbd
DIST certbot-2.11.0.gh.tar.gz 2322114 BLAKE2B d266483d1ffc9f9274df3d5e389ed961758e77e9455a7324132bb2bfe4896db663642a98ac7250d35fbbd60d6aef0d6d2a58f98ad17130958dcfcd61283c2479 SHA512 ba47fc98faaf47278c58e107356371c06039f70ad539d2ca1ac39462bb45c7a6c55ed525d8bd8b11cd35cf807f3423e19309022751a492ba19ded79cfbb6d7f4
EBUILD certbot-2.10.0.ebuild 1528 BLAKE2B 545abbd95761600f13ec22cbcf996ca4b1a04a1fb08b0dadcefa9696a35a3765f009733c3a8b153e22d24df223cb778ac05684110188a7886ee3eed2498d472c SHA512 43c0107185d0e36b0630d5b69e77bc32d43c6dcfe254b5fb8d0f92ae105452f3ca4013a6f1a859a85e0e473855d898637eb1938e7fd67fe138eb29700c3cd839
-EBUILD certbot-2.11.0.ebuild 1532 BLAKE2B 0fa348ecdb0750887cfd220ae9d55e147771b8fc503f2c8ee5d1004066ed1d4a3dccd804088271e09005939483871012f879e327ded91a5657a0205b7079ec89 SHA512 52bc685c1ab676c4f4dd96d40b3ea990a90b67a6d3977eca3e8bc3c7448f841d3a943458245ab16f217acb8db23882139d7fe6b871b2781e62d447c65d2f8c58
+EBUILD certbot-2.11.0-r3.ebuild 1532 BLAKE2B 0fa348ecdb0750887cfd220ae9d55e147771b8fc503f2c8ee5d1004066ed1d4a3dccd804088271e09005939483871012f879e327ded91a5657a0205b7079ec89 SHA512 52bc685c1ab676c4f4dd96d40b3ea990a90b67a6d3977eca3e8bc3c7448f841d3a943458245ab16f217acb8db23882139d7fe6b871b2781e62d447c65d2f8c58
+EBUILD certbot-2.11.0.ebuild 1528 BLAKE2B 545abbd95761600f13ec22cbcf996ca4b1a04a1fb08b0dadcefa9696a35a3765f009733c3a8b153e22d24df223cb778ac05684110188a7886ee3eed2498d472c SHA512 43c0107185d0e36b0630d5b69e77bc32d43c6dcfe254b5fb8d0f92ae105452f3ca4013a6f1a859a85e0e473855d898637eb1938e7fd67fe138eb29700c3cd839
EBUILD certbot-9999.ebuild 1532 BLAKE2B 0fa348ecdb0750887cfd220ae9d55e147771b8fc503f2c8ee5d1004066ed1d4a3dccd804088271e09005939483871012f879e327ded91a5657a0205b7079ec89 SHA512 52bc685c1ab676c4f4dd96d40b3ea990a90b67a6d3977eca3e8bc3c7448f841d3a943458245ab16f217acb8db23882139d7fe6b871b2781e62d447c65d2f8c58
MISC metadata.xml 404 BLAKE2B 81266457a8db353ea7c650478797e49ba61828d9cf0116a94fc62e5ee7a87272b25660f45741cf98843cfc2a5c286284b59f568ad8f4ad33d2bce60bc04549dc SHA512 d7b1e2417cba958f59b05cac02fee15e361fe9657f28d53d6308011767637d838dc09dd4ce21ba56d5174af0fa4cb6a7fee5771f780d7127d9de5a9e628172fd
diff --git a/app-crypt/certbot/certbot-2.11.0-r3.ebuild b/app-crypt/certbot/certbot-2.11.0-r3.ebuild
new file mode 100644
index 000000000000..7762dd3262d4
--- /dev/null
+++ b/app-crypt/certbot/certbot-2.11.0-r3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+if [[ "${PV}" == *9999 ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/certbot/certbot.git"
+ EGIT_SUBMODULES=()
+ EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+else
+ SRC_URI="
+ https://github.com/certbot/certbot/archive/v${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+ "
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Let’s Encrypt client to automate deployment of X.509 certificates"
+HOMEPAGE="
+ https://github.com/certbot/certbot/
+ https://pypi.org/project/certbot/
+ https://letsencrypt.org/
+"
+
+S="${WORKDIR}/${P}/${PN}"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="selinux"
+
+BDEPEND="
+ test? (
+ dev-python/typing-extensions[${PYTHON_USEDEP}]
+ )
+"
+
+# See certbot/setup.py for acme >= dep
+RDEPEND="
+ >=app-crypt/acme-${PV}[${PYTHON_USEDEP}]
+ >=dev-python/ConfigArgParse-1.5.3[${PYTHON_USEDEP}]
+ >=dev-python/configobj-5.0.6[${PYTHON_USEDEP}]
+ >=dev-python/cryptography-3.2.1[${PYTHON_USEDEP}]
+ >=dev-python/distro-1.0.1[${PYTHON_USEDEP}]
+ >=dev-python/josepy-1.13.0[${PYTHON_USEDEP}]
+ >=dev-python/parsedatetime-2.4[${PYTHON_USEDEP}]
+ dev-python/pyrfc3339[${PYTHON_USEDEP}]
+ >=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+ selinux? ( sec-policy/selinux-certbot )
+"
+
+distutils_enable_sphinx docs \
+ dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+python_test() {
+ local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+ epytest
+}
diff --git a/app-crypt/certbot/certbot-2.11.0.ebuild b/app-crypt/certbot/certbot-2.11.0.ebuild
index 7762dd3262d4..97ed2a10849a 100644
--- a/app-crypt/certbot/certbot-2.11.0.ebuild
+++ b/app-crypt/certbot/certbot-2.11.0.ebuild
@@ -19,7 +19,7 @@ else
https://github.com/certbot/certbot/archive/v${PV}.tar.gz
-> ${P}.gh.tar.gz
"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
fi
DESCRIPTION="Let’s Encrypt client to automate deployment of X.509 certificates"
diff --git a/app-crypt/debian-archive-keyring/Manifest b/app-crypt/debian-archive-keyring/Manifest
index 0869d49cce03..6eb64da428d1 100644
--- a/app-crypt/debian-archive-keyring/Manifest
+++ b/app-crypt/debian-archive-keyring/Manifest
@@ -1,7 +1,3 @@
-DIST debian-archive-keyring_2021.1.1_all.deb 93592 BLAKE2B 8e17e16b2f0c670a1c486e8d139bf3da68ee7606052b219dd0b0bdc1334434686fe1920a33fcaf8e51e5b162c375e3528c3e565b99313f55e3dc9517eae5f4c5 SHA512 64575ab9f23b69ca98f13d535e18574b6d7805add0d56238e760b9e639c9990f3f3d865460fdaf86480c3905a3f3d7637b56e2998ae60f2f05e2d08e148ddcc7
-DIST debian-archive-keyring_2023.3_all.deb 160696 BLAKE2B f674b1e713355423e9f8a05bdad60c4bd5cc4e523ba9110468f043fe2f919b9c260c8ba612f45cc3331231fd44c38da0e29e8643c650206d0068114763e8f4df SHA512 c7f93756270b102bf1a6539e15bfc3ef65377b150f8258b7f994802e17518a468d2514739257aad1ce29be0113671fa31823a94a0b88f96f9925f88682429ac7
DIST debian-archive-keyring_2023.4_all.deb 160732 BLAKE2B 361fa5fc691c629adbbcfa7aaac10b2a6b094769db266cbfbdc22b74d70b8e836c7a645d8bf4f784f7f89642b973a94e776df1b7dba38317edc76f8fbad2694e SHA512 43360871728355eab0d5bbb5eee7fbb0adfdde97eb828972b0eebbb3f3b23369ac5825b232e444f0a212e00e47863dcd9d260db4f04394c9e1b7dfd282e44904
-EBUILD debian-archive-keyring-2021.1.1.ebuild 572 BLAKE2B aeefb72e33b8f736b11661640e2b2c304def4be822c5d201dc79c767e0aa32f65e8b9eef5c7f66716629b238f1db41ba57c87fa1db131c9590353d26f208d4f7 SHA512 09b621e427385f78be2409c9db22f5b3bef2aa25806b40fae9bd3a9a0c5385ba2d3204115fd6154ba28fbae3373c74d283bd16c8dd5db059de514a93a624c713
-EBUILD debian-archive-keyring-2023.3.ebuild 585 BLAKE2B 0aa07b2af28a663f6883a4991ec42b2c08036e8bc53b1294f43b9ec50cabd99dd59700dad66757c47842b57eb2ef3ac9a8f60abedbabc68de1a803fb1d993835 SHA512 4e62e7912cae4b78d74deef3318619c578a7357189c6108b48d5affa04d6221913afa3018e8590e6b4bb5254181f7b088188005d129125986abc8d7596b817c1
-EBUILD debian-archive-keyring-2023.4.ebuild 585 BLAKE2B 0aa07b2af28a663f6883a4991ec42b2c08036e8bc53b1294f43b9ec50cabd99dd59700dad66757c47842b57eb2ef3ac9a8f60abedbabc68de1a803fb1d993835 SHA512 4e62e7912cae4b78d74deef3318619c578a7357189c6108b48d5affa04d6221913afa3018e8590e6b4bb5254181f7b088188005d129125986abc8d7596b817c1
+EBUILD debian-archive-keyring-2023.4.ebuild 591 BLAKE2B 747e39f2655bd3e3a45a7de83217e8eed1bb14b7518855592f8eddba04aa4eb6e085699a7c145dd47cad09914023540dad5f49d9518e66b719fc0d1022c49fd5 SHA512 88e8f161bb80640396e782dd1df7fdb0806b86cc2f89c87ae9a412fcea4793f81117abf9a4dcf5a3e839785e1aab99f981d695d731379921bbd6cbcd49fbe4fe
MISC metadata.xml 281 BLAKE2B 656a093cc4296d44da7aae8489bc5818873797765a02cd8e14e1b2baa9b5d22f3fe920c9c8c37420172c6dea5e7bc065ded9985e24d0c00804515a0fa50c5055 SHA512 c4944985c300a4917fa6fa449a6d84af84c353ecfa8f944c1cd8f37a9ab8b82c92fc6a66d2eff6a0a8e50b5d21ff8639406106d3188e06126c04ce49820ccb34
diff --git a/app-crypt/debian-archive-keyring/debian-archive-keyring-2021.1.1.ebuild b/app-crypt/debian-archive-keyring/debian-archive-keyring-2021.1.1.ebuild
deleted file mode 100644
index 547d41918d4e..000000000000
--- a/app-crypt/debian-archive-keyring/debian-archive-keyring-2021.1.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker
-
-DESCRIPTION="GnuPG archive keys of the Debian archive"
-HOMEPAGE="https://packages.debian.org/sid/debian-archive-keyring"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}_all.deb"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_install() {
- doins -r .
-
- # https://bugs.gentoo.org/729142
- gunzip "${D}"/usr/share/doc/${PN}/changelog.gz || die
-
- mv "${D}"/usr/share/doc/{${PN},${PF}} || die
-}
diff --git a/app-crypt/debian-archive-keyring/debian-archive-keyring-2023.3.ebuild b/app-crypt/debian-archive-keyring/debian-archive-keyring-2023.3.ebuild
deleted file mode 100644
index 47f1db2a04c5..000000000000
--- a/app-crypt/debian-archive-keyring/debian-archive-keyring-2023.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit unpacker
-
-DESCRIPTION="GnuPG archive keys of the Debian archive"
-HOMEPAGE="https://packages.debian.org/sid/debian-archive-keyring"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}_all.deb"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_install() {
- doins -r .
-
- # https://bugs.gentoo.org/729142
- gunzip "${D}"/usr/share/doc/${PN}/changelog.gz || die
-
- mv "${D}"/usr/share/doc/{${PN},${PF}} || die
-}
diff --git a/app-crypt/debian-archive-keyring/debian-archive-keyring-2023.4.ebuild b/app-crypt/debian-archive-keyring/debian-archive-keyring-2023.4.ebuild
index 47f1db2a04c5..6843dd929c25 100644
--- a/app-crypt/debian-archive-keyring/debian-archive-keyring-2023.4.ebuild
+++ b/app-crypt/debian-archive-keyring/debian-archive-keyring-2023.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}_all.deb"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
IUSE=""
S="${WORKDIR}"
diff --git a/app-crypt/easy-rsa/Manifest b/app-crypt/easy-rsa/Manifest
index d3a9118f8b00..874095a02a5f 100644
--- a/app-crypt/easy-rsa/Manifest
+++ b/app-crypt/easy-rsa/Manifest
@@ -1,10 +1,6 @@
AUX 65easy-rsa 37 BLAKE2B 4a53c21a6027a9c5857d93e23703651b3d2642f54ce4519e727dd421230662f27f2ab45761041cf5b6b6cd654831d33297f1656eab26c496ee3e4f9d39f6ac3d SHA512 2f8c4f489ebd2ad2e5a0d45351361ecfc06a9481d9e15ea48215addb82ddf2083a85acb0a5c171d0c7e5406152d3679a5a7835e22ba9953e554614d94026d778
-DIST easy-rsa-3.1.2.tar.gz 6424018 BLAKE2B fef84b90875837c151bf9d71f71587d81aba79579948f4ff29ec3632cd17b0de82bf64c7d25b93720a696d339acdbf520b3a366e3ab214789acd17629d5db5ba SHA512 f36d3e11488ee98be4d901a8ae4f6cf08f4f0efc95bec38d1f1cde3ebd9dd133fe493cab2ebbbbbc99e803e318f93536e6a45ae677adb65c94d998114278035a
-DIST easy-rsa-3.1.6.tar.gz 6814828 BLAKE2B e61fa195e8edeb4b529c86f5814f47f8b10746dfe2effe48685651edd43e4ec9efe4acc2df4d5d13e4348455e36d0623bf5d1a78f2b0f68fb0e63afcee8630d4 SHA512 fb4cb25d63c2ca81cb1723d2ad0f321ff78b519fbde99ebbb97cea82d69292d283a5b927583f9721e91d157587615ecb7c918364d3aca0676b4e2ee624883074
-DIST easy-rsa-3.1.7.tar.gz 6553099 BLAKE2B d1f8b5d6062d834e0e76111a724eb05bd554238c9e418db703ca216f348fd55d741294c49d24957e23f054c81eb85c2c45995a17fb24a91f388b766d33537118 SHA512 8569121fb2d0d1c0810413b8b533fd2cbb27faa5df28bf60c35fddbef1696280c95fe0cd30e286c994596e46ec6709f650c2e6ea5ec07715cdc90da9dcbba5d2
DIST easy-rsa-3.2.0.tar.gz 7033408 BLAKE2B ad1779d6eec3d3b36b7f1c13e73c29bbebe7709c0ef91da1b53482eeab01ad56335bf0ec7bc83331976df926dbb316fc35fc7b83934955c72c9c60b5ecb207f6 SHA512 410453cd170400fafa85547a49a2b4072683bd8c33fba64f81506cb571cd9da8c4c13d13108120c55541aabfe5ceaf3fd491d8f7105c5cc4e4082505777e8282
-EBUILD easy-rsa-3.1.2.ebuild 727 BLAKE2B 96e2ffeb9ba650f6e90d47893d7ec49ebe880df2c35bd103f803c61e60fe6292158b09d2cc242a850f41eb8dd92c8dfd1c37879b9622206b47726fe358eadf4a SHA512 8437a27d9431b29d6250b5ea90af3543d76e4b51eaaf7731fc38a68db619a704e2d1057044bd9ce62b39f8ec2c9bd9d365ff95e35a6c37211045b59ed1df4165
-EBUILD easy-rsa-3.1.6.ebuild 733 BLAKE2B 66a96841c6bfe9c7959062104534c81b4cbfe15f60179d44deac3371876ae221749bfeb20880f68780572b90565aa880ba913d50f1484379cb9e90357016431a SHA512 5135ae25eed4b1b0c84b9dc2b9723a3b0f9baf80374127376a955b63e8ea3000da4972e77dd0c86af4c908f0879da6b397a16b4a68551bf48bcba38dde4c6d6e
-EBUILD easy-rsa-3.1.7.ebuild 733 BLAKE2B 66a96841c6bfe9c7959062104534c81b4cbfe15f60179d44deac3371876ae221749bfeb20880f68780572b90565aa880ba913d50f1484379cb9e90357016431a SHA512 5135ae25eed4b1b0c84b9dc2b9723a3b0f9baf80374127376a955b63e8ea3000da4972e77dd0c86af4c908f0879da6b397a16b4a68551bf48bcba38dde4c6d6e
+DIST easy-rsa-3.2.1.tar.gz 7043742 BLAKE2B 7bc6d5534e47fed6b22de745b9d8ba579f1be49ad52a2d985d81cd1b2e22914b796c47b1a2aab8ca3944eaca37152c30d73659a200f870d1bff1a4bd87830557 SHA512 cdaf5167c31bfa506f7837e664837659a251f317ed3a5a1fcadd1ade4d25e4e8b855bccd3a8c26a14b87f65d8906990e01e87ffe4c6faad83bd008df3ebb3939
EBUILD easy-rsa-3.2.0.ebuild 756 BLAKE2B 0f3da99e21b5ac3eef6e65ed18c8bda78bcf970bba504043cc19b943b41a737c71491de65579ae496703830df4cc0c04e22cc1f30f81326f2302e4572b9dd5f0 SHA512 7ed2c4f86a4baee6dc2d1f00caad2dc876e6a5f013838c3f1bb982f40628ce79f8cedfb4539123004958beff1c520e7f6984788e588643806dff3e5891ee98f9
+EBUILD easy-rsa-3.2.1.ebuild 762 BLAKE2B 317136066ecf71be2deeaf8dea24e01961bfeb49488b9a2ce1fe78055929dea5c67125591818f98b59fc3a1fcdee80ea3447c57c56e9e7441400f9112d3df405 SHA512 e3c66686323de914bece205a15e76666cb508c90db90aa08bd09f45b05f5df5203bda71e2b17b4699abbb1220c95b8f4c1dff2f093df007ab3ffd8239726ee3c
MISC metadata.xml 334 BLAKE2B e1ef3179415d52b55684873a36d6ed5eeff1c2727816a862feb34fdfebb9774bf7930e1e5028c0146034fb85e9214b0958b021db89dba15f8bf8f7cf78dada1e SHA512 9964c197845a58aede767ae26fdf3ab707a9e74bfc05deacc4c0b8d8349f33e9d64794045d5937d01529f704ec69bb8ecd42dddc8ea6553dc01d4e8e8dd949df
diff --git a/app-crypt/easy-rsa/easy-rsa-3.1.6.ebuild b/app-crypt/easy-rsa/easy-rsa-3.1.6.ebuild
deleted file mode 100644
index 0f1dc242b23a..000000000000
--- a/app-crypt/easy-rsa/easy-rsa-3.1.6.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Small RSA key management package, based on OpenSSL"
-HOMEPAGE="https://openvpn.net/"
-SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-DEPEND=">=dev-libs/openssl-0.9.6:0="
-RDEPEND="${DEPEND}"
-
-src_install() {
- exeinto /usr/share/easy-rsa
- doexe easyrsa3/easyrsa
- insinto /usr/share/easy-rsa
- doins -r easyrsa3/{vars.example,openssl-easyrsa.cnf,x509-types}
- dodoc README.quickstart.md ChangeLog
- dodoc -r doc
- doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
-}
diff --git a/app-crypt/easy-rsa/easy-rsa-3.1.7.ebuild b/app-crypt/easy-rsa/easy-rsa-3.1.7.ebuild
deleted file mode 100644
index 0f1dc242b23a..000000000000
--- a/app-crypt/easy-rsa/easy-rsa-3.1.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Small RSA key management package, based on OpenSSL"
-HOMEPAGE="https://openvpn.net/"
-SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-
-DEPEND=">=dev-libs/openssl-0.9.6:0="
-RDEPEND="${DEPEND}"
-
-src_install() {
- exeinto /usr/share/easy-rsa
- doexe easyrsa3/easyrsa
- insinto /usr/share/easy-rsa
- doins -r easyrsa3/{vars.example,openssl-easyrsa.cnf,x509-types}
- dodoc README.quickstart.md ChangeLog
- dodoc -r doc
- doenvd "${FILESDIR}/65easy-rsa" # config-protect easy-rsa
-}
diff --git a/app-crypt/easy-rsa/easy-rsa-3.1.2.ebuild b/app-crypt/easy-rsa/easy-rsa-3.2.1.ebuild
index d088e3e3aab0..af86a09c2dfe 100644
--- a/app-crypt/easy-rsa/easy-rsa-3.1.2.ebuild
+++ b/app-crypt/easy-rsa/easy-rsa-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,14 +9,14 @@ SRC_URI="https://github.com/OpenVPN/easy-rsa/archive/v${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
DEPEND=">=dev-libs/openssl-0.9.6:0="
RDEPEND="${DEPEND}"
src_install() {
exeinto /usr/share/easy-rsa
- doexe easyrsa3/easyrsa
+ doexe easyrsa3/easyrsa dev/easyrsa-tools.lib
insinto /usr/share/easy-rsa
doins -r easyrsa3/{vars.example,openssl-easyrsa.cnf,x509-types}
dodoc README.quickstart.md ChangeLog
diff --git a/app-crypt/glep63-check/Manifest b/app-crypt/glep63-check/Manifest
index a1b314a11ca6..50472d49a470 100644
--- a/app-crypt/glep63-check/Manifest
+++ b/app-crypt/glep63-check/Manifest
@@ -1,3 +1,3 @@
DIST glep63-check-11.tar.gz 73765 BLAKE2B f1893397c18458d1a9abb0236334f2acf9adcb4cf13229f49887cd1381db4e68c470f604b76b339c5481207c63522a3f99256e00cba820e3a15c412a8e52ec2d SHA512 6ee9ed33ee259eaa14d6fb1d914e555aae5b622d04f08a2eef094e7ff20ce9368a3af105a55cbc2c37ced5b51846f17651b20a2c0644f0efcc883eea49f0310b
-EBUILD glep63-check-11.ebuild 705 BLAKE2B 609d6b3da9a306e4c3bd5c2928ef50e68304964eba21bd9bf6b743e5e726d7ce54905391987b3e7278356bb393f223da2fd984f2b7af5d35bfae4419cf3b9414 SHA512 779e5b79e19a75243898a10d064a584afa6aa6ef4ed6a4230f144651ac99e7474d96161c8768b674e7362b99800e42fb6bf33990effac1785040cdcf2188a255
+EBUILD glep63-check-11.ebuild 705 BLAKE2B cbe206355a544ef382e2f3b1af900e846203964d3d6e7a3ca0521be00c0ae80c7a48397b33e863c7a4bebe8d677f459191ad098ec132d1cc06c7f826a001e618 SHA512 fa26b166ce56a3c1ba8a39b4193f7151ea4f63ca57b4ec00a026f6716a602145a65b14899dec92b3733d425c2dc07e669a06a6a9536aa8f8a47e79d7c4e797df
MISC metadata.xml 538 BLAKE2B 048a37ba118ccf91598205ccb0a2122b556f0e24f81fcde068f1413ab4db15687ae55830c4cab1d1ad1bc3ff2d51a7c16c855b58857d3dc08db274971cebb275 SHA512 9e865daaa782e8973dcce7d2ad715b0ba1081833211714c61552a0cf8b425d88c9df2692927c35cdc580256202b9c86d51026696d7fc6620b187afa1d84010e1
diff --git a/app-crypt/glep63-check/glep63-check-11.ebuild b/app-crypt/glep63-check/glep63-check-11.ebuild
index 5c8ed0f1b659..219a87590c93 100644
--- a/app-crypt/glep63-check/glep63-check-11.ebuild
+++ b/app-crypt/glep63-check/glep63-check-11.ebuild
@@ -4,7 +4,7 @@
EAPI=8
DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit distutils-r1
diff --git a/app-crypt/gnupg-pkcs11-scd/Manifest b/app-crypt/gnupg-pkcs11-scd/Manifest
index 8a9489f2e5eb..a5eb4d5b48ac 100644
--- a/app-crypt/gnupg-pkcs11-scd/Manifest
+++ b/app-crypt/gnupg-pkcs11-scd/Manifest
@@ -1,5 +1,8 @@
AUX gnupg-pkcs11-scd-proxy.confd 38 BLAKE2B 56951cac6c364a75191cbcf5b074e537bf9783e32defe4c571a64e00754565666c4f379956ff4b1db713d496ebb838ff599d2b25223fb66652dd7d727812ef4f SHA512 15a4e6534e5069a9f02050e0d7dc5a27609065fafa789985a2ab448033811c9099fbc00ded558b98797b6191c5ced94cbd1bda626a1dab85cde747a856ed1ecf
AUX gnupg-pkcs11-scd-proxy.initd 685 BLAKE2B a7f38141554e98b859f8a6945c7e50f1c223157163bfa3f2dc10c291458935b95b29a8a383f937e144e4970d63e3b857bb9f6ec51143f90043f57da92f083feb SHA512 7afd4f088946f6829b19b897eb7bee67456f25a3f14d10f6fed14918327212d19cdd01028214207a4aba3abed6fb592e34333a5e2424d830af2ff1ec8d8a5e02
DIST gnupg-pkcs11-scd-0.10.0.tar.bz2 149036 BLAKE2B 7282850ddb953a32114a3b28e9f1992dd73cc64d065c00308479276750bdfd52533c3347361d86fb6ddc8ae01fcfabe5b375501280c9bd93e6a6d4e209c63e98 SHA512 47b9afdc3552fc9a741a725c6732cd31cd2643d7483a50d26222d68d0557b700addff37d8598ee1076575b8bc1e1134a52e06b67d4f94dda7c90141a57ca4182
-EBUILD gnupg-pkcs11-scd-0.10.0.ebuild 994 BLAKE2B bd0149df0723dbc6d781f76358084dee271635f0c72ed2d4d59dd63b4b2010178d6403a6535827efd0f36e1937ea749ba5e542855f13969f91837f1e19e1d3d3 SHA512 cfe2a220ca7f9507b8d0d8b7940f1bb6871f56d1935b3e9ff5be24eac58967c4de62c868ac2c20b80e09d37eb5018efe2e932f17ffb178095188aad7134e2529
+DIST gnupg-pkcs11-scd-0.11.0.tar.bz2 154497 BLAKE2B d5a0c84c6a31a3b8396b11cc2935995a2ed754e163f60bc81b142c59d37fe6f282c5d33222b85d50f95590e07da1187ba319e0dea23490e35ccc8c04346e93b5 SHA512 6f8da7e4166dc37aa98f424a470ea6f0678cfd5b02ac7b8e11516ea0a4bda0d84855b20fde166a5406047e8251b77f1544d7b362f72016bb5ee0a13ba040a40c
+EBUILD gnupg-pkcs11-scd-0.10.0.ebuild 1194 BLAKE2B 6dad16be3e00d26cb3519f75e86e292542be61ff5e3bf33e3c58f7fd4bc0da6f353fed1202b5d7220fafbdd924537bc119eb2f5b91e7856531eee0f2c3ecb3e9 SHA512 705d5871d406d541ebc9fd20dd211e60066184fea13fdf863069e6bd14309a096d50d49c26f4b38dafc420d193e0b3520d447cc1ffae01ca82349d86baf48b90
+EBUILD gnupg-pkcs11-scd-0.11.0.ebuild 1191 BLAKE2B 0109b716264315a56ebdee8fd866b76fc5b9dbe141e908819c3d14dfb19d6e03a4bca7fa1826a3445f4ae6c2aa4725d7d4b7df66148f6d32c5b7cff79da6fad2 SHA512 0b459d679dadc2171bc3489170936b084ba22e6709492b332ad29dafd3a570c33b6785602dde54898493f01b6edd428859fb8151fccfd113d862687227f5a9b5
+EBUILD gnupg-pkcs11-scd-9999.ebuild 1191 BLAKE2B 0109b716264315a56ebdee8fd866b76fc5b9dbe141e908819c3d14dfb19d6e03a4bca7fa1826a3445f4ae6c2aa4725d7d4b7df66148f6d32c5b7cff79da6fad2 SHA512 0b459d679dadc2171bc3489170936b084ba22e6709492b332ad29dafd3a570c33b6785602dde54898493f01b6edd428859fb8151fccfd113d862687227f5a9b5
MISC metadata.xml 388 BLAKE2B c98dcab45a87ea80fb7a4ef3090cb888701bf14a9f0074a39174549ad3ec94cb5071c792562d39856e5d40b31e8dd5b9a82e00d428bf0def47ed9338d8259ba0 SHA512 7fdcbc1668e16afc5b98006196d184cdfccbacb51740b888c4f14551e9bbabe7e8cea704c3baf1f7bdbc8984f57130b141acf20d1332a96985227c9ba333c73c
diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.10.0.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.10.0.ebuild
index 9eace6ea0546..3a54b3d1ca4a 100644
--- a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.10.0.ebuild
+++ b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.10.0.ebuild
@@ -5,11 +5,17 @@ EAPI=8
DESCRIPTION="PKCS#11 support for GnuPG"
HOMEPAGE="https://sourceforge.net/projects/gnupg-pkcs11/"
-SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/alonbl/gnupg-pkcs11-scd.git"
+ inherit autotools git-r3
+else
+ SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+fi
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
IUSE="proxy"
DEPEND="
@@ -17,16 +23,24 @@ DEPEND="
<dev-libs/libassuan-3:=
dev-libs/libgcrypt:=
dev-libs/libgpg-error:=
- dev-libs/pkcs11-helper:="
+ dev-libs/pkcs11-helper:=
+"
RDEPEND="
${DEPEND}
proxy? (
acct-group/gnupg-pkcs11
acct-group/gnupg-pkcs11-scd-proxy
acct-user/gnupg-pkcs11-scd-proxy
- )"
+ )
+"
BDEPEND="virtual/pkgconfig"
+src_prepare() {
+ default
+
+ [[ ${PV} == 9999 ]] && eautoreconf
+}
+
src_configure() {
local myeconfargs=(
$(use_enable proxy)
diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.11.0.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.11.0.ebuild
new file mode 100644
index 000000000000..57940c3a99e9
--- /dev/null
+++ b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-0.11.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="PKCS#11 support for GnuPG"
+HOMEPAGE="https://sourceforge.net/projects/gnupg-pkcs11/"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/alonbl/gnupg-pkcs11-scd.git"
+ inherit autotools git-r3
+else
+ SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="proxy"
+
+DEPEND="
+ dev-libs/openssl:=
+ dev-libs/libassuan:=
+ dev-libs/libgcrypt:=
+ dev-libs/libgpg-error:=
+ dev-libs/pkcs11-helper:=
+"
+RDEPEND="
+ ${DEPEND}
+ proxy? (
+ acct-group/gnupg-pkcs11
+ acct-group/gnupg-pkcs11-scd-proxy
+ acct-user/gnupg-pkcs11-scd-proxy
+ )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ default
+
+ [[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable proxy)
+ --with-proxy-socket=/run/gnupg-pkcs11-scd-proxy/cmd
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ if use proxy; then
+ newinitd "${FILESDIR}"/gnupg-pkcs11-scd-proxy.initd gnupg-pkcs11-scd-proxy
+ newconfd "${FILESDIR}"/gnupg-pkcs11-scd-proxy.confd gnupg-pkcs11-scd-proxy
+ fi
+}
diff --git a/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-9999.ebuild b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-9999.ebuild
new file mode 100644
index 000000000000..57940c3a99e9
--- /dev/null
+++ b/app-crypt/gnupg-pkcs11-scd/gnupg-pkcs11-scd-9999.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="PKCS#11 support for GnuPG"
+HOMEPAGE="https://sourceforge.net/projects/gnupg-pkcs11/"
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="https://github.com/alonbl/gnupg-pkcs11-scd.git"
+ inherit autotools git-r3
+else
+ SRC_URI="https://github.com/alonbl/${PN}/releases/download/${P}/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="proxy"
+
+DEPEND="
+ dev-libs/openssl:=
+ dev-libs/libassuan:=
+ dev-libs/libgcrypt:=
+ dev-libs/libgpg-error:=
+ dev-libs/pkcs11-helper:=
+"
+RDEPEND="
+ ${DEPEND}
+ proxy? (
+ acct-group/gnupg-pkcs11
+ acct-group/gnupg-pkcs11-scd-proxy
+ acct-user/gnupg-pkcs11-scd-proxy
+ )
+"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+ default
+
+ [[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable proxy)
+ --with-proxy-socket=/run/gnupg-pkcs11-scd-proxy/cmd
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ if use proxy; then
+ newinitd "${FILESDIR}"/gnupg-pkcs11-scd-proxy.initd gnupg-pkcs11-scd-proxy
+ newconfd "${FILESDIR}"/gnupg-pkcs11-scd-proxy.confd gnupg-pkcs11-scd-proxy
+ fi
+}
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 3c02f5954242..7577be9fdb83 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -5,7 +5,9 @@ AUX gnupg-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch 1048
AUX gnupg-2.2.42-bug923248-insecure-backup.patch 12385 BLAKE2B af374b2038a6d8628922e433f26dee2cc66c9e031d871947e2a44586cf2183d8a7bc365f1f0cc0cde552eb176d5f580b3aaab5e4a551d0652f10096c5150aa43 SHA512 1dc123f120d95ae77b52b3869bf7abfcaf0cfbfe732f691663b472a6e9bdd20502280527585dda81da4bd03e8194bdd5e72cc2111f24ccf2ce9e476fe474d4cf
AUX gnupg-2.2.42-dirmngr-proxy.patch 4882 BLAKE2B 1dbe7221ce82024d93cb7e41cb675cd4f159e34f26126cf7ce56e59115548919c3df4b38ff017540734886af3bc516307f92cb66c3b0aa66ce0181215422e516 SHA512 fa920e0d16da4bb689664a0a7d1e851317be387e9acdc7bf79970195408e498452e8c19eb548e3397aa147a1881af1ad1e9689e40046f3ce3ea81654d6e0d2c7
AUX gnupg-2.2.42-gpgme-tests.patch 1214 BLAKE2B f83ed690099a7151d9b8144a112c14a809e120309ebb2283bf835e37c91e18566e3d6f1b7f8d6fbd5977424a19110923196a6495f22cddfa5cc6893be6c3b720 SHA512 1fb8767b06ab1d32711275c1efca47b802cc58e7f0b04d754f3b4138e81b4bb011965e9919b3e24d3b20046b31df3f615770054a98bc61971257bd7f77bbc184
+AUX gnupg-2.2.45-fix-status-output-LISTTRUSTED.patch 1122 BLAKE2B a906fb9414a7635c44406c0256867e2384f57c58034af0a4bef4035cd11992a0e880e43047fa0f2c3a25ab17de0924f168a99697a1bff255b15264509eba3441 SHA512 a71ea3cd79dc37c0ab3c8e44656d65c463ac817417c93807e76e7a52dfb33cfa61df545aff6104c81549e2570d064df58de2de849a13f8887704adbea8e520b2
AUX gnupg-2.4.5-revert-rfc4880bis.patch 6701 BLAKE2B 10fd21ba49183ffd1cde6d48deeccdfb368bdb8da95c14f5cb64589f5376ad31a43e7f37dfc4ca726ae7939275a06eb5d6082627ca20699a62e1914538adb2e8 SHA512 04b4b235261991f1365772ba9920cc16a3320609162ad81c188cbeb533f1347b8e2e5d67b7a1d87e67b9fbe1fec35524bc030484b87abb1892d135976b1b95fe
+AUX gnupg-2.4.6-c99.patch 733 BLAKE2B 23ea109c09424f9d44e3ad0957ab080f931ef5345c64403436ceea8d01179c7ef097c915ccfb52d78535f4318d1d868e809bab01fb17056c2bda94d9a1a418ce SHA512 5cd7cf8ac52447abfd01efe1c8898bdec5abff72062feb41c12389e5fc703caaa825c9ea5395e0180b5a57fe5464e4ac79fe80475083b4b91fda5487c63832c9
AUX gpg-agent-browser.socket 298 BLAKE2B 0b08e5e60ced5e09a485506a52c1da35ed6e557fc36021d0c5f5f1ade19e7dd1d67096110eebe7955246eea53f21b2bdc3ab9f3a660ed8be90ab609ce7126008 SHA512 8dfdd132f991be23aa29ea36d2cfbfd36cdd5c3f7243636fb82ee99e5a427eccbdec69d51732ad78b9592a307eb2a0044c413635e03a6cadc94b7719388b86a7
AUX gpg-agent-extra.socket 281 BLAKE2B 2b8edd4454fece75535e84a2ee7daffa764395a99fbfbcc1d17673220795955b4bd62a447776cbe8a2b1a790da9104465c15f47ae0ea3c5d20514cf93db27922 SHA512 b0bfa5c7ecdb541684c56938f97660fd9efce7df2ec6bdf8de95cca9ed90323a7ca796c3e886fc081b11eeff1c2632e6c20ddcbf23e14286993fa8ff0ba08804
AUX gpg-agent-ssh.socket 308 BLAKE2B bacd09131082ee4bd440568b68065fb148c90a620e6628796bb9f3a2957a13860d15ce548e39ce10bc8749ebeabd7dcd0e893db49df295c9126078fc3de76619 SHA512 202bc5c9c7f9c4e97f53626c906ea455d6d4497cc03272c52f7b653cb5d5dc23850b85f939b88d04bbe70e309ad007415401298c9d04cb9b60329ad9e550e93d
@@ -15,13 +17,19 @@ DIST gnupg-2.2.42.tar.bz2 7434291 BLAKE2B 5f7f01f31949e5258d638fbff81fa641e5c167
DIST gnupg-2.2.42.tar.bz2.sig 238 BLAKE2B 251ad0a832042ceb93b0edfda8652104bfb463e291322f22f0ab0d9b35606c3589be7a6f3e9e2aac8f6ac368a7d11840ab83b29997587dc65685de9f2dec3fee SHA512 7073bfc920c571680a1de57b4e6cd83cde24ccb3b5f592602b0c32fd762eef497027b08745044c9f41130ca99bb7ec77222568c2d0a1099d3c1c15137e0221d7
DIST gnupg-2.2.43.tar.bz2 7435426 BLAKE2B ddf5c89d317e6ce8d1a5348f0ef81ffa1c61c995ddb312b28410f04502b01eae307cd943bee7182d28d4efccac394c91053f8e33756b00166bf66b2bf4a791a7 SHA512 0d2e733b6659c116c043db5252de4de33d6a70c16172d1fe9b779ba413ba9fcb64bbfdcc4686d0e87904561fc62d1aa765144e0586957a500287c175ee37bd49
DIST gnupg-2.2.43.tar.bz2.sig 119 BLAKE2B 38fd3790f5065d67d6b5323ef7abbb79facf00e5b9daba98e5078302fc3887423173ba434c7eff1e64faecef88d87aab9c057c570d6e96e8d0808f07f32d8fa1 SHA512 47c5354869b1825e56fa4276826fcde1ee41c70aab9b411686cf2733f4d1df9c006049e49e066b22e475bd37b337f9ffc97f8bbca0c62c0f32296909464a0643
+DIST gnupg-2.2.45.tar.bz2 7447141 BLAKE2B 8fe2036325e31332166c0477ce9514152c8417a9f61b3edc43487340d5b52e6a4d4c2b104ca9fe7ce6893e6d2977e2cd9c9ccfb52c0b1ea18dae3304ec6ec7f3 SHA512 086bb2a96ff4a681451b357495c8b435229e6526e1121d8faee3cb2ecc9c14965c92c9b1ccbbf3a03f6c59c215cca85a5c4f740f2df7c008a9fa672b370bf33c
+DIST gnupg-2.2.45.tar.bz2.sig 119 BLAKE2B 6656747b2d640a95c4172a221952fa75f7d03c231b7c6d40ea57b43a5bcfbceb800023ca2f352ca09325aaf186a7bf31fcfe7104129c5d6628f0e1256994df76 SHA512 181195a76eede8113bd8f2a7f5bc20674226f6327cf8263389e3d178c205ed2d817b28f2d3b504dd9f852f22fc283d2c14e809ba1c05cfe88b66103845ff114c
DIST gnupg-2.4.5.tar.bz2 7889060 BLAKE2B a8b80cd4dfbb377066efb5c9f1b6cdc6d0cd1b18358c962781b5c06de1545117b13038a4655ae627c36bfd2e5fee127692df8729d6b23e1b31051ab6d897b733 SHA512 4d54744f09399c5899144d0cb5fdc2756e45b058db41b9ea9df3be03e80b914509e16ef35aa0248e7561185b80f7a5f9fd6afcab8ccff75ff82ed555448a38ff
DIST gnupg-2.4.5.tar.bz2.sig 238 BLAKE2B b236e7d62f49c8385f4fb81389bf10715d9c0a0cb5c0b4c20fb6ff1465d05a3c3657061284db23af988a1ca16c9fa393af3ce5cbd27934501eb41a4f448fff0a SHA512 5a06970e499d1eb5213b142a8a182e46f5f21b7cb32785a9e5069378797c124e151ce74727382003820042d60fd7a2f909143f44aa9ef282605875e1cab04aef
+DIST gnupg-2.4.6.tar.bz2 8011304 BLAKE2B 3b0deb3da1ec404e8f0aa50c424c7072727f933228de732d661a17ca15785b7430700e7b88afba69538f9794863cb218c90ae3d43469541fb9152fbabd3bc909 SHA512 192ae6cb18547e9c5fc4263dc968b548c1ce563ceb8cc2e651b264d4e5afa1cd99a2c1cdd80906faf5e0b0ca99cef76e003b1f7e73238f311a74a1de6c35b5cb
+DIST gnupg-2.4.6.tar.bz2.sig 119 BLAKE2B f22b9488a46e585eaa4ed6434c37603756de2a0136a6e8a44d974304d31299f64dee5065a0c1f8ed6aff24555e369ffa213558027698a7e7b2244cef7c9eff76 SHA512 699f99d5aedbb1adef0fc46fbfb4184996ebaeb08e3c5a4d64195cd14e628a17a234ff9d990ad63c32119cbab24bcba802590eaf69f030a0a0addf9928172221
DIST gnupg-2.5.1.tar.bz2 8126739 BLAKE2B 46955d2eebe14395adc0fdf81e89a32f3f9baaabfe1eee78f256a1fab25ce6fdb96b873678cfeb5e4abf4894c7ab4908359ed04cc6571ff442dcc5325b3ccd66 SHA512 733a11ff24145e23dd7d34d954a70c25bf70ecb1d517b8e15cc34bf690786c9f7007e4e99cde573500ac012852e91b29568fed00491f8c8254b3fb63ca5777cd
DIST gnupg-2.5.1.tar.bz2.sig 238 BLAKE2B cd024a63ecb82a12e92444cbff8dbc9bef6a4e436d59957aae77927cce0baf9e282e63df7a5159a521c7c8694a0dbe96d6537ad3ec5f779c7c0dea8d02b5e70d SHA512 8ffd5cc72a2907972bf1854e804f6c215ff66ba2d6e91952700f49b2b5ba8bab035d0f42efdb0d3c3166301cda6e716394928bdd9c0d0d1e1789a02c7aa1a926
EBUILD gnupg-2.2.42-r4.ebuild 5703 BLAKE2B e3b01ff2397a38d7062799195fc52c969d0ac117211eb385c13280211a5e0c7467fe158e1fcc958afda9745c0a9b9ef482d21d4d8809de14ebefddcd089fa6ba SHA512 80845654342a6f301d80e7c22e9efd8531fbdc3cb989c99421ccc2bdc532f79983b4d44088558cfbf2a941869f2bd83c587c262d141851be43b5e15e01ddb0d0
EBUILD gnupg-2.2.43-r1.ebuild 5573 BLAKE2B 2fb3e5977f4f1828ba87b88100622b84e6c48e892e97e49e65456bfe97d9a8b4f19d5c0b53804eaa8f5a2a8cae3a256478c3b509da77aefb0e9835af3871ba30 SHA512 c6e3532520d1945046e08cef686691ae3efc21e9b2e6a7bf3a7c8e0c24d69130fde03ff6c8336ecd92bb7018bcda5555dd0c9f4332efffcfca1200ae9c039936
+EBUILD gnupg-2.2.45.ebuild 5645 BLAKE2B 1ec23a834e5a336cd939be1f6c3eba1630b1882c3fcc947c0797b98519d6ea0037365f04bd09aaad209562a79395c021e9b9b05d8f38a66bcb189d8a53994503 SHA512 f8212761df52df60dceb06b2cd3038763229b7a55f0f73e808382a954d84cefb7984ec0ac70fb303404827317c9a89fee02241d2cfe77fe8635bb96e33a889a2
EBUILD gnupg-2.4.5-r1.ebuild 5894 BLAKE2B a235df7b022acf9bc4d11fa566b7edf39f60dd865802685f5bf68e6df76913589691476a2d48a885816e8aecc2112de14508e44882e43dd3bbefdedd54385a14 SHA512 f621e0a6227862acdab31bb5902e235b8fd5c3e3908be747d5680957d0d55ad5b92ba6a7e2436d1902cd304a40a62fdca8236e67563624bce0b4d683c0364d9b
-EBUILD gnupg-2.4.5-r2.ebuild 6127 BLAKE2B 49d54a7d1eb0d549525223bd31960386ba4068ba59d7890e5e9396a7f341c1d67b9a34288bcad04278d720613173d9904ffd86d64e11744f19b3dda618c4d5ca SHA512 040f1fd9f1013afb74eb6257d03faac11ad3c5a003e5b1c8010ae280b8c5ca9f5b3dca1d935acdeb36191728f7dde3f42a16e8537ee578240bf0792f285cfccc
-EBUILD gnupg-2.5.1.ebuild 6134 BLAKE2B 59eda7c70745867290e44b8ce5f8c21b1e93a175f6e8096c23a973fdff1aebc2531f0d51870dbdb3b3682a9fc26ef71e171df8a571c8570f2667ae1a2e262f4c SHA512 0b7646838717c57384639ae93b4885982287cc5d9b7e941d1116f9358660b6edd42bbbba37b3ee6c6a0e4a4780a8c53ed98d8a49dbf251e7327f766ddc7eb11d
+EBUILD gnupg-2.4.5-r2.ebuild 6119 BLAKE2B 2f414a0dfe969c750e09ceacde25805ed8b04cb9ae9630b2731da6473796ca77dbb76bd555198350dd6b837f3cd14f7019a75b63ba05f1f0366dc544747f4ce4 SHA512 04ca8526ddc38c858f50c233568c28111f90c6ae222663eebc5ffcfa3852ee5397eca28fbf73324e771855060dd74792b97eac51c64d79edd2ccb3eb35c3c8f0
+EBUILD gnupg-2.4.6-r1.ebuild 6108 BLAKE2B 42df459e2600661c0f8927e9fc8fe70fc7aa226208aa9e4bb618d939d61207c9b5e1a9a08d9098fc51c2f5190e67ec8eea0fec827efec2db81d5361ff3f1811b SHA512 d6004160d9f7ecfa6d3712c12e12d7b1e606b945985a7696aa94e39466c1c8b5427dfc6455ad1e1da9e170b7b4580e1a4f7105c9e3cc468f48b0b9439386582f
+EBUILD gnupg-2.5.1.ebuild 6087 BLAKE2B 489d00a348d323809439f838e90e344db63aa5185c089d2ef743469a5867ea06b5ba0ab97005bfef30f5957edb7f213501d2f692774bf9458c3afcbd167a8208 SHA512 e744fe7b322c16c4d842fb553a5129abc482bcb8846121c92be7d3bbc3139ee546dde281fc2645ec6413dd8b9fd0bbb77630f7fa6fe0cd6a2de524195517ac2b
MISC metadata.xml 1189 BLAKE2B dae783678abfe0bae095970d96d952f591a569debad411708d29a2f128c6a291b73a33ee0b3491a6a5ec44c11f56d33c1531022e0ef9eaad3326c9cd0f79e3fb SHA512 bc7d6a9ceda213c134d9afc527fe0b0c87a4886a171b7a1e1f662f3978fec5e71323bae4c9f3882e1d763d5738446f161265070a8e513a59fa62ef0f792e9fa5
diff --git a/app-crypt/gnupg/files/gnupg-2.2.45-fix-status-output-LISTTRUSTED.patch b/app-crypt/gnupg/files/gnupg-2.2.45-fix-status-output-LISTTRUSTED.patch
new file mode 100644
index 000000000000..f34810d2792a
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.2.45-fix-status-output-LISTTRUSTED.patch
@@ -0,0 +1,30 @@
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=2ca38bee7a63c0f7185ca1dbf13da1cbc4933563
+
+From 2ca38bee7a63c0f7185ca1dbf13da1cbc4933563 Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Thu, 31 Oct 2024 11:47:55 +0900
+Subject: [PATCH] agent: Fix status output for LISTTRUSTED.
+
+* agent/trustlist.c (istrusted_internal): When LISTMODE is enabled,
+TRUSTLISTFPR status output should be done.
+
+--
+
+GnuPG-bug-id: 7363
+Fixes-commit: 4fa82eec43e8d205fa336113f6ea554923fd6986
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+--- a/agent/trustlist.c
++++ b/agent/trustlist.c
+@@ -485,8 +485,8 @@ istrusted_internal (ctrl_t ctrl, const char *fpr, int listmode, int *r_disabled,
+ in a locked state. */
+ if (already_locked)
+ ;
+- else if (ti->flags.relax || ti->flags.cm || ti->flags.qual
+- || ti->flags.de_vs)
++ else if (listmode || ti->flags.relax || ti->flags.cm
++ || ti->flags.qual || ti->flags.de_vs)
+ {
+ unlock_trusttable ();
+ locked = 0;
+--
+2.30.2
diff --git a/app-crypt/gnupg/files/gnupg-2.4.6-c99.patch b/app-crypt/gnupg/files/gnupg-2.4.6-c99.patch
new file mode 100644
index 000000000000..35c9b33edd9f
--- /dev/null
+++ b/app-crypt/gnupg/files/gnupg-2.4.6-c99.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/942467
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=c0cb0175c9e6e8d6a3bdd2e40f85fa730fa325af
+
+From c0cb0175c9e6e8d6a3bdd2e40f85fa730fa325af Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Tue, 9 Jul 2024 10:48:02 +0900
+Subject: [PATCH] scd: Add <unistd.h> for read(2) / write(2) .
+
+* scd/app.c: Include <unistd.h>.
+
+--
+
+Reported-by: David Bohman
+GnuPG-bug-id: 7193
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+(cherry picked from commit 1d5cfa9b7fd22e1c46eeed5fa9fed2af6f81d34f)
+--- a/scd/app.c
++++ b/scd/app.c
+@@ -22,6 +22,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ #include <npth.h>
+
+ #ifndef HAVE_W32_SYSTEM
+--
+2.30.2
diff --git a/app-crypt/gnupg/gnupg-2.2.45.ebuild b/app-crypt/gnupg/gnupg-2.2.45.ebuild
new file mode 100644
index 000000000000..6ff933b65347
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.2.45.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
+# in-source builds are not supported: https://dev.gnupg.org/T6313#166339
+inherit flag-o-matic out-of-source multiprocessing systemd toolchain-funcs verify-sig
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="https://gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
+RESTRICT="!test? ( test )"
+
+# Existence of executables is checked during configuration.
+# Note: On each bump, update dep bounds on each version from configure.ac!
+DEPEND="
+ >=dev-libs/libassuan-2.5.0:=
+ >=dev-libs/libgcrypt-1.8.0:=
+ >=dev-libs/libgpg-error-1.38
+ >=dev-libs/libksba-1.4.0
+ >=dev-libs/npth-1.2
+ >=net-misc/curl-7.10
+ sys-libs/zlib
+ bzip2? ( app-arch/bzip2 )
+ ldap? ( net-nds/openldap:= )
+ readline? ( sys-libs/readline:= )
+ smartcard? ( usb? ( virtual/libusb:1 ) )
+ ssl? ( >=net-libs/gnutls-3.0:= )
+ tofu? ( >=dev-db/sqlite-3.7 )
+"
+RDEPEND="
+ ${DEPEND}
+ nls? ( virtual/libintl )
+ selinux? ( sec-policy/selinux-gpg )
+ wks-server? ( virtual/mta )
+"
+PDEPEND="
+ app-crypt/pinentry
+"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( sys-apps/texinfo )
+ nls? ( sys-devel/gettext )
+ verify-sig? ( sec-keys/openpgp-keys-gnupg )
+"
+
+DOCS=(
+ ChangeLog NEWS README THANKS TODO VERSION
+ doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
+ "${FILESDIR}"/${PN}-2.2.45-fix-status-output-LISTTRUSTED.patch
+)
+
+src_prepare() {
+ default
+
+ # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
+ # idea borrowed from libdbus, see
+ # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
+ #
+ # This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
+ # which in turn requires discovery in Autoconf, something that upstream deeply resents.
+ sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
+ -i doc/examples/systemd-user/gpg-agent-ssh.socket || die
+}
+
+my_src_configure() {
+ # Upstream don't support LTO, bug #854222.
+ filter-lto
+
+ local myconf=(
+ $(use_enable bzip2)
+ $(use_enable nls)
+ $(use_enable smartcard scdaemon)
+ $(use_enable ssl gnutls)
+ $(use_enable test all-tests)
+ $(use_enable test tests)
+ $(use_enable tofu)
+ $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
+ $(use_enable wks-server wks-tools)
+ $(use_with ldap)
+ $(use_with readline)
+
+ # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+ # As of GnuPG 2.3, the mailprog substitution is used for the binary called
+ # by wks-client & wks-server; and if it's autodetected but not not exist at
+ # build time, then then 'gpg-wks-client --send' functionality will not
+ # work. This has an unwanted side-effect in stage3 builds: there was a
+ # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+ # the build where the install guide previously make the user chose the
+ # logger & mta early in the install.
+ --with-mailprog=/usr/libexec/sendmail
+
+ --disable-ntbtls
+ --enable-gpg
+ --enable-gpgsm
+ --enable-large-secmem
+
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+ GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+ KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
+ LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
+ LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
+ NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
+
+ $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+ )
+
+ if use prefix && use usb; then
+ # bug #649598
+ append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0"
+ fi
+
+ # bug #663142
+ if use user-socket; then
+ myconf+=( --enable-run-gnupg-user-socket )
+ fi
+
+ # glib fails and picks up clang's internal stdint.h causing weird errors
+ tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
+
+ econf "${myconf[@]}"
+}
+
+my_src_compile() {
+ default
+
+ use doc && emake -C doc html
+}
+
+my_src_test() {
+ export TESTFLAGS="--parallel=$(makeopts_jobs)"
+
+ default
+}
+
+my_src_install() {
+ emake DESTDIR="${D}" install
+
+ use tools && dobin \
+ tools/{gpg-zip,gpgconf,gpgsplit,gpg-check-pattern} \
+ tools/make-dns-cert
+
+ dosym gpg /usr/bin/gpg2
+ dosym gpgv /usr/bin/gpgv2
+ echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+ echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+ use doc && dodoc doc/gnupg.html/*
+}
+
+my_src_install_all() {
+ einstalldocs
+
+ use tools && dobin tools/{convert-from-106,mail-signed-keys,lspgpot}
+
+ use doc && dodoc doc/*.png
+
+ systemd_douserunit doc/examples/systemd-user/*.{service,socket}
+}
diff --git a/app-crypt/gnupg/gnupg-2.4.5-r2.ebuild b/app-crypt/gnupg/gnupg-2.4.5-r2.ebuild
index efcb0ec1ad03..b39c186864ac 100644
--- a/app-crypt/gnupg/gnupg-2.4.5-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.4.5-r2.ebuild
@@ -23,7 +23,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
RESTRICT="!test? ( test )"
REQUIRED_USE="test? ( tofu )"
diff --git a/app-crypt/gnupg/gnupg-2.4.6-r1.ebuild b/app-crypt/gnupg/gnupg-2.4.6-r1.ebuild
new file mode 100644
index 000000000000..0b2fe344f8c9
--- /dev/null
+++ b/app-crypt/gnupg/gnupg-2.4.6-r1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Maintainers should:
+# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
+# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
+# (find the one for the current release then subscribe to it +
+# any subsequent ones linked within so you're covered for a while.)
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
+# in-source builds are not supported: https://dev.gnupg.org/T6313#166339
+inherit flag-o-matic out-of-source multiprocessing systemd toolchain-funcs verify-sig
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
+HOMEPAGE="https://gnupg.org/"
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="test? ( tofu )"
+
+# Existence of executables is checked during configuration.
+# Note: On each bump, update dep bounds on each version from configure.ac!
+DEPEND="
+ >=dev-libs/libassuan-2.5.0:=
+ >=dev-libs/libgcrypt-1.9.1:=
+ >=dev-libs/libgpg-error-1.46
+ >=dev-libs/libksba-1.6.3
+ >=dev-libs/npth-1.2
+ >=net-misc/curl-7.10
+ sys-libs/zlib
+ bzip2? ( app-arch/bzip2 )
+ ldap? ( net-nds/openldap:= )
+ readline? ( sys-libs/readline:0= )
+ smartcard? ( usb? ( virtual/libusb:1 ) )
+ tofu? ( >=dev-db/sqlite-3.27 )
+ tpm? ( >=app-crypt/tpm2-tss-2.4.0:= )
+ ssl? ( >=net-libs/gnutls-3.2:0= )
+"
+RDEPEND="
+ ${DEPEND}
+ nls? ( virtual/libintl )
+ selinux? ( sec-policy/selinux-gpg )
+ wks-server? ( virtual/mta )
+"
+PDEPEND="
+ app-crypt/pinentry
+"
+BDEPEND="
+ virtual/pkgconfig
+ doc? ( sys-apps/texinfo )
+ nls? ( sys-devel/gettext )
+ verify-sig? ( sec-keys/openpgp-keys-gnupg )
+"
+
+DOCS=(
+ ChangeLog NEWS README THANKS TODO VERSION
+ doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
+)
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
+ "${FILESDIR}"/${PN}-2.4.5-revert-rfc4880bis.patch # bug #926186
+ "${FILESDIR}"/${PN}-2.4.6-c99.patch
+)
+
+src_prepare() {
+ default
+
+ GNUPG_SYSTEMD_UNITS=(
+ dirmngr.service
+ dirmngr.socket
+ gpg-agent-browser.socket
+ gpg-agent-extra.socket
+ gpg-agent.service
+ gpg-agent.socket
+ gpg-agent-ssh.socket
+ )
+
+ cp "${GNUPG_SYSTEMD_UNITS[@]/#/${FILESDIR}/}" "${T}" || die
+
+ # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
+ # idea borrowed from libdbus, see
+ # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
+ #
+ # This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
+ # which in turn requires discovery in Autoconf, something that upstream deeply resents.
+ sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
+ -i "${T}"/gpg-agent-ssh.socket || die
+}
+
+my_src_configure() {
+ # Upstream don't support LTO, bug #854222.
+ filter-lto
+
+ local myconf=(
+ $(use_enable bzip2)
+ $(use_enable nls)
+ $(use_enable smartcard scdaemon)
+ $(use_enable ssl gnutls)
+ $(use_enable test all-tests)
+ $(use_enable test tests)
+ $(use_enable tofu)
+ $(use_enable tofu keyboxd)
+ $(use_enable tofu sqlite)
+ $(usex tpm '--with-tss=intel' '--disable-tpm2d')
+ $(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
+ $(use_enable wks-server wks-tools)
+ $(use_with ldap)
+ $(use_with readline)
+
+ # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
+ # As of GnuPG 2.3, the mailprog substitution is used for the binary called
+ # by wks-client & wks-server; and if it's autodetected but not not exist at
+ # build time, then then 'gpg-wks-client --send' functionality will not
+ # work. This has an unwanted side-effect in stage3 builds: there was a
+ # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
+ # the build where the install guide previously make the user chose the
+ # logger & mta early in the install.
+ --with-mailprog=/usr/libexec/sendmail
+
+ --disable-ntbtls
+ --enable-gpgsm
+ --enable-large-secmem
+
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+ GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config"
+
+ $("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+ )
+
+ if use prefix && use usb; then
+ # bug #649598
+ append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0"
+ fi
+
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # https://dev.gnupg.org/T7368
+ append-cppflags -D_XOPEN_SOURCE=500
+ fi
+
+ # bug #663142
+ if use user-socket; then
+ myconf+=( --enable-run-gnupg-user-socket )
+ fi
+
+ # glib fails and picks up clang's internal stdint.h causing weird errors
+ tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
+
+ econf "${myconf[@]}"
+}
+
+my_src_compile() {
+ default
+
+ use doc && emake -C doc html
+}
+
+my_src_test() {
+ export TESTFLAGS="--parallel=$(makeopts_jobs)"
+
+ default
+}
+
+my_src_install() {
+ emake DESTDIR="${D}" install
+
+ use tools && dobin tools/{gpgconf,gpgsplit,gpg-check-pattern} tools/make-dns-cert
+
+ dosym gpg /usr/bin/gpg2
+ dosym gpgv /usr/bin/gpgv2
+ echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
+ echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
+
+ dodir /etc/env.d
+ echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
+
+ use doc && dodoc doc/gnupg.html/*
+}
+
+my_src_install_all() {
+ einstalldocs
+
+ use tools && dobin tools/{convert-from-106,mail-signed-keys,lspgpot}
+ use doc && dodoc doc/*.png
+
+ # Dropped upstream in https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=eae28f1bd4a5632e8f8e85b7248d1c4d4a10a5ed.
+ dodoc "${FILESDIR}"/README-systemd
+ systemd_douserunit "${GNUPG_SYSTEMD_UNITS[@]/#/${T}/}"
+}
diff --git a/app-crypt/gnupg/gnupg-2.5.1.ebuild b/app-crypt/gnupg/gnupg-2.5.1.ebuild
index 382e366f6c0d..af4b2cee9a10 100644
--- a/app-crypt/gnupg/gnupg-2.5.1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.5.1.ebuild
@@ -95,10 +95,6 @@ src_prepare() {
# which in turn requires discovery in Autoconf, something that upstream deeply resents.
sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-i "${T}"/gpg-agent-ssh.socket || die
-
- # definition of getpeername etc uses different things like socket_fd_t
- [[ ${CHOST} == *-solaris* ]] &&
- append-cflags $(test-flags-CC -Wno-incompatible-pointer-types)
}
my_src_configure() {
@@ -146,6 +142,11 @@ my_src_configure() {
append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0"
fi
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # https://dev.gnupg.org/T7368
+ export ac_cv_should_define__xopen_source=yes
+ fi
+
# bug #663142
if use user-socket; then
myconf+=( --enable-run-gnupg-user-socket )
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index ec2eb4e1f131..cc8f4f42f156 100644
--- a/app-crypt/gpgme/Manifest
+++ b/app-crypt/gpgme/Manifest
@@ -4,5 +4,5 @@ AUX gpgme-1.23.1-tests-gnupg-no-tofu.patch 828 BLAKE2B a46a844bc2e44ceb2c647486e
DIST gpgme-1.23.2.tar.bz2 1836904 BLAKE2B 563e470e861c7cc64ecb3e8dd0a0ed8436bc0867105093abcec09f4d1e1dd95cbf64c8161cf8500b9842583b57f6583efff63e5111234e36fda1e6fbedce2f78 SHA512 6cfcd07e81a93de240582de5a46545420cee93d1f27fe20ea2c983780fdd3036b69fdba073cf549d68a20791e189bf4b3cdde14a43f912d2ab9ef3414c83ac75
DIST gpgme-1.23.2.tar.bz2.sig 238 BLAKE2B fafba6e2f1f34c53fa3f7e05953298132f7b046048660b9f2df5bc11ccb9694b581117ca78883a8f4ca9af060397a39f3132a3711be1cd28183b7c2f8f93a8b7 SHA512 65b7cdd4ce06bb0b15b13033d226423380338efdcb47ffc3f33780a92973453053f8f59b12a3f37e392e773bdd207a7420c25aa3a210c15eec45b7bfef6e891e
EBUILD gpgme-1.23.2-r1.ebuild 6068 BLAKE2B 1b33d1d0f31374d0a088f99c713c776bbdc99627bc31a4b98668b29ba2ed541c6f40ed7dc1b793c5bdd9123016722f867c594e463b636d1faff0f5acf0334283 SHA512 9d4585824bd5c9a16c588746583dbbc9807cc37cac4b725e4363fd5ef8d0bd80e403af7cbe9745b66879c5e8798462d507bf9c03be994336f350dc9aad61a674
-EBUILD gpgme-1.23.2-r2.ebuild 6066 BLAKE2B 54e25d4467fe005ddcbdf789abb175470f0700e906bbeddd9b8837498887781590c1c7f26172c81d042e618640ed3817ee6416d9e034fee773eadc243fa2ce9a SHA512 13a95dade0198fba948e46e171ea82d8497ba73f27b9c8088f8131a348e59510e792598e1cd5ed73399030b829b890eb595efe117b39ce98283730ff58bb22a7
+EBUILD gpgme-1.23.2-r2.ebuild 6058 BLAKE2B c6a0f78406386360883618d0820a4f21de71fa4a54293ae791fc8d11cf738359f35d4e1d4eb2e0f179d80250a42536e5aaa4944558ac2d800b0cd1a4868cd48b SHA512 264b838f5b3c89476a1800b59aa18f0153d186103eb395f37d4513094fdb1ced89e6d929cd38712de419542762eaa80d983a13ef27ae16843aca4ee0e30fdf38
MISC metadata.xml 333 BLAKE2B 6dd18b63ec1f7656ab8bd705242bec45d7820db8be31f326172cad400711e6d7268c156d6b81facfdfa79118c04728ac910a8f8de36a11454227a1399235a582 SHA512 21b8d7bf3f14b5ab7e2ea587027395cdd881ecddd5a4f70237cafc70dc904b396a33f70dd7ef37519df5a204f4e3a89d9ea6ffc221df41bd9cbf23e69863f12f
diff --git a/app-crypt/gpgme/gpgme-1.23.2-r2.ebuild b/app-crypt/gpgme/gpgme-1.23.2-r2.ebuild
index 8ed22d8e19c7..4f3058b0405d 100644
--- a/app-crypt/gpgme/gpgme-1.23.2-r2.ebuild
+++ b/app-crypt/gpgme/gpgme-1.23.2-r2.ebuild
@@ -34,7 +34,7 @@ LICENSE="GPL-2 LGPL-2.1"
# Bump FUDGE if a release is made which breaks ABI without changing SONAME.
# (Reset to 0 if FUDGE != 0 if libgpgme/libgpgmepp/libqpggme change.)
SLOT="1/11.6.15.2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="common-lisp static-libs +cxx python qt5 qt6 test"
RESTRICT="!test? ( test )"
REQUIRED_USE="
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 662e9490d4c6..a01051f556f2 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,4 +1,5 @@
AUX heimdal-7.8.0-CVE-2022-45142.patch 1320 BLAKE2B 2aa61a0a7c852b587b4313a13b4fa24415123590bd5779e972a395fa4e93e048544e874b238d8fabf7853001ff1eae668263bbf8f8f00d2ce395a5af869ba99f SHA512 9a03a218c0e523ed50051176f11f6939a5c9dd45c40495fa676b94083a1aa69ec9109fa415f836cec1b3a26ff77cd3ac44a7464f0395c8088627561fefbf2c66
+AUX heimdal-7.8.0-autoconf-2.72.patch 827 BLAKE2B 5084548adba9712e7b16ebd77e47d44c665ab6bd1e879a8b1f83e7a01384a58d7dc39b534132b2b8143c43f17ff9fa7d779cc144df9033507c6b8376036f20d2 SHA512 2b2af161713d1d76e6cc5669373de073015898cc64548d7826988bd7e7861507b26d61edea62248c2b2a553c327d3d64b36d70ad3e0078c9db916b32c693d384
AUX heimdal-7.8.0-configure-clang16.patch 2374 BLAKE2B 7db8772c3939b733b284a491322c8f256e9c50fce3a8727209ebddb2ae2493b4305d25d92a7e7e2cc8fb3c114be688b462556db718d4c8eb9a9cd722beddc777 SHA512 b14ae324d742eebc756ff5a01762aae7282a32ffd09f703e82bc3b7bedfa0ede08763003d711acf72edc5768ed9db64a4b72682be945e41954de1ace26bcd18b
AUX heimdal-kadmind.confd 151 BLAKE2B 1e916d248e9d93029e1e2a541c505c87f017e2a825383650dd8cf0e9c55d1740410312bf050270a382caef11250dbcf333724e5e73ce4ed4d2dacb53dbdb6a34 SHA512 2e2852fa6bebeb58da4bd80fb584339ab8c95fdc1e37f957045f9fcc9b212ccf61145d16c6f7a2fae6245e977200e48150f25bc4ac1d734692555ccfd9911810
AUX heimdal-kadmind.initd-r2 427 BLAKE2B 55f0d458b28c889bce8a98ce58112124983c284918c1db1b877c095bd9f573d60ec035afe3182d5ae3f6d484af6fdd09b9efe01b73821921afac8509b65abbf4 SHA512 fd8cf77b7786a6b78d775be3ee769a31ec27a085f4e0764722948a02122e9a4ce52143eb1d3ac2acd7c74a5bee4432220155eb9a49bfbafc0c23431b18da64b2
@@ -14,5 +15,5 @@ AUX heimdal_fix-db60.patch 443 BLAKE2B d89892570100dcc4a9b5bacd672cd28ce284ae9ad
AUX heimdal_tinfo.patch 711 BLAKE2B 730ef4b1ba79d80c7257d1bd04783584cf616b2e51d6028fe3160dfdc113b6243c7af8c116ff969de439ebb79bab9091f8e5d6e9037c2b48541e6cbc83ba1026 SHA512 b4c63c9e945b914009569e62fd53229032ffaecde11dc4d02a89d5ba65f2c28020d43af8f2c26d87e2b383ba6dd3c3f4c4b69529471bc1928b45a9b5c437958d
AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16bdf6f554c585572ed9d3835bed976c8953fc92d0f42270c6a0767e943ec5efa5b79f6f4cf89 SHA512 4dad6837344e30c6988355551b5b82bce748dad7aa7648204ba7852540ad3a546b5344926789d60e78d57ff20dff87b680b790dc8d86c8dec1008feb0d809e38
DIST heimdal-7.8.0.tar.gz 10024936 BLAKE2B bab8ed12a5257395b34bb88e22147912857015c652f0899c54809582c49f9c33b9ac748b28dd38ac7072d245e86e44c5dafb8725103fcb4a6dae16c8d1d4b623 SHA512 0167345aca77d65b7a1113874eee5b65ec6e1fec1f196d57e571265409fa35ef95a673a4fd4aafbb0ab5fb5b246b97412353a68d6613a8aff6393a9f1e72999e
-EBUILD heimdal-7.8.0-r3.ebuild 4370 BLAKE2B d70ad7f1c0becd276d970bce38bc9897acde22f8856635167d4bb2431b8fee58ced112c9a2c48e856dd81db5498ea5c3ec477bdd15cf7d577ca67db2050c3923 SHA512 8dc9d7ff669e9db1da816fa38761fa78fdc6d2e45e17b496131f5063db859cdc2ff04cd4076b5057da31e7320eb0a322b720770c39cc5d41b654d44d1555efe5
+EBUILD heimdal-7.8.0-r3.ebuild 4419 BLAKE2B 56e839fdbd3b0d8270685187eab2d44e3e4613302cf6d9df92fa86f91b9f6831de88d6f1ddb892fba70084600b67b1492f7b2f3ff120cc2e7aefd2d5c6f013a5 SHA512 477b3ff81b4db449b800ff06e898a3607c50d611a863ad1440fa04b9af6ffc9bd40c269e30167e03d559fbad4fe56154ca609a418fbc68ead543a6f8a6d8d5f1
MISC metadata.xml 582 BLAKE2B e38fb8048d899871775a690397627b0003cb3301aaa3c98cc8fb9d70e867bd0b922581d3e319464ff89929c4a34c608e23cecc72f0b4a320b3365cf23853268e SHA512 77b5b3da9ccbcb77c6e0985c7610b3ba5b698092327221477f30828f086ef3891c8170856cb6b26a5596239180e43c5b6d5e213ae6a7129c659bb34fe9c498cd
diff --git a/app-crypt/heimdal/files/heimdal-7.8.0-autoconf-2.72.patch b/app-crypt/heimdal/files/heimdal-7.8.0-autoconf-2.72.patch
new file mode 100644
index 000000000000..5528af696680
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-7.8.0-autoconf-2.72.patch
@@ -0,0 +1,19 @@
+https://github.com/heimdal/heimdal/pull/1229
+
+From 2b372170c894ed9aa3fe2fca976f3541ea7041d9 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd@kuhls.net>
+Date: Sat, 10 Feb 2024 09:33:48 +0100
+Subject: [PATCH] cf/largefile.m4: Fix build with autoconf-2.72
+
+Fixes https://github.com/heimdal/heimdal/issues/1201
+--- a/cf/largefile.m4
++++ b/cf/largefile.m4
+@@ -10,7 +10,7 @@ dnl with generated code, such as lex
+ if test "$enable_largefile" != no -a "$ac_cv_sys_large_files" != no; then
+ CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files"
+ fi
+-if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no; then
++if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no && test -n "$ac_cv_sys_file_offset_bits"; then
+ CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
+ fi
+ ])
diff --git a/app-crypt/heimdal/heimdal-7.8.0-r3.ebuild b/app-crypt/heimdal/heimdal-7.8.0-r3.ebuild
index 5c703d0db52e..11e4adcdf1af 100644
--- a/app-crypt/heimdal/heimdal-7.8.0-r3.ebuild
+++ b/app-crypt/heimdal/heimdal-7.8.0-r3.ebuild
@@ -68,6 +68,7 @@ PATCHES=(
"${FILESDIR}/heimdal_fix-db60.patch"
"${FILESDIR}/heimdal-7.8.0-CVE-2022-45142.patch"
"${FILESDIR}/heimdal-7.8.0-configure-clang16.patch"
+ "${FILESDIR}/heimdal-7.8.0-autoconf-2.72.patch"
)
src_prepare() {
diff --git a/app-crypt/jitterentropy/Manifest b/app-crypt/jitterentropy/Manifest
index 72040f3fbc00..376cb69d0dad 100644
--- a/app-crypt/jitterentropy/Manifest
+++ b/app-crypt/jitterentropy/Manifest
@@ -1,3 +1,5 @@
DIST jitterentropy-3.4.1.tar.gz 86110 BLAKE2B 729ef7d01a17c9eb16cc352da0286bd292f2faae63754b06036dbb44d52e85e2e2e0d2a38ac57d4350eaebbc47457f0457a988a657f7fe6c5d782d50922552d2 SHA512 c832b33c084a8c56fb9ee0c0f7397fa9206cbd6fcbea047495e543566fc0d9b5d8978c8668103203d87b5b70c0e177f9ef7cc614b3ce689b90fbb8b85e6fedbb
+DIST jitterentropy-3.6.0.tar.gz 96456 BLAKE2B 5e4fc185f16b59456a681e37f90de3b1e381bd6269bf72294822c1b8db11bbd5fe48640f2f38257c9b1238df38df7d95c2d1b9136b12364dde6e5cf3395c2e6e SHA512 8b234d0ac8115d004e8b1f41318e42d72324dfcbea0b3ba96499a6f9d740e13659c5bea032f77baad8d8ea3846fcd628665df573ab12b6111785f4bb5954834c
EBUILD jitterentropy-3.4.1.ebuild 1612 BLAKE2B 85c6cc080600653d37a2c091fb51d4c2abbaf93c908b3afb960c0602a1119a26bbff808cddeff6296571adb174f5faf3adba8668337936a142d8c7b81a6b5048 SHA512 52c793e33aa66556bdd63fcb12b1362900b4ae32d58d5a4891baaeae3b2327a8dcc14b6d8d459484ef409769be4e91963292fb2c713cd6239e9f2a657fc7f6c6
+EBUILD jitterentropy-3.6.0.ebuild 1617 BLAKE2B 1f6624eb6ac1c681c234bfae976db6a4724fada69ef6945c1e434e5604f97ac6bdfee21e1cdf7159417c4da8fb956190ebbd84f2b2236bf72aed810fa2d10d9a SHA512 89fdc682279d092558b6504f65ad5df7eb9cc232fcf71d798554c95d9fd016e25b10f6d353bc221f6b695af6765bc62f6f6c8772f727ecb7c32a1abe52529eea
MISC metadata.xml 681 BLAKE2B c0777e7525bc36dd9a65680b2cb0b918d73f9e091fe686b7d7ec3ec4441b73c776bf8d3526cf8f16dcb34228532a633b9d6d9df18b2dc626f602eb813cf53634 SHA512 1cc9f7bdca491ac96ce85adf9a0fe1462e52e1da99181750aaf362197dde3c68e9278ead72e0ca81b689812edcb3670e1a143ef37c5dab7b646b818df5c893a1
diff --git a/app-crypt/jitterentropy/jitterentropy-3.6.0.ebuild b/app-crypt/jitterentropy/jitterentropy-3.6.0.ebuild
new file mode 100644
index 000000000000..987687b0feb5
--- /dev/null
+++ b/app-crypt/jitterentropy/jitterentropy-3.6.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Hardware RNG based on CPU timing jitter"
+HOMEPAGE="https://github.com/smuellerDD/jitterentropy-library"
+SRC_URI="https://github.com/smuellerDD/jitterentropy-library/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-library-${PV}"
+
+# For future reference, tests/raw-entropy/validation-{restart,runtime}
+# have a weird license clause where it says:
+# The licensee IS NOT granted permission to redistribute the source code or
+# derivatives of the source code, and the binaries compiled from the source
+# code or its derivatives to any third parties.
+# Do not package these two components!
+LICENSE="BSD"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="static-libs"
+
+src_prepare() {
+ default
+
+ # Disable man page compression on install
+ sed -e '/\tgzip.*man/ d' -i Makefile || die
+}
+
+src_compile() {
+ # Upstream defines some of CFLAGS in the Makefile using '?='
+ # This allows those default flags to be overwritten by
+ # user-defined CFLAGS. Restore some of the defaults.
+ append-cflags '-fwrapv' '-fvisibility=hidden' '-fPIE'
+ # Optimizations are not allowed by upstream, which already
+ # overrides CFLAGS in Makefile. We need to handle CPPFLAGS here.
+ append-cppflags '-O0'
+ emake AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
+src_install() {
+ emake PREFIX="${EPREFIX}/usr" \
+ LIBDIR="$(get_libdir)" \
+ DESTDIR="${D}" \
+ INSTALL_STRIP="install" \
+ install $(usex static-libs install-static '')
+}
diff --git a/app-crypt/keysmith/Manifest b/app-crypt/keysmith/Manifest
index 7ec51820268e..48b68c8e57db 100644
--- a/app-crypt/keysmith/Manifest
+++ b/app-crypt/keysmith/Manifest
@@ -1,5 +1,5 @@
-DIST keysmith-24.05.2.tar.xz 171756 BLAKE2B 5059579e9529f834814a3f586dbab5aad1a5235759c0fa76a7c7cf5588bb3b2fd64ca381d0d749d88cf74446ca5a380cb6f49eebe005e34a6f184e3f8fbcf7dd SHA512 fd2964b4fc754ac71d5fc2b273e2e70671f4b8a4cdf95e340ade20a234d7ddbfc81e0a6bfbde3178b49ba94b3219a2e1169903eac4d707b1f130df7ed7478f77
DIST keysmith-24.08.1.tar.xz 171424 BLAKE2B 79f3f12c533245749e17c98e6cc4c3f7856d393b4a01f208b611a7ba354145c3c44d93a078ed1728e592c62c4b05783870da1b643ddf74ea06f1f2d08801b1ec SHA512 c1386053249c65c626a5c2d2a84c7a036a4b702c5fd240217f5bc26de55e6eadcd0a7e3235a0a949dc8862fc96400fb3b8d26da476dc9d0e89969bdaea6079cc
-EBUILD keysmith-24.05.2.ebuild 847 BLAKE2B 107bbe4cff40031a7f77d1772691e4ca274460074192aa7cde08e590d1e480ec939781a7a83c7c1bf5da2b4eba91881c516fc6f4ce4630207d49552964852e8b SHA512 7cfd1b29ddf09348e7e72015dc4ac75502267e5bba9e05775ff62792180fef37f9804b5b6077e2e692648b56548c058bbacb91c9dd340aae7c55d5d9bd299492
-EBUILD keysmith-24.08.1.ebuild 849 BLAKE2B 729d061e7b663e632490103ca606971dc5a2e042c371c573c50c6ed778a4a08edeb3894b4c7e1b597a94c9ec0ae6684ffb5e83d202594ca28a1fddfbb0c3b26b SHA512 a91a0f938a3a1d746fba7c2f459e56b54a438ee206208e01d184c5c1e388ff8ddf3f29c662eabed40631e443d678dc96cea4ecbbc7c41d3f9db80c92704ae8dc
+DIST keysmith-24.08.3.tar.xz 171432 BLAKE2B 3849b02928b0aff80e28cc09d208ff543cf930e8e997a5c2c139325e1ce1785c5e569604eb64217f02b2ca99ae5b5edd651069f601a5a01ed59aaf65202ffedf SHA512 bfb67ea99c1435bee49e3a5170c9ca102f9d6ffe81ca66c1fa97e8c86fdf4464abb8a1c945cb7ffa2d89bfa995dda3ef7d20a512476642d38b9483789163b8eb
+EBUILD keysmith-24.08.1.ebuild 847 BLAKE2B de6b50e6b8748802879f80b65ac6910f9cb6bbbb9d6ae0c066dbd539db0e8a09669c06916539423d1b118bb126d57081eb8d27e74fd4c9081cab3e0dfd5eb5a3 SHA512 ec36ed5e237e349cc7a56ef3c0ffa1ccb53d6268ad0302e2fe38dc8cf3efae1cc693ba3cd6109e2f6743120f4e2dd8f69752aba29e4e15f3ef8187996a84f659
+EBUILD keysmith-24.08.3.ebuild 849 BLAKE2B 729d061e7b663e632490103ca606971dc5a2e042c371c573c50c6ed778a4a08edeb3894b4c7e1b597a94c9ec0ae6684ffb5e83d202594ca28a1fddfbb0c3b26b SHA512 a91a0f938a3a1d746fba7c2f459e56b54a438ee206208e01d184c5c1e388ff8ddf3f29c662eabed40631e443d678dc96cea4ecbbc7c41d3f9db80c92704ae8dc
MISC metadata.xml 380 BLAKE2B 110b310586031ac53056b1502648607210ee0256858efee1d54e756e130b4e331202f8571c96f5064ccee7d63bce9c4af2b92c40389d2c7b06a4fad70be8656d SHA512 10365587bc7347003e99f0684c92fa7c7154576643eaee09e79b1bddf5aed12b6062dc426b07343c6cfbcd423ab3e77e245b3659919f75e4a4183fb56fa2fa0e
diff --git a/app-crypt/keysmith/keysmith-24.08.1.ebuild b/app-crypt/keysmith/keysmith-24.08.1.ebuild
index 592cdbe13527..fc881a98a8b5 100644
--- a/app-crypt/keysmith/keysmith-24.08.1.ebuild
+++ b/app-crypt/keysmith/keysmith-24.08.1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/keysmith/"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~x86"
IUSE=""
COMMON_DEPEND="
diff --git a/app-crypt/keysmith/keysmith-24.05.2.ebuild b/app-crypt/keysmith/keysmith-24.08.3.ebuild
index bb6b9b405e71..592cdbe13527 100644
--- a/app-crypt/keysmith/keysmith-24.05.2.ebuild
+++ b/app-crypt/keysmith/keysmith-24.08.3.ebuild
@@ -5,8 +5,8 @@ EAPI=8
KDE_ORG_CATEGORY="utilities"
ECM_TEST="true"
-KFMIN=6.3.0
-QTMIN=6.6.2
+KFMIN=6.5.0
+QTMIN=6.7.2
inherit ecm gear.kde.org
DESCRIPTION="OTP client for Plasma Mobile and Desktop"
@@ -14,7 +14,7 @@ HOMEPAGE="https://apps.kde.org/keysmith/"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
IUSE=""
COMMON_DEPEND="
diff --git a/app-crypt/loop-aes-losetup/Manifest b/app-crypt/loop-aes-losetup/Manifest
index fb21c0b9b9a0..0d2d3508cb15 100644
--- a/app-crypt/loop-aes-losetup/Manifest
+++ b/app-crypt/loop-aes-losetup/Manifest
@@ -5,5 +5,5 @@ DIST util-linux-2.39.2.tar.xz 8362220 BLAKE2B 963c257b86f8a025a3452f102656f47938
DIST util-linux-2.40.1.tar.sign 833 BLAKE2B 2f8537cd4f52e0c203360d081a91f17c2db13c0f6054ef02f967e8fdf03099bb8c42604864003bfb911ea7804033f4020e2f56a933667fc84ac9c4b8d01e9ed5 SHA512 ab73a27fc8601041bf7b8a088586b78c49ca83cf9c8cfe5877280c0b5c607e95695512804335a8c0ac1d243e4433595f44256407fdbfb053451b8ab40d605502
DIST util-linux-2.40.1.tar.xz 8823784 BLAKE2B a51fcf9b63c033e470da4f4f0094f0f923fdeb5a649a5c59d2d44888e5e741dfd95e589247355296e050d9ec8dc4334c5898453af055abcb30082af6b835a3e3 SHA512 58ec6eb41d4b6bfc544a80e95c71b5f3798ab4d2a9435d3ee9e5edd56f9b3f09bcb154bdd70e002dc018938937e2e946ae731dcda0f86b362fc43423689e41fc
EBUILD loop-aes-losetup-2.39.2.ebuild 1861 BLAKE2B 1274cc7ef2f6659aea9d07227943d4de8e979f37eaf67a0b5fb4bb656fc0b9688f1b51480071de7f90960a65d016223b08e4e9ccbc24a2c65a2bdb34f6e78746 SHA512 5b96d851610a51d579b4e34f616eb57ef25f5217feacb4a82954a22506c665d165634ffdd35f5aa6b70f60b47e8ab097af3c001f5ce63090e89f3989a9fc34dd
-EBUILD loop-aes-losetup-2.40.1.ebuild 2714 BLAKE2B a005af2f69df128ca7977518390c23d46f25dd973720d363e3c70901de5d146f9b6be2b1b02fa95d43d96f8460afef40f75eb01b6cfa13a2b00b43b84ce72466 SHA512 19f1e8ecf5dbb90724b2bfd294a53692c7fd3b0c8fac3c01535f6583f558660b43985e61afb69a05a8d02a6dd8b976e0a9ac31e77258a0adc317ca32ed62fb24
+EBUILD loop-aes-losetup-2.40.1.ebuild 2717 BLAKE2B cad51df7c0f374d95558071db227cbbc6b52e502f749dac90ad5f5bbdc88f584f32fb48e4e894591abfa9fc26cbf2aacdb481c517b0bb3baae0f4de42cac055e SHA512 deca597b8d05b7b6cb995c3ac70526c425b2d71820976e20e1c395cf8d0944711a9bd4ac00c4a20a8eb78ead0d9e1f314f9cc4cb5bf1ad982d7cb0dff9cf43f8
MISC metadata.xml 536 BLAKE2B e791994189960de5e4314e89e827340481d01e341874b813a20bfa7adeb4d0122ae9929a688cd5c08da27a24d2461452875f70c5363a158328b13d053f275587 SHA512 e842172b0af47ca7e4ffd9c2e7c8d2013369f5090c2f037f7b8e04869924a1864015e4aef10b96b7ef38ffebbdc238e7d917b13e0be9558ed77be7109968d0f1
diff --git a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.40.1.ebuild b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.40.1.ebuild
index 467544ceb089..00f67816b903 100644
--- a/app-crypt/loop-aes-losetup/loop-aes-losetup-2.40.1.ebuild
+++ b/app-crypt/loop-aes-losetup/loop-aes-losetup-2.40.1.ebuild
@@ -55,7 +55,7 @@ src_unpack() {
if use verify-sig; then
einfo "Unpacking ${MY_P}.tar.xz ..."
verify-sig_verify_detached - "${DISTDIR}"/${MY_P}.tar.sign \
- < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -x)) "${BROOT}"/usr/share/openpgp-keys/karelzak.asc
+ < <(xz -cd "${DISTDIR}"/${MY_P}.tar.xz | tee >(tar -xf -)) "${BROOT}"/usr/share/openpgp-keys/karelzak.asc
assert "Unpack failed"
verify-sig_verify_detached "${DISTDIR}"/${LOOPAES_P}.tar.bz2{,.sign}
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index a0e40c868ae3..ae331f962346 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -14,5 +14,6 @@ AUX mit-krb5kpropd.service 128 BLAKE2B 31d002c16987bd6fc42e22e64dd9bd1f9db36655d
AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad2a60beebe83bd766d42261bd44c712df14608a1e5e922715780a6c4aa8ad294c34ba4e8fc336a24d038fd3 SHA512 4e7ae175425e0787a1d5ff959471a88bf5af4cd6e213dc6d4048902fab7547c1186a082370b523f9549f5096acfab1fb03b4839e42bd80dc539130ae4bb3ea55
AUX mit-krb5kpropd_at.service 141 BLAKE2B 2f6741a55551e0f8673cd78480b7775f3e9a1fedda7af110d68f7577aa2711addc7ec8cbb20a5bc13c6bab560d6e7e854ce2ef9e81bbee487a700eec6f9be1c9 SHA512 7f21497a6045d2e0ad8f6f14c275bb895ce9317764e71c5290b0846688479ce9ba49e14ef73f6debda5f6ffe730b4da28a380717b09fe0d60d102ba44efcb170
DIST krb5-1.21.3.tar.gz 9136145 BLAKE2B e909a55eaedab68e5c829bb7bbd26cec5db2d7b8d97f3b034de94d8f957003f16977ac619afee3b862f288e59f05c5e44f41e65b8883961c8b22a26e2f4733bc SHA512 87bc06607f4d95ff604169cea22180703a42d667af05f66f1569b8bd592670c42820b335e5c279e8b4f066d1e7da20f1948a1e4def7c5d295c170cbfc7f49c71
+EBUILD mit-krb5-1.21.3-r1.ebuild 4155 BLAKE2B f8a94b93abe154bbbbc90bd580fe0030ac533c747c722950290b3873a9a97dfd716b9d643a0b5d5d1c56d3d1cc374947f87eba4fe934d2dd52cdfd653202984b SHA512 9d87c36b34c9e4c8e7239d44246b7312a4b4c1cec3c1dac78759d14fa3fa3836fcdfd6910ad51814625b997ad081c918310b973806cdcd261bb3cdb125bcbbde
EBUILD mit-krb5-1.21.3.ebuild 4096 BLAKE2B 5afca7eb76ae9d78e046205cd41d8aceef85674e6a2b68df9a067dd967c074ceb7c1a2157112efba8f74965719191a80d4db77747b577a5c82337e80c0445f36 SHA512 39b810b41aee11cb7034e5e0ea485c83df2b50a0749aa65881bd8db164b11cf54acd3ba83ca6a012c8f5fd0d632314aa4b00c111a036ad9ede7486b6a32555e9
MISC metadata.xml 886 BLAKE2B 4db2f2acb4740d9d8d4dea745ebe583e373ccf6c6e8b33206305ebadc971e3132d4f0811407755ab4d9053bf2993d763a59b9104169d90c776cc7e3fd20ea9b1 SHA512 783772b00fc4d6f1da7b074bab380ed7448af7e5bfb8ff1dcbb098ee8f5fc16ac441da300c455b016e09025c65754bf540dc27bdc13198d93740e0110d1f5dc2
diff --git a/app-crypt/mit-krb5/mit-krb5-1.21.3-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.21.3-r1.ebuild
new file mode 100644
index 000000000000..d4a9b8582d06
--- /dev/null
+++ b/app-crypt/mit-krb5/mit-krb5-1.21.3-r1.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{11..13} )
+inherit autotools flag-o-matic python-any-r1 systemd toolchain-funcs multilib-minimal
+
+MY_P="${P/mit-}"
+P_DIR=$(ver_cut 1-2)
+DESCRIPTION="MIT Kerberos V"
+HOMEPAGE="https://web.mit.edu/kerberos/www/"
+SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}/src
+
+LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux test xinetd"
+
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ !!app-crypt/heimdal
+ >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+ || (
+ >=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
+ >=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
+ )
+ keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
+ lmdb? ( dev-db/lmdb:= )
+ nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
+ openldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
+ pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+ xinetd? ( sys-apps/xinetd )
+ "
+BDEPEND="
+ ${PYTHON_DEPS}
+ >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+ app-alternatives/yacc
+ cpu_flags_x86_aes? (
+ amd64? ( dev-lang/yasm )
+ x86? ( dev-lang/yasm )
+ )
+ doc? ( virtual/latex-base )
+ test? ( dev-util/cmocka )
+ "
+RDEPEND="${DEPEND}
+ selinux? ( sec-policy/selinux-kerberos )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.12_warn_cflags.patch"
+ "${FILESDIR}/${PN}_dont_create_rundir.patch"
+ "${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/krb5-config
+)
+
+src_prepare() {
+ default
+ # Make sure we always use the system copies.
+ rm -rf util/{et,ss,verto}
+ sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
+
+ eautoreconf
+}
+
+src_configure() {
+ # lto-type-mismatch (bug #854225)
+ filter-lto
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ AR="$(tc-getAR)" \
+ WARN_CFLAGS="set" \
+ econf \
+ $(use_with openldap ldap) \
+ $(use_enable nls) \
+ $(use_enable pkinit) \
+ $(use_with lmdb) \
+ $(use_with keyutils) \
+ --without-hesiod \
+ --enable-shared \
+ --with-system-et \
+ --with-system-ss \
+ --enable-dns-for-realm \
+ --enable-kdc-lookaside-cache \
+ --with-system-verto \
+ --enable-thread-support \
+ --disable-rpath
+}
+
+multilib_src_compile() {
+ emake -j1
+}
+
+multilib_src_test() {
+ multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+ emake \
+ DESTDIR="${D}" \
+ EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
+ install
+}
+
+multilib_src_install_all() {
+ # default database dir
+ keepdir /var/lib/krb5kdc
+
+ cd ..
+ dodoc README
+
+ newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
+ newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
+ newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
+ newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
+ newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
+ newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
+
+ systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
+ systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
+ systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
+ systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
+ systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
+
+ insinto /etc
+ newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
+ insinto /var/lib/krb5kdc
+ newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
+
+ if use openldap ; then
+ dodoc "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.ldif"
+ dodoc "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.openldap.ldif"
+ insinto /etc/openldap/schema
+ doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
+ fi
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}/kpropd.xinetd" kpropd
+ fi
+
+ if use doc; then
+ dodoc -r doc/html
+ docinto pdf
+ dodoc doc/pdf/*.pdf
+ fi
+}
diff --git a/app-crypt/moolticute/Manifest b/app-crypt/moolticute/Manifest
index 6fba316107ba..c4ccc4545657 100644
--- a/app-crypt/moolticute/Manifest
+++ b/app-crypt/moolticute/Manifest
@@ -4,8 +4,8 @@ AUX moolticuted.init 262 BLAKE2B f4eb3e905d03de4586d040dbcbeb3e381e6ae64d80b10f6
DIST moolticute-1.00.1.tar.gz 5911062 BLAKE2B c3e20d4466c6020842447cb2fa54eee309664e8bbbb52aff8582ff7d333c8e5a9a2d286dace8207f62aacc41e0d9a99b733cfc5788dac72933ae7e15dc91a779 SHA512 c1a4ab39abc8360d088f267ae06f69deb135975caaf9224488d5e33127c1a9c1d2c80795d901e83bd13c82f80f1e362acfe59b03ad024b88ef7b8a7d56acd79b
DIST moolticute-1.01.0.tar.gz 5912712 BLAKE2B dd6e22235978424744a6b0791c479c6cf233645a1a3879db6913acfca16ccb49eec45be5e9e2f6ba0f730edec658daa3aba91fcbd0389e734aeab7f89ca7a7ba SHA512 b5998f6739bd095e0ce8a18a9cc576a9f97b6e214b47670e5858937358f35c9dc36c3357b9ff943eabcd4a3feb7179cbc2640888aae8d59481abb41a81527c52
DIST moolticute-1.03.0.tar.gz 5963926 BLAKE2B a5b5f98bb501811891c9ac22754538cd1df21b9cc848cb883d5babad89bb76bb9f9b4c533250b0eedca7a8b79ff44f85e6de1e00cdd6d6220ba61b67958be3fc SHA512 450753c5d7f1e226d9b75b8ab4d61970120a2685d249a637c1323141b73108321b346001d2310558e2365ca842c7a3d5ab2f7773d32b5365d2bb3f937108d186
-EBUILD moolticute-1.00.1.ebuild 1357 BLAKE2B b1d01c117607f24f66d78a700ed270ca045080af61ae3f26b176387bd16e97467dd0e4c514047ca9d3c739838113e0aaf7c9477448a908ab96892273041aeb2d SHA512 333701b211629d8a0fe8caf28f53cf87d3ab3daa1cc95489ec2906fbaa8d4ed1742ba2ca8467945796f3379afc7e3b8f3f0e93638d56f3bac060167c96f92aaa
-EBUILD moolticute-1.01.0.ebuild 1357 BLAKE2B b1d01c117607f24f66d78a700ed270ca045080af61ae3f26b176387bd16e97467dd0e4c514047ca9d3c739838113e0aaf7c9477448a908ab96892273041aeb2d SHA512 333701b211629d8a0fe8caf28f53cf87d3ab3daa1cc95489ec2906fbaa8d4ed1742ba2ca8467945796f3379afc7e3b8f3f0e93638d56f3bac060167c96f92aaa
-EBUILD moolticute-1.03.0.ebuild 1420 BLAKE2B 648e5f3a7a8ae401aec580cd0ef338093d1729563b9bdd9023ba9d872eca9a83f70457f400897abdb6509585a970f1bc2751e331d1ede7909251fc6489392c9e SHA512 293b782fb8dedaae6ee88fd3e9cb43588588dc9754b63651e49df8e468e7799c3df0d3c42eabd57fd4d1a444329855cdec467fb9dc40c7cc5a4f090ddd3f406a
-EBUILD moolticute-9999.ebuild 1357 BLAKE2B b1d01c117607f24f66d78a700ed270ca045080af61ae3f26b176387bd16e97467dd0e4c514047ca9d3c739838113e0aaf7c9477448a908ab96892273041aeb2d SHA512 333701b211629d8a0fe8caf28f53cf87d3ab3daa1cc95489ec2906fbaa8d4ed1742ba2ca8467945796f3379afc7e3b8f3f0e93638d56f3bac060167c96f92aaa
+EBUILD moolticute-1.00.1-r1.ebuild 1292 BLAKE2B b8cab71c425762a3f306922d0e64a7f468f905f0c6d12913c2b8ce151eff88d6a8454c49f43cde8023b2c9d694b15e7e0a1cb08824ad1f8993b6de4cc32663e8 SHA512 619c98779a060159ec5274a7579b190b6c301651eae053ed096fb9a31b7318939f15a5bc5c3e2cffcb6ad154c9eb431b37846deddcf7b685a8a2526f39aff68d
+EBUILD moolticute-1.01.0-r1.ebuild 1292 BLAKE2B b8cab71c425762a3f306922d0e64a7f468f905f0c6d12913c2b8ce151eff88d6a8454c49f43cde8023b2c9d694b15e7e0a1cb08824ad1f8993b6de4cc32663e8 SHA512 619c98779a060159ec5274a7579b190b6c301651eae053ed096fb9a31b7318939f15a5bc5c3e2cffcb6ad154c9eb431b37846deddcf7b685a8a2526f39aff68d
+EBUILD moolticute-1.03.0-r1.ebuild 1355 BLAKE2B 7fec7eca2704c92e0dc68abb1c5539bab0f960559a12609c13109a6be908372b2d04cc086812224606f011dac2fe6313f97b096fbd64cf403c76a028ec5b57de SHA512 04d6b499a632a8873a6307b145fb3981a7e0c723f531a4f63e579e3297cbc2146e5adfc226881285f40ef38ed5be9b334d29e8a7d1a7acbacc936679094c8d07
+EBUILD moolticute-9999.ebuild 1292 BLAKE2B b8cab71c425762a3f306922d0e64a7f468f905f0c6d12913c2b8ce151eff88d6a8454c49f43cde8023b2c9d694b15e7e0a1cb08824ad1f8993b6de4cc32663e8 SHA512 619c98779a060159ec5274a7579b190b6c301651eae053ed096fb9a31b7318939f15a5bc5c3e2cffcb6ad154c9eb431b37846deddcf7b685a8a2526f39aff68d
MISC metadata.xml 561 BLAKE2B 3acaed8d64be983605a440f04e23f2ea9c6a8f8506276900a1b7256e863d2ebd1713a5310740e3b670997c3420b038703ead60db752d1d8a1b7ff0d0885dc854 SHA512 a83b9cfd8d7d94df853e5d1abde7bc01137d847679c9dc96203af4cd87547ec747e557502a1e34e713e11f4867da4b0b784428b75a6af2e97d57f63b920cb730
diff --git a/app-crypt/moolticute/moolticute-1.00.1.ebuild b/app-crypt/moolticute/moolticute-1.00.1-r1.ebuild
index d7fa4843bf98..fd840ecf9eb0 100644
--- a/app-crypt/moolticute/moolticute-1.00.1.ebuild
+++ b/app-crypt/moolticute/moolticute-1.00.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,6 @@ HOMEPAGE="https://github.com/mooltipass/moolticute"
LICENSE="GPL-3"
SLOT="0"
-IUSE="systemd"
RDEPEND="
>=dev-libs/libusb-1.0.20
@@ -29,8 +28,7 @@ RDEPEND="
dev-qt/qttest:5
dev-qt/qtwebsockets:5
dev-qt/qtwidgets:5
- systemd? ( sys-apps/systemd )
- !systemd? ( sys-apps/systemd-utils )
+ virtual/libudev:=
"
BDEPEND="${RDEPEND}
dev-qt/linguist-tools:5
diff --git a/app-crypt/moolticute/moolticute-1.01.0.ebuild b/app-crypt/moolticute/moolticute-1.01.0-r1.ebuild
index d7fa4843bf98..fd840ecf9eb0 100644
--- a/app-crypt/moolticute/moolticute-1.01.0.ebuild
+++ b/app-crypt/moolticute/moolticute-1.01.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,6 @@ HOMEPAGE="https://github.com/mooltipass/moolticute"
LICENSE="GPL-3"
SLOT="0"
-IUSE="systemd"
RDEPEND="
>=dev-libs/libusb-1.0.20
@@ -29,8 +28,7 @@ RDEPEND="
dev-qt/qttest:5
dev-qt/qtwebsockets:5
dev-qt/qtwidgets:5
- systemd? ( sys-apps/systemd )
- !systemd? ( sys-apps/systemd-utils )
+ virtual/libudev:=
"
BDEPEND="${RDEPEND}
dev-qt/linguist-tools:5
diff --git a/app-crypt/moolticute/moolticute-1.03.0.ebuild b/app-crypt/moolticute/moolticute-1.03.0-r1.ebuild
index 706c83a1a2da..583d9b162471 100644
--- a/app-crypt/moolticute/moolticute-1.03.0.ebuild
+++ b/app-crypt/moolticute/moolticute-1.03.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,6 @@ HOMEPAGE="https://github.com/mooltipass/moolticute"
LICENSE="GPL-3"
SLOT="0"
-IUSE="systemd"
RDEPEND="
>=dev-libs/libusb-1.0.20
@@ -29,8 +28,7 @@ RDEPEND="
dev-qt/qttest:5
dev-qt/qtwebsockets:5
dev-qt/qtwidgets:5
- systemd? ( sys-apps/systemd )
- !systemd? ( sys-apps/systemd-utils )
+ virtual/libudev:=
"
BDEPEND="${RDEPEND}
dev-qt/linguist-tools:5
diff --git a/app-crypt/moolticute/moolticute-9999.ebuild b/app-crypt/moolticute/moolticute-9999.ebuild
index d7fa4843bf98..fd840ecf9eb0 100644
--- a/app-crypt/moolticute/moolticute-9999.ebuild
+++ b/app-crypt/moolticute/moolticute-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,6 @@ HOMEPAGE="https://github.com/mooltipass/moolticute"
LICENSE="GPL-3"
SLOT="0"
-IUSE="systemd"
RDEPEND="
>=dev-libs/libusb-1.0.20
@@ -29,8 +28,7 @@ RDEPEND="
dev-qt/qttest:5
dev-qt/qtwebsockets:5
dev-qt/qtwidgets:5
- systemd? ( sys-apps/systemd )
- !systemd? ( sys-apps/systemd-utils )
+ virtual/libudev:=
"
BDEPEND="${RDEPEND}
dev-qt/linguist-tools:5
diff --git a/app-crypt/onak/Manifest b/app-crypt/onak/Manifest
index 872c38259a8b..a48a4eba6e84 100644
--- a/app-crypt/onak/Manifest
+++ b/app-crypt/onak/Manifest
@@ -1,5 +1,7 @@
AUX onak-0.5.0-musl-strtouq-fix.patch 353 BLAKE2B b5930a61c157073072e8dac9bf38c195cbfa4a0da8d7c424d8cf6e7845b63003b87be65cb0ed509f40dcb275034b05f0581507c2d0f2569ebe6fb67dd4c2913b SHA512 8b9dd23c05f14453d1d3cd5349fe1af7c0fd4713c882835600b2825854c02c2944e9a3f932888e7c26e439d98c5aac57527198db3e634908d9d31e1c3f6fb3ec
+AUX onak-0.6.3-cmake.patch 1849 BLAKE2B b4c05a73554c7c831ba55adb32b8e5f5c97932b042b6afdc0b884aef952f7ff84e288c31c17e5b1cd5782d4be22f67fe4e2f4a5a15a8af926bde7fbfd5e12756 SHA512 e97e58eca3411a7b06d28d4e6ce726921f28eb7a4091d70b97435519416c126fdf502fe21abee6dd32ff9a3e81b1ee675059073d41241366e53d2f57a988c67e
DIST onak-0.5.0.tar.xz 240764 BLAKE2B a42d9a97137ae7fb403d8a20f2a9a5b5060d216fca97447630c8e8659440d5baa0c6e0fbe983feec8b4061263decc1183868055fe53c0797d49dd1f2e4c141f8 SHA512 db38793acc82089089ac0b9fb6db9989b6bb8e94c35c14112d028d12f7bb7553b7409121378346625528c4916506d007bf40963f4a346483f51a23b670680a7d
+DIST onak-0.6.3.tar.xz 717040 BLAKE2B bae6c5b6022b42f59d6cf978d5e79df7b8bb71692bc11cfd162563f8afacb07c81505e070a7f6154b409db78449cd3b2182a1232e6ff3dacb4588cd977482f44 SHA512 3952b2ca8dfc32236dc6fc92a35d0d8223ae03be343fef4fcda49875d9d2b6ceb042c1c2cd63c035c467ee2773a103a36c7407c201f23de176e2121559ea1bff
EBUILD onak-0.5.0-r1.ebuild 1072 BLAKE2B 9b46f3f2266676601f8be4ed9484912f89fa6abf77088761d02d7237977fe70f6ef4254524ba204a72bef9acc513dbcc843f1cf1debcc925849bf7b27ea7db18 SHA512 3816329df3635c81f7aa03ddb655dee7f552f03085936c88a228ed92510af2f5c0aa11cd78217dc5279a0145d094d760e61c0330e1282b9e5dd17ab19f943f76
-EBUILD onak-0.5.0.ebuild 1012 BLAKE2B 3dacd0c3dd3afc4b74018f8056f5acc74bd8cbacbdb9c82f553264f12894d2815b953828284adf878b2a31d0d6c8cf15f3189767de5505fcf11ccbc982a93ed7 SHA512 b10740cf0ca4c1790acf7d7584c9e64e7865ef4159a2d56a034da96f0adc48c246efe50bdb986c32d317471a1f680e5f77b12c3bb0e3b301ac14fa4d1b92f423
-MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
+EBUILD onak-0.6.3.ebuild 1513 BLAKE2B f8a0441ba6311fc1e69bcd15c912b9a699a4c4ee01175118a88bbd1273c55c17c7a94052b4dd264f1eb30e5a0891920923bb84e4043beea3fe28f0a8c1afaca4 SHA512 bd430b1fa6fd4185757aac77bec8f81e5caead1ac182c4ceeeb1cab52eaeee1d3d13189c7ccaf0309217d94275dd67264bc862f4d99640240b3c15462dc36113
+MISC metadata.xml 380 BLAKE2B a9dc78b8406eee4e7a6b1ce374a80251c5934f7b9a35775cdcd3ca2caafc6343d4c987f216297b51ca12275772a181b9518890b3a21fa82120fd6fed21209c73 SHA512 a8d98d4dffe5ef8e4074a948ae7a7d52fc7e77e8712446c90481ad54f481dfd4e2689857bf324bf95e859b55e6c25f1197dd8db6b1f874b27606809e7cdbd53a
diff --git a/app-crypt/onak/files/onak-0.6.3-cmake.patch b/app-crypt/onak/files/onak-0.6.3-cmake.patch
new file mode 100644
index 000000000000..f1b62577c87d
--- /dev/null
+++ b/app-crypt/onak/files/onak-0.6.3-cmake.patch
@@ -0,0 +1,51 @@
+From 226cb71737b24ab602e26b72b183888cd1385e86 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@gentoo.org>
+Date: Fri, 1 Nov 2024 15:02:07 +0100
+Subject: [PATCH 1/2] Workaround automagic properties of CMakeList.txt
+
+The GENTOO_BACKENDS variable is controlled from the ebuild, therefore it
+can be synchronised with users USE preference, unlike the BACKENDS which
+is filled automagically based on detected libraries.
+
+Additionally, BACKEND_${DBTYPE}_LIBS variable needs to be propagated to
+the parent scope, otherwise non-dynamic db backend cannot link properly.
+---
+ CMakeLists.txt | 2 +-
+ keydb/CMakeLists.txt | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ed47ba3..d46dcdf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -123,7 +123,7 @@ add_subdirectory(keydb)
+ if (DBTYPE STREQUAL "dynamic")
+ LIST(APPEND LIBONAK_LIBRARIES "dl")
+ else()
+- list (FIND BACKENDS ${DBTYPE} _index)
++ list (FIND GENTOO_BACKENDS ${DBTYPE} _index)
+ if (${_index} LESS 0)
+ message(FATAL_ERROR "${DBTYPE} is not a supported DB backend.")
+ endif()
+diff --git a/keydb/CMakeLists.txt b/keydb/CMakeLists.txt
+index 7567b6c..724f208 100644
+--- a/keydb/CMakeLists.txt
++++ b/keydb/CMakeLists.txt
+@@ -50,7 +50,7 @@ if (KEYD STREQUAL "ON")
+ endif()
+
+ if (DBTYPE STREQUAL "dynamic")
+- foreach(BACKEND IN LISTS BACKENDS)
++ foreach(BACKEND IN LISTS GENTOO_BACKENDS)
+ add_library(keydb_${BACKEND} SHARED keydb_${BACKEND}.c)
+ target_include_directories(keydb_${BACKEND} SYSTEM PUBLIC
+ ${BACKEND_${BACKEND}_INC})
+@@ -59,4 +59,6 @@ if (DBTYPE STREQUAL "dynamic")
+ install(TARGETS keydb_${BACKEND} LIBRARY DESTINATION
+ ${CMAKE_INSTALL_LIBDIR}/onak/backends/)
+ endforeach(BACKEND)
++else()
++ set(BACKEND_${DBTYPE}_LIBS ${BACKEND_${DBTYPE}_LIBS} PARENT_SCOPE)
+ endif()
+--
+2.45.2
diff --git a/app-crypt/onak/metadata.xml b/app-crypt/onak/metadata.xml
index 115e9d64a669..68c2a2f0f43b 100644
--- a/app-crypt/onak/metadata.xml
+++ b/app-crypt/onak/metadata.xml
@@ -2,4 +2,11 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
+ <use>
+ <flag name="dynamic">Support for dynamic loading of backends</flag>
+ <flag name="hkp">Proxying backend support</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">u1f35c/onak</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/app-crypt/onak/onak-0.5.0.ebuild b/app-crypt/onak/onak-0.5.0.ebuild
deleted file mode 100644
index 258e3d778a1e..000000000000
--- a/app-crypt/onak/onak-0.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="onak is an OpenPGP keyserver"
-HOMEPAGE="http://www.earth.li/projectpurple/progs/onak.html"
-SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="berkdb postgres"
-
-DEPEND="berkdb? ( >=sys-libs/db-4 )
- postgres? ( dev-db/postgresql[server] )"
-
-DOCS=(
- apache2 README LICENSE onak.sql
-)
-
-# it tries to use all backends?
-RESTRICT="test"
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local backend="fs"
- use berkdb && backend="db4"
- use postgres && backend="pg"
- if use berkdb && use postgres; then
- ewarn "berkdb and postgres requested, postgres was preferred"
- fi
- econf --localstatedir=/var --enable-backend="${backend}"
-}
-
-src_install() {
- default
- insinto /etc
- doins onak.ini
- keepdir /var/lib/onak
- dodir /usr/lib/cgi-bin/pks
- insinto /usr/lib/cgi-bin/pks
- doins add gpgwww lookup
-}
diff --git a/app-crypt/onak/onak-0.6.3.ebuild b/app-crypt/onak/onak-0.6.3.ebuild
new file mode 100644
index 000000000000..d1f63a70acd1
--- /dev/null
+++ b/app-crypt/onak/onak-0.6.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="onak is an OpenPGP keyserver"
+HOMEPAGE="
+ https://www.earth.li/projectpurple/progs/onak.html
+ https://github.com/u1f35c/onak
+"
+SRC_URI="https://www.earth.li/projectpurple/files/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="berkdb +dynamic hkp postgres test"
+REQUIRED_USE="test? ( dynamic )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/nettle:=
+ dev-libs/gmp:=
+ berkdb? ( sys-libs/db:= )
+ hkp? ( net-misc/curl )
+ postgres? ( dev-db/postgresql:= )
+"
+DEPEND="${RDEPEND}"
+
+DOCS=(
+ README.md onak.sql
+)
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.5.0-musl-strtouq-fix.patch"
+ "${FILESDIR}/${P}-cmake.patch"
+)
+
+src_configure() {
+ # variable is initialized with default values based on list from
+ # keydb/CMakeLists.txt. The fs backend is the last one in the list for
+ # USE=-dynamic backend options, see DBTYPE option, which mimics bahavior of
+ # older ebuild version.
+ local backends=( file keyring stacked keyd fs )
+ use berkdb && backends+=( db4 )
+ use hkp && backends+=( hkp )
+ use postgres && backends+=( pg )
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+ -DGENTOO_BACKENDS=$(IFS=';'; echo "${backends[*]}")
+ -DDBTYPE=$(usex dynamic dynamic "${backends[-1]}")
+ )
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ keepdir /var/lib/onak
+ insinto /usr/lib/cgi-bin/pks
+ doins "${BUILD_DIR}"/cgi/{add,gpgwww,hashquery,lookup}
+}
diff --git a/app-crypt/p11-kit/Manifest b/app-crypt/p11-kit/Manifest
index e5cb10c5c337..35f22e235f9f 100644
--- a/app-crypt/p11-kit/Manifest
+++ b/app-crypt/p11-kit/Manifest
@@ -1,4 +1,6 @@
AUX p11-kit-0.25.3-pointer.patch 4083 BLAKE2B 7aad1cca28abe2af19ec882d94c43705d34874e65940a2f5bc647bd500091bd88e5ea7bb9b7cd50d707a85d20aaa8772f22b5ba54c4e3e1d49d35521a5c43538 SHA512 22b793db6f8f911926791ce331c69ce41cf397e17a362afc829914534f2ea3d316fa34c292e55ac21f874328f8daf32e4b856666da70fa3cde7cba55f72a293d
DIST p11-kit-0.25.3.tar.xz 991528 BLAKE2B 5c695c1ef95edf4bbbab001aa634076c433df0bc89cb8104deaec2ce00c6908640e467755b49c6900e5d7d5d81e1a3871f4978a212c6f6ae088386ac0b95289a SHA512 ad2d393bf122526cbba18dc9d5a13f2c1cad7d70125ec90ffd02059dfa5ef30ac59dfc0bb9bc6380c8f317e207c9e87e895f1945634f56ddf910c2958868fb4c
-EBUILD p11-kit-0.25.3-r2.ebuild 2005 BLAKE2B c5e7b6dace54069ec16277f9988ce71827e1804d6e5ca5914e8d158083c20b369f687874cc66b0c04f55fee4bd4466f14fec2ccf2ad79b0e2e31ce16b9754a9a SHA512 9567b69fc25bc47becb731f88a54749c9344df62f6c8367b2841befce0169d83cfb1ce44c50aea4aa1ac4c84fd171f6f39985c855ddbebebfbef7e66771ce606
+DIST p11-kit-0.25.5.tar.xz 1002056 BLAKE2B 96d6a9c2807586abafae4da4df89f566672733963997d6a83e00aaf83a7a0c0e2995638f505e98fb87a90c60bde28814f1e8b7d5071bf0af96bb0467105a1ddc SHA512 177ec6ff5eb891901078306dce2bf3f5c1a0e5c2a8c493bdf5a08ae1ff1240fdf6952961e973c373f80ac3d1d5a9927e07f4da49e4ff92269d992e744889fc94
+EBUILD p11-kit-0.25.3-r2.ebuild 2005 BLAKE2B 476334d3a581e9e033cf96309ab3b03c7f7b594d7beb4ea1f7f48ac7f8b5ba51f0e8b6bf549dd02f1ceb82c981d34650dd72bb642b33992028e84a751dcb0ecf SHA512 c75e94c76d873d221200ff59621d3676d8c0db8555fe15f119cbf7d98a6047422b3c2e68268303f713b87bbcd0bd863f4abed2760fe4b293d65c7440624718e8
+EBUILD p11-kit-0.25.5.ebuild 1956 BLAKE2B 9f06e91e27825ded7381d27105c0994fe1c03477d7e6962385ad7619bfa6acf4df15755fae9014223879fde6add1b25e0afe8c450956d19c604cb81bffb55d97 SHA512 20a94fa1379fb5e7a98bf2f8f5b16f61bf8874ee8305102df95db1746cc78ccc5ea5d66348938c9c9284786eb1166c5144535daa384e99069e6665b43d17855a
MISC metadata.xml 249 BLAKE2B 689b2967578682135e3f7d619c2b733bb4e50cd74215a0fa17d3bae7b4f59495c7f8d316ef5340d14cf32de956162fa890186f19346d95f212d18a643b55bee1 SHA512 f3f0b79d325cd001c8cf1c9d6ca14d3c09149aefab7862bd04801cafdc2efad9fe7e456e4fac55c6233413f645188188643f6e8f8dfb54deffe5fa30768831b0
diff --git a/app-crypt/p11-kit/p11-kit-0.25.3-r2.ebuild b/app-crypt/p11-kit/p11-kit-0.25.3-r2.ebuild
index 70bbe18bb324..f27bbaf48cf6 100644
--- a/app-crypt/p11-kit/p11-kit-0.25.3-r2.ebuild
+++ b/app-crypt/p11-kit/p11-kit-0.25.3-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit bash-completion-r1 meson-multilib python-any-r1
DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
diff --git a/app-crypt/p11-kit/p11-kit-0.25.5.ebuild b/app-crypt/p11-kit/p11-kit-0.25.5.ebuild
new file mode 100644
index 000000000000..0c23a73251f2
--- /dev/null
+++ b/app-crypt/p11-kit/p11-kit-0.25.5.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+inherit bash-completion-r1 meson-multilib python-any-r1
+
+DESCRIPTION="Provides a standard configuration setup for installing PKCS#11"
+HOMEPAGE="https://p11-glue.github.io/p11-glue/p11-kit.html"
+SRC_URI="https://github.com/p11-glue/p11-kit/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+libffi gtk-doc nls systemd test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-misc/ca-certificates
+ >=dev-libs/libtasn1-3.4:=[${MULTILIB_USEDEP}]
+ libffi? ( dev-libs/libffi:=[${MULTILIB_USEDEP}] )
+ systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ app-text/docbook-xsl-stylesheets
+ dev-libs/libxslt
+ virtual/pkgconfig
+ gtk-doc? ( dev-util/gtk-doc )
+ nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+ default
+
+ # Relies on dlopen which won't work for multilib tests (bug #913971)
+ cat <<-EOF > "${S}"/p11-kit/test-server.sh || die
+ #!/bin/sh
+ exit 77
+ EOF
+}
+
+multilib_src_configure() {
+ # Disable unsafe tests, bug#502088
+ export FAKED_MODE=1
+
+ local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local
+
+ # p11-kit doesn't need this to build and castxml needs Clang. To get
+ # a deterministic non-automagic build, always disable the search for
+ # castxml.
+ cat >> ${native_file} <<-EOF || die
+ [binaries]
+ castxml='castxml-falseified'
+ EOF
+
+ local emesonargs=(
+ --native-file "${native_file}"
+ -Dbashcompdir="$(get_bashcompdir)"
+ -Dtrust_module=enabled
+ -Dtrust_paths="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
+ $(meson_feature libffi)
+ $(meson_use nls)
+ $(meson_use test)
+ $(meson_native_use_bool gtk-doc gtk_doc)
+ $(meson_native_true man)
+ $(meson_native_use_feature systemd)
+ )
+
+ meson_src_configure
+}
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 1ebf5816603f..dc20673ccd30 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,16 +1,6 @@
AUX pinentry-1.0.0-AR.patch 326 BLAKE2B 2a05565287d2a3ff9423db1365af6ac1d2d0e0e5b3b7db49ee927eacd480cfbd29abd2313d84eb764e9d7eccd4654e2173fbf8be4508dd88f14bf12f0f9dab39 SHA512 3a8b13ddaa2af8c793586cd73e44b59828e769c3861b2d328273bac991e7e171c8714e2098674a9ae8a77c9a68098012d217e67dde8872df154a1e499837de52
-AUX pinentry-1.2.1-automagic-capslock.patch 2831 BLAKE2B abe6c6815521dd80a227704ad2698e4aaa808faccb7d95acb1b2af8bb55f2fec03d92df0b60703da2c9f092988da32572ad2fcbd1735b3109ae278d24e76e1eb SHA512 a9fe32da17d214e5d0355efa575c04f4010a42dd9b272e2446f632017a383f2dd5bd3b98a8a71fe13bf55769fa0b420310d4f3217fa16a31272058d44598f99d
-AUX pinentry-1.2.1-include-memory.patch 8682 BLAKE2B e119583daaf2b418047fc51bc29dafb979452f5831dd89a86879c87038abb0d690752078577803810f52a0eb2660ad3428abdcac4f670450ac09b701c250641c SHA512 9a56ea04447fabd248f54953d07262510d7ebcfef3e5daf8084f4138df037bf31288ff95baa6eae6ec7584a773fd3ae242c121ca3c1910d415407a8eccb69ccd
AUX pinentry-1.3.0-automagic.patch 4225 BLAKE2B bc93667e359aee721bb887c4b794483b07c0864e7b2c647954a43b010d3284ebfcc35b922e0db51ea54c46895edfc59322bd579d931bfb20ebad93980609880f SHA512 25a9820e3c08814e5b90e900a8f91856891b1bcdd78d01f516f743c28bec9e609872f1c2f23ffbad1e48791d4d44b8efddc6a370f20be9c6f5d991463bd6446f
-AUX pinentry-1.3.0-ifdef-qt.patch 3354 BLAKE2B 94efd9162e391eb769a235558301b646f6c97be3c7cbb1789addd381e856da78c6067b8f6bb90f5821476fa7762a756f147c106607a5715c0c888d237ab94264 SHA512 a76a6749b4903c549405e0cdd5fd69042dee8583520a3de1a72bb151ca437d4b4750bd455b9b4f15f9b767eec4ca3b37690645a98c85b85c0f6658ba912fbbdd
-DIST pinentry-1.2.1.tar.bz2 547698 BLAKE2B aa47612aa3a6f74c3676bf4018780356cb22ed4078792c1f466f9e0465199428c151c0e20dfbe6c784ef93c2b42b673daff0b6adc74c8c98fed9921e65ed42ea SHA512 a665315628f4dcf07e16a22db3f3be15d7e7e93b3deec0546c7275b71b0e3bd65535a08af5e12d6339fd6595132df86529401d9d12bd17c428a3466e8dfafab6
-DIST pinentry-1.2.1.tar.bz2.sig 238 BLAKE2B 01ba3dc296a8e76c546d21d0bb0cd13778476d5d5b3ef55a3401c6a0353a56d79250d11555afb31c77c5a77e63847ded0f8eaef395bb0dc2ee3ff1d6a4ed83bd SHA512 d0e8435dc169a58f111f057f1c9fbb6c70da32a850f1107d6abdf41357c1714832728109ae61507db313d7eaef9596e5faf92fd21bed78adcc46a8c8a590430b
-DIST pinentry-1.3.0.tar.bz2 610363 BLAKE2B a55b80754ef37d18ebdf0bd50e134a7b1bf6362b859b7069a9e4ebd86cd7e733d51f3c21a16779a18aa0d0dfab1f7a3df070d4f7e39e0840339078c4e9cb58bc SHA512 1bbac81c6811cffc8969a46494e6daa6b8447802f47ff6fa3e4dc9ac244cf6e5f629834c9b6a60770d06bff6c9932ad4059f10d2fdf93fd9e26fd5d21c0e3732
-DIST pinentry-1.3.0.tar.bz2.sig 119 BLAKE2B 0f11126761b2a06f8b08cf971f5d610cacbde1a5ee419523a6e704ac21fef4cce26495a160a51bee5ed5f68eca7d6864dfa03efa48030ba2cf783e767b925e1c SHA512 77a61877adf241d67caeea3af4c12a2c7c13ddc423ac001fab79bcec463a5853d8806052d61504fae0c67e0a9d1edf6a12d24b560ff7b4083eea5e86f9b54a90
DIST pinentry-1.3.1.tar.bz2 611233 BLAKE2B 47a510b3746fc8cdd83b56302132f4f4d9c61324fc857ce0867387f70f79490dad375bca4dc72e5d1cdca707bf89a16e1c9a20bf1aa0e857d69e59dc59403afd SHA512 3b72034dc1792b1475acb6d605ff7c1bd7647a0f02d1b6bdcd475acdef24bc802f49e275055436c3271261c4b7a64168477a698aab812a145962146b2f67a0e2
DIST pinentry-1.3.1.tar.bz2.sig 119 BLAKE2B ca562d2903c88c4297e641ddc39f6cd99db3e3fd40cf5d69e7b4335f006c7717c874fa4b5e47920af3ec97385a96c0c96aafb849cf399d11a7f9f1a6b693f479 SHA512 22bd94f74486300eb84c1c9c371a43b05fb6179118518004fba0d42b6d3e6731f94d79b37c2a3a6b0c5886578c4575f75d2460accd36cd4874342e7239521be9
-EBUILD pinentry-1.2.1-r7.ebuild 2614 BLAKE2B cf0aeda4cab14f7e3b2deeb034b466e1e92012b43870c7ca2ad4c9bcae530cae8134ca8471f1ef27943110e76829dfcd3247375fad028237046df12a0f4a44cd SHA512 9471c2de5968d10e9611f54b8b47cf5cf8eec4cdedd7c9a0b932cef234a537f1e7e4e9638dc02f42e53a4b6687aafb15e1b349e7577d7635526488c17b7fc4a4
-EBUILD pinentry-1.2.1-r8.ebuild 2615 BLAKE2B 48ee64964d608c5bf6e59bbb57ed6cceb79926be877b69059218549e349e74fb96cef1fd08145e8c35f55575bc44fa8c0ecaeebaec38d2c12748a51cfdaa6cdd SHA512 536ec9e997c3796591fabc1f4481cf20b74dfd2dadc1c5057a4a277e73f9f5b96f9ac906af2ea1fe0901b57ddc846142203916cdb865352c6923737b17c07f16
-EBUILD pinentry-1.3.0-r3.ebuild 3279 BLAKE2B c826ee93f01b381099a75c43e51e447b1b1a765800920bca8bfa5b5e70bf27c4392ab0f4d05ac038e3d2bd562be47c99d1e035ca579b3b211e0582913cff2f0e SHA512 9e68a2bed1af980e4247e1c86357d0c40767eb38c09d8177b8180956d58563f861baff114047a6d3d69702175cfc9e0f0505c6f0f61a10b49e6840d79c698a3f
-EBUILD pinentry-1.3.1.ebuild 3245 BLAKE2B 9d179ce81228339c8810ace0b31ab75a1bbbe4c46aefed9a0f944d5393d0dab95235078618efb2fe3aa32084e54fbaf283516eccfb8528e192d182c159936b81 SHA512 5a2f0c42cd6dbb1780caf61b723aada9dc0046bea243ea60a3ee14d15b81b378fa15bfd3e4c550673b7827142e995443c574d401fe137cfba7cb33bf039766af
+EBUILD pinentry-1.3.1.ebuild 3237 BLAKE2B a6d0aa8378dfed178196182606158240b223ad246bd5eeb2ea829f1fa9942f8b0a075208f9fb779e90476947889a32992f36e22a46d14501c8eb0bbae929584b SHA512 e199284f9e68f44f7507480d6c5248b5d2dc95529cfcbf741c15c28ca68de048a3ee3bd96023db0f00800deddc3a343a2438feaf62e72f0fa9cedf4e74a873de
MISC metadata.xml 344 BLAKE2B d71f184ae783d215e32dc94e346c1f753f158b298cc2df87c14d5b73454ff3b4bf0ce4744d2aa0359bc68cb993cd35d2d6f77a09769853fda5b66e1cc1da3580 SHA512 0ae1c64980d4d94b8bbc04040a17b358b7138bf4022dcd97b6d2c464bc5fac0911c9522bea253586f69c8d137b75fe3e302d7cd9802290c2720c77706d9a935f
diff --git a/app-crypt/pinentry/files/pinentry-1.2.1-automagic-capslock.patch b/app-crypt/pinentry/files/pinentry-1.2.1-automagic-capslock.patch
deleted file mode 100644
index 081fad60eb03..000000000000
--- a/app-crypt/pinentry/files/pinentry-1.2.1-automagic-capslock.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-https://dev.gnupg.org/T6161
-https://bugs.gentoo.org/819939
-https://bugs.gentoo.org/837719
---- a/configure.ac
-+++ b/configure.ac
-@@ -508,8 +508,12 @@ fi
- dnl
- dnl Check for libX11 library
- dnl
-+AC_ARG_WITH(x,
-+ AS_HELP_STRING([--with-x],[use libX11]),
-+ [want_x11=$withval], [want_x11=maybe])
-+
- have_x11=no
--if test "$have_w32_system" != "yes"; then
-+AS_IF([test "$have_w32_system" != "yes" && test "$want_x11" != "no"], [
- PKG_CHECK_MODULES(
- LIBX11,
- [x11],
-@@ -519,18 +523,20 @@ if test "$have_w32_system" != "yes"; then
- have_x11=no
- ]
- )
-+])
-
-- if test "$have_x11" = "yes"; then
-- AC_DEFINE(HAVE_X11, 1,
-- [The pinentries can optionally use x11.])
-- fi
--fi
-+AS_IF([test "$have_x11" = "yes"], [AC_DEFINE(HAVE_X11, 1, [The pinentries can optionally use x11.])])
-
- dnl
- dnl Check for KF5WaylandClient library
- dnl
-+
-+AC_ARG_ENABLE(kf5-wayland,
-+ AS_HELP_STRING([--enable-kf5-wayland],[use KF5WaylandClient for capslock indication on Wayland]),
-+ [want_kf5_wayland=$enableval], [want_kf5_wayland=maybe])
-+
- have_kf5waylandclient=no
--if test "$have_w32_system" != "yes"; then
-+AS_IF([test "$have_w32_system" != "yes" && test "$want_kf5_wayland" != "no"], [
- PKG_CHECK_MODULES(
- KF5WAYLANDCLIENT,
- [KF5WaylandClient >= 5.60],
-@@ -540,7 +546,7 @@ if test "$have_w32_system" != "yes"; then
- have_kf5waylandclient=no
- ]
- )
--fi
-+])
-
- dnl
- dnl Check for Qt5 pinentry program.
---- a/m4/qt.m4
-+++ b/m4/qt.m4
-@@ -33,6 +33,10 @@ AC_DEFUN([FIND_QT],
- enable_pinentry_qt5=$enableval,
- enable_pinentry_qt5="try")
-
-+ AC_ARG_ENABLE(qtx11extras,
-+ AS_HELP_STRING([--enable-qtx11extras],[use Qt5X11Extras for capslock indication on X11]),
-+ [want_qtx11extras=$enableval], [want_qtx11extras=maybe])
-+
- have_qt5_libs="no";
- require_qt_cpp11="no";
-
-@@ -63,20 +67,22 @@ AC_DEFUN([FIND_QT],
- fi
- fi
-
-- if test "$have_x11" = "yes"; then
-+ have_qt5_x11extras=no
-+ AS_IF([test "$have_x11" = "yes" && test "$want_qtx11extras" != "no"], [
- PKG_CHECK_MODULES(
- PINENTRY_QT_X11_EXTRAS,
- Qt5X11Extras >= 5.1.0,
- [have_qt5_x11extras="yes"],
-- [
-- AC_MSG_WARN([pinentry-qt will be built without Caps Lock warning on X11])
-- have_qt5_x11extras="no"
-- ])
-- if test "$have_qt5_x11extras" = "yes"; then
-+ [have_qt5_x11extras="no"]
-+ )
-+ ])
-+
-+ AS_IF([test "$have_qt5_x11extras" = "yes"], [
- PINENTRY_QT_CFLAGS="$LIBX11_CFLAGS $PINENTRY_QT_CFLAGS $PINENTRY_QT_X11_EXTRAS_CFLAGS"
- PINENTRY_QT_LIBS="$LIBX11_LIBS $PINENTRY_QT_LIBS $PINENTRY_QT_X11_EXTRAS_LIBS"
-- fi
-- fi
-+ ], [
-+ AC_MSG_WARN([pinentry-qt will be built without Caps Lock warning on X11])
-+ ])
-
- AC_CHECK_TOOL(MOC, moc)
- AC_MSG_CHECKING([moc version])
diff --git a/app-crypt/pinentry/files/pinentry-1.2.1-include-memory.patch b/app-crypt/pinentry/files/pinentry-1.2.1-include-memory.patch
deleted file mode 100644
index 8c67950af6f3..000000000000
--- a/app-crypt/pinentry/files/pinentry-1.2.1-include-memory.patch
+++ /dev/null
@@ -1,313 +0,0 @@
-https://bugs.gentoo.org/925557
-https://dev.gnupg.org/D566
-
-From 8ab1682e80a2b4185ee9ef66cbb44340245966fc Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Mon, 20 Mar 2023 08:31:04 +0100
-Subject: [PATCH] Fix problem with inclusion of wrong memory.h.
-
-* secmem/memory.h: Rename to ...
-* secmem/secmem.h: this.
-* pinentry/pinentry.h: Include secmem.h. Remove almost all inclusions
-of memory.h or replace them by "../secmem/secmem.h".
---
-
-See-also: https://dev.gnupg.org/D566
----
- fltk/main.cxx | 1 -
- fltk/pinwindow.cxx | 2 +-
- gnome3/pinentry-gnome3.c | 2 --
- pinentry/password-cache.c | 2 +-
- pinentry/pinentry-curses.c | 7 +++----
- pinentry/pinentry-emacs.c | 2 +-
- pinentry/pinentry.c | 1 -
- pinentry/pinentry.h | 2 ++
- secmem/Makefile.am | 2 +-
- secmem/secmem++.h | 2 +-
- secmem/secmem.c | 2 +-
- secmem/{memory.h => secmem.h} | 0
- tqt/secqstring.h | 2 +-
- tty/pinentry-tty.c | 1 -
- w32/main.c | 1 -
- 15 files changed, 12 insertions(+), 17 deletions(-)
- rename secmem/{memory.h => secmem.h} (100%)
-
---- a/fltk/main.cxx 2019-03-05 23:09:48.000000000 -0800
-+++ b/fltk/main.cxx 2024-02-26 11:02:47.822134762 -0800
-@@ -34,7 +34,6 @@
- #include <getopt.h>
- #include <assert.h>
-
--#include "memory.h"
- #include <memory>
-
- #include <pinentry.h>
---- a/fltk/pinwindow.cxx 2017-12-03 08:13:05.000000000 -0800
-+++ b/fltk/pinwindow.cxx 2024-02-26 11:02:47.822134762 -0800
-@@ -32,7 +32,7 @@
- #include <FL/Fl_Return_Button.H>
- #include <FL/Fl_Pixmap.H>
-
--#include "memory.h"
-+#include "../secmem/secmem.h"
-
- #include "encrypt.xpm"
- #include "icon.xpm"
---- a/gnome3/pinentry-gnome3.c 2022-08-24 03:31:59.000000000 -0700
-+++ b/gnome3/pinentry-gnome3.c 2024-02-26 11:02:47.822134762 -0800
-@@ -30,8 +30,6 @@
-
- #include <assuan.h>
-
--#include "memory.h"
--
- #include "pinentry.h"
-
- #ifdef FALLBACK_CURSES
---- a/pinentry/password-cache.c 2017-12-03 08:13:15.000000000 -0800
-+++ b/pinentry/password-cache.c 2024-02-26 11:02:47.822134762 -0800
-@@ -31,7 +31,7 @@
- #endif
-
- #include "password-cache.h"
--#include "memory.h"
-+#include "../secmem/secmem.h"
-
- #ifdef HAVE_LIBSECRET
- static const SecretSchema *
---- a/pinentry/pinentry.c 2022-08-24 03:31:59.000000000 -0700
-+++ b/pinentry/pinentry.c 2024-02-26 11:02:47.822134762 -0800
-@@ -44,7 +44,6 @@
-
- #include <assuan.h>
-
--#include "memory.h"
- #include "secmem-util.h"
- #include "argparse.h"
- #include "pinentry.h"
---- a/pinentry/pinentry-curses.c 2022-08-24 03:31:59.000000000 -0700
-+++ b/pinentry/pinentry-curses.c 2024-02-26 11:02:47.822134762 -0800
-@@ -62,8 +62,6 @@
- #include <utime.h>
- #endif /*HAVE_UTIME_H*/
-
--#include <memory.h>
--
- #ifdef HAVE_WCHAR_H
- #include <wchar.h>
- #endif /*HAVE_WCHAR_H*/
-@@ -1017,10 +1015,11 @@
- #ifndef HAVE_DOSISH_SYSTEM
- int no_input = 1;
- #endif
--
- #ifdef HAVE_NCURSESW
- char *old_ctype = NULL;
-+#endif
-
-+#ifdef HAVE_NCURSESW
- if (pinentry->lc_ctype)
- {
- old_ctype = strdup (setlocale (LC_CTYPE, NULL));
---- a/pinentry/pinentry-emacs.c 2021-08-11 04:16:10.000000000 -0700
-+++ b/pinentry/pinentry-emacs.c 2024-02-26 11:02:47.822134762 -0800
-@@ -48,7 +48,7 @@
- #include <assuan.h>
-
- #include "pinentry-emacs.h"
--#include "memory.h"
-+#include "../secmem/secmem.h"
- #include "secmem-util.h"
-
- /* The communication mechanism is similar to emacsclient, but there
---- a/pinentry/pinentry.h 2022-08-24 03:31:59.000000000 -0700
-+++ b/pinentry/pinentry.h 2024-02-26 11:02:47.822134762 -0800
-@@ -21,6 +21,8 @@
- #ifndef PINENTRY_H
- #define PINENTRY_H
-
-+#include "../secmem/secmem.h"
-+
- #ifdef __cplusplus
- extern "C" {
- #if 0
---- a/secmem/Makefile.am 2017-12-03 08:13:05.000000000 -0800
-+++ b/secmem/Makefile.am 2024-02-26 11:02:47.822134762 -0800
-@@ -22,7 +22,7 @@
- noinst_LIBRARIES = libsecmem.a
-
- libsecmem_a_SOURCES = \
-- memory.h \
-+ secmem.h \
- secmem-util.h \
- util.h \
- secmem.c \
---- a/secmem/memory.h 2017-12-03 08:13:05.000000000 -0800
-+++ b/secmem/memory.h 1969-12-31 16:00:00.000000000 -0800
-@@ -1,55 +0,0 @@
--/* Quintuple Agent secure memory allocation
-- * Copyright (C) 1998,1999 Free Software Foundation, Inc.
-- * Copyright (C) 1999,2000 Robert Bihlmeyer <robbe@orcus.priv.at>
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License as published by
-- * the Free Software Foundation; either version 2 of the License, or
-- * (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU General Public License
-- * along with this program; if not, see <https://www.gnu.org/licenses/>.
-- * SPDX-License-Identifier: GPL-2.0+
-- */
--
--#ifndef _MEMORY_H
--#define _MEMORY_H
--
--#include <sys/types.h>
--
--#ifdef __cplusplus
--extern "C" {
--#if 0
--}
--#endif
--#endif
--
--
--/* values for flags, hardcoded in secmem.c */
--#define SECMEM_WARN 0
--#define SECMEM_DONT_WARN 1
--#define SECMEM_SUSPEND_WARN 2
--
--void secmem_init( size_t npool );
--void secmem_term( void );
--void *secmem_malloc( size_t size );
--void *secmem_realloc( void *a, size_t newsize );
--void secmem_free( void *a );
--int m_is_secure( const void *p );
--void secmem_dump_stats(void);
--void secmem_set_flags( unsigned flags );
--unsigned secmem_get_flags(void);
--size_t secmem_get_max_size (void);
--
--#if 0
--{
--#endif
--#ifdef __cplusplus
--}
--#endif
--#endif /* _MEMORY_H */
---- a/secmem/secmem.c 2022-08-24 03:31:59.000000000 -0700
-+++ b/secmem/secmem.c 2024-02-26 11:02:47.822134762 -0800
-@@ -34,7 +34,7 @@
- #endif
- #include <string.h>
-
--#include "memory.h"
-+#include "secmem.h"
-
- #ifdef ORIGINAL_GPG_VERSION
- #include "types.h"
---- a/secmem/secmem++.h 2017-12-03 08:13:05.000000000 -0800
-+++ b/secmem/secmem++.h 2024-02-26 11:02:47.822134762 -0800
-@@ -19,7 +19,7 @@
- #ifndef __SECMEM_SECMEMPP_H__
- #define __SECMEM_SECMEMPP_H__
-
--#include "secmem/memory.h"
-+#include "../secmem/secmem.h"
- #include <cstddef>
-
- namespace secmem {
---- a/secmem/secmem.h 1969-12-31 16:00:00.000000000 -0800
-+++ b/secmem/secmem.h 2024-02-26 11:02:47.822134762 -0800
-@@ -0,0 +1,55 @@
-+/* Quintuple Agent secure memory allocation
-+ * Copyright (C) 1998,1999 Free Software Foundation, Inc.
-+ * Copyright (C) 1999,2000 Robert Bihlmeyer <robbe@orcus.priv.at>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, see <https://www.gnu.org/licenses/>.
-+ * SPDX-License-Identifier: GPL-2.0+
-+ */
-+
-+#ifndef _MEMORY_H
-+#define _MEMORY_H
-+
-+#include <sys/types.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#if 0
-+}
-+#endif
-+#endif
-+
-+
-+/* values for flags, hardcoded in secmem.c */
-+#define SECMEM_WARN 0
-+#define SECMEM_DONT_WARN 1
-+#define SECMEM_SUSPEND_WARN 2
-+
-+void secmem_init( size_t npool );
-+void secmem_term( void );
-+void *secmem_malloc( size_t size );
-+void *secmem_realloc( void *a, size_t newsize );
-+void secmem_free( void *a );
-+int m_is_secure( const void *p );
-+void secmem_dump_stats(void);
-+void secmem_set_flags( unsigned flags );
-+unsigned secmem_get_flags(void);
-+size_t secmem_get_max_size (void);
-+
-+#if 0
-+{
-+#endif
-+#ifdef __cplusplus
-+}
-+#endif
-+#endif /* _MEMORY_H */
---- a/tqt/secqstring.h 2017-12-03 08:33:12.000000000 -0800
-+++ b/tqt/secqstring.h 2024-02-26 11:02:47.822134762 -0800
-@@ -65,7 +65,7 @@
-
- extern "C"
- {
--#include "memory.h"
-+#include "../secmem/secmem.h"
- }
-
- /* We need the original qchar and qstring for transparent conversion
---- a/tty/pinentry-tty.c 2021-08-11 04:16:10.000000000 -0700
-+++ b/tty/pinentry-tty.c 2024-02-26 11:02:47.822134762 -0800
-@@ -41,7 +41,6 @@
- #include <gpg-error.h>
-
- #include "pinentry.h"
--#include "memory.h"
-
- #ifndef HAVE_DOSISH_SYSTEM
- static int timed_out;
---- a/w32/main.c 2022-08-24 03:31:59.000000000 -0700
-+++ b/w32/main.c 2024-02-26 11:02:47.822134762 -0800
-@@ -29,7 +29,6 @@
- #endif
-
- #include "pinentry.h"
--#include "memory.h"
-
- #include "resource.h"
- /* #include "msgcodes.h" */
diff --git a/app-crypt/pinentry/files/pinentry-1.3.0-ifdef-qt.patch b/app-crypt/pinentry/files/pinentry-1.3.0-ifdef-qt.patch
deleted file mode 100644
index 4fc724287515..000000000000
--- a/app-crypt/pinentry/files/pinentry-1.3.0-ifdef-qt.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-https://dev.gnupg.org/D596
-
-From 762346c5d1877cde6b37b191cd3c2469e1c7ddbb Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heiko.becker@kde.org>
-Date: Mon, 18 Mar 2024 20:38:09 +0100
-Subject: [PATCH] qt5: Add a '5' to adjust defines
-
-They were changed from PINENTRY_QT_FOO to PINENTRY_QT5_FOO in
-1e79123c389584b8240387914b193be41b823e92.
---- a/qt5/capslock.cpp
-+++ b/qt5/capslock.cpp
-@@ -32,7 +32,7 @@
- CapsLockWatcher::Private::Private(CapsLockWatcher *q)
- : q{q}
- {
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- if (qApp->platformName() == QLatin1String("wayland")) {
- watchWayland();
- }
-@@ -44,7 +44,7 @@ CapsLockWatcher::CapsLockWatcher(QObject *parent)
- , d{new Private{this}}
- {
- if (qApp->platformName() == QLatin1String("wayland")) {
--#ifndef PINENTRY_QT_WAYLAND
-+#ifndef PINENTRY_QT5_WAYLAND
- qWarning() << "CapsLockWatcher was compiled without support for Wayland";
- #endif
- }
---- a/qt5/capslock_p.h
-+++ b/qt5/capslock_p.h
-@@ -23,7 +23,7 @@
-
- #include "capslock.h"
-
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- namespace KWayland
- {
- namespace Client
-@@ -38,12 +38,12 @@ class CapsLockWatcher::Private
- {
- public:
- explicit Private(CapsLockWatcher *);
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- void watchWayland();
- #endif
-
- private:
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- void registry_seatAnnounced(quint32, quint32);
- void seat_hasKeyboardChanged(bool);
- void keyboard_modifiersChanged(quint32);
-@@ -52,7 +52,7 @@ private:
- private:
- CapsLockWatcher *const q;
-
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- KWayland::Client::Registry *registry = nullptr;
- KWayland::Client::Seat *seat = nullptr;
- #endif
---- a/qt5/capslock_unix.cpp
-+++ b/qt5/capslock_unix.cpp
-@@ -25,7 +25,7 @@
- #include "capslock.h"
- #include "capslock_p.h"
-
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- # include <KWayland/Client/connection_thread.h>
- # include <KWayland/Client/keyboard.h>
- # include <KWayland/Client/registry.h>
-@@ -34,7 +34,7 @@
-
- #include <QGuiApplication>
-
--#ifdef PINENTRY_QT_X11
-+#ifdef PINENTRY_QT5_X11
- # include <QX11Info>
- # include <X11/XKBlib.h>
- # undef Status
-@@ -42,25 +42,25 @@
-
- #include <QDebug>
-
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- using namespace KWayland::Client;
- #endif
-
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- static bool watchingWayland = false;
- #endif
-
- LockState capsLockState()
- {
- static bool reportUnsupportedPlatform = true;
--#ifdef PINENTRY_QT_X11
-+#ifdef PINENTRY_QT5_X11
- if (qApp->platformName() == QLatin1String("xcb")) {
- unsigned int state;
- XkbGetIndicatorState(QX11Info::display(), XkbUseCoreKbd, &state);
- return (state & 0x01) == 1 ? LockState::On : LockState::Off;
- }
- #endif
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- if (qApp->platformName() == QLatin1String("wayland")) {
- if (!watchingWayland && reportUnsupportedPlatform) {
- qDebug() << "Use CapsLockWatcher for checking for Caps Lock on Wayland";
-@@ -74,7 +74,7 @@ LockState capsLockState()
- return LockState::Unknown;
- }
-
--#ifdef PINENTRY_QT_WAYLAND
-+#ifdef PINENTRY_QT5_WAYLAND
- void CapsLockWatcher::Private::watchWayland()
- {
- watchingWayland = true;
---
-2.44.0
diff --git a/app-crypt/pinentry/pinentry-1.2.1-r7.ebuild b/app-crypt/pinentry/pinentry-1.2.1-r7.ebuild
deleted file mode 100644
index c3656d8993ef..000000000000
--- a/app-crypt/pinentry/pinentry-1.2.1-r7.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
-inherit autotools qmake-utils verify-sig
-
-DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="https://gnupg.org/related_software/pinentry/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="caps efl emacs gtk keyring ncurses qt5 wayland X"
-
-DEPEND="
- >=dev-libs/libassuan-2.1:=
- >=dev-libs/libgcrypt-1.6.3
- >=dev-libs/libgpg-error-1.17
- efl? ( dev-libs/efl[X] )
- keyring? ( app-crypt/libsecret )
- ncurses? ( sys-libs/ncurses:= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- wayland? ( kde-plasma/kwayland:5 )
- X? (
- dev-qt/qtx11extras:5
- x11-libs/libX11
- )
- )
-"
-RDEPEND="
- ${DEPEND}
- gtk? ( app-crypt/gcr:0[gtk] )
-"
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
- verify-sig? ( sec-keys/openpgp-keys-gnupg )
-"
-PDEPEND="emacs? ( app-emacs/pinentry )"
-IDEPEND=">=app-eselect/eselect-pinentry-0.7.2"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.0-AR.patch"
- "${FILESDIR}/${PN}-1.2.1-automagic-capslock.patch" # bug #819939, bug #837719
-)
-
-src_prepare() {
- default
-
- unset FLTK_CONFIG
-
- # bug #934771
- rm m4/libassuan.m4 || die
-
- eautoreconf
-}
-
-src_configure() {
- export PATH="$(qt5_get_bindir):${PATH}"
- export QTLIB="$(qt5_get_libdir)"
-
- local myeconfargs=(
- $(use_enable efl pinentry-efl)
- $(use_enable emacs pinentry-emacs)
- $(use_enable keyring libsecret)
- $(use_enable gtk pinentry-gnome3)
- $(use_enable ncurses fallback-curses)
- $(use_enable ncurses pinentry-curses)
- $(use_enable qt5 pinentry-qt)
- $(use_enable wayland kf5-wayland)
- $(use_enable X qtx11extras)
- $(use_with X x)
-
- --enable-pinentry-tty
- --disable-pinentry-fltk
- --disable-pinentry-gtk2
-
- MOC="$(qt5_get_bindir)"/moc
- GPG_ERROR_CONFIG="${ESYSROOT}"/usr/bin/${CHOST}-gpg-error-config
- LIBASSUAN_CONFIG="${ESYSROOT}"/usr/bin/libassuan-config
-
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- rm "${ED}"/usr/bin/pinentry || die
-
- use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5
-}
-
-pkg_postinst() {
- eselect pinentry update ifunset
-}
-
-pkg_postrm() {
- eselect pinentry update ifunset
-}
diff --git a/app-crypt/pinentry/pinentry-1.2.1-r8.ebuild b/app-crypt/pinentry/pinentry-1.2.1-r8.ebuild
deleted file mode 100644
index ea45c42d15ec..000000000000
--- a/app-crypt/pinentry/pinentry-1.2.1-r8.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
-inherit autotools qmake-utils verify-sig
-
-DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="https://gnupg.org/related_software/pinentry/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="caps efl emacs gtk keyring ncurses qt5 wayland X"
-
-DEPEND="
- >=dev-libs/libassuan-2.1:=
- >=dev-libs/libgcrypt-1.6.3
- >=dev-libs/libgpg-error-1.17
- efl? ( dev-libs/efl[X] )
- keyring? ( app-crypt/libsecret )
- ncurses? ( sys-libs/ncurses:= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- wayland? ( kde-plasma/kwayland:5 )
- X? (
- dev-qt/qtx11extras:5
- x11-libs/libX11
- )
- )
-"
-RDEPEND="
- ${DEPEND}
- gtk? ( app-crypt/gcr:0[gtk] )
-"
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
- verify-sig? ( sec-keys/openpgp-keys-gnupg )
-"
-PDEPEND="emacs? ( app-emacs/pinentry )"
-IDEPEND=">=app-eselect/eselect-pinentry-0.7.2"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.0-AR.patch"
- "${FILESDIR}/${PN}-1.2.1-automagic-capslock.patch" # bug #819939, bug #837719
- "${FILESDIR}/${PN}-1.2.1-include-memory.patch"
-)
-
-src_prepare() {
- default
-
- unset FLTK_CONFIG
-
- # bug #934771
- rm m4/libassuan.m4 || die
-
- eautoreconf
-}
-
-src_configure() {
- export PATH="$(qt5_get_bindir):${PATH}"
- export QTLIB="$(qt5_get_libdir)"
-
- local myeconfargs=(
- $(use_enable efl pinentry-efl)
- $(use_enable emacs pinentry-emacs)
- $(use_enable keyring libsecret)
- $(use_enable gtk pinentry-gnome3)
- $(use_enable ncurses fallback-curses)
- $(use_enable ncurses pinentry-curses)
- $(use_enable qt5 pinentry-qt)
- $(use_enable wayland kf5-wayland)
- $(use_enable X qtx11extras)
- $(use_with X x)
-
- --enable-pinentry-tty
- --disable-pinentry-fltk
- --disable-pinentry-gtk2
-
- MOC="$(qt5_get_bindir)"/moc
- ac_cv_path_GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config"
-
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- rm "${ED}"/usr/bin/pinentry || die
-
- use qt5 && dosym pinentry-qt /usr/bin/pinentry-qt5
-}
-
-pkg_postinst() {
- eselect pinentry update ifunset
-}
-
-pkg_postrm() {
- eselect pinentry update ifunset
-}
diff --git a/app-crypt/pinentry/pinentry-1.3.0-r3.ebuild b/app-crypt/pinentry/pinentry-1.3.0-r3.ebuild
deleted file mode 100644
index 7801015f9ed2..000000000000
--- a/app-crypt/pinentry/pinentry-1.3.0-r3.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
-inherit autotools qmake-utils verify-sig
-
-DESCRIPTION="Simple passphrase entry dialogs which utilize the Assuan protocol"
-HOMEPAGE="https://gnupg.org/related_software/pinentry/"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="caps efl emacs gtk keyring ncurses qt5 qt6 wayland X"
-
-DEPEND="
- >=dev-libs/libassuan-2.1:=
- >=dev-libs/libgcrypt-1.6.3
- >=dev-libs/libgpg-error-1.17
- efl? ( dev-libs/efl[X] )
- keyring? ( app-crypt/libsecret )
- ncurses? ( sys-libs/ncurses:= )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- wayland? ( kde-plasma/kwayland:5 )
- X? (
- dev-qt/qtx11extras:5
- x11-libs/libX11
- )
- )
- qt6? (
- dev-qt/qtbase:6[gui,widgets]
- wayland? (
- kde-frameworks/kguiaddons:6
- kde-frameworks/kwindowsystem:6
- )
- )
-"
-RDEPEND="
- ${DEPEND}
- gtk? ( app-crypt/gcr:4[gtk] )
-"
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
- verify-sig? ( sec-keys/openpgp-keys-gnupg )
-"
-PDEPEND="emacs? ( app-emacs/pinentry )"
-IDEPEND=">=app-eselect/eselect-pinentry-0.7.4"
-
-DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.0-AR.patch"
- "${FILESDIR}/${PN}-1.3.0-automagic.patch" # bug #819939, bug #837719
- "${FILESDIR}/${PN}-1.3.0-ifdef-qt.patch"
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- unset FLTK_CONFIG
-
- local myeconfargs=(
- $(use_enable efl pinentry-efl)
- $(use_enable emacs pinentry-emacs)
- $(use_enable keyring libsecret)
- $(use_enable gtk pinentry-gnome3)
- $(use_enable ncurses fallback-curses)
- $(use_enable ncurses pinentry-curses)
- $(use_enable qt5 pinentry-qt5)
- $(use_enable qt6 pinentry-qt)
- # TODO: could split this up into qt5/qt6?
- $(use_enable X qtx11extras)
- $(use_with X x)
-
- --enable-pinentry-tty
- --disable-pinentry-fltk
- --disable-pinentry-gtk2
-
- ac_cv_path_GPGRT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpgrt-config"
-
- $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
- )
-
- if use qt5 ; then
- export PATH="$(qt5_get_bindir):${PATH}"
- export QTLIB="$(qt5_get_libdir):${QTLIB}"
- export MOC5="$(qt5_get_bindir)"/moc
-
- myeconfargs+=(
- $(use_enable wayland kf5-wayland)
- )
- else
- myeconfargs+=(
- --disable-kf5-wayland
- )
- fi
-
- if use qt6 ; then
- export PATH="$(qt6_get_bindir):${PATH}"
- export QTLIB="$(qt6_get_libdir):${QTLIB}"
- export MOC="$(qt6_get_libdir)/qt6/libexec/moc"
-
- myeconfargs+=(
- $(use_enable wayland kf6-wayland)
- )
- else
- myeconfargs+=(
- --disable-kf6-wayland
- )
- fi
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
-
- rm "${ED}"/usr/bin/pinentry || die
-
- # The preferred Qt implementation upstream gets installed as just 'qt'.
- # Make a symlink for eselect-pinentry and friends.
- if use qt6 ; then
- dosym pinentry-qt /usr/bin/pinentry-qt6
- fi
-}
-
-pkg_postinst() {
- eselect pinentry update ifunset
-}
-
-pkg_postrm() {
- eselect pinentry update ifunset
-}
diff --git a/app-crypt/pinentry/pinentry-1.3.1.ebuild b/app-crypt/pinentry/pinentry-1.3.1.ebuild
index 0c43eb7f16ab..058af5e6c990 100644
--- a/app-crypt/pinentry/pinentry-1.3.1.ebuild
+++ b/app-crypt/pinentry/pinentry-1.3.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="caps efl emacs gtk keyring ncurses qt5 qt6 wayland X"
DEPEND="
diff --git a/app-crypt/qca/Manifest b/app-crypt/qca/Manifest
index 00815c7f2f8a..0ba319805e9b 100644
--- a/app-crypt/qca/Manifest
+++ b/app-crypt/qca/Manifest
@@ -1,5 +1,5 @@
AUX qca-disable-pgp-test.patch 446 BLAKE2B a98d5951d7b89c65787d7d586a5504949c51271ebe09c5e19b90a2e24f24fb6d03d6c1f76d7ad4234354bc2507cf7031c716b3b2bf8243b8c1d85065079dded4 SHA512 30bb6d31b9392166d6bbae39da2eeb1788ac9cccffb801b074468a3606a6e1a56d6a41ee276d3b8b8d39112bf6aea7025f07f4810bb835102bd00521ee9eb104
DIST qca-2.3.9.tar.xz 765256 BLAKE2B 6f8015f45c252d4991dce9154f270d7450b94ec40156e91d537fbdbc17969873689f324032ee24e3fa1c7205a41c6da2870375bfafa308cf82f266bc89da8081 SHA512 025ef203c66e413a9c93d7e0e5449d8a23fb6bb27b2f1c4f137173e33b8c17ff6dec794c8349b6b37ee9d7fffe23875a2cf7cf6592efc373f1aac9230f83aa06
-EBUILD qca-2.3.9.ebuild 2561 BLAKE2B ba87c111789f5ea8de2a746c4a9e712730f37c777e0f34c951a535321ca90fbca4b52e7e84c480e35e7edf010562ac0830bcad6c5f944af0cb9b06db2907a74f SHA512 7831de39a824b67c8ad2c3431bfd2ad6db289d40f3269e1b921806d1868d0847d2d5522d27952500a951b47da6bbbab69c60e26f315862c916fbe5785e8ee2a8
-EBUILD qca-9999.ebuild 2414 BLAKE2B 25a245570c640820dc4f4cb91e5bcd66ea9f3d31ceaeb648560ad8c842588e45a4d7d62acbfa11fbc8acd3b0155702f68b3534f0c554281a67fdd4e8e5e05e25 SHA512 77b0d59297576c1a2737bd1ccf601277f41b686035ea66279e2ee0771835e4256e22b2f8ae0dc2428fef29fa873c4f7b909398571d94e60aaa9e62ea1cd8c4be
+EBUILD qca-2.3.9.ebuild 2561 BLAKE2B 9ebb164bf3591c1c4863617a2efe263083fd84640a72aff7a64d521cd93ead1b71499ef5533822115b3a1bf15d92f02cbfba2fc68cec3f85628450be80b2c39d SHA512 89f49d53d635dbe0dd0253fefacd3ea435096f8fcd8721d64d9e780ba7b242ce658848ae1e32b4486e0ffddfa349e9489425ff7109e2299ee2f7595263325361
+EBUILD qca-9999.ebuild 2414 BLAKE2B e319c6245cfe6abe5d911c1472661c9e618424f21477e43fb2105bc515d6d4f84520ed747d3434f62a5b22e7910c4916e6fa8580a6a270bd88413f8e8da2cfac SHA512 4f44c2d6a84b5fce842ca4db483d2a154c9362900b63f1742a4b03714f0cbe5e37125c58848854cc5a7fe4fcfe44007e8bb2adf95d8141f500ee6bfecd247cd1
MISC metadata.xml 781 BLAKE2B 048fe4155a9e47f36bab098734fcfcf661377d017d0616351b7a11a83dd57cdaa2eec370fafdf2f41e5806f01a3934811181972aa232c1d5332a00af1402912c SHA512 65328a1acfdc05ea3491d7fb46a3fa340e467d33c4b81001745e8923ad2aa300cc7a3dfcc29e01afe1882abd18dd024d8ecc4e2c31a2bf5319608589730a37c1
diff --git a/app-crypt/qca/qca-2.3.9.ebuild b/app-crypt/qca/qca-2.3.9.ebuild
index d55ba464ac80..7ed751df06e3 100644
--- a/app-crypt/qca/qca-2.3.9.ebuild
+++ b/app-crypt/qca/qca-2.3.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="2"
KEYWORDS="amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 +qt5 qt6 sasl softstore +ssl test"
+IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 qt5 +qt6 sasl softstore +ssl test"
REQUIRED_USE="|| ( qt5 qt6 )"
RESTRICT="!test? ( test )"
diff --git a/app-crypt/qca/qca-9999.ebuild b/app-crypt/qca/qca-9999.ebuild
index df6544b73a42..3ccb568c5478 100644
--- a/app-crypt/qca/qca-9999.ebuild
+++ b/app-crypt/qca/qca-9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://userbase.kde.org/QCA"
LICENSE="LGPL-2.1"
SLOT="2"
KEYWORDS=""
-IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 +qt5 qt6 sasl softstore +ssl test"
+IUSE="botan debug doc examples gcrypt gpg logger nss pkcs11 qt5 +qt6 sasl softstore +ssl test"
REQUIRED_USE="|| ( qt5 qt6 )"
RESTRICT="!test? ( test )"
diff --git a/app-crypt/rhash/Manifest b/app-crypt/rhash/Manifest
index 61eb2d39fad5..e6ea20c83e3f 100644
--- a/app-crypt/rhash/Manifest
+++ b/app-crypt/rhash/Manifest
@@ -1,7 +1,6 @@
AUX rhash-1.4.4-prefix.patch 836 BLAKE2B 9c3b953e5249c4ee0be5d23cb595ed1c84611ce6299b29b2b3fd38b7de1f891fb5a8f6a4a5fed3e3b8862fff9f8623f310a0d436ab4eab44e42ff79e0b1f99f5 SHA512 3740a2ea78d28fa916533af27740011c2dd520eb2bc18a6a19fc530a0414a8eb7bd911a7a39ddd0a1a2fec5def20b61ed1731349880346c413d7d6000569bf32
-DIST rhash-1.4.3-src.tar.gz 429290 BLAKE2B d225aeae0b3a8fb2e093a9aef50cd07a790c7e9734e91114deef2ca8492c85261b8ed5dea45958e35e049ea888885175608962ea72297bdef48b00c52f51eaca SHA512 d87ffcde28d8f25cf775c279fed457e52d24523ed9b695629dae694b3c22372247d18f6032f8ce13a0b70fa2953be408982e46659daaa7c4ab227ae89eaed9c7
DIST rhash-1.4.4-src.tar.gz 435691 BLAKE2B f3d42f333ad9a82fe4a8ef5af5d8008abf526c05c06a00c7033881d5a27ba663c3cc5cefb73ea8157ac24cb10a50a4e500706d489e61a03dbaee74a4735d1722 SHA512 00a7e5e058b53ce20ae79509815452ed9cb699d1322b678220b72c61dea3ea2f8fa131acfade8bb6d9f6af913f0c3c472330841181b22314b8755166310c946f
-EBUILD rhash-1.4.3.ebuild 2122 BLAKE2B c18f3d6a397a6e14b05daa86738c5608b6b44bc3797485666f4c74684c5d6dd04d827b265412e352930c3a012514177853c88ae8465e5bc8f08e033f64cb3256 SHA512 38131c1b8a114a69418adb4e53725293f2ebe65444badc4fb4856cfe2bde17a44fd288cd262be9d4bfcdcd0594788eb24e443fd3e27fce53f136cde02734abe1
-EBUILD rhash-1.4.4-r1.ebuild 2318 BLAKE2B 9e74a7047d4ccee2e79a602474864deda8ce3b012463dc6486b2ba7e47a0050064060a7f80f608e60681d606b34deb4952977c0996e788f7dfc173ec1e86910c SHA512 07a47e78126de62b6de4b97d4cc4533c26e57ba2b59a9e6efca64b499843397641c917eafea1904a906d8285e8f883a4ea7a040082fb92a945577e97397197a2
-EBUILD rhash-1.4.4.ebuild 2519 BLAKE2B d4aed6d855dac6c499df19765b456e95825538780f8a0326d0c69e57218d1d0c425bb855752ea502daf95e5301ad645bc6572072af9c7de9777c13f2d92bc93b SHA512 b6f6b1c2b4f06c85cad3eccfe54c469dd66776c071060d58b22551c7d22702c344639d597d4950ccd64b9b205e13b514b49e4fba1bb3b2c8669c32831d3b9bf5
+DIST rhash-1.4.5-src.tar.gz 444526 BLAKE2B 11021119e8af28e12491eabd55232e24a056bce79b624c970e4806c28fe707ea1395eb390572dba3453900d4512e5896d70642370d0c9340359e2fee95d62c8d SHA512 49bd6aa2497efc4871ae31eaca51d2dc78ceb7126311557d5280b14fafe9355eaecad37f0f78f865e4e1dd1aeb506d3301989cd2f9fff7b0091c81978e8c2f2e
+EBUILD rhash-1.4.4-r1.ebuild 2310 BLAKE2B e5f2d4dd82a1ef6d327457b0ab84360852caa4f640e828a2d2cc0b1a488386c6602ae3e0cd4b188401ef3092e6ffba095f2fada1c5416e08d8227b27ab37dda1 SHA512 3cb22c2991b48dd0df2a64c1d10781950bd32b6847e2e45508df8ebe2bcd8efb643e86dba2290b382c8aa03bb45e773480c1d344210d0aa9af159dedb9d8f768
+EBUILD rhash-1.4.5.ebuild 2271 BLAKE2B 6d7ddeec897958434796bb25c366f023707257e4edea5298181e20a97e17f8536f8400a1693fd97c12790428d0ee0883969114c8243fd88c5564ead6f7e9fd4c SHA512 1d152e030f5cdfd186a5578542782a2b26b2b07d197b6f53ee438fea46f959930f5ad82469af15a27b209d3cc7ae3f3fac3bd4beeec11b07e5afa3bed0e2bf9f
MISC metadata.xml 817 BLAKE2B eeb15cde9e06507f73330759d44dca59dea3bbcb972cb25af71d91f065eb64dbd1ddc61e43f8fad50c264c269542f92efdace36d3397647c3c53972e695da22f SHA512 3e2f688b57c74e051fcfb90d34685346c459c5e9f425266fd3d8e099f586037b14c2bfdac76f135a046c77cc850bb49954c0e7d8dc9ded1db47bf0919ab3ea93
diff --git a/app-crypt/rhash/rhash-1.4.3.ebuild b/app-crypt/rhash/rhash-1.4.3.ebuild
deleted file mode 100644
index 5ec40aeb2f88..000000000000
--- a/app-crypt/rhash/rhash-1.4.3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic toolchain-funcs multilib-minimal
-
-DESCRIPTION="Console utility and library for computing and verifying file hash sums"
-HOMEPAGE="https://rhash.sourceforge.net/"
-SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tar.gz"
-
-LICENSE="0BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="debug nls ssl static-libs"
-
-RDEPEND="
- ssl? (
- dev-libs/openssl:0=[${MULTILIB_USEDEP}]
-)"
-
-DEPEND="
- ${RDEPEND}
-"
-
-BDEPEND="
- nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/RHash-${PV}"
-
-src_prepare() {
- default
-
- if [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] ; then
- # we lack posix_memalign
- sed -i -e '/if _POSIX_VERSION/s/if .*$/if 0/' \
- librhash/util.h || die
- fi
-
- multilib_copy_sources
-}
-
-multilib_src_configure() {
- # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
- # https://github.com/gentoo/gentoo/pull/28355
- # mold needs this too but right now tc-ld-is-mold is also not available
- if tc-ld-is-lld; then
- append-ldflags -Wl,--undefined-version
- fi
-
- set -- \
- ./configure \
- --target="${CHOST}" \
- --cc="$(tc-getCC)" \
- --ar="$(tc-getAR)" \
- --extra-cflags="${CFLAGS}" \
- --extra-ldflags="${LDFLAGS}" \
- --prefix="${EPREFIX}"/usr \
- --libdir="${EPREFIX}"/usr/$(get_libdir) \
- --sysconfdir="${EPREFIX}"/etc \
- --disable-openssl-runtime \
- --disable-static \
- --enable-lib-shared \
- $(use_enable debug) \
- $(use_enable nls gettext) \
- $(use_enable ssl openssl) \
- $(use_enable static-libs lib-static)
-
- echo "${@}"
- "${@}" || die "configure failed"
-}
-
-multilib_src_compile() {
- emake all \
- $(multilib_is_native_abi && use nls && echo compile-gmo)
-}
-
-multilib_src_install() {
- # -j1 needed due to race condition.
- emake DESTDIR="${D}" -j1 \
- install{,-lib-headers,-pkg-config} \
- $(multilib_is_native_abi && use nls && echo install-gmo) \
- install-lib-so-link
-}
-
-multilib_src_test() {
- emake test
-}
diff --git a/app-crypt/rhash/rhash-1.4.4-r1.ebuild b/app-crypt/rhash/rhash-1.4.4-r1.ebuild
index 35aa2be528d3..0c1b26eeb3f8 100644
--- a/app-crypt/rhash/rhash-1.4.4-r1.ebuild
+++ b/app-crypt/rhash/rhash-1.4.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tar.gz"
LICENSE="0BSD"
SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="debug nls ssl static-libs"
RDEPEND="
diff --git a/app-crypt/rhash/rhash-1.4.4.ebuild b/app-crypt/rhash/rhash-1.4.5.ebuild
index 364c986148de..a8d92ff1409b 100644
--- a/app-crypt/rhash/rhash-1.4.4.ebuild
+++ b/app-crypt/rhash/rhash-1.4.5.ebuild
@@ -8,6 +8,7 @@ inherit flag-o-matic toolchain-funcs multilib-minimal
DESCRIPTION="Console utility and library for computing and verifying file hash sums"
HOMEPAGE="https://rhash.sourceforge.net/"
SRC_URI="https://downloads.sourceforge.net/${PN}/${P}-src.tar.gz"
+S="${WORKDIR}/RHash-${PV}"
LICENSE="0BSD"
SLOT="0/1"
@@ -27,12 +28,6 @@ BDEPEND="
nls? ( sys-devel/gettext )
"
-S="${WORKDIR}/RHash-${PV}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-prefix.patch
-)
-
src_prepare() {
default
@@ -54,12 +49,7 @@ src_prepare() {
}
multilib_src_configure() {
- # ideally we want !tc-ld-is-bfd for best future-proofing, but it needs
- # https://github.com/gentoo/gentoo/pull/28355
- # mold needs this too but right now tc-ld-is-mold is also not available
- if tc-ld-is-lld; then
- append-ldflags -Wl,--undefined-version
- fi
+ append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
set -- \
./configure \
diff --git a/app-crypt/ssss/Manifest b/app-crypt/ssss/Manifest
index 6985605f4743..dc2267cf7146 100644
--- a/app-crypt/ssss/Manifest
+++ b/app-crypt/ssss/Manifest
@@ -1,3 +1,3 @@
DIST ssss-0.5.7.tar.gz 21774 BLAKE2B 923f9e0c46e82261dc4f293635aa318c986cee221a93e9df3d232e4b923a7828f0301c8729a5beb72b66e1646e5a0694cfa9546ea26b0e06fa16a8a0c7487ef6 SHA512 aca85b7a63e6d009fffe5540b0c8e3190c364aa2070e8d8487fd42d7ac76143e404b226b28f3630022d102679371673cc7c08b8c5d3bcf63e3676b7293d2ba00
-EBUILD ssss-0.5.7-r1.ebuild 809 BLAKE2B 1ddf5d480e289621fae06412d152d3ab029fadff28732f898806321ff854f2cd622d8caf94949d762459da2f5de932f0525aacc66f8d0c8da2833b48be8ac4fe SHA512 29359d910dbdf373a9d496825e923fc1c434d8c98e2c00cd9e7b5c543a8daee2714b455a1936e3a9e6c4d7d8a5c564ea3d84e5df4cefde90781e2551cc9dccb7
+EBUILD ssss-0.5.7-r2.ebuild 852 BLAKE2B 26d308a731417ecb27bc21b9296b4a8eba0ed384cf8a8fe860db1590d4f785f65aa9c0a479e0c48635eedfb8b7e55f58fa20162e8c9bafe308adb1b32b1e8d3e SHA512 89cb736ef4dbada0204011b04d3077dc207e2055e9cfac0274477eb9e3b2559c48e42f3babf16b537ad9a0309eac7d7da59102b200a3fd465648bf49ef12adca
MISC metadata.xml 572 BLAKE2B a40cd8132c114b04e6af99883713fe581dc6527d6773a4a74422e1e853dfa85455f1b199c9b8b9db056cbd7877087c8b713b3285f9bb3fe75a28fa076e3bfe65 SHA512 f715a45bd74530c74b8934c8da2d2067ec00b9af6eaebb5e50310b45295db8dbc1bd65e2258e1860f624e69565f5f04c37aaf4f5813637404b28135ff22967ca
diff --git a/app-crypt/ssss/ssss-0.5.7-r1.ebuild b/app-crypt/ssss/ssss-0.5.7-r2.ebuild
index f847746a60e5..c9c3277abf1a 100644
--- a/app-crypt/ssss/ssss-0.5.7-r1.ebuild
+++ b/app-crypt/ssss/ssss-0.5.7-r2.ebuild
@@ -25,8 +25,10 @@ src_prepare() {
tc-export CC
- # Respect users [CL]FLAGS and don't strip, as portage does this part
- sed -e 's/-O2/$(CFLAGS) -lgmp $(LDFLAGS)/g' -e '/strip/d' -i Makefile || die
+ # Respect users [CL]FLAGS
+ # Don't strip, as portage does this part
+ # Don't use 'which'
+ sed -e 's/-O2/$(CFLAGS) -lgmp $(LDFLAGS)/g' -e '/strip/d' -e 's/which/type -P/g' -i Makefile || die
}
src_install() {
diff --git a/app-crypt/tpm2-tools/Manifest b/app-crypt/tpm2-tools/Manifest
index 834464e8ccf4..83defed45051 100644
--- a/app-crypt/tpm2-tools/Manifest
+++ b/app-crypt/tpm2-tools/Manifest
@@ -1,14 +1,5 @@
AUX tpm2-tools-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch 408 BLAKE2B a0d042d7a1beeba1b671c130179f416aa53c1d59a66787fde69bbf9c9a6ce1d8e8aa4f074e2c2304160bcd3725287e78671c62d9a5ef348fb172bbad17e4fd8a SHA512 c9e3035a413540a373fb8de4bb5f0f18347c836ed338bc2d2dacbdfc0274aa5087786b894ca2d484038dd90499e97618039ac88743fb5e466e4b42fa522dc99e
-AUX tpm2-tools-5.6-bashism.patch 1802 BLAKE2B 28bf27329d0fbb314c3bc297788e6ae5615c53f74c7a11784e0200ad39f6ec5e887aa7341130b4d9136b6639147cbd11546dbbc1552bb59e565debd4594595f8 SHA512 784d06e6933e108409994b21b5d55c498a800e5a693889c6ab06378c2babbb7bb6ea18d0bae9fa3fee13ca961d6ff21ebe363962bd998f5c42950c8f820fe2d9
-AUX tpm2-tools-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch 4136 BLAKE2B c7531d8425ac1df9610c8371a3a01a4cf68c224ca5bf2d8d5f68187c6013ab16d8c16ad261c53319caae04769421398bbbaa0710d95b202c43f62722b631f1d6 SHA512 8f3c38417d546beb8cf7e3410a5d91af59893eb7b08ee0060c5c5363f316490ae904a456009a2643e95e4db3fefc85795884fc91c2fb492e8911d92c97e6aba5
-AUX tpm2-tools-5.6-test-eventlog.sh-Fix-accidental-deletions.patch 2805 BLAKE2B f8d1f063fef10c3a8d2324a70b4ee6efc99a4a4a08ce79db822169a65319d4fc50dc6a62036d74a1da43d09a008d33d09fd1efcb2c109e5e67ffed9e56b36412 SHA512 c01d78bf67ecc57a6f594739a20ec6e4c0e78ef2c062e7f82594d17cec86b907b0c2aacbb44be119a7d2b2a01f3d0931ad558d2e775ba1d75eac2ddeb1570b8c
-DIST tpm2-tools-5.5.tar.gz 1241390 BLAKE2B 2225f9e0835988351f84ed06f914616e25fd65bacaa93b51d0bb04185314efb9a6f60eb3539b250f54b2c2ba590f1b76594df3e625e45c8d37e38d13371bea26 SHA512 24f72a3e9840d531d900e96771a863baae1c71a76fcad0fda8020dff06acd8e3b65b86401ace21f034766403caf9ae97ce710ff6013bb7ed25657a6ecf325470
-DIST tpm2-tools-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch.xz 47916 BLAKE2B 1bbc84f58ad46507417c89be1b4ce2450fb33cf3abe8f080c23890d96be85379f135ef1dbf4b580e1a386fa6d5ebc4fbaab351b5238bbf1011bb97b0f49a847b SHA512 3db0daa39a8dc756d7cb25e3673149dc3eeafd7410f2c6537464431b501e3704a886d9b7a9acd71440d6d419649dd471fd6f9247d593c89a30b05774a8d1b3de
-DIST tpm2-tools-5.6.1.tar.gz 1255474 BLAKE2B 7fda0084283bbd592c3323605f598ebb77ba267ebb900e62b2eff2742257378d95f99b48aab090f80438a6c86f168e1863f9350c18571a23e17eea90a1b9bdd9 SHA512 7a5903db0578a1364c44ca8ac3672c3cae745e2b0ab66ddf6a91fdb75146441af32dfe4ccad6825bea343fea74bed97f9e45bf752594ee56f32e4cb7be2bed33
-DIST tpm2-tools-5.6.tar.gz 1266731 BLAKE2B fe88722c26d62128cd6dfbdd8ef2568656a75fe27b1443fed28387d0db1f50b7d0651819d34dfa98acde785b4cfb4e7c11420b110bb5333ed2bb6b67cdd4fc70 SHA512 14216f29ed3ecca5fbe356ed3744c8b6b25a62ff11b2aed596d11101328c8bfd29a02f6ca5a218f9a4477a5e9648c50f0ae96e71de0b4ff5ea1f98ebeeb73cd7
+AUX tpm2-tools-5.7-tests-Eliminate-dependency-on-which.patch 1382 BLAKE2B 823d13dd3b47cb04cf668ccd5e2c7565101943be00a2e06d28ef7290ab065a4053c6b28914c534f76b485adf96d7b73731720e50f49f335c0bd716af9f63e463 SHA512 59fcd058de4d11f5c858a9dc44d91786693d21b85f757628fea74355b27610db5ad05ea4a4131399273440fa54b95ad1715e6353a6a46e099fceaeac6607086d
DIST tpm2-tools-5.7.tar.gz 1339035 BLAKE2B 3984f25176e0b092793a33a0b40b396bc650de989e0b600989d11439cccdf7bc410535c01e1a0e985ab67b36b63eb02d392342aa1746b86727ba22d67d522389 SHA512 629b0b1826815877f452935285f7b3fe0f32bd24fe9130eb169a2dc9b7b254a737797043af9eea68be706b87c32ab2b7189151360c9c00bc5c31dce62a799670
-EBUILD tpm2-tools-5.5.ebuild 1643 BLAKE2B 5029ad3299b8db9d0005866660db88884833619fade7131a6b4b7b42f1ce62a2fe8eb94ad175b889bd2d9c2b6d4bf5d91d2455bd0ea0a9ad8e0c59565c73b1e2 SHA512 195dc492373400638ec7baa5c191e7eeea646523f296ff16422ae56d7347e5e6fdea12d199e8d32bc700790f9a206b5e84b0e52348f67b4ad681e6889cf1703e
-EBUILD tpm2-tools-5.6-r1.ebuild 2230 BLAKE2B 29bd871f43e77ad687efdaf30866929b0c78b7013e2fb3aec8ffe6aee30bb184efee7b96a3e0cd487bd4c6510494f7b8df91ddecfc43c53b711cdbc45f69271f SHA512 ddc4b86bf59291e6fdbb0b443435f135992d4e0ba9e7b69ab0a5efb0f950ed8004fa9a3155cbb1fc26c41b59241769d6c16e65180ae474b48b43ce8e27d20a9f
-EBUILD tpm2-tools-5.6.1.ebuild 2331 BLAKE2B 780cc29ffa04e805e2504a8180a741959c162206e93b32cc5a70d8000b4ea494173ba0a37e9c18f7b2517b46c9fa46cd738709489a7bd524d55dfb1f53154c65 SHA512 7f5f35c6b7294b7f4f22487f8af1d2766b946573e8abbaaec6e040e82dceb60eb15155c8dcaa7f3a9f4b192b09ef49fa50ab3df7265d5e5e0b5276047f24b1bb
-EBUILD tpm2-tools-5.7.ebuild 1946 BLAKE2B 036b526770caf7db787ba78f2646d1e9d52fa20998a36bb8412fdf308ea7a90e76c8abf2ad9bcb334f1385349d04ebf0eac619ca650612292ebb5ea5e7def2dc SHA512 3bd0836de7d949a59b2f134b7211f25292fc748db05b331a2488a44c6ae01cc3edcb2d57a077e7dcf6a9395bf057f26b56632e085a940a971c7c6df0d5a806f9
+EBUILD tpm2-tools-5.7.ebuild 2013 BLAKE2B b8b3f737f0327449e487d0c0dc0383bda59d3095c6ae6dba8c635669bdeccbf95a4b16b1c14bab89a4a6ca535c6b856b6fa80093309e0930b7122b1a3d8420ce SHA512 a041c28c21d23eb7a05638e91033ea3d884d9c16d85817ee9d2b2e0690a6c0e9c78e5d745e6b5a8145b5f1e352142330a9c13ccc5ee70c71fbcbcb49acd9eeaf
MISC metadata.xml 560 BLAKE2B fe8daaba2a7586247537f8ed7b92769676b20f2c1377f7bb582dff49e06cf3f9beba4f79e28f10ea76d67d089eb152b060b091414dd9b47c5694ca153211421f SHA512 a744fcc50c7e44b1939190150404aee9054eab8e921e6f63cafa58dc80be5f20692632509de85399b6a9633701da72fd951e8bcfbe9e5177f315fa1dcbcc9ee5
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-bashism.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-bashism.patch
deleted file mode 100644
index 01ce4301d4e3..000000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-bashism.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://github.com/tpm2-software/tpm2-tools/pull/3339
-
-From 9f244c3f74747b7f79c8c6813657b2f2f8a1c844 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 21 Jan 2024 08:08:28 +0000
-Subject: [PATCH] configure.ac: fix bashisms
-
-configure scripts need to be runnable with a POSIX-compliant /bin/sh.
-
-On many (but not all!) systems, /bin/sh is provided by Bash, so errors
-like this aren't spotted. Notably Debian defaults to /bin/sh provided
-by dash which doesn't tolerate such bashisms as '=='.
-
-This retains compatibility with bash.
-
-Fixes configure warnings/errors like:
-```
-checking for libcurl... yes
-./configure: 15201: test: xauto: unexpected operator
-./configure: 15286: test: xauto: unexpected operator
-checking for efivar/efivar.h... yes
-```
-
-This fixes a build error later on too:
-```
-/usr/lib/gcc/x86_64-pc-linux-gnu/14/../../../../x86_64-pc-linux-gnu/bin/ld: lib/libcommon.a(libcommon_a-tpm2_eventlog_yaml.o): in function `yaml_devicepath':
-tpm2_eventlog_yaml.c:(.text.yaml_devicepath+0x2f): undefined reference to `efidp_format_device_path'
-/usr/lib/gcc/x86_64-pc-linux-gnu/14/../../../../x86_64-pc-linux-gnu/bin/ld: tpm2_eventlog_yaml.c:(.text.yaml_devicepath+0x61): undefined reference to `efidp_format_device_path'
-```
-
-Bug: https://bugs.gentoo.org/922592
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -94,9 +94,9 @@ AC_ARG_WITH([efivar],
- )
-
- # use the true program to avoid failing hard
--AS_IF([test "x$with_efivar" == "xauto"],
-+AS_IF([test "x$with_efivar" = "xauto"],
- [PKG_CHECK_MODULES([EFIVAR], [efivar], [AC_CHECK_HEADERS([efivar/efivar.h], , [true])], [true])],
-- [test "x$with_efivar" == "xyes"],
-+ [test "x$with_efivar" = "xyes"],
- [PKG_CHECK_MODULES([EFIVAR], [efivar], [AC_CHECK_HEADERS([efivar/efivar.h])])],
- )
-
-
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch
deleted file mode 100644
index f24cf50aff5c..000000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 9cd74df24dbeee81b408e12ac10a98a088008d07 Mon Sep 17 00:00:00 2001
-From: Juergen Repp <juergen_repp@web.de>
-Date: Mon, 20 Nov 2023 13:55:36 +0100
-Subject: [PATCH] test eventlog: fix check eventlog.sh if efivar.h exists
-
-If efivar.h exist a pretty print function for the DevicePath
-is executed. Therefore two yaml test files are needed for
-the bin test file uefiservices.
-Fixes #3302.
-
-Signed-off-by: Juergen Repp <juergen_repp@web.de>
----
- Makefile.am | 13 ++++++
- configure.ac | 3 ++
- .../event-uefiservices.bin.yaml.pretty | 45 +++++++++++++++++++
- ...n.yaml => event-uefiservices.bin.yaml.raw} | 0
- 4 files changed, 61 insertions(+)
- create mode 100644 test/integration/fixtures/event-uefiservices.bin.yaml.pretty
- rename test/integration/fixtures/{event-uefiservices.bin.yaml => event-uefiservices.bin.yaml.raw} (100%)
-
-diff --git a/Makefile.am b/Makefile.am
-index 413345cd..ef76dca8 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -352,6 +352,7 @@ TEST_EXTENSIONS = .sh
-
- check-hook:
- rm -rf .lock_file
-+ rm -f $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml
-
- EXTRA_DIST_IGNORE = \
- .gitignore \
-@@ -647,6 +648,18 @@ dist-hook:
- for f in $(EXTRA_DIST_IGNORE); do \
- rm -rf `find $(distdir) -name $$f`; \
- done;
-+
-+prepare-check:
-+if HAVE_EFIVAR_H
-+ cp $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml.pretty \
-+ $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml
-+else
-+ cp $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml.raw \
-+ $(abs_top_srcdir)/test/integration/fixtures/event-uefiservices.bin.yaml
-+endif
-+
-+check: prepare-check
-+
- if !HAVE_PANDOC
- # If pandoc is not enabled, we want to complain that you need pandoc for make dist,
- # so hook the target and complain.
-diff --git a/configure.ac b/configure.ac
-index 362ae0aa..54224048 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -97,6 +97,9 @@ AS_IF([test "x$with_efivar" == "xauto"],
- [PKG_CHECK_MODULES([EFIVAR], [efivar], [AC_CHECK_HEADERS([efivar/efivar.h])])],
- )
-
-+AC_CHECK_HEADERS([efivar/efivar.h],[efivar_h=yes ], [efivar = no ])
-+AM_CONDITIONAL([HAVE_EFIVAR_H], [test "$efivar_h" = yes])
-+
- # backwards compat with older pkg-config
- # - pull in AC_DEFUN from pkg.m4
- m4_ifndef([PKG_CHECK_VAR], [
-diff --git a/test/integration/fixtures/event-uefiservices.bin.yaml.pretty b/test/integration/fixtures/event-uefiservices.bin.yaml.pretty
-new file mode 100644
-index 00000000..f0819f70
---- /dev/null
-+++ b/test/integration/fixtures/event-uefiservices.bin.yaml.pretty
-@@ -0,0 +1,45 @@
-+---
-+version: 1
-+events:
-+- EventNum: 0
-+ PCRIndex: 0
-+ EventType: EV_NO_ACTION
-+ Digest: "0000000000000000000000000000000000000000"
-+ EventSize: 37
-+ SpecID:
-+ - Signature: Spec ID Event03
-+ platformClass: 0
-+ specVersionMinor: 0
-+ specVersionMajor: 2
-+ specErrata: 0
-+ uintnSize: 2
-+ numberOfAlgorithms: 2
-+ Algorithms:
-+ - Algorithm[0]:
-+ algorithmId: sha1
-+ digestSize: 20
-+ - Algorithm[1]:
-+ algorithmId: sha256
-+ digestSize: 32
-+ vendorInfoSize: 0
-+- EventNum: 1
-+ PCRIndex: 2
-+ EventType: EV_EFI_BOOT_SERVICES_DRIVER
-+ DigestCount: 2
-+ Digests:
-+ - AlgorithmId: sha1
-+ Digest: "855685b4dbd4b67d50e0594571055054cfe2b1e9"
-+ - AlgorithmId: sha256
-+ Digest: "dd8576b4ff346c19c56c3e4f97ce55c5afa646f9c669be0a7cdd05057a0ecdf3"
-+ EventSize: 84
-+ Event:
-+ ImageLocationInMemory: 0x7dcf6018
-+ ImageLengthInMemory: 171464
-+ ImageLinkTimeAddress: 0x0
-+ LengthOfDevicePath: 52
-+ DevicePath1: 'PciRoot(0x0)/Pci(0x2,0x0)/Pci(0x0,0x0)/Offset(0x12600,0x3c3ff)'
-+pcrs:
-+ sha1:
-+ 2 : 0x5b5f4d5c31664f01670a98a5796a36473671befc
-+ sha256:
-+ 2 : 0x35fcf9d737c52c971f7c74058d36937dbd7824177fa0f1de3eba3934fcb83b9d
-diff --git a/test/integration/fixtures/event-uefiservices.bin.yaml b/test/integration/fixtures/event-uefiservices.bin.yaml.raw
-similarity index 100%
-rename from test/integration/fixtures/event-uefiservices.bin.yaml
-rename to test/integration/fixtures/event-uefiservices.bin.yaml.raw
---
-2.41.0
-
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog.sh-Fix-accidental-deletions.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog.sh-Fix-accidental-deletions.patch
deleted file mode 100644
index 7274ee40827a..000000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.6-test-eventlog.sh-Fix-accidental-deletions.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 4dec5295361d753c3466bc9e8b0ae3a3cc58dff5 Mon Sep 17 00:00:00 2001
-From: Juergen Repp <juergen_repp@web.de>
-Date: Thu, 4 Apr 2024 09:42:51 +0200
-Subject: [PATCH] test eventlog.sh Fix accidental deletions.
-
-* Accidental deletions made in commit 196e3d439407e81040ced054a8ed302489348a9d
- are undone.
-* python3 is used as default instead of python.
-
-Signed-off-by: Juergen Repp <juergen_repp@web.de>
----
- test/integration/tests/eventlog.sh | 33 ++++++++++++++++++++++++++++--
- 1 file changed, 31 insertions(+), 2 deletions(-)
-
-diff --git a/test/integration/tests/eventlog.sh b/test/integration/tests/eventlog.sh
-index 9d5290f0..e7c13706 100755
---- a/test/integration/tests/eventlog.sh
-+++ b/test/integration/tests/eventlog.sh
-@@ -3,7 +3,7 @@
- set -E
- shopt -s expand_aliases
-
--alias python=${PYTHON-python}
-+alias python=${PYTHON-python3}
-
- yaml_validate() {
- cmd=$1
-@@ -88,7 +88,36 @@ expect_pass() {
- expect_fail
- expect_fail foo
- expect_fail foo bar
--expect_fail ${srcdir}/test/integration/fix
-+expect_fail ${srcdir}/test/integration/fixtures/event-bad.bin
-+
-+expect_pass ${srcdir}/test/integration/fixtures/specid-vendordata.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event-uefivar.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event-uefiaction.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event-uefiservices.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event-uefi-sha1-log.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event-bootorder.bin
-+expect_pass ${srcdir}/test/integration/fixtures/event-postcode.bin
-+
-+# Make sure that --eventlog-version=2 works on complete TPM2 logs
-+expect_pass ${srcdir}/test/integration/fixtures/event-arch-linux.bin --eventlog-version=2
-+expect_pass ${srcdir}/test/integration/fixtures/event-gce-ubuntu-2104-log.bin --eventlog-version=2
-+expect_pass ${srcdir}/test/integration/fixtures/event-sd-boot-fedora37.bin --eventlog-version=2
-+expect_pass ${srcdir}/test/integration/fixtures/event-moklisttrusted.bin --eventlog-version=2
-+
-+# Pick an event with leading whitespace and validate we have
-+# preserved it correctly after parsing the YAML
-+event=$(yaml_validate "print(y['events'][80]['Event']['String'])" < ${srcdir}/test/integration/fixtures/event-moklisttrusted.bin.yaml | tr -d '\0')
-+expect=$(echo -e "grub_cmd: menuentry UEFI Firmware Settings --id uefi-firmware {\n\t\tfwsetup\n\t}")
-+if test "$event" != "$expect"
-+then
-+ echo "Got $event"
-+ echo "Want $expect"
-+ exit 1
-+fi
-+
-+# Compare strings generated by tpm2_eventlog with binary data of the corresponding
-+# events.
- hex_file="${srcdir}/test/integration/fixtures/event-moklisttrusted-hex.yaml"
- tool_file="${srcdir}/test/integration/fixtures/event-moklisttrusted.bin.yaml"
-
---
-2.43.2
-
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.7-tests-Eliminate-dependency-on-which.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.7-tests-Eliminate-dependency-on-which.patch
new file mode 100644
index 000000000000..1872d7d2389e
--- /dev/null
+++ b/app-crypt/tpm2-tools/files/tpm2-tools-5.7-tests-Eliminate-dependency-on-which.patch
@@ -0,0 +1,42 @@
+From e9af1553f26ebad6e8db14b599dc74bab5663806 Mon Sep 17 00:00:00 2001
+From: Christopher Byrne <salah.coronya@gmail.com>
+Date: Tue, 16 Apr 2024 09:32:30 -0500
+Subject: [PATCH] tests: Eliminate dependency on 'which'
+
+See https://lwn.net/Articles/874049/
+
+Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
+---
+ test/integration/tests/pcrevent.sh | 2 +-
+ test/integration/tests/symlink.sh | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/integration/tests/pcrevent.sh b/test/integration/tests/pcrevent.sh
+index 5484cfbe..d7166789 100644
+--- a/test/integration/tests/pcrevent.sh
++++ b/test/integration/tests/pcrevent.sh
+@@ -44,7 +44,7 @@ yaml_verify $hash_out_file
+ while IFS='' read -r l || [[ -n "$l" ]]; do
+
+ alg=`echo -n $l | cut -d\: -f 1-1`
+- if ! which "$alg"sum >/dev/null 2>&1; then
++ if ! command -v "$alg"sum >/dev/null 2>&1; then
+ echo "Ignore checking $alg algorithm due to unavailable \"${alg}sum\" program"
+ continue
+ fi
+diff --git a/test/integration/tests/symlink.sh b/test/integration/tests/symlink.sh
+index 606e1a1a..f65a7567 100644
+--- a/test/integration/tests/symlink.sh
++++ b/test/integration/tests/symlink.sh
+@@ -17,7 +17,7 @@ start_up
+ # Positive tests:
+ #
+ fail=0
+-TPM2_TOOL="$(which tpm2)"
++TPM2_TOOL="$(command -v tpm2)"
+
+ if [ -z "$TPM2_TOOL" ]; then
+ echo "unable to locate tpm2 tool"
+--
+2.45.2
+
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
deleted file mode 100644
index 866f1e799d24..000000000000
--- a/app-crypt/tpm2-tools/tpm2-tools-5.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit bash-completion-r1 flag-o-matic python-any-r1
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="+fapi test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
- dev-libs/openssl:=
- net-misc/curl
- sys-libs/efivar:="
-DEPEND="${RDEPEND}
- test? (
- app-crypt/swtpm
- app-crypt/tpm2-abrmd
- dev-util/cmocka
- )"
-BDEPEND="virtual/pkgconfig
- dev-build/autoconf-archive
- test? (
- app-editors/vim-core
- dev-tcltk/expect
- $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
- )
- ${PYTHON_DEPS}"
-
-python_check_deps() {
- python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_configure() {
- # tests fail with LTO enabbled. See bug 865275 and 865277
- filter-lto
- econf \
- $(use_enable fapi) \
- $(use_enable test unit) \
- --with-bashcompdir=$(get_bashcompdir) \
- --enable-hardening
-}
-
-src_install() {
- default
- mv "${ED}"/$(get_bashcompdir)/tpm2{_completion.bash,} || die
- local utils=( "${ED}"/usr/bin/tpm2_* )
- utils=("${utils[@]##*/}")
- # these utiltites don't have bash completions
- local nobashcomp=( tpm2_encodeobject tpm2_getpolicydigest tpm2_sessionconfig )
- mapfile -d $'\0' -t utils < <(printf '%s\0' "${utils[@]}" | grep -Ezvw "${nobashcomp[@]/#/-e}")
- bashcomp_alias tpm2 "${utils[@]}"
-}
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild
deleted file mode 100644
index ab59eed9520d..000000000000
--- a/app-crypt/tpm2-tools/tpm2-tools-5.6-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools bash-completion-r1 flag-o-matic python-any-r1
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/tpm2-tools-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="+fapi test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
- dev-libs/openssl:=
- net-misc/curl
- sys-libs/efivar:="
-DEPEND="${RDEPEND}
- test? (
- app-crypt/swtpm
- app-crypt/tpm2-abrmd
- dev-util/cmocka
- )"
-BDEPEND="virtual/pkgconfig
- dev-build/autoconf-archive
- test? (
- app-editors/vim-core
- dev-tcltk/expect
- $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
- )
- ${PYTHON_DEPS}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch"
- "${WORKDIR}/${PN}-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch"
- "${FILESDIR}/${PN}-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch"
- "${FILESDIR}/${PN}-5.6-bashism.patch"
- "${FILESDIR}/${PN}-5.6-test-eventlog.sh-Fix-accidental-deletions.patch"
-)
-
-python_check_deps() {
- python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # tests fail with LTO enabbled. See bug 865275 and 865277
- filter-lto
- econf \
- $(use_enable fapi) \
- $(use_enable test unit) \
- --with-bashcompdir=$(get_bashcompdir) \
- --enable-hardening
-}
-
-src_install() {
- default
- mv "${ED}"/$(get_bashcompdir)/tpm2{_completion.bash,} || die
- local utils=( "${ED}"/usr/bin/tpm2_* )
- utils=("${utils[@]##*/}")
- # these utiltites don't have bash completions
- local nobashcomp=( tpm2_encodeobject tpm2_getpolicydigest\
- tpm2_sessionconfig tpm2_tr_encode)
- mapfile -d $'\0' -t utils < <(printf '%s\0' "${utils[@]}" | grep -Ezvw "${nobashcomp[@]/#/-e}")
- bashcomp_alias tpm2 "${utils[@]}"
-}
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
deleted file mode 100644
index d66c553ca767..000000000000
--- a/app-crypt/tpm2-tools/tpm2-tools-5.6.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit autotools bash-completion-r1 flag-o-matic python-any-r1
-
-DESCRIPTION="Tools for the TPM 2.0 TSS"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-tools"
-SRC_URI="https://github.com/tpm2-software/tpm2-tools/releases/download/${PV}/${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/tpm2-tools-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86"
-IUSE="+fapi test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=app-crypt/tpm2-tss-3.0.1:=[fapi?]
- dev-libs/openssl:=
- net-misc/curl
- sys-libs/efivar:="
-DEPEND="${RDEPEND}
- test? (
- app-crypt/swtpm
- app-crypt/tpm2-abrmd
- dev-util/cmocka
- )"
-BDEPEND="virtual/pkgconfig
- dev-build/autoconf-archive
- test? (
- app-editors/vim-core
- dev-tcltk/expect
- $(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
- )
- ${PYTHON_DEPS}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.6-test-eventlog-fix-check-eventlog.sh-if-efivar.h-exis.patch"
- "${WORKDIR}/${PN}-5.6-tpm2_eventlog-Create-raw-and-pretty-print-format-for.patch"
- "${FILESDIR}/${PN}-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch"
- "${FILESDIR}/${PN}-5.6-test-eventlog.sh-Fix-accidental-deletions.patch"
-)
-
-python_check_deps() {
- python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- # tests fail with LTO enabbled. See bug 865275 and 865277
- filter-lto
- econf \
- $(use_enable fapi) \
- $(use_enable test unit) \
- --with-bashcompdir=$(get_bashcompdir) \
- --enable-hardening
-}
-
-src_install() {
- default
- mv "${ED}"/$(get_bashcompdir)/tpm2{_completion.bash,} || die
- local utils=( "${ED}"/usr/bin/tpm2_* )
- utils=("${utils[@]##*/}")
- # these utiltites don't have bash completions
- local nobashcomp=( tpm2_encodeobject tpm2_getpolicydigest\
- tpm2_sessionconfig tpm2_tr_encode)
- mapfile -d $'\0' -t utils < <(printf '%s\0' "${utils[@]}" | grep -Ezvw "${nobashcomp[@]/#/-e}")
- bashcomp_alias tpm2 "${utils[@]}"
-}
-
-src_test() {
-# This hook doesn't get invoked consisently, so call it manually
-# else one of the tests will fail
- emake prepare-check
- default
-}
diff --git a/app-crypt/tpm2-tools/tpm2-tools-5.7.ebuild b/app-crypt/tpm2-tools/tpm2-tools-5.7.ebuild
index 99c2a66f1a7f..530587f97e2d 100644
--- a/app-crypt/tpm2-tools/tpm2-tools-5.7.ebuild
+++ b/app-crypt/tpm2-tools/tpm2-tools-5.7.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit autotools bash-completion-r1 flag-o-matic python-any-r1
DESCRIPTION="Tools for the TPM 2.0 TSS"
@@ -38,6 +38,7 @@ BDEPEND="virtual/pkgconfig
PATCHES=(
"${FILESDIR}/${PN}-5.6-Makefile-am-Dont-require-pandoc-for-tests.patch"
+ "${FILESDIR}/${PN}-5.7-tests-Eliminate-dependency-on-which.patch"
)
python_check_deps() {
diff --git a/app-crypt/ubuntu-keyring/Manifest b/app-crypt/ubuntu-keyring/Manifest
index 124f37d35f67..7a0b77af165c 100644
--- a/app-crypt/ubuntu-keyring/Manifest
+++ b/app-crypt/ubuntu-keyring/Manifest
@@ -5,5 +5,5 @@ DIST ubuntu-keyring_2023.11.28.1.orig.tar.xz 20236 BLAKE2B b6f925ef76e4aca2ae346
EBUILD ubuntu-keyring-2020.02.11.2.ebuild 461 BLAKE2B 1ffb83d3447ff326ba3092ced56f73aee1b0f445ce204ccd51560eecbc7713eebffee3352370ce2a63ebd504d3f479d163ac653c2a7cea01fce75891b437ba1e SHA512 598c17f9f8adb5b3467e58ecd362d04ce07dc5bb8231726de5483e37f03a8546036adc6b6aa8a312751671f2e0f33e3d45aa76e47d50f4295ba2e8d361a29103
EBUILD ubuntu-keyring-2020.06.17.1.ebuild 473 BLAKE2B 6c3c898211ba90543c1d0d4189492006c1b142f5cbbef5d400ad755695a9849db7c4df8315135b88f61d1440e7074882ac8cbe91e2c9c6b5bc85f831ba8e56c9 SHA512 c7037e78586ca505f95b2062487df2e560d6ca1cf230af1579b12439df27de37fcbd8cbe464b6345dfccef86bba0a41c79547244cf786bb69bb370e9cb2d6b79
EBUILD ubuntu-keyring-2021.03.26.ebuild 473 BLAKE2B 6c3c898211ba90543c1d0d4189492006c1b142f5cbbef5d400ad755695a9849db7c4df8315135b88f61d1440e7074882ac8cbe91e2c9c6b5bc85f831ba8e56c9 SHA512 c7037e78586ca505f95b2062487df2e560d6ca1cf230af1579b12439df27de37fcbd8cbe464b6345dfccef86bba0a41c79547244cf786bb69bb370e9cb2d6b79
-EBUILD ubuntu-keyring-2023.11.28.1.ebuild 488 BLAKE2B fa240373329a9c6504d0a716396a8c262f6afce1de559fcbf5b2d2d993d353d5f158d9272ecefaf1850bac60276fb1d90ac1036580bbbc875240783f75a43252 SHA512 86bebe6e19d3677f85592526743a61eeefe6deffb4094c8ed92cc73bdf3fa78fa31442622d83128d4d8260d6033a46064587ec88315571a2d5a5df9ba0c145ec
+EBUILD ubuntu-keyring-2023.11.28.1.ebuild 495 BLAKE2B 38d0401f0e24ebeb10de4b9e5e7045b09e1ba563b1649ab80dbe6b84d99c4611b14d997b13893341c0e274e1d6c9343b4eb4821f3582049a0e062ceda9a04832 SHA512 eb9b2859ceb2f560536c3f3c8526c1d30efc1613fab35083f593f56de713bc4b25c4cd92e7f9d5946e891b462fe59b71bd0c505bf62d1e95a3b91247fd2a3c12
MISC metadata.xml 250 BLAKE2B 2bc2e14adc90cf0097dec7f5c2eeeaebecbd404252555385c3455d81ea3a22eecc3dc27aa17699ab500fdfcb737f58a6cc981aeb691fe6266537c290655ca54f SHA512 913641ea55e6cbeb7ca80b13ed2161dd3d22e6d2f59408bf272c4a79e4590b4f2c726f4025d190e58617e262313fbf9ba0892b72773e4769466f812b5c009374
diff --git a/app-crypt/ubuntu-keyring/ubuntu-keyring-2023.11.28.1.ebuild b/app-crypt/ubuntu-keyring/ubuntu-keyring-2023.11.28.1.ebuild
index 2d9eb9a3825e..f66937cde963 100644
--- a/app-crypt/ubuntu-keyring/ubuntu-keyring-2023.11.28.1.ebuild
+++ b/app-crypt/ubuntu-keyring/ubuntu-keyring-2023.11.28.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~loong ~ppc64 ~x86"
S="${WORKDIR}"/${PN}
diff --git a/app-crypt/veracrypt/Manifest b/app-crypt/veracrypt/Manifest
index 25201ed39078..46ba8993d481 100644
--- a/app-crypt/veracrypt/Manifest
+++ b/app-crypt/veracrypt/Manifest
@@ -1,7 +1,9 @@
AUX veracrypt-1.25.9-wxGTK3.2.patch 17509 BLAKE2B f0139aa7d3859777e5f84ba18fa1f230ce1d03f554160242b9cf3a71d9734667e9e879a318c54feb5c3ce1e1d39308fc6982280f8d246900caaf448afc5bdb37 SHA512 ca14bd6e3ce01bd2ff879bcaf4f5a54b54a2dd4e1b015e457f2834add706b91358a6ed20b74551b46ec7812d08a36013189e802e5ce8e7f1e1d6e88d2d6a21fb
AUX veracrypt.init 384 BLAKE2B 0325852e3bb9d8427298c46b0e7caefb1f62d957a158c8a6f898c6609c0363449ef5f48c9cd5a1092efbd9d2e1077a6218bdbebacebde936afc40ec3bfd0b3eb SHA512 574b18b7cbc5f4ea71bb35ec3343af5bdcc7848801decf3b93157bc4fde44ca5daec01847e3ff9f3a638b297f33023ea46a0ada5cc64bab0d14cbe12b93b66ed
DIST veracrypt-1.25.9.tar.gz 26200897 BLAKE2B e48f060343f875a0660040dde35fa826ca87c3659d97a039c2b84193276075b4d3596119bde6727e51eead0c876c91a5a1a3ea77717e74061d5d20a4ea1a6fed SHA512 e83bf7ca52d3893347dd06295db0534931f6f388fc6b0f26dc80ffef77f13918bf9558ab8ac2e6225945415f3291646d7c1c8de382dbe8e468ab1e927251982c
+DIST veracrypt-1.26.15.tar.gz 30974645 BLAKE2B 88fd0b84a9c93d7ae524da7b906584ea3f5496d5e9e31a227667d0b1b8a75bdefdb51dd60022cfdb9e7f77d0c5775e946814546eb2392026f405994fb9ae143b SHA512 a3598fd32ac460ce0fc12b5826d39e7969041b78c13a01936a96a5471ce00dbed5af129dd617f5f16d7496f54b106da2f42660366dadd81de5bca9580d8a542a
DIST veracrypt-1.26.7.tar.gz 30322472 BLAKE2B a71adf9fa5a2aafb9694ccf7a7ac45e6e16cf8277a57f9f52e2fd0ddb2657bd1a28dd4b2c0bf9167298251b4a87ab3f0ca0a8a8424b612be0cd7a4bcc630a438 SHA512 1b0fae30e3a8eb20e1ddcf7697f5b1ce947ddc3555442a561e50fe10bd82183ff5b21dc1c06ce2024eecab869fe38616ac47931c880816f814b961bbd1dec8e2
EBUILD veracrypt-1.25.9-r1.ebuild 2925 BLAKE2B fca79572908028359fc9599b76f5116257112512fa0f7aba79b0b94ef5fa8d6cc61a998ec229d20df70df9554cdb8c2b749cdf49684a2493162490b6e29c4afa SHA512 d42d165a54299b965f9621630323bf8ec0ffadfb15ee46bef95201cc4655f5e4b61e2942ca98e4bb3307184be0140123afa9e38a60fc146ac234fd71c86b24ed
+EBUILD veracrypt-1.26.15.ebuild 3052 BLAKE2B a71f8e32f1ff7753868dbe5a81b09edf9511016dd8571a9bb785a14354a4bc8ea925b778020f839d0fec8d396a4bd4f0982c0c315371f8e8df4f45cf98663458 SHA512 d65572c7f509543e8ff0fdc9dd7eb39a660f8b2d4639c585a6c845fc7c41096b1d36a986b1969cbc4e7d2008ddc72319b7313d5d82e0fc2998ac8100b1775700
EBUILD veracrypt-1.26.7.ebuild 3051 BLAKE2B 8453d8c9797e34876fa51d0f89fc96681eba70e4551eadccdc2ea88e53abdd2b580ccd1c95068d909dd06b335a19e1d7674002278d6f865d7864e79c27678b22 SHA512 a4eb612c222a8b25a751e40a8be2aa7e3d142f8cf1198268c9b01a67fc21934495c3349d0763a281727b14238f6bd712f5153fa4f69217214a2749dfcd7a530e
MISC metadata.xml 336 BLAKE2B f4d113cb71afc4b2856216740318c9909164eddfedc6051490bc0ae487e99a0019768f8ec4954b66cae88a671eb17087ee53af8338b4cf5a18f0057ed163904a SHA512 b9cf52029a3903eb553a68673ed86b052de2953c86de3ee81b8a7c40f9475c53e95d5c582fff8527703f2194bf255b888ae25484c1718b8995fcdaaf69d157ec
diff --git a/app-crypt/veracrypt/veracrypt-1.26.15.ebuild b/app-crypt/veracrypt/veracrypt-1.26.15.ebuild
new file mode 100644
index 000000000000..a1276336ac41
--- /dev/null
+++ b/app-crypt/veracrypt/veracrypt-1.26.15.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+inherit desktop flag-o-matic linux-info pax-utils toolchain-funcs wxwidgets
+
+DESCRIPTION="Disk encryption with strong security based on TrueCrypt"
+HOMEPAGE="https://www.veracrypt.fr/en/Home.html"
+SRC_URI="https://github.com/${PN}/VeraCrypt/archive/VeraCrypt_${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/VeraCrypt-VeraCrypt_${PV}/src"
+
+# The modules not linked against in Linux include (but not limited to):
+# libzip, chacha-xmm, chacha256, chachaRng, rdrand, t1ha2
+# Tested by actually removing the source files and performing a build
+# For this reason, we don't have to worry about their licenses
+LICENSE="Apache-2.0 BSD RSA truecrypt-3.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+asm cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_ssse3 doc X"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+ app-admin/sudo
+ sys-apps/pcsc-lite
+ sys-fs/fuse:0
+ sys-fs/lvm2
+ x11-libs/wxGTK:${WX_GTK_VER}[X?]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ asm? ( dev-lang/yasm )
+ virtual/pkgconfig"
+
+CONFIG_CHECK="~BLK_DEV_DM ~CRYPTO ~CRYPTO_XTS ~DM_CRYPT ~FUSE_FS"
+
+src_configure() {
+ setup-wxwidgets
+
+ # https://bugs.gentoo.org/786741
+ # std::byte clashes with src/Common/Tcdefs.h typedef
+ append-cxxflags -std=c++14
+}
+
+src_compile() {
+ local myemakeargs=(
+ NOSTRIP=1
+ NOTEST=1
+ VERBOSE=1
+ CC="$(tc-getCC)"
+ CXX="$(tc-getCXX)"
+ AR="$(tc-getAR)"
+ RANLIB="$(tc-getRANLIB)"
+ TC_EXTRA_CFLAGS="${CFLAGS}"
+ TC_EXTRA_CXXFLAGS="${CXXFLAGS}"
+ TC_EXTRA_LFLAGS="${LDFLAGS}"
+ WX_CONFIG="${WX_CONFIG}"
+ $(usex X "" "NOGUI=1")
+ $(usex asm "" "NOASM=1")
+ $(usex cpu_flags_x86_sse2 "" "NOSSE2=1")
+ $(usex cpu_flags_x86_sse4_1 "SSE41=1" "")
+ $(usex cpu_flags_x86_ssse3 "SSSE3=1" "")
+ )
+
+ emake "${myemakeargs[@]}"
+}
+
+src_test() {
+ ./Main/veracrypt --text --test || die "tests failed"
+}
+
+src_install() {
+ local DOCS=( Readme.txt )
+
+ dobin Main/veracrypt
+ if use doc; then
+ DOCS+=( "${S}"/../doc/EFI-DCS )
+ docompress -x /usr/share/doc/${PF}/EFI-DCS
+ HTML_DOCS=( "${S}"/../doc/html/. )
+ fi
+ einstalldocs
+
+ newinitd "${FILESDIR}"/veracrypt.init veracrypt
+
+ if use X; then
+ local s
+ for s in 16 48 128 256; do
+ newicon -s ${s} Resources/Icons/VeraCrypt-${s}x${s}.xpm veracrypt.xpm
+ done
+ make_desktop_entry veracrypt "VeraCrypt" veracrypt "Utility;Security"
+ fi
+
+ pax-mark -m "${ED}"/usr/bin/veracrypt
+}
+
+pkg_postinst() {
+ local version
+
+ ewarn "VeraCrypt has a very restrictive license. Please be explicitly aware"
+ ewarn "of the limitations on redistribution of binaries or modified source."
+
+ # Remove this when we remove veracrypt-1.25.9.ebuild from the tree.
+ for version in ${REPLACING_VERSIONS}; do
+ if ver_test "${version}" -lt "1.26.7"; then
+ ewarn "Starting with 1.26.7, TrueCrypt volumes are no longer supported."
+ ewarn "Please explore alternatives such as dm-crypt to mount truecrypt volumes."
+ ewarn "Moreover, support for RIPEMD160 and GOST89 is dropped."
+ ewarn "Volumes using these algoritms will no longer mount."
+ fi
+ done
+}
diff --git a/app-crypt/xca/Manifest b/app-crypt/xca/Manifest
index b9b488f509ac..70d0577cbe2d 100644
--- a/app-crypt/xca/Manifest
+++ b/app-crypt/xca/Manifest
@@ -1,9 +1,12 @@
AUX xca-1.0.0-desktop.patch 391 BLAKE2B 1cbec5681df8da9230b783c8ea048a199bd31a38fce6781dcd86b926e03b245de05b148d8df9034f5c7470dcf5823bd4a080cbb011a1a32fc0b96d8a8a5d950d SHA512 5dd62d8d2f4485b6155e466bb9a012f44104ff36c97bae61e8155880b937fc1271e94fb5b83627bd828e3cde0ab421a150458d050cb512d633d1c5c97f80f163
AUX xca-2.4.0-man-page.patch 903 BLAKE2B f734d19e252d0cfb566f4a309359d088701dce6ffe81c4529964b7af4d84ae775d7bcd2748a572c12c3d4db6e5723ec91aeef56e9c6dcf28d51da65189013d57 SHA512 43ddd7d330285b2d5dd866f6c91270b5bbc24896d825d4bc701646701f334e52804047f417e530a067486719431eb4cd6f7145cef3b87730756bb81a390fae71
+AUX xca-2.8.0-man-page.patch 1026 BLAKE2B aeb83c424de6ef2c6e26ef9f612e0bc2d465a400c058a753cfad7a3d292a7c624dd1ddfd4a868361673ecc51ff70b27339775f74a402e4cfa19fa75c6e0a2131 SHA512 553a84ff4dfb2b5b3c71010673a21cfcf2d56f929f5c96f156ab44ddff2a39567d72cea65e1af728ef43b75ba29a76a514fca189e886bea23260b56fe541583e
DIST xca-2.5.0.tar.gz 1850445 BLAKE2B e12666fc0513cd04bd61d4e182851c055c120425ad8d2fb2698396429b7afb4cc57c77be6d6cc3f63f9d49d5a179123b336d43dde57ef4a3274e7ba1a06f22f7 SHA512 8b283509849c9ac34d5250c780dc0c7a6319eb3201ae892fc2c38e5257d7db4e565e88167a687ffc1ca436068a41cd48fad59d3ecc8235678d46cf026280bd5e
DIST xca-2.6.0.tar.gz 1874590 BLAKE2B a6a83df88209d6c929bfd5781f6d56b01498d3b9d296a66f4e513f279fc3c14749e1af1f765e863b26e49807a00f5c11e40f8e16f965e23025d835b58eaf4dfc SHA512 4797445e818545c92ded8f611e53f36cab85b527772a531d7a3fae5c5fdb87e1be34139ffeb906239bc3a02221807e2d7c286990ce68f92c1964545cb8fd7986
DIST xca-2.7.0.tar.gz 1893082 BLAKE2B e37f622864ea20dcf9796640ab7628205823ed2bc8cfeba54fe5dc815be60fba318e9b180d880258ad3d9d2b58b98fd688ee87969da0e2cc8017d98c0cce5680 SHA512 ac441a88c3a4548d78256509ba47cdcb438113e021d76367cbbb91f2a6f6ade2f6ee50c9132d2e89f3843263a7fbd4af73fcada0c32573c819781c0228939f62
+DIST xca-2.8.0.tar.gz 1955684 BLAKE2B 4ba352d023a3c7018cfb89cc6e8d9296c7a2664338ef4a3084339f96d32073065be7ec5d07e35cc9b91371e3d580872fa0d282ae10aa5bb36d0ffefa472c23d9 SHA512 14e880625f086d12cd39e55c1dc5703bdbc7cfcf683cf4706bb3fd0e2d9c2937194d3420f5e9a0a8f8fc22a24a56eaf67dc7c8eae5426e991f6737f0b6bb7a52
EBUILD xca-2.5.0.ebuild 1421 BLAKE2B 76e7249bedc9007decfd75cb2baa5b73976350532b13329673b232cd0cdc23b0398c11592c53f756056fcf3151625952d5bfc8d9f079cbe3257a646a3dffe9cc SHA512 37aa0016f26962a5a5ee8aec1f5c0925f1b60037745906f2da2d0de9db74dea7908b0b43e22a0f08fa5e73c155e25623140fde4ca78d017488e5bef2f587995c
EBUILD xca-2.6.0.ebuild 1372 BLAKE2B 82451f42e9bc72d13045a90ae673bb2af3464fd4a789729416ad9842ae760b17055ce153cd30c72f3324aca657259bf7887ae36ddaee579858a88e6c16fd55f1 SHA512 2b01c3ae6fe028f5843034d0ce3a42a468379f0e4f483018d05632ac820b2c38c00e97aabf38467272a24a9f1916e6e2fc2b94bb3fc17031d900920ac4a2ca3c
EBUILD xca-2.7.0.ebuild 1597 BLAKE2B 32265b8d87af53e3dd675ec1c25b6814611aa0103ae1cab605b02e641c91c1b0e7332d4106cb54cbd22809ce2451a9175cb17c87b46a00057c3e0cc21a701f71 SHA512 6037ff859e73e824b21ff879f365c9a1f8db5bc1a306d488b9878ed7f3e55c0a6dfc75676340a8095691792a6cfbab83455319cb418e03a11c020eda7e3a5cbf
+EBUILD xca-2.8.0.ebuild 1325 BLAKE2B 2028d91c32cf3c12898872e478da098a4aff4eb5d6920da66212d147f4f251647b1a935da2e68aeb74787fa9482dbbae776c56d082d78b8645fa435df7d62106 SHA512 aeba7997b7f2b203cc942fd70d6a6f0efdd143d47d29a7cf9f411827211511b1f3b3c0770a9dfcf89f85a14ea181618f267ee5cddebe29f9480dc9fab9fee55a
MISC metadata.xml 304 BLAKE2B f99e5a2ed991066c1c605ca7bba6669b362e90a96e5a26258caf8d6491f8c5351cc897826bd06dda28ac67cc3813b0fa640b8fe304aeea7ea10b75fa3074d340 SHA512 b8d54115ab45ecc869066e083938a28d075f4436fef33607685e633976843023b3fe4fb65456ba04532f38c4f35b7dc109f68c59c11ad4e73f2332786fee6cf5
diff --git a/app-crypt/xca/files/xca-2.8.0-man-page.patch b/app-crypt/xca/files/xca-2.8.0-man-page.patch
new file mode 100644
index 000000000000..b592e70d3ed9
--- /dev/null
+++ b/app-crypt/xca/files/xca-2.8.0-man-page.patch
@@ -0,0 +1,25 @@
+--- a/doc/CMakeLists.txt 2024-10-15 08:03:24.619608495 +0200
++++ b/doc/CMakeLists.txt 2024-10-15 08:04:23.264026922 +0200
+@@ -160,8 +160,8 @@
+
+ if (NOT WIN32)
+ add_custom_command(
+- OUTPUT "${D}/xca.1.gz"
+- COMMAND cat "${S}/xca.1.head" "${D}/xca.1.options" "${S}/xca.1.tail" | gzip -n9 > "${D}/xca.1.gz"
++ OUTPUT "${D}/xca.1"
++ COMMAND cat "${S}/xca.1.head" "${D}/xca.1.options" "${S}/xca.1.tail" | cat > "${D}/xca.1"
+ DEPENDS "${S}/xca.1.head" "${S}/xca.1.tail"
+ "${D}/xca.1.options"
+ COMMENT "Compiling man page"
+@@ -171,9 +171,9 @@
+ COMMAND xcadoc man "${D}/xca.1.options"
+ COMMENT "Generate 'man' commandline documentation"
+ )
+- add_custom_target(manpage ALL DEPENDS ${D}/xca.1.gz)
++ add_custom_target(manpage ALL DEPENDS ${D}/xca.1)
+ if (NOT APPLE)
+- install(FILES "${D}/xca.1.gz" DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
++ install(FILES "${D}/xca.1" DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+ endif()
+ add_dependencies(${CMAKE_PROJECT_NAME} manpage)
+ endif()
diff --git a/app-crypt/xca/xca-2.8.0.ebuild b/app-crypt/xca/xca-2.8.0.ebuild
new file mode 100644
index 000000000000..9c6ad5666134
--- /dev/null
+++ b/app-crypt/xca/xca-2.8.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit cmake virtualx xdg-utils
+
+DESCRIPTION="A GUI to OpenSSL, RSA public keys, certificates, signing requests etc"
+HOMEPAGE="https://hohnstaedt.de/xca/"
+SRC_URI="https://github.com/chris2511/xca/archive/refs/tags/RELEASE.${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/xca-RELEASE.${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc"
+
+RDEPEND="
+ dev-libs/libltdl:0=
+ dev-qt/qtbase:6[sqlite,widgets]
+ dev-qt/qttools:6[assistant]
+ dev-libs/openssl:*
+ doc? ( app-text/linuxdoc-tools )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-qt/qttools:6[linguist]
+ doc? ( dev-python/sphinx dev-python/sphinxcontrib-htmlhelp dev-python/sphinxcontrib-qthelp )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.8.0-man-page.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DQTFIXEDVERSION=Qt6
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+}
+
+src_test() {
+ virtx default
+}
+
+src_install() {
+ cmake_src_install
+
+ insinto /etc/xca
+ doins misc/*.txt
+
+ dosym xca /usr/bin/xca-console
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+}
diff --git a/app-crypt/yubioath-flutter-bin/Manifest b/app-crypt/yubioath-flutter-bin/Manifest
index 6e06b3f1cc49..cc2e8c573604 100644
--- a/app-crypt/yubioath-flutter-bin/Manifest
+++ b/app-crypt/yubioath-flutter-bin/Manifest
@@ -1,7 +1,9 @@
DIST yubico-authenticator-6.1.0-linux.tar.gz 46363854 BLAKE2B f50f8dc6cdca9044c9c1a0f370cc71d627358038bd00f34bb3801d9b5cc31a5fc904ba817e5ad613c6947c9546691d965e6b373c89e220314747a5eb0321e217 SHA512 e4a63aa40e06ae4cbeee5fc32b749bcc94c9a22b86104ff32e8f94dcd34cf0a0e61e686efd4a21ea8965f37e997f53d452739bb4c332af2387473dccd5b72b99
DIST yubico-authenticator-6.4.0-linux.tar.gz 34381501 BLAKE2B 472de3d5a3a0dc2f604f3626d50850dd28ab1ae70219dff9d98b91005f2899643f1aa2e7ceb9d7019acc42aaa61fad9b14f6adf8465e1cb0a0ad8bbb19872a00 SHA512 a9cb633233ed142edf288483f3e0e109c10fa01cf3639388403983ac8336df7fcd47d4dedfe76c7fa7b35fa643668a06a185fe1ae4875a7e3729db9b738c8f86
DIST yubico-authenticator-7.0.0-linux.tar.gz 46533619 BLAKE2B af77608a7f37efa15464113769bf76fa9e92e99ffb8a459d5b5bb5f5c88e0c023d05f5477774722a4d5933522531ab06e7134fad77ac19af4fc57cff5b7d66b6 SHA512 f9010ff6a6e009ca878ac00a99e3714d1a1b92af4dd22f6568f19ab908dd477635afa187139a46de45d1769a19bf7b0f9d329f678cdaf7e64241f7975b418bd6
+DIST yubico-authenticator-7.1.0-linux.tar.gz 47062304 BLAKE2B 17cd8e09dc18d765cac6e6ae27e74bc2eb658f9dcdba3f26d16ce4156278c0999d57fa4e7ca1d9f4be93d86c2c17be069fea414de05397a619881c9e466b923a SHA512 6c22cf63cb491b1d35ecdedc5028eba0c29e4258bae530f62864fbed4f21c4a156f1bd7feef40bbdcb9f1572097f3ce6895ddd0df38ddb9804a585d64cf9d3bc
EBUILD yubioath-flutter-bin-6.1.0-r3.ebuild 2330 BLAKE2B 9572de2146f97fae7dc0649ece52a1a9e9524f35bc66bcac1843a5c4f9fc48971ed08b50dff3a73f62d8c37b2be9a7052fdcd33a53a50c1b57118964c34f18c3 SHA512 6a4a92991be5a09a04713e3c767ce81b143de40637d8776f8a5bca4cb448eab8f077c0d6e6c6a214087a8e578624238c82719d6bbd1fcbb6df303eb33e8e717a
EBUILD yubioath-flutter-bin-6.4.0-r1.ebuild 2403 BLAKE2B 5d700eeaeb27e86e1716a44a53a1ea2cd8c255b66db7a834d40978f450bcd0407f50b0476e99ddfb290fd958d90938252c3c409a37e8e0c4bd5f0bae478258ef SHA512 9358764e8bfd506c8dc25fceeeed7b10351bb6e94b89bebf82b16f0ec878bfab43f5ce28605c73ffa9159c2d963de95a61883508bd98456aeb56656243bd0345
EBUILD yubioath-flutter-bin-7.0.0.ebuild 2447 BLAKE2B 922f250bc140929ed5d845aac8d9f74c730dffb9b1c82cc7264b12fec9af910ce6c9a936053e6179a7fcb3f6ac2540f1373dc0a1aa8778e9c2b0a192b0bdda30 SHA512 e6785831fb663abda15df67c8d50c6a0201083000bb4701625cc2ebfc3b96e4b76d5243467353a37f315f2323de99f738085bfdd141b33dea4c0507d963f501b
+EBUILD yubioath-flutter-bin-7.1.0.ebuild 2447 BLAKE2B 922f250bc140929ed5d845aac8d9f74c730dffb9b1c82cc7264b12fec9af910ce6c9a936053e6179a7fcb3f6ac2540f1373dc0a1aa8778e9c2b0a192b0bdda30 SHA512 e6785831fb663abda15df67c8d50c6a0201083000bb4701625cc2ebfc3b96e4b76d5243467353a37f315f2323de99f738085bfdd141b33dea4c0507d963f501b
MISC metadata.xml 333 BLAKE2B 7f04bc0877fb881af8d867ef35b9e9998e22be0c69747a2f36e16de3632cf0cb7835483430396244551dcac978021e9281301ebf0bde51a3ae2f022b9a03f354 SHA512 f857a7150979f6a9e93c21ab6a60dcfaf70998021605e94eb486d8db73371c9bcf7f02b80f4b65dcda84ead94fd3641acd00ed78a92e807f57ddd59a78080093
diff --git a/app-crypt/yubioath-flutter-bin/yubioath-flutter-bin-7.1.0.ebuild b/app-crypt/yubioath-flutter-bin/yubioath-flutter-bin-7.1.0.ebuild
new file mode 100644
index 000000000000..d9791c330cb2
--- /dev/null
+++ b/app-crypt/yubioath-flutter-bin/yubioath-flutter-bin-7.1.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="Yubico Authenticator for TOTP"
+HOMEPAGE="
+ https://developers.yubico.com/yubioath-flutter/
+ https://github.com/Yubico/yubioath-flutter"
+SRC_URI="https://github.com/Yubico/yubioath-flutter/releases/download/${PV}/yubico-authenticator-${PV}-linux.tar.gz"
+S="${WORKDIR}/yubico-authenticator-${PV}-linux"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+
+RDEPEND="
+ app-accessibility/at-spi2-core:2
+ app-crypt/ccid
+ dev-libs/glib:2
+ media-libs/fontconfig
+ media-libs/harfbuzz
+ media-libs/libepoxy
+ sys-libs/glibc
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/libnotify
+ x11-libs/libxcb
+ x11-libs/pango"
+BDEPEND="app-admin/chrpath"
+
+# "Modern" app, built using Google's flutter framework.
+#
+# Don't even *think* about unbundling the dependencies, they're all
+# hardcoded into the main binary and the helper, including but not
+# limited to a full-fledged python interpreter that gets dlopen'd, an
+# assortment of python packages, the X11 kitchen sink, random GCC
+# libraries, and OpenSSL 1.1, oftentimes using git checkouts instead of
+# released versioned libraries.
+#
+# The only way to avoid this mess would be to build flutter from source,
+# but unfortunately life is too short to be dealing with whatever is
+# Google's framework-de-jour on a regular basis.
+QA_PREBUILT="opt/yubico-authenticator/*"
+
+src_install() {
+ einstalldocs
+ rm -r README* || die
+
+ sed -e 's|@EXEC_PATH/authenticator|authenticator|' \
+ -e 's|@EXEC_PATH/linux_support/com.yubico.yubioath.png|com.yubico.yubioath|g' \
+ -i linux_support/com.yubico.authenticator.desktop || die
+ domenu linux_support/com.yubico.authenticator.desktop
+ doicon -s 128 linux_support/com.yubico.yubioath.png
+ rm -r linux_support || die
+
+ exeinto /opt/yubico-authenticator
+ doexe authenticator
+ rm authenticator || die
+
+ exeinto /opt/yubico-authenticator/helper
+ doexe helper/authenticator-helper
+ rm helper/authenticator-helper || die
+
+ # prevent rpath_security_checks() trigger
+ chrpath -d helper/_internal/libjpeg-*.so* helper/_internal/pillow.libs/libjpeg-*.so* || die
+
+ insinto /opt/yubico-authenticator
+ doins -r .
+
+ dosym ../../opt/yubico-authenticator/authenticator /usr/bin/authenticator
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ elog "Make sure you are a member of the pcscd group"
+ elog "and the pcscd service is running."
+}
diff --git a/app-crypt/zulucrypt/Manifest b/app-crypt/zulucrypt/Manifest
index f09a267c6258..4875ab89205f 100644
--- a/app-crypt/zulucrypt/Manifest
+++ b/app-crypt/zulucrypt/Manifest
@@ -1,4 +1,3 @@
-AUX zulucrypt-5.5.0_pre20180223-fno-common.patch 524 BLAKE2B 7abdc51e78c112ac8787c16278903e02bc05c7066f03fb2fe821311c6830000b81531bb9bdb19d7ca2d3c91b7d85642c943ed839012f612170a4da7466150361 SHA512 71808d1dce262ac0ccd834c5461e01115d80153f3b4ad6274575bb190e89a64ddb34a3c5c66701c5f2b1a83e1ccfcb495df1772dd1a13c6155b55188acc3cfb2
-DIST zulucrypt-5.5.0_pre20180223.tar.gz 2162535 BLAKE2B 7d098ec20b7f355be6ad863121f7016d6b1ccbcc133438b616cfbd805110b24ae91dc74b0c2daf3137511fcb72e0338663c3c743c6c3d2b761883c57c590c0e5 SHA512 38ea9442a48c02741e11e59759b745ce3d6d6ca5f37d8b685526be76308a8fa1f7db7fd38038e5ce50e2a8afd8740b0a683a3458cb1df6f0b70c41fbf8035c15
-EBUILD zulucrypt-5.5.0_pre20180223.ebuild 1137 BLAKE2B cfe38a307947bfcd58293b2be29e247d542cc03c71083b3a7b63de0b64162d46ef479f5b10e007e660dbc0314cf4e6d6c3eec151aa4c6bd0fc2df39f7c1ffa6e SHA512 94bc993cce3a66663413e43f6bd60e2f12719b472a7ae9eab532b4a709efdaaf2264a15b1ce9ed5f8c8be6e0706acffbbd9694cdc5e4e0ae599b040e4c485e67
+DIST zulucrypt-7.0.0.tar.xz 1159544 BLAKE2B 9ba2aa751f4224a87636993983523d25dbcf23e70bc9dfbe5476cb44e1af8cc1b75ac450f77997fb6e3cf65ec3425d424c325dfdb4e4da9ec39e100e623cff9c SHA512 f131f423da2796d760e4eaa50a7e56e0283bdf6d5e46ff32bd9bf0edc127a087e947e0f7d39fd99fd28cc4566c89cde9e1a85dd67e50e1cb7d6c9de31d7918bf
+EBUILD zulucrypt-7.0.0.ebuild 980 BLAKE2B 4157173c223383fdc90cb231c8b383bf006b95fa82d6f17d6f900b79f820adb3c645a2bb4b43a609debf152b452fc1084ac1a7d12c0fcd9a38ce5a6dbace52a7 SHA512 53450731f29e5f3d8c8ee6c5b8215734cf69a23b374a31ba66166da23c00878ef8533c512ad7d53608253945cead808c8d2de41e631339a5e32c873917209118
MISC metadata.xml 492 BLAKE2B 9caf25777cc4332115a0633a8d48981c407655b1f10b3f7d808079bb1f184c00ef91d9c728edcb60fa94aaed6c6b546d6a90e2b29d4788f68142efe3adda1eb4 SHA512 6e0b059e926329a1ff798e1a4c670d83ad34edb24243bc6c88fb314ca661b7c0c18013f6ad987720f32899bcc761266bd47e55acd3522e396b767f6ce6758869
diff --git a/app-crypt/zulucrypt/files/zulucrypt-5.5.0_pre20180223-fno-common.patch b/app-crypt/zulucrypt/files/zulucrypt-5.5.0_pre20180223-fno-common.patch
deleted file mode 100644
index ea5bcd7a6d18..000000000000
--- a/app-crypt/zulucrypt/files/zulucrypt-5.5.0_pre20180223-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/zuluCrypt-cli/bin/security.h
-+++ b/zuluCrypt-cli/bin/security.h
-@@ -35,7 +35,7 @@ extern "C" {
- * set the function to be called when an attempt to evelate or downgrade privileges fail
- * zuluCryptSecurityPrivilegeElevationError global variable is defined in security.c
- */
--void ( *zuluCryptSecurityPrivilegeElevationError )( const char * ) ;
-+extern void ( *zuluCryptSecurityPrivilegeElevationError )( const char * ) ;
-
- void zuluCryptSecuritySetPrivilegeElevationErrorFunction( void ( * ) ( const char * ) ) ;
-
diff --git a/app-crypt/zulucrypt/zulucrypt-5.5.0_pre20180223.ebuild b/app-crypt/zulucrypt/zulucrypt-7.0.0.ebuild
index 413d47c9f966..46db21703bce 100644
--- a/app-crypt/zulucrypt/zulucrypt-5.5.0_pre20180223.ebuild
+++ b/app-crypt/zulucrypt/zulucrypt-7.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,43 +7,37 @@ inherit cmake xdg
DESCRIPTION="Front end to cryptsetup"
HOMEPAGE="https://mhogomchungu.github.io/zuluCrypt/"
-EGIT_COMMIT="76637bb05af13744bf1734b56f67d6d5cc2343b1"
-SRC_URI="https://github.com/mhogomchungu/zuluCrypt/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/zuluCrypt-${EGIT_COMMIT}"
+SRC_URI="https://github.com/mhogomchungu/${PN}/releases/download/${PV}/${P}.tar.xz"
+S="${WORKDIR}/zuluCrypt-${PV}"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="keyring kwallet +qt5 udev"
-REQUIRED_USE="kwallet? ( qt5 )"
+IUSE="keyring kwallet +qt6 udev"
+REQUIRED_USE="kwallet? ( qt6 )"
DEPEND="
dev-libs/libgcrypt:0=
sys-fs/cryptsetup:=
keyring? ( app-crypt/libsecret )
- qt5? (
+ qt6? (
dev-libs/libpwquality
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtwidgets:5
- kwallet? ( kde-frameworks/kwallet:5 )
+ dev-qt/qtbase:6[gui,network,widgets]
+ kwallet? ( kde-frameworks/kwallet:6 )
)"
RDEPEND="${DEPEND}
udev? ( virtual/udev )"
BDEPEND="virtual/pkgconfig"
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
src_configure() {
local mycmakeargs=(
+ -DBUILD_WITH_QT6=ON
+ -DINTERNAL_ZULUPLAY=ON
-DLIB_SUFFIX="$(get_libdir)"
-DNOGNOME=$(usex !keyring)
-DNOKDE=$(usex !kwallet)
- -DNOGUI=$(usex !qt5)
- -DQT5=true
+ -DNOGUI=$(usex !qt6)
-DUDEVSUPPORT=$(usex udev)
- -DINTERNAL_ZULUPLAY=true
)
cmake_src_configure
}