adding /etc/env.d entry to get around (#71004)

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index 1a2a14dd95b9011f613a9cee51f118c206935e97..1dc06d7acd71bcfdaacdf281cd7f8697df55220d 100644 (file)
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/nspr
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.26 2004/09/19 18:55:47 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.27 2004/11/15 21:16:29 liquidx Exp $
+
+*nspr-4.4.1-r1 (15 Nov 2004)
+
+  15 Nov 2004; Alastair Tse <liquidx@gentoo.org> +nspr-4.4.1-r1.ebuild:
+  adding /etc/env.d entry to get around (#71004)
 
   19 Sep 2004; Martin Schlemmer <azarah@gentoo.org> nspr-4.4.1.ebuild:
   Do not install libs in /usr/bin.

diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 37862f7193dc4f11d008d73702eb874759c0c697..c9e46030b3ba4f3645ae43496358f0303bf3d352 100644 (file)
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 23304c583e6f5b0264e11b94b1a56a9b ChangeLog 2902
 MD5 cee0bd3a864ab0f7c990d3d51b5d45db nspr-4.1.2.ebuild 1160
 MD5 0598e8cd704060328f76cf8744c302ef nspr-4.3.ebuild 1011
+MD5 9d933b6e28846e008ccfde74dc9336dd nspr-4.4.1-r1.ebuild 1269
 MD5 0d6964f5c129a3c22f8dabc6c7088a68 nspr-4.4.1.ebuild 1142
 MD5 10437559f8044e78299742d18180760e files/digest-nspr-4.1.2 63
 MD5 6cbbac8e2a77405ce2ab861405896548 files/digest-nspr-4.3 61
-MD5 b12990968c289b9e7f8fbb2174ec827c files/nspr-4.3-amd64.patch 7713
 MD5 0a10b7414a160ead09dbd743e3128364 files/digest-nspr-4.4.1 63
+MD5 b12990968c289b9e7f8fbb2174ec827c files/nspr-4.3-amd64.patch 7713
 MD5 1a031c0f4c5de0e38a0df0b5308c3453 files/nspr-4.4.1-hppa.patch 4046
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBiq6UHTu7gpaalycRAqd7AKDTuPlyTHKHPPnhikn/Jgh56558IwCfZVkI
-RQqqtYyjd5fDfWV3BG0TjtA=
-=mUaL
------END PGP SIGNATURE-----
+MD5 0a10b7414a160ead09dbd743e3128364 files/digest-nspr-4.4.1-r1 63

diff --git a/dev-libs/nspr/files/digest-nspr-4.4.1-r1 b/dev-libs/nspr/files/digest-nspr-4.4.1-r1
new file mode 100644 (file)
index 0000000..e7a595d
--- /dev/null
+++ b/dev-libs/nspr/files/digest-nspr-4.4.1-r1
@@ -0,0 +1 @@
+MD5 6187ec5f2c01554ceef2db35160f84dc nspr-4.4.1.tar.gz 1324075

diff --git a/dev-libs/nspr/nspr-4.4.1-r1.ebuild b/dev-libs/nspr/nspr-4.4.1-r1.ebuild
new file mode 100644 (file)
index 0000000..0354ff4
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.4.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.4.1-r1.ebuild,v 1.1 2004/11/15 21:16:29 liquidx Exp $
+
+inherit eutils
+
+DESCRIPTION="Netscape Portable Runtime"
+HOMEPAGE="http://www.mozilla.org/projects/nspr/"
+SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar.gz"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+       unpack ${A}
+       mkdir ${S}/build
+       mkdir ${S}/inst
+       if [ "${ARCH}" = "amd64" ]
+       then
+               cd ${S}; epatch ${FILESDIR}/${PN}-4.3-amd64.patch
+       elif [ "${ARCH}" = "hppa" ]
+       then
+               cd ${S}
+               epatch ${FILESDIR}/${PN}-${PV}-hppa.patch
+       fi
+}
+src_compile() {
+       cd ${S}/build
+       ../mozilla/nsprpub/configure \
+               --host=${CHOST} \
+               --prefix=${S}/inst \
+               --infodir=/usr/share/info \
+               --mandir=/usr/share/man || die "./configure failed"
+       make || die
+}
+
+src_install () {
+       # Their build system is royally fucked, as usual
+       cd ${S}/build
+       make install
+       dodir /usr
+       cp -rfL dist/* ${D}/usr
+       rm -rf ${D}/usr/bin/lib*.so
+
+       # cope with libraries being in /usr/lib/nspr
+       dodir /etc/env.d
+       echo 'LDPATH=/usr/lib/nspr' > ${D}/etc/env.d/50nspr
+}

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 3db0dd3ab869a106e288bcdabc975799cbd33287..a9de419d31826e31a74723fba903dd7f3ac134f0 100644 (file)
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,11 @@
 # 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.32 2004/11/12 10:40:11 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.33 2004/11/15 21:17:30 liquidx Exp $
+
+*nss-3.9.2-r1 (15 Nov 2004)
+
+  15 Nov 2004; Alastair Tse <liquidx@gentoo.org> +nss-3.9.2-r1.ebuild:
+  adding /etc/env.d entry to get around (#71004)
 
   12 Nov 2004; Mike Gardiner <obz@gentoo.org> nss-3.9.2.ebuild:
   Keyworded ppc

diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 65a9dc4bb7efda311247b7ba512ce8f9df43517c..d4c4df91e556e51cae661418e04ce493ed2fd421 100644 (file)
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -1,10 +1,12 @@
-MD5 0ee0b76ae0dab7a386d7f3453c65753b nss-3.8.ebuild 2603
-MD5 3c0a578d2cc7fed97c8180184dea6e6f nss-3.9.2.ebuild 2222
 MD5 c9e19de67673eb26661e8ff0fee89ba5 ChangeLog 3670
 MD5 8f906ffe0aa837e5e26fe03af3043461 metadata.xml 219
-MD5 c0b014e0fdabd7754008a3112553be18 files/nss-3.8-mips.patch 689
-MD5 ef044b71f9a324137ddae80c970ea246 files/nss-3.8-hppa.patch 4758
-MD5 31208c12f404d120fb880b0e8300c175 files/nss-3.9.2-ppc64.patch 526
+MD5 0ee0b76ae0dab7a386d7f3453c65753b nss-3.8.ebuild 2603
+MD5 3c0a578d2cc7fed97c8180184dea6e6f nss-3.9.2.ebuild 2222
+MD5 fb9fc293999c6911f264e0a2746d553c nss-3.9.2-r1.ebuild 2341
+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 80da1f67cfbd587017f411109c5ca57b files/digest-nss-3.8 60
+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

diff --git a/dev-libs/nss/files/digest-nss-3.9.2-r1 b/dev-libs/nss/files/digest-nss-3.9.2-r1
new file mode 100644 (file)
index 0000000..c8fd29d
--- /dev/null
+++ b/dev-libs/nss/files/digest-nss-3.9.2-r1
@@ -0,0 +1 @@
+MD5 c10b5100510dab1e3c94b76a4d7b1f23 nss-3.9.2.tar.gz 4734817

diff --git a/dev-libs/nss/nss-3.9.2-r1.ebuild b/dev-libs/nss/nss-3.9.2-r1.ebuild
new file mode 100644 (file)
index 0000000..3a11326
--- /dev/null
+++ b/dev-libs/nss/nss-3.9.2-r1.ebuild
@@ -0,0 +1,71 @@
+# 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 $
+
+inherit eutils
+
+RTM_NAME="NSS_${PV//./_}_RTM"
+DESCRIPTION="Mozilla's Netscape 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"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc"
+IUSE=""
+
+DEPEND="virtual/libc
+       app-arch/zip
+       >=dev-libs/nspr-4.3"
+
+src_unpack() {
+       unpack ${A}
+
+       # hack nspr paths
+       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:' \
+               -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:' \
+               -i ${S}/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
+
+       # 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}-${PV}-ppc64.patch
+}
+
+src_compile() {
+       cd ${S}/mozilla/security/coreconf
+
+       emake -j1 BUILD_OPT=1 || die "coreconf make failed"
+       cd ${S}/mozilla/security/dbm
+       emake -j1 BUILD_OPT=1 || die "dbm make failed"
+       cd ${S}/mozilla/security/nss
+       emake -j1 BUILD_OPT=1 || die "nss make failed"
+}
+
+src_install () {
+       cd ${S}/mozilla/security/dist
+
+       # 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"
+
+       # all the include files
+       insinto /usr/include/nss
+       doins private/nss/*.h
+       doins public/nss/*.h
+
+       # coping with nss being in a different path
+       dodir /etc/env.d
+       echo 'LDPATH=/usr/lib/nss' > ${D}/etc/env.d/50nss
+
+       # NOTE: we ignore the binary files
+}