Adding workaround for bug 314095

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 45 insertions, 16 deletions

diff --git a/sci-libs/minuit/ChangeLog b/sci-libs/minuit/ChangeLog
index 519da4fc2951..32a1919f190b 100644
--- a/sci-libs/minuit/ChangeLog
+++ b/sci-libs/minuit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/minuit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/ChangeLog,v 1.11 2010/05/10 14:57:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/ChangeLog,v 1.12 2010/06/02 09:51:02 xarthisius Exp $
+
+  02 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org> minuit-5.27.02.ebuild,
+  +files/minuit-5.27.02-asneeded.patch:
+  Adding workaround for bug 314095
 
 *minuit-5.27.02 (10 May 2010)
 
diff --git a/sci-libs/minuit/Manifest b/sci-libs/minuit/Manifest
index 7650bb7c0cab..e97978439680 100644
--- a/sci-libs/minuit/Manifest
+++ b/sci-libs/minuit/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX minuit-5.27.02-asneeded.patch 768 RMD160 6e242b131ce3642f385e284e2464ed25e0b19988 SHA1 8d3dbea62742666b5cd273b554f0382acdab54ee SHA256 4dc209f8c98d06a38c0c1270f5d3a96b359b468276d44cd7969b178a7b4c5e36
 DIST Minuit2-5.24.00.tar.gz 475383 RMD160 c8b4e3e69aca53746b0307ef0aa4784cbd323db4 SHA1 1457b7d6f213b2d5284d8e23199f366ef91eeb69 SHA256 2e4df8de85eab97484424d1c10128c489948f0dbab4779c36195aa1a42d4b2c2
 DIST Minuit2-5.27.02.tar.gz 489449 RMD160 9c342e23b4c2e53de20e21c7365dac9881b98a83 SHA1 439ad7db29ddd7781469346a994cd6b5fd3816bf SHA256 262e2a014f17dd54535b71efc69d1ee6318e6109a57dbe376b416247a031ad5e
 DIST mntutorial.pdf 263735 RMD160 4ef7806018a0ac43e322325ab9ea716268ac65cd SHA1 c32bdc4fb130ea8baa32e5dd79a7bc701b313110 SHA256 a72207746c548f4b468b147c27552b4a1bc9762df2a19f9cb0f9ec297899ef07
 DIST mnusersguide.pdf 260072 RMD160 d3809c8c7f0b105fef61f23c63708ff926853c37 SHA1 ac8b0b8464c8cfd2d02bbdb14e97be6271272259 SHA256 cffef5faa1c4d6ac589d4bd40ea474302f55fab47ab2e711b37f1183870fb206
 EBUILD minuit-5.24.00.ebuild 1673 RMD160 532b49069cdb846fbd114fa8802d26031f8acb9c SHA1 d74fc6c39438ef0f5ace0eca6c75a04be998e128 SHA256 ee6b4a82d87d03564d1e5ff24bd666e15991270506834120df740ec59786ed7a
-EBUILD minuit-5.27.02.ebuild 1669 RMD160 03e611ccdf49c5e1a8fc13b8609c05aba185f727 SHA1 e55eb713cc42320d2bc186ae3ed38f835a834d9b SHA256 4df7eb2972c9817c2b3479834760940f8636d118b7c3e2093fe1e716cbc88b3d
-MISC ChangeLog 2084 RMD160 bf0c78074161c1d0d3363b333bf7f90c93d86b0d SHA1 f51fc6fbeddb01b8b695ade3a1b09696ca49b5ca SHA256 329463e1173594b29f834bcf7abf8f4e6f5300065325978888068fef3e8dd93f
+EBUILD minuit-5.27.02.ebuild 1807 RMD160 e954d413018f47b8380e47eadc85734bea738fb3 SHA1 d514788d7b2020ccf7e27e722fe9c9b7ce8ae4c2 SHA256 21405764b1939c458a5bec5aa9797e9c7194ad63e163f886ebd62c9caaa0c798
+MISC ChangeLog 2243 RMD160 2f77e81a2c6bf9f9ef0dae3e7b7e99f348fc91ca SHA1 2a5e5a4cefd539390b662fe4991141959d6cd7b7 SHA256 b7f216d3f3b740df528cc86dfe22304128b3bc9a309f0f590be3e8d4ea4939a8
 MISC metadata.xml 525 RMD160 73232a63d390b0f64f8679059782d1c96358b425 SHA1 0ab5b599239adfb9896c7b71663a42564adb06f4 SHA256 9d2450a7a5feb0c357ed37375083fd55b34fd7caedee2a7b058e5eaea4616866
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkvoHsYACgkQgAnW8HDreRai0QCffSGX+/E4ezJ6O6z5Q1wtrRwE
-y/0An0NPtIB3uBJUYpLirLPVitZRkMWm
-=OpdR
------END PGP SIGNATURE-----
diff --git a/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch b/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch
new file mode 100644
index 000000000000..ba5ab50d635d
--- /dev/null
+++ b/sci-libs/minuit/files/minuit-5.27.02-asneeded.patch
@@ -0,0 +1,28 @@
+Workaround for as-needed failure. It's not a proper patch!
+If you know how to do it better, please do!
+
+http://bugs.gentoo.org/show_bug.cgi?id=314095
+
+--- src/Makefile.am
++++ src/Makefile.am
+@@ -9,6 +9,10 @@
+ # The convenience library to be built.
+ lib_LTLIBRARIES = libMinuit2.la
+ 
++if GNUOPENMP
++  libMinuit2_la_LIBADD = -lgomp
++endif
++
+ libMinuit2_la_SOURCES =				\
+          AnalyticalGradientCalculator.cxx	\
+          BasicMinimumError.cxx			\
+--- configure.in
++++ configure.in
+@@ -43,6 +43,7 @@
+ AC_OPENMP
+ CFLAGS="$CFLAGS $OPENMP_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
++AM_CONDITIONAL(GNUOPENMP, test "x$OPENMP_CXXFLAGS" = "x-fopenmp")
+ 
+ dnl files to be generated 
+ AC_OUTPUT(Makefile inc/Makefile inc/Minuit2/Makefile inc/Math/Makefile src/Makefile 
diff --git a/sci-libs/minuit/minuit-5.27.02.ebuild b/sci-libs/minuit/minuit-5.27.02.ebuild
index 3ba7b3492979..2b362aab4d04 100644
--- a/sci-libs/minuit/minuit-5.27.02.ebuild
+++ b/sci-libs/minuit/minuit-5.27.02.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/minuit-5.27.02.ebuild,v 1.1 2010/05/10 14:57:03 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/minuit-5.27.02.ebuild,v 1.2 2010/06/02 09:51:02 xarthisius Exp $
 
 EAPI=2
-inherit eutils toolchain-funcs
+inherit autotools eutils toolchain-funcs
 
 MY_PN=Minuit2
 
@@ -16,7 +16,7 @@ SRC_URI="http://seal.web.cern.ch/seal/MathLibs/${MY_PN}/${MY_PN}-${PV}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc openmp"
 DEPEND="doc? ( app-doc/doxygen )"
 RDEPEND=""
@@ -32,6 +32,12 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	rm config/m4/ac_openmp.m4
+	AT_M4DIR="config/m4" eautoreconf
+}
+
 src_configure() {
 	econf $(use_enable openmp)
 }