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

(Portage version: 2.2_rc55/cvs/Linux x86_64)

9 files changed, 11 insertions, 264 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/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)