gentoo resync : 03.03.2021

2 files changed, 29 insertions, 23 deletions

diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 9eaf75310db5..30d576ceaa2d 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,11 +1,12 @@
 AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d4fc6a8b59b9931db387e9045167973a0bb98ee11164ccbc13c7ea7fb545fab45a8112df5806a5a13d2b77abf682eec1390a15 SHA512 4e68e6068921e9ed54bda68af422a491cb530b60ffbb85fe1986a403cd9023522c179b5afcf65e22c223a665163d1c2d1993322d652053b72e3fe07efe692d59
 DIST ca-certificates_20200601.tar.xz 245668 BLAKE2B 1249782dba046f52832d365e4770e02ed24c0b50bff4ceec5e5af932c807eb8120f8e3bc7858503e74789ecb2da577509819f3ffdf9bd1ec5cc22d61f2194ad5 SHA512 7bfd3122430be0a46bd10dcb0e0664561d1e0b2656b9f37677d89f71a1dcb0e668c25ffe08412888125fa9a53ee8245a4b3fc1004c419a159766665b1241113c
+DIST ca-certificates_20210119.tar.xz 232964 BLAKE2B 593352912d2b490e3f46ea032ac1ddf1c87a7ac93859d475461cbba490918cdec853b0bb30bb253a634d8d597ca6f0304bc81122b4b31b5b31fd6a80e1faaf33 SHA512 a824209fa0ff0865872a07d8e6b901d8407f599243810fd5c820e1f69226e05b0b4f1e25e5ff3d8d398ff952529084442f026e32220961f359f6323f6bf03373
 DIST nss-3.53.tar.gz 81178428 BLAKE2B 5e67b02bf0ba9390311d77ee4d7b86fd7339bd4f7d830b32563799e4eef126143f0b76b2933ad14c5c5d3da6cb3fa0e670aca7ce9654316123abadce25a728ec SHA512 280edf24356b764584200bff949af4a7f88514ee8ac80bf5348a9a844a8b1eb263e9aa1d772644bd8bb1bd195c12b6cc173280cfc88cd97e56562e1c40e71503
-DIST nss-3.59.tar.gz 82141516 BLAKE2B 74959b14ec42b4628dfc3365af00420cdbd41d202541e9379f6a4448c4496b76307af48c9ec405b370f8770327ce56742b4382f8cd49724b42732ce5cc5b0779 SHA512 8963e846f2ff7222457ae59f042672cf4e44f7752807226f46c215a772fd1cbd65d0ce634da4afb698eabd4eb1c1e78146cc2a089339ada11da03d259c609a38
 DIST nss-3.60.tar.gz 82035831 BLAKE2B fffc0e26d58d4625be1b8b0123f248a0c7994b18868ece534ba4d60131dd4897d075d7b2dba672c31ccd333e0c18ea384e2aa2f495c23b5430d6d10b91922873 SHA512 6463b2da28b5d9f1f20d45f77a3179e2b93c874af5742c7fc51eb7c44cef93270acacf79174dc63905f227256cbcee23a36f98f1cfed10dd5c56ffc0a76e2695
+DIST nss-3.62.tar.gz 82159506 BLAKE2B 9abd7504766fb57214a16608a7299f8cf6d25c9a4e285665eabd812bce536ba244b698de31fd53796148f3856e4bee6c8a03ce5b6c5234a9337d7af8f300f007 SHA512 7044008ea8e5d6f658da96e202a896e24a1ffa29d7ca862f32ed37cfa09adf8c2d5fbc371e3af6bc5151b2d1216c38207976b41888d5ad8efd4dc3049cb5831d
 DIST nss-cacert-class1-class3-r1.patch 22503 BLAKE2B d2ba6b5c3675484dab5b6709478101a9dadc0baded3dbf891dcd04e5eb912079b87cdd17f893a0f539a2a53fb05357c6dd309fb624facac3b021c82c7424a91f SHA512 68906d2442986ad13ebf9cd97c26fac34af3efd5cfaacb3d7824adad966349ad796c9cec8dec44c46d5c571df88ce83aea02ce82e71da337aa4e1aeef58eda66
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 EBUILD ca-certificates-20200601.3.53.ebuild 5591 BLAKE2B caeca6b6ef04f9cffcd09f71a71e60f5a0bb83e2a17d250b7c70509d7b7c5a0157ca73551b3195f8e896967ca7693c286d654924a7e928a32588b4548169f0b5 SHA512 50173d5d27dea6a7425d59f05f7d6739a0c247ec171e641af26197746f28257fbdbe1e84ed2596a44bbf5ff2417e9e8526271cc6f552ba960ce95b30b6406f94
-EBUILD ca-certificates-20200601.3.59.ebuild 5600 BLAKE2B 9745244af02f8be68ba8f055d4f5c4bb5c1bcdd071daef8beee5c56ba00b10f6b57ea25a016d76cbba4fb7ab496727011fdb9b27b3fa120711bcf731e05e23cb SHA512 b72089184394cb71bc2de8cfe9b12944989b0fd0f1c50c7955f823c7d13d0fd1cc430d2d8f502f0fe338ebd002eeccc9f11d96e6d9e5f8dc7242b96d7bcc1233
 EBUILD ca-certificates-20200601.3.60.ebuild 5736 BLAKE2B 676fdc86a69b8154d0cfe00d003d9ccc69092d62c2434ea641a10a2783562ece7662c9bf59789127acf6cca6870eb3f6388eeaeb3fc06d8978e091aac8ca92bb SHA512 f9ee82f49030ebdf44d4e399bdc8988e2bf4ebbe80a9dde88c192bd986ffd6305008d360f9a8ebe0795bf34af57e49ef451666f14cfd890f299e1d1ca867dad4
+EBUILD ca-certificates-20210119.3.62.ebuild 5736 BLAKE2B 676fdc86a69b8154d0cfe00d003d9ccc69092d62c2434ea641a10a2783562ece7662c9bf59789127acf6cca6870eb3f6388eeaeb3fc06d8978e091aac8ca92bb SHA512 f9ee82f49030ebdf44d4e399bdc8988e2bf4ebbe80a9dde88c192bd986ffd6305008d360f9a8ebe0795bf34af57e49ef451666f14cfd890f299e1d1ca867dad4
 MISC metadata.xml 436 BLAKE2B f37fed732b387ea5e778bb88c349c78127b0db613def815d75e5cc2b7a7dbd049131eef33617fe3139975bd0c6bb187cf20e98c27e3ee10c3928b394fe6f02ac SHA512 dade84534ac0e574b3d127a1dc367b2f206874500057662d6139a00dc30506e1d977e3020b8e983750a8ef243bcfb34e152391d12027d88f8c116d151090ed9b
diff --git a/app-misc/ca-certificates/ca-certificates-20200601.3.59.ebuild b/app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild
index 65559a6386b6..2f777c592fc7 100644
--- a/app-misc/ca-certificates/ca-certificates-20200601.3.59.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20210119.3.62.ebuild
@@ -16,16 +16,15 @@
 # When triaging user reports, refer to our wiki for tips:
 # https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{7..9} )
 
-inherit eutils python-any-r1
+inherit python-any-r1
 
 if [[ ${PV} == *.* ]] ; then
 	# Compile from source ourselves.
 	PRECOMPILED=false
-	inherit eapi7-ver
 
 	DEB_VER=$(ver_cut 1)
 	NSS_VER=$(ver_cut 2-)
@@ -45,7 +44,7 @@ else
 	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
 		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
 		cacert? (
-			https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
+			https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r1.patch
 		)"
 fi
 
@@ -55,20 +54,24 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~
 IUSE=""
 ${PRECOMPILED} || IUSE+=" cacert"
 
-DEPEND=""
-if ${PRECOMPILED} ; then
-	DEPEND+=" !<sys-apps/portage-2.1.10.41"
-fi
 # c_rehash: we run `c_rehash`
 # debianutils: we run `run-parts`
-RDEPEND="${DEPEND}
-	app-misc/c_rehash
+CDEPEND="app-misc/c_rehash
 	sys-apps/debianutils"
 
-if ! ${PRECOMPILED}; then
-	DEPEND+=" ${PYTHON_DEPS}"
+BDEPEND="${CDEPEND}"
+if ! ${PRECOMPILED} ; then
+	BDEPEND+=" ${PYTHON_DEPS}"
 fi
 
+DEPEND=""
+if ${PRECOMPILED} ; then
+	DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+
+RDEPEND="${CDEPEND}
+	${DEPEND}"
+
 S=${WORKDIR}
 
 pkg_setup() {
@@ -79,12 +82,12 @@ pkg_setup() {
 }
 
 src_unpack() {
-	if ! ${PRECOMPILED}; then
+	if ! ${PRECOMPILED} ; then
 		default
 		# Initial 20200601 deb release had bad naming inside the debian source tarball.
 		DEB_S="${WORKDIR}/${PN}-${DEB_VER}"
 		DEB_BAD_S="${WORKDIR}/work"
-		if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]]; then
+		if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]] ; then
 			mv "${DEB_BAD_S}" "${DEB_S}"
 		fi
 	fi
@@ -106,7 +109,7 @@ src_prepare() {
 
 		if use cacert ; then
 			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
-			eapply -p0 "${DISTDIR}"/nss-cacert-class1-class3.patch
+			eapply "${DISTDIR}"/nss-cacert-class1-class3-r1.patch
 			popd >/dev/null || die
 		fi
 	fi
@@ -137,8 +140,10 @@ src_compile() {
 			|| die
 		if use cacert ; then
 			mkdir -p "${c}"/cacert.org || die
-			mv "${d}"/CAcert_Inc..crt \
-				"${c}"/cacert.org/cacert.org_root.crt || die
+			mv "${d}"/CA_Cert_Signing_Authority.crt \
+				"${c}"/cacert.org/cacert.org_class1.crt || die
+			mv "${d}"/CAcert_Class_3_Root.crt \
+				"${c}"/cacert.org/cacert.org_class3.crt || die
 		fi
 		mv "${d}"/*.crt "${c}"/mozilla/ || die
 	else
@@ -169,16 +174,16 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -d "${EROOT%/}/usr/local/share/ca-certificates" ]] ; then
+	if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then
 		# if the user has local certs, we need to rebuild again
 		# to include their stuff in the db.
 		# However it's too overzealous when the user has custom certs in place.
 		# --fresh is to clean up dangling symlinks
-		"${EROOT%/}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
 	fi
 
-	if [[ -n "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l)" ]] ; then
+	if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then
 		ewarn "Removing the following broken symlinks:"
-		ewarn "$(find -L "${EROOT%/}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
 	fi
 }