gentoo auto-resync : 13:07:2023 - 22:35:45

5 files changed, 28 insertions, 3 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0d41d09abde6..029494caea45 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libp11/Manifest b/dev-libs/libp11/Manifest
index 3e913f74ebd4..e2d368b218b4 100644
--- a/dev-libs/libp11/Manifest
+++ b/dev-libs/libp11/Manifest
@@ -1,4 +1,4 @@
-AUX libp11-0.4.12-openssl-3.1.patch 961 BLAKE2B 01aae650ec002a7fd1d70cd41953138f7ca8be5168e626530db8e78c85aa2681e8f2bb61e5811a2a5cac116d22cfcfd102736554bb53719509f81e20ac9decbe SHA512 018d026b56bb50219c7b946dcbdee8aaa91f7d48cfdc595fd46a5250ff1a9f9766fd5dd4f97261ac9adbb109b78023971b97bbd42a6533f0a43bb7d437924824
+AUX libp11-0.4.12-openssl-3.1.patch 1969 BLAKE2B 94f516348da3e76a07923dcfff46e0c0ffd8bcea4e58eda75a7d753dd09a1d14d6357ec369630afec7007ccc2638c44cd714d769c3eccb4aef398ebd88cd01b3 SHA512 90f426ff7b817f335c0eac38f167ded3be1c0033ffd38ce87dbe5843d2ad2e43327ea613760fec5c86c9a7a39860787c9997506fd4a8d464cdabfe7388520342
 DIST libp11-0.4.12.tar.gz 516414 BLAKE2B a816749984753a1916dd58860c51b49d316946b59eb3bc839f6a21dcff14de48d7a4937f55fc7ad96a26b914591854d5cf11a1fbac2d5f2f5e04c833973c0e42 SHA512 674cfca2c9eaf162262204c94f9d59d3095dabbc348c1842e758b897e1a5bd4ba08b2d589ec3b2a2d1343a8760eab253e7008dc09ef5b499e2f16385efe5c8cc
 EBUILD libp11-0.4.12-r1.ebuild 735 BLAKE2B 345d0b033c53d9842e47be807ecf22b382da1b96b2a258ec7163f5924489abad6ccdd6499b1831868ab8fb7b3201056ec2483c90e5d82795953148a00c44bd34 SHA512 247b4fcd656d60866ec9a3d6d361cb0a16b35b70b4aef696937cef4c5133aa69cac626b1ec10cca1396e5d1214933b53ab81d27c672f226430f3ac554b605c7f
 EBUILD libp11-0.4.12-r3.ebuild 932 BLAKE2B 9d9d3a6cac738ff4d46d949c906d365a5a54c1bd319258e84eafeccf6300c0fc74460af916cb7986dbd8e492cb8b9f104112ea66efd0f3ce219013f762066f13 SHA512 ca823dadd68bcbf859c807ac538edc629cd8b1acc2075b1037cf9537fd728847ddf87211f2be6113b5286c11461ced8a656b0e4e3872075c092ec49e384b4f6c
diff --git a/dev-libs/libp11/files/libp11-0.4.12-openssl-3.1.patch b/dev-libs/libp11/files/libp11-0.4.12-openssl-3.1.patch
index fbc7cf9d64ed..f7f148e07e1b 100644
--- a/dev-libs/libp11/files/libp11-0.4.12-openssl-3.1.patch
+++ b/dev-libs/libp11/files/libp11-0.4.12-openssl-3.1.patch
@@ -23,3 +23,28 @@ index d6b0ee91..b96979d9 100644
  	    LIBP11_LT_OLDEST="3"
  	    debian_ssl_prefix="openssl-3.0.0";;
  	1.1.*) # Predicted engines directory prefix for OpenSSL 1.1.x
+From 0697773b403efb8e7fa9f0c0fddcb499fb9b6337 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 13 Jul 2023 13:52:54 -0400
+Subject: [PATCH] configure: treat all openssl-3.x releases the same
+
+OpenSSL's soversion will not change for any 3.x minor release.
+
+https://www.openssl.org/policies/general/versioning-policy.html
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index b96979d9..c344e84a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,7 @@ AC_C_BIGENDIAN
+ # issues with applications linking to new openssl, old libp11, and vice versa
+ case "`$PKG_CONFIG --modversion --silence-errors libcrypto || \
+ 	$PKG_CONFIG --modversion openssl`" in
+-	3.1.*|3.0.*) # Predicted engines directory prefix for OpenSSL 3.x
++	3.*) # Predicted engines directory prefix for OpenSSL 3.x
+ 	    LIBP11_LT_OLDEST="3"
+ 	    debian_ssl_prefix="openssl-3.0.0";;
+ 	1.1.*) # Predicted engines directory prefix for OpenSSL 1.1.x
diff --git a/dev-libs/newt/Manifest b/dev-libs/newt/Manifest
index 49a57f1d20b1..38177f0dfe01 100644
--- a/dev-libs/newt/Manifest
+++ b/dev-libs/newt/Manifest
@@ -3,6 +3,6 @@ AUX newt-0.52.21-python-sitedir.patch 954 BLAKE2B ed2a504cc2e2c06200e209fdf55e9b
 AUX newt-0.52.22-gold.patch 477 BLAKE2B 32145a4fc83d9ed91712ae5d90ef3409593bf911d078e81c9443081432f0f0ae73e9b1c1f7692d344db521d794f5ad2b4b1c0fe0c9d0f2e0cc8a16701efbdd31 SHA512 16ddc925c34dd128e5168e7a9be2653b5488635929c91229d1a12e71a2fe0be0755263ff68ca23e45b1296ec994cddecf1ed7fffe33453fe0971be82df60f19d
 AUX newt-0.52.23-gold.patch 472 BLAKE2B 07753aa346032369a17030fa883d4c08e340c5510625211acbeead0f0d5143914d0935affdf47aed36ec3607da6f7c7b8849ee92292730e4578e87b47c92870b SHA512 518f257ff913bd2467cf34a0dc0e26ec9ff430bc1aff939044055805c79addede1c58de32097248724ca2a8c247690e173eb87c1c5144bb161eb6db52f7ac845
 DIST newt-0.52.23.tar.gz 128884 BLAKE2B 283809ac259475588b2f277e6c14ddc2981204f8d6c4963aa9ca7bf87376d2025e9edcc3194804bd6928f75deef706758e1868ba730fd06856ed0a95e534be00 SHA512 8040b01178311532c31642daae5bffc9c0f1917d28957164a02b3f5bd402e6561ff6faee75a936f72485eb71004238ede78c1973a970451fb5aaccff231887c7
-EBUILD newt-0.52.23-r1.ebuild 2193 BLAKE2B 273304d28020888f6885ca0092cdbf2bad08353a0ced4d3c6f2cc34243d7e663e535eb9d7b9c640b4a37c6ee6b4b2b5974d709cb4cac9e491372784d3846faa1 SHA512 4f1d8fec2c0fc971459b14760c8f814d803fe023dea221c48dc84f615dc28047f020c48a416bc20e5c94203949ad77c1bbc494e16e2c8b0261117da5e8d2d926
+EBUILD newt-0.52.23-r1.ebuild 2190 BLAKE2B b12a5682a447bac785ad422a5745bb19713252061f08a03b6a336f943255e221eab29d82c9824ec7230e59dd19883c3d96f0f65474ddd885d68b53237a29a5a0 SHA512 29c039bd7869cadf4eefb7627d5d61c41da2c629a8f9928faf27bc5138da8e19e9f141c405488a0b3572b472731198ab50db2f50038fde79f89c629acfe0e99e
 EBUILD newt-0.52.23.ebuild 2226 BLAKE2B 6b8b2106e3f700dafc1c522aec02d3868c36a5107ee9282634f68d085aac6bbb2e98a759ba8f7bdda2e42f47df7cc96489854327641d05545ec1f351dacfeb04 SHA512 cc9f67a888ab2e25f196349954af19e7e29fd838fdd904df148ca2070f3970a8a978cd1d78773325fcf5667b55207d96bafc146daa2ace96f1007f03763895ed
 MISC metadata.xml 333 BLAKE2B 5c5dc4580c21be4e57fd230e26cf7d9c79600b93f3f6788ba16b3f389c62a26c51a393a2d0147990492559c1b3fcc94751d7d8ac493f72e45efcedb152d2dd1f SHA512 34bb99d390ae88dbefde06ed990f5da92db8805fa7c2cd73ac86e651cbc14dbc6c8e00496ff1f38aee6c9c14ac654385bc41aa26020c63c49d39213dd5a0b9ca
diff --git a/dev-libs/newt/newt-0.52.23-r1.ebuild b/dev-libs/newt/newt-0.52.23-r1.ebuild
index c5cadd071212..d7f82ed5ca2f 100644
--- a/dev-libs/newt/newt-0.52.23-r1.ebuild
+++ b/dev-libs/newt/newt-0.52.23-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/mlichvar/newt/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv sparc x86"
 IUSE="gpm nls tcl"
 RESTRICT="test"