gentoo resync : 14.05.2020

32 files changed, 224 insertions, 170 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 00f95e192a17..ed666528ec31 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 663caf919f41..9d4a25b212f5 100644
--- a/app-i18n/ibus-anthy/Manifest
+++ b/app-i18n/ibus-anthy/Manifest
@@ -1,5 +1,5 @@
 DIST ibus-anthy-1.5.10.tar.gz 758528 BLAKE2B 39496f5c3a5f2038f3f81e09504e472a32da85f27701741cbe77b576afcd8685c4f2209aaf24ef84420cbeec1614b251d2903c1ea4e7175a1014f92615399847 SHA512 963b1dfba18259aad2296c10de35f9f321b0169d6f85afa058ed57b6894fe4e1d44514ffadeee3c3108aac77f54aa645096ddf4bdb353fafaedb83d27d8c5d47
-DIST ibus-anthy-1.5.9.tar.gz 765672 BLAKE2B 88a2b935bfe1007bdcbd70af358509da77533a67df4b6d0be218b5f9d5e1c0ca093e62618765f1e2d7c06c2127458319bbf482ce8598398b9562ecec8a258301 SHA512 2f57db784ddbd4ea57afba245dc532fe4ee8c9fea5fc7df9b3ca26600816ef4c0626b4ebdbbd976826c391890216af587863707caa26c3926a6278cc6b720ef6
-EBUILD ibus-anthy-1.5.10-r1.ebuild 1272 BLAKE2B 9f709491dda1b80f4a74292f82e9b246099f8de7a324daccb368e7deae5673272af27ff8a3aed28303a70cc508056214b050ac5353b2bcc1d0f2c5b38b23ac8a SHA512 2c66358abc262635bc70375fd64b0a1131be1850830c89a9ee68a58169400b7f8d5bcd74f16cca2f1b6d2cd053c4b982d34fcfce0922fb237380f4a7a0a87db4
-EBUILD ibus-anthy-1.5.9-r1.ebuild 1251 BLAKE2B 6588a7d19dd0a55ec5505ab325c12976f8d883eed498fa2301fe5aa053ec8e7f6bfce2540f3b662ebca9e51291c06b38880eac8d447638ee516eb19fd64e613d SHA512 dec5af46c4fab1c0b740814893141a3921a78609c04b2def1385758f27969d6a2d085e8747d7cfc8fa06b7c0ce7698597a65ef228648185a21a3e0f92f06998a
+DIST ibus-anthy-1.5.11.tar.gz 809725 BLAKE2B b12139e208c401e3fdda0d3a184b0246d039e077b827d1aeb2da20470deeb62551026c68ba39c289e7876467147a6ba93d318d0582a9b45866c2f5a4f52e85aa SHA512 2ac85bf4ddba56e3f84c3732082b3b63a07175ea712aad2865de4f87b8c0967da303ee1edccbed0890095e8ddab10e58307a47b72ee11b51de3927fdb9e72418
+EBUILD ibus-anthy-1.5.10-r1.ebuild 1285 BLAKE2B 570cb96794d1fbb1964980ec302e9e120b34a0c8daff255e70fe29c921d7675920df9f93d27ae668268f83e64973d17acf3a2f82d35ffbc313ec8c7cade6e484 SHA512 b27e6034f3740078f1a0a6278b6ec3934ac9f7d89ada688e18a9430f9f903ba20451ad8a871203a2801bad30a9d5ced244e25dc1976055aba102091b760c63ee
+EBUILD ibus-anthy-1.5.11.ebuild 1268 BLAKE2B 5bf626b2b42182645e30a4cc81fb202f3f375fa2ec830bc8ae0e747588217b18b2d03cdd3c380fa22ffbbd061aa87bd43578186b10da113377abe438add3aa4d SHA512 54ccf4f6a937c652f2bb2ddc35435bd8c8e7f7c0f341f8037982bdc92fc58f5e316f27fef4f42cd6dc9b84603569f26dc934d77f80e742e643804fbc4d414090
 MISC metadata.xml 476 BLAKE2B 33f4115e9bafa5d3f491ea05b8395123c9cb6b844959df2ee8b2cc9609b8fd20d25cc870adc117c9e96e17f215c806d82ff138b01c2b02e2e63eb99d568ea626 SHA512 024c387b5eb01279f8803df81b1d7dc2b86969ffee5986bef75987c066cce48f7d1fe8ea35790be4fafbff2281850f2b03904f41e06bc37fc9d40537eca96c07
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r1.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r1.ebuild
index 49d72440083c..f8d2fd9b0ff5 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r1.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.10-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit gnome2-utils python-single-r1
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -23,8 +23,8 @@ RDEPEND="${PYTHON_DEPS}
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
 	')
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/intltool
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
diff --git a/app-i18n/ibus-anthy/ibus-anthy-1.5.9-r1.ebuild b/app-i18n/ibus-anthy/ibus-anthy-1.5.11.ebuild
index 557c5b30b615..b818978cb1ad 100644
--- a/app-i18n/ibus-anthy/ibus-anthy-1.5.9-r1.ebuild
+++ b/app-i18n/ibus-anthy/ibus-anthy-1.5.11.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-PYTHON_COMPAT=( python3_6 )
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit gnome2-utils python-single-r1
 
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ibus/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -23,9 +23,8 @@ RDEPEND="${PYTHON_DEPS}
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
 	')
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
 src_prepare() {
@@ -41,6 +40,10 @@ src_configure() {
 		--with-python=${EPYTHON}
 }
 
+src_test() {
+	:
+}
+
 src_install() {
 	default
 	find "${ED}" -name '*.la' -delete || die
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index e21e6d2fda53..643a120e1b3b 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-typing-booster-2.7.0.tar.gz 7364094 BLAKE2B 60a45121b398032b2581d1f3e5929e74e69ee22bf0807b069529afb30797daacece47e83b0696397e6b9c3f6adc28012c7f2b7102387e03eb360383946e836b2 SHA512 a11d2cad660dc813022eda89bb690e3fe7cd517ad6a3cbc7f31879afb60c5d1628f25beb423f922b26d7dd92c685471c767084cdd3a35aff1e2314a21cd757c1
 DIST ibus-typing-booster-2.8.0.tar.gz 8018809 BLAKE2B 9306b980623094a8b72d6824292d8d52a90df69b7f1f7df11c0df63c5d2c4f2aa1ca4e2765320096915b30cc807fbe24f64a219c3beb1bec4a1d81be4511779a SHA512 64c112275ec63ac3d3c13202256be8bfded152da7b08dde7e6eb01dd38fd48535d63daaa6c2fcc09e64dcd4927931380ccd0a0be739f04330fb15dc0d4fe1823
-EBUILD ibus-typing-booster-2.7.0-r1.ebuild 917 BLAKE2B e07904b632e185636e3c5dbbbfbb3d72723866022f04aa7abe7d00411779c57639d47c07b34e2b33eef0418b67515f94d53afaff2a4e9a55c0b1d4b4289fac41 SHA512 a2b0451ed29c1dc573b3f4158c9c19fc47f7ab46cfae0b614cd10ede3c3952380deb148039ef24674aa1e627631503ffc9876916bc25af12a618d2f416d8ff7b
-EBUILD ibus-typing-booster-2.8.0.ebuild 915 BLAKE2B 8505c9546d6f07fe6c7fe641ac3cc973eb27ed681dceeca9091659d984d8bcc7285568005b46726448447d50bcf3540acacdb330cbd20c7cf49d43cb361365f4 SHA512 23e841de462df06e7f41a96271b027af87b2024cefd0e82f15535a91ecb72639ba5d54802a0b7860f354d4e3ddbc27a8eac29194188cc173e7ccd38f9685d987
+DIST ibus-typing-booster-2.8.2.tar.gz 8161995 BLAKE2B 79c7bacb7c5a07139c710ddf063b58ed6bc15d1f58529dfaa0d8f1935cb513fe27ad5e95af0ca7383922f5642d1197cf74183ba2463a3fa81637add5d8376691 SHA512 3dffc21aae59ebc8c7b3ef3df588f958b4a42a2025dc6a82613e9bb1b324f8c999d01b8d98ed48794b3ea8fd5c3221df489a88f8c54c154a69be9908beda85b5
+EBUILD ibus-typing-booster-2.8.0.ebuild 904 BLAKE2B 2342c11d4ed30313c166d1860b16f1a9ad0fb93898290041a0ac5e9c1974c5210d29f6590b251ee72d6074b648357ae6f0e1a72b0af80d8d42e3a23f9c1759ed SHA512 eb48fb3e05cbea35d04bfd521d6b3d941c095e5b1a1446d204dd7fcd4cf6464d62e002eea446749177270b564abf9cad5a6dbd3cc4e311152f0eeaa1e3e89340
+EBUILD ibus-typing-booster-2.8.2.ebuild 904 BLAKE2B 2342c11d4ed30313c166d1860b16f1a9ad0fb93898290041a0ac5e9c1974c5210d29f6590b251ee72d6074b648357ae6f0e1a72b0af80d8d42e3a23f9c1759ed SHA512 eb48fb3e05cbea35d04bfd521d6b3d941c095e5b1a1446d204dd7fcd4cf6464d62e002eea446749177270b564abf9cad5a6dbd3cc4e311152f0eeaa1e3e89340
 MISC metadata.xml 331 BLAKE2B 85b93b548e9cbef93b09e59ebf23c10b1cb4c392bcb6aeeab697cdaa775afa06874b5a6965ab09ffd8c937a0842699cdb27ad70c6146d5c37b516d82a92c80b2 SHA512 e0524c2ebad138f51a5d79d639e809196029a83f46dc331c2bd21d94417d5adf8d059f15694b484f4fcb107dff2aba7d3ad4c87a19accaccf75429bfa2c92b63
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild
index 0091f717eeca..f22450c777f4 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit python-single-r1
@@ -18,7 +18,7 @@ IUSE=""
 RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-CDEPEND="${PYTHON_DEPS}
+DEPEND="${PYTHON_DEPS}
 	dev-libs/m17n-lib
 	$(python_gen_cond_dep '
 		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
@@ -27,8 +27,7 @@ CDEPEND="${PYTHON_DEPS}
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
 		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
 	')"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	>=dev-db/m17n-db-1.7"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
+BDEPEND="sys-devel/gettext
 	virtual/pkgconfig"
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0-r1.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.2.ebuild
index 99d431fc2d5c..f22450c777f4 100644
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0-r1.ebuild
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.8.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="sqlite(+)"
 
 inherit python-single-r1
@@ -18,7 +18,7 @@ IUSE=""
 RESTRICT="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-CDEPEND="${PYTHON_DEPS}
+DEPEND="${PYTHON_DEPS}
 	dev-libs/m17n-lib
 	$(python_gen_cond_dep '
 		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
@@ -27,8 +27,7 @@ CDEPEND="${PYTHON_DEPS}
 		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
 		dev-python/pyxdg[${PYTHON_MULTI_USEDEP}]
 	')"
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	>=dev-db/m17n-db-1.7"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
+BDEPEND="sys-devel/gettext
 	virtual/pkgconfig"
diff --git a/app-i18n/nkf/Manifest b/app-i18n/nkf/Manifest
index b4baf24e8ad7..44bd33cb9568 100644
--- a/app-i18n/nkf/Manifest
+++ b/app-i18n/nkf/Manifest
@@ -6,5 +6,5 @@ DIST nkf-2.1.4.tar.gz 232479 BLAKE2B 81887b8b0422e92b2fa2be285c1d9fa4da16d572ca5
 DIST nkf.1j 24160 BLAKE2B 1d461dbacfb6e5ee358d7ea162582da5042a03f02448791c4ed33a10e9eb6e5907220db8d70aea691e3908252daffcbacdaab1b9fe52b0e4e25f7b590e5bca72 SHA512 4680dfb59ceb9db5031ecefeca808e34202c841309d5b634cdd7aa89ee97118701ddeddb0ae18a2cf791987929dc9c5a528275cb1f63b1742eac2197ac9c1416
 DIST python-nkf-0.2.0_p20141211.tar.gz 187761 BLAKE2B b607e155934dd14ad4d29298f209a233d846122299326df48e45339661d1cd08a789f5278928cb4a32c747673723f5f8877d98c7a6200af6b2dbbf29cd100f00 SHA512 5a493f32244e3cb72d188fa39b810baef31ce5f530309797a05474e3f58cf22fd5f8b6c66cdf5268451c49ffb759c476c707329ce1ccf42da0362ad4f5c24d71
 EBUILD nkf-2.1.3-r2.ebuild 1684 BLAKE2B 8d163de8197a52c0ad0054d14b8899cd6f05f4ac0468318d58a345b0afcfaf1c4ad36ad028686b42a568022226c45124e9f022e421136757edc001c1f8831502 SHA512 1ecddea3aef41246748bda0b999afbf3b0acaef17c02f4dbd6d8a36b41a0cfff1669b871f5b9f69f5924c898ee7c1674e9ddca76e336b95709835468c808e147
-EBUILD nkf-2.1.4.ebuild 1793 BLAKE2B 2fc0ab2f2e606aaa5a4f633f6784b9f0c3c3ee24e5eb1c4c9955c2410059b861fa19289a8d8b08dec528d1187c666e75e58b0ac2b7d2aac0f7ca0ca756706ffe SHA512 b110a15aa43098ea9cbc8eb347d53656f495b044ca4f0278a6f8f485b075f4de1eb6b4306c3ff4218338864a3ce810c4cac72a23b14902d20a24d2df31fef82d
+EBUILD nkf-2.1.4.ebuild 1787 BLAKE2B 290bdfbaeeeb51ebc69f74843ccb1724e879941c713a09caa7843f66fe4e752ce18e081cf2836ec7821d4c249f68a86c000f2cd9d4a7477c5382a540894a7b39 SHA512 7b5444e0a3da445f58627ebbbefb88b1d60571a2ec4b7664571507b2ffcbe752f6d1d7dd604e62f4152a4a1a68a0e3ef5983f0c2de4f6a6bb424362fdd56a8c8
 MISC metadata.xml 310 BLAKE2B 5db509d8ef0ebd0727be43314f12d877a704ff9eb8b9cde61733c4dbad8196780c07c9de484f29786116e7fe9267ca3f6be9f727be9f4fa34e582b23fa586594 SHA512 2db03c97fb76c37b779c7f6e467c03b2bc08d2642090cc27a99ae07296edcde04924e37c8a3e6cb23d61552e8cf4bee273e5c17077fac0ae0ea3458aaa81eacd
diff --git a/app-i18n/nkf/nkf-2.1.4.ebuild b/app-i18n/nkf/nkf-2.1.4.ebuild
index 313a6e04ac42..25f4cbcc3d49 100644
--- a/app-i18n/nkf/nkf-2.1.4.ebuild
+++ b/app-i18n/nkf/nkf-2.1.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1 perl-module toolchain-funcs vcs-snapshot
 
diff --git a/app-i18n/pology/Manifest b/app-i18n/pology/Manifest
index ec77c2e6f216..4f008f9d0cef 100644
--- a/app-i18n/pology/Manifest
+++ b/app-i18n/pology/Manifest
@@ -1,4 +1,4 @@
 DIST pology-0.12.tar.bz2 1773467 BLAKE2B 7725b6dcb10c0f14533ee31a3d75c78e4fbd12d79ce21017b16d339a880cb73c47c8801e54f5ca0c49d8f364a12179caf6f4100b6eee5b5c47638f61d47a30d0 SHA512 2e23d1dd0c38cc17826908734adf46fb30c30d58f906fc223e2e9251791dad43d02840ae4eca55e04682af574df45a553ccd83faf85a785a1446f645e4222b4f
-EBUILD pology-0.12-r2.ebuild 1594 BLAKE2B 398d3480c3f0a320ebf4b58f4907b637d9dc84b36e4263e5c33abdc253fbef997fab2bbc3f441c720022eea947ba2d9a21488f7b8fd211ad94364b258d0abd75 SHA512 dca123900889c3bc8544e1f0d83c31c4f46e9b5eff8127b87ca5f2e6e75eff743519f569cb04f0277e668d3da8c0b8456c8b935e5518e093560178fda9428dd9
-EBUILD pology-9999.ebuild 1596 BLAKE2B add34836b2524dfad4770657ff3491c5ce7c9c3ef10f20589265c8912a03af9ed8706f58e94c1ffb22c82050e46c7374d8928ae06d3be8373d51914bf1cc03be SHA512 a86d8261a2bd6b5589a62b4bff9ae2f1d32c8d3b1652abcf3eef34a95d51462d1b278f8643607620f82c78815d24fdeacef52ab3707195e121cc5ed696d072c9
+EBUILD pology-0.12-r2.ebuild 1637 BLAKE2B 442bd1b818c343258f31fe93ed4b98a3bb43d5bdcb818bb62557533167f12700d2671b723f12d50b24828fb1adaf5cfa2f93e11c830fca05c1d6a0eeb60abe75 SHA512 780318047c162857ce910e6d5fdfb7b0125a4cf6b39b7c2235091ab3905491e28bd5ac91d18808f474d9dc1be2d588a5963c9137d22fb3eb6985d462b8dccaed
+EBUILD pology-9999.ebuild 1639 BLAKE2B 65458ae746686a4c5065e7c01d1c9e1f9e23f10d47a43edb024fd9208349460a55737da1d55cbca370bddf912e1f0c760178b6cfe4898cf20eea159ca07b0036 SHA512 07d16a74de5d82a88fbe58588dc89df741684493495faa69265dd8f13cc8744a4b068971d4ebbc1e56bcede72d8d0ed16d0b5fa5166025646f715eee4ed840eb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-i18n/pology/pology-0.12-r2.ebuild b/app-i18n/pology/pology-0.12-r2.ebuild
index fcb45eb16276..96b897adefd6 100644
--- a/app-i18n/pology/pology-0.12-r2.ebuild
+++ b/app-i18n/pology/pology-0.12-r2.ebuild
@@ -47,6 +47,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
 		-DCMAKE_DISABLE_FIND_PACKAGE_Epydoc=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Pygments=ON
 	)
 	cmake_src_configure
 }
diff --git a/app-i18n/pology/pology-9999.ebuild b/app-i18n/pology/pology-9999.ebuild
index 1347ffb8ba86..033de2d14358 100644
--- a/app-i18n/pology/pology-9999.ebuild
+++ b/app-i18n/pology/pology-9999.ebuild
@@ -47,6 +47,7 @@ src_configure() {
 	local mycmakeargs=(
 		-DDOC_INSTALL_DIR="${EPREFIX}"/usr/share/doc/${PF}
 		-DCMAKE_DISABLE_FIND_PACKAGE_Epydoc=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Pygments=ON
 	)
 	cmake_src_configure
 }
diff --git a/app-i18n/skk-jisyo/Manifest b/app-i18n/skk-jisyo/Manifest
index 9d5f7feccc87..76242abb3772 100644
--- a/app-i18n/skk-jisyo/Manifest
+++ b/app-i18n/skk-jisyo/Manifest
@@ -1,6 +1,6 @@
 DIST skk-jisyo-201805.tar.xz 6133180 BLAKE2B 52408eb2f1fa5e5146fd4db55c249f80b5ede7d2ce1e7a3c11fb69507f87f86d778e25b04ce4e39dd241ea2d8000d829b34c47df991cb91f886923e330b652eb SHA512 13675502332609857b66391bdb9dc252b9f7a48814f6db10c60106b9cc3ce823df7615d77e0579d13b9d3da93dae2006cedc145d8dd80af39b9d4ecfe94373d5
 DIST skk-jisyo-201905.tar.xz 6198572 BLAKE2B a26e0be0406699424b24a8d1b004317b5d274fc02ed50ef6c4c696de8e039a6cfd7b34b292b7b7ecbdc2fee1950f6cc2a122ef457ba12f96972584560d3ac355 SHA512 db32fab5d5bf232838a3d502d4f648dde556381df9f96acec13d011274dedf5443676ce36324430dbe8cacb6a037e7bf70e72ef46b94fc6b57b9448e76aab38b
 EBUILD skk-jisyo-201805.ebuild 1346 BLAKE2B 754722d85b3b23412273542324d18f9896dbf44be1c1f16b0115ba3df8ae1c47e2435e6bfc0127571e06f9eae72e1bf3c24a776b878aba547967c063db82b1a3 SHA512 20ef913647bab0cc898f64564743545c982d235fd02288f8fad50e50af21510ab08bdc9742316c979b006d78df8ba1eca59ec7a1faf6d8cf67061396e172c238
-EBUILD skk-jisyo-201905.ebuild 1343 BLAKE2B 9cf7b1fad63f193a942afd31ff2306f52be7ac40835a410ddc94c8d57fdfcc9122741550f82493c313555becb47d0034d626389ee80cdc401a458b9983309489 SHA512 61f61b7c5779da49eca348439cccd50e3ab3cd0d015311712a53d8c4b007174271f22e728af50349743a1bddd757f20b807e75899c264a758b8c86e1de45535b
-EBUILD skk-jisyo-999999.ebuild 1648 BLAKE2B 93b07b219378be74e87817da306968951b22e92791246672e31b3817911b7a6b25a5e7da68e9cdd5317da6a9fcbee5cccdc2ea7a560da7aa6a5b3791eb1c453b SHA512 28648a723fab209828dc2fde0e664aa444fa4a2327e6308e9ac63a08d9e521008a905520ff68606a123901cb3a18e5d09b7ae24e97140daab8d072ccaff7b289
+EBUILD skk-jisyo-201905.ebuild 1338 BLAKE2B 29aeef80385bb3b2cc98e2ddbce82ccf02eac160c4d3969763ea41357075fa00e0efcb6aa29b8f20094377765bd0ef2bc4bf6d5f48a89ca8fbb37408977296f4 SHA512 86a5c1f7d692f98746b123daf5742b707c4c2e0afb2fc963eda39087d983bfe6e8543d390fb558e0a89701ec5d39b40dcad66203a12499f79275b839a620f440
+EBUILD skk-jisyo-999999.ebuild 1675 BLAKE2B b909d798fc8f06cb569fa6a38652b2b4af4e0b6c29739fc5c5f7c31e02b378d05d3dde328a22f1dfa9341fd6cba0b40fb5998fc80eb0be839e330f123055102a SHA512 ee18969559c73b008ecce1fb10c1ff0386de7049c74eecc09dc16e83da40a1b1bdad660095e7872050ae5a962df731df9ddfa701b7ab167aa301b1336640a273
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/skk-jisyo/skk-jisyo-201905.ebuild b/app-i18n/skk-jisyo/skk-jisyo-201905.ebuild
index 988c19a0a04e..979958d073ca 100644
--- a/app-i18n/skk-jisyo/skk-jisyo-201905.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-201905.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2 freedist public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 arm ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="cdb"
 
 DEPEND="virtual/awk
diff --git a/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
index ff740ab28884..2268f975ecd0 100644
--- a/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
 HOMEPAGE="https://skk-dev.github.io/dict"
 EGIT_REPO_URI="https://github.com/skk-dev/dict"
 
-LICENSE="GPL-2 freedist public-domain"
+LICENSE="CC-BY-SA-3.0 GPL-2+ public-domain unicode"
 SLOT="0"
 KEYWORDS=""
 IUSE="cdb ${USE_RUBY//ruby/ruby_targets_ruby}"
@@ -28,7 +28,8 @@ DEPEND="${RUBY_DEPS}
 	)"
 RDEPEND=""
 
-DOCS=( ChangeLog{,.{1..3}} committers.txt edict_doc.txt )
+DOCS=( ChangeLog{,.{1..3}} committers.md )
+HTML_DOCS=( edict_doc.html )
 
 SKKTOOLS_DIR="${EPREFIX}/usr/share/skktools/convert2skk"
 
diff --git a/app-i18n/tomoe-gtk/Manifest b/app-i18n/tomoe-gtk/Manifest
index 1bc4a6f8e97a..ff3d68a76c7c 100644
--- a/app-i18n/tomoe-gtk/Manifest
+++ b/app-i18n/tomoe-gtk/Manifest
@@ -1,3 +1,3 @@
 DIST tomoe-gtk-0.6.0.tar.gz 448058 BLAKE2B 06db81c971bf06ae1b625afb90950e7a76ad2acfb6abf038ce0c6114c4f7bc42a76a7f07dc848cfa5e6aef3039e6bab32b0d7496fea1fb67bf936b5f9631a130 SHA512 caa9b79edde7885e00d939cb3de30b32da0c1c8a7d803e26c756ee0695f7e15bee241036b1125f838e72e016f4bee9736a398108fff0eed20f1fdb86d221dc43
-EBUILD tomoe-gtk-0.6.0-r5.ebuild 991 BLAKE2B 62f4ae57bf4142032e454826210511592c6ac838730190668b5a12436108d10515d576dc5b29115b89696f7bf446c4c7f53626fa6d96ae386248b6c29f5dc89e SHA512 6e0b1763d13cbcf01fda05dc0feb4a75b181ba1a63043fc66e6222982fe235b9c321afa360a0036e303e434881d87aa6a77431159693a6a716b3072efec5be47
+EBUILD tomoe-gtk-0.6.0-r6.ebuild 598 BLAKE2B 9c42e9bc2f8ecaa3dfade024ef12090f37905fa2d796aa7168620996b1e20b6bc1ab10da0e2b4b5793d8b0c247624ed08faa4c0e304777e1c70a9c72a31403fa SHA512 0e47634b15a80ed9b5ce49fc8f62e434f805aeda61e04c679a6d6a458aa58aa87b83543f537460ca8ea28d4cba9fdffe2a6b86ba0f5f15a31b4199ec5fd29932
 MISC metadata.xml 374 BLAKE2B 39965153f406f0dab239af88b4da0823befba31b026a262e1dd42373514fdd91b21cf582c3a00184459f62253f5fed7828bae911d82c3ba31331bb7f6d6abc6e SHA512 8b35eb486271612ca74076681fc7c84a27ec5bf49b8523996d14f7cb26d22952569497656378d07ca03ec7f9e05a30e851b9220f905fcc2265d4a4568badf15e
diff --git a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r5.ebuild b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r5.ebuild
deleted file mode 100644
index f5a0c638be4f..000000000000
--- a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r5.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ltprune python-single-r1
-
-DESCRIPTION="Tomoe GTK+ interface widget library"
-HOMEPAGE="http://tomoe.osdn.jp/"
-SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="app-i18n/tomoe[python(+)?,${PYTHON_SINGLE_USEDEP}]
-	x11-libs/gtk+:2
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
-		')
-	)"
-DEPEND="${RDEPEND}
-	dev-util/gtk-doc-am
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with python python "") \
-		--without-gucharmap
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-}
diff --git a/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r6.ebuild b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r6.ebuild
new file mode 100644
index 000000000000..24fcbb8f3374
--- /dev/null
+++ b/app-i18n/tomoe-gtk/tomoe-gtk-0.6.0-r6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Tomoe GTK+ interface widget library"
+HOMEPAGE="http://tomoe.osdn.jp/"
+SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="app-i18n/tomoe
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--without-python \
+		--without-gucharmap
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-i18n/tomoe/Manifest b/app-i18n/tomoe/Manifest
index 29b442201eaf..29f42ec320be 100644
--- a/app-i18n/tomoe/Manifest
+++ b/app-i18n/tomoe/Manifest
@@ -3,5 +3,5 @@ AUX tomoe-gentoo.patch 599 BLAKE2B d297c41007f17ac07f6a80fb451c2d605ebf275b64af9
 AUX tomoe-glib-2.32.patch 688 BLAKE2B 5aeb0fa73f54331e20d8a3cd360a4e7c06e770f988686bd3ddd055b49390abd1c064a9369d89c7a4f6cd6c9631a075ba56857b0db54befeace96c233cf9e7947 SHA512 ec0344ccb48ecc8f0df3a76424ed93c9e223a3b22733626a460c4729681d7f9f072ddb84311d22e161c04503dd845c7da774ea9832df32cb79199ca47589073c
 AUX tomoe-ruby19.patch 2646 BLAKE2B 7b2289af7e87946bb9c4cb197b493bc2b8625a3bc3f22ee42270a403bd36b1bee4efcbb46117f11d537e3c8a38dfbcfca6484c0a1db6ec2f0b7a5469dac35b47 SHA512 52f555412853c3485e8d3ab7b7739f030e2c3d2b5c4aac14ebb967c93427fe04cbcfec2f5997f09f0f7611dc268ee63437b256ef4cac1ea805f0ae84a522b836
 DIST tomoe-0.6.0.tar.gz 4918949 BLAKE2B c9f4accc77fe7c6214c4d19dbbac7d0d39ed7947588ab1b8a1416f6cfeda33a6cfa84352f888d02848c8e2026bd5c36d2fe52d099bda6ca41a6d215733b11aa3 SHA512 eab618d7b28fc9613c175fab6f80fc7d6acc34af3a47f20c11b42a32acd87143ae10caca67fa1a5e2e75441d431799a5725a5d507604f8bd7447bbc1826f0bb8
-EBUILD tomoe-0.6.0-r5.ebuild 2112 BLAKE2B c60b4ac44e9db3005059b9543c81a8b4932e9344cb5dfea9c234dba273d97ece424f53af97714b95c134f99ffc9f180790f09b127274924e7ce9f8d0b7013ea2 SHA512 d9232f2954d898247cbce92152ef2ca59771759658ff664707b56153075f81f07421ccb3263dce3b8f26603ffc3867a6352b643d8678dfa386dcf2f0b1b72198
+EBUILD tomoe-0.6.0-r6.ebuild 1768 BLAKE2B ba5ea4da80001632668244a20bf4e703d87db7989969c0b2b74714a3291f5a660dc2ce5a8360cfb85b08d8df3ad0d0c931f0d9fe526bce1fe4fb1d4133399046 SHA512 668000834b77dce1488cccc8a0a8ad688e471bb16be72b5d1dfb704bb5d57fe5399cc82c4fb0276077a0137d4c2e78e444093df79f620c9e38b82f08e413665c
 MISC metadata.xml 482 BLAKE2B 454f6c496dda5f9ca738bb81c843a650be203b58bbaf4f0775204be463de6eccdd11023705295e89d1cc8513eead67dbe1fb26740bdc39216e8e2d4ee838e8ca SHA512 0898e0ba0bd42458870d268ee6bc881da1c88ab01969037d57f0d4abf5f140a7ce77bf87d918976bd763a33c8869e73d0fb2ec744be747d5bc30d594cc54efeb
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
index 9f94b8adc0c2..00b0c32111b1 100644
--- a/app-i18n/tomoe/tomoe-0.6.0-r5.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0-r6.ebuild
@@ -2,10 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby25 ruby26 ruby27"
 
-inherit autotools python-single-r1 ruby-utils
+USE_RUBY="ruby25 ruby26 ruby27"
+inherit autotools ruby-utils
 
 DESCRIPTION="Japanese handwriting recognition engine"
 HOMEPAGE="http://tomoe.osdn.jp/"
@@ -14,21 +13,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="hyperestraier mysql python ruby ${USE_RUBY//ruby/ruby_targets_ruby} static-libs subversion"
+IUSE="hyperestraier mysql ruby ${USE_RUBY//ruby/ruby_targets_ruby} subversion"
+REQUIRED_USE="ruby? ( ^^ ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )"
+
 RESTRICT="test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	ruby? ( ^^ ( ${USE_RUBY//ruby/ruby_targets_ruby} ) )"
 
 RDEPEND="dev-libs/glib:2
 	hyperestraier? ( app-text/hyperestraier )
 	mysql? ( dev-db/mysql-connector-c:= )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
-			dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
-		')
-	)
 	ruby? (
 		$(for ruby in ${USE_RUBY}; do
 			echo "ruby_targets_${ruby}? (
@@ -51,10 +43,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-ruby19.patch
 )
 
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
 src_prepare() {
 	sed -i \
 		-e "s/use_est=yes/use_est=$(usex hyperestraier)/" \
@@ -77,8 +65,8 @@ src_configure() {
 
 	econf \
 		$(use_enable ruby dict-ruby) \
-		$(use_enable static-libs static) \
-		$(use_with python python "") \
+		--disable-static \
+		--without-python \
 		$(use_with ruby ruby "$(type -P ${ruby})") \
 		--with-svn-include="${EPREFIX}"/usr/include \
 		--with-svn-lib="${EPREFIX}"/usr/$(get_libdir)
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index 24d2e1777579..cc3a57323eac 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1,3 +1,5 @@
 DIST transifex-client-0.12.4.tar.gz 179349 BLAKE2B 4287bf32a31a5319f54ae5f141f53fa00554c542d7f0f1000e985547f01029b05dc18f38ef992d37c08c6c0ab54d934a4ab37c37f0bfee299d824224316acbad SHA512 516531a0c5a7242da27e8b34a0513b24b806d3b3a271cfe29b31ef7969472f82a37e6fbb1d6198feb1c5bd99d7503bacf3f162808504415ea46670af3fe2369e
+DIST transifex-client-0.13.9.tar.gz 197283 BLAKE2B 9fd6f63a54d09f190f7dd6701e4994e4fd67e23cf630dcb49641a3c7356e55f1146be7c2a590fb09a52cccfa99e709c48fffd7df416d1d4c10231c4f42919380 SHA512 3dc4a1e713a797ce1ea626c9e85dd353fec3034ba21ab04bc89e5b927e0298b4f6560a793eec50d1a99c7ab340462c33d18c1e159697c476001be868cb7f87fa
 EBUILD transifex-client-0.12.4.ebuild 638 BLAKE2B 0b53b4af9264e9b5bfe96cbfe08da48a16ecce00fc06779c2cf54c622efddb4096fbe414fc9d45c74c51f058f9795ea765c29b371768041ddb2435d592786b46 SHA512 1273f8da1fb49837fe52447fca6010b9054239b0d9599ae5ba0d9ffde40f9bf9d993a6c31e849450a46d6d1f1641589c1350cb0117bc40a96faa3a7325ae7f20
-MISC metadata.xml 312 BLAKE2B 4f8f44c33d8e28af1666aed00cd0536cf010425d878769c0354ccee3e09a05314a61336ca16a012c6f9a453370df95410e02835123fa09b04bb9b6e6be9b39c7 SHA512 2f46ebd28eab7970044d6ce2570abce4507e3a6087ffd6b3825e005a25645d24f0b9c1fa08c31cbfe7d4a4795d6318e0cb72a959b36934055dbb95aa4d688272
+EBUILD transifex-client-0.13.9.ebuild 752 BLAKE2B 0ddbf4e4a08f2890dd3da509f2d3ae52a2235268a8f845960a7c92279aa3bb573adf6d3102219c8c7e399a080fb28d6f18ed689b01244f523bc0bc723eed7212 SHA512 7eb6b8ddfc035f0331b0bb4f0b0dde20131c54c4553429a486ef97b338e8b458083f642807e8834b1e30b727ed51982279d8648ae991fffb12c25671d73d0dc5
+MISC metadata.xml 511 BLAKE2B cb47fd7af2c99fe027060cd09a0ed4943faf219f1a9117be347e317c651d68f4a8d6967a51d899f6e125110138cfd47242b8818ef0bdf51f8b08d3989680ed79 SHA512 e1ff78568bc8bc8c80a48ffe569deb6fe36f431443ef10903a3fe03ea3f2b1452e0c145388c7225d0dfcac126b692276b27e8973a8875788234924a1d2cd8c31
diff --git a/app-i18n/transifex-client/metadata.xml b/app-i18n/transifex-client/metadata.xml
index 99f86e1fb073..0b3622727182 100644
--- a/app-i18n/transifex-client/metadata.xml
+++ b/app-i18n/transifex-client/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gentoo.2019@r123.de</email>
+		<name>Robert Siebeck</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">transifex-client</remote-id>
 		<remote-id type="github">transifex/transifex-client</remote-id>
diff --git a/app-i18n/transifex-client/transifex-client-0.13.9.ebuild b/app-i18n/transifex-client/transifex-client-0.13.9.ebuild
new file mode 100644
index 000000000000..e7e38c2901f4
--- /dev/null
+++ b/app-i18n/transifex-client/transifex-client-0.13.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A command line interface for Transifex"
+HOMEPAGE="https://pypi.org/project/transifex-client/ https://www.transifex.net/"
+SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+RDEPEND="<dev-python/python-slugify-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.19.1[${PYTHON_USEDEP}]
+	<dev-python/six-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.24.2[${PYTHON_USEDEP}]"
+
+distutils_enable_tests setup.py
diff --git a/app-i18n/unicode-cldr/Manifest b/app-i18n/unicode-cldr/Manifest
index 95600d2a54dc..7b0667b5e63f 100644
--- a/app-i18n/unicode-cldr/Manifest
+++ b/app-i18n/unicode-cldr/Manifest
@@ -1,7 +1,7 @@
-DIST unicode-cldr-common-31.0.1.zip 16370865 BLAKE2B 46e941471074116eb00ba81848b37c82e025e12841d75ef9e4e2620f887384c4dbb3f8c36febcd86d19cd17d4d84e77e11121d1ed1cf2ccf67a09260cdddc9f7 SHA512 6ef4a73b31bde5dead5af9145e5befa5969e9449b4072c94c5370c979db54e3072ec5bf15f54152045da329bf4382e54edb532c0ec77a2ce451bacc8778b73bc
 DIST unicode-cldr-common-33.0.zip 20401984 BLAKE2B 1318f8c73678f4ed2ff6a2d947171515d52825c2395e77c8149fb6a5646110876dd8e1bc30a3b918cb25c4bf106b42fe2a372a9938ff0dbf106cf0d7dc33d75a SHA512 f2f9fa5242702fd8044c9b239e175b7ead41e36da39c9e67e70b4fde7ed5d28115141ea457cda4f645b10a2d29734b35590bd0f012296bdf4986a920b87532dd
 DIST unicode-cldr-common-35.1.zip 22368309 BLAKE2B 3d00bafccca8d0b8821083fdf94440adca6f8931951de33f5914308bccddaf5c3b642d59c2b7d04588995c9a284852677ae3ab2feeb9fe531e7479d08f4ee7be SHA512 e06594da3d6dc376457e507fe234281fcb04d08daabfdaed60afb3aa59f88cdc0a7c27974c52ebd432746fcc7664948f9d6e6fde5874ad85c6c73a6441425465
-EBUILD unicode-cldr-31.0.1.ebuild 497 BLAKE2B 9dbd1fa7213e0424f97c4c365fbfe5fe1f9e52a7008219cce2ab8cf3fc2b54e3f363743129f5b9db7b890a627738b2f842f7119e52cc2d52e438d2ee7e266e01 SHA512 74b59c4201a0ce17158eaa84bb0c9de3969849d7c368588024fe94319b18d1c761dc8d373d5ac1d0837fef930e529ab77e7594f3be3204eef7989413b5de06ff
+DIST unicode-cldr-common-37.0.zip 25983328 BLAKE2B 6210d9f71cb57bc8e663eb51b2af552e30debdfeae206c2368e3ddafad723d1077cb0a2b2defb75170ef056f2d81d510e62761cbec2ed2071071e3859e7dd098 SHA512 b42e2c889b78d2ed774e2fb9f67cf3f9154aca57c5a966ea740fb7852c8c59e142f89764491f569c62d58f288e55176c8517674e2aefd2e9b8598eee3ba4307d
 EBUILD unicode-cldr-33.0.ebuild 685 BLAKE2B af75e0169cb257d4773a985ff5134fb5c8f12afb36408b2f9517411390981183f529c7468f5e5c59bfb43aa192e24cd17de7b2a1016c7ba31484630c948380e5 SHA512 59d010a5f4ce34157292e4db4b48823124d37b7e5267af2fcda4084da5783356def38fb138d5b1bff040bbed12b9dba5138099141afd265c3fb6174e7906a585
 EBUILD unicode-cldr-35.1.ebuild 692 BLAKE2B d97dbe12a6e6f6a9df84253f71f65b2eed95851e56dc99d3a4b27ea63c844848cfb0d2b588841e056305157650d9e31c2a790772b5deba39e5dc973fdd93ec8c SHA512 6899ab659b5b52e4fa814efa6bea6b55669d3eccae1e97561bcedd8d74efcd007b4f3a8e78f8ea815614353e08442859e003a120bc18706e2e553d7bf16b0b08
+EBUILD unicode-cldr-37.0.ebuild 531 BLAKE2B 0a50d74dd4ca11b339b824624d205bf4bc854ca230715a3457c323113cbc60fcff931353f39fd8c9e65689b8373cbdfd891c505bf4d813912b76ba3481f705ed SHA512 31164f2a1f0cb0df10747dbcb45e10ffd8625b2f09662e3845f614fd99526bb6a545ba5e792cfba2d57e92c8417489a0d75040d6bb08fb671ceb686f46fd8b3f
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-cldr/unicode-cldr-31.0.1.ebuild b/app-i18n/unicode-cldr/unicode-cldr-31.0.1.ebuild
deleted file mode 100644
index 9f65fc0fd5e9..000000000000
--- a/app-i18n/unicode-cldr/unicode-cldr-31.0.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Unicode Common Locale Data Repository"
-HOMEPAGE="http://cldr.unicode.org/"
-SRC_URI="http://${PN%-*}.org/Public/${PN/*-}/${PV}/core.zip -> ${PN}-common-${PV}.zip"
-
-LICENSE="unicode"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-S="${WORKDIR}"
-
-src_install() {
-	insinto /usr/share/${PN/-//}
-	doins -r common
-}
diff --git a/app-i18n/unicode-cldr/unicode-cldr-37.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-37.0.ebuild
new file mode 100644
index 000000000000..a6c32ce6d0df
--- /dev/null
+++ b/app-i18n/unicode-cldr/unicode-cldr-37.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Unicode Common Locale Data Repository"
+HOMEPAGE="https://cldr.unicode.org/"
+SRC_URI="https://unicode.org/Public/${PN#*-}/${PV%.0}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip"
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/${PN/-//}
+	doins -r common
+}
diff --git a/app-i18n/unicode-data/Manifest b/app-i18n/unicode-data/Manifest
index 299d3d618ce5..72a896d6d11b 100644
--- a/app-i18n/unicode-data/Manifest
+++ b/app-i18n/unicode-data/Manifest
@@ -2,6 +2,9 @@ DIST unicode-data-12.0.0-UCD.zip 8410561 BLAKE2B 10d34faaad501ddaba6de73a126b8dc
 DIST unicode-data-12.0.0-Unihan.zip 6749737 BLAKE2B a6caeb86f5c9dc13bc265c81acaa8ae791fdc8dbf728d3fba7a7004edcfbfa655424371cd4c9e667e1f1d6a5623b0ac1d320f0709c232b58b02494a728c7d2dd SHA512 7fdefad078284c14a9105655d1cb4d2b0dc1c89c56effe92ffcbd5a30b325559a56d97574b6077144d7a4ed02df6e6a402a2a5360e4abc0c84bae5c589044375
 DIST unicode-data-12.1.0-UCD.zip 8410738 BLAKE2B b635b449a04f3ffed8ec7311064cf2093cec5e7ebf8ec9a52b753a1c9a3f50374bdfe41a4e3e61bceefb69a847474b086b24a43f7f02de7183474737086f869f SHA512 68512627ecb75520b354160216cc14622c0d5321356f03429a102f734bddf6859c4ab266ed15db177dcbffd76c97d13d90de9a4fc38b10082a0e58fe3c82cda4
 DIST unicode-data-12.1.0-Unihan.zip 6749737 BLAKE2B a6caeb86f5c9dc13bc265c81acaa8ae791fdc8dbf728d3fba7a7004edcfbfa655424371cd4c9e667e1f1d6a5623b0ac1d320f0709c232b58b02494a728c7d2dd SHA512 7fdefad078284c14a9105655d1cb4d2b0dc1c89c56effe92ffcbd5a30b325559a56d97574b6077144d7a4ed02df6e6a402a2a5360e4abc0c84bae5c589044375
+DIST unicode-data-13.0.0-UCD.zip 7537310 BLAKE2B 5bcc8f010f81fea22cd0b5806ee190bbe9e58348c5cc3627141de3b1df5a00cbdcd800ebd0eb3bc0499b2c26920f6cadf42804b539e5be0aeeeb9eaee334a817 SHA512 aed6d06c370dd87bc5713e19ff4cde47b065b76a18149194fa843e4efc5269f749ec8905cad9132d3b803ab621a46e372052b8f3c3e9b6a65afa6516b0f2b4f2
+DIST unicode-data-13.0.0-Unihan.zip 7044963 BLAKE2B fffcd322c87c607e9e689bfef4ec79b4ec576b4ffd84465ed6d38f485ac4fccc7d0f46662f76dbb79630e070b12bf9e1530bbbd5b32c043b71f696018e1f3ad2 SHA512 87238202b5da069ab1bbc4672d86c6fd0711e354fb17f53b0b4152850c56c0fa09e6e45820ae52d49756b25fe696518ceaa34cbfe5366ff60688c9a5c3a2d5be
 EBUILD unicode-data-12.0.0.ebuild 777 BLAKE2B fd8806e48c3c1a1368dd4db416a7c0b8e85819cb0174b250932b0258b8b21611401cf31aa3575471888969fe06b621f4acae03728d6ec6976ce12536fd295a55 SHA512 15673e33060bbc37eb4da94b7887ebdec3c0641e08e05b356dc29a776948c36f1c7f2f9ef9280c948d63abd455059854ca44889fdf3d5c054362b6e767c7f1fe
 EBUILD unicode-data-12.1.0.ebuild 789 BLAKE2B 53712a51a60f329af8ae58974407987407d6a4245c1abd44a4e795a80a765503a41423f7fa8ba8d44c86de19e314076fa31469f9a5a2701cea3f9a6e148b83f7 SHA512 abc12447244d4c387aaa3803405b57529a391b96df8a66b79abf54565d64dca65055fd1dc70c617a327af7235f21135e3b721502de145ef8f8165048705a3056
-MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
+EBUILD unicode-data-13.0.0.ebuild 778 BLAKE2B 9ec0887367f0b8d803de639a3194f52abbfe61a62d739569d7ba93f5bdf81da19fc243d0269131010048645df95f0ab4f072a6530f9e6989ff4a4fedf27bc742 SHA512 148945d3c85c0b4755ec233541e72985ae83e0432de96c555ff11b3420d5515027124baa97c7a245fc54694217d372ed9a6feeede1d908daf7a4ca3d9665b96d
+MISC metadata.xml 347 BLAKE2B 6d5200dae7279af5ad9ae629ffdde919d239d868bbf90592f33ffd7b4d26ae911f5cb21b9dea7d2b0bee3ae1f78c0703e1b2e6e56e91f365611c1ed5be54c3c4 SHA512 cd88c99ee7b72bf0aca6ba376f0e07c504fbe5bcb8e2fb158404e4d46e50f18de351577b2629e0a8449541412536a6566b8943a96e57f5d5ec6f5becca767433
diff --git a/app-i18n/unicode-data/metadata.xml b/app-i18n/unicode-data/metadata.xml
index cc081897d48c..6d1ac9db2d8b 100644
--- a/app-i18n/unicode-data/metadata.xml
+++ b/app-i18n/unicode-data/metadata.xml
@@ -5,4 +5,8 @@
 		<email>fonts@gentoo.org</email>
 		<name>Fonts</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-i18n/unicode-data/unicode-data-13.0.0.ebuild b/app-i18n/unicode-data/unicode-data-13.0.0.ebuild
new file mode 100644
index 000000000000..02c0e2af5cab
--- /dev/null
+++ b/app-i18n/unicode-data/unicode-data-13.0.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Unicode data from unicode.org"
+HOMEPAGE="https://unicode.org/ucd/"
+SRC_URI="https://unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
+	https://unicode.org/Public/zipped/${PV}/Unihan.zip -> ${P}-Unihan.zip"
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+S="${WORKDIR}"
+
+src_unpack() {
+	# Unihan.zip needs to be installed as a zip for reverse deps
+	# https://bugzilla.gnome.org/show_bug.cgi?id=768210
+	unpack ${P}-UCD.zip
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r "${S}"/*
+	newins "${DISTDIR}"/${P}-Unihan.zip Unihan.zip
+}
diff --git a/app-i18n/unicode-emoji/Manifest b/app-i18n/unicode-emoji/Manifest
index d522534de978..5ec638089942 100644
--- a/app-i18n/unicode-emoji/Manifest
+++ b/app-i18n/unicode-emoji/Manifest
@@ -1,19 +1,19 @@
 DIST unicode-emoji-data-11.0.txt 59720 BLAKE2B f1416d01d384245769549cc6ea93a2fe28bbfe77d30b26c9042965e3f9aee546572ef593284f767017b3a76acbc8015987c924be3afcc06df60b31588962a455 SHA512 501847414275564c7753b7d2b8e45cdfbf9fe96a96f0f3eea81f34c480da551b317b432ca426f6441c95eea520992e8888ead749e9c60da38233afd159d9b555
 DIST unicode-emoji-data-12.0.txt 63812 BLAKE2B 7e21860d73372aeebf487c2c4ddebe76585fef30670bdb4d27cd4d1f62ce863009524f1c4eaef62be693b127fb08b20585b2b1ca059bf993412b0f7d1530d061 SHA512 3e60e8a63abb40332a7ace61d1790b29e00251edca92afe52075627fb210a1097eea6033b727b458b6a5c7935018706ae71a2c1ec439bea3ccb8501c47c4abb5
-DIST unicode-emoji-data-5.0.txt 35041 BLAKE2B 83e52d46495e9e657717aa2c59a6f7eb457ef0592a88b86b72558bb12edf30587c833877d23739bb245a77b946ad983c967fa6706a7482132ac793a4823da570 SHA512 3b68cb709700cf871f545f357a54864c6cf1dee2ee7046f42d895c0811a75129206edf2c0617a5f1183417066f0fdf2e74086e880a65826590aac9d1d31f568f
+DIST unicode-emoji-data-13.0.txt 105959 BLAKE2B 6cfbc3170f8ef990ece1f1ae9e923ac4a753dc2c2d949e5bc82c2afb0bb12a90eb4e2dcd505666b8cadc91c42f6ca9c6bec3293fecafdacf911a885b0cc42468 SHA512 7b6f838a5b863b070cdf4289a8b7a2e6f07e5af8c6614aa58b4179658f7d73161615c3c4757464585d1e9d73d307e0a60fd6621900aa9e88365d8c03729780d0
 DIST unicode-emoji-sequences-11.0.txt 105983 BLAKE2B 5b929faa3cfdbcfa11fa72f77386d3a7aee2dddc5ceb3d110d275a3ed523ddadc7be71b3fb857901d880970d5ab48dfc4b024d7e379b5efb0992e7424bfde80a SHA512 c9af23e0738350b6d61691498ac82cccec970bb2cd4a0c5d6fab6c86fef742c09c6a83f50124c1f98c285e706d145786bb29cbf4339ff1a01c75ad7515b159a6
 DIST unicode-emoji-sequences-12.0.txt 155539 BLAKE2B 701e283fcfda3582a7ec1e0922a8fa584c2e77bb7d59aaa826324d2163972b59b004107c778dc41880c7768f9c884f64d6e41639696c91052d8c81e5fb409f22 SHA512 7ddadff1259c08d503b5936aecac9ad51e9cb2b0ed84c70fdaf0df370b2edd5e24ebed99d5df7325becf269e9f2d931d1bbbabe5d95c1b9af08111bf37bd29b3
-DIST unicode-emoji-sequences-5.0.txt 103383 BLAKE2B 1fc122b617963090d7ce165c9bc13a0507c5c26e60c36fa320f3527bae72e7362be944aa28cc4ea29598551361c304d43c7fe276a0452c2c5fae7e584b3169da SHA512 729bbf862b8d7ff6225b7416a0a464592f89040e4c27674c0d9afb6e0d997162c0a336c2a1e9de41313dcd45b504b3b27915ee8c67e45186c942c2996076d554
+DIST unicode-emoji-sequences-13.0.txt 178671 BLAKE2B e391c53f8737fe7e9d8b002e61471afd903859ed9c5ca8035b04fa1c31d3f199b443e39ba7996604c606c5c46f2d9ff521d40af85e0b7c493bfcc784e2e61af3 SHA512 65f4fdaf6f2038d34f645220a0306036244dba69aeba0a44939584c18ad8e0488cb612f07e17cdb1ffea3d8d2fe3e54ed2e134855c3dc615730fd14cd297a9a3
 DIST unicode-emoji-test-11.0.txt 361356 BLAKE2B 0e3b035fff3a4e542b3dd1172cf1438648a273ec0490316f843009b725c04764180a3ce0581b3e9819a0a5724c95ae5b536065e80401510d0b8e174636544184 SHA512 89c5a0f2eb460234e50dcc0fc904fbb254a1c0afa54b5bb672032f01764e0bed3624d1a4cd5627c83fcf1ea1347c9e3baaca05b2c685890afa505763baf8be79
 DIST unicode-emoji-test-12.0.txt 394898 BLAKE2B bdb5d32b657edfac1693fc8748653f2cbd513dc5b5cd558d24c2667bb5e7efa1c3bbf25c042bff509722acf448fb633baea24ddaac8c0144e0b368a394ea6b18 SHA512 b02c7977961f1b9a8c52322ba6b8d27afb84a2d131887add18352460dc6eb2488afd7bb9dac2e3f62b88604b69d02e4289bbaad551463d8b4b0589fbc16b64b9
-DIST unicode-emoji-test-5.0.txt 341770 BLAKE2B ab4e0900dd685172ba686c3a8e501cb3333be5594338526179a3d851970546fdde2793f9c31c501e978608bcee57d7281b4722bc6f657f0626c4a48ca2ad8490 SHA512 368483fadaa2c87e1197d0b0351c1e68b4244e73ab93542d73df7169d1dfcdf98b0fc1da8a969645f6a2d45db1f2db5f75ba919dd05f1012fbc2f3fb524f5c5d
+DIST unicode-emoji-test-13.0.txt 453143 BLAKE2B 3effaedbd7f37c0bc1d3aa122b0240c4dbf981b05bed83b6bb6523a1680900c64ff27edd1dc14d14d072a8631176f5fab5ed0166bbead6944d5b89e9729d6c75 SHA512 6da82936f1eb92e5d31a4e815204e17119011408d746c60c3ecd700c8039389d7c790c8ea6b8ec2828aadd863b923f0d3861a42a1f6b5ecdbbb19d2f5f81ea56
 DIST unicode-emoji-variation-sequences-11.0.txt 36333 BLAKE2B c32b674969a102d24645d33fb000c31997c26c1e6de956fc82ae41c2fd43b244f3757e8ab217cbb03434defca16373fd33affa25c6df0b7b9393f0ab191ec65f SHA512 a0a487ef43d9cd49ff2ced654794e7190f357b00dd70ec9b84e640181dc5b2df44b2063aa4b16447d00815094155b24531f115e9121c51c95635b0af4b043643
 DIST unicode-emoji-variation-sequences-12.0.txt 36333 BLAKE2B 812dfa33f4c21aee0ac7895339d81ab6fb36c550f72df0dbfc491390082223e3babc55cf6a78b7f2ce1ed5bf739ae5eef8c7fc2afe223c5c1c14491d3d29490b SHA512 aaf6c964db27ba41b0becc6aad87e40ea7b3d7a593d33052a4ad1a67528cdf663a46622c367830b6ac47e3efccf1e52eeb18802b235560b47a7fc485097e1fba
-DIST unicode-emoji-variation-sequences-5.0.txt 36120 BLAKE2B 50e19bd7147486437dc4fd7784ec9bd5869e58f934738fa1d46edc030202fb9490ddebd6f1cefb98dd78b3be2c4da7e3f2acef0ce54487a183123311efbf7205 SHA512 484509ed56c5ea5e73160e211643a938d3fa08474281d316e5ed2d2346f38f5140a147454a9cb81c9f463d6c62befd98a8b70b695ee50effdbcfc6085dcaa520
+DIST unicode-emoji-variation-sequences-13.0.txt 36485 BLAKE2B 81a7ee549a209aa1cfc0c0c941c9163c35da357541d8a234be26d18df1abbc8db8b62577c6aa15699b0b173497374a4a4fa1f7d23a9d2698f33ba0ea7d3a1b03 SHA512 7edaf7c4df3eb34aa208ae5688a59220d125d3eb262b750493e758584d92ab3dfb3eee23a9e31c50902f4513a5a91e6cee5708bc16d052a568bd7b355573895c
 DIST unicode-emoji-zwj-sequences-11.0.txt 126959 BLAKE2B 82d78fd5fd47bb4201001903c0610e3950a2fa1c315fe8494e15977999ba0b8f0d4431eb842db6f01ab765fd181067b07258ddb4c547ddfc01fc0da7680ea540 SHA512 a2a50cd5451d3ba1da0f3b46e18a10d621ead0372599b98dad0fd47fdb271407f72bd72854136c93311b13950cedc2b1594f06d460e551ab120ed30ba8abce4d
 DIST unicode-emoji-zwj-sequences-12.0.txt 148234 BLAKE2B d5facf566e48f49f87df30b928b4d60cfeafa11da383aa34cefae0b05a796f3a9c78bbaa79ee8b460eea92c753b7e7d7840849fdc9f7bc57b2752f8b63d2988c SHA512 8d7c59d01d702d10f162476d7f96feea0d515521d1dca6aa819ed4d482a83d54c26ed225fcf864b607999a7016dddc89961b0760584d7ec0b5cbdf8e12b85051
-DIST unicode-emoji-zwj-sequences-5.0.txt 115207 BLAKE2B beb8f304be16ffe34fde4cab20bfb981f3ae61ffc6827ced0b3160de7e405459fdf38c6e7fcafdd3887da16da7870b84520f1c68e661480efbd0cb9510a04649 SHA512 26398ac77035d2f5df7a61f4c2a8a098af8e551576c9c9f157379c05aa8f75de5a0827c9bc476eb20f32c38b0c3605f6a1d9e07fe27f0e75df359ed2a7e6d25b
+DIST unicode-emoji-zwj-sequences-13.0.txt 189608 BLAKE2B 759c8c0763ed88a9ebbf40a8ef1046537773cae3043186aded7089ca3052a5c6d6baba3c30f00df57dcab0a83d46323a0c1e8551db63c3329610c641646a388a SHA512 a0b04ca2732acd33c7ea9a2929ef5d60080dfeb4b1b452e853486e57663518773af4e863b239dd2bd6f5e78ce2a7e828898757ca4adc82134da370111c3e0272
 EBUILD unicode-emoji-11.0.ebuild 999 BLAKE2B 2db60b0cb51b73d1ff6208d26028b996bae0dfed9d1a3354f068e5322a5d4c7ecc2fee7d0617349e0292f0aff93e75328d378b82c4b37b0d13f6a74bf0bf1efc SHA512 3700b820199ec46201d2cf703cf901baf8aa58e075300fd26b9e2e4e3582145f2a13119f414ec07a28ecdb295106d75d68f8f2c35026643ba998aa800000f746
 EBUILD unicode-emoji-12.0.ebuild 1006 BLAKE2B 25297006b65daead9be9df4871a0909c02851b3b2244856d2ff430ff04a33f8cc9c9796f36019412fafe42eca01575a2954cd009c86f9a20c836fbd1ea236c52 SHA512 dc3cf5e6e0aa9ecb8dcdb352c7a082e6a05c92b87b068c4846f7a3840c4eb4e6adaf708d094eed579c8d3e1160e82798975c710c645b9e920da2343b27d404ca
-EBUILD unicode-emoji-5.0.ebuild 881 BLAKE2B f68d27e7ea5db9ba81eb9a55d8c44587a2425f7396d43d29e3196341567b6b420a86bee4f7b4a61ed35702a16745de11d2a69514f1015e1a7b3082c02e210cb9 SHA512 fb8676f2643cf0f54fb1a2af488629b3467daf31098b1208773293e2802cd7c78f9a8cdd3300028ba9186bc34c95dea7b16ff6fa8efdfb02f83fb3fefbe22c17
+EBUILD unicode-emoji-13.0.ebuild 974 BLAKE2B d01433ad3897a512581cb0d99cf0a8a4da93fed6be733d1d259adb38478d9adbc1eeff56b81cfb7dbae4c3a6ae86dd692ddb3457591e277aaccdc2220cf55e1d SHA512 490570a122c9619d0b340c424372846c738296e1bf5fc0ff46bd1abfa2bd8fc0e87b0db2a4a7f6e3bb32b7e94e26431193c368b0a2917ce35d4fb77c767e6fb5
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-emoji/unicode-emoji-13.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-13.0.ebuild
new file mode 100644
index 000000000000..7910a6947061
--- /dev/null
+++ b/app-i18n/unicode-emoji/unicode-emoji-13.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="UTS #51 Unicode Emoji"
+HOMEPAGE="https://unicode.org/emoji/techindex.html"
+DATA_URI="https://unicode.org/Public/${PN#*-}/${PV}"
+UCD_URI="https://unicode.org/Public/${PV}.0/ucd/${PN#*-}"
+SRC_URI="${DATA_URI}/${PN#*-}-sequences.txt -> ${PN}-sequences-${PV}.txt
+	${DATA_URI}/${PN#*-}-test.txt -> ${PN}-test-${PV}.txt
+	${DATA_URI}/${PN#*-}-zwj-sequences.txt -> ${PN}-zwj-sequences-${PV}.txt
+	${UCD_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt
+	${UCD_URI}/${PN#*-}-variation-sequences.txt -> ${PN}-variation-sequences-${PV}.txt"
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+S="${WORKDIR}"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	local a
+	insinto /usr/share/${PN/-//}
+	for a in ${A}; do
+		newins "${DISTDIR}"/${a} $(echo ${a} | sed "s/${PN%-*}-\(.*\)-${PV}/\1/")
+	done
+}
diff --git a/app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild
deleted file mode 100644
index 9cc4bd6649fd..000000000000
--- a/app-i18n/unicode-emoji/unicode-emoji-5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="UTR #51 Unicode Emoji"
-HOMEPAGE="https://unicode.org/emoji"
-BASE_URI="https://${PN%-*}.org/Public/${PN/*-}/${PV}"
-SRC_URI="${BASE_URI}/${PN/*-}-data.txt -> ${PN}-data-${PV}.txt
-	${BASE_URI}/${PN/*-}-sequences.txt -> ${PN}-sequences-${PV}.txt
-	${BASE_URI}/${PN/*-}-test.txt -> ${PN}-test-${PV}.txt
-	${BASE_URI}/${PN/*-}-variation-sequences.txt -> ${PN}-variation-sequences-${PV}.txt
-	${BASE_URI}/${PN/*-}-zwj-sequences.txt -> ${PN}-zwj-sequences-${PV}.txt"
-
-LICENSE="unicode"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_unpack() {
-	:
-}
-
-src_install() {
-	local a
-	insinto /usr/share/${PN/-//}
-	for a in ${A}; do
-		newins "${DISTDIR}"/${a} $(echo ${a} | sed "s/${PN%-*}-\(.*\)-${PV}/\1/")
-	done
-}