Workaround problem where some bash versions treat $CMD specially #90970

Package-Manager: portage-2.0.51.19

4 files changed, 32 insertions, 10 deletions

diff --git a/x11-terms/xterm/ChangeLog b/x11-terms/xterm/ChangeLog
index 966833432e9c..9e2297e6eb97 100644
--- a/x11-terms/xterm/ChangeLog
+++ b/x11-terms/xterm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-terms/xterm
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.79 2005/04/27 11:37:42 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/ChangeLog,v 1.80 2005/04/30 16:20:56 agriffis Exp $
+
+  30 Apr 2005; Aron Griffis <agriffis@gentoo.org> xterm-200-r1.ebuild,
+  xterm-201.ebuild:
+  Workaround problem where some bash versions treat $CMD specially #90970
 
   27 Apr 2005; Seemant Kulleen <seemant@gentoo.org> xterm-201.ebuild:
   wasn't meant to be stabled, very very sorry
diff --git a/x11-terms/xterm/Manifest b/x11-terms/xterm/Manifest
index c0c1d933ff35..8b6db01d2628 100644
--- a/x11-terms/xterm/Manifest
+++ b/x11-terms/xterm/Manifest
@@ -1,12 +1,22 @@
-MD5 a4a58b8e3050247cda52576b9c0f1cf5 ChangeLog 11747
-MD5 a8f4e2b68b04b535b32e12816278f1da metadata.xml 231
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8bda5b10e58ca6db21c5081e9e1d1c5b xterm-200-r1.ebuild 2052
+MD5 83a5df024de5e769db4b9edab69fab98 xterm-201.ebuild 2413
 MD5 1765e27e1dc3a249bf40d42d1e1a01b8 xterm-197.ebuild 1624
+MD5 1d60a059d293775882bdd97dfce2899a ChangeLog 11914
 MD5 ec505f279a237dd970d710aa1a0bcee9 xterm-199.ebuild 1611
-MD5 cc6c77e2aabfa98173ad773e6686e68a xterm-200-r1.ebuild 1906
-MD5 25e1ba77c032a9e918d75916e7cc85df xterm-201.ebuild 2299
-MD5 262f724e0a5b9a083a6fb77ba48e5e12 files/digest-xterm-197 58
-MD5 6fae395e470f08203ce93f62fa6e896c files/digest-xterm-199 58
+MD5 a8f4e2b68b04b535b32e12816278f1da metadata.xml 231
+MD5 201c212a3232d830f73261ea29e14f66 files/xterm-no-toolbar-by-default.patch 380
 MD5 22861d1a4affc7229c468095a0103257 files/xterm-184-remove-termcap-breakage.patch 377
 MD5 7b7d35cfdf6b4601d1079f1aca757ab5 files/digest-xterm-200-r1 58
+MD5 262f724e0a5b9a083a6fb77ba48e5e12 files/digest-xterm-197 58
+MD5 6fae395e470f08203ce93f62fa6e896c files/digest-xterm-199 58
 MD5 882f30d5e789becbfab9dec94025c812 files/digest-xterm-201 58
-MD5 201c212a3232d830f73261ea29e14f66 files/xterm-no-toolbar-by-default.patch 380
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCc7IRBXaUFmZvwyMRAidRAJ9GVweDE5GYyk5iE5tnvTT0RAhBfwCghjzL
+bkkA5Wd+X1kJJxoqvaskyfM=
+=+72R
+-----END PGP SIGNATURE-----
diff --git a/x11-terms/xterm/xterm-200-r1.ebuild b/x11-terms/xterm/xterm-200-r1.ebuild
index a53014d45850..1ffea5aa2321 100644
--- a/x11-terms/xterm/xterm-200-r1.ebuild
+++ b/x11-terms/xterm/xterm-200-r1.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/x11-terms/xterm/xterm-200-r1.ebuild,v 1.2 2005/04/20 22:02:56 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-200-r1.ebuild,v 1.3 2005/04/30 16:20:57 agriffis Exp $
 
 inherit eutils flag-o-matic
 
@@ -17,6 +17,12 @@ DEPEND="virtual/x11
 	sys-apps/utempter
 	Xaw3d? ( x11-libs/Xaw3d )"
 
+src_unpack() {
+	unpack ${A}
+	# Workaround problem where some bash versions treat $CMD specially
+	sed -i 's/\<CMD\>/LINK_CMD/g' ${S}/plink.sh
+}
+
 src_compile() {
 
 	filter-flags "-fstack-protector"
diff --git a/x11-terms/xterm/xterm-201.ebuild b/x11-terms/xterm/xterm-201.ebuild
index 9099345ac809..2bdd9e2ce90a 100644
--- a/x11-terms/xterm/xterm-201.ebuild
+++ b/x11-terms/xterm/xterm-201.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/x11-terms/xterm/xterm-201.ebuild,v 1.2 2005/04/27 11:37:43 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/xterm/xterm-201.ebuild,v 1.3 2005/04/30 16:20:57 agriffis Exp $
 
 inherit eutils flag-o-matic
 
@@ -20,6 +20,8 @@ DEPEND="virtual/x11
 src_unpack() {
 	unpack ${A}; cd ${S}
 	epatch ${FILESDIR}/${PN}-no-toolbar-by-default.patch
+	# Workaround problem where some bash versions treat $CMD specially
+	sed -i 's/\<CMD\>/LINK_CMD/g' ${S}/plink.sh
 }
 
 src_compile() {