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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A828E15808B for ; Sun, 10 Apr 2022 22:58:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3CBDE09C6; Sun, 10 Apr 2022 22:58:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5C2E9E0992 for ; Sun, 10 Apr 2022 22:58:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A15B03418D4 for ; Sun, 10 Apr 2022 22:58:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A0B01BF for ; Sun, 10 Apr 2022 22:58:44 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1649631513.8fa751d866e2588957ba1502ba0984247f78440c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-engines/devilutionx/, games-engines/devilutionx/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild games-engines/devilutionx/devilutionx-9999.ebuild games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch X-VCS-Directories: games-engines/devilutionx/files/ games-engines/devilutionx/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8fa751d866e2588957ba1502ba0984247f78440c X-VCS-Branch: master Date: Sun, 10 Apr 2022 22:58:44 +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: 37bd0ecf-4154-45a7-9ad4-94330d812e79 X-Archives-Hash: 46b806ecf8934eb194529d2295c5fc4d commit: 8fa751d866e2588957ba1502ba0984247f78440c Author: Sam James gentoo org> AuthorDate: Tue Mar 22 22:04:33 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sun Apr 10 22:58:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fa751d8 games-engines/devilutionx: fix automagic ccache usage We let users enable this by themselves via e.g. FEATURES=ccache. Maintainer timeout. Closes: https://bugs.gentoo.org/813768 Signed-off-by: Sam James gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/24714 Signed-off-by: Sam James gentoo.org> games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild | 3 ++- games-engines/devilutionx/devilutionx-9999.ebuild | 3 ++- .../files/devilutionx-1.2.1-disable-ccache.patch | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild index 9dd19f639bcb..2a2abba3eba0 100644 --- a/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild +++ b/games-engines/devilutionx/devilutionx-1.2.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -41,6 +41,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-1.2.0_pre-no_bundled_font.patch" #704508 + "${FILESDIR}/${PN}-1.2.1-disable-ccache.patch" #813768 ) DOCS=( docs/CHANGELOG.md ) diff --git a/games-engines/devilutionx/devilutionx-9999.ebuild b/games-engines/devilutionx/devilutionx-9999.ebuild index 9dd19f639bcb..2a2abba3eba0 100644 --- a/games-engines/devilutionx/devilutionx-9999.ebuild +++ b/games-engines/devilutionx/devilutionx-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -41,6 +41,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-1.2.0_pre-no_bundled_font.patch" #704508 + "${FILESDIR}/${PN}-1.2.1-disable-ccache.patch" #813768 ) DOCS=( docs/CHANGELOG.md ) diff --git a/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch b/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch new file mode 100644 index 000000000000..a89b53e63d34 --- /dev/null +++ b/games-engines/devilutionx/files/devilutionx-1.2.1-disable-ccache.patch @@ -0,0 +1,17 @@ +We let users enable ccache by themselves. Avoids sandbox violation. + +https://bugs.gentoo.org/813768 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -54,11 +54,6 @@ if(NOT VERSION_NUM) + endif() + endif() + +-find_program(CCACHE_PROGRAM ccache) +-if(CCACHE_PROGRAM) +- set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") +-endif() +- + if(VERSION_NUM MATCHES untagged) + project(DevilutionX + LANGUAGES C CXX)