Version bump

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 122 insertions, 1 deletions

diff --git a/sci-astronomy/scamp/ChangeLog b/sci-astronomy/scamp/ChangeLog
index 42606a9f4280..819620601e9e 100644
--- a/sci-astronomy/scamp/ChangeLog
+++ b/sci-astronomy/scamp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-astronomy/scamp
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/scamp/ChangeLog,v 1.2 2009/03/05 23:30:45 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/scamp/ChangeLog,v 1.3 2009/07/28 17:08:38 bicatali Exp $
+
+*scamp-1.5.5 (28 Jul 2009)
+
+  28 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org> +scamp-1.5.5.ebuild,
+  +files/scamp-1.5.5-autotools.patch:
+  Version bumpp
 
   05 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org>
   files/scamp-1.4.6-autotools.patch:
diff --git a/sci-astronomy/scamp/files/scamp-1.5.5-autotools.patch b/sci-astronomy/scamp/files/scamp-1.5.5-autotools.patch
new file mode 100644
index 000000000000..f58dca7b50f9
--- /dev/null
+++ b/sci-astronomy/scamp/files/scamp-1.5.5-autotools.patch
@@ -0,0 +1,67 @@
+--- configure.ac.orig	2009-04-10 20:22:36.000000000 +0100
++++ configure.ac	2009-07-28 17:50:01.000000000 +0100
+@@ -24,39 +24,19 @@
+ sinclude(acx_cdsclient.m4)
+ sinclude(acx_fftw.m4)
+ sinclude(acx_plplot.m4)
+-sinclude(acx_prog_cc_optim.m4)
+ sinclude(acx_pthread.m4)
+ sinclude(acx_urbi_resolve_dir.m4)
+ 
+ # Display pakage and version number
+ AC_MSG_RESULT([******** Configuring:  $PACKAGE_NAME $VERSION ($date) ********])
+ 
+-# Initialize the list of compilers to consider
+-cclist="cc gcc"
+-# Backup and reset the input CFLAGS
+-mycflags="$CFLAGS"
+-CFLAGS=""
+-
+-# Provide special option for the Linux Intel C compiler
+-AC_MSG_CHECKING([for Linux Intel C compiler mode])
+-AC_ARG_ENABLE(icc,
+-	[AC_HELP_STRING([--enable-icc],
+-	[Enable special mode for compilation with the Intel compiler \
+-(off by default)])],
+-        use_icc="yes"
+-        cclist="icc $cclist"
+-	AC_MSG_RESULT([yes]),
+-        use_icc="no"
+-	AC_MSG_RESULT([no]))
+-
+ # Checks for programs.
+ # GCC is chosen last because it is likely to yield less optimized code
+ AC_LANG(C)
+-AC_PROG_CC([$cclist])
++AC_PROG_CC
+ # C Compiler: Check that it is ANSI C and POSIX-compliant
+ AM_PROG_CC_STDC
+ AC_ISC_POSIX
+-ACX_PROG_CC_OPTIM
+ AC_DISABLE_STATIC
+ #AC_DISABLE_SHARED
+ AC_PROG_LIBTOOL
+@@ -273,11 +253,6 @@
+ 
+ # Link with gprof option
+ if test "$use_gprof" = "yes"; then
+-  if test "$use_icc" = "yes"; then
+-    CFLAGS="$CFLAGS -pq"
+-  else
+-    CFLAGS="$CFLAGS -pg"
+-  fi
+   use_static="no"
+ fi
+ 
+--- src/Makefile.am.orig	2009-04-09 10:00:38.000000000 +0100
++++ src/Makefile.am	2009-07-28 17:54:16.000000000 +0100
+@@ -15,6 +15,8 @@
+ 		  define.h fft.h fgroup.h field.h fitswcs.h globals.h header.h \
+ 		  key.h match.h misc.h mosaic.h photsolve.h preflist.h prefs.h \
+ 		  proper.h samples.h threads.h types.h wcscelsys.h xml.h
++scamp_CPPFLAGS  = @PLPLOT_CFLAGS@
+ scamp_LDADD	= $(top_builddir)/src/fits/libfits.a \
+-		  $(top_builddir)/src/wcs/libwcs_c.a
++		  $(top_builddir)/src/wcs/libwcs_c.a \
++		  @PLPLOT_LIBS@
+ DATE=`date +"%Y-%m-%d"`
diff --git a/sci-astronomy/scamp/scamp-1.5.5.ebuild b/sci-astronomy/scamp/scamp-1.5.5.ebuild
new file mode 100644
index 000000000000..aa0ddd0f1cfa
--- /dev/null
+++ b/sci-astronomy/scamp/scamp-1.5.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-astronomy/scamp/scamp-1.5.5.ebuild,v 1.1 2009/07/28 17:08:38 bicatali Exp $
+
+EAPI=2
+inherit eutils autotools
+
+DESCRIPTION="Computes astrometric and photometric solutions for astronomical images"
+HOMEPAGE="http://astromatic.iap.fr/software/scamp"
+SRC_URI="ftp://ftp.iap.fr/pub/from_users/bertin/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc threads plplot"
+
+RDEPEND="sci-astronomy/cdsclient
+	virtual/cblas
+	>=sci-libs/lapack-atlas-3.8.0
+	sci-libs/fftw:3.0
+	plplot? ( >=sci-libs/plplot-5.9 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	# gentoo uses cblas instead of ptcblas (linked to threaded with eselect)
+	sed -i \
+		-e 's/ptcblas/cblas/g' \
+		acx_atlas.m4 || die "sed acx_atlas.m4 failed"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--with-atlas="/usr/$(get_libdir)/lapack/atlas" \
+		$(use_with plplot) \
+		$(use_enable threads)
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog HISTORY README THANKS BUGS
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins doc/*.pdf || die "pdf doc install failed"
+	fi
+}