sys-cluster/globus-build: Use mv -f, readd pkg_postrm with workaround

svn path=/sunrise/; revision=9070

diff --git a/sys-cluster/globus-build/ChangeLog b/sys-cluster/globus-build/ChangeLog
index ceca7599d70a9d78f86cc4150ee540cfa1b16ba0..5d52770c76a4bfeea61ab80312c8942baa637d42 100644 (file)
--- a/sys-cluster/globus-build/ChangeLog
+++ b/sys-cluster/globus-build/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-build-4.2.1.ebuild:
+  Use mv -f, readd pkg_postrm with workaround
+
   19 Aug 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   globus-build-4.2.1.ebuild, metadata.xml:
   Even more cleanup, useflags dont seem to be used for globus-build

diff --git a/sys-cluster/globus-build/Manifest b/sys-cluster/globus-build/Manifest
index cc01a9681ea4f0ecd6c8de66bd2692ba9d0ab105..7583d4e8ecd53954ecde231eb89701c7e613b036 100644 (file)
--- a/sys-cluster/globus-build/Manifest
+++ b/sys-cluster/globus-build/Manifest
@@ -1,5 +1,5 @@
 AUX 21globus-build 187 RMD160 2c9f1bd0051f19721a9fc43024cbbd920c8bc965 SHA1 55f53f00e674631402ed7cb90813de585360aa26 SHA256 21b2c26cc49ea4808918b1f6bb253e251ed6a228b6fab93996835ff9eadda741
 DIST gt4.2.1-all-source-installer.tar.bz2 111057292 RMD160 a8ffb66c47c0221acdf17256e1495e613417226e SHA1 33c6868189a6652a8714abe9ad8fa2cc481dd1d7 SHA256 f22deb1d47556e9c4be8ed556f497e6cded641c41f103663d7f499f9175d3705
-EBUILD globus-build-4.2.1.ebuild 1486 RMD160 3e72a5975f35ac56486853cf1f51b10c2eb259b7 SHA1 cf56845924e68059192aa26f3c69bb036d07fad9 SHA256 4e042afb928033af648c1281c6be3bcbba000ce79405a6bfc6da77a3e9dabd1f
-MISC ChangeLog 991 RMD160 18c6927fc9a5a89d45728558afe5701bf2ba49fd SHA1 ace15278f80df94eb9500b76fd30983d66f5d223 SHA256 47e309fbb6f767910f5d5d06ac03fb3c8c4ae0c826c47cf78e4cfc6f0d049310
+EBUILD globus-build-4.2.1.ebuild 1820 RMD160 89f443323467a95b4da6d3c1ec951d5a1573a716 SHA1 3343b304d95320bf95ab361d4855dcef3aa84a05 SHA256 816f7312c66679ac88bde0f0f1609d8fbb9f5e7ab8d048c1dcd485931f8075f6
+MISC ChangeLog 1126 RMD160 4f10ebefda5e46c29bc7ec32f5d4f94f0e956c42 SHA1 e5bbd011634cf6c2a28a9aebe22834ca95610331 SHA256 b7a4c285dbb342f67ad928d47c8597e93a9261e42b8cb8cb57ee659bf87299a4
 MISC metadata.xml 266 RMD160 5ccd2d6d69833c312dc77e83d2f108c44eb5ddad SHA1 efe083fce0b0a7f026bb61183ad2d4d3b0a6dc2a SHA256 59ae8a388bcec5eeffcd1e2ebf1b15099063fb9b35009a43d83988a46ff48b1e

diff --git a/sys-cluster/globus-build/globus-build-4.2.1.ebuild b/sys-cluster/globus-build/globus-build-4.2.1.ebuild
index 95faf51488275f1672a4a8eac93bf2ecee6d60fe..db520ec5811d703c9c67bec7ef2d6e0916852746 100644 (file)
--- a/sys-cluster/globus-build/globus-build-4.2.1.ebuild
+++ b/sys-cluster/globus-build/globus-build-4.2.1.ebuild
@@ -57,10 +57,19 @@ src_install() {
        # The supplied Makefile install violates standard practices.  The
        # following simulates a "make DESTDIR=${D}" and moves the built
        # programs/files into ${D}
-       cp -dpR "${S}"/build/* "${D}/" || die "mv failed"
+       mv -f "${S}"/build/* "${D}/" || die "mv failed"
 
        doenvd "${T}"/21globus-build || die "install env.d/globus-build died"
 
        einfo "Updating ownership and permissions..."
        fowners -R globus:globus * || die "fowners failed"
 }
+
+pkg_postrm() {
+       if ! [[ -e /opt/globus4/sbin/gpt-build ]] && ! has_version sys-cluster/globus ; 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"
+               ewarn "installation directory ${GLOBUS}."
+       fi
+}