commit: 861c7cfb378586bbc29af6ae02fcc0df5522736b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 21 11:09:03 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr 22 16:27:14 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=861c7cfb
app-i18n/fcitx-unikey: Drop IUSE qt5, qt6; fix IUSE gui no-op
- app-i18n/fcitx-qt[qt6(+)] USEdep default analogous to fcitx-configtool
- USE=-gui was doing nothing since ENABLE_QT is default enabled
- USE=qt5 was doing nothing since it did not tick any cmake arg
- nor was it exclusive-or enforced by REQUIRED_USE constraints
but their cmake build system does not allow both to be enabled
- wire up IUSE test with cmake arg
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...y-5.1.6.ebuild => fcitx-unikey-5.1.6-r1.ebuild} | 28 +++++++---------------
app-i18n/fcitx-unikey/fcitx-unikey-5.1.6.ebuild | 2 +-
2 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-5.1.6.ebuild
b/app-i18n/fcitx-unikey/fcitx-unikey-5.1.6-r1.ebuild
similarity index 67%
copy from app-i18n/fcitx-unikey/fcitx-unikey-5.1.6.ebuild
copy to app-i18n/fcitx-unikey/fcitx-unikey-5.1.6-r1.ebuild
index 6536fa939b23..2c287b009738 100644
--- a/app-i18n/fcitx-unikey/fcitx-unikey-5.1.6.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-5.1.6-r1.ebuild
@@ -4,7 +4,6 @@
EAPI=8
MY_PN="fcitx5-unikey"
-
inherit cmake unpacker xdg
DESCRIPTION="Unikey (Vietnamese Input Method) engine support for Fcitx"
@@ -15,22 +14,13 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="LGPL-2+ GPL-2+"
SLOT="5"
KEYWORDS="~amd64 ~x86"
-IUSE="+gui +qt5 qt6 test"
+IUSE="+gui test"
RESTRICT="!test? ( test )"
RDEPEND="
>=app-i18n/fcitx-5.1.12:5
- >=app-i18n/fcitx-qt-5.0.12[qt5?,qt6?,-onlyplugin]
- gui? (
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5=
- dev-qt/qtwidgets:5
- )
- qt6? (
- dev-qt/qtbase:6[dbus,gui,widgets]
- )
- )
+ >=app-i18n/fcitx-qt-5.1.4:5[qt6(+),-onlyplugin]
+ gui? ( dev-qt/qtbase:6[dbus,gui,widgets] )
"
DEPEND="${RDEPEND}"
BDEPEND="
@@ -39,12 +29,10 @@ BDEPEND="
"
src_configure() {
- local mycmakeargs=( )
- if use gui; then
- mycmakeargs+=(
- -DENABLE_QT=ON
- -DUSE_QT6=$(usex qt6)
- )
- fi
+ local mycmakeargs=(
+ -DENABLE_QT=$(usex gui)
+ -DENABLE_TEST=$(usex test)
+ -DUSE_QT6=ON
+ )
cmake_src_configure
}
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-5.1.6.ebuild
b/app-i18n/fcitx-unikey/fcitx-unikey-5.1.6.ebuild
index 6536fa939b23..69102a4d17e2 100644
--- a/app-i18n/fcitx-unikey/fcitx-unikey-5.1.6.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-5.1.6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
LICENSE="LGPL-2+ GPL-2+"
SLOT="5"
KEYWORDS="~amd64 ~x86"
-IUSE="+gui +qt5 qt6 test"
+IUSE="+gui qt5 +qt6 test"
RESTRICT="!test? ( test )"
RDEPEND="
