Marked ~x64-macos, libnaming fixes, and disable resigning of libs on Darwin, since Darwin doesn't do ELF

(Portage version: 2.2.01.19295-prefix/cvs/Darwin i386)

2 files changed, 15 insertions, 10 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 51c3a145cccb..9cc31fa26c01 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/nss
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.214 2011/09/04 10:14:47 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.215 2011/09/24 14:17:23 grobian Exp $
+
+  24 Sep 2011; Fabian Groffen <grobian@gentoo.org> nss-3.12.11.ebuild:
+  Marked ~x64-macos, libnaming fixes, and disable resigning of libs on Darwin,
+  since Darwin doesn't do ELF
 
   04 Sep 2011; Markus Meier <maekke@gentoo.org> nss-3.12.10.ebuild:
   arm stable, bug #379549
diff --git a/dev-libs/nss/nss-3.12.11.ebuild b/dev-libs/nss/nss-3.12.11.ebuild
index 8d76e843c8e7..907e6685b15a 100644
--- a/dev-libs/nss/nss-3.12.11.ebuild
+++ b/dev-libs/nss/nss-3.12.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.11.ebuild,v 1.1 2011/08/27 23:40:25 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.12.11.ebuild,v 1.2 2011/09/24 14:17:23 grobian Exp $
 
 EAPI=3
 inherit eutils flag-o-matic multilib toolchain-funcs
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}
 
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="utils"
 
 DEPEND="dev-util/pkgconfig"
@@ -103,7 +103,7 @@ generate_chk() {
 	einfo "Resigning core NSS libraries for FIPS validation"
 	shift 2
 	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libname=lib${i}.so
+		local libname=lib${i}$(get_libname)
 		local chkname=lib${i}.chk
 		"${shlibsign}" \
 			-i "${libdir}"/${libname} \
@@ -119,7 +119,7 @@ cleanup_chk() {
 	local libdir="$1"
 	shift 1
 	for i in ${NSS_CHK_SIGN_LIBS} ; do
-		local libfname="${libdir}/lib${i}.so"
+		local libfname="${libdir}/lib${i}$(get_libname)"
 		# If the major version has changed, then we have old chk files.
 		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
 			&& rm -f "${libfname}.chk"
@@ -178,7 +178,7 @@ src_install () {
 	# shlibsign after prelink.
 	declare -a libs
 	for l in ${NSS_CHK_SIGN_LIBS} ; do
-		libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}.so")
+		libs+=("${EPREFIX}/usr/$(get_libdir)/lib${l}$(get_libname)")
 	done
 	OLD_IFS="${IFS}" IFS=":" ; liblist="${libs[*]}" ; IFS="${OLD_IFS}"
 	echo -e "PRELINK_PATH_MASK=${liblist}" >"${T}/90nss"
@@ -188,13 +188,14 @@ src_install () {
 
 pkg_postinst() {
 	elog "We have reverted back to using upstreams soname."
-	elog "Please run revdep-rebuild --library libnss3.so.12 , this"
+	elog "Please run revdep-rebuild --library libnss3$(get_libname 12) , this"
 	elog "will correct most issues. If you find a binary that does"
 	elog "not run please re-emerge package to ensure it properly"
-	elog " links after upgrade."
+	elog "links after upgrade."
 	elog
-	# We must re-sign the libraries AFTER they are stripped.
-	generate_chk "${EROOT}"/usr/bin/shlibsign "${EROOT}"/usr/$(get_libdir)
+	# We must re-sign the ELF libraries AFTER they are stripped.
+	[[ ${CHOST} != *-darwin* ]] && \
+		generate_chk "${EROOT}"/usr/bin/shlibsign "${EROOT}"/usr/$(get_libdir)
 }
 
 pkg_postrm() {