get_libdir-ized and made libnspr actually install to /usr/$(get_libdir)/nspr

4 files changed, 26 insertions, 16 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index 1dc06d7acd71..b2a03b509e26 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,12 @@
 # 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.27 2004/11/15 21:16:29 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.28 2004/11/25 04:54:46 lv Exp $
+
+*nspr-4.4.1-r2 (24 Nov 2004)
+
+  24 Nov 2004; Travis Tilley <lv@gentoo.org> -nspr-4.4.1-r1.ebuild,
+  +nspr-4.4.1-r2.ebuild:
+  get_libdir-ized and made libnspr actually install to /usr/$(get_libdir)/nspr
 
 *nspr-4.4.1-r1 (15 Nov 2004)
 
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index cc0256dc5d67..a49dd0e33a06 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,21 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fc158cfde2442ac70b176dc5f0ecc3cc ChangeLog 3055
+MD5 90d4699f04984259358ab135abc1d351 ChangeLog 3253
 MD5 cee0bd3a864ab0f7c990d3d51b5d45db nspr-4.1.2.ebuild 1160
 MD5 0598e8cd704060328f76cf8744c302ef nspr-4.3.ebuild 1011
-MD5 302aca18816802ac6f66606e2a730a94 nspr-4.4.1-r1.ebuild 1272
 MD5 0d6964f5c129a3c22f8dabc6c7088a68 nspr-4.4.1.ebuild 1142
+MD5 d2820b842a0f12cdd8e38ecfd27508ca nspr-4.4.1-r2.ebuild 1808
 MD5 10437559f8044e78299742d18180760e files/digest-nspr-4.1.2 63
 MD5 6cbbac8e2a77405ce2ab861405896548 files/digest-nspr-4.3 61
 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
-MD5 0a10b7414a160ead09dbd743e3128364 files/digest-nspr-4.4.1-r1 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBmRzIRkyva5PS18kRAs2KAKChQRTwM44JNTBckYrTsgF9VlHlCACgmh6U
-W+6wmxiHnzhtjC8DRYZdAP8=
-=ifcb
------END PGP SIGNATURE-----
+MD5 0a10b7414a160ead09dbd743e3128364 files/digest-nspr-4.4.1-r2 63
diff --git a/dev-libs/nspr/files/digest-nspr-4.4.1-r1 b/dev-libs/nspr/files/digest-nspr-4.4.1-r2
index e7a595dee6cb..e7a595dee6cb 100644
--- a/dev-libs/nspr/files/digest-nspr-4.4.1-r1
+++ b/dev-libs/nspr/files/digest-nspr-4.4.1-r2
diff --git a/dev-libs/nspr/nspr-4.4.1-r1.ebuild b/dev-libs/nspr/nspr-4.4.1-r2.ebuild
index 0354ff490781..7aec41596e3b 100644
--- a/dev-libs/nspr/nspr-4.4.1-r1.ebuild
+++ b/dev-libs/nspr/nspr-4.4.1-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/nspr/nspr-4.4.1-r1.ebuild,v 1.1 2004/11/15 21:16:29 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.4.1-r2.ebuild,v 1.1 2004/11/25 04:54:46 lv Exp $
 
 inherit eutils
 
@@ -46,7 +46,21 @@ src_install () {
 	cp -rfL dist/* ${D}/usr
 	rm -rf ${D}/usr/bin/lib*.so
 
+	# 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
+
 	# cope with libraries being in /usr/lib/nspr
 	dodir /etc/env.d
-	echo 'LDPATH=/usr/lib/nspr' > ${D}/etc/env.d/50nspr
+	echo "LDPATH=/usr/$(get_libdir)/nspr" > ${D}/etc/env.d/50nspr
 }
+