sci-astronomy: clean up

Files:
	deleted:    ../../sci-astronomy/fpipe/fpipe-0.0.0.ebuild
	modified:   ../../sci-astronomy/ftools/Manifest
	deleted:    ../../sci-astronomy/ftools/ftools-6.4.1.ebuild
	deleted:    ../../sci-astronomy/ftools/ftools-6.4.ebuild
	deleted:    ../../sci-astronomy/ftools/ftools-6.5.ebuild
	deleted:    ../../sci-astronomy/ftools/ftools-6.6.1-r1.ebuild
	deleted:    ../../sci-astronomy/ftools/ftools-6.6.1.ebuild
	modified:   ../../sci-astronomy/ftools/ftools-6.6.2.ebuild

7 files changed, 4 insertions, 366 deletions

diff --git a/sci-astronomy/ftools/Manifest b/sci-astronomy/ftools/Manifest
index aba2783..99d29dc 100644
--- a/sci-astronomy/ftools/Manifest
+++ b/sci-astronomy/ftools/Manifest
@@ -1,4 +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
@@ -7,8 +8,5 @@ AUX lhea-fixperl-destdir.patch 346 RMD160 1847549e5b2bcb2b5426a5225a31084d57db25
 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 562 RMD160 5dae9936eea2c9f3ec826981a8176731a60f49d0 SHA1 763c766edeada38996277beac9d1eff1f50e0130 SHA256 103319f0989f33edaa523b50475f552cba480ea5ace4e5b2896a719028db0f65
 DIST heasoft6.6.2src.tar.gz 41784019 RMD160 5237ddde4c25d0230de3a924985a3147ee2701e1 SHA1 30aac17d03df9b09171572f29be6d0a81a523957 SHA256 ef18ed517db0e2d8874d1febe8fece13e95783b6a7060156d3f7e22d9ceb613c
-EBUILD ftools-6.6.1-r1.ebuild 2003 RMD160 4eb8cb1f649f80cc259e4b9610a9b8aaf1f8a4ee SHA1 ac10d3fcad4aa7b7446d58bdbd0948cf85ea54b3 SHA256 871d835dbbdb71314f8d90a94a22a7519d8c648d442746066363ac3c2c170538
-EBUILD ftools-6.6.1.ebuild 1911 RMD160 ba849617b62ddbac13c1fab45157d1bbd05db7bf SHA1 078a2aa8bf1a5e5af3b2da31c835f2c630f677e9 SHA256 4e389dd716cb9e4e9243178c4c067b96f2839ced5ea5446b57c163f918069be7
-EBUILD ftools-6.6.2.ebuild 2158 RMD160 6013d9dee1c1d2cda40eb62e1c031a6edee0a6d6 SHA1 1c455eeeb351572b48c9bb8a497067ba9226b644 SHA256 7aa7880078adb43734951db998035df350c925a43ef22bea83e32d352b68d30e
+EBUILD ftools-6.6.2.ebuild 2169 RMD160 d4d62667999476326b68323addfea6cdfc3736a0 SHA1 c2871e847c13beff01b94ea7bc0e5a0ae3c82dd9 SHA256 f84dd94446cda6449f1732a545aeebd81d9f1123b81eacbec9b1a3b9d51751f4
diff --git a/sci-astronomy/ftools/ftools-6.4.1.ebuild b/sci-astronomy/ftools/ftools-6.4.1.ebuild
deleted file mode 100644
index 76de0d9..0000000
--- a/sci-astronomy/ftools/ftools-6.4.1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils fortran autotools
-
-# This package only includes the futils.
-
-DESCRIPTION="HEASOFT/HEADAS: The FTools (futils only) from NASA's GSFC for viewing and manipulating FITS files. Includes CFITSIO."
-HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/"
-SRC_URI="ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/heasoft${PV}src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-# Recommend >=dev-lang/perl-5.6.0.
-# Possibly we can have cfitsio installed side-by-side.
-DEPEND=">=dev-lang/perl-5.6.0
-	x11-base/xorg-server
-	!sci-libs/cfitsio"
-RDEPEND="${DEPEND}"
-
-
-S="${WORKDIR}/heasoft-${PV}"
-
-# INSTDIR="${D}/headas-${PV}"
-# INSTDIR_ARCH="${INSTDIR}/<arch-and-lib>"
-
-INSTPREFIX=/usr/heasoft
-ARCHPREFIX=/usr
-
-pkg_setup() {
-	fortran_pkg_setup
-}
-
-src_unpack() {
-	unpack "${A}"
-
-	# All occurrences of hd_install.c are the same, and need the same patch.
-	HD_INSTALL_C_DIR=". tcltk ftools heacore demo"
-	for rdir in ${HD_INSTALL_C_DIR}; do
-		cd "${S}/${rdir}"
-		einfo "Entering \"${rdir}\" ..."
-		EPATCH_OPTS="-p1" epatch "${FILESDIR}/hd_install-DESTDIR.patch"
-	done
-}
-
-src_compile() {
-	cd "${S}/BUILD_DIR/"
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-
-src_install() {
-	cd "${S}/BUILD_DIR/"
-	emake DESTDIR="${D}" install || die "Install failed"
-	dodoc "${S}/Release_Notes_6.4.1" || die "dodoc failed"
-}
-
-pkg_postinst() {
-	ewarn "In order to use heasoft and the ftools, put in your ~/.bashrc"
-	einfo
-	ewarn "	export HEADAS=\"${INSTDIR_ARCH}\""
-	ewarn "	alias heainit=\". $HEADAS/headas-init.sh"
-	einfo
-	ewarn "and initialize the ftools with"
-	einfo
-	ewarn "	$ heainit"
-	einfo
-	ewarn "every time you start a new shell."
-	ewarn "This is necessary since heasoft does not comply exactly with"
-	ewarn "GNU software conventions."
-	elog "Happy fitsing."
-}
diff --git a/sci-astronomy/ftools/ftools-6.4.ebuild b/sci-astronomy/ftools/ftools-6.4.ebuild
deleted file mode 100644
index 9dafd23..0000000
--- a/sci-astronomy/ftools/ftools-6.4.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils fortran autotools
-
-DESCRIPTION="HEASOFT/HEADAS: The FTools from NASA's GSFC for viewing and manipulating FITS files. Includes CFITSIO."
-HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/"
-SRC_URI="ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/heasoft${PV}src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE=""
-
-# Recommend >=dev-lang/perl-5.6.0.
-# Possibly we can have cfitsio installed side-by-side.
-DEPEND="dev-lang/perl
-	x11-base/xorg-server
-	!sci-libs/cfitsio"
-RDEPEND="${DEPEND}"
-
-
-S="${WORKDIR}/headas-${PV}"
-
-INSTDIR="${D}/headas-${PV}"
-INSTDIR_ARCH="${INSTDIR}/<arch-and-lib>"
-
-pkg_setup() {
-	fortran_pkg_setup
-}
-
-
-src_compile() {
-	cd "${S}/BUILD_DIR/"
-	econf --x-include="${ROOT}/usr/include" --x-libraries="${ROOT}/usr/lib" || die "econf failed"
-	emake || die "emake failed"
-}
-
-
-src_install () {
-	emake install || die "emake install failed"
-	dodoc "${S}/Release_Notes_6.3" "${S}/Release_Notes_6.3.1" "${S}/HEASOFT-INSTALL.TXT" || die "dodoc failed"
-}
-
-pkg_postinst() {
-	ewarn "In order to use heasoft and the ftools, put in your ~/.bashrc"
-	einfo
-	ewarn "	export HEADAS=\"${INSTDIR_ARCH}\""
-	ewarn "	alias heainit=\". $HEADAS/headas-init.sh"
-	einfo
-	ewarn "and initialize the ftools with"
-	einfo
-	ewarn "	$ heainit"
-	einfo
-	ewarn "every time you start a new shell."
-	ewarn "This is necessary since heasoft does not comply exactly with"
-	ewarn "GNU software conventions."
-	elog "Happy fitsing."
-}
diff --git a/sci-astronomy/ftools/ftools-6.5.ebuild b/sci-astronomy/ftools/ftools-6.5.ebuild
deleted file mode 100644
index 3a4b95a..0000000
--- a/sci-astronomy/ftools/ftools-6.5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils fortran autotools
-
-# This package only includes the futils.
-
-DESCRIPTION="HEASOFT/HEADAS: The FTools (futils only) from NASA's GSFC for viewing and manipulating FITS files. Includes CFITSIO."
-HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/"
-SRC_URI="ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/heasoft${PV}src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-# Recommend >=dev-lang/perl-5.6.0.
-# Possibly we can have cfitsio installed side-by-side.
-DEPEND=">=dev-lang/perl-5.6.0
-	x11-base/xorg-server
-	!sci-libs/cfitsio"
-RDEPEND="${DEPEND}"
-
-
-S="${WORKDIR}/heasoft-${PV}"
-
-# INSTDIR="${D}/headas-${PV}"
-# INSTDIR_ARCH="${INSTDIR}/<arch-and-lib>"
-
-INSTPREFIX=/usr/heasoft
-ARCHPREFIX=/usr
-
-pkg_setup() {
-	fortran_pkg_setup
-}
-
-# src_unpack() {
-	# unpack "${A}"
-
-	# # All occurrences of hd_install.c are the same, and need the same patch.
-	# # HD_INSTALL_C_DIR=". tcltk ftools heacore demo"
-	# # for rdir in ${HD_INSTALL_C_DIR}; do
-		# # cd "${S}/${rdir}"
-		# # einfo "Entering \"${rdir}\" ..."
-		# # EPATCH_OPTS="-p1" epatch "${FILESDIR}/hd_install-DESTDIR.patch"
-	# # done
-# }
-
-src_compile() {
-	cd "${S}/BUILD_DIR/"
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-
-src_install() {
-	cd "${S}/BUILD_DIR/"
-	emake DESTDIR="${D}" install || die "Install failed"
-	dodoc "${S}/Release_Notes_6.4.1" || die "dodoc failed"
-}
-
-pkg_postinst() {
-	ewarn "In order to use heasoft and the ftools, put in your ~/.bashrc"
-	einfo
-	ewarn "	export HEADAS=\"${INSTDIR_ARCH}\""
-	ewarn "	alias heainit=\". $HEADAS/headas-init.sh"
-	einfo
-	ewarn "and initialize the ftools with"
-	einfo
-	ewarn "	$ heainit"
-	einfo
-	ewarn "every time you start a new shell."
-	ewarn "This is necessary since heasoft does not comply exactly with"
-	ewarn "GNU software conventions."
-	elog "Happy fitsing."
-}
diff --git a/sci-astronomy/ftools/ftools-6.6.1-r1.ebuild b/sci-astronomy/ftools/ftools-6.6.1-r1.ebuild
deleted file mode 100644
index 527998d..0000000
--- a/sci-astronomy/ftools/ftools-6.6.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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="heasoft${PV}src.tar.gz"
-LICENSE="UNKOWN"
-SLOT="0"
-KEYWORDS="~x86"
-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
-}
-
-src_configure() {
-	econf --prefix="${PREFIX}" || die "econf 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 -j1 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}"
-}
diff --git a/sci-astronomy/ftools/ftools-6.6.1.ebuild b/sci-astronomy/ftools/ftools-6.6.1.ebuild
deleted file mode 100644
index c5607af..0000000
--- a/sci-astronomy/ftools/ftools-6.6.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# 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}/"
-
-
-src_prepare() {
-	# 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"
-	done
-	cd "${S}"
-	epatch "${FILESDIR}"/no-tk-docs.patch || die "epatch failed"
-	epatch "${FILESDIR}"/lhea-fixperl-destdir.patch || die "epatch failed"
-	epatch "${FILESDIR}"/headas-init-destdir.patch || die "epatch failed"
-}
-
-src_configure() {
-	cd BUILD_DIR
-	./configure --prefix="/usr/heasoft-${PV}/" || die "configure failed"
-}
-
-src_compile() {
-	cd BUILD_DIR
-	make -j1 || die "make failed"
-}
-
-src_install() {
-	cd BUILD_DIR
-	make -j1 DESTDIR="${D}" INSTALL_ROOT="${D}" install || die "make 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 || die "einstall failed"
-}
diff --git a/sci-astronomy/ftools/ftools-6.6.2.ebuild b/sci-astronomy/ftools/ftools-6.6.2.ebuild
index f37d50e..d6c7589 100644
--- a/sci-astronomy/ftools/ftools-6.6.2.ebuild
+++ b/sci-astronomy/ftools/ftools-6.6.2.ebuild
@@ -8,12 +8,12 @@ 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="heasoft${PV}src.tar.gz"
+SRC_URI="http://localhost/heasoft${PV}src.tar.gz"
 LICENSE="UNKOWN"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-RESTRICT="test fetch"
+RESTRICT="test"
 
 DEPEND="x11-base/xorg-server
 		>=dev-lang/perl-5.6.0"