From 69be656bed9e971da90524545d8d803d84d98df2 Mon Sep 17 00:00:00 2001 From: Marcelo Góes Date: Thu, 26 Jan 2006 21:42:47 +0000 Subject: 3.10 version bump for bug 120442. (Portage version: 2.0.54) --- dev-libs/nss/ChangeLog | 10 +++- dev-libs/nss/Manifest | 23 ++++------ dev-libs/nss/files/digest-nss-3.10 | 1 + dev-libs/nss/files/nss.pc.in | 11 +++++ dev-libs/nss/nss-3.10.ebuild | 93 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 121 insertions(+), 17 deletions(-) create mode 100644 dev-libs/nss/files/digest-nss-3.10 create mode 100644 dev-libs/nss/files/nss.pc.in create mode 100644 dev-libs/nss/nss-3.10.ebuild diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog index 7237c5a0d4e1..a1e415932589 100644 --- a/dev-libs/nss/ChangeLog +++ b/dev-libs/nss/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-libs/nss -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.45 2005/08/06 07:18:28 dragonheart Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.46 2006/01/26 21:42:47 vanquirius Exp $ + +*nss-3.10 (26 Jan 2006) + + 26 Jan 2006; Marcelo Goes +files/nss.pc.in, + +nss-3.10.ebuild: + 3.10 version bump for bug 120442. 06 Aug 2005; Daniel Black -files/nss-3.8-amd64.patch, -files/nss-3.8-hppa.patch, diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index f90b9632ecf2..2e9a5464594d 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -1,19 +1,12 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 6bcae02650491a8e27a7c7dcf0f7362f ChangeLog 5386 -MD5 5a175354c5a11c16ce7018948acc98be metadata.xml 218 -MD5 80437a059e77f1ec174f0985632dab5a nss-3.9.2-r2.ebuild 3263 -MD5 70c12077b7e7383d38606366f23b041f nss-3.9.2-r3.ebuild 3324 -MD5 31208c12f404d120fb880b0e8300c175 files/nss-3.9.2-ppc64.patch 526 +MD5 6fff6f2a02f311ef3fb3dc6e870ec467 attachment.cgi?id=78186 275 +MD5 5ff9f249fea8d2955ae67d2af2047376 files/digest-nss-3.10 61 MD5 5b40cac4fbb267e83bdf04c269a7c665 files/digest-nss-3.9.2-r2 62 -MD5 8e9778b27c44abf6fb4319b7f5289b21 files/nss-3.9.2-mips64.patch 508 MD5 5b40cac4fbb267e83bdf04c269a7c665 files/digest-nss-3.9.2-r3 62 MD5 a3ab6ae2213780c0e20c5b9aa8f018e9 files/nss-3.9.2-gcc4.patch 1818 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFC9GRYmdTrptrqvGERAi35AJ0S2ULE/FCrW+H4EnMIQxbicki1SACcCKLw -XFXL4SPiFDZ1wjWi0uceawo= -=T5Y4 ------END PGP SIGNATURE----- +MD5 8e9778b27c44abf6fb4319b7f5289b21 files/nss-3.9.2-mips64.patch 508 +MD5 31208c12f404d120fb880b0e8300c175 files/nss-3.9.2-ppc64.patch 526 +MD5 5a175354c5a11c16ce7018948acc98be metadata.xml 218 +MD5 2adb68348d174be3b10c6d95c81da748 nss-3.10.ebuild 3508 +MD5 80437a059e77f1ec174f0985632dab5a nss-3.9.2-r2.ebuild 3263 +MD5 70c12077b7e7383d38606366f23b041f nss-3.9.2-r3.ebuild 3324 diff --git a/dev-libs/nss/files/digest-nss-3.10 b/dev-libs/nss/files/digest-nss-3.10 new file mode 100644 index 000000000000..09ec1b0b9833 --- /dev/null +++ b/dev-libs/nss/files/digest-nss-3.10 @@ -0,0 +1 @@ +MD5 f0d75d52aff21f88d9c055bdb78f54f8 nss-3.10.tar.gz 3622858 diff --git a/dev-libs/nss/files/nss.pc.in b/dev-libs/nss/files/nss.pc.in new file mode 100644 index 000000000000..c8e9ada7c36b --- /dev/null +++ b/dev-libs/nss/files/nss.pc.in @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=/usr +libdir=/usr/lib/nss +includedir=/usr/include + +Name: NSS +Description: Mozilla Network Security Services +Version: @NSS_VER@ +Requires: nspr >= @NSPR_VER@ +Libs: -L${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3 -Wl,-R${libdir} +Cflags: -I${includedir}/nss diff --git a/dev-libs/nss/nss-3.10.ebuild b/dev-libs/nss/nss-3.10.ebuild new file mode 100644 index 000000000000..f836a9e3ec7c --- /dev/null +++ b/dev-libs/nss/nss-3.10.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.10.ebuild,v 1.1 2006/01/26 21:42:47 vanquirius Exp $ + +inherit eutils + +NSPR_VER="4.6.1" +RTM_NAME="NSS_${PV//./_}_RTM" +DESCRIPTION="Mozilla's Netscape Security Services Library that implements PKI support" +HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" +SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz" + +LICENSE="MPL-1.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +DEPEND="virtual/libc + app-arch/zip + >=dev-libs/nspr-${NSPR_VER}" + +src_unpack() { + unpack ${A} + + # hack nspr paths + echo 'INCLUDES += -I${ROOT}usr/include/nspr -I$(DIST)/include/dbm' \ + >> ${S}/mozilla/security/coreconf/headers.mk || die "failed to append include" + + sed -e 's:$(DIST)/lib/$(LIB_PREFIX)plc4:${ROOT}usr/'"$(get_libdir)"'/nspr/$(LIB_PREFIX)plc4:' \ + -e 's:$(DIST)/lib/$(LIB_PREFIX)plds4:${ROOT}usr/'"$(get_libdir)"'/nspr/$(LIB_PREFIX)plds4:' \ + -i ${S}/mozilla/security/nss/lib/ckfw/builtins/Makefile + sed -e 's:$(DIST)/lib/$(LIB_PREFIX)plc4:${ROOT}usr/'"$(get_libdir)"'/nspr/$(LIB_PREFIX)plc4:' \ + -e 's:$(DIST)/lib/$(LIB_PREFIX)plds4:${ROOT}usr/'"$(get_libdir)"'/nspr/$(LIB_PREFIX)plds4:' \ + -i ${S}/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile + + # cope with nspr being in /usr/$(get_libdir)/nspr + sed -e 's:-L$(DIST)/lib.:-L$(DIST)/lib/ -L/usr/'"$(get_libdir)"'/nspr/ :g' \ + -i ${S}/mozilla/security/nss/lib/ckfw/builtins/Makefile \ + -i ${S}/mozilla/security/nss/lib/ckfw/builtins/manifest.mn \ + -i ${S}/mozilla/security/nss/lib/ckfw/dbm/manifest.mn \ + -i ${S}/mozilla/security/nss/cmd/platlibs.mk \ + -i ${S}/mozilla/security/nss/cmd/pkiutil/platlibs.mk \ + -i ${S}/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile \ + -i ${S}/mozilla/security/nss/lib/freebl/config.mk \ + -i ${S}/mozilla/security/nss/lib/nss/config.mk \ + -i ${S}/mozilla/security/nss/lib/smime/config.mk \ + -i ${S}/mozilla/security/nss/lib/softoken/config.mk \ + -i ${S}/mozilla/security/nss/lib/ssl/config.mk + + # modify install path + sed -e 's:SOURCE_PREFIX = $(CORE_DEPTH)/\.\./dist:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ + -i ${S}/mozilla/security/coreconf/source.mk +} + +src_compile() { + cd ${S}/mozilla/security/coreconf + + emake -j1 BUILD_OPT=1 || die "coreconf make failed" + cd ${S}/mozilla/security/dbm + emake -j1 BUILD_OPT=1 || die "dbm make failed" + cd ${S}/mozilla/security/nss + emake -j1 BUILD_OPT=1 || die "nss make failed" +} + +src_install () { + cd ${S}/mozilla/security/dist + + # put all *.a files in /usr/lib/nss (because some have conflicting names + # with existing libraries) + dodir /usr/$(get_libdir)/nss + cp -L */lib/*.a ${D}/usr/$(get_libdir)/nss || die "copying libs failed" + cp -L */lib/*.so ${D}/usr/$(get_libdir)/nss || die "copying shared libs failed" + + # all the include files + insinto /usr/include/nss + doins private/nss/*.h + doins public/nss/*.h + + # coping with nss being in a different path + dodir /etc/env.d + echo "LDPATH=/usr/$(get_libdir)/nss" > ${D}/etc/env.d/50nss + + # NOTE: we ignore the binary files + + # create pkg-config file + mkdir -p ${D}/usr/$(get_libdir)/pkgconfig/ + sed -e "s:@NSS_VER@:${PV}:g" \ + -e "s:@NSPR_VER@:${NSPR_VER}:g" \ + -e "s:libdir=/usr/lib/nss:libdir=/usr/$(get_libdir)/nss:g" \ + < ${FILESDIR}/${PN}.pc.in \ + > ${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc \ + || die "pkg-config file creation failed!" +} -- cgit v1.2.3-65-gdbad