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

[Joonas Niilola]

commit:     ae75bb2605050c62397e489d9929ddadb1dd246e
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Mon Oct 31 15:16:09 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 15:46:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae75bb26

media-gfx/freecad: swap patch

Swap a patch, available in two different versions to reduce number of
files in ${FILESDIR}. This patch is also used by 0.20.1.

Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28051
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 ...1231-0003-Gentoo-specific-don-t-check-vcs.patch | 26 ----------------------
 media-gfx/freecad/freecad-9999.ebuild              |  4 +++-
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git 
a/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
 
b/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
deleted file mode 100644
index ac8d194d00ea..000000000000
--- 
a/media-gfx/freecad/files/freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From acc8a26b73a87ae024bce30e9f1531610b6e0e5f Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gen...@posteo.net>
-Date: Sat, 13 Feb 2021 14:54:28 +0100
-Subject: [PATCH] [Gentoo specific] don't check vcs
-
-Signed-off-by: Bernd Waibel <waebbl-gen...@posteo.net>
----
- src/Tools/SubWCRev.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Tools/SubWCRev.py b/src/Tools/SubWCRev.py
-index 9795450..59938bd 100644
---- a/src/Tools/SubWCRev.py
-+++ b/src/Tools/SubWCRev.py
-@@ -455,7 +455,7 @@ def main():
-         if o in ("-b", "--bindir"):
-             bindir = a
- 
--    vcs=[GitControl(), DebianGitHub(), BazaarControl(), Subversion(), 
MercurialControl(), DebianChangelog(), UnknownControl()]
-+    vcs=[UnknownControl()]
-     for i in vcs:
-         if i.extractInfo(srcdir, bindir):
-             # Open the template file and the version file
--- 
-2.30.1
-

diff --git a/media-gfx/freecad/freecad-9999.ebuild 
b/media-gfx/freecad/freecad-9999.ebuild
index 67ba7b4138f4..95e48c37bdac 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -120,7 +120,7 @@ REQUIRED_USE="
 "
 
 PATCHES=(
-       
"${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
+       "${FILESDIR}"/${PN}-0.19.4-Gentoo-specific-don-t-check-vcs.patch
        
"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
 )
 
@@ -138,6 +138,8 @@ src_prepare() {
        # Fix desktop file
        sed -e 's/Exec=FreeCAD/Exec=freecad/' -i 
src/XDGData/org.freecadweb.FreeCAD.desktop || die
 
+       find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert 
to unix line endings"
+
        cmake_src_prepare
 }