gentoo resync : 04.08.2018

7 files changed, 4 insertions, 166 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 8cb8540c2dff..f189f3cebe4f 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/hoomd-blue/Manifest b/sci-physics/hoomd-blue/Manifest
deleted file mode 100644
index 1c5eb5fc83bd..000000000000
--- a/sci-physics/hoomd-blue/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST hoomd-blue-2.0.2.tar.bz2 2942198 BLAKE2B 5a2f964c002fd30d89757720fc9cddf733bbeaf125f7cdbab7b9c1a421e65575936fda903d3912a315433fb530148d7cddcb5830f87d9a81acdc1ba1dbf82ea2 SHA512 6480639bc1b8d0534c220c7512f742a6f9eba76ad25991153735cc7f4ff88345332be4c215abd94de85249e79e85a6970be1a74a96350d4693a2c1291fbbf689
-DIST libgetar-0.5.0.tar.bz2 217067 BLAKE2B 68d7669801d438a509582817c6e7074367a6945ee7c8f8e764dcb97e5a97a6b3394237bed4d07880a3d567b8b23dc1f159597ac51c54d03038beb1592a515952 SHA512 a27de8f7c976e5578142319684de15afca47c24953f590b34cad4ef88c3778aa47aa5eb9a1f83b1473aa49f4394e45dfaa4a8b5107264fa93101dea78ec5fa6b
-EBUILD hoomd-blue-2.0.2.ebuild 1678 BLAKE2B 314ff15781e1abaf2a69d121953787fe6c044832d979cc2b27306cae301702cb3848863d3c6f3962a39d5b35d22c19f91391cebdf71b82470ae2214e243d1981 SHA512 3661ed6fb5c847ce42471540cc6052f2703df6b560313c8b40882ed3a25f460d64edb279ae191c23004fa1fba479f1b8d95ef7c96e86e85c891d19dc32587079
-EBUILD hoomd-blue-9999.ebuild 1678 BLAKE2B 314ff15781e1abaf2a69d121953787fe6c044832d979cc2b27306cae301702cb3848863d3c6f3962a39d5b35d22c19f91391cebdf71b82470ae2214e243d1981 SHA512 3661ed6fb5c847ce42471540cc6052f2703df6b560313c8b40882ed3a25f460d64edb279ae191c23004fa1fba479f1b8d95ef7c96e86e85c891d19dc32587079
-MISC metadata.xml 558 BLAKE2B bffcf8679616338e5b5dc8b6a5585ce9a656561354e74a17dc955b0b6776685ac7f721e3949a954a6a11fbd57c36d450161a08d3a086835a234d3544bf204daa SHA512 48dfc3b18f1ab9d5c3ecd82e2eb30ec907a65c38b2cb28d6253c1a41990f9dd05ca86c7696c6f218b14149e115e9c1ad257f43ae3c7d37854c416e02855abf07
diff --git a/sci-physics/hoomd-blue/hoomd-blue-2.0.2.ebuild b/sci-physics/hoomd-blue/hoomd-blue-2.0.2.ebuild
deleted file mode 100644
index 4eeb2d729682..000000000000
--- a/sci-physics/hoomd-blue/hoomd-blue-2.0.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils cuda python-r1
-
-DESCRIPTION="a general-purpose particle simulation toolkit"
-HOMEPAGE="http://codeblue.umich.edu/hoomd-blue/"
-EGIT_REPO_URI="https://bitbucket.org/glotzer/${PN}.git"
-
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://bitbucket.org/glotzer/${PN}.git"
-	inherit git-r3
-else
-	inherit vcs-snapshot
-	GETTAR_VER=0.5.0
-	SRC_URI="https://bitbucket.org/glotzer/${PN}/get/v${PV}.tar.bz2 -> ${P}.tar.bz2
-		https://bitbucket.org/glotzer/libgetar/get/v${GETTAR_VER}.tar.bz2 -> libgetar-${GETTAR_VER}.tar.bz2"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="hoomd-blue"
-SLOT="0"
-IUSE="cuda test mpi"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	mpi? ( virtual/mpi )
-	cuda? ( dev-util/nvidia-cuda-sdk )
-	dev-libs/boost:=[threads,python,mpi,${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	[[ ${PV} = 9999 ]] || mv ../libgetar-${GETTAR_VER}/* hoomd/extern/libgetar || die
-	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	src_configure_internal() {
-		local mycmakeargs=(
-			-DENABLE_MPI=$(usex mpi)
-			-DENABLE_CUDA=$(usex cuda)
-			-DBUILD_TESTING=$(usex test)
-			-DUPDATE_SUBMODULES=OFF
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DCMAKE_INSTALL_PREFIX=$(python_get_sitedir)
-		)
-		cmake-utils_src_configure
-	}
-	python_foreach_impl src_configure_internal
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_make
-}
-
-src_test() {
-	python_foreach_impl cmake-utils_src_test
-}
-
-src_install() {
-	python_foreach_impl cmake-utils_src_install
-}
diff --git a/sci-physics/hoomd-blue/hoomd-blue-9999.ebuild b/sci-physics/hoomd-blue/hoomd-blue-9999.ebuild
deleted file mode 100644
index 4eeb2d729682..000000000000
--- a/sci-physics/hoomd-blue/hoomd-blue-9999.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-CMAKE_MAKEFILE_GENERATOR="ninja"
-
-inherit cmake-utils cuda python-r1
-
-DESCRIPTION="a general-purpose particle simulation toolkit"
-HOMEPAGE="http://codeblue.umich.edu/hoomd-blue/"
-EGIT_REPO_URI="https://bitbucket.org/glotzer/${PN}.git"
-
-if [[ ${PV} = 9999 ]]; then
-	EGIT_REPO_URI="https://bitbucket.org/glotzer/${PN}.git"
-	inherit git-r3
-else
-	inherit vcs-snapshot
-	GETTAR_VER=0.5.0
-	SRC_URI="https://bitbucket.org/glotzer/${PN}/get/v${PV}.tar.bz2 -> ${P}.tar.bz2
-		https://bitbucket.org/glotzer/libgetar/get/v${GETTAR_VER}.tar.bz2 -> libgetar-${GETTAR_VER}.tar.bz2"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="hoomd-blue"
-SLOT="0"
-IUSE="cuda test mpi"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	mpi? ( virtual/mpi )
-	cuda? ( dev-util/nvidia-cuda-sdk )
-	dev-libs/boost:=[threads,python,mpi,${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	[[ ${PV} = 9999 ]] || mv ../libgetar-${GETTAR_VER}/* hoomd/extern/libgetar || die
-	use cuda && cuda_src_prepare
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	src_configure_internal() {
-		local mycmakeargs=(
-			-DENABLE_MPI=$(usex mpi)
-			-DENABLE_CUDA=$(usex cuda)
-			-DBUILD_TESTING=$(usex test)
-			-DUPDATE_SUBMODULES=OFF
-			-DPYTHON_EXECUTABLE="${PYTHON}"
-			-DCMAKE_INSTALL_PREFIX=$(python_get_sitedir)
-		)
-		cmake-utils_src_configure
-	}
-	python_foreach_impl src_configure_internal
-}
-
-src_compile() {
-	python_foreach_impl cmake-utils_src_make
-}
-
-src_test() {
-	python_foreach_impl cmake-utils_src_test
-}
-
-src_install() {
-	python_foreach_impl cmake-utils_src_install
-}
diff --git a/sci-physics/hoomd-blue/metadata.xml b/sci-physics/hoomd-blue/metadata.xml
deleted file mode 100644
index 1b92a0a45128..000000000000
--- a/sci-physics/hoomd-blue/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>junghans@gentoo.org</email>
-    <name>Christoph Junghans</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>sci-chemistry@gentoo.org</email>
-    <name>Gentoo Chemistry Project</name>
-  </maintainer>
-  <use>
-    <flag name="cuda">Enable cuda non-bonded kernels</flag>
-  </use>
-  <upstream>
-    <remote-id type="bitbucket">glotzer/hoomd-blue</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index c10762e52892..d7c16532e085 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -10,9 +10,9 @@ AUX root-6.14.00-http.patch 1130 BLAKE2B b2967a7e2a56d3989ebbcc84d82aa0395708ff8
 AUX rootd.confd 199 BLAKE2B d7638f5ee8ccb4fcb428d07c59d776a9ab8773fa8a8911281e8f76b32fab5902e3f6f6086ad210af39480df514c947719cc5e76d29c7dbf2a8715ae58ef49880 SHA512 2ce6753d37a7f22cc3656f110f802b8e07c1469bfe4524606c1472369352f8c584c01c716760252fab40369470b72d8c77cdbb2d52126c39371faaf597bf58d8
 AUX rootd.initd 622 BLAKE2B 7edeaf3cf550303642a89eb69edb65e6625215ac2daae5766904bcc14f1b30f6277c6eac6b895f46fbda01656df80cb71fdad6294a19bf581badceaa29278fdf SHA512 fde858a37b52540285d228e52845c963b18065a250aef0753f469753d541f577ac401f01438297c030e47176350bb23c3c0280c9b4ccbc1feda3313ab7c9be2e
 DIST root_v6.12.06.source.tar.gz 162284452 BLAKE2B 944b5e899677bab40842d7ec969ff08cfa470e63be9a02b948a49ae088e8da72ce433a5071d9196bfd98f71e6861b1bda285354012620eee6c61cffcee71a0c8 SHA512 3d44749ccfc3d40a2f516ae53ef40fb244ed785eee0dbc18ff822bbb811a15b943039d30282ef5358a283d485e62531880c877ec77a86089503b06d6f37e42e1
-DIST root_v6.14.00.source.tar.gz 162436586 BLAKE2B 6047fe9fb898be9d4f00f2e6eb378d213996b49b9677f61ccc0250bb6d0801d8410850a39e0983534da2c6a307bd64b0ed6c03ab873a6c8b844500a96444a455 SHA512 2d4e754e3054018a53af28408b218bc52c0c60bea69a3c9e48f0d3feadbfebb559087fb453505b281fe01043f723e4b766cda8fca1e68dbf9e202c67d417e5b3
+DIST root_v6.14.02.source.tar.gz 162458882 BLAKE2B 70778819c6348f3fda9d7a224639da41f2a1522baec669e0cb88680f978fc64e98f87790d96b177e42ca5639e47f2646b94e65c112dd3b237bdd3dcfa9f6aeac SHA512 7117a74c622cc2d7d8b616abf8571444f6178c911dd768274af6def95e7cd7d1e39506a3b57f694fd4a687ad3bd1f6c68e64ff3eccdcd3236b0b59b08db6b934
 EBUILD root-6.12.06-r1.ebuild 9188 BLAKE2B 3a23869ac2344c4949eb1cdaec9fd4763ad84641defbe928b2c940f2a3db4bf7f00d16f60abf2284b647f169fdb234ee9155215346f878fcc12a2bf073f1e8ad SHA512 ed545ac2493b7ebddaf71d438d71b2b6f58cb562ec3017311d185084a7e0838aa8c253a320392cab1a3ca7b46655f95a786c55fd3b3ab18c06dfcc7edc02f543
 EBUILD root-6.12.06-r4.ebuild 7914 BLAKE2B fbe59c55e9ff7f257c5f9861eeabb5b76d2c1fd1236057879c108da63bf65fe1aeb0f3eff846e6f57175cce019a1aee786420d7fc7549bd8cf1d0dc8c043ba81 SHA512 5c094fd843a68ac5591a4fbf45ae4ef6073d10ed4f3b10613fab39e5017ed3c28c99bfc5a3841151a6aae228e2477a820ec5edba4b7225d361f00d960cc81aad
-EBUILD root-6.14.00-r1.ebuild 7942 BLAKE2B 0f3ea03b7f8236adadda68c6a54b7b41277c1af4a98f04215c2c120b8d3cc2a5618f03bd30f1d224804329ed254d05d58ea7064a561e89e21a5ce3c46f67a19a SHA512 d35525b285b6ef8700b60f2d36012398fa2f3c7cca4cf42802de2c0876ca5681ab01c616a1cf1f94aa74929357706bf961bafbb3f9662be703a713ce954bf51c
+EBUILD root-6.14.02.ebuild 7904 BLAKE2B 09e0636a2911e52005cb464732cb75112ab2bbba0faa9e805334323b695443cee43076acbc2d001a03646c6da67fd421891b4f42c67012914caf526ac31020ba SHA512 acf4ef7a89cf0df8dda63e233e00ba8400d916e5c4f14d01410a4cbb3fa2487f863784bdf560e5c3d7ce243bc0ce676e4969de2cf3eec0d9e32d3ca9fdebfcf8
 EBUILD root-9999.ebuild 8103 BLAKE2B c23d1d152ce67fbdc52b1eb9163b40b827471198eb6456f96ce38c36e463a4138e0db377c4a316e5c028cf3971cf73fa849b71c12542809efdc3d37b769f5444 SHA512 f0acc7909028c63f49ff0507199e89acdfe207d3c121ee110aa7ccd1beee0fe618b3741763f893da4621c8cb82e733534a363ae1bcdcceb421908241c66884bd
 MISC metadata.xml 3019 BLAKE2B 2d09d1b38ea45967ac74fd23265070df4393b66757dd3fee20541115b564dbbd017152b7f28d3e73ce19e44eeacd7be491c6b6d1d920216942586c5169a6695f SHA512 a51afe372f4aa84e622ff58bf89cee5665c0daf900c7ed7647a25167c58bbe3c45ebb0df342c30dea446b4c171d787b445136dec8eeaa32a2a5e0aecc04d737f
diff --git a/sci-physics/root/root-6.14.00-r1.ebuild b/sci-physics/root/root-6.14.02.ebuild
index 124bdd2658fb..4d725bd70a50 100644
--- a/sci-physics/root/root-6.14.00-r1.ebuild
+++ b/sci-physics/root/root-6.14.02.ebuild
@@ -111,7 +111,6 @@ RDEPEND="${CDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch
 	"${FILESDIR}"/${PN}-6.13.02-hsimple.patch
-	"${FILESDIR}"/${PN}-6.14.00-http.patch
 )
 
 pkg_setup() {
@@ -154,6 +153,7 @@ src_configure() {
 		-Dexplicitlink=ON
 		-Dexceptions=ON
 		-Dfail-on-missing=ON
+		-Dgnuinstall=OFF
 		-Dshared=ON
 		-Dsoversion=ON
 		-Dbuiltin_llvm=ON
@@ -208,7 +208,6 @@ src_configure() {
 		-Dglite=OFF # not implemented
 		-Dglobus=OFF
 		-Dgminimal=OFF
-		-Dgnuinstall=OFF
 		-Dgsl_shared=$(usex gsl)
 		-Dgviz=$(usex graphviz)
 		-Dhdfs=OFF
@@ -240,7 +239,7 @@ src_configure() {
 		-Droot7=$(usex root7)
 		-Drootbench=OFF
 		-Droottest=$(usex test)
-		-Drpath=ON # needed for multi-slot to work
+		# -Drpath=ON # needed for multi-slot to work
 		-Druby=OFF # deprecated and broken
 		-Druntime_cxxmodules=OFF # does not work yet
 		-Dr=$(usex R)