diff options
-rw-r--r-- | dev-libs/nspr/ChangeLog | 6 | ||||
-rw-r--r-- | dev-libs/nspr/Manifest | 9 | ||||
-rw-r--r-- | dev-libs/nspr/files/nspr-4.6.1-lang.patch | 41 | ||||
-rw-r--r-- | dev-libs/nspr/nspr-4.6.1-r1.ebuild | 3 |
4 files changed, 54 insertions, 5 deletions
diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog index bd6910d4ee4d..4cd3dd7e942e 100644 --- a/dev-libs/nspr/ChangeLog +++ b/dev-libs/nspr/ChangeLog @@ -1,6 +1,10 @@ # 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.41 2006/01/30 17:35:52 anarchy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.42 2006/02/08 13:42:12 anarchy Exp $ + + 08 Feb 2006; <anarchy@gentoo.org> +files/nspr-4.6.1-lang.patch, + nspr-4.6.1-r1.ebuild: + Locales fixed thanks to vapier bug #121999 *nspr-4.6.1-r1 (30 Jan 2006) diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index 4f911409ec1c..2fb686503810 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -31,6 +31,9 @@ SHA256 01bba00a314375cbb056c4e26e059515a6a0df92c62229799abca9f3fa9c7842 files/ns MD5 094b3d2db82a236dbc4623522988a619 files/nspr-4.6.1-gcc-visibility.patch 594 RMD160 90d12fb89d8c23880d6a9c2018cddb100e1c0fb9 files/nspr-4.6.1-gcc-visibility.patch 594 SHA256 1a8f18ecff6d28b0ce92a3d59e4eb844d79e9d25eed401e6dc66c33b03f59613 files/nspr-4.6.1-gcc-visibility.patch 594 +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 215e4174aea8d00c45ee29f021a68a4e files/nspr.pc.in 250 RMD160 4b09e190d343398d26568ed0dce821f951128782 files/nspr.pc.in 250 SHA256 af16b4d93fe4615572ea1af025ff7b56763c734a4d946bb20abd62b032e08639 files/nspr.pc.in 250 @@ -49,6 +52,6 @@ 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 a18364fd901cbfbc81b1e7889948f811 nspr-4.6.1-r1.ebuild 2463 -RMD160 bdd1c12a496d13bb75b925210853b3327be81264 nspr-4.6.1-r1.ebuild 2463 -SHA256 9ba34d01f7c5b1353c8aa3eb5d19446704839c1a884087b726757b3a115e9ad9 nspr-4.6.1-r1.ebuild 2463 +MD5 3d2268acdcf6b75d2c4aeeb60c09cd87 nspr-4.6.1-r1.ebuild 2501 +RMD160 b86fe9029c564376b7871e244a10b72175906fd3 nspr-4.6.1-r1.ebuild 2501 +SHA256 1772268e2da4cedec07ab77c85cf75534ab15879551ba279912ab274dfab3386 nspr-4.6.1-r1.ebuild 2501 diff --git a/dev-libs/nspr/files/nspr-4.6.1-lang.patch b/dev-libs/nspr/files/nspr-4.6.1-lang.patch new file mode 100644 index 000000000000..46fe15b810a8 --- /dev/null +++ b/dev-libs/nspr/files/nspr-4.6.1-lang.patch @@ -0,0 +1,41 @@ +The LANG vars aren't reset early enough so when sed tries to use [a-zA-Z] in +option parsing, it may break. + +http://bugs.gentoo.org/103483 + +--- mozilla/nsprpub/configure ++++ mozilla/nsprpub/configure +@@ -54,6 +54,16 @@ + infodir='${prefix}/info' + mandir='${prefix}/man' + ++# NLS nuisances. ++# Only set these to C if already set. These must not be set unconditionally ++# because not all systems understand e.g. LANG=C (notably SCO). ++# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! ++# Non-C LC_CTYPE values break the ctype check. ++if test "${LANG+set}" = set; then LANG=C; export LANG; fi ++if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi ++if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi ++if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi ++ + # Initialize some other variables. + subdirs= + MFLAGS= MAKEFLAGS= +@@ -452,16 +463,6 @@ + esac + done + +-# NLS nuisances. +-# Only set these to C if already set. These must not be set unconditionally +-# because not all systems understand e.g. LANG=C (notably SCO). +-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +-# Non-C LC_CTYPE values break the ctype check. +-if test "${LANG+set}" = set; then LANG=C; export LANG; fi +-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +-if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi +- + # confdefs.h avoids OS command line length limits that DEFS can exceed. + rm -rf conftest* confdefs.h + # AIX cpp loses on an empty file, so make sure it contains at least a newline. diff --git a/dev-libs/nspr/nspr-4.6.1-r1.ebuild b/dev-libs/nspr/nspr-4.6.1-r1.ebuild index ce206c01a3f6..551a61ed00e2 100644 --- a/dev-libs/nspr/nspr-4.6.1-r1.ebuild +++ b/dev-libs/nspr/nspr-4.6.1-r1.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.2 2006/01/30 17:40:58 anarchy Exp $ +# $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 $ inherit eutils gnuconfig @@ -24,6 +24,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-gcc-visibility.patch epatch "${DISTDIR}"/${P}-disable-gcc-ansi.patch.bz2 epatch "${FILESDIR}"/${P}-config.patch + epatch "${FILESDIR}"/${P}-lang.patch gnuconfig_update } |