gentoo auto-resync : 11:10:2024 - 04:04:14

11 files changed, 44 insertions, 420 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 1e07f4e0cc76..a65a22847706 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index e12d4c509b30..7d5f9b240dfa 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -22,6 +22,6 @@ DIST gnupg-2.5.1.tar.bz2.sig 238 BLAKE2B cd024a63ecb82a12e92444cbff8dbc9bef6a4e4
 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.4.5-r1.ebuild 5894 BLAKE2B a235df7b022acf9bc4d11fa566b7edf39f60dd865802685f5bf68e6df76913589691476a2d48a885816e8aecc2112de14508e44882e43dd3bbefdedd54385a14 SHA512 f621e0a6227862acdab31bb5902e235b8fd5c3e3908be747d5680957d0d55ad5b92ba6a7e2436d1902cd304a40a62fdca8236e67563624bce0b4d683c0364d9b
-EBUILD gnupg-2.4.5-r2.ebuild 6122 BLAKE2B 115526800159d59fce92d2fb68b126ba8cf28b09994a41cd097a53c2afa41af6d1d8903c61fa808f56120242fd1138a752cead4dba20c4035363c573010f28ad SHA512 42fcfca7cdf2ba981b83d758467e31cdbc4cde2bf8778220385fcd2b5ec506ad011aaebdb2c176ee37aa203322fd5f4db642a278bba34e2d511dc41a3e2f7163
+EBUILD gnupg-2.4.5-r2.ebuild 6121 BLAKE2B cc79d597baef996a886bdc33905c5607ca4cae02890801e26e920126bdd55f8c1af3b755c3025fb8fca775ae16f2d2fdeff71617c04db9b1fbe031204f29b71f SHA512 f69da4961e0f66712e790a916be829923a0816b56e37727ee458d65a1cb845e72d5a8e733bec6d07625c9d8769f75098d6de7446fbaeeced6fe54e111ef8594a
 EBUILD gnupg-2.5.1.ebuild 6134 BLAKE2B 59eda7c70745867290e44b8ce5f8c21b1e93a175f6e8096c23a973fdff1aebc2531f0d51870dbdb3b3682a9fc26ef71e171df8a571c8570f2667ae1a2e262f4c SHA512 0b7646838717c57384639ae93b4885982287cc5d9b7e941d1116f9358660b6edd42bbbba37b3ee6c6a0e4a4780a8c53ed98d8a49dbf251e7327f766ddc7eb11d
 MISC metadata.xml 1189 BLAKE2B dae783678abfe0bae095970d96d952f591a569debad411708d29a2f128c6a291b73a33ee0b3491a6a5ec44c11f56d33c1531022e0ef9eaad3326c9cd0f79e3fb SHA512 bc7d6a9ceda213c134d9afc527fe0b0c87a4886a171b7a1e1f662f3978fec5e71323bae4c9f3882e1d763d5738446f161265070a8e513a59fa62ef0f792e9fa5
diff --git a/app-crypt/gnupg/gnupg-2.4.5-r2.ebuild b/app-crypt/gnupg/gnupg-2.4.5-r2.ebuild
index 25adbec972b4..c5d12577d083 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/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 8964412310f0..dfe471ddde4a 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 6061 BLAKE2B 1d50f35f569adeb6e77fc36a989dfff1f2ff50fe1b6353dc5530331da7678b6a11e21cf22e34efcbd5774465c65b73ab81e098c6a4f98d17528a605855bb0ed0 SHA512 512fb2564c2790bfb2388581362ecd37777668c7e1f589ba31abaefea0b72d6eb3020098a29ae802bb92a01df154cef5089a0ff29c1423853501563d4d7d2ee3
+EBUILD gpgme-1.23.2-r2.ebuild 6060 BLAKE2B 92b1de2b827e6a405a642ca79e2027c57919a32b39bc59e9f08c7f8a880cb6c39564e478d4f3ca462f5bb79a3df6e1a11c6d8f1ff39752ebf292a15456f6f30b SHA512 6045df3e0909558413ee487cb00da54fbe97b1dd74edfec31ba426abc50ca5e353e54c55edc2352557337824be69011f2dc1ebc7524aa18c6b31e5fa41d2ce59
 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 4f49af966171..f8f363937a07 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/keysmith/Manifest b/app-crypt/keysmith/Manifest
index 7ec51820268e..bbb01dedee90 100644
--- a/app-crypt/keysmith/Manifest
+++ b/app-crypt/keysmith/Manifest
@@ -1,5 +1,7 @@
 DIST keysmith-24.05.2.tar.xz 171756 BLAKE2B 5059579e9529f834814a3f586dbab5aad1a5235759c0fa76a7c7cf5588bb3b2fd64ca381d0d749d88cf74446ca5a380cb6f49eebe005e34a6f184e3f8fbcf7dd SHA512 fd2964b4fc754ac71d5fc2b273e2e70671f4b8a4cdf95e340ade20a234d7ddbfc81e0a6bfbde3178b49ba94b3219a2e1169903eac4d707b1f130df7ed7478f77
 DIST keysmith-24.08.1.tar.xz 171424 BLAKE2B 79f3f12c533245749e17c98e6cc4c3f7856d393b4a01f208b611a7ba354145c3c44d93a078ed1728e592c62c4b05783870da1b643ddf74ea06f1f2d08801b1ec SHA512 c1386053249c65c626a5c2d2a84c7a036a4b702c5fd240217f5bc26de55e6eadcd0a7e3235a0a949dc8862fc96400fb3b8d26da476dc9d0e89969bdaea6079cc
+DIST keysmith-24.08.2.tar.xz 171436 BLAKE2B 0baebcfed7b9fec5d68e5801bef5cb092d8f99cefa00cdae866670708506cc098e4e4a8a4157952df59bcdd4a3f5a393c15d2f22c7999cb47632bba333ef1daa SHA512 5a39d50189863eeb527a7dd36e904ecde31b1b2c0eaa2684ce1c95cd0a215030a6a37227023e0478ba6e5309d18f4480755118bb32aa089341464b354b23b507
 EBUILD keysmith-24.05.2.ebuild 847 BLAKE2B 107bbe4cff40031a7f77d1772691e4ca274460074192aa7cde08e590d1e480ec939781a7a83c7c1bf5da2b4eba91881c516fc6f4ce4630207d49552964852e8b SHA512 7cfd1b29ddf09348e7e72015dc4ac75502267e5bba9e05775ff62792180fef37f9804b5b6077e2e692648b56548c058bbacb91c9dd340aae7c55d5d9bd299492
 EBUILD keysmith-24.08.1.ebuild 849 BLAKE2B 729d061e7b663e632490103ca606971dc5a2e042c371c573c50c6ed778a4a08edeb3894b4c7e1b597a94c9ec0ae6684ffb5e83d202594ca28a1fddfbb0c3b26b SHA512 a91a0f938a3a1d746fba7c2f459e56b54a438ee206208e01d184c5c1e388ff8ddf3f29c662eabed40631e443d678dc96cea4ecbbc7c41d3f9db80c92704ae8dc
+EBUILD keysmith-24.08.2.ebuild 849 BLAKE2B 729d061e7b663e632490103ca606971dc5a2e042c371c573c50c6ed778a4a08edeb3894b4c7e1b597a94c9ec0ae6684ffb5e83d202594ca28a1fddfbb0c3b26b SHA512 a91a0f938a3a1d746fba7c2f459e56b54a438ee206208e01d184c5c1e388ff8ddf3f29c662eabed40631e443d678dc96cea4ecbbc7c41d3f9db80c92704ae8dc
 MISC metadata.xml 380 BLAKE2B 110b310586031ac53056b1502648607210ee0256858efee1d54e756e130b4e331202f8571c96f5064ccee7d63bce9c4af2b92c40389d2c7b06a4fad70be8656d SHA512 10365587bc7347003e99f0684c92fa7c7154576643eaee09e79b1bddf5aed12b6062dc426b07343c6cfbcd423ab3e77e245b3659919f75e4a4183fb56fa2fa0e
diff --git a/app-crypt/keysmith/keysmith-24.08.2.ebuild b/app-crypt/keysmith/keysmith-24.08.2.ebuild
new file mode 100644
index 000000000000..592cdbe13527
--- /dev/null
+++ b/app-crypt/keysmith/keysmith-24.08.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_CATEGORY="utilities"
+ECM_TEST="true"
+KFMIN=6.5.0
+QTMIN=6.7.2
+inherit ecm gear.kde.org
+
+DESCRIPTION="OTP client for Plasma Mobile and Desktop"
+HOMEPAGE="https://apps.kde.org/keysmith/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	dev-libs/kirigami-addons:6
+	dev-libs/libsodium:=
+	>=dev-qt/qtbase-${QTMIN}:6[gui,widgets]
+	>=dev-qt/qtdeclarative-${QTMIN}:6
+	>=dev-qt/qtsvg-${QTMIN}:6
+	>=kde-frameworks/kdbusaddons-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kirigami-${KFMIN}:6
+	>=kde-frameworks/kwindowsystem-${KFMIN}:6
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+RDEPEND="${COMMON_DEPEND}
+	>=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
+"
diff --git a/app-crypt/pinentry/Manifest b/app-crypt/pinentry/Manifest
index 4d6df316cd97..e616651c9c77 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -1,6 +1,4 @@
 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.3.0.tar.bz2 610363 BLAKE2B a55b80754ef37d18ebdf0bd50e134a7b1bf6362b859b7069a9e4ebd86cd7e733d51f3c21a16779a18aa0d0dfab1f7a3df070d4f7e39e0840339078c4e9cb58bc SHA512 1bbac81c6811cffc8969a46494e6daa6b8447802f47ff6fa3e4dc9ac244cf6e5f629834c9b6a60770d06bff6c9932ad4059f10d2fdf93fd9e26fd5d21c0e3732
@@ -8,5 +6,5 @@ DIST pinentry-1.3.0.tar.bz2.sig 119 BLAKE2B 0f11126761b2a06f8b08cf971f5d610cacbd
 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.3.0-r3.ebuild 3279 BLAKE2B c826ee93f01b381099a75c43e51e447b1b1a765800920bca8bfa5b5e70bf27c4392ab0f4d05ac038e3d2bd562be47c99d1e035ca579b3b211e0582913cff2f0e SHA512 9e68a2bed1af980e4247e1c86357d0c40767eb38c09d8177b8180956d58563f861baff114047a6d3d69702175cfc9e0f0505c6f0f61a10b49e6840d79c698a3f
-EBUILD pinentry-1.3.1.ebuild 3240 BLAKE2B 40dd8c94e06391e9b1dc2d08de3eb5e12677c00c255afb6093ce8b61d6909516d6d23ad05a33ff057a636ab078539377d2b9fa22181daa1e18f73ad52517a68d SHA512 7511dd7a0dccd0b7cfa3083e9c077086a608b75fe76909da141a9ef45e4a837bbfa71375cec08f4dd5cf2b15d9268e476bb02427603fb93194a1e0f481f8506d
+EBUILD pinentry-1.3.1.ebuild 3239 BLAKE2B 0f4327e2ab7d22f9e3085811391ddb2a386fbc87988858e8413faa7d6b3a83a7e0393964b54906c7226aff1d701065a2bb589f1c737c7fd3fab889e257de9899 SHA512 d4451f7abb63babb9117b336917e84d9de4cd59d0b38932448a49d331a460ec7cb74c43de956e812f14575b4e1a4a47193895d3d68f606ee82a9f9162f3b624b
 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/pinentry-1.3.1.ebuild b/app-crypt/pinentry/pinentry-1.3.1.ebuild
index fa9064e3c4d7..4df32837685c 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="