[gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/

[Guilherme Amadio]

commit:     0644d83de67b352bf88de744264143d5ad1bd4ce
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 22 12:44:39 2018 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 14:23:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0644d83d

sci-physics/root: do not look for ftgl and gl2ps with USE=-opengl

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../root/files/root-6.12.04-no-opengl.patch        | 23 ++++++++++++++++++++++
 sci-physics/root/root-6.12.06-r1.ebuild            |  1 +
 2 files changed, 24 insertions(+)

diff --git a/sci-physics/root/files/root-6.12.04-no-opengl.patch 
b/sci-physics/root/files/root-6.12.04-no-opengl.patch
new file mode 100644
index 00000000000..319020222e5
--- /dev/null
+++ b/sci-physics/root/files/root-6.12.04-no-opengl.patch
@@ -0,0 +1,23 @@
+diff --git a/cmake/modules/SearchInstalledSoftware.cmake 
b/cmake/modules/SearchInstalledSoftware.cmake
+index a68c462eb3..1e82e57241 100644
+--- a/cmake/modules/SearchInstalledSoftware.cmake
++++ b/cmake/modules/SearchInstalledSoftware.cmake
+@@ -499,7 +499,7 @@ if(opengl)
+ endif()
+ 
+ #---Check for gl2ps 
------------------------------------------------------------------
+-if(NOT builtin_gl2ps)
++if(gl2ps AND NOT builtin_gl2ps)
+   message(STATUS "Looking for gl2ps")
+   find_Package(gl2ps)
+   if(NOT GL2PS_FOUND)
+@@ -999,7 +999,7 @@ if(globus)
+ endif()
+ 
+ #---Check for ftgl if 
needed----------------------------------------------------------
+-if(NOT builtin_ftgl)
++if(ftgl AND NOT builtin_ftgl)
+   find_package(FTGL)
+   if(NOT FTGL_FOUND)
+     if(fail-on-missing)
+

diff --git a/sci-physics/root/root-6.12.06-r1.ebuild 
b/sci-physics/root/root-6.12.06-r1.ebuild
index c0815302e7d..1908822d66c 100644
--- a/sci-physics/root/root-6.12.06-r1.ebuild
+++ b/sci-physics/root/root-6.12.06-r1.ebuild
@@ -114,6 +114,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-6.00.01-dotfont.patch
        "${FILESDIR}"/${PN}-6.11.02-hsimple.patch
        "${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch
+       "${FILESDIR}"/${PN}-6.12.04-no-opengl.patch
        "${FILESDIR}"/${PN}-6.12.04-z3.patch
 )