diff options
author | 2009-04-12 12:17:33 +0200 | |
---|---|---|
committer | 2009-04-12 12:17:33 +0200 | |
commit | f6d6a6bb75c732441f27814d48828ae35a52a535 (patch) | |
tree | 5ba70aeb2d6bea9f7968c4e87093ca97a38d0c4f /sci-astronomy | |
parent | sci-astronomy/ftools-6.6.1-r1: Need -j1 for install. (diff) | |
download | kork-f6d6a6bb75c732441f27814d48828ae35a52a535.tar.gz kork-f6d6a6bb75c732441f27814d48828ae35a52a535.tar.bz2 kork-f6d6a6bb75c732441f27814d48828ae35a52a535.zip |
sci-astronomy/ftools-6.6.1-r1: Portage knows about heasoft.
Diffstat (limited to 'sci-astronomy')
-rw-r--r-- | sci-astronomy/ftools/Manifest | 2 | ||||
-rw-r--r-- | sci-astronomy/ftools/ftools-6.6.1-r1.ebuild | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/sci-astronomy/ftools/Manifest b/sci-astronomy/ftools/Manifest index b9b3706..f572083 100644 --- a/sci-astronomy/ftools/Manifest +++ b/sci-astronomy/ftools/Manifest @@ -8,5 +8,5 @@ AUX lhea-fixpfiles-destdir.patch 562 RMD160 fd1af4e68bb7885652a6e81404371bba5fe8 AUX no-tk-docs.patch 738 RMD160 d69e261c402d2e545f109495be999eaeb5d37620 SHA1 35ff2466c06df162e584b76ad3ef15d05b9e2f42 SHA256 0782fe89fc4d29eb4ba2c01f8d6420762060a156db7cb7cf7847f3a5a366f44c AUX par2-destdir.patch 580 RMD160 56efb9a0049486f7736fe6bcd08947de45599ffa SHA1 97e12b9bb9feccf1be3d3bc1b83a6e79d4078f37 SHA256 aba4b7ba28204b6863c5e8ade5528874ef0606e15d03b1ea167ab9732ac481d4 DIST heasoft6.6.1src.tar.gz 41783649 RMD160 b03d23ad61023d9f9d8df247a448c8ad4d66f98d SHA1 58376bd6ce4dbc9cdb3a901c977602d120d0609e SHA256 f73e78e5a5b6af8b9db0aee66957bf450980455fc78a8d7aa056e6013b49285d -EBUILD ftools-6.6.1-r1.ebuild 1757 RMD160 af4829bd9329cf108bb82d49765a943e3c7e6a8d SHA1 96553d386b6a309cd0a25f81aba4f0066bd6a0f6 SHA256 1550190f19eb4d9917576421ae51f931354d9325455b49f83d456025e1493d6e +EBUILD ftools-6.6.1-r1.ebuild 1815 RMD160 fcf6d1cef381a1d3183746c6c5ae46333d8adb6b SHA1 6462c2cb4d8de9f90c8f7ee44231706e8bdb92a1 SHA256 741da322af2497f96060529b0bbe8b59fdb275b066a2dba7945678bcd0af1646 EBUILD ftools-6.6.1.ebuild 1911 RMD160 ba849617b62ddbac13c1fab45157d1bbd05db7bf SHA1 078a2aa8bf1a5e5af3b2da31c835f2c630f677e9 SHA256 4e389dd716cb9e4e9243178c4c067b96f2839ced5ea5446b57c163f918069be7 diff --git a/sci-astronomy/ftools/ftools-6.6.1-r1.ebuild b/sci-astronomy/ftools/ftools-6.6.1-r1.ebuild index 7fc8b4e..33e1d7d 100644 --- a/sci-astronomy/ftools/ftools-6.6.1-r1.ebuild +++ b/sci-astronomy/ftools/ftools-6.6.1-r1.ebuild @@ -23,9 +23,6 @@ PREFIX="/usr/heasoft-${PV}" MSG="The HEASOFT General-Use FTools have been installed into $PREFIX. -Portage doesn't know about them. If you want to remove -HEASOFT, you need to do -'rm -rf \"${PREFIX}\"'. To use the HEASOFT, you need to set the HEADAS environment variable, and source the headas init script, like so @@ -43,7 +40,7 @@ src_prepare() { } src_configure() { - [[ -d "${PREFIX}" ]] && die "Please remove previous installation." + [[ -d "${PREFIX}" ]] && die "Please unmerge previous installation." ewarn "This ebuild is no good." cd BUILD_DIR econf --prefix="${PREFIX}" || die "econf failed" @@ -58,11 +55,15 @@ src_compile() { src_install() { # The heasoft install scripts don't allow for $DESTDIR. Thus we - # must let headas install itself. This is very bad, I know. + # must let headas install itself. This is very, very bad. addwrite "${PREFIX}" + einfo "Installing into ${PREFIX} directly..." cd BUILD_DIR # Hell knows why we need -j1 here. But we sure need it. emake -j1 install || die "emake install failed" + einfo "Moving ${PREFIX} to image directory..." + mkdir "${D}"/usr + mv "${PREFIX}" "${D}"/usr dodoc WTF |