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 94D601382C5 for ; Tue, 22 Jun 2021 23:44:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CEA36E084A; Tue, 22 Jun 2021 23:44:19 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 39DFDE084A for ; Tue, 22 Jun 2021 23:44:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 D075E335D11 for ; Tue, 22 Jun 2021 23:44:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43C5578A for ; Tue, 22 Jun 2021 23:44:16 +0000 (UTC) From: "Horea Christian" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Horea Christian" Message-ID: <1624405448.b8407e77728489cb3da158b77f0afb01291371f2.chymera@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/ciftilib/, sci-libs/ciftilib/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/ciftilib/ciftilib-1.6.0.ebuild sci-libs/ciftilib/files/ciftilib-1.6.0-version.patch X-VCS-Directories: sci-libs/ciftilib/ sci-libs/ciftilib/files/ X-VCS-Committer: chymera X-VCS-Committer-Name: Horea Christian X-VCS-Revision: b8407e77728489cb3da158b77f0afb01291371f2 X-VCS-Branch: master Date: Tue, 22 Jun 2021 23:44:16 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4adda2ea-e61b-4603-8f51-ff06fa9fe088 X-Archives-Hash: 99ce01f66743484757271c24f8aae9af commit: b8407e77728489cb3da158b77f0afb01291371f2 Author: Horea Christian chymera eu> AuthorDate: Tue Jun 22 23:44:08 2021 +0000 Commit: Horea Christian gmail com> CommitDate: Tue Jun 22 23:44:08 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b8407e77 sci-libs/ciftilib: fixed boost version checking Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Horea Christian chymera.eu> sci-libs/ciftilib/ciftilib-1.6.0.ebuild | 6 +++++ .../ciftilib/files/ciftilib-1.6.0-version.patch | 27 ++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/sci-libs/ciftilib/ciftilib-1.6.0.ebuild b/sci-libs/ciftilib/ciftilib-1.6.0.ebuild index 062fa44ef..fffd4f9c1 100644 --- a/sci-libs/ciftilib/ciftilib-1.6.0.ebuild +++ b/sci-libs/ciftilib/ciftilib-1.6.0.ebuild @@ -24,6 +24,12 @@ RDEPEND="${DEPEND}" S="${WORKDIR}/CiftiLib-${PV}" +# fix submitted upstream +# https://github.com/Washington-University/CiftiLib/pull/23 +PATCHES=( + "${FILESDIR}/${P}-version.patch" +) + #TODO: Enable doc building and installation src_prepare(){ diff --git a/sci-libs/ciftilib/files/ciftilib-1.6.0-version.patch b/sci-libs/ciftilib/files/ciftilib-1.6.0-version.patch new file mode 100644 index 000000000..e64a55f2f --- /dev/null +++ b/sci-libs/ciftilib/files/ciftilib-1.6.0-version.patch @@ -0,0 +1,27 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -83,18 +83,18 @@ ENDIF (NOT QT_FOUND) + INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) + SET(LIBS ${LIBS} ${Boost_LIBRARIES}) + #boost quirks +-IF (Boost_VERSION LESS 104400) ++IF (Boost_VERSION VERSION_LESS 1.44.00) + #absolute() was added in 1.44.0, with filesystem v3 + ADD_DEFINITIONS(-DCIFTILIB_BOOST_NO_FSV3) +-ENDIF (Boost_VERSION LESS 104400) +-IF (Boost_VERSION LESS 104800) ++ENDIF (Boost_VERSION VERSION_LESS 1.44.00) ++IF (Boost_VERSION VERSION_LESS 1.48.00) + #canonical() was added in 1.48.0 + ADD_DEFINITIONS(-DCIFTILIB_BOOST_NO_CANONICAL) +-ENDIF (Boost_VERSION LESS 104800) +-IF (Boost_VERSION LESS 105600) ++ENDIF (Boost_VERSION VERSION_LESS 1.48.00) ++IF (Boost_VERSION VERSION_LESS 1.56.00) + #try_lexical_cast was added in 1.56.0 + ADD_DEFINITIONS(-DCIFTILIB_BOOST_NO_TRY_LEXICAL) +-ENDIF (Boost_VERSION LESS 105600) ++ENDIF (Boost_VERSION VERSION_LESS 1.56.00) + + #zlib, useful for volume reading + FIND_PACKAGE(ZLIB)