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

[Sebastien Fabbro]

commit:     58a3a6f73d0821a13121a9ec589d7df84e507b35
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 27 20:44:26 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 20:44:26 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=58a3a6f7

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

Package-Manager: portage-2.2.8-prefix

---
 sci-astronomy/eye/ChangeLog                       |  8 +++-
 sci-astronomy/eye/eye-1.4.1.ebuild                | 32 -------------
 sci-astronomy/eye/eye-9999.ebuild                 | 16 +++----
 sci-astronomy/eye/files/eye-1.4.1-configure.patch | 58 -----------------------
 sci-astronomy/eye/metadata.xml                    |  4 +-
 5 files changed, 16 insertions(+), 102 deletions(-)

diff --git a/sci-astronomy/eye/ChangeLog b/sci-astronomy/eye/ChangeLog
index 153dbfc..32e5162 100644
--- a/sci-astronomy/eye/ChangeLog
+++ b/sci-astronomy/eye/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-astronomy/eye
-# Copyright 1999-2013 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,
+  -eye-1.4.1.ebuild, -files/eye-1.4.1-configure.patch, eye-9999.ebuild,
+  metadata.xml:
+  sci-astronomy/eye: EAPI-5, autotools-utils
+
   03 Mar 2013; Justin Lecher <jlec@g.o> eye-9999.ebuild, metadata.xml:
   Clean wrong space and blank lines
 
@@ -22,4 +27,3 @@
   18 Nov 2010; Sébastien Fabbro <bicatali@g.o> +eye-1.4.1.ebuild,
   +files/eye-1.4.1-configure.patch, +metadata.xml:
   Initial import
-

diff --git a/sci-astronomy/eye/eye-1.4.1.ebuild b/sci-astronomy/eye/eye-1.4.1.ebuild
deleted file mode 100644
index 082194e..0000000
--- a/sci-astronomy/eye/eye-1.4.1.ebuild
+++ /dev/null
@@ -1,32 +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="Enhance astronomical object extraction with neural network filters"
-HOMEPAGE="http://www.astromatic.net/software/eye"
-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 threads"
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-configure.patch
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable threads)
-}
-
-src_install () {
-	default
-	use doc && dodoc doc/*.pdf
-}

diff --git a/sci-astronomy/eye/eye-9999.ebuild b/sci-astronomy/eye/eye-9999.ebuild
index cad6953..6128c94 100644
--- a/sci-astronomy/eye/eye-9999.ebuild
+++ b/sci-astronomy/eye/eye-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="Enhance astronomical object extraction with neural network filters"
 HOMEPAGE="http://www.astromatic.net/software/eye"
@@ -26,15 +29,12 @@ IUSE="doc threads"
 RDEPEND=""
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	eautoreconf
-}
-
 src_configure() {
-	econf $(use_enable threads)
+	local myeconfargs=( $(use_enable threads) )
+	autotools-utils_src_configure
 }
 
 src_install () {
-	default
+	autotools-utils_src_install
 	use doc && dodoc doc/*
 }

diff --git a/sci-astronomy/eye/files/eye-1.4.1-configure.patch b/sci-astronomy/eye/files/eye-1.4.1-configure.patch
deleted file mode 100644
index 3694724..0000000
--- a/sci-astronomy/eye/files/eye-1.4.1-configure.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Respect user's flags.
-Don't define --enable-icc (that's what the CC env is for)
---- configure.ac.orig	2010-11-17 23:15:08.000000000 +0000
-+++ configure.ac	2010-11-17 23:30:56.000000000 +0000
-@@ -21,43 +21,14 @@
- 
- # Include macros
- sinclude(acx_pthread.m4)
--sinclude(acx_prog_cc_optim.m4)
- 
- # Display pakage and version number
- AC_MSG_RESULT([*********** Configuring:  $PACKAGE $VERSION ($date) **********])
- 
--# Initialize the list of compilers to consider
--cclist="cc gcc"
--
--# Backup and reset the input CFLAGS and LDFLAGS
--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_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_INSTALL
- AC_PROG_RANLIB
- 
-@@ -67,7 +38,7 @@
- # Checks for header files.
- AC_HEADER_STDC
- AC_CHECK_HEADERS(fcntl.h sys/mman.h time.h unistd.h)
--if test $use_icc = "yes" -a $CC = "icc"; then
-+if test $CC = "icc"; then
- AC_CHECK_HEADERS(mathimf.h)
- fi
- 

diff --git a/sci-astronomy/eye/metadata.xml b/sci-astronomy/eye/metadata.xml
index f5351e4..9c2032f 100644
--- a/sci-astronomy/eye/metadata.xml
+++ b/sci-astronomy/eye/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci-astronomy</herd>
-  <longdescription lang="en">
+<herd>sci-astronomy</herd>
+<longdescription lang="en">
   In EyE (Enhance Your Extraction) an artificial neural network
   connected to pixels of a moving window (retina) is trained to
   associate these input stimuli to the corresponding response in one