[gentoo-commits] proj/sci:master commit in: sci-biology/dcm2niix/, sci-biology/dcm2niix/files/

[gentoo-commits] proj/sci:master commit in: sci-biology/dcm2niix/, sci-biology/dcm2niix/files/

[Andrew Ammerlaan]

commit:     877cafa591695d148ce3a915043b005d320ce1bf
Author:     Lucas Mitrak <lucas <AT> lucasmitrak <DOT> com>
AuthorDate: Thu Jun 10 21:11:21 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Fri Jun 11 10:13:18 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=877cafa5

sci-biology/dcm2niix: add patch

* Disable finding git in cmake
* Add patch to ebuild

Currently, sci-biology/dcm2niix will not compile if git is not found.
The patch dcm2niix-disable_find_git.patch comments out the lines which
attempt to find git and require it to be found. With this patch, the
package will compile correctly. Without this patch, cmake will throw
an error if git is not found.
This commit was tested in a docker image with dev-util/ebuildtester.
This commit was written, tested, and submitted by Lucas Mitrak.

Closes: https://bugs.gentoo.org/755746
Signed-off-by: Lucas Mitrak <lucas <AT> lucasmitrak.com>
Closes: https://github.com/gentoo/sci/pull/1091
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sci-biology/dcm2niix/dcm2niix-1.0.20201102.ebuild     |  4 ++++
 .../dcm2niix/files/dcm2niix-disable_find_git.patch    | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/sci-biology/dcm2niix/dcm2niix-1.0.20201102.ebuild b/sci-biology/dcm2niix/dcm2niix-1.0.20201102.ebuild
index b7f4166f5..e9d0d7ea0 100644
--- a/sci-biology/dcm2niix/dcm2niix-1.0.20201102.ebuild
+++ b/sci-biology/dcm2niix/dcm2niix-1.0.20201102.ebuild
@@ -16,6 +16,10 @@ KEYWORDS="~amd64 ~x86"
 DEPEND=""
 RDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-disable_find_git.patch
+)
+
 pkg_postinst() {
 	optfeature "parallel gzip support" app-arch/pigz
 }

diff --git a/sci-biology/dcm2niix/files/dcm2niix-disable_find_git.patch b/sci-biology/dcm2niix/files/dcm2niix-disable_find_git.patch
new file mode 100644
index 000000000..ba51997f2
--- /dev/null
+++ b/sci-biology/dcm2niix/files/dcm2niix-disable_find_git.patch
@@ -0,0 +1,19 @@
+disable finding git because it should not be used nor needed
+Written and tested by Lucas Mitrak.
+https://bugs.gentoo.org/755746
+
+--- a/SuperBuild/SuperBuild.cmake
++++ b/SuperBuild/SuperBuild.cmake
+@@ -1,8 +1,8 @@
+ # Check if git exists
+-find_package(Git)
+-if(NOT GIT_FOUND)
+-    message(FATAL_ERROR "Cannot find Git. Git is required for Superbuild")
+-endif()
++#find_package(Git)
++#if(NOT GIT_FOUND)
++#    message(FATAL_ERROR "Cannot find Git. Git is required for Superbuild")
++#endif()
+ 
+ # Use git protocol or not
+ option(USE_GIT_PROTOCOL "If behind a firewall turn this off to use http instead." ON)