[gentoo-commits] repo/gentoo:master commit in: sci-astronomy/esorex/

[Sebastien Fabbro]

commit:     ec57125c36a557e5866918d0d4d19dd88d402236
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 24 21:28:30 2016 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 21:31:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec57125c

sci-astronomy/esorex: Version bump

Package-Manager: portage-2.2.27

 sci-astronomy/esorex/Manifest                         |  2 +-
 .../{esorex-3.10-r2.ebuild => esorex-3.12.ebuild}     | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/sci-astronomy/esorex/Manifest b/sci-astronomy/esorex/Manifest
index 35d10e6..556e7a1 100644
--- a/sci-astronomy/esorex/Manifest
+++ b/sci-astronomy/esorex/Manifest
@@ -1,2 +1,2 @@
 DIST esorex-3.10.2.tar.gz 817875 SHA256 
9a295754452b3e84fe2bc3674aaaf2e93354d2ad16781cb3f4c3f37ca0214e1e SHA512 
6f6f663bd74d61f3612a13fb39e17c984f8ed88d9dd175951b385d9797433b19a6e276841b23b61881cec8702eb8d74061549a922acf939a9a5e98c8016d1ecb
 WHIRLPOOL 
cb900ecad2067498c9865cfbd3db4d80f0f2907ea18e8eb3ab5d07aaea2a184520a480ad62cf591a30abbe51023f8f8384139ca67fdd05d3a35cde837f730967
-DIST esorex-3.10.tar.gz 817307 SHA256 
72ff1d26a45d7e926b1f4f74f1f286c8feb142dba7b0b5bb717c6286644f9494 SHA512 
985a906418488fec46fc939bf64b40330ae829771860a36a40240b703f6f6f89f3da6701ee4ceb8c6d2c0b478004596dce4dbc11389937e75ef02d9ecb4c3d16
 WHIRLPOOL 
ef368d35f5145b5626c88d6d4af7249889cce1ef901c67318d1f06f9baa7a0411c87917969261c0a268a06e5fd0dafd30701f49394cb82671f8c9ce282bc4768
+DIST esorex-3.12.tar.gz 649290 SHA256 
b99a11a93942543fd6c4e96975fa9f45e0e2c36412093c1be6ac37e545f1fd50 SHA512 
02547d44cf93c570b2be6f429215efee95a2ef91a26b45fd0a5bfea3ec00837e04972f801c3c00a892eb8bb24b2e3aa8a854b4093844cfae0aed3bf0f396eac6
 WHIRLPOOL 
8c22a6afb7bd8ccabc5e6bc2b42bb414a4a0a0dada41c15686949e20d2bbdc5f473107221ecb5222b4b5d06db42af786d812a861076c93743612bca05ee5833f

diff --git a/sci-astronomy/esorex/esorex-3.10-r2.ebuild 
b/sci-astronomy/esorex/esorex-3.12.ebuild
similarity index 75%
rename from sci-astronomy/esorex/esorex-3.10-r2.ebuild
rename to sci-astronomy/esorex/esorex-3.12.ebuild
index 4a159be..8c71831 100644
--- a/sci-astronomy/esorex/esorex-3.10-r2.ebuild
+++ b/sci-astronomy/esorex/esorex-3.12.ebuild
@@ -1,14 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-AUTOTOOLS_AUTORECONF=1
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AT_NO_RECURSIVE=1
-
-inherit autotools-utils
+inherit autotools
 
 DESCRIPTION="ESO Recipe Execution Tool to exec cpl scripts"
 HOMEPAGE="http://www.eso.org/sci/software/cpl/esorex.html";
@@ -25,17 +21,20 @@ RDEPEND="${DEPEND}"
 PATCHES=(
        "${FILESDIR}"/${PN}-3.9.6-use-shared-libs.patch
        "${FILESDIR}"/${PN}-3.10-remove-private-ltdl.patch
-       "${FILESDIR}"/${PN}-3.10-fix-autotools.patch
        "${FILESDIR}"/${PN}-3.10-generate-manpage.patch
        "${FILESDIR}"/${PN}-3.10-remove-empty-configdir.patch
        "${FILESDIR}"/${PN}-3.10-set-default-plugin-path.patch
-       "${FILESDIR}"/${PN}-3.10-cpl60_compat.patch
 )
 
 export CPLDIR="${EPREFIX}/usr"
 
+src_prepare() {
+       default
+       AT_NO_RECURSIVE=1 eautoreconf
+}
+
 src_install() {
-       autotools-utils_src_install
+       default
        dodoc -r examples
        docompress -x /usr/share/doc/${PF}/examples
 }