From babde8690a5c46ba051dd5988b947780b8f02870 Mon Sep 17 00:00:00 2001 From: Stephen Becker Date: Sat, 25 Feb 2006 18:31:07 +0000 Subject: removing old patch, and converting old ebuilds to use the new form (Portage version: 2.1_pre4-r1) --- dev-libs/nss/ChangeLog | 6 +++++- dev-libs/nss/files/nss-3.9.2-mips64.patch | 21 --------------------- dev-libs/nss/nss-3.9.2-r2.ebuild | 6 +++--- dev-libs/nss/nss-3.9.2-r3.ebuild | 6 +++--- 4 files changed, 11 insertions(+), 28 deletions(-) delete mode 100644 dev-libs/nss/files/nss-3.9.2-mips64.patch diff --git a/dev-libs/nss/ChangeLog b/dev-libs/nss/ChangeLog index 187c1633b2d5..2f5844c8ba43 100644 --- a/dev-libs/nss/ChangeLog +++ b/dev-libs/nss/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/nss # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.49 2006/02/25 18:25:08 geoman Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/ChangeLog,v 1.50 2006/02/25 18:31:07 geoman Exp $ + + 25 Feb 2006; Stephen P. Becker + -files/nss-3.9.2-mips64.patch, nss-3.9.2-r2.ebuild, nss-3.9.2-r3.ebuild: + removing old patch, and converting old ebuilds to use the new form 25 Feb 2006; Stephen P. Becker +files/nss-mips64.patch, nss-3.11-r1.ebuild: diff --git a/dev-libs/nss/files/nss-3.9.2-mips64.patch b/dev-libs/nss/files/nss-3.9.2-mips64.patch deleted file mode 100644 index 5abb26634743..000000000000 --- a/dev-libs/nss/files/nss-3.9.2-mips64.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- mozilla/security/coreconf/Linux.mk.orig 2004-08-21 00:07:08.000000000 -0400 -+++ mozilla/security/coreconf/Linux.mk 2004-08-20 23:28:52.000000000 -0400 -@@ -106,6 +106,10 @@ - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = mips - else -+ifeq ($(OS_TEST),mips64) -+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -+ CPU_ARCH = mips64 -+else - OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE - CPU_ARCH = x86 - endif -@@ -122,6 +126,7 @@ - endif - endif - endif -+endif - - - LIBC_TAG = _glibc diff --git a/dev-libs/nss/nss-3.9.2-r2.ebuild b/dev-libs/nss/nss-3.9.2-r2.ebuild index 04cd4f0d2711..ebed163d712b 100644 --- a/dev-libs/nss/nss-3.9.2-r2.ebuild +++ b/dev-libs/nss/nss-3.9.2-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# 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.9.2-r2.ebuild,v 1.11 2005/02/06 10:40:24 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.9.2-r2.ebuild,v 1.12 2006/02/25 18:31:07 geoman Exp $ inherit eutils @@ -51,7 +51,7 @@ src_unpack() { -i ${S}/mozilla/security/coreconf/source.mk cd ${S}; epatch ${FILESDIR}/${PN}-${PV}-ppc64.patch - cd ${S}; epatch ${FILESDIR}/${PN}-${PV}-mips64.patch + cd ${S}; epatch ${FILESDIR}/${PN}-mips64.patch } src_compile() { diff --git a/dev-libs/nss/nss-3.9.2-r3.ebuild b/dev-libs/nss/nss-3.9.2-r3.ebuild index 4d29571b74db..6776fcf82130 100644 --- a/dev-libs/nss/nss-3.9.2-r3.ebuild +++ b/dev-libs/nss/nss-3.9.2-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# 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.9.2-r3.ebuild,v 1.1 2005/04/25 09:36:58 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nss/nss-3.9.2-r3.ebuild,v 1.2 2006/02/25 18:31:07 geoman Exp $ inherit eutils @@ -51,7 +51,7 @@ src_unpack() { -i ${S}/mozilla/security/coreconf/source.mk cd ${S}; epatch ${FILESDIR}/${PN}-${PV}-ppc64.patch - cd ${S}; epatch ${FILESDIR}/${PN}-${PV}-mips64.patch + cd ${S}; epatch ${FILESDIR}/${PN}-mips64.patch cd ${S}; epatch ${FILESDIR}/${PN}-${PV}-gcc4.patch } -- cgit v1.2.3-65-gdbad