Better autotoolization with libtool for cfitsio-2.510, for consistency with newer versions. Fix license (mainly BSD with pieces of GPL-2). Dropped alpha, ppc and ppc64 keywords because of use of dev-lang/cfortran.

Package-Manager: portage-2.1.5.2

4 files changed, 306 insertions, 2 deletions

diff --git a/sci-libs/cfitsio/ChangeLog b/sci-libs/cfitsio/ChangeLog
index 771520cbec0c..2c6a4e994d07 100644
--- a/sci-libs/cfitsio/ChangeLog
+++ b/sci-libs/cfitsio/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-libs/cfitsio
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.14 2008/05/31 13:26:35 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/ChangeLog,v 1.15 2008/06/02 08:21:45 bicatali Exp $
+
+*cfitsio-2.510-r2 (02 Jun 2008)
+
+  02 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/cfitsio-2.510-autotools.patch, +cfitsio-2.510-r2.ebuild:
+  Better autotoolization with libtool for cfitsio-2.510, for consistency
+  with newer versions. Fix license (mainly BSD with pieces of
+  GPL-2). Dropped alpha, ppc and ppc64 keywords because of use of
+  dev-lang/cfortran.
+	
 
   31 May 2008; Markus Dittrich <markusle@gentoo.org>
   cfitsio-2.510-r1.ebuild, cfitsio-3.006.ebuild:
diff --git a/sci-libs/cfitsio/Manifest b/sci-libs/cfitsio/Manifest
index f420412bf40d..a57ed8f58e58 100644
--- a/sci-libs/cfitsio/Manifest
+++ b/sci-libs/cfitsio/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX cfitsio-2.510-autotools.patch 6275 RMD160 02770f8738698fef2e8a9f51add2f99492cb8ad4 SHA1 bf297d7d04791475f9805244aab778215ac13955 SHA256 34d252c38c6664d57239124af9bac1bbf56fd9b43656db9b0e0855e7da53aba4
 AUX cfitsio-2.510-configure.patch 1230 RMD160 b1ca2255de7125f4e9a2f727832c8ee3ab2aaedb SHA1 eb1953b897d48bcc7c017890239c7e0165ab09d1 SHA256 b03fbb74d34ab91658d8871d88a4090db316f1911d87d0e19dfe6f7a744d269d
 AUX cfitsio-3.006-configure.patch 1226 RMD160 b37bd87f9e786acf00058ef75e68764d550c664c SHA1 ff9f29f346eaa1bf7e4950d73e569144a3f28d33 SHA256 5709cdccc061940e58c873a77135c1ac2e214a1b9be759509978301449f45b85
 AUX cfitsio-3.060-autotools.patch 8831 RMD160 c928ef54ee03b67d0f6816a8df1a1c92c81195c7 SHA1 4c6b2e83f41239e69731eb37c7b4810033acf94d SHA256 5507af5a8fccd5f88b9fa1f470d8f1f76f9e8c97d5456d54cbb22fff6e12d624
@@ -5,7 +9,15 @@ DIST cfitsio2510.tar.gz 2059679 RMD160 a22d276555dd55cdc871819528dc944d29291360
 DIST cfitsio3006.tar.gz 2121107 RMD160 76244e8fa523992f345ae1a7ab4f41ed6c6adb91 SHA1 ce850ea422c1ae86b19bcce4504dc216a29d1b07 SHA256 c156ee0becee8987a14229e705f0f9f39dd2b73bbc9e73bc5d69f43896cb9a63
 DIST cfitsio3060.tar.gz 2260799 RMD160 2c85f7fe1ddce8f83d5b2bdbf30c681fe0db0d87 SHA1 ec92c0d4402d2a7cf13f514c1be77665c43e0147 SHA256 3475679b6ef7a8494ceffec8255b9b2719251f16880da5d128b58c5de8954b46
 EBUILD cfitsio-2.510-r1.ebuild 1287 RMD160 72708a9c3e3c5d08d2a1f23351f4053550c8a1de SHA1 9df770665d76e579befcb47c93773cc9eb359195 SHA256 64ace0ce49863a1a0fbe8d7849a011bae1c0e0d6ac5cda37c83950ca092d1e3c
+EBUILD cfitsio-2.510-r2.ebuild 1522 RMD160 59beb08ebb2496c762a18deacf5c558c51970e83 SHA1 48176f6e52279d84c90d2a4cbd19c78de323c559 SHA256 ce9df0c150fbbfcfa63e0e8fbb7f75923da9b9978508f669738e6d80d5c7872c
 EBUILD cfitsio-3.006.ebuild 1320 RMD160 f97db7e15949babf9747306444b89cc432dfc753 SHA1 23cd9142830946389471ad0713a0952a862e2bdd SHA256 11197ffc7caccd24e07f6546d8bbbe6d45c565886622864980b2e983d68c6d5b
 EBUILD cfitsio-3.060.ebuild 1873 RMD160 db477363b74cbd6a02d1467429e38cb0335c00e9 SHA1 f4af9065f083756e97ab9ece6ee1e74f5314eeae SHA256 d2c16cda0622e29951b269b78f882b830cbf3115e6d6e39d46ad5771a94c1525
-MISC ChangeLog 3576 RMD160 726380bd0e72703067f36ba8627f0d29edac2ac8 SHA1 77b2624d72fc185839786101debf2588e6611973 SHA256 9d5f99bc42d504fe4883d065bcf86d02f4bb0c84bc47491b1da552c74f6e6ab4
+MISC ChangeLog 3955 RMD160 dae7947fee42f32361db146b96c9098c45c43e81 SHA1 838deae60cda93d4d62f579d661bd0036255e7cf SHA256 02933d41e637455ce3d02f09c7d25994a92e4770e8f6ef64b13bb4ff5051a4f8
 MISC metadata.xml 663 RMD160 fa865916cf612ed4d4510e2ac1a5aebd6568bad4 SHA1 4e58f56c8f6ebed1b013bc2c81509a7ebf569a9a SHA256 b3bf5af66a3c0b34c9f62155b3cf0207072cfae8695575dd194061e80873ec7e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhDraEACgkQ1ycZbhPLE2CJtwCglcHkKPn6h7AmxV1UAxStRelQ
+vmQAn2mWhcI5i+Eip914gE1fsO4vwkDJ
+=yYA7
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/cfitsio/cfitsio-2.510-r2.ebuild b/sci-libs/cfitsio/cfitsio-2.510-r2.ebuild
new file mode 100644
index 000000000000..75da2c208cec
--- /dev/null
+++ b/sci-libs/cfitsio/cfitsio-2.510-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cfitsio/cfitsio-2.510-r2.ebuild,v 1.1 2008/06/02 08:21:45 bicatali Exp $
+
+inherit eutils fortran autotools
+
+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="~amd64 ~hppa ~sparc ~x86"
+IUSE="doc fortran"
+
+DEPEND="fortran? ( dev-lang/cfortran )"
+RDEPEND=""
+
+S="${WORKDIR}/${PN}"
+
+pkg_setup() {
+	if use fortran; then
+		FORTRAN="gfortran g77 ifc"
+		fortran_pkg_setup
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# 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
+	fi
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	eautoreconf
+}
+
+src_compile() {
+	econf $(use_enable fortran) || die "econf failed"
+	emake || die "emake failed"
+}
+
+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 doc && dodoc cfitsio.ps quick.ps
+	if use fortran; then
+		doins cookbook.f || die "install cookbook failed"
+		dodoc fitsio.doc
+		use doc && dodoc fitsio.ps
+	fi
+}
diff --git a/sci-libs/cfitsio/files/cfitsio-2.510-autotools.patch b/sci-libs/cfitsio/files/cfitsio-2.510-autotools.patch
new file mode 100644
index 000000000000..457a016bb89a
--- /dev/null
+++ b/sci-libs/cfitsio/files/cfitsio-2.510-autotools.patch
@@ -0,0 +1,224 @@
+--- configure.ac.absent	1970-01-01 01:00:00.000000000 +0100
++++ configure.ac	2008-06-02 00:52:50.000000000 +0100
+@@ -0,0 +1,129 @@
++AC_PREREQ(2.59)
++AC_INIT([cfitsio], [2.510], [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="2:5: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], [Build the fortran interface]),
++   [ENABLE_FORTRAN=$enableval
++    AC_MSG_RESULT([$enableval])],
++   [ENABLE_FORTRAN=no 
++    AC_MSG_RESULT([no])]
++)
++
++if test x"$ENABLE_FORTRAN" = x"yes" ; then
++  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)
++fi
++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])]
++)
++# check for flock_t
++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_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>
++		]
++)
++
++# this quick check will add -lm to LIBS
++AC_CHECK_LIB(m, cos)
++
++AC_CONFIG_FILES([Makefile cfitsio.pc])
++AC_OUTPUT
+--- Makefile.am.absent	1970-01-01 01:00:00.000000000 +0100
++++ Makefile.am	2008-06-02 00:54:40.000000000 +0100
+@@ -0,0 +1,76 @@
++lib_LTLIBRARIES = libcfitsio.la
++
++C_SOURCES = 	buffers.c cfileio.c checksum.c compress.c drvrfile.c drvrmem.c \
++		drvrnet.c drvrsmem.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
++
++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
++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@
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = cfitsio.pc
++
++LDADD = libcfitsio.la
++bin_PROGRAMS = fitscopy imcopy listhead
++fitscopy_SOURCES = fitscopy.c
++listhead_SOURCES = listhead.c
++imcopy_SOURCES = imcopy.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
++
++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
+--- cfitsio.pc.in.absent	1970-01-01 01:00:00.000000000 +0100
++++ cfitsio.pc.in	2008-06-02 01:24:58.000000000 +0100
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: @PACKAGE_NAME@
++Description: FITS File Subroutine Library
++Version: @PACKAGE_VERSION@
++Libs: -L${libdir} -lcfitsio @LIBS@
++Cflags: -I${includedir}