fixed broken configure and bumped to the current release

(Portage version: 2.1_rc1-r2)

9 files changed, 190 insertions, 2 deletions

diff --git a/sci-libs/cfitsio/ChangeLog b/sci-libs/cfitsio/ChangeLog
index b9c4d3349d6e..3e9519478330 100644
--- a/sci-libs/cfitsio/ChangeLog
+++ b/sci-libs/cfitsio/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-libs/cfitsio
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.6 2005/09/16 07:26:02 agriffis Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.7 2006/05/17 06:20:53 nerdboy Exp $
+
+*cfitsio-3.006 (17 May 2006)
+
+  17 May 2006; Steve Arnold <nerdboy@gentoo.org>
+  +files/cfitsio-2.510-configure.patch,
+  +files/cfitsio-3.006-configure.patch, +cfitsio-2.510-r1.ebuild,
+  +cfitsio-3.006.ebuild, -cfitsio-2.510.ebuild:
+  fixed broken configure and bumped to the current release; newer portage
+  will bomb on the older ebuilds.
 
   16 Sep 2005; Aron Griffis <agriffis@gentoo.org> cfitsio-2.510.ebuild:
   Mark 2.510 stable on alpha
diff --git a/sci-libs/cfitsio/cfitsio-2.510-r1.ebuild b/sci-libs/cfitsio/cfitsio-2.510-r1.ebuild
new file mode 100644
index 000000000000..1e58b6993c29
--- /dev/null
+++ b/sci-libs/cfitsio/cfitsio-2.510-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-2.510-r1.ebuild,v 1.1 2006/05/17 06:20:53 nerdboy Exp $
+
+inherit eutils multilib toolchain-funcs
+
+IUSE="doc"
+
+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="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ppc ~ppc64 sparc x86"
+
+DEPEND="virtual/libc"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-configure.patch || die "epatch failed"
+}
+
+src_compile() {
+	econf --host=${CHOST} --prefix=${D}usr --libdir=${D}usr/$(get_libdir) \
+	    || die "econf failed"
+	make || die "make failed"
+	make shared fitscopy imcopy listhead
+}
+
+src_install () {
+	diropts "-m0644"
+	dodir /usr/$(get_libdir) /usr/include
+	dobin fitscopy imcopy listhead
+	dolib.so libcfitsio.so.*
+	dodoc changes.txt README Licence.txt
+
+	if use doc; then
+		dodoc *.ps cookbook.*
+	fi
+	insinto /usr/include
+	doins fitsio.h fitsio2.h longnam.h drvrsmem.h
+}
diff --git a/sci-libs/cfitsio/cfitsio-3.006.ebuild b/sci-libs/cfitsio/cfitsio-3.006.ebuild
new file mode 100644
index 000000000000..18479cf1b922
--- /dev/null
+++ b/sci-libs/cfitsio/cfitsio-3.006.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-3.006.ebuild,v 1.1 2006/05/17 06:20:53 nerdboy Exp $
+
+inherit eutils multilib toolchain-funcs
+
+IUSE="doc"
+
+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="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="virtual/libc"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-makefile.patch || die "epatch failed"
+}
+
+src_compile() {
+	econf --host=${CHOST} --prefix=${D}usr --libdir=${D}usr/$(get_libdir) || die "econf failed"
+	make || die "make failed"
+	make shared fitscopy imcopy listhead
+}
+
+src_install () {
+	dodir /usr/bin /usr/include /usr/$(get_libdir)
+	dolib.so libcfitsio.so.*
+	dobin fitscopy imcopy listhead
+	dodoc changes.txt README
+
+	if use doc; then
+		dodoc *.ps cookbook.*
+	fi
+
+	insinto /usr/include
+	doins fitsio.h fitsio2.h longnam.h drvrsmem.h
+}
diff --git a/sci-libs/cfitsio/files/cfitsio-2.510-configure.patch b/sci-libs/cfitsio/files/cfitsio-2.510-configure.patch
new file mode 100644
index 000000000000..4d4cff0231db
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-2.510-configure.patch
@@ -0,0 +1,39 @@
+--- Makefile.in.orig	2006-05-16 22:41:42.000000000 -0700
++++ Makefile.in	2006-05-16 22:44:32.000000000 -0700
+@@ -18,8 +18,8 @@
+ # testprog targets. See also changes and comments in configure.in
+ #
+ 
+-CFITSIO_LIB =	@CFITSIO_PREFIX@/lib
+-CFITSIO_INCLUDE =	@CFITSIO_PREFIX@/include
++CFITSIO_LIB =	@CFITSIO_PREFIX@/${LIBDIR}
++CFITSIO_INCLUDE =	@CFITSIO_PREFIX@/${INCLUDEDIR}
+ 
+ SHELL =		/bin/sh
+ RANLIB =	@RANLIB@
+@@ -142,4 +142,4 @@
+ objs: ${CORE_OBJECTS}
+ 
+ ${CFITSIO_LIB} ${CFITSIO_INCLUDE}:
+-	@if [ ! -d $@ ]; then mkdir $@; fi
++	@if [ ! -d $@ ]; then mkdir -p $@; fi
+--- configure.orig	2006-05-16 22:41:34.000000000 -0700
++++ configure	2006-05-16 22:46:39.000000000 -0700
+@@ -1230,6 +1230,8 @@
+     ;;
+   lnx)
+     SHLIB_LD=":"
++    LD_FLAGS="-shared -Wl,-soname,libcfitsio.so.0"
++    SHLIB_SUFFIX=".so.0"
+     ;;
+   osf)
+     SHLIB_LD="ld -shared -expect_unresolved '*'"
+@@ -1249,7 +1251,7 @@
+ # Darwin uses gcc (=cc), but needs different flags (see above)
+ # if test "x$GCC" = xyes; then
+ if test "x$GCC" = xyes && test "x$EXT" != xdarwin && test "x$EXT" != xcygwin; then
+-  SHLIB_LD="$CC -shared"
++  SHLIB_LD="gcc -shared -Wl,-soname,libcfitsio.so.0"
+   lhea_shlib_cflags='-fPIC'
+ fi
+ if test "x$lhea_shlib_cflags" != x; then
diff --git a/sci-libs/cfitsio/files/cfitsio-3.006-configure.patch b/sci-libs/cfitsio/files/cfitsio-3.006-configure.patch
new file mode 100644
index 000000000000..1144e3651bf5
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-3.006-configure.patch
@@ -0,0 +1,39 @@
+--- Makefile.in.orig	2006-05-16 20:54:31.000000000 -0700
++++ Makefile.in	2006-05-16 20:56:02.000000000 -0700
+@@ -19,8 +19,8 @@
+ #
+ 
+ CFITSIO_PREFIX	= @CFITSIO_PREFIX@
+-CFITSIO_LIB	= ${CFITSIO_PREFIX}/lib
+-CFITSIO_INCLUDE	= ${CFITSIO_PREFIX}/include
++CFITSIO_LIB	= ${CFITSIO_PREFIX}/${LIBDIR}
++CFITSIO_INCLUDE	= ${CFITSIO_PREFIX}/${INCLUDEDIR}
+ 
+ SHELL =		/bin/sh
+ RANLIB =	@RANLIB@
+@@ -146,4 +146,4 @@
+ objs: ${CORE_OBJECTS}
+ 
+ ${CFITSIO_PREFIX} ${CFITSIO_LIB} ${CFITSIO_INCLUDE}:
+-	@if [ ! -d $@ ]; then mkdir $@; fi
++	@if [ ! -d $@ ]; then mkdir -p $@; fi
+--- configure.orig	2006-05-16 20:54:04.000000000 -0700
++++ configure	2006-05-16 21:13:01.000000000 -0700
+@@ -1252,6 +1252,8 @@
+     ;;
+   lnx)
+     SHLIB_LD=":"
++    LD_FLAGS="-shared -Wl,-soname,libcfitsio.so.1"
++    SHLIB_SUFFIX=".so.0"
+     ;;
+   osf)
+     SHLIB_LD="ld -shared -expect_unresolved '*'"
+@@ -1271,7 +1273,7 @@
+ # Darwin uses gcc (=cc), but needs different flags (see above)
+ # if test "x$GCC" = xyes; then
+ if test "x$GCC" = xyes && test "x$EXT" != xdarwin && test "x$EXT" != xcygwin; then
+-  SHLIB_LD="$CC -shared"
++  SHLIB_LD="gcc -shared -Wl,-soname,libcfitsio.so.1"
+   lhea_shlib_cflags='-fPIC'
+ fi
+ if test "x$lhea_shlib_cflags" != x; then
diff --git a/sci-libs/cfitsio/files/digest-cfitsio-2.490 b/sci-libs/cfitsio/files/digest-cfitsio-2.490
index f7817d1cb6a1..f9e49bdc0e08 100644
--- a/sci-libs/cfitsio/files/digest-cfitsio-2.490
+++ b/sci-libs/cfitsio/files/digest-cfitsio-2.490
@@ -1 +1,3 @@
 MD5 271b07dcfe3e928e5138d64672eb77d9 cfitsio2490.tar.gz 2032914
+RMD160 14d9f4719706e03a9ca9c9079783d04ca7ece9e4 cfitsio2490.tar.gz 2032914
+SHA256 299ba48ccde81d527a933969e1bb721483333e2bc7afb611529ca1d2eb9ec418 cfitsio2490.tar.gz 2032914
diff --git a/sci-libs/cfitsio/files/digest-cfitsio-2.500 b/sci-libs/cfitsio/files/digest-cfitsio-2.500
index 4b1c7047ea3c..5151109f3cb3 100644
--- a/sci-libs/cfitsio/files/digest-cfitsio-2.500
+++ b/sci-libs/cfitsio/files/digest-cfitsio-2.500
@@ -1 +1,3 @@
 MD5 5447664f2948de94a180f447c2b15a5f cfitsio2500.tar.gz 2050459
+RMD160 4be86aa902d9a54644eeca2a6d8113a1003cc0c8 cfitsio2500.tar.gz 2050459
+SHA256 bdfaa00ad41730ead6ccdcee92dc4f3aa0dfc8af5a887ae54b8dbca0909a22a7 cfitsio2500.tar.gz 2050459
diff --git a/sci-libs/cfitsio/files/digest-cfitsio-2.510-r1 b/sci-libs/cfitsio/files/digest-cfitsio-2.510-r1
new file mode 100644
index 000000000000..c194e3ee96d9
--- /dev/null
+++ b/sci-libs/cfitsio/files/digest-cfitsio-2.510-r1
@@ -0,0 +1,3 @@
+MD5 ae8e5e7e3d38cf5de7d1228b40faa62d cfitsio2510.tar.gz 2059679
+RMD160 a22d276555dd55cdc871819528dc944d29291360 cfitsio2510.tar.gz 2059679
+SHA256 2d7bb11acd549be79255d2de971d3c1256c01d1508876f17fedbdac6dac17278 cfitsio2510.tar.gz 2059679
diff --git a/sci-libs/cfitsio/files/digest-cfitsio-3.006 b/sci-libs/cfitsio/files/digest-cfitsio-3.006
new file mode 100644
index 000000000000..d94dacffc106
--- /dev/null
+++ b/sci-libs/cfitsio/files/digest-cfitsio-3.006
@@ -0,0 +1,3 @@
+MD5 4aacb54dcf833c8075d1f6515ba069ca cfitsio3006.tar.gz 2121107
+RMD160 76244e8fa523992f345ae1a7ab4f41ed6c6adb91 cfitsio3006.tar.gz 2121107
+SHA256 c156ee0becee8987a14229e705f0f9f39dd2b73bbc9e73bc5d69f43896cb9a63 cfitsio3006.tar.gz 2121107