10 files changed, 7 insertions, 63 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 021305dce43c..1e07f4e0cc76 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 55c12efb7e98..777c257dc58e 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,8 @@
-AUX certbot-2.11.0-workaround-cryptography-deprecation-warnings.patch 1795 BLAKE2B 1c518f3e5a541f6e4e43e07db49d5e7e167fb492fb5820d8edacba10f2be8654b3941e1e2eaca274a65c9d00d16216fd6e8d10e3ef6701218186cd6e6a69cc57 SHA512 f98d83618ec89abe5a7a391ece39eca7d80155cf36441525190a2eb8a4c329b2d528d78685f8535490e89e5ca63179f394c8d6712c1df3194bddc242e9e0f700
+AUX certbot-2.11.0-workaround-cryptography-deprecation-warnings.patch 1808 BLAKE2B 820deddb0b7a87f6b03f4d419de1275ea2472e3ffc49ad1cb16ad32b0abfb74202ec9b3d518cf8477c5e4aafdc80379a8a1b966ae2f7668f1d111d77d249d5d6 SHA512 0cf47a53473292c5e304c320718d66625121cf9b7ea48161835d4449b0039ca0083d831f1ab55bdee60527c5a4128af05c7aafcb239456c1b1af31b289e03dc3
 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-r1.ebuild 1626 BLAKE2B 70815019ff06a3021bd457a17da96a715d03667a23dec8feff847585fbc9a8d1705387de1e4733b972c554b80e4235c9fc8f83adfa3e61f72a1c55a9fc76886d SHA512 2583eb6fa2063dd8fb44a7cd9d4756ebbef1ec4db9d17c7ad6969920c2def5ec1bf7269a99eb463485421391ca3267e917e22a153aa6f3d24c2be1bc75997be6
+EBUILD certbot-2.11.0-r2.ebuild 1626 BLAKE2B 70815019ff06a3021bd457a17da96a715d03667a23dec8feff847585fbc9a8d1705387de1e4733b972c554b80e4235c9fc8f83adfa3e61f72a1c55a9fc76886d SHA512 2583eb6fa2063dd8fb44a7cd9d4756ebbef1ec4db9d17c7ad6969920c2def5ec1bf7269a99eb463485421391ca3267e917e22a153aa6f3d24c2be1bc75997be6
 EBUILD certbot-2.11.0.ebuild 1532 BLAKE2B 0fa348ecdb0750887cfd220ae9d55e147771b8fc503f2c8ee5d1004066ed1d4a3dccd804088271e09005939483871012f879e327ded91a5657a0205b7079ec89 SHA512 52bc685c1ab676c4f4dd96d40b3ea990a90b67a6d3977eca3e8bc3c7448f841d3a943458245ab16f217acb8db23882139d7fe6b871b2781e62d447c65d2f8c58
 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-r1.ebuild b/app-crypt/certbot/certbot-2.11.0-r2.ebuild
index 7787932d9c6a..7787932d9c6a 100644
--- a/app-crypt/certbot/certbot-2.11.0-r1.ebuild
+++ b/app-crypt/certbot/certbot-2.11.0-r2.ebuild
diff --git a/app-crypt/certbot/files/certbot-2.11.0-workaround-cryptography-deprecation-warnings.patch b/app-crypt/certbot/files/certbot-2.11.0-workaround-cryptography-deprecation-warnings.patch
index b0d59594d03f..ecaf4830eb24 100644
--- a/app-crypt/certbot/files/certbot-2.11.0-workaround-cryptography-deprecation-warnings.patch
+++ b/app-crypt/certbot/files/certbot-2.11.0-workaround-cryptography-deprecation-warnings.patch
@@ -23,7 +23,7 @@ https://bugs.gentoo.org/937889
 +    with warnings.catch_warnings():
 +        # Workaround for deprecation warnings w/ newer cryptography
 +        # https://github.com/certbot/certbot/issues/9967 (bug #937889)
-+        warnings.filterwarnings("ignore",category=DeprecationWarning)
++        warnings.filterwarnings("ignore", category=CryptographyDeprecationWarning)
 +
 +        if not response_ocsp.this_update:
 +            raise AssertionError('param thisUpdate is not set.')
diff --git a/app-crypt/debian-archive-keyring/Manifest b/app-crypt/debian-archive-keyring/Manifest
index 18ba8e02e77b..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 592 BLAKE2B 7b9b064d30b243e54c0c318527c0c975304e7efbe438e12538dd618b4a5e39d710357254d718e3a76e4925e3708de8ffd3ecb3d4e08d007048c41ea8c3bf70e2 SHA512 8bfd2f4ebc4458b2d5f1188cb154ef53cc31eb485aed73ae9ddcf8c721628691a1d346cd692c0ba646d83da38cc308f5aabe7f4eb1830f619638ef073412e316
+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 0b3b3cb4c158..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
@@ -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 ~loong ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~x86"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/app-crypt/gpgme/Manifest b/app-crypt/gpgme/Manifest
index 42e128beb73e..8964412310f0 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 6062 BLAKE2B e85dbe00c7f904517b16fbfa8588dc8de17429a305901989eb5d2c7d5bba40149386f2e23e5ce5f5dcb015dfbf910318b45457ad56a4ad4c72b625ce8c8c0ea1 SHA512 9b8be0924036ae25be795537d80b109dd948deb1c9b3940de914e5f0eb654fcaf230c4ffeb085b081ee2ccd6dc16b8fcbcbc8e2dd211169ab2d392aab786f557
+EBUILD gpgme-1.23.2-r2.ebuild 6061 BLAKE2B 1d50f35f569adeb6e77fc36a989dfff1f2ff50fe1b6353dc5530331da7678b6a11e21cf22e34efcbd5774465c65b73ab81e098c6a4f98d17528a605855bb0ed0 SHA512 512fb2564c2790bfb2388581362ecd37777668c7e1f589ba31abaefea0b72d6eb3020098a29ae802bb92a01df154cef5089a0ff29c1423853501563d4d7d2ee3
 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 01a66f79eafe..4f49af966171 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="