dev-libs/nss: Drop pem support in favor of new nss-pem package

Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Jory Pratt <anarchy@gentoo.org>

diff --git a/dev-libs/nss/nss-3.50.ebuild b/dev-libs/nss/nss-3.50-r1.ebuild
similarity index 94%
rename from dev-libs/nss/nss-3.50.ebuild
rename to dev-libs/nss/nss-3.50-r1.ebuild
index c3b9fde9344532170c87a23dea00b13fed631891..b6a9c7b9594ee262ea51cd7517e5378d6e26b552 100644 (file)
--- 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