gentoo resync : 25.11.2020

4 files changed, 88 insertions, 23 deletions

diff --git a/app-i18n/kcm-fcitx/Manifest b/app-i18n/kcm-fcitx/Manifest
index 70070bf0a0b1..b39b2d3f8467 100644
--- a/app-i18n/kcm-fcitx/Manifest
+++ b/app-i18n/kcm-fcitx/Manifest
@@ -1,4 +1,6 @@
 DIST kcm-fcitx-0.5.5.tar.xz 63364 BLAKE2B e3b185468a4587c510e47bee4d7260d5d9ed27032174e3928ed3f008a68e8a4b9d124bda14a75348d65c41ddff2e39bb91d8a4f3663a81788850e5fb33740c8a SHA512 e6a7bcad10003a956389ee266cf6d2f3730dafafcdd0bb43de328397749775e5cd305f16fdca2365e246c903677dba042da81a6dfd873aa1be74174e2b0b372e
-EBUILD kcm-fcitx-0.5.5.ebuild 1196 BLAKE2B 5c7612b75ec49946a7c3236ffae7dede6df61b615c8ed32af80466555804596de673738360a4844a070fc4c5eb0621cea721dda5bfa306d533c1b734d39f7e88 SHA512 15f9aaa3081334fd542396eece62b93642604db726cb78c7e2a1739682907ee6dd0e57a7eb0a744557223b2f3e16e64061600d65f8bbcecf07e425af8d57b000
-EBUILD kcm-fcitx-4.5.9999.ebuild 1187 BLAKE2B 31e76e84ee5500c8f6fab64882c5c0b2d73a29cc3bd04aaf5089b009003b7d4d3ade412c6e06b8819f27ef1b7d133c487d9e2f9303099217f6f5402e19a32d1a SHA512 7e264ab819e3332c1c2e8365a562cd1a5db030cf3303419ae4678b85711790921a6455180c779a0102c4cb0175b88b4bf10bf4901d5ca02e0d02ca1077defa59
+DIST kcm-fcitx-0.5.6.tar.xz 63556 BLAKE2B 8518c454f15e5faeaab136c08eef9a7474537414485815e67ee26fcff815f6506769ec047158450a7a0f1843ac31616d34317e9de7bec8ee62fc81541134625a SHA512 a3d378ecd9ea9fa5bcc42c75e5b0b0ac2ba6c94fda93b7213d821546bb83b5904c75c2fc9482cd7b47fbf5ad81a0641b7ec345aa2e630c8795bf8d5b89f9cd3b
+EBUILD kcm-fcitx-0.5.5.ebuild 1263 BLAKE2B 06af9dd1cf4147e0eaefd80a71dde34f8099f62c4eb627bc8a40f665ecf98e422a6e75506ec5bc05366f2383cf8e2a1693b65cee64b6632a7c773358e9f22992 SHA512 dc5d5055d11dd5c3a2df6efc6790d274c3d9368fc96cc5b772f6cdffc224d3fe7c639c990aed551d7b9f5a8b0a03cd0a7a739791b9aa87249e4e497c41bbb7b9
+EBUILD kcm-fcitx-0.5.6.ebuild 1237 BLAKE2B a8185c2b4eb7034c7a290ccfcbfa22a6b55611467ce67bf0af672a9814603266de0050069faa1df8959c990c15c2d7712b17bd842881ef73f13548390dba8d4c SHA512 97e922d96ae36ff6796cefc7f0dd3fe0b7db4bea78e7c3124b182639edcea8ce6b37313a5d8fb3eb65661516f3afb656738799c25be6e3d1b52d3ec945d8f474
+EBUILD kcm-fcitx-4.5.9999.ebuild 1226 BLAKE2B d15fe4ee56ecc6ffec98601e0af3d1d122c32bc3e7b2257fba3727cd665282725ccb02d806e645579b6504bd560a132a96e20d4707866d126e31f0c2093ef666 SHA512 89b8471c0b1871088e4ac8e1d8cb773f2d05f6cfa3b51e5f87334a855c94c9ec1b084cad530abf3d7c820e358bf3eb24eaa4e91a4e3569bdf614add1729527a5
 MISC metadata.xml 448 BLAKE2B 1bad84f73fbc4e994084f472c2beaab2217259d6da1c1dcd3d7c91fdf30a1c1252adc930236e5ab8f99fa6f764aca4db5219996730037b4ea7da22ae075de6d1 SHA512 fd57b8dd9c679ef1309c6f02c55add627d029e6232bd3efdd8acb6c76be334411cf42e40950f749234f0c290467c4e3245232278a54118010ce01df664aed871
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
index 7204e2277fe5..8f420c466aae 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2013-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,7 +24,13 @@ SLOT="4-plasma5"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	kde-frameworks/extra-cmake-modules:5
+	sys-devel/gettext
+	virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	>=app-i18n/fcitx-qt5-1.1:4
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -40,17 +46,14 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
 	kde-frameworks/kwidgetsaddons:5
 	virtual/libintl
 	x11-libs/libX11
-	x11-libs/libxkbfile
-	!${CATEGORY}/${PN}:4[-minimal(-)]"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	sys-devel/gettext
-	virtual/pkgconfig"
+	x11-libs/libxkbfile"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:4-plasma4[-minimal(-)]"
 
 src_configure() {
 	local mycmakeargs=(
 		-DKDE_INSTALL_USE_QT_SYS_PATHS=yes
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild
new file mode 100644
index 000000000000..be86ae5b382d
--- /dev/null
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-0.5.6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2013-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake
+
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/fcitx/kcm-fcitx"
+fi
+
+DESCRIPTION="KDE configuration module for Fcitx"
+HOMEPAGE="https://fcitx-im.org/ https://github.com/fcitx/kcm-fcitx"
+if [[ "${PV}" =~ (^|\.)9999$ ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://download.fcitx-im.org/${PN}/${P}.tar.xz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="4-plasma5"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	kde-frameworks/extra-cmake-modules:5
+	sys-devel/gettext
+	virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
+	>=app-i18n/fcitx-qt5-1.1:4
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	kde-frameworks/kconfigwidgets:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/ki18n:5
+	kde-frameworks/kio:5
+	kde-frameworks/kitemviews:5
+	kde-frameworks/kwidgetsaddons:5
+	virtual/libintl
+	x11-libs/libX11
+	x11-libs/libxkbfile"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:4-plasma4[-minimal(-)]"
+
+src_configure() {
+	local mycmakeargs=(
+		-DKDE_INSTALL_USE_QT_SYS_PATHS=yes
+	)
+
+	cmake_src_configure
+}
diff --git a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
index bed2c38530a0..753485c93790 100644
--- a/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
+++ b/app-i18n/kcm-fcitx/kcm-fcitx-4.5.9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2013-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils
+inherit cmake
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,7 +24,13 @@ SLOT="4-plasma5"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	kde-frameworks/extra-cmake-modules:5
+	sys-devel/gettext
+	virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	>=app-i18n/fcitx-qt5-1.1:4
 	dev-qt/qtcore:5
 	dev-qt/qtdbus:5
@@ -36,21 +42,17 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
 	kde-frameworks/ki18n:5
 	kde-frameworks/kio:5
 	kde-frameworks/kitemviews:5
-	kde-frameworks/knewstuff:5
 	kde-frameworks/kwidgetsaddons:5
 	virtual/libintl
 	x11-libs/libX11
-	x11-libs/libxkbfile
-	!${CATEGORY}/${PN}:4[-minimal(-)]"
-DEPEND="${RDEPEND}
-	kde-frameworks/extra-cmake-modules:5
-	sys-devel/gettext
-	virtual/pkgconfig"
+	x11-libs/libxkbfile"
+RDEPEND="${DEPEND}
+	!${CATEGORY}/${PN}:4-plasma4[-minimal(-)]"
 
 src_configure() {
 	local mycmakeargs=(
 		-DKDE_INSTALL_USE_QT_SYS_PATHS=yes
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }