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

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

4 files changed, 39 insertions, 59 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/Manifest b/sci-physics/hepmc/Manifest
index 21e979884f8d..afdceb893195 100644
--- a/sci-physics/hepmc/Manifest
+++ b/sci-physics/hepmc/Manifest
@@ -1,8 +1,16 @@
-DIST HepMC-2.04.00.tar.gz 6360541 RMD160 d4781eb0ea849f13402b000e49eaf999518204bb SHA1 ea85e0694505a28c82041414085dc144e975bb8d SHA256 a221e6eda77b41fa7f073c7d37028314d7a77793555cd594944f59b34f2f947a
-DIST HepMC-2.04.01.tar.gz 6362975 RMD160 1e003516a3741e858077e495d895c86635f60ec1 SHA1 b06de22e6b7c2eb9e9d5b3b93cb18181344f89c1 SHA256 5575d179f9bd2f07669e04f9458bc9ad9ccb8885486c216b165a0239547287a8
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST HepMC-2.05.00.tar.gz 5544803 RMD160 5732905cd38c7e646271e8260b4782f0ccd2998b SHA1 b41e4e265f0321266ff54d113c2ca914518d36cf SHA256 5da10baa59d5dcf8dbfca297f061d5caf5dd8adc8b1f37c925436fd2d6dd68ac
-EBUILD hepmc-2.04.00.ebuild 1247 RMD160 5f84b18a410524a5ccccc9aeda6c77ffeb3bb449 SHA1 c1b51d5038ff284f58b4b3c7533ecfef13531026 SHA256 57de41115757e6044b4d192d6df2135e2bd972e3b57312d5181a4f60972def94
-EBUILD hepmc-2.04.01.ebuild 1208 RMD160 a47f3b8c371425d670bc34806abcce623d38e933 SHA1 2fecbc63f661b074aab67d2975ce8d1fddc15e41 SHA256 6b04eea123d006cf0e5010de3c8e6bafc95379475e87a9de9ead6d59a922835a
+DIST HepMC-2.05.01.tar.gz 5138294 RMD160 403a9bc4b9987c992bb21e8bf5f5f2b838cd1b3e SHA1 ffc2048d2d146a0494fa010afdbe27db6f5b75e3 SHA256 d4c300bb33cf85b10a0cd073b390ec3ff5b2ad5cd408ab428c8debb20a92dccb
 EBUILD hepmc-2.05.00.ebuild 1203 RMD160 5b36a4c2d807be9309a2cc06b2ee15594a21054d SHA1 e2bdfc5e0d00729f51f94a59342b7f2c6170ebe8 SHA256 bacd2a46fbd0b6c671b0fcaa9ab8e3ccadb8d319ac769206f546114876f67b12
-MISC ChangeLog 1586 RMD160 2660ba49fea1edd7f559d305a85ff292a7d0558f SHA1 c315039f78d9e8adb0f89054757e39bd9f3d07e1 SHA256 974e57a339bc7bc86faf432b8aa59558d44b9d504f398bc485ce606881993df0
+EBUILD hepmc-2.05.01.ebuild 1389 RMD160 c24fdc0ae813fd218b0df171b2b4a709e0456457 SHA1 f7d68bdafdf3b7744bd8ac5426619acf8f198c83 SHA256 8abd3705eca379ac796bd69e06a65b69b9201b5b36e37018d42bbe0db4cbd0f4
+MISC ChangeLog 1973 RMD160 8e89be7214fe9e24feafdf40a36a94d347a3299a SHA1 9b76a6bd6e0ad8005779becb29a4fad56ab8d8bf SHA256 3b347707ee71633fabc8e7704773c0d29a7d87d7cd330e85a0533fedfac5a29c
 MISC metadata.xml 1291 RMD160 6f907411d6c897e4f01c06f97c535ea7c3af7875 SHA1 cb5af85bd4c34210192209a4f2242123982c3baa SHA256 56362a0f765e7b4ba3c38648e1930e1c1a253008d8e28a533ac407ee7d1b69ef
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAktGsWoACgkQ1ycZbhPLE2D9eACeICc/YtEAxmttQUpbKTzt6coV
+/EMAoIk+RivF8sloSMMotFxR0Botpt8j
+=fFrB
+-----END PGP SIGNATURE-----
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}" \