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 17AB4158089 for ; Wed, 27 Sep 2023 08:34:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 60BB42BC02A; Wed, 27 Sep 2023 08:34:14 +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 4D56A2BC02A for ; Wed, 27 Sep 2023 08:34:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 91C82335CD2 for ; Wed, 27 Sep 2023 08:34:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F7A1123E for ; Wed, 27 Sep 2023 08:34:12 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1695803635.be66c616e363d402e57cb12146fc80e08d8c3805.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/stellarium/, sci-astronomy/stellarium/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-astronomy/stellarium/files/stellarium-0.23.3-ccache.patch sci-astronomy/stellarium/stellarium-23.3.ebuild X-VCS-Directories: sci-astronomy/stellarium/files/ sci-astronomy/stellarium/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: be66c616e363d402e57cb12146fc80e08d8c3805 X-VCS-Branch: master Date: Wed, 27 Sep 2023 08:34:12 +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: 92073f30-d3a2-4b04-9e1d-98ac0edbc0aa X-Archives-Hash: 6c6b9967f78994767848e1cd59f9eb91 commit: be66c616e363d402e57cb12146fc80e08d8c3805 Author: Alexey Sokolov asokolov org> AuthorDate: Tue Sep 26 21:08:25 2023 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Wed Sep 27 08:33:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be66c616 sci-astronomy/stellarium: simplify disabling of ccache Signed-off-by: Alexey Sokolov asokolov.org> Closes: https://github.com/gentoo/gentoo/pull/33078 Signed-off-by: Florian Schmaus gentoo.org> .../stellarium/files/stellarium-0.23.3-ccache.patch | 13 ------------- sci-astronomy/stellarium/stellarium-23.3.ebuild | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/sci-astronomy/stellarium/files/stellarium-0.23.3-ccache.patch b/sci-astronomy/stellarium/files/stellarium-0.23.3-ccache.patch deleted file mode 100644 index e71c9f7f90ea..000000000000 --- a/sci-astronomy/stellarium/files/stellarium-0.23.3-ccache.patch +++ /dev/null @@ -1,13 +0,0 @@ -Don't automagically use ccache https://bugs.gentoo.org/847439 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -196,7 +196,7 @@ IF(OPENGL_DEBUG_LOGGING) - ENDIF() - - # Use ccache if possible --IF(NOT WIN32) -+IF(FALSE) - FIND_PROGRAM(CCACHE_PROGRAM ccache) - IF(CCACHE_PROGRAM) - MESSAGE(STATUS "Found ccache ${CCACHE_PROGRAM}") diff --git a/sci-astronomy/stellarium/stellarium-23.3.ebuild b/sci-astronomy/stellarium/stellarium-23.3.ebuild index 3df848b94c87..0287f1b313ff 100644 --- a/sci-astronomy/stellarium/stellarium-23.3.ebuild +++ b/sci-astronomy/stellarium/stellarium-23.3.ebuild @@ -101,7 +101,6 @@ RESTRICT="!test? ( test )" PATCHES=( "${FILESDIR}/stellarium-0.20.3-unbundle-zlib.patch" - "${FILESDIR}/stellarium-0.23.3-ccache.patch" ) VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/stellarium.asc @@ -138,6 +137,7 @@ src_configure() { filter-lto # https://bugs.gentoo.org/862249 local mycmakeargs=( + -DCCACHE_PROGRAM=no -DCPM_LOCAL_PACKAGES_ONLY=yes -DENABLE_GPS="$(usex gps)" -DENABLE_MEDIA="$(usex media)"