gentoo resync : 09.03.2018

8 files changed, 102 insertions, 45 deletions

diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 69675248dd6e..a070e3fb7e02 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/cgal/Manifest b/sci-mathematics/cgal/Manifest
index 08aaa34dd4f7..a03fbc0a127c 100644
--- a/sci-mathematics/cgal/Manifest
+++ b/sci-mathematics/cgal/Manifest
@@ -1,8 +1,12 @@
+AUX cgal-4.11.1-fix-buildsystem.patch 840 BLAKE2B e1179b2721e52b2edf305e2cb434a914f0b46b6aa694fd1766a8622b65ed8e8209a06bc134bfab97f07b789af45f74605fc7ed2b6c45ed5f5574a0a801c479dd SHA512 5e6315dfa64c58ea88d473b3513ec0817e6d212c325dd70b523d2dca2817fed2cdb0791686b7353c410e42ff8b1ee228a045bd6f002b591672066b33ce6f09ad
 AUX cgal-4.7-fix-buildsystem.patch 761 BLAKE2B 13897f474dee1a4129a0555179082a50cb12831cbc2226617aaa128b87fdcfabc2cc0e97fa65b39013e147dcbfa7e851c2453ee8d415389f4622a2dc2f55f728 SHA512 97d380e915561a8407f6daf681457d5cce1f5ae2f8e1af25b1bea21876d661941144d53c6d96f90c65b9377aece98d2c0b14450917f4b768644de51020fe2338
 DIST CGAL-4.10-doc_html.tar.xz 27147028 BLAKE2B ccdb77a497c2aef3004c3adfd81bf8f79a3322ed6cc071569d23666cf8ad00a94ce01f1bab21171eb461066e45a42c9c7003705d3d3d701879e7eb1e13af0eef SHA512 1c1c90c3ce07c5e4bf5a125cd5dccd0595f5c5d8fcf0f16df8a5506c6fe611c30440e034621c3477ae55670f96abbe389bfc2f3e0c88e099133b03cce6f2923d
 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.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.9.ebuild 1920 BLAKE2B dadff73dac32bc6b2aab830495446de6d05d0ccaff9e554a70075a283e38cb468c7f2539173f5b5921951e76bb112c28b3a5f448907c223044d7e6887933b80c SHA512 19e6e2a617a8c9c4fbd5ab4f832c14f5c5ca6ce600f34e3aa6dc8f73aa98c0b3e0b64667a5f29d552c974f164e71c500ee1c3f14c781e659a5fdfae6615c6f03
 MISC metadata.xml 1320 BLAKE2B 783149a7fc48a50a58319ff81790908eb6294bf1fae99fcf8cffd6249ef1c60c1a87f3d818352f70b36790d2fd9ffb0daa9b16d918625a27f82b843579228fd1 SHA512 ee385a11e84af08f5c8146da067d27beceea4f15b2ede403ed799dc7766a4f749904356f22175eceb121555d6a40f3994381f6a1f8d2a90178962b65cf2a40d0
diff --git a/sci-mathematics/cgal/cgal-4.11.1.ebuild b/sci-mathematics/cgal/cgal-4.11.1.ebuild
new file mode 100644
index 000000000000..97da0b221e6d
--- /dev/null
+++ b/sci-mathematics/cgal/cgal-4.11.1.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-3.1
+	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"
+		-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/cgal/files/cgal-4.11.1-fix-buildsystem.patch b/sci-mathematics/cgal/files/cgal-4.11.1-fix-buildsystem.patch
new file mode 100644
index 000000000000..e6c9cd984d67
--- /dev/null
+++ b/sci-mathematics/cgal/files/cgal-4.11.1-fix-buildsystem.patch
@@ -0,0 +1,15 @@
+diff -urEbwB CGAL-4.11.1/cmake/modules/CGAL_SetupFlags.cmake CGAL-4.11.1.new/cmake/modules/CGAL_SetupFlags.cmake
+--- CGAL-4.11.1/cmake/modules/CGAL_SetupFlags.cmake	2018-02-24 21:00:36.000000000 +0100
++++ CGAL-4.11.1.new/cmake/modules/CGAL_SetupFlags.cmake	2018-03-05 12:13:47.233411449 +0100
+@@ -61,11 +61,6 @@
+   add_definitions(-DCGAL_TEST_SUITE)
+ endif()
+ 
+-if ( NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug"
+-     AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo" AND NOT "${CMAKE_BUILD_TYPE}" STREQUAL "MinSizeRel" )
+-  message( FATAL_ERROR "${CMAKE_BUILD_TYPE} is not a valid build type: only Release, Debug, RelWithDebInfo or MinSizeRel is allowed" )
+-endif()
+-
+ message( STATUS "Build type: ${CMAKE_BUILD_TYPE}" )
+ 
+ string( TOUPPER "${CMAKE_BUILD_TYPE}" CGAL_BUILD_TYPE_UPPER )
diff --git a/sci-mathematics/glpk/Manifest b/sci-mathematics/glpk/Manifest
index 07687aef77c9..e57d60a47dea 100644
--- a/sci-mathematics/glpk/Manifest
+++ b/sci-mathematics/glpk/Manifest
@@ -18,5 +18,5 @@ EBUILD glpk-4.55.ebuild 1347 BLAKE2B b21d4850cdc95157143185e8eba3286f55ed05bc486
 EBUILD glpk-4.57.ebuild 1315 BLAKE2B efce0212dc4fa8215b72719d9cc596ba68db18a931276d0564ba3a9aead69667fd2fcbb02eadeac87ff1a98d9c869d04f558d1e80cdeda223100b48cff38aed6 SHA512 bbf6657723a9acedfdcbdf4aacffdc0c10e04274bcb2405ea8cd4e16c5a17d1aa0a8c8cb29d24c17c47d805078ab54ba06595626ec8d1e1c7b1d91d1155f2231
 EBUILD glpk-4.60.ebuild 1321 BLAKE2B 98ec6cc92bfae2d680c638dae089ef50374b1274867078eb136e4670e5b75023fb4cb78e0d36c7f1ebf4919b2eb4e52561f90afe02c5e8428a060b0c470c2327 SHA512 d08285cad862a073fbaf8e5c33ce3220cd0dd0ac77f9b5d509d44ce83b26220727adf2251e190bd3cd0d59c8112e6d331c25e75b6e12947643b2366297fba2c4
 EBUILD glpk-4.61-r1.ebuild 1371 BLAKE2B 4fc9822c369d6dd4800b1aa6f9c47bcbc1176e2f0d61b1b6feac4c17fce9afa4d991208f88e64216455a3c2b27f5fe544bc8fa649af7ac3cb60f956f1d44aeb9 SHA512 0b5ff8d0c16d053fbe5cb9a98ac87207f433b7e9fae4ce3d80083a423e01ba8396080c42ffee55f64ab1c16d22bed37a3baf19d08975959c2232650fedffd74f
-EBUILD glpk-4.63.ebuild 1366 BLAKE2B d6dc4da4e642e3ed295e3ed1058bb8c80b06313a107f2112c830e5f75730ac1705dd0fa0d7c23edd0e5ae47737742df5c69298601ac29907c8734f45a91e18ec SHA512 c0c77a6cb3edf772dabfe4294e4ee49e0e6f070328db6b657a8185ee3fe62953e5ed7718513186ec5751f7106c22d1ea2d3e0effcf51619abeef35a376efd5bd
+EBUILD glpk-4.63.ebuild 1365 BLAKE2B a50ae71108ccd37f36580b75fc23cf3c654d306b455947ad90a750dd42715a8c44cc06652cf590af95e5576f6262afb4b37ca847cd392d2e06b1bca0aef1af81 SHA512 b67fbfc232d20a5d46935c5c343d0fb2bacb900358b2988ecb4c41511e64ae9cad7390e4ee3b9d109f61b0400f3c68b9221d44c64d9aae215f2f64cc1717ec84
 MISC metadata.xml 668 BLAKE2B 9dec50a5d6aa33f108651ed8fd891750fc8146eedf8df28abc0fa04a6db2f0d590073fe3606c658a99d56d283d7a24629503bbf11f6593ef1b90314d26a1ab69 SHA512 0c37b2854097a14a58070b1651ccdcdfae652e7d2b5afd62c617e22fa0256acee07aab0409f6621382151e1fb5e605002a3a809113693b2078054a4b16e72452
diff --git a/sci-mathematics/glpk/glpk-4.63.ebuild b/sci-mathematics/glpk/glpk-4.63.ebuild
index 1d50881a973b..0da9d80e7aec 100644
--- a/sci-mathematics/glpk/glpk-4.63.ebuild
+++ b/sci-mathematics/glpk/glpk-4.63.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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/octave-epstk/Manifest b/sci-mathematics/octave-epstk/Manifest
index e61216619122..7b3ad97b1fa7 100644
--- a/sci-mathematics/octave-epstk/Manifest
+++ b/sci-mathematics/octave-epstk/Manifest
@@ -1,7 +1,4 @@
-DIST octave-epstk_2.3-2.debian.tar.gz 10079 BLAKE2B dac7f138373a14bb51190dadeb4481c73b204756a1760242141459c011e59e14d705e2cc1b3f4de9a5a49ee034dffa898e1d217a90ea564556ecc71346d84d4f SHA512 076c374581df44d5b6ac9e0a7fd0a412adfda325fd28fbbf036a739d444332a75dea30a3e313f4df8ec54ceab60fea8206cf70837ae83407b17c5ff42e35563f
-DIST octave-epstk_2.3.orig.tar.bz2 1401307 BLAKE2B d2537046e2436e595ad7d86c783b095af51d3598faa9b97d22724e75fc8e009afe096bcf736145e90757088c9148c1d2dad1689bc06343d7789d0f1137bb5a48 SHA512 3b672e78636a1d339355d5f8340a0f35c3af443061e76de875a0f22fae5fa394b3373fb12770705a301dbccdd1ad577aec2934daa04e8f3d16f8133b77e9bbd7
 DIST octave-epstk_2.4-1.debian.tar.gz 10905 BLAKE2B 79290d650a3a9e485c2b45fabcf5aa6c68585656f5f1c81ac3412ea123986bb51ed18b7f093bcec954964e260907594d5fda0f28915ef951fe59c6d238092278 SHA512 93ce2bdb04b2be36bc73d2c13a1bdd909b30597a76bc80db0abb1b4f53467742086559ed1f5ce265cea70f84c9b33d07a514b4fc1c8afc46640d0031907e6dea
 DIST octave-epstk_2.4.orig.tar.bz2 1072111 BLAKE2B 25694cb80fe66efb15508f6654218a2fcfd66997258e590626caf4daeafdc68b92dba5c9b0066c25777af609606d9b6e15ebea45c8fabcca17c962a1d664172c SHA512 64de7c23e2a79f03a6aeaa9e8a73c6d95e59cf616fc601bd8c6ad18d3870b1c60752f95cdc174cc31b3095e8b6e3858111c7d72b3b6df8effee4393791282112
-EBUILD octave-epstk-2.3.ebuild 885 BLAKE2B 6e566560842828cfd9116a855c1136d3cd036750c73fb2f732789369757ca1d739df51316d46443fd7dd774fd056b74bf461ab782cfc67eddad585015d05b00d SHA512 7d55c2cc0eaed1747a571ca926e844a27f537bc469c0ba3e6968bf7c564a328891d95a4bb859abcdd7fc585d6a29937d80dfa38c05870f5ec09e94fb2fc8c9a8
 EBUILD octave-epstk-2.4.ebuild 871 BLAKE2B dbffdcfac3e8df62a095fbf54f764f73c7fdd357e5452481d44017157978f8a539af6a0939d97848c6856906ead60e23be5e1179e7e75d33f58c483461b97c08 SHA512 a84e188cc192d109733cc27ab92aa54dae4f0a5a184147f8397ff15d2b0391e7676018e29b7f82e896db7fb09e6bc27bc6fac26569a1dd5c20a64220915c3cef
 MISC metadata.xml 614 BLAKE2B 7e4e57a0aa9b57d55fe747609630d9ec2b037595f88ba1d3352a3702c85de6695c43035d75780189bc7293b581766b5305ff37c005de2843a6e9033000540d0c SHA512 d3ff3c6669d6fb6dac67df09c9eb7245e5cbf91d9bdd0d0ae47f66fcf3e11a2f769bdc9f934a35189792364a902518ae6d906963859eabfdc65579f6253e1061
diff --git a/sci-mathematics/octave-epstk/octave-epstk-2.3.ebuild b/sci-mathematics/octave-epstk/octave-epstk-2.3.ebuild
deleted file mode 100644
index f4c6f9a75dc9..000000000000
--- a/sci-mathematics/octave-epstk/octave-epstk-2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils
-
-DEB_PR=2
-DESCRIPTION="Graphical output functions for Matlab and Octave"
-HOMEPAGE="http://www.epstk.de/"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.bz2
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}-${DEB_PR}.debian.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~amd64"
-SLOT="0"
-IUSE="doc"
-
-RDEPEND="sci-mathematics/octave
-	app-text/ghostscript-gpl"
-DEPEND=""
-
-S="${WORKDIR}"
-
-src_prepare() {
-	local p
-	cd eps*
-	for p in $(cat "${WORKDIR}"/debian/patches/series); do
-		epatch "${WORKDIR}"/debian/patches/${p}
-	done
-}
-
-src_install () {
-	insinto /usr/share/octave/site/m/${PN}
-	doins eps*/m/* || die
-	use doc && dohtml -r eps*/doc/*
-	insinto /etc
-	doins debian/epstk.conf || die
-	dodoc debian/README.Debian debian/changelog
-}