Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/sci-astronomy/ftools
diff options
context:
space:
mode:
Diffstat (limited to 'sci-astronomy/ftools')
-rw-r--r--sci-astronomy/ftools/Manifest11
-rw-r--r--sci-astronomy/ftools/files/hd-std-install-tasks.patch17
-rw-r--r--sci-astronomy/ftools/files/hd_install-DESTDIR.patch24
-rw-r--r--sci-astronomy/ftools/files/hd_install-destdir.patch27
-rw-r--r--sci-astronomy/ftools/files/headas-init-destdir.patch38
-rw-r--r--sci-astronomy/ftools/files/install-iwidgets-symlink-destdir.patch22
-rw-r--r--sci-astronomy/ftools/files/lhea-fixperl-destdir.patch12
-rw-r--r--sci-astronomy/ftools/files/lhea-fixpfiles-destdir.patch15
-rw-r--r--sci-astronomy/ftools/files/no-tk-docs.patch21
-rw-r--r--sci-astronomy/ftools/files/par2-destdir.patch14
-rw-r--r--sci-astronomy/ftools/ftools-6.7.ebuild83
11 files changed, 85 insertions, 199 deletions
diff --git a/sci-astronomy/ftools/Manifest b/sci-astronomy/ftools/Manifest
index 99d29dc..261df17 100644
--- a/sci-astronomy/ftools/Manifest
+++ b/sci-astronomy/ftools/Manifest
@@ -1,12 +1,5 @@
-AUX hd-std-install-tasks.patch 949 RMD160 e1b6a73d90141ff054a4c9ae5b632d005e60f2db SHA1 40f13de4abe5479245f200e0132a870450b4db00 SHA256 2b14c47b877d2c8d6e2683c0f1d227886c5517311e93a0aa5ea365caa15a42b2
-AUX hd_install-DESTDIR.patch 891 RMD160 00597fd6c53357f4dd7e03d47303de86ee0cb07b SHA1 27a84b5ea95d0b318b8d08a4781d4aa9a8d845dd SHA256 66d0478f2936b56165e2237578e6bb78dcc6a4ca7f197470b5164a043500b92f
-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 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.2src.tar.gz 41784019 RMD160 5237ddde4c25d0230de3a924985a3147ee2701e1 SHA1 30aac17d03df9b09171572f29be6d0a81a523957 SHA256 ef18ed517db0e2d8874d1febe8fece13e95783b6a7060156d3f7e22d9ceb613c
+DIST heasoft6.7src.tar.gz 60248795 RMD160 65d0bb699012d00971a61ed980f47b9ec8447d37 SHA1 c8591dbedee825520b67d27532c2bcd2c9bbd926 SHA256 7cf45f44a4302654c8fe6f395e3f886733abd897d94535220856192b122ee1b1
EBUILD ftools-6.6.2.ebuild 2169 RMD160 d4d62667999476326b68323addfea6cdfc3736a0 SHA1 c2871e847c13beff01b94ea7bc0e5a0ae3c82dd9 SHA256 f84dd94446cda6449f1732a545aeebd81d9f1123b81eacbec9b1a3b9d51751f4
+EBUILD ftools-6.7.ebuild 2179 RMD160 bdb5af3cd6501ffb4a7162da661b95a08025974e SHA1 a07e14af03bc70175434b811790f54cb38b981ea SHA256 fc8c7b3e23beb4157dc627d309b7bd08637093b57fcd4b822c47d744b86c428b
diff --git a/sci-astronomy/ftools/files/hd-std-install-tasks.patch b/sci-astronomy/ftools/files/hd-std-install-tasks.patch
deleted file mode 100644
index 35ee894..0000000
--- a/sci-astronomy/ftools/files/hd-std-install-tasks.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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/hd_install-DESTDIR.patch b/sci-astronomy/ftools/files/hd_install-DESTDIR.patch
deleted file mode 100644
index f0c47e5..0000000
--- a/sci-astronomy/ftools/files/hd_install-DESTDIR.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- heasoft-6.4.1.orig/BUILD_DIR/hd_install.c 2004-04-09 20:33:04.000000000 +0200
-+++ heasoft-6.4.1/BUILD_DIR/hd_install.c 2008-06-24 22:57:00.000000000 +0200
-@@ -1548,6 +1548,21 @@
- /* Next argument is required to be the name of the destination. */
- if(NULL != *nextArg && '\0' != **nextArg) {
- status = CleanPath(*nextArg, &dest, status);
-+
-+ /* add $DESTDIR to filename */
-+ char *newdest = NULL;
-+ char *destdir = getenv("DESTDIR");
-+ fprintf(stderr, "DESTDIR=%s.\n", destdir);
-+ fprintf(stderr, "dest=%s.\n", dest);
-+ if (NULL != destdir) {
-+ status = AppendPath(destdir, dest, &newdest, status);
-+ fprintf(stderr, "newdest=%s.\n", newdest);
-+ if (OK != status)
-+ continue;
-+ free(dest);
-+ dest = newdest;
-+ }
-+
- ++nextArg;
- } else {
- fprintf(stderr, sErrFmt, sBanner, usage);
diff --git a/sci-astronomy/ftools/files/hd_install-destdir.patch b/sci-astronomy/ftools/files/hd_install-destdir.patch
deleted file mode 100644
index 7508875..0000000
--- a/sci-astronomy/ftools/files/hd_install-destdir.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/BUILD_DIR/hd_install.c b/BUILD_DIR/hd_install.c
---- a/BUILD_DIR/hd_install.c
-+++ b/BUILD_DIR/hd_install.c
-@@ -1459,6 +1459,7 @@ int HDinstall_file(int argc, char** argv, int status) {
- char** nextArg;
- char** tmpArg;
- char* tmp_cp;
-+ char* destdir;
- InstallOptions opts = DEFAULT;
-
- /* Process command line options which apply to this program. */
-@@ -1555,6 +1556,15 @@ int HDinstall_file(int argc, char** argv, int status) {
- continue;
- }
-
-+ /* Prepend $DESTDIR if defined. */
-+ if(NULL != (destdir = getenv("DESTDIR"))) {
-+ char* newdest = NULL;
-+ if(OK != (status = AppendPath(destdir, dest, &newdest, status)))
-+ continue;
-+ free(dest);
-+ dest = newdest;
-+ }
-+
- /* Give information. */
- /* Perform installation. */
- status = InstallFiles(src, dest, nextArg, &opts, status);
diff --git a/sci-astronomy/ftools/files/headas-init-destdir.patch b/sci-astronomy/ftools/files/headas-init-destdir.patch
deleted file mode 100644
index 213d67c..0000000
--- a/sci-astronomy/ftools/files/headas-init-destdir.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/BUILD_DIR/Makefile.in b/BUILD_DIR/Makefile.in
-index f0a0fc0..bdfbb29 100644
---- a/BUILD_DIR/Makefile.in
-+++ b/BUILD_DIR/Makefile.in
-@@ -15,14 +15,18 @@ install: check-selection
- @${MAKE} ${HD_SELECTED} HD_TARGET=$@
- @./hd_install . ${HD_TOP_EXEC_PFX}/BUILD_DIR
- @if [ -d ../glast ]; then \
-- ./hd_install -f ${HD_TOP_EXEC_PFX}/BUILD_DIR/fermi-init.csh \
-+ ./hd_install -f \
-+ ${DESTDIR}/${HD_TOP_EXEC_PFX}/BUILD_DIR/fermi-init.csh \
- ${HD_TOP_EXEC_PFX}/fermi-init.csh ${HD_LN_S}; \
-- ./hd_install -f ${HD_TOP_EXEC_PFX}/BUILD_DIR/fermi-init.sh \
-+ ./hd_install -f \
-+ ${DESTDIR}/${HD_TOP_EXEC_PFX}/BUILD_DIR/fermi-init.sh \
- ${HD_TOP_EXEC_PFX}/fermi-init.sh ${HD_LN_S}; \
- else \
-- ./hd_install -f ${HD_TOP_EXEC_PFX}/BUILD_DIR/headas-init.csh \
-+ ./hd_install -f \
-+ ${DESTDIR}/${HD_TOP_EXEC_PFX}/BUILD_DIR/headas-init.csh \
- ${HD_TOP_EXEC_PFX}/headas-init.csh ${HD_LN_S}; \
-- ./hd_install -f ${HD_TOP_EXEC_PFX}/BUILD_DIR/headas-init.sh \
-+ ./hd_install -f \
-+ ${DESTDIR}/${HD_TOP_EXEC_PFX}/BUILD_DIR/headas-init.sh \
- ${HD_TOP_EXEC_PFX}/headas-init.sh ${HD_LN_S}; \
- fi
- @./hd_install -f hd_install${BSUF} ${HD_TOP_EXEC_PFX}/bin/hd_install${BSUF}
-@@ -34,8 +38,8 @@ install: check-selection
- install-fguiparfiles:
- @if [ -d ../ftools/guis/fgui ]; then \
- echo "Creating .par2 files for fgui:"; \
-- HEADAS=${HD_TOP_EXEC_PFX}; export HEADAS; \
-- . ${HD_TOP_EXEC_PFX}/headas-init.sh; \
-+ HEADAS=${DESTDIR}/${HD_TOP_EXEC_PFX}; export HEADAS; \
-+ . ${DESTDIR}/${HD_TOP_EXEC_PFX}/headas-init.sh; \
- echo "cd ../ftools/guis/fgui"; \
- cd ../ftools/guis/fgui; \
- echo "`which tclsh` convertpar.tcl ftools"; \
diff --git a/sci-astronomy/ftools/files/install-iwidgets-symlink-destdir.patch b/sci-astronomy/ftools/files/install-iwidgets-symlink-destdir.patch
deleted file mode 100644
index fb6f3c9..0000000
--- a/sci-astronomy/ftools/files/install-iwidgets-symlink-destdir.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/lhea-fixperl-destdir.patch b/sci-astronomy/ftools/files/lhea-fixperl-destdir.patch
deleted file mode 100644
index 527bca9..0000000
--- a/sci-astronomy/ftools/files/lhea-fixperl-destdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/lhea-fixperl b/lhea-fixperl
-index 927387b..e052b59 100755
---- a/lhea-fixperl
-+++ b/lhea-fixperl
-@@ -21,6 +21,7 @@ else
- fi
-
- for file in $filelist; do
-+ file="$DESTDIR/$file"
- if [ -f $file ]; then
- if [ `grep -c '^#!.*perl' $file 2> /dev/null` -gt 0 ]; then
- echo "Modifying $file to use Perl given by LHEAPERL at runtime."
diff --git a/sci-astronomy/ftools/files/lhea-fixpfiles-destdir.patch b/sci-astronomy/ftools/files/lhea-fixpfiles-destdir.patch
deleted file mode 100644
index 1392dce..0000000
--- a/sci-astronomy/ftools/files/lhea-fixpfiles-destdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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/files/no-tk-docs.patch b/sci-astronomy/ftools/files/no-tk-docs.patch
deleted file mode 100644
index 657c3c0..0000000
--- a/sci-astronomy/ftools/files/no-tk-docs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/tcltk/tk/unix/Makefile.in b/tcltk/tk/unix/Makefile.in
---- a/tcltk/tk/unix/Makefile.in
-+++ b/tcltk/tk/unix/Makefile.in
-@@ -600,7 +600,7 @@ gdb: wish
- gdb ./wish --command=gdb.run
- rm gdb.run
-
--INSTALL_TARGETS = install-binaries install-libraries install-demos install-doc @EXTRA_INSTALL@
-+INSTALL_TARGETS = install-binaries install-libraries install-demos @EXTRA_INSTALL@
-
- install: $(INSTALL_TARGETS)
-
-@@ -1542,7 +1542,7 @@ package-config:
- package-common:
- cd $(DISTDIR)/unix/`arch`;\
- $(MAKE); \
-- $(MAKE) install-libraries install-doc \
-+ $(MAKE) install-libraries \
- prefix=$(DISTDIR)/SUNWtcl/$(TCLVERSION) \
- exec_prefix=$(DISTDIR)/SUNWtcl/$(TCLVERSION)/`arch`
- mkdir -p $(DISTDIR)/SUNWtcl/$(TCLVERSION)/bin
diff --git a/sci-astronomy/ftools/files/par2-destdir.patch b/sci-astronomy/ftools/files/par2-destdir.patch
deleted file mode 100644
index 1d0fca5..0000000
--- a/sci-astronomy/ftools/files/par2-destdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/BUILD_DIR/Makefile.in b/BUILD_DIR/Makefile.in
---- a/BUILD_DIR/Makefile.in
-+++ b/BUILD_DIR/Makefile.in
-@@ -34,8 +34,8 @@ install: check-selection
- install-fguiparfiles:
- @if [ -d ../ftools/guis/fgui ]; then \
- echo "Creating .par2 files for fgui:"; \
-- HEADAS=${HD_TOP_EXEC_PFX}; export HEADAS; \
-- . ${HD_TOP_EXEC_PFX}/headas-init.sh; \
-+ HEADAS=${DESTDIR}/${HD_TOP_EXEC_PFX}; export HEADAS; \
-+ . ${DESTDIR}/${HD_TOP_EXEC_PFX}/headas-init.sh; \
- echo "cd ../ftools/guis/fgui"; \
- cd ../ftools/guis/fgui; \
- echo "`which tclsh` convertpar.tcl ftools"; \
diff --git a/sci-astronomy/ftools/ftools-6.7.ebuild b/sci-astronomy/ftools/ftools-6.7.ebuild
new file mode 100644
index 0000000..8beef1c
--- /dev/null
+++ b/sci-astronomy/ftools/ftools-6.7.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
+
+DESCRIPTION="General-Use FTools for manipulating and inspecting FITS files"
+HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/ftools/ftools_menu.html"
+SRC_URI="http://localhost/heasoft${PV}src.tar.gz"
+LICENSE="UNKOWN"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+RESTRICT="test"
+
+DEPEND="x11-base/xorg-server
+ >=dev-lang/perl-5.6.0"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/heasoft-${PV}/BUILD_DIR"
+PREFIX="/usr/heasoft-${PV}"
+
+MSG="The HEASOFT General-Use FTools have been installed into
+${PREFIX}.
+
+To use the HEASOFT, you need to source the headas init script,
+like so
+ . \${HEADAS}/headas-init.sh
+if you are using a bourne-shell. As a shortcut you can put an
+alias in your ~/.bashrc:
+ alias heainit=\". \${HEADAS}/headas-init.sh\"
+
+C-shells should source \${HEADAS}/headas-init.csh instead.
+
+The environment vairable \${HEADAS} has been defined for you
+globally in /etc/env.d/99headas."
+
+pkg_setup() {
+ [[ -d "${PREFIX}" ]] && die "Please unmerge previous installation."
+ ewarn "This ebuild works but doesn't do things as god intended..."
+}
+
+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}"/../ftools/guis/xdf
+ sed -i '27iClientData Tk_MainWindow (Tcl_Interp *) ;' xdfShared.c || die
+}
+
+src_configure() {
+ econf --prefix="${PREFIX}" || die "econf failed"
+}
+
+src_compile() {
+ emake -j2 || die "emake failed"
+}
+
+src_install() {
+ # The heasoft install scripts don't allow for $DESTDIR. Thus we
+ # must let headas install itself. This is very, very bad.
+ addwrite "${PREFIX}"
+ einfo "Installing into ${PREFIX} directly..."
+ # Hell knows why we need -j1 here. But we sure need it.
+ emake install || die "emake install failed"
+ einfo "Moving ${PREFIX} to image directory..."
+ mkdir "${D}"/usr
+ mv "${PREFIX}" "${D}"/usr
+
+ echo "${MSG}" > WTF
+ dodoc WTF
+
+ echo "HEADAS=\"`grep "HD_TOP_EXEC_PFX.*= " Makefile | sed "s#^HD_TOP_EXEC_PFX.*= ##"`\"" > 99headas
+ doenvd 99headas
+}
+
+pkg_postinst() {
+ elog "${MSG}"
+}