gentoo resync : 09.03.2018

3 files changed, 6 insertions, 66 deletions

diff --git a/sci-physics/rivet/Manifest b/sci-physics/rivet/Manifest
index 8594963aaf1a..0c317b894a54 100644
--- a/sci-physics/rivet/Manifest
+++ b/sci-physics/rivet/Manifest
@@ -1,6 +1,4 @@
-DIST Rivet-2.3.0.tar.bz2 2742948 BLAKE2B 3a90927720b9d0badf0c7278d61a848c660be8196ed62d3a1a0f04dd6c9537d60f223c47cf9385b1e7a919b28caea4bb1b605b5d3b675388e3b5cda920bffeb1 SHA512 b51b77f80d69156dead899312cad838bc03479a072e163df50262e86790503515f8ab8af93723c3cbd33007d9812aa10581b2c960d92bc1fcf5031d27018d239
-DIST Rivet-2.5.2.tar.bz2 3005023 BLAKE2B ffccefbe38f3b6ddab16d3b9138d9779ab4ad2f466094675ed0d13c59d0bfd5efe753ca8bec57b31377ba42d76f313dce18af158cc61daace425d4bbdfb6b055 SHA512 dd84143eb5d4b24ae2e5ace175e349fe48b4b5e6a47b3aa031a4144c635f016e8bbd731ed3f96b5c2f52c7df8ff0f1db70750fc45381bdfcdd469fd4c058beef
+DIST Rivet-2.6.0.tar.bz2 3527799 BLAKE2B a0ffe7a73ed1120cd3944d3c845ed9387528e7645554c589fda0bfcac694e36f24ee78914e916c51f3a978659933b4e8934e0373f26e4a3ba7597714fc9a939f SHA512 49c381d88075715e23942bb02066b189305077581cd64b708ccaf79436202fe1c9d7989fc1f35dfeffdc643adb39283710fdf33fc87407cfb7ddd3e9d2297feb
 DIST refs.bib 16907 BLAKE2B 70c11f86c8ebf6386615b3e900280d1a2677dc82d99f944ac670f52320e05355352dd4017a48ae2af52dfd6f46a92a0d2d65bde4c271589ba4e66b3e7b68982c SHA512 64755e6aeaa1f0b3fb76a33ffdf226bcd42ee597a78a8d458b728f0e6f576d4dafbb276a0498c3b573d23054ccbf54ada6f6c12faf52dbfbeef2372094d01181
-EBUILD rivet-2.3.0.ebuild 1305 BLAKE2B 42f7dfb1fc32929c63e9b181cb0c57e3e37317f5fbd4374a3a3294f20acb75ce42d4eb2f7ec9859707010bf9197b1bbc22519fd44ebd18a0ed55eaea9d531c85 SHA512 d366357c41ed61d2fc7937e014d92dea94b6b7a47913694048276d4a041cdc2e185849869c9b21db0ff2a503dc11bde70a4cf2a86a9116e992a21a27e1467193
-EBUILD rivet-2.5.2.ebuild 1768 BLAKE2B 2a66f04d97db6cdae6c7b4afca1fc5dc4819468eb0366bf1b1332a7d9df440e07b9e7d06e727018a7ea150c7706426ab3969a0e4bc0d993f4121c54b42fef89d SHA512 8bf89e54ce4279b5703b440a5c5dafddb1559b3aab08b5bc3ed1028bd4467c31f5a996cf9d919b0426ef88996fc63aea35393f6ad7c70934074dde876bf675b7
+EBUILD rivet-2.6.0-r1.ebuild 1877 BLAKE2B a3a47ef6e45b7a3a5b7c3edaee37799004fe6d3f74f162d338153f7adc12a102d39e7b0fb8b0bcfb47422870810f64899145ca55e1cbf2a400e781c2425d1f46 SHA512 40b14de834c15f61e79a66fcf0748284311645c5c0dc60e3261a3ac2b0804cdfc1482e6e7980c016d9562b622e0037272096e5224636aa38fd62273e6e47125c
 MISC metadata.xml 836 BLAKE2B ab971f916f23c3c3d70e54440e8f2303918084d25ba5a5ca7ed50142606f88e25019dac7781f20df717e4a552fc3ca642439bf0c37476aa378969f82abbab1c3 SHA512 21245268e114d41e0fe10cf6d265b3db7a0e220e1f6d545df4782839f6f5f284c9ddd6f89d20c74497e394e23bf93c96013dcde5c3685e4f1c112c73156f8db0
diff --git a/sci-physics/rivet/rivet-2.3.0.ebuild b/sci-physics/rivet/rivet-2.3.0.ebuild
deleted file mode 100644
index 63dece0d0092..000000000000
--- a/sci-physics/rivet/rivet-2.3.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-AUTOTOOLS_AUTORECONF=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 autotools-utils bash-completion-r1
-
-MYP=Rivet-${PV}
-
-DESCRIPTION="Toolkit for validation of Monte Carlo HEP event generators"
-HOMEPAGE="http://rivet.hepforge.org/"
-
-SRC_URI="http://www.hepforge.org/archive/${PN}/${MYP}.tar.bz2"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc python static-libs"
-
-RDEPEND="
-	dev-libs/boost:0=
-	sci-libs/gsl:0=
-	sci-physics/fastjet:0=[plugins]
-	sci-physics/hepmc:0=
-	sci-physics/yoda:0=[python]
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[latex,dot] )
-	python? ( dev-python/cython[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MYP}"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable python pyext)
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	use doc && doxygen Doxyfile
-}
-
-src_install() {
-	autotools-utils_src_install
-	newbashcomp "${ED}"/usr/share/Rivet/rivet-completion rivet
-	use doc && dohtml -r doxy/html/* && dodoc doc/rivet-manual.pdf
-}
diff --git a/sci-physics/rivet/rivet-2.5.2.ebuild b/sci-physics/rivet/rivet-2.6.0-r1.ebuild
index 86e41340c503..273705fb73d0 100644
--- a/sci-physics/rivet/rivet-2.5.2.ebuild
+++ b/sci-physics/rivet/rivet-2.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ RDEPEND="
 	sci-libs/gsl:=
 	sci-physics/fastjet[plugins]
 	sci-physics/hepmc
-	>=sci-physics/yoda-1.5.0[python]
+	sci-physics/yoda:=[python]
 	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[latex,dot] )
@@ -50,6 +50,8 @@ src_prepare() {
 
 	# Install rivet-manual.pdf to docdir intead of pkgdatadir
 	sed -i '/pkgdata_DATA = $(DOCS)/s/pkgdata/doc/' doc/Makefile.am || die
+	# Adjust shebangs of Python scripts
+	sed -i "s@^#! /usr/bin/env python@#!${EPREFIX}/usr/bin/python2@" bin/* || die
 	eautoreconf
 }
 
@@ -73,7 +75,6 @@ src_compile() {
 
 src_install() {
 	default
-
 	newbashcomp "${ED%/}"/usr/share/Rivet/rivet-completion rivet
 	rm -f "${ED%/}"/usr/share/Rivet/rivet-completion || die
 }