commit: 16b3ee2a97c86e1d0183f2c41d83ee2571ea3adc Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Jan 26 17:24:33 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jan 26 23:03:01 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16b3ee2a
*/*: qmake-utils.eclass consumers: Make use of qt6_get_libexecdir Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> Part-of: https://github.com/gentoo/gentoo/pull/45527 Signed-off-by: Sam James <sam <AT> gentoo.org> app-crypt/pinentry/pinentry-1.3.2-r1.ebuild | 4 ++-- dev-libs/kdsingleapplication/kdsingleapplication-1.2.0.ebuild | 4 ++-- media-gfx/engauge/engauge-12.9.1.ebuild | 4 ++-- media-gfx/engauge/engauge-9999.ebuild | 4 ++-- net-libs/accounts-qt/accounts-qt-1.17-r2.ebuild | 4 ++-- net-libs/signond/signond-8.61-r102.ebuild | 4 ++-- .../qelectrotech/qelectrotech-0.90_pre20250820.ebuild | 4 ++-- sci-mathematics/octave/octave-9.2.0-r2.ebuild | 10 +++++----- x11-themes/smplayer-skins/smplayer-skins-20.11.0.ebuild | 2 +- x11-themes/smplayer-themes/smplayer-themes-20.11.0.ebuild | 2 +- 10 files changed, 21 insertions(+), 21 deletions(-) diff --git a/app-crypt/pinentry/pinentry-1.3.2-r1.ebuild b/app-crypt/pinentry/pinentry-1.3.2-r1.ebuild index 6f36bf8224c6..a33429935f3a 100644 --- a/app-crypt/pinentry/pinentry-1.3.2-r1.ebuild +++ b/app-crypt/pinentry/pinentry-1.3.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -87,7 +87,7 @@ src_configure() { if use qt6 ; then export PATH="$(qt6_get_bindir):${PATH}" export QTLIB="$(qt6_get_libdir):${QTLIB}" - export MOC="$(qt6_get_libdir)/qt6/libexec/moc" + export MOC="$(qt6_get_libexecdir)/moc" myeconfargs+=( $(use_enable wayland kf6-wayland) diff --git a/dev-libs/kdsingleapplication/kdsingleapplication-1.2.0.ebuild b/dev-libs/kdsingleapplication/kdsingleapplication-1.2.0.ebuild index 84338c6eeaab..0be1e931fa3c 100644 --- a/dev-libs/kdsingleapplication/kdsingleapplication-1.2.0.ebuild +++ b/dev-libs/kdsingleapplication/kdsingleapplication-1.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 2024-2025 Gentoo Authors +# Copyright 2024-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -36,7 +36,7 @@ src_configure() { -DKDSingleApplication_TESTS=$(usex test) ) use doc && mycmakeargs+=( - -DQHELPGEN_EXECUTABLE="$(qt6_get_bindir)/../libexec/qhelpgenerator" + -DQHELPGEN_EXECUTABLE="$(qt6_get_libexecdir)/qhelpgenerator" ) cmake_src_configure } diff --git a/media-gfx/engauge/engauge-12.9.1.ebuild b/media-gfx/engauge/engauge-12.9.1.ebuild index 9ed2e5c24f65..36ada5fadc61 100644 --- a/media-gfx/engauge/engauge-12.9.1.ebuild +++ b/media-gfx/engauge/engauge-12.9.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -62,7 +62,7 @@ src_configure() { $(usex pdf "CONFIG+=pdf PKGCONFIG+=poppler-qt6" "") \ engauge.pro pushd help >/dev/null || die - $(qt6_get_libdir)/qt6/libexec/qhelpgenerator engauge.qhp || die + $(qt6_get_libexecdir)/qhelpgenerator engauge.qhp || die popd >/dev/null || die } diff --git a/media-gfx/engauge/engauge-9999.ebuild b/media-gfx/engauge/engauge-9999.ebuild index ddc0da49cd6b..04bac85fdfe8 100644 --- a/media-gfx/engauge/engauge-9999.ebuild +++ b/media-gfx/engauge/engauge-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -62,7 +62,7 @@ src_configure() { $(usex pdf "CONFIG+=pdf PKGCONFIG+=poppler-qt6" "") \ engauge.pro pushd help >/dev/null || die - $(qt6_get_libdir)/qt6/libexec/qhelpgenerator engauge.qhp || die + $(qt6_get_libexecdir)/qhelpgenerator engauge.qhp || die popd >/dev/null || die } diff --git a/net-libs/accounts-qt/accounts-qt-1.17-r2.ebuild b/net-libs/accounts-qt/accounts-qt-1.17-r2.ebuild index 417918c1e7eb..351d8be7184d 100644 --- a/net-libs/accounts-qt/accounts-qt-1.17-r2.ebuild +++ b/net-libs/accounts-qt/accounts-qt-1.17-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -44,7 +44,7 @@ src_prepare() { sed -e "s|share/doc/\$\${PROJECT_NAME}|share/doc/${PF}|" \ -i doc/doc.pri || die - sed -e "/QHG_LOCATION/s|qhelpgenerator|$(qt6_get_libdir)/qt6/libexec/&|" \ + sed -e "/QHG_LOCATION/s|qhelpgenerator|$(qt6_get_libexecdir)/&|" \ -i doc/doxy.conf || die if ! use doc; then sed -e "/include( doc\/doc.pri )/d" -i ${PN}.pro || die diff --git a/net-libs/signond/signond-8.61-r102.ebuild b/net-libs/signond/signond-8.61-r102.ebuild index e8a58b31c30e..3a7da6ebd284 100644 --- a/net-libs/signond/signond-8.61-r102.ebuild +++ b/net-libs/signond/signond-8.61-r102.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -58,7 +58,7 @@ PATCHES=( src_prepare() { default - sed -e "/QHG_LOCATION/s|qhelpgenerator|$(qt6_get_libdir)/qt6/libexec/&|" \ + sed -e "/QHG_LOCATION/s|qhelpgenerator|$(qt6_get_libexecdir)/&|" \ -i {lib/plugins/,lib/SignOn/,}doc/doxy.conf || die # install docs to correct location diff --git a/sci-electronics/qelectrotech/qelectrotech-0.90_pre20250820.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.90_pre20250820.ebuild index 5c49bfad73ce..f303feb80357 100644 --- a/sci-electronics/qelectrotech/qelectrotech-0.90_pre20250820.ebuild +++ b/sci-electronics/qelectrotech/qelectrotech-0.90_pre20250820.ebuild @@ -1,4 +1,4 @@ -# Copyright 2001-2025 Gentoo Authors +# Copyright 2001-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -58,7 +58,7 @@ PATCHES=( src_prepare() { cmake_src_prepare - sed -e "/QHG_LOCATION/s:\".*\":""$(qt6_get_bindir)/../libexec/qhelpgenerator"":" -i Doxyfile || die + sed -e "/QHG_LOCATION/s:\".*\":""$(qt6_get_libexecdir)/qhelpgenerator"":" -i Doxyfile || die } src_configure() { diff --git a/sci-mathematics/octave/octave-9.2.0-r2.ebuild b/sci-mathematics/octave/octave-9.2.0-r2.ebuild index c1c05db298f0..3bdc64c9c564 100644 --- a/sci-mathematics/octave/octave-9.2.0-r2.ebuild +++ b/sci-mathematics/octave/octave-9.2.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -181,11 +181,11 @@ src_configure() { # Tell autoconf where to find qt binaries, fix bug #837752 if use gui ; then - export MOC="$(qt6_get_bindir)/../libexec/moc" \ - UIC="$(qt6_get_bindir)/../libexec/uic" \ - RCC="$(qt6_get_bindir)/../libexec/rcc" \ + export MOC="$(qt6_get_libexecdir)/moc" \ + UIC="$(qt6_get_libexecdir)/uic" \ + RCC="$(qt6_get_libexecdir)/rcc" \ LRELEASE="$(qt6_get_bindir)/lrelease" \ - QHELPGENERATOR="$(qt6_get_bindir)/../libexec/qhelpgenerator" + QHELPGENERATOR="$(qt6_get_libexecdir)/qhelpgenerator" fi econf "${myeconfargs[@]}" diff --git a/x11-themes/smplayer-skins/smplayer-skins-20.11.0.ebuild b/x11-themes/smplayer-skins/smplayer-skins-20.11.0.ebuild index f5a58bcedf0d..40340fa1c264 100644 --- a/x11-themes/smplayer-skins/smplayer-skins-20.11.0.ebuild +++ b/x11-themes/smplayer-skins/smplayer-skins-20.11.0.ebuild @@ -20,7 +20,7 @@ src_prepare() { default sed -i -e 's/make/$(MAKE)/' Makefile || die - sed -i -e "s|rcc -binary|$(qt6_get_bindir)/../libexec/&|" themes/Makefile || die + sed -i -e "s|rcc -binary|$(qt6_get_libexecdir)/&|" themes/Makefile || die } src_install() { diff --git a/x11-themes/smplayer-themes/smplayer-themes-20.11.0.ebuild b/x11-themes/smplayer-themes/smplayer-themes-20.11.0.ebuild index 160588f2915f..f15d90a499b2 100644 --- a/x11-themes/smplayer-themes/smplayer-themes-20.11.0.ebuild +++ b/x11-themes/smplayer-themes/smplayer-themes-20.11.0.ebuild @@ -21,7 +21,7 @@ src_prepare() { default # bug 544108 - sed -i -e "s|rcc -binary|$(qt6_get_bindir)/../libexec/&|" themes/Makefile || die + sed -i -e "s|rcc -binary|$(qt6_get_libexecdir)/&|" themes/Makefile || die # bug 544160 sed -i -e 's/make/$(MAKE)/' Makefile || die
