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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 530E11581FB for ; Sun, 24 Nov 2024 20:25:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 538EFE07EC; Sun, 24 Nov 2024 20:25:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E693E07EC for ; Sun, 24 Nov 2024 20:25:12 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 754DF340836 for ; Sun, 24 Nov 2024 20:25:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C23271E75 for ; Sun, 24 Nov 2024 20:25:09 +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: <1732479862.4441effb71a9457ea25cef1006500c8c71e9757b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/, media-gfx/freecad/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/freecad/files/freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch media-gfx/freecad/freecad-1.0.0-r1.ebuild X-VCS-Directories: media-gfx/freecad/ media-gfx/freecad/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4441effb71a9457ea25cef1006500c8c71e9757b X-VCS-Branch: master Date: Sun, 24 Nov 2024 20:25:09 +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: 4c3161e8-9f0a-4243-a607-300704e1a304 X-Archives-Hash: 9310297cf300e0bcc26e4eaf03881a07 commit: 4441effb71a9457ea25cef1006500c8c71e9757b Author: Chris Mayo gmail com> AuthorDate: Tue Oct 29 19:57:30 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Nov 24 20:24:22 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4441effb media-gfx/freecad: Stop converting line endings Closes: https://bugs.gentoo.org/939791 Signed-off-by: Chris Mayo gmail.com> Signed-off-by: Sam James gentoo.org> ...freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch | 15 +++++++++++++++ media-gfx/freecad/freecad-1.0.0-r1.ebuild | 5 +---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/media-gfx/freecad/files/freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch new file mode 100644 index 000000000000..d901e47e2ca0 --- /dev/null +++ b/media-gfx/freecad/files/freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch @@ -0,0 +1,15 @@ +--- a/src/Tools/SubWCRev.py ++++ b/src/Tools/SubWCRev.py +@@ -510,12 +510,6 @@ def main(): + bindir = a + + vcs = [ +- GitControl(), +- DebianGitHub(), +- BazaarControl(), +- Subversion(), +- MercurialControl(), +- DebianChangelog(), + UnknownControl(), + ] + for i in vcs: diff --git a/media-gfx/freecad/freecad-1.0.0-r1.ebuild b/media-gfx/freecad/freecad-1.0.0-r1.ebuild index 80786d6c93dc..a1ac43e6031f 100644 --- a/media-gfx/freecad/freecad-1.0.0-r1.ebuild +++ b/media-gfx/freecad/freecad-1.0.0-r1.ebuild @@ -130,7 +130,6 @@ DEPEND="${RDEPEND} ) " BDEPEND=" - app-text/dos2unix dev-lang/swig test? ( $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') @@ -164,7 +163,7 @@ REQUIRED_USE=" # There is no py3.12 support planned for pyside2 PATCHES=( - "${FILESDIR}"/${PN}-1.0.0-Gentoo-specific-don-t-check-vcs.patch + "${FILESDIR}"/${PN}-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch "${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch ) @@ -183,8 +182,6 @@ src_prepare() { # Fix desktop file sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecad.FreeCAD.desktop || die - find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings" - cmake_src_prepare }