Version bump

Package-Manager: portage-2.1.4.4

3 files changed, 133 insertions, 2 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 20fc8831a54c..502e4a4bfb74 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/nss
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.119 2008/04/02 17:53:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.120 2008/04/09 14:45:22 armin76 Exp $
+
+*nss-3.12_rc2 (09 Apr 2008)
+
+  09 Apr 2008; Raúl Porcel <armin76@gentoo.org> +nss-3.12_rc2.ebuild:
+  Version bump
 
   02 Apr 2008; Raúl Porcel <armin76@gentoo.org> -nss-3.12_beta2.ebuild,
   nss-3.12_beta3.ebuild:
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 858f181b03fc..f64804b918f8 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -10,8 +10,10 @@ AUX nss.pc.in 269 RMD160 8716eb83ecf554c5751b0a135adeaf0a3a4208b0 SHA1 1a33aeb41
 DIST nss-3.11.7.tar.gz 3731160 RMD160 5edec8f5d33e15ddba45b3d4fcfa3ca62628540c SHA1 501af41c4abc2300de2e5f90311583f47c19888c SHA256 e0cb80cbd08d677f9e73d19bbdedfd75fe931777ea732ec352dc1f133f999b98
 DIST nss-3.11.9.tar.gz 3760535 RMD160 f60eca812ace7dc57459a2ddbce12c2305540061 SHA1 96dc531d4ed518d4b4bf43932896cab276d6f3ed SHA256 fa55182f675d5c180eb928a17a9eec94cd317172ba4b070b628c52230b9a5028
 DIST nss-3.12_beta3.tar.bz2 3946738 RMD160 02d255709887e24d60ad1ff7e959bf7b66a9cb93 SHA1 ee98856772a0f084de7c41f599ce86af4b438cd6 SHA256 9ad60d9e1c8383f1c7eed0fc01c54300c4b67b7066e5bd543cfbc2534fd16833
+DIST nss-3.12_rc2.tar.bz2 3959867 RMD160 49bebd32e96d976db3f08dee92844b3d15881710 SHA1 923e534ce2261e59e689ba4c1602e5d9133502db SHA256 7b65aaa1da3ac54353c63b2e60778e30f5252c84ef58b8da6ed184752d4e918b
 EBUILD nss-3.11.7.ebuild 4128 RMD160 302284d76aaa8b728e0046dbdcbd34873221d0e4 SHA1 a3a7629261eddeaa8b0915834eb46e8a724bc641 SHA256 1a5552186b558687f5d9991276739c5df178ba3d9dd4a7092bca5752107e4df4
 EBUILD nss-3.11.9.ebuild 4128 RMD160 356d5c9ae0af4d982fdc971dec90a074f35f4e27 SHA1 82605f56666c28c484d13c11a592b9a14f0af925 SHA256 a007ad4a1fc7260f2688c4fbd0ee0837e230845c4416c9a9f99ff1c0c8c30a80
 EBUILD nss-3.12_beta3.ebuild 4270 RMD160 364196ffc883377a9122d7ab22606359c53d1394 SHA1 3295e7b4d97c2ddc80bcd873f3d606616b83b14e SHA256 0e616ef6dc3323857fe813f9783f045642a95946c04925bfc7a410ca5833ef67
-MISC ChangeLog 14661 RMD160 2965edbca5d480b89dddc6ab6c746d0e16884177 SHA1 c7c7d0cfecd11ccffd07e830aa93e832818e7e54 SHA256 54a22ce78c53536a5e6c20a74f83a620c5e0006faa57d7cdaf2e7a77404b31c3
+EBUILD nss-3.12_rc2.ebuild 4268 RMD160 cb0a3711765772aef8cc43d8be712290a7d4c16d SHA1 c14a85cb4bb4fb8fa8cdd39a4068c5ed098b1cb2 SHA256 206d53f308f6a240c6f38a1d77518e03cdee808d79e86f4c5149ee82c0243b6a
+MISC ChangeLog 14777 RMD160 5551b924c6e4d9b9c9f8813d5dd0de4cc712efcd SHA1 5faa7175d2d8c12ac6d00edb62c5dd9b043d35fe SHA256 426f3d4a6b9da8c34e16fd76aad7129c2c5de32d9de9baf015e57896a23c6732
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
diff --git a/dev-libs/nss/nss-3.12_rc2.ebuild b/dev-libs/nss/nss-3.12_rc2.ebuild
new file mode 100644
index 000000000000..ca4a002abfcd
--- /dev/null
+++ b/dev-libs/nss/nss-3.12_rc2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12_rc2.ebuild,v 1.1 2008/04/09 14:45:22 armin76 Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+NSPR_VER="4.7.1_beta2"
+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="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-libs/nspr-${NSPR_VER}
+	>=dev-db/sqlite-3.5"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+
+	# hack nspr paths
+	echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \
+		>> "${S}"/mozilla/security/coreconf/headers.mk || die "failed to append include"
+
+	# cope with nspr being in /usr/$(get_libdir)/nspr
+	sed -e 's:$(DIST)/lib:/usr/'"$(get_libdir)"/nspr':' \
+		-i "${S}"/mozilla/security/coreconf/location.mk
+
+	# modify install path
+	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i "${S}"/mozilla/security/coreconf/source.mk
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-3.11-config.patch
+	epatch "${FILESDIR}"/${PN}-3.12-config-1.patch
+	epatch "${FILESDIR}"/${PN}-mips64.patch
+}
+
+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 "FAIL";;
+	esac
+
+	export NSDISTMODE=copy
+	export NSS_USE_SYSTEM_SQLITE=1
+	cd "${S}"/mozilla/security/coreconf
+	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" || die "coreconf make failed"
+	cd "${S}"/mozilla/security/dbm
+	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" || die "dbm make failed"
+	cd "${S}"/mozilla/security/nss
+	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" || 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"
+
+	# 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
+
+	dodir /usr/bin
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp "${FILESDIR}"/3.12-nss-config.in "${D}"/usr/bin/nss-config
+	cp "${FILESDIR}"/3.12-nss.pc.in "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc
+	NSS_VMAJOR=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMAJOR" | awk '{print $3}'`
+	NSS_VMINOR=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VMINOR" | awk '{print $3}'`
+	NSS_VPATCH=`cat ${S}/mozilla/security/nss/lib/nss/nss.h | grep "#define.*NSS_VPATCH" | awk '{print $3}'`
+
+	sed -e "s,@libdir@,/usr/"$(get_libdir)"/nss,g" \
+		-e "s,@prefix@,/usr,g" \
+		-e "s,@exec_prefix@,\$\{prefix},g" \
+		-e "s,@includedir@,\$\{prefix}/include/nss,g" \
+		-e "s,@MOD_MAJOR_VERSION@,$NSS_VMAJOR,g" \
+		-e "s,@MOD_MINOR_VERSION@,$NSS_VMINOR,g" \
+		-e "s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g" \
+		-i "${D}"/usr/bin/nss-config
+	chmod 755 "${D}"/usr/bin/nss-config
+
+	sed -e "s,@libdir@,/usr/"$(get_libdir)"/nss,g" \
+	      -e "s,@prefix@,/usr,g" \
+	      -e "s,@exec_prefix@,\$\{prefix},g" \
+	      -e "s,@includedir@,\$\{prefix}/include/nss," \
+	      -e "s,@NSPR_VERSION@,`nspr-config --version`,g" \
+	      -e "s,@NSS_VERSION@,$NSS_VMAJOR.$NSS_VMINOR.$NSS_VPATCH,g" \
+	      -i "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc
+	chmod 644 "${D}"/usr/$(get_libdir)/pkgconfig/nss.pc
+
+	if use utils; then
+		cd "${S}"/mozilla/security/dist/*/bin/
+		for f in *; do
+			newbin ${f} nss${f}
+		done
+	fi
+}