gentoo resync : 03.11.2021

25 files changed, 232 insertions, 74 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 0f54c4774af1..69d57a01bd53 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-anthy/Manifest b/app-i18n/ibus-anthy/Manifest
index 4cf06104ff00..cdbaba436426 100644
--- a/app-i18n/ibus-anthy/Manifest
+++ b/app-i18n/ibus-anthy/Manifest
@@ -1,5 +1,5 @@
 DIST ibus-anthy-1.5.12.tar.gz 825323 BLAKE2B 4d81a5885e4ad6cfc7a10ecb61bf998a76c24049e58841f84ed31f45a8ab5e91cfd2c60be3a66008f97317047487bedcf956b9126fa17602c6f8a29950687b84 SHA512 6950a2865e4753831f8918f4a5926571bc8304454b6368662ef56a6fb11a60f0675e3d589108ebfd38cb5d193f7b61053a10baa6dad23adad67b3b3fc58760e8
 DIST ibus-anthy-1.5.13.tar.gz 265252 BLAKE2B d35299dba3260b85f80f259e0a40ea1ec061ed8082b6e5c872eab6398b6242342b2ee4da0c3b191aa428ae2d8dc652b0e414fd0c9f7b93ca8dcd6303c0586b4d SHA512 058feb49b2fe50ae3ca959f4754b8070f3ebc1e6727fef4bca791aa45a23c95018000e2a8bca496d6592b052298a6fb2869a07c2cc56cc473c81cc437efa175b
 EBUILD ibus-anthy-1.5.12.ebuild 1295 BLAKE2B 9545399cd39d088b51bc65dd4fa3a00fcca0acbd1f0deb2da97f2a1a549580794c15907f91dfa6777674f9416fba3c1b4d33ddfa38715f5bb40b4bab4166cb6f SHA512 1777a0358cecaa593962a71893eccb53679b268c62673a637070f0974598ec9bf7ea342797b587c0852e0e03920df33223f47b65144b25e04edf2058aec95f91
-EBUILD ibus-anthy-1.5.13.ebuild 1310 BLAKE2B 4c37d1cb0f2ca6fd699b972b16f836a5ef7467f284e8aefaa20751798a955b5fa0dc3d722e4ec17cb5c1e6d91dd60679f7871d8a78293d7fd2d3f45b19047964 SHA512 b1e5f2e53c43975dd67652bec29ba86acf77c7fe4a0403755641dc37260f579ce12c931099fef54cc0d36ffaa84b2e843b941f96690c4ddf782d12f6dce542bd
+EBUILD ibus-anthy-1.5.13.ebuild 1311 BLAKE2B bf015015d31584b8c91ff856aacad58c157fb135cfc717e86b40260328b13033bbf2d99d6f6cbf27e12cb6526087392f3cfde5ab37f06e8d9642115db9588305 SHA512 5f4abfb8f62cedc817cc5eeee4e975dba33b8ddd7544beaf02697f47456636bfcd7ba6b9919848d0ec7452321c9dd74597a296a54c808d87c4063acb3b56975a
 MISC metadata.xml 325 BLAKE2B ae0af274a4321f66c02696f5f6440ce55a1a8406efe0f5c17c76606ab536b157f528eb93508d1ac95a893a54ada06c538d627754f8795271e3bb99eb4bbfdcc1 SHA512 64b47eae1d72f07324b98eb1dbc9a2a4b7cc0c74172e0df55e9d5abdaf10ebe1d90f4217b973979e3b53c5a21084fcad6785203a7b4280dc0706d4e6d1bd74f6
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.13.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.13.ebuild
index 955ebf478d18..b74c9f0cf162 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.13.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.13.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=( python3_{8,9} )
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit autotools gnome2-utils python-single-r1 xdg
 
diff --git a/app-i18n/ibus-cangjie/Manifest b/app-i18n/ibus-cangjie/Manifest
index 806b6e1b55b3..ae8b7b149549 100644
--- a/app-i18n/ibus-cangjie/Manifest
+++ b/app-i18n/ibus-cangjie/Manifest
@@ -1,4 +1,4 @@
 AUX ibus-cangjie-2.4-metadata.patch 2227 BLAKE2B 6997c3653224b15722cb17b7f33bb101f18dc443062a793f7c8fc6288c9dfd917c7b8e00a3ba2dc0673041195dd43468cf441edbd89c00615d0691a6f2268e33 SHA512 07cf9d87b0c022f36a8f9c9c59a1ade144a4d1e7804bd95579ae2b4186a7942feeb8c77be3a1e41229c3e56e5c28a603e316e28e0d8609a8c94351676216df8e
 DIST ibus-cangjie-2.4.tar.xz 150616 BLAKE2B 2e59acc1b05ce0dc3dad26ba663440d067bf28a549e79ec9d127de414d715f5e376f426db5b415255eb63aa13677e59643889481f5e39c946399d4d4fe15a468 SHA512 cef9562fc4a5f3b78881c09b43e502f02322148e501022d3f80989caef4ca98ae26903e9a3dcc422feeba7712a8321c731ba229429e52fe919db5144aa0ead47
-EBUILD ibus-cangjie-2.4-r2.ebuild 1113 BLAKE2B 988dc13b6528586375f3c539e24fd6a1e83efa045e59f448f38847f770f4dd581d016bb31a35e52f1fbba07ed76bc9b5b39ed9a6fbd53b01aaf8aac45b40569a SHA512 c52c9c14df48b1c985fd5046c33da64e46b988e46710ca8159e20fed1632ab1cfcaa0c5c1cfbb4ec93c72b50f5edd11ccecdadb94a90135997852c09643cac3b
+EBUILD ibus-cangjie-2.4-r2.ebuild 1111 BLAKE2B cbb501dae783816eb4872cb4c674cb819f4ad67750b2e319e058e364541b01f0340501962c9823f7611e57dc90d0ff3a104ce8916bb0f39ce53bacdaad2889e3 SHA512 4db871af670cb2d6911986941e34847e57ae5c7f55e5c97fe873ef3d003d9f7406ec8b6417e8f100c65059fb6dc11baf85394eaaa8b6ec0d15062347c16930c3
 MISC metadata.xml 322 BLAKE2B f957eedb318ce44762a380e003b2f60f3b54f37adb5f745de1de4e97f476a0bed191fc08d01988d71efa0082d1a0dcada9a9e7572e83bc3c29776dd8e0be7487 SHA512 dea8e303029ad69ed58e62618cf42a00d198681aa65c669ae5403d924f16e5f166f10ff2f464e07ea988795ce546c135d77d32b27b7775cbdb958ab4dd017f71
diff --git a/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild b/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild
index b6fa5e00fca8..a6331c5ecb48 100644
--- a/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild
+++ b/app-i18n/ibus-cangjie/ibus-cangjie-2.4-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit autotools gnome2-utils python-r1 xdg
 
 DESCRIPTION="Chinese Cangjie and Quick engines for IBus"
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index cac8704f7383..13337f5cd242 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,4 +1,4 @@
 AUX ibus-hangul-test.patch 446 BLAKE2B 06a83c8701e803f97b5755215488639b77c3be819b39932e6d6e957467eec482f32bf0477d84e7ec552a495f2e5b56f4dc730c27851cff2f252b0b36152d19f6 SHA512 3171d14b3eb495f09c5a90cee9fc85d87a5b773452367f1ed1bd33eaa3a220658052f6edef53fc7585292b0811f5b04b53eade0175d609dadcee0d29ea3506ac
 DIST ibus-hangul-1.5.4.tar.gz 542612 BLAKE2B 46495c04a37888a3ed21831b5bbca5b788f4d3a831fb3ce4eb13d95f302877fadddf831016f1d29aa2c1a6ba73fc0d585f2be57c10267a51a1a2186642632918 SHA512 dc4c755349424605de3832496a8a0cf7e8da577cbeff85d2b03da187fd5fdc9de5475eb523c69310e4f7edbb9a513f6f218de082ba32a25a477cdf5eb6f65513
-EBUILD ibus-hangul-1.5.4.ebuild 1221 BLAKE2B 6e96e2760d1e5cd89d7397e6b8d06702dd4b3457bcceb339468ccc738020d0bdb30ea4dd88671bf2ee44268182156fd88febdcaa8e454b1950f6439a28e08c09 SHA512 c442df0276f89948a1f42a5c44f71de9f392cd13349c4e143fa6ed3a633797614344b038e53d786fe1f8ef5b029c0a4a0773b65912fa2aa9bfc0dc872078cd95
+EBUILD ibus-hangul-1.5.4.ebuild 1221 BLAKE2B 546277d963186a41ff82c0b1f81568b42a0bc9381f25c4fcec16644c530efda01d954f1b5a14d27b43396e3f310eebdccf48ae802fd1dc905b51f28e395b945b SHA512 3e8900d14f64d5983f113b1e0c620a11228e8857d220bc9abec0be1d8abfce434716d28d8b44f1ed33b756271e89bf6c2d1766303205b513867b0cf0bc825b9d
 MISC metadata.xml 321 BLAKE2B d336297b96a4ba3ae1e2c8bf3b1493717b49ce42c85cb0748af54c7bf6be4a1c74461c122dbbfc9b107fa02f4e83800798dd61c1bba74426bb7a2487e0d8fef9 SHA512 d05f79c856e4e579d1f98cd7c9869294f1906fa7e73eeae7120ee6af710d5f16f103d63f1261a9d798ba5584fa8e6f349d73d407a747811515280c736b43eb48
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
index a2c9a9f929a9..57c4f12e5c62 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.4.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=( python3_{8..9} )
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit gnome2-utils python-single-r1 xdg virtualx
 
diff --git a/app-i18n/ibus-table/Manifest b/app-i18n/ibus-table/Manifest
index 4f0b2b1d5f13..aa1b9839c808 100644
--- a/app-i18n/ibus-table/Manifest
+++ b/app-i18n/ibus-table/Manifest
@@ -1,3 +1,3 @@
 DIST ibus-table-1.14.1.tar.gz 1451943 BLAKE2B e8fc54daf89aaee813de6788bef9f56a654ffdf4751acf3e2f622d971134c3aba906ca2b106f51b2fa305b8c65fb4db862f57f5f9e3e82a569c5a72e3017e627 SHA512 a658c2d370d173d2fe2f38c02c6b822a17771754ac98a856f954c4c998e90a857f9d54ed652c74159af9545d445001d202e7b5578e7694f8767f928b42db9055
-EBUILD ibus-table-1.14.1.ebuild 1035 BLAKE2B 3d6f6497234af6e53a4095bc5fed4eb26c327efc72ab66133125aa015548d22117a97d4547acea1cd72b176c8eee9c8cbdf85566d87dec87b9d84f872fa92e34 SHA512 846f9911b80ed5230af4957c490f34969f4608ecf6f5011eb4ebd7742bdd5b64493df1b06951dd1edb678a4e8067400b5c6a28f8acdd6728990801e40d6ae29e
+EBUILD ibus-table-1.14.1.ebuild 1036 BLAKE2B 7d8675e81b7479baa17ec10a123a17b0ec70107f092c9f3132268c30de9142d16852dee0778ec7d835e5df978a9265de21576a5beca1f25ce16894bc98a7567d SHA512 ec83e59fab0605efcb9da896a0af86980a1d4a94554292cbe5fae5086c619ff7adffe8973e79cc84b4dba73a1e504153dd58551718be45a37c458f129cf9ac5d
 MISC metadata.xml 315 BLAKE2B eeff056ce020201cb6e59f0f160232486fd94cc9de7cc90980155f9ef97988199d592b01190b13b013433853fbc25d9c4e5e29fe33fb74aa4239318cfac312fd SHA512 3329cc73468815ecf7f122ee8e8b81ca7295abcfeab95082841ae460c7ca76fdf2cb3d01b1548795bb525ce855052f512b8b2d77fa3afd302f41c156edf35de0
diff --git a/app-i18n/ibus-table/ibus-table-1.14.1.ebuild b/app-i18n/ibus-table/ibus-table-1.14.1.ebuild
index 98017235346d..ba7777ab68ac 100644
--- a/app-i18n/ibus-table/ibus-table-1.14.1.ebuild
+++ b/app-i18n/ibus-table/ibus-table-1.14.1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=( python3_{8,9} )
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit gnome2-utils python-single-r1 xdg
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index 86f1cf675c4f..a069391d869e 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,5 +1,5 @@
 DIST ibus-typing-booster-2.14.12.tar.gz 10226257 BLAKE2B 5dae530a7ec425e8bd3c6009d0bdb9b8d321c8670769ddf80ba7f706d6b5140f21f184f877603de3cc6f425a4a1953c645eb177c9fa8183ecfd091ccfb32353a SHA512 09d1898c3ac8a1dc79768df7a44c33862a0b0fbb2122d184f1e8a839b8c3c71191fe5ef932f9e649ac715c8093a5c277d5783594f8defc06ecc13727b851ffa5
 DIST ibus-typing-booster-2.14.13.tar.gz 10239396 BLAKE2B 1c4db896f28f3f1b58bd3071fb6f2d5c1b2b4e0fbad43568ae25d69f301d4ce408ca6c2fb829818f6981c2f212c499c1dfabc3511f09f7a9f5c3d4ae2d08a212 SHA512 4e1f1c39fea030f1f056966007127afeb5c6c098a66ecd6fe0b4ea60f302438e072d6d409ef2bee9ea5b0d1048b5a22d7e4fad9f7f509362e2af251855f6e535
 EBUILD ibus-typing-booster-2.14.12-r1.ebuild 1148 BLAKE2B 11526afa746bbad40c6747c1a6b83b6be5d3b224373164d5286435c795814695e59b4842c7a7061298c7d160001729e0a5becc50bc4f4673ec97424311646805 SHA512 16c9fe7b754e26af1425fb8e68232097531c1985c8485055eeebace97252e8aa5037ac40d7b0756b202b2cf56fd6aedfca294507ac964e93c2212a56263186c9
-EBUILD ibus-typing-booster-2.14.13-r1.ebuild 1150 BLAKE2B 3809ef99b3c983fc124034d046aa2ed5b3818bf551b288351ccc280078d66f4fcc6036166eb238e25b823dea2c2d7c6de11b4f26f5ef1ea69de089a896fdb117 SHA512 56c958fc7c55aca42bea232e1a44747746768b019326402ce27ee4eb4adfb3adea4a72a0881861986afd29334de4fcd570a233c3ac867046c8a018789ec172c0
+EBUILD ibus-typing-booster-2.14.13-r1.ebuild 1151 BLAKE2B 9a584e3949d7065bd70ba6341be236025c5611503f5d9cb6f0e9849e481916eb9e89c18701ff7fd0cbae9bf0641543ef8b33c536ad7e5501882bac0d4f5335a3 SHA512 16e8dea273ef486a1b62b92161a0beb8aafb70405541d072f0ffcaf72f972401376dd887fa3e1a5605f792e60d1e0e1ceb5c244a94bb49a9edc2c2ce161cb7e7
 MISC metadata.xml 331 BLAKE2B e076fda3780cbfebae0a799bcc320de0417dfc2a726320c014d253163625da4fd629b180442449368e316e134bf2024f7e03373f2ca0342c4b63a11c63475697 SHA512 f79eaa01a0ad3005064928ef7fbaed4bc98f8850ca36b23309096647b6158c7500e0075f149e4e764a89af99a8fe342eb6a1d9b83a347557300545ecf870e4d8
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13-r1.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13-r1.ebuild
index c4ae2d6d9037..a57f70b73a9b 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13-r1.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.14.13-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
-PYTHON_COMPAT=( python3_{8,9} )
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit gnome2-utils python-single-r1 xdg
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 7548877c5ac4..a68742ac91ee 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -6,5 +6,5 @@ DIST ibus-1.5.25.tar.gz 3669787 BLAKE2B 0a568c77d29dfbe0c2c8cdbe8c8ae86b69c7a1a5
 EBUILD ibus-1.5.22.ebuild 4143 BLAKE2B e539ca4998d07537d138fe2b8d88fb49865471875759512289c8b388ea5e01931822bf2af986484b8f3bd3f791cb964a112473e3b51c62a774b59ec16c6b0e27 SHA512 6165d5f700ef3ca7a66098b5f2463b40ac025bda2ac5df148bc341e08827717ef58370e564c883ae8a7526f9f79e97e1ff927eb316244d69e516498ab85de931
 EBUILD ibus-1.5.23.ebuild 4450 BLAKE2B c88dc256f2ffbe8cf035a27d4081e5473dabf4875ea39b0f7695d086328ba58a3fde097f1a6dcfc55ede344faa8607eaa93812f89280100802be78cf7f765f3e SHA512 685ca1cc3bebc48ce15c68f3fe5587a1ac646245ffad3e627bf2de705bfc92cd0373336fc6767b11ac16dd3df7c2ca79fc9e266021af00ca965e3a2c3556fabf
 EBUILD ibus-1.5.24.ebuild 4483 BLAKE2B 1400cbebfb9b2dc425786261a75274d5c1d4748af74334517087aba27bcc55fc331f1c32401927499f3fc6780ffabbd4a73f866f6388f3bc9c3835b60c57ab5d SHA512 a7dce123b28947240d7ee13f2161a80aa884c2ea68879aa403fefa76f2cf1a5d240d411f08e4102cf7a4e97dfd61203d4939c1c9cd34898f264459b554d7aab9
-EBUILD ibus-1.5.25.ebuild 4512 BLAKE2B ea1ce052a5e487656fa2fdcab5e1cc4602a50ed4a312e35a50598f9d1c56231a3f01a4ac0cd2f5fdf7bad8f39a1e31a8c199cbfe40b8ba849a937dcdaff89914 SHA512 f70cf5494f5b42de33f8f4f4001e85953441773b7002f2ae3b2496cdfc8db028ae5c3d7e14882c9dae58970c891da23941e2668e26f20859260a6935b8c83874
+EBUILD ibus-1.5.25.ebuild 4509 BLAKE2B 88a60da65725ed03ffa3f3c6a19301d518622e286d7905bc432a957b61bc13108874849f425ad5855b3a8c923c0710ed5ba0f31aba27216e8818efd200a46e28 SHA512 85f85d88b231fb8b5d38e5d34bb834a81c4f96583bdd7bbbd37f2ac8122047174d09b454a9d4fc9fe2abd0ae207d2ac338fe34b9c7088f32d911237468d1e8e9
 MISC metadata.xml 866 BLAKE2B f6a00311b03da6e54d020fef05fee2f168834ea624a362bf15eaa4a52c72e8db828e7a9da8066b4facbd449d6395eedc9dace2d57465ae6f0aac3e80055267ee SHA512 7b595b5228656e6cc49c8875cc2e7fe75bfb95e94f7fd324bfabd55d03f180475554fe77949e154b9281a8426bcc7eae025329c6a5b141a0dec7341a2136b94d
diff --git a/app-i18n/ibus/ibus-1.5.25.ebuild b/app-i18n/ibus/ibus-1.5.25.ebuild
index 9dc461da301e..1adc299fca10 100644
--- a/app-i18n/ibus/ibus-1.5.25.ebuild
+++ b/app-i18n/ibus/ibus-1.5.25.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 VALA_MIN_API_VERSION="0.34"
 VALA_MAX_API_VERSION="0.50"
 VALA_USE_DEPEND="vapigen"
diff --git a/app-i18n/im-chooser/Manifest b/app-i18n/im-chooser/Manifest
index d7b9148c94f1..0f73a9cc9eb2 100644
--- a/app-i18n/im-chooser/Manifest
+++ b/app-i18n/im-chooser/Manifest
@@ -1,3 +1,5 @@
 DIST im-chooser-1.7.0.tar.bz2 509630 BLAKE2B 4a7706509ceb19c7292a5c8cf80c8fa0b571819403f30f1fa3002927c69a83522b4de627b1d453db0ada8e662da3624edcb5f85eaf01dfa0187978f2a9b2095c SHA512 2a01488062b5a4dc1e4cd0815dda5a6bcef205dc50ed75d58836c5b46e3f86be79aac70eb5d6753e5f569ccc05015dd6d8de59029e94dc407cc613160d3ac61c
-EBUILD im-chooser-1.7.0.ebuild 966 BLAKE2B de043ef070a6c0ca2fb13e23dd587c25a28770fa768c85f582c52b7aa945e0fcb73c12e1d8142c912bbb7e8141ba595f7e1fced73f76a6039c78ce0c26e2673a SHA512 98247120f4f0d9fe21bf732a226ebf3cf797b276e8c8620583dd149f6d756b06169129b193f6225c4cefad42fb92b5e1adc572f6c683980d140efba330459805
-MISC metadata.xml 626 BLAKE2B f8dd76bbe663f9d91b7d05b110e164a5f8e9c7b6999650d0ce42d7d3ade024f4fc7dfd44eba1200fa615be2d87c7029bcaf672f7e9ca63750717100c30a7d613 SHA512 74a348dd766c442f27dcf71eb32c0eed32b8e5a6bc267ac2d0b9b0d10a7f5fabe4a9d7f074850a9f69e37f2e5429dd829130946ec2bdd4f98aa2dce0e95f3278
+DIST im-chooser-1.7.3.tar.bz2 602217 BLAKE2B d61ad631ff40a25bffef17779b01073062bd70221b7e4ca435b896fc989f9a71036b84a5eb774abd2f42cee218932ccc7511a6056d3aa14d2cb7c262c4b45fe3 SHA512 d43088909e7ba3ad84166965877c4052aad195e360c0583dbc612b46cccd703217b57f149fa584f2f0d3fb706a8bcd6d129c5f9ca407b0a11bb6d304d4a06ef7
+EBUILD im-chooser-1.7.0-r2.ebuild 935 BLAKE2B f696b159972f5f145ef97a0dfc60a08e582e87d40ee7af2d6d96b965d4ccd66c2e186dba6b10c60487d168163b613a602441760b51cea6f77ade8234d36e0252 SHA512 34e016ea178850023e8ad18511e66b621bc69f15570b6f5745c66465e780101e30607eb4b5e17425e66ce0fc48064a30fcc940117b2067e248b8da7563e919ad
+EBUILD im-chooser-1.7.3.ebuild 923 BLAKE2B a4a7a75f6d507541d4d45855db8618454e49d763207973eabdbfb41c1d30ee3a76341852e1bede624c7335cac50cac898525812ce81656894f2219a3c96dfb46 SHA512 ee284d6a198268f696850a7c28027c80ae7870a4f244b615fa8ec008b1b84483d49f8a4f8bc5f870e8fb039b81e8b608f067ab37179604507644fe8d535c03fa
+MISC metadata.xml 492 BLAKE2B 52e0b290e1ff9a3bc27eae91aecdfa145045e5746bddd128ba6fe4a1063f07e33491b3622fe770a58fc52a1fd31864debb811ad50a32b9d30c5f8c7ec3d9df3c SHA512 a2b347f40c28baeaaf7c6375a14723612bdaa3fdc3670b049088681dd18f98d2fbaf56be670f2dba267c5a9e8e9da1e1eb91ac1fafeb54f6530bf490a5e0d6fa
diff --git a/app-i18n/im-chooser/im-chooser-1.7.0.ebuild b/app-i18n/im-chooser/im-chooser-1.7.0-r2.ebuild
index cff570a150e8..f493dc5a0002 100644
--- a/app-i18n/im-chooser/im-chooser-1.7.0.ebuild
+++ b/app-i18n/im-chooser/im-chooser-1.7.0-r2.ebuild
@@ -1,38 +1,37 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="8"
 
-inherit autotools
+inherit autotools xdg
 
 DESCRIPTION="Desktop Input Method configuration tool"
 HOMEPAGE="https://pagure.io/im-chooser"
 SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE="gtk2 xfce"
+IUSE="xfce"
 
 RDEPEND="app-i18n/imsettings
 	virtual/libintl
+	x11-libs/gtk+:3
 	x11-libs/libSM
-	gtk2? ( x11-libs/gtk+:2 )
-	!gtk2? ( x11-libs/gtk+:3 )
 	xfce? ( xfce-base/libxfce4util )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/intltool
 	sys-devel/autoconf-archive
 	sys-devel/gettext
 	virtual/pkgconfig"
 
 src_prepare() {
 	sed -i \
-		-e "/PKG_CHECK_MODULES/s/\(gtk+-3\.0\)/$(usex !gtk2 '\1' _)/" \
 		-e "/PKG_CHECK_MODULES/s/\(libxfce4util-1\.0\)/$(usex xfce '\1' _)/" \
 		-e "/^GNOME_/d" \
 		-e "/^CFLAGS/s/\$WARN_CFLAGS/-Wall -Wmissing-prototypes/" \
 		configure.ac
+	sed -i "s/Applications;//" src/app/${PN}.desktop.in.in
 
 	default
 	eautoreconf
diff --git a/app-i18n/im-chooser/im-chooser-1.7.3.ebuild b/app-i18n/im-chooser/im-chooser-1.7.3.ebuild
new file mode 100644
index 000000000000..32ca7804c6d7
--- /dev/null
+++ b/app-i18n/im-chooser/im-chooser-1.7.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools xdg
+
+DESCRIPTION="Desktop Input Method configuration tool"
+HOMEPAGE="https://pagure.io/im-chooser"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="xfce"
+
+RDEPEND=">=app-i18n/imsettings-1.8
+	virtual/libintl
+	x11-libs/gtk+:3
+	x11-libs/libSM
+	xfce? ( xfce-base/libxfce4util )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i \
+		-e "/PKG_CHECK_MODULES/s/\(libxfce4util-1\.0\)/$(usex xfce '\1' _)/" \
+		-e "/^GNOME_/d" \
+		-e "/^CFLAGS/s/\$WARN_CFLAGS/-Wall -Wmissing-prototypes/" \
+		configure.ac
+	sed -i "s/Applications;//" src/app/${PN}.desktop.in.in
+
+	default
+	eautoreconf
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-i18n/im-chooser/metadata.xml b/app-i18n/im-chooser/metadata.xml
index 44a7fc1547e8..1e89d4e6c916 100644
--- a/app-i18n/im-chooser/metadata.xml
+++ b/app-i18n/im-chooser/metadata.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <longdescription lang="en">
-    IM Chooser is a GUI configuration tool for IMSettings to choose Input
-    Method you want to use or disable it entirely on the desktop.
-  </longdescription>
-  <use>
-    <flag name="gtk2">
-      Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3
-     </flag>
-    <flag name="xfce">Enable support for XFCE panel</flag>
-  </use>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription lang="en">
+		IM Chooser is a GUI configuration tool for IMSettings to choose Input
+		Method you want to use or disable it entirely on the desktop.
+	</longdescription>
+	<use>
+		<flag name="xfce">Enable support for XFCE panel</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-i18n/imsettings/Manifest b/app-i18n/imsettings/Manifest
index 199180e6fdcb..5d6b6ca72c7a 100644
--- a/app-i18n/imsettings/Manifest
+++ b/app-i18n/imsettings/Manifest
@@ -1,4 +1,6 @@
-AUX imsettings-1.7.2-fno-common.patch 334 BLAKE2B e4ca9b361b2559e808e40db759a2418a5f757e482eb10b2c0fd4ec73b1781eda29982427ec71bf11b4574ff862df4d2c18e01d672e9b5c656aac54e0b67ba4bb SHA512 c3c6445182934b7822f71085f27279b918e16c79f02cec6e3ece3133d891bb3a7aca09c3adc675aabfce34a0ab2e8e7f61eba47b5e76da70ceee0a8f1f86ca69
+AUX imsettings-fno-common.patch 334 BLAKE2B e4ca9b361b2559e808e40db759a2418a5f757e482eb10b2c0fd4ec73b1781eda29982427ec71bf11b4574ff862df4d2c18e01d672e9b5c656aac54e0b67ba4bb SHA512 c3c6445182934b7822f71085f27279b918e16c79f02cec6e3ece3133d891bb3a7aca09c3adc675aabfce34a0ab2e8e7f61eba47b5e76da70ceee0a8f1f86ca69
 DIST imsettings-1.7.2.tar.bz2 595754 BLAKE2B 9964ab7ca842a7e1b9e9c61434275b55d6a58e271dd12058195573aa65c623d5152a04bc893b3ac4d983c4798bd6f4e8cdb486577be45ec43db6600f72c8cc3b SHA512 b28d67705d3d6a0ec95babaca616f750b73cdac5e01ed61e25a6527fd7f816a14654cd7233eca56d7427b9395e7ad75757b95cd7bd55c56bbdc145a3f8bfe1f0
-EBUILD imsettings-1.7.2.ebuild 1787 BLAKE2B a32a55cb94527a601c38b6f40ba47495cc48c385d793682b0d9174875ba9b73edf985ec627249d8ef36f1c62901583655452810e1e320b04eba307d174aee98f SHA512 4283751cff7ab98e639eed3d41d8c7bb9a341ea97c90fa45103242e728a5a5b8bfeac18c2b048e827b6dabbb1317ff148f50f3fab6bd40320b5f17bf71a42811
-MISC metadata.xml 619 BLAKE2B 3263c9e540462808e64248a0574050b8cfb5e38c012ff4d2791293dc30aca4e1da74740d30359d7cbe7a846b9cc635f5c33b976962d24b54cff2cffe997d07f4 SHA512 68b2a2450f15a349062e628106b51ba09258d715f93c121423f36ed7f32fba5013efc21cfb2538a70b9dfcfeb1400a06b7f341a9702019efcb98bb6c0f4ea98f
+DIST imsettings-1.8.2.tar.bz2 705391 BLAKE2B 3b7f3e2ca2c08bc149be95fb97889ab58fc22be828b9801f4c342c1514a7be35644548d6a920fe657e1d85a9d35d8c2a40766f25d6420bb3da8a8f4e7a7ba739 SHA512 600315a20fd61eaa77a0add1e587861ad3ce70175d87639e43105d804cec59bfbc0219f2177c4d9e07d337231eb85514cbfd8af614a113b688ead372075b9ff4
+EBUILD imsettings-1.7.2.ebuild 1662 BLAKE2B c9b2942533d904a6a40c771dfb5ad5c72eb06c3c94acd1eeef1eff52839501949391d8a7081d56983bdecd146124f8e256885fa7d91da8ff6e5abb601fea0469 SHA512 3c4df3f5aa61dff767b8b1b660b045c011d37cbd332641b1f0e78cca58655273bec9f9f0c8f90a19faec129e187286f446e66c1e7c6eb2d80a5e6f2aa984bf68
+EBUILD imsettings-1.8.2.ebuild 1644 BLAKE2B 9df87222a7e61c0f57dfa3a3485509cc235f56131db80e5a53c904efc19cab73d2cefc104182af40c0fc4392072d826d8fe671e64f32bddf160ee6444b26477c SHA512 42eae33bca964dca4e555e11c08d959a8eac1253deb7749d9f9df754600f44c4480860844bbb62baf8875bf1d17b3bc1213faa00b1538ebffb8800149cd06361
+MISC metadata.xml 485 BLAKE2B d88d782384ac82e2fdd3c73821019b2293e27c6883036daa3c4e9477e81b7f82ec7dc47ee779c376ac8462d032a445dd6682a53330ac4acaebb3ec9f94affe6e SHA512 c9d7943e08fded57aa9d13538bd2daca3afe393831f113cf56a7cfda9f4b16324553f029f483cf3c6f1b54827423cd5171bea94d9638046a90f15a2170ab058f
diff --git a/app-i18n/imsettings/files/imsettings-1.7.2-fno-common.patch b/app-i18n/imsettings/files/imsettings-fno-common.patch
index 0845bd31820a..0845bd31820a 100644
--- a/app-i18n/imsettings/files/imsettings-1.7.2-fno-common.patch
+++ b/app-i18n/imsettings/files/imsettings-fno-common.patch
diff --git a/app-i18n/imsettings/imsettings-1.7.2.ebuild b/app-i18n/imsettings/imsettings-1.7.2.ebuild
index 789cc72bb3e2..bd16d48dc80e 100644
--- a/app-i18n/imsettings/imsettings-1.7.2.ebuild
+++ b/app-i18n/imsettings/imsettings-1.7.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="8"
 
 inherit autotools
 
@@ -9,40 +9,37 @@ DESCRIPTION="Delivery framework for general Input Method configuration"
 HOMEPAGE="https://tagoh.bitbucket.io/imsettings"
 SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
 
-LICENSE="LGPL-2.1"
+LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 ~x86"
-IUSE="gconf gtk2 qt5 +introspection xfconf"
+IUSE="gconf qt5 +introspection xfconf"
 RESTRICT="test"
 
 RDEPEND="dev-libs/glib:2
 	sys-apps/dbus
 	virtual/libintl
+	x11-libs/gtk+:3
 	x11-libs/libX11
 	x11-libs/libgxim
 	x11-libs/libnotify
 	gconf? ( gnome-base/gconf )
-	gtk2? ( x11-libs/gtk+:2 )
-	!gtk2? ( x11-libs/gtk+:3 )
 	introspection? ( dev-libs/gobject-introspection )
 	xfconf? ( xfce-base/xfconf )"
 DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/glib-utils
+BDEPEND="dev-util/glib-utils
 	dev-util/intltool
 	sys-devel/autoconf-archive
 	sys-devel/gettext
 	virtual/pkgconfig"
 
-MY_XINPUTSH="90-xinput"
+PATCHES=( "${FILESDIR}"/${PN}-fno-common.patch )
 
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+MY_XINPUTSH="90-xinput"
 
 src_prepare() {
 	sed -i \
 		-e "/PKG_CHECK_MODULES/s/\(gconf-2\.0\)/$(usex gconf '\1' _)/" \
-		-e "/PKG_CHECK_MODULES/s/\(gtk+-2\.0\)/$(usex gtk2 '\1' _)/" \
-		-e "/PKG_CHECK_MODULES/s/\(gtk+-3\.0\)/$(usex !gtk2 '\1' _)/" \
+		-e "/PKG_CHECK_MODULES/s/\(gtk+-2\.0\)/_/" \
 		-e "/PKG_CHECK_MODULES/s/\(check\)/_/" \
 		-e "/PKG_CHECK_MODULES/s/\(libxfconf-0\)/$(usex xfconf '\1' _)/" \
 		-e "s/use_qt=\"yes\"/use_qt=\"$(usex qt5)\"/" \
diff --git a/app-i18n/imsettings/imsettings-1.8.2.ebuild b/app-i18n/imsettings/imsettings-1.8.2.ebuild
new file mode 100644
index 000000000000..6478f417a858
--- /dev/null
+++ b/app-i18n/imsettings/imsettings-1.8.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit autotools
+
+DESCRIPTION="Delivery framework for general Input Method configuration"
+HOMEPAGE="https://tagoh.bitbucket.io/imsettings"
+SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gconf qt5 +introspection xfconf"
+RESTRICT="test"
+
+RDEPEND="dev-libs/glib:2
+	sys-apps/dbus
+	virtual/libintl
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libgxim
+	x11-libs/libnotify
+	gconf? ( gnome-base/gconf )
+	introspection? ( dev-libs/gobject-introspection )
+	xfconf? ( xfce-base/xfconf )"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/glib-utils
+	sys-devel/autoconf-archive
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-fno-common.patch )
+
+MY_XINPUTSH="90-xinput"
+
+src_prepare() {
+	sed -i \
+		-e "/PKG_CHECK_MODULES/s/\(gconf-2\.0\)/$(usex gconf '\1' _)/" \
+		-e "/PKG_CHECK_MODULES/s/\(gtk+-2\.0\)/_/" \
+		-e "/PKG_CHECK_MODULES/s/\(check\)/_/" \
+		-e "/PKG_CHECK_MODULES/s/\(libxfconf-0\)/$(usex xfconf '\1' _)/" \
+		-e "s/use_qt=\"yes\"/use_qt=\"$(usex qt5)\"/" \
+		-e "/^GNOME_/d" \
+		-e "/^CFLAGS/s/\$WARN_CFLAGS/-Wall -Wmissing-prototypes/" \
+		configure.ac
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--with-xinputsh=${MY_XINPUTSH}
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	fperms 0755 /etc/X11/xinit/xinitrc.d/${MY_XINPUTSH}
+}
+
+pkg_postinst() {
+	if [[ ! -e "${EPREFIX}"/etc/X11/xinit/xinputrc ]]; then
+		ln -sf xinput.d/xcompose.conf "${EPREFIX}"/etc/X11/xinit/xinputrc
+	fi
+}
diff --git a/app-i18n/imsettings/metadata.xml b/app-i18n/imsettings/metadata.xml
index 8120f5ba616c..25862f59a7ee 100644
--- a/app-i18n/imsettings/metadata.xml
+++ b/app-i18n/imsettings/metadata.xml
@@ -1,18 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cjk@gentoo.org</email>
-    <name>Cjk</name>
-  </maintainer>
-  <use>
-    <flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
-    <flag name="gtk2">
-      Build with <pkg>x11-libs/gtk+</pkg>:2 instead of <pkg>x11-libs/gtk+</pkg>:3
-     </flag>
-    <flag name="xfconf">Enable support for <pkg>xfce-base/xfconf</pkg></flag>
-  </use>
-  <upstream>
-    <remote-id type="bitbucket">tagoh/imsettings</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<use>
+		<flag name="gconf">Enable support for <pkg>gnome-base/gconf</pkg></flag>
+		<flag name="xfconf">Enable support for <pkg>xfce-base/xfconf</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="bitbucket">tagoh/imsettings</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-i18n/man-pages-zh_CN/Manifest b/app-i18n/man-pages-zh_CN/Manifest
index ce55ee66e692..40a3ee0dce5f 100644
--- a/app-i18n/man-pages-zh_CN/Manifest
+++ b/app-i18n/man-pages-zh_CN/Manifest
@@ -1,3 +1,5 @@
 DIST man-pages-zh_CN-1.6.3.2.tar.gz 1845997 BLAKE2B 3af6859593e4b2a52ef3ce93f2d18fe0f102e63cee3c7035de04ab4d8b8ac491ceff284b1a2f01a5e4dcdc4869c2a9768ff7dfde48b9e89813a2e558bf7b259e SHA512 61171406482a24c3dfd1b6303af3d7fb086466d5f05d5799f50488beb78c91c5d1bcf574aab669b71fa0f027691a0be1a1d254d08f823ff4bd8bf976e0c83dff
+DIST man-pages-zh_CN-1.6.3.6.tar.gz 1861327 BLAKE2B 59a806aadd0ab6584a51efec8cf8e0e3ff88f589db48dd01d586534f81a06cbdc86efc7541bd9ced778b8ecc915e0f1baded882951fb60138e197f7b6b259d60 SHA512 dc9ecd461eba41fc30658e028f853e3664fc6ce27c5b48c3159c5c8a452ad6d71730e0e5f551efa7b4c358baf010ba27a855457ae69b21e9637af326044dcca8
 EBUILD man-pages-zh_CN-1.6.3.2.ebuild 832 BLAKE2B f22d5af540573deec7a75e5390a75463190ac64b8406363415f35db9ebe9c60f1eb7608bd430cb3f394090a1172ae699a999222db9c87f5ab745f9485457c163 SHA512 4ccd643343fa74ebf7613fc94b0e8ad9555710c82c6a88b923489e7bfd1a1c92b9eb44fbe5933cd02f6ac626835ea1ee3676b85c76ddaae78735771fc26c8b98
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+EBUILD man-pages-zh_CN-1.6.3.6.ebuild 864 BLAKE2B 81502c5a3af74ae38ffe07d8d9e349d1ea2145b944e95db55eb6534fc3330c50dd3143298760b5c656c8697b3f4545600bad9d6aab8d755a5ad75ac2219c59c5 SHA512 6ecea954f05aa5eed49e8d4218e96b2bb05171dd250b66658cab57746be7cca1d3e9506551b72a8b86635285fdc7e8d15f4cb8accc80d44beea18c8d0ebe3271
+MISC metadata.xml 486 BLAKE2B 86ba9e466c0f3aa1131645452f043be4cda3c2a39f24fad5e10c2baef357ec8afbff83b8f8cf76a11bbc50b91cc640c5a39ade4ba38f0b8fc752f43bebb45112 SHA512 2aac83400286feaf20fbcc38e53a346e49f1b8813228249589b161b782672069bf7c037e0c7806be0b277a09c111ac2b5fae31ac458efa2e3a93d7e61dcdbaa4
diff --git a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.6.ebuild b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.6.ebuild
new file mode 100644
index 000000000000..6f75703a013d
--- /dev/null
+++ b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.6.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="A somewhat comprehensive collection of Chinese Linux man pages"
+HOMEPAGE="https://github.com/man-pages-zh/manpages-zh"
+MY_PN="manpages-zh"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="https://github.com/man-pages-zh/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="FDL-1.2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="virtual/man"
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	# groups' zh_CN manpage is alrealy provided by sys-apps/shadow
+	# to avoid file collision, we have to remove it
+	rm src/man1/groups.1 || die
+
+	doman -i18n=zh_CN src/man?/*.[1-9]*
+	dodoc README.md AUTHORS ChangeLog NEWS
+}
diff --git a/app-i18n/man-pages-zh_CN/metadata.xml b/app-i18n/man-pages-zh_CN/metadata.xml
index 85e4ed814fa2..9e494569799e 100644
--- a/app-i18n/man-pages-zh_CN/metadata.xml
+++ b/app-i18n/man-pages-zh_CN/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>petrus.zy.07@gmail.com</email>
+		<name>Petrus Zhao</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">man-pages-zh/manpages-zh</remote-id>
+	</upstream>
 </pkgmetadata>