gentoo auto-resync : 08:10:2024 - 04:26:34

3 files changed, 20 insertions, 120 deletions

diff --git a/app-i18n/fcitx-configtool/Manifest b/app-i18n/fcitx-configtool/Manifest
index 724ac057b813..f74138109f0e 100644
--- a/app-i18n/fcitx-configtool/Manifest
+++ b/app-i18n/fcitx-configtool/Manifest
@@ -2,6 +2,5 @@ DIST fcitx-configtool-0.4.10.tar.xz 50440 BLAKE2B f2f2241d3ea139f6f3de9b8c6ffcc7
 DIST fcitx-configtool-5.1.6.tar.zst 149667 BLAKE2B 2536258eb92c04623b2f1aa77c99cf91919cd4f1d23c0bdf7f87ab8528b2b1305ed6771ee93b25d67ace24dfc5b14413d96d13f5487fe58efe93b36c452ff67a SHA512 1cedd3b5eae3c069774da3456799e26ab36cf8b8a6515cf008fe6e9822bfa7d0992ed69c4ef9671484082778cd5560ee6255446be3ebbf00f305143b20531aeb
 EBUILD fcitx-configtool-0.4.10.ebuild 851 BLAKE2B 97d7acbf9f2984de63df3c6e603fb7d5c4bb8d5828d70d3840b8bc8fb8381388112978c2967f404f485ddc441daaa14b8ea972cad92068dba17cc6758063f7b0 SHA512 e7de180936ec303bfc23e02b77f0d367e94c30253b55dae9bd47ea2a0eb60df7da2360eb25b0c5b6930d08239109629e75179d502e930140b46385bc1a262c7a
 EBUILD fcitx-configtool-4.9999.ebuild 818 BLAKE2B d034a75bf15f37b71243d5d1c15a8ec6114ca559d715101f031d434b1a9478c39298f95b022c7c4f8cd08ad2701eeefb4cef628a4795f5fd15567723b0c71362 SHA512 42b150975f7293dfdb67c6d6479803526438adc80032adbaadf6f03927f6adaafd4469d145d07a21f8b929cba6eddf20e21d2374085c8791d77046ed0f496659
-EBUILD fcitx-configtool-5.1.6-r1.ebuild 2100 BLAKE2B f6caa9ff345290e6a61bb598142fcfefa5935c57f6114441e692fbbdc7cbc9fe9f8595d8b2f6839cdf6884b14f20a176cb3d95c570e8374e427e04463a66ede1 SHA512 0391e6fce39e5aadeec47e3a28b1cf287070abaf0221929c51743a6da28a45b25051b6d612572423382fba70d0839ef79f1bd654a463ba1d07da28cc3311dbf3
-EBUILD fcitx-configtool-5.1.6.ebuild 1583 BLAKE2B cbe08ad6c326ba90266119497fa8ef5cb46a19e40c3e27a397ab95a65b89299258e604bf6b35e44d26471aefaf64a6a2aadb64d3cdda3224e5667766c726aff4 SHA512 9338eefaa1885cfe06b14db5b0a4aa0216c0863d3090fd880f7af2a86d417af5e945e83e63c982ca36591f0efa1ba0c762ead1a3c20eba372fa62316dbb7c23f
+EBUILD fcitx-configtool-5.1.6-r2.ebuild 1519 BLAKE2B 13ebdaee653a9b44bf641d9a1415edfef194ee17fe5f780c4d8554cb82e5a3a753b0237752c1bd0cab70f6ecacfed33c855bd2a49ddd64b9be54547726fe2968 SHA512 fdb7b7428bf4ab0e02bcf4ec8aefe8aeb0cbb6d64c150b443cfe6911c9e48d19d2a7450b4b92911352e8e0ea01b76dbeab3c0991a76101c2c09781c9e98fe495
 MISC metadata.xml 803 BLAKE2B 41ac8883bc7a637de21f4af61b9e2bc133e14977c7a1f275e67794a420726466108a2f4288f03e6bef4e63b89091e803838587b483f64007258df62ac67e95cb SHA512 7ed03bf3a463f1239062015a122bf41c9444efa4fa3730d986e5479dcfebed376cab1bd1280bff0b5d1fb51a759da5f81b792e8b3d6e6a13896aef85459ffd7b
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-5.1.6-r1.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.6-r1.ebuild
deleted file mode 100644
index b3ac6d27c992..000000000000
--- a/app-i18n/fcitx-configtool/fcitx-configtool-5.1.6-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_PN="fcitx5-configtool"
-
-inherit cmake unpacker
-
-DESCRIPTION="Configuration module for Fcitx"
-HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5-configtool"
-SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="GPL-2+"
-SLOT="5"
-KEYWORDS="amd64"
-IUSE="kcm +config-qt qt6 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-i18n/fcitx-5.1.6:5
-	app-text/iso-codes
-	sys-devel/gettext
-	virtual/libintl
-	x11-libs/libX11
-	x11-libs/libxkbfile
-	x11-misc/xkeyboard-config
-	kcm? ( x11-libs/libxkbcommon )
-	!qt6? (
-		>=app-i18n/fcitx-qt-5.1.4:5[qt5,-onlyplugin]
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		kde-frameworks/kwidgetsaddons:5
-		config-qt? (
-			kde-frameworks/kitemviews:5
-		)
-		kcm? (
-			dev-qt/qtquickcontrols2:5
-			kde-frameworks/kcoreaddons:5
-			kde-frameworks/kdeclarative:5
-			kde-frameworks/ki18n:5
-			kde-frameworks/kiconthemes:5
-			kde-frameworks/kirigami:5
-			kde-frameworks/kpackage:5
-			kde-plasma/libplasma:5
-		)
-	)
-	qt6? (
-		>=app-i18n/fcitx-qt-5.1.4:5[qt6,-onlyplugin]
-		dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
-		dev-qt/qtsvg:6
-		kde-frameworks/kwidgetsaddons:6
-		config-qt? (
-			kde-frameworks/kitemviews:6
-		)
-		kcm? (
-			dev-qt/qtdeclarative:6
-			kde-frameworks/kcoreaddons:6
-			kde-frameworks/kdeclarative:6
-			kde-frameworks/ki18n:6
-			kde-frameworks/kiconthemes:6
-			kde-frameworks/kirigami:6
-			kde-frameworks/kpackage:6
-			kde-frameworks/ksvg:6
-			kde-frameworks/kcmutils:6
-			kde-plasma/libplasma:6
-		)
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	$(unpacker_src_uri_depends)
-	kde-frameworks/extra-cmake-modules:0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKDE_INSTALL_USE_QT_SYS_PATHS=yes
-		-DENABLE_KCM=$(usex kcm)
-		-DENABLE_CONFIG_QT=$(usex config-qt)
-		-DENABLE_TEST=$(usex test)
-		-DUSE_QT6=$(usex qt6)
-	)
-
-	cmake_src_configure
-}
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-5.1.6.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.6-r2.ebuild
index da44e902b68a..ce5113443197 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-5.1.6.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-5.1.6-r2.ebuild
@@ -10,48 +10,44 @@ inherit cmake unpacker
 DESCRIPTION="Configuration module for Fcitx"
 HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/fcitx5-configtool"
 SRC_URI="https://download.fcitx-im.org/fcitx5/${MY_PN}/${MY_PN}-${PV}.tar.zst -> ${P}.tar.zst"
-
 S="${WORKDIR}/${MY_PN}-${PV}"
+
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~loong ~riscv ~x86"
+KEYWORDS="amd64"
 IUSE="kcm +config-qt test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=app-i18n/fcitx-5.1.6:5
-	>=app-i18n/fcitx-qt-5.1.4:5[qt5,-onlyplugin]
+	>=app-i18n/fcitx-qt-5.1.4:5[qt6(+),-onlyplugin]
 	app-text/iso-codes
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	kde-frameworks/kwidgetsaddons:5
+	dev-qt/qtbase:6[concurrent,dbus,gui,widgets]
+	dev-qt/qtsvg:6
+	kde-frameworks/kwidgetsaddons:6
 	sys-devel/gettext
 	virtual/libintl
 	x11-libs/libX11
 	x11-libs/libxkbfile
 	x11-misc/xkeyboard-config
-	config-qt? (
-		kde-frameworks/kitemviews:5
-	)
+	config-qt? ( kde-frameworks/kitemviews:6 )
 	kcm? (
+		dev-qt/qtdeclarative:6
+		kde-frameworks/kcoreaddons:6
+		kde-frameworks/kdeclarative:6
+		kde-frameworks/ki18n:6
+		kde-frameworks/kiconthemes:6
+		kde-frameworks/kirigami:6
+		kde-frameworks/kpackage:6
+		kde-frameworks/ksvg:6
+		kde-frameworks/kcmutils:6
+		kde-plasma/libplasma:6
 		x11-libs/libxkbcommon
-		dev-qt/qtquickcontrols2:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kdeclarative:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kiconthemes:5
-		kde-frameworks/kirigami:5
-		kde-frameworks/kpackage:5
-		kde-plasma/libplasma:5
 	)
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
+	$(unpacker_src_uri_depends)
 	kde-frameworks/extra-cmake-modules:0
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -63,8 +59,7 @@ src_configure() {
 		-DENABLE_KCM=$(usex kcm)
 		-DENABLE_CONFIG_QT=$(usex config-qt)
 		-DENABLE_TEST=$(usex test)
-		# kde-frameworks/kitemviews:6 is not ready.
-		-DUSE_QT6=no
+		-DUSE_QT6=ON
 	)
 
 	cmake_src_configure