rpath fix

Package-Manager: portage-2.1_pre4-r1

4 files changed, 123 insertions, 1 deletions

diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog
index 05f0a1a36ad8..83fdeeff424d 100644
--- a/dev-libs/nss/ChangeLog
+++ b/dev-libs/nss/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/nss
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.47 2006/01/30 17:36:32 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.48 2006/02/09 19:15:41 anarchy Exp $
+
+*nss-3.11-r1 (09 Feb 2006)
+
+  09 Feb 2006; <anarchy@gentoo.org> +nss-3.11-r1.ebuild:
+  rpath fix
 
 *nss-3.11 (30 Jan 2006)
 
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index 4a613959c01c..926f3b696799 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -4,6 +4,9 @@ SHA256 55d535207693f3c85ef2357696c093f6ab53310c4182b8d0dc23afc1ea22c3bd ChangeLo
 MD5 93fb1be7be955df0ed2a022d6997abaf files/digest-nss-3.11 229
 RMD160 89faa75e6c5925884c3653d36d40297654219446 files/digest-nss-3.11 229
 SHA256 7961822db8eaec303b55897d6745dee2b5d1cb55ac79b88250bb016afe6c74fd files/digest-nss-3.11 229
+MD5 93fb1be7be955df0ed2a022d6997abaf files/digest-nss-3.11-r1 229
+RMD160 89faa75e6c5925884c3653d36d40297654219446 files/digest-nss-3.11-r1 229
+SHA256 7961822db8eaec303b55897d6745dee2b5d1cb55ac79b88250bb016afe6c74fd files/digest-nss-3.11-r1 229
 MD5 5b40cac4fbb267e83bdf04c269a7c665 files/digest-nss-3.9.2-r2 62
 RMD160 e51cf2203f48656512cb80ad47985e2f00aafa50 files/digest-nss-3.9.2-r2 62
 SHA256 f6c7f9eb5d161150cb3ae3cd06411c8bf2d539d9569b8dbed8474abb34089780 files/digest-nss-3.9.2-r2 62
@@ -34,6 +37,9 @@ SHA256 cf659c5e72e560b79a928e7cdf5ed416b286f4eefa8d5b0cab50ee846b320e75 files/ns
 MD5 5a175354c5a11c16ce7018948acc98be metadata.xml 218
 RMD160 0d285ed934300df6fa69d767f86c130ec33e9701 metadata.xml 218
 SHA256 1ccd545528e7c3c425fbddbc5c9efa829b36555cd13b392c0e4a90b8c7d7949f metadata.xml 218
+MD5 0e55cfecad01181318acf2774346b86d nss-3.11-r1.ebuild 3893
+RMD160 d1da4e76e5a47b2569887355b5ca8c3d3d9de8b6 nss-3.11-r1.ebuild 3893
+SHA256 c2f9a8c583b91c99b393651ea7dc63465c5fef9f012838f06d5d91b6adfd859b nss-3.11-r1.ebuild 3893
 MD5 106d5f5b8b902fe277a441e56c48825e nss-3.11.ebuild 3664
 RMD160 3f55d210cdd3b5dda4cc8c44f219c2ec22783a4f nss-3.11.ebuild 3664
 SHA256 c71ec76c568dc679e97245e1c95eaad44b37db8e4c274753cca7ddbed0a5f71b nss-3.11.ebuild 3664
diff --git a/dev-libs/nss/files/digest-nss-3.11-r1 b/dev-libs/nss/files/digest-nss-3.11-r1
new file mode 100644
index 000000000000..802d7b71a488
--- /dev/null
+++ b/dev-libs/nss/files/digest-nss-3.11-r1
@@ -0,0 +1,3 @@
+MD5 9be73bd73e361e5e36edf77f456fa20a nss-3.11.tar.gz 5002908
+RMD160 90be4b42e490084c23451ce8abcf089150357d1e nss-3.11.tar.gz 5002908
+SHA256 35b65a672c699f1e5fc082fccc29bcc65102ef8d31cff106f2ec68beace96809 nss-3.11.tar.gz 5002908
diff --git a/dev-libs/nss/nss-3.11-r1.ebuild b/dev-libs/nss/nss-3.11-r1.ebuild
new file mode 100644
index 000000000000..279fc729ca2b
--- /dev/null
+++ b/dev-libs/nss/nss-3.11-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.11-r1.ebuild,v 1.1 2006/02/09 19:15:41 anarchy Exp $
+
+inherit eutils
+
+NSPR_VER="4.6.1-r2"
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/libc
+	app-arch/zip
+	>=dev-libs/nspr-${NSPR_VER}"
+
+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"
+
+	# cope with nspr being in /usr/$(get_libdir)/nspr
+	sed -e 's:$(DIST)/lib:${ROOT}/usr/'"$(get_libdir)"/nspr':' \
+		-i ${S}/mozilla/security/coreconf/location.mk
+
+	# 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}-zdefs.patch
+	epatch ${FILESDIR}/${PN}-${PV}-config.patch
+	epatch ${FILESDIR}/${PN}-${PV}-config-1.patch
+}
+
+src_compile() {
+	if use amd64 || use ppc64 || use ia64 || use s390; then
+		export USE_64=1
+	fi
+	export NSDISTMODE=copy
+	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 () {
+	MINOR_VERSION=11
+	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}/nss-config.in ${D}/usr/bin/nss-config
+	cp ${FILESDIR}/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
+}