Marked ~x64-macos, libnaming fixes, and disable resigning of libs on Darwin, since...

Package-Manager: portage-2.2.01.19295-prefix/cvs/Darwin i386

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 51c3a145cccb21641e85504bfa027a1576ff7dbf..9cc31fa26c0189e15e1e5372812ed81b3bd66d95 100644 (file)
--- 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/Manifest b/dev-libs/nss/Manifest
index 4c5eccd9e2bde1de43496dcbdae7b8fe61f52536..2d9abb6e3e02bb43cb6285d77fdea5276ede0f3b 100644 (file)
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -10,16 +10,16 @@ DIST nss-3.12.8.tar.gz 5951955 RMD160 08f8118e194fcfd5225c4dc64873f0883b8278b6 S
 DIST nss-3.12.9.tar.gz 5984608 RMD160 d4da08fb2f363ea5ea90599bd90e54aaad0a3e56 SHA1 5b49da5e6f61610a718fcd0838dac365a5e17de2 SHA256 0dc77718016654bbf6ffdda09e968e2b2875c05dacec967abf5725b5daae5978
 DIST nss-3.12.9.with.ckbi.1.82.tar.gz 6012144 RMD160 a5392169f240fe804aa4d55229a246c7f4997c65 SHA1 32d8c607c2301bdf053ab5d4fea7ec5af9d5d35a SHA256 b55ea655f3029737b4236f27301c1eb48b417714ff45ac8b8b67963ea80787a3
 EBUILD nss-3.12.10.ebuild 6764 RMD160 bd101be19e59dadd3fcacaa09bdc225af789cf00 SHA1 d609a403c153faaf0e42ffadc4a2e39dde0eda9e SHA256 247fb02791f7a4879327a2d6a2119d12a6aa5d736809f3c58352d9e619136d5b
-EBUILD nss-3.12.11.ebuild 6625 RMD160 7bd0194f79df4d4c41e79adb446e9de5f3daed3d SHA1 1c23c8931c0815fed224daa4de8c4eb4a1f4b789 SHA256 3fbb90d462cdfb2ae19be22f11d8dd33f2c379223dfa38ae6113511d862ed772
+EBUILD nss-3.12.11.ebuild 6718 RMD160 85a2d2273f3568a1de5b9b0bb540d4bbf4e6a891 SHA1 6ec22d5b1f7509fba937ccc6a085f53b0fd5cb22 SHA256 163c7555994eb95fd23c9393afba499f96142406f2cb143db0514f5c5430eb39
 EBUILD nss-3.12.8.ebuild 6615 RMD160 f29d4249af89a8ac8d2f681ff4d954b27998c8f1 SHA1 42b3310d57b05fc3780e35562be4005573bd894b SHA256 05d6eb4d6f0ed6d9d117a3714647a445237ddfb3feb6268ca2c23604ddf24a3f
 EBUILD nss-3.12.9-r1.ebuild 6651 RMD160 e703a80c96a376b8096e6d2025c544c8c28cf298 SHA1 4efbc98b9629df2147966f75cd0a76c3ad9ea076 SHA256 0a7b2685fca3b84b9c6b9b1df77ca98949b0454a5576fc664d35472ef4ef9743
 EBUILD nss-3.12.9.ebuild 6624 RMD160 512c34751a753da29043b158c290a222bd0159ed SHA1 729be6566c55e02600ed0552775497a7a98953eb SHA256 385dd1ab26aa17bd61e15f4a9ae3c0683a35d2cb5e71458140e2aee76bdb7bff
-MISC ChangeLog 27062 RMD160 fdd4171d33cdf8940e56e458309a2d331c58682b SHA1 3402b20ab3ec6a59a620a2d9fe6f03b51192a518 SHA256 f9a8187a509d290c74747f064ea99c081f83d5f9428d445479603fc23293892b
+MISC ChangeLog 27244 RMD160 232655f02d32edb2603a998bab4bed547a18b77e SHA1 2555a4f23cb89d33129d488663d9bba3805a090b SHA256 e0f9ed55ad51908c492129da017cecd8d3291fe8e6cec4a6161ac14dad63d2a3
 MISC metadata.xml 245 RMD160 f0c9fbd458bca39f235195807582f530797bcd27 SHA1 a2c000437e0149764d8aa0a4e58b8cf106685d83 SHA256 58443b11f9dff75b5d4391f03dbafd90305a0ec8f046f8f0068fb95777c01bd4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iEYEARECAAYFAk5jT80ACgkQkKaRLQcq0GLKPgCgiStwwiAaI61yN/fzdSR2y0AG
-3VwAoJEw3rG9Mn0v8AQQ3MerRgB9MRHO
-=mNfW
+iEYEARECAAYFAk595nkACgkQX3X2B8XHTolQnACghgcOVz90RrS2+LYduRGEx5tc
+7JcAnRa/hsJRDWqche33W2V1+22cFOph
+=bU5e
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/nss/nss-3.12.11.ebuild b/dev-libs/nss/nss-3.12.11.ebuild
index 8d76e843c8e7a4e198ab84e721b1beb022354bc6..907e6685b15a2d4ccf7ad3efede62b7096d35f80 100644 (file)
--- 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() {