gentoo resync : 12.01.2019

11 files changed, 30 insertions, 315 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index ede95a0aefea..1005f500382d 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/clhep/Manifest b/sci-physics/clhep/Manifest
index 9d6e3c5cbf46..ca3aa22896cc 100644
--- a/sci-physics/clhep/Manifest
+++ b/sci-physics/clhep/Manifest
@@ -1,15 +1,5 @@
-DIST clhep-2.1.4.1.tgz 1866250 BLAKE2B 51339ecf0448c97abfeb4e9e95ae3b0c10d370672df5a0342b6a4c08b40268dab1396351f61756d20a53ee62a6e92e8556624a01fd543ef830bbfff2a383e424 SHA512 ff5eb76ddf740635c17f01c62679ae7c22c152f96684315f059744ab67e420e51ba9c1ae0ac745b2890d1ddb6a678999b61d44c36e358c1d95c6b57362f3fae0
-DIST clhep-2.1.4.2.tgz 1838675 BLAKE2B 974f5ab440bf56d318a8fbb3665adc9a8f5e406ac4fd8394b2ceabb346856bdcbc17a30ba2d94c61e88732586e9f26707fc3c8e495bbe2c94cbf9c8c0f05ded7 SHA512 8caa6fdbf1d7dbfe217cc5aef384e21b99ae386a76771f17b3dc583c0c55e21164ad3778005798f1a4d151b79782b96a3495d88f1cf7bd46da4c6550ebd69f7c
-DIST clhep-2.2.0.1.tgz 1844675 BLAKE2B af2e379035df136a9ecdcf6b22d2d5120e8c89e6dcfc44ddfa26bdfecf2eb45e83a972b4dd38e4fdf55aeb9df90fb7ab97ecb1f294c5c0e87955477bdd8e5601 SHA512 930577d18f1c4a9dc94b259589653ebecf7b85ec78da7e1dc7b49d282dbae210bcf257831254f875840a3fd6bf5fc4ad7c4e46825e31674c55c746ef7c2939f2
 DIST clhep-2.2.0.5.tgz 1847046 BLAKE2B 8dddc6b9acbf41abdd849ef1aa1087d93f48fc83937ee67e687e28c421d290683e5381c2b9f8034e2651e3ccec2fd2e0ba8bee73dc55618e22c0e4df7ce3a378 SHA512 07d9359604196344fe3b13cc103727693fd70818c22849e54507530221812843a943cb8ed66eea421e498edcc9c0f584826823ea7939cbf53b90b17d412aed1a
-DIST clhep-2.3.1.0.tgz 1538945 BLAKE2B 9aa76fb35c99bbd76d5cdbf5d58b5f64a4a24516b1b9dd5dff7fdf0c60f1c9a4d23e86bce3f4dc0ef849d65753702b0e9043caa8e07f3235ab25c79c7ad83fa5 SHA512 786ad6289ab064c3c428ba2a8f534fcadd09f1f00a9c725dc987ea46c55d1f4ec7beab25221c978992dd195b02a65388a35aa6d7f471b6742c9ff6cdb7a8b7a4
-DIST clhep-2.3.3.1.tgz 1565701 BLAKE2B e5153da7a79d0c6e6f4f98cfadd836ee7b36196dcc0daae45bc38c43c24b10cf65aeb71dd0313c7195cd0734d645e8ddcbeed53b82b16d7ae35ecffab2383b4e SHA512 b13e336f9c4dd741291768a4c59075e88467ad54dc41a07eeb519712055e1a26c2369bffb6aeeeac4199066ce1bc863e9d90647094dd2fced7069d82a4cd1317
 DIST clhep-2.4.0.4.tgz 1536520 BLAKE2B 7ab58aeab685950393c8059f77e95cbbf7bf61f04e8113c6fd7b09200cce497716d5a0e023143dde395db895f48848a78e579e38968d9f27a50769034003e11e SHA512 349c1225713a3bc91fe94e27f938e919b434e6466df94dcde915c7e8ed313b9b2e7186e67a9b580ede21aec0050507a070c279920590148ebbec0ac5733fb008
-EBUILD clhep-2.1.4.1.ebuild 1367 BLAKE2B c6bcb52e1b2b7fe8f9a69ea33a29ec841a7629b507a4563facb294a0fc73cd4e5171b8417f46100c642bf753d698d298b1a2555fbaf93598dcaf4834641b6ea7 SHA512 4e14e1d851d8dbd5155b4a527497b875f0779e42e6aaa74e825ec0fcac74d7851e856685b11ceb81b35e7604546928839608e30a8ddb7a93ba2fb9686c1b477c
-EBUILD clhep-2.1.4.2.ebuild 1378 BLAKE2B 4193175797acdbb52cffd3b6de01679a8e310099f4f12321fe192bd319bcef8520d91a811033535916cf996683f2f800ebf9d7ba80377b149fb826d94631e018 SHA512 a7970a0e9ffd1620a39ab206cc158d6d980b08d8503de10507f7b4874d9cbe57e9844df862441fb8bef59f813f01f14e1b0c8111289429268957b1259d338410
-EBUILD clhep-2.2.0.1.ebuild 1378 BLAKE2B 4193175797acdbb52cffd3b6de01679a8e310099f4f12321fe192bd319bcef8520d91a811033535916cf996683f2f800ebf9d7ba80377b149fb826d94631e018 SHA512 a7970a0e9ffd1620a39ab206cc158d6d980b08d8503de10507f7b4874d9cbe57e9844df862441fb8bef59f813f01f14e1b0c8111289429268957b1259d338410
-EBUILD clhep-2.2.0.5.ebuild 1374 BLAKE2B 09920510732f5ca752c01672c11ed7e7d3f261dfd2c5ed82f824e3c4bccb1faed4e0ee8f1b376a7a97e5dd0ce037103445bdec7775a212628b99bf06dacd6f8e SHA512 a11977b880aed6a7a678f5e3f8f661a2687a05ac611f2dccbcacccd56c9f5e27456b46e6af512627a3a849507c70b8df3d13188c589443052fe1b38275d608ef
-EBUILD clhep-2.3.1.0.ebuild 1378 BLAKE2B 4193175797acdbb52cffd3b6de01679a8e310099f4f12321fe192bd319bcef8520d91a811033535916cf996683f2f800ebf9d7ba80377b149fb826d94631e018 SHA512 a7970a0e9ffd1620a39ab206cc158d6d980b08d8503de10507f7b4874d9cbe57e9844df862441fb8bef59f813f01f14e1b0c8111289429268957b1259d338410
-EBUILD clhep-2.3.3.1.ebuild 1274 BLAKE2B e3e82e240abda4f14520c3713d25e73a4d291d18daa6ef35c0827d567b345d6f11c1f54e7885f3d3ffe8a49c7b10ebecf57786f8bd7671b6a1d7ca62045f0c74 SHA512 26954289283caf6666d84f4fb48f1ab1514f42d9c694657485c1d84e69524cfeeb7fb89b11a4ce4d9fb946f05493746172c3e69836f40accd60f242fee46e248
-EBUILD clhep-2.4.0.4.ebuild 1153 BLAKE2B 2f25784e72e25a96be71df937588d4e085331d66fe97c94bb38ed6b3166e7051f2662a2e15e7118530fbb14209eca68cfe7d8e836f85021087264284eab59e63 SHA512 437d3f6c1380c29a9eb2b84b10534454d9a5686be0734ed0e710646c6d9d1741e427ff58b9aebe3b4908b52abcb64987a585206b22d0b4437d8218363ae8aa16
+EBUILD clhep-2.2.0.5.ebuild 1329 BLAKE2B 44ff5e92f552290ffb31f352274d86186d841ea529b127ea6ad2ea598177cba37ce31f6177a3b3c7c17e507fb98c35c6df85c768fcd8739fcd486531e948fdb3 SHA512 09fa9b6135205ee61b162b00bf8552fc1b515b2e49bb7ec63862f438d8077a6607b8541d66a7ee2e5f269a8fb301782ad6f7fffa4ba2a2c81526e55c742264b5
+EBUILD clhep-2.4.0.4.ebuild 1110 BLAKE2B d79ec57e7b1a44d7e038cdea4bcbdc7da55ed1a6a748b49b835ed249c04ca178d07db19fef8fbd19f37690d094f5264d63f0ac1a31bbdbf99c3be851ecb61dd4 SHA512 8f60847cbf23ea0138e0199d380fb6ac175e079f35bb8d652f98297f182fc4d6dcbe8bc38e59f35b64a4332780649ed7e58a06232af7c68a7f5f41a752038429
 MISC metadata.xml 496 BLAKE2B 60254470fbb21294249dd75b34aebb0d29d090aba3a41f75e02950ccd77fe1ca0043eec460844f2de4b2a9b4bd4e34f2faa6c00b81daf8e615b78d92f503ade3 SHA512 768aeefc23a2ea89eb63b0eb6fd084c253243b6d67b822702dffc8f49a7170d30e55ebc08875ff238e618639882f93fe6e1390e3d8456f3850d75d5a98bf3b96
diff --git a/sci-physics/clhep/clhep-2.1.4.1.ebuild b/sci-physics/clhep/clhep-2.1.4.1.ebuild
deleted file mode 100644
index 39ae660ca9b0..000000000000
--- a/sci-physics/clhep/clhep-2.1.4.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-DESCRIPTION="High Energy Physics C++ library"
-HOMEPAGE="http://www.cern.ch/clhep"
-SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc static-libs test"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S="${WORKDIR}/${PV}/CLHEP"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# respect flags
-	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
-	# no batch mode to allow parallel building (bug #437482)
-	sed -i \
-		-e 's:-interaction=batchmode::g' \
-		cmake/Modules/ClhepBuildTex.cmake || die
-	# gentoo doc directory
-	sed -i \
-		-e "/DESTINATION/s:doc:share/doc/${PF}:" \
-		cmake/Modules/ClhepBuildTex.cmake */doc/CMakeLists.txt || die
-	# dont build test if not asked
-	if ! use test; then
-		sed -i \
-			-e '/add_subdirectory(test)/d' \
-			*/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTING)
-		$(cmake-utils_use doc CLHEP_BUILD_DOCS)
-	)
-	DESTDIR="${ED}" cmake-utils_src_configure
-	use doc && MAKEOPTS+=" -j1"
-}
-
-src_install() {
-	cmake-utils_src_install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/sci-physics/clhep/clhep-2.1.4.2.ebuild b/sci-physics/clhep/clhep-2.1.4.2.ebuild
deleted file mode 100644
index fc50b6a42203..000000000000
--- a/sci-physics/clhep/clhep-2.1.4.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-DESCRIPTION="High Energy Physics C++ library"
-HOMEPAGE="http://www.cern.ch/clhep"
-SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-IUSE="doc static-libs test"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S="${WORKDIR}/${PV}/CLHEP"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# respect flags
-	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
-	# no batch mode to allow parallel building (bug #437482)
-	sed -i \
-		-e 's:-interaction=batchmode::g' \
-		cmake/Modules/ClhepBuildTex.cmake || die
-	# gentoo doc directory
-	sed -i \
-		-e "/DESTINATION/s:doc:share/doc/${PF}:" \
-		cmake/Modules/ClhepBuildTex.cmake */doc/CMakeLists.txt || die
-	# dont build test if not asked
-	if ! use test; then
-		sed -i \
-			-e '/add_subdirectory(test)/d' \
-			*/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTING)
-		$(cmake-utils_use doc CLHEP_BUILD_DOCS)
-	)
-	DESTDIR="${ED}" cmake-utils_src_configure
-	use doc && MAKEOPTS+=" -j1"
-}
-
-src_install() {
-	cmake-utils_src_install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/sci-physics/clhep/clhep-2.2.0.1.ebuild b/sci-physics/clhep/clhep-2.2.0.1.ebuild
deleted file mode 100644
index fc50b6a42203..000000000000
--- a/sci-physics/clhep/clhep-2.2.0.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-DESCRIPTION="High Energy Physics C++ library"
-HOMEPAGE="http://www.cern.ch/clhep"
-SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-IUSE="doc static-libs test"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S="${WORKDIR}/${PV}/CLHEP"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# respect flags
-	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
-	# no batch mode to allow parallel building (bug #437482)
-	sed -i \
-		-e 's:-interaction=batchmode::g' \
-		cmake/Modules/ClhepBuildTex.cmake || die
-	# gentoo doc directory
-	sed -i \
-		-e "/DESTINATION/s:doc:share/doc/${PF}:" \
-		cmake/Modules/ClhepBuildTex.cmake */doc/CMakeLists.txt || die
-	# dont build test if not asked
-	if ! use test; then
-		sed -i \
-			-e '/add_subdirectory(test)/d' \
-			*/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTING)
-		$(cmake-utils_use doc CLHEP_BUILD_DOCS)
-	)
-	DESTDIR="${ED}" cmake-utils_src_configure
-	use doc && MAKEOPTS+=" -j1"
-}
-
-src_install() {
-	cmake-utils_src_install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/sci-physics/clhep/clhep-2.2.0.5.ebuild b/sci-physics/clhep/clhep-2.2.0.5.ebuild
index 35c47db6a89d..7c5de315a5ab 100644
--- a/sci-physics/clhep/clhep-2.2.0.5.ebuild
+++ b/sci-physics/clhep/clhep-2.2.0.5.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils multilib
+inherit cmake-utils
 
 DESCRIPTION="High Energy Physics C++ library"
-HOMEPAGE="http://www.cern.ch/clhep"
+HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
 SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2/${PV}"
 KEYWORDS="amd64 hppa ppc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 IUSE="doc static-libs test"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
+
+BDEPEND="doc? ( virtual/latex-base )"
 
 S="${WORKDIR}/${PV}/CLHEP"
 
@@ -42,8 +41,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTING)
-		$(cmake-utils_use doc CLHEP_BUILD_DOCS)
+		-DCLHEP_BUILD_DOCS=$(usex doc)
 	)
 	DESTDIR="${ED}" cmake-utils_src_configure
 	use doc && MAKEOPTS+=" -j1"
@@ -51,5 +49,7 @@ src_configure() {
 
 src_install() {
 	cmake-utils_src_install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a
+	if ! use static-libs; then
+		rm "${ED}"/usr/$(get_libdir)/*.a || die
+	fi
 }
diff --git a/sci-physics/clhep/clhep-2.3.1.0.ebuild b/sci-physics/clhep/clhep-2.3.1.0.ebuild
deleted file mode 100644
index fc50b6a42203..000000000000
--- a/sci-physics/clhep/clhep-2.3.1.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-DESCRIPTION="High Energy Physics C++ library"
-HOMEPAGE="http://www.cern.ch/clhep"
-SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-IUSE="doc static-libs test"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S="${WORKDIR}/${PV}/CLHEP"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# respect flags
-	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
-	# no batch mode to allow parallel building (bug #437482)
-	sed -i \
-		-e 's:-interaction=batchmode::g' \
-		cmake/Modules/ClhepBuildTex.cmake || die
-	# gentoo doc directory
-	sed -i \
-		-e "/DESTINATION/s:doc:share/doc/${PF}:" \
-		cmake/Modules/ClhepBuildTex.cmake */doc/CMakeLists.txt || die
-	# dont build test if not asked
-	if ! use test; then
-		sed -i \
-			-e '/add_subdirectory(test)/d' \
-			*/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTING)
-		$(cmake-utils_use doc CLHEP_BUILD_DOCS)
-	)
-	DESTDIR="${ED}" cmake-utils_src_configure
-	use doc && MAKEOPTS+=" -j1"
-}
-
-src_install() {
-	cmake-utils_src_install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/sci-physics/clhep/clhep-2.3.3.1.ebuild b/sci-physics/clhep/clhep-2.3.3.1.ebuild
deleted file mode 100644
index e284870ec6ae..000000000000
--- a/sci-physics/clhep/clhep-2.3.3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils multilib
-
-DESCRIPTION="High Energy Physics C++ library"
-HOMEPAGE="http://cern.ch/clhep"
-SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
-LICENSE="GPL-3 LGPL-3"
-SLOT="2/${PV}"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-IUSE="doc static-libs test"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[latex] )"
-
-S="${WORKDIR}/${PV}/CLHEP"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# respect flags
-	sed -i -e 's:-O::g' cmake/Modules/ClhepVariables.cmake || die
-	# dont build test if not asked
-	if ! use test; then
-		sed -i \
-			-e '/add_subdirectory(test)/d' \
-			*/CMakeLists.txt || die
-	fi
-	# gentoo doc directory
-	if use doc; then
-		grep -rl 'share/doc/CLHEP' |
-		xargs sed -i \
-			-e "s:share/doc/CLHEP:share/doc/${PF}:" \
-			{.,*}/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	append-cxxflags $(test-flags-CXX -std=c++11)
-	local mycmakeargs=(
-		$(cmake-utils_use test ENABLE_TESTING)
-		$(cmake-utils_use doc CLHEP_BUILD_DOCS)
-	)
-	DESTDIR="${ED}" cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a
-}
diff --git a/sci-physics/clhep/clhep-2.4.0.4.ebuild b/sci-physics/clhep/clhep-2.4.0.4.ebuild
index 08425f145ab5..5f32e859e2c6 100644
--- a/sci-physics/clhep/clhep-2.4.0.4.ebuild
+++ b/sci-physics/clhep/clhep-2.4.0.4.ebuild
@@ -1,21 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils multilib
+inherit cmake-utils
 
 DESCRIPTION="High Energy Physics C++ library"
-HOMEPAGE="http://cern.ch/clhep"
+HOMEPAGE="http://proj-clhep.web.cern.ch/proj-clhep/"
 SRC_URI="http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/${P}.tgz"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2/${PV}"
 KEYWORDS="amd64 ~hppa ppc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 IUSE="doc test threads"
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen[latex] )"
+
+BDEPEND="doc? ( app-doc/doxygen[latex] )"
 
 S="${WORKDIR}/${PV}/CLHEP"
 
@@ -41,7 +40,6 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
 		-DCLHEP_BUILD_DOCS=$(usex doc)
 		-DCLHEP_SINGLE_THREAD=$(usex threads no yes)
 	)
diff --git a/sci-physics/sassena/Manifest b/sci-physics/sassena/Manifest
index f75350bceb26..a6f3fb2d0ee0 100644
--- a/sci-physics/sassena/Manifest
+++ b/sci-physics/sassena/Manifest
@@ -2,5 +2,5 @@ AUX sassena-1.4.2_cmake-remove-missing.patch 1044 BLAKE2B e294515e5167c2bb87b3a1
 AUX sassena-1.4.2_link_boost_thread.patch 4581 BLAKE2B 24fd46217eaf6c3a1b0ef70dd06d759489eca2822f71d8c541a4715b14108f99f1d06572d732b4f6232825acc96162fecdcfbd4f4ff3298c50f87964bdcc13f0 SHA512 12e5d62d972eb9e0e89587db66f335496ba921009435a40ca61824165726244cf394634b88cd9ebbde08217d00ea4fd5a182aa7854be2ec481edf970a7442a37
 AUX sassena-1.4.2_uint32_t.patch 491 BLAKE2B a057fa62c85fb7ef2ba6f142c12fdf8fba74efdc75b4870ff2c7ee4475b942a224001c954aa6273608ef7264fe8203167fc0558f9a18c3427e7b26bcd1ae46f6 SHA512 1cf7bf57cbb4c967c63b32b063e71ef62f40640858464b4db4d392fe967be25010fa9e22f5cbca2e82e7cc185ccf07819919087ed72b79bace8ce152bace1b2e
 DIST sassena-1.4.2.tar.gz 783708 BLAKE2B eef37655c50831f50bfd7f9d66b98d30820661682c78d9fc0f24bf4cc924dfff3a2ce3d116a8fe1161522907825a1bbaaef5d61bf8edb20094bc37606cf87c88 SHA512 07dbd44494a50de29b6f3b3542d862328726d132bda097352ac2f6ad24479b93b2d77c5ea2ef812b2956d0ac950ad69b93da0996f14ff1ce9f0e310b27728942
-EBUILD sassena-1.4.2.ebuild 712 BLAKE2B 3e07a9329477b748be1c72801442c24b2149f094ca93a15a0e898ed9832116a1891ba952959b9e46e202af3ff5b4c363317c4f78e93c07b6cc89be025e5a0b49 SHA512 4cf60609ea5239b8a9db57b5b80da87d4b7614700cec6a9b38d6091ed05602be58189ff9a589b1530bf0cd387cff5a43ff03982459dbb4cedc1695accdf04892
+EBUILD sassena-1.4.2.ebuild 715 BLAKE2B 0a6531db60f7998d1e6537527b04b41ce766238b3607fea9332524d22e2bbd45a298fc1fc076e18dcc7ab1e6aa4a081ad2ed9d7b31d55243d58a49abea3106f9 SHA512 9e70d3f6e9143ccf9dde23f3693b367d82d07f2372b54e8b7cdacc78603201215389f551a2b83a7377b430e7d1cd2e361995c2f9ef3297dede198ec6d83437bc
 MISC metadata.xml 328 BLAKE2B 7e270a4dd50c9624077be5c6b901aad041914299bca8c79e1f295a86533b401140924d2beea933ef6632661c2359f099deb78cb57c733d101b8ebeb23474538c SHA512 32e9e1d75cdaf8d4019c85ae952194ed9f60991068ffc10015b552ec3ea673e8e9ff35bde421059f5e0ee098a109af61b97de16bd16408e8b94b402e605163f6
diff --git a/sci-physics/sassena/sassena-1.4.2.ebuild b/sci-physics/sassena/sassena-1.4.2.ebuild
index 4546a6090317..8931b9bc422c 100644
--- a/sci-physics/sassena/sassena-1.4.2.ebuild
+++ b/sci-physics/sassena/sassena-1.4.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit cmake-utils
 
 DESCRIPTION="Software for Calculating Scattering Diagrams on Massively Parallel Computers"
-HOMEPAGE="http://www.sassena.org"
+HOMEPAGE="https://github.com/benlabs/sassena"
 SRC_URI="https://github.com/benlabs/sassena/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -15,13 +15,14 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux"
 IUSE=""
 
 DEPEND="
-		dev-libs/boost[mpi]
-		sci-libs/hdf5[mpi]
-		dev-libs/libxml2
-		sci-libs/fftw:3.0
-		virtual/mpi
-		virtual/blas
-		virtual/lapack"
+	dev-libs/boost[mpi]
+	dev-libs/libxml2
+	sci-libs/fftw:3.0
+	sci-libs/hdf5[mpi]
+	virtual/blas
+	virtual/lapack
+	virtual/mpi
+"
 RDEPEND="${DEPEND}"
 
 PATCHES=(