Fix syntax in pkg_setup, so that it works also with older bash versions.

Package-Manager: portage-2.1.4.4

diff --git a/x11-libs/openmotif/ChangeLog b/x11-libs/openmotif/ChangeLog
index aae3e7a8c20c9ec8c63bb5804a15b147aa1db177..99eb3c11076d0e0c5bba327f61d1d6c9412fa3c4 100644 (file)
--- a/x11-libs/openmotif/ChangeLog
+++ b/x11-libs/openmotif/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/openmotif
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.167 2008/03/07 15:16:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/ChangeLog,v 1.168 2008/03/07 22:19:17 ulm Exp $
+
+  07 Mar 2008; Ulrich Mueller <ulm@gentoo.org> openmotif-2.3.0-r1.ebuild:
+  Fix syntax in pkg_setup, so that it works also with older bash versions.
 
   07 Mar 2008; Ulrich Mueller <ulm@gentoo.org> metadata.xml,
   -openmotif-2.3.0.ebuild:

diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index 839e864194fc9477641a161064a91add64893b51..b25bc7a69e45b73a4b655c15fedde9fb3deb058b 100644 (file)
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -9,13 +9,13 @@ DIST openmotif-2.2.3-patches-1.tar.bz2 19960 RMD160 735931640dfb1d45f331e1015dce
 DIST openmotif-2.3.0-manual.pdf.tgz 4195259 RMD160 45b1a17a653b01ccf0324e0bc70fd1ef5db5a395 SHA1 1d0f55928ad65ee321564ba962b1608cfd83bb96 SHA256 49692fd4d5441d2dbb5ca36199b209c8503452fda9b36e929d1aa3673bffaecb
 DIST openmotif-2.3.0.tar.gz 5661471 RMD160 317c8d13d59c6fdd4a9f0e3b63000695f6677b6c SHA1 efb5f5fdc4cc43ef6065594f4ebe98953b7af15e SHA256 81d63e4145fab729621cba38bb0e88fccfbcbb5918473319e9b01a6fbe909544
 EBUILD openmotif-2.2.3-r9.ebuild 3087 RMD160 9abe07e3f2c6d29b284c0a8460c17feca5cbf459 SHA1 7974f28219210a7ca4de6f24f3c8f5db6f208d30 SHA256 4dccc8fb8e3032a2453ba4e8919d40d2fa820b926301e3914cc0a52e614b96ed
-EBUILD openmotif-2.3.0-r1.ebuild 3895 RMD160 5e9acc166566d5559e11e78160704dfee06a0c2e SHA1 b5e68e90e799fe0a4fb5b7ffd1007e182c36a678 SHA256 015ffb1fea5bbcff70b8328bb52d3d0831a836f3db31b01bde4245bfa4e20cd0
-MISC ChangeLog 26113 RMD160 f87cc813fb87a992d6c85427952eabd7270a6c12 SHA1 643f57b971455574144b50ab8a8a4039bd6e34a6 SHA256 1a3ec4a07a0a52495414ec27842b8f4692b93f9770d5d702f2256afaf79955f9
+EBUILD openmotif-2.3.0-r1.ebuild 3964 RMD160 d6161b54eef7654dcc64c787e80a38e4d01417a6 SHA1 1e94634d7b1472b9563e904e57d340ca1992db6c SHA256 bba22450e6d08cc8eb18e7dc8189d54089d6507de7feb40387e899e887fb308d
+MISC ChangeLog 26263 RMD160 8d19f379e4c50c8dbe8d72ff135144b6371e6235 SHA1 20b7882a1675700319dfbdd5f0fd9bf24930698b SHA256 87d13b1479ab2dc2c7f492f67ff9de7ebf1b50805de9a314510f5108af299f9f
 MISC metadata.xml 219 RMD160 e4108515c4905448a3f0666974dfe0606bee0527 SHA1 02c240887d922c73610257891793b3bdec27fc8e SHA256 c1572876b54cc63c7b7ecad4c9adf1b6460d166c41e84b1df0322c5df6497ffb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.8 (GNU/Linux)
 
-iEYEARECAAYFAkfRXBsACgkQOeoy/oIi7uwSRwCfddciJQKc7Txf2/5qtJHB9Da9
-bAcAoLsbhnGRnY5Pu3eRH7JDipv5RpHv
-=EZRb
+iEYEARECAAYFAkfRv0AACgkQOeoy/oIi7uwdFACfdEgCZSbAzFR4dowk+xFFs/Iy
+kBcAnRAbujMtLa5yWpRT+C+AbSrR95If
+=VHDN
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild b/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild
index 7e0ae588de3f90fee8a25a511321d6a5d528d903..46b5238d765dcdc638587336f4cb344fc6449d68 100644 (file)
--- a/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild
+++ b/x11-libs/openmotif/openmotif-2.3.0-r1.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/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild,v 1.15 2008/03/07 15:11:21 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild,v 1.16 2008/03/07 22:19:17 ulm Exp $
 
 inherit eutils flag-o-matic multilib autotools
 
@@ -33,11 +33,13 @@ PROVIDE="virtual/motif"
 
 pkg_setup() {
        # clean up orphaned cruft left over by motif-config
-       local i count=0
+       local i l count=0
        for i in "${ROOT}"usr/bin/{mwm,uil,xmbind} \
                "${ROOT}"usr/include/{Xm,uil,Mrm} \
                "${ROOT}"usr/$(get_libdir)/lib{Xm,Uil,Mrm}.*; do
-               if [[ -L "${i}" && $(readlink "${i}") =~ (openmo|less)tif- ]]; then
+               [[ -L "${i}" ]] || continue
+               l=$(readlink "${i}")
+               if [[ ${l} == *openmotif-* || ${l} == *lesstif-* ]]; then
                        einfo "Cleaning up orphaned ${i} symlink ..."
                        rm -f "${i}"
                fi
@@ -45,7 +47,8 @@ pkg_setup() {
 
        cd "${ROOT}"usr/share/man
        for i in $(find . -type l); do
-               if [[ $(readlink "${i}") =~ -(openmo|less)tif- ]]; then
+               l=$(readlink "${i}")
+               if [[ ${l} == *-openmotif-* || ${l} == *-lesstif-* ]]; then
                        (( count++ ))
                        rm -f "${i}"
                fi