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

["Joonas Niilola" <juippis@gentoo.org>]

commit:     bbdef3fd3ee7165b750f41175238a415e5f81cc5
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Mar 13 14:33:51 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 11:41:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbdef3fd

media-gfx/freecad: several updates with 9999

Fix an issue with selecting correct python, introduced by
https://github.com/FreeCAD/FreeCAD/commit/e2782d0c20111b0563f6e66eb3a7dff1208fe1c5
Remove ccache USE flag, as well as code from CMakeLists.txt

Bug: https://github.com/waebbl/waebbl-gentoo/issues/309
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/19914
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-gfx/freecad/freecad-9999.ebuild | 33 +++++++++++++++++----------------
 media-gfx/freecad/metadata.xml        |  3 ---
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index e2cb13d51fc..47d3587ffec 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 # vtk needs updating to use 3.9
 PYTHON_COMPAT=( python3_{7,8} )
 
-inherit check-reqs cmake desktop optfeature python-single-r1 xdg
+inherit check-reqs cmake desktop eapi8-dosym optfeature python-single-r1 xdg
 
 DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
@@ -16,17 +16,18 @@ if [[ ${PV} = *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/FreeCAD/FreeCAD.git"
 	S="${WORKDIR}/freecad-${PV}"
 else
-	COMMIT=82ec99dbc1f0f054748059ae8bb138eb44b43073
-	SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+	MY_PV=$(ver_cut 1-2)
+	MY_PV=$(ver_rs 1 '_' ${MY_PV})
+	SRC_URI="https://github.com/FreeCAD/FreeCAD/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/FreeCAD-${COMMIT}"
+	S="${WORKDIR}/FreeCAD-${PV}"
 fi
 
 # code is licensed LGPL-2
 # examples are licensed CC-BY-SA (without note of specific version)
 LICENSE="LGPL-2 CC-BY-SA-4.0"
 SLOT="0"
-IUSE="ccache debug headless pcl test"
+IUSE="debug headless pcl test"
 RESTRICT="!test? ( test )"
 
 FREECAD_EXPERIMENTAL_MODULES="cloud plot ship"
@@ -91,10 +92,7 @@ RDEPEND="
 	')
 "
 DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/swig
-	ccache? ( dev-util/ccache )
-"
+BDEPEND="dev-lang/swig"
 
 # To get required dependencies:
 # 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
@@ -121,12 +119,13 @@ REQUIRED_USE="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.19_pre20201231-0001-FindCoin3DDoc.cmake-fix-patch-for-coin-docs.patch
-	"${FILESDIR}"/${PN}-0.19_pre20201231-0002-CMakeLists.txt-add-option-for-ccache.patch
+	"${FILESDIR}"/${PN}-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch
+	"${FILESDIR}"/${PN}-0.19.1-0001-Gentoo-specific-Remove-ccache-usage.patch
 )
 
-DOCS=( README.md ChangeLog.txt CODE_OF_CONDUCT.md )
+DOCS=( CODE_OF_CONDUCT.md ChangeLog.txt README.md )
 
-CHECKREQS_DISK_BUILD="7G"
+CHECKREQS_DISK_BUILD="3G"
 
 pkg_setup() {
 	check-reqs_pkg_setup
@@ -204,7 +203,7 @@ src_configure() {
 
 		-DFREECAD_BUILD_DEBIAN=OFF
 
-		-DFREECAD_USE_CCACHE=$(usex ccache)
+		-DFREECAD_USE_CCACHE=OFF
 		-DFREECAD_USE_EXTERNAL_KDL=ON
 		-DFREECAD_USE_EXTERNAL_SMESH=OFF		# no package in Gentoo
 		-DFREECAD_USE_EXTERNAL_ZIPIOS=OFF		# doesn't work yet, also no package in Gentoo tree
@@ -215,6 +214,8 @@ src_configure() {
 		-DFREECAD_USE_QT_FILEDIALOG=ON
 		-DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
 
+		-DPython3_EXECUTABLE=${PYTHON}
+
 		-DOCC_INCLUDE_DIR="${CASROOT}"/include/opencascade
 		-DOCC_LIBRARY_DIR="${CASROOT}"/$(get_libdir)
 		-DOCCT_CMAKE_FALLBACK=ON				# don't use occt-config which isn't included in opencascade for Gentoo
@@ -242,12 +243,12 @@ src_install() {
 	cmake_src_install
 
 	if ! use headless; then
-		dosym ../$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+		dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
 		mv "${ED}"/usr/$(get_libdir)/freecad/share/* "${ED}"/usr/share || die "failed to move shared ressources"
 	fi
-	dosym ../$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+	dosym8 -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
 
-	python_optimize "${ED}"/usr/share/${PN}/data/Mod/ "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
+	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
 }
 
 pkg_postinst() {

diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index 599d1643a22..a4419122627 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -18,9 +18,6 @@
 			Build the architecture workbench for working with architectural 
 			elements
 		</flag>
-		<flag name="ccache">
-			Use <pkg>dev-util/ccache</pkg> to build the package.
-		</flag>
 		<flag name="cloud">
 			Build the Cloud workbench, to access cloud providers (mostly
 			Amazon S3).