Removed as needed patch, seems to be bugyy and not needed (included in recent autoconf?)

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

10 files changed, 17 insertions, 280 deletions

diff --git a/sci-libs/minuit/ChangeLog b/sci-libs/minuit/ChangeLog
index 42ea53db409a..dc9f6f2bd0eb 100644
--- a/sci-libs/minuit/ChangeLog
+++ b/sci-libs/minuit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/minuit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/ChangeLog,v 1.9 2009/09/24 06:20:58 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/ChangeLog,v 1.10 2009/12/04 22:41:48 bicatali Exp $
+
+  04 Dec 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -minuit-5.16.00.ebuild, -files/minuit-5.16.00-gcc4.3.patch,
+  -minuit-5.20.00.ebuild, -files/minuit-5.20.00-gcc43.patch,
+  -minuit-5.22.00.ebuild, -files/minuit-5.22.00-as-needed.patch,
+  minuit-5.24.00.ebuild, -files/minuit-5.24.00-as-needed.patch:
+  Removed as needed patch, seems to be bugyy and not needed (included in
+  recent autoconf?)
 
 *minuit-5.24.00 (24 Sep 2009)
 
diff --git a/sci-libs/minuit/Manifest b/sci-libs/minuit/Manifest
index d55cd8b48b8e..29d5f0f16cc3 100644
--- a/sci-libs/minuit/Manifest
+++ b/sci-libs/minuit/Manifest
@@ -1,26 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX minuit-5.16.00-gcc4.3.patch 645 RMD160 addf25a93afc20ce6fb8fb1088368d54896ad9cc SHA1 a86b204d06b9b0670fcc930254de58b712e4f601 SHA256 42622b30b2672ede43e35da34868bbbaa4d76efd5b8945a50aac23be1db8b78d
-AUX minuit-5.20.00-gcc43.patch 300 RMD160 ba70cb78598c25d82f50d10f6ee98e4c6bf0a061 SHA1 bfcc700689cdf52e007b4c1f2e13e94716f87120 SHA256 d01090bfad1ffc9e10a935e34c5407b61e6116079efc53945a7e19c2f305c398
-AUX minuit-5.22.00-as-needed.patch 291 RMD160 98c289579c703b5708210192857bcfdf718d90bb SHA1 a2eee7b8514d51b2236db8e499f01b9286a8fa83 SHA256 3749f883f7c83d0bf41b512e59e4ba4d7eb4aab496d01b00864d16d84bcb921a
-AUX minuit-5.24.00-as-needed.patch 788 RMD160 86611f8ff8b40e8679ea769c9bb0a68f4785cf92 SHA1 268b0b3111fee070d96dffe73cf78be9ddda6a73 SHA256 7e0ff36918a2f024d56ee118a728e351e71a5cfebccacbcd4c7cf20885119771
-DIST Minuit2-5.16.00.tar.gz 438532 RMD160 72fc99cb798196a53b99e1bf52e2c8c7046dc582 SHA1 c1bc3dec0f3a3d2dd400188baca074ffb3cb9566 SHA256 db840e4983de0cea9fa1e861cd3c373c5effd969ad88849b1dd0894f80a02717
-DIST Minuit2-5.20.00.tar.gz 463986 RMD160 14d1fe255fee7901060d499f00732af61081c396 SHA1 9e338aaa45f9bef98b5b63444662a66768cf802f SHA256 c5afbfcf25cb4fb95f773f6611a46ec4f293ad2f3c3a3cd75f79ea5e226f62e4
-DIST Minuit2-5.22.00.tar.gz 471267 RMD160 7e491d908808b7f23a46f4f57276910d24a69e01 SHA1 ac37758f0f2a953a94650b03361e5d7070b2d438 SHA256 f1dd3356b1cbde3299e3b00a4de47bc6ebc94b3cdef94cf5000a7639e114b8df
 DIST Minuit2-5.24.00.tar.gz 475383 RMD160 c8b4e3e69aca53746b0307ef0aa4784cbd323db4 SHA1 1457b7d6f213b2d5284d8e23199f366ef91eeb69 SHA256 2e4df8de85eab97484424d1c10128c489948f0dbab4779c36195aa1a42d4b2c2
 DIST mntutorial.pdf 263735 RMD160 4ef7806018a0ac43e322325ab9ea716268ac65cd SHA1 c32bdc4fb130ea8baa32e5dd79a7bc701b313110 SHA256 a72207746c548f4b468b147c27552b4a1bc9762df2a19f9cb0f9ec297899ef07
 DIST mnusersguide.pdf 260072 RMD160 d3809c8c7f0b105fef61f23c63708ff926853c37 SHA1 ac8b0b8464c8cfd2d02bbdb14e97be6271272259 SHA256 cffef5faa1c4d6ac589d4bd40ea474302f55fab47ab2e711b37f1183870fb206
-EBUILD minuit-5.16.00.ebuild 1461 RMD160 c92622e69ca32f79100f7edc238672b72f87dab6 SHA1 5bb95c5f86184da153c130b46953e6330ebd8812 SHA256 b64be1c659334081ab118c53af6afa801292c96f1001be8b6cfe149006742f78
-EBUILD minuit-5.20.00.ebuild 1465 RMD160 c5aed0fe04c774ec4daa8c23d45428578f4ff6f4 SHA1 63b33d4d07207a289c33edd52f04e0d0727e2e9a SHA256 7c390e9a02d74f5d2af0dbe41874cb3f78a715abdb4af1f61f98c79ad016115f
-EBUILD minuit-5.22.00.ebuild 1785 RMD160 6776976301ce0d35cba5a399f99d150bc627bf8e SHA1 5f8870823ab37887acb226faef44aab7676a8027 SHA256 36b960788b1a5da306fe8c79d1d557c00f420da1a59490f26b140796855d464c
-EBUILD minuit-5.24.00.ebuild 1778 RMD160 83f29753341da7db65ed24cfb40d365511039d21 SHA1 93cd7421db022ed0c11f454e3c03bde3962018a3 SHA256 8a65d06073cbd4ab7f9d3cae9008fba19e51f850660163960d4769b0578c838b
-MISC ChangeLog 1568 RMD160 4bb272961c2691edfc8b51a25b16a0ba435c459b SHA1 5d573b15265a43a8fb0380047dc131916dfcd727 SHA256 12d3fbc115f5ddf205887c796289047ba369eec52f01501d47221b0a5147594e
+EBUILD minuit-5.24.00.ebuild 1673 RMD160 532b49069cdb846fbd114fa8802d26031f8acb9c SHA1 d74fc6c39438ef0f5ace0eca6c75a04be998e128 SHA256 ee6b4a82d87d03564d1e5ff24bd666e15991270506834120df740ec59786ed7a
+MISC ChangeLog 1970 RMD160 fa95331c284aef94828b239825c008d90962dbdd SHA1 1355949feb8dc23c4ea5a005b51bb8e2e1a44ebd SHA256 c3ec084bbed2bc6fa9262a3228fdd500a6b541e5e6db3c4ebaced4368915e0f5
 MISC metadata.xml 525 RMD160 73232a63d390b0f64f8679059782d1c96358b425 SHA1 0ab5b599239adfb9896c7b71663a42564adb06f4 SHA256 9d2450a7a5feb0c357ed37375083fd55b34fd7caedee2a7b058e5eaea4616866
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkq7D90ACgkQ1ycZbhPLE2DycQCeMVGuG4l+T7Zjrg+BH2YGY1GI
-WfkAnjdwA4JpJ8jwHB5aG/fxuNu6DgPS
-=UD8e
+iEYEARECAAYFAksZmZcACgkQ1ycZbhPLE2DrZgCdEts/VSfXIiePihrcdYybvq9Y
+2w8An3ywU+bFFlgb/P9Ljpw8I59sDzAO
+=cjME
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/minuit/files/minuit-5.16.00-gcc4.3.patch b/sci-libs/minuit/files/minuit-5.16.00-gcc4.3.patch
deleted file mode 100644
index e7b63574e248..000000000000
--- a/sci-libs/minuit/files/minuit-5.16.00-gcc4.3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur Minuit2-5.16.00/src/MnUserTransformation.cxx Minuit2-5.16.00.new/src/MnUserTransformation.cxx
---- Minuit2-5.16.00/src/MnUserTransformation.cxx	2006-07-05 12:04:25.000000000 -0400
-+++ Minuit2-5.16.00.new/src/MnUserTransformation.cxx	2008-06-01 06:15:23.000000000 -0400
-@@ -10,6 +10,7 @@
- #include "Minuit2/MnUserTransformation.h"
- #include "Minuit2/MnUserCovariance.h"
- 
-+#include <cstdio>
- #include <algorithm>
- 
- namespace ROOT {
-@@ -47,7 +48,7 @@
-    p[0] = 'p';
-    p[4] = '\0';
-    for(unsigned int i = 0; i < par.size(); i++) {
--      std::sprintf(p+1,"%i",i);
-+      sprintf(p+1,"%i",i);
-       Add(p, par[i], err[i]);
-    }
- }
diff --git a/sci-libs/minuit/files/minuit-5.20.00-gcc43.patch b/sci-libs/minuit/files/minuit-5.20.00-gcc43.patch
deleted file mode 100644
index f19788f12705..000000000000
--- a/sci-libs/minuit/files/minuit-5.20.00-gcc43.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- test/MnSim/GaussRandomGen.h.orig	2008-07-03 11:03:17.000000000 +0100
-+++ test/MnSim/GaussRandomGen.h	2008-07-03 11:03:42.000000000 +0100
-@@ -10,7 +10,8 @@
- #ifndef MN_GaussRandomGen_H_
- #define MN_GaussRandomGen_H_
- 
--#include <math.h>
-+#include <cmath>
-+#include <cstdlib>
- 
- namespace ROOT {
- 
diff --git a/sci-libs/minuit/files/minuit-5.22.00-as-needed.patch b/sci-libs/minuit/files/minuit-5.22.00-as-needed.patch
deleted file mode 100644
index 850098839c20..000000000000
--- a/sci-libs/minuit/files/minuit-5.22.00-as-needed.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.am.orig	2009-01-22 00:44:01.925673316 +0000
-+++ src/Makefile.am	2009-01-22 00:43:34.963076306 +0000
-@@ -79,6 +79,8 @@
- 	 mnvert.cxx				\
-          mnxerbla.cxx                        
- 
-+libMinuit2_la_LDFLAGS = $(OPENMP_CXXFLAGS)
-+
- INCLUDES =					\
- 	-I$(top_srcdir)/inc
- 
diff --git a/sci-libs/minuit/files/minuit-5.24.00-as-needed.patch b/sci-libs/minuit/files/minuit-5.24.00-as-needed.patch
deleted file mode 100644
index b1cf59b177a9..000000000000
--- a/sci-libs/minuit/files/minuit-5.24.00-as-needed.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- config/m4/ac_openmp.m4.orig	2009-07-17 16:35:06.000000000 +0100
-+++ config/m4/ac_openmp.m4	2009-09-24 07:17:56.000000000 +0100
-@@ -87,6 +87,13 @@
-       *)
-         OPENMP_[]_AC_LANG_PREFIX[]FLAGS=$ac_cv_prog_[]_AC_LANG_ABBREV[]_openmp ;;
-     esac
-+  OPENMP_LIBS=
-+  if test "x$ac_option" = "x-fopenmp"; then
-+     OPENMP_LIBS="-lgomp"
-+  fi
-+  AC_SUBST([OPENMP_LIBS])
-+
-   fi
-   AC_SUBST([OPENMP_]_AC_LANG_PREFIX[FLAGS])
-+
- ])
---- configure.in.orig	2009-09-24 06:53:14.000000000 +0100
-+++ configure.in	2009-09-24 06:50:12.000000000 +0100
-@@ -43,6 +43,7 @@
- AC_OPENMP
- CFLAGS="$CFLAGS $OPENMP_CFLAGS"
- CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
-+LIBS="$LIBS $OPENMP_LIBS"
- 
- 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.16.00.ebuild b/sci-libs/minuit/minuit-5.16.00.ebuild
deleted file mode 100644
index 4a1f161444ca..000000000000
--- a/sci-libs/minuit/minuit-5.16.00.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/minuit-5.16.00.ebuild,v 1.5 2008/06/02 01:27:44 mr_bones_ Exp $
-
-inherit eutils
-
-MY_PN=Minuit2
-
-DESCRIPTION="A C++ physics analysis tool for function minimization"
-HOMEPAGE="http://seal.web.cern.ch/seal/MathLibs/Minuit2/html/index.html"
-
-SRC_URI="http://seal.web.cern.ch/seal/MathLibs/${MY_PN}/${MY_PN}-${PV}.tar.gz
-	doc? ( http://seal.cern.ch/documents/minuit/mnusersguide.pdf
-	http://seal.cern.ch/documents/minuit/mntutorial.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc"
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc4.3.patch
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-	if use doc; then
-		make docs || die "make docs failed"
-	fi
-}
-
-src_test() {
-	emake check || die "emake check failed"
-	# make check only compiles the tests. run them
-	for d in test/Mn*; do
-		cd "${S}"/${d}
-		for t in test_*; do
-			./${t} || die "${t} failed"
-		done
-	done
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/share/doc/${PF}/MnTutorial
-	doins test/MnTutorial/*.{h,cxx}
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/mn*.pdf || die "doins failed"
-		dohtml -r doc/html/* || die "dohtml failed"
-	fi
-}
diff --git a/sci-libs/minuit/minuit-5.20.00.ebuild b/sci-libs/minuit/minuit-5.20.00.ebuild
deleted file mode 100644
index 617e78a84868..000000000000
--- a/sci-libs/minuit/minuit-5.20.00.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/minuit-5.20.00.ebuild,v 1.1 2008/07/03 10:16:31 bicatali Exp $
-
-inherit eutils
-
-MY_PN=Minuit2
-
-DESCRIPTION="A C++ physics analysis tool for function minimization"
-HOMEPAGE="http://seal.web.cern.ch/seal/MathLibs/Minuit2/html/index.html"
-
-SRC_URI="http://seal.web.cern.ch/seal/MathLibs/${MY_PN}/${MY_PN}-${PV}.tar.gz
-	doc? ( http://seal.cern.ch/documents/minuit/mnusersguide.pdf
-		   http://seal.cern.ch/documents/minuit/mntutorial.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc"
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-	if use doc; then
-		emake docs || die "emake docs failed"
-	fi
-}
-
-src_test() {
-	emake check || die "emake check failed"
-	# make check only compiles the tests. run them
-	for d in test/Mn*; do
-		cd "${S}"/${d}
-		for t in test_*; do
-			./${t} || die "${t} failed"
-		done
-	done
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/share/doc/${PF}/MnTutorial
-	doins test/MnTutorial/*.{h,cxx}
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/mn*.pdf || die "doins failed"
-		dohtml -r doc/html/* || die "dohtml failed"
-	fi
-}
diff --git a/sci-libs/minuit/minuit-5.22.00.ebuild b/sci-libs/minuit/minuit-5.22.00.ebuild
deleted file mode 100644
index 6482124a2c96..000000000000
--- a/sci-libs/minuit/minuit-5.22.00.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/minuit-5.22.00.ebuild,v 1.1 2009/01/23 14:11:22 bicatali Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs flag-o-matic autotools
-
-MY_PN=Minuit2
-
-DESCRIPTION="A C++ physics analysis tool for function minimization"
-HOMEPAGE="http://seal.web.cern.ch/seal/MathLibs/Minuit2/html/index.html"
-
-SRC_URI="http://seal.web.cern.ch/seal/MathLibs/${MY_PN}/${MY_PN}-${PV}.tar.gz
-	doc? ( http://seal.cern.ch/documents/minuit/mnusersguide.pdf
-		   http://seal.cern.ch/documents/minuit/mntutorial.pdf )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="doc openmp"
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	if use openmp && [[ $(tc-getCXX)$ == *g++* ]]; then
-		if built_with_use sys-devel/gcc openmp; then
-			append-ldflags -lgomp
-		else
-			ewarn "You are using gcc built without openmp"
-			ewarn "Switch CXX to an OpenMP capable compiler"
-			die "Need openmp"
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	AT_M4DIR="config/m4" eautoreconf
-}
-
-src_compile() {
-	emake || die "emake failed"
-	if use doc; then
-		emake docs || die "emake docs failed"
-	fi
-}
-
-src_test() {
-	emake check || die "emake check failed"
-	# make check only compiles the tests. run them
-	for d in test/Mn*; do
-		cd "${S}"/${d}
-		for t in test_*; do
-			./${t} || die "${t} failed"
-		done
-	done
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	insinto /usr/share/doc/${PF}/MnTutorial
-	doins test/MnTutorial/*.{h,cxx}
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins "${DISTDIR}"/mn*.pdf || die "doins failed"
-		dohtml -r doc/html/* || die "dohtml failed"
-	fi
-}
diff --git a/sci-libs/minuit/minuit-5.24.00.ebuild b/sci-libs/minuit/minuit-5.24.00.ebuild
index 94efc03035d6..10c1478079bb 100644
--- a/sci-libs/minuit/minuit-5.24.00.ebuild
+++ b/sci-libs/minuit/minuit-5.24.00.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/minuit-5.24.00.ebuild,v 1.1 2009/09/24 06:20:58 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/minuit/minuit-5.24.00.ebuild,v 1.2 2009/12/04 22:41:48 bicatali Exp $
 
 EAPI=2
-inherit eutils toolchain-funcs autotools
+inherit eutils toolchain-funcs
 
 MY_PN=Minuit2
 
@@ -31,10 +31,6 @@ pkg_setup() {
 		die "Need openmp"
 	fi
 }
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	AT_M4DIR="config/m4" eautoreconf
-}
 
 src_configure() {
 	econf $(use_enable openmp)