From 16449a80e28af2209916cc66d19c9a44ca2b90d9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Feb 2019 15:11:50 +0000 Subject: gentoo resync : 20.02.2019 --- sci-libs/lmfit/Manifest | 5 +- sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch | 85 ++++++++++++++++++++++++++++ sci-libs/lmfit/lmfit-8.0.ebuild | 25 -------- sci-libs/lmfit/lmfit-8.2.2.ebuild | 25 ++++++++ 4 files changed, 113 insertions(+), 27 deletions(-) create mode 100644 sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch delete mode 100644 sci-libs/lmfit/lmfit-8.0.ebuild create mode 100644 sci-libs/lmfit/lmfit-8.2.2.ebuild (limited to 'sci-libs/lmfit') diff --git a/sci-libs/lmfit/Manifest b/sci-libs/lmfit/Manifest index 50b129ff04ef..c31cc91894f3 100644 --- a/sci-libs/lmfit/Manifest +++ b/sci-libs/lmfit/Manifest @@ -1,11 +1,12 @@ AUX lmfit-7.0-cmake.patch 2226 BLAKE2B 317d232718c8172508d67de527161b074676bf62ff4da45d21a9444626fb2e84150c0b3fb099a6a9c5247ea2ec9b53c89b4b0f6d64f8b3d6352629e440e89ad4 SHA512 a9e95299baac18818a131ac67c82d49777e7cae6629d9f6bedc2e7f175f2d6a416888d973064df13d79315a5445d95c0e9a2e3d5fc1ac476fdb2b688dbe601e3 AUX lmfit-8.0-cmake.patch 2251 BLAKE2B 4549bfb77187c0bc1040a3d3e4e3233445536d039b0d185e4a2d160fcf4d7c0ba2584bd0d943f9527c4af141688a0940763f7c23893263f7af1e294337710e65 SHA512 d3bcb2a9aa882c8240c873a65cc4b8d198ca26990d64d87988ea09e8398b10f83aedd4367bf65cb949091a6a4c3b4d70911658e46808d852cc26c3af2f6e032f +AUX lmfit-8.2.2-cmake.patch 2769 BLAKE2B 7f67349b93cde9bf14ce5295d3a32a73301897e1643be5beea71ccb8e9d7a9a128c4160b7eb5dcbdfb1189ee6e774e151bd5f71b3af4d7ec0a00ba61f7ad79f1 SHA512 93b1f5242e1152dea4910c96b2c561a370f2e2a78fc730b5ee00257049f96a253badf5d7752a1bbac320df43e436d8f4d913fbf8d40f7b36e3579efb16147417 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 +DIST lmfit-8.2.2.tgz 31970 BLAKE2B 67eebc0e58d3d78057afcd84f35adcfea783c8501a5f8934dd07c38eb2419b1c43bedd3401a830a993005913138bdf8d1dc73c2142983b9f881f0db9bec06b93 SHA512 5835dce914027429cb36765543cf6b872e4ef1acd8feaeca281f9edf286fda89db78fbc0713dcfea4e4f2fe55a1b05317e6428980060bc3acce579ef1fa0c271 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 547 BLAKE2B ca24a9539256e249cb06d88ae1077a13a0c3ff62257d9eaa0751b3b56ecb6e4fd6bba4d8fa8553493eeefbd361b10e4fa056d807f151fce0077084d9220400e2 SHA512 1c4440f1d2a3a9ab910a740b731ae83645d7a62a38417639080cf5845880c5e498be08ac8a5a58545f6daeec963f9f784d19ed03054952ad4230ffdb7f5e1c86 -EBUILD lmfit-8.0.ebuild 543 BLAKE2B b77c765248184b82012abb73e17143784f6bacd85e72ee2d77585098294b5dcd9de00e9420d955f5ef4c32e27e93509748dcd7643b06f167c446d35fd47acd61 SHA512 5e0476aac93c71fc62c78e25e0b17b25dee340268857984c8e130bf698a5c232fbe70abfeac016e8f26e207b3f7f3ad6ab0a0baf9b4778c1559a85826e52f4cc +EBUILD lmfit-8.2.2.ebuild 543 BLAKE2B df340a25fdb763f0db342b1111757be2db5e9eaf40c34d4bf35a043feee3a073bd985080799a16dfac1d1cb1ff7b37120bb29f00757a64753cdec0b1c2f92e1d SHA512 2b34186319e98e2775f9fa9438d29fa09b8ec56b98bc7efe3ee3f2e413fe64b3eefd3cd6f83019a876cecc195c5aede3a59808e6a16e2c236af792ff0e65abae MISC metadata.xml 328 BLAKE2B fe29c76e5725821e31de0e2b14e0b975d5b8838e9907bf9ddacdb40cddc0529550fe83468226bf045fcf7ad95b2e56d31dc564dcf7e6d9a0401317313e2f0f27 SHA512 e6cf20d6c9130a16ce37c44890f928cb5dca1bb67425d8cdcc1ab7db22f7c8e2ac513b11c33b0f0495e25dd389ac926f2099d0253288eb1ed290f30e655a1c4f diff --git a/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch b/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch new file mode 100644 index 000000000000..258f70a533d4 --- /dev/null +++ b/sci-libs/lmfit/files/lmfit-8.2.2-cmake.patch @@ -0,0 +1,85 @@ +From 72dae8c23604288331c9a7f03f60ec792a384121 Mon Sep 17 00:00:00 2001 +From: christoph junghans +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 +Signed-off-by: Alexey Shvetsov +--- + CMakeLists.txt | 10 +++++++--- + lib/CMakeLists.txt | 4 ++-- + man/CMakeLists.txt | 4 ++-- + 3 files changed, 11 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index dbb571e..279f06a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,7 +4,7 @@ cmake_policy(SET CMP0048 NEW) + list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + include(PreventInSourceBuilds) + +-project(lmfit VERSION 8.2.1 LANGUAGES C) ++project(lmfit VERSION 8.2.2 LANGUAGES C) + + # --- Declare project-wide user flags, and set default values --- + option(FITTEST "Build with FitTest" OFF) +@@ -23,12 +23,16 @@ else() + endif() + + include(CTest) ++include(GNUInstallDirs) + +-set(destination ${CMAKE_INSTALL_PREFIX}) ++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() + + configure_file("lmfit.pc.in" "lmfit.pc" @ONLY) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/lmfit.pc" +- DESTINATION "${destination}/lib/pkgconfig/") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig/") + + add_subdirectory(lib) + add_subdirectory(demo) +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index a266f4e..e071a3c 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -18,9 +18,9 @@ link_libm(${library_name}) + + 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 --git a/man/CMakeLists.txt b/man/CMakeLists.txt +index d4595fd..5505713 100644 +--- a/man/CMakeLists.txt ++++ b/man/CMakeLists.txt +@@ -15,11 +15,11 @@ function(one_page pname section) + ) + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section} +- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man${section}" ++ DESTINATION "${CMAKE_INSTALL_MANDIR}/man${section}" + ) + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.html +- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/lmfit/html" ++ DESTINATION "${CMAKE_INSTALL_DOCDIR}-${CMAKE_PROJECT_VERSION}/html" + ) + endfunction() + +-- +2.20.1 + diff --git a/sci-libs/lmfit/lmfit-8.0.ebuild b/sci-libs/lmfit/lmfit-8.0.ebuild deleted file mode 100644 index db342f68909e..000000000000 --- a/sci-libs/lmfit/lmfit-8.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# 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 -} diff --git a/sci-libs/lmfit/lmfit-8.2.2.ebuild b/sci-libs/lmfit/lmfit-8.2.2.ebuild new file mode 100644 index 000000000000..6d1f6b2e4b60 --- /dev/null +++ b/sci-libs/lmfit/lmfit-8.2.2.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2019 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 +} -- cgit v1.2.3