Drop old, obsoletes bug #442766

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

6 files changed, 23 insertions, 427 deletions

diff --git a/sci-libs/cfitsio/ChangeLog b/sci-libs/cfitsio/ChangeLog
index b1c58440e7e4..1be65675f20d 100644
--- a/sci-libs/cfitsio/ChangeLog
+++ b/sci-libs/cfitsio/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/cfitsio
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.72 2015/07/15 16:23:10 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.73 2015/07/28 14:43:45 jlec Exp $
+
+  28 Jul 2015; Justin Lecher <jlec@gentoo.org> -cfitsio-3.140.ebuild,
+  -cfitsio-3.350.ebuild, -files/cfitsio-3.140-autotools.patch,
+  -files/cfitsio-3.140-missing-include.patch:
+  Drop old, obsoletes bug #442766
 
   15 Jul 2015; Tobias Klausmann <klausman@gentoo.org> cfitsio-3.360.ebuild:
   Stable on alpha, bug 542590
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index 4a7afc23d463..af275ea8d8b8 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -1,22 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX cfitsio-3.140-autotools.patch 8213 SHA256 46eba8ba973eb0873992ea942d196815d375951c9154af65eb217abddd4c617f SHA512 390009737b1c4a3641f7bd357130838e490580f45216b52c82f542ed18966a5f440b48fcda458a4f8c70d3da3e98ed23d3b6049e5c8e3cb0838e3f580ff0e3a6 WHIRLPOOL 5730f90049c976e4641bb6875a2d6c57a2a229ff5c58ae93ef00218a37a571f48589e82bdf7aaaca905a905fcbee95928c1b5067172f52b23cad1a80e093667e
-AUX cfitsio-3.140-missing-include.patch 384 SHA256 3758a4c2b926889b42c14e6ad01857c4ab7ab5bf07010b8d5c043c284d1740eb SHA512 648bcc893420c6abe7cbd67512f06b43b8008cf83c741ab6ca09a2be2249693f05fcda7b4bdff01cc30cf230c7a8df3a3eea35c7010451f83389a764cdd9a4fd WHIRLPOOL 8bf7a53e6c353ba9613f5396f8019f74ee97bbea9f9386be17ab69e54b2b65fb2495105af21ca504469144097104e8d1d8541e31ef39af19cbd4eb72ad870bf4
-DIST cfitsio-3.350.tar.gz 4091022 SHA256 3e6615cec267b47faf378079a2c5e41a68bc0584390cad10fa292fa530842ef1 SHA512 d2f632845cdbdc2badb52da78eb9709afc15a2e2c7a914f726dde5b24bbffeb9fadce5ec642e85366d4bac3e177ee3e596b2f953abc6f0a62a5c2ef0e3d1b520 WHIRLPOOL 865c24c2b22402c5c50c4f09e12166f424623bb756f6678952949e3fa2e01a3bef3e4f3cbb856ec946a62e16480e6ce9336f564e033657bf2049bcd32fbcdbb8
 DIST cfitsio-3.360.tar.gz 4104894 SHA256 b5fb209583c76a0bcc39808e55ebf2417b9c26114c59db1a3f49ea1ede5fa95d SHA512 158819b4a3a29c29a5f017283e2b20067420994e881d202dbf3ba199c9e564dc1e74f8be5ce84f78107126d2a8688cc55cc7ed284540ca647e44cdc3b0b02072 WHIRLPOOL 05589a27c6fa83a0240b26924954c1c6d25d985ad609dfbd37fccfe5758fd28efbd97a5ec289803053e2f53e053e51c017292845de1b4368bcd1725fa2eccdb7
-DIST cfitsio3140.tar.gz 2903379 SHA256 d45e253d513d8df331a0294d243460773c57f9045878c8b79efbc7427c873d96 SHA512 9c307a39968d141fc2a1bf63fb212f2466ed5fb860c1ec9a6017023bd7be3079682428f06b2fa4dc699d8e14b5bf2155b486340f82ece64c357b2cab6d51fca2 WHIRLPOOL 61e757e7eeca36c1ae436ac49a72ccae17f3c7f0fce2936acd4ca29ee999c577610d9869498caf24e2dc86a80894ca8503c2d1d3307a43c89f977f2aff47cd30
-EBUILD cfitsio-3.140.ebuild 1527 SHA256 717bbb6490d4bc89aeaeabaef1f13af9302b52bdb1fc22c7d4feae6a5cc0260a SHA512 cdab29c448d3828a1ac5754eaa106a9dba39157b291991bc0993456f1b94eeaa8175524715f4d5533797166dfeaeaa0798194915f276e6808ffc801b03023ac9 WHIRLPOOL 3f99572959a5c63df385628a5d2607b61be0eb92001132f3d98b723f24b73a6b5a10ee009e59897f1591b0864836e2bed1e7940fed40836aacd7f50d8769507a
-EBUILD cfitsio-3.350.ebuild 1551 SHA256 d95dc44a77f2bba0c6eb9c46679c48e145a70453d225bcbc5c0de43ce4af1ebf SHA512 862a65fd546c1cc97b2cf7500586d181ace06c5205c00a9a3a7ce2c336e84e4f28415c574ad4a43337e34a847ed666b40aac1107070bafd0b70fed52226985d6 WHIRLPOOL 5e8ab8d05024cecbbf5032bea2a58f84c5d84c4a635f4c8ab8bb6cfe4eeee537b53a101e652d0f860852340d6f491f262e97f5b168c1fbbe9a9e33fea537b9a5
 EBUILD cfitsio-3.360.ebuild 1591 SHA256 66a4bbb1503f8baa358868ee2669291620c0ed8fe8b84f622ed7bc0e0535f89d SHA512 c7abd50796b1b13ea84922134243afe81f564c1f7ceb5db5de6fb5cfcf686419f539ddcfff4a7c7080aa087ca16e03beece7bee2becbfccce49505058a3503d4 WHIRLPOOL 08f599706473ff3214997b15e16f1614b52d4508d0f3ce5ed9d272e14f4372522c3832393413ff577e8340b67200db3c15ed58be0d7462b8f5eac5bf5029d720
-MISC ChangeLog 12878 SHA256 4e9a3104c4f77d11dd9f45143d57b0a63f42a665e39b846ff5df97c1f1cea3bc SHA512 4baf1f32ff117c486134219c777a5b513c587e5a067fd8d34c3e5e8585ca1a89bd7630206c46f0a3f876cfa7731070ffdf16fd98d0892a5e905225e6b5ceb1a2 WHIRLPOOL d1b15747eda7cc71206b7c32ccba05fe7e8b37b94b446cee8a1af3d330f55864c575933600206c3d531f5999c473e98ed78779492aec6b02524ed8b85d610e4f
+MISC ChangeLog 13088 SHA256 c93262b801e6aa27296180d71726bf335672fe877cf828e2d1cf34c0ac852eef SHA512 28fb2b283bc22658da71b8fa8a5cc40b9a9a2054c987b87bb8f6284115d555af5ebd7461ba133605f5dcdc1987dbdbb5f4a3bf9918d0758d6ad5122e5111d48a WHIRLPOOL 48837dd48bf47bf89a50e0eb9dc7fd4fa7bf5c002e02158a8108daf1ac151ba57a2f7e28390da3641359ba42f5f2eff71e75523dbcb244cbba850f730a57f263
 MISC metadata.xml 737 SHA256 1e6ca9a3c97878e23e465e1f8962daa500141dd3806b951df6b70ab872179f20 SHA512 e8ae72bcca65cf1fb450064f33bea2b332ae5a156fed757bbaf51053ebd96b8c13869929a29cf1528ec355f355049c1d8d1fe7b7552ae79f949639d0a085f31e WHIRLPOOL 60d125ef41a71017cf0d41228e93463d6781bee2295575dc4f5bf96e9bc44864eb744df5a37bb4acbecb5f1c3e4684f75da6d0a518452c15d4558a053fa5879e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.1
 
-iKYEAREIAGYFAlWmiO9fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldDFGNDg1MzU4NjMzRTAyNzA3RkY0ODA1QzAz
-RUUwM0ExQ0U1RDU0RTgACgkQA+4Doc5dVOjc1ACfR+4c9Pu3CVubK1a/C0iFVEJQ
-OEoAoIswfr7Ze4x/9tqjkHkhy1fT8OeF
-=LJYo
+iQJ8BAEBCgBmBQJVt5UcXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiNiIP/Ajdt8ZSh428BdyAESEMIItQ
+NdLQlGMKOWfWH/izLHySKJgm5oB4obfv3gXoyBZvHpgZxX5vN9V5qoBw9UcXSSKx
+BFsOh62JAv9skb7mPOkHZ/5h4/MAO/jARdsiNmD7uuTulI5qRsy/j5PE5kDGN+Mh
+JyTtq4VknQcxS6llOZz5PPzH2bX52zfpAQXpLitju1pUVVvv8zoDWPD/Qq5qIRWM
+5G8cYb1GOAwAKViyFPYAWw5vmoKtOQQaNunbPig0AUfFq1PmxEer8978fWJUJEMu
+12MgYfrslCEGiqqcEW9gLtWFv5JspHIn+3IGVP5dMmcm30dsrf+hSwWwCwrSVT3F
+TzlWP70N/qscD11dAXfCu9MUy3wDdzHt8tZUlAjVKJiEQuUbm9IsOZPLlagE4jBt
+V9Zdqe1CMu5P7bVCeQjvrHPIXo0tJbscaWJYK0w4uTC6YmTh3TmXmt10xVV39Da+
+FQ3NRrwc2teBgSj/aTmn5ewXapYhvm7JygGM2ctd+QJoqIlEa2UPO6olQdwYZtTL
+ReTQH5NM5d3mRwWNareECP3tE1eSzs+Cj7Rcr3TpJCKm4T7c9PmjdNZIBP9qb5Bg
+MiLB9Nuzvme1qepnpoi3u01JLc9Y2qXIjz6sPaA3NlLR9MXyFQGYz9ait6bYJ+6h
+CRELIfyKIzR++zCkkeG1
+=rmKv
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cfitsio/cfitsio-3.140.ebuild b/sci-libs/cfitsio/cfitsio-3.140.ebuild
deleted file mode 100644
index a0dd52c0e397..000000000000
--- a/sci-libs/cfitsio/cfitsio-3.140.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.140.ebuild,v 1.9 2013/09/23 13:04:36 jlec Exp $
-
-EAPI=2
-
-inherit autotools eutils fortran-2
-
-DESCRIPTION="C and Fortran library for manipulating FITS files"
-HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
-SRC_URI="ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/${PN}${PV//.}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE="doc fortran"
-
-DEPEND="fortran? ( dev-lang/cfortran )"
-RDEPEND=""
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	# avoid internal cfortran
-	if use fortran; then
-		sed -i \
-			-e 's:"cfortran.h":<cfortran.h>:' \
-			f77_wrap.h || die "sed fortran failed"
-		mv cfortran.h cfortran.h.disabled
-		ln -s /usr/include/cfortran.h .
-	fi
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	epatch "${FILESDIR}"/${P}-missing-include.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable fortran)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc changes.txt README cfitsio.doc || die "dodoc failed"
-	insinto /usr/share/doc/${PF}/examples
-	doins cookbook.c testprog.c speed.c smem.c || die "install examples failed"
-	use fortran && dodoc fitsio.doc && doins cookbook.f
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins quick.ps cfitsio.ps fpackguide.pdf
-		use fortran && doins fitsio.ps
-	fi
-}
diff --git a/sci-libs/cfitsio/cfitsio-3.350.ebuild b/sci-libs/cfitsio/cfitsio-3.350.ebuild
deleted file mode 100644
index afd62471d17b..000000000000
--- a/sci-libs/cfitsio/cfitsio-3.350.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.350.ebuild,v 1.2 2013/09/23 13:04:36 jlec Exp $
-
-EAPI=5
-
-inherit autotools-utils fortran-2
-
-DESCRIPTION="C and Fortran library for manipulating FITS files"
-HOMEPAGE="http://heasarc.gsfc.nasa.gov/docs/software/fitsio/fitsio.html"
-SRC_URI="http://dev.gentoo.org/~bicatali/distfiles/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="doc examples fortran static-libs +tools threads"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	fortran? ( dev-lang/cfortran )"
-
-pkg_setup() {
-	use fortran && fortran-2_pkg_setup
-}
-
-src_prepare() {
-	# avoid internal cfortran
-	if use fortran; then
-		mv cfortran.h cfortran.h.disabled
-		ln -s "${EPREFIX}"/usr/include/cfortran.h . || die
-	fi
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable fortran)
-		$(use_enable threads)
-		$(use_enable tools)
-	)
-	autotools-utils_src_configure
-}
-
-src_install () {
-	autotools-utils_src_install
-	dodoc changes.txt README* cfitsio.doc Changes*
-	use fortran && dodoc fitsio.doc
-	use doc && dodoc quick.pdf cfitsio.pdf fpackguide.pdf
-	use doc && use fortran && dodoc fitsio.pdf
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins cookbook.c testprog.c speed.c smem.c
-		use fortran && doins cookbook.f testf77.f
-	fi
-}
diff --git a/sci-libs/cfitsio/files/cfitsio-3.140-autotools.patch b/sci-libs/cfitsio/files/cfitsio-3.140-autotools.patch
deleted file mode 100644
index 7acd8eb9cb89..000000000000
--- a/sci-libs/cfitsio/files/cfitsio-3.140-autotools.patch
+++ /dev/null
@@ -1,291 +0,0 @@
---- cfitsio.pc.in.orig	2008-06-02 01:20:50.000000000 +0100
-+++ cfitsio.pc.in	2008-06-02 01:22:14.000000000 +0100
-@@ -1,10 +1,10 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=${exec_prefix}/lib
--includedir=${prefix}/include
-+libdir=@libdir@
-+includedir=@includedir@
- 
--Name: cfitsio
-+Name: @PACKAGE_NAME@
- Description: FITS File Subroutine Library
--Version: 3.006
--Libs: -L${libdir} -lcfitsio @LIBS@ -lm
-+Version: @PACKAGE_VERSION@
-+Libs: -L${libdir} -lcfitsio @LIBS@
- Cflags: -I${includedir}
---- configure.ac.orig	1970-01-01 01:00:00.000000000 +0100
-+++ configure.ac	2009-08-20 00:25:49.000000000 +0100
-@@ -0,0 +1,181 @@
-+AC_PREREQ(2.59)
-+AC_INIT([cfitsio], [3.140], [pence@tetra.gsfc.nasa.gov])
-+AC_CONFIG_SRCDIR([fitscore.c])
-+AM_INIT_AUTOMAKE([foreign])
-+
-+
-+AC_PROG_LIBTOOL
-+dnl no api version info, so simply copy package version
-+SHARED_VERSION_INFO="3:0:0"
-+AC_SUBST(SHARED_VERSION_INFO)
-+
-+AC_PROG_YACC
-+AC_PROG_LEX
-+
-+AC_MSG_CHECKING([whether to enable fortran interface])
-+AC_ARG_ENABLE([fortran],
-+   [AS_HELP_STRING([--enable-fortran], [Compile the fortran interface [default=yes]])],
-+   [ENABLE_FORTRAN=$enableval])
-+
-+case x"$ENABLE_FORTRAN" in
-+ *)
-+    ENABLE_FORTRAN=yes
-+    AC_MSG_RESULT([yes])
-+    AC_PROG_F77
-+    if test x$F77 = xg77; then
-+      cfortran_def=g77Fortran
-+    elif test x$F77 = xifort ; then
-+      cfortran_def=INTEL_COMPILER
-+    elif test x$F77 = xgfortran ; then
-+      cfortran_def=gFortran
-+    elif test x$F77 = xpgf77 ; then
-+      cfortran_def=pgiFortran
-+    else
-+      cfortran_def=f2cFortran
-+    fi
-+    CPPFLAGS_FORTRAN="-D$cfortran_def"
-+    AC_SUBST(CPPFLAGS_FORTRAN)
-+    ;;
-+ xno)
-+    ENABLE_FORTRAN=no
-+    AC_MSG_RESULT([no])
-+    ;;
-+esac
-+
-+AC_SUBST([ENABLE_FORTRAN])
-+AM_CONDITIONAL([ENABLE_FORTRAN], test "x$ENABLE_FORTRAN" = "xyes")
-+
-+AC_CANONICAL_HOST
-+case $host in
-+    *apple*darwin*)
-+	dnl may break Absoft compilers
-+	AC_DEFINE(_LARGEFILE_SOURCE, [1], 
-+		  [Define to 1 if you have large file support])
-+	AC_DEFINE(_FILE_OFFSET_BITS, [64],
-+ 		  [Offsets bits in files])
-+	;;
-+    *hppa*)
-+	CPPFLAGS_EXTRA="-DPG_PPU"
-+	;;
-+    *sunos5*)
-+	AC_DEFINE(_LARGEFILE_SOURCE, [1], 
-+		  [Define to 1 if you have large file support])
-+	AC_DEFINE(_FILE_OFFSET_BITS, [64],
-+ 		  [Offsets bits in files])
-+	CPPFLAGS_EXTRA="-DHAVE_ALLOCA_H -DHAVE_POSIX_SIGNALS"
-+	;;
-+    *irix*)
-+	CPPFLAGS_EXTRA="-DHAVE_POSIX_SIGNALS"
-+	;;
-+    *linux*)
-+	AC_DEFINE(_LARGEFILE_SOURCE, [1], 
-+		  [Define to 1 if you have large file support])
-+	AC_DEFINE(_FILE_OFFSET_BITS, [64],
-+ 		  [Offsets bits in files])
-+	;;
-+    *cygwin*)
-+	CPPFLAGS_EXTRA="-DHAVE_POSIX_SIGNALS"
-+	;;
-+    *)
-+	;;
-+esac
-+AC_SUBST(CPPFLAGS_EXTRA)
-+
-+AC_CHECK_FUNCS([ftruncate])
-+AC_CHECK_FUNCS([shmat shmdt shmget], 
-+    AC_DEFINE(HAVE_SHMEM_SERVICES, [1],
-+	[Define to yes if you have shared memory functions])
-+)
-+AC_CHECK_FUNCS([gethostbyname connect],
-+   [AC_DEFINE(HAVE_NET_SERVICES, [1], 
-+       [Define to 1 if you have network functions])]
-+)
-+AC_CHECK_TYPE(long long,
-+   [AC_DEFINE(HAVE_LONGLONG, [1], 
-+   	[Define to 1 if your compiler supports long long])]
-+)
-+dnl check for flock_t
-+AC_MSG_CHECKING([for flock_t in sys/fcntl.h])
-+AC_COMPILE_IFELSE(
-+	[AC_LANG_PROGRAM([[
-+#include <sys/fcntl.h>
-+			]], [[
-+flock_t filler;
-+			]])],
-+	[AC_DEFINE(HAVE_FLOCK_T, 1, [if you have flock_t])
-+	 AC_MSG_RESULT([yes])],
-+	[AC_MSG_RESULT([no]) ])
-+
-+if test "$HAVE_FLOCK_T" != 1; then
-+   AC_MSG_CHECKING([for flock_t in sys/flock.h])
-+   AC_COMPILE_IFELSE([
-+	AC_LANG_PROGRAM([[
-+#include <sys/flock.h>
-+			]], [[
-+flock_t filler;
-+			]])],
-+	[AC_DEFINE(HAVE_FLOCK_T, 1, [if you have flock_t])
-+	 AC_MSG_RESULT([yes])],
-+	[AC_MSG_RESULT([no]) ])
-+fi
-+
-+# check for union semun type
-+AC_CHECK_TYPE(union semun,
-+   AC_DEFINE(HAVE_UNION_SEMUN, [1],
-+	[Define to 1 if you have semun in sys/sem.h]),,[
-+#include <sys/types.h>
-+#include <sys/ipc.h>
-+#include <sys/sem.h>
-+		]
-+)
-+
-+dnl this quick check will add -lm to LIBS
-+AC_CHECK_LIB(m, cos)
-+
-+AC_ARG_WITH([gsiftp-flavour],
-+  [AC_HELP_STRING([--with-gsiftp-flavour[=PATH]], [Compile with a given Globus Toolkit gsiftp protocol flavour])],
-+  ,
-+  [withval=no])
-+
-+case x$withval in
-+  xno)
-+      AC_MSG_CHECKING([for Globus flavor])
-+      AC_MSG_RESULT([none])
-+      ;;
-+  xyes)
-+      AC_MSG_RESULT([yes])
-+      ;;
-+  *)
-+   AC_MSG_RESULT([$withval])
-+   GSIFTP_FLAVOUR=$withval
-+   AC_DEFINE(GSIFTP_FLAVOUR, [1], 
-+	    [Define to 1 if you want Globus Toolkit architecture])
-+   ;;
-+esac
-+
-+AC_ARG_WITH(gsiftp,
-+    [AC_HELP_STRING([--with-gsiftp[=PATH]], [Compile with Globus Toolkit gsiftp protocol support [default=no]])],
-+    ,
-+    [withval=no])
-+case "x$withval" in
-+  xno)
-+      AC_MSG_CHECKING([for Globus Toolkit])
-+      AC_MSG_RESULT([no])
-+      ;;
-+  xyes)
-+      AC_MSG_RESULT([yes])
-+      ;;
-+  *)
-+      AC_MSG_RESULT([yes])
-+      CPPFLAGS_GLOBUS="-I${withval}/include/${GSIFTP_FLAVOUR}"
-+      LIBS_GLOBUS="-L${withval}/lib -lglobus_ftp_client_${GSIFTP_FLAVOUR}"
-+      HAVE_GSIFTP=yes
-+      AC_DEFINE(HAVE_GSIFTP, [1],
-+	    [Define if you want Globus Toolkit gsiftp protocol support])
-+	    ;;
-+esac
-+
-+AC_SUBST(CPPFLAGS_GLOBUS)
-+AC_SUBST(LIBS_GLOBUS)
-+AC_CONFIG_FILES([Makefile cfitsio.pc])
-+AC_OUTPUT
---- Makefile.am.orig	1970-01-01 01:00:00.000000000 +0100
-+++ Makefile.am	2009-08-20 00:45:37.000000000 +0100
-@@ -0,0 +1,86 @@
-+lib_LTLIBRARIES = libcfitsio.la
-+
-+C_SOURCES = \
-+	buffers.c cfileio.c checksum.c compress.c drvrfile.c drvrmem.c \
-+	drvrnet.c drvrsmem.c drvrgsiftp.c editcol.c edithdu.c eval_l.c \
-+	eval_y.c eval_f.c fitscore.c getcol.c getcolb.c getcold.c getcole.c \
-+	getcoli.c getcolj.c getcolk.c getcoll.c getcols.c getcolsb.c \
-+	getcoluk.c getcolui.c getcoluj.c getkey.c group.c grparser.c \
-+	histo.c iraffits.c \
-+	modkey.c putcol.c putcolb.c putcold.c putcole.c putcoli.c \
-+	putcolj.c putcolk.c putcoluk.c putcoll.c putcols.c putcolsb.c \
-+	putcolu.c putcolui.c putcoluj.c putkey.c region.c scalnull.c \
-+	swapproc.c wcssub.c wcsutil.c imcompress.c quantize.c ricecomp.c \
-+	pliocomp.c fits_hcompress.c fits_hdecompress.c
-+
-+F77_SOURCES=
-+if ENABLE_FORTRAN
-+F77_SOURCES += f77_wrap1.c f77_wrap2.c f77_wrap3.c f77_wrap4.c f77_wrap.h
-+endif
-+AM_YFLAGS = -d -v
-+
-+include_HEADERS = fitsio.h fitsio2.h longnam.h drvrsmem.h
-+noinst_HEADERS = cfortran.h  drvrgsiftp.h  eval_defs.h  f77_wrap.h  group.h \
-+	compress.h  eval_tab.h   fpack.h   grparser.h  region.h
-+
-+libcfitsio_la_SOURCES = $(C_SOURCES) $(F77_SOURCES) $(include_HEADERS)
-+libcfitsio_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
-+libcfitsio_la_CPPFLAGS = @CPPFLAGS_FORTRAN@ @CPPFLAGS_EXTRA@ @CPPFLAGS_GLOBUS@
-+libcfitsio_la_LIBADD = @LIBS_GLOBUS@
-+
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = cfitsio.pc
-+
-+LDADD = libcfitsio.la
-+bin_PROGRAMS = fitscopy imcopy listhead fpack funpack
-+fitscopy_SOURCES = fitscopy.c
-+listhead_SOURCES = listhead.c
-+imcopy_SOURCES = imcopy.c
-+fpack_SOURCES = fpack.c fpackutil.c
-+funpack_SOURCES = funpack.c fpackutil.c
-+
-+# tests
-+check_PROGRAMS = testprog
-+noinst_PROGRAMS =  speed cookbook smem
-+testprog_SOURCES = testprog.c
-+speed_SOURCES = speed.c
-+cookbook_SOURCES = cookbook.c
-+smem_SOURCES = smem.c
-+
-+if ENABLE_FORTRAN
-+check_PROGRAMS += testf77
-+testf77_SOURCES = testf77.f
-+endif
-+
-+EXTRA_DIST = README README.MacOS README.win32 License.txt changes.txt cfitsio.doc fitsio.doc cfitsio.tex fitsio.tex quick.tex
-+
-+check-local: $(check_PROGRAMS)
-+	@total=0; failed=0; \
-+	for i in $(check_PROGRAMS); do \
-+		echo "--- Testing $$i ---"; \
-+		./$$i${EXEEXT} > my_$$i.out; \
-+		diff $$i.out my_$$i.out; \
-+		cmp $$i.fit $$i.std; \
-+		if [ "x$$?" = "x0" ]; then \
-+			echo "Test \`$$i' PASSED."; \
-+		else \
-+			echo "Test \`$$i' FAILED!!!"; \
-+			failed=$$(($$failed + 1)); \
-+		fi; \
-+		total=$$(($$total + 1)); \
-+	done; \
-+	if [ $$failed -gt 0 ]; then \
-+		echo "*** ERROR: $$failed/$$total tests failed!!!"; \
-+		echo ""; \
-+		exit 1; \
-+	fi
-+
-+eval:
-+	@$(LEX) -t eval.l > eval_l.c1; \
-+	sed -e 's/yy/ff/g' -e 's/YY/FF/g' eval_l.c1 > eval_l.c; \
-+	rm -f eval_l.c1; \
-+	$(YACC) -d -v -y eval.y; \
-+	sed -e 's/yy/ff/g' -e 's/YY/FF/g' y.tab.c > eval_y.c; \
-+	sed -e 's/yy/ff/g' -e 's/YY/FF/g' y.tab.h > eval_tab.h; \
-+	rm -f y.tab.c y.tab.h
diff --git a/sci-libs/cfitsio/files/cfitsio-3.140-missing-include.patch b/sci-libs/cfitsio/files/cfitsio-3.140-missing-include.patch
deleted file mode 100644
index b28f6d2a4162..000000000000
--- a/sci-libs/cfitsio/files/cfitsio-3.140-missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur cfitsio.orig/fpackutil.c cfitsio/fpackutil.c
---- cfitsio.orig/fpackutil.c	2009-03-18 16:31:42.000000000 +0000
-+++ cfitsio/fpackutil.c	2009-03-19 22:38:15.002056931 +0000
-@@ -10,6 +10,7 @@
- #include <sys/time.h>
- #include <time.h>
- #include <stdlib.h>
-+#include <math.h>
- 
- /* these filename buffer are used to delete temporary files */
- /* in case the program is aborted */