Fixing compatibility of wrapper so it REALLY works with /bin/sh

Package-Manager: portage-2.1.4_rc13

5 files changed, 32 insertions, 28 deletions

diff --git a/rox-base/rox/ChangeLog b/rox-base/rox/ChangeLog
index d379aaa6c716..07c8ff07710c 100644
--- a/rox-base/rox/ChangeLog
+++ b/rox-base/rox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for rox-base/rox
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/ChangeLog,v 1.52 2008/01/02 12:39:49 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/ChangeLog,v 1.53 2008/01/02 12:44:42 lack Exp $
+
+  02 Jan 2008; Jim Ramsay <lack@gentoo.org> rox-2.6.1.ebuild,
+  rox-2.7.ebuild, rox-2.7-r2.ebuild:
+  Fixing compatibility of wrapper so it REALLY works with /bin/sh
 
   02 Jan 2008; Jim Ramsay <lack@gentoo.org> -rox-2.7-r1.ebuild,
   rox-2.7-r2.ebuild:
diff --git a/rox-base/rox/Manifest b/rox-base/rox/Manifest
index 7f1dd7f5fdf2..cd9e266417d0 100644
--- a/rox-base/rox/Manifest
+++ b/rox-base/rox/Manifest
@@ -8,22 +8,22 @@ RMD160 8b54d9493f0a4b81632a4d448b1003402859c6dc files/rox-2.7-nostrip.patch 664
 SHA256 4fce67a2c336f8ce66f3eccc9ab42b52f16bb99c03e6f29369024e11821a03fc files/rox-2.7-nostrip.patch 664
 DIST rox-filer-2.6.1.tar.bz2 1816711 RMD160 94a3320883c49066072d44f25f417e20739711ca SHA1 5364ac260970ecafa58f92892becf8104db025a3 SHA256 e7efefbfa8e37ba7263771bdfd0b16c9f4b47b09d301b82616012ad53eb03e02
 DIST rox-filer-2.7.tar.bz2 1829001 RMD160 f378129073b00e388559380fc551b23437cd4cbf SHA1 421a9999885b04482e3efb6da18705e6788cb4da SHA256 c43ad72760e5ef2c9150d00c7beae24c99c1df102443e87e6ccd969427a47c92
-EBUILD rox-2.6.1.ebuild 2845 RMD160 21801617c5532fd71e63c4de6872c5f1e3d10ee1 SHA1 15bdd51222086a66284c9dcbb8c41fd33b142e28 SHA256 18acd291bfeb0d42e17dfa613c09ff7e7b46e449d9af7234446760838c11b2a9
-MD5 39916c579b032ac94a820ce86ee5b0dd rox-2.6.1.ebuild 2845
-RMD160 21801617c5532fd71e63c4de6872c5f1e3d10ee1 rox-2.6.1.ebuild 2845
-SHA256 18acd291bfeb0d42e17dfa613c09ff7e7b46e449d9af7234446760838c11b2a9 rox-2.6.1.ebuild 2845
-EBUILD rox-2.7-r2.ebuild 3627 RMD160 d3e3204d7cf66f14bef5a673e5082428c994499e SHA1 041495c40045a2c1eaf5c0b35d66750ddd89b811 SHA256 063243fdc8f245f713c7f39a59ea818ebba6634b3748102bccbc9b9ad7e26f65
-MD5 28de79f6537454c2f557b2d2463d64d1 rox-2.7-r2.ebuild 3627
-RMD160 d3e3204d7cf66f14bef5a673e5082428c994499e rox-2.7-r2.ebuild 3627
-SHA256 063243fdc8f245f713c7f39a59ea818ebba6634b3748102bccbc9b9ad7e26f65 rox-2.7-r2.ebuild 3627
-EBUILD rox-2.7.ebuild 2845 RMD160 5903769110b983ce4661de3777268250ec2ab8c6 SHA1 e5b2f16ad1b4e21693f181407b4aec12acc7f54b SHA256 aaa9149406e454e0db341b4c1bb7a270d462477f6d9b2c0184da392922fb4726
-MD5 d64d7d908b21b1e0269df03c078f1c85 rox-2.7.ebuild 2845
-RMD160 5903769110b983ce4661de3777268250ec2ab8c6 rox-2.7.ebuild 2845
-SHA256 aaa9149406e454e0db341b4c1bb7a270d462477f6d9b2c0184da392922fb4726 rox-2.7.ebuild 2845
-MISC ChangeLog 11982 RMD160 190c1a477e33ef5090daeed9c3200c765687dce5 SHA1 2681e83562af28dda423d6cc327e00322174dfa8 SHA256 8530fa51bbfa8bb111d4df79e03c69a7a042147cc29ae878635dab4d46fc90d5
-MD5 14e7fa87fc3ae38ac79d10f214fe57a1 ChangeLog 11982
-RMD160 190c1a477e33ef5090daeed9c3200c765687dce5 ChangeLog 11982
-SHA256 8530fa51bbfa8bb111d4df79e03c69a7a042147cc29ae878635dab4d46fc90d5 ChangeLog 11982
+EBUILD rox-2.6.1.ebuild 2838 RMD160 72b13c5ca858a09acd243606faacded52354b00b SHA1 c0614ddb653803973b5ed737d1952c70a05dfcbc SHA256 18f897f0e834c0901540419242940e18a3774a5df08a76d7c9832c514e5e9972
+MD5 34ef49ff39710a47c2434cfa78724e99 rox-2.6.1.ebuild 2838
+RMD160 72b13c5ca858a09acd243606faacded52354b00b rox-2.6.1.ebuild 2838
+SHA256 18f897f0e834c0901540419242940e18a3774a5df08a76d7c9832c514e5e9972 rox-2.6.1.ebuild 2838
+EBUILD rox-2.7-r2.ebuild 3623 RMD160 3a09522ae29cf615be6235ccc239062c0943a33e SHA1 9a3a5e2cdb0f0621700e943fa9440309db26a99d SHA256 53e7409fe7ffb98594083023aff2dde9b9de9c3535dd4bd612a7a8b4e814117b
+MD5 4cc186aed52f741f4e9dbcfde29a2d11 rox-2.7-r2.ebuild 3623
+RMD160 3a09522ae29cf615be6235ccc239062c0943a33e rox-2.7-r2.ebuild 3623
+SHA256 53e7409fe7ffb98594083023aff2dde9b9de9c3535dd4bd612a7a8b4e814117b rox-2.7-r2.ebuild 3623
+EBUILD rox-2.7.ebuild 2841 RMD160 ee012af42ab3bf399a778fc7394e2920ca5f03b1 SHA1 71437013e9d53c41f69bd2a7902afbd19d8288b0 SHA256 4621f45dcedebc2a856a4b76a5c85c993033a885b61134df700abbe15b179665
+MD5 d4225087ed2784f4c5f90678d5273b0d rox-2.7.ebuild 2841
+RMD160 ee012af42ab3bf399a778fc7394e2920ca5f03b1 rox-2.7.ebuild 2841
+SHA256 4621f45dcedebc2a856a4b76a5c85c993033a885b61134df700abbe15b179665 rox-2.7.ebuild 2841
+MISC ChangeLog 12148 RMD160 609396e42c04a555428472672c23d6a03b5197c6 SHA1 4e46e71c65076a5da2c5b72443a95d93910fb370 SHA256 ae45b5be87373dd0fd30040024ce483eeb340abbd414c0f6236e213c31893f66
+MD5 7ef687b738de63da46db4e879065c052 ChangeLog 12148
+RMD160 609396e42c04a555428472672c23d6a03b5197c6 ChangeLog 12148
+SHA256 ae45b5be87373dd0fd30040024ce483eeb340abbd414c0f6236e213c31893f66 ChangeLog 12148
 MISC metadata.xml 157 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f SHA1 54ccd31d923f052c9111f04c1a7d8b8f04f0a7b2 SHA256 941fe96a972d5a4f49555c01cbfab71d51e81ade3a53322fee549061aa17012c
 MD5 94ae74afbf5ec6b3f8cdcb4ea7c917bb metadata.xml 157
 RMD160 fd6d83b802caa82822e8bb4d1752063fcda9b47f metadata.xml 157
diff --git a/rox-base/rox/rox-2.6.1.ebuild b/rox-base/rox/rox-2.6.1.ebuild
index a3c7bc3f9847..a198d638a41a 100644
--- a/rox-base/rox/rox-2.6.1.ebuild
+++ b/rox-base/rox/rox-2.6.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.6.1.ebuild,v 1.7 2007/11/04 14:15:54 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.6.1.ebuild,v 1.8 2008/01/02 12:44:42 lack Exp $
 
 inherit eutils multilib
 
@@ -79,13 +79,13 @@ src_install() {
 
 	cat >"${D}/usr/bin/${WRAPPERNAME}" <<EOF
 #!/bin/sh
-if [[ "\${LIBDIRPATH}" ]]; then
+if [ "\${LIBDIRPATH}" ]; then
 	export LIBDIRPATH="\${LIBDIRPATH}:${LIBDIR}"
 else
 	export LIBDIRPATH="${LIBDIR}"
 fi
 
-if [[ "\${APPDIRPATH}" ]]; then
+if [ "\${APPDIRPATH}" ]; then
 	export APPDIRPATH="\${APPDIRPATH}:${APPDIR}"
 else
 	export APPDIRPATH="${APPDIR}"
diff --git a/rox-base/rox/rox-2.7-r2.ebuild b/rox-base/rox/rox-2.7-r2.ebuild
index 7dd39ec4ca50..be597c97edd5 100644
--- a/rox-base/rox/rox-2.7-r2.ebuild
+++ b/rox-base/rox/rox-2.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.7-r2.ebuild,v 1.3 2008/01/02 12:39:49 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.7-r2.ebuild,v 1.4 2008/01/02 12:44:42 lack Exp $
 
 EAPI=1
 inherit eutils multilib
@@ -87,13 +87,13 @@ src_install() {
 
 	cat >"${D}/usr/bin/${WRAPPERNAME}" <<EOF
 #!/bin/sh
-if [[ "\${LIBDIRPATH}" ]]; then
+if [ "\${LIBDIRPATH}" ]; then
 	export LIBDIRPATH="\${LIBDIRPATH}:${LIBDIR}"
 else
 	export LIBDIRPATH="${LIBDIR}"
 fi
 
-if [[ "\${APPDIRPATH}" ]]; then
+if [ "\${APPDIRPATH}" ]; then
 	export APPDIRPATH="\${APPDIRPATH}:${APPDIR}"
 else
 	export APPDIRPATH="${APPDIR}"
diff --git a/rox-base/rox/rox-2.7.ebuild b/rox-base/rox/rox-2.7.ebuild
index 629020c0dadd..c38a90f85f49 100644
--- a/rox-base/rox/rox-2.7.ebuild
+++ b/rox-base/rox/rox-2.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.7.ebuild,v 1.1 2007/11/30 21:36:26 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/rox-base/rox/rox-2.7.ebuild,v 1.2 2008/01/02 12:44:42 lack Exp $
 
 inherit eutils multilib
 
@@ -79,13 +79,13 @@ src_install() {
 
 	cat >"${D}/usr/bin/${WRAPPERNAME}" <<EOF
 #!/bin/sh
-if [[ "\${LIBDIRPATH}" ]]; then
+if [ "\${LIBDIRPATH}" ]; then
 	export LIBDIRPATH="\${LIBDIRPATH}:${LIBDIR}"
 else
 	export LIBDIRPATH="${LIBDIR}"
 fi
 
-if [[ "\${APPDIRPATH}" ]]; then
+if [ "\${APPDIRPATH}" ]; then
 	export APPDIRPATH="\${APPDIRPATH}:${APPDIR}"
 else
 	export APPDIRPATH="${APPDIR}"