From d01da9a535e1a26bbf56ad0bb1d770e3f508f860 Mon Sep 17 00:00:00 2001
From: Henry Gebhardt <hsggebhardt@googlemail.com>
Date: Tue, 9 Nov 2010 19:03:48 +0100
Subject: sci-astronomy/fpipe-9999: Minor changes

- Depend on >=ftools-6.10, because that include 'ape_trad_get_int()'.

- Source /etc/env.d/99headas in case heasoft was updated, but the new
  shell wasn't sourced yet.
---
 sci-astronomy/fpipe/Manifest          | 2 +-
 sci-astronomy/fpipe/fpipe-9999.ebuild | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'sci-astronomy')

diff --git a/sci-astronomy/fpipe/Manifest b/sci-astronomy/fpipe/Manifest
index 268abf1..b95fe7c 100644
--- a/sci-astronomy/fpipe/Manifest
+++ b/sci-astronomy/fpipe/Manifest
@@ -1 +1 @@
-EBUILD fpipe-9999.ebuild 1752 RMD160 e4c8952b39e13d97683404dc54358b95911196c3 SHA1 3e0c1d8be086bafec13d4ab92fca09bc654b9420 SHA256 a61553c88da6843b674eff71c048c364f52f7ded35544d83be38a02414b06612
+EBUILD fpipe-9999.ebuild 1849 RMD160 73de85030982ea4f14794533ffc7c7d27509f692 SHA1 5d7061eb1aadd1a5eecab7830fc69b4bb9a21a6c SHA256 0c3a00d8a785558448374630e3e84d455296da0201169b53fbdd3186e3f79eba
diff --git a/sci-astronomy/fpipe/fpipe-9999.ebuild b/sci-astronomy/fpipe/fpipe-9999.ebuild
index f4ab643..d5fbf0d 100644
--- a/sci-astronomy/fpipe/fpipe-9999.ebuild
+++ b/sci-astronomy/fpipe/fpipe-9999.ebuild
@@ -24,7 +24,7 @@ DEPEND=">=x11-libs/gtk+-2.14
 		perl-gcpan/IPC-XPA
 		virtual/libusb:1
 		virtual/latex-base
-		sci-astronomy/ftools"
+		>=sci-astronomy/ftools-6.10"
 
 pkg_setup() {
 	ewarn "Note: this software is not yet in a too mature status so expect some minor things to break"
@@ -37,7 +37,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# Get the new HEADAS location
+	. "${ROOT}/etc/env.d/99headas"
+	echo HEADAS="${HEADAS}"
+
 	filter-flags -O2
+
 	cd software
 	econf $(use_enable debug debug 1) \
 			--disable-fpcmsimulator \
-- 
cgit v1.2.3-18-g5258