From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 507DF138334 for ; Fri, 1 Jun 2018 16:29:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3194EE0802; Fri, 1 Jun 2018 16:29:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D9C8FE0802 for ; Fri, 1 Jun 2018 16:29:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CE5ED335C51 for ; Fri, 1 Jun 2018 16:29:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9DCE2A2 for ; Fri, 1 Jun 2018 16:29:24 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1527870553.108ef0e63abf16a743faff1463c3c2adf7c9b147.junghans@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/lmfit/, sci-libs/lmfit/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/lmfit/files/lmfit-7.0-cmake.patch sci-libs/lmfit/lmfit-5.1.ebuild sci-libs/lmfit/lmfit-6.4.ebuild sci-libs/lmfit/lmfit-7.0.ebuild sci-libs/lmfit/metadata.xml X-VCS-Directories: sci-libs/lmfit/files/ sci-libs/lmfit/ X-VCS-Committer: junghans X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: 108ef0e63abf16a743faff1463c3c2adf7c9b147 X-VCS-Branch: master Date: Fri, 1 Jun 2018 16:29:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 27dd2feb-4225-4cce-a639-f0a30ff4e075 X-Archives-Hash: 5e8a95bbb375443bc00e538f81257ce2 commit: 108ef0e63abf16a743faff1463c3c2adf7c9b147 Author: Christoph Junghans gentoo org> AuthorDate: Fri Jun 1 16:28:50 2018 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Fri Jun 1 16:29:13 2018 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=108ef0e6 sci-libs/lmfit: moved to gx86 sci-libs/lmfit/files/lmfit-7.0-cmake.patch | 66 ------------------------------ sci-libs/lmfit/lmfit-5.1.ebuild | 24 ----------- sci-libs/lmfit/lmfit-6.4.ebuild | 24 ----------- sci-libs/lmfit/lmfit-7.0.ebuild | 25 ----------- sci-libs/lmfit/metadata.xml | 11 ----- 5 files changed, 150 deletions(-) diff --git a/sci-libs/lmfit/files/lmfit-7.0-cmake.patch b/sci-libs/lmfit/files/lmfit-7.0-cmake.patch deleted file mode 100644 index 9ca4efb24..000000000 --- a/sci-libs/lmfit/files/lmfit-7.0-cmake.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 4e66272e1f5ebb220af517ca4d8804936f7f465c Mon Sep 17 00:00:00 2001 -From: Christoph Junghans -Date: Thu, 31 May 2018 18:11:26 -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 ---- - CMakeLists.txt | 7 +++++-- - lib/CMakeLists.txt | 4 ++-- - man/CMakeLists.txt | 2 +- - 3 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f2d0bdf..75753d3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,9 +13,12 @@ set(lmfit_VERSION ${lmfit_SOVERSION}.0) # lib version - # --- 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 -Werror") -+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 -Werror") -+endif() - - add_subdirectory(lib) - add_subdirectory(demo) -diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt -index 51b79bb..754f60f 100644 ---- a/lib/CMakeLists.txt -+++ b/lib/CMakeLists.txt -@@ -17,9 +17,9 @@ target_link_libraries(${library_name} m) - - 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 a718d3d..4a15597 100644 ---- a/man/CMakeLists.txt -+++ b/man/CMakeLists.txt -@@ -15,7 +15,7 @@ function(one_page pname section) - ) - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/${pname}.${section} -- DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man${section}" -+ DESTINATION "${CMAKE_INSTALL_MANDIR}/man${section}" - ) - endfunction() - --- -2.16.4 - diff --git a/sci-libs/lmfit/lmfit-5.1.ebuild b/sci-libs/lmfit/lmfit-5.1.ebuild deleted file mode 100644 index e2d9b300a..000000000 --- a/sci-libs/lmfit/lmfit-5.1.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils - -DESCRIPTION="library for Levenberg-Marquardt least-squares minimization and curve fitting" -HOMEPAGE="http://apps.jcns.fz-juelich.de/doku/sc/lmfit" -SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="static-libs" - -src_configure() { - econf $(use_enable static-libs static) -} - -src_install() { - default - prune_libtool_files -} diff --git a/sci-libs/lmfit/lmfit-6.4.ebuild b/sci-libs/lmfit/lmfit-6.4.ebuild deleted file mode 100644 index 5cc8fa8bd..000000000 --- a/sci-libs/lmfit/lmfit-6.4.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils - -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/old/${P}.tgz" - -LICENSE="BSD-2" -SLOT="0" -KEYWORDS="~amd64" -IUSE="static-libs" - -src_configure() { - econf $(use_enable static-libs static) -} - -src_install() { - default - prune_libtool_files -} diff --git a/sci-libs/lmfit/lmfit-7.0.ebuild b/sci-libs/lmfit/lmfit-7.0.ebuild deleted file mode 100644 index e895f1f06..000000000 --- a/sci-libs/lmfit/lmfit-7.0.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# 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" -IUSE="" - -PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) - -src_configure() { - local mycmakeargs=( - -DINJECT_C_FLAGS=OFF - ) - - cmake-utils_src_configure -} diff --git a/sci-libs/lmfit/metadata.xml b/sci-libs/lmfit/metadata.xml deleted file mode 100644 index 2550df822..000000000 --- a/sci-libs/lmfit/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - sci@gentoo.org - Gentoo Science Project - - - lmfit - -