From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7F1FE138334 for ; Fri, 23 Aug 2019 20:23:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 76AABE07D8; Fri, 23 Aug 2019 20:23:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4D6E8E07D8 for ; Fri, 23 Aug 2019 20:23:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6DBC834A201 for ; Fri, 23 Aug 2019 20:23:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE46A471 for ; Fri, 23 Aug 2019 20:23:30 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1566591533.f8e7ad222d18b1c72c637a4da4d6a5cfcdfda262.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/ X-VCS-Repository: proj/mozilla X-VCS-Files: dev-libs/nss/Manifest dev-libs/nss/nss-3.45.ebuild X-VCS-Directories: dev-libs/nss/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: f8e7ad222d18b1c72c637a4da4d6a5cfcdfda262 X-VCS-Branch: master Date: Fri, 23 Aug 2019 20:23:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a2c022fd-2197-4e82-84e5-475d2a434829 X-Archives-Hash: 97042037f3fe5bcc228374ec0c2b612b commit: f8e7ad222d18b1c72c637a4da4d6a5cfcdfda262 Author: Jory Pratt gentoo org> AuthorDate: Fri Aug 23 20:18:53 2019 +0000 Commit: Jory Pratt gentoo org> CommitDate: Fri Aug 23 20:18:53 2019 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=f8e7ad22 dev-libs/nss: fix misc issues in coding Package-Manager: Portage-2.3.72, Repoman-2.3.17 Signed-off-by: Jory Pratt gentoo.org> dev-libs/nss/Manifest | 19 ------------------- dev-libs/nss/nss-3.45.ebuild | 12 ++++++------ 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index c6ca1dd..693b0a4 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,22 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 - DIST nss-3.45.tar.gz 76017462 BLAKE2B 33b310a2cfe86bbbcbb34aa0ea8f11ef8bc9ba45301bf338a1271e88f606b89cb98ad12fad9ae248fa1205218bcf10a106437972fbf56c6563255f3ba0cbf466 SHA512 33360a1bb4e0a0a974070c354ee82c515d5cfa2a12c9c96817a9fdb3e4ca1ad62eb95886b9b0d60e2f69efda964376d0671c1e3c920b2ea614aeecb719c6ff29 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2 ------BEGIN PGP SIGNATURE----- - -iQIzBAEBCgAdFiEEWCOBmo8i7LhvVmNAVx3S0DQ8YDkFAl0loLkACgkQVx3S0DQ8 -YDkhEg/+MIUtXDTbngQcEOc+aiGmDfftcxsB3TPlGuROgwKKznv6fHpeRlzNPEz5 -aIfSTUuIA++QeBPkVbsTDWezbXpkVeF7pt15ucNRVy2qy9Y+4b3j4iZe9glVDB/T -Rc3z9vw8HJOP8QQLjeGy+h2O8NKIYQW+oJ1YhzfoytGvCJFrG77OviSpMBdK9e4i -S40jmZLIy6BN2B7EeSVxyd2faWBqJhv5IU8uDkXUWRPE3RjfgZFIn7vIKQnE6DPv -fBxzwrhxYeuCclA/Sro81mqfQGNP6zxoWdyJxKiFYAD4VyvqGsiFcZkoLjSY46bL -szrOD248APlLcPufC0oZtmTF2kUzkFYpD/STc85srAxACI+Lo/LCmJk9joNgknz1 -xvwe5jVj2zY4Qa8eG9E98l4NC6L2wA8zVr0jZRPA5xi3LcHpkTCE93sfzd45w1IG -WeNLr3YLrVSKAEWpsJD9PpBgm/N4I8oTeMbVDdzwc24KHufFTQEPP5kJnzCWneB+ -FmxTz5MSgx3eI4D9q7OajiJ1lzlUdGp4OPGKCvtcIxnlrFnuUM3UraNf0q6nkBBp -QOV8ZJ2T1BRd95FhVRBEUuvj7sBGJcWhUdT7fUUL3sFzMLEuwpqMT3nX8IBGi97m -lLQ3IhPL5fntndiCrrQBXW4RJbFQ1MoHExCr5p2rHiCGt/jjKRY= -=pgBg ------END PGP SIGNATURE----- diff --git a/dev-libs/nss/nss-3.45.ebuild b/dev-libs/nss/nss-3.45.ebuild index bd22251..b2b5169 100644 --- a/dev-libs/nss/nss-3.45.ebuild +++ b/dev-libs/nss/nss-3.45.ebuild @@ -255,23 +255,23 @@ multilib_src_install() { pushd dist >/dev/null || die dodir /usr/$(get_libdir) - cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed" + cp -L */lib/*$(get_libname) "${ED%}"/usr/$(get_libdir) || die "copying shared libs failed" local i for i in crmf freebl nssb nssckfw ; do - cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed" + cp -L */lib/lib${i}.a "${ED%}"/usr/$(get_libdir) || die "copying libs failed" done # Install nss-config and pkgconfig file dodir /usr/bin - cp -L */bin/nss-config "${ED%/}"/usr/bin || die + cp -L */bin/nss-config "${ED%}"/usr/bin || die dodir /usr/$(get_libdir)/pkgconfig - cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die + cp -L */lib/pkgconfig/nss.pc "${ED%}"/usr/$(get_libdir)/pkgconfig || die # create an nss-softokn.pc from nss.pc for libfreebl and some private headers # bug 517266 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 \ + */lib/pkgconfig/nss.pc >"${ED%}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \ || die "could not create nss-softokn.pc" # all the include files @@ -346,7 +346,7 @@ multilib_src_install() { # shlibsign after prelink. dodir /etc/prelink.conf.d printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \ - > "${ED%/}"/etc/prelink.conf.d/nss.conf + > "${ED%}"/etc/prelink.conf.d/nss.conf } pkg_postinst() {