gentoo resync : 20.12.2017

8 files changed, 38 insertions, 19 deletions

diff --git a/sci-physics/Manifest.gz b/sci-physics/Manifest.gz
index 3cc7d9eb7694..826ec57d9b4c 100644
--- a/sci-physics/Manifest.gz
+++ b/sci-physics/Manifest.gz
diff --git a/sci-physics/reduze/Manifest b/sci-physics/reduze/Manifest
index 8a7cd9c5f444..a1586d56805f 100644
--- a/sci-physics/reduze/Manifest
+++ b/sci-physics/reduze/Manifest
@@ -1,3 +1,4 @@
+AUX reduze-2.2-db.patch 815 BLAKE2B be6be6a6f84d63653dfcf04892421365d19ba53ea0e2ec8e81004d15bddb2df9d124601b780f2e02ec502a5734affb5a7dc88341931f83ef24c72c9d9811b245 SHA512 466414af3dcc00ba446b5790abf1eafbde622e9c4a744c2098e2dbd4bf4864656b2a1c3d9eb028c7889e6d9d998dbd3c7b5e64148375accee324466ae749f415
 DIST reduze-2.2.tar.gz 669858 BLAKE2B 52c48f5547055087dc2969fe5a7a42281519cf1d9a454a675ea54741f3d5912cd9b135816994241fa206585038d683ba5a3849308ff0403f1d3507ec9b77fe00 SHA512 ca4ed6f754fc75511b0916e8c2eea26a69e0e30c604a714af76995038a8e11dc3b129157bf1a170e639ea0fc39f9f5102bba4ad503874f044ac91855d9a95dab
-EBUILD reduze-2.2.ebuild 1388 BLAKE2B 951573debfeccf3127ff5b09458ae3dc382c0bcfddbd24b4819f6512f5d27f861f20a3553f7fa0654ae57083b05286af914c5d381412569421a2977e113e73c0 SHA512 1f2671b506d310ca59511886da84a7af5c6986ab0f344910d771435a75c8f7d9bec9febb4e247c5f2ca1c4792abac499aa1ca48477aa83624fafe079b1ebe0e7
+EBUILD reduze-2.2.ebuild 1429 BLAKE2B becbc74d69a1b2ebb9127938475e206901fa951bb68d66ec67bcbd19d98d44cbcc92cf9bf0c0a7454806fbb07a56afc061ae24efe78d4853c72e27bfccd28106 SHA512 f33ec0ef4b50770b81f0ae43812c9965fb0dd4094e58af965d0b6abdef34e2c9c99adfd80c90c62a17c7b82b7aa7ea0db7b471ae3f235c6698cc7385c3189c8a
 MISC metadata.xml 454 BLAKE2B 556608e358992ff4d66aff76659eac5567df8479000b0a0843d811adc416e2195444e067cff91db1a66bb3c75720bf05c2320680db200d570eccf09d8fd3e245 SHA512 2c4ba8ba43848a07834cb7f31a474f7c236356ef228e87db2870a4d19c3d2edf29189fab25f05efe70c004a3fdb7c2fd065687b104fe33d1fd20626c6aea4372
diff --git a/sci-physics/reduze/files/reduze-2.2-db.patch b/sci-physics/reduze/files/reduze-2.2-db.patch
new file mode 100644
index 000000000000..671cd5565e0a
--- /dev/null
+++ b/sci-physics/reduze/files/reduze-2.2-db.patch
@@ -0,0 +1,15 @@
+diff -r -U2 reduze-2.2.orig/reduze/CMakeLists.txt reduze-2.2/reduze/CMakeLists.txt
+--- reduze-2.2.orig/reduze/CMakeLists.txt	2017-11-17 14:11:58.000000000 +0700
++++ reduze-2.2/reduze/CMakeLists.txt	2017-12-19 20:27:17.508528174 +0700
+@@ -84,9 +84,8 @@
+ 	message (STATUS "Building with Berkeley DB support")
+ 	find_path(DB_INCLUDE_PATH NAMES dbstl_common.h
+-	          PATHS /usr/local/include/db4 /usr/local/include
+-	                /usr/include/db4 /usr/include)
++	          PATHS /usr/include/db6.0)
+     # we also need db.h but just assume its in the same directory
+ 	find_library(DB_LIBRARY NAMES db_stl
+-	             PATHS /usr/lib /usr/local/lib)
++	             PATHS /usr/lib /usr/lib64)
+ 	if (NOT (DB_LIBRARY AND DB_INCLUDE_PATH))
+ 		message (FATAL_ERROR "Failed to find Berkeley DB or its STL interface"
diff --git a/sci-physics/reduze/reduze-2.2.ebuild b/sci-physics/reduze/reduze-2.2.ebuild
index 37b323c903b1..7e8241f3c736 100644
--- a/sci-physics/reduze/reduze-2.2.ebuild
+++ b/sci-physics/reduze/reduze-2.2.ebuild
@@ -22,6 +22,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
+PATCHES=( "${FILESDIR}"/${P}-db.patch )
+
 src_prepare() {
 	cmake-utils_src_prepare
 	# gentoo doc directory
diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest
index 08f4ec037fff..1a69424f990a 100644
--- a/sci-physics/root/Manifest
+++ b/sci-physics/root/Manifest
@@ -2,8 +2,8 @@ AUX proofd.confd 415 BLAKE2B ca38b3d9cf27cd3c4a57f595741abf40691a300585d35a6c1bf
 AUX proofd.initd 606 BLAKE2B 60c7ec90b68b8b1add38c81f7730859a8bc9528ac60ed41713309c3a4931af193cc9f90ab1265f8f174e5a73fbcbfc3855cc3fdb253ce2d09a75f4032efbb8c8 SHA512 de72ea4ea106ab6ec4cc892c2eaf1b17f85db3de9dbfe85d34678678268c943868e4698a1a046e51b5694f03109cb06484b90aea83cf2728229a065f35c3d165
 AUX root-5.28.00b-glibc212.patch 276 BLAKE2B 04ae90704b3d9186f85ef95e5a97d0864ea8f298ba81d7c854e3cc9c42791a2d5ac0f8b9a4110a1704f2880a5676949b7814f2148d237374b9af03faccfce22c SHA512 26138c8d14f319248d2b33395a57767c8d9bbf552244c2c55a7d6c0a1526de4c84313e020dc6c7483866cb3a927ba047d60f9b4dc8bd8291dd451a847b7e7379
 AUX root-5.32.00-afs.patch 1322 BLAKE2B a2b92d9a4a4ba19e7f7972ed7921d9909cb40beb97f487eb13f4904c9e73954642f79858ec0245ca3064dc2b114edb77eddfe8c3571828b68a491f277d3c15bd SHA512 4c021dadf266d58cc6ba3906ba3cd3ca2e2051f69266a7c3b32931ef8c0f40af2d79cb640aaf9c93b3302f9f17a3361683f616c18db2f25d86ca21d37f7b0bf8
-AUX root-5.32.00-cfitsio.patch 593 BLAKE2B 49b534feefd4d014362ec70914785d28f7664412038a79aa9cd9209ca5bb028e11615b749cd8bd0cddb9b01ba6a542a93f978e30710fca4eb4ce2172b7c9dde5 SHA512 1e9b1de637aeb667718e7e262615126626f951acefd2e1c4a3f53cfb13fb4dbde0186c301ffcc175cbab701825f340cffdb26cf741b244fba84cb8938ccb89e8
-AUX root-5.32.00-chklib64.patch 886 BLAKE2B ba0bf5399cf491814da58dc2d8a3a6ec07a5bd9b75669fcf37604eb3caf55670dd000d77424446512628aefebd42bd67a2d3be882640cdec07a1e40a814455ab SHA512 45a9776ca5110170099ea33dfe19a7b3a358734e3376aaf242202701df7e9d4f2d337962663c7d38c5ce189efdb1ad6b3c9382f2bb4a5ec2cf5bf9253985b067
+AUX root-5.32.00-cfitsio.patch 592 BLAKE2B c9f5c1efc61cec663fe1627fbaa4d312686b52e6dbddbf367219aac8ebbdff81a211895383b90bccec671a67366ca0aed2261f327cbf3e0a16e7ff022e9211e1 SHA512 d7a1b893968899fe54ad101d4622899e0be488446687692a4cbd3f4d008a03681a9f0c9f21318a47c572d3687196026abe7886ebc755f46194f4708702eb47c8
+AUX root-5.32.00-chklib64.patch 885 BLAKE2B 4ae23e3fae0fc82e01ecbdace05615ee9e18dad21dc14ce414a0a6431d75dbc01664ea25ffc32dc2c94fb912f39b581e00ca6ab06503dca78fc2d238d022d5f9 SHA512 82f6a895879ef808fb9d2bfbc04099b48bcdd52d0af1899f8925d8a9d69b39a5177e369a002f8d9f25a203053f3507a5b048c8cf96e73fbdabb534477bae5f93
 AUX root-5.32.00-dotfont.patch 2563 BLAKE2B 77ac953642b1093b5cc868746a6f76f13252665da0b52ad6e46065416fc579aa06b1ef1c00480a7885e2e2811e70bf65485cc11104e1db9bf63ae46c7bc09fff SHA512 332ffe0ac6d1249ef1643b6a1df77ef23c1af1c4547f248295c1ae9c284384446a84a374b2b117b1157e770ac65a404be1c4cc17a497c43e2c34bcbf51619441
 AUX root-5.34.05-nobyte-compile.patch 5504 BLAKE2B 052cc5ebd1fae7d439244ccf9f343a2161d383b9d68dce5548654f23751cc97ad20cd5be56c2049522641036a8c60a0a5cf49a528437b9a52a71d27e8a8cb774 SHA512 ef1405b2cd67393402ac365d66f7eb2846a62ff8a492649cbaf3bc004f5c98592c9b926458055912217ca7f755bcfa5d3b741f61e6648dfaf05fa2b62f62b27d
 AUX root-5.34.13-unuran.patch 1555 BLAKE2B b476c0f00dd0bfc1f6a6fc63957794cc932fc1e747b5900a0e4b5e2142b3a71b0fe3076591134b46df724b8f9ff5820064bc9cf1e1af4be2a77fb0414f28722c SHA512 571d6bd56d2419e4b96f7ca95d14d291768cc98024f871ca35bfae1a7d1e010a7c101f927c66ece4c006ca89401aeaea89945b8502f1ae2b2068f535d0bc95f3
@@ -18,5 +18,5 @@ AUX rootd.initd 622 BLAKE2B 7edeaf3cf550303642a89eb69edb65e6625215ac2daae5766904
 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
 EBUILD root-5.34.36.ebuild 12173 BLAKE2B 4829235ce5fae8b912afde7d28b619e98c9335cea9f614716f9222916734ef71b87df3d791f18337ddd477a854053ef690e4f4edfd43aeab7ba519686c2baa68 SHA512 52fee9354448cb8b471e28ff4ee2a552a975f36d9b6efc3af1b0e3e83a554dc406c502348ea49bbbbec82cf86cbeb9ed7d6df01645a31e4f5211c665abb27dfd
-EBUILD root-6.12.04-r1.ebuild 9915 BLAKE2B 0a5fa19d389f26fec7af03427c2bc7458daf7358b1ed8ed894dd0592f5aba4d8fc5b2182393692c2abf73ace6f80445fee058f6f430e81f5ae5eeef53ec09989 SHA512 f5eea751b2c20df1e0d0a70771c1e2194a39ca647a5508786c0fdaebd7c634f400cdd42ebb80d03547900f85626c19eee87f99ba36669c8790a8bd20f89b9cf0
+EBUILD root-6.12.04-r1.ebuild 9862 BLAKE2B eeeb35628db388ffe7cc9c06b5412229ab77ecacb63471c3af171c99c9753f94e49780d707f862035c6082fa99775443b95ba0d94602a2fdd1c0e6e3409cd732 SHA512 31423590930e9455aa6807ff4b7dbe9dee3aa017314297c679c10c8544a77e9e77f9819d3a5526e1df6913bae541cea45bfc557c45c868526fcac8d45c2b4e5d
 MISC metadata.xml 3238 BLAKE2B 0396ebafbf0bd14c88f7ba401f12f698ccca313c0c04cab46f9fa198681b0f305f21413bab8a86c97bb65e0bbe00eb6b6f488600402784109dc13ed196d6589b SHA512 2ba887003b3dc6dc3d4de379ec9dde8a7ba8144c2bbd7be50ebcfc7b3bfb3154733edd39007fcd8c380034d028a0d3f352e4cb973d8facd9412f38f820c16b1e
diff --git a/sci-physics/root/files/root-5.32.00-cfitsio.patch b/sci-physics/root/files/root-5.32.00-cfitsio.patch
index 853c3f39f207..156667f8fee4 100644
--- a/sci-physics/root/files/root-5.32.00-cfitsio.patch
+++ b/sci-physics/root/files/root-5.32.00-cfitsio.patch
@@ -1,5 +1,5 @@
---- configure.orig	2012-01-19 23:44:44.127607638 +0100
-+++ configure	2012-01-20 00:19:20.420652913 +0100
+--- a/configure	2012-01-19 23:44:44.127607638 +0100
++++ b/configure	2012-01-20 00:19:20.420652913 +0100
 @@ -3435,9 +3435,7 @@
      cfitsioinc=$found_hdr
      cfitsioincdir=$found_dir
diff --git a/sci-physics/root/files/root-5.32.00-chklib64.patch b/sci-physics/root/files/root-5.32.00-chklib64.patch
index 979220f02f35..23f20d54f0cc 100644
--- a/sci-physics/root/files/root-5.32.00-chklib64.patch
+++ b/sci-physics/root/files/root-5.32.00-chklib64.patch
@@ -1,6 +1,6 @@
 bug fix for #406817
---- configure.orig	2012-02-29 19:46:41.000000000 +0400
-+++ configure	2012-03-22 03:28:43.458968696 +0400
+--- a/configure	2012-02-29 19:46:41.000000000 +0400
++++ b/configure	2012-03-22 03:28:43.458968696 +0400
 @@ -441,14 +441,13 @@
          fi
      else
diff --git a/sci-physics/root/root-6.12.04-r1.ebuild b/sci-physics/root/root-6.12.04-r1.ebuild
index f428493ad11e..7bb076d35565 100644
--- a/sci-physics/root/root-6.12.04-r1.ebuild
+++ b/sci-physics/root/root-6.12.04-r1.ebuild
@@ -102,6 +102,18 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	xinetd? ( sys-apps/xinetd )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.28.00b-glibc212.patch
+	"${FILESDIR}"/${PN}-5.32.00-afs.patch
+	"${FILESDIR}"/${PN}-5.32.00-cfitsio.patch
+	"${FILESDIR}"/${PN}-5.32.00-chklib64.patch
+	"${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
+)
+
 pkg_setup() {
 	use fortran && fortran-2_pkg_setup
 	use python && python-single-r1_pkg_setup
@@ -122,17 +134,6 @@ pkg_setup() {
 src_prepare() {
 	cmake-utils_src_prepare
 
-	epatch \
-        "${FILESDIR}"/${PN}-5.28.00b-glibc212.patch \
-        "${FILESDIR}"/${PN}-5.32.00-afs.patch \
-        "${FILESDIR}"/${PN}-5.32.00-cfitsio.patch \
-        "${FILESDIR}"/${PN}-5.32.00-chklib64.patch \
-        "${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
-
 	# make sure we use system libs and headers
 	rm montecarlo/eg/inc/cfortran.h README/cfortran.doc || die
 	rm -r graf2d/asimage/src/libAfterImage || die