rpath fix

(Portage version: 2.1_pre4-r1)

9 files changed, 259 insertions, 5 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index 4cd3dd7e942e..4285c088c6da 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/nspr
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.42 2006/02/08 13:42:12 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.43 2006/02/09 19:10:46 anarchy Exp $
+
+*nspr-4.6.1-r2 (09 Feb 2006)
+
+  09 Feb 2006; <anarchy@gentoo.org> +files/nspr-4.6.1-config-1.patch,
+  +nspr-4.6.1-r2.ebuild:
+  rpath fix/hack
 
   08 Feb 2006; <anarchy@gentoo.org> +files/nspr-4.6.1-lang.patch,
   nspr-4.6.1-r1.ebuild:
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 4872792eff4b..44a5ecda7ad7 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,6 +1,6 @@
-MD5 9f8d0a73569b6a8e546bd16c01c1e6c4 ChangeLog 5045
-RMD160 e6b6de2b755158da2fc8c282024c33b95952788d ChangeLog 5045
-SHA256 25183b3a5d0d0982d1e66ffbf64af33e868825a3c4405b8dae287571829dbc4b ChangeLog 5045
+MD5 00e6aa6cda37c63e0788a09c4f33feb4 ChangeLog 5188
+RMD160 09c31872f07af9f97a44ecb89487c4bd1c7e342e ChangeLog 5188
+SHA256 4bde3a82a9ee6bedb303aeacc174dd9af918a0da7dac68e95317e84b54d9c0ca ChangeLog 5188
 MD5 10437559f8044e78299742d18180760e files/digest-nspr-4.1.2 63
 RMD160 65c4d3237415274ec1ce62e169cf56ff62399e4a files/digest-nspr-4.1.2 63
 SHA256 50cb6893f71edc7b685c3c4e65fb18a580913044916c83d6fd9c2aefe8707b50 files/digest-nspr-4.1.2 63
@@ -16,6 +16,9 @@ SHA256 7639d67da355e49a73e9da46a2e777855cf772783bc881e188c3ab2d178bbcad files/di
 MD5 fb58705dbbaf7c7f4b07bffeebd05eca files/digest-nspr-4.6.1-r1 521
 RMD160 af32f7cce9bc9f9f01298df4e58704cf199eb693 files/digest-nspr-4.6.1-r1 521
 SHA256 b805dd573493dd35dd96a8a19953a5e24ce9ef084e0b852ec971b660a7d26879 files/digest-nspr-4.6.1-r1 521
+MD5 fb58705dbbaf7c7f4b07bffeebd05eca files/digest-nspr-4.6.1-r2 521
+RMD160 af32f7cce9bc9f9f01298df4e58704cf199eb693 files/digest-nspr-4.6.1-r2 521
+SHA256 b805dd573493dd35dd96a8a19953a5e24ce9ef084e0b852ec971b660a7d26879 files/digest-nspr-4.6.1-r2 521
 MD5 b12990968c289b9e7f8fbb2174ec827c files/nspr-4.3-amd64.patch 7713
 RMD160 33bc221a8f59c5b7175784b777693aa19e027e4a files/nspr-4.3-amd64.patch 7713
 SHA256 da682b4d50a6093750f621afecf91f04380e0379207b82dfd6f283f714db8fde files/nspr-4.3-amd64.patch 7713
@@ -25,6 +28,9 @@ SHA256 a4444d9a9eaa70bfc22bb632e2aedac75b8e9ce658f7c67f62da2a2489625624 files/ns
 MD5 8febddba94492208369d1934210180f9 files/nspr-4.4.1-ppc64.patch 2077
 RMD160 08650a78b25a7cf6d3c10821969ccca4032ea0de files/nspr-4.4.1-ppc64.patch 2077
 SHA256 3c4e80ebb922fb4dc9a3b6f9acf728cdb230f32d58edafad2c7ac1d9084547f7 files/nspr-4.4.1-ppc64.patch 2077
+MD5 268f90a610fa729ec783fbdbed7adf1b files/nspr-4.6.1-config-1.patch 565
+RMD160 62fef94c85f636249c83cb6f4a7cc00a71adf3f6 files/nspr-4.6.1-config-1.patch 565
+SHA256 9ed8fd15102ef3de6d837d40ec5d73aef0ea45bf9059b4cf5ff1f47b6a519ed6 files/nspr-4.6.1-config-1.patch 565
 MD5 ea9d3d76a3bb62cb554c40ecd45f04ee files/nspr-4.6.1-config.patch 2722
 RMD160 75701d5dbdd25a05a3bb43539bfa5f5ea850aabd files/nspr-4.6.1-config.patch 2722
 SHA256 01bba00a314375cbb056c4e26e059515a6a0df92c62229799abca9f3fa9c7842 files/nspr-4.6.1-config.patch 2722
@@ -55,3 +61,6 @@ SHA256 e035ac48cae2fd39df495fa69dfbfb7372892371c3ba9ed48427d11b3fac72fd nspr-4.4
 MD5 67d4cf966cf1ab8d705cb7293fc1671c nspr-4.6.1-r1.ebuild 2501
 RMD160 d24d93cadf18bee21537ab90cf9ac03142fffddc nspr-4.6.1-r1.ebuild 2501
 SHA256 58d44cedd011ab8ad8b8ae358d3b06e28e2d4ce01bbdc232778b297587b94cb8 nspr-4.6.1-r1.ebuild 2501
+MD5 140e7d480d871ed3e9dfab448570b8ee nspr-4.6.1-r2.ebuild 2790
+RMD160 65c9b2006d0f3e5a6f9b69529be29f00325769cd nspr-4.6.1-r2.ebuild 2790
+SHA256 1229401bf9dede8d426fb7773a9ebd07e263da3c781851ecb64b42c1b0fd0451 nspr-4.6.1-r2.ebuild 2790
diff --git a/dev-libs/nspr/files/digest-nspr-4.6.1-r2 b/dev-libs/nspr/files/digest-nspr-4.6.1-r2
new file mode 100644
index 000000000000..4cf781ba3664
--- /dev/null
+++ b/dev-libs/nspr/files/digest-nspr-4.6.1-r2
@@ -0,0 +1,6 @@
+MD5 4179b55d590be158d3618a9937cf605b nspr-4.6.1-disable-gcc-ansi.patch.bz2 5863
+RMD160 16787ab777261ed897e4ef30480636921836aaa6 nspr-4.6.1-disable-gcc-ansi.patch.bz2 5863
+SHA256 64920c6d8af73cbd0c68e9e0f6fbf19a9d920239179ceb47424ebd6ff8ce34e3 nspr-4.6.1-disable-gcc-ansi.patch.bz2 5863
+MD5 267a63dec54e72b02831d3083fd9faaf nspr-4.6.1.tar.gz 1327028
+RMD160 75e8fe9b32df1698a9290baec122fa5bb970a75d nspr-4.6.1.tar.gz 1327028
+SHA256 30c70a5a241016d0968d148c3bdaf9d9692b5aa44426d40c01ec51654e0e0479 nspr-4.6.1.tar.gz 1327028
diff --git a/dev-libs/nspr/files/nspr-4.6.1-config-1.patch b/dev-libs/nspr/files/nspr-4.6.1-config-1.patch
new file mode 100644
index 000000000000..a7d536152520
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.6.1-config-1.patch
@@ -0,0 +1,11 @@
+--- mozilla/nsprpub/configure.orig	2006-01-14 22:41:37.000000000 +0000
++++ mozilla/nsprpub/configure	2006-01-14 22:49:14.000000000 +0000
+@@ -3893,7 +3893,7 @@
+     PR_MD_CSRCS=linux.c
+     MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
+     DSO_CFLAGS=-fPIC
+-    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@)'
++    DSO_LDOPTS='-shared -Wl,-soname -Wl,$(notdir $@).$(MOD_MINOR_VERSION)'
+     _OPTIMIZE_FLAGS=-O2
+     _DEBUG_FLAGS="-g -fno-inline"  # most people on linux use gcc/gdb, and that
+                                    # combo is not yet good at debugging inlined
diff --git a/dev-libs/nspr/nspr-4.6.1-r2.ebuild b/dev-libs/nspr/nspr-4.6.1-r2.ebuild
new file mode 100644
index 000000000000..429cb781906a
--- /dev/null
+++ b/dev-libs/nspr/nspr-4.6.1-r2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.1-r2.ebuild,v 1.1 2006/02/09 19:10:46 anarchy Exp $
+
+inherit eutils gnuconfig
+
+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
+		mirror://gentoo/${P}-disable-gcc-ansi.patch.bz2
+		http://dev.gentoo.org/~anarchy/dist/${P}-disable-gcc-ansi.patch.bz2"
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+IUSE="ipv6"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	mkdir build inst
+	epatch "${FILESDIR}"/${P}-gcc-visibility.patch
+	epatch "${DISTDIR}"/${P}-disable-gcc-ansi.patch.bz2
+	epatch "${FILESDIR}"/${P}-config.patch
+	epatch "${FILESDIR}"/${P}-config-1.patch
+	epatch "${FILESDIR}"/${P}-lang.patch
+	gnuconfig_update
+}
+
+src_compile() {
+	cd build
+
+	if use amd64 || use ppc64 || use ia64 || use s390; then
+		myconf="${myconf} --enable-64bit"
+	else
+		myconf=""
+	fi
+
+	if use ipv6; then
+		myconf="${myconf} --enable-ipv6"
+	fi
+
+	../mozilla/nsprpub/configure \
+		--build=${CBUILD:-${CHOST}} \
+		--host=${CHOST} \
+		--prefix=/usr \
+		--libdir=/usr/$(get_libdir)/nspr \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		${myconf} || die "./configure failed"
+	make || die
+}
+
+src_install () {
+	# Their build system is royally fucked, as usual
+	MINOR_VERSION=6
+	cd ${S}/build
+	make install
+	insinto /usr
+	doins -r dist/*
+	rm -rf ${D}/usr/bin/lib*.so
+
+	#removing includes/nspr/md as per fedora spec
+	# i.e a waste of space!
+	rm -rf ${D}/usr/include/nspr/md
+
+	# there have been /usr/lib/nspr changes (like the ldpath below), but never
+	# have I seen any libraries end up in this directory. lets fix that.
+	# note: I tried doing this fix via the build system. It wont work.
+	if [ ! -e ${D}/usr/lib/nspr ] ; then
+		mkdir -p ${D}/usr/lib/nspr
+		mv ${D}/usr/lib/*so* ${D}/usr/lib/nspr
+		mv ${D}/usr/lib/*\.a ${D}/usr/lib/nspr
+	fi
+	# and while we're at it, lets make it actually use the arch's libdir damnit
+	if [ "lib" != "$(get_libdir)" ] ; then
+		mv ${D}/usr/lib ${D}/usr/$(get_libdir)
+	fi
+	#and while at it move them to files with versions-ending
+	#and link them back :)
+	cd ${D}/usr/lib/${get_libdir}/nspr
+	for file in *.so; do
+	    mv ${file} ${file}.${MINOR_VERSION}
+	    ln -s ${file}.${MINOR_VERSION} ${file}
+	done
+	# cope with libraries being in /usr/lib/nspr
+	dodir /etc/env.d
+	echo "LDPATH=/usr/$(get_libdir)/nspr" > ${D}/etc/env.d/08nspr
+
+	# install nspr-config
+	insinto  /usr/bin
+	doins ${S}/build/config/nspr-config
+	chmod a+x ${D}/usr/bin/nspr-config
+
+	# create pkg-config file
+	insinto /usr/$(get_libdir)/pkgconfig/
+	doins ${S}/build/config/nspr.pc
+}
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
+}