drop system zlib support and re-enable NSS_ENABLE_ECC

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 127 insertions, 2 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index db73dcf53052..0a4ff4939e46 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/nss
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.155 2009/09/16 13:10:06 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.156 2009/09/20 20:46:06 anarchy Exp $
+
+*nss-3.12.4-r1 (20 Sep 2009)
+
+  20 Sep 2009; Jory A. Pratt <anarchy@gentoo.org> +nss-3.12.4-r1.ebuild:
+  remove system zlib support, re-enable ECC export
 
   16 Sep 2009; Jory A. Pratt <anarchy@gentoo.org> nss-3.12.4.ebuild:
   Make pkg_postinst() clearer on revdep-rebuild usage.
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index dde76fe148f2..4e095103e23e 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -20,6 +20,7 @@ EBUILD nss-3.11.9-r1.ebuild 4249 RMD160 b946376594976c29d73050af8bdb8887aa73b382
 EBUILD nss-3.12.2.ebuild 4598 RMD160 bfe76dcbb0bbc33aad9462384217cc8a3b0e2402 SHA1 6167d30a4d42d690af15960438e318687ab95f8c SHA256 3362b29bcd69d539dd8a15b46d4681c43d63de07cb628679a002bd317a2cd849
 EBUILD nss-3.12.3-r1.ebuild 4707 RMD160 a0152ef25c60c1a84f38c4d79589a007c9584a7e SHA1 0d705e3db8f9fea9b04fb912e8d6eded40496693 SHA256 577f4d89c6d0fc7c2ff9bacce97b4658e681ac3f7f269f4eed4a2a65e976e927
 EBUILD nss-3.12.3.ebuild 4613 RMD160 440ac301ddf48df2e715ea7c59d30b8f9cc658fc SHA1 88c7c9f9c821d9df2ae8ab0497adfa6f3c4b9195 SHA256 7e1430b5c050da8b83aad62209a5fc0a7262676f8adf38f00d8a92123cedb9ce
+EBUILD nss-3.12.4-r1.ebuild 3774 RMD160 5e439f44046762e5a8744bedb3a36434500fb18e SHA1 3f930d2bce11107ea853f6f9016b23253522076a SHA256 790fdb3c3821a0068ea2d888b5b100b72ba424340bd0467400d97da39682cd94
 EBUILD nss-3.12.4.ebuild 3794 RMD160 1529fbb5f2d56bbb0250441574aba901cc46dc34 SHA1 c1fcae53fb99a33fc4127a0fea3ec73ffb77c70c SHA256 f18db815880f0733907ab59eb1106f881dd24c64b1eceb4c7b4b716e8cb2add1
-MISC ChangeLog 19239 RMD160 9df33fc85f0c3635d10da33c1cb8286d7411777f SHA1 643fcb0e72d5135c029217c62e358767e4bad42a SHA256 c835530dd2b065800c055b88f466a5d410bb2c6077a8bd5276612f0ab803ccec
+MISC ChangeLog 19394 RMD160 a64cd7d5b67b1cd8517772878c411260d1aaad31 SHA1 89959b379dbac7544d4b608c4dee3ac0940d868f SHA256 838eddbd0ff9252f09acf9e04468804841fa7f462ccca6998ebbdb456c427f31
 MISC metadata.xml 245 RMD160 f0c9fbd458bca39f235195807582f530797bcd27 SHA1 a2c000437e0149764d8aa0a4e58b8cf106685d83 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4
diff --git a/dev-libs/nss/nss-3.12.4-r1.ebuild b/dev-libs/nss/nss-3.12.4-r1.ebuild
new file mode 100644
index 000000000000..3da3e8d91354
--- /dev/null
+++ b/dev-libs/nss/nss-3.12.4-r1.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.4-r1.ebuild,v 1.1 2009/09/20 20:46:06 anarchy Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+NSPR_VER="4.7.4"
+RTM_NAME="NSS_${PV//./_}_RTM"
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz"
+#SRC_URI="http://dev.gentoo.org/~armin76/dist/${P}.tar.bz2
+#	mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="utils"
+
+DEPEND="dev-util/pkgconfig"
+RDEPEND=">=dev-libs/nspr-${NSPR_VER}
+	>=dev-db/sqlite-3.5"
+
+src_unpack() {
+	unpack ${A}
+
+	# Custom changes for gentoo
+	epatch "${FILESDIR}"/"${P}"-gentoo-fixups-1.diff
+
+	cd "${S}"/mozilla/security/coreconf
+
+	# modify install path
+	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+
+	# Ensure we stay multilib aware
+	sed -i -e "s:gentoo:$(get_libdir):" "${S}"/mozilla/security/nss/config/Makefile
+}
+
+src_compile() {
+	strip-flags
+
+	echo > "${T}"/test.c
+	$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
+	case $(file "${T}"/test.o) in
+	*64-bit*) export USE_64=1;;
+	*32-bit*) ;;
+	*) die "Failed to detect whether your arch is 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
+	export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L//'`
+	export NSDISTMODE=copy
+	export NSS_ENABLE_ECC=1
+	export XCFLAGS="${CFLAGS}"
+	export FREEBL_NO_DEPEND=1
+	export NSS_ENABLE_ECC=1
+
+	cd "${S}"/mozilla/security/coreconf
+	emake -j1 CC="$(tc-getCC)" || die "coreconf make failed"
+	cd "${S}"/mozilla/security/dbm
+	emake -j1 CC="$(tc-getCC)" || die "dbm make failed"
+	cd "${S}"/mozilla/security/nss
+	emake -j1 CC="$(tc-getCC)" || die "nss make failed"
+}
+
+src_install () {
+	MINOR_VERSION=12
+	cd "${S}"/mozilla/security/dist
+
+	# put all *.a files in /usr/lib/nss (because some have conflicting names
+	# with existing libraries)
+	dodir /usr/$(get_libdir)/nss
+	cp -L */lib/*.so "${D}"/usr/$(get_libdir)/nss || die "copying shared libs failed"
+	cp -L */lib/*.chk "${D}"/usr/$(get_libdir)/nss || die "copying chk files failed"
+	cp -L */lib/*.a "${D}"/usr/$(get_libdir)/nss || die "copying libs failed"
+
+	# Install nspr-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${D}"/usr/bin
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${D}"/usr/$(get_libdir)/pkgconfig
+
+	# all the include files
+	insinto /usr/include/nss
+	doins private/nss/*.h
+	doins public/nss/*.h
+	cd "${D}"/usr/$(get_libdir)/nss
+	for file in *.so; do
+		mv ${file} ${file}.${MINOR_VERSION}
+		ln -s ${file}.${MINOR_VERSION} ${file}
+	done
+
+	# coping with nss being in a different path. We move up priority to
+	# ensure that nss/nspr are used specifically before searching elsewhere.
+	dodir /etc/env.d
+	echo "LDPATH=/usr/$(get_libdir)/nss" > "${D}"/etc/env.d/08nss
+
+	if use utils; then
+		cd "${S}"/mozilla/security/dist/*/bin/
+		for f in *; do
+			newbin ${f} nss${f}
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "We have reverted back to using upstreams soname."
+	elog "Please run revdep-rebuild --library libnss3.so.12 , this"
+	elog "will correct most issues. If you find a binary that does"
+	elog "not run please re-emerge package to ensure it properly"
+	elog " links after upgrade."
+	elog
+}