[gentoo-commits] proj/sci:master commit in: sci-libs/ciftilib/, sci-libs/ciftilib/files/

[Horea Christian]

commit:     b8407e77728489cb3da158b77f0afb01291371f2
Author:     Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Tue Jun 22 23:44:08 2021 +0000
Commit:     Horea Christian <horea.christ <AT> gmail <DOT> 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 <chr <AT> 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)