Version bump

Package-Manager: portage-2.1.3.19

6 files changed, 295 insertions, 6 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index dd9c64bf9623..fd569967df92 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/nss
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.108 2007/12/23 12:11:30 armin76 Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.109 2008/01/18 21:42:42 armin76 Exp $
+
+*nss-3.12_beta1 (18 Jan 2008)
+
+  18 Jan 2008; Raúl Porcel <armin76@gentoo.org> +files/3.12-nss.pc.in,
+  +files/3.12-nss-config.in, +nss-3.12_beta1.ebuild:
+  Version bump
 
 *nss-3.12_alpha2_p2-r1 (23 Dec 2007)
 
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 40753c12e088..29e5655ab4b6 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,3 +1,11 @@
+AUX 3.12-nss-config.in 2238 RMD160 b9dfeeef5319bae20326454a67dc67316dcd04cd SHA1 535ea4869d0f5fdc4f14b723320ef7284c14190a SHA256 57fb0219482981c80d9a72d8a86dfcbe0e776e4e5609fad8965e651f79296fa7
+MD5 99b1609eb56425f4ecafc6a0b457f83b files/3.12-nss-config.in 2238
+RMD160 b9dfeeef5319bae20326454a67dc67316dcd04cd files/3.12-nss-config.in 2238
+SHA256 57fb0219482981c80d9a72d8a86dfcbe0e776e4e5609fad8965e651f79296fa7 files/3.12-nss-config.in 2238
+AUX 3.12-nss.pc.in 269 RMD160 8716eb83ecf554c5751b0a135adeaf0a3a4208b0 SHA1 1a33aeb4131333d4cf4ccef7118533d0e89d7267 SHA256 cf659c5e72e560b79a928e7cdf5ed416b286f4eefa8d5b0cab50ee846b320e75
+MD5 33cb378486c19bd3ae4172c121fa7a15 files/3.12-nss.pc.in 269
+RMD160 8716eb83ecf554c5751b0a135adeaf0a3a4208b0 files/3.12-nss.pc.in 269
+SHA256 cf659c5e72e560b79a928e7cdf5ed416b286f4eefa8d5b0cab50ee846b320e75 files/3.12-nss.pc.in 269
 AUX nss-3.11-config-1.patch 1440 RMD160 052cc7d19eafaadec1cca6d9882f23265afdf8a7 SHA1 7a9153ec9bd099d2b1d42ab3de240201ae5d6004 SHA256 9a67bbbd9996535ac0aff115294c6537be5ba2efc99ae48c3bc92eb995e670bc
 MD5 12e4123fd9cc84264cc7ff25478b580f files/nss-3.11-config-1.patch 1440
 RMD160 052cc7d19eafaadec1cca6d9882f23265afdf8a7 files/nss-3.11-config-1.patch 1440
@@ -24,6 +32,7 @@ RMD160 8716eb83ecf554c5751b0a135adeaf0a3a4208b0 files/nss.pc.in 269
 SHA256 cf659c5e72e560b79a928e7cdf5ed416b286f4eefa8d5b0cab50ee846b320e75 files/nss.pc.in 269
 DIST nss-3.11.7.tar.gz 3731160 RMD160 5edec8f5d33e15ddba45b3d4fcfa3ca62628540c SHA1 501af41c4abc2300de2e5f90311583f47c19888c SHA256 e0cb80cbd08d677f9e73d19bbdedfd75fe931777ea732ec352dc1f133f999b98
 DIST nss-3.12_alpha2_p2.tar.bz2 3903174 RMD160 997c8daacdb5a3410ca3c23ce6d682345f392828 SHA1 291bddb0bbe3edd1fb473e0eaddfe51e26231810 SHA256 3bff7452b200623ec84a8c5dadf8283ff0af9f4705bc0fc92f505a618ad5c1a6
+DIST nss-3.12_beta1.tar.bz2 3904926 RMD160 fe0388d27299e7005346920f1d7f741117693511 SHA1 f861facec3e12f28f7a5b2d89cc3d6512d427376 SHA256 f1876a178b78db492d7e305c0b57d0dff0415d0ae0b2ac9324bfc5ff4a479e25
 EBUILD nss-3.11.7.ebuild 4123 RMD160 1095dd17d1d83076a5d89eadc12ff6e18c70991f SHA1 3401ba33406d51d94d2945cde6694c76eeb39c29 SHA256 0dd566e819e705eeba7063376e82ac4d227bcca63c76f30296a13f9afe2b87c0
 MD5 dbca4f5a7f362d3a29b1759a71fc3a48 nss-3.11.7.ebuild 4123
 RMD160 1095dd17d1d83076a5d89eadc12ff6e18c70991f nss-3.11.7.ebuild 4123
@@ -32,10 +41,14 @@ EBUILD nss-3.12_alpha2_p2-r1.ebuild 4110 RMD160 5094ee2906152a3668c21ced81db00bf
 MD5 2bc868a2de1cbbaf127ab69ca00fa2e5 nss-3.12_alpha2_p2-r1.ebuild 4110
 RMD160 5094ee2906152a3668c21ced81db00bf4a07838b nss-3.12_alpha2_p2-r1.ebuild 4110
 SHA256 674c21299fe784b450f310665d784c02850bae35a7886d4d47cff0e5e43be2eb nss-3.12_alpha2_p2-r1.ebuild 4110
-MISC ChangeLog 13097 RMD160 e3f96ef9623b752d933d3ae56f0cd652eb585d3c SHA1 2f83e32642777009f1ca66f939b739e8ec73045a SHA256 ab5a8025aa77cf93d0a96a28acb0f2890ff7bb2ea08ef750093382e2c42295e0
-MD5 eff3d89005d15a1871d1011f541c04b3 ChangeLog 13097
-RMD160 e3f96ef9623b752d933d3ae56f0cd652eb585d3c ChangeLog 13097
-SHA256 ab5a8025aa77cf93d0a96a28acb0f2890ff7bb2ea08ef750093382e2c42295e0 ChangeLog 13097
+EBUILD nss-3.12_beta1.ebuild 4113 RMD160 49d56eeb8c56f21f686f184a98bd57f16b7c58ef SHA1 c014588dffc5fc8f428663837a3f78a5bfc14e7e SHA256 820e7024ce3a63737e17c73594e1d181d8f62f0e13f013b56d1ba913ee14ecec
+MD5 aacfc88ef477fbc7febcf871f91c9cb1 nss-3.12_beta1.ebuild 4113
+RMD160 49d56eeb8c56f21f686f184a98bd57f16b7c58ef nss-3.12_beta1.ebuild 4113
+SHA256 820e7024ce3a63737e17c73594e1d181d8f62f0e13f013b56d1ba913ee14ecec nss-3.12_beta1.ebuild 4113
+MISC ChangeLog 13269 RMD160 5a5d219ee0b6482a2db40ff2fb7d237142d39669 SHA1 1a963dfe8e931dd016ca22942ce2a16034d470ee SHA256 eb7df9095db325f648480dc518e03ecaa66189be547539cecb7a0fd4d02048a2
+MD5 0f1ab063b9a903023fa0379ea71e110f ChangeLog 13269
+RMD160 5a5d219ee0b6482a2db40ff2fb7d237142d39669 ChangeLog 13269
+SHA256 eb7df9095db325f648480dc518e03ecaa66189be547539cecb7a0fd4d02048a2 ChangeLog 13269
 MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
 MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 metadata.xml 160
@@ -46,3 +59,6 @@ SHA256 d67aca9b6034182af060c931905bb4ec4198bb769245bb787aa93c818cadedf0 files/di
 MD5 73218a66acae24d3958df48ef0330e18 files/digest-nss-3.12_alpha2_p2-r1 262
 RMD160 f3bd609acc20acd0ff918b2d4b2b37cda11acda6 files/digest-nss-3.12_alpha2_p2-r1 262
 SHA256 a36f1fb12fc05e8599588ef676db716c3a9c2f639a817b5590d4fc87303fa821 files/digest-nss-3.12_alpha2_p2-r1 262
+MD5 a2aa79c46eb272607b6bbe3ffc8d29d0 files/digest-nss-3.12_beta1 250
+RMD160 94046c781919f2c7ba905e0146f7658ce49ec90c files/digest-nss-3.12_beta1 250
+SHA256 e5e491c098f81b260a1e1e5156650c8a22ba87471d829193c2f0947506465839 files/digest-nss-3.12_beta1 250
diff --git a/dev-libs/nss/files/3.12-nss-config.in b/dev-libs/nss/files/3.12-nss-config.in
new file mode 100644
index 000000000000..664fafeed06e
--- /dev/null
+++ b/dev-libs/nss/files/3.12-nss-config.in
@@ -0,0 +1,137 @@
+#!/bin/sh
+
+prefix=@prefix@
+
+major_version=@MOD_MAJOR_VERSION@
+minor_version=@MOD_MINOR_VERSION@
+patch_version=@MOD_PATCH_VERSION@
+
+usage()
+{
+	cat <<EOF
+Usage: nss-config [OPTIONS] [LIBRARIES]
+Options:
+	[--prefix[=DIR]]
+	[--exec-prefix[=DIR]]
+	[--includedir[=DIR]]
+	[--libdir[=DIR]]
+	[--version]
+	[--libs]
+	[--cflags]
+Dynamic Libraries:
+	nss
+	ssl
+	smime
+EOF
+	exit $1
+}
+
+if test $# -eq 0; then
+	usage 1 1>&2
+fi
+
+lib_ssl=yes
+lib_smime=yes
+lib_nss=yes
+
+while test $# -gt 0; do
+  case "$1" in
+  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+  *) optarg= ;;
+  esac
+
+  case $1 in
+    --prefix=*)
+      prefix=$optarg
+      ;;
+    --prefix)
+      echo_prefix=yes
+      ;;
+    --exec-prefix=*)
+      exec_prefix=$optarg
+      ;;
+    --exec-prefix)
+      echo_exec_prefix=yes
+      ;;
+    --includedir=*)
+      includedir=$optarg
+      ;;
+    --includedir)
+      echo_includedir=yes
+      ;;
+    --libdir=*)
+      libdir=$optarg
+      ;;
+    --libdir)
+      echo_libdir=yes
+      ;;
+    --version)
+      echo ${major_version}.${minor_version}.${patch_version}
+      ;;
+    --cflags)
+      echo_cflags=yes
+      ;;
+    --libs)
+      echo_libs=yes
+      ;;
+    ssl)
+      lib_ssl=yes
+      ;;
+    smime)
+      lib_smime=yes
+      ;;
+    nss)
+      lib_nss=yes
+      ;;
+    *)
+      usage 1 1>&2
+      ;;
+  esac
+  shift
+done
+
+# Set variables that may be dependent upon other variables
+if test -z "$exec_prefix"; then
+    exec_prefix=@exec_prefix@
+fi
+if test -z "$includedir"; then
+    includedir=@includedir@
+fi
+if test -z "$libdir"; then
+    libdir=@libdir@
+fi
+
+if test "$echo_prefix" = "yes"; then
+    echo $prefix
+fi
+
+if test "$echo_exec_prefix" = "yes"; then
+    echo $exec_prefix
+fi
+
+if test "$echo_includedir" = "yes"; then
+    echo $includedir
+fi
+
+if test "$echo_libdir" = "yes"; then
+    echo $libdir
+fi
+
+if test "$echo_cflags" = "yes"; then
+    echo -I$includedir
+fi
+
+if test "$echo_libs" = "yes"; then
+      libdirs="-Wl,-R$libdir -L$libdir"
+      if test -n "$lib_ssl"; then
+	libdirs="$libdirs -lssl${major_version}"
+      fi
+      if test -n "$lib_smime"; then
+	libdirs="$libdirs -lsmime${major_version}"
+      fi
+      if test -n "$lib_nss"; then
+	libdirs="$libdirs -lnss${major_version}"
+      fi
+      echo $libdirs
+fi      
+
diff --git a/dev-libs/nss/files/3.12-nss.pc.in b/dev-libs/nss/files/3.12-nss.pc.in
new file mode 100644
index 000000000000..1c5ac9626409
--- /dev/null
+++ b/dev-libs/nss/files/3.12-nss.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: NSS
+Description: Network Security Services
+Version: @NSS_VERSION@
+Requires: nspr >= @NSPR_VERSION@
+Libs: -L${libdir} -lssl3 -lsmime3 -lnss3 -Wl,-R${libdir}
+Cflags: -I${includedir}
diff --git a/dev-libs/nss/files/digest-nss-3.12_beta1 b/dev-libs/nss/files/digest-nss-3.12_beta1
new file mode 100644
index 000000000000..b4ca34cc5629
--- /dev/null
+++ b/dev-libs/nss/files/digest-nss-3.12_beta1
@@ -0,0 +1,3 @@
+MD5 b7585c6070a7ef8290f106a8a942fa55 nss-3.12_beta1.tar.bz2 3904926
+RMD160 fe0388d27299e7005346920f1d7f741117693511 nss-3.12_beta1.tar.bz2 3904926
+SHA256 f1876a178b78db492d7e305c0b57d0dff0415d0ae0b2ac9324bfc5ff4a479e25 nss-3.12_beta1.tar.bz2 3904926
diff --git a/dev-libs/nss/nss-3.12_beta1.ebuild b/dev-libs/nss/nss-3.12_beta1.ebuild
new file mode 100644
index 000000000000..2e6d960d151d
--- /dev/null
+++ b/dev-libs/nss/nss-3.12_beta1.ebuild
@@ -0,0 +1,116 @@
+# 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_beta1.ebuild,v 1.1 2008/01/18 21:42:42 armin76 Exp $
+
+inherit eutils flag-o-matic multilib
+
+NSPR_VER="4.7.0_pre20080113"
+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}"
+
+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.11.5-config-1.patch
+	epatch "${FILESDIR}"/${PN}-mips64.patch
+}
+
+src_compile() {
+	strip-flags
+	if use amd64 || use ppc64 || use ia64 || use s390; then
+		export USE_64=1
+	fi
+	export NSDISTMODE=copy
+	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
+}