gentoo resync : 25.11.2020

3 files changed, 28 insertions, 16 deletions

diff --git a/app-i18n/fcitx-libpinyin/Manifest b/app-i18n/fcitx-libpinyin/Manifest
index 7f834d075636..3b382fc00e20 100644
--- a/app-i18n/fcitx-libpinyin/Manifest
+++ b/app-i18n/fcitx-libpinyin/Manifest
@@ -1,5 +1,5 @@
 DIST fcitx-data-model.text.20161206.tar.gz 15099931 BLAKE2B 80e6a6fe5109011d6ea8683658d3fa89fc00e9dacfd140da3e993afc7db088c445da636797fbdac416e70119d37d47bdb0cb18d3865cebb397dbaa8a3055d703 SHA512 26450e347b7a211e5abd94acbb9befc8cee7d8fc20e5161ef11b8b9b1ad47cde4f1add5c41484d9af04e4dde2aa748090e297e799ee7f6d2f9fcec3873eee429
 DIST fcitx-libpinyin-0.5.3_dict.tar.xz 15149856 BLAKE2B 35297477b3a4df9152162b8ad57d536333c5007510f387323d03e862901f17bb337504f20e6edc8d48e338916a6c4543900974027b60f7e87b0005f836677d29 SHA512 d132e0c007bd62286cfa89f6605a5315b6f5ae94a75bdd389fff1061e1547ad64c615fb0b75189d8cf35fa289a53e5d485911e06e368b2bf3af7b5a996fcd08a
-EBUILD fcitx-libpinyin-0.5.3.ebuild 1480 BLAKE2B 36b80c0fbf07be52c61652e5905fbe219aeaff0852c9137359f05ea1b8c192f3d374e4743727a02ac184397b9d50a5c6c634853b7252a47ce4a5768151d6ea3f SHA512 771b7b52c95a34c453bb8146abec4796e173922c80e855ad0047063a872d85f05fe0993a022a30c741d68dad364383f8d3109f121fefa91a25ffda109f3064cb
-EBUILD fcitx-libpinyin-4.9999.ebuild 1461 BLAKE2B 1c31d1702c7616db8ff6f5594c772a1c704db81b9c9e3fed40642ae73992357eace8acd1e24e49a905b8a1d9edef4c6fc39fbe2369869a964f9b9b69901fb309 SHA512 7b2da078b268aee69e6d693ef7ca26ddcf39f638f4da05c6a6eb18cc40f6b7740d503446e18eaf963f133f0110ccb1f3b6a50b4789c2c313adc1d33b14992483
+EBUILD fcitx-libpinyin-0.5.3.ebuild 1601 BLAKE2B 180fe2f12f7dc9105b952d888c016fe4056d2b3a16e3fbf861a7ea6bed33e97b6ccd1fef6e06153df9b18543a5ee078a5588b4692ac7915c00d5dc70b0eeb42c SHA512 73a01b5853c521ae1a6b69bb9fc17d8df27b20444dd89ff1e6f2fb3fa036265eaa6ddb435bec5469f3d49cefab5d28296b5755481b26b6fa8a2e5dfa062e51fe
+EBUILD fcitx-libpinyin-4.9999.ebuild 1582 BLAKE2B e4664b16a52aa4ef11868cf67729c6dc53c77f4b8c16019ff700bae854cc7def01336c9d8c47e19568f9e08e6f2a8cc6c9d0b750d3669b49205e8d199ee8d0f8 SHA512 92b3610d1466a90bbe71b3132131df5592111fa8eb2051f59ba62b75a77374a593056e3617e58c6cc82c7c92d8a95f8c652cebcca8ac672b98646082b8204fd9
 MISC metadata.xml 537 BLAKE2B d60daacfeb2a33824bd399d144ea7bd9a99a6a96062df226d4de0b674387df563a1294366b0cb2e216c33b321680f00adc88905167508898f6c3a37d6f0c1bfe SHA512 32e4b2319df016e83055699ada867d1e1aba7b09d26308f03143df986e6aaadf77243da97894d33282ad7d1a7ee881723a4eadcac6f4573fce05ba3700a10609
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
index 079c6e3c5fa3..1742c97885a1 100644
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2012-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,7 +24,14 @@ SLOT="4"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="dictionary-manager"
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+	>=app-i18n/libpinyin-2.1.0
+	virtual/pkgconfig
+	dictionary-manager? (
+		>=dev-qt/qtcore-5.7:5
+		>=dev-qt/qtwidgets-5.7:5
+	)"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	>=app-i18n/libpinyin-2.1.0:=
 	dev-libs/glib:2
 	sys-apps/dbus
@@ -38,8 +45,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
 		>=dev-qt/qtwebengine-5.7:5[widgets]
 		>=dev-qt/qtwidgets-5.7:5
 	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 DOCS=(AUTHORS)
 
@@ -48,7 +54,7 @@ src_prepare() {
 		ln -s "${DISTDIR}/fcitx-data-model.text.20161206.tar.gz" data/model.text.20161206.tar.gz || die
 	fi
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -56,7 +62,7 @@ src_configure() {
 		-DENABLE_QT=$(usex dictionary-manager)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
index af2da3f65dcd..23aae0d11f68 100644
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 2012-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 
-inherit cmake-utils xdg-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,7 +24,14 @@ SLOT="4"
 KEYWORDS=""
 IUSE="dictionary-manager"
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+	>=app-i18n/libpinyin-2.1.0
+	virtual/pkgconfig
+	dictionary-manager? (
+		>=dev-qt/qtcore-5.7:5
+		>=dev-qt/qtwidgets-5.7:5
+	)"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	>=app-i18n/libpinyin-2.1.0:=
 	dev-libs/glib:2
 	sys-apps/dbus
@@ -38,8 +45,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
 		>=dev-qt/qtwebengine-5.7:5[widgets]
 		>=dev-qt/qtwidgets-5.7:5
 	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 DOCS=(AUTHORS)
 
@@ -48,7 +54,7 @@ src_prepare() {
 		ln -s "${DISTDIR}/fcitx-data-model.text.20161206.tar.gz" data/model.text.20161206.tar.gz || die
 	fi
 
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -56,7 +62,7 @@ src_configure() {
 		-DENABLE_QT=$(usex dictionary-manager)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {