Simplify pkg_setup.

Package-Manager: portage-2.1.4.4

diff --git a/x11-libs/openmotif/Manifest b/x11-libs/openmotif/Manifest
index da82a1b7a2f4da54e2408bd2d2779588ab951163..d3d918ad8d37d37e1c728743bd863d5f19fd1783 100644 (file)
--- a/x11-libs/openmotif/Manifest
+++ b/x11-libs/openmotif/Manifest
@@ -21,14 +21,14 @@ DIST openmotif-2.2.3-CAN-2004-0914-newer.patch.bz2 11986 RMD160 f04ccc46b82782d5
 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 3665 RMD160 ff360947f706ae39ef3324a839427c9763700621 SHA1 5135beaf45008d74e937dbc133e3cd5a279fcfd3 SHA256 39e9f2336b0a0469108757436a5bd6dcc88cd0f28912009b75831f84c3a14b1a
-EBUILD openmotif-2.3.0-r1.ebuild 3396 RMD160 d70edbdb8d18bb9ddbe774bebb8df07bc4b0cf56 SHA1 c288f52868ed24c05bf6db514cade0bb3f19e69d SHA256 010bb0f35c90e55edb27ad6ddd561f2fb6f4dd266d41c1c64323069a6e8b0826
+EBUILD openmotif-2.3.0-r1.ebuild 3182 RMD160 154f466292c860cc7841684de2cdc46322ad47e5 SHA1 dd6669d651f9a9f2490fc6bcce2cd14f3ee1056a SHA256 37cb6b28e3d44e3caa087fed662cb0e36d640dae2da3e18efe745f3243a33afb
 EBUILD openmotif-2.3.0.ebuild 3215 RMD160 897d14313b0ad956bc1c549a962723ebe32649dd SHA1 9ff7aceee3e435010feb085215209fd1ee7b0e4e SHA256 8208aa62cb2bc44a4145c11db93dd7eb4f5af36d15c5539c4f36dc54e5907e5e
 MISC ChangeLog 24300 RMD160 cfd92b62d1b81b249740896361df54f8117e8b1e SHA1 6415e253fb99b6f898ce5dcaabadd2732139f8cb SHA256 6d2056c3c4b5feb0337881ee616b45f66776b1b99813faf563518c9f331c3d2c
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.8 (GNU/Linux)
 
-iEYEARECAAYFAke4HhsACgkQOeoy/oIi7uzHpACcDlpMoTy3Go0rJ9d//+K9ovo9
-juQAniQI0xgCpyujhHiHspOvK41Hjvh0
-=/Xqt
+iEYEARECAAYFAke6gS4ACgkQOeoy/oIi7uw9BwCeJiViAC7S1qWiKhR28Lnw17oV
+bPoAoLpmb79FZZovM4i4qEzxQFTJJFsw
+=FvFa
 -----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 dd9ccee3537f0ca3f273edb2bc65e8798e4c4eb6..7bd5d6293dc267112c5ecd113ec4a2e5a1058d3e 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.5 2008/02/17 11:44:27 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/openmotif/openmotif-2.3.0-r1.ebuild,v 1.6 2008/02/19 07:11:35 ulm Exp $
 
 inherit eutils flag-o-matic multilib autotools
 
@@ -34,21 +34,9 @@ PROVIDE="virtual/motif"
 pkg_setup() {
        # clean up orphaned cruft left over by motif-config
        local i count=0
-       local stalesyms="usr/bin/mwm \
-                               usr/bin/uil \
-                               usr/bin/xmbind \
-                               usr/include/Xm \
-                               usr/include/uil \
-                               usr/include/Mrm"
-
-       for i in ${stalesyms} ; do
-               if [[ -L "${ROOT}"${i} ]] ; then
-                       einfo "Cleaning up orphaned ${ROOT}${i} symlink ..."
-                       rm -f "${ROOT}"${i}
-               fi
-       done
-
-       for i in "${ROOT}"usr/$(get_libdir)/lib{Xm,Uil,Mrm}.*; do
+       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
                        einfo "Cleaning up orphaned ${i} symlink ..."
                        rm -f "${i}"