Version bump

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 130 insertions, 6 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/Manifest b/sci-astronomy/scamp/Manifest
index 472feb8ffbd6..6947ea637916 100644
--- a/sci-astronomy/scamp/Manifest
+++ b/sci-astronomy/scamp/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA1
 
 AUX scamp-1.4.6-autotools.patch 11670 RMD160 e8432a55ae36fe1d829fb1dea96f511af65ac066 SHA1 da3dd598774ded600c47521d73e9e0fd7d62220c SHA256 6fa2ae757fe38d1eb595e49b45c5e45e8bb811151daa68bc47e8743ac107e7e1
+AUX scamp-1.5.5-autotools.patch 1995 RMD160 19262dbb55ab7b91057f7be10980a248e3a14781 SHA1 6da267b431416a8b03f455f459b34894f0840f6d SHA256 52b55f000cdd0dcba0f12ade45f1a71563204c6f64ebf6c547cf26c3fe7b7a12
 DIST scamp-1.4.6.tar.gz 9172210 RMD160 cccec80d6cb3b2988960790174438e816175c7be SHA1 28042fdca3a25bb864437083a6c004a4d06356b3 SHA256 1b2f5619f1b53d16d85cccde701c50c8c37c8731b7d58d515803b11f77f99173
+DIST scamp-1.5.5.tar.gz 9183149 RMD160 79b28e01e39cb7d9c1caec7ce754d0550d96ae66 SHA1 9f62db1e068396fbed18d8874dbf967fc7514211 SHA256 ef15d3d334d7635cc0ba29ef8e03d89a6c1630a277d6f9572c82e71f26984f60
 EBUILD scamp-1.4.6.ebuild 1396 RMD160 9794f79b5220cbca2ef97b05928f91fad3958531 SHA1 dce5f0188ef9cc71448e98fa56d9ffc3b0fba188 SHA256 b6095cf93e32f917b462cdef15ef1ebb22c980ef52e4073857a93c9e0f0f46fe
-MISC ChangeLog 1585 RMD160 61ceba327337721b02e9cff50deaaf5796f291ec SHA1 6b911bd5927b9543bde97d994a655d8b6ded75a1 SHA256 acc7ae93b4c1158e1285415798924276443a5a4a59f7005d7eba438a9c076e18
+EBUILD scamp-1.5.5.ebuild 1306 RMD160 deb6994200710a6e2a39399b52b473f093f25853 SHA1 c6ec8e1fc49bc325cdb5fcf4e15e97209cb6738a SHA256 e14c95ae90da17867096567b68757204ef1d74cdbcdc1a67fd8b235556371d0a
+MISC ChangeLog 1744 RMD160 6ef6dda97ba45bf4fab957712508334336a74952 SHA1 69544801403b49330e78191478a79db06f023b56 SHA256 6d59fd44bb601b0251cc778a1678113ce755df99fd0b5694c20dbf375f710648
 MISC metadata.xml 502 RMD160 9497fdb374d39db4d8a95962026b236f37915c29 SHA1 38af39ae972bcc75b3cf67711d097c1577ccfa02 SHA256 986e1e381aaf54ffcf3394a2ec31c9c9da1f5cfef5416c6903a87f65776b92dd
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkmwYK8ACgkQ1ycZbhPLE2C8tACdH220D3M/Elg0blggRVyNSBAW
-mkIAn1VFsxI992tRllusrPPBg5Zt7LFB
-=EKMd
+iEYEARECAAYFAkpvMKUACgkQ1ycZbhPLE2AmaACcCFB69tWzYVlMzaNZW9R03shT
+WIUAnRc7rrs2LT4qq1lPUMbofU46c+GF
+=qilJ
 -----END PGP SIGNATURE-----
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
+}