sci-astronomy/ftools-6.6.1-r1: Revision bump.

This still includes a bunch of of left-overs that might become useful.

It is missing a usage message, and can't be uninstalled automatically.

7 files changed, 176 insertions, 4 deletions

diff --git a/sci-astronomy/ftools/Manifest b/sci-astronomy/ftools/Manifest
index 558ab33..bfd3077 100644
--- a/sci-astronomy/ftools/Manifest
+++ b/sci-astronomy/ftools/Manifest
@@ -1,7 +1,12 @@
+AUX hd-std-install-tasks.patch 949 RMD160 e1b6a73d90141ff054a4c9ae5b632d005e60f2db SHA1 40f13de4abe5479245f200e0132a870450b4db00 SHA256 2b14c47b877d2c8d6e2683c0f1d227886c5517311e93a0aa5ea365caa15a42b2
 AUX hd_install-destdir.patch 874 RMD160 90d241360baa6fd8b7c059c9a2f97097abaa3ec1 SHA1 8ab3430b9dba2e1763a59f9df0994e8f67d1e6b4 SHA256 b338263cd300724646fb32d9a6233d9cf73a1baa3885a80a0d3ced44bdac7626
 AUX headas-init-destdir.patch 1659 RMD160 bbc161b0745c6843231f82b9d41b9e254f7d04b4 SHA1 18d74fa1c5fb0ef705a005185541bc5d034e8c0d SHA256 6f4b617921607e58c135b172b43e2b5a8b75cddb84f100733424395cbbac2672
-AUX lhea-fixperl-destdir.patch 418 RMD160 05deb5f4fca25c27d46af61d0d32f180fb423ab4 SHA1 4b8a94e11e9e798b6402f7d7b8788476e7d519d1 SHA256 cde19d8d6f6718f8eae74104b02e6e56ec15bb2c0c2dec3c1cbde5c3ae95fc94
+AUX install-iwidgets-symlink-destdir.patch 1247 RMD160 a9688efedb167436859d805ad792dd02a8af778c SHA1 7877de6242ca9d7cdfae9a3ed4ce13b71b9f4962 SHA256 8d936782a117028f410fd293dd4adb2cb365312a8678155a051989f34c680d05
+AUX installManPage-S-namecollision.patch 786 RMD160 82f9911c5922d02f9f0870c19b960ae17b670ad1 SHA1 3e38468fda1e1b8c17a60ae1f9e27b266958aa72 SHA256 27bd0f77c7ddaa96cac057f2e2c690188059858e6e6fe495336556fb7c5ece31
+AUX lhea-fixperl-destdir.patch 346 RMD160 1847549e5b2bcb2b5426a5225a31084d57db2565 SHA1 4a6e48041bd376a8ec20078ced2e0b32a3f87a68 SHA256 1ead248629f7f2a9a7eea3a2e5b9cc1356cf5640ff4e25f3fb765af53d64a839
+AUX lhea-fixpfiles-destdir.patch 562 RMD160 fd1af4e68bb7885652a6e81404371bba5fe86997 SHA1 d676bcb05b25ce8cd7a0f1222145225d651576f7 SHA256 aa118542b1b2285bc7b8b441faed0b8efbf0d24f1d24f20d3a2257afcc713287
 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 2475 RMD160 7f6456b0b8734500a57a0d85ef15df769c9ef423 SHA1 40f23c4ab97e4c281697acff679c972170435f7c SHA256 b3d3f28155199ec30b7d5179f5c54eb7ff2378a66341080401eb4661d6ef5784
 EBUILD ftools-6.6.1.ebuild 1911 RMD160 ba849617b62ddbac13c1fab45157d1bbd05db7bf SHA1 078a2aa8bf1a5e5af3b2da31c835f2c630f677e9 SHA256 4e389dd716cb9e4e9243178c4c067b96f2839ced5ea5446b57c163f918069be7
diff --git a/sci-astronomy/ftools/files/hd-std-install-tasks.patch b/sci-astronomy/ftools/files/hd-std-install-tasks.patch
new file mode 100644
index 0000000..35ee894
--- /dev/null
+++ b/sci-astronomy/ftools/files/hd-std-install-tasks.patch
@@ -0,0 +1,17 @@
+diff --git a/heacore/BUILD_DIR/Makefile-std b/heacore/BUILD_DIR/Makefile-std
+index 13a8d97..4e68256 100644
+--- a/heacore/BUILD_DIR/Makefile-std
++++ b/heacore/BUILD_DIR/Makefile-std
+@@ -479,10 +479,10 @@ ${HD_TARG_PFX}install-tasks:
+ 	@for file in ${HD_INSTALL_TASKS} ${HD_INSTALL_ONLY_TASKS} .; do \
+ 	  if [ $$file = . ]; then continue; fi; \
+ 	  filepart=`echo $$file | sed 's%.*/%%'`; \
+-	  ${HD_INSTALL} $$file${BSUF} ${HD_BIN}/$$filepart${BSUF} ${HD_CP_P}; \
++	  ${HD_INSTALL} $$file${BSUF} ${DESTDIR}/${HD_BIN}/$$filepart${BSUF} ${HD_CP_P}; \
+ 	  status=$$?; if [ $$status -ne 0 ]; then exit $$status; fi; \
+ 	  if [ "x${HD_BIN}" != "x${HD_TOP_BIN}" ]; then \
+-	    ${HD_INSTALL} ${HD_BIN}/$$filepart${BSUF} ${HD_TOP_BIN}/$$filepart${BSUF} ${HD_LN_S}; \
++	    ${HD_INSTALL} ${HD_BIN}/$$filepart${BSUF} ${DESTDIR}/${HD_TOP_BIN}/$$filepart${BSUF} ${HD_LN_S}; \
+ 	    status=$$?; if [ $$status -ne 0 ]; then exit $$status; fi; \
+ 	  fi; \
+ 	done
diff --git a/sci-astronomy/ftools/files/install-iwidgets-symlink-destdir.patch b/sci-astronomy/ftools/files/install-iwidgets-symlink-destdir.patch
new file mode 100644
index 0000000..fb6f3c9
--- /dev/null
+++ b/sci-astronomy/ftools/files/install-iwidgets-symlink-destdir.patch
@@ -0,0 +1,22 @@
+diff --git a/tcltk/BUILD_DIR/Makefile.in b/tcltk/BUILD_DIR/Makefile.in
+index a4f2be7..210bc10 100644
+--- a/tcltk/BUILD_DIR/Makefile.in
++++ b/tcltk/BUILD_DIR/Makefile.in
+@@ -158,7 +158,7 @@ install-iwidgets:
+ 	${MAKE} subdir-iwidgets HD_TARGET="install" \
+ 		prefix=${HD_EXEC_PFX} exec_prefix=${HD_EXEC_PFX} \
+ 		LD_LIBRARY_PATH="${TCL_DIR}:${LD_LIBRARY_PATH}"
+-	@cd ${HD_TOP_LIB}; rm -f iwidgets; ln -sf ${IWIDGETS} iwidgets
++	@cd "${DESTDIR}"/${HD_TOP_LIB}; rm -f iwidgets; ln -sf ${IWIDGETS} iwidgets
+ #-------------------------------------------------------------------------------
+ 
+ # Specializations for iwidgets2.2.0
+@@ -223,7 +223,7 @@ publish-tclreadline:
+ install-tclreadline:
+ 	${MAKE} subdir-tclreadline HD_TARGET="install" \
+ 		prefix=${HD_EXEC_PFX} exec_prefix=${HD_EXEC_PFX} TCLRL_DIR=${HD_LIB}/tclreadline${TCLREADLINE_VERS} TCLRL_LIBDIR=${HD_LIB} tclrldir=${HD_LIB}/tclreadline${TCLREADLINE_VERS}
+-	@cd ${HD_TOP_LIB}; rm -f tclreadline; ln -sf tclreadline${TCLREADLINE_VERS} tclreadline
++	@cd "${DESTDIR}"/${HD_TOP_LIB}; rm -f tclreadline; ln -sf tclreadline${TCLREADLINE_VERS} tclreadline
+ 	@if [ "x${HD_LIB_STYLE}" = xstatic ]; then \
+ 		${HD_INSTALL} ${HD_LIB}/libtclreadline.a ${HD_LIB}/lib${TCLREADLINE}.a ${HD_LN_S}; \
+ 	fi
diff --git a/sci-astronomy/ftools/files/installManPage-S-namecollision.patch b/sci-astronomy/ftools/files/installManPage-S-namecollision.patch
new file mode 100644
index 0000000..fe9cd1c
--- /dev/null
+++ b/sci-astronomy/ftools/files/installManPage-S-namecollision.patch
@@ -0,0 +1,30 @@
+diff --git a/tcltk/tcl/unix/installManPage b/tcltk/tcl/unix/installManPage
+index 93fd925..765d838 100755
+--- a/tcltk/tcl/unix/installManPage
++++ b/tcltk/tcl/unix/installManPage
+@@ -3,7 +3,7 @@
+ ZIP=:
+ while true; do
+     case $1 in
+-        -s | --symlinks  )      S="-s ";;
++        -s | --symlinks  )      SYM="-s ";;
+         -z | --compress  )    ZIP=$2;  shift ;;
+ 	-e | --extension )      Z=$2;  shift ;;
+ 	-s | --suffix    ) SUFFIX=$2;  shift ;;
+@@ -18,7 +18,7 @@ fi
+ 
+ MANPAGE=$1
+ DIR=$2
+-test -z "$S" && S="$DIR/"
++test -z "$SYM" && SYM="$DIR/"
+ 
+ # A sed script to parse the alternative names out of a man page.
+ #
+@@ -62,6 +62,6 @@ for f in $NAMES; do
+ 	$ZIP $DIR/$FIRST
+     else
+ 	rm -f $DIR/$f $DIR/$f.*
+-	ln $S$FIRST$Z $DIR/$f$Z
++	ln $SYM$FIRST$Z $DIR/$f$Z
+     fi
+ done
diff --git a/sci-astronomy/ftools/files/lhea-fixperl-destdir.patch b/sci-astronomy/ftools/files/lhea-fixperl-destdir.patch
index 625f12a..527bca9 100644
--- a/sci-astronomy/ftools/files/lhea-fixperl-destdir.patch
+++ b/sci-astronomy/ftools/files/lhea-fixperl-destdir.patch
@@ -1,7 +1,7 @@
-diff --git a/heacore/BUILD_DIR/lhea-fixperl b/heacore/BUILD_DIR/lhea-fixperl
+diff --git a/lhea-fixperl b/lhea-fixperl
 index 927387b..e052b59 100755
---- a/heacore/BUILD_DIR/lhea-fixperl
-+++ b/heacore/BUILD_DIR/lhea-fixperl
+--- a/lhea-fixperl
++++ b/lhea-fixperl
 @@ -21,6 +21,7 @@ else
  fi
  
diff --git a/sci-astronomy/ftools/files/lhea-fixpfiles-destdir.patch b/sci-astronomy/ftools/files/lhea-fixpfiles-destdir.patch
new file mode 100644
index 0000000..1392dce
--- /dev/null
+++ b/sci-astronomy/ftools/files/lhea-fixpfiles-destdir.patch
@@ -0,0 +1,15 @@
+diff --git a/ftools/BUILD_DIR/Makefile b/ftools/BUILD_DIR/Makefile
+index 67c72c4..9940349 100644
+--- a/ftools/BUILD_DIR/Makefile
++++ b/ftools/BUILD_DIR/Makefile
+@@ -43,8 +43,8 @@ install-BUILD_DIR:
+ fixpfiles:
+ 	@LHEA_DATA=${HD_TOP_REFDATA}; LHEA_HELP=${HD_TOP_HELP}; \
+ 	export LHEA_DATA; export LHEA_HELP; \
+-	if [ -d ${HD_PFILES} ]; then \
+-		cd ${HD_PFILES}; lhea-fixpfiles; \
++	if [ -d "${DESTDIR}"/${HD_PFILES} ]; then \
++		cd "${DESTDIR}"/${HD_PFILES}; lhea-fixpfiles; \
+ 	fi
+ 
+ # Specializations for xspec (spectral dir) in case we only have xspec data:
diff --git a/sci-astronomy/ftools/ftools-6.6.1-r1.ebuild b/sci-astronomy/ftools/ftools-6.6.1-r1.ebuild
new file mode 100644
index 0000000..6430124
--- /dev/null
+++ b/sci-astronomy/ftools/ftools-6.6.1-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils
+# A well-used example of an eclass function that needs eutils is epatch. If
+# your source needs patches applied, it's suggested to put your patch in the
+# 'files' directory and use:
+#
+#   epatch "${FILESDIR}"/patch-name-here
+#
+# eclasses tend to list descriptions of how to use their functions properly.
+# take a look at /usr/portage/eclasses/ for more examples.
+
+DESCRIPTION="General-Use FTools for manipulating and inspecting FITS files"
+HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/ftools/ftools_menu.html"
+SRC_URI="heasoft${PV}src.tar.gz"
+LICENSE="GPLv2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+RESTRICT="test"
+
+DEPEND="x11-base/xorg-server"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/heasoft-${PV}/"
+PREFIX="/usr/heasoft-${PV}"
+
+
+src_prepare() {
+	for subdir in tcl tk; do
+		cd "${S}"/tcltk/${subdir}/unix
+		epatch "${FILESDIR}"/installManPage-S-namecollision.patch \
+			|| die "epatch failed"
+	done
+	#cd "${S}"/heacore/BUILD_DIR
+	#epatch "${FILESDIR}"/hd-std-install-tasks.patch
+	# The same source file hd_install.c occurs multiple times, and needs to
+	# be patched to support $DESTDIR.
+	#for subdir in . demo tcltk ftools heacore heatools; do
+	#	cd "${S}"/${subdir}/BUILD_DIR
+	#	epatch "${FILESDIR}"/hd_install-destdir.patch || die "epatch failed"
+	#	epatch "${FILESDIR}"/lhea-fixperl-destdir.patch || die "epatch failed"
+	#done
+	#cd "${S}"
+	#epatch "${FILESDIR}"/install-iwidgets-symlink-destdir.patch \
+	#	|| die "epatch failed"
+	#cd "${S}"/ftools/BUILD_DIR
+	#epatch "${FILESDIR}"/lhea-fixpfiles-destdir.patch || die "epatch failed"
+#    epatch "${FILESDIR}"/no-tk-docs.patch || die "epatch failed"
+#    epatch "${FILESDIR}"/headas-init-destdir.patch || die "epatch failed"
+}
+
+src_configure() {
+	cd BUILD_DIR
+	econf --prefix="${PREFIX}" || die "econf failed"
+}
+
+src_compile() {
+	cd BUILD_DIR
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	addwrite "${PREFIX}"
+	cd BUILD_DIR
+	emake -j1 install || die "emake install failed"
+#    emake -j1 DESTDIR="${D}" INSTALL_ROOT="${D}" install || die "emake install failed"
+
+	#emake \
+	#	prefix="${D}"/usr \
+	#	mandir="${D}"/usr/share/man \
+	#	infodir="${D}"/usr/share/info \
+	#	libdir="${D}"/usr/$(get_libdir) \
+	#	install || die "emake install failed"
+
+	# The portage shortcut to the above command is simply:
+	#
+	#einstall DESTDIR="${D}" INSTALL_ROOT="${D}" || die "einstall failed"
+}