gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

*/*: qmake-utils.eclass consumers: Make use of qt6_get_libexecdir

Browse Source 
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Part-of: https://github.com/gentoo/gentoo/pull/45527
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2026-01-26 18:24:33 +01:00
committed by Sam James
parent 70a4eda488
commit 16b3ee2a97
10 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app-crypt/pinentry/pinentry-1.3.2-r1.ebuild
View File

@@ -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)

4
dev-libs/kdsingleapplication/kdsingleapplication-1.2.0.ebuild
View File

@@ -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
}

4
media-gfx/engauge/engauge-12.9.1.ebuild
View File

@@ -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
}

4
media-gfx/engauge/engauge-9999.ebuild
View File

@@ -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
}

4
net-libs/accounts-qt/accounts-qt-1.17-r2.ebuild
View File

@@ -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

4
net-libs/signond/signond-8.61-r102.ebuild
View File

@@ -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

4
sci-electronics/qelectrotech/qelectrotech-0.90_pre20250820.ebuild
View File

@@ -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() {

10
sci-mathematics/octave/octave-9.2.0-r2.ebuild
View File

@@ -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[@]}"

2
x11-themes/smplayer-skins/smplayer-skins-20.11.0.ebuild
View File

@@ -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() {

2
x11-themes/smplayer-themes/smplayer-themes-20.11.0.ebuild
View File

@@ -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