From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1S6YHb-0004gh-GW for garchives@archives.gentoo.org; Sun, 11 Mar 2012 02:13:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B9D2E05F9; Sun, 11 Mar 2012 02:13:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 568A5E05F9 for ; Sun, 11 Mar 2012 02:13:05 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9937E1B4047 for ; Sun, 11 Mar 2012 02:13:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5F3EBE5428 for ; Sun, 11 Mar 2012 02:13:03 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1331431936.6eb4270df80da11c341cd0bbf84c4943e13dada4.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: dev-libs/nss/files/, dev-libs/nss/ X-VCS-Repository: proj/mozilla X-VCS-Files: dev-libs/nss/Manifest dev-libs/nss/files/nss-3.12.5-gentoo-fixups.diff dev-libs/nss/files/nss-3.13-gentoo-fixup.patch dev-libs/nss/nss-3.13.3.ebuild X-VCS-Directories: dev-libs/nss/files/ dev-libs/nss/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 6eb4270df80da11c341cd0bbf84c4943e13dada4 X-VCS-Branch: master Date: Sun, 11 Mar 2012 02:13:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 1dc2e4f4-2dce-4a98-9530-16278e571486 X-Archives-Hash: 0d79a5e48ceb3ca3a25786bbcc247fd7 commit: 6eb4270df80da11c341cd0bbf84c4943e13dada4 Author: Jory A. Pratt gentoo org> AuthorDate: Sun Mar 11 02:12:16 2012 +0000 Commit: Jory Pratt gentoo org> CommitDate: Sun Mar 11 02:12:16 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mozilla.git;a= =3Dcommit;h=3D6eb4270d fix nss.pc to not use rpath flags --- dev-libs/nss/Manifest | 4 +- ...too-fixups.diff =3D> nss-3.13-gentoo-fixup.patch} | 32 ++++++++++--= -------- dev-libs/nss/nss-3.13.3.ebuild | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index 2ffe106..ec732c3 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,6 +1,6 @@ -AUX nss-3.12.5-gentoo-fixups.diff 6669 RMD160 af35db729406c62d0e8582e7db= 18f2f80a71c776 SHA1 e50b55be77f62516f735acfb41a1e47509572cd8 SHA256 24593= 640e682cb7a831cd8a0888397b7b20880c9cfabed76bb647cc12385aef6 AUX nss-3.12.6-gentoo-fixup-warnings.patch 301 RMD160 9bd51d07ba7e568b6f= 29b7c347a71c1717912234 SHA1 620bec7adc3c36c94075bffead0ce73cd8d3d7df SHA2= 56 e14b227f762bd21875208e241029966b1e3873edfdf0592ca69bd9714859d329 +AUX nss-3.13-gentoo-fixup.patch 6423 RMD160 335aaab44d35539ec6ae46cb00cc= 6e7fbb32f55c SHA1 cd6fe8a020404afec2934e54ea9b46dbcfdd2703 SHA256 48cc782= 4fd90bf2b03954495c93d5466a2ce831c70f876a0e14a7859132db02c AUX nss-3.13.1-solaris-gcc.patch 994 RMD160 f6bfc9b34aebf2fd4b47187884fe= 572e446aa2c0 SHA1 37ad83887a91073c94bbed698677b82160392771 SHA256 2633e73= f8bba27fb34b5872464946b1abe03a7e73e544be4f751655c6276487b DIST nss-3.13.3-add_spi+cacerts_ca_certs.patch 69983 RMD160 be90a26851b8= b431ddfcb42718917bebadaad21f SHA1 02d33b60aecc2e2cc85db1737eb17981bf50eb2= 1 SHA256 aa3e4ac057865b6c90718d1c815686867ff96540bb500b9191a632c029d2ad9e DIST nss-3.13.3.tar.gz 6083507 RMD160 844958f0cad39d0283d046104fd41349ff= 4dda4c SHA1 6b8b92d3de893ae67dc04ce9a14ab5c9495dd4a6 SHA256 efa10f2c70da4= bddabf1a6081964969bb23359b93d6eadbf4739274a77bc3587 -EBUILD nss-3.13.3.ebuild 6694 RMD160 d1c9d790b5a4a8cb80abfd495e498143af2= 3e518 SHA1 5c1f5dd98be18c3d1f014df39eac1187adcc9287 SHA256 4e4c13834698cb= 2153a6431ca10e3a6b14968ec651c7784665c618ec3484c24e +EBUILD nss-3.13.3.ebuild 6692 RMD160 ee473ef98308e9173b41118211101cee5aa= 10959 SHA1 72917f175ee26d9ec29c373e46361cac16682d19 SHA256 1480b710a0dc0d= d14268e9bb0d5ef20685c30ec75ed25c77e2fcc74ef9b2933c diff --git a/dev-libs/nss/files/nss-3.12.5-gentoo-fixups.diff b/dev-libs/= nss/files/nss-3.13-gentoo-fixup.patch similarity index 77% rename from dev-libs/nss/files/nss-3.12.5-gentoo-fixups.diff rename to dev-libs/nss/files/nss-3.13-gentoo-fixup.patch index 79ac73c..42f26c6 100644 --- a/dev-libs/nss/files/nss-3.12.5-gentoo-fixups.diff +++ b/dev-libs/nss/files/nss-3.13-gentoo-fixup.patch @@ -1,6 +1,6 @@ -diff -urN nss-3.12.5-orig/mozilla/security/nss/config/Makefile nss-3.12.= 5/mozilla/security/nss/config/Makefile ---- nss-3.12.5-orig/mozilla/security/nss/config/Makefile 1969-12-31 18:0= 0:00.000000000 -0600 -+++ nss-3.12.5/mozilla/security/nss/config/Makefile 2009-09-14 21:45:45.= 619639265 -0500 +diff -urN a/mozilla/security/nss/config/Makefile b/mozilla/security/nss/= config/Makefile +--- a/mozilla/security/nss/config/Makefile 1969-12-31 18:00:00.000000000= -0600 ++++ b/mozilla/security/nss/config/Makefile 2009-09-14 21:45:45.619639265= -0500 @@ -0,0 +1,40 @@ +CORE_DEPTH =3D ../.. +DEPTH =3D ../.. @@ -42,9 +42,9 @@ diff -urN nss-3.12.5-orig/mozilla/security/nss/config/M= akefile nss-3.12.5/mozill + +dummy: all export libs + -diff -urN nss-3.12.5-orig/mozilla/security/nss/config/nss-config.in nss-= 3.12.5/mozilla/security/nss/config/nss-config.in ---- nss-3.12.5-orig/mozilla/security/nss/config/nss-config.in 1969-12-31= 18:00:00.000000000 -0600 -+++ nss-3.12.5/mozilla/security/nss/config/nss-config.in 2009-09-14 21:4= 7:45.190638078 -0500 +diff -urN a/mozilla/security/nss/config/nss-config.in b/mozilla/security= /nss/config/nss-config.in +--- a/mozilla/security/nss/config/nss-config.in 1969-12-31 18:00:00.0000= 00000 -0600 ++++ b/mozilla/security/nss/config/nss-config.in 2009-09-14 21:47:45.1906= 38078 -0500 @@ -0,0 +1,145 @@ +#!/bin/sh + @@ -191,9 +191,9 @@ diff -urN nss-3.12.5-orig/mozilla/security/nss/config= /nss-config.in nss-3.12.5/m + echo $libdirs +fi =20 + -diff -urN nss-3.12.5-orig/mozilla/security/nss/config/nss.pc.in nss-3.12= .5/mozilla/security/nss/config/nss.pc.in ---- nss-3.12.5-orig/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:= 00:00.000000000 -0600 -+++ nss-3.12.5/mozilla/security/nss/config/nss.pc.in 2009-09-14 21:45:45= .653637310 -0500 +diff -urN a/mozilla/security/nss/config/nss.pc.in b/mozilla/security/nss= /config/nss.pc.in +--- a/mozilla/security/nss/config/nss.pc.in 1969-12-31 18:00:00.00000000= 0 -0600 ++++ b/mozilla/security/nss/config/nss.pc.in 2009-09-14 21:45:45.65363731= 0 -0500 @@ -0,0 +1,12 @@ +prefix=3D@prefix@ +exec_prefix=3D@exec_prefix@ @@ -204,12 +204,12 @@ diff -urN nss-3.12.5-orig/mozilla/security/nss/conf= ig/nss.pc.in nss-3.12.5/mozil +Description: Network Security Services +Version: @NSS_MAJOR_VERSION@.@NSS_MINOR_VERSION@.@NSS_PATCH_VERSION@ +Requires: nspr >=3D 4.8 -+Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 -Wl,-R${libdir} ++Libs: -L${libdir} -lssl3 -lsmime3 -lnssutil3 -lnss3 +Cflags: -I${includedir} + -diff -urN nss-3.12.5-orig/mozilla/security/nss/Makefile nss-3.12.5/mozil= la/security/nss/Makefile ---- nss-3.12.5-orig/mozilla/security/nss/Makefile 2008-12-02 17:24:39.00= 0000000 -0600 -+++ nss-3.12.5/mozilla/security/nss/Makefile 2009-09-14 21:45:45.6786571= 45 -0500 +diff -urN a/mozilla/security/nss/Makefile b/mozilla/security/nss/Makefil= e +--- a/mozilla/security/nss/Makefile 2008-12-02 17:24:39.000000000 -0600 ++++ b/mozilla/security/nss/Makefile 2009-09-14 21:45:45.678657145 -0500 @@ -78,7 +78,7 @@ # (7) Execute "local" rules. (OPTIONAL). # ####################################################################### @@ -232,9 +232,9 @@ diff -urN nss-3.12.5-orig/mozilla/security/nss/Makefi= le nss-3.12.5/mozilla/secur build_dbm: ifndef NSS_DISABLE_DBM cd $(CORE_DEPTH)/dbm ; $(MAKE) export libs -diff -urN nss-3.12.5-orig/mozilla/security/nss/manifest.mn nss-3.12.5/mo= zilla/security/nss/manifest.mn ---- nss-3.12.5-orig/mozilla/security/nss/manifest.mn 2008-04-04 15:36:59= .000000000 -0500 -+++ nss-3.12.5/mozilla/security/nss/manifest.mn 2009-09-14 21:45:45.7036= 56167 -0500 +diff -urN a/mozilla/security/nss/manifest.mn b/mozilla/security/nss/mani= fest.mn +--- a/mozilla/security/nss/manifest.mn 2008-04-04 15:36:59.000000000 -05= 00 ++++ b/mozilla/security/nss/manifest.mn 2009-09-14 21:45:45.703656167 -05= 00 @@ -42,6 +42,6 @@ =20 RELEASE =3D nss diff --git a/dev-libs/nss/nss-3.13.3.ebuild b/dev-libs/nss/nss-3.13.3.ebu= ild index 019a901..3b5f686 100644 --- a/dev-libs/nss/nss-3.13.3.ebuild +++ b/dev-libs/nss/nss-3.13.3.ebuild @@ -29,7 +29,7 @@ src_setup() { =20 src_prepare() { # Custom changes for gentoo - epatch "${FILESDIR}/${PN}-3.12.5-gentoo-fixups.diff" + epatch "${FILESDIR}/${PN}-3.13-gentoo-fixup.patch" epatch "${FILESDIR}/${PN}-3.12.6-gentoo-fixup-warnings.patch" epatch "${DISTDIR}/nss-3.13.3-add_spi+cacerts_ca_certs.patch" =20