From 5894020efdd19bebca73d842f67617d8b3b8bff4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Thu, 10 Nov 2005 21:26:46 +0000 Subject: [PATCH] Move exporting of vars in src_compile() and src_install() to work around portage env bug, similar to sys-fs/e2fsprogs-1.38. Package-Manager: portage-2.0.53_rc7 --- sys-libs/com_err/ChangeLog | 6 +++++- sys-libs/com_err/com_err-1.38.ebuild | 11 ++++++++--- sys-libs/ncurses/Manifest | 15 +++------------ sys-libs/ss/ChangeLog | 6 +++++- sys-libs/ss/ss-1.38.ebuild | 11 ++++++++--- 5 files changed, 29 insertions(+), 20 deletions(-) diff --git a/sys-libs/com_err/ChangeLog b/sys-libs/com_err/ChangeLog index de98cc2cb05d..25420cc5204f 100644 --- a/sys-libs/com_err/ChangeLog +++ b/sys-libs/com_err/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/com_err # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/com_err/ChangeLog,v 1.20 2005/09/08 17:02:49 ka0ttic Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/com_err/ChangeLog,v 1.21 2005/11/10 21:22:09 flameeyes Exp $ + + 10 Nov 2005; Diego Pettenò com_err-1.38.ebuild: + Move exporting of vars in src_compile() and src_install() to work around + portage env bug, similar to sys-fs/e2fsprogs-1.38. 08 Sep 2005; Aaron Walker com_err-1.38.ebuild: Stable on mips. diff --git a/sys-libs/com_err/com_err-1.38.ebuild b/sys-libs/com_err/com_err-1.38.ebuild index 5f426c6140c1..93125668a5e0 100644 --- a/sys-libs/com_err/com_err-1.38.ebuild +++ b/sys-libs/com_err/com_err-1.38.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/com_err/com_err-1.38.ebuild,v 1.15 2005/10/13 13:02:30 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/com_err/com_err-1.38.ebuild,v 1.16 2005/11/10 21:22:09 flameeyes Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -22,12 +22,13 @@ src_unpack() { unpack ${A} cd "${S}" epatch "${FILESDIR}"/${PN}-1.37-makefile.patch +} + +src_compile() { export LDCONFIG=/bin/true export CC=$(tc-getCC) export STRIP=/bin/true -} -src_compile() { local libtype case ${USERLAND} in Darwin) libtype=bsd;; @@ -47,6 +48,10 @@ src_test() { } src_install() { + export LDCONFIG=/bin/true + export CC=$(tc-getCC) + export STRIP=/bin/true + make -C lib/et DESTDIR="${D}" install || die dosed '/^ET_DIR=/s:=.*:=/usr/share/et:' /usr/bin/compile_et dosym et/com_err.h /usr/include/com_err.h diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest index 5d4170c46f5a..f7fc8cf664fc 100644 --- a/sys-libs/ncurses/Manifest +++ b/sys-libs/ncurses/Manifest @@ -1,7 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 189ef9e1acde41c585061ec6d469d399 ChangeLog 15870 +MD5 0edf86746761d52686203e67bb8da47d ChangeLog 16087 MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r5 64 MD5 a370aabb0870d2822a0ab839947919f3 files/digest-ncurses-5.4-r6 64 MD5 97d66c7857e4be9c07d6ae8d7798a16c files/digest-ncurses-5.4.20050319 142 @@ -10,17 +7,11 @@ MD5 cfb597b362a2079e24880e47e24357df files/digest-ncurses-5.5-r1 64 MD5 118971faee11066510aa77e6c6a2c51b files/ncurses-5.4-c++-templates.patch 351 MD5 1ecbf68a55269d2cebeb997f6973fc1d files/ncurses-5.4-share-sed.patch 686 MD5 61ecd5aac5ddbd35cc4d4a00282eed01 files/ncurses-5.4-xterm.patch 495 +MD5 44e644063b6a69d58662e363af118df8 files/ncurses-5.5-gfbsd.patch 3049 MD5 2167b54d7c96964183554e767e5f5376 files/xterm-debian.ti 342 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 a885c047e0ef76d733b76f158c480f2a ncurses-5.4-r5.ebuild 6147 MD5 d303a209fc62dfcb17c00343f1fc6dcb ncurses-5.4-r6.ebuild 5385 MD5 45af8f6f6c26f746944e5e170f4ce537 ncurses-5.4.20050319.ebuild 5741 -MD5 edf823f9288a022eb5b682decb638b3c ncurses-5.5-r1.ebuild 5251 +MD5 c3076137c2592607280360168b438d9c ncurses-5.5-r1.ebuild 5294 MD5 05ffcf86aeb3d3f5c9a5bfd5a72fb2d2 ncurses-5.5.ebuild 5253 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDcrTSgIKl8Uu19MoRAm1NAKCAkkRQS0mNpQKnNauDKL8e6YIYCgCfTLws -CSh6YaUWM6qHUkLD1hqSaN0= -=mV0p ------END PGP SIGNATURE----- diff --git a/sys-libs/ss/ChangeLog b/sys-libs/ss/ChangeLog index d83329b3ae99..91224e819889 100644 --- a/sys-libs/ss/ChangeLog +++ b/sys-libs/ss/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/ss # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ChangeLog,v 1.19 2005/09/10 05:50:48 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ChangeLog,v 1.20 2005/11/10 21:26:46 flameeyes Exp $ + + 10 Nov 2005; Diego Pettenò ss-1.38.ebuild: + Move exporting of vars in src_compile() and src_install() to work around + portage env bug, similar to sys-fs/e2fsprogs-1.38. 10 Sep 2005; Mike Frysinger +files/ss-1.38-locale.patch, ss-1.38.ebuild: diff --git a/sys-libs/ss/ss-1.38.ebuild b/sys-libs/ss/ss-1.38.ebuild index 0ec184978bb3..f6ffeb5daf6b 100644 --- a/sys-libs/ss/ss-1.38.ebuild +++ b/sys-libs/ss/ss-1.38.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ss-1.38.ebuild,v 1.15 2005/09/25 22:16:31 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ss/ss-1.38.ebuild,v 1.16 2005/11/10 21:26:46 flameeyes Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -24,12 +24,13 @@ src_unpack() { cd "${S}" epatch "${FILESDIR}"/${PN}-1.38-locale.patch epatch "${FILESDIR}"/${PN}-1.37-makefile.patch +} + +src_compile() { export LDCONFIG=/bin/true export CC=$(tc-getCC) export STRIP=/bin/true -} -src_compile() { local libtype case ${USERLAND} in Darwin) libtype=bsd;; @@ -49,6 +50,10 @@ src_test() { } src_install() { + export LDCONFIG=/bin/true + export CC=$(tc-getCC) + export STRIP=/bin/true + dodir /usr/share/man/man1 make -C lib/ss DESTDIR="${D}" install || die -- 2.26.2