alpha/arm/ia64 stable wrt #257577

(Portage version: 2.1.6.4/cvs/Linux 2.6.27-gentoo-r8 ia64)

3 files changed, 7 insertions, 134 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 1be2dbbd6160..2aea3aec5527 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/nss
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.140 2009/02/14 21:44:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.141 2009/02/15 11:32:16 armin76 Exp $
+
+  15 Feb 2009; Raúl Porcel <armin76@gentoo.org> -nss-3.12.2_rc1.ebuild,
+  nss-3.12.2.ebuild:
+  alpha/arm/ia64 stable wrt #257577
 
   14 Feb 2009; Markus Meier <maekke@gentoo.org> nss-3.12.2.ebuild:
   amd64/x86 stable, bug #257577
diff --git a/dev-libs/nss/nss-3.12.2.ebuild b/dev-libs/nss/nss-3.12.2.ebuild
index 0d357c190fe9..8c2e538a3a48 100644
--- a/dev-libs/nss/nss-3.12.2.ebuild
+++ b/dev-libs/nss/nss-3.12.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.4 2009/02/14 21:44:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.2.ebuild,v 1.5 2009/02/15 11:32:16 armin76 Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs
 
@@ -14,7 +14,7 @@ SRC_URI="http://dev.gentoo.org/~armin76/dist/${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"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="utils"
 
 S="${WORKDIR}"
diff --git a/dev-libs/nss/nss-3.12.2_rc1.ebuild b/dev-libs/nss/nss-3.12.2_rc1.ebuild
deleted file mode 100644
index 587d87e099d7..000000000000
--- a/dev-libs/nss/nss-3.12.2_rc1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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.7 2008/12/27 16:15:54 ranger 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.5"
-
-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
-}