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

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

commit:     5927fa068889aa555a1f9657e27305eb11ffae37
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Mar 18 09:12:08 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 16:14:22 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5927fa06

media-gfx/freecad: drop environment file

Setting PYTHONPATH seems no longer be needed and raises incompatibilities
with other packages.

Also, AddonManager plugin now needs webchannel and webengine support for pyside2,
thus the USEDEP string has been updated to include USE flags for these.

Bug: https://bugs.gentoo.org/835331
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24636
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/freecad/files/99freecad                                     | 1 -
 .../freecad/{freecad-0.19.2-r6.ebuild => freecad-0.19.2-r7.ebuild}    | 2 --
 media-gfx/freecad/freecad-9999.ebuild                                 | 4 +---
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/media-gfx/freecad/files/99freecad b/media-gfx/freecad/files/99freecad
deleted file mode 100644
index 81104107c22e..000000000000
--- a/media-gfx/freecad/files/99freecad
+++ /dev/null
@@ -1 +0,0 @@
-PYTHONPATH=/usr/lib64/freecad/Ext:/usr/lib64/freecad/Mod:/usr/lib64/freecad/lib64

diff --git a/media-gfx/freecad/freecad-0.19.2-r6.ebuild b/media-gfx/freecad/freecad-0.19.2-r7.ebuild
similarity index 99%
rename from media-gfx/freecad/freecad-0.19.2-r6.ebuild
rename to media-gfx/freecad/freecad-0.19.2-r7.ebuild
index 931a6260baa1..aa2041fd5f01 100644
--- a/media-gfx/freecad/freecad-0.19.2-r6.ebuild
+++ b/media-gfx/freecad/freecad-0.19.2-r7.ebuild
@@ -273,8 +273,6 @@ src_install() {
 	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
-
-	doenvd "${FILESDIR}/99${PN}"
 }
 
 pkg_postinst() {

diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index 97ada209ae61..377cf7cb37ba 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -87,7 +87,7 @@ RDEPEND="
 		dev-python/numpy[${PYTHON_USEDEP}]
 		>=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
 		dev-python/pybind11[${PYTHON_USEDEP}]
-		dev-python/pyside2[gui,svg,${PYTHON_USEDEP}]
+		dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
 		dev-python/shiboken2[${PYTHON_USEDEP}]
 		addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] )
 		fem? ( dev-python/ply[${PYTHON_USEDEP}] )
@@ -270,8 +270,6 @@ src_install() {
 	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
-
-	doenvd "${FILESDIR}/99${PN}"
 }
 
 pkg_postinst() {