diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-01-05 14:04:26 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-01-05 14:04:26 +0000 |
commit | 8fd9d385e5bc3c01115ec2ddcb2227607eb90861 (patch) | |
tree | aba1e6ef6b95e94172c009394cd1fcbc383e7d6e /media-gfx | |
parent | 1ddcee0bd115d2f843f82061cb0d1741bf90151d (diff) |
gentoo auto-resync : 05:01:2024 - 14:04:25
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/Manifest.gz | bin | 37688 -> 37687 bytes | |||
-rw-r--r-- | media-gfx/freecad/Manifest | 4 | ||||
-rw-r--r-- | media-gfx/freecad/freecad-0.21.2-r1.ebuild (renamed from media-gfx/freecad/freecad-0.21.2.ebuild) | 17 | ||||
-rw-r--r-- | media-gfx/freecad/freecad-9999.ebuild | 18 |
4 files changed, 28 insertions, 11 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 982a795d7e92..d01b5b6100ca 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index c0e8017be54b..c27d079c8025 100644 --- a/media-gfx/freecad/Manifest +++ b/media-gfx/freecad/Manifest @@ -12,6 +12,6 @@ DIST freecad-0.21.2.tar.gz 66124278 BLAKE2B 84a4f8008192cd1a2ee1737b537b2668a8c0 EBUILD freecad-0.20.2-r1.ebuild 10408 BLAKE2B 503eb47d56c92d9a95727825366a7b16a03f6df378e6a0fe300bed5300ccce77af5d13c09fb797cc6b0deed46747001ded8f439331e34e373e4bfd5ba59cf74a SHA512 ea4520aeb24c1baa91469b5f2f672d8d52217a31901600a8f3f4dbb9a7dff3faf9724e9dd79c39b36ff08d5a63f8acce6779eb1ebae004f951a5a857df522a8d EBUILD freecad-0.20.2-r2.ebuild 10385 BLAKE2B df9d6c357735e35016585e4514a28f3819fff42b9090dda6fc00c3aa41523985fe249e935b858a4bf39b1faf226712b191db62d27ffc77fbf44bc18abe28ca4c SHA512 fc19d0fd6bdcd1abc0dc8f99ced84e39842d4c3f9289a9d5d544da06799aae400f9d91ab607db02bd96e52dd658fba8b70a18fc96114a5b563eba4b6dbc26ff4 EBUILD freecad-0.20.2.ebuild 9858 BLAKE2B 254dcc53a8eecf329854e10af1d13bd6995f4d2720268cd0e0e59ca3e5c10385d6edfe18ff1c5a36fe03d4ae0a4bccf4eafa6f778424b9ef281b15e0e368c6e4 SHA512 5e6f6bffadf57ab79b578790e9bf62934f5b598e09cdb8a6f08c07a06ff8a4d8daf297114c88f4abb5400991526abd28bb00cd7be79333b27a8f0f92179b49cb -EBUILD freecad-0.21.2.ebuild 11192 BLAKE2B 5ec9540ba5aaee49e0bbd113af5e970a7a9da835a785984276b9b41083fc90d4473b9096a1dc537272cdb034bbb6d5fc317e120c432b90c895190347dd2a0258 SHA512 58ae03de3dd786c5100f29a79a9fd00b30f6600303316b989d451b96debe1c06c1bf42d36821e77049d897605dd64b609b3d329f46fb73056d964519ed7bfafe -EBUILD freecad-9999.ebuild 11269 BLAKE2B b0ae03c7850f90b0c581d99bb308dec3cba65e232cc6b12f70cd3abada318d10aac7bbb0c763778584d169f6906d0ef6e124f2188074d5dd67dd10ac7cff785e SHA512 057ab20d766e37931e096237e535b566d71aa68f922656e77a12708bbf177c1618fc745a5b06c33c2f2f80f350515b8ac6ca96240d50893e08750ef33352d3ff +EBUILD freecad-0.21.2-r1.ebuild 11555 BLAKE2B 02b88a2f64c1da4dc8c68c240081a1773221973c9a5f6eb4c4e424cc77dcfb8438b2e4bdc6b85f0110c4944eaf8a1f90cba3e1fd7b1826d69585833da8490680 SHA512 59a849fb0f7178709b33dd6ae83c2b396583bb766e3d99f9484daa6710815dec0fb6e4b249c9fcbb2a687e6c2f0673e85ee8bd08190d2a1471f632d7764a11a2 +EBUILD freecad-9999.ebuild 11589 BLAKE2B 113505b1df62b9f3729a524c82dbec91179e4b8c51bc1743a841db9e3454c265e5c976cf8013b781673443ca4ca5bff65b17a30f9a8326c0168af4bb242659b9 SHA512 c00bfe2d56936bbf48a4ac2b4ffa0323a04a4a4a9eed1ce47f64c2664831bab72b931ad813ce1275e72b3d303eb3dccba04530036c41e4be0663cafb0f944067 MISC metadata.xml 3189 BLAKE2B b236dc1ac3c1a56609cc0d40b6f6ed5cb0c70ce06bd3c5dce45c5f3bcf1d06548a3d62e7e5c786278f84a6874ed330a470a753946c1e6963e7b5fa7d43854eb8 SHA512 ac8018f6c6819c237168228bd767659e1fd1b7aec18c8581a284e498a91dceda78ced26f7a5a1f3b110956fd940f72c677984e1127f76c9fd6330a7d54044fa2 diff --git a/media-gfx/freecad/freecad-0.21.2.ebuild b/media-gfx/freecad/freecad-0.21.2-r1.ebuild index 1932b59458c1..a2c42145c9aa 100644 --- a/media-gfx/freecad/freecad-0.21.2.ebuild +++ b/media-gfx/freecad/freecad-0.21.2-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit check-reqs cmake optfeature python-single-r1 xdg +inherit check-reqs cmake optfeature python-single-r1 qmake-utils xdg DESCRIPTION="QT based Computer Aided Design application" HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD" @@ -81,7 +81,7 @@ RDEPEND=" virtual/glu virtual/opengl !qt6? ( - designer? ( dev-qt/designer:5 ) + dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 @@ -89,6 +89,7 @@ RDEPEND=" dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 + pcl? ( sci-libs/pcl[qt5] ) $(python_gen_cond_dep ' dev-python/matplotlib[${PYTHON_USEDEP}] >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] @@ -98,9 +99,11 @@ RDEPEND=" ) qt6? ( designer? ( dev-qt/qttools:6[designer] ) + dev-qt/qttools:6[widgets] dev-qt/qtbase:6[gui,opengl,widgets] dev-qt/qtsvg:6 dev-qt/qtwebengine:6[widgets] + pcl? ( sci-libs/pcl[-qt5,qt6(-)] ) $(python_gen_cond_dep ' dev-python/matplotlib[${PYTHON_USEDEP}] >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] @@ -111,7 +114,7 @@ RDEPEND=" ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) - pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] ) + pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] dev-python/pybind11[${PYTHON_USEDEP}] @@ -270,14 +273,20 @@ src_configure() { if use qt6; then mycmakeargs+=( + -DFREECAD_QT_MAJOR_VERSION=6 -DFREECAD_QT_VERSION=6 -DQT_DEFAULT_MAJOR_VERSION=6 + -DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc" + -DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc" -DBUILD_QT5=OFF ) else mycmakeargs+=( + -DFREECAD_QT_MAJOR_VERSION=5 -DFREECAD_QT_VERSION=5 -DQT_DEFAULT_MAJOR_VERSION=5 + -DQt5Core_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" + -DQt5Core_RCC_EXECUTABLE="$(qt5_get_bindir)/rcc" -DBUILD_QT5=ON ) fi diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index 37978aa661a6..afcff7e93e63 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 PYTHON_COMPAT=( python3_{10..12} ) -inherit check-reqs cmake optfeature python-single-r1 xdg +inherit check-reqs cmake optfeature python-single-r1 qmake-utils xdg DESCRIPTION="QT based Computer Aided Design application" HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD" @@ -81,7 +81,7 @@ RDEPEND=" virtual/glu virtual/opengl !qt6? ( - designer? ( dev-qt/designer:5 ) + dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 @@ -89,6 +89,7 @@ RDEPEND=" dev-qt/qtwebengine:5[widgets] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 + pcl? ( sci-libs/pcl[qt5] ) $(python_gen_cond_dep ' dev-python/matplotlib[${PYTHON_USEDEP}] >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] @@ -97,10 +98,11 @@ RDEPEND=" ' python3_{10..11} ) ) qt6? ( - designer? ( dev-qt/qttools:6[designer] ) + dev-qt/qttools:6[designer] dev-qt/qtbase:6[gui,opengl,widgets] dev-qt/qtsvg:6 dev-qt/qtwebengine:6[widgets] + pcl? ( sci-libs/pcl[-qt5,qt6(-)] ) $(python_gen_cond_dep ' dev-python/matplotlib[${PYTHON_USEDEP}] >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] @@ -111,7 +113,7 @@ RDEPEND=" ) netgen? ( media-gfx/netgen[opencascade] ) openscad? ( media-gfx/openscad ) - pcl? ( sci-libs/pcl:=[opengl,openni2,qt5,vtk] ) + pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] dev-python/pybind11[${PYTHON_USEDEP}] @@ -271,14 +273,20 @@ src_configure() { if use qt6; then mycmakeargs+=( + -DFREECAD_QT_MAJOR_VERSION=6 -DFREECAD_QT_VERSION=6 -DQT_DEFAULT_MAJOR_VERSION=6 + -DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc" + -DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc" -DBUILD_QT5=OFF ) else mycmakeargs+=( + -DFREECAD_QT_MAJOR_VERSION=5 -DFREECAD_QT_VERSION=5 -DQT_DEFAULT_MAJOR_VERSION=5 + -DQt5Core_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" + -DQt5Core_RCC_EXECUTABLE="$(qt5_get_bindir)/rcc" -DBUILD_QT5=ON ) fi |