[gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/

[Lars Wendler]

commit:     d96cebdae53734ac0d872f4741669b5a20b154e9
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 09:09:19 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Nov 22 09:09:19 2019 +0000
URL:        https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=d96cebda

dev-libs/nss: Bump to version 3.47.1. Removed old

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 dev-libs/nss/Manifest                              |  2 +-
 .../nss/{nss-3.47.ebuild => nss-3.47.1.ebuild}     | 25 +++++++++++-----------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 9067d17..ec7d084 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,3 +1,3 @@
-DIST nss-3.47.tar.gz 76461837 BLAKE2B 
8b11b5330cf134f2f94c2b4a07d52e153ff40006770e31cbba379ff623b822778bd8ae4510493912263299bbb8f6e0706f30d59633256a3141cbd8faedd1f257
 SHA512 
99d04d28c38092826f5aab125662780865de49a97743ff0ab49a191bafae3ba3a937369cd6909ab23e7dcaf06482c8852b31ef057dc12c758f2681e03822e247
+DIST nss-3.47.1.tar.gz 76462846 BLAKE2B 
a26e858e06c494adb4059f8cc73993b0f3cff90a0785ed7eed3760931aa6b4ae5706cf7994c6c1421d9ed8bc36d1a4c199988bd9c59c06bb95fd03521c20f141
 SHA512 
ddee53f58929e5f3849c9f88a3a6735453a258c3c32a7e3e73cc949e0b7ad2dff81b21db31c9c5e1ef3eb79d63c31660e38ce76c06ca54a5681dd611dc2e2ae9
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 
9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68
 SHA512 
a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 
7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84
 SHA512 
5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2

diff --git a/dev-libs/nss/nss-3.47.ebuild b/dev-libs/nss/nss-3.47.1.ebuild
similarity index 93%
rename from dev-libs/nss/nss-3.47.ebuild
rename to dev-libs/nss/nss-3.47.1.ebuild
index 938eb5b..a7be090 100644
--- a/dev-libs/nss/nss-3.47.ebuild
+++ b/dev-libs/nss/nss-3.47.1.ebuild
@@ -21,14 +21,15 @@ LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris 
~x86-solaris"
 IUSE="cacert +nss-pem utils"
-CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
-DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+BDEPEND="
+       >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+"
+RDEPEND="
        >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-       ${CDEPEND}"
-RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
-       ${CDEPEND}
+       >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+       >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
 "
+DEPEND="${RDEPEND}"
 
 RESTRICT="test"
 
@@ -255,23 +256,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 +347,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() {