Fixed for newer automake (bug #472018), switch to EAPI5

(Portage version: 2.2.01.21938-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

4 files changed, 34 insertions, 20 deletions

diff --git a/sci-physics/fastjet/ChangeLog b/sci-physics/fastjet/ChangeLog
index 6ca01b990f85..6abcf9e20934 100644
--- a/sci-physics/fastjet/ChangeLog
+++ b/sci-physics/fastjet/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-physics/fastjet
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/fastjet/ChangeLog,v 1.6 2012/10/16 19:00:28 jlec Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/fastjet/ChangeLog,v 1.7 2013/06/04 17:35:13 bicatali Exp $
+
+  04 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> fastjet-3.0.3-r1.ebuild,
+  files/fastjet-3.0.3-system-siscone.patch, metadata.xml:
+  Fixed for newer automake (bug #472018), switch to EAPI5
 
   16 Oct 2012; Justin Lecher <jlec@gentoo.org> fastjet-3.0.3-r1.ebuild,
   metadata.xml:
diff --git a/sci-physics/fastjet/fastjet-3.0.3-r1.ebuild b/sci-physics/fastjet/fastjet-3.0.3-r1.ebuild
index 8c7b30168a7b..cdf5d19e9f0f 100644
--- a/sci-physics/fastjet/fastjet-3.0.3-r1.ebuild
+++ b/sci-physics/fastjet/fastjet-3.0.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/fastjet/fastjet-3.0.3-r1.ebuild,v 1.3 2012/10/16 19:00:28 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/fastjet/fastjet-3.0.3-r1.ebuild,v 1.4 2013/06/04 17:35:13 bicatali Exp $
 
-EAPI=4
+EAPI=5
 
 AUTOTOOLS_AUTORECONF=yes
 
diff --git a/sci-physics/fastjet/files/fastjet-3.0.3-system-siscone.patch b/sci-physics/fastjet/files/fastjet-3.0.3-system-siscone.patch
index c81d86174a7b..b74b8e4e9033 100644
--- a/sci-physics/fastjet/files/fastjet-3.0.3-system-siscone.patch
+++ b/sci-physics/fastjet/files/fastjet-3.0.3-system-siscone.patch
@@ -1,7 +1,16 @@
 diff -Nur fastjet-3.0.3.orig/configure.ac fastjet-3.0.3/configure.ac
 --- fastjet-3.0.3.orig/configure.ac	2012-06-25 15:15:32.000000000 +0100
 +++ fastjet-3.0.3/configure.ac	2012-07-24 18:39:11.000000000 +0100
-@@ -252,6 +252,11 @@
+@@ -14,7 +14,7 @@
+ dnl  - the first macro needs to place the files in the correct 
+ dnl    dir in order to have the correct -I options for the remote build
+ dnl  - see Makefile.am for distcleaning AX_PREFIX_CONFIG_H leftovers
+-AM_CONFIG_HEADER(include/fastjet/config_raw.h:config.h.in)
++AC_CONFIG_HEADERS(include/fastjet/config_raw.h:config.h.in)
+ AX_PREFIX_CONFIG_H(include/fastjet/config_auto.h,FASTJET,include/fastjet/config_raw.h)
+ 
+ dnl check autoconf version
+@@ -252,6 +252,12 @@
  fi
  
  dnl SISCone
@@ -10,6 +19,7 @@ diff -Nur fastjet-3.0.3.orig/configure.ac fastjet-3.0.3/configure.ac
 +	[bundle_siscone=$withval],
 +	[bundle_siscone=no])
 +AM_CONDITIONAL(BUNDLE_SISCONE, test x$bundle_siscone != xno)
++
  ACX_CHECK_PLUGIN(SISCone, siscone, SISCONE, yes,
  	         [CONFIG_LIBS_PLUGINS=${CONFIG_LIBS_PLUGINS}" -lsiscone_spherical -lsiscone"
                    CONFIG_LIBS_PLUGINS_STATIC=${CONFIG_LIBS_PLUGINS_STATIC}" \${installationdir}/lib/libsiscone.a \${installationdir}/lib/libsiscone_spherical.a"])
diff --git a/sci-physics/fastjet/metadata.xml b/sci-physics/fastjet/metadata.xml
index dd3b54b23cca..21ba005f8078 100644
--- a/sci-physics/fastjet/metadata.xml
+++ b/sci-physics/fastjet/metadata.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci-physics</herd>
-	<longdescription lang="en">
-    The FastJet package provides a fast implementation of the
-    longitudinally invariant kt longitudinally invariant inclusive
-    Cambridge/Aachen and anti-kt jet finders and a uniform interface
-    to external jet finders (notably SISCone) via a plugin
-    mechanism. It also includes tools for calculating jet areas and
-    performing background (pileup/UE) subtraction.
- </longdescription>
-	<use>
-		<flag name="plugins"> Build all standard and C++ plugins </flag>
-		<flag name="cgal"> Use <pkg>sci-mathematics/cgal</pkg> instead of
-   bundled algorithms</flag>
-	</use>
+<herd>sci-physics</herd>
+<longdescription lang="en">
+  The FastJet package provides a fast implementation of the
+  longitudinally invariant kt longitudinally invariant inclusive
+  Cambridge/Aachen and anti-kt jet finders and a uniform interface
+  to external jet finders (notably SISCone) via a plugin
+  mechanism. It also includes tools for calculating jet areas and
+  performing background (pileup/UE) subtraction.
+</longdescription>
+<use>
+  <flag name="plugins"> Build all standard and C++ plugins </flag>
+  <flag name="cgal"> Use <pkg>sci-mathematics/cgal</pkg> instead of
+  bundled algorithms</flag>
+</use>
 </pkgmetadata>