diff options
author | Henry Gebhardt <hsggebhardt@googlemail.com> | 2010-11-11 15:55:41 +0100 |
---|---|---|
committer | Henry Gebhardt <hsggebhardt@googlemail.com> | 2010-11-11 20:55:26 +0100 |
commit | 9bf77522cebf7b991e0e4f599c709a7fdc5203ca (patch) | |
tree | 05b1b8f6d2caf3171bcd62e5962f8b9ec2bc88e0 | |
parent | app-backup/bup-0.20: the backlog cleanup release (diff) | |
download | kork-9bf77522cebf7b991e0e4f599c709a7fdc5203ca.tar.gz kork-9bf77522cebf7b991e0e4f599c709a7fdc5203ca.tar.bz2 kork-9bf77522cebf7b991e0e4f599c709a7fdc5203ca.zip |
sci-astronomy/ftools-6.10: Fix revdep-control file generation
-rw-r--r-- | sci-astronomy/ftools/Manifest | 2 | ||||
-rw-r--r-- | sci-astronomy/ftools/ftools-6.10.ebuild | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/sci-astronomy/ftools/Manifest b/sci-astronomy/ftools/Manifest index 44ad6a4..2581172 100644 --- a/sci-astronomy/ftools/Manifest +++ b/sci-astronomy/ftools/Manifest @@ -1,6 +1,6 @@ AUX installManPage-S-namecollision.patch 786 RMD160 82f9911c5922d02f9f0870c19b960ae17b670ad1 SHA1 3e38468fda1e1b8c17a60ae1f9e27b266958aa72 SHA256 27bd0f77c7ddaa96cac057f2e2c690188059858e6e6fe495336556fb7c5ece31 DIST heasoft-6.10src.tar.gz 65094690 RMD160 ce22802a22fe0273a0d7c56b617436ee709af565 SHA1 21d4bb5c8fc0730c87114da11ba67edcfd82d77d SHA256 1e5d5439803e9b8c744784362e614fc7c8a6fb47b3430ea1edf23a5610b2fb0e DIST heasoft6.9src.tar.gz 64709171 RMD160 e70eade8c125c47ed10bb83e1bb21fb7f3f5e229 SHA1 4c8b51f9a3a528d89065a0967bb6e0dc5f25ea30 SHA256 83df06147dc772441427c888c3c7c9d810486aad9a45208586bba56baf160ab4 -EBUILD ftools-6.10.ebuild 2944 RMD160 519de6fdb4b541e0d89afdd42b6caa9f6d54156d SHA1 20c0ed642740feaa8d2ee2d4789329509cff70b8 SHA256 0db13c77bb4ad3b45d37b9e80706b87d6df81951e39a483bf81a3043263a4006 +EBUILD ftools-6.10.ebuild 3120 RMD160 b6fcee4134ad430cbc39e3f3ed9f902acbaaba4f SHA1 823503f9cf61d16523d9663d8ce28fd74217564f SHA256 243a6d99485a6635d0d6ca525a3ba1bc938276562d220aa4ad8593717a84b956 EBUILD ftools-6.9-r1.ebuild 2967 RMD160 de5922fdb1c535b3bb760241ae35151606a5a111 SHA1 4ee04aea9c8e4f2d58329b800e67ddb4c9e770fa SHA256 8adba16987ad76a43e8a63efd2592b8b716599a205da9f0cf3a3a3977be4dd89 EBUILD ftools-6.9.ebuild 2251 RMD160 b08369c20cb0901c9a64e5478a37bd6ff9f1fcaa SHA1 6d809585a4d172b93deca0d833a1984b34bd206a SHA256 7e2671f0bf9d91bfc2b9c6fd2939449a092dbfa60ac05d0d2a99ab30c018dd50 diff --git a/sci-astronomy/ftools/ftools-6.10.ebuild b/sci-astronomy/ftools/ftools-6.10.ebuild index dbe1cad..bb82738 100644 --- a/sci-astronomy/ftools/ftools-6.10.ebuild +++ b/sci-astronomy/ftools/ftools-6.10.ebuild @@ -20,7 +20,7 @@ DEPEND="x11-base/xorg-server RDEPEND="${DEPEND}" S="${WORKDIR}/heasoft-${PV}/BUILD_DIR" -PREFIX="/usr/heasoft-${PVR}" +PREFIX="${ROOT}/usr/heasoft-${PVR}" MSG="The HEASOFT General-Use FTools have been installed into ${PREFIX}. @@ -70,8 +70,9 @@ src_install() { # -j1 is needed, don't know why exactly emake -j1 install || die "emake install failed" einfo "Moving ${PREFIX} to image directory..." - mkdir "${D}"/usr - mv "${PREFIX}" "${D}"/usr + D_PREFIX_DIR="${D}/${PREFIX%/*}" + mkdir -p "${D_PREFIX_DIR}" || die "Failed to create image directory" + mv "${PREFIX}" "${D_PREFIX_DIR}" || die "Failed to move to image directory" echo "${MSG}" > WTF dodoc WTF @@ -81,13 +82,15 @@ src_install() { echo "HEADAS=\"${HEADAS}\"" > 99headas doenvd 99headas + DHEADAS="${D}/${HEADAS}" + einfo "Heasoft's installation is a mess. A revdep-rebuild control " einfo "file is installed for ape and cfitsio, so that any dependencies " einfo "won't scream everytime you run revdep-rebuild." - ape_so="`ls "${HEADAS}/lib/libape_*.so"`" + ape_so="`ls "${DHEADAS}"/lib/libape_*.so`" ape_so="${ape_so##*/}" - cfitsio_so="`ls "${HEADAS}/lib/libcfitsio_*.so"`" - cfitsio_so="${ape_so##*/}" + cfitsio_so="`ls "${DHEADAS}"/lib/libcfitsio_*.so`" + cfitsio_so="${cfitsio_so##*/}" echo "# Heasoft's installation is a mess." > 70-heasoft echo "# This file makes it slightly less annoying for other" >> 70-heasoft echo "# packages using its libraries." >> 70-heasoft |