gentoo auto-resync : 23:12:2022 - 07:58:50

6 files changed, 12 insertions, 5 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d22bdb8357ab..2b12ea946f56 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/openssl-compat/Manifest b/dev-libs/openssl-compat/Manifest
index 2383a8c8a0d3..8208ebe5d2cb 100644
--- a/dev-libs/openssl-compat/Manifest
+++ b/dev-libs/openssl-compat/Manifest
@@ -8,5 +8,5 @@ DIST openssl-1.1.1s.tar.gz 9868981 BLAKE2B ecd19eaf84dbc80448b51651abe52a89cc005
 DIST openssl-1.1.1s.tar.gz.asc 858 BLAKE2B d95f0f80d460feac737f84ed629c45aaf5e453103ef202ec7d33cf33b89ad83a9007429433b10754b725d7963b1960e350b64e8bdfe569ad149e26bef462eeca SHA512 aa6e5e940448297a90c46ba162f8e6ee324c2e202a9283328c31f996dc2259dd9f5f981d94d1cf1dd3cc73c44647b473602dacb857b9719bf066931b43b899e6
 DIST openssl-compat-1.0.2u-versioned-symbols.patch.gz 24633 BLAKE2B 6bfad4ad27dbca0bd85bfd9521ffc844c3e93e6a1cca7c814edd49affc60ece1c706dd3aa7be2ce80857532531eac6f0f03f43c0be22a769d00d9241686eff71 SHA512 3d85aa34f2491e0e36eedc45829709e0fb552f6d558c2726b59dafa98c3e679b88497f3f7399d7565d88e727591e7d9b12f5b1e27116ba19b9a661d7f75b07a9
 EBUILD openssl-compat-1.0.2u-r2.ebuild 7794 BLAKE2B 292aa0999be2c173b86b9324a8e1e73fd536b38af5106d09d776931c8a170808ddf976536d7f88398260e1cda58945fe747255a8f3c2d4432ab4e8ca139e83a4 SHA512 271767ff717c9324a34c3ae1964a6a428f83e97d002be6df797cadc809768a198ab090cb313e5aa3bc9fd22d029f2cf17c3612f51e154e140a552bfdf9cb55f2
-EBUILD openssl-compat-1.1.1s.ebuild 7672 BLAKE2B e57cd370b40e51c7760210991ac26ee5a83f8c237dda83d2ffd674eafbd78a256ad162151832dfa219a56edabaf21708c6cf1c66f74facb18a104f680667974d SHA512 8e9ea75d023cc9321d6499bfad17ab2537c26d969656f8df2530aa36e2a6de2b13b949531366a8a5e6579a3008f786e713e15f0886b7b7179459cd8f46a55b75
+EBUILD openssl-compat-1.1.1s.ebuild 7760 BLAKE2B 6764b4c114772b49fdb24a1102d9ac53f6c6e93ef265d7f251f78a67ab8a8dfebaef9555e9ede3c882ad6f26eef2cc0caba5dd2ad2fd51018f168fff94919091 SHA512 e0cdf8b85b6932ca54c8aeafd7e5f30309fb378a656773badcbc381f9ac43d0df2fe9bc4885566224394a46fdc054b289eefd9f30e4852a8e3bf3831341943fb
 MISC metadata.xml 1223 BLAKE2B db6fe704a4a09590821cd011556759cfd60543fd531fef3bd233378f396ac5e67c7d834eee4e544995c3af02dc9f222ac787e0b8a1c48a6cadd06541c81372fb SHA512 3cd0b3d8ba2c2c31d3240a080c0edf61a3b090adb4bb14c3b79c9cd1f0c0ac332a9c9457b218a09fb9192cc82004dba57cd4cac404fdd5ddfe4f0c7780b596cd
diff --git a/dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild b/dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild
index 7f129274d627..e95f60fc6006 100644
--- a/dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild
+++ b/dev-libs/openssl-compat/openssl-compat-1.1.1s.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
-inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
+inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig linux-info
 
 MY_P=openssl-${PV/_/-}
 DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)"
@@ -54,6 +54,9 @@ pkg_setup() {
 			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
 		fi
 	fi
+
+	use test && CONFIG_CHECK="~CRYPTO_USER_API_SKCIPHER"
+	linux-info_pkg_setup
 }
 
 src_unpack() {
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index cc016e4404c0..bcdef0c27735 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -16,7 +16,7 @@ DIST openssl-3.0.7.tar.gz 15107575 BLAKE2B 141881071fa62f056c514e7c653a61c59cc45
 DIST openssl-3.0.7.tar.gz.asc 858 BLAKE2B bd07a6f656cce817038743caf1131ef8d7a21bf587e706e32771ad9e09cb4821d21b71171a7fe7bb6bece95e9b06cea6d723aae9de8b62049b5a8316578500be SHA512 9093a8a5a990f5f37bd95e7ca55f2371e59242be408ea7d9403bcfc9c8873c022237e13c0ec81881a20607ea46927887a895a82b6f50c6f423b4c54f9ef0cde1
 EBUILD openssl-1.0.2u-r1.ebuild 9980 BLAKE2B 0017b72acb2eb86f2927845903c93aacfc9c2812ecc5dd5daa23ffc6dd961a4258181ac2c085798b228df5aa23fff2faf476f880406a7c0eeecde3a8391d6a11 SHA512 7aadb788732ee4dbf32ba34567c8ffc897354ac4028f26ec60fab8f099a445c494825bcaad7a5bc053a1ca3f70bfc0f9e944cce5a4051708555cae24c6c5b9a9
 EBUILD openssl-1.1.1q.ebuild 10190 BLAKE2B d43cbde3d6b34a33f7937b59d0a2770290cc342ff664796bca1c546d2a70ba609d0d8f035c1cf2d8f339bcd82ab651e970a5d9ee55a2a6734a2e17b7187aff59 SHA512 47e480e4344753939cd8f64c1e7dd36eed12b8568cc18dd9691bb4d231088d2f77d1ba5fb79f2f9f3ec18b3bb8fb9c118bbb716af91d0023fe920fc968f081ee
-EBUILD openssl-1.1.1s.ebuild 10156 BLAKE2B 1748ebcd3c309783f794c7edebc8e1ba4d815f7381689c6d38c7dd3c740c3e6cb8298695df5873c075e987d3cfd7f2b5af42103304121392ec3bbdfd6e44976d SHA512 1dcbaac82562127fbaacd5afad73970474fdf90d4bc9d248ef41a703764a402d55f6919b67e860b179eda35642c4553e575f4af89f1dab3781e401205e39f071
+EBUILD openssl-1.1.1s.ebuild 10244 BLAKE2B 8718b01b9426b4ca51d5e4afbe531755ba1542ede77d5038f6cc9a5f42abd27c0fccb5d713afb408d6092caf8c0b774a96dadda918f07900be0c7f4f76fbd47a SHA512 72fe25bc58d23ba2a31cbf137a179ae8477a084fbf1ada28cd878fd1958dce891ee3b8fba7d31ab10e623f202b49d96779d6e03f9761c73c77c6d5d8a25dafd3
 EBUILD openssl-3.0.7-r1.ebuild 9867 BLAKE2B cf5c11fb8f3629e708fe973ce4a8347ab8d04901e625e34ff55be93307ce3f5c3214a2efaaf7d475638007ab6bc21ea7b895d701a8574f877e285cc87fe020a4 SHA512 df9cc24b08cab21f607eed16aed95a82ba491d5368f29fa74296082955a612900fd3284a7bece408a95a3346a5aeb0bbb162a6d64bbd01abc8ebde75395b4f47
-EBUILD openssl-3.0.7-r2.ebuild 10063 BLAKE2B f013be422b4aa7c08c7ad0b64977b7bdb08ff8c3624fd31debfb85739e99d857c23823bb3f4bcdacf861567ead68c7d5c64cdf2fd2fae77b98fcb4463457f292 SHA512 66e377c6a59deb1524859ee3b220b898c0ac2daed3c15a79d992e324e0b10dff3c7bf145fb7e325a6b1aed6caf29b9fb220e46939ee0357fa208832a68b9785c
+EBUILD openssl-3.0.7-r2.ebuild 10121 BLAKE2B 2f3129b1f077c15a2108c9316a702786cdd0d73eff57e53963d506d846bb509b0a76f419164bec65038c5db2dd9dc22890a24890e43926c391cac4053245d029 SHA512 b76e62dd36d16566c80ad02ed65ab5022ab7f2be7b618a163aff6fb9060064af503b8dc5c863148070c08f9ac6e62ee3f884169ae68de1d5b8640e13e17d2a0e
 MISC metadata.xml 1664 BLAKE2B cf9d4613e5387e7ec0787b1a6c137baa71effb8458fa63b5dea0be4d5cf7c8607257262dbf89dcc0c3db7b17b10232d32902b7569827bd4f2717b3ef7dffaaa9 SHA512 01deef1de981201c14101630d2a4ae270abcac9a4b27b068359d76f63aeb6075aceb33db60175c105294cb7045aae389168f4cf1edf0f6e3656ccc2fe92e9c92
diff --git a/dev-libs/openssl/openssl-1.1.1s.ebuild b/dev-libs/openssl/openssl-1.1.1s.ebuild
index 3bfa37a91882..a47367ffab4c 100644
--- a/dev-libs/openssl/openssl-1.1.1s.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1s.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
-inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
+inherit edo flag-o-matic toolchain-funcs multilib-minimal verify-sig linux-info
 
 MY_P=${P/_/-}
 DESCRIPTION="Full-strength general purpose cryptography library (including SSL and TLS)"
@@ -61,6 +61,9 @@ pkg_setup() {
 			die "FEATURES=test with USE=sctp requires net.sctp.auth_enable=1!"
 		fi
 	fi
+
+	use test && CONFIG_CHECK="~CRYPTO_USER_API_SKCIPHER"
+	linux-info_pkg_setup
 }
 
 src_unpack() {
diff --git a/dev-libs/openssl/openssl-3.0.7-r2.ebuild b/dev-libs/openssl/openssl-3.0.7-r2.ebuild
index 17ccd678b293..3ce576abc93d 100644
--- a/dev-libs/openssl/openssl-3.0.7-r2.ebuild
+++ b/dev-libs/openssl/openssl-3.0.7-r2.ebuild
@@ -63,6 +63,7 @@ pkg_setup() {
 			CONFIG_CHECK="~TLS ~TLS_DEVICE"
 			ERROR_TLS="You will be unable to offload TLS to kernel because CONFIG_TLS is not set!"
 			ERROR_TLS_DEVICE="You will be unable to offload TLS to kernel because CONFIG_TLS_DEVICE is not set!"
+			use test && CONFIG_CHECK+=" ~CRYPTO_USER_API_SKCIPHER"
 
 			linux-info_pkg_setup
 		fi