Use "type" instead of "which", as per http://archives.gentoo.org/gentoo-dev/msg_14342...

Package-Manager: portage-2.1.2-r9

diff --git a/app-emulation/xen-tools/ChangeLog b/app-emulation/xen-tools/ChangeLog
index 337aa6f6661920b6bcf72eb26531ed80e6d1752f..7596d3540370088b1ab17f4dd8b8eb0ff39214eb 100644 (file)
--- a/app-emulation/xen-tools/ChangeLog
+++ b/app-emulation/xen-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-emulation/xen-tools
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.19 2006/12/16 04:38:32 aross Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/ChangeLog,v 1.20 2007/03/13 06:26:34 aross Exp $
+
+  13 Mar 2007; Andrew Ross <aross@gentoo.org> xen-tools-3.0.2-r3.ebuild,
+  xen-tools-3.0.2-r4.ebuild:
+  Use "type" instead of "which", as per
+  http://archives.gentoo.org/gentoo-dev/msg_143424.xml
 
   16 Dec 2006; Andrew Ross <aross@gentoo.org> xen-tools-3.0.2-r4.ebuild:
   Narrow dep on app-emulation/xen to match version of xen-tools.

diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index 221370922a7ce212415383971114221c1196bfb5..792257e4fc718b72d281ad5de7621bdae6453423 100644 (file)
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -67,18 +67,18 @@ EBUILD xen-tools-3.0.2-r2.ebuild 4690 RMD160 4fed8c5d8c94e48c7e246eb09c3476cc4a9
 MD5 628b3541b104bc0017e1a4c388407055 xen-tools-3.0.2-r2.ebuild 4690
 RMD160 4fed8c5d8c94e48c7e246eb09c3476cc4a9d0996 xen-tools-3.0.2-r2.ebuild 4690
 SHA256 41f01585495e4b4e6a8651e61e29355a6033734ac11bc71ac9ee515b7d6e58c5 xen-tools-3.0.2-r2.ebuild 4690
-EBUILD xen-tools-3.0.2-r3.ebuild 5530 RMD160 fe932ebe8722970f5a433a0619552c6ec2f93eaf SHA1 421419794bd2c77c6780d936c91f1c19c000dfb2 SHA256 cff3399ef7a791cafcf2053c00124ab56772b730ac8aa32a088ced857b011c1e
-MD5 11588a83ffd3177430efeca5cc668ba3 xen-tools-3.0.2-r3.ebuild 5530
-RMD160 fe932ebe8722970f5a433a0619552c6ec2f93eaf xen-tools-3.0.2-r3.ebuild 5530
-SHA256 cff3399ef7a791cafcf2053c00124ab56772b730ac8aa32a088ced857b011c1e xen-tools-3.0.2-r3.ebuild 5530
-EBUILD xen-tools-3.0.2-r4.ebuild 5865 RMD160 f69f257660690861a351a9e1ce90808e4d365f9e SHA1 4543de23e4257bcf0f71b86f5a77d8d84345d7dd SHA256 69a98d505706ff9f6e575e4e3b12d922b8aee4f3ca0502ffc60e9451c945d65b
-MD5 6f8b8e8611cdc065426d8176bceea7fd xen-tools-3.0.2-r4.ebuild 5865
-RMD160 f69f257660690861a351a9e1ce90808e4d365f9e xen-tools-3.0.2-r4.ebuild 5865
-SHA256 69a98d505706ff9f6e575e4e3b12d922b8aee4f3ca0502ffc60e9451c945d65b xen-tools-3.0.2-r4.ebuild 5865
-MISC ChangeLog 6007 RMD160 297b1012d148b34cf8da7594c786ba475494ba3d SHA1 378be9f5278659f847b40d7dd872a9e7cef65ab7 SHA256 5d09b0adbfb5ca9f46d535bb1372ebffa17ef810443e92d8030b1599e9290f8f
-MD5 9ff8a5e1d0dcca46fb322dbf1cc88643 ChangeLog 6007
-RMD160 297b1012d148b34cf8da7594c786ba475494ba3d ChangeLog 6007
-SHA256 5d09b0adbfb5ca9f46d535bb1372ebffa17ef810443e92d8030b1599e9290f8f ChangeLog 6007
+EBUILD xen-tools-3.0.2-r3.ebuild 5532 RMD160 64cfd1efd361b584acf512c3b71ae7edc7bee3b6 SHA1 74f1d03f74bf5fe9d1bdffa2ed21671aa8445e6f SHA256 58e173a1c833f0331ed835c6844d7585632261b860f4da39fa1c131b167a3481
+MD5 ae77ac438f0e09224289ca9d13185cbc xen-tools-3.0.2-r3.ebuild 5532
+RMD160 64cfd1efd361b584acf512c3b71ae7edc7bee3b6 xen-tools-3.0.2-r3.ebuild 5532
+SHA256 58e173a1c833f0331ed835c6844d7585632261b860f4da39fa1c131b167a3481 xen-tools-3.0.2-r3.ebuild 5532
+EBUILD xen-tools-3.0.2-r4.ebuild 5867 RMD160 c972890e9fd533596655c9060786fe77331ee956 SHA1 51841dc30ad70a004797a4ee799fc1869b9a07ab SHA256 cfbb90fc15938b6a700c585221c0dd65f66698edbdc41a74fbf21ff3ba693ffa
+MD5 7a7cb41002faa8a7a59a7bffd11f7a8e xen-tools-3.0.2-r4.ebuild 5867
+RMD160 c972890e9fd533596655c9060786fe77331ee956 xen-tools-3.0.2-r4.ebuild 5867
+SHA256 cfbb90fc15938b6a700c585221c0dd65f66698edbdc41a74fbf21ff3ba693ffa xen-tools-3.0.2-r4.ebuild 5867
+MISC ChangeLog 6205 RMD160 3e5e3a00afda765e0eb9c4bc979eb9f2146457dc SHA1 14735bf345f4b778e4330f9af875d237630f3b17 SHA256 040e84a45a5fd71190a885f92d4aed24f7974f6df5fbf17838a34e6be89fd7d2
+MD5 4c4923d449e879f3727d4d9ffa6d066b ChangeLog 6205
+RMD160 3e5e3a00afda765e0eb9c4bc979eb9f2146457dc ChangeLog 6205
+SHA256 040e84a45a5fd71190a885f92d4aed24f7974f6df5fbf17838a34e6be89fd7d2 ChangeLog 6205
 MISC metadata.xml 156 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 SHA1 e6da014f2004758c7a806592ef9450489eebf593 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2
 MD5 559b4095659a2a2a489784de8a6ef95e metadata.xml 156
 RMD160 bb062b1ba5554779dcfd0e73baf533ce9fbcdf68 metadata.xml 156

diff --git a/app-emulation/xen-tools/xen-tools-3.0.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2-r3.ebuild
index 3457ddd72af1338d69ae6085470a85a41229be07..3a39045b794ce93b43ed28d0884221b44001199b 100644 (file)
--- a/app-emulation/xen-tools/xen-tools-3.0.2-r3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.0.2-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.0.2-r3.ebuild,v 1.1 2006/08/14 07:11:47 aross Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.0.2-r3.ebuild,v 1.2 2007/03/13 06:26:34 aross Exp $
 
 inherit mount-boot flag-o-matic distutils eutils multilib
 
@@ -54,7 +54,7 @@ pkg_setup() {
                ewarn "will be enabled anyway."
        fi
 
-       if [[ "$(scanelf -s __guard -q `which python`)" ]] ; then
+       if [[ "$(scanelf -s __guard -q `type -P python`)" ]] ; then
                eerror "xend doesn't work when python is built with stack smashing protection (ssp)."
                eerror "Please append the following to your CFLAGS and remerge python:"
                eerror "  '-fno-stack-protector -fno-stack-protector-all'"

diff --git a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
index ff4b7d933e2658d1a02b3a733d4b4d60475411c4..4dc898b13847d2c3cd2170cd75b9d9e2b7e07a03 100644 (file)
--- a/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild,v 1.2 2006/12/16 04:38:32 aross Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-3.0.2-r4.ebuild,v 1.3 2007/03/13 06:26:34 aross Exp $
 
 inherit mount-boot flag-o-matic distutils eutils multilib
 
@@ -49,7 +49,7 @@ pkg_setup() {
                ewarn "will be enabled anyway."
        fi
 
-       if [[ "$(scanelf -s __guard -q `which python`)" ]] ; then
+       if [[ "$(scanelf -s __guard -q `type -P python`)" ]] ; then
                ewarn "xend may not work when python is built with stack smashing protection (ssp)."
                ewarn "If 'xm create' fails with '<ProtocolError for /RPC2: -1 >', see bug #141866"
        fi