diff options
author | 2020-02-10 11:44:36 -0600 | |
---|---|---|
committer | 2020-02-10 11:44:36 -0600 | |
commit | 2442149e91df742392f18730028de394ff464c88 (patch) | |
tree | 4c8898d9e91d4b3b80264b059c389e6c7097aa3a | |
parent | www-client/firefox: Version bump 73.0 (diff) | |
download | mozilla-2442149e91df742392f18730028de394ff464c88.tar.gz mozilla-2442149e91df742392f18730028de394ff464c88.tar.bz2 mozilla-2442149e91df742392f18730028de394ff464c88.zip |
dev-libs/nss: include cmac.h, drop pem support in favor of standalone
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Jory Pratt <anarchy@gentoo.org>
-rw-r--r-- | dev-libs/nss/Manifest | 1 | ||||
-rw-r--r-- | dev-libs/nss/metadata.xml | 1 | ||||
-rw-r--r-- | dev-libs/nss/nss-3.50-r1.ebuild (renamed from dev-libs/nss/nss-3.50.ebuild) | 22 |
3 files changed, 3 insertions, 21 deletions
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index 1df0b846..2478d161 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,3 +1,2 @@ DIST nss-3.50.tar.gz 78041630 BLAKE2B 4d21a1cac475936e153b22829f8b4b2f6f6a57c41e14d091b287aba633a8d4c80c045882ce6f1cb7a2f9ce760d616b13389f90e59f60250c41080ed1f5a4900a SHA512 d6bcaf8ad65b5a97c42cd6cbbc68add5c4b49db74b2debcedb2a007f72511ac0e9bd21fd2dec041bc1975cfc8af26a48450aa0d1b962f755931ab2ac45c795b1 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/metadata.xml b/dev-libs/nss/metadata.xml index 009a0973..c76b1650 100644 --- a/dev-libs/nss/metadata.xml +++ b/dev-libs/nss/metadata.xml @@ -9,7 +9,6 @@ <flag name="cacert"> Include root/class3 certs from CAcert (http://www.cacert.org/) </flag> - <flag name="nss-pem">Add support for libnsspem</flag> <flag name="utils">Install utilities included with the library</flag> </use> <upstream> diff --git a/dev-libs/nss/nss-3.50.ebuild b/dev-libs/nss/nss-3.50-r1.ebuild index c3b9fde9..b6a9c7b9 100644 --- a/dev-libs/nss/nss-3.50.ebuild +++ b/dev-libs/nss/nss-3.50-r1.ebuild @@ -7,20 +7,16 @@ inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal NSPR_VER="4.25" RTM_NAME="NSS_${PV//./_}_RTM" -# Rev of https://git.fedorahosted.org/cgit/nss-pem.git -PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116" -PEM_P="${PN}-pem-20160329" DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz - cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch ) - nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )" + cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )" 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" +IUSE="cacert utils" BDEPEND=" >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] " @@ -46,19 +42,7 @@ PATCHES=( "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch" ) -src_unpack() { - unpack ${A} - if use nss-pem ; then - mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die - fi -} - src_prepare() { - if use nss-pem ; then - PATCHES+=( - "${FILESDIR}/${PN}-3.47-enable-pem.patch" - ) - fi if use cacert ; then #521462 PATCHES+=( "${DISTDIR}/${PN}-cacert-class1-class3.patch" @@ -280,7 +264,7 @@ multilib_src_install() { insinto /usr/include/nss doins public/nss/*.{h,api} insinto /usr/include/nss/private - doins private/nss/{blapi,alghmac}.h + doins private/nss/{blapi,alghmac,cmac}.h popd >/dev/null || die |