gentoo auto-resync : 23:08:2022 - 20:45:29

2 files changed, 10 insertions, 5 deletions

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 60a565945a74..55fc516bdfff 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -4,12 +4,12 @@ AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a
 AUX nss-3.68-ld-fix.patch 1059 BLAKE2B ea449bf15d603e970468f1349a32804403036300c33bb77909d9752f069b2b8bc5bb3ddc3da286b5f0d4f3901c990af6ad308f7b5523103e35d72cfe18e031c2 SHA512 b3f39cb0c9d91968b3dd45fbdbd4de841e17e9b97790c574d8dc6a43e8fa59f3add77125c1117092d4600ea6a89659b0a8a26ff00cdb92165d107f47372ef862
 AUX nss-3.79-gcc-13.patch 1058 BLAKE2B d0249304f09fdea7e391732e7da63344c3e29c1856cb5ddb9e55a27305ab050077d138d9a8fdfbd6573bd7e7a345ed39f506e534464c3caaae925d1717b75edb SHA512 24dd41401b44ce86498a9b42f96068dbf58c6814ab18453db0615d49bdf327610a1ee2b0e32a2905a1c34364abd8d4c162a179f6b57cac19068babebbed229b4
 DIST nss-3.68.4.tar.gz 82409303 BLAKE2B a3cf572e82ce29dbc77e9356e0db425170f7294f1468755843746539663fe486089660e1c1b379d0184003d9ccf57db6cf0b2c161d7038301c1cb5028175b16d SHA512 f97b63a9f8218f8fbd7b5d48c084b8166366d02cd50aac69a22d56324d2fea01c49d074e51430bd128f510c733085f3f43c9739ce4073a07a5666675e0ef3b15
-DIST nss-3.79.tar.gz 84830113 BLAKE2B f558592bf0983d3c44f11e079512865d310b4f4c225bcc8e2058cb6a4a721d471c575965a1c2b5d0a130dcf27840da3d7b0ee8aa27fc63791414e22ef7804fa8 SHA512 d3311da3bd0e6907760390221c1307a63d84dd8ad9b85dbfdbf59fe4678341c9856b6f93235731999a1236c98dc0ac66d2dc023eb439cb696f73509dae70c41d
+DIST nss-3.79.1.tar.gz 84694831 BLAKE2B 209a502ba4b808bb4cb9b8775328fa26e36c55147ee5da7b8f661349129250f09685dd69919e24d7ff72cc55a2e9cbbbc9c059e543cf1b0a6a08e809be262d4c SHA512 e841efe9d0300d99b50e54c159c75df76c09c34c74bbc9b6ca007ad017b2cb91a8d33f6f4195e52bd8f3ed7be5d53f3ce7ce10825fa21abbf5dbba3db109e037
 DIST nss-3.81.tar.gz 84842767 BLAKE2B 01b6bf96a1507f8f16693b11aec7897c2fd046a97109fe30dcd4dbd53f82247d9809d189d885fded1f9c89e87b4051d2c121003a30e180ba685a95c46d3232fd SHA512 206faa29ff9fc9c70f85cbb86690b55bd11003a1a5b1d49f5f3731fdd1221690f957a17d912ee5272505afb938968327f4532ae8f5d2d77e6e13370768229747
 DIST nss-3.82.tar.gz 84708994 BLAKE2B 59d3ace416c725933a07c51dc911f2fa11d55b1daddc5252a01ef3ae9df3375cbb199eff92e8e2bb364b9381ad1066c74d4f93c00900847f5234591bbbb29824 SHA512 6e0f28c3f776178ab2d97c6e2436aa10d72c9c2668aea1a6695ccf49e8c3c4cd2d266168508bcb456c655f2e692dceb44eae53c80d50076d7156db3deac70057
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
 EBUILD nss-3.68.4.ebuild 9328 BLAKE2B 5883d294203e24b15b927cf60dd90b5a9b4666b26d5a8591ccbf248b99bf82da2866383de792c1bb5af794cb73fc7be73ead212cb3193ef98198509e061010d3 SHA512 0bb43a21931d5a3bd8ff9146ed4c63ad1d3d76075bb27eb25ed97fd3825dbd436576fc71387a6633961ad15bf03bfd37b315094cb2551073ca331187a55572c7
-EBUILD nss-3.79-r1.ebuild 10353 BLAKE2B da796c5bb3b7e73e87c3af0e2531d405070f87d251e6de360e5e63c81ce65e72001233d5f48650bf1a3c1fbe61261d221af6188213dc652e589774e2ad5ad3af SHA512 a047c3ac020ec3cabdc38662df9403d602b17eae4e414f274bb4df7d8790e27259455e94b13bd244a32a9a7a2b1dfa94ef025e0de9bcc108407ef1122f10388b
+EBUILD nss-3.79.1.ebuild 10480 BLAKE2B 06850337e70943128f696ad5b9709c910e2d038293ddd450e1a43576cbbf784dbbd8e81fae18518bf659e71eccc95cb2427373548e104b821ce37c81947d9d21 SHA512 8c8271924c02ee6d00ed6b7436e17c4a22763057b7101928973ab99324b603775c9d64e8e88dfc9fb27900532ea8946922b32f7d351cadb93e5f2ec14efdad0b
 EBUILD nss-3.81.ebuild 10512 BLAKE2B b4fb44ac0ca7b2f325817ad9e7e1a30aacddbceea329d019ca967ecb2aec0b90976b3bb6c8898dd951184ac65482c100f07e50c4d8cabaa4722182ab5c0d4838 SHA512 2c4d21eb9d860ed4139dd72af5829d9db69a44474954e23dcfd05d76f0b8f0457f71c6a026bf60724ed3a3ef5c1cd7d72a020955a51f7263fb2a5d763e1f503b
 EBUILD nss-3.82.ebuild 10512 BLAKE2B b4fb44ac0ca7b2f325817ad9e7e1a30aacddbceea329d019ca967ecb2aec0b90976b3bb6c8898dd951184ac65482c100f07e50c4d8cabaa4722182ab5c0d4838 SHA512 2c4d21eb9d860ed4139dd72af5829d9db69a44474954e23dcfd05d76f0b8f0457f71c6a026bf60724ed3a3ef5c1cd7d72a020955a51f7263fb2a5d763e1f503b
 MISC metadata.xml 517 BLAKE2B 85fba14d0b8a3539c57b8dca15a0f7789bb78a92891ff39271f804fa07b1620f5f3ece89269e3305b578064a53aeae7ab298bb97cdc019f41793888d42159727 SHA512 7b1fba5488498d5499134f1b58ecaa01cb8c51af3da666d55fba3884703d34efb57b449e76461fb6e13c37687bf5125c5dbab1934a950d4d13c0cff5a3b3318e
diff --git a/dev-libs/nss/nss-3.79-r1.ebuild b/dev-libs/nss/nss-3.79.1.ebuild
index 2f82bbb29d11..758e290ed0af 100644
--- a/dev-libs/nss/nss-3.79-r1.ebuild
+++ b/dev-libs/nss/nss-3.79.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-IUSE="cacert test utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
+IUSE="cacert test +utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
 RESTRICT="!test? ( test )"
 # pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
 RDEPEND="
@@ -50,6 +50,7 @@ src_prepare() {
 	fi
 
 	pushd coreconf >/dev/null || die
+
 	# hack nspr paths
 	echo 'INCLUDES += -I$(DIST)/include/dbm' \
 		>> headers.mk || die "failed to append include"
@@ -60,6 +61,7 @@ src_prepare() {
 
 	# Respect LDFLAGS
 	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+
 	popd >/dev/null || die
 
 	# Fix pkgconfig file for Prefix
@@ -201,6 +203,9 @@ multilib_src_compile() {
 }
 
 multilib_src_test() {
+	einfo "Tests can take a *long* time, especially on a multilib system."
+	einfo "30-45+ minutes per lib configuration. Bug #852755"
+
 	# https://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html
 	# https://firefox-source-docs.mozilla.org/security/nss/legacy/nss_sources_building_testing/index.html#running_the_nss_test_suite
 	# https://www-archive.mozilla.org/projects/security/pki/nss/testnss_32.html (older)
@@ -218,7 +223,7 @@ multilib_src_test() {
 	# after x86.
 	local objdir=$(find "${BUILD_DIR}"/dist -maxdepth 1 -iname Linux* | rev | cut -d/ -f1 | rev)
 
-        # Can tweak to a subset of tests in future if we need to, but would prefer not
+	# Can tweak to a subset of tests in future if we need to, but would prefer not
 	OBJDIR="${objdir}" DIST="${BUILD_DIR}/dist" MOZILLA_ROOT="${BUILD_DIR}" ./all.sh || die
 }
 
@@ -287,7 +292,7 @@ multilib_src_install() {
 
 	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
 	# bug 517266
-	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+	sed -e 's#Libs:#Libs: -lfreebl#' \
 		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
 		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
 		|| die "could not create nss-softokn.pc"