gentoo resync : 27.10.2018

4 files changed, 91 insertions, 4 deletions

diff --git a/sci-libs/lmfit/Manifest b/sci-libs/lmfit/Manifest
index 08aa24a94f1f..50b129ff04ef 100644
--- a/sci-libs/lmfit/Manifest
+++ b/sci-libs/lmfit/Manifest
@@ -1,8 +1,11 @@
 AUX lmfit-7.0-cmake.patch 2226 BLAKE2B 317d232718c8172508d67de527161b074676bf62ff4da45d21a9444626fb2e84150c0b3fb099a6a9c5247ea2ec9b53c89b4b0f6d64f8b3d6352629e440e89ad4 SHA512 a9e95299baac18818a131ac67c82d49777e7cae6629d9f6bedc2e7f175f2d6a416888d973064df13d79315a5445d95c0e9a2e3d5fc1ac476fdb2b688dbe601e3
+AUX lmfit-8.0-cmake.patch 2251 BLAKE2B 4549bfb77187c0bc1040a3d3e4e3233445536d039b0d185e4a2d160fcf4d7c0ba2584bd0d943f9527c4af141688a0940763f7c23893263f7af1e294337710e65 SHA512 d3bcb2a9aa882c8240c873a65cc4b8d198ca26990d64d87988ea09e8398b10f83aedd4367bf65cb949091a6a4c3b4d70911658e46808d852cc26c3af2f6e032f
 DIST lmfit-5.1.tgz 345077 BLAKE2B df27621745601ffacd2110b28f3e3ea2b06d4c8c3c8fad5dda13bb4d6c2bd9f2a793ff88fab4f6d8c78075278bb26f3f424bd0074095e67ab1780a9d57b72b4b SHA512 1df6ed51d7f2137529793948f6c57ef3658932c9198776925a9f6e1d586352651c93aa053a064db7a201dbb848a7108f284223feff45171d142087539d834b29
 DIST lmfit-6.4.tgz 388809 BLAKE2B 48aa619642ac3fd009ec6a8f8b44ee4c800fc3f33e2603b557218cdf37c789159dc3947a648d560b9e2dd7fef08a6644fd25ac61505859dc3b1d151eeea58c27 SHA512 2bd0f24dd4638345b8b1ce6803ddcf45ca3ef888eb285e99f9f158c2e30b0f96016d9d84a112cdbf28f2ba98470e54fe773416179a65264426043c9a5186757d
 DIST lmfit-7.0.tgz 37950 BLAKE2B a509110f70e7e863d1172b8d91f7439763f0434702f265751e9955494f4982b4c17f0baaa080af86e5cae7f535555e27b98b45ba6a529061d107e53bdb9fd698 SHA512 78f479786c6e5c417781c6d629f5a517335fac70df049fafdefd511485da4e542c988d69c998f96eaab4306160de4bb09a631ca6ffff74bba70c51428d734fc3
+DIST lmfit-8.0.tgz 42833 BLAKE2B d2ad9f5cd35997c8ce6827148e9ca748f3d14044f515a927442e9e5f57508cdfb729cd7172987a0e94284d7e93f7aafc0cb572137f201994c8d3ad9a9fb64c9b SHA512 3b4e4af6c70269f8752428d416e014d4e69df3f73b25e9ba16dd07afc03598a1dca08050cecba29a3b2651e003e703ba4412716100b1bb55b1830f74f16da676
 EBUILD lmfit-5.1.ebuild 516 BLAKE2B 51a6715eeca7a7c3b6172530af4d6c908bdbcb3b3a5339e60c1af9bf60277b4275f49cfbf68eb3072f7f3f7864f9890ab486093253c72f0988673ea764b2513f SHA512 3ff7c3bb21bf2c95ce466f3168c2362a5fd3a0e8085621e0bae0d6b28191bc5d7368f4e09afc87ffe0720ac4740cdfeb27ee4bdc5cd83006f6837c2ac46775f9
 EBUILD lmfit-6.4.ebuild 516 BLAKE2B 51a6715eeca7a7c3b6172530af4d6c908bdbcb3b3a5339e60c1af9bf60277b4275f49cfbf68eb3072f7f3f7864f9890ab486093253c72f0988673ea764b2513f SHA512 3ff7c3bb21bf2c95ce466f3168c2362a5fd3a0e8085621e0bae0d6b28191bc5d7368f4e09afc87ffe0720ac4740cdfeb27ee4bdc5cd83006f6837c2ac46775f9
-EBUILD lmfit-7.0.ebuild 536 BLAKE2B 29221f8196319bc8ff31d0ca6989ec50136e074b2bfcf5df90c012d21d416222ae9c83de1fa8f5d92129ee548960f7da1d0a580936df04d62036cc4ae8ad3d90 SHA512 7887abc5f96ed37a81d61c392829a9bfd7027dd7092387b2b20e812187c63d3c0379dc578b7d27129fc9701066f4b9ae04dbce11d166d2267227a4f423ed5e28
+EBUILD lmfit-7.0.ebuild 547 BLAKE2B ca24a9539256e249cb06d88ae1077a13a0c3ff62257d9eaa0751b3b56ecb6e4fd6bba4d8fa8553493eeefbd361b10e4fa056d807f151fce0077084d9220400e2 SHA512 1c4440f1d2a3a9ab910a740b731ae83645d7a62a38417639080cf5845880c5e498be08ac8a5a58545f6daeec963f9f784d19ed03054952ad4230ffdb7f5e1c86
+EBUILD lmfit-8.0.ebuild 543 BLAKE2B b77c765248184b82012abb73e17143784f6bacd85e72ee2d77585098294b5dcd9de00e9420d955f5ef4c32e27e93509748dcd7643b06f167c446d35fd47acd61 SHA512 5e0476aac93c71fc62c78e25e0b17b25dee340268857984c8e130bf698a5c232fbe70abfeac016e8f26e207b3f7f3ad6ab0a0baf9b4778c1559a85826e52f4cc
 MISC metadata.xml 328 BLAKE2B fe29c76e5725821e31de0e2b14e0b975d5b8838e9907bf9ddacdb40cddc0529550fe83468226bf045fcf7ad95b2e56d31dc564dcf7e6d9a0401317313e2f0f27 SHA512 e6cf20d6c9130a16ce37c44890f928cb5dca1bb67425d8cdcc1ab7db22f7c8e2ac513b11c33b0f0495e25dd389ac926f2099d0253288eb1ed290f30e655a1c4f
diff --git a/sci-libs/lmfit/files/lmfit-8.0-cmake.patch b/sci-libs/lmfit/files/lmfit-8.0-cmake.patch
new file mode 100644
index 000000000000..367aa2147ae4
--- /dev/null
+++ b/sci-libs/lmfit/files/lmfit-8.0-cmake.patch
@@ -0,0 +1,59 @@
+from: christoph junghans <junghans@votca.org>
+date: mon, 22 oct 2018 21:00:00 -0600
+subject: [patch] cmake: minor distribution tweaks
+
+- use gnuinstalldirs to allow to configure install dirs
+- allow to disable injecting c flags
+
+signed-off-by: christoph junghans <junghans@votca.org>
+---
+ cmakelists.txt     | 7 +++++--
+ lib/cmakelists.txt | 4 ++--
+ man/cmakelists.txt | 2 +-
+ 3 files changed, 8 insertions(+), 5 deletions(-)
+
+diff -Naur lmfit-8.0.orig/CMakeLists.txt lmfit-8.0/CMakeLists.txt
+--- lmfit-8.0.orig/CMakeLists.txt	2018-10-22 20:54:43.452888191 -0600
++++ lmfit-8.0/CMakeLists.txt	2018-10-22 20:56:00.573905982 -0600
+@@ -13,9 +13,12 @@
+ # --- Declare project-wide user flags, and set default values ---
+ option(FITTEST "Build with FitTest" OFF)
+ 
+-set(destination ${CMAKE_INSTALL_PREFIX})
++include(GNUInstallDirs)
+ 
+-set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses  -Wno-unknown-pragmas")
++option(INJECT_C_FLAGS "Inject a bunch of useful c flags" ON)
++if (INJECT_C_FLAGS)
++    set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -pedantic -Wall -Wno-sign-compare -Wno-unused-result -Wno-parentheses  -Wno-unknown-pragmas")
++endif()
+ 
+ add_subdirectory(lib)
+ add_subdirectory(demo)
+diff -Naur lmfit-8.0.orig/lib/CMakeLists.txt lmfit-8.0/lib/CMakeLists.txt
+--- lmfit-8.0.orig/lib/CMakeLists.txt	2018-10-22 20:54:43.452888191 -0600
++++ lmfit-8.0/lib/CMakeLists.txt	2018-10-22 20:55:08.073213116 -0600
+@@ -17,9 +17,9 @@
+ 
+ install(
+     TARGETS ${library_name} LIBRARY
+-    DESTINATION ${destination}/lib
++    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+     COMPONENT Libraries)
+ install(
+     FILES ${inc_files}
+-    DESTINATION ${destination}/include
++    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+     COMPONENT Headers)
+diff -Naur lmfit-8.0.orig/man/CMakeLists.txt lmfit-8.0/man/CMakeLists.txt
+--- lmfit-8.0.orig/man/CMakeLists.txt	2018-10-22 20:54:43.452888191 -0600
++++ lmfit-8.0/man/CMakeLists.txt	2018-10-22 20:55:08.073213116 -0600
+@@ -15,7 +15,7 @@
+     )
+     install(
+         FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section}
+-        DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man${section}"
++        DESTINATION "${CMAKE_INSTALL_MANDIR}/man${section}"
+     )
+ endfunction()
+ 
diff --git a/sci-libs/lmfit/lmfit-7.0.ebuild b/sci-libs/lmfit/lmfit-7.0.ebuild
index e895f1f06889..e4258a74110a 100644
--- a/sci-libs/lmfit/lmfit-7.0.ebuild
+++ b/sci-libs/lmfit/lmfit-7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,11 +7,11 @@ inherit cmake-utils
 
 DESCRIPTION="library for Levenberg-Marquardt least-squares minimization and curve fitting"
 HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/lmfit"
-SRC_URI="http://apps.jcns.fz-juelich.de/src/lmfit/${P}.tgz"
+SRC_URI="http://apps.jcns.fz-juelich.de/src/lmfit/old/${P}.tgz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
diff --git a/sci-libs/lmfit/lmfit-8.0.ebuild b/sci-libs/lmfit/lmfit-8.0.ebuild
new file mode 100644
index 000000000000..db342f68909e
--- /dev/null
+++ b/sci-libs/lmfit/lmfit-8.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="library for Levenberg-Marquardt least-squares minimization and curve fitting"
+HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/lmfit"
+SRC_URI="http://apps.jcns.fz-juelich.de/src/lmfit/${P}.tgz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DINJECT_C_FLAGS=OFF
+	)
+
+	cmake-utils_src_configure
+}