From e5be367b7e093a2bb0a2fdef9675190f926d3bd5 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sun, 25 Sep 2005 10:38:45 +0000 Subject: [PATCH] Touchup ebuild and run gnuconfig #99975 by Yuri Vasilevski. Package-Manager: portage-2.0.52-r1 http://www.bash.org/?136501 --- dev-libs/nspr/ChangeLog | 7 +++++-- dev-libs/nspr/Manifest | 18 +++++++++--------- dev-libs/nspr/nspr-4.4.1-r2.ebuild | 28 ++++++++++++---------------- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dev-libs/nspr/ChangeLog b/dev-libs/nspr/ChangeLog index 3b1fac5ea087..d706049083ea 100644 --- a/dev-libs/nspr/ChangeLog +++ b/dev-libs/nspr/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/nspr -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.38 2005/08/22 23:31:32 flameeyes Exp $ +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/ChangeLog,v 1.39 2005/09/25 10:38:45 vapier Exp $ + + 25 Sep 2005; Mike Frysinger nspr-4.4.1-r2.ebuild: + Touchup ebuild and run gnuconfig #99975 by Yuri Vasilevski. 22 Aug 2005; Diego Pettenò nspr-4.4.1-r2.ebuild: Unbreak on Gentoo/FreeBSD, use cp -R instead of cp -r (-L option is not diff --git a/dev-libs/nspr/Manifest b/dev-libs/nspr/Manifest index 216202b48a05..6b0fe272d27c 100644 --- a/dev-libs/nspr/Manifest +++ b/dev-libs/nspr/Manifest @@ -2,21 +2,21 @@ Hash: SHA1 MD5 249653fbfdf5589f8a8bb2f645f017a1 nspr-4.1.2.ebuild 1160 -MD5 80e81a92769f5a4ac5cc0280f225039c ChangeLog 4347 MD5 c3e6bf1670e6e6f79920efb95aff7fd5 nspr-4.4.1.ebuild 1144 +MD5 d3ce1a1e550a679dad6f7592447d4b2c nspr-4.4.1-r2.ebuild 1796 +MD5 4e09dedbd2811a413643332821c39d05 ChangeLog 4479 MD5 695935dce10dfe23aad92e8122edeaa3 nspr-4.3.ebuild 1009 -MD5 527595c7a05d02a4bd56a75ac4aaee62 nspr-4.4.1-r2.ebuild 1850 -MD5 1a031c0f4c5de0e38a0df0b5308c3453 files/nspr-4.4.1-hppa.patch 4046 -MD5 b12990968c289b9e7f8fbb2174ec827c files/nspr-4.3-amd64.patch 7713 -MD5 0a10b7414a160ead09dbd743e3128364 files/digest-nspr-4.4.1-r2 63 MD5 0a10b7414a160ead09dbd743e3128364 files/digest-nspr-4.4.1 63 MD5 10437559f8044e78299742d18180760e files/digest-nspr-4.1.2 63 -MD5 6cbbac8e2a77405ce2ab861405896548 files/digest-nspr-4.3 61 MD5 8febddba94492208369d1934210180f9 files/nspr-4.4.1-ppc64.patch 2077 +MD5 0a10b7414a160ead09dbd743e3128364 files/digest-nspr-4.4.1-r2 63 +MD5 1a031c0f4c5de0e38a0df0b5308c3453 files/nspr-4.4.1-hppa.patch 4046 +MD5 b12990968c289b9e7f8fbb2174ec827c files/nspr-4.3-amd64.patch 7713 +MD5 6cbbac8e2a77405ce2ab861405896548 files/digest-nspr-4.3 61 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDCmBij5H05b2HAEkRAq/4AJwOpdzg+vDy6LZRl2wOcyVGXuAcwwCeNyPW -jKgxnItKdGeUQZIrGQExd2c= -=2OKF +iD8DBQFDNn5sgIKl8Uu19MoRAiJqAJkBz3nCqPp28IkeYviVLzdQvWSNqACaAsJc +yX2xmeBqHrwrn8pKfxNoSss= +=HC78 -----END PGP SIGNATURE----- diff --git a/dev-libs/nspr/nspr-4.4.1-r2.ebuild b/dev-libs/nspr/nspr-4.4.1-r2.ebuild index 8464562d0512..4fc5a31e1b1d 100644 --- a/dev-libs/nspr/nspr-4.4.1-r2.ebuild +++ b/dev-libs/nspr/nspr-4.4.1-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.4.1-r2.ebuild,v 1.13 2005/08/22 23:31:32 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/nspr/nspr-4.4.1-r2.ebuild,v 1.14 2005/09/25 10:38:45 vapier Exp $ -inherit eutils +inherit eutils gnuconfig DESCRIPTION="Netscape Portable Runtime" HOMEPAGE="http://www.mozilla.org/projects/nspr/" @@ -13,25 +13,22 @@ SLOT="0" KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86" IUSE="" -DEPEND="virtual/libc" +DEPEND="" src_unpack() { unpack ${A} - mkdir ${S}/build - mkdir ${S}/inst - if [ "${ARCH}" = "amd64" ] - then - cd ${S}; epatch ${FILESDIR}/${PN}-4.3-amd64.patch - elif [ "${ARCH}" = "hppa" ] - then - cd ${S} - epatch ${FILESDIR}/${PN}-${PV}-hppa.patch - fi - epatch ${FILESDIR}/${PN}-${PV}-ppc64.patch + cd "${S}" + mkdir build inst + epatch "${FILESDIR}"/${PN}-4.3-amd64.patch + epatch "${FILESDIR}"/${PN}-${PV}-hppa.patch + epatch "${FILESDIR}"/${PN}-${PV}-ppc64.patch + gnuconfig_update } + src_compile() { - cd ${S}/build + cd build ../mozilla/nsprpub/configure \ + --build=${CBUILD:-${CHOST}} \ --host=${CHOST} \ --prefix=${S}/inst \ --infodir=/usr/share/info \ @@ -64,4 +61,3 @@ src_install () { dodir /etc/env.d echo "LDPATH=/usr/$(get_libdir)/nspr" > ${D}/etc/env.d/50nspr } - -- 2.26.2