get_libdir-ized and made nss work with an nspr in /usr/$(get_libdir)/nspr/. stable on amd64

4 files changed, 36 insertions, 25 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index a9de419d3182..01425a30d0ac 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/nss
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.33 2004/11/15 21:17:30 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.34 2004/11/25 15:55:04 lv Exp $
+
+*nss-3.9.2-r2 (25 Nov 2004)
+
+  25 Nov 2004; Travis Tilley <lv@gentoo.org> -nss-3.9.2-r1.ebuild,
+  +nss-3.9.2-r2.ebuild:
+  get_libdir-ized and made nss work with an nspr in /usr/$(get_libdir)/nspr/.
+  stable on amd64
 
 *nss-3.9.2-r1 (15 Nov 2004)
 
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 6a0270d52169..afe085c867b8 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 babbc065ec75b993b1730b124fef8b13 ChangeLog 3824
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
 MD5 0ee0b76ae0dab7a386d7f3453c65753b nss-3.8.ebuild 2603
 MD5 3c0a578d2cc7fed97c8180184dea6e6f nss-3.9.2.ebuild 2222
-MD5 c48e5bc72817df5c6e2f30d479e373be nss-3.9.2-r1.ebuild 2348
+MD5 04950b0daf2d49f13675c3e9eddbc690 nss-3.9.2-r2.ebuild 3213
+MD5 08a218fdeb3832c0bce63d4b05e6194e ChangeLog 4036
 MD5 80da1f67cfbd587017f411109c5ca57b files/digest-nss-3.8 60
 MD5 5b40cac4fbb267e83bdf04c269a7c665 files/digest-nss-3.9.2 62
 MD5 d5948dfd93b61198742855ec3d2a254d files/nss-3.8-amd64.patch 8306
 MD5 ef044b71f9a324137ddae80c970ea246 files/nss-3.8-hppa.patch 4758
 MD5 c0b014e0fdabd7754008a3112553be18 files/nss-3.8-mips.patch 689
 MD5 31208c12f404d120fb880b0e8300c175 files/nss-3.9.2-ppc64.patch 526
-MD5 5b40cac4fbb267e83bdf04c269a7c665 files/digest-nss-3.9.2-r1 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBmR0yRkyva5PS18kRAns1AKC4W9lUeIBPgP0FtSqlbZ+obZUHCQCfa0Dr
-d8A4AIWt+hq0BRnLf08jcXQ=
-=CZzd
------END PGP SIGNATURE-----
+MD5 5b40cac4fbb267e83bdf04c269a7c665 files/digest-nss-3.9.2-r2 62
diff --git a/dev-libs/nss/files/digest-nss-3.9.2-r1 b/dev-libs/nss/files/digest-nss-3.9.2-r2
index c8fd29d3966d..c8fd29d3966d 100644
--- a/dev-libs/nss/files/digest-nss-3.9.2-r1
+++ b/dev-libs/nss/files/digest-nss-3.9.2-r2
diff --git a/dev-libs/nss/nss-3.9.2-r1.ebuild b/dev-libs/nss/nss-3.9.2-r2.ebuild
index 3a1132668586..c7141d696d46 100644
--- a/dev-libs/nss/nss-3.9.2-r1.ebuild
+++ b/dev-libs/nss/nss-3.9.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.9.2-r1.ebuild,v 1.1 2004/11/15 21:17:30 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.9.2-r2.ebuild,v 1.1 2004/11/25 15:55:04 lv Exp $
 
 inherit eutils
 
@@ -11,12 +11,12 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc"
+KEYWORDS="~x86 ~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc"
 IUSE=""
 
 DEPEND="virtual/libc
 	app-arch/zip
-	>=dev-libs/nspr-4.3"
+	>=dev-libs/nspr-4.4.1-r2"
 
 src_unpack() {
 	unpack ${A}
@@ -25,13 +25,27 @@ src_unpack() {
 	echo 'INCLUDES += -I${ROOT}usr/include/nspr -I$(DIST)/include/dbm' \
 		>> ${S}/mozilla/security/coreconf/headers.mk || die "failed to append include"
 
-	sed -e 's:$(DIST)/lib/$(LIB_PREFIX)plc4:${ROOT}usr/lib/$(LIB_PREFIX)plc4:' \
-		-e 's:$(DIST)/lib/$(LIB_PREFIX)plds4:${ROOT}usr/lib/$(LIB_PREFIX)plds4:' \
+	sed -e 's:$(DIST)/lib/$(LIB_PREFIX)plc4:${ROOT}usr/'"$(get_libdir)"'/nspr/$(LIB_PREFIX)plc4:' \
+		-e 's:$(DIST)/lib/$(LIB_PREFIX)plds4:${ROOT}usr/'"$(get_libdir)"'/nspr/$(LIB_PREFIX)plds4:' \
 		-i ${S}/mozilla/security/nss/lib/ckfw/builtins/Makefile
-	sed -e 's:$(DIST)/lib/$(LIB_PREFIX)plc4:${ROOT}usr/lib/$(LIB_PREFIX)plc4:' \
-		-e 's:$(DIST)/lib/$(LIB_PREFIX)plds4:${ROOT}usr/lib/$(LIB_PREFIX)plds4:' \
+	sed -e 's:$(DIST)/lib/$(LIB_PREFIX)plc4:${ROOT}usr/'"$(get_libdir)"'/nspr/$(LIB_PREFIX)plc4:' \
+		-e 's:$(DIST)/lib/$(LIB_PREFIX)plds4:${ROOT}usr/'"$(get_libdir)"'/nspr/$(LIB_PREFIX)plds4:' \
 		-i ${S}/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
 
+	# cope with nspr being in /usr/$(get_libdir)/nspr
+	sed -e 's:-L$(DIST)/lib.:-L$(DIST)/lib/ -L/usr/'"$(get_libdir)"'/nspr/ :g' \
+		-i ${S}/mozilla/security/nss/lib/ckfw/builtins/Makefile \
+		-i ${S}/mozilla/security/nss/lib/ckfw/builtins/manifest.mn \
+		-i ${S}/mozilla/security/nss/lib/ckfw/dbm/manifest.mn \
+		-i ${S}/mozilla/security/nss/cmd/platlibs.mk \
+		-i ${S}/mozilla/security/nss/cmd/pkiutil/platlibs.mk \
+		-i ${S}/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile \
+		-i ${S}/mozilla/security/nss/lib/freebl/config.mk \
+		-i ${S}/mozilla/security/nss/lib/nss/config.mk \
+		-i ${S}/mozilla/security/nss/lib/smime/config.mk \
+		-i ${S}/mozilla/security/nss/lib/softoken/config.mk \
+		-i ${S}/mozilla/security/nss/lib/ssl/config.mk
+
 	# modify install path
 	sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
 		-i ${S}/mozilla/security/coreconf/source.mk
@@ -54,9 +68,9 @@ src_install () {
 
 	# put all *.a files in /usr/lib/nss (because some have conflicting names
 	# with existing libraries)
-	dodir /usr/lib/nss
-	cp -L */lib/*.a ${D}/usr/lib/nss || die "copying libs failed"
-	cp -L */lib/*.so ${D}/usr/lib/nss || die "copying shared libs failed"
+	dodir /usr/$(get_libdir)/nss
+	cp -L */lib/*.a ${D}/usr/$(get_libdir)/nss || die "copying libs failed"
+	cp -L */lib/*.so ${D}/usr/$(get_libdir)/nss || die "copying shared libs failed"
 
 	# all the include files
 	insinto /usr/include/nss
@@ -65,7 +79,7 @@ src_install () {
 
 	# coping with nss being in a different path
 	dodir /etc/env.d
-	echo 'LDPATH=/usr/lib/nss' > ${D}/etc/env.d/50nss
+	echo "LDPATH=/usr/$(get_libdir)/nss" > ${D}/etc/env.d/50nss
 
 	# NOTE: we ignore the binary files
 }