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 81F5A1382C5 for ; Thu, 22 Mar 2018 14:24:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BCD3FE09BF; Thu, 22 Mar 2018 14:24:41 +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 951F6E09BF for ; Thu, 22 Mar 2018 14:24:41 +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 87B7A335C5C for ; Thu, 22 Mar 2018 14:24:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C899267 for ; Thu, 22 Mar 2018 14:24:37 +0000 (UTC) From: "Guilherme Amadio" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Guilherme Amadio" Message-ID: <1521728611.0644d83de67b352bf88de744264143d5ad1bd4ce.amadio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-physics/root/, sci-physics/root/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-physics/root/files/root-6.12.04-no-opengl.patch sci-physics/root/root-6.12.06-r1.ebuild X-VCS-Directories: sci-physics/root/ sci-physics/root/files/ X-VCS-Committer: amadio X-VCS-Committer-Name: Guilherme Amadio X-VCS-Revision: 0644d83de67b352bf88de744264143d5ad1bd4ce X-VCS-Branch: master Date: Thu, 22 Mar 2018 14:24:37 +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: 530069ba-a62e-4365-b955-d5f1417e588b X-Archives-Hash: d28b9768ad05ec165904d424b2b15f12 commit: 0644d83de67b352bf88de744264143d5ad1bd4ce Author: Guilherme Amadio gentoo org> AuthorDate: Thu Mar 22 12:44:39 2018 +0000 Commit: Guilherme Amadio gentoo 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 )