[gentoo-commits] proj/sci:master commit in: sci-astronomy/missfits/files/, sci-astronomy/missfits/

[Sebastien Fabbro]

commit:     e130e62c5f118131b595864959049b05b20cf48a
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 27 22:30:17 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 22:30:17 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e130e62c

sci-astronomy/missfits: EAPI-5, autotools-utils

Package-Manager: portage-2.2.8-prefix

---
 sci-astronomy/missfits/ChangeLog                   |   8 +-
 .../missfits/files/missfits-2.4.0-configure.patch  | 108 ---------------------
 sci-astronomy/missfits/missfits-2.4.0.ebuild       |  29 ------
 sci-astronomy/missfits/missfits-9999.ebuild        |  11 +--
 4 files changed, 10 insertions(+), 146 deletions(-)

diff --git a/sci-astronomy/missfits/ChangeLog b/sci-astronomy/missfits/ChangeLog
index b1cba2a..6ff1dea 100644
--- a/sci-astronomy/missfits/ChangeLog
+++ b/sci-astronomy/missfits/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-astronomy/missfits
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  27 Feb 2014; Sébastien Fabbro <bicatali@g.o> -Manifest,
+  -files/missfits-2.4.0-configure.patch, -missfits-2.4.0.ebuild,
+  missfits-9999.ebuild:
+  sci-astronomy/missfits: EAPI-5, autotools-utils
+
 *missfits-9999 (09 Jul 2012)
 
   09 Jul 2012; Sébastien Fabbro <bicatali@g.o> missfits-2.4.0.ebuild,
@@ -21,4 +26,3 @@
   18 Nov 2010; Sébastien Fabbro <bicatali@g.o> +missfits-2.4.0.ebuild,
   +files/missfits-2.4.0-configure.patch, +metadata.xml:
   Initial import
-

diff --git a/sci-astronomy/missfits/files/missfits-2.4.0-configure.patch b/sci-astronomy/missfits/files/missfits-2.4.0-configure.patch
deleted file mode 100644
index 1e8eb49..0000000
--- a/sci-astronomy/missfits/files/missfits-2.4.0-configure.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- configure.ac.orig	2010-11-17 23:51:53.000000000 +0000
-+++ configure.ac	2010-11-17 23:54:58.000000000 +0000
-@@ -20,51 +20,18 @@
- AC_SUBST(DATE3, "$date3")
- 
- # Include macros
--sinclude(acx_prog_cc_optim.m4)
- sinclude(acx_urbi_resolve_dir.m4)
- 
- # Display pakage and version number
- AC_MSG_RESULT([*********** Configuring:  $PACKAGE $VERSION ($date) **********])
- 
--# Initialize the list of compilers to consider
--cclist="cc gcc"
--
--# Provide special option for choosing automatically the compilation flags.
--AC_MSG_CHECKING([if compilation flags are set automatically])
--AC_ARG_ENABLE(auto-flags,
--	[AC_HELP_STRING([--enable-auto-flags],
--	[Let the configure script choose the compilation flags \
--(off by default)])],
--	use_autoflag="yes"
--	AC_MSG_RESULT([yes]),
--	use_autoflag="no"
--	AC_MSG_RESULT([no]))
--
--# 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_PROG_CC([$cclist])
-+AC_PROG_CC
- # C Compiler: Check that it is ANSI C
- AM_PROG_CC_STDC
- # C Compiler: Check that it is POSIX-compliant
- AC_ISC_POSIX
--# Override automatic CFLAGS and LDFLAGS with those of user
--if test "$use_autoflag" = "yes"; then
--  CFLAGS=""
--  LDFLAGS =""
--  ACX_PROG_CC_OPTIM
--fi
- AC_PROG_RANLIB
- AC_PROG_INSTALL
- 
-@@ -75,7 +42,7 @@
- # Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS([fcntl.h stdlib.h string.h unistd.h sys/mman.h])
--if test $use_icc = "yes" -a $CC = "icc"; then
-+if test $CC = "icc"; then
-   AC_CHECK_HEADERS(mathimf.h)
- fi
- 
-@@ -115,43 +82,6 @@
- 
- AC_DEFINE_UNQUOTED([XSL_URL], "$xsl_url",[Default URL of the XSLT filter])
- 
--# Provide special option for gprof profiling
--AC_MSG_CHECKING([for gprof profiler mode])
--AC_ARG_ENABLE(gprof,
--	[AC_HELP_STRING([--enable-gprof],
--	[Enable special mode for compilation with the gprof profiler \
--(off by default)])],
--        use_gprof="yes"
--	AC_MSG_RESULT([yes]),
--        use_gprof="no"
--	AC_MSG_RESULT([no]))
--
--# Enable linking options for making the executable as portable as possible.
--AC_MSG_CHECKING([best linking option])
--AC_ARG_ENABLE(best-link,
--	[AC_HELP_STRING([--enable-best-link],
--	[Choose the right combination of static and dynamic linking to make \
--the executable as portable as possible (off by default)])],
--	use_best="yes"
--	AC_MSG_RESULT([yes]),
--	use_best="no"
--	AC_MSG_RESULT([no]))
--
--# Link with gprof option
--if test "$use_gprof" = "yes"; then
--  if test "$use_icc" = "yes"; then
--    AM_CFLAGS="$AM_CFLAGS -pq"
--  else
--    AM_CFLAGS="$AM_CFLAGS -pg"
--  fi
--  use_best="no"
--fi
--
--# "Best" linking option
--if test "$use_best" = "yes"; then
--  AM_LDFLAGS="-shared-libgcc -static-libtool-libs $AM_LDFLAGS"
--fi
--
- # Display compiler and linker flags
- AC_MSG_RESULT([***************************************************************])
- AC_MSG_RESULT([Compile cmdline:  $CC $AM_CPPFLAGS $CPPFLAGS $AM_CFLAGS $CFLAGS])

diff --git a/sci-astronomy/missfits/missfits-2.4.0.ebuild b/sci-astronomy/missfits/missfits-2.4.0.ebuild
deleted file mode 100644
index 75a9197..0000000
--- a/sci-astronomy/missfits/missfits-2.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit autotools eutils
-
-DESCRIPTION="Performs basic maintenance and packaging tasks on FITS files"
-HOMEPAGE="http://www.astromatic.net/software/missfits/"
-SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-configure.patch
-	eautoreconf
-}
-
-src_install () {
-	default
-	use doc && dodoc doc/*.pdf
-}

diff --git a/sci-astronomy/missfits/missfits-9999.ebuild b/sci-astronomy/missfits/missfits-9999.ebuild
index b9434e0..2ac2a85 100644
--- a/sci-astronomy/missfits/missfits-9999.ebuild
+++ b/sci-astronomy/missfits/missfits-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=4
+EAPI=5
 
 if [[ ${PV} == "9999" ]] ; then
 	_SVN=subversion
@@ -14,7 +14,8 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit ${_SVN} autotools
+AUTOTOOLS_AUTORECONF=1
+inherit ${_SVN} autotools-utils
 
 DESCRIPTION="Performs basic maintenance and packaging tasks on FITS files"
 HOMEPAGE="http://www.astromatic.net/software/missfits/"
@@ -26,11 +27,7 @@ IUSE="doc"
 RDEPEND=""
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	eautoreconf
-}
-
 src_install () {
-	default
+	autotools-utils_src_install
 	use doc && dodoc doc/*
 }