gentoo resync 31.01.2019

5 files changed, 10 insertions, 4 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 17fef48653b6..c14d0c966210 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/cernlib/Manifest b/sci-physics/cernlib/Manifest
index 39f0faae622c..cdc629cf1483 100644
--- a/sci-physics/cernlib/Manifest
+++ b/sci-physics/cernlib/Manifest
@@ -7,5 +7,5 @@ DIST cernlib_20061220+dfsg3-4.3.debian.tar.xz 168928 BLAKE2B 15147d1d84d3e4abb06
 DIST cernlib_20061220+dfsg3.orig.tar.gz 6434476 BLAKE2B 069eda316ffbc4873e79952283a0aa2693ed58a3cc369bca72e29a4feaef4840922b4f62ababba1476f2aa0309f68833a4a35a3b5c6ac015bdbd85b3b58b2efe SHA512 11fade45c5ae69c858f37a82e74ab1a69416314a23c12ec5205ee6b918590d66f26d3ae68afa466ae3109d736212968ece956a444270ddd189a27a24c0ccece8
 EBUILD cernlib-2006-r5.ebuild 2941 BLAKE2B 7f46ad84ae5459772974be17007071fd5049584943ecaf9a3d5ea73da7d424efebe3c85cd4482617d0bd78765af9d6f343b1b6d47c021a928ceac2050d8547c7 SHA512 5b5de782e64937d08d7b748d16efbfcd927f99fe05f127426e5bd52be3ce21f741f6ac42157efb6c95318acd38e217c714e39c2c736f8cd5335d3bf26d961557
 EBUILD cernlib-2006-r6.ebuild 2996 BLAKE2B 02602426dab1d77f98a8f70997d7357715f47eddc87c4a80c39dcf10684617db230a613396754dae7884eaed7805d914738a72aa12f29094bdf89a3d681c1c84 SHA512 d2721cd22118e0ab7bcbdd39cc94c2c5620f99775c089f3918e128ee23e0d34ae96238c0c1e0b80d2fe062c12434085993f7d84cd5f90bb4781ad130ff2e62a6
-EBUILD cernlib-2006-r7.ebuild 2996 BLAKE2B 250f40bd42379c1bb17530a4077c7cdc9e8c2293bdd9cf9221805a42180d9b0c102edcc8f8aa681b2bc6f9cba57d8d13cf4ce40683922818138e705ff10b359e SHA512 0da0b967504f8be9a184ea112a6bce4a8ea2bdeeff8f0397219dabc02908bb309707e75ac71893f7378678270831d8fa7690afb11765607dbc74d250966c28fa
+EBUILD cernlib-2006-r7.ebuild 3010 BLAKE2B 17f778cd95128e09252be544144aa732b9767f767f92096bdf6b3b76c81192fe330f999111e1569eceeeb5a400e58355701e701af1c995b12f5824bce3f24c9c SHA512 9dde5fc5814cf0ce917a0aab2a37c4d5a55b155cf98db3c29e285df87fb8527002541e98f3a5817a0614fa6be7cf7b2bf5d2665027ef9cf43e72a3f936b4093c
 MISC metadata.xml 759 BLAKE2B f01fad2a4cead94f4c422f4f2906bb26c9c960f4a85c07bb1cc900a058184fb2b0774251e93f3d92e105f9ff4675cf0c9035d4ffe0841c63d54e344bb0b0d149 SHA512 133dd51ec200866d1886a1c077dad4a1a7ec786d77b59e1da147a7e95a5b6e8c9f1ce41dfcfa35c406625ed4aa966891cc5247ef35d7a82791d9b42c91fc7477
diff --git a/sci-physics/cernlib/cernlib-2006-r7.ebuild b/sci-physics/cernlib/cernlib-2006-r7.ebuild
index ddc16413da29..216c3fda914a 100644
--- a/sci-physics/cernlib/cernlib-2006-r7.ebuild
+++ b/sci-physics/cernlib/cernlib-2006-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,8 @@ KEYWORDS="~amd64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
 RDEPEND="
 	x11-libs/motif:0
 	virtual/lapack
-	dev-lang/cfortran"
+	dev-lang/cfortran
+	net-libs/libnsl"
 DEPEND="${RDEPEND}
 	x11-misc/imake
 	x11-misc/makedepend
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index c1f67c5c42ad..639be4d4508a 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -10,6 +10,6 @@ DIST root_v6.14.06.source.tar.gz 162462837 BLAKE2B a6904b67d1f5964768fa884bd2b5c
 DIST root_v6.14.08.source.tar.gz 162474562 BLAKE2B f8bfdabb4d91bbdfbab0b17626fff1f8aa265292996d857025cbd1543306f3ec540a1afb080788bfc7149ea835932b59d7c54dcd802354e31294ba2e5e9d2366 SHA512 827e39efbf3c69429a0a256127ca9f87550d9084c34c715bddccbf87a8c111c367b9a0ac6882aac747c9b48f4a3effb3747b4df567429910c93ee64dfe35df5b
 EBUILD root-6.12.06-r8.ebuild 7960 BLAKE2B 78811e6ccd29c98f1fba08a64c7bdd7f5497ff22da7fd264cceb2008fc6adaa39ef3be219843b22861b8dec1657c6496f34e2cd74d68edebdb67df714fc41060 SHA512 69c96c970a26957618db2759e15099892367f5411d3ab1db2f88743cf144445c4f8dabd51cfedc2a164fdacae86fcccbb507079a5d7ec375fa3647a3cbe014ce
 EBUILD root-6.14.06-r2.ebuild 8196 BLAKE2B b686e1e20afb4528e8df24040f86cf2260d9d2e0b9adfbe495fe6eb70248b6ce9bf8612d762c2ace2f198dbde4fcf2f7907f39510ebd91582f7892db7b1b04b0 SHA512 712ef6de41924d93bca6642f4b9bc1d0efa6bb7d82c204a7be516b2b9d27427cafe3f4e0e85f97fa5fa5b8941234abb7de0260878577e4528dce5b2025b723fb
-EBUILD root-6.14.08-r1.ebuild 8203 BLAKE2B b619185ed606ef71bef54b16b61c139eeb0dd30c5612ed2303e3298b2aaf65b853b0bcea484f86c9d35906de31936021aa04a07b27b8e269f8eb5698d47d5000 SHA512 279c54b6bae5f5d6f3463bf97fbb00a6f5208b23e29f81d3ba2fb3058d6bc4d775ae14805607876c806afa66cdfb8bf4519014f57b5ced34ebd77ca215ee3f76
+EBUILD root-6.14.08-r1.ebuild 8322 BLAKE2B f2007da7527df847d1dcbc0b313349f6d5832086367d8723d81d6fd42cf22109c125d3827967f7837af0bb3b6fe45ba889456ba2afe0303f5dcf9f3aebc5d7fa SHA512 5168e8c5ed63dcab7cd058c4d1c7ceed3bbf062aa15cece2f7ca89ba1c860cb78cbaffcea68e36e7c480452b995ee3b98a9b007f8dcb73cda56d6ce5b3d55f4e
 EBUILD root-9999.ebuild 8307 BLAKE2B 1932ca3501767e729fab5658681c75d75ea7b839fda2f43777f5ff76d9cfbdd589793378cda3119f5e1457d48ffe42d116d628ccc36148c270b67e56af407068 SHA512 b6ee00de46d9ced77e54182b750810bd7548de48ce8aa63f4a898b5df7604fe06685cfc7015b2a61556ae1c8284f93ccd5492559285ef232b14881ac9c461aa5
 MISC metadata.xml 3079 BLAKE2B a67a71c5dcde9c3d05420b7edefeee32a8e623e10d03f75169a02044377106641ed6dc96c65aa71f42c94c4b29777c0267e9163870cbb392e1dc7715b8ccc542 SHA512 24bb9b7d0d0263f363639f4861a071bfb7f1bdd5e15ec4b166c44114b25343edb008f7ac896dd899cbcdd068abd762aa84924a6e50384ee214de28beb08cfd2a
diff --git a/sci-physics/root/root-6.14.08-r1.ebuild b/sci-physics/root/root-6.14.08-r1.ebuild
index 303a28a35928..591ae2768d3a 100644
--- a/sci-physics/root/root-6.14.08-r1.ebuild
+++ b/sci-physics/root/root-6.14.08-r1.ebuild
@@ -134,6 +134,8 @@ src_prepare() {
 
 	# CSS should use local images
 	sed -i -e 's,http://.*/,,' etc/html/ROOT.css || die "html sed failed"
+
+	hprefixify core/clingutils/CMakeLists.txt
 }
 
 # Note: ROOT uses bundled clang because it is patched and API-incompatible
@@ -318,6 +320,9 @@ src_install() {
 		rm -r tmva || die
 	fi
 
+	# Environment variables are managed by env.d.
+	rm -f bin/*.{c,}sh || die
+
 	# clean up unnecessary files from installation
 	rm -r emacs test || die
 }