gentoo auto-resync : 14:10:2024 - 04:04:03HEADmaster

8 files changed, 5 insertions, 46 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index d7d671be6870..edc2dc48f8fd 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/certbot/Manifest b/app-crypt/certbot/Manifest
index 777c257dc58e..9bd5c07a5c55 100644
--- a/app-crypt/certbot/Manifest
+++ b/app-crypt/certbot/Manifest
@@ -1,8 +1,7 @@
-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-r2.ebuild 1626 BLAKE2B 70815019ff06a3021bd457a17da96a715d03667a23dec8feff847585fbc9a8d1705387de1e4733b972c554b80e4235c9fc8f83adfa3e61f72a1c55a9fc76886d SHA512 2583eb6fa2063dd8fb44a7cd9d4756ebbef1ec4db9d17c7ad6969920c2def5ec1bf7269a99eb463485421391ca3267e917e22a153aa6f3d24c2be1bc75997be6
+EBUILD certbot-2.11.0-r3.ebuild 1532 BLAKE2B 0fa348ecdb0750887cfd220ae9d55e147771b8fc503f2c8ee5d1004066ed1d4a3dccd804088271e09005939483871012f879e327ded91a5657a0205b7079ec89 SHA512 52bc685c1ab676c4f4dd96d40b3ea990a90b67a6d3977eca3e8bc3c7448f841d3a943458245ab16f217acb8db23882139d7fe6b871b2781e62d447c65d2f8c58
 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-r2.ebuild b/app-crypt/certbot/certbot-2.11.0-r3.ebuild
index 7787932d9c6a..7762dd3262d4 100644
--- a/app-crypt/certbot/certbot-2.11.0-r2.ebuild
+++ b/app-crypt/certbot/certbot-2.11.0-r3.ebuild
@@ -55,10 +55,6 @@ RDEPEND="
 	selinux? ( sec-policy/selinux-certbot )
 "
 
-PATCHES=(
-	"${FILESDIR}"/certbot-2.11.0-workaround-cryptography-deprecation-warnings.patch
-)
-
 distutils_enable_sphinx docs \
 	dev-python/sphinx-rtd-theme
 distutils_enable_tests pytest
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
deleted file mode 100644
index ecaf4830eb24..000000000000
--- a/app-crypt/certbot/files/certbot-2.11.0-workaround-cryptography-deprecation-warnings.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://github.com/certbot/certbot/issues/9967
-https://bugs.gentoo.org/937889
---- a/certbot/ocsp.py
-+++ b/certbot/ocsp.py
-@@ -4,6 +4,7 @@ from datetime import timedelta
- import logging
- import re
- import subprocess
-+import warnings
- from subprocess import PIPE
- from typing import Optional
- from typing import Tuple
-@@ -235,12 +236,17 @@ def _check_ocsp_response(response_ocsp: 'ocsp.OCSPResponse', request_ocsp: 'ocsp
-     # https://github.com/openssl/openssl/blob/ef45aa14c5af024fcb8bef1c9007f3d1c115bd85/crypto/ocsp/ocsp_cl.c#L338-L391
-     # thisUpdate/nextUpdate are expressed in UTC/GMT time zone
-     now = datetime.now(pytz.UTC).replace(tzinfo=None)
--    if not response_ocsp.this_update:
--        raise AssertionError('param thisUpdate is not set.')
--    if response_ocsp.this_update > now + timedelta(minutes=5):
--        raise AssertionError('param thisUpdate is in the future.')
--    if response_ocsp.next_update and response_ocsp.next_update < now - timedelta(minutes=5):
--        raise AssertionError('param nextUpdate is in the past.')
-+    with warnings.catch_warnings():
-+        # Workaround for deprecation warnings w/ newer cryptography
-+        # https://github.com/certbot/certbot/issues/9967 (bug #937889)
-+        warnings.filterwarnings("ignore", category=CryptographyDeprecationWarning)
-+
-+        if not response_ocsp.this_update:
-+            raise AssertionError('param thisUpdate is not set.')
-+        if response_ocsp.this_update > now + timedelta(minutes=5):
-+            raise AssertionError('param thisUpdate is in the future.')
-+        if response_ocsp.next_update and response_ocsp.next_update < now - timedelta(minutes=5):
-+            raise AssertionError('param nextUpdate is in the past.')
- 
- 
- def _check_ocsp_response_signature(response_ocsp: 'ocsp.OCSPResponse',
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 7d5f9b240dfa..7d3b70d6e733 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 6121 BLAKE2B cc79d597baef996a886bdc33905c5607ca4cae02890801e26e920126bdd55f8c1af3b755c3025fb8fca775ae16f2d2fdeff71617c04db9b1fbe031204f29b71f SHA512 f69da4961e0f66712e790a916be829923a0816b56e37727ee458d65a1cb845e72d5a8e733bec6d07625c9d8769f75098d6de7446fbaeeced6fe54e111ef8594a
+EBUILD gnupg-2.4.5-r2.ebuild 6120 BLAKE2B d1f3a955ef1ec7c03f96a5aaf1ac44314794644b66066b5d816df95c095219a29fad77e87da3cbf4b73ec335b1fcf46339bc38c5ef4843787abcb29496d6f447 SHA512 3d7e0a49fddeb0ae67e4f4ae1c3bffa73706c3ee313afe09ebd940fa3b9720a625be88cf2289c9ea7dd8e3650fa51bd41ca58fa385687477359b4cb34f39f69a
 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 c5d12577d083..61bd51928024 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/pinentry/Manifest b/app-crypt/pinentry/Manifest
index e616651c9c77..3d8a865fb597 100644
--- a/app-crypt/pinentry/Manifest
+++ b/app-crypt/pinentry/Manifest
@@ -6,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 3239 BLAKE2B 0f4327e2ab7d22f9e3085811391ddb2a386fbc87988858e8413faa7d6b3a83a7e0393964b54906c7226aff1d701065a2bb589f1c737c7fd3fab889e257de9899 SHA512 d4451f7abb63babb9117b336917e84d9de4cd59d0b38932448a49d331a460ec7cb74c43de956e812f14575b4e1a4a47193895d3d68f606ee82a9f9162f3b624b
+EBUILD pinentry-1.3.1.ebuild 3238 BLAKE2B 25b8fbe9e5f2dee822577ea29bd801243b5d73a8d3fdf92351deb0c22ae4157cbc3c448c10be081c4029f86a43faa30938bdb16e7c2507ac71023859e8c2da82 SHA512 3e4db45eefcdea948d2a21a67b48831371b0c6eaadce1cff50757d803d6a763aef01ac1d105928eea768c2a9663d6cfaca77510c1993253a69355fb74bd7dcbd
 MISC metadata.xml 344 BLAKE2B d71f184ae783d215e32dc94e346c1f753f158b298cc2df87c14d5b73454ff3b4bf0ce4744d2aa0359bc68cb993cd35d2d6f77a09769853fda5b66e1cc1da3580 SHA512 0ae1c64980d4d94b8bbc04040a17b358b7138bf4022dcd97b6d2c464bc5fac0911c9522bea253586f69c8d137b75fe3e302d7cd9802290c2720c77706d9a935f
diff --git a/app-crypt/pinentry/pinentry-1.3.1.ebuild b/app-crypt/pinentry/pinentry-1.3.1.ebuild
index 4df32837685c..71ae740002b1 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="