gentoo resync : 09.03.2018

3 files changed, 7 insertions, 40 deletions

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
 }