From fcc5224904648a8e6eb528d7603154160a20022f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 2 Feb 2022 01:39:05 +0000
Subject: gentoo resync : 02.02.2022

---
 media-gfx/freecad/Manifest            |  3 +--
 media-gfx/freecad/freecad-9999.ebuild | 30 +++++++++++-------------------
 2 files changed, 12 insertions(+), 21 deletions(-)

(limited to 'media-gfx/freecad')

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index a79f3fc8f701..6500fcd4c52d 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -8,7 +8,6 @@ AUX freecad-0.19.2-0007-fix-build-failure-with-opencascade-7.5.2.patch 1054 BLAK
 AUX freecad-0.19_pre20201231-0003-Gentoo-specific-don-t-check-vcs.patch 881 BLAKE2B 8d8327a283fc46b9f195b4dfe68ac6594ed020154f5f65eab5fe86bde2d32bb3d1081fdf9c5d50e30c24ffdc0504a61c047088e24ab4c377aca6e8f5a14e9760 SHA512 17bdf85c6c25d38a46d643666cbf594f5d16952504344af34b1f4960b53a2a534ccac1594d6ae9b5f827fe3403e08a26edb0c40346a9837316307bd484f35088
 DIST freecad-0.19.2-0005-Make-smesh-compile-with-vtk9.patch.xz 5368 BLAKE2B 69bafefd049effe3c31719bb2c23d32e8ba7ad58235c58ac8279ba6c036feaf1b97d5751cf2d68896e7489803103b2d0f92f76e61b3ccc97ef05a95b337ca5c2 SHA512 66585cc13fb3b0b026cf9dbd761c8ba1c1fe4d4f7db2e144ddd97706e02ccd78f4a43ac7cd93ddcae6e73933bf41d4cbd4d94bcdff8804b81378a6d946c7b070
 DIST freecad-0.19.2.tar.gz 296987961 BLAKE2B 3c21359c71f7ac5a49cc4b4be437dfce02f2af73dfc526a3955547718ee41c461fc787d029a9a77374d58516d7c56fec6982fe6d38ab17fbc30c0a94929136bf SHA512 420f00e696725cbd31c936c47b6ac226d866a17c7b7683ad381b8dd5edaffc7dfb1a3c4238c08e8b4fd34ef0c08d7c244cb7797012e596df1ce0a4f6e3be6b72
-DIST freecad-9999-Gentoo-specific-fix-install-locations-of-Ext-and-Mod.patch.xz 4144 BLAKE2B bfd9a0fcd9a6a5fb4c9ef2d5e88e69b869f908142cedf5dd1449b917d90e36187ce6227af99613efedd05eb3218d17e9e6df4430ea0413988340c91c111bbe4e SHA512 5d452eca6bc88fb50ae47a6b6127e39f3d17a60498627920b13273e6afaceaca64e47ade4d1fce18b3bfbcdf4eb13565244ecc575707f1aedf3bb1d6dfc7e89e
 EBUILD freecad-0.19.2-r5.ebuild 10917 BLAKE2B 35866de96fe9b930182522f3728adad45342c15eacebfc798ff294b884b1fcbaebe9158765fd0d1bb2ae99b5894413cec1c6fecfb88e6ce7e64dee809f971840 SHA512 6fd55da6d9b1b4f0b6a68ae6dc1c2c1b40dedf298988dd873500a6da6ba02bc4eb8aeb6eff69f0bbc9e85e4b4ed63fc54e7cc87173c05ba745a28f3c094a523f
-EBUILD freecad-9999.ebuild 10822 BLAKE2B 89e8e85ab4e3d80ee7d3d346de53fda3adb07a5ea057324409ca52f91f5542569b7476b602999aca056088b66f6c51f75822ff4668aeff89ba53965ec280d716 SHA512 a92798699ab2349b3b1bd694a787935a4a01df88ca0ba669a45d96b5b9bb395db412ded3ed399607a7479886b9389ce42b27550e186fe2e40ff166d2c4e1383a
+EBUILD freecad-9999.ebuild 10642 BLAKE2B 2504f33a116f9d10dafcf611eba5673131141077898769011066540a59c9abf5f617f0ab6dad2a35ae2aa2c89295f1babbd4d8b651fb921042e90ddd85f50e85 SHA512 b9216438a9c59c2947945c97c5ff9eb2eb10971208f42e731767f11193e23862487ad8035b558f04a5913b22c1737cfc670ead890c0e1fbdd85974e09f4cca53
 MISC metadata.xml 3268 BLAKE2B 4e99f8237c96f96500ec15a0e175684f445c9a68e1080f6f61538ae4e99cb2afccc14d50c626c44764ea4362ed82cc2ccf74f8ae53d713d70b21860eeb39650d SHA512 fbc87f4a401c33de8033b54213026631a9f956918cc256eb9a10cec88b316f71fd98959c79f58acc3d4a75d28117097ea0cc4ee33f333923d4387e9d3af43bb5
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 2852f295c8e1..97ada209ae61 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,12 +11,10 @@ DESCRIPTION="QT based Computer Aided Design application"
 HOMEPAGE="https://www.freecadweb.org/ https://github.com/FreeCAD/FreeCAD"
 
 MY_PN=FreeCAD
-MY_PATCH="${P}-Gentoo-specific-fix-install-locations-of-Ext-and-Mod"
 
 if [[ ${PV} = *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
-	SRC_URI="https://raw.githubusercontent.com/waebbl/waebbl-gentoo/master/patches/${MY_PATCH}.patch.xz"
 	S="${WORKDIR}/freecad-${PV}"
 else
 	MY_PV=$(ver_cut 1-2)
@@ -139,11 +137,6 @@ pkg_setup() {
 	[[ -z ${CASROOT} ]] && die "\${CASROOT} not set, plesae run eselect opencascade"
 }
 
-src_unpack() {
-	git-r3_src_unpack
-	unpack ${MY_PATCH}.patch.xz
-}
-
 src_prepare() {
 	# the upstream provided file doesn't find the coin doc tag file,
 	# but cmake ships a working one, so we use this.
@@ -153,13 +146,6 @@ src_prepare() {
 	sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
 
 	cmake_src_prepare
-
-	# Fix line endings on a few files for patching
-	for f in src/Mod/{Cloud,Inspection,Start/StartPage}/CMakeLists.txt; do
-		dos2unix -q ${f}
-	done
-
-	eapply "${WORKDIR}"/${P}-Gentoo-specific-fix-install-locations-of-Ext-and-Mod.patch
 }
 
 src_configure() {
@@ -210,10 +196,10 @@ src_configure() {
 		-DBUILD_WEB=ON							# needed by start workspace
 		-DBUILD_WITH_CONDA=OFF
 
-		-DCMAKE_INSTALL_DATADIR=share/${PN}/data
-		-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-		-DCMAKE_INSTALL_INCLUDEDIR=include/${PN}
-		-DCMAKE_INSTALL_LIBDIR=$(get_libdir)/${PN}
+		-DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
+		-DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
+		-DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
 
 		-DFREECAD_BUILD_DEBIAN=OFF
 
@@ -275,6 +261,12 @@ src_install() {
 
 	dobin src/Tools/freecad-thumbnailer
 
+	if ! use headless; then
+		dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCAD /usr/bin/freecad
+		mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources"
+	fi
+	dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
+
 	python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
 	# compile main package in python site-packages as well
 	python_optimize
-- 
cgit v1.2.3