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

Package-Manager: portage-2.2.8-prefix

5 files changed, 12 insertions, 102 deletions

diff --git a/sci-astronomy/stuff/ChangeLog b/sci-astronomy/stuff/ChangeLog
index 2f967daf9..dfb71f7e2 100644
--- a/sci-astronomy/stuff/ChangeLog
+++ b/sci-astronomy/stuff/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-astronomy/stuff
-# Copyright 1999-2011 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@gentoo.org> -Manifest,
+  -files/stuff-configure.patch, -stuff-1.19.ebuild, stuff-9999.ebuild:
+  sci-astronomy/stuff: EAPI-5, autotools-utils
+
   04 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
   Switched herd to sci-astronomy
 
@@ -13,4 +17,3 @@
   27 Jul 2009; Sébastien Fabbro <bicatali@gentoo.org> +stuff-1.19.ebuild,
   +files/stuff-configure.patch, +metadata.xml:
   Initial import
-
diff --git a/sci-astronomy/stuff/Manifest b/sci-astronomy/stuff/Manifest
deleted file mode 100644
index e03b87980..000000000
--- a/sci-astronomy/stuff/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST stuff-1.19.tar.gz 4017086 SHA256 592e6bfff704d1391b150a0820b52258ef69a99b698ac07eb0a8f04daf5b0210 SHA512 d4dd26a024a4c1372ede2d0ae642ac3ce9e35715e22705996d6344e9e3054e645f1e662ef975d7fb00aea611720ef8c37153b533e0a1b1d9ffb13f16cafba423 WHIRLPOOL a1949b63e6dd6ac34c3ea1c4190c0f236e4a1f0c8363bf876f9329c1c5252272becf72d1327362c0d0b200629a14fcd012fcf07d6538635f614c8d510d54a189
diff --git a/sci-astronomy/stuff/files/stuff-configure.patch b/sci-astronomy/stuff/files/stuff-configure.patch
deleted file mode 100644
index 4f8c1bd63..000000000
--- a/sci-astronomy/stuff/files/stuff-configure.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- configure.ac.orig	2009-03-25 18:21:24.000000000 +0000
-+++ configure.ac	2009-03-25 18:27:33.000000000 +0000
-@@ -20,42 +20,17 @@
- AC_SUBST(DATE3, "$date3")
- 
- # Include macros
--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=""
--myldflags="$LDFLAGS"
--LDFLAGS=""
--
--# 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])
- # C Compiler: Check that it is ANSI C
- AM_PROG_CC_STDC
- # C Compiler: Check that it is POSIX-compliant
- AC_ISC_POSIX
--ACX_PROG_CC_OPTIM
- AC_PROG_RANLIB
- AC_PROG_INSTALL
- 
-@@ -154,19 +129,6 @@
-   use_static="no"
- fi
- 
--# Static linking option
--if test "$use_static" = "yes"; then
--  LDFLAGS="-static -shared-libgcc $LDFLAGS"
--fi
--
--# Override automatic CFLAGS and LDFLAGS with those of user
--#if test -n "$mycflags"; then
--#CFLAGS="$mycflags"
--#fi
--#if test -n "$myldflags"; then
--#LDFLAGS="$myldflags"
--#fi
--
- # Display compiler and linker flags
- AC_MSG_RESULT([***************************************************************])
- AC_MSG_RESULT([Compile cmdline:  $CC $CFLAGS])
diff --git a/sci-astronomy/stuff/stuff-1.19.ebuild b/sci-astronomy/stuff/stuff-1.19.ebuild
deleted file mode 100644
index eb9151721..000000000
--- a/sci-astronomy/stuff/stuff-1.19.ebuild
+++ /dev/null
@@ -1,27 +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="Tool for automatic generation of astronomical catalogs"
-HOMEPAGE="http://www.astromatic.net/software/stuff/"
-SRC_URI="http://www.astromatic.net/download/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="threads"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-configure.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable threads)
-}
diff --git a/sci-astronomy/stuff/stuff-9999.ebuild b/sci-astronomy/stuff/stuff-9999.ebuild
index 77b91829b..c020416e1 100644
--- a/sci-astronomy/stuff/stuff-9999.ebuild
+++ b/sci-astronomy/stuff/stuff-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,10 @@ else
 	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 fi
 
-inherit ${_SVN} autotools
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_IN_SOURCE_BUILD=1
+
+inherit ${_SVN} autotools-utils
 
 DESCRIPTION="Tool for automatic generation of astronomical catalogs"
 HOMEPAGE="http://www.astromatic.net/software/stuff/"
@@ -27,10 +30,7 @@ IUSE="threads"
 RDEPEND="sci-libs/fftw:3.0"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	eautoreconf
-}
-
 src_configure() {
-	econf $(use_enable threads)
+	local myeconfargs=( $(use_enable threads) )
+	autotools-utils_src_configure
 }