From: Michał Górny <mgorny@gentoo.org>
Date: Wed, 19 Aug 2009 00:23:44 +0000 (+0000)
Subject: sys-cluster/globus: Support ${ROOT} in postrm. Use relative symlink to gpt/packages... 
X-Git-Url: http://pileus.org/git/?p=~andy%2Fsunrise;a=commitdiff_plain;h=77f44721ba9e64bb21a70557f36693cc1ef0f142

sys-cluster/globus: Support ${ROOT} in postrm. Use relative symlink to gpt/packages to make it root-independent.

svn path=/sunrise/; revision=9059
---

diff --git a/sys-cluster/globus/ChangeLog b/sys-cluster/globus/ChangeLog
index 6ef7e1f0d..78b592ddd 100644
--- a/sys-cluster/globus/ChangeLog
+++ b/sys-cluster/globus/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  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
+  root-independent.
+
   18 Aug 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   globus-4.2.1.ebuild:
   Add workaround for pkg_postrm
diff --git a/sys-cluster/globus/Manifest b/sys-cluster/globus/Manifest
index 9284d01af..deb358b7d 100644
--- 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 6461 RMD160 a4ef270210cdd5a7d2da3775e39392a8a752e12c SHA1 63e39f028b355d8ae305634b942986aba82759dd SHA256 fe961402b86e209c15eb9cb66c4c83c518e84ebce3366dcde567daee0f8285eb
-MISC ChangeLog 734 RMD160 b4f7766a4b6036f113f4f22e9dd632c8690d729d SHA1 7b2b8e41e42f84f03ff9c75059fc30f827194c55 SHA256 a0936ec5cc1949a2039292dee3ea9f13faa25d221838a836e7dedc45f2d88760
+EBUILD globus-4.2.1.ebuild 6430 RMD160 69aef5db0db7cc9d0308d23b8cedd6a4bfe5e5dd SHA1 057ed3f5a3644f27f810ca446f51937f56912106 SHA256 492bfef5d3a44d7de4f95cccae04741d94ab7a0dff809fb30c2f9f38528542d1
+MISC ChangeLog 919 RMD160 845ba9e34cc0c60c23621694999ce32e4c85089c SHA1 84e189f04b1752e5070555694265f089089b4c3c SHA256 cc51f07a71118946be11a8e513418dbf637b1fa9e87a0ca6cf336cc2cb8cedc0
 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 d48bb9ed8..790b6e8f0 100644
--- a/sys-cluster/globus/globus-4.2.1.ebuild
+++ b/sys-cluster/globus/globus-4.2.1.ebuild
@@ -144,8 +144,7 @@ src_install() {
 	doins quickstart.html || die "install quickstart.html died"
 
 	einfo "linking globus_packages directory"
-	dosym "${ROOT}${GLOBUS}"/etc/gpt/packages \
-		  "${ROOT}${GLOBUS}"/etc/globus_packages \
+	dosym gpt/packages ${GLOBUS}/etc/globus_packages \
 			|| die "generating symbolic link died"
 
 	einfo "Updating ownership and permissions..."
@@ -173,7 +172,7 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	if ! [[ -e "${GLOBUS}"/bin/globus-start-container ]]; then
+	if ! [[ -e "${ROOT}${GLOBUS}"/bin/globus-start-container ]]; 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"