Gentoo Archives: gentoo-commits

From: Jory Pratt <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/files/, dev-libs/nss/
Date: Mon, 31 Oct 2011 20:15:38
Message-Id: d9eec9b5103afd7fc09463634975cb7b1ed26202.anarchy@gentoo
1 commit: d9eec9b5103afd7fc09463634975cb7b1ed26202
2 Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 31 20:15:03 2011 +0000
4 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 31 20:15:03 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/mozilla.git;a=commit;h=d9eec9b5
7
8 update nss, solaris patch needs to be ported or drop'd before moving to
9 tree
10
11 ---
12 dev-libs/nss/Manifest | 5 +--
13 dev-libs/nss/files/nss-3.12.4-solaris-gcc.patch | 33 --------------------
14 .../nss/{nss-3.12.11.ebuild => nss-3.13.1.ebuild} | 1 -
15 3 files changed, 2 insertions(+), 37 deletions(-)
16
17 diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
18 index ef682de..2d762fa 100644
19 --- a/dev-libs/nss/Manifest
20 +++ b/dev-libs/nss/Manifest
21 @@ -1,5 +1,4 @@
22 -AUX nss-3.12.4-solaris-gcc.patch 842 RMD160 83324ac0ecde97e1976bf5162e7ce01ab2ca07e6 SHA1 769562dc8fd7ecc85e4f06a88d568433f2f3f5e2 SHA256 cf2695f4d73ad9de267ffd2e47b2f8940bf56d94b51e66d1e36907b5d6368865
23 AUX nss-3.12.5-gentoo-fixups.diff 6669 RMD160 af35db729406c62d0e8582e7db18f2f80a71c776 SHA1 e50b55be77f62516f735acfb41a1e47509572cd8 SHA256 24593640e682cb7a831cd8a0888397b7b20880c9cfabed76bb647cc12385aef6
24 AUX nss-3.12.6-gentoo-fixup-warnings.patch 301 RMD160 9bd51d07ba7e568b6f29b7c347a71c1717912234 SHA1 620bec7adc3c36c94075bffead0ce73cd8d3d7df SHA256 e14b227f762bd21875208e241029966b1e3873edfdf0592ca69bd9714859d329
25 -DIST nss-3.12.11.tar.gz 5944840 RMD160 4528d4be996bce801ff5f4c978457bd17c8e8625 SHA1 187ae83a8368512bb8729c206da2ed34db1725ad SHA256 d043f8d44212bc9418b6a954ca88e05b8ab2a71f8c59e6829a9a36d8a28e9f16
26 -EBUILD nss-3.12.11.ebuild 6625 RMD160 3bf09ff1cc38df747bc74264d28b732d0a293fef SHA1 b0d71bd7112a1145d6634b8d40e768accb8902b0 SHA256 e182ebdeb1012af160e873327ac9ca49d70b75990cbc7ddb7497d72c06ac6acf
27 +DIST nss-3.13.1.tar.gz 5985329 RMD160 c1743308c380169d666e5c08b23a455f86b360bd SHA1 d8e7ee9f9f1e0bfa2ea8b72d25727634fea130a6 SHA256 95d933b59be466f19f90f595a35b4b92213fef084caecafeb89f4e2ce7160660
28 +EBUILD nss-3.13.1.ebuild 6548 RMD160 df35794b23d838ff6b9cacbd458660e98288c372 SHA1 f202807a79f289ace368daebcaba7c68d85feca5 SHA256 3fedaa7814415599ade07cc7afba0dd9ae1b17261da117d47575615db916eeef
29
30 diff --git a/dev-libs/nss/files/nss-3.12.4-solaris-gcc.patch b/dev-libs/nss/files/nss-3.12.4-solaris-gcc.patch
31 deleted file mode 100644
32 index f0a3310..0000000
33 --- a/dev-libs/nss/files/nss-3.12.4-solaris-gcc.patch
34 +++ /dev/null
35 @@ -1,33 +0,0 @@
36 ---- mozilla/security/coreconf/SunOS5.mk.orig 2009-10-02 10:51:26.617090950 +0200
37 -+++ mozilla/security/coreconf/SunOS5.mk 2009-10-02 10:53:39.756260510 +0200
38 -@@ -37,6 +37,9 @@
39 -
40 - include $(CORE_DEPTH)/coreconf/UNIX.mk
41 -
42 -+NS_USE_GCC = 1
43 -+GCC_USE_GNU_LD = 1
44 -+
45 - #
46 - # Temporary define for the Client; to be removed when binary release is used
47 - #
48 -@@ -104,7 +107,7 @@
49 - endif
50 - endif
51 -
52 --INCLUDES += -I/usr/dt/include -I/usr/openwin/include
53 -+#INCLUDES += -I/usr/dt/include -I/usr/openwin/include
54 -
55 - RANLIB = echo
56 - CPU_ARCH = sparc
57 -@@ -114,11 +117,6 @@
58 - NOMD_OS_CFLAGS += $(DSO_CFLAGS) $(OS_DEFINES) $(SOL_CFLAGS)
59 -
60 - MKSHLIB = $(CC) $(DSO_LDOPTS) $(RPATH)
61 --ifdef NS_USE_GCC
62 --ifeq (GNU,$(findstring GNU,$(shell `$(CC) -print-prog-name=ld` -v 2>&1)))
63 -- GCC_USE_GNU_LD = 1
64 --endif
65 --endif
66 - ifdef MAPFILE
67 - ifdef NS_USE_GCC
68 - ifdef GCC_USE_GNU_LD
69
70 diff --git a/dev-libs/nss/nss-3.12.11.ebuild b/dev-libs/nss/nss-3.13.1.ebuild
71 similarity index 98%
72 rename from dev-libs/nss/nss-3.12.11.ebuild
73 rename to dev-libs/nss/nss-3.13.1.ebuild
74 index c0d8283..6936143 100644
75 --- a/dev-libs/nss/nss-3.12.11.ebuild
76 +++ b/dev-libs/nss/nss-3.13.1.ebuild
77 @@ -44,7 +44,6 @@ src_prepare() {
78 sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
79 "${S}"/mozilla/security/nss/config/Makefile
80
81 - epatch "${FILESDIR}"/${PN}-3.12.4-solaris-gcc.patch # breaks non-gnu tools
82 # dirty hack
83 cd "${S}"/mozilla/security/nss
84 sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \