Provide /usr/bin/env symlink as some shell scripts use it as a poor mans $PATH search.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 30 insertions, 19 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index fd6403121260..9eddb9289b01 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.342 2013/02/27 08:07:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.343 2013/02/28 22:43:20 vapier Exp $
+
+  28 Feb 2013; Mike Frysinger <vapier@gentoo.org> busybox-1.21.0.ebuild,
+  busybox-9999.ebuild:
+  Provide /usr/bin/env symlink as some shell scripts use it as a poor mans $PATH
+  search.
 
   27 Feb 2013; Mike Frysinger <vapier@gentoo.org> busybox-1.21.0.ebuild,
   busybox-9999.ebuild:
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 9c684e035e67..6ca65eea8d33 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -38,24 +38,24 @@ EBUILD busybox-1.19.3-r1.ebuild 8449 SHA256 89497a117be3235619155c56984ada796850
 EBUILD busybox-1.20.0.ebuild 8811 SHA256 19c606393839c21452f4352d6290495a27edddfc7b1d7fabff373da2d06a3dee SHA512 20c085027cea9ab62564f63eaf26f0ac205804ba2be6da02609dcd77c4adfa6dc6c08b56d7cb747d34938a3440bb27522a11515f50d71215f4bdca8d4c5ed04f WHIRLPOOL 822bf4e851f642d20a1786b53ca80cbeef86d2bee6d8775f395d87c254b66da991f1964c5f62e61f36d150566f0582e9c465e47285ad6315feb188435e6b5608
 EBUILD busybox-1.20.1.ebuild 8854 SHA256 6df4da6cff549e49babb76991fc9b0972b32a61e88906fc550a99e719dc861ed SHA512 72c291f76da4a018ee9b9a2a95150998afb2a5f26ad8125ac3b6e7f88c8a1aa7baf34908329aee6be7f8035041d42608d635efdbc7ec64dec901cc4b1ba7c41c WHIRLPOOL a63a743b92b9d4affa544dbe71005c0497bcf673a600c00b905043b6534dfed830cc225624e5f4c4b8166a3a7bc68f8b8ced1a90819f16943d0816278a63761b
 EBUILD busybox-1.20.2.ebuild 8690 SHA256 1561777575c2012653eaeb4940558feb4e9a2564f7368dc642ddbe83b3d81979 SHA512 1e49eeb8b67716e53287360dce03a7d706b3b11e9e8ea938a77a036b5b78dd16ecaa1fa702bf56ba33f5a5eb2df4a8c957cb9d0a5cd326af2b7344e49121659b WHIRLPOOL a58f6bee8782458c9871d312cdaa9459ddf57ce9621303c0bff1ed494cb200c2ce25611f2ab731f01165ff951fd9bfc14b29c836bcb4536610e05a45b5a726d4
-EBUILD busybox-1.21.0.ebuild 8400 SHA256 6db4a2ce395d2e15152c0ff981e0e8b7f777960850b77d4537a1d5726d54ede9 SHA512 2c01c0350c7d0cdfe0114ba83e9ad01f3582527196f225b119783d3a39a75db4bce90e96b7f3362618e17a517dcac66a7209938f0722a6b13b922e8da376505a WHIRLPOOL ccf24eb3f894a7c028ca54540c26979a9a60cd1594e9803e6f21433f63da0f2a0f77a3715336d003be82a060ed4faa25727a98a3f55caef69b6b7544fa33c42a
-EBUILD busybox-9999.ebuild 8399 SHA256 3ddd709f92cfecac81a32678f44a072452f4e0b7accec6ac81e8394ae6e79b2b SHA512 3cd3b84ef93e52034e5510e1ed67558b76a750dc93080b194b1f16524807fb797123bc4f3f921c5d3daf8777e61326cd0bc15680cc6952c787a15af6d35980ee WHIRLPOOL d5aa50e446a69a0b63dee6d9d9d0e83bfda8e2399e564a0cacc19296c5860bc94b608899595a6bb8128b84f47c6b8c8d7eb67c2974e0f9f210cae6637c0e29e3
-MISC ChangeLog 52743 SHA256 a5d12ddeb448a6bd1a3418eac5e9379b25b53561dca5eb5dff5831fbabe38387 SHA512 9d67566b2405ea1468b750d6619ff4a9cc6ee9fce127799fa7284de54f4cd9b77476ed1f4f39ae0cb4a4a38296ee1e20c7d06787574f995a036e95eee742474c WHIRLPOOL abf172247ab7882b538ca625c4d9daec3d62be45fc1e219cdd4182a989213edf568b0abfa401c57488f485ee6768222b4de2cfa014243218b5d46a913462c358
+EBUILD busybox-1.21.0.ebuild 8507 SHA256 b7691298e2c3b008c32d465c87b25c3126095274204df27006268b9848fc6fe9 SHA512 bd6937b977ab62f12d06d75ec0e3d5cdb79c023fc8e0e76b4502a6ce2a7798072b3d536e493d0a63751c238cfdd2ab522ae39313e9bf7e48026f32356ba960e9 WHIRLPOOL 439da8e7995b65e9c816ca516b9265f002e83d6b64dc3bbeba39c5038904d8ad3b0745a9a504e39a648e751a98883fea3945a187272cc1cd47f43602d64baded
+EBUILD busybox-9999.ebuild 8506 SHA256 08368826e7140b6d925b7eb348f1ccb99a851b825f9d6f4d80adee57d4f6dec0 SHA512 44f90f8eeb41cd2db2306df90debe289b7cd5ccf72bbd8185f64747067fc41717692a7609976738d6efefc9367a91d68c2ee9ae21ac74e3707dd896b5e6b4b69 WHIRLPOOL 11708cfbf79cb597a9f3ca75d0bffd77b0d1a247dbb25fecefeda5fe35aa5b5141c2b161c1e370c6c088597c0d9f4cd3db207e2071a456b3a66ec7203c11f2b7
+MISC ChangeLog 52931 SHA256 3e997dfebe661861827670e845441ab0aa1f46f12498103c460690d3c52bed2d SHA512 4e87a88a3562f9150272918d8ceb32a6c26f8e13260ab6237c5479ce6c06ea34003ce426478eadec695668e51a2305a254724ed33c0038864ddd7e0fc3d3a265 WHIRLPOOL c215ead690d9ee7f9e5d2d59a011408a316e538848771769eddae6cce74bd74fd22b7c078caf484fc718391db4f69507005e2bf9be8deb8843f1104cea3c701e
 MISC metadata.xml 708 SHA256 e17f2240f57d74f8847e7bbf4e3cf44fdcd3ab3f610e0a66eb186d2a598178be SHA512 0d26c0593b156cc5764ad03c64e9b2a724b3877e348787d57818aec6b32f995951a9c0976a92d6ba824a2a5983d0c88116b9d335e51ba0e3c7b8f89e579482ba WHIRLPOOL 2ab4758748cf6d83d1a3a1d2f5f9472825a01affe5c7fdf8cd78fb9c75a1abaf18d8895fce12c7c502453caf68dd40799f47cce502804c9ec60705af2bb4f388
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRLb8FAAoJELEHsLL7fEFWvQIP+gIw5jOhmdc/przmegdHc4Ig
-sQ4rvkBVQqwuWOHORCExIguAYX/55CwO6Fy33ZFxMbx774yS6bT6E0FY5hmFgLfP
-yVPTx+b0Cc8HuhGDbHXWWqxSJKJZZKiMysWc8fhW9SpSyWZqnfH17UpVbmp5xjIp
-jmCOjaNhnBEqme0rDHYnNS117TyQdSi4VeNISFodC6sDi3EgotqozXJ8OSKhFaTi
-4HuSe/xNP8+S28AV5uq37P+HJK3yzJ5C1iGbw4xiwyNzfebhkevHvQSc6maAeF3T
-KFH7rjIKYrVrAfr+OReUVmGMo5bO1zYOeS6Bry4Y+gVIU3WIn/s3GuRQqR04RSHF
-auU5U7Wb+k/L0Q2q3dgwN9uZWsKpn+2Nktgd2UH/a8EUVgp3NqMONoUK4lm62n/T
-ictaq2qnSY692JjxhqHetj29/zB57ZaMGErXzHoKFT2LdlmEFI9I80b3xaQL4ZtE
-pw4jG01hmwhsmfJgLvLyIAC/s6XC+5o0wG2b2tHPkPRu0GXTs879mlQGizQhF5pc
-i3RSyW7uhFTK2FK8IIlYf7U48P4oPn97COY03QJkIJoMuAd6Fod/+rbbECbLwMj3
-xLBix+0ZsbCrcx2sToiwY14TJdbcXmaSGFd2zxdaaXGpb2EEGYUwzaqtj/F6ZGOb
-1od29AhirCZc9QBiZfNU
-=kxhy
+iQIcBAEBCAAGBQJRL93YAAoJELEHsLL7fEFWUjgP/iaKj/dZdPMYZZ5hnfaeRKN3
+mhj0aGaOo5y9kAaj2bXva5zznzNVf4tx5LQybK4XPtPwVIgV66QbDPJOw8Ptwxoo
+0giNY1tkx7lW+uldsEEC4k/V99446P3LJRMrr2BMPrg+iS4kWZxTPbgSkUfYV7O7
+wiYM4AUJV9rnvfeGnKODqCkJ8bb/+CD2bIvfhuCpWieDaVd9QLNlyQ33ydFpAcga
+05XRRsX/fAbed1wMwTdrITyO9CUkNNfRR+/+PlInaLYAmU5TQiFhrVts5G7tUffu
+JKsfTlP4fMxFF2JsvoVYgyGp9licOR8WaTOmxDAdtprvoIKFsfeKKL3V0QEge/lk
+Dc+EjxHhMtefAvzKdE2vBbbzl1UgZn8lOCejP8bc29T8p50GYRUt02yADsKXmPqQ
+037b/JzPsGr0eBvCl15ezhvXZC6amB9htRbtD+SeQXQwhGXCVoTp0Ucw0fEnXvS3
+2yfgsxHhxkImLyixSgchd0zfjGJB1/20/plH7XqtR9/sXIRQVuHLmdrdRZTxLy4s
+m7cOWMXLDTvMh6CtLcuyBFLo7OJsAry0uazOmdmY3Dousk58gAZ77Js5T9Hpeldc
++6Az84HmEp6aYDnEdbQbxqUNpOXiZ+1t0Je4euDupwGIk61DMOdGBc1DnOvvo6b+
+C8FGfIerfSN5xQ8wLKhu
+=fFSz
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.21.0.ebuild b/sys-apps/busybox/busybox-1.21.0.ebuild
index 48cfdf96be9c..949dcd6d2fab 100644
--- a/sys-apps/busybox/busybox-1.21.0.ebuild
+++ b/sys-apps/busybox/busybox-1.21.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.21.0.ebuild,v 1.8 2013/02/27 08:07:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.21.0.ebuild,v 1.9 2013/02/28 22:43:20 vapier Exp $
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
 
@@ -242,6 +242,9 @@ src_install() {
 	# bundle up the symlink files for use later
 	emake DESTDIR="${ED}" install
 	rm _install/bin/busybox
+	# for compatibility, provide /usr/bin/env
+	mkdir -p _install/usr/bin
+	ln -s /bin/env _install/usr/bin/env
 	tar cf busybox-links.tar -C _install . || : #;die
 	insinto /usr/share/${PN}
 	use make-symlinks && doins busybox-links.tar
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index a1d5c9e22bf7..b767c8cc91f3 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild,v 1.14 2013/02/27 08:07:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-9999.ebuild,v 1.15 2013/02/28 22:43:20 vapier Exp $
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
 
@@ -242,6 +242,9 @@ src_install() {
 	# bundle up the symlink files for use later
 	emake DESTDIR="${ED}" install
 	rm _install/bin/busybox
+	# for compatibility, provide /usr/bin/env
+	mkdir -p _install/usr/bin
+	ln -s /bin/env _install/usr/bin/env
 	tar cf busybox-links.tar -C _install . || : #;die
 	insinto /usr/share/${PN}
 	use make-symlinks && doins busybox-links.tar