From 4eb453ac55dd165107b78256efa9a36daee03273 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Wed, 7 Mar 2007 22:04:42 +0000 Subject: [PATCH] Change all instances of [ to [[. Package-Manager: portage-2.1.2.1 --- app-emulation/emul-linux-x86-java/ChangeLog | 8 ++- app-emulation/emul-linux-x86-java/Manifest | 50 +++++++++++-------- .../emul-linux-x86-java-1.4.2.03-r2.ebuild | 12 ++--- .../emul-linux-x86-java-1.5.0.10.ebuild | 4 +- .../emul-linux-x86-java-1.5.0.11.ebuild | 4 +- .../emul-linux-x86-java-1.6.0.ebuild | 4 +- 6 files changed, 49 insertions(+), 33 deletions(-) diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog index 5e33815cbefa..4c1c7f615461 100644 --- a/app-emulation/emul-linux-x86-java/ChangeLog +++ b/app-emulation/emul-linux-x86-java/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/emul-linux-x86-java # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.21 2007/02/11 22:47:48 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.22 2007/03/07 22:04:42 wolf31o2 Exp $ + + 07 Mar 2007; Chris Gianelloni + emul-linux-x86-java-1.4.2.03-r2.ebuild, + emul-linux-x86-java-1.5.0.10.ebuild, emul-linux-x86-java-1.5.0.11.ebuild, + emul-linux-x86-java-1.6.0.ebuild: + Change all instances of [ to [[. *emul-linux-x86-java-1.5.0.11 (11 Feb 2007) diff --git a/app-emulation/emul-linux-x86-java/Manifest b/app-emulation/emul-linux-x86-java/Manifest index d19c1cf15f3b..a408b7a25941 100644 --- a/app-emulation/emul-linux-x86-java/Manifest +++ b/app-emulation/emul-linux-x86-java/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX construct-1.6.sh 6798 RMD160 799ca391fbd21f367967d7c9ecd41426f4a72401 SHA1 014a26831f8f3cee9653d42cd194216cda2e1787 SHA256 32639949b003703e236257f3d2d3272659ab89c80b2819bdb552af2d5f3070d7 MD5 7d7c11a7876fbf6faa240eba586f7793 files/construct-1.6.sh 6798 RMD160 799ca391fbd21f367967d7c9ecd41426f4a72401 files/construct-1.6.sh 6798 @@ -26,26 +29,26 @@ DIST j2re-1.4.2-03-linux-i586.bin 13541431 RMD160 82c707956dc65e9640fda97587ac74 DIST jdk-1_5_0_10-dlj-linux-i586.bin 49553457 RMD160 8aa7b53064831d800b8aeae67ffd3f5e4e2e3155 SHA1 fc4883d6da60940cbe4b6c2575478cead26313ff SHA256 e4300d88ae630f02132a4ce23afbdc40f994de91b37d4b64cb1da0b58df678fa DIST jdk-1_5_0_11-dlj-linux-i586.bin 49598681 RMD160 74c5bd78450397006ea145580c3554d77b64a31d SHA1 965e4983da769b6c5d6ec79c942337bc8bee5c8a SHA256 da7c0217c1c6d47aad77a8b5ca0b30b01846c8090d5b1d5907862ef7122a1705 DIST jdk-6-dlj-linux-i586.bin 62718862 RMD160 4ff9f1f82b20f0dbd792e6765c02d87749e00aac SHA1 bc7a56952b362e472a0ec179e0852ca7bf0c0507 SHA256 1c4f98edb6c1b379807d9dab61971c0271b2b4cf1f1be914cc85354744408467 -EBUILD emul-linux-x86-java-1.4.2.03-r2.ebuild 3115 RMD160 0ff0c7c84086a3152a9e4e27f8795ea581e5936e SHA1 6cb2a5f91ef016509663f1008edcaef7c0ee3d5b SHA256 5152d941145c78fb93e9600d3098563fffac5aa1122a3d97c1efd86b9418fc1d -MD5 d7233867c69e3bce503bd78c955e41de emul-linux-x86-java-1.4.2.03-r2.ebuild 3115 -RMD160 0ff0c7c84086a3152a9e4e27f8795ea581e5936e emul-linux-x86-java-1.4.2.03-r2.ebuild 3115 -SHA256 5152d941145c78fb93e9600d3098563fffac5aa1122a3d97c1efd86b9418fc1d emul-linux-x86-java-1.4.2.03-r2.ebuild 3115 -EBUILD emul-linux-x86-java-1.5.0.10.ebuild 4005 RMD160 e01649fd8a77cf3ee246bbb53ba12f8e49e6b066 SHA1 bf211f7c90f1016c6f40e907c82beddccc25630f SHA256 66716890d7644cebca97172f8ff45ab811943bc53edcbdd67e99c09c7e1e538e -MD5 cbdd19236681beec2d108c38701212ee emul-linux-x86-java-1.5.0.10.ebuild 4005 -RMD160 e01649fd8a77cf3ee246bbb53ba12f8e49e6b066 emul-linux-x86-java-1.5.0.10.ebuild 4005 -SHA256 66716890d7644cebca97172f8ff45ab811943bc53edcbdd67e99c09c7e1e538e emul-linux-x86-java-1.5.0.10.ebuild 4005 -EBUILD emul-linux-x86-java-1.5.0.11.ebuild 4004 RMD160 ae275cfd19a3bdfc723a7eaee4695f10da3e951d SHA1 9814a37b1dec84ce7eecefec957e6ea0ae2c3beb SHA256 3c000f83d0c5b8040866104766534019659e1b53bedbc3728b2aeef3a63ec5f9 -MD5 d41a56ed80e761e7bdcb8424f6fff4a0 emul-linux-x86-java-1.5.0.11.ebuild 4004 -RMD160 ae275cfd19a3bdfc723a7eaee4695f10da3e951d emul-linux-x86-java-1.5.0.11.ebuild 4004 -SHA256 3c000f83d0c5b8040866104766534019659e1b53bedbc3728b2aeef3a63ec5f9 emul-linux-x86-java-1.5.0.11.ebuild 4004 -EBUILD emul-linux-x86-java-1.6.0.ebuild 3709 RMD160 788e8c081735286753717e760cda298397759e9b SHA1 ef93b298cf84e8206796194e86779bbd27da7074 SHA256 02475dcb74b7bd2227da4ab8adc2a7a17785be730405fc09436654ba8f9e7b66 -MD5 bb167a976c47a0e2f06bad7a72d6aa76 emul-linux-x86-java-1.6.0.ebuild 3709 -RMD160 788e8c081735286753717e760cda298397759e9b emul-linux-x86-java-1.6.0.ebuild 3709 -SHA256 02475dcb74b7bd2227da4ab8adc2a7a17785be730405fc09436654ba8f9e7b66 emul-linux-x86-java-1.6.0.ebuild 3709 -MISC ChangeLog 4173 RMD160 b3a225b8613798f71fcb22033b8dc1cee7628175 SHA1 bdbebc8c8f2c3c3833007f1850328f59c5c608e9 SHA256 766ff361d313fd015dbf323709c5d5f68b95a9462cf697173a6f09dc432f9785 -MD5 dc750fa6ec9ebc54138a40407c876aa1 ChangeLog 4173 -RMD160 b3a225b8613798f71fcb22033b8dc1cee7628175 ChangeLog 4173 -SHA256 766ff361d313fd015dbf323709c5d5f68b95a9462cf697173a6f09dc432f9785 ChangeLog 4173 +EBUILD emul-linux-x86-java-1.4.2.03-r2.ebuild 3126 RMD160 1c4467faa02e3612521ab19dae3b7595a22fb538 SHA1 da2092e888d07c174afb4eb6e0878543967ea0d7 SHA256 df1aac9e03dde75a927d6ff108093d08866cef419a192c027d54761c70c72076 +MD5 25f6cf4ccd7097c2b889b15b98a97cb4 emul-linux-x86-java-1.4.2.03-r2.ebuild 3126 +RMD160 1c4467faa02e3612521ab19dae3b7595a22fb538 emul-linux-x86-java-1.4.2.03-r2.ebuild 3126 +SHA256 df1aac9e03dde75a927d6ff108093d08866cef419a192c027d54761c70c72076 emul-linux-x86-java-1.4.2.03-r2.ebuild 3126 +EBUILD emul-linux-x86-java-1.5.0.10.ebuild 4008 RMD160 853a9f097804c7db9d7964b3a3b549440eb78b43 SHA1 3fe8b4a61954ad651dbac34cd39cc8aaf8347e7f SHA256 fec8cbc3b3ff9284e109cc11de222c1d72f4a8c83c99390dee4e345de3f6c162 +MD5 ec1ecd6c1f6bbc4f3258bfb776997675 emul-linux-x86-java-1.5.0.10.ebuild 4008 +RMD160 853a9f097804c7db9d7964b3a3b549440eb78b43 emul-linux-x86-java-1.5.0.10.ebuild 4008 +SHA256 fec8cbc3b3ff9284e109cc11de222c1d72f4a8c83c99390dee4e345de3f6c162 emul-linux-x86-java-1.5.0.10.ebuild 4008 +EBUILD emul-linux-x86-java-1.5.0.11.ebuild 4009 RMD160 9571fb8c249af7d8654644bed0052e9fe79c6cec SHA1 cf64c74bf44b5dd9848e3bed7b90d0f005190354 SHA256 a560d15aecd490fd0ad09ae3aee789f28c196a55e71a2ed6f4980f53b8fc4ef4 +MD5 2398a209f00a5ef7c74d25c3af2619ab emul-linux-x86-java-1.5.0.11.ebuild 4009 +RMD160 9571fb8c249af7d8654644bed0052e9fe79c6cec emul-linux-x86-java-1.5.0.11.ebuild 4009 +SHA256 a560d15aecd490fd0ad09ae3aee789f28c196a55e71a2ed6f4980f53b8fc4ef4 emul-linux-x86-java-1.5.0.11.ebuild 4009 +EBUILD emul-linux-x86-java-1.6.0.ebuild 3714 RMD160 28c3092cc930ab5101d07f18ed579b069728c33a SHA1 461317c58e1b188d7b79933d2882af3e91fe81a7 SHA256 e9cd04ef4df8d93c3ac85d3705668c15c53589ecc9041646739db628cc4b6a72 +MD5 6a7c2c1b0bf52d52a3f5146f27c11aaa emul-linux-x86-java-1.6.0.ebuild 3714 +RMD160 28c3092cc930ab5101d07f18ed579b069728c33a emul-linux-x86-java-1.6.0.ebuild 3714 +SHA256 e9cd04ef4df8d93c3ac85d3705668c15c53589ecc9041646739db628cc4b6a72 emul-linux-x86-java-1.6.0.ebuild 3714 +MISC ChangeLog 4420 RMD160 b8f31daeed9fbabc0e7e002574c7f44d38621553 SHA1 83eababd7f24e5cf174dbeb11ad32a7898ab460f SHA256 f7e8f412e8470dc1473a4da13933aedf71b25e1d46b54c3d81a1a69280afbb92 +MD5 4f16d2fcd1d9ea2fed213b0096fed8f4 ChangeLog 4420 +RMD160 b8f31daeed9fbabc0e7e002574c7f44d38621553 ChangeLog 4420 +SHA256 f7e8f412e8470dc1473a4da13933aedf71b25e1d46b54c3d81a1a69280afbb92 ChangeLog 4420 MISC metadata.xml 242 RMD160 b7739d92e1001156498af74dc8f6176273f742f6 SHA1 fd426af5f6d4efa0adf65aded927fd242e6fdf26 SHA256 df247383374651f561e9833633c2d533fe78ede8430186e2017e6f54452afaa4 MD5 6d8e6f3e73af8b455f7cc0ecbdfc7015 metadata.xml 242 RMD160 b7739d92e1001156498af74dc8f6176273f742f6 metadata.xml 242 @@ -62,3 +65,10 @@ SHA256 d45f41801f33a45e20fcd5d142301f5ab50e31d8964f7aafa1af837c3bde052f files/di MD5 35eac157f9b69bbbd07333c5a6a3f922 files/digest-emul-linux-x86-java-1.6.0 259 RMD160 1451526c43309c014d81ea9645251f568208a9b5 files/digest-emul-linux-x86-java-1.6.0 259 SHA256 7bfbfcb961d132341e65eaf06b2fbf36ed8d1387b0fbaa35f160ffc2fb217abe files/digest-emul-linux-x86-java-1.6.0 259 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFF7zcDkT4lNIS36YERAoVNAJ9yWTKboO3fifrAqsZ+uQvqsea+MACgqAe7 +1x9kL8iL00J+HCCDqDfjgkU= +=4Jbk +-----END PGP SIGNATURE----- diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild index 20a6b0bc09f9..f9c37708ae64 100644 --- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild +++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild,v 1.2 2007/01/23 10:50:33 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild,v 1.3 2007/03/07 22:04:42 wolf31o2 Exp $ inherit multilib java-vm-2 versionator @@ -37,7 +37,7 @@ RESTRICT="nostrip" # Extract the 'skip' value (offset of tarball) we should pass to tail get_offset() { - [ ! -f "$1" ] && return + [[ ! -f "$1" ]] && return local offset="`gawk ' /^[[:space:]]*skip[[:space:]]*=/ { @@ -55,7 +55,7 @@ get_offset() { src_unpack () { local offset="`get_offset ${DISTDIR}/${A}`" - if [ -z "${offset}" ] ; then + if [[ -z "${offset}" ]] ; then eerror "Failed to get offset of tarball!" die "Failed to get offset of tarball!" fi @@ -68,16 +68,16 @@ unpack_jars() { # New to 1.4.2 local PACKED_JARS="lib/tools.jar lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar javaws/javaws.jar" local UNPACK_CMD="" - if [ -f "$JAVAHOME/lib/unpack" ]; then + if [[ -f "$JAVAHOME/lib/unpack" ]]; then UNPACK_CMD="$JAVAHOME/lib/unpack" chmod +x "$UNPACK_CMD" #packerror="" sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD for i in $PACKED_JARS; do - if [ -f "$JAVAHOME/${i%.jar}.pack" ]; then + if [[ -f "$JAVAHOME/${i%.jar}.pack" ]]; then einfo "Creating ${JAVAHOME}/${i}" "$UNPACK_CMD" "$JAVAHOME/${i%.jar}.pack" "$JAVAHOME/$i" - if [ ! -f "$JAVAHOME/$i" ]; then + if [[ ! -f "$JAVAHOME/$i" ]]; then die "Failed to unpack jar files ${i}." # Please refer\n" #ewarn "to the Troubleshooting section of the Installation\n" #ewarn "Instructions on the download page for more information.n" diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.10.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.10.ebuild index 87c12b11401b..5240596d01ae 100644 --- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.10.ebuild +++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.10.ebuild,v 1.2 2007/02/03 05:17:53 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.10.ebuild,v 1.3 2007/03/07 22:04:42 wolf31o2 Exp $ inherit java-vm-2 eutils @@ -47,7 +47,7 @@ QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so opt/${P}/lib/i386/libdeploy.so" src_unpack() { - if [ ! -r ${DISTDIR}/${At} ]; then + if [[ ! -r ${DISTDIR}/${At} ]]; then die "cannot read ${At}. Please check the permission and try again." fi diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild index 7380b455f390..3fef720f62aa 100644 --- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild +++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild,v 1.1 2007/02/11 22:47:48 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.11.ebuild,v 1.2 2007/03/07 22:04:42 wolf31o2 Exp $ inherit java-vm-2 eutils @@ -47,7 +47,7 @@ QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so opt/${P}/lib/i386/libdeploy.so" src_unpack() { - if [ ! -r ${DISTDIR}/${At} ]; then + if [[ ! -r ${DISTDIR}/${At} ]]; then die "cannot read ${At}. Please check the permission and try again." fi diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild index 5c703b2f2b79..89ece38b6db5 100644 --- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild +++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild,v 1.2 2007/02/11 22:32:24 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.ebuild,v 1.3 2007/03/07 22:04:42 wolf31o2 Exp $ inherit java-vm-2 eutils @@ -50,7 +50,7 @@ QA_TEXTRELS_amd64="opt/${P}/lib/i386/motif21/libmawt.so opt/${P}/lib/i386/server/libjvm.so" src_unpack() { - if [ ! -r ${DISTDIR}/${At} ]; then + if [[ ! -r ${DISTDIR}/${At} ]]; then die "cannot read ${At}. Please check the permission and try again." fi -- 2.26.2