Fix bug #210041, bug #210039, thanks to vapier

(Portage version: 2.1.3.19)

4 files changed, 41 insertions, 23 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index 37df9566993c..f7f7cdb1ae7c 100644
--- a/dev-libs/nspr/ChangeLog
+++ b/dev-libs/nspr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/nspr
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.94 2008/02/11 12:13:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.95 2008/02/14 11:09:23 armin76 Exp $
+
+  14 Feb 2008; Raúl Porcel <armin76@gentoo.org> nspr-4.6.7.ebuild,
+  nspr-4.6.8.ebuild, nspr-4.7.ebuild:
+  Fix bug #210041, bug #210039, thanks to vapier
 
 *nspr-4.7 (11 Feb 2008)
 *nspr-4.6.8 (11 Feb 2008)
diff --git a/dev-libs/nspr/nspr-4.6.7.ebuild b/dev-libs/nspr/nspr-4.6.7.ebuild
index 92a30fea2892..66b850601775 100644
--- a/dev-libs/nspr/nspr-4.6.7.ebuild
+++ b/dev-libs/nspr/nspr-4.6.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.7.ebuild,v 1.9 2007/12/17 23:34:06 redhatter Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.7.ebuild,v 1.10 2008/02/14 11:09:23 armin76 Exp $
 
-inherit eutils multilib
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Netscape Portable Runtime"
 HOMEPAGE="http://www.mozilla.org/projects/nspr/"
@@ -28,11 +28,13 @@ src_unpack() {
 src_compile() {
 	cd build
 
-	if use amd64 || use ppc64 || use ia64 || use s390; then
-		myconf="${myconf} --enable-64bit"
-	else
-		myconf=""
-	fi
+	echo > "${T}"/test.c
+	$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
+	case $(file "${T}"/test.o) in
+	    *64-bit*) myconf="${myconf} --enable-64bit";;
+	    *32-bit*) ;;
+	    *) die "FAIL";;
+	esac
 
 	if use ipv6; then
 		myconf="${myconf} --enable-ipv6"
diff --git a/dev-libs/nspr/nspr-4.6.8.ebuild b/dev-libs/nspr/nspr-4.6.8.ebuild
index 702886a2199c..11b32df4a97f 100644
--- a/dev-libs/nspr/nspr-4.6.8.ebuild
+++ b/dev-libs/nspr/nspr-4.6.8.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.8.ebuild,v 1.1 2008/02/11 12:13:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.8.ebuild,v 1.2 2008/02/14 11:09:23 armin76 Exp $
 
-inherit eutils multilib
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Netscape Portable Runtime"
 HOMEPAGE="http://www.mozilla.org/projects/nspr/"
@@ -28,11 +28,13 @@ src_unpack() {
 src_compile() {
 	cd build
 
-	if use amd64 || use ppc64 || use ia64 || use s390; then
-		myconf="${myconf} --enable-64bit"
-	else
-		myconf=""
-	fi
+	echo > "${T}"/test.c
+	$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
+	case $(file "${T}"/test.o) in
+	    *64-bit*) myconf="${myconf} --enable-64bit";;
+	    *32-bit*) ;;
+	    *) die "FAIL";;
+	esac
 
 	if use ipv6; then
 		myconf="${myconf} --enable-ipv6"
diff --git a/dev-libs/nspr/nspr-4.7.ebuild b/dev-libs/nspr/nspr-4.7.ebuild
index d358412231b6..1ed82c5e849f 100644
--- a/dev-libs/nspr/nspr-4.7.ebuild
+++ b/dev-libs/nspr/nspr-4.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.7.ebuild,v 1.1 2008/02/11 12:13:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.7.ebuild,v 1.2 2008/02/14 11:09:23 armin76 Exp $
 
-inherit eutils multilib
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="Netscape Portable Runtime"
 HOMEPAGE="http://www.mozilla.org/projects/nspr/"
@@ -28,11 +28,13 @@ src_unpack() {
 src_compile() {
 	cd "${S}"/build
 
-	if use amd64 || use ppc64 || use ia64 || use s390; then
-		myconf="${myconf} --enable-64bit"
-	else
-		myconf=""
-	fi
+	echo > "${T}"/test.c
+	$(tc-getCC) -c "${T}"/test.c -o "${T}"/test.o
+	case $(file "${T}"/test.o) in
+	    *64-bit*) myconf="${myconf} --enable-64bit";;
+	    *32-bit*) ;;
+	    *) die "FAIL";;
+	esac
 
 	if use ipv6; then
 		myconf="${myconf} --enable-ipv6"
@@ -71,3 +73,11 @@ src_install () {
 	# Remove stupid files in /usr/bin
 	rm "${D}"/usr/bin/{prerr.properties,nspr.pc}
 }
+
+pkg_preinst() {
+    preserve_old_lib /usr/$(get_libdir)/nspr/lib{nspr,plc,plds}4.so.6
+}
+
+pkg_postinst() {
+    preserve_old_lib_notify /usr/$(get_libdir)/nspr/lib{nspr,plc,plds}4.so.6
+}