7 files changed, 12 insertions, 16 deletions
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 8a8a25ddfc79..bcfe16c2b064 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 6cdf41933922..7c7f314eecab 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -6,5 +6,5 @@ DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060
 DIST ibus-1.5.20.tar.gz 3393487 BLAKE2B 0ed930cbadf7ecf9fa82ee2c0e2a8aa8cfb25a8dc1a2e2ffef0d4f894df31f879f08d7ed14508736836545cbc25b929707939c3b0ea53f2b44ba7489d6dc80ed SHA512 2bbcc19742882fa55d9c8704251f133c5be9f36a93cf52d70c460a4713419868deb634f965e67c1d5c45b615de388b92c0fbb863b118a546fbb89370a38eb77b
 EBUILD ibus-1.5.18.ebuild 4303 BLAKE2B 8ee9740732ddce17e04235a81334ef3547825a3f5d23029df92e172c6a0fccfc180e46961d025c232acbc89a37fed4a50daed7eed94fa14917b9a7523e4a677c SHA512 22280af357ddc970b4408b8a689c497fa5a13265e5dd0fe48d5182409cdcf42ecf818012ba7177ebdd4485b6ee2878ed0055c377528ebb0fd42e9f6195366c6e
 EBUILD ibus-1.5.19.ebuild 4416 BLAKE2B a32df75cb888844a8ca78753ccb9e8245c288882a38be41dbe8ea503d07e6d2e4c4820a5ecf48eae1e5e987592872cf8aaaad04e6545c2258c63f0eb52bf1b04 SHA512 fe00a1e0e7d336a2d3a9d066334c8a5dd667c9eef7fc8ba516028a5feede945f5b0af59717874a9ac3ce9acd57b189a51182c77bf7eb73d83bd0bcb96ec070b3
-EBUILD ibus-1.5.20.ebuild 4130 BLAKE2B 19d14745ed2be706daebf0625f93619b8210198870a722ec6f4e86afef5203cdf0d5ec45a28f7e942213b5b94d9d58433ecb837d4f7647a2e89d4c5d1f852e02 SHA512 8078a4355be3495e1924e0ab41751c1d695bf085840435fc168327905a3aaa51f783e83fc155d45e16ba0ed065d094d36e768d3f3b9730634ec174fcfb6da52a
+EBUILD ibus-1.5.20.ebuild 4129 BLAKE2B 288404c0a0ea9d80c95a691e6baaef05b47aa35f8e93312033c9108a78337e881f03d6fa1da4e36d1253998b47739262244d8b964228416a257c21266cd68b25 SHA512 ae96352fa78e66d44fb3b711d9e496ed8d38a5817c6c91c029e4f761c09f8e863323d472805516f49d85708e63ff146d41a921f59b6ddc36ce74c1ce00f38f03
 MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100
diff --git a/app-i18n/ibus/ibus-1.5.20.ebuild b/app-i18n/ibus/ibus-1.5.20.ebuild
index 1f0bb3865191..17f6dc0d6eca 100644
--- a/app-i18n/ibus/ibus-1.5.20.ebuild
+++ b/app-i18n/ibus/ibus-1.5.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
 REQUIRED_USE="emoji? ( gtk )
 	gtk2? ( gtk )
diff --git a/app-i18n/man-pages-fr/Manifest b/app-i18n/man-pages-fr/Manifest
index e1f8c7f4bea7..3bd5f79257d0 100644
--- a/app-i18n/man-pages-fr/Manifest
+++ b/app-i18n/man-pages-fr/Manifest
@@ -3,6 +3,6 @@ DIST man-pages-3.70.tar.xz 1266044 BLAKE2B 00aa14ac7c9aafb9883713c4d13fe9318cf10
 DIST man-pages-fr-3.70-1-r1.tar.gz 4669973 BLAKE2B 2fd32c5e922f8d74dbec74724c9acb8f5fdc0fd7a88f4687465713b22ddee5589b4a54383bdf14eb76076538e9d28a20ffdac2415c521b21e21f5186606121d6 SHA512 002ca3b7066437ce3a42f9c0396940ffc8593d2acdd05a3150c54b8d1f272ef6a448a18e6f3de0f90ac6eb4e616c132eb4e11e3e052b2e6f83a820a7d56f32d1
 DIST man-pages-fr-3.70-1.tar.xz 1143156 BLAKE2B 09a86733caf03246e530e898688d0f93ef401a74cc66eb1f5ee05ded5dee0be45fc27fcbcf458f2c5a3286a6655c7b7302eb1b2759be6e0205e69db95ce989dc SHA512 7bb6991b2278c898d67d465ebe434dc3a969e9ec5c962ed6b6fdb41e66121a1924573f529d310adf30cd8494515888627b3226f26b906452a8882c4851c290d8
 DIST perkamon-man-pages-3.70.tar.gz 24292 BLAKE2B 60848a93d95c1eedc50b10a4b8cfd68c3847ae5e6d13de06058f1c89218d953f68f5428fe3d422c11078f80a5bcb678abd51388b6ee4ea20c2db2e9a87fc51e6 SHA512 648f16c958d1ed5933da1e971f94391761cad94414eb4d0d3eee612f9cabef3a56f07c5f83b72be3f98d49a9956d3ccceb1568ea76572f6d4a6fb8b50a8225a5
-EBUILD man-pages-fr-3.70-r1.ebuild 1212 BLAKE2B 7b49de502f38eaf4c693d76945f45fad7ae165c772af2a2f9ce310b69ab318095d272b02c96ec0d78305a5ba8c5ae83c2e9080b495702bd4fe7059934e7dc81a SHA512 481d0e0a9906e24ecd7f671306aa7c11728e7ae2993392809e20b352670257a6397777986b7597f23b181ec9f3b3e69d4dc3e8c661f7af0f6e808b8bf25b8453
+EBUILD man-pages-fr-3.70-r1.ebuild 1211 BLAKE2B fc95f4cee5af0f61a1f19173dcbdafd3cfa4904b716c74c28b677011e928ab51f094094ea1c9734979b896be5dd48d80c0b9084dde9a2c4a505ba976508d5935 SHA512 d440042646317d845466f0e7abd6f2c1ca81cab54de00933cf4f73e606925443b641d012cb164d108634533db5da889518654e89cd6b7a2594b675c73909f0cd
 EBUILD man-pages-fr-3.70.ebuild 593 BLAKE2B e0169886c506e7412fbd395c42d7320b841aee6b22acc26c3244f8b695fc7a23621e9a744912417fba2d423a218fa98a64eeeca118e6b5f537ac0b56f37fc724 SHA512 22aa7346bed0fadae049e5d461d5694fb71e13e0fbad028d4e68ab3663b7dd434e8138ab5199d627bb2e26ae056c61776ddd16aadc882b53c494368a8e72b57f
 MISC metadata.xml 546 BLAKE2B a22dfeb81d1ca03f415767c7666bf5575e9c6bffb6a12b7f75b3c1921c05f21d7cd2eac020facc5b161ca89204d6d1d64b47e7436b577dbf2939b0799820cca6 SHA512 dcda3faede9782291b4ee3a1022434bea5c1807fe1099f84f3869f6d4276a918fb0eefef6879db96497d1106deb490d0a993dd5636d36b4e7455f71b6b809c17
diff --git a/app-i18n/man-pages-fr/man-pages-fr-3.70-r1.ebuild b/app-i18n/man-pages-fr/man-pages-fr-3.70-r1.ebuild
index 2a7a148e2f75..d540ec8de59a 100644
--- a/app-i18n/man-pages-fr/man-pages-fr-3.70-r1.ebuild
+++ b/app-i18n/man-pages-fr/man-pages-fr-3.70-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD GPL-2+ man-pages"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="app-text/po4a"
 
diff --git a/app-i18n/skk-jisyo/Manifest b/app-i18n/skk-jisyo/Manifest
index b9fc41ae432d..a8f41bd424d0 100644
--- a/app-i18n/skk-jisyo/Manifest
+++ b/app-i18n/skk-jisyo/Manifest
@@ -2,5 +2,5 @@ DIST skk-jisyo-201605.tar.xz 6288104 BLAKE2B d68332a4fa0804b596fc42f3dc8231a6eeb
 DIST skk-jisyo-201805.tar.xz 6133180 BLAKE2B 52408eb2f1fa5e5146fd4db55c249f80b5ede7d2ce1e7a3c11fb69507f87f86d778e25b04ce4e39dd241ea2d8000d829b34c47df991cb91f886923e330b652eb SHA512 13675502332609857b66391bdb9dc252b9f7a48814f6db10c60106b9cc3ce823df7615d77e0579d13b9d3da93dae2006cedc145d8dd80af39b9d4ecfe94373d5
 EBUILD skk-jisyo-201605.ebuild 1309 BLAKE2B 8cad5144891e505667dcba43458e50f02c07ac57b1d329a68c23ea8089c1f7e598cbbe92ebd2fff65b371df99483c2d5ba9b2d6e281023b2ae8641d254939232 SHA512 856f31033950f5d7cfabb6d6833592bc4c0a88978a23650357a4d80ebf8c6c4caf0941d3c9d6069a1f8c43ff9f0d9a113148107405bab65e83781c7d961c79e1
 EBUILD skk-jisyo-201805.ebuild 1315 BLAKE2B db4e0cf6388f8b08907236fb064248743afc4e001d963c2858b3e2bcc2ac3f337d7e0802742762d0b074f31a639929dd52a54eec44267e6217439631bdc2c5dc SHA512 1b623dd576ab168e6375cb66207028894da3d7f4011ce3f09e18ea46e3ccf3fb55a33cf46f63826d13277b0ed1cce52448362ed584f37a569ab62ff692694b3d
-EBUILD skk-jisyo-999999.ebuild 1713 BLAKE2B aad56ab0ade442ae3da013fb5e6d1171be36a04c2b2c87ffb18a849193dc4e6a8738246a937e27b60369dd11aefdc8388f29e6284db9a4d96b3567f0d2e73c7d SHA512 c80ad23b025afcbc8af327cfa2c26872097057f41a9cc9e74152e190afd81ae11247782c97468207b080b3f76aa73fc76c8e01c3cf673416bcd8ef9bdd0222e7
+EBUILD skk-jisyo-999999.ebuild 1609 BLAKE2B f0a40eeaa4e4834b3f6f9d3d0361b7ddccf1ede445a819c7a9854a64f8956bbc775a844ee509bc0d600ccd0a3119dc121fe628977f7fee1e5eed0bd6d69ae53b SHA512 a456906128d32b4bb2fe251738bf34d343c77074c73e6e77f2e2900146505e41360f24d4e87c46482352bb0ee014882c3ecb61a0de4b6482fb4257628c5593ea
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
index a8d31cb7d6ca..5954af57aa56 100644
--- a/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-999999.ebuild
@@ -1,19 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+EAPI="7"
+USE_RUBY="ruby24 ruby25 ruby26"
 
-inherit cvs ruby-single
+inherit git-r3 ruby-single
 
 MY_PN=${PN^^}
 
 DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
-HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
-ECVS_SERVER="openlab.jp:/circus/cvsroot"
-ECVS_MODULE="skk/dic"
-ECVS_USER="guest"
-ECVS_PASS="guest"
+HOMEPAGE="https://skk-dev.github.io/dict"
+EGIT_REPO_URI="https://github.com/skk-dev/dict"
 
 LICENSE="GPL-2 freedist public-domain"
 SLOT="0"
@@ -30,9 +27,8 @@ DEPEND="${RUBY_DEPS}
 		)
 	)"
 RDEPEND=""
-S="${WORKDIR}/${ECVS_MODULE}"
 
-DOCS=( ChangeLog{,.{1..3}} READMEs/committers.txt edict_doc.txt zipcode/README.ja )
+DOCS=( ChangeLog{,.{1..3}} committers.txt edict_doc.txt zipcode/README.ja )
 
 SKKTOOLS_DIR="${EPREFIX}/usr/share/skktools/convert2skk"