gentoo resync : 09.03.2018

4 files changed, 48 insertions, 54 deletions

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
+}