UDe-bundle siscone again

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

4 files changed, 94 insertions, 9 deletions

diff --git a/sci-physics/fastjet/ChangeLog b/sci-physics/fastjet/ChangeLog
index 13a56f09be25..52d166cc63c0 100644
--- a/sci-physics/fastjet/ChangeLog
+++ b/sci-physics/fastjet/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-physics/fastjet
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/fastjet/ChangeLog,v 1.8 2014/02/23 02:46:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/fastjet/ChangeLog,v 1.9 2014/05/06 17:40:58 bicatali Exp $
+
+*fastjet-3.0.6-r1 (06 May 2014)
+
+  06 May 2014; Sébastien Fabbro <bicatali@gentoo.org> +fastjet-3.0.6-r1.ebuild,
+  +files/fastjet-3.0.6-system-siscone.patch, -fastjet-3.0.6.ebuild:
+  UDe-bundle siscone again
 
 *fastjet-3.0.6 (23 Feb 2014)
 
diff --git a/sci-physics/fastjet/Manifest b/sci-physics/fastjet/Manifest
index 2b513014e2e2..6502f32b1361 100644
--- a/sci-physics/fastjet/Manifest
+++ b/sci-physics/fastjet/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA256
 
 AUX fastjet-3.0.3-system-siscone.patch 4191 SHA256 57d1bc7d85d2dbc0fe4d8b38727562db8a8758c6b33bc3cc2d4363d263f63a5d SHA512 34ba5e61364f9fe090389edbeda4370b2707e89fab2a00e941cabe496f8e7cdd65fb1fccdb48f000247b0e6bb3abc79bb995931fd4a9709584eed8eaab42957c WHIRLPOOL 217436144a424196b96f5d123ea00c9be8a5a4c44011e6605208198e64430ecbd737e8dfe4ba327b58c234551fa9308220e7fac5d71b9d36bb58b727a0e34d21
+AUX fastjet-3.0.6-system-siscone.patch 3726 SHA256 10f150979e7f1f06c71d57b22d6161332ebddbef20e0ce1caa7787e512e72125 SHA512 7522e3fd0fe789bc5b3172c2c26566136004b828a46a81fb0ec39bb6bedbf358efc0b51acab8cb19a40dd5b4138190f87655ddd2679cc91c819f5c7c9e9f4c57 WHIRLPOOL 3a45e02c436eba0314ca5a6e6a589afd042f083ffbbeb13f3c2317b540333c33b1a8d021adaab7e68aee8f3c7d1f5bf1313bcc24aaa6f51c06e5ddec04f5d0f7
 DIST fastjet-3.0.3.tar.gz 2240610 SHA256 6a3e5869cf43b325c7222a925e195b2bd624db922958a926cb4211c00882a50d SHA512 1fcdd0998d222ae089f10676ae1048fdce3e90f6aef3cd51463719b7ab26f8bcdd599d9521c6f9ef18e3989dbffd7f06da717ce845ab7e486a99433129b56f41 WHIRLPOOL b43091b978bde5189ed009ad424934d45607717bfc81e4d0b49c1ce634650bbf9e51019c7bfb0f6ce6298a697e6c8be296feaae1ac31bd2184e44b53a538ba48
 DIST fastjet-3.0.6.tar.gz 2216501 SHA256 9718f1d014afe4433bc0612a67a050d720c486fcfa7ad9c9b96bf087b0f3da0b SHA512 1f01b7ed0e07bd94c88faa123f72c2e3bcd81ad32ab4d03dc0a18dd18635f3b18ba8d339176b0ef1d6e58cecd9f37aaea30b4ad909d2782ce5be7c11e205c3a5 WHIRLPOOL 8c1aeab2724940e41ca6eed093582d6d9a5424b7f2b86af00bd7e1fedd3df0157538c6d97ff08147a4e3a5300d035d683df31b4a7a9d36bc9c14eca9375ae1e1
 EBUILD fastjet-3.0.3-r1.ebuild 1356 SHA256 69b5cadbc0bb8249aeb50092a50c15dca0f49815d7ef9fb3f8a523a21f582867 SHA512 dd33f064a1028b3261f4325478697033f667e781de2418f4f04f66fe996e64762705a7cbba8dab82caacf9b23d740528308ebc9e63dec2f399114b99e18617ef WHIRLPOOL 6a10139066fbfea0dcd6616bbed984cc94e03aa3f608b3b739d10eb016a4e52de5d3e3739d234473e7f320f9933253514ad9255c9b1197cc3594e2fa5881c3de
-EBUILD fastjet-3.0.6.ebuild 1274 SHA256 be39434b9a301a2b2fd564252e4c8bcf8d4551b0bbf375e575cb650dbae04b9f SHA512 1c52b3e58e72b1746ff343163614015c87a57d77fa77e94c3bd7660f6bc1365ef9fd86a254cea12fe0129222a2c747eb539edc604e3ef7386e7588b15c07a9c6 WHIRLPOOL 00ada6eeb0d5bbf530103dc665ee34bc58f66d87fe10e43f62caafd85969e70c560ee2adec657a7e5f97c1de8fa954edbdadbc0d8f794ce7bb692bf581c97394
-MISC ChangeLog 1965 SHA256 8a45d6f109117f8d28b8477097acae2402230cc90d4505bf1e37e31e2244b307 SHA512 57cd26ae5e8be48edc3752d67acfa4655d15661c254c0d84e928324d941748f01331111fc28abde336e87e50505b7d85ad8368ad4b5082aebc888109dbb2cf1b WHIRLPOOL 1d05359d86d8446bda48cc6214beaf450803ee7a58713e7f11f05d5c0d4cf311eebea35f2096f2796a1e23b46ab6cf0e6dca29cf8c1625beb5854256ac3a4d2d
+EBUILD fastjet-3.0.6-r1.ebuild 1360 SHA256 297eb1cb2f98eafe568834c65d89a94fac097b37af42b490ece0a11c6af0359f SHA512 177ad32649b488974374d800ab2f6081c70627a6a6cb2c4f5eb0ebf42eb3aa17d2f924db3581f4f8b05dd4c1b669b1bf65c8560d9d5b87361e1f5c4e660fe063 WHIRLPOOL 70d85c1dc05efab4af220c4c25fb2df6cb49968615593d55d5deee9439be3f6d84a26e7057661d4e7543e2eafe2c5ba72d77c60796f8997ea753e594ab2d5456
+MISC ChangeLog 2175 SHA256 64bb1e7d93c42de38d896c41046a5d0be2caac69f26cd454288e044df5244c9e SHA512 106962af37f72ee1cdc092edb62a0873dbb7a454bd1dfe8b11f973e8a52d6b8e2d2ac7c3003e087d1cbc60fbe9737d7c2c717f2168e470258b8b19e79b1df9c1 WHIRLPOOL 47bd675e4f27cba65c815e2fd66631cdf80427fc98fdc35c40ab1f0f9693c0440e18ee44c3494c59a4b4df29d083c31c9c3421300009b636f7059e5005cd75af
 MISC metadata.xml 751 SHA256 0c61b85fac33ea4d9f2daa3f3b4712ebf4af03291900a862d188a68e3dbb003c SHA512 cfb68b3f1e6ccf2aa5f171b119980b9eb274c773185249daccb4ce88c8e811998a3e37f4351786251c7ad0c617804300907a4c105622d8f870478801066b942e WHIRLPOOL ea60c6801f43127248f82d5fb161bd9ab635c6a2caed9af09e51f4307295cf9b13d974da49f54dd7dd1d5f086d74f4a60cfec6325385519b575a5fe6e660abd0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMJYPAACgkQ1ycZbhPLE2C/KACfXih0DRe2ZVya+qiOx6tVZL5M
-SxwAn0rY0grrQQIKK1B/KdFkVe/uHxYG
-=LbqO
+iEYEAREIAAYFAlNpHq8ACgkQ1ycZbhPLE2BEAQCeLOSnh2RG1hURssA2p/81Qpww
++OsAn1jmrIPsTILfhYVGgWitTNXtRj3n
+=ZGmR
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/fastjet/fastjet-3.0.6.ebuild b/sci-physics/fastjet/fastjet-3.0.6-r1.ebuild
index 289ca8f8ec20..527c8efd9f65 100644
--- a/sci-physics/fastjet/fastjet-3.0.6.ebuild
+++ b/sci-physics/fastjet/fastjet-3.0.6-r1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/fastjet/fastjet-3.0.6.ebuild,v 1.1 2014/02/23 02:46:07 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/fastjet/fastjet-3.0.6-r1.ebuild,v 1.1 2014/05/06 17:40:58 bicatali Exp $
 
 EAPI=5
 
 FORTRAN_NEEDED=plugins
+AUTOTOOLS_AUTORECONF=1
 
 inherit autotools-utils fortran-2 flag-o-matic
 
@@ -20,10 +21,13 @@ IUSE="cgal doc examples +plugins static-libs"
 RDEPEND="cgal? ( sci-mathematics/cgal )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )
-	plugins? ( sci-physics/siscone )"
+	plugins? ( sci-physics/siscone:0= )"
+
+PATCHES=( "${FILESDIR}"/${P}-system-siscone.patch )
 
 src_configure() {
-	use cgal && has_version sci-mathematics/cgal[gmp] && append-ldflags -lgmp
+	use cgal && \
+		has_version sci-mathematics/cgal[gmp] && append-ldflags -lgmp
 	local myeconfargs=(
 		$(use_enable cgal)
 		$(use_enable plugins allplugins)
diff --git a/sci-physics/fastjet/files/fastjet-3.0.6-system-siscone.patch b/sci-physics/fastjet/files/fastjet-3.0.6-system-siscone.patch
new file mode 100644
index 000000000000..d3995473fe54
--- /dev/null
+++ b/sci-physics/fastjet/files/fastjet-3.0.6-system-siscone.patch
@@ -0,0 +1,74 @@
+diff -Nur fastjet-3.0.6.orig/configure.ac fastjet-3.0.6/configure.ac
+--- fastjet-3.0.6.orig/configure.ac	2014-05-06 10:29:55.240632504 -0700
++++ fastjet-3.0.6/configure.ac	2014-05-06 10:36:20.156246416 -0700
+@@ -261,6 +261,12 @@
+ fi
+ 
+ dnl SISCone
++AC_ARG_WITH(bundle-siscone,
++	[  --with-bundle-siscone  Build the bundled SISCone library [default=no]],
++	[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 -Nur fastjet-3.0.6.orig/example/Makefile.am fastjet-3.0.6/example/Makefile.am
+--- fastjet-3.0.6.orig/example/Makefile.am	2014-05-06 10:29:55.239632499 -0700
++++ fastjet-3.0.6/example/Makefile.am	2014-05-06 10:36:20.156246416 -0700
+@@ -43,7 +43,7 @@
+ 03_plugin_CXXFLAGS = $(AM_CXXFLAGS) $(CGAL_CPPFLAGS) -I$(srcdir)/../include
+ 03_plugin_LDADD = ../src/libfastjet.la $(CGAL_LIBS)
+ 03_plugin_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone
+-03_plugin_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
++03_plugin_LDADD += ../plugins/SISCone/libSISConePlugin.la
+ else
+ EXTRA_DIST += 03-plugin.cc
+ endif
+@@ -125,7 +125,7 @@
+ fastjet_areas_LDADD = ../src/libfastjet.la $(CGAL_LIBS)
+ if BUILD_PLUGIN_SISCONE
+ fastjet_areas_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone
+-fastjet_areas_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
++fastjet_areas_LDADD += ../plugins/SISCone/libSISConePlugin.la
+ endif
+ 
+ fastjet_timing_plugins_SOURCES = fastjet_timing_plugins.cc CmdLine.cc
+@@ -135,7 +135,7 @@
+ fastjet_timing_plugins_LDADD += ../tools/libfastjettools.la 
+ if BUILD_PLUGIN_SISCONE
+ fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/SISCone -I$(srcdir)/../plugins/SISCone/siscone
+-fastjet_timing_plugins_LDADD += ../plugins/SISCone/libSISConePlugin.la ../plugins/SISCone/siscone/siscone/libsiscone.la ../plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
++fastjet_timing_plugins_LDADD += ../plugins/SISCone/libSISConePlugin.la
+ endif
+ if BUILD_PLUGIN_CDFCONES
+ fastjet_timing_plugins_CXXFLAGS += -I$(srcdir)/../plugins/CDFCones
+diff -Nur fastjet-3.0.6.orig/plugins/SISCone/Makefile.am fastjet-3.0.6/plugins/SISCone/Makefile.am
+--- fastjet-3.0.6.orig/plugins/SISCone/Makefile.am	2014-05-06 10:29:55.250632584 -0700
++++ fastjet-3.0.6/plugins/SISCone/Makefile.am	2014-05-06 10:36:20.156246416 -0700
+@@ -1,11 +1,22 @@
+-SUBDIRS = siscone fastjet .
++SUBDIRS = fastjet .
+ 
+ if MONOLITHIC_PLUGINS
+ noinst_LTLIBRARIES = libSISConePlugin.la
+ else
+ lib_LTLIBRARIES = libSISConePlugin.la
+ endif
+-libSISConePlugin_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir) -I$(srcdir)/siscone -I$(srcdir)/../../include
++libSISConePlugin_la_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir) -I$(srcdir)/../../include
++
++if BUNDLE_SISCONE
++SUBDIRS += siscone
++libSISConePlugin_la_CXXFLAGS += -I$(srcdir)/siscone
++libSISConePlugin_la_LIBADD = \
++	$(top_builddir)/plugins/SISCone/siscone/siscone/libsiscone.la \
++	$(top_builddir)/plugins/SISCone/siscone/siscone/spherical/libsiscone_spherical.la
++else
++libSISConePlugin_la_LIBADD = -lsiscone -lsiscone_spherical
++endif
++
+ libSISConePlugin_la_SOURCES = SISConePlugin.cc SISConeSphericalPlugin.cc
+ 
+ EXTRA_DIST = makefile.static