Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 926603 - media-gfx/freecad-0.21.2-r1; restore ebuild to prevent rebuild if USE=-qt6
Summary: media-gfx/freecad-0.21.2-r1; restore ebuild to prevent rebuild if USE=-qt6
Status: RESOLVED INVALID
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: Eclasses (show other bugs)
Hardware: All Linux
: Normal normal (vote)
Assignee: Bernd
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2024-03-09 14:44 UTC by CaptainBlood
Modified: 2024-03-10 00:16 UTC (History)
4 users (show)

See Also:
Package list:
Runtime testing required: ---


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description CaptainBlood 2024-03-09 14:44:34 UTC
This is a long lasting ebuild here.
That would prevent power consumption, if no additional enhancements are included in r2.

Reproducible: Always
Comment 1 Andreas Sturmlechner gentoo-dev 2024-03-09 14:47:35 UTC
You can use --exclude to avoid an unwanted upgrade.
Comment 2 CaptainBlood 2024-03-09 17:44:46 UTC
Please reconsider
Cf: https://forums.gentoo.org/viewtopic-t-1167770-highlight-.html
Comment 3 Andrew Ammerlaan gentoo-dev 2024-03-09 18:34:20 UTC
> That would prevent power consumption, if no additional enhancements are included in r2.

But there are additional changes which make the revbump required... so nothing I can do here.
Comment 4 CaptainBlood 2024-03-10 00:09:41 UTC
Bisecting shows how rebuilding qt5 has no additional directive.

amd64 ~ # diff -C 2 freecad-0.21.2-r1-installed.ebuild freecad-0.21.2-r1-latest.ebuild
*** freecad-0.21.2-r1-installed.ebuild   2024-03-09 22:06:45.671916250 +0300
--- freecad-0.21.2-r1-latest.ebuild   2024-03-09 18:46:13.722379023 +0300
***************
*** 60,63 ****
--- 60,64 ----
     qt6? (
        dev-qt/qtbase:6[concurrent,network,xml]
+       dev-qt/qt5compat:6
     )
     media-libs/freetype
amd64 ~ # diff -C 8 freecad-0.21.2-r1-latest.ebuild /var/db/repos/gentoo/media-gfx/freecad/freecad-0.21.2-r2.ebuild
*** freecad-0.21.2-r1-latest.ebuild   2024-03-09 18:46:13.722379023 +0300
--- /var/db/repos/gentoo/media-gfx/freecad/freecad-0.21.2-r2.ebuild   2024-03-09 13:41:22.000000000 +0300
***************
*** 1,14 ****
  # 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 qmake-utils xdg
 
  DESCRIPTION="QT based Computer Aided Design application"
  HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD"
 
  MY_PN=FreeCAD
 
--- 1,14 ----
  # Copyright 1999-2024 Gentoo Authors
  # Distributed under the terms of the GNU General Public License v2
 
  EAPI=8
 
! PYTHON_COMPAT=( python3_{10..11} )
 
  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"
 
  MY_PN=FreeCAD
 
***************
*** 54,70 ****
        dev-qt/qtconcurrent:5
        dev-qt/qtcore:5
        dev-qt/qtnetwork:5
        dev-qt/qtxml:5
        dev-qt/qtxmlpatterns:5
     )
     qt6? (
        dev-qt/qtbase:6[concurrent,network,xml]
-       dev-qt/qt5compat:6
     )
     media-libs/freetype
     media-libs/qhull:=
     sci-libs/hdf5:=[fortran,zlib]
     >=sci-libs/med-4.0.0-r1
     sci-libs/opencascade:=[json,vtk]
     sci-libs/orocos_kdl:=
     sys-libs/zlib
--- 54,69 ----
***************
*** 95,110 ****
--- 94,110 ----
              dev-python/matplotlib[${PYTHON_USEDEP}]
              >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
              dev-python/pyside2[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
              dev-python/shiboken2[${PYTHON_USEDEP}]
           ' python3_{10..11} )
        )
        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
           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}]
***************
*** 153,171 ****
  #
  # The increase in auto-enabled workbenches is due to their need in parts of the
  # test suite when compiled with a minimal set of USE flags.
  REQUIRED_USE="
     ${PYTHON_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
     "${FILESDIR}"/${PN}-0.21.1-Gentoo-specific-don-t-check-vcs.patch
  )
 
  DOCS=( CODE_OF_CONDUCT.md README.md )
 
--- 153,169 ----
***************
*** 190,206 ****
     local mycmakeargs=(
        -DBUILD_ADDONMGR=$(usex addonmgr)
        -DBUILD_ARCH=ON
        -DBUILD_ASSEMBLY=OFF               # deprecated
        -DBUILD_CLOUD=$(usex cloud)
        -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)
        -DBUILD_FLAT_MESH=ON
        -DBUILD_FORCE_DIRECTORY=ON            # force building in a dedicated directory
        -DBUILD_FREETYPE=ON                  # automagic dep
        -DBUILD_GUI=$(usex gui)
        -DBUILD_IDF=$(usex idf)
--- 188,203 ----
***************
*** 275,299 ****
--- 272,300 ----
     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
+          # Drawing module unmaintained and not ported to qt6
+          -DBUILD_DRAWING=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
+          # Drawing module unmaintained and not ported to qt6
+          -DBUILD_DRAWING=ON
        )
     fi
 
     cmake_src_configure
  }
 
  # We use the FreeCADCmd binary instead of the FreeCAD binary here
  # for two reasons:
Comment 5 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2024-03-10 00:14:33 UTC
Just use --exclude.
Comment 6 Sam James archtester Gentoo Infrastructure gentoo-dev Security 2024-03-10 00:16:53 UTC
(In reply to Sam James from comment #5)
> Just use --exclude.

(The revbump was needed as it was wrong beforehand for Qt 6, and there's no way to do a revbump just for one USE flag.)