Fix from Andrew Gaffney to tee output from emerge when using just --pretend #188812.

Package-Manager: portage-2.1.3.11
RepoMan-Options: --force

5 files changed, 50 insertions, 22 deletions

diff --git a/sys-devel/crossdev/ChangeLog b/sys-devel/crossdev/ChangeLog
index bedccab1b2c7..3c85ae2f6163 100644
--- a/sys-devel/crossdev/ChangeLog
+++ b/sys-devel/crossdev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/crossdev
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.53 2007/07/29 04:36:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/ChangeLog,v 1.54 2007/10/06 13:44:38 vapier Exp $
+
+*crossdev-0.9.18-r4 (06 Oct 2007)
+
+  06 Oct 2007; Mike Frysinger <vapier@gentoo.org> files/crossdev,
+  +crossdev-0.9.18-r4.ebuild:
+  Fix from Andrew Gaffney to tee output from emerge when using just --pretend
+  #188812.
 
 *crossdev-0.9.18-r3 (29 Jul 2007)
 
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index d5eb66226d60..9b23cf117c9f 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX crossdev 18606 RMD160 d3ae2b5748a864ca108ac57aeb217cf731c525a1 SHA1 ec5da811e10abeec4117bd4f4e3b11033a119e24 SHA256 bf18a2a934b0c5a32cc39bb15f35b000e38764391015f9aed94fe61606409c45
-MD5 13eb3cd214a127f898a187a55af9e77c files/crossdev 18606
-RMD160 d3ae2b5748a864ca108ac57aeb217cf731c525a1 files/crossdev 18606
-SHA256 bf18a2a934b0c5a32cc39bb15f35b000e38764391015f9aed94fe61606409c45 files/crossdev 18606
+AUX crossdev 18633 RMD160 1cae0d990b706903d1efc3d780cda4ae5edbb502 SHA1 0e1a7ba7e9dbf661e7f8b5f06ffbcdde81112bdf SHA256 f8517ec85e00a2d3d2085f8626ed0b42863525898f7b8f84307cfc8c63828e8b
+MD5 0e7468f88d58fdd24e3c54d40b596353 files/crossdev 18633
+RMD160 1cae0d990b706903d1efc3d780cda4ae5edbb502 files/crossdev 18633
+SHA256 f8517ec85e00a2d3d2085f8626ed0b42863525898f7b8f84307cfc8c63828e8b files/crossdev 18633
 AUX crossdev-stable 18236 RMD160 8ce4dfcf55a204802c1ccc3439fc192010868ac2 SHA1 66d74f40ab62513db912da56e0b7aea006b8aa27 SHA256 fc59ee6dcb9235cc146228625b4c29ecf85eaf77bbb9b14c89178cebde0225e3
 MD5 b8e07a9c6103a15d684adc9a09c64895 files/crossdev-stable 18236
 RMD160 8ce4dfcf55a204802c1ccc3439fc192010868ac2 files/crossdev-stable 18236
@@ -13,14 +13,14 @@ EBUILD crossdev-0.9.17-r3.ebuild 663 RMD160 145598635b28fd8a481dd4d6da54c7658cf6
 MD5 51c3658daa5d63301cbe26dd605dbcdc crossdev-0.9.17-r3.ebuild 663
 RMD160 145598635b28fd8a481dd4d6da54c7658cf600f1 crossdev-0.9.17-r3.ebuild 663
 SHA256 4104f8515aaa05de4df2fc1be251f7e931421a22c5ea8eb4f1cc2ff6938fcb9f crossdev-0.9.17-r3.ebuild 663
-EBUILD crossdev-0.9.18-r3.ebuild 643 RMD160 a19ec4e7c51ae5a15ba15a66db83f306a4397ab2 SHA1 8fd72bef14ad13cbd7011b67edd82c1cccb1be46 SHA256 1bfb0c04f3f7231fe6f3b150fb120d99a63cfda83b6386ce539453f18b15069d
-MD5 0aa31177ee4b1560a5657d68297249d4 crossdev-0.9.18-r3.ebuild 643
-RMD160 a19ec4e7c51ae5a15ba15a66db83f306a4397ab2 crossdev-0.9.18-r3.ebuild 643
-SHA256 1bfb0c04f3f7231fe6f3b150fb120d99a63cfda83b6386ce539453f18b15069d crossdev-0.9.18-r3.ebuild 643
-MISC ChangeLog 10793 RMD160 ad8dd223b3b51714be4b328bd33e90ab5076cfaf SHA1 d0c5fb8424fffce0eca1e006c67f9ad2be36911d SHA256 56e29547bd12a6ea16c39e5de231e08115f0a751753b5cd4d2e27687482b47e7
-MD5 773a356e0ec4ffd28cf3e1269023d1d5 ChangeLog 10793
-RMD160 ad8dd223b3b51714be4b328bd33e90ab5076cfaf ChangeLog 10793
-SHA256 56e29547bd12a6ea16c39e5de231e08115f0a751753b5cd4d2e27687482b47e7 ChangeLog 10793
+EBUILD crossdev-0.9.18-r4.ebuild 643 RMD160 bd39d9975320511d0f0f2940bd583189393d3e0f SHA1 4f1681fd7fcbcd485e8375e71b4c53b3c3e25fcd SHA256 9cecf0961413482169a8524459e0b8087499b4ce1af8a8f5b6c2af988c5ae470
+MD5 3137c336c3cbafeb27cbc30910c50015 crossdev-0.9.18-r4.ebuild 643
+RMD160 bd39d9975320511d0f0f2940bd583189393d3e0f crossdev-0.9.18-r4.ebuild 643
+SHA256 9cecf0961413482169a8524459e0b8087499b4ce1af8a8f5b6c2af988c5ae470 crossdev-0.9.18-r4.ebuild 643
+MISC ChangeLog 11014 RMD160 c87330260aef2e61d928bf4d68f4cdfd724b8a94 SHA1 307dc2a7577774517ea7ac908f4834975ae6b600 SHA256 74ddff66b511b60a1546caa4dd345bbfd467ea04baa4a34352635f103d3e26c0
+MD5 a8cc14e3b809a097cb78d41edf2f7ea9 ChangeLog 11014
+RMD160 c87330260aef2e61d928bf4d68f4cdfd724b8a94 ChangeLog 11014
+SHA256 74ddff66b511b60a1546caa4dd345bbfd467ea04baa4a34352635f103d3e26c0 ChangeLog 11014
 MISC metadata.xml 222 RMD160 0be0385efc240909b533447fe4ce586bf39c52f5 SHA1 e965b449efbf26435730e93c78602fb5d8cdce0e SHA256 c11360fafdb92d96d343530a7f5869494a27c5cc1fec703094b1221632b6163f
 MD5 e91cdaf464f515f3528da02cf06e54a1 metadata.xml 222
 RMD160 0be0385efc240909b533447fe4ce586bf39c52f5 metadata.xml 222
@@ -28,13 +28,13 @@ SHA256 c11360fafdb92d96d343530a7f5869494a27c5cc1fec703094b1221632b6163f metadata
 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-crossdev-0.9.17-r3 0
 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-crossdev-0.9.17-r3 0
 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-crossdev-0.9.17-r3 0
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-crossdev-0.9.18-r3 0
-RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-crossdev-0.9.18-r3 0
-SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-crossdev-0.9.18-r3 0
+MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-crossdev-0.9.18-r4 0
+RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-crossdev-0.9.18-r4 0
+SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-crossdev-0.9.18-r4 0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGrBlVp/wUKkr7RBoRAt2BAJ9o4kJTEOKB6zp/kLBQy/7W4sorfACg3DBw
-wL9aoquCLIeieLkTyjx3u7c=
-=angb
+iD8DBQFHB5FMp/wUKkr7RBoRAliyAJ425RlUH1luLVXrbyXzOe7DbF1kCwCfWqDu
+Qsc9cQpchbysdLYM/9lzvpk=
+=4gHm
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/crossdev/crossdev-0.9.18-r4.ebuild b/sys-devel/crossdev/crossdev-0.9.18-r4.ebuild
new file mode 100644
index 000000000000..7cdab786fe6e
--- /dev/null
+++ b/sys-devel/crossdev/crossdev-0.9.18-r4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/crossdev-0.9.18-r4.ebuild,v 1.1 2007/10/06 13:44:38 vapier Exp $
+
+DESCRIPTION="Gentoo Cross-toolchain generator"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=sys-apps/portage-2.1
+	app-shells/bash
+	|| ( dev-util/unifdef sys-freebsd/freebsd-ubin )"
+
+src_install() {
+	dosbin "${FILESDIR}"/crossdev || die
+	dosed "s:GENTOO_PV:${PV}:" /usr/sbin/crossdev
+}
diff --git a/sys-devel/crossdev/files/crossdev b/sys-devel/crossdev/files/crossdev
index 506b5cd1fb5d..dbe323f6a33b 100755
--- a/sys-devel/crossdev/files/crossdev
+++ b/sys-devel/crossdev/files/crossdev
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.97 2007/07/29 04:36:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/crossdev/files/crossdev,v 1.98 2007/10/06 13:44:38 vapier Exp $
 
 cd /
 umask 0022 #159111
@@ -573,7 +573,7 @@ doemerge() {
 
 	set_use $1 ${USE}
 
-	if [[ ${UOPTS/-v} != ${UOPTS} ]] ; then
+	if [[ ${UOPTS/-v} != ${UOPTS} || ${UOPTS/-p} != ${UOPTS} ]] ; then
 		emerge cross-${CTARGET}/$1 ${EOPTS} \
 			2>&1 | tee ${logfile}
 	else
diff --git a/sys-devel/crossdev/files/digest-crossdev-0.9.18-r4 b/sys-devel/crossdev/files/digest-crossdev-0.9.18-r4
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/crossdev/files/digest-crossdev-0.9.18-r4