gentoo resync : 09.03.2018

14 files changed, 327 insertions, 160 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 20ca37080ae1..cbffbaeef34b 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/lammps/Manifest b/sci-physics/lammps/Manifest
index 4adf466fd47a..78d499f79cee 100644
--- a/sci-physics/lammps/Manifest
+++ b/sci-physics/lammps/Manifest
@@ -26,6 +26,8 @@ DIST lammps-9Dec15.tar.gz 82374079 BLAKE2B 8b5054b59162b98bf98980a8ece344af733de
 DIST lammps-9Jan17.tar.gz 109694893 BLAKE2B dc3af18d4a7db43d22bc4d2ed79366f7f1b73cd5f8951d289ce6ad0a572b14fd8f1bc946382afe9fc60bc46354beb374caf09d195419235e077bf9386259f194 SHA512 ea7c61bc9607ff0e4c0af5c1a668d400841dfc11c6d6aacc6131a48a5a0d11cb6857303626b583d5119e5257b5b338853c5afafcc3870bb30d5743ff5648348c
 DIST lammps-patch_17Jan2018.tar.gz 91721592 BLAKE2B d606a5fd699f3e7aaa777065532f778e96a5b21b88de3fcce69e79c4931fea233ed1ad68f56120865061623c6e33282b9f23f927a7a9820f8f824a241e5cd823 SHA512 533ada073882e9bfc6431db62c4899005983d9efbbb043bcb50b2b0a7af2b11c411bbcc6523b2ffbd5d46531b24573f4b98a07dc757bacbc2f27bb056d7956ff
 DIST lammps-patch_1Sep2017.tar.gz 88751184 BLAKE2B 013ba612c67767c0e11b64f0b726a81c534ceb763ac9eba9a94ef9e02166278c28cb5937162b83f783b80fef6471b0e265e45245cc5594eaa2b27ec2d5f972cf SHA512 01b56484d6e9d03c0cdc2f8100f571d6e0a354b08bda7f22176744f2724e566443514e7d8abb0571d4207709155441644d4c6dbcf17ee2a8dc4f10cb6c3e8ac1
+DIST lammps-patch_22Feb2018.tar.gz 91869050 BLAKE2B 09d364b489d4402145b879ca40b290a4e33f39b6e5e4183bcccb09001002cb742917c8792f942a8b64bd992cde5c0f8dcd8b76506048f1392d33d1192aa4551d SHA512 8d4ac0f9cdcf4caa10bfb48129eec21cf31f7ce881b4cbd803c20fb638f7e55a1e645d314e172fe70eab473a4976c7f482e8c059e0c4e82527eb9438437ae146
+DIST lammps-patch_8Mar2018.tar.gz 91878683 BLAKE2B a4cf307769b1ac27c9cbe781a70f307d5275d2ccd4f6f77a2a21f00413ffa0af499577207afd23afd95ef6126071e8b779f6c52d50ff7117afb63161613c9f5b SHA512 57885d12e9e0ea9a6735cc2f7a2a8a9314dacbe9eaf5a46cb6d20fd7e2d0e8b0ebb3e24731eb750861973efe4d3cf0cf5a739cc9d51407f26bf3d556243c186f
 EBUILD lammps-20150210.ebuild 4832 BLAKE2B f857d2e0e82c2e5b05fe89c62fda44b917d8be0a184171235eadee85c97699de5d4f22a1ea20c12a5523702ab376df9c80d486a7751cd3fbc9527a6954e59026 SHA512 fbbfd6768d9ee99f49aea6abb030486a7f80c4aad95412407031499681a2a36997c31cb4873e0ab867425678b952a44284129accde9abe60c1bfb891c38d2dfa
 EBUILD lammps-20150515-r1.ebuild 6708 BLAKE2B 88d66db586b1900c8dfb039c305fe14ee9a0b1dfb231a8613e77689a22e429144621f45cb9e91adaa34e2dabd9ea8c11e4f49f60854c328f0c02fb9209ac5f4f SHA512 72c53dcd1cade6756010065353742f75eae95a4178e133509dae09233007491c52c3c5bfa3f98243a8d32066c0320c1726d99e1bf06c6e2e1ff16fbe2592d75b
 EBUILD lammps-20150515.ebuild 6703 BLAKE2B 6bdc6a410d9ded09f0273621e8d8bb167f3e183ca3e7f921b983647efca8cdec0cea266991177c3a109d952871b516b26a47c4176dca9a16f1ba879c718c4a7c SHA512 cfc3f0c55d93194db134dabf9153739904c5afb036ad9917930086c3d5cbcef9ccbf8afc6f682ecd22b2b73daee7dc2cd6fcc4f5da0f931b2e1b7561084a2464
@@ -50,4 +52,6 @@ EBUILD lammps-20170706.ebuild 6029 BLAKE2B 5a054b176d72e106972da77d412830ae24378
 EBUILD lammps-20170901-r1.ebuild 3040 BLAKE2B e42773dc4fb72164b616788e6d39885708acae9b89e5933bcb26f6a91350ab6528abfd0870059bc3576b7745b48de1166b63180f5a01c23509966ff602dde0a0 SHA512 33e4171aade9ae9da8f9e050aa675faed0ed77989e5862995e0a18df52fff1b416343cc2209a09b48f3d0d37ec935fd5ae1e5a966667010383b7f1a04697a8df
 EBUILD lammps-20170901.ebuild 3008 BLAKE2B db21f6df81e82bca23b32df40a08d214a55d60805a94bebf911d0123cc70be83760564b444028a7fdb30dd2ca0b54010dfd54eb644cac970b067f0f9d1445d24 SHA512 766c140ce1e0889ec3b88c65047cec54668058ca53f0e3dc61312cedb716beeb402328632dcab4c32aaaeca8af7f733d03cec60fe9a0f342d1f0ae0eb50d6ad4
 EBUILD lammps-20180117.ebuild 3040 BLAKE2B 74b48a09ab862dc1fb0d7b1fc927b16250926d7b528d1d36a8cbe1fb3ce1fd58522355bb7559f7a4ae999b5748d0b66e2982c218a8acd40435243825d6a07cc2 SHA512 6965f3a6102e86b375482a35061ffbd6d1b3ee2bd7e8023f66c639af9630e29face9be627196cb0658e28b9b09a19f55b5bd62688370a8f01cc78152b5952b80
+EBUILD lammps-20180222.ebuild 3040 BLAKE2B 74b48a09ab862dc1fb0d7b1fc927b16250926d7b528d1d36a8cbe1fb3ce1fd58522355bb7559f7a4ae999b5748d0b66e2982c218a8acd40435243825d6a07cc2 SHA512 6965f3a6102e86b375482a35061ffbd6d1b3ee2bd7e8023f66c639af9630e29face9be627196cb0658e28b9b09a19f55b5bd62688370a8f01cc78152b5952b80
+EBUILD lammps-20180308.ebuild 3040 BLAKE2B 74b48a09ab862dc1fb0d7b1fc927b16250926d7b528d1d36a8cbe1fb3ce1fd58522355bb7559f7a4ae999b5748d0b66e2982c218a8acd40435243825d6a07cc2 SHA512 6965f3a6102e86b375482a35061ffbd6d1b3ee2bd7e8023f66c639af9630e29face9be627196cb0658e28b9b09a19f55b5bd62688370a8f01cc78152b5952b80
 MISC metadata.xml 1338 BLAKE2B 553629a0b3221db88a37cd6b0bfa806da9265caf2df038736211351a87ac34af5a98f0e7f3e34246d814a378cd64b1ed82d69f4c26e18c3a7700441f8be6fa2d SHA512 b3556e8444b4cb42d1fa80cc8735e11e07cd2928af67104d4518b874e167d5755840c3585e3ffefa88057f84d711cafe0a60405323b4ad6a9546c19d4a5d94bd
diff --git a/sci-physics/lammps/lammps-20180222.ebuild b/sci-physics/lammps/lammps-20180222.ebuild
new file mode 100644
index 000000000000..1f8951205bb4
--- /dev/null
+++ b/sci-physics/lammps/lammps-20180222.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-utils fortran-2 python-r1
+
+convert_month() {
+	local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec )
+	echo ${months[${1#0}]}
+}
+
+MY_PV="patch_$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:0:4}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
+HOMEPAGE="http://lammps.sandia.gov/"
+SRC_URI="https://github.com/lammps/lammps/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cuda examples gzip lammps-memalign mpi netcdf python test"
+
+DEPEND="
+	app-arch/gzip
+	media-libs/libpng:0
+	sys-libs/zlib
+	mpi? (
+		virtual/mpi
+		sci-libs/hdf5[mpi]
+	)
+	python? ( ${PYTHON_DEPS} )
+	sci-libs/voro++
+	virtual/blas
+	virtual/lapack
+	sci-libs/fftw:3.0
+	netcdf? ( sci-libs/netcdf )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
+	dev-cpp/eigen:3
+	"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}/cmake"
+
+src_configure() {
+	local mycmakeargs=(
+	    -DBUILD_SHARED_LIBS=ON
+		-DENABLE_MPI=$(usex mpi)
+		-DENABLE_GPU=$(usex cuda)
+		-DENABLE_TESTING=$(usex test)
+		-DENABLE_ASPHERE=ON
+		-DENABLE_BODY=ON
+		-DENABLE_CLASS2=ON
+		-DENABLE_COLLOID=ON
+		-DENABLE_COMPRESS=ON
+		-DENABLE_CORESHELL=ON
+		-DENABLE_DIPOLE=ON
+		-DENABLE_GRANULAR=ON
+		-DENABLE_KSPACE=ON
+		-DFFT=FFTW3
+		-DENABLE_MANYBODY=ON
+		-DENABLE_MC=ON
+		-DENABLE_MEAM=ON
+		-DENABLE_MISC=ON
+		-DLAMMPS_XDR=ON #630444
+		-DENABLE_MOLECULE=ON
+		-DENABLE_PERI=ON
+		-DENABLE_QEQ=ON
+		-DENABLE_REAX=ON
+		-DENABLE_REPLICA=ON
+		-DENABLE_RIGID=ON
+		-DENABLE_SHOCK=ON
+		-DENABLE_SNAP=ON
+		-DENABLE_SRD=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_MPIIO=$(usex mpi)
+		-DENABLE_VORONOI=ON
+		-DENABLE_USER-ATC=ON
+		-DENABLE_USER-AWPMD=ON
+		-DENABLE_USER-CGDNA=ON
+		-DENABLE_USER-CGSDK=ON
+		-DENABLE_USER-COLVARS=ON
+		-DENABLE_USER-DIFFRACTION=ON
+		-DENABLE_USER-DPD=ON
+		-DENABLE_USER-DRUDE=ON
+		-DENABLE_USER-EFF=ON
+		-DENABLE_USER-FEP=ON
+		-DENABLE_USER-H5MD=$(usex mpi)
+		-DENABLE_USER-LB=$(usex mpi)
+		-DENABLE_USER-MANIFOLD=ON
+		-DENABLE_USER-MEAMC=ON
+		-DENABLE_USER-MGPT=ON
+		-DENABLE_USER-MISC=ON
+		-DENABLE_USER-MOLFILE=ON
+		-DENABLE_USER-NETCDF=$(usex netcdf)
+		-DENABLE_USER-PHONON=ON
+		-DENABLE_USER-QTB=ON
+		-DENABLE_USER-REAXC=ON
+		-DENABLE_USER-SMD=ON
+		-DENABLE_USER-SMTBQ=ON
+		-DENABLE_USER-SPH=ON
+		-DENABLE_USER-TALLY=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
+	insinto "/${LAMMPS_POTENTIALS}"
+	doins "${S}"/../potentials/*
+	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
+	doenvd 99lammps
+
+	# Install python script.
+	use python && python_foreach_impl python_domodule "${S}"/../python/lammps.py
+
+	if use examples; then
+		for d in examples bench; do
+			local LAMMPS_EXAMPLES="/usr/share/${PN}/${d}"
+			insinto "${LAMMPS_EXAMPLES}"
+			doins -r "${S}"/../${d}/*
+		done
+	fi
+}
diff --git a/sci-physics/lammps/lammps-20180308.ebuild b/sci-physics/lammps/lammps-20180308.ebuild
new file mode 100644
index 000000000000..1f8951205bb4
--- /dev/null
+++ b/sci-physics/lammps/lammps-20180308.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-utils fortran-2 python-r1
+
+convert_month() {
+	local months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec )
+	echo ${months[${1#0}]}
+}
+
+MY_PV="patch_$((10#${PV:6:2}))$(convert_month ${PV:4:2})${PV:0:4}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Large-scale Atomic/Molecular Massively Parallel Simulator"
+HOMEPAGE="http://lammps.sandia.gov/"
+SRC_URI="https://github.com/lammps/lammps/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cuda examples gzip lammps-memalign mpi netcdf python test"
+
+DEPEND="
+	app-arch/gzip
+	media-libs/libpng:0
+	sys-libs/zlib
+	mpi? (
+		virtual/mpi
+		sci-libs/hdf5[mpi]
+	)
+	python? ( ${PYTHON_DEPS} )
+	sci-libs/voro++
+	virtual/blas
+	virtual/lapack
+	sci-libs/fftw:3.0
+	netcdf? ( sci-libs/netcdf )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-4.2.9-r1 )
+	dev-cpp/eigen:3
+	"
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}/cmake"
+
+src_configure() {
+	local mycmakeargs=(
+	    -DBUILD_SHARED_LIBS=ON
+		-DENABLE_MPI=$(usex mpi)
+		-DENABLE_GPU=$(usex cuda)
+		-DENABLE_TESTING=$(usex test)
+		-DENABLE_ASPHERE=ON
+		-DENABLE_BODY=ON
+		-DENABLE_CLASS2=ON
+		-DENABLE_COLLOID=ON
+		-DENABLE_COMPRESS=ON
+		-DENABLE_CORESHELL=ON
+		-DENABLE_DIPOLE=ON
+		-DENABLE_GRANULAR=ON
+		-DENABLE_KSPACE=ON
+		-DFFT=FFTW3
+		-DENABLE_MANYBODY=ON
+		-DENABLE_MC=ON
+		-DENABLE_MEAM=ON
+		-DENABLE_MISC=ON
+		-DLAMMPS_XDR=ON #630444
+		-DENABLE_MOLECULE=ON
+		-DENABLE_PERI=ON
+		-DENABLE_QEQ=ON
+		-DENABLE_REAX=ON
+		-DENABLE_REPLICA=ON
+		-DENABLE_RIGID=ON
+		-DENABLE_SHOCK=ON
+		-DENABLE_SNAP=ON
+		-DENABLE_SRD=ON
+		-DENABLE_PYTHON=ON
+		-DENABLE_MPIIO=$(usex mpi)
+		-DENABLE_VORONOI=ON
+		-DENABLE_USER-ATC=ON
+		-DENABLE_USER-AWPMD=ON
+		-DENABLE_USER-CGDNA=ON
+		-DENABLE_USER-CGSDK=ON
+		-DENABLE_USER-COLVARS=ON
+		-DENABLE_USER-DIFFRACTION=ON
+		-DENABLE_USER-DPD=ON
+		-DENABLE_USER-DRUDE=ON
+		-DENABLE_USER-EFF=ON
+		-DENABLE_USER-FEP=ON
+		-DENABLE_USER-H5MD=$(usex mpi)
+		-DENABLE_USER-LB=$(usex mpi)
+		-DENABLE_USER-MANIFOLD=ON
+		-DENABLE_USER-MEAMC=ON
+		-DENABLE_USER-MGPT=ON
+		-DENABLE_USER-MISC=ON
+		-DENABLE_USER-MOLFILE=ON
+		-DENABLE_USER-NETCDF=$(usex netcdf)
+		-DENABLE_USER-PHONON=ON
+		-DENABLE_USER-QTB=ON
+		-DENABLE_USER-REAXC=ON
+		-DENABLE_USER-SMD=ON
+		-DENABLE_USER-SMTBQ=ON
+		-DENABLE_USER-SPH=ON
+		-DENABLE_USER-TALLY=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	local LAMMPS_POTENTIALS="usr/share/${PN}/potentials"
+	insinto "/${LAMMPS_POTENTIALS}"
+	doins "${S}"/../potentials/*
+	echo "LAMMPS_POTENTIALS=${EROOT}${LAMMPS_POTENTIALS}" > 99lammps
+	doenvd 99lammps
+
+	# Install python script.
+	use python && python_foreach_impl python_domodule "${S}"/../python/lammps.py
+
+	if use examples; then
+		for d in examples bench; do
+			local LAMMPS_EXAMPLES="/usr/share/${PN}/${d}"
+			insinto "${LAMMPS_EXAMPLES}"
+			doins -r "${S}"/../${d}/*
+		done
+	fi
+}
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
 }
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 0ca78699c6e9..7aa25164f859 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -10,13 +10,12 @@ AUX root-5.34.13-unuran.patch 1555 BLAKE2B b476c0f00dd0bfc1f6a6fc63957794cc932fc
 AUX root-5.34.26-ldflags.patch 626 BLAKE2B 3c3b8bf4d173afd6024843c0e125d8b64868f367de96775e23ae21ee6adc7fb294700372eb4a3743178728ef947fbaa18e1f3c18ca5731931ed0c1a7b1ab580c SHA512 fa38441a472b8b811c293aecbf1e233ea619cb4a2c9bfb8dda1706c0ac34bf5c3dcf23a43a517a72aab5faa63e733eee74515cbf70b6f15e3cfba46e3e5c4ccc
 AUX root-6.00.01-dotfont.patch 2718 BLAKE2B a130dac163b92a4a91edc22d39722a47fcdb51cb681500a8f734091e2dc0edb6aed4a7e964cbc22120064ea49694e5fd4d2555931da5f89c0f514f75eb7314cf SHA512 8f01655e863d36678dea37df934e3d8d9c2bc85920497345feb8d863bdc1b7413c783b916050d1e7b476ecdf9e1e8afdcbb32e621d625305898d51947b6955c6
 AUX root-6.11.02-hsimple.patch 1838 BLAKE2B e5d4a2a04580c1ebe4e1da4cf615939347bcf24003c240870252938421f189e5da3ffc4a913c2241fe93f78077373ac0614bd85d32c33ba0da2203fa906f520a SHA512 3ded889d7a79070d78824bbea059f6451c96d95ac7c45063b2328856111e3dd28677dfd9a0696d0d5cbbe200690ed3f940341966847745c4bcf2f7e235135e5b
-AUX root-6.12.04-find-oracle-12.patch 1013 BLAKE2B 82d9dfc161ede442a8102831abbe042561b5a0b700533b420a2e38cbeddd4d6a2360ec76bdcf5fdd281f3493b6088b39af8edc3bbb33280e6e401474346a9198 SHA512 539cc42a25b1bea39e844a5e8597426f8afe8ea882ea573a40aea9e20e8fe50c6913520239b3aa15195511dfd95fe2baebe2dbeb3fbeddee2e384b25d66d6dc8
 AUX root-6.12.04-no-ocaml.patch 1631 BLAKE2B 808da46144572073e6fac54859a60a9f056e164a4f31718f2962197f162ced11a6f1e9839af50d1d9c720dc0e2811f9eabef4901dfbe0c14d055315abf9dcdad SHA512 37d78c57b05a20088794cf887d60514c932b6b11b2a918b4b2621700be281df80adf3f17d76da17a146e4e941bf472a0a1ddcbbf14406e5d49bd3b8e4dbf3c50
 AUX root-6.12.04-z3.patch 1155 BLAKE2B 31d099bb260a030d88fcfbe0c9c5a7953738619b216da4140e087b29fead0bfd05bd22aa75da99521689decfb54caa23e0b50a9be9c34fe2fd75596b99b13092 SHA512 ca82ed6f3a0eb9e0ae13a0c354eab0a7c9c18e93ef444418f5786decdd8600184a6c2d5deb6d54d1a852076988645a0fbd215459cd15f5569f54606d74ee3e18
 AUX rootd.confd 199 BLAKE2B d7638f5ee8ccb4fcb428d07c59d776a9ab8773fa8a8911281e8f76b32fab5902e3f6f6086ad210af39480df514c947719cc5e76d29c7dbf2a8715ae58ef49880 SHA512 2ce6753d37a7f22cc3656f110f802b8e07c1469bfe4524606c1472369352f8c584c01c716760252fab40369470b72d8c77cdbb2d52126c39371faaf597bf58d8
 AUX rootd.initd 622 BLAKE2B 7edeaf3cf550303642a89eb69edb65e6625215ac2daae5766904bcc14f1b30f6277c6eac6b895f46fbda01656df80cb71fdad6294a19bf581badceaa29278fdf SHA512 fde858a37b52540285d228e52845c963b18065a250aef0753f469753d541f577ac401f01438297c030e47176350bb23c3c0280c9b4ccbc1feda3313ab7c9be2e
 DIST root_v5.34.36.source.tar.gz 75427331 BLAKE2B 203af03e1459c7fe079fcb1b30da145b3262f90c074abb7ff8fb3b1b2b90ac24391ce51aa8afbd10e0db8d69549207f15176207bc30a13720e0ae94342a38dfa SHA512 2cc0c8f8b63b2a3ce01c49c41704483548a7324d92c21a63e3e36a00f4d6f5656a7844fdf48cb71a6f2a2c974112527300ffd3bb5502d8365ffaf138e6ae4c7a
-DIST root_v6.12.04.source.tar.gz 162106020 BLAKE2B f27382cf748d4e31d71b460ecbf9b9f12294fb212bf23dc3d34c98737d8815b2eea2318247e56953ba184bb790bbb2f4b43c675dcb7a02b77c011f19e15d0d83 SHA512 67e400e9e7e8cabfb036a1eb1c262d462f613de7d6e18f8a17109c8eb52932e9ba77e69ab7b1f62c582d06b7f4d020cc888a0dfbefb4d3716743f142c3e3c063
+DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff08cfa470e63be9a02b948a49ae088e8da72ce433a5071d9196bfd98f71e6861b1bda285354012620eee6c61cffcee71a0c8 SHA512 3d44749ccfc3d40a2f516ae53ef40fb244ed785eee0dbc18ff822bbb811a15b943039d30282ef5358a283d485e62531880c877ec77a86089503b06d6f37e42e1
 EBUILD root-5.34.36.ebuild 12173 BLAKE2B 4829235ce5fae8b912afde7d28b619e98c9335cea9f614716f9222916734ef71b87df3d791f18337ddd477a854053ef690e4f4edfd43aeab7ba519686c2baa68 SHA512 52fee9354448cb8b471e28ff4ee2a552a975f36d9b6efc3af1b0e3e83a554dc406c502348ea49bbbbec82cf86cbeb9ed7d6df01645a31e4f5211c665abb27dfd
-EBUILD root-6.12.04-r2.ebuild 9931 BLAKE2B 91db5e7baf12ba2e12faa959cc258a76f0fa1783f2ae888a50944f9697722f2b9d30a1558df77bfa3561870785fb500559c928dd217f22f1da880c4045c9e60b SHA512 c0ff456b41c16886461ae4c1eb96d1919d65a8ea3ad8c33e73667d15d091455356b11a45cc857d23fe6ab6f56e6b3d6e8c056055c32bbb06821aae6888733016
+EBUILD root-6.12.06.ebuild 9982 BLAKE2B 1f1c61774ceaca9dc1e7001a258e1fe92c0bc69b42e90d03a9673d4d75e6c589931c496b220a0b33c672746e5f1d7de594ef007736a7f3772931e7f9ecc9f303 SHA512 4e8e5e326c014c44c7b7c15951b7b63fcb0b46d4c06c4b682e7547191e996a41c1352685a4d59658f8eed872f85acc1aecba3d3f62eec0a4ed84f88817c3d2da
 MISC metadata.xml 3238 BLAKE2B 0396ebafbf0bd14c88f7ba401f12f698ccca313c0c04cab46f9fa198681b0f305f21413bab8a86c97bb65e0bbe00eb6b6f488600402784109dc13ed196d6589b SHA512 2ba887003b3dc6dc3d4de379ec9dde8a7ba8144c2bbd7be50ebcfc7b3bfb3154733edd39007fcd8c380034d028a0d3f352e4cb973d8facd9412f38f820c16b1e
diff --git a/sci-physics/root/files/root-6.12.04-find-oracle-12.patch b/sci-physics/root/files/root-6.12.04-find-oracle-12.patch
deleted file mode 100644
index 242e76d09879..000000000000
--- a/sci-physics/root/files/root-6.12.04-find-oracle-12.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7aa8aacad80c75b40bb25bdeccc7cacce9a270ca Mon Sep 17 00:00:00 2001
-From: Guilherme Amadio <amadio@cern.ch>
-Date: Mon, 18 Dec 2017 13:32:06 +0100
-Subject: [PATCH] Fix FindOracle.cmake to find version 12.x
-
----
- cmake/modules/FindOracle.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/modules/FindOracle.cmake b/cmake/modules/FindOracle.cmake
-index 24031664a6..b7c8cfbb99 100644
---- a/cmake/modules/FindOracle.cmake
-+++ b/cmake/modules/FindOracle.cmake
-@@ -12,7 +12,7 @@ set(ORACLE_FOUND 0)
- if(ORACLE_INCLUDE_DIR AND ORACLE_LIBRARY_OCCI)
-   set(ORACLE_FIND_QUIETLY 1)
- endif()
--set(ORACLE_HOME $ENV{ORACLE_DIR})
-+set(ORACLE_HOME $ENV{ORACLE_HOME})
- 
- IF (ORACLE_PATH_INCLUDES)
-     SET (ORACLE_INCLUDES_LOCATION ${ORACLE_PATH_INCLUDES})
-@@ -55,7 +55,7 @@ FIND_LIBRARY(
- )
- FIND_LIBRARY(
-     ORACLE_LIBRARY_LNNZ
--    NAMES libnnz10 nnz10 libnnz11 nnz11 ociw32
-+    NAMES libnnz10 nnz10 libnnz11 nnz11 libnnz12 nnz12 ociw32
-     PATHS ${ORACLE_LIB_LOCATION}
- )
- 
--- 
-2.15.1
-
diff --git a/sci-physics/root/root-6.12.04-r2.ebuild b/sci-physics/root/root-6.12.06.ebuild
index 15613207ee75..c875fb4bddfb 100644
--- a/sci-physics/root/root-6.12.04-r2.ebuild
+++ b/sci-physics/root/root-6.12.06.ebuild
@@ -9,8 +9,8 @@ CMAKE_MAKEFILE_GENERATOR=emake
 FORTRAN_NEEDED="fortran"
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
-inherit cmake-utils elisp-common eutils fortran-2 python-single-r1 \
-	toolchain-funcs user versionator xdg-utils
+inherit cmake-utils elisp-common eutils fortran-2 gnome2-utils \
+	python-single-r1 toolchain-funcs user versionator xdg-utils
 
 DESCRIPTION="C++ data analysis framework and interpreter from CERN"
 HOMEPAGE="https://root.cern"
@@ -112,7 +112,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-6.00.01-dotfont.patch
 	"${FILESDIR}"/${PN}-6.11.02-hsimple.patch
 	"${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch
-	"${FILESDIR}"/${PN}-6.12.04-find-oracle-12.patch
 	"${FILESDIR}"/${PN}-6.12.04-z3.patch
 )
 
@@ -267,6 +266,7 @@ daemon_install() {
 	fowners rootd:rootd /var/spool/rootd
 	dodir /var/spool/rootd/{pub,tmp}
 	fperms 1777 /var/spool/rootd/{pub,tmp}
+	keepdir /var/spool/rootd/{pub,tmp}
 
 	local i
 	for i in ${daemons}; do
@@ -336,8 +336,10 @@ src_install() {
 
 pkg_postinst() {
 	xdg_desktop_database_update
+	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
+	gnome2_icon_cache_update
 }
diff --git a/sci-physics/yoda/Manifest b/sci-physics/yoda/Manifest
index f1f4fec0b397..665270839ac4 100644
--- a/sci-physics/yoda/Manifest
+++ b/sci-physics/yoda/Manifest
@@ -1,5 +1,5 @@
-DIST YODA-1.4.0.tar.bz2 809432 BLAKE2B 5a02ccc67f9fe2bfea9471d2bb1518b0377747182551d8041fce3ee4058f701bf69170e37792d22d8efd00c9264eea8ae8e2673b14b46768953dcc4ca2ca6304 SHA512 f1873888f3d2c28d42ac54fa9f3fa4a98e648a638ebceffce0a2f742c5fb6647fabd0de49c00407741e937600fc8a12d33ca26b8b9cd9b81c28a4d2e11f2bd3a
 DIST YODA-1.6.5.tar.bz2 818613 BLAKE2B 6a8762c4f8d4bbcacf11c1b9929cff4b00811d4e18c596122dce335782a741aa1c76fab4b2ed9897dc800af1a18dba809e4fa0956cb5eb6fc84cc98544c669d6 SHA512 bead0a3ada233c1fbafe66d25e65262c20d9a9dfa6265440320a0fc782e91b3ac6581698e2015d86f2b58dc305dedbc48ed648ff03ec9f6abc11a7fb27938b1a
-EBUILD yoda-1.4.0.ebuild 1112 BLAKE2B 0fc91128cdd9c45e192bd96bb10d86adf70eec66387a97694005a9a47b46c2d5f920cff8bc0b36433ebc844f969b2d8e0cbad9aecb70b9273dc416ff1bcc0200 SHA512 8417899f7db56918156257996539b29cc5756b18f606919e43a8e8a13cebedf45d966c8191065a1057c6f459c3a3a321d3dc65cbbb27e57ef57d1a4ab399c5e8
+DIST YODA-1.7.0.tar.bz2 949964 BLAKE2B 44063500b95e6a089adac0a28eb0165c6d91f09642dcba7eae994a8b2dd9c4cc5cff40d63cbb481f41e023193632b9b2c17c4304bc03afa4ad2c6010b52c15da SHA512 de4eff3fdd7f8f031745152907eadfe4687c6c8597772d8aba628e58e7d6f203bbe55ba030a77990b2441a9b046a4d7e2bce1fb29ba9a631c1cff17acd95b1e5
 EBUILD yoda-1.6.5.ebuild 1042 BLAKE2B 1694ad20c68b6bb6c3d7bd37809ed8abead572ff83261d2feb7905a647af5585e0e9059049ec763eeefa6a74c9b7b1903829b08c76ee45505d28e188e8ae760d SHA512 0fe36248bd11c97839ff9a8ddcc2f0db306a16a906354289a8fca879d46b5eece81cbc2cb71334d5dd5ee3cb8a15dbea3efa5e6535183610279ea58711d45cbb
-MISC metadata.xml 719 BLAKE2B 1450c7ac742789a0d8caa5e0737ad068f8b1228258853436a96b2cc0777386a35e59fb251995efd54f947a1d12c620d4bfe1fe92568a4dcc9766e4bf49978807 SHA512 e41f7be6cad26c10a4632a0d70de86793771a3c616f649d526885d960bc880c5300e08a88f9d3c97be017f3682e46a18d3ef271264a720a297355f56590c19c8
+EBUILD yoda-1.7.0.ebuild 1029 BLAKE2B 3fc334dfef8777f462014ba9c98803fed85e4f8fee380e4825f5802e80fbd80cfad92f1b33f295aa5530dad8525c9dc916cb0fca5e3ddf0c2b35bf1b39b923f3 SHA512 99e276ad69277b670a8b191c731b47ecf33df8f5e3fc498bdd8eed4dd62d83caf039aec737878119df49e8c728786881dd1bd49fe4716f10191378eb5a19c8fa
+MISC metadata.xml 659 BLAKE2B 460df9dfdf485eb860ba7eb737ee9cc715e823b4961894a99e51e9bbdb98ce14a87639ddb0774aeed11d111ed21ddc4e1804f41fcb4cd72c5b0b456402588f6f SHA512 ad6899122310e6e4ecb0e72737362379cc180524dd7e60c6dbacbd7d2a0eab5c633eb5ecf8b6731ed40b12e0e186eba8ce6def539c1c0969974e75467250b7b7
diff --git a/sci-physics/yoda/metadata.xml b/sci-physics/yoda/metadata.xml
index 61a7329540bc..8075483ee7b7 100644
--- a/sci-physics/yoda/metadata.xml
+++ b/sci-physics/yoda/metadata.xml
@@ -13,7 +13,6 @@
   in Rivet.
 </longdescription>
 <use>
-  <flag name="c++11"> Build using the C++11 standard</flag>
   <flag name="root">Adds support for <pkg>sci-physics/root</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/sci-physics/yoda/yoda-1.4.0.ebuild b/sci-physics/yoda/yoda-1.4.0.ebuild
deleted file mode 100644
index 81a8d7b03a90..000000000000
--- a/sci-physics/yoda/yoda-1.4.0.ebuild
+++ /dev/null
@@ -1,50 +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
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 autotools-utils bash-completion-r1
-
-MYP=YODA-${PV}
-
-DESCRIPTION="Yet more Objects for (High Energy Physics) Data Analysis"
-HOMEPAGE="http://yoda.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="c++11 python root static-libs"
-
-RDEPEND="
-	dev-libs/boost:0=
-	python? ( ${PYTHON_DEPS} )
-	root? ( sci-physics/root:0=[python=,${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	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 c++11 stdcxx11)
-		$(use_enable python pyext)
-		$(use_enable root)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	newbashcomp "${ED}"/usr/share/YODA/yoda-completion yoda
-}
diff --git a/sci-physics/yoda/yoda-1.7.0.ebuild b/sci-physics/yoda/yoda-1.7.0.ebuild
new file mode 100644
index 000000000000..9f53d934f26e
--- /dev/null
+++ b/sci-physics/yoda/yoda-1.7.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit bash-completion-r1 python-single-r1
+
+DESCRIPTION="Yet more Objects for (High Energy Physics) Data Analysis"
+HOMEPAGE="http://yoda.hepforge.org/"
+
+SRC_URI="http://www.hepforge.org/archive/${PN}/${P^^}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="python root static-libs"
+
+RDEPEND="
+	python? ( ${PYTHON_DEPS} )
+	root? ( sci-physics/root:=[python=,${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}
+	python? ( dev-python/cython[${PYTHON_USEDEP}] )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${P^^}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	econf \
+		$(use_enable python pyext) \
+		$(use_enable root) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	newbashcomp "${ED%/}"/usr/share/YODA/yoda-completion ${PN}
+	rm "${ED%/}"/usr/share/YODA/yoda-completion || die
+}