gentoo resync : 30.09.2020

16 files changed, 62 insertions, 54 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 5a1205d50d59..11f14b861808 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/fcitx-configtool/Manifest b/app-i18n/fcitx-configtool/Manifest
index 956e32113a7e..37cdf526f48c 100644
--- a/app-i18n/fcitx-configtool/Manifest
+++ b/app-i18n/fcitx-configtool/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-configtool-0.4.10.tar.xz 50440 BLAKE2B f2f2241d3ea139f6f3de9b8c6ffcc71c789dfa291efe4c551596eebc8a04f13f9fe698cc25d8349a174399044d15ddca2aeab952ac2bc7f0f4e9e47d453329ca SHA512 1c1267e9de694bbd5f258b5bba1e7514c4f8556cdc82a1cce5eafd8a4ec571955285dade0acd02f128eca01f867a30c5c6264ee7e91d32a333eba6e4d275fe8f
-EBUILD fcitx-configtool-0.4.10.ebuild 832 BLAKE2B f88443fd41ed77cb6b142a484cd124bf84e1cfff6dd0fce7be9d0827b3d8067160218ef6b536072469f64b92e80c32a0cca762a33c566f4d3e79f3fda91422b2 SHA512 34ff11c0cbf108c7bdda5c5d1a8b626bcab76f5dd08599bd3ad04f12b28287a9073635042a6451fc9f426246afb4350e04e231dc81083d64684aff7d8e557a20
-EBUILD fcitx-configtool-4.9999.ebuild 813 BLAKE2B 6977ef3e492a4fb17f49089e107877dc2c0975d01f471e77f9403c0b44c3eec9c3981f53365ba43a5444c2e07b21b359b0394ea4fb443712786dc049423c12ea SHA512 121ef2f1b2dd26677c00c189fe74b1a133b59cb245a006cd23e273bc6d82eb591213929dd5267428e84cffa0bbeb534b4a6da9b998a70001c81da685f6ce7ac0
+EBUILD fcitx-configtool-0.4.10.ebuild 849 BLAKE2B e38e94e63fd89abca4bb81bc4a8416487c8149b831b1702e3393a8e9a092a54f15c35917c1ac9b36be13542d0a3c8ac60133d32502b6a89837fc51d4c9b63c81 SHA512 5f98ca5c3209f676d72c2ee651c1a1882305d58288051d899ec5987b2652c1d4b31b8d9cb1548f5af96f9ba7f32a5a15b936115cd0d629e0bc070d1998bfd022
+EBUILD fcitx-configtool-4.9999.ebuild 830 BLAKE2B 3d4386bd8005064eb82234f9fbb63e2b05021979e894c67ac5b37b4a95d1d1ae9103152e00e1640d385f08131b4426cf0e5b0e94ee8071046eaaae966679f706 SHA512 479f25c0976da7779e12a973b2473001c053191cced668ad9cefc7dd6050adaa778780263d639874c3a47f4360d6c2ec4f8e3f5c3747be6d740ed2fe4c5bc89d
 MISC metadata.xml 455 BLAKE2B 89268d866dde8861e25a631d76d7053a6e847134d02195aa883952b79a0f81742c4cad0f8938b0eb180240d5e95ff1c73b7c673d9a3b2dafd0b28f20e186589c SHA512 5fb4ff1f8fe55ba75d4609791f0f41cfe8728000cd0d5bf07d3f4df99bf375ab23f15cfd0754b032b333d67c7cfef6a13daa007d81a67b8be0b27454b7e7548e
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
index 9fe46f55f860..1f5e7d08ada6 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-0.4.10.ebuild
@@ -24,7 +24,8 @@ SLOT="4"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-libs/glib:2
+	virtual/pkgconfig"
 DEPEND=">=app-i18n/fcitx-4.2.9:4
 	app-text/iso-codes
 	dev-libs/glib:2
diff --git a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
index 19655e98c974..9ef906f089f5 100644
--- a/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
+++ b/app-i18n/fcitx-configtool/fcitx-configtool-4.9999.ebuild
@@ -24,7 +24,8 @@ SLOT="4"
 KEYWORDS=""
 IUSE=""
 
-BDEPEND="virtual/pkgconfig"
+BDEPEND="dev-libs/glib:2
+	virtual/pkgconfig"
 DEPEND=">=app-i18n/fcitx-4.2.9:4
 	app-text/iso-codes
 	dev-libs/glib:2
diff --git a/app-i18n/fcitx-libpinyin/Manifest b/app-i18n/fcitx-libpinyin/Manifest
index 9567136d9ca1..7f834d075636 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 1489 BLAKE2B b6ea741875c1056c4730c5e3655f3c71fb3528e0c885e0600c446d565ce328250c6a2a9b99775e0c152ebb06ea7af7890fa3241ba66c335a8708e631cd3655cd SHA512 d49283d99de260318b30a4cb2e7a2ba17984d2db1f7aae0dcd4d640731c4264c7e4c4813a80156ccaac2ece780c1cb7fbcf9bad016ff1e3fe3dd6427d42b96f6
-EBUILD fcitx-libpinyin-4.9999.ebuild 1470 BLAKE2B 8da13daf9d233f8a88e67070f92d6b2be1c85e4bf4f140192e41a85b52b3855f04b19329459969e370dcc00543a49110fce336a0a3a5d9e1c86ad8a777410079 SHA512 d889ac88764e9fce9a42ae03610ea9fe250542117b05e484b202ef9f021866aa4eb9c10ebb00a9a1d3dfd2a56e5df25c1e3279f0d4a0650be7e2c90f111d22a9
+EBUILD fcitx-libpinyin-0.5.3.ebuild 1480 BLAKE2B 36b80c0fbf07be52c61652e5905fbe219aeaff0852c9137359f05ea1b8c192f3d374e4743727a02ac184397b9d50a5c6c634853b7252a47ce4a5768151d6ea3f SHA512 771b7b52c95a34c453bb8146abec4796e173922c80e855ad0047063a872d85f05fe0993a022a30c741d68dad364383f8d3109f121fefa91a25ffda109f3064cb
+EBUILD fcitx-libpinyin-4.9999.ebuild 1461 BLAKE2B 1c31d1702c7616db8ff6f5594c772a1c704db81b9c9e3fed40642ae73992357eace8acd1e24e49a905b8a1d9edef4c6fc39fbe2369869a964f9b9b69901fb309 SHA512 7b2da078b268aee69e6d693ef7ca26ddcf39f638f4da05c6a6eb18cc40f6b7740d503446e18eaf963f133f0110ccb1f3b6a50b4789c2c313adc1d33b14992483
 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 941ab64d0264..079c6e3c5fa3 100644
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-0.5.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -60,9 +60,9 @@ src_configure() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
index 66cc6ae0ed8d..af2da3f65dcd 100644
--- a/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
+++ b/app-i18n/fcitx-libpinyin/fcitx-libpinyin-4.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -60,9 +60,9 @@ src_configure() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-rime/Manifest b/app-i18n/fcitx-rime/Manifest
index ac1c87cc3042..54bab80ed513 100644
--- a/app-i18n/fcitx-rime/Manifest
+++ b/app-i18n/fcitx-rime/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-rime-0.3.2.tar.xz 40960 BLAKE2B 1c9185dd9d2912e74b9916916fed09a01c30e0867d93fe94e04d5324883783dddbdca0f553d80aa19e2e59d2ec8fd2a50a7f89118c22cb09310296292a566760 SHA512 8c6d845b0899d9b8b9b41b895abd5c1b8916856b71f529aabd08d1c27a2b09bb5a9343912d088da460c2e22da0a3ce759a34fd13099a149bb8cd1ff4eafe29f1
-EBUILD fcitx-rime-0.3.2.ebuild 926 BLAKE2B 6ce396b63205e0288f904c8b3b4f5bf035e4a9d6df9928e1c5d79a8e325838986d9c371a485ebd93b8eb4e7b136571a8fe040d75b870a244842f02ae0df7eb02 SHA512 c6c0d63a8c0caf0fd2acafb4f2917eec1418985fdd4028088959f324968268f1a6570fc35ffcd24d7c3af2627c4710f281386ea801dd87b06ea72618778e2d8e
-EBUILD fcitx-rime-4.9999.ebuild 1129 BLAKE2B de07cfda170020c2edfb3e03908d0504fa937bba7ce122f39c468b643ca8ec4714e02830d5851e1fa65cae19594ba76ac9bcf26cde77ecd7a8869af6b0a9a16c SHA512 6d43703e4cf1b6208d07ec88a3c805e01925139e8107d53c920717cc19f389602f71be54bbc66f70c466d11d20e4026a078d8ab4df9d6ce3a87157a4e0397af3
+EBUILD fcitx-rime-0.3.2.ebuild 917 BLAKE2B f0acef45c38348b0c35476d1322e3459e48ff00c3cd58759bce84c3acbf25545978a89d334e44f15c9da49231726adef445e72e7a8dd206b9991a23da091cc26 SHA512 4d6b54142f8531afccb2b8236dd2c7d469c2aecf703cb562459066de5803b79024adb8c164e0d45aae6259aadf5120764f079a64df020e71adb5d72010e60d1d
+EBUILD fcitx-rime-4.9999.ebuild 1120 BLAKE2B 0599154f7bbc8b19527f7af86a15a109a60f49f6175b50da5ce86815f8c7249d322331c891054ed95d50fa0ef8e6f2db5bcb99b72d54fecb04493f9bd0e16eec SHA512 7c4de0eea31be6c94d45d66b6077185024dbacfe46419286de6361e92b5b1d6d167646f48662b67788aac3f1c04d9e53f73510c4cf6cf076ed967b5cd34c24d0
 MISC metadata.xml 633 BLAKE2B ef743e2803b410627255e712b1f0c759c9605eaadf4cc980382acae3a657cfad935b45cdaa6f0bbf697bc1eaf8e2963e8de4a0dc5afe62ffa9f3c6a8bd6ba361 SHA512 91e6413d4cdc60e3d4f989ea06fd5b65acff6684d09fdfe4253f812678bf1e9aa0a4f191ef7ff88e6c394e9d1a8ed252b57ac48262483e52dfa4615c785ff4eb
diff --git a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
index a028f7f8ff9e..273db4b0c27a 100644
--- a/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
+++ b/app-i18n/fcitx-rime/fcitx-rime-0.3.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -42,9 +42,9 @@ src_configure() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
index 5b17c2b01487..382c68ff7502 100644
--- a/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
+++ b/app-i18n/fcitx-rime/fcitx-rime-4.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit cmake-utils gnome2-utils
+inherit cmake-utils xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -50,9 +50,9 @@ src_configure() {
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-table-extra/Manifest b/app-i18n/fcitx-table-extra/Manifest
index 4f9e95fa4524..dffe9e40496a 100644
--- a/app-i18n/fcitx-table-extra/Manifest
+++ b/app-i18n/fcitx-table-extra/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-table-extra-0.3.8.tar.xz 3700736 BLAKE2B b8ce4b3aa04eba8b594b86958bb83e348758c30688828a4834643cf7bdd62852c2ca89bc4f75f0cb1b16ce969b0454c58e3abadff9c78318dc0953e0905c75fa SHA512 454798e9bd25c630ce98e2daf7296e82ba5fbc98027171038a5a7b9ac3169c153302a6703d9416718ec3a0b76db6d732caf3f03c6e6005841c9d7798702542df
-EBUILD fcitx-table-extra-0.3.8.ebuild 773 BLAKE2B 2aa86ed2f196624c532ea5be21b583e55eff7d262532d6f37ae00733de1e7e466da8e20787c653b1868d599057981f98394675c7faa8d205f85106200c8c14d9 SHA512 9fd4679713cda7ab85d695fa0820a4eceb8932adf50c2fed717bf9b6d31803f112c03d4a3d3c1056dec09f3b08038b169c42a7fdd1be1f6deab90050968cf7cb
-EBUILD fcitx-table-extra-4.9999.ebuild 754 BLAKE2B 479656e8f963b3afef4f97d9e35e4ba8e7dc16b8896b643d85fdc2ec9f5b7ec2a3fee5873cd4346daeec95d5ea753a6c710d009a4f55c160044ad796e40e163b SHA512 4ae1b85b47a4f0b611b449dea691a9abe547130b82ae896c87fb4bd17d325aecab428df109a6c8319f076b7854095434e0e7cf3979c207760489f36835147f21
+EBUILD fcitx-table-extra-0.3.8.ebuild 792 BLAKE2B 9b55a05194b7103a97629ca7782093d95fd512ea840b0bd8c38d2ab179d10827879d5088e275226cd4f55e9653bbc164ba676dddc4c6601d32cbc14e25ac0348 SHA512 1f12e525ed4d17dadc020fa133f3abe8015389af6e5ae1f98d71355501437d5e4ef9902e09a8c7b4a388364368528793252725abe5d6653d27352ce047ae954d
+EBUILD fcitx-table-extra-4.9999.ebuild 773 BLAKE2B 1debb5da1822ed6e17c62a3a37f2f80e079166b9434cd2f9840f8d0a9f747affbd556040bf7088951fd1a5851e7dbacc62d4f98c3d9961a7f28488b41d65d5c6 SHA512 fd3b5d55e45e0712211cf7ebb8808fde09ba373d7f3ae13a9c43b871fb5287133fc4bb26429f2916d0ca1883406a49003f7b3b400d1e2c2a85dccc281034ac26
 MISC metadata.xml 456 BLAKE2B cb14969ef6882db359489ce3eb5700179d3eda829e0e1b59bef1227e5083723ff2f5ee5b82ed075250673fbe89b6c97aa2f3ce694a4fc0d89c6a600f5ca9346a SHA512 543a24a29523fc93626c2783c3035e3ffd1f7e850a62d80920c5b62b32cb54ff9e811f5d3c15fe785c967daa78e5da56eb38ef6b773a1cdaa4ab3e8e2a3b3235
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
index 24bb5f73b8b4..473763dfd10b 100644
--- a/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.ebuild
+++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-0.3.8.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 gnome2-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,16 +24,17 @@ SLOT="4"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4[table]"
-DEPEND="${RDEPEND}
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
 	virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4[table]"
+RDEPEND="${DEPEND}"
 
 DOCS=(AUTHORS)
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild b/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild
index ac818b0f0b30..19721f5620a3 100644
--- a/app-i18n/fcitx-table-extra/fcitx-table-extra-4.9999.ebuild
+++ b/app-i18n/fcitx-table-extra/fcitx-table-extra-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 gnome2-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,16 +24,17 @@ SLOT="4"
 KEYWORDS=""
 IUSE=""
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4[table]"
-DEPEND="${RDEPEND}
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
 	virtual/pkgconfig"
+DEPEND=">=app-i18n/fcitx-4.2.9:4[table]"
+RDEPEND="${DEPEND}"
 
 DOCS=(AUTHORS)
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-unikey/Manifest b/app-i18n/fcitx-unikey/Manifest
index 1782dc60d96c..67f37fc652f9 100644
--- a/app-i18n/fcitx-unikey/Manifest
+++ b/app-i18n/fcitx-unikey/Manifest
@@ -1,4 +1,4 @@
 DIST fcitx-unikey-0.2.7.tar.xz 75204 BLAKE2B a0d70747a560b2493a3b7f7e06ff35f7e465bb4c4c8d22cb4db02f70a6298c49780fd0045874faeba1f20ad188a01a81fefc67a4f6ac9d6946d959f731a376a4 SHA512 1bb78e4f27f0cda1e3aa5a633be45e0a26d121d5b472b1325b0c028ff65ca156d23e7ffee0367badeac1dd21ba1743ee8a2c9c27c629ae0996e84e0062b67ad2
-EBUILD fcitx-unikey-0.2.7.ebuild 1042 BLAKE2B b0f0aa590c8a9298390f02e0e3000198322842624bfd525cb6e44401dc532047718f6b17fd56da04f254ebac2603edf10384c3560c856ddc0732618fde1534f3 SHA512 6de0a7aa577e51c87b7caf0e9e87b884a139511136046c876e38ac00eb22984c14a4b0ae426720e3b8702098fbd7c7379e4e4a94f68b8d3e594f594c1709ef68
-EBUILD fcitx-unikey-4.9999.ebuild 1023 BLAKE2B a9ac963a81379dfb14ae66fc51f28c3395a7f4b9d94e4ec9515d03dddfd7ee49ea9bb04de8c051f791083087521e7851e6db76c4e2af97d30c177a0a68ba409d SHA512 d02774c894c21ab00b22f4865473b21f4f51c01c807536658fa8b85921f2b5f9056b9e8ff8afe719e156524944435126f657da6475ff2ae521c34a29c36f2a8c
+EBUILD fcitx-unikey-0.2.7.ebuild 1099 BLAKE2B eb051e22a3184c0f4d4dff9c0ac742a7272ef8f6011a1631fdb9868b9812d581f8d3cb54efd3f59a299b3bbfb5fb443a566f5018229e61dfe86492e1fea3405b SHA512 95b1eb66170bcb1aa997e374ae860117ab2afc4cb55940c0755382fef360c5fbe81cf82da09fc0ff5714a821c46eea8feaf1028702df7dc3889c409d1cb255f9
+EBUILD fcitx-unikey-4.9999.ebuild 1080 BLAKE2B d0294f4b5b7d75792462a72743b7e6697d0c7e9802cb53d38587a957f3666dd99f6fb319f417f7b5202bf68f91a657d03f4fc6f22647a5c0127583edd7b2fde1 SHA512 a1b852387046602883c45c2e98a8b6441a4bbc40b2a7370d8410f33054879a1ea45bc311ae042bc53a0f535a16a6c2724309499bd628e4879f8706358e70bdf8
 MISC metadata.xml 522 BLAKE2B 8d69748cb9296020466c42b0277d8618dccb9c787f35e920d5a0d5e9447c723d7ba1e5c0a7c508053fa33b7c989d7a5c0542a144958083a6214f23399440e83e SHA512 c08e14d4e9268a0c0608148117d50b77754f1f9d96433a28f243fd0643d7021a9e2b85ca57de9f4196bcee54eb05b3c5bee497a3dbf77ef9b279c1bff7814694
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild
index 05e9166a8900..778af9552b8b 100644
--- a/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-0.2.7.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 gnome2-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,7 +24,11 @@ SLOT="4"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="+macro-editor"
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+	sys-devel/gettext
+	virtual/pkgconfig
+	macro-editor? ( >=dev-qt/qtwidgets-5.7:5 )"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	virtual/libintl
 	macro-editor? (
 		>=app-i18n/fcitx-qt5-1.1:4
@@ -32,9 +36,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
 		>=dev-qt/qtgui-5.7:5
 		>=dev-qt/qtwidgets-5.7:5
 	)"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 DOCS=()
 
@@ -43,13 +45,13 @@ src_configure() {
 		-DENABLE_QT=$(usex macro-editor)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
diff --git a/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild b/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
index c20cc8cad7a2..23a3d96150a7 100644
--- a/app-i18n/fcitx-unikey/fcitx-unikey-4.9999.ebuild
+++ b/app-i18n/fcitx-unikey/fcitx-unikey-4.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 gnome2-utils
+inherit cmake xdg-utils
 
 if [[ "${PV}" =~ (^|\.)9999$ ]]; then
 	inherit git-r3
@@ -24,7 +24,11 @@ SLOT="4"
 KEYWORDS=""
 IUSE="+macro-editor"
 
-RDEPEND=">=app-i18n/fcitx-4.2.9:4
+BDEPEND=">=app-i18n/fcitx-4.2.9:4
+	sys-devel/gettext
+	virtual/pkgconfig
+	macro-editor? ( >=dev-qt/qtwidgets-5.7:5 )"
+DEPEND=">=app-i18n/fcitx-4.2.9:4
 	virtual/libintl
 	macro-editor? (
 		>=app-i18n/fcitx-qt5-1.1:4
@@ -32,9 +36,7 @@ RDEPEND=">=app-i18n/fcitx-4.2.9:4
 		>=dev-qt/qtgui-5.7:5
 		>=dev-qt/qtwidgets-5.7:5
 	)"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
 
 DOCS=()
 
@@ -43,13 +45,13 @@ src_configure() {
 		-DENABLE_QT=$(usex macro-editor)
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }