Version bump and skip the buggy tests in the case when MeV and cm are chosen units

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

3 files changed, 26 insertions, 54 deletions

diff --git a/sci-physics/hepmc/ChangeLog b/sci-physics/hepmc/ChangeLog
index 66712afaee6e..b2be06e78e22 100644
--- a/sci-physics/hepmc/ChangeLog
+++ b/sci-physics/hepmc/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sci-physics/hepmc
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/hepmc/ChangeLog,v 1.11 2009/12/28 18:54:23 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/hepmc/ChangeLog,v 1.12 2010/01/08 03:38:33 bicatali Exp $
+
+  08 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -hepmc-2.04.00.ebuild, -hepmc-2.04.01.ebuild, +hepmc-2.05.01.ebuild:
+  Version bump and skip the buggy tests in the case when MeV and cm are
+  chosen units
+
+*hepmc-2.05.01 (08 Jan 2010)
+
+  08 Jan 2010; Sébastien Fabbro <bicatali@gentoo.org>
+  -hepmc-2.04.00.ebuild, -hepmc-2.04.01.ebuild, +hepmc-2.05.01.ebuild:
+  Version bump
 
   28 Dec 2009; Raúl Porcel <armin76@gentoo.org> hepmc-2.05.00.ebuild:
   sparc stable wrt #294444
diff --git a/sci-physics/hepmc/hepmc-2.04.00.ebuild b/sci-physics/hepmc/hepmc-2.04.00.ebuild
deleted file mode 100644
index b65a1b6d76a0..000000000000
--- a/sci-physics/hepmc/hepmc-2.04.00.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/hepmc/hepmc-2.04.00.ebuild,v 1.6 2009/05/05 19:37:24 fauli Exp $
-
-MYP=HepMC-${PV}
-
-DESCRIPTION="Event Record for Monte Carlo Generators"
-HOMEPAGE="https://savannah.cern.ch/projects/hepmc/"
-SRC_URI="http://lcgapp.cern.ch/project/simu/HepMC/download/${MYP}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa sparc x86"
-IUSE="doc examples gev cm"
-
-DEPEND=""
-
-S="${WORKDIR}/${MYP}"
-
-src_compile() {
-	# random default choice: use MeV over GeV and mm over cm
-	local length_conf="MM"
-	use cm && length_conf="CM"
-	local momentum_conf="MEV"
-	use gev && momentum_conf="GEV"
-	econf \
-		--with-length=${length_conf} \
-		--with-momentum=${momentum_conf} \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		INSTALLDIR=/usr/share/doc/${PF}/examples \
-		doc_installdir=/usr/share/doc/${PF} \
-		install || die "emake install failed"
-
-	dodoc README AUTHORS ChangeLog
-	insinto /usr/share/doc/${PF}
-	if use doc; then
-		doins -r doc/html || die
-	else
-		rm -f "${D}"/usr/share/doc/${PF}/*pdf
-	fi
-	use examples || rm -rf "${D}"/usr/share/doc/${PF}/examples
-}
diff --git a/sci-physics/hepmc/hepmc-2.04.01.ebuild b/sci-physics/hepmc/hepmc-2.05.01.ebuild
index 6bdc3e5784ba..aaa02531e347 100644
--- a/sci-physics/hepmc/hepmc-2.04.01.ebuild
+++ b/sci-physics/hepmc/hepmc-2.05.01.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/hepmc/hepmc-2.04.01.ebuild,v 1.1 2009/02/18 11:44:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/hepmc/hepmc-2.05.01.ebuild,v 1.1 2010/01/08 03:38:33 bicatali Exp $
 
 EAPI=2
 
@@ -15,12 +15,13 @@ SLOT="0"
 KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 IUSE="doc examples gev cm"
 
-DEPEND=""
+RDEPEND=""
+DEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MYP}"
 
 src_configure() {
-	# random default choice: use MeV over GeV and mm over cm
+	# use MeV over GeV and mm over cm
 	local length_conf="MM"
 	use cm && length_conf="CM"
 	local momentum_conf="MEV"
@@ -30,6 +31,14 @@ src_configure() {
 		--with-momentum=${momentum_conf}
 }
 
+src_test() {
+	# hack to skip buggy tests with MeV:
+	# https://savannah.cern.ch/support/index.php?108390
+	if use gev && ! use cm; then
+		emake check || die "emake check failed"
+	fi
+}
+
 src_install() {
 	emake \
 		DESTDIR="${D}" \