gentoo resync : 15.09.2018

5 files changed, 23 insertions, 65 deletions

diff --git a/sci-libs/alglib/Manifest b/sci-libs/alglib/Manifest
index 0346de2888a4..07a491be3667 100644
--- a/sci-libs/alglib/Manifest
+++ b/sci-libs/alglib/Manifest
@@ -1,7 +1,5 @@
-AUX CMakeLists.txt 1076 BLAKE2B 8269169a16e2a1b56f976d47e5369c8c2106cad01f295875f788da928b6238feff0d4c956c55feb8ac57454b806442f0ee2429d08b5dec59d6444a0cfd7f4e5d SHA512 e5a10fe01c313863e23e9b61eef64e0b08232bf324d50ab6583bbb085cba5722c190bbdfca7bee485c65c8cd7e713300ced4a8feb2cdba0bee07244d5154de25
 AUX CMakeLists.txt-3.8.2 1159 BLAKE2B bd12bd65ddc7e60d1e84b04d5c01391420accf099f17801680446856e817bd606315ee54a44b0bd559fe0a9fce35dfab8b9dfa2dd7edc406d57563ea0f77999a SHA512 193661b9f949972048132bc07b4619c2f0d38135d6f0030621cd8aabf87e9e78a6bec18cdb4fb9cb9e547fee9f4387e21ba3a02d45c41033a9c0be9221cf7d3c
+AUX alglib-3.10.0-disable-minlm-test.patch 709 BLAKE2B 160bd6a598eb9c822b16da6455bae980cf6bfd77c9889c0d2385b896ec502030741c1f6a929f48a49c73fe35e696cf83b97d72a007e91899bd61d369b195b9e9 SHA512 00d62278a65f30d97dd7df8ac20d17dbc40117c25e2cef64652f2afd0bda7c277f8600ccfa7036da8a4a4173e0f0f433d898b87c04ab6d2d89e2547f8a305ee9
 DIST alglib-3.10.0.cpp.gpl.tgz 1991101 BLAKE2B 884b80becce676285b7bc1f26ed8917c4c82f53b41c0350dfc8bff6573e2e6f12183e82fc317b54a8021b1f931eb7d5b55944902d0816f7097fdc05632128bdc SHA512 f02b3db5ab8dee841f27186b6693997c4e6876e75310b0a31a04593dbcb41d300920404e32e7aecb39c8dd15e54cfee05b725caa27397a67b453f6e64cd1ef5e
-DIST alglib-3.8.2.cpp.tgz 1674260 BLAKE2B 85379da805abe27b86025bddafab775fbcb132b74db07abb204c6677b4fe75bd392d2bacb01b26510e1a6f1086b062902f598c9f13892b46e3dca938e73d1ea7 SHA512 3d7b6e3b5a29f25aee476bdd69e583d7504a2e06d390822b4aa2792eeb500e08c13477176be348a9dd560bad358e423465c9086f0c7c12f73dc88024364aed50
-EBUILD alglib-3.10.0-r1.ebuild 611 BLAKE2B a903cf2e8a555b12e85bbd0b0abb22aafc7ea49e41dc7e8e6ff19a139adefaf784f4ae88c5d195171fc911a4613ff8a4b5120e03414499e5fbf254daa1dd5f9b SHA512 5b62b28e889a64b8ecbac1a4b22516085591586deff2c0d0e170fd3ace27f86a39a3a798e9a2527ecd46aadf9c0443b29618a4c9a4e845f51e3370961a9a9e91
-EBUILD alglib-3.8.2-r1.ebuild 606 BLAKE2B 2ac905bec314659c65974f54ddbc99f1e6383ea440f27b3abe0350f4326299e12cafa73fc49edd1fb2e4c53c75eff230764bbb82d65a20e87da13f8a44676349 SHA512 b1e71c39760f2e45384988f8c789456fb76ae110c5d9c6dd0ccb6f0bf72d898acee7a3bace7d888c7a90a9e5a62fdf1b0f223d7e92e6ac1a2914fd915ff2f0ad
+EBUILD alglib-3.10.0-r1.ebuild 721 BLAKE2B b27ea4c54c620a4eb87ed6098660b7eeefb64073617cceece660593044746631bbfdebc380cc56ca70652b2a39b8e175636a9f7d84bbe3dcd25567ed0b8da2c9 SHA512 e825ad8c516e15c591b222f21669fddf2c71931fe8edeca82b89b3c869ba6cba48d3edffc4fd8c3542be8d076c87bb2ac812703dd2b3b454b24f93420ac393b0
 MISC metadata.xml 1592 BLAKE2B 96df655b24fc1e27a90f6a31388135e9ec14965eef850c14468797dbb19670ef4695219459b2af337613a92cc25a7eb12a1b07f95a3e1e4b058d9f9c38ded770 SHA512 e16165304d85c3201c428b46bb85006281a2faac170f6b7f2966bc683f57387a0d4b68eddd6ad2d4ed9d26af992f4f9b2616c761f0bf1102c6749a8025478844
diff --git a/sci-libs/alglib/alglib-3.10.0-r1.ebuild b/sci-libs/alglib/alglib-3.10.0-r1.ebuild
index 71b8e121855a..43f3eacc3500 100644
--- a/sci-libs/alglib/alglib-3.10.0-r1.ebuild
+++ b/sci-libs/alglib/alglib-3.10.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit cmake-utils
+inherit cmake-utils flag-o-matic
 
 DESCRIPTION="Numerical analysis and data processing library"
 HOMEPAGE="http://www.alglib.net/"
@@ -11,13 +11,16 @@ SRC_URI="http://www.alglib.net/translator/re/${P}.cpp.gpl.tgz"
 
 SLOT="0/3.8"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 S="${WORKDIR}"/cpp/
 
+PATCHES=( "${FILESDIR}/${P}-disable-minlm-test.patch" )
+
 src_prepare() {
 	cp "${FILESDIR}"/CMakeLists.txt-3.8.2 CMakeLists.txt || die
+	use x86 && append-cppflags -ffloat-store
 	cmake-utils_src_prepare
 }
 
diff --git a/sci-libs/alglib/alglib-3.8.2-r1.ebuild b/sci-libs/alglib/alglib-3.8.2-r1.ebuild
deleted file mode 100644
index 6e725a2cd3d1..000000000000
--- a/sci-libs/alglib/alglib-3.8.2-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Numerical analysis and data processing library"
-HOMEPAGE="http://www.alglib.net/"
-SRC_URI="http://www.alglib.net/translator/re/${P}.cpp.tgz"
-
-SLOT="0/3.7"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-S="${WORKDIR}"/cpp/
-
-src_prepare() {
-	cp "${FILESDIR}"/CMakeLists.txt-${PV} CMakeLists.txt || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=( $(cmake-utils_use_build test) )
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/alglib/files/CMakeLists.txt b/sci-libs/alglib/files/CMakeLists.txt
deleted file mode 100644
index 6455423b0fe9..000000000000
--- a/sci-libs/alglib/files/CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-project(alglib CXX)
-cmake_minimum_required(VERSION 2.8)
-
-INCLUDE(GNUInstallDirs)
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
-SET(VERSION 3.7.0)
-SET(SOVERSION 3.7)
-
-FILE(GLOB ALGLIB_SRC_LIB "src/*.cpp")
-FILE(GLOB ALGLIB_HDR_LIB "src/*.h")
-
-ADD_LIBRARY(alglib SHARED ${ALGLIB_SRC_LIB})
-SET_TARGET_PROPERTIES(alglib PROPERTIES 
-  VERSION ${VERSION}
-  SOVERSION ${SOVERSION})
-
-INSTALL(TARGETS alglib DESTINATION ${CMAKE_INSTALL_LIBDIR}/)
-INSTALL(FILES ${ALGLIB_HDR_LIB} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
-#===========================================================
-ADD_EXECUTABLE(test_c tests/test_c.cpp)
-TARGET_LINK_LIBRARIES(test_c alglib)
-#INSTALL(TARGETS test_c DESTINATION ${CMAKE_INSTALL_BINDIR}/)
-#===========================================================
-ADD_EXECUTABLE(test_i tests/test_i.cpp)
-TARGET_LINK_LIBRARIES(test_i alglib)
-#INSTALL(TARGETS test_i DESTINATION ${CMAKE_INSTALL_BINDIR}/)
-#===========================================================
-
-enable_testing()
-add_test( test_c ${CMAKE_BUILD_DIR}/test_c)
-add_test( test_i ${CMAKE_BUILD_DIR}/test_i)
diff --git a/sci-libs/alglib/files/alglib-3.10.0-disable-minlm-test.patch b/sci-libs/alglib/files/alglib-3.10.0-disable-minlm-test.patch
new file mode 100644
index 000000000000..fc2dfae6c012
--- /dev/null
+++ b/sci-libs/alglib/files/alglib-3.10.0-disable-minlm-test.patch
@@ -0,0 +1,16 @@
+Description: disable minlm test, because it fails sometimes on some platforms.
+Author: Anton Gladky <gladk@debian.org>
+Last-Update: 2015-05-29
+
+Index: cpp/tests/test_c.cpp
+===================================================================
+--- cpp.orig/tests/test_c.cpp
++++ cpp/tests/test_c.cpp
+@@ -93354,7 +93354,6 @@ _s_testrecord unittests[] =
+     {"spline1d",testspline1d,_pexec_testspline1d},

+     {"normestimator",testnormestimator,_pexec_testnormestimator},

+     {"minqp",testminqp,_pexec_testminqp},

+-    {"minlm",testminlm,_pexec_testminlm},

+     {"lsfit",testlsfit,_pexec_testlsfit},

+     {"parametric",testparametric,_pexec_testparametric},

+     {"linlsqr",testlinlsqr,_pexec_testlinlsqr},