diff options
Diffstat (limited to 'media-gfx/freecad')
-rw-r--r-- | media-gfx/freecad/Manifest | 4 | ||||
-rw-r--r-- | media-gfx/freecad/freecad-0.21.2-r2.ebuild (renamed from media-gfx/freecad/freecad-0.21.2-r1.ebuild) | 10 | ||||
-rw-r--r-- | media-gfx/freecad/freecad-9999.ebuild | 10 |
3 files changed, 16 insertions, 8 deletions
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index c27d079c8025..47a6fe13a5ee 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-r1.ebuild 11555 BLAKE2B 02b88a2f64c1da4dc8c68c240081a1773221973c9a5f6eb4c4e424cc77dcfb8438b2e4bdc6b85f0110c4944eaf8a1f90cba3e1fd7b1826d69585833da8490680 SHA512 59a849fb0f7178709b33dd6ae83c2b396583bb766e3d99f9484daa6710815dec0fb6e4b249c9fcbb2a687e6c2f0673e85ee8bd08190d2a1471f632d7764a11a2 -EBUILD freecad-9999.ebuild 11589 BLAKE2B 113505b1df62b9f3729a524c82dbec91179e4b8c51bc1743a841db9e3454c265e5c976cf8013b781673443ca4ca5bff65b17a30f9a8326c0168af4bb242659b9 SHA512 c00bfe2d56936bbf48a4ac2b4ffa0323a04a4a4a9eed1ce47f64c2664831bab72b931ad813ce1275e72b3d303eb3dccba04530036c41e4be0663cafb0f944067 +EBUILD freecad-0.21.2-r2.ebuild 11611 BLAKE2B 2490ec4fc5768af96fea39379a9036b080bbe8346f91d5a1419195d802c218db16f3ea20f27e368e8e2a027cafe016ed16c70a1c53af20914a2a0f5f0480b7c1 SHA512 8b0b517d38d490e6b66f8b5af041cbba1fdc4e40fb2363abb2fe1622287ccc875ab1715149c90f3686f7cf58bf909de0fd86b1b467ec94b490bd038d3d50322c +EBUILD freecad-9999.ebuild 11806 BLAKE2B b8e736cfd141ea76dfd110b851b7d97c55eddfeffb1bf646d9765971a9d233996163d737e85036d572aba1db51e6e94d40693a3b4a1374c6e7b1eec522f0ea61 SHA512 941f25542b702f0d7fd1d617d966a3358edb51ecf9d401195cd73bdb520255c5fa196632f86acec2b32a88fe5aa1b2ab56fe5efb95c4154d465a0a6c51bbcab9 MISC metadata.xml 3189 BLAKE2B b236dc1ac3c1a56609cc0d40b6f6ed5cb0c70ce06bd3c5dce45c5f3bcf1d06548a3d62e7e5c786278f84a6874ed330a470a753946c1e6963e7b5fa7d43854eb8 SHA512 ac8018f6c6819c237168228bd767659e1fd1b7aec18c8581a284e498a91dceda78ced26f7a5a1f3b110956fd940f72c677984e1127f76c9fd6330a7d54044fa2 diff --git a/media-gfx/freecad/freecad-0.21.2-r1.ebuild b/media-gfx/freecad/freecad-0.21.2-r2.ebuild index a2c42145c9aa..6f67542fe86c 100644 --- a/media-gfx/freecad/freecad-0.21.2-r1.ebuild +++ b/media-gfx/freecad/freecad-0.21.2-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit check-reqs cmake optfeature python-single-r1 qmake-utils xdg @@ -99,6 +99,7 @@ RDEPEND=" ) qt6? ( designer? ( dev-qt/qttools:6[designer] ) + dev-qt/qt5compat:6 dev-qt/qttools:6[widgets] dev-qt/qtbase:6[gui,opengl,widgets] dev-qt/qtsvg:6 @@ -157,9 +158,7 @@ REQUIRED_USE=" designer? ( gui ) inspection? ( points ) path? ( robot ) - python_single_target_python3_12? ( gui? ( qt6 ) ) " -# There is no py3.12 support planned for pyside2 PATCHES=( "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch @@ -194,7 +193,6 @@ src_configure() { -DBUILD_COMPLETE=OFF # deprecated -DBUILD_DRAFT=ON -DBUILD_DESIGNER_PLUGIN=$(usex designer) - -DBUILD_DRAWING=ON -DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for >=boost-1.77.0 -DBUILD_FEM=$(usex fem) -DBUILD_FEM_NETGEN=$(usex netgen) @@ -279,6 +277,8 @@ src_configure() { -DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc" -DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc" -DBUILD_QT5=OFF + # Drawing module unmaintained and not ported to qt6 + -DBUILD_DRAWING=OFF ) else mycmakeargs+=( @@ -288,6 +288,8 @@ src_configure() { -DQt5Core_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" -DQt5Core_RCC_EXECUTABLE="$(qt5_get_bindir)/rcc" -DBUILD_QT5=ON + # Drawing module unmaintained and not ported to qt6 + -DBUILD_DRAWING=ON ) fi diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index afcff7e93e63..05acf4426854 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -45,6 +45,7 @@ RESTRICT="!test? ( test )" RDEPEND=" ${PYTHON_DEPS} + dev-cpp/yaml-cpp dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libfmt:= @@ -98,7 +99,9 @@ RDEPEND=" ' python3_{10..11} ) ) qt6? ( - dev-qt/qttools:6[designer] + designer? ( dev-qt/qttools:6[designer] ) + dev-qt/qt5compat:6 + dev-qt/qttools:6[widgets] dev-qt/qtbase:6[gui,opengl,widgets] dev-qt/qtsvg:6 dev-qt/qtwebengine:6[widgets] @@ -194,7 +197,6 @@ src_configure() { -DBUILD_COMPLETE=OFF # deprecated -DBUILD_DRAFT=ON -DBUILD_DESIGNER_PLUGIN=$(usex designer) - -DBUILD_DRAWING=ON -DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for current git master -DBUILD_FEM=$(usex fem) -DBUILD_FEM_NETGEN=$(usex netgen) @@ -279,6 +281,8 @@ src_configure() { -DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc" -DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc" -DBUILD_QT5=OFF + # Drawing module unmaintained and not ported to qt6 + -DBUILD_DRAWING=OFF ) else mycmakeargs+=( @@ -288,6 +292,8 @@ src_configure() { -DQt5Core_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" -DQt5Core_RCC_EXECUTABLE="$(qt5_get_bindir)/rcc" -DBUILD_QT5=ON + # Drawing module unmaintained and not ported to qt6 + -DBUILD_DRAWING=ON ) fi |