[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/, media-gfx/freecad/files/

["Sam James" <sam@gentoo.org>]

commit:     4441effb71a9457ea25cef1006500c8c71e9757b
Author:     Chris Mayo <aklhfex <AT> gmail <DOT> com>
AuthorDate: Tue Oct 29 19:57:30 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <aklhfex <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> 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
 }