gentoo resync : 10.11.2017

4 files changed, 15 insertions, 6 deletions

diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 2ef43a472ddd..753434a58791 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -18,7 +18,7 @@ EBUILD glpk-4.55.ebuild 1347 SHA256 415f803488ceb9104ead4ffab284ca88e4974d26893d
 EBUILD glpk-4.57.ebuild 1315 SHA256 d590b71c771b07944a1c583b817c471b420d7a4c14296ca7aef9e7e389ccfe8e SHA512 bbf6657723a9acedfdcbdf4aacffdc0c10e04274bcb2405ea8cd4e16c5a17d1aa0a8c8cb29d24c17c47d805078ab54ba06595626ec8d1e1c7b1d91d1155f2231 WHIRLPOOL 743ad16be80dd8062ec7028deca813a57a7a196b9410057e44b08f6124c15a1c9af7c223bcd0096e739e45c7bb88d15137561fd142f0f1faf81a5dce9e555f99
 EBUILD glpk-4.60.ebuild 1321 SHA256 b671f9c496dd2727e07944624fec3869b50a31f8ebe51406f62c88c1bc3047c0 SHA512 d08285cad862a073fbaf8e5c33ce3220cd0dd0ac77f9b5d509d44ce83b26220727adf2251e190bd3cd0d59c8112e6d331c25e75b6e12947643b2366297fba2c4 WHIRLPOOL 8001fab2cdd16f1ea91bf2780a0f26a1a21c979ae8e638f27626969e1f6a78eb8185b60d58e98a086802de6f287cf6cda97f5fa7a2ca3b005d06b8af650f9918
 EBUILD glpk-4.61-r1.ebuild 1371 SHA256 840d75670251e229e2cc2338fbf3f6bdc8b5b107f068a13ccf62d4c53d094fa3 SHA512 0b5ff8d0c16d053fbe5cb9a98ac87207f433b7e9fae4ce3d80083a423e01ba8396080c42ffee55f64ab1c16d22bed37a3baf19d08975959c2232650fedffd74f WHIRLPOOL d732ed51b6ee155f8ff09a381f543d196933f53fec854226b6f4cdb8cbd8c9fd4b832e4e2b2d1ed2d01dc1f9f2976ae42f595dad973a311ce8cadc1c1d445053
-EBUILD glpk-4.63.ebuild 1370 SHA256 bcd793cff796457548531b2be38700fb1769627eb842d2ce08775bba687824d7 SHA512 e3cdcbe9d82c397ccbbfaf47daf4b826a4d373ef33b84486417a072c3f6a0e0e6ba3f5fba4b0f659d46abab78c6c5771bb7adf893432b6c31ec0132c4bcc2289 WHIRLPOOL 36555628f5a5090e287a7196a3b1c2206e81931081065971827ff410af18a7f3d9145af173ae955a684dcaad69afbf772f2596542b238f6ee2e195bec1942436
+EBUILD glpk-4.63.ebuild 1369 SHA256 e8fc699276f0b42b0b00a8f12c7f2869677d6dbf59a45008c5385b421ecf3d02 SHA512 7ff3d5aae158822491e37d24ef13bef6f569132d712ce2b978e4743d3bb3c3e43b8be0f07dcc1c9b71c5dfc8cdeedbb49279e8cac06b85fd25354fbd26a87b8c WHIRLPOOL 90a4bd9b7e7f2938476d157052a389b96a49d9b8e63fcbe0216f7622300d734aa88eae602f505a2d40ff3c5545c9876b87e7c621cf65bda8b7f606d8a7a2bfee
 MISC ChangeLog 3630 SHA256 0586aff273680ef8e4ce18d2cfe4b3b60bd841a2b56ff0b6dfcc3b6e415d383c SHA512 15259fb0e755e64b2ad33ba3d7cadab1b954f431917f847a65c41e412178d2f242b0bb6cbc1ebfa82afa62dc1f2b406d42889c3044c7fc881e758f215d8f5309 WHIRLPOOL 89ac2cc3a83229329e700e391751ff8cfdbf8dfe17bc30792ae0b3c7b6a0e1734ce6aaf0925819c6b29c7abdca560c168220cf2dfdd12f2aea702429d94ada78
 MISC ChangeLog-2015 10948 SHA256 581cb219e0a74c9d0f03c4396beea266cc37cc1daadba7b65b89bab09a7f4640 SHA512 5b57eab22f60815e27ee9fafd98e3c1481ca0ebfda35558c911c827768da7f2525d817a62f636e94fc3d4d62f4f5ff3dc09f3fdb1db2683beca987048e32437d WHIRLPOOL f216f24b75ede3ad5adb05d2595ba0c31dff38adea1d6c7506984e057273bab52fb29fbaff2128ae84b1abcc18ada4f2a2dbbb1e92112d396a9bd7022aee486e
 MISC metadata.xml 668 SHA256 8cbcca21a5696013e042f16c2983b1318d69fe0793c7091816ae6008a3f08c48 SHA512 0c37b2854097a14a58070b1651ccdcdfae652e7d2b5afd62c617e22fa0256acee07aab0409f6621382151e1fb5e605002a3a809113693b2078054a4b16e72452 WHIRLPOOL ec80a813ef0e6d90c3fe4eeb54e4869b9edc248ff06d91812859d8c145e9beaf1d9eb16cc7dc19a400951dd425e3d746e476df8deb2b6c008aebe13034b79db9
diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild
index 73e2f18581cf..7e40891d6473 100644
--- a/sci-mathematics/glpk/glpk-4.63.ebuild
+++ b/sci-mathematics/glpk/glpk-4.63.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 SLOT="0/40"
 IUSE="doc examples gmp odbc mysql static-libs"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="
 	sci-libs/amd:0=
diff --git a/sci-mathematics/why3-for-spark/Manifest b/sci-mathematics/why3-for-spark/Manifest
index 75815e00d3f5..3bc4c233aa76 100644
--- a/sci-mathematics/why3-for-spark/Manifest
+++ b/sci-mathematics/why3-for-spark/Manifest
@@ -1,4 +1,4 @@
 AUX why3-for-spark-2017-gentoo.patch 1300 SHA256 d96d6043d0c4e103ea7a35bf98daa40ef05417e94833fe6d07524a27d7af66ee SHA512 7ec992b1d0f0f285903b69876b853a8d368c73f4ed3dfccc25f5ae18e72e0c6f71ce9b81e18f2a685d19a7bfa8e69571cb71d4faa5ec67e0fbf2231202c2ea3d WHIRLPOOL 87256925a66ce0f4829fca043657c4804f0293493770904c2492174107a764a0a06ff73b87e2ded72334222cc9def467e50e45e59eea43cd9b7f2539b956dbdc
 DIST why3-for-spark-gpl-2017-src.tar.gz 9248235 SHA256 7e7aee3912421847c416bc1f066ac342e811601c29d7b69e98e789a59a724d8e SHA512 8f444402f6c1744cd7c565117732935791b1ae7996a94314c40a66d125eae8a81f2257314246c94fd29d3cd16abcff6a50a152a1191a4aae39a2c8a8d7c3b9e1 WHIRLPOOL 256648567b3a220f762c7e30d0f90265fd10af21b66c3607b9072e81444b0a33dc971126232e11f3edc64eac2598fbd3ad428d063f2c9db8d247be2abe5be904
-EBUILD why3-for-spark-2017.ebuild 1641 SHA256 47738b095e90645f913d9d55dac2272791ce3bc2a3e0cce327db90ccac71b367 SHA512 0c5940ecbb09fc3ea379ead9eec3bd6ae9ef080323dde2367c0094315425671d38c8b5bb876e7821aa35f6bc2d66535515255083a881f4c17ea020ab773f1c04 WHIRLPOOL 57e332eb27aab292001082a5fad688f7a83b2d37d5b27c1dfa4b433badd1e09dc8f17dd7cd5261fb5c826578aa3dca02587a95afa8bc2063b00e8e67e7715f83
+EBUILD why3-for-spark-2017.ebuild 1936 SHA256 d2314f24b38e9b3677ef7d6298ebf76ec93e3bd97fb3cefa7d3e5916b6112556 SHA512 b92abe2231e661b256d8b6607458d01ebac30236f723e472f88adcacee917feb8d56d129328ec0875fca52778dfaeaecab62d73443c8de37012b18aef5a38aed WHIRLPOOL affa6f454df4764fe880b9186084fb81f6509a3712503ffd68aaec1164b129c63bab7c82998be8ad43146b3d771a7771bd2cdc3ec94b5d9ec27fa3308cbca652
 MISC metadata.xml 1363 SHA256 013b66bd8ddb397a162291f83ed6744ea78521b89ed4014f67ad7f794aa2a3d5 SHA512 ee8323cc37fdea800e355fc14ba67cac66c3ec3c41528d481a7e938b1d3e23859bdddfb06d3b6653725cdcfcc0d07e66ba1d3cc80b3637a781db7bab5f7dc677 WHIRLPOOL f0804ec3311720be99db48f0839ee7269a4aba8ea6c07ea8abb69591c281fca7719b565694f47c43797debcafe65d19005674a1e53e13a8c9701257f50333bf8
diff --git a/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild b/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild
index 3fd441065140..1fa2034863d2 100644
--- a/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild
+++ b/sci-mathematics/why3-for-spark/why3-for-spark-2017.ebuild
@@ -15,9 +15,9 @@ SRC_URI="http://mirrors.cdn.adacore.com/art/591c45e2c7a447af2deed055
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="coq doc emacs gtk html hypothesis-selection profiling zarith zip"
+IUSE="coq doc emacs gtk html hypothesis-selection +ocamlopt profiling zarith zip"
 
-DEPEND=">=dev-lang/ocaml-4.02.3
+DEPEND=">=dev-lang/ocaml-4.02.3[ocamlopt?]
 	dev-ml/menhir
 	coq? ( sci-mathematics/coq )
 	doc? ( dev-tex/rubber )
@@ -26,7 +26,7 @@ DEPEND=">=dev-lang/ocaml-4.02.3
 	html? ( dev-tex/hevea )
 	hypothesis-selection? ( dev-ml/ocamlgraph )
 	zarith? ( dev-ml/zarith )
-	zip? ( dev-ml/camlzip )"
+	zip? ( >=dev-ml/camlzip-1.07 )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MYP}
@@ -55,6 +55,7 @@ src_configure() {
 		$(use_enable gtk ide) \
 		$(use_enable html html-doc) \
 		$(use_enable hypothesis-selection) \
+		$(use_enable ocamlopt native-code) \
 		$(use_enable profiling) \
 		$(use_enable zarith) \
 		$(use_enable zip)
@@ -62,11 +63,19 @@ src_configure() {
 
 src_compile() {
 	default
+	if use ocamlopt; then
+		emake byte
+	else
+		# If using bytecode we dont want to strip the binary as it would remove
+		# the bytecode and only leave ocamlrun...
+		export STRIP_MASK="*/bin/*"
+	fi
 	use doc && emake doc
 }
 
 src_install() {
 	default
+	emake DESTDIR="${D}" install-lib
 	emake DESTDIR="${D}" install_spark2014_dev
 	docompress -x /usr/share/doc/${PF}/examples
 	dodoc -r examples