| 1 |
commit: f8e7ad222d18b1c72c637a4da4d6a5cfcdfda262 |
| 2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 23 20:18:53 2019 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 23 20:18:53 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=f8e7ad22 |
| 7 |
|
| 8 |
dev-libs/nss: fix misc issues in coding |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.72, Repoman-2.3.17 |
| 11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-libs/nss/Manifest | 19 ------------------- |
| 14 |
dev-libs/nss/nss-3.45.ebuild | 12 ++++++------ |
| 15 |
2 files changed, 6 insertions(+), 25 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest |
| 18 |
index c6ca1dd..693b0a4 100644 |
| 19 |
--- a/dev-libs/nss/Manifest |
| 20 |
+++ b/dev-libs/nss/Manifest |
| 21 |
@@ -1,22 +1,3 @@ |
| 22 |
------BEGIN PGP SIGNED MESSAGE----- |
| 23 |
-Hash: SHA512 |
| 24 |
- |
| 25 |
DIST nss-3.45.tar.gz 76017462 BLAKE2B 33b310a2cfe86bbbcbb34aa0ea8f11ef8bc9ba45301bf338a1271e88f606b89cb98ad12fad9ae248fa1205218bcf10a106437972fbf56c6563255f3ba0cbf466 SHA512 33360a1bb4e0a0a974070c354ee82c515d5cfa2a12c9c96817a9fdb3e4ca1ad62eb95886b9b0d60e2f69efda964376d0671c1e3c920b2ea614aeecb719c6ff29 |
| 26 |
DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 |
| 27 |
DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2 |
| 28 |
------BEGIN PGP SIGNATURE----- |
| 29 |
- |
| 30 |
-iQIzBAEBCgAdFiEEWCOBmo8i7LhvVmNAVx3S0DQ8YDkFAl0loLkACgkQVx3S0DQ8 |
| 31 |
-YDkhEg/+MIUtXDTbngQcEOc+aiGmDfftcxsB3TPlGuROgwKKznv6fHpeRlzNPEz5 |
| 32 |
-aIfSTUuIA++QeBPkVbsTDWezbXpkVeF7pt15ucNRVy2qy9Y+4b3j4iZe9glVDB/T |
| 33 |
-Rc3z9vw8HJOP8QQLjeGy+h2O8NKIYQW+oJ1YhzfoytGvCJFrG77OviSpMBdK9e4i |
| 34 |
-S40jmZLIy6BN2B7EeSVxyd2faWBqJhv5IU8uDkXUWRPE3RjfgZFIn7vIKQnE6DPv |
| 35 |
-fBxzwrhxYeuCclA/Sro81mqfQGNP6zxoWdyJxKiFYAD4VyvqGsiFcZkoLjSY46bL |
| 36 |
-szrOD248APlLcPufC0oZtmTF2kUzkFYpD/STc85srAxACI+Lo/LCmJk9joNgknz1 |
| 37 |
-xvwe5jVj2zY4Qa8eG9E98l4NC6L2wA8zVr0jZRPA5xi3LcHpkTCE93sfzd45w1IG |
| 38 |
-WeNLr3YLrVSKAEWpsJD9PpBgm/N4I8oTeMbVDdzwc24KHufFTQEPP5kJnzCWneB+ |
| 39 |
-FmxTz5MSgx3eI4D9q7OajiJ1lzlUdGp4OPGKCvtcIxnlrFnuUM3UraNf0q6nkBBp |
| 40 |
-QOV8ZJ2T1BRd95FhVRBEUuvj7sBGJcWhUdT7fUUL3sFzMLEuwpqMT3nX8IBGi97m |
| 41 |
-lLQ3IhPL5fntndiCrrQBXW4RJbFQ1MoHExCr5p2rHiCGt/jjKRY= |
| 42 |
-=pgBg |
| 43 |
------END PGP SIGNATURE----- |
| 44 |
|
| 45 |
diff --git a/dev-libs/nss/nss-3.45.ebuild b/dev-libs/nss/nss-3.45.ebuild |
| 46 |
index bd22251..b2b5169 100644 |
| 47 |
--- a/dev-libs/nss/nss-3.45.ebuild |
| 48 |
+++ b/dev-libs/nss/nss-3.45.ebuild |
| 49 |
@@ -255,23 +255,23 @@ multilib_src_install() { |
| 50 |
pushd dist >/dev/null || die |
| 51 |
|
| 52 |
dodir /usr/$(get_libdir) |
| 53 |
- cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed" |
| 54 |
+ cp -L */lib/*$(get_libname) "${ED%}"/usr/$(get_libdir) || die "copying shared libs failed" |
| 55 |
local i |
| 56 |
for i in crmf freebl nssb nssckfw ; do |
| 57 |
- cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed" |
| 58 |
+ cp -L */lib/lib${i}.a "${ED%}"/usr/$(get_libdir) || die "copying libs failed" |
| 59 |
done |
| 60 |
|
| 61 |
# Install nss-config and pkgconfig file |
| 62 |
dodir /usr/bin |
| 63 |
- cp -L */bin/nss-config "${ED%/}"/usr/bin || die |
| 64 |
+ cp -L */bin/nss-config "${ED%}"/usr/bin || die |
| 65 |
dodir /usr/$(get_libdir)/pkgconfig |
| 66 |
- cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die |
| 67 |
+ cp -L */lib/pkgconfig/nss.pc "${ED%}"/usr/$(get_libdir)/pkgconfig || die |
| 68 |
|
| 69 |
# create an nss-softokn.pc from nss.pc for libfreebl and some private headers |
| 70 |
# bug 517266 |
| 71 |
sed -e 's#Libs:#Libs: -lfreebl#' \ |
| 72 |
-e 's#Cflags:#Cflags: -I${includedir}/private#' \ |
| 73 |
- */lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \ |
| 74 |
+ */lib/pkgconfig/nss.pc >"${ED%}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \ |
| 75 |
|| die "could not create nss-softokn.pc" |
| 76 |
|
| 77 |
# all the include files |
| 78 |
@@ -346,7 +346,7 @@ multilib_src_install() { |
| 79 |
# shlibsign after prelink. |
| 80 |
dodir /etc/prelink.conf.d |
| 81 |
printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \ |
| 82 |
- > "${ED%/}"/etc/prelink.conf.d/nss.conf |
| 83 |
+ > "${ED%}"/etc/prelink.conf.d/nss.conf |
| 84 |
} |
| 85 |
|
| 86 |
pkg_postinst() { |
Archives