commit:     5f1ddf94909ca9733f067c26eef71965d5371314
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 25 14:01:24 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Apr 25 14:01:33 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f1ddf94

media-gfx/freecad: updated patch for 9999

Closes: https://bugs.gentoo.org/905004
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 ...-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch |  6 ------
 .../freecad-9999-Gentoo-specific-don-t-check-vcs.patch    | 15 +++++++++++++++
 media-gfx/freecad/freecad-9999.ebuild                     |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git 
a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
 
b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
index c8772febdee8..8e875c1811f5 100644
--- 
a/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
+++ 
b/media-gfx/freecad/files/freecad-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
@@ -4,12 +4,6 @@ Date: Fri, 12 Mar 2021 23:55:09 +0100
 Subject: [PATCH] [Gentoo specific] Remove ccache usage
 
 Signed-off-by: Bernd Waibel <waebbl-gen...@posteo.net>
----
- CMakeLists.txt | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5b17736..38e482a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -8,11 +8,6 @@ if (POLICY CMP0072)

diff --git 
a/media-gfx/freecad/files/freecad-9999-Gentoo-specific-don-t-check-vcs.patch 
b/media-gfx/freecad/files/freecad-9999-Gentoo-specific-don-t-check-vcs.patch
new file mode 100644
index 000000000000..3c8b61ab56a4
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-9999-Gentoo-specific-don-t-check-vcs.patch
@@ -0,0 +1,15 @@
+--- a/src/Tools/SubWCRev.py
++++ b/src/Tools/SubWCRev.py
+@@ -509,12 +509,6 @@ def main():
+             bindir = a
+ 
+     vcs = [
+-        GitControl(),
+-        DebianGitHub(),
+-        BazaarControl(),
+-        Subversion(),
+-        MercurialControl(),
+-        DebianChangelog(),
+         UnknownControl(),
+     ]
+     for i in vcs:

diff --git a/media-gfx/freecad/freecad-9999.ebuild 
b/media-gfx/freecad/freecad-9999.ebuild
index b9d1e7ae4206..47fbacf3eba4 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -136,7 +136,7 @@ REQUIRED_USE="
 "
 
 PATCHES=(
-       "${FILESDIR}"/${PN}-0.19.4-Gentoo-specific-don-t-check-vcs.patch
+       "${FILESDIR}"/${PN}-9999-Gentoo-specific-don-t-check-vcs.patch
        
"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
        
"${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch
 )

Reply via email to