Version bump

Package-Manager: portage-2.1.4.5

4 files changed, 163 insertions, 2 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 7a29c728a0c8..ec45653fcd7d 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,12 @@
 # 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.129 2008/11/25 14:50:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.130 2008/12/11 10:39:04 armin76 Exp $
+
+*nss-3.12.2_rc1 (11 Dec 2008)
+
+  11 Dec 2008; Raúl Porcel <armin76@gentoo.org> +files/nss-mips64-2.patch,
+  +nss-3.12.2_rc1.ebuild:
+  Version bump
 
 *nss-3.12-r1 (25 Nov 2008)
 *nss-3.11.9-r1 (25 Nov 2008)
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index bb153c0e1da7..62b7440f0fb1 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -6,11 +6,14 @@ AUX nss-3.11.5-config-1.patch 1508 RMD160 2f71b5c38841c2c24cbea6ca0f206b3debfb49
 AUX nss-3.12-config-1.patch 1508 RMD160 ea2f4e2f05cc865ef41af0c39e573b8eb8801f42 SHA1 4897595a91f331ce34155e9872ece3518acb1ac8 SHA256 22d72c155d7b6aa8f1dd797959d5ec3b0975cf9a1bf4607e6b0ee2207112c2b7
 AUX nss-config.in 2238 RMD160 b9dfeeef5319bae20326454a67dc67316dcd04cd SHA1 535ea4869d0f5fdc4f14b723320ef7284c14190a SHA256 57fb0219482981c80d9a72d8a86dfcbe0e776e4e5609fad8965e651f79296fa7
 AUX nss-fbsd7.patch 638 RMD160 9c60b07a9f9b9a7482221f09042266c358d6cfcf SHA1 27036a161ff076fc8a9d459458d2a4adc38876ad SHA256 f471f04def6d4f1abd2062b582246a60a33b346576ad6e71c782fcfe317c8cc7
+AUX nss-mips64-2.patch 540 RMD160 16c461f453470238922065068dd6530b908bb64f SHA1 27062b98164c946d5116b64a49c7c164b261fdbd SHA256 06ad64812bd49382ff4165bfa452fd697a5ca2c03e8f3ffb9aa1bcfa14499b34
 AUX nss-mips64.patch 508 RMD160 17e750805ec8e3e6f5989810b43522bea344f133 SHA1 dd127c2365ea13f5f5c3ec3f9d6d1991225e3565 SHA256 e50a8fcd0521b7722448b480ff672d49d6ca0dc6134d8df25ac63da1a83ab07b
 AUX nss.pc.in 269 RMD160 8716eb83ecf554c5751b0a135adeaf0a3a4208b0 SHA1 1a33aeb4131333d4cf4ccef7118533d0e89d7267 SHA256 cf659c5e72e560b79a928e7cdf5ed416b286f4eefa8d5b0cab50ee846b320e75
 DIST nss-3.11.9.tar.gz 3760535 RMD160 f60eca812ace7dc57459a2ddbce12c2305540061 SHA1 96dc531d4ed518d4b4bf43932896cab276d6f3ed SHA256 fa55182f675d5c180eb928a17a9eec94cd317172ba4b070b628c52230b9a5028
+DIST nss-3.12.2_rc1.tar.bz2 3966090 RMD160 d1743154280d95a6a6781a7a2867a83b0496560e SHA1 428eafbad360ab51175573768cf21945f88e1750 SHA256 b5a29be0c54bc67bc2181d86405c0f9df389bb29f328a14df949da46502471be
 DIST nss-3.12.tar.gz 5163155 RMD160 a84f9fa11e9fdb1c13f6d9b804b6f37dac4ee0af SHA1 6b8e83c0931cfad161aae993d344687b67f317aa SHA256 d30a7470b82a73ed442525b365afaf00427204e3771edfeab05743acca97122b
 EBUILD nss-3.11.9-r1.ebuild 4249 RMD160 b946376594976c29d73050af8bdb8887aa73b382 SHA1 17482607cc8b98e69ecff4735bbf276601f484ad SHA256 086b85d6e853f8cb058e3111a86f2de31525dad78df70a5e5143dd48cf786098
 EBUILD nss-3.12-r1.ebuild 4448 RMD160 7cbbd11586af9b843d739305ca9c837b850dc126 SHA1 43e716ba68560879c7e64fa49fb21a2db15afc2e SHA256 086610630d65a46a86e6ef5174fe29243a9a52f107676576ceb0ca7d2db45080
-MISC ChangeLog 16095 RMD160 70d40c2b4c112dd8d6495c065dc951595267cfcb SHA1 edd5dc2276523fe1444deb1f3951eaca47ed78ad SHA256 78c5965c59cfec360bb20f92ce66b79b5600a7ff256894969433a4e6ad650d99
+EBUILD nss-3.12.2_rc1.ebuild 4519 RMD160 69bdcf014244a6cb51f46f120d8416319d623f1c SHA1 6ec991cc37df1947217fade49f30d7fc55c9567c SHA256 a3e8d2ca73846679642902aa7889b1f68fc849da21a88272a6c28ce758a5027b
+MISC ChangeLog 16244 RMD160 b2b249d80b25d68d750f1df6e8b4174924c47c8c SHA1 2618373c1f777cecc0235a716a684ac942f1fd44 SHA256 75069e0bb55b4b7b36919bb77f5f05b363718877513ed8155a9d5c3c200e2956
 MISC metadata.xml 245 RMD160 f0c9fbd458bca39f235195807582f530797bcd27 SHA1 a2c000437e0149764d8aa0a4e58b8cf106685d83 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4
diff --git a/dev-libs/nss/files/nss-mips64-2.patch b/dev-libs/nss/files/nss-mips64-2.patch
new file mode 100644
index 000000000000..8257eb4d9095
--- /dev/null
+++ b/dev-libs/nss/files/nss-mips64-2.patch
@@ -0,0 +1,21 @@
+--- mozilla/security/coreconf/Linux.mk.orig	2008-12-11 09:12:48.000000000 +0000
++++ mozilla/security/coreconf/Linux.mk	2008-12-11 09:13:51.000000000 +0000
+@@ -119,6 +119,10 @@
+ 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
+ 	CPU_ARCH        = mips
+ else
++ifeq ($(OS_TEST),mips64)
++	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
++	CPU_ARCH        = mips64
++else
+ ifeq (,$(filter-out i%86,$(OS_TEST)))
+ 	OS_REL_CFLAGS	= -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
+ 	CPU_ARCH	= x86
+@@ -140,6 +144,7 @@
+ endif
+ endif
+ endif
++endif
+ 
+ 
+ LIBC_TAG		= _glibc
diff --git a/dev-libs/nss/nss-3.12.2_rc1.ebuild b/dev-libs/nss/nss-3.12.2_rc1.ebuild
new file mode 100644
index 000000000000..b1ea1e188ee4
--- /dev/null
+++ b/dev-libs/nss/nss-3.12.2_rc1.ebuild
@@ -0,0 +1,131 @@
+# 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.2_rc1.ebuild,v 1.1 2008/12/11 10:39:04 armin76 Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+NSPR_VER="4.7.3"
+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"
+
+S="${WORKDIR}"
+
+DEPEND=">=dev-libs/nspr-${NSPR_VER}
+	>=dev-db/sqlite-3.6.2"
+
+src_unpack() {
+	unpack ${A}
+
+	cd "${S}"/mozilla/security/coreconf
+	# hack nspr paths
+	echo 'INCLUDES += -I/usr/include/nspr -I$(DIST)/include/dbm' \
+		>> 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 location.mk
+
+	# 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
+
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-3.11-config.patch
+	epatch "${FILESDIR}"/${PN}-3.12-config-1.patch
+	epatch "${FILESDIR}"/${PN}-mips64-2.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
+	export NSS_ENABLE_ECC=1
+	cd "${S}"/mozilla/security/coreconf
+	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "coreconf make failed"
+	cd "${S}"/mozilla/security/dbm
+	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "dbm make failed"
+	cd "${S}"/mozilla/security/nss
+	emake -j1 BUILD_OPT=1 XCFLAGS="${CFLAGS}" 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"
+
+	# 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
+}