gentoo resync : 15.09.2018

6 files changed, 95 insertions, 5 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index ef6d5cdd7793..9d7796d560dc 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index a03fbc0a127c..c26bec88f2aa 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -4,9 +4,12 @@ DIST CGAL-4.10-doc_html.tar.xz 27147028 BLAKE2B ccdb77a497c2aef3004c3adfd81bf8f7
 DIST CGAL-4.10.tar.xz 14249804 BLAKE2B 4715449bebc45fe9270b4a336af964eda4c1a603a9a63b3f3b6922253e18f205e27d5d14dea7ae90ece4184c8b3bafb0ff2963311da7a95ab6d21d8961679ac1 SHA512 2029ad647e73692bb38b2ed9606aae61ec1d74df886bb6fd0f4e3388fb08a51de87a1e290df0dcc621a8abc2654915e2d331ec9f6d27ddd9a21f187a165fa09d
 DIST CGAL-4.11.1-doc_html.tar.xz 30575368 BLAKE2B 088cedcde628520625a4494b261e3ae963b8f3688ce4c1117e70f925ff86d11606482d3ce04415d6f03d07a52dfbf041ee315a0e627eb2d7944d08223b51077c SHA512 b16ad29a2981fc72902cc2c850a02c0412eb2f09f5ec864d85c92230ffe1f996c45ae2558b472b0b239d6c7718ccc6da6d65e52b5a7b33d1b406eda4aad0bca5
 DIST CGAL-4.11.1.tar.xz 14650588 BLAKE2B 08a7a61d92fc5293eef194d4bb1a42c69cacd8bbc3ee3c1e803435d0d7e2c3cf6533ce5a8f40fb4bf4e6b2ba34ec2c74abd2c2cbdbddbb874caa75b7d80624ba SHA512 0687ddd52e7a7d5e437a57c06d6c1ad7b325a7d0055fc48ba11be6fbc3e4003e2b28a35a9caac0c69af4c73d7d85553502e777714fa56c64580131b04dbe563e
+DIST CGAL-4.11.3-doc_html.tar.xz 30576756 BLAKE2B 6d32f3bca1c5aee4ed09eb96a35113a8a71bf14679e204683268ccee56f4a4799ef696bebd5ec0fd6add964e23273efc87167c122a5dc781c9cc7b2f5b938c29 SHA512 a729bea11a9b853a8197cc7ebb089005f98868e393e91142946d45a485e2e9ac9eacce1b230d91240080033b5c31bfd0195820ee5ae7f621bdd75f1abf19244f
+DIST CGAL-4.11.3.tar.xz 14657412 BLAKE2B a10457d255fcdd822f90419ff6af5389c50e88b254ed7f37471e24bb8523732b5aa6bd1ee5e67f14fcf0d8e79abf86e798ddeb3e0ce965dc2cde5667377bf5e0 SHA512 44cdd5fb313841d208ffeb9a96aa8db5111defd581b749c80f655390b5468f7c18b61df0ac2bdeb5259507341cc451fcd8cd50f7ff0571efdcb76eb920f92f7e
 DIST cgal-4.9-doc_html-1.tar.xz 26612436 BLAKE2B 17ea9c6e7bd9c981c0b8282b4e4dd3606e1939902c131947e05eccd1760d743740bc9bc385052954c3e60a49a7d5f1d961b4f954892d172095e3a2cf86e8887e SHA512 df9855ff2b152a32dfb584c68b861e2cd480c073cd8cfddc494295455aff8d96e00ba6424b7a7f460e2f9e8db0fcefe858a656f4834821dd5466f61eb3d555b2
 DIST cgal-4.9.tar.xz 13749292 BLAKE2B fc6f44dec7c4cfd6ec13911cd668f0c6df7e73cd85540678f43c95b6fd9130449ca2597222e6b668b05072194302b95d63ff775ca82380aedc4fb8c439967c5b SHA512 6f55e061917869dea1083e6fccac132a5232c2de4c01d0ed052bbb31789a23cc66334f12a884ed1e8a1b84af0e2a7186000964dd12e4b41914ee7fd5e36baca8
 EBUILD cgal-4.10.ebuild 1996 BLAKE2B d94c7a8c9fc7e6b2ad4bc0f76d73a53e42dbac4a4a79b5d56ce921333793a505706bfa87da685819944b5d9ac1ff28a2cf0a12b8b7943fbdc7b1216c80e9a565 SHA512 af69e87c18b6d000f224402e609c729051b1d05d864d759c0e7e5a2550c9ff2f5cd15e899bbd475879a86fb10bef41a33f149dd50615337a9ff9fcd73937bed5
 EBUILD cgal-4.11.1.ebuild 1854 BLAKE2B ec5b8ef250df2b34c97cd4fa3c6dfa5a46a866ecd4bfadae6c29b3a76f251c20d66bdb20784310059a88791d00112926799c1bdd6cac823e63f5eef3806ad8fd SHA512 39aaabec4f5bb9ff66bba690ff870bbbcdb96b42a2032bbbc8b4ec6f8c316ee3ab5fae4d322c0cee1b72a1332ca0e926fdebede07156e46e139fbc4bd747fe03
+EBUILD cgal-4.11.3.ebuild 1853 BLAKE2B 87f50aca9142bc66d16749277ef15fe762b6ff64db1b2b39968ad681ad1c19be278f04372a7a5008ceaec5b60400a8ae557c9b7398f5ac9d62abcedf93f94ab1 SHA512 8673e8b9a2c6686e2fa15ada1c1a3d57682474b11438e1ba84108a825483f9713ffa2f84de934ecb9ec6b67ab3184cfcb8b0c2697eb8baaf3ed09d008f5be898
 EBUILD cgal-4.9.ebuild 1920 BLAKE2B dadff73dac32bc6b2aab830495446de6d05d0ccaff9e554a70075a283e38cb468c7f2539173f5b5921951e76bb112c28b3a5f448907c223044d7e6887933b80c SHA512 19e6e2a617a8c9c4fbd5ab4f832c14f5c5ca6ce600f34e3aa6dc8f73aa98c0b3e0b64667a5f29d552c974f164e71c500ee1c3f14c781e659a5fdfae6615c6f03
 MISC metadata.xml 1320 BLAKE2B 783149a7fc48a50a58319ff81790908eb6294bf1fae99fcf8cffd6249ef1c60c1a87f3d818352f70b36790d2fd9ffb0daa9b16d918625a27f82b843579228fd1 SHA512 ee385a11e84af08f5c8146da067d27beceea4f15b2ede403ed799dc7766a4f749904356f22175eceb121555d6a40f3994381f6a1f8d2a90178962b65cf2a40d0
diff --git a/sci-mathematics/cgal/cgal-4.11.3.ebuild b/sci-mathematics/cgal/cgal-4.11.3.ebuild
new file mode 100644
index 000000000000..5227111e2e8f
--- /dev/null
+++ b/sci-mathematics/cgal/cgal-4.11.3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+MY_P=CGAL-${PV}
+
+DESCRIPTION="C++ library for geometric algorithms and data structures"
+HOMEPAGE="https://www.cgal.org/"
+SRC_URI="
+	https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}.tar.xz
+	doc? ( https://github.com/CGAL/cgal/releases/download/releases%2F${MY_P}/${MY_P}-doc_html.tar.xz )"
+
+LICENSE="LGPL-3 GPL-3 Boost-1.0"
+SLOT="0/13"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples +gmp mpfi ntl qt5"
+
+RDEPEND="
+	dev-cpp/eigen
+	dev-libs/boost:=[threads]
+	dev-libs/mpfr:0=
+	sys-libs/zlib:=
+	x11-libs/libX11:=
+	virtual/glu:=
+	virtual/opengl:=
+	gmp? ( dev-libs/gmp:=[cxx] )
+	mpfi? ( sci-libs/mpfi )
+	ntl? ( dev-libs/ntl )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.11.1-fix-buildsystem.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# modules provided by dev-util/cmake and dev-cpp/eigen
+	rm cmake/modules/Find{Eigen3,GLEW,OpenGL}.cmake || die
+	sed -e '/install(FILES AUTHORS/d' \
+		-i CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCGAL_INSTALL_LIB_DIR="$(get_libdir)"
+		-DCGAL_INSTALL_CMAKE_DIR="$(get_libdir)/cmake/CGAL"
+		-DWITH_LEDA=OFF
+		-DWITH_Eigen3=ON
+		-DWITH_ZLIB=ON
+		-DWITH_GMP="$(usex gmp)"
+		-DWITH_GMPXX="$(usex gmp)"
+		-DWITH_MPFI="$(usex mpfi)"
+		-DWITH_NTL="$(usex ntl)"
+		-DWITH_CGAL_Qt5="$(usex qt5)"
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	use doc && local HTML_DOCS=( "${WORKDIR}"/doc_html/. )
+	cmake-utils_src_install
+	if use examples; then
+		dodoc -r examples demo
+		docompress -x /usr/share/doc/${PF}/{examples,demo}
+	fi
+}
diff --git a/sci-mathematics/octave/Manifest b/sci-mathematics/octave/Manifest
index 78be73a5e22a..83eb4f7eb198 100644
--- a/sci-mathematics/octave/Manifest
+++ b/sci-mathematics/octave/Manifest
@@ -7,11 +7,11 @@ AUX octave-4.2.2-fix-qscintilla-detection.patch 452 BLAKE2B bed48bf923cbfba50c50
 AUX octave-4.2.2-imagemagick-configure.patch 873 BLAKE2B 9de92c88f83c56d521f83df7672e71bc9398ad782004339c737d2991d85154cc1cf2c3d5fe912892c87b18f51af6b11d4b8fadcc5ed058b76cfa604b93aaa720 SHA512 582df053f6c14790461408a180ce66589bd6501e3f9ecdc126b2cf12e8044198dff6eb66904b7704f87cba46adaabbac3126e46c61e406debe8cca49b935f93d
 AUX octave-4.2.2-ncurses-pkgconfig.patch 1034 BLAKE2B 244a96ab7cfd47203e7d23774c52f54e105f209edf79c869e6ce253a9cec7a3373a8dd0c98196ba3271f9b2b066ad3de3784151072055f2319ebbb4d1b68a475 SHA512 d2d6fe57a11f0493f86378bc4e1fc71378ae6d1878d17a367b77aa16a29880e37134e61343ba081f7ab2c4d127d93611491bef1320d6cd202eff0d78681cd4cc
 AUX octave-4.4.0-imagemagick-configure.patch 862 BLAKE2B 46e5b0ab1f7e2fd261b012bebc7a21789df102f0467e93c72c02a0615dc05fce4def0dc26aabdd0d10922e51f53b93f57d15b71a983b0ebcb3c23a900f692c49 SHA512 17fe3cfdcfdde0caaedf7983f46f286cc7c66b39b7f696527cb8d217af7d9d63a4de26f798afb8a189b351c509c958ecfbab925f927449f97ae763fed750cd51
-AUX octave-4.4.0-imagemagick.patch 778 BLAKE2B 5f71ce6bc7ed9bc84f78f2bcb35d67232f0c550349f0212f653f49e837d7e28e3e87a0f47aca9629f9523c6972088d801270fe3d8e0c5bd487eac3db9cdb6b29 SHA512 dd111e621347c22de02829351fa6af4ea30e60ec5b3455a6bccce5e7794be93817651e607c81649f80511c7c1cc1a6a29ee27669af0660094a7f6ccdfdb8115d
+AUX octave-4.4.0-imagemagick.patch 850 BLAKE2B d6779333b449150299608f07d3d8a2fbce2dea1c9db7f1e04f9407ab570216e323795aeaa2964b32747f33e49d707fbea069e7dd4a438440eee4731771707125 SHA512 94d9743e2029f46e842a73ebb6315f85c5f6b0a71b797a0e43ac0f81abeccd8683d2cb84f858730c3ce40b3130012d659f571d4111f949494f6dd6bba7619477
 AUX octave-4.4.0-qt-5.11.patch 346 BLAKE2B 0e9d5a2701ca789abaf9b396e5716226ce786fe259ae84ab8cbdeeff80dcf871945e1eec5260c14525744559ee8258e96ca5e8543ab21cff27ac21723078435f SHA512 48fbd44cf0af2ecc391c18a4fdd5e0f6682998f5ab5aadf5b2f1740504b4bd40fa24c08449c4ee50d47d0307748ff7fd5a23870e6b643658583260de8b338130
 AUX octave-4.4.0-texi.patch 570 BLAKE2B 83863f20e995eb4512944d6766b09a648b0d00b434f98f25db214ef6b3bcfa504d316dad984e7330ed51d972e5caec69c42797f703595a39d6acab7128270313 SHA512 e2d0390e586e001182a31a840ed6a93b4fb6ce0dd581f64460dcf3947783dd4755a8bd277f4babb6328f04cf653f02ac681952610d7eb70165936a9d79998c3f
 DIST octave-4.2.2.tar.gz 25624087 BLAKE2B c46de90d9a985c2b6b4f87b94b56f2ba4fb648ca0a0aff1f64e9b9d27a6d791e8657c2bff0c4daa3de5ac3622c23b34724e740ec1fe0f1a71d8f416c9f58d88a SHA512 b94edd79adc0e19229bb654037910201b51b6cfa373d63de5e3aa69e9b659b2e2790e2d2b4b5e8d2f12b26846c20ba5c12eae657155c8329e85e970f738d08c2
 DIST octave-4.4.0.tar.gz 29009355 BLAKE2B 3f7b4a6e1262cd0009f8649a570749acc2dc8b42aa1f88a6ce69b9c6bb99a95390f5a153c391a60ac118dc1e87f15596c7225764634c6076bb1ab3dfa4e09bcc SHA512 6a167a4a6a2f6ae70511f13b14feea0ce3efcc964227c93f3195adb3a1f1f28dda56f86a2e1c7c5e9f54891d2846fb96972092387e3da41f2e04cb700606ffc2
-EBUILD octave-4.2.2.ebuild 4977 BLAKE2B 7731031afe7718a0e3e4441be0ffe2813d7dd8087300fe994abde88a07692bfec4efc09b5dfe9aabd0c77d4d83a35a80588f1d6846d316986973e0c81e6f74a8 SHA512 220ff00f3399df1b10f38c7feae36af99bfd06e4a36a11d46d8f9a2286b67464ec0f5aa11fb1308d98431aa1c1884d5ab027f1fb2c4d1cb2bd4c0e9e4eda9167
+EBUILD octave-4.2.2.ebuild 5018 BLAKE2B 31a4044ed79454e35188ca546ff21cac7868d412f3f9c8fe4230b4afba4d1c440da651b497753e6331e1ea018aa6254a9ba2de7544df1daa39925a720cf6df1f SHA512 02f48228c6e4b96ce09c860b6eb4ca07939cf813e1036314f63bd8c4f15b3702c70d16bcda94dcb6557c9ec875aa00e704bc6bfcdc943b2445e2ed57155c4bd2
 EBUILD octave-4.4.0.ebuild 5092 BLAKE2B c78da0de6de2550d58131a36336d49d021ef203c42f3f1889913c01d1b0ee24af2c446bb30d6f56043c368d7ec3943d50637a939e65638bbd6ddba6030054614 SHA512 fc3e27c85ed9a5e54ce3acad53bd8d6122dace79b62cb02a155a4abe93c75209f883556761ed20ef78e6a64d8dc97c6c876b9f3a918898119db46cbef21d66dc
 MISC metadata.xml 1199 BLAKE2B f1daa0330bdc0362c68458ce6e7145118dd8a9d1a3bcbcc76c04ccdffe700c9d6f71b5e8b7f05b5ed0154352a213ce7b5177284919362585fedb0dbd8b68cbca SHA512 aebb1728f0ca59ba83b649eea72c267c530efc0b97b12f0d7958ba8de0f482fcb37245cf93bc188c9368686e0feafc44da4a7dd97d6bab8246309945fee8f7a4
diff --git a/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch b/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch
index 2f651e0995ee..2aa6e5b9d8c6 100644
--- a/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch
+++ b/sci-mathematics/octave/files/octave-4.4.0-imagemagick.patch
@@ -1,16 +1,22 @@
 --- a/libinterp/corefcn/__magick_read__.cc	2018-05-22 12:25:37.688173855 +0200
 +++ a/libinterp/corefcn/__magick_read__.cc.new	2018-05-22 12:32:51.475172200 +0200
-@@ -817,10 +817,11 @@
+@@ -817,10 +817,19 @@
        // depth is 8, there's a good chance that we will be limited.  It
        // is also the GraphicsMagick recommended setting and the default
        // for ImageMagick.
--      if (QuantumDepth < 16)
++#ifdef QuantumDepth
+       if (QuantumDepth < 16)
++#else
 +      using namespace Magick;
 +      if (MAGICKCORE_QUANTUM_DEPTH < 16)
++#endif
          warning_with_id ("Octave:GraphicsMagick-Quantum-Depth",
                           "your version of %s limits images to %d bits per pixel\n",
--                         MagickPackageName, QuantumDepth);
++#ifdef QuantumDepth
+                          MagickPackageName, QuantumDepth);
++#else
 +                         MagickPackageName, MAGICKCORE_QUANTUM_DEPTH);
++#endif
  
        initialized = true;
      }
diff --git a/sci-mathematics/octave/octave-4.2.2.ebuild b/sci-mathematics/octave/octave-4.2.2.ebuild
index da55163918a9..cf8556845539 100644
--- a/sci-mathematics/octave/octave-4.2.2.ebuild
+++ b/sci-mathematics/octave/octave-4.2.2.ebuild
@@ -92,6 +92,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-ncurses-pkgconfig.patch
 	"${FILESDIR}"/${PN}-4.2.0-zlib-underlinking.patch
 	"${FILESDIR}"/${P}-fix-qscintilla-detection.patch
+	"${FILESDIR}"/${PN}-4.4.0-qt-5.11.patch
 )
 
 src_prepare() {