From bd4aeefe33e63f613512604e47bfca7b2187697d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 3 Nov 2019 16:06:58 +0000
Subject: gentoo resync : 03.11.2019

---
 app-i18n/Manifest.gz                               | Bin 20996 -> 20998 bytes
 app-i18n/canfep/Manifest                           |   2 +-
 app-i18n/canfep/canfep-1.0-r1.ebuild               |  11 +-
 app-i18n/cstools/Manifest                          |   2 +-
 app-i18n/cstools/cstools-3.42-r1.ebuild            |  22 +++
 app-i18n/cstools/cstools-3.42.ebuild               |  20 ---
 app-i18n/ibus-libpinyin/Manifest                   |   7 +-
 .../ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild    |   2 +-
 .../ibus-libpinyin/ibus-libpinyin-1.9.2.ebuild     |  53 ------
 .../ibus-libpinyin/ibus-libpinyin-1.9.3-r1.ebuild  |  52 ------
 .../ibus-libpinyin/ibus-libpinyin-1.9.3.ebuild     |  44 -----
 app-i18n/ibus-typing-booster/Manifest              |   4 +-
 .../ibus-typing-booster-2.5.3.ebuild               |  32 ----
 .../ibus-typing-booster-2.7.0.ebuild               |  32 ++++
 app-i18n/ibus/Manifest                             |   2 +
 app-i18n/ibus/ibus-1.5.21.ebuild                   | 180 +++++++++++++++++++++
 app-i18n/libtabe/Manifest                          |   4 +-
 app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild          |  67 ++++----
 app-i18n/libtabe/libtabe-0.2.6.ebuild              |  53 ------
 app-i18n/man-pages-de/Manifest                     |   7 -
 .../files/man-pages-de-1.3-bzip2.patch             |  19 ---
 app-i18n/man-pages-de/man-pages-de-1.15.ebuild     |  52 ------
 app-i18n/man-pages-de/man-pages-de-1.21.ebuild     |  48 ------
 app-i18n/man-pages-de/man-pages-de-2.10.ebuild     |  80 ---------
 app-i18n/scim-tables/Manifest                      |   2 +-
 app-i18n/scim-tables/scim-tables-0.5.13.ebuild     |  53 +++---
 app-i18n/skk-jisyo/Manifest                        |   2 +-
 app-i18n/skk-jisyo/skk-jisyo-201805.ebuild         |   2 +-
 app-i18n/xvnkb/Manifest                            |   6 +-
 app-i18n/xvnkb/files/0.2.8a-putenv.patch           |  11 --
 app-i18n/xvnkb/files/xvnkb-0.2.8a.patch            |  16 --
 app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild              |  70 --------
 app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild              |  50 +++---
 33 files changed, 332 insertions(+), 675 deletions(-)
 create mode 100644 app-i18n/cstools/cstools-3.42-r1.ebuild
 delete mode 100644 app-i18n/cstools/cstools-3.42.ebuild
 delete mode 100644 app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.2.ebuild
 delete mode 100644 app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.3-r1.ebuild
 delete mode 100644 app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.3.ebuild
 delete mode 100644 app-i18n/ibus-typing-booster/ibus-typing-booster-2.5.3.ebuild
 create mode 100644 app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0.ebuild
 create mode 100644 app-i18n/ibus/ibus-1.5.21.ebuild
 delete mode 100644 app-i18n/libtabe/libtabe-0.2.6.ebuild
 delete mode 100644 app-i18n/man-pages-de/files/man-pages-de-1.3-bzip2.patch
 delete mode 100644 app-i18n/man-pages-de/man-pages-de-1.15.ebuild
 delete mode 100644 app-i18n/man-pages-de/man-pages-de-1.21.ebuild
 delete mode 100644 app-i18n/man-pages-de/man-pages-de-2.10.ebuild
 delete mode 100644 app-i18n/xvnkb/files/0.2.8a-putenv.patch
 delete mode 100644 app-i18n/xvnkb/files/xvnkb-0.2.8a.patch
 delete mode 100644 app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild

(limited to 'app-i18n')

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index c98c9b0041c3..cc9deb6213d7 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/canfep/Manifest b/app-i18n/canfep/Manifest
index 53e07f570b29..603f156e17f9 100644
--- a/app-i18n/canfep/Manifest
+++ b/app-i18n/canfep/Manifest
@@ -2,6 +2,6 @@ AUX canfep-posix-pty.patch 1674 BLAKE2B dfeda6e249501ed6b5a8bd185dbd9df735bd9f08
 AUX canfep-termcap.patch 6533 BLAKE2B c8e9ffa84390bac88e6ad1fc30e47d237a6fc10d3f8b727a730358faa69d76a24ddb9b1467d695eed691ceb9e1b5558baf12d45178e44b642fb3fc7ff0f9d36d SHA512 7ebaf5745bdc8b1aa1bd07879fe51c3c6410c1475f9e44535bf863f9ab0b7ee6ac0f3dca852c22036ae2ecfababfd976a0c3027ad9d33e3aae7e289c00bd60bc
 DIST canfep-1.0.tar.gz 8067 BLAKE2B 1a6e8af357d2b7aaccf442b0f8bab577ed05a5a0fdf2fb4c189105c2c41f739c2e559e740584bf393fcc52d3f3bd0bb6216e06e2b685f62f7dded9d576e95bed SHA512 0fd7c8ca56282fa537b76fe33f46e03d4f0f4727528ccad95cd4726888372da9158fc8bed2cdc67d645defb479040cd4a4d0999f69d38fd8b4080f7ece4e67d6
 DIST canfep_utf8.diff 7152 BLAKE2B e3848d5119b01d3296c93b5ed8495c6f93ecb1ef39f168d6e1685636055295b8f7277c6b680cadb648fe6847c92e3b038a9b5a9a58f23fe3490dcbe675bcc96f SHA512 32d946b8b78efd3b95736738497fe46a7d0e2383f2b665c8af79270d7b0d1404ca051e63fc67375f0b953b8f604475c8d6b2d683089bc97b098fa9524b89208c
-EBUILD canfep-1.0-r1.ebuild 980 BLAKE2B f3681c10cd62315c8f3f31f5a216b6a2ab6d36ffb9fb09d3a5ad6d1db85c0c8414d351342ad7b4b17035fd78ccca11ce42ada2dacb81f5efdea24048dd2c14a0 SHA512 57c102baccceafdbbf894576a9e0b338c8c0213b1d51cd41e93f8a9414aae37881e1101e9a05cbadac35ce31e6f4d57c49cd60f980987932a7415df408492054
+EBUILD canfep-1.0-r1.ebuild 997 BLAKE2B 494ff7ddc0a3e51c36c2bc766df0ebe2a1b4856478f9011057ebe11b27cb664985ec5ce9b8f2d8ebb9db5d04a26bc401d60a5776677524baebe6860f243846a9 SHA512 fc44c3107247a3de09705a45875e4bdeb3d4010f212b474cd4d7f54d42d37158bbc043327e222a8ec232fe7d291dae650534b9e9ac1e91c015fac064f5838878
 EBUILD canfep-1.0.ebuild 893 BLAKE2B ad7563343f58d9e831d31ad9f3cec03f833aaa0d09a15cbb5a3ab2a57b809435ad153858f003a0d2947d3e06d2248af93b79b5575d0483501700de4adc3504b6 SHA512 7970b0c9ce1fdd16e933c5f3c5b82216f9ab212433881ff51d0020e13fb05d4d96dd150ba0c305701e9c9029575aa5c52875bb61049962a47c5cb3c45f68b939
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/canfep/canfep-1.0-r1.ebuild b/app-i18n/canfep/canfep-1.0-r1.ebuild
index d46bf3258374..c78e54ada07f 100644
--- a/app-i18n/canfep/canfep-1.0-r1.ebuild
+++ b/app-i18n/canfep/canfep-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,13 +6,14 @@ EAPI="6"
 inherit toolchain-funcs
 
 DESCRIPTION="Canna Japanese kana-kanji frontend processor on console"
-HOMEPAGE="http://www.geocities.co.jp/SiliconValley-Bay/7584/canfep/"
-SRC_URI="http://www.geocities.co.jp/SiliconValley-Bay/7584/${PN}/${P}.tar.gz
+#HOMEPAGE="http://www.geocities.co.jp/SiliconValley-Bay/7584/canfep/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz
 	unicode? ( http://hp.vector.co.jp/authors/VA020411/patches/${PN}_utf8.diff )"
 
 LICENSE="canfep"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ppc ~sparc x86"
 IUSE="unicode"
 
 RDEPEND="app-i18n/canna
@@ -35,7 +36,7 @@ src_prepare() {
 src_compile() {
 	emake \
 		CC="$(tc-getCXX)" \
-		LIBS="-lcanna $(pkg-config --libs ncurses)"
+		LIBS="-lcanna $($(tc-getPKG_CONFIG) --libs ncurses)"
 }
 
 src_install() {
diff --git a/app-i18n/cstools/Manifest b/app-i18n/cstools/Manifest
index 5d22497828c4..ed79bb139ea4 100644
--- a/app-i18n/cstools/Manifest
+++ b/app-i18n/cstools/Manifest
@@ -1,3 +1,3 @@
 DIST Cstools-3.42.tar.gz 30650 BLAKE2B bf67d60b2373bed444086a8866695ee861f473fde5a623b7813659fda5dc905bffc968fefb479bd76e8345a1d9f47d3094c55a683a939a45e9a5fffd402ad33c SHA512 78f2f95b5cfde77d23249550085a895abc35965b02ff26382b248d4e713c90c113ad7909b916713dff55c9ee210f13672d609d794b3caf9985fcb207a071f19f
-EBUILD cstools-3.42.ebuild 484 BLAKE2B 856f05f5fb15e74e2f2a45ba213710b103e288dd132f78f5e202d4793fce1fbd880fd19063c4de853904770164612a760c18171e6db1661b9520157bc50b161c SHA512 6a86863aa2afc34d399d37605a54da8b4f3485579b94f54d5f9f30be17df59c22db3adcdc378c12736f69239f49ec3f9a85f5cec02bbc9e90e27721b85e47a47
+EBUILD cstools-3.42-r1.ebuild 520 BLAKE2B 8fbcb145c580e63a3c651aba390ae161137365cf5dedecc6ca8fa0124f4e44b193619ebf5c05582cfe4e49d3645fd1a34ec219f830173b3bdeab1e8e9d360a8e SHA512 5c42180481d6f85c42314aa36a03df13f18f5ab6ec7c726d57497e518abff2ef8edd47622f4591f9766daa58c069522f62908573523d4663b5648fe942fc8389
 MISC metadata.xml 630 BLAKE2B e49440973b0869398113f9f601fd894e40a9a0035e42f18232e3f140b49db84876cbc6c7d02a38336de4023d438137c00856db2ff52891207db682376d4d67f8 SHA512 9fc60f84d9cdc0ae1fd60e9443126e618bbe8b029a2a6b44696754164cadbad61714b2ce8e8847f8b70486ad7c62f8e7edc52ecd16410220ce577e376729e0b3
diff --git a/app-i18n/cstools/cstools-3.42-r1.ebuild b/app-i18n/cstools/cstools-3.42-r1.ebuild
new file mode 100644
index 000000000000..5a1eb09a1a07
--- /dev/null
+++ b/app-i18n/cstools/cstools-3.42-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit perl-module
+
+MY_P="Cstools-${PV}"
+DESCRIPTION="A charset conversion tool cstocs and two Perl modules for Czech language"
+SRC_URI="https://www.adelton.com/perl/Cstools/${MY_P}.tar.gz"
+HOMEPAGE="https://www.adelton.com/perl/Cstools/"
+SLOT="0"
+LICENSE="Artistic"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-perl/MIME-tools"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/app-i18n/cstools/cstools-3.42.ebuild b/app-i18n/cstools/cstools-3.42.ebuild
deleted file mode 100644
index d3aba33b2715..000000000000
--- a/app-i18n/cstools/cstools-3.42.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit perl-app
-
-MY_P="Cstools-${PV}"
-DESCRIPTION="A charset conversion tool cstocs and two Perl modules for Czech language"
-SRC_URI="https://www.adelton.com/perl/Cstools/${MY_P}.tar.gz"
-HOMEPAGE="https://www.adelton.com/perl/Cstools/"
-SLOT="0"
-LICENSE="Artistic"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-perl/MIME-tools"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/app-i18n/ibus-libpinyin/Manifest b/app-i18n/ibus-libpinyin/Manifest
index 2b7e2d2432cd..08f0cb40a1c8 100644
--- a/app-i18n/ibus-libpinyin/Manifest
+++ b/app-i18n/ibus-libpinyin/Manifest
@@ -1,11 +1,6 @@
 DIST boost.282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d.m4 55907 BLAKE2B 16ac81094457c80b418109104139c1604e38ec58d6065474cc512668601f12896c4d470fe15c9a366a5ec63d50135265df71f28f4202fa283231879fafb0efbc SHA512 382c7f8a94059ae9816783b12c2d27ee6ca69e23ef7085bf2ee5a31109e6ab0c3d0b0042a3dc290b89276b6315d767aedf073dca390fa688a9aae07e837f83c9
 DIST ibus-libpinyin-1.10.0.tar.gz 1693440 BLAKE2B 5e0d9debddfbb81fcb45ac86d1fe8fb1220a50c527222fb3c3431149231f41dcc59ae87da9ae9485e2585f0e3051ac4d1792407ba62d90e5e0323c482d52318f SHA512 c9fdc28562714bddc889805e1d439a7dd425f721a8236b8f8ec4727ce24e5053693b3e5bd9b06ced22ceb66bc7621715f7ee52e00af3b8b113503a5ce6963ca0
 DIST ibus-libpinyin-1.11.1.tar.gz 1728202 BLAKE2B 6e2273c4ff1be76bb8b0e65b915e039c0a181981d20ed94662184e161e8639ad3d548de981d7bbae950ab8b5019bedaed9593e03282e2f9d207f831929d422bc SHA512 48691952a10f4ab545d8e233dc3cd75fc54270c03a687820048152636df26d233ee0fba89e4ec2ccd5a6e410b41e556872e3dd2468d59d44b3440e904b93528b
-DIST ibus-libpinyin-1.9.2.tar.gz 1693247 BLAKE2B a887be2a11406420e86cf1e7f76f8d8c06cbffa62a0ab42d450015965c24accab51164ed18cdc8e24f26edf03676603a691c907e00722efc24e947919345570f SHA512 008390049b0186b7163cfd8857806715dd78235fc1e35a89d4b58a38eb7f292b643d48f502c0c924512a9f5a96d2581f577d6a9ec3b660d05d9a4adcde970430
-DIST ibus-libpinyin-1.9.3.tar.gz 1692251 BLAKE2B 6f23a8838f90c082a43fc2922bcaf13ecf287fdfb898f1ba213739f8e2f65ff9a68bdc57cf8f82e73e2c5e1569f1209b8294b45c30c5c3b7e32287b73394ddc7 SHA512 cad3d8415e0c206cbd2eb606ea04b5861e10c3a5f614d90bbba29b751fcc978e2ce1a8a000ceb8cc98de1afcc145ea62b5ee8e9d34e4184bccc487225b34ab1a
-EBUILD ibus-libpinyin-1.10.0.ebuild 1504 BLAKE2B acde303e11eb1247070b722c3091e345baecc52c2be979282f08fd67533df15bf580a203e9def2632ffea5f55e0415e6974822242e8b37894417f3999d485529 SHA512 8e4ef404686546dbc1087ec72ae8869cca35e124a39d1d2b507b922f1e455ccb98485b59066df271d52215ba4ba5f591893f92152b7eb8bb80bc81216cf66cd6
+EBUILD ibus-libpinyin-1.10.0.ebuild 1502 BLAKE2B 31f87c7b2f7d26f681383d86f19f1e3a5a8659dd8b3e0879143e3153ab5c41b9a2e9c24f308d48ac9f2715d983d4f45cfaad0a179a677e4fc8a75745c5b1259f SHA512 4a27ce65b03e5dc0c7ae5f54ed1f8aa3f155907e008a97ff5460d587c8f507f04ce099c83c44de59fe34ce1faf06ccd2136bb78169bcf88e53f40eec901fbe13
 EBUILD ibus-libpinyin-1.11.1.ebuild 1168 BLAKE2B 61ff0f1bdbde3e2b3457daf7305f26426e22c9a5e8662d85e19b98fc87a1688051d5d77777b65d01464bcfd3dec6e0ec21b9de65cb43932d4c7424c70c9a1e90 SHA512 c0ba8a5cd462971fca1d4413b4631550dd3920599dfbc6339ff3be46cd32a82c81ce8cc1ba2bff558f850cfff309bb46ed24866b9a5ea9bbf4e9e034356d0371
-EBUILD ibus-libpinyin-1.9.2.ebuild 1168 BLAKE2B f6df3141832f86f0efbbde6d92a4f692795b585800f9d3c24eeacbe15300be61996b6d029fce6ac8e02ca8253b9cb6c8e3ce5b21b8d688eb2bab860a157d2cb1 SHA512 ace4d4f847d87b9c44e061457f040f744463a06aff68e762200700913d0f54fcf9d8150c064a44245ef95c31d9ca653c6807f6003620788a5962d3a99370e414
-EBUILD ibus-libpinyin-1.9.3-r1.ebuild 1407 BLAKE2B 9b2424d1fe2ea8f1488909831ba59f6920ca7398aa2810a6caa67dff4ab0a9ac0ab328e03a3c629a2b44552fbd3b758909d5101f97f696dc3cd99dacd2c191fc SHA512 89ce99b04ee1dadcca556f73943327df5fd26b8210fdbecf8fecd899a83c27a92fcac49254c41c145b000e4f84d2eef65fddaa95c7d3be20ab0e2a83f761658f
-EBUILD ibus-libpinyin-1.9.3.ebuild 1065 BLAKE2B 7d8ce41d0bfa9faf82d7651a72b6976953da94e0baaea2abe557cdb931bd667efac553cf8ebcb241ef385b8c55dd237f533a5be6757fb6ab507283c320f9eb3f SHA512 12ceebfafbacb494efee3e90ca78e9c6845aef202b5a432828fbcbce1a0b688294861151324d2e75ccd7f67ccc84084cb2a4310290b975c350011fd422d34457
 MISC metadata.xml 807 BLAKE2B 864c61e2dac53fc0b95541bf79e8f27a183f879bab95574f7cf462bfe276c89c8a5d2b65c899f4734c487feff1113a20ee02debd48b4ff955a24ace70ed5006e SHA512 c92e0e2c47a1272285c3a36cfc18c739df2a69dc911a8849cdc9c517183309908fdae894e88ed7511645b1c90c3611670b046f1a2c7c48fd0ff7c79d2de0a5b0
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild
index 646cb4dae3f4..3f5e863d4a58 100644
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild
+++ b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="boost lua opencc"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.2.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.2.ebuild
deleted file mode 100644
index 8856c6b4b622..000000000000
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit autotools gnome2-utils python-single-r1
-
-DESCRIPTION="Intelligent Pinyin engine based on libpinyin for IBus"
-HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin"
-SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="boost lua opencc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	>=app-i18n/libpinyin-2.1.0:=
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	boost? ( dev-libs/boost:= )
-	lua? ( dev-lang/lua:0 )
-	opencc? ( app-i18n/opencc:= )"
-
-DEPEND="${RDEPEND}
-	virtual/libintl
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	sed -i "s/python/${EPYTHON}/" setup/ibus-setup-libpinyin.in || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-english-input-mode \
-		$(use_enable boost) \
-		$(use_enable lua lua-extension) \
-		$(use_enable opencc)
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.3-r1.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.3-r1.ebuild
deleted file mode 100644
index 364d20022ce2..000000000000
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.3-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit autotools python-single-r1
-
-BOOST_M4_GIT_VERSION=282b1e01f5bc5ae94347474fd8c35cb2f7a7e65d
-
-DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
-HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
-SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	boost? ( https://github.com/tsuna/boost.m4/raw/${BOOST_M4_GIT_VERSION}/build-aux/boost.m4 -> boost.${BOOST_M4_GIT_VERSION}.m4 )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boost lua opencc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	>=app-i18n/libpinyin-2.1.0:=
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	boost? ( dev-libs/boost:= )
-	lua? ( dev-lang/lua:0 )
-	opencc? ( app-i18n/opencc:= )"
-
-DEPEND="${RDEPEND}
-	virtual/libintl
-	virtual/pkgconfig"
-
-src_prepare() {
-	if use boost; then
-		cp "${DISTDIR}/boost.${BOOST_M4_GIT_VERSION}.m4" "m4/boost.m4" \
-			|| die "copying newer version of boost.m4 file failed"
-	fi
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-english-input-mode \
-		$(use_enable boost) \
-		$(use_enable lua lua-extension) \
-		$(use_enable opencc)
-}
diff --git a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.3.ebuild b/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.3.ebuild
deleted file mode 100644
index 424a0179e359..000000000000
--- a/app-i18n/ibus-libpinyin/ibus-libpinyin-1.9.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit autotools python-single-r1
-
-DESCRIPTION="Intelligent Pinyin and Bopomofo input methods based on LibPinyin for IBus"
-HOMEPAGE="https://github.com/libpinyin/ibus-libpinyin https://sourceforge.net/projects/libpinyin/"
-SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="boost lua opencc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	>=app-i18n/libpinyin-2.1.0:=
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	boost? ( dev-libs/boost:= )
-	lua? ( dev-lang/lua:0 )
-	opencc? ( app-i18n/opencc:= )"
-
-DEPEND="${RDEPEND}
-	virtual/libintl
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-english-input-mode \
-		$(use_enable boost) \
-		$(use_enable lua lua-extension) \
-		$(use_enable opencc)
-}
diff --git a/app-i18n/ibus-typing-booster/Manifest b/app-i18n/ibus-typing-booster/Manifest
index d2094e60c1b4..a9541732e359 100644
--- a/app-i18n/ibus-typing-booster/Manifest
+++ b/app-i18n/ibus-typing-booster/Manifest
@@ -1,5 +1,5 @@
-DIST ibus-typing-booster-2.5.3.tar.gz 6463060 BLAKE2B c1053f2e9536ee1dd1c243702150e7f0d1dce1651a196a705395890d3d6274a369c718c66c62d96bd317862d831da8195e70bddcde53fef27c1531e5525193ae SHA512 6d7f033919223522c9b0fcef5af4d8368f126c2da1acbbb0403c0575cdedaddd1de7d5cbcdf15dda63b05a871f35708586628195c3da4cfd86ca12bfde452672
 DIST ibus-typing-booster-2.6.0.tar.gz 6863400 BLAKE2B e399ebaa19a2949882de41cb3b11dfc161a0ddb300e23daf216857dea9bb4b3d31db6dcd02846214b8ac677df92672a342c7c9e992ab791f97bdf8abc514ba4a SHA512 7e916eaba5d3f14bde383acedd5ce9cd74e72328f25a84936055ee9183b4aeff79d5297fffdd27713491f23a949377cafc39bc52efa0f7d5995672176cb808c8
-EBUILD ibus-typing-booster-2.5.3.ebuild 853 BLAKE2B 6c1200af452176170c9cbccb3d64ea1417bbd76b71b0be523d3c2ca02037a0b5541d77e7dadbd9be91b75a53b450604f3fd8a1ad64a46a953d106320f4f66b94 SHA512 0ab809822cf0bc40b88ba09f0c7103e20eb56a5a30c0229882234ee1fce1f9b4859cfa381652402386475a6ab8ed88a98df9a1393a6f630f32cd1d9b820626f8
+DIST ibus-typing-booster-2.7.0.tar.gz 7364094 BLAKE2B 60a45121b398032b2581d1f3e5929e74e69ee22bf0807b069529afb30797daacece47e83b0696397e6b9c3f6adc28012c7f2b7102387e03eb360383946e836b2 SHA512 a11d2cad660dc813022eda89bb690e3fe7cd517ad6a3cbc7f31879afb60c5d1628f25beb423f922b26d7dd92c685471c767084cdd3a35aff1e2314a21cd757c1
 EBUILD ibus-typing-booster-2.6.0.ebuild 857 BLAKE2B 4c68182ecbf141868ce5560bd2046fecd279bc8831679ef3b88eb07220cbf364d0e8bcb3d7d0e4d30d96c6a2b67ad1fe74ff6579a3a8c40eda0dadf75f8da0e7 SHA512 60560906ff65573aadef3270db06c9dbb3156f6b851dc79de0dfe86f4027041ecbe1cf92f31e8382c2f43d9f9903b83f5e4c15ceec3d0297742f24f566461820
+EBUILD ibus-typing-booster-2.7.0.ebuild 857 BLAKE2B 4c68182ecbf141868ce5560bd2046fecd279bc8831679ef3b88eb07220cbf364d0e8bcb3d7d0e4d30d96c6a2b67ad1fe74ff6579a3a8c40eda0dadf75f8da0e7 SHA512 60560906ff65573aadef3270db06c9dbb3156f6b851dc79de0dfe86f4027041ecbe1cf92f31e8382c2f43d9f9903b83f5e4c15ceec3d0297742f24f566461820
 MISC metadata.xml 331 BLAKE2B 85b93b548e9cbef93b09e59ebf23c10b1cb4c392bcb6aeeab697cdaa775afa06874b5a6965ab09ffd8c937a0842699cdb27ad70c6146d5c37b516d82a92c80b2 SHA512 e0524c2ebad138f51a5d79d639e809196029a83f46dc331c2bd21d94417d5adf8d059f15694b484f4fcb107dff2aba7d3ad4c87a19accaccf75429bfa2c92b63
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.5.3.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.5.3.ebuild
deleted file mode 100644
index e5433dc5ed44..000000000000
--- a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.5.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{3_5,3_6} )
-PYTHON_REQ_USE="sqlite(+)"
-
-inherit python-single-r1
-
-DESCRIPTION="Completion input method for IBus"
-HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
-SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-CDEPEND="${PYTHON_DEPS}
-	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
-	dev-libs/m17n-lib
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	>=dev-db/m17n-db-1.7"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig"
diff --git a/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0.ebuild b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0.ebuild
new file mode 100644
index 000000000000..b026527d36a3
--- /dev/null
+++ b/app-i18n/ibus-typing-booster/ibus-typing-booster-2.7.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit python-single-r1
+
+DESCRIPTION="Completion input method for IBus"
+HOMEPAGE="https://mike-fabian.github.io/ibus-typing-booster"
+SRC_URI="https://github.com/mike-fabian/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RESTRICT="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="${PYTHON_DEPS}
+	app-i18n/ibus[python(+),${PYTHON_USEDEP}]
+	dev-libs/m17n-lib
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	>=dev-db/m17n-db-1.7"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
diff --git a/app-i18n/ibus/Manifest b/app-i18n/ibus/Manifest
index 9f02aeb098e3..e76bcc68f873 100644
--- a/app-i18n/ibus/Manifest
+++ b/app-i18n/ibus/Manifest
@@ -4,7 +4,9 @@ AUX ibus-1.5.19-vala-0.43.4.patch 8430 BLAKE2B 2c87c226b3e52710eac046d5c82203162
 DIST ibus-1.5.18.tar.gz 2760121 BLAKE2B dfcf549362ac9ac0cb9adb9cedc3fd7146877a42e0e086ad7be18ccb6239868ed940d2c371d83c2e2706c7120702af0bcb0106da60889f0b3d5857b8929b9165 SHA512 34519c3464eaf2cac3320e1568fc76f4edb281afa70f335c015b828ff4e86b3224d77b95cdc0b2e76e42459c54b1044264ff226963fe739dd553ac7326d2f2d3
 DIST ibus-1.5.19.tar.gz 2842274 BLAKE2B a5aea4770c1c0a58a9e0b1aa26f47a8ab9eb5060a0c06179663984c5b531464ff4575a8ece2f2ee2122f777ca615296c1e46ad4833c68ba2da038f2b85dea374 SHA512 ddcd464c9afb6d081df1cfac65069506877eb4818c3ba5594bcf76f3c6795ef6c17177a778dc89b2ef69d10d87297aa12c8e04f156b750e500b51b32787bd9fc
 DIST ibus-1.5.20.tar.gz 3393487 BLAKE2B 0ed930cbadf7ecf9fa82ee2c0e2a8aa8cfb25a8dc1a2e2ffef0d4f894df31f879f08d7ed14508736836545cbc25b929707939c3b0ea53f2b44ba7489d6dc80ed SHA512 2bbcc19742882fa55d9c8704251f133c5be9f36a93cf52d70c460a4713419868deb634f965e67c1d5c45b615de388b92c0fbb863b118a546fbb89370a38eb77b
+DIST ibus-1.5.21.tar.gz 3463069 BLAKE2B 75b9e7cc4d84b69941d53321da1fe63ad911740a36ed51c7fceaa2a7bc30f6ae39d3f575b4b5fc4268d7c3b3e1c0bae11881dd7a8b7bd441ecf89c83c7279858 SHA512 c7c06e13e78fb4d4d26ce8975b6db4f7914efb325a903999a82197229e13d5ebb4afc876ef67e1d86db58f08c16350dc095aaea050b2f69c2bfc4c452adc5331
 EBUILD ibus-1.5.18.ebuild 4293 BLAKE2B 27d5e8f493c30bd818aa6ab1b7e07cee569610cba143d14ee1163b2c236c566ac3be0af30e31e5c4f6285d8d7cb1fa65cd6047a647e5f9f8054decc9673d0ceb SHA512 07172e6efe3ba4abe7dd0c90e9f46d584b447628417b4390388daa8db991cf03e4c5d812ac3d36166942a5697b237110e857b7060c5d1587118bd82b222217c3
 EBUILD ibus-1.5.19.ebuild 4406 BLAKE2B fb24ea2b1043c3c7a4ed507db20a8753eee4c1b93ca7c27e23aa0ffe3cd6ca56dc0c18686c8688ad5bcf3ece4c11cdddbbaba40ac13f8442b5892738e6a3df3a SHA512 dd4b71ca1ad0892519c1a5b41c7e1132e2096051f6301e8dd9aa07b5afb6727a29f5a40da89bd0017d84a1d3fdaad9c49830a9ccc65763d75b060feef108afb7
 EBUILD ibus-1.5.20.ebuild 4118 BLAKE2B c3f56fe42f676aa95724b1529b592cf6667472f9a29eb7462b07090500e838c9bf24c48f7c0130ee4a887105028a9fb0f497b44c8eb835d7c40755c0cdbb96ad SHA512 4fc1cafbc04473c84f96752ae9506b3993bccc1ca822174faa132b8f469fdd0b3a0e922ece8bd763bd6186cc188f05c642bbbd16984a27f4f19009e11a108de5
+EBUILD ibus-1.5.21.ebuild 4127 BLAKE2B bf2aa8d12d22c75d5d374b28837146779a554551b0473ba7e28c013f32c719b251556f23a9126ceedbfba5b14bab24ca201a24375035a2089fd0cb6baf84d5b1 SHA512 cc166d609823b6eb2a59cb50368ce29187011d75c41095345b66c9772e0cfe3ed69005e29b70b0bd4d8cae0dabad58dd452b666c4f93a9c2a6cc5e36a358017f
 MISC metadata.xml 942 BLAKE2B 9d8f0df17ae7c5c60892a8bf661c1f7325f4943e30d51667fe5e56f2c74f55e36c6f40cd6044435b9f046a88a267fa1b5d46f6cddc0cefa6b423554ff905e882 SHA512 5501b7ef3b46de30b69eabe28334556c979c99610f0a6051a254a7591de612d99ea9ee3c18c2f3869ae2046514df8cd555d801cc778bc1db111895256b7ab100
diff --git a/app-i18n/ibus/ibus-1.5.21.ebuild b/app-i18n/ibus/ibus-1.5.21.ebuild
new file mode 100644
index 000000000000..b078dba41432
--- /dev/null
+++ b/app-i18n/ibus/ibus-1.5.21.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+VALA_MIN_API_VERSION="0.34"
+VALA_USE_DEPEND="vapigen"
+
+inherit autotools bash-completion-r1 gnome2-utils python-r1 vala virtualx xdg-utils
+
+DESCRIPTION="Intelligent Input Bus for Linux / Unix OS"
+HOMEPAGE="https://github.com/ibus/ibus/wiki"
+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"
+IUSE="+X +emoji gconf +gtk +gtk2 +introspection kde nls +python test +unicode vala wayland"
+REQUIRED_USE="emoji? ( gtk )
+	gtk2? ( gtk )
+	kde? ( gtk )
+	python? (
+		${PYTHON_REQUIRED_USE}
+		introspection
+	)
+	test? ( gtk )
+	vala? ( introspection )"
+
+CDEPEND="app-text/iso-codes
+	dev-libs/glib:2
+	gnome-base/dconf
+	gnome-base/librsvg:2
+	sys-apps/dbus[X?]
+	X? (
+		x11-libs/libX11
+		!gtk? ( x11-libs/gtk+:2 )
+	)
+	gconf? ( gnome-base/gconf:2 )
+	gtk? (
+		x11-libs/gtk+:3
+		x11-libs/libX11
+		x11-libs/libXi
+		gtk2? ( x11-libs/gtk+:2 )
+	)
+	introspection? ( dev-libs/gobject-introspection )
+	kde? ( dev-qt/qtgui:5 )
+	nls? ( virtual/libintl )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+	)
+	wayland? (
+		dev-libs/wayland
+		x11-libs/libxkbcommon
+	)"
+RDEPEND="${CDEPEND}
+	python? (
+		gtk? (
+			x11-libs/gtk+:3[introspection]
+		)
+	)"
+DEPEND="${CDEPEND}
+	$(vala_depend)
+	dev-util/glib-utils
+	virtual/pkgconfig
+	emoji? (
+		app-i18n/unicode-cldr
+		app-i18n/unicode-emoji
+	)
+	nls? ( sys-devel/gettext )
+	unicode? ( app-i18n/unicode-data )"
+
+src_prepare() {
+	vala_src_prepare --ignore-use
+	sed -i "/UCD_DIR=/s/\$with_emoji_annotation_dir/\$with_ucd_dir/" configure.ac
+	if ! has_version 'x11-libs/gtk+:3[wayland]'; then
+		touch ui/gtk3/panelbinding.vala
+	fi
+	if ! use emoji; then
+		touch \
+			tools/main.vala \
+			ui/gtk3/panel.vala
+	fi
+	if ! use kde; then
+		touch ui/gtk3/panel.vala
+	fi
+
+	# for multiple Python implementations
+	sed -i "s/^\(PYGOBJECT_DIR =\).*/\1/" bindings/Makefile.am
+	# fix for parallel install
+	sed -i "/^if ENABLE_PYTHON2/,/^endif/d" bindings/pygobject/Makefile.am
+	# require user interaction
+	sed -i "/^TESTS += ibus-\(compose\|keypress\)/d" src/tests/Makefile.am
+
+	sed -i "/^bash_completion/d" tools/Makefile.am
+
+	default
+	eautoreconf
+	xdg_environment_reset
+}
+
+src_configure() {
+	local unicodedir="${EPREFIX}"/usr/share/unicode
+	local python_conf=()
+	if use python; then
+		python_setup
+		python_conf+=(
+			$(use_enable gtk setup)
+			--with-python=${EPYTHON}
+		)
+	else
+		python_conf+=( --disable-setup )
+	fi
+
+	econf \
+		$(use_enable X xim) \
+		$(use_enable emoji emoji-dict) \
+		$(use_with emoji unicode-emoji-dir "${unicodedir}"/emoji) \
+		$(use_with emoji emoji-annotation-dir "${unicodedir}"/cldr/common/annotations) \
+		$(use_enable gconf) \
+		$(use_enable gtk gtk3) \
+		$(use_enable gtk ui) \
+		$(use_enable gtk2) \
+		$(use_enable introspection) \
+		$(use_enable kde appindicator) \
+		$(use_enable nls) \
+		$(use_enable test tests) \
+		$(use_enable unicode unicode-dict) \
+		$(use_with unicode ucd-dir "${EPREFIX}/usr/share/unicode-data") \
+		$(use_enable vala) \
+		$(use_enable wayland) \
+		"${python_conf[@]}"
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	virtx emake -j1 check
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	if use python; then
+		python_install() {
+			emake -C bindings/pygobject \
+				pyoverridesdir="$(${EPYTHON} -c 'import gi; print(gi._overridesdir)')" \
+				DESTDIR="${D}" \
+				install
+		}
+		python_foreach_impl python_install
+	fi
+
+	keepdir /usr/share/ibus/engine
+
+	newbashcomp tools/${PN}.bash ${PN}
+
+	insinto /etc/X11/xinit/xinput.d
+	newins xinput-${PN} ${PN}.conf
+}
+
+pkg_preinst() {
+	use gconf && gnome2_gconf_savelist
+}
+
+pkg_postinst() {
+	use gconf && gnome2_gconf_install
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	dconf update
+}
+
+pkg_postrm() {
+	use gtk && gnome2_query_immodules_gtk3
+	use gtk2 && gnome2_query_immodules_gtk2
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/app-i18n/libtabe/Manifest b/app-i18n/libtabe/Manifest
index 7c041377cbae..2fd72d484486 100644
--- a/app-i18n/libtabe/Manifest
+++ b/app-i18n/libtabe/Manifest
@@ -1,8 +1,6 @@
 AUX libtabe-0.2.6-fabs.patch 1024 BLAKE2B 4b96a84c5f05323586e7a81112ebbaae7ec4cd0e6e91c9f1886d98450c7c9ca15d2b432bbeb97e7ae0af5024264f07843e6ef98cfa83763d80780645d8038444 SHA512 05d2962925ac19bd0f56078cb7fcb2808d31f80db7738bfe291e349bf69395f5d795ca2d6176550eab81b914e261e127d185ee60aca63917b5742608bda6e265
 AUX libtabe-0.2.6-ldflags.patch 2026 BLAKE2B 5902556cc1e28fb7baca2c6fbd0d7315124efa81cb9ecf960a8f40147d5c76204d09e168be0fed5b16c2d3e660d82579d5ce6e90d5cb01c55a5dafb76ef48fe7 SHA512 c7aebc251a287d0026f8b78649b30e7551e925ae936033d7af365c74416db6e350dc026f1550d3c84feb50916be661b14060b41534642531ac7871a1a0e5f233
-DIST libtabe_0.2.6-1.1.diff.gz 74149 BLAKE2B cbd5ba77d41ef147a339c6456bf42fb16b31a6928ab858338b52960ec3c8a4aa24af194d9c2eb92f64738af4f3289b889efb76ce792225823dc3d8e8f4ce8837 SHA512 001a08d69d93f0092c8a54c11a88afab850de1383febeda68c1a6b2a2b1447d01c929de47c7d947e390706d0bec6b8825b8fe11fc6c8a40d6d047b644009b6e2
 DIST libtabe_0.2.6-1.2.diff.gz 74362 BLAKE2B d09e91bad9e9e3240cdc261140012977f318436af420564692152a8b7a99cd7c427433a6180c1f9490995b43cd95200318ffb5dab68fc18561d7ced58fd00bd6 SHA512 011a76f3c8a1c13a6cfd0e96eb41557a8bfbf1aca8cb79daee0f0941b920d25614df5e0479368bf7075cb511851cab4c9113b30656d55b4d29128eb7312d0ef1
 DIST libtabe_0.2.6.orig.tar.gz 1792199 BLAKE2B fec2259678a57b144eccf49ba459d2930f89f871873b3547040fd570a0f8510bc84e27609b1ca2d82596d5a025f0bd7251870655f4a83758be806f75db5abb48 SHA512 88f1cb279ccf487de5d0f8a1e9eede8d5ca16e4507b59db0b66241d0cdae609ed0b04093a82eabe0569f885aa397c1d5fa3f0ae3c3270a348ce045d73e01fbc7
-EBUILD libtabe-0.2.6.1.2.ebuild 1438 BLAKE2B 35ea812b928286aafb537e27764564a749de41ea0d967cdcd7bdaac503575f66cb6f7287241946ad49f0799540352eb09f0926c501e57d12034e9be103e75cf5 SHA512 418ef8f4f12a20d588e18fbb224804cc20b0d0ca1dc368d0a0d37b8566b9055f05381849df31ee19f79073953a00c11f14d9d2720b3d8e233f3f3ee2b8be32b6
-EBUILD libtabe-0.2.6.ebuild 1097 BLAKE2B beba2fc5ac62c9ecd35974d0fddb4a566570b4717569a053c2d6a797dbeb05b977593045805d6f527a3383d81630881d5ba6d807960ed948fe342b77372d5be8 SHA512 69192cbe9f460f991fd483a5ab62edca21ccf2a047165b47bbf68950b715840160135fd4551c77fbd1759eb484dcfb5550238b109d4351096fe49afad17f85ce
+EBUILD libtabe-0.2.6.1.2.ebuild 1423 BLAKE2B 71ce66ddfa62b7dfe81a88d8313241d5378266f071439a2e5a148fb6488239b949fe33f10d1daa3dcec633df887a86f360986415a757ab458a4a49cb6d089516 SHA512 b8aebd49e8cc1863e603c23253c47bf0df62cc257b96188a5782e6e060cf524b735698b5fc5a13480b4fa3c945bc3004db0277819cb92fb4638cb45973c043f0
 MISC metadata.xml 230 BLAKE2B 42b2921aa8f0a7ac96ff31ef846311f023469d38da4186c49a365cb7c4a1c63769e54718fb9ab6e8cfd2b532f249b0214cc54929e93d1a9960a6b5be3238b55d SHA512 74065bee639a38ecdef7c32280ed43a8f1627362cd8e97e714a09bcf116ae8bc4c61b2ab13c31bd02a22ae8a5a201263981ee519a0b6ba9df81a4d5f3cd94eb1
diff --git a/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild b/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild
index 3f33549ccf4b..62e347d8caf9 100644
--- a/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild
+++ b/app-i18n/libtabe/libtabe-0.2.6.1.2.ebuild
@@ -1,62 +1,71 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 WANT_AUTOMAKE=1.11
 
-inherit eutils libtool autotools multilib versionator
+inherit autotools
 
-DEBIAN_PV=$(replace_version_separator 3 '-')
+DEBIAN_PV=$(ver_rs 3 '-')
 DEBIAN_PATCH=${PN}_${DEBIAN_PV}.diff
 ORIG_PV=${DEBIAN_PV%-*}
 ORIG_P=${PN}-${ORIG_PV}
 
 DESCRIPTION="Libtabe provides bimsphone support for xcin-2.5+"
 HOMEPAGE="https://packages.qa.debian.org/libt/libtabe.html"
-SRC_URI="mirror://debian/pool/main/${PN:0:4}/${PN}/${PN}_${ORIG_PV}.orig.tar.gz
+SRC_URI="
+	mirror://debian/pool/main/${PN:0:4}/${PN}/${PN}_${ORIG_PV}.orig.tar.gz
 	mirror://debian/pool/main/${PN:0:4}/libtabe/${DEBIAN_PATCH}.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="debug"
 
-DEPEND=">=sys-libs/db-4.5
+RDEPEND=">=sys-libs/db-4.5:="
+DEPEND="
+	${RDEPEND}
 	x11-libs/libX11"
 
 S=${WORKDIR}/${ORIG_P}.orig
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${DEBIAN_PATCH}
-	epatch "${FILESDIR}"/${ORIG_P}-fabs.patch
-	epatch "${FILESDIR}"/${ORIG_P}-ldflags.patch
+PATCHES=(
+	"${WORKDIR}"/${DEBIAN_PATCH}
+	"${FILESDIR}"/${ORIG_P}-fabs.patch
+	"${FILESDIR}"/${ORIG_P}-ldflags.patch
+)
 
-	ln -s script/configure.in . || die
+src_prepare() {
+	default
+
+	ln -s script/configure.in configure.ac || die
 	eautoreconf
 }
 
-src_compile() {
-	myconf="--with-db-inc=/usr/include
-		--with-db-lib=/usr/$(get_libdir)
-		--with-db-bin=/usr/bin
-		--with-db-name=db
-		--enable-shared
-		--disable-static
-		$(use_enable debug)"
-
-	econf ${myconf}
+src_configure() {
+	econf \
+		--with-db-inc="${EPREFIX}"/usr/include \
+		--with-db-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-db-bin="${EPREFIX}"/usr/bin \
+		--with-db-name=db \
+		--enable-shared \
+		--disable-static \
+		$(use_enable debug)
+}
 
+src_compile() {
 	# We execute this serially because the Makefiles don't handle
 	# proper cross-directory references.
-	for dir in src util tsi-src; do
-		emake -C ${dir} || die "make failed"
-	done
+	emake -C src
+	emake -C util
+	emake -C tsi-src
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc doc/* || die
+	default
+	dodoc -r doc/.
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-i18n/libtabe/libtabe-0.2.6.ebuild b/app-i18n/libtabe/libtabe-0.2.6.ebuild
deleted file mode 100644
index 21639e688efb..000000000000
--- a/app-i18n/libtabe/libtabe-0.2.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils libtool autotools multilib
-
-DESCRIPTION="Libtabe provides bimsphone support for xcin-2.5+"
-HOMEPAGE="https://packages.qa.debian.org/libt/libtabe.html"
-SRC_URI="mirror://debian/pool/main/libt/libtabe/${P/-/_}.orig.tar.gz
-	mirror://debian/pool/main/libt/libtabe/${P/-/_}-1.1.diff.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="debug"
-
-DEPEND=">=sys-libs/db-4.5
-	x11-libs/libX11"
-
-S=${WORKDIR}/${P}.orig
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/${P/-/_}-1.1.diff
-	epatch "${FILESDIR}"/${P}-fabs.patch
-	rm -f configure
-	elibtoolize
-	cd script
-	eautoreconf
-	cp script/* ./
-	cp configure ../
-	cd ..
-}
-
-src_compile() {
-	myconf="--with-db-inc=/usr/include
-		--with-db-lib=/usr/$(get_libdir)
-		--with-db-bin=/usr/bin
-		--with-db-name=db
-		--enable-shared
-		--disable-static
-		$(use_enable debug)"
-
-	econf ${myconf}
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed."
-	dodoc doc/*
-}
diff --git a/app-i18n/man-pages-de/Manifest b/app-i18n/man-pages-de/Manifest
index 3aed8f63d2b8..d342109cb31b 100644
--- a/app-i18n/man-pages-de/Manifest
+++ b/app-i18n/man-pages-de/Manifest
@@ -1,10 +1,3 @@
-AUX man-pages-de-1.3-bzip2.patch 604 BLAKE2B 0569a8303e3e28ecbdeaaab04f9ce7a84fb7309485bf7e82da1cbb3aabe0e1987e3a192a27d793cb32bcb36fd8f4dd06ef5940c90ce32e92f3cc783b0387c5aa SHA512 ab07f650572e97cd4bcc31d438d601be182c98998086be9d875b0193a9c7ebe0add85e2cb14867082f70b009acfdd102fe743af02a947f3f41111594c7082932
-DIST manpages-de-1.15.tar.xz 1529576 BLAKE2B 600d9c186ffa46fd1db110c3889abc44bb6ccb6847ed8385c461c7fa696f5a9e8a65233d1290ae9d1e9eb26694e8769aa35983f07205a0e7e57c9b0c14c7d7bc SHA512 d1f1b9f60c4713d6be650e21b7664ff594dbd542b53148c00d1a2269413d39615dd76be4c4095eeb72e2598b94af134ca5d128b85d9520a1ac404364b8a53948
-DIST manpages-de-1.21.tar.xz 1585600 BLAKE2B f2364e0b5fc1ca8ce8f5eb7fa5987d1bc68b1f8f2c1a26240d5cabd03eb5bb094f0d63274c7208059a766498f5f20ca7ccab72a9d4847057aae3b7d6697018e7 SHA512 24cc36e8e9c2efb8cd2a0c374a3f5da96f6645a306082cc28aae5933081f7de24bac03652f690a2becd32a23a93c17ddd9029190c299dda95eeb25f49b327fac
-DIST manpages-de-v2.10.tar.bz2 18037944 BLAKE2B 7f2ec07e4b4b13adfb93c00827ae56cb82c2158de2a59bca729e5fe5bbe1f9a60c39712c52ae8b5856eb55288b1b562fd320473ed94f443e252df80a909df08b SHA512 d74b62903061f5af939c8e5a5f48906fecd2956d9291be54cb00041f3c964c769159989fba888ddfb41e167b5342b7b71d2dcc7b58f1b1453836b24bb9121f26
 DIST manpages-de-v2.12.tar.bz2 10242050 BLAKE2B fa497a6fce2c2387dad2ab9443584174d8d5fab530b94e0123e71286c588cb3a2e52aa96760dbfd6545bed013c460e1bf61eb4a5af0673bb84c1c0f0c960a357 SHA512 548d3dd500ce1eadc71365119e35072b71e3fbe36eba664d992e94897f442fb93f9397053f72363f83dff2e931d93e2af995976736d8513d11d7c42bdb471862
-EBUILD man-pages-de-1.15.ebuild 1289 BLAKE2B 2aa0d95614a5cb2d22a63c661befd01b789e6c7e322a48c013d5b408058235141bf0db7680f81da0016b8f03d246b8de6cc6ac0528cbbfc3aad4fba11bc475d1 SHA512 7f090cb1bef72e48034e98f5868378f47683575dde6668177871b12e1d06bf46cdfffb7b03877d19e57c925cb5c6cb599f766710743d150a79e36ea4f5258f57
-EBUILD man-pages-de-1.21.ebuild 1252 BLAKE2B 49503d85ab5a60b5dc5475f11d4ddc042abb3883665336450179a2247279ee0171037f7937195467e4d7b25dd8671f7a676171c7ad983f9134c7430689139df1 SHA512 2158482fb6541e0391b3c916da51fbc1bd5e67c8a283cc0a795e6e68462eb3c1ce343b8fc9161199a8bf56632505f0c1fd39e4527dffdbb61e5797286d1ae6b9
-EBUILD man-pages-de-2.10.ebuild 1898 BLAKE2B a44fb94d3d46334e1a2e7a58651cec5dc2091815d204222670d7a8e8a2ae09c78c86643ed7f967d62c18d2c7df00d19ec68c01a2f388f49f325a758f869a4d1a SHA512 4528a8b742541dea23819826909f631b5fb5c2287c21aac80a6e2efafc9fe245effca49b868c554e11394d3759b72f314e9f67adb70a665e8b37f32322026fbc
 EBUILD man-pages-de-2.12.ebuild 1884 BLAKE2B 80663f53a6c60144903e627c999cc85af7c8fcd0b6666abb1c29c352bcd9e01a686865617a7eaf094d50d728907ce6842449c18cf5d0f9fd07303f720093843d SHA512 05efb264a7f9f15afa2f786d3ff8aa361aa91598c17cbac1c78c9016ba9d8ad08abc0e1e824ea879097be62db35a5ab6923b11898105d9c5011f9ba8c815c1d8
 MISC metadata.xml 369 BLAKE2B 41170815bcde0a65831b0453eee7b99359594bc67d345e31d1228d6b5def740d73087b96473511a8249528ac16a80b0eeee91791f9d4f113cb5caed918b40552 SHA512 e36208b3689927021e51ad2348ba3f5a5598b9657ffd7156d928dc817b90ed91a57d43605eb8a3e2fde1caf04349ba76b68ebc7ead1061ecca66280095179658
diff --git a/app-i18n/man-pages-de/files/man-pages-de-1.3-bzip2.patch b/app-i18n/man-pages-de/files/man-pages-de-1.3-bzip2.patch
deleted file mode 100644
index 09a569c23498..000000000000
--- a/app-i18n/man-pages-de/files/man-pages-de-1.3-bzip2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/po/generate-manpage.sh
-+++ b/po/generate-manpage.sh
-@@ -38,6 +38,16 @@
- 		original="$uncompressed_manpage"
- 	fi
- fi
-+# Try a bzip'ed version
-+if [ ! -f "$original" ]; then
-+	original=/usr/share/man/man$section/$manpage.bz2
-+	if [ -f "$original" ]; then
-+		# The manpage exists, but needs to be decompressed
-+		uncompressed_manpage=`mktemp`
-+		bzip2 -d -c "$original" > "$uncompressed_manpage"
-+		original="$uncompressed_manpage"
-+	fi
-+fi
- # Cannot generate manpage if the original could not be found
- if [ ! -f "$original" ]; then
- 	echo "The original manpage for $manpage could not be found." >&2
diff --git a/app-i18n/man-pages-de/man-pages-de-1.15.ebuild b/app-i18n/man-pages-de/man-pages-de-1.15.ebuild
deleted file mode 100644
index 49370f0b46bd..000000000000
--- a/app-i18n/man-pages-de/man-pages-de-1.15.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P="${PN/-/}-${PV}"
-
-DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
-HOMEPAGE="https://alioth.debian.org/projects/manpages-de/"
-SRC_URI="https://manpages-de.alioth.debian.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-DEPEND="app-text/po4a"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3-bzip2.patch"
-)
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	# Use the same compression as every other manpage
-	local PORTAGE_COMPRESS_LOCAL=${PORTAGE_COMPRESS-bzip2}
-	if [[ ${PORTAGE_COMPRESS+set} == "set" ]] ; then
-		PORTAGE_COMPRESS_LOCAL="#"
-	fi
-	if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
-		case ${PORTAGE_COMPRESS_LOCAL} in
-			bzip2|gzip)  local PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
-			;;
-		esac
-	fi
-	sed -i -e "s/gzip --best/${PORTAGE_COMPRESS_LOCAL} ${PORTAGE_COMPRESS_FLAGS_LOCAL}/"\
-		po/man{1,2,3,4,5,6,7,8}/Makefile.in po/common.mk || die
-	eautoreconf
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake mandir="${ED}"/usr/share/man install
-	dodoc CHANGES README
-}
diff --git a/app-i18n/man-pages-de/man-pages-de-1.21.ebuild b/app-i18n/man-pages-de/man-pages-de-1.21.ebuild
deleted file mode 100644
index 99357591bc93..000000000000
--- a/app-i18n/man-pages-de/man-pages-de-1.21.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P="${PN/-/}-${PV}"
-
-DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
-HOMEPAGE="https://alioth.debian.org/projects/manpages-de/"
-SRC_URI="https://manpages-de.alioth.debian.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-DEPEND="app-text/po4a"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	# Use the same compression as every other manpage
-	local PORTAGE_COMPRESS_LOCAL=${PORTAGE_COMPRESS-bzip2}
-	if [[ ${PORTAGE_COMPRESS+set} == "set" ]] ; then
-		PORTAGE_COMPRESS_LOCAL="#"
-	fi
-	if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
-		case ${PORTAGE_COMPRESS_LOCAL} in
-			bzip2|gzip)  local PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
-			;;
-		esac
-	fi
-	sed -i -e "s/gzip --best/${PORTAGE_COMPRESS_LOCAL} ${PORTAGE_COMPRESS_FLAGS_LOCAL}/"\
-		po/man{1,2,3,4,5,6,7,8}/Makefile.in po/common.mk || die
-	eautoreconf
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake mandir="${ED}"/usr/share/man install
-	dodoc CHANGES README
-}
diff --git a/app-i18n/man-pages-de/man-pages-de-2.10.ebuild b/app-i18n/man-pages-de/man-pages-de-2.10.ebuild
deleted file mode 100644
index 2828f80836c0..000000000000
--- a/app-i18n/man-pages-de/man-pages-de-2.10.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${PN/-/}-v${PV}"
-
-DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
-HOMEPAGE="https://salsa.debian.org/manpages-de-team/manpages-de"
-SRC_URI="https://salsa.debian.org/manpages-de-team/manpages-de/-/archive/v${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-BDEPEND="app-text/po4a"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	sed '/gzip --best/d' -i po/Makefile.am || die
-
-	# sys-apps/shadow has it's own translated man-page for this
-	local manpage
-	local noinst_manpages=(
-		upstream/primary/man1/groups.1
-		po/primary/man1/groups.1.po
-		po/primary/man1/su.1.po
-	)
-	for manpage in ${noinst_manpages[@]} ; do
-		rm "${manpage}" || die
-	done
-
-	# Use the same compression as every other manpage
-	local PORTAGE_COMPRESS_LOCAL=${PORTAGE_COMPRESS-bzip2}
-	local PORTAGE_COMPRESS_FLAGS_LOCAL=${PORTAGE_COMPRESS_FLAGS}
-	if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
-		case ${PORTAGE_COMPRESS_LOCAL} in
-			bzip2|gzip)
-				PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
-			;;
-		esac
-	fi
-
-	# Fix source files for symlinks
-	local LINKSOURCE
-	case ${PORTAGE_COMPRESS_LOCAL} in
-		bzip2)
-			for LINKSOURCE in upstream/*/links.txt ; do
-				sed -i -e 's/\.gz/\.bz2/g' "${LINKSOURCE}" || die
-			done
-		;;
-		gzip)
-			# pass
-		;;
-		xz)
-			for LINKSOURCE in upstream/*/links.txt ; do
-				sed -i -e 's/\.gz/\.xz/g' "${LINKSOURCE}" || die
-			done
-		;;
-		*)
-			ewarn "Unexpected compression command ${PORTAGE_COMPRESS} found, symlinks will not work."
-		;;
-	esac
-
-	eautoreconf
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake mandir="${ED}"/usr/share/man install
-	dodoc CHANGES.md README.md
-}
diff --git a/app-i18n/scim-tables/Manifest b/app-i18n/scim-tables/Manifest
index aaa45566728f..527612105a58 100644
--- a/app-i18n/scim-tables/Manifest
+++ b/app-i18n/scim-tables/Manifest
@@ -1,5 +1,5 @@
 AUX scim-tables-0.5.12-automake.patch 356 BLAKE2B bce5fcef77970e3504048389968a11e00bcdac1049425b99b75d5f5081c7966eb2c38f6c98aebd3512bfae78cca7b4171f916099ef77f40dfb59e7e3865350cf SHA512 020b32250566092c784727d316acb800013d1c4f7bbd970503e4033bd9006e523079f2b906c7b0db67501d6e441b98500d6da40bdf37b2749f6611c6f6523df9
 AUX scim-tables-0.5.8+gcc-4.3.patch 462 BLAKE2B 181974c195ce3a5d53ac4f95a067adbca82e60b44f664b6caec4f0052f46d02bceccf6aa102f6dc771b1bdc6186fa27c58a550f2cc11cd61cd304b9c4cf5bcf5 SHA512 450b5ca11d1f9b776edae027e8b9af1e24511c145e5df83e344b236be434f7ac7bb7fb24c304dc3e6b2e25ce38a4933acf09140b50f66eed3b734daf9d6c30f6
 DIST scim-tables-0.5.13.tar.gz 6716275 BLAKE2B 8b7932f38baab64d9e1db6e9f76e3d7425f3b1ff071c358b8f2a7d8b2602d3304248e97389f2423ebc12b37edf43c114f73e6bace3907547af44963e03317878 SHA512 400aa99acef83b82e6422398f41bf65e51b7e703adc3e87cdef03793d84983e600f9e6201fda6f9c54e97f35c44da72a657ce15caef09ef490c44ad19c3a9e33
-EBUILD scim-tables-0.5.13.ebuild 1487 BLAKE2B f64a6c7dc8e20a245e3e203b301c309721150114c43475c5d39a954d2e52b755dc6b32ca9cc7fbcb57f4252780804106cbdb986a3374f6de4eedb36d4ba79368 SHA512 5d0c37f6eeeed593601d070bd57ed63d257d575114ec146ee8c48f97fc466cc118a828154bdd66cd2be1c134173bf63e965f1200188676e528776f50e3835840
+EBUILD scim-tables-0.5.13.ebuild 852 BLAKE2B 9157826e62848160d0f1e0a53821991649a818b513a044da9327d21fbce254cec6b2b39cd3f3db4a7bb9725aebd6105ccd162f4a4509ed2fbf718f454ba09e1f SHA512 7d4db6d0f8d0590a6cf2ce97b5839b79a7fb90f22ffc8df5a06b5e19a67e8c7b66b1bafd8cb8a689404e99035fdc632f55b92347caa239fe4db5164c04fe4148
 MISC metadata.xml 308 BLAKE2B 1bdcfa2996c5ba60e52eddb6446bbc6978ebee7f1f2f4658c44438b886a89cf46a3fddea53c479151e5e023e5681dca5f01264a26ca108c895ac6758f01d6430 SHA512 9f18bf632f3eff9a6498145c2b4c04d51bb119c67351216ab757cd3cea2364c60bef683769218c0596ef6bd29235e51df6a64f9ab1234665fc2191e18fc51cc7
diff --git a/app-i18n/scim-tables/scim-tables-0.5.13.ebuild b/app-i18n/scim-tables/scim-tables-0.5.13.ebuild
index 530fd551b64c..718a68ef66c5 100644
--- a/app-i18n/scim-tables/scim-tables-0.5.13.ebuild
+++ b/app-i18n/scim-tables/scim-tables-0.5.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit autotools base eutils
+inherit autotools
 
 DESCRIPTION="Smart Common Input Method (SCIM) Generic Table Input Method Server"
 HOMEPAGE="http://www.scim-im.org/"
@@ -13,51 +13,36 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc x86"
 IUSE="nls"
-LANGS="am ar bn gu hi ja kn ko ml ne pa ru ta te th uk vi zh"
 
-RDEPEND=">=app-i18n/scim-1.4.7-r2
+RDEPEND="
+	>=app-i18n/scim-1.4.7-r2
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.5.8+gcc-4.3.patch"
+	"${FILESDIR}"/${PN}-0.5.8+gcc-4.3.patch
 	"${FILESDIR}"/${PN}-0.5.12-automake.patch
-	)
+)
 
-pkg_setup() {
-	elog "Not all languages are going to be compiled."
-	elog "Please set LINGUAS to your preferred language(s)."
-	elog "Supported LINGUAS values are:"
-	elog "${LANGS}"
+src_prepare() {
+	default
+	eautoreconf
 }
 
-src_unpack() {
-	base_src_unpack
-
-	strip-linguas ${LANGS}
-	local use_languages="additional ${LINGUAS}"
-	elog "Languages being compiled are: ${use_languages}"
-
-	cd "${S}"
-	sed -i -e "/^SUBDIRS/s/.*/SUBDIRS = ${use_languages}/g" \
-			tables/Makefile.{am,in} || die "sed ${m} failed"
-
-	AT_NO_RECURSIVE=yes AT_M4DIR=${S}/m4 eautoreconf
-}
-
-src_compile() {
+src_configure() {
 	econf \
 		--disable-skim-support \
-		$(use_enable nls) \
 		--disable-static \
-		--disable-dependency-tracking \
-		--without-arts || die "econf failed"
-	emake || die "make failed"
+		--without-arts \
+		$(use_enable nls)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	dodoc README ChangeLog AUTHORS
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/app-i18n/skk-jisyo/Manifest b/app-i18n/skk-jisyo/Manifest
index 08a9d7cc58f4..699f7ef37641 100644
--- a/app-i18n/skk-jisyo/Manifest
+++ b/app-i18n/skk-jisyo/Manifest
@@ -1,6 +1,6 @@
 DIST skk-jisyo-201605.tar.xz 6288104 BLAKE2B d68332a4fa0804b596fc42f3dc8231a6eebe8bddacc6e0babec6cc5992ddaadb46e8fa9af742daa30545a585428afe79eab28329ce1d37e0192b08b20d7c584e SHA512 1093d363fe571c3e3e05fa54046fc4b88cbed2fbd104838576c83694556585401c3affa0afb2ed078c6f1b06f62a7b14145b1305f6fef089f160b4073900c7a1
 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 1347 BLAKE2B 562c99ed17a9e0f947b2d73f6cc7958d03be23e3059e42132e5d0cb55a0854345431909c5b06a619e3cfc176419126a37a2aacded7f8e3bb5b99df784dc87931 SHA512 0da12814ce93b9cff23f5b718f5fb99cd1cb900ba2da2141d0f22975d44e0bdbdbf26eab4bd1d34ff599d43938327e7921df91e555f0635ea9b8d54fdd190c2a
+EBUILD skk-jisyo-201805.ebuild 1346 BLAKE2B 754722d85b3b23412273542324d18f9896dbf44be1c1f16b0115ba3df8ae1c47e2435e6bfc0127571e06f9eae72e1bf3c24a776b878aba547967c063db82b1a3 SHA512 20ef913647bab0cc898f64564743545c982d235fd02288f8fad50e50af21510ab08bdc9742316c979b006d78df8ba1eca59ec7a1faf6d8cf67061396e172c238
 EBUILD skk-jisyo-999999.ebuild 1648 BLAKE2B 93b07b219378be74e87817da306968951b22e92791246672e31b3817911b7a6b25a5e7da68e9cdd5317da6a9fcbee5cccdc2ea7a560da7aa6a5b3791eb1c453b SHA512 28648a723fab209828dc2fde0e664aa444fa4a2327e6308e9ac63a08d9e521008a905520ff68606a123901cb3a18e5d09b7ae24e97140daab8d072ccaff7b289
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/skk-jisyo/skk-jisyo-201805.ebuild b/app-i18n/skk-jisyo/skk-jisyo-201805.ebuild
index 191cef66c281..ccadac7decec 100644
--- a/app-i18n/skk-jisyo/skk-jisyo-201805.ebuild
+++ b/app-i18n/skk-jisyo/skk-jisyo-201805.ebuild
@@ -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/xvnkb/Manifest b/app-i18n/xvnkb/Manifest
index 62d4e00f9e24..c50eb01bc2a6 100644
--- a/app-i18n/xvnkb/Manifest
+++ b/app-i18n/xvnkb/Manifest
@@ -1,8 +1,4 @@
-AUX 0.2.8a-putenv.patch 337 BLAKE2B a288ed8cfa4d4130df371cccd61c86267ccf0d51b68eb297306abf666de218bdf036ed9a7c50de30d34566135a16045c0788d12db974a386a9ac2f8076fcad60 SHA512 1354f215534427f63b2ba663cc271858bc0cc4451c369464033241d71b665dcf5858b748e0144587b044644d20639f34684674b6ad49a71f8f02cfc156241a6f
-AUX xvnkb-0.2.8a.patch 562 BLAKE2B 9302bfc3e510b555995f00efb9bc9d51276ce557a8b4c32306f01318c1950c533e6e219b7ab4a63e2aaf45421c42d87caa529eab3f9efd6d3ea644b582bb5825 SHA512 1859b8bcbae7baa33d565d7fe4f861bfd14a1a08dfc0b0188704f728ab1ada606f74dcb7782afc83bf644ead6f66e0228231d85cefae9a210293e595da480c46
 AUX xvnkb-0.2.9a-ldflags.patch 1261 BLAKE2B cfa566937710bc9c45f9faa0cb6d5dc4d62ef96383c957e7e0d3d731814d5112978062dd873e5428b1035f77f2a96e5e76973258c35da859f98b76cc1773cc52 SHA512 5b54ce3d25a9f634f53347e553ce45b35456228b0cb00f9308d872dcbb33c18218e27921a54e4b9e91d98892f0490c864662d96cee09e99a8400fba46f590afb
-DIST xvnkb-0.2.8a.tar.bz2 76221 BLAKE2B a9bc825ba9412f7e2fa1fdd400ba5f648ad9001dbac7e3b804fc444d5b88534b4f75cb529bf489cb0b107564d4c562be419ea9883b29d154cb3141e0d52fec1e SHA512 76ed49fec52fbcfa4a81a7d80208b3f11d911695e2f8f37d9fbb5e6e1899ffffa722c26a577d4236dfd459769d08d0180593ee0db971910b0cd62e77c49516d5
 DIST xvnkb-0.2.9a.tar.bz2 76429 BLAKE2B 33205bfe8dcc2fd68eaffb507dfb2db55cc1a71d33765f807b3804091a29f8c34ca8dcaf65a3f3978da921534d054096fb22abded3c4829d5ca256d3e51fff34 SHA512 3dbf4adb65f321d721fc74e05e92d2d1460e63c49e8a1ab2e10ab9f015e1a57bd3e641645d1283f1d0c5592eb7b342bf210d9fcab9ba441b6416c2f8fd1af6da
-EBUILD xvnkb-0.2.8a-r1.ebuild 1480 BLAKE2B a589a21afa8f501b92f42610c25cc17ce97e6f54d549fbf28309977bf1f0012134a72e6ab1c1e1579c0c8b0abe2b22ec8a63994ec217244eca0a7ab9756a6094 SHA512 1393190018e2d133d48f2bae9edbbac08387724e4ed3b472434a2d21a2342e09647fe819bbed2cc5717189eb0dc88a1da86cfc4a542b529320c0abb26322f361
-EBUILD xvnkb-0.2.9a-r1.ebuild 1426 BLAKE2B 23c976233d008fa9e822d4a12ea4661c9761ded63d1a33105c1d1a67b557a8f7aea370436657354308da2ba6df838763b1f363bfcf7e05dd6fbd6059e120292e SHA512 7facf8728a6b2e147bdebed757347c7fff69fe35024a6891a7ebf6b40898b49313417191b738969e3c081297d6e4ba662636496f4567ebcacc7935146d140d57
+EBUILD xvnkb-0.2.9a-r1.ebuild 1284 BLAKE2B f098c17bb08a6b904a89ee08b9821770e63375983edef2e87c91c19a108652fc69199efe63cf5a81c3f282c12ea4850aaa991c3f73a919b573531a0b6f3b601d SHA512 adc863b50c4dab538ce46dc57c762efc513dbab83e922fe83dc7a85d9159bb0c21422b7f395184f621d332bb579cfb9e05f5213d6221a17a07e636d83e2632c4
 MISC metadata.xml 319 BLAKE2B d651b6c56f28bb3735d1ee4cbe42ab1cd6f0db55692494fbb78ad9e61aa5655a9003dd12d2da620d184bae5739f79c9642b69e182fc134ed0401b8b135e78694 SHA512 72d8e0bd2181f6f9ab0b0d9a688a718b6e5b606abb7882cb50d36c0e273308055eeb87f0a55834d85240fea60278c8933c828a79822a24b9700189bc1bea77b1
diff --git a/app-i18n/xvnkb/files/0.2.8a-putenv.patch b/app-i18n/xvnkb/files/0.2.8a-putenv.patch
deleted file mode 100644
index ef7827e20fe8..000000000000
--- a/app-i18n/xvnkb/files/0.2.8a-putenv.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xvnkb.c.old	2005-05-04 22:11:50.323413496 +0700
-+++ xvnkb.c	2005-05-04 22:12:01.212758064 +0700
-@@ -77,7 +77,7 @@
- static void __attribute__ ((constructor)) xvnkb_init(void)
- {
- 	static char gtk_xim_env[24] = "GTK_IM_MODULE=xim";
--	putenv(gtk_xim_env);
-+	/*putenv(gtk_xim_env);*/
- 	/* TODO:
- 	 - Initialize some more variables
- 	 */
diff --git a/app-i18n/xvnkb/files/xvnkb-0.2.8a.patch b/app-i18n/xvnkb/files/xvnkb-0.2.8a.patch
deleted file mode 100644
index 51862a1986bd..000000000000
--- a/app-i18n/xvnkb/files/xvnkb-0.2.8a.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur xvnkb-0.2.8/visckey.c xvnkb-0.2.8-new/visckey.c
---- xvnkb-0.2.8/visckey.c	2004-01-17 05:19:17.000000000 +0700
-+++ xvnkb-0.2.8-new/visckey.c	2004-03-03 04:20:44.000000000 +0700
-@@ -423,8 +423,11 @@
- /*----------------------------------------------------------------------------*/
- inline void VKClearBuffer()
- {
--	tempoff = count = *word = vpc = 0;
-+	tempoff = count = *word = 0;
-+#ifdef VK_CHECK_SPELLING
-+	vpc = 0;
- 	vp = -1;
-+#endif
- }
- /*----------------------------------------------------------------------------*/
- inline long VKBackspaceDelete()
diff --git a/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild
deleted file mode 100644
index 51c383883193..000000000000
--- a/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-IUSE="spell xft"
-
-DESCRIPTION="Vietnamese input keyboard for X"
-SRC_URI="http://xvnkb.sourceforge.net/xvnkb/${P}.tar.bz2"
-HOMEPAGE="http://xvnkb.sourceforge.net/"
-
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="ppc x86"
-RDEPEND="x11-libs/libX11
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}.patch"
-	epatch "${FILESDIR}/${PV}-putenv.patch"
-
-	# Remove pregenerated dep file.
-	rm -f "${S}/tools/Makefile.dep"
-}
-
-src_compile() {
-	local myconf
-
-	use spell || myconf="${myconf} --no-spellcheck"
-	use xft || myconf="${myconf} --no-xft"
-
-	# *not* autotools
-	./configure \
-		--use-extstroke ${myconf} \
-		|| die "./configure failed"
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	dobin xvnkb
-	dobin tools/xvnkb_ctrl
-
-	dolib xvnkb.so.${PV}
-	dosym /usr/lib/xvnkb.so.${PV} /usr/lib/xvnkb.so
-
-	dodoc ChangeLog AUTHORS THANKS TODO INSTALL* README* doc/*
-	docinto scripts
-	dodoc scripts/*
-	docinto contrib
-	dodoc contrib/*
-}
-
-pkg_postinst() {
-	elog "Remember to"
-	elog "$ export LANG=en_US.UTF-8"
-	elog "(or any other UTF-8 locale) and"
-	elog "$ export LD_PRELOAD=/usr/lib/xvnkb.so"
-	elog "before starting X Window"
-	elog "More documents are in /usr/share/doc/${PF}"
-	ewarn "Programs with suid/sgid will have LD_PRELOAD cleared"
-	ewarn "You have to unset suid/sgid to use with xvnkb"
-}
diff --git a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
index 3011a7130047..3f52d6d81c32 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
@@ -1,57 +1,50 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils multilib toolchain-funcs
-
-IUSE="spell xft"
+inherit toolchain-funcs
 
 DESCRIPTION="Vietnamese input keyboard for X"
 SRC_URI="http://xvnkb.sourceforge.net/${P}.tar.bz2"
 HOMEPAGE="http://xvnkb.sourceforge.net/"
 
 LICENSE="GPL-2"
-
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-RDEPEND="x11-libs/libX11
-	xft? ( x11-libs/libXft )"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
+KEYWORDS="amd64 ppc x86"
+IUSE="spell xft"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-ldflags.patch
-}
+RDEPEND="
+	x11-libs/libX11:=
+	xft? ( x11-libs/libXft:= )"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
 
-src_compile() {
-	local myconf
+PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
 
+src_configure() {
 	tc-export CC
 
-	use spell || myconf="${myconf} --no-spellcheck"
-	use xft || myconf="${myconf} --no-xft"
+	local myconf=()
+	! use spell && myconf+=( --no-spellcheck )
+	! use xft && myconf+=( --no-xft )
 
 	# *not* autotools
 	./configure \
-		--use-extstroke ${myconf} \
+		--use-extstroke "${myconf[@]}" \
 		|| die "./configure failed"
-
-	emake || die "emake failed"
 }
 
 src_install() {
 	dobin xvnkb
 	dobin tools/xvnkb_ctrl
 
-	dolib xvnkb.so.${PV}
+	dolib.so xvnkb.so.${PV}
 	dosym xvnkb.so.${PV} /usr/$(get_libdir)/xvnkb.so
 
-	dodoc ChangeLog AUTHORS THANKS TODO README* doc/*
-	docinto scripts; dodoc scripts/*
-	docinto contrib; dodoc contrib/*
+	einstalldocs
+	dodoc -r doc/. scripts contrib
 }
 
 pkg_postinst() {
@@ -60,7 +53,8 @@ pkg_postinst() {
 	elog "(or any other UTF-8 locale) and"
 	elog "$ export LD_PRELOAD=/usr/$(get_libdir)/xvnkb.so"
 	elog "before starting X Window"
-	elog "More documents are in /usr/share/doc/${PF}"
+	elog "More documents are in ${EROOT}/usr/share/doc/${PF}"
+
 	ewarn "Programs with suid/sgid will have LD_PRELOAD cleared"
 	ewarn "You have to unset suid/sgid to use with xvnkb"
 }
-- 
cgit v1.2.3