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

Package-Manager: portage-2.2.01.21938-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

5 files changed, 42 insertions, 29 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/Manifest b/sci-physics/fastjet/Manifest
index 34be3c42977a..1638a8264dae 100644
--- a/sci-physics/fastjet/Manifest
+++ b/sci-physics/fastjet/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX fastjet-3.0.3-system-siscone.patch 3724 SHA256 e3142d8c8d23bd532dbf4ac818b252a910c30512e8512fc29d4bd25393de96a9 SHA512 343b82a7a0a7523230719f018a009dee5ba1ca8db75f80b3a196f238e27ccab3c1fabf81035ba3f8b3df149207e2bfb9f11070581368bd8e71f5e6bcd4e7d07e WHIRLPOOL 7e99ea6aed63e8cdee41b7d5624299d7d2e9aa2f23035a8be259c4a46b69bd4385a5f9c2d238a049ea00279ad32d7381f968b3a5f087b2cf6341e43dd81551b5
+AUX fastjet-3.0.3-system-siscone.patch 4191 SHA256 57d1bc7d85d2dbc0fe4d8b38727562db8a8758c6b33bc3cc2d4363d263f63a5d SHA512 34ba5e61364f9fe090389edbeda4370b2707e89fab2a00e941cabe496f8e7cdd65fb1fccdb48f000247b0e6bb3abc79bb995931fd4a9709584eed8eaab42957c WHIRLPOOL 217436144a424196b96f5d123ea00c9be8a5a4c44011e6605208198e64430ecbd737e8dfe4ba327b58c234551fa9308220e7fac5d71b9d36bb58b727a0e34d21
 DIST fastjet-3.0.3.tar.gz 2240610 SHA256 6a3e5869cf43b325c7222a925e195b2bd624db922958a926cb4211c00882a50d SHA512 1fcdd0998d222ae089f10676ae1048fdce3e90f6aef3cd51463719b7ab26f8bcdd599d9521c6f9ef18e3989dbffd7f06da717ce845ab7e486a99433129b56f41 WHIRLPOOL b43091b978bde5189ed009ad424934d45607717bfc81e4d0b49c1ce634650bbf9e51019c7bfb0f6ce6298a697e6c8be296feaae1ac31bd2184e44b53a538ba48
-EBUILD fastjet-3.0.3-r1.ebuild 1352 SHA256 1863abf1a370e736b20e7255fa49f888e0c87e11b666a19ae488e709faf2b59d SHA512 f32e4ca62fd121416279b6b66528fee2e00b8c9cf4bc846d42c3fff70d133f48e8317bc2092a62a4c07093b492defd4e3e399ea035e9f6eaa34deb7e7e32673b WHIRLPOOL 272075183e47d8f47785106aa3f635a9ef9747d4caf838f623ad0ca1813fcc033207c1c344502b62a2dc2d8957a535b1c8472cbccf6396c999f0c3af7a04c808
-MISC ChangeLog 1640 SHA256 46644fc4e806b24d05b1db84d420627de2f39206b57e940acafe9ef811a986e2 SHA512 57f7e91e2c37cbc561219f0d52f73d36be19e854f6426f8082f530b0f92619ecd005d49cc6fc643b5ea214c6f2d4579a4f692f7220edb51ef76550e9f1b19cac WHIRLPOOL 3ddb10db47e00b22b6f91ac6c0dad4ebbbb7ed400e86dc4f5a53cb2a61285480deddd309fba7913e01a374ea40dc39266b1d52dddee3cea25a6897b02a9cf5c8
-MISC metadata.xml 769 SHA256 08e536cf6fc684c9867e4ecdf35038a2e69437b6847d128a4c56dd0fa6376666 SHA512 6e4f01249f92c01ee628a1938550308ce4c75ed71be5181b6ea2f3f1be1b4646e7e9f71b95fe5c8340ae520c5cb3465b33bf10cfad62fd20f224edd072b51d21 WHIRLPOOL 44a9c5c5a57f574801a65a72e612f0a44a5585a40089de46649a672e7d28652b6f68c5e76c189897c9a8656d9e53f8409faa3def16bbc0800c3e3a5408747132
+EBUILD fastjet-3.0.3-r1.ebuild 1356 SHA256 69b5cadbc0bb8249aeb50092a50c15dca0f49815d7ef9fb3f8a523a21f582867 SHA512 dd33f064a1028b3261f4325478697033f667e781de2418f4f04f66fe996e64762705a7cbba8dab82caacf9b23d740528308ebc9e63dec2f399114b99e18617ef WHIRLPOOL 6a10139066fbfea0dcd6616bbed984cc94e03aa3f608b3b739d10eb016a4e52de5d3e3739d234473e7f320f9933253514ad9255c9b1197cc3594e2fa5881c3de
+MISC ChangeLog 1841 SHA256 d188dcdf5a5b6b1ee883ec226af1a3dd2e25438c809590a79ccfca7bda742758 SHA512 b64e92422e2a3e300871e4ad3745d26707d262e452f06e0c2119c2c3943658af0782a3efbbd66e81660012864fab52d640b1dadbe45cd9d38a7361f099f91421 WHIRLPOOL 7a22acd07419ce520d5ffdaa79130ee730ab4059898eb638eb5c880fb73c60430f98d3ef2b1f977edc8d264c8e2dcb9df439991d1d976fdb9e35a557c79cb033
+MISC metadata.xml 751 SHA256 0c61b85fac33ea4d9f2daa3f3b4712ebf4af03291900a862d188a68e3dbb003c SHA512 cfb68b3f1e6ccf2aa5f171b119980b9eb274c773185249daccb4ce88c8e811998a3e37f4351786251c7ad0c617804300907a4c105622d8f870478801066b942e WHIRLPOOL ea60c6801f43127248f82d5fb161bd9ab635c6a2caed9af09e51f4307295cf9b13d974da49f54dd7dd1d5f086d74f4a60cfec6325385519b575a5fe6e660abd0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlB9rs0ACgkQgAnW8HDreRbkDACg0LaJU9Xjd4wutPAajcT2Dj3n
-U50AoIzPeYcWLh1eEi4pezOsTsP22fB8
-=aCdj
+iEYEAREIAAYFAlGuJasACgkQ1ycZbhPLE2B71wCeImphyvQRt2f/gRCMexx7HYTk
+DMcAoI1JnZ+p9ihZCSiC0Z+kR+Aj2V5e
+=wQdD
 -----END PGP SIGNATURE-----
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>