patch prtime for sparc and possible other archs

Package-Manager: portage-2.1_pre4-r1

5 files changed, 57 insertions, 13 deletions

diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog
index 4285c088c6da..098c779bed25 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.43 2006/02/09 19:10:46 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.44 2006/02/23 18:23:13 anarchy Exp $
+
+*nspr-4.6.1-r3 (23 Feb 2006)
+
+  23 Feb 2006; <anarchy@gentoo.org> +files/nspr-4.6.1-prtime.patch,
+  -nspr-4.6.1-r1.ebuild, +nspr-4.6.1-r3.ebuild:
+  fix to prtime for sparc and other archs
 
 *nspr-4.6.1-r2 (09 Feb 2006)
 
diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest
index 2ec44970e072..05e7827b7d3d 100644
--- a/dev-libs/nspr/Manifest
+++ b/dev-libs/nspr/Manifest
@@ -1,6 +1,6 @@
-MD5 0499292dceb960268854754ff65a6a7e ChangeLog 5188
-RMD160 756badfde8d90a9b43aa2ce650456a421d29c141 ChangeLog 5188
-SHA256 c5de48cbcd6d06f3d8fa08558d0b615f821bfeeb49054bed72de0bc9d73927f7 ChangeLog 5188
+MD5 b2c23d3b045f6f071f84f0ecf35eb0f6 ChangeLog 5377
+RMD160 46c7e08d9c7930e7bebc723dd5e4f6593dda8111 ChangeLog 5377
+SHA256 95c1b47cb09e2721c78b962e3e724441c17c94b6cb1c5c18613a1c573cb8a20e ChangeLog 5377
 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
@@ -13,12 +13,12 @@ SHA256 7639d67da355e49a73e9da46a2e777855cf772783bc881e188c3ab2d178bbcad files/di
 MD5 0a10b7414a160ead09dbd743e3128364 files/digest-nspr-4.4.1-r2 63
 RMD160 4a2aaaa9d4c3e6fd3751a7434ab0343740246a57 files/digest-nspr-4.4.1-r2 63
 SHA256 7639d67da355e49a73e9da46a2e777855cf772783bc881e188c3ab2d178bbcad files/digest-nspr-4.4.1-r2 63
-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 fb58705dbbaf7c7f4b07bffeebd05eca files/digest-nspr-4.6.1-r3 521
+RMD160 af32f7cce9bc9f9f01298df4e58704cf199eb693 files/digest-nspr-4.6.1-r3 521
+SHA256 b805dd573493dd35dd96a8a19953a5e24ce9ef084e0b852ec971b660a7d26879 files/digest-nspr-4.6.1-r3 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
@@ -40,6 +40,9 @@ SHA256 1a8f18ecff6d28b0ce92a3d59e4eb844d79e9d25eed401e6dc66c33b03f59613 files/ns
 MD5 e8905b71dabc2551ce9744076eb7cdb7 files/nspr-4.6.1-lang.patch 1718
 RMD160 6c3fb440f4b4004289de3f65b996936bcfcbaa45 files/nspr-4.6.1-lang.patch 1718
 SHA256 326f5f9d020e73a6ed8e949124eb075f21d856d0b099b8d04035ecc937cd35fb files/nspr-4.6.1-lang.patch 1718
+MD5 427516bd171200f54d93738aa4c1ab28 files/nspr-4.6.1-prtime.patch 1003
+RMD160 20a8efaffdaf51d55566c14ebac1f40d3f22303b files/nspr-4.6.1-prtime.patch 1003
+SHA256 54ed12024f4fd65bb911279faab18665b00429c7d0811c7485d4ff5c2c436237 files/nspr-4.6.1-prtime.patch 1003
 MD5 215e4174aea8d00c45ee29f021a68a4e files/nspr.pc.in 250
 RMD160 4b09e190d343398d26568ed0dce821f951128782 files/nspr.pc.in 250
 SHA256 af16b4d93fe4615572ea1af025ff7b56763c734a4d946bb20abd62b032e08639 files/nspr.pc.in 250
@@ -58,9 +61,9 @@ SHA256 6cbfbd40c1f38704379b6318690624d02ceb4c99ceb8c90dffe058f92e2061c3 nspr-4.4
 MD5 c3e6bf1670e6e6f79920efb95aff7fd5 nspr-4.4.1.ebuild 1144
 RMD160 e780fa2219e694a9e995df0513affbcf803ff016 nspr-4.4.1.ebuild 1144
 SHA256 e035ac48cae2fd39df495fa69dfbfb7372892371c3ba9ed48427d11b3fac72fd nspr-4.4.1.ebuild 1144
-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 0bc517db79b53b131a1a1fb0fb6387cc nspr-4.6.1-r2.ebuild 2786
 RMD160 de4db9490a66c3b6156adcd37bf24bab8b3baadc nspr-4.6.1-r2.ebuild 2786
 SHA256 616324649ea818ba6cf6e6c10b356489fd1675fda9e9eb4648af239e55dac60a nspr-4.6.1-r2.ebuild 2786
+MD5 e1376499b390e970718d7eba11f2b915 nspr-4.6.1-r3.ebuild 2836
+RMD160 7cc26349e9671c3ce40a08a212ab34931f353f3f nspr-4.6.1-r3.ebuild 2836
+SHA256 f63be8d94af50e9e2318670e79378947f08fded38007dff2127afc22314f7b08 nspr-4.6.1-r3.ebuild 2836
diff --git a/dev-libs/nspr/files/digest-nspr-4.6.1-r1 b/dev-libs/nspr/files/digest-nspr-4.6.1-r3
index 4cf781ba3664..4cf781ba3664 100644
--- a/dev-libs/nspr/files/digest-nspr-4.6.1-r1
+++ b/dev-libs/nspr/files/digest-nspr-4.6.1-r3
diff --git a/dev-libs/nspr/files/nspr-4.6.1-prtime.patch b/dev-libs/nspr/files/nspr-4.6.1-prtime.patch
new file mode 100644
index 000000000000..4839838f2b06
--- /dev/null
+++ b/dev-libs/nspr/files/nspr-4.6.1-prtime.patch
@@ -0,0 +1,26 @@
+--- mozilla/nsprpub/pr/src/misc/prtime.c-orig	2004-04-25 10:01:01.000000000 -0500
++++ mozilla/nsprpub/pr/src/misc/prtime.c	2006-02-23 12:07:35.098166000 -0600
+@@ -1509,7 +1509,7 @@
+                 case TT_EET: zone_offset =  2 * 60; break;
+                 case TT_JST: zone_offset =  9 * 60; break;
+                 default:
+-                  PR_ASSERT (0);
++                  return PR_FAILURE;
+                   break;
+                 }
+         }
+@@ -1551,11 +1551,12 @@
+           struct tm localTime;
+           time_t secs;
+ 
+-          PR_ASSERT(tm.tm_month > -1 
++          if (!(tm.tm_month > -1
+                                    && tm.tm_mday > 0 
+                                    && tm.tm_hour > -1
+                                    && tm.tm_min > -1
+-                                   && tm.tm_sec > -1);
++                                   && tm.tm_sec > -1)) 
++		return PR_FAILURE;
+ 
+             /*
+              * To obtain time_t from a tm structure representing the local
diff --git a/dev-libs/nspr/nspr-4.6.1-r1.ebuild b/dev-libs/nspr/nspr-4.6.1-r3.ebuild
index 551a61ed00e2..b9cc98d7eb89 100644
--- a/dev-libs/nspr/nspr-4.6.1-r1.ebuild
+++ b/dev-libs/nspr/nspr-4.6.1-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.3 2006/02/08 13:42:12 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.6.1-r3.ebuild,v 1.1 2006/02/23 18:23:13 anarchy Exp $
 
 inherit eutils gnuconfig
 
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${PV}/src/${P}.tar
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ipv6"
 
 DEPEND=""
@@ -24,7 +24,9 @@ src_unpack() {
 	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
+	epatch "${FILESDIR}"/${P}-prtime.patch
 	gnuconfig_update
 }
 
@@ -54,6 +56,7 @@ src_compile() {
 
 src_install () {
 	# Their build system is royally fucked, as usual
+	MINOR_VERSION=6
 	cd ${S}/build
 	make install
 	insinto /usr
@@ -76,7 +79,13 @@ src_install () {
 	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/$(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