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 06EB2158041 for ; Tue, 9 Apr 2024 14:44:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE1A5E2A54; Tue, 9 Apr 2024 14:44:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 8BC80E2A52 for ; Tue, 9 Apr 2024 14:44:49 +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 9543734323A for ; Tue, 9 Apr 2024 14:44:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 329061662 for ; Tue, 9 Apr 2024 14:44:47 +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: <1712673794.8398394c8cd9b13fa675805b8b4349d9645e2883.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/opencpn/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/opencpn/opencpn-5.8.4.ebuild X-VCS-Directories: sci-geosciences/opencpn/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8398394c8cd9b13fa675805b8b4349d9645e2883 X-VCS-Branch: master Date: Tue, 9 Apr 2024 14:44:47 +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: d4831666-11e6-488c-a4f6-a0ce6d9ae34a X-Archives-Hash: 19a170bcb3bc2b9ba5f0fb9a6bcbffbd commit: 8398394c8cd9b13fa675805b8b4349d9645e2883 Author: Eli Schwartz gmail com> AuthorDate: Mon Apr 8 21:46:52 2024 +0000 Commit: Sam James gentoo org> CommitDate: Tue Apr 9 14:43:14 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8398394c sci-geosciences/opencpn: remove mysterious double-eapply In multiple phase functions, "default" is run in addition to cmake_* eclass phases. This is entirely redundant, as cmake.eclass does this for you. As a result, running it twice would simply attempt to apply a patch that has already been applied, inevitably failing, and causing a very confusing build error when you know the patch does indeed apply. Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> sci-geosciences/opencpn/opencpn-5.8.4.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/sci-geosciences/opencpn/opencpn-5.8.4.ebuild b/sci-geosciences/opencpn/opencpn-5.8.4.ebuild index 816c23d16687..694939aded12 100644 --- a/sci-geosciences/opencpn/opencpn-5.8.4.ebuild +++ b/sci-geosciences/opencpn/opencpn-5.8.4.ebuild @@ -46,7 +46,6 @@ BDEPEND=" " src_prepare() { - default # see bug #907759 sed -i "s/ cc / $(tc-getBUILD_CC) /" "${S}"/CMakeLists.txt cmake_src_prepare @@ -72,7 +71,6 @@ src_configure() { } src_install() { - default cmake_src_install mv "${D}/usr/share/doc/${PN}"/* "${D}/usr/share/doc/${PF}" || die rmdir "${D}/usr/share/doc/${PN}"