From cf33cd6be476e25d3bb5f607cb1d204c96e55f89 Mon Sep 17 00:00:00 2001
From: Yongxiang Liang <tanekliang@gmail.com>
Date: Sat, 9 Mar 2024 00:59:42 +0800
Subject: app-i18n/fcitx-qt: fix build with pure wayland

Closes: https://github.com/gentoo/gentoo/pull/35673
Signed-off-by: Yongxiang Liang <tanekliang@gmail.com>
Signed-off-by: Yixun Lan <dlan@gentoo.org>
---
 app-i18n/fcitx-qt/fcitx-qt-5.1.5-r1.ebuild | 66 ++++++++++++++++++++++++++++++
 app-i18n/fcitx-qt/fcitx-qt-5.1.5.ebuild    | 65 -----------------------------
 2 files changed, 66 insertions(+), 65 deletions(-)
 create mode 100644 app-i18n/fcitx-qt/fcitx-qt-5.1.5-r1.ebuild
 delete mode 100644 app-i18n/fcitx-qt/fcitx-qt-5.1.5.ebuild

(limited to 'app-i18n')

diff --git a/app-i18n/fcitx-qt/fcitx-qt-5.1.5-r1.ebuild b/app-i18n/fcitx-qt/fcitx-qt-5.1.5-r1.ebuild
new file mode 100644
index 000000000000..e08026f4846e
--- /dev/null
+++ b/app-i18n/fcitx-qt/fcitx-qt-5.1.5-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="fcitx5-qt"
+
+inherit cmake
+
+DESCRIPTION="Qt library and IM module for fcitx5"
+HOMEPAGE="https://github.com/fcitx/fcitx5-qt"
+SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="BSD LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+IUSE="+qt5 onlyplugin staticplugin qt6 +X wayland"
+REQUIRED_USE="
+	|| ( qt5 qt6 )
+	qt5? ( X )
+	staticplugin? ( onlyplugin )
+"
+
+RDEPEND="
+	!onlyplugin? (
+		>=app-i18n/fcitx-5.1.5:5
+		qt5? ( dev-qt/qtconcurrent:5 )
+	)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5=
+		dev-qt/qtwidgets:5
+		wayland? ( dev-qt/qtwayland:5 )
+	)
+	qt6? (
+		dev-qt/qtbase:6[dbus,gui,widgets,wayland?]
+		wayland? ( dev-qt/qtwayland:6 )
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb
+		x11-libs/libxkbcommon
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	kde-frameworks/extra-cmake-modules:0
+	virtual/pkgconfig
+	!onlyplugin? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_QT4=no
+		-DENABLE_QT5=$(usex qt5)
+		-DENABLE_QT6=$(usex qt6)
+		-DENABLE_QT6_WAYLAND_WORKAROUND=$(usex qt6 $(usex wayland))
+		-DENABLE_X11=$(usex X)
+		-DBUILD_ONLY_PLUGIN=$(usex onlyplugin)
+		-DBUILD_STATIC_PLUGIN=$(usex staticplugin)
+	)
+	cmake_src_configure
+}
diff --git a/app-i18n/fcitx-qt/fcitx-qt-5.1.5.ebuild b/app-i18n/fcitx-qt/fcitx-qt-5.1.5.ebuild
deleted file mode 100644
index 6aef4f82cf22..000000000000
--- a/app-i18n/fcitx-qt/fcitx-qt-5.1.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="fcitx5-qt"
-
-inherit cmake
-
-DESCRIPTION="Qt library and IM module for fcitx5"
-HOMEPAGE="https://github.com/fcitx/fcitx5-qt"
-SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.xz -> ${P}.tar.xz"
-
-LICENSE="BSD LGPL-2.1+"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
-IUSE="+qt5 onlyplugin staticplugin qt6 +X wayland"
-REQUIRED_USE="
-	|| ( qt5 qt6 )
-	qt5? ( X )
-	staticplugin? ( onlyplugin )
-"
-
-RDEPEND="
-	!onlyplugin? (
-		>=app-i18n/fcitx-5.1.5:5
-		qt5? ( dev-qt/qtconcurrent:5 )
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5=
-		dev-qt/qtwidgets:5
-		wayland? ( dev-qt/qtwayland:5 )
-	)
-	qt6? (
-		dev-qt/qtbase:6[dbus,gui,widgets,wayland?]
-		wayland? ( dev-qt/qtwayland:6 )
-	)
-	X? (
-		x11-libs/libX11
-		x11-libs/libxcb
-		x11-libs/libxkbcommon
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	kde-frameworks/extra-cmake-modules:0
-	virtual/pkgconfig
-	!onlyplugin? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_QT4=no
-		-DENABLE_QT5=$(usex qt5)
-		-DENABLE_QT6=$(usex qt6)
-		-DENABLE_QT6_WAYLAND_WORKAROUND=$(usex qt6 $(usex wayland))
-		-DBUILD_ONLY_PLUGIN=$(usex onlyplugin)
-		-DBUILD_STATIC_PLUGIN=$(usex staticplugin)
-	)
-	cmake_src_configure
-}
-- 
cgit v1.2.3-65-gdbad