dev-libs/nss: dropped SPI certificates and changed cacert default to off

Bug: http://bugs.gentoo.org/580722

Package-Manager: portage-2.2.28

diff --git a/dev-libs/nss/nss-3.25.ebuild b/dev-libs/nss/nss-3.25-r1.ebuild
similarity index 96%
rename from dev-libs/nss/nss-3.25.ebuild
rename to dev-libs/nss/nss-3.25-r1.ebuild
index 8a72adc5054fc2e8c11350e7a4bab92a92c01c40..ede1f3ae60cb3c516996ccd8942be541a0896ece 100644 (file)
--- a/dev-libs/nss/nss-3.25.ebuild
+++ b/dev-libs/nss/nss-3.25-r1.ebuild
@@ -15,13 +15,12 @@ PEM_P="${PN}-pem-20140125"
 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/~anarchy/patches/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch )
        nss-pem? ( https://dev.gentoo.org/~anarchy/dist/${PEM_P}.tar.bz2 )"
 
 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-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cacert +nss-pem utils"
+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}]
@@ -63,14 +62,14 @@ src_prepare() {
                        "${FILESDIR}/${PN}-3.21-pem-werror.patch"
                )
        fi
+       if use cacert ; then #521462
+               PATCHES+=(
+                       "${FILESDIR}/${PN}-3.21-cacert-class3.patch"
+               )
+       fi
 
        default
 
-       if use cacert ; then
-                       eapply -p4 "${DISTDIR}/${PN}-3.14.1-add_spi+cacerts_ca_certs.patch"
-                       eapply "${FILESDIR}/${PN}-3.21-cacert-class3.patch" #521462
-       fi
-
        pushd coreconf >/dev/null || die
        # hack nspr paths
        echo 'INCLUDES += -I$(DIST)/include/dbm' \