sys-cluster/globus: Adjust pkg_postrm

svn path=/sunrise/; revision=9071

diff --git a/sys-cluster/globus/ChangeLog b/sys-cluster/globus/ChangeLog
index 78b592dddf0df0ec5fd664f2763d01b725a9adab..b15485f45992e3833c316a45e1f3f29304807a5c 100644 (file)
--- a/sys-cluster/globus/ChangeLog
+++ b/sys-cluster/globus/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Aug 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  globus-4.2.1.ebuild:
+  Adjust pkg_postrm
+
   19 Aug 2009; Michał Górny (sedzimir) <gentoo@mgorny.alt.pl>
   globus-4.2.1.ebuild:
   Support ${ROOT} in postrm. Use relative symlink to gpt/packages to make it

diff --git a/sys-cluster/globus/Manifest b/sys-cluster/globus/Manifest
index deb358b7d1357de472e5cd7a7ec30010e3cb7428..56c6f43196d75aa58ba6eaefa06992a1e10f0bd7 100644 (file)
--- a/sys-cluster/globus/Manifest
+++ b/sys-cluster/globus/Manifest
@@ -3,6 +3,6 @@ AUX gaa_test.patch 596 RMD160 a35a8600e546e78b0abd19feab2d918c83124eb9 SHA1 3e6e
 AUX globus-init.d 1566 RMD160 53c449256203f44238c0561bfa9e09e2392cfc98 SHA1 bab5245e5942753611c2d80107e2219a787c3849 SHA256 e4d216ffcb511b31935cee3076c2b0e7045da924e19074257302a2cd1dbd837e
 AUX gwd_open.patch 470 RMD160 a561456c15e6e6b01cd6d1291da0e76dcf3bca32 SHA1 c846e281e0251490c4f0b0fb7e4d8b4c901d6277 SHA256 95e66415b01f6971379c07447d7a25875f7f9261381f26730323d92fd465b2a3
 DIST gt4.2.1-all-source-installer.tar.bz2 111057292 RMD160 a8ffb66c47c0221acdf17256e1495e613417226e SHA1 33c6868189a6652a8714abe9ad8fa2cc481dd1d7 SHA256 f22deb1d47556e9c4be8ed556f497e6cded641c41f103663d7f499f9175d3705
-EBUILD globus-4.2.1.ebuild 6430 RMD160 69aef5db0db7cc9d0308d23b8cedd6a4bfe5e5dd SHA1 057ed3f5a3644f27f810ca446f51937f56912106 SHA256 492bfef5d3a44d7de4f95cccae04741d94ab7a0dff809fb30c2f9f38528542d1
-MISC ChangeLog 919 RMD160 845ba9e34cc0c60c23621694999ce32e4c85089c SHA1 84e189f04b1752e5070555694265f089089b4c3c SHA256 cc51f07a71118946be11a8e513418dbf637b1fa9e87a0ca6cf336cc2cb8cedc0
+EBUILD globus-4.2.1.ebuild 6473 RMD160 d01eb76126958f9f30917f08b03f02b363e5b6d9 SHA1 72a0064281711f1e4de50ec9e13b2a96da4e94df SHA256 0074a830240daee8d852f4ad896b1f0cec70bf5e776e2cb89844588a740c3ebf
+MISC ChangeLog 1022 RMD160 a882e7843f3d04dd1b568a82384769ebe7473348 SHA1 ba5f56795b65abff3122b48663557279a0254937 SHA256 fba41dcad5453f96f6a811d8148ec25e844103f74e8da3f4f8e15ed633410850
 MISC metadata.xml 1334 RMD160 ec788b689c06f2ac53d347afcaae694d0a27df6a SHA1 57d1713b5491e5fe02b59a16575e4b59fe67084a SHA256 20524ea91e4b9d650432ceeebd5fd21d3b450fcfad6351375209737273c29299

diff --git a/sys-cluster/globus/globus-4.2.1.ebuild b/sys-cluster/globus/globus-4.2.1.ebuild
index 790b6e8f0c9cc68b16101cc3bc8649bfe3e3fc57..cc8c585fb79597538d857f35ff1c24bebab2b55f 100644 (file)
--- a/sys-cluster/globus/globus-4.2.1.ebuild
+++ b/sys-cluster/globus/globus-4.2.1.ebuild
@@ -172,7 +172,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-       if ! [[ -e "${ROOT}${GLOBUS}"/bin/globus-start-container ]]; then
+       if ! [[ -e "${ROOT}${GLOBUS}"/bin/globus-start-container ]] && ! has_version sys-cluster/globus-build ; then
                ewarn "Globus builds and installs files into ${GLOBUS}"
                ewarn "after package installation.  After uninstalling"
                ewarn "you may want to manually remove all or part of the Globus"