summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Savchenko <bircoph@gentoo.org>2015-07-16 22:16:37 +0000
committerAndrew Savchenko <bircoph@gentoo.org>2015-07-16 22:16:37 +0000
commit14c75885bf99215f5919c142f6de079811567829 (patch)
tree54cd8acefa34648e77518bc716386b8d7ce1f19d /sci-physics
parentVersion bump. (diff)
downloadgentoo-2-14c75885bf99215f5919c142f6de079811567829.tar.gz
gentoo-2-14c75885bf99215f5919c142f6de079811567829.tar.bz2
gentoo-2-14c75885bf99215f5919c142f6de079811567829.zip
For 5.34 branch demand pythia8 to be within [8.1.80, 8.2.0) range
Signed-off-by: Andrew Savchenko <bircoph@gentoo.org> (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 565953B95372756C)
Diffstat (limited to 'sci-physics')
-rw-r--r--sci-physics/root/ChangeLog6
-rw-r--r--sci-physics/root/root-5.34.28-r1.ebuild4
2 files changed, 7 insertions, 3 deletions
diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog
index 22753f739961..a0872eef593b 100644
--- a/sci-physics/root/ChangeLog
+++ b/sci-physics/root/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sci-physics/root
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.148 2015/07/16 21:22:10 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/ChangeLog,v 1.149 2015/07/16 22:16:37 bircoph Exp $
+
+ 16 Jul 2015; Andrew Savchenko <bircoph@gentoo.org> root-5.34.28-r1.ebuild:
+ root-5.34.xx can't be used with >=pythia-8.2, see
+ https://sft.its.cern.ch/jira/browse/ROOT-6862
16 Jul 2015; Andrew Savchenko <bircoph@gentoo.org> root-5.34.26.ebuild,
root-5.34.28-r1.ebuild, root-6.02.05-r2.ebuild:
diff --git a/sci-physics/root/root-5.34.28-r1.ebuild b/sci-physics/root/root-5.34.28-r1.ebuild
index aaf695ae2e31..62ee744bf319 100644
--- a/sci-physics/root/root-5.34.28-r1.ebuild
+++ b/sci-physics/root/root-5.34.28-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild,v 1.2 2015/07/16 21:22:10 bircoph Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/root/root-5.34.28-r1.ebuild,v 1.3 2015/07/16 22:16:37 bircoph Exp $
EAPI=5
@@ -86,7 +86,7 @@ CDEPEND="
oracle? ( dev-db/oracle-instantclient-basic:0= )
postgres? ( dev-db/postgresql:= )
pythia6? ( sci-physics/pythia:6= )
- pythia8? ( >=sci-physics/pythia-8.1.80:8= )
+ pythia8? ( >=sci-physics/pythia-8.1.80:8= <sci-physics/pythia-8.2.0:8= )
python? ( ${PYTHON_DEPS} )
ruby? (
dev-lang/ruby:=