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 405816d34ac8..2ac737ae1b21 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.122 2008/05/11 14:30:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.123 2008/06/05 13:08:22 armin76 Exp $
+
+*nss-3.12_rc4 (05 Jun 2008)
+
+  05 Jun 2008; Raúl Porcel <armin76@gentoo.org> +nss-3.12_rc4.ebuild:
+  Version bump
 
 *nss-3.12_rc3 (11 May 2008)
 
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index dfd7bd4286a1..02211fa698ca 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -12,10 +12,12 @@ DIST nss-3.11.9.tar.gz 3760535 RMD160 f60eca812ace7dc57459a2ddbce12c2305540061 S
 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
 DIST nss-3.12_rc3.tar.bz2 3968437 RMD160 5a81a794e8570d4cb1442237d6319bb69ff35444 SHA1 1b104812242db47c993b920617b562e19fc5453a SHA256 bb2fbde2032f475f290d1d1c6e255f41f28450781f98e85e693d34bc99cb59ca
+DIST nss-3.12_rc4.tar.bz2 3967984 RMD160 0d701e0b908bcc8d1ab2a1bc7f25dc40bafcd0e3 SHA1 8fbef53575eafe83bdfd3be7debc6fb80ced5036 SHA256 fb899d9c9085531f9f1e5c9f1e124b3bd240cc6d11176d3dcab573c30f7b2ec4
 EBUILD nss-3.11.7.ebuild 4195 RMD160 4277636203125b85942af289c92c7e2c8a4d13e7 SHA1 92cece9c10fea4da6a780f3d9e16e2741dd40347 SHA256 9b7bc3036787b39c47bc15eb9d261bd8a46b459021887b7323f9974cbff5bef3
 EBUILD nss-3.11.9.ebuild 4196 RMD160 78d9a474370b87775caca47af4d14604faf25a51 SHA1 38ab26c01081a19514ec2512ee3b588a708875c9 SHA256 5d299c0502de8cd407b99195791ce81bb801459aae538eda4ca2a08254cc2fab
 EBUILD nss-3.12_beta3.ebuild 4321 RMD160 872ea8b6fc5da384ba7a0e109fc41d1b49a41a4f SHA1 36e97a4ff98cd4ac08fca2b41c0e4b6f51fee130 SHA256 acd91d10f275cd2f71a60a813bdc464533c737460b8b67e8282a8d8e2a3c8aa5
 EBUILD nss-3.12_rc2.ebuild 4319 RMD160 56b11812c3bffa31bb4a108a0fdf49901a7ae025 SHA1 2cf84165f463178ae3b80bead3b19aeeb4658f32 SHA256 aaf59101508cdacec4f36b0e76ca0253fcbe82312345f6e575189c465434051e
 EBUILD nss-3.12_rc3.ebuild 4319 RMD160 2cd853ff176a94f532a9088feb9d85b7293765d4 SHA1 52d59afa1b74ff7cc1ca1d150e15b32bb0cc5b63 SHA256 5404a00dae02323b409e3b4888ba339df4fbbcf0bf689b9ddfcf99d70edfc20a
-MISC ChangeLog 15070 RMD160 48c3d30a739d672b2f0b01c5fda3a3167fa00e72 SHA1 9b6c19e861bab868bfe821967cbd48be1638c3d2 SHA256 d4ebd4c7084856b0e3c57b8158584e800ad098e4bdf2d54d6b9c383ea56310e7
+EBUILD nss-3.12_rc4.ebuild 4313 RMD160 1a843674561d6a6b859bd6f76be21d38dfbaf50e SHA1 9f5e45f8a2117e92fa913ece4d2eecc5e0aab329 SHA256 83daa82e0aceed694c65ef166fb4acd1664a39f4f6a6210ab332ddc5af2e89fd
+MISC ChangeLog 15186 RMD160 2b5761a044f3ed6843a9d62f29cbe13c0672cdab SHA1 50b9fc813c71d09da80bbcd506b08a985ee903f9 SHA256 9fb42532336b4a4d3f8c0379d7a71eeb3d16e9b0731537a770259824ea9c5434
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
diff --git a/dev-libs/nss/nss-3.12_rc4.ebuild b/dev-libs/nss/nss-3.12_rc4.ebuild
new file mode 100644
index 000000000000..3267f4fc492a
--- /dev/null
+++ b/dev-libs/nss/nss-3.12_rc4.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_rc4.ebuild,v 1.1 2008/06/05 13:08:22 armin76 Exp $
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+NSPR_VER="4.7.1"
+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}" 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
+}