gentoo (leap year) resync : 29.02.2020

16 files changed, 46 insertions, 544 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 9b52cb1bd8ba..2d8a539dae26 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index 222e04e0fed9..26ba9cd6754c 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,3 +1,5 @@
 DIST ibus-hangul-1.5.1.tar.gz 460517 BLAKE2B 913d0d8b8995fac3cd73ca40280761d5bf44f35134cb7e73075c233f9c1ef5aa00bb7d7b8da20a69273cd0eb8202b9deb409e1b8d1b6ebbeccccb5f0ef98d341 SHA512 1254398cc4daef2bcbb4cf5be5cfe4c3478097cc5be1f2b39861efe55529ba36602798a84c2540298c2c3b6405c1bd38c97543827c74a473dca5a2d23e3ac4ec
+DIST ibus-hangul-1.5.3.tar.gz 525834 BLAKE2B 6c92dbbde39bc42b7df974dbb23c9ef62088c8d3f63a500bd3c7e9c90b3d80d16dc1d76616620e1d7590fee549979a03585ac635761687dc11737d65fdf09e08 SHA512 ba21a8afb750e33744042c5e4f9d88891764921a37c4dbe1f4efa9883fd3c889789854af57adcd24bc1ca365ee49d2e01073c54d72cd025558b41788fb6213b4
 EBUILD ibus-hangul-1.5.1-r1.ebuild 921 BLAKE2B 0b9f3d9c07594dd3598c3a04eda66ecfbabbbb000ea801fc1d46ec964a18bd1d1160a71cc24f8a5cadd483ff26499dce9ca3528c99244262b2501d17828af02d SHA512 c88bbf13ee0a04602d805cf0115db5bc9e1c0ed7dc96f024b6608d9ba71b008d73ee99deb89d9dd70119b141b577c1409461025cf2589eec9e0af60232abe393
+EBUILD ibus-hangul-1.5.3.ebuild 908 BLAKE2B a1039fa2a166dbecb6b104b7e3b3adc58b2107d66a44d0a19f314f3d3f8f294d7b907620ad08388175899b69d9ced68e6bc28f0cff0af47811dd4fd297c8cffd SHA512 05bf2c00cbee52ea4b57fd4ed74effd97c68210957456794c25a30f533238a1ab923a8b01e5ad1e77f45c31c553a99c94fcee73fee412c3d657674e65b0fbbae
 MISC metadata.xml 469 BLAKE2B fc2c441dc9e4074913f97fd699f765f5cf658cf2faf60bd2e5794349cf58ae83d875bee8303f4836625111b1af89bfad5379c53424910725fc344bc89eef7eb7 SHA512 e22052e96605c02b108b6ec009c81f92ec83fe39978645ec5fccce5cbe4b17f1e205bd5e2173b3f082ff3a0ca404a6576b7f4bc2afa3915482d7afbb154b0172
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.5.3.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.5.3.ebuild
new file mode 100644
index 000000000000..393fcb686cec
--- /dev/null
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.5.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit gnome2-utils python-single-r1
+
+DESCRIPTION="Korean Hangul engine for IBus"
+HOMEPAGE="https://github.com/libhangul/ibus-hangul/wiki"
+SRC_URI="https://github.com/libhangul/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		app-i18n/ibus[python(+),${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=app-i18n/libhangul-0.1
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		--with-python=${EPYTHON}
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-i18n/scim-anthy/Manifest b/app-i18n/scim-anthy/Manifest
index ab3be74015c9..620d749d9d8a 100644
--- a/app-i18n/scim-anthy/Manifest
+++ b/app-i18n/scim-anthy/Manifest
@@ -1,5 +1,5 @@
 AUX scim-anthy-1.2.7-gtk2_build.patch 24547 BLAKE2B 22b20c7b34e83a9392fe89a2484d994364e12b5618fd7fac0e19af3c8988c1b3acbfe31872f98308c1c201d4e5c1ea598597bc15e04e77e54cfb2fedea7d9e4d SHA512 2814481606429228891cda1c70ed53b4014d2e192f6ab7859d5033a9353ab02dea044291ec8e5667853ac6db2da19f06c4a42ce6fe27d11110a5b0f6ee56bd0e
 DIST scim-anthy-1.2.7-patches.tar.xz 11236 BLAKE2B 5db168479db59bdd1a9a9561af8635e370a338620f4c4cb1676a707c60c0140e2ddd6517896ff5d8a90cd0fe9e2fe25eea7dca693c02e765fb6b8a584f9f409c SHA512 ff265547ea78912b3cb2519793fc7159d466da6bbd3cd47f63a67731207c46ba8932a5384899ffbe517bb3d91f14ee282906ee287025ae64ccee7636dd633f08
 DIST scim-anthy-1.2.7.tar.gz 680942 BLAKE2B 9f2b33d53e5ed14c806dcae50a73d3bb234ec74b820651b09ccf0e3b78924bb0331ec4f5b93f9b0bcb2429bf528f9ddc35d0cda9b3a4d30780f083493945c963 SHA512 4ece2e458b204a68392ed676134ff45f1e193fda00d5ffb219c4e947f7f069a0221b279f110bf4093a22e57c41cb1555c6be4d42bea1c9e848af06ad8e0bc2da
-EBUILD scim-anthy-1.2.7-r1.ebuild 1084 BLAKE2B 5210abc8c725ce135bec6ee8d3b1a47c03911071d34d91755ac3924def10547e9fd7c7b5593acd0f53e0007f85bade757e1388c44209e77387643c9b01fc0594 SHA512 1e56299bdbb2a0191a47e26d8d9f3baa1ad738cb49772b78c02a828d11c7a78cafc1dda12e4327134497886d9c2c5061dc580d267192b844c792158b925afd6f
+EBUILD scim-anthy-1.2.7-r1.ebuild 1050 BLAKE2B f57ddf1e7e487b71f26c801297b1892daf519595f05341a95d0a37ac3ecfdf8a8108c3b87622651a54cf62e5f6510639e6710a0a2d4a2e3ab27519669d71961e SHA512 b13ec0cbcf05a2748454c06e8989efcd40c9096866caea4e1c798bcca0a4a41d86042fc91233f822b4b2263984ff2577648ada54e3f670f79564cdff7b3bcb79
 MISC metadata.xml 505 BLAKE2B 811e271383ea3c8f7f3ef772c8b97a395682e3f40c948d6ac09e9aed18b96e7ad0943a4e11e5e2f9fdd5615d86aaf3e5977975d02e5f6c2342d1fee3b563d3f4 SHA512 85aba6ffa284906fc8732242f5efe3563483930dd625871d670840c558f99e04e509080d0ff804746db8d5a3da9210680bab223dd78bcae79cc2ebcde622114b
diff --git a/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild b/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
index f2170e142c85..ee98d2db2ecf 100644
--- a/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
+++ b/app-i18n/scim-anthy/scim-anthy-1.2.7-r1.ebuild
@@ -40,8 +40,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_enable nls) \
-		--disable-static \
-		--disable-dependency-tracking
+		--disable-static
 }
 
 src_install() {
diff --git a/app-i18n/zhcon/Manifest b/app-i18n/zhcon/Manifest
deleted file mode 100644
index b588306dce9e..000000000000
--- a/app-i18n/zhcon/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX zhcon-0.2.6+gcc-4.3.patch 5808 BLAKE2B 2e0087dd58f52d490df4d064792e22cdc40eb2ceed82989d914e34e1b86aa5a76b20666990b46ffdc190b600475b1310b03bb5e27ba8139558223fa306b5f52a SHA512 f8bc5a21ec505494fa104c16ed1057a73b0da3be060b381a1ba8ad29d470dbb8e9361714821eb9ec19ae8898b77a7c9855ca163daf632c2e3bad90aa3c7239cb
-AUX zhcon-0.2.6+linux-headers-2.6.26.patch 527 BLAKE2B f7f0cd2a975861489dbbf4410859dbab197e72ff2c1f521c58cd7cc981c46e3ee2bd4ae67c6898fc7509e23d21e544312fe368ef4982a95f5e7b2ea33065e9c2 SHA512 2800b14b46341afdaf2e8d555232a78583415de168ba1fef32205a73b32fa838fcdb1a99f6d389b2d5df87c9d5d764fe44eba7e70d5164521e3ac65977de553c
-AUX zhcon-0.2.6-amd64.patch 2760 BLAKE2B eab6f9885400c0282d71cc19970ded49d93fe8c0694a6dec18266fed69ad4acf19b057f159c7f5af2e2eae1a8773cf8ab6edb1217f36735588f86bc8a987ac93 SHA512 4c2a398b78b3026ddfb6a2a77308bb1a78cae51eff0691d42ff7c849a266414c74033f8ce6b6bf211a7ab6dcf39d94dffc96e27dd4e9604629a70f7a65bd907a
-AUX zhcon-0.2.6-automagic-fix.patch 1363 BLAKE2B 6b03a2dd0c91953e75a11685ea0726375a3a972168f62f9beda0ea1839b875b1efdf5313c5b7d26cc3213ee6e5f6c0660a659b0d964101cead275759974b9db9 SHA512 c88b2d15e8a9f47de46d6cd5e0ac6a0e5bbeaa45ffb39a91d9067fc3f730019ac753e8517e2636994b5ab5bc44c1bd081246b0700ecff61b3dab45caba0d3226
-AUX zhcon-0.2.6-curses.patch 707 BLAKE2B b0ea8d779b3f06d6430ba9b52238172022d90a129f3c0cae6dc087802805d20a192d405af4837e0916ab9ab8b1e335e87223348fdcf9234f957a96d1a0a77dbf SHA512 129d4121d7d28d757cbe992a255d56ba157799a6ca53df3224c7475c745a9ed94663f2a0a58562cd52ac5c388f21f6bb835f28eec16c0c40438f0e3a95e40ea4
-AUX zhcon-0.2.6.configure.in.patch 379 BLAKE2B b87b5e6f61890d058c77eb5d578ec9db6cfc7c66ac2b599bcaef8246da118b63013b4ce918c6ffc996ca41da5d80af2db974b7ef5165b593ce7e15da947af234 SHA512 8d226fb01707b37bc5accd44fad01cf028ccfd4c9d826f4056700c9291b3f544333f80f716da4834dae5e32a6a17bdd1c7913635e14eb10764716a45b91229d6
-AUX zhcon-0.2.6.make-fix.patch 3071 BLAKE2B 527083f2fbe91ffeccdb6b6130f68d32e09e0d3b3738fac0e5626eba886a7f325836305df6ffb6f206d05f220c342b945cab2d442f3165de77e77ea66584dba9 SHA512 25ac39954f69c251ea1587f580879ca1e38502997b1b7313ef43a84d8626811c5b74e1a0065fec94f4c5acf378ee4495cb41c3ff3a902bd73973f15239c593a8
-AUX zhcon-0.2.6.sysconfdir.patch 779 BLAKE2B 869a6fe3bcf632d0c29eb37145dc516fde1bc01066dd3d657b38fa91a355f613b23326653ee7bf06a368cd7fd6fe8012b70fceb0a805f9699910a1b6ad5b241b SHA512 8996e04f6cb7ba7fa1b548fa47ab3463a76aa690e59fce1614986dbf73d3569eea479c5c764e84f6994a6b6795c4fcf29f9018a3b5cee2ec075677f909de4e11
-DIST zhcon-0.2.5-to-0.2.6.diff.gz 2881 BLAKE2B eb7b3bc38ae77c7a0add2a0693822fb34a7721ec4224a5be6fc533f0c69878a66c123a12b2d38a09ab1a3360f3d1e0658ccaf35e138d102748675cd60f81df21 SHA512 c4725e600cde5a629735506c8eaa3b78df4606cd2745891a21c4f25889cff10b6fe4cbeb3cf60b85ad62ed0e46c8e7bbb802b7675f79f3a1d82f6942c393d4ad
-DIST zhcon-0.2.5.tar.gz 5011644 BLAKE2B 326add20cac0bab31c4a34a0261374f2daf8db84f0fafd774c3498c4ba42275a6258bac0b74447626e691c1e86bcd6e0a6408cb8d6af5c1ff2a8912b5dc3d411 SHA512 35f1517b649e5afe3156eb1aa7735f3d3a988fad08c433b8f343df6ba3fdef89493afe61488a76059e4bfa1db4455d21d0bde7041bab37eb50e5ab0b622218fa
-EBUILD zhcon-0.2.6-r3.ebuild 1321 BLAKE2B 70eaa98c092a4be6714e84076d755c73bda941d87998cad89a4d4b0e0230ee77eba4505642ac848d22bca368fdead8d5cfbbc6382f6eadaf2ed50245cf5b9d70 SHA512 8459558b9836bab8876f0619cc623d527afe5f97cd251bfced724031bee3fcc74f4b617f5693de91217bbf185fc03fe40936818a9e9cbf5b3e493f2745ba49e9
-MISC metadata.xml 620 BLAKE2B 2d07a1bd4880b59a4d6c76325ffe19ebaeacb2943797f5afeeb25ce7521d1ca406d3367496a0ebcf0235bcdd54d6e68bbb2196dd24f926877a00a0ce1313aec5 SHA512 f67cb7edc94c9d26bf5b7e89d9a02333aec62d8dce387b2449c1879f93a56654a12292b92be63936615ca916452a0d19d62bee984e2462fb939a0fe98e2e7c84
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6+gcc-4.3.patch b/app-i18n/zhcon/files/zhcon-0.2.6+gcc-4.3.patch
deleted file mode 100644
index beece66b1da8..000000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6+gcc-4.3.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-diff -NrU5 zhcon-0.2.6.orig/src/basefont.cpp zhcon-0.2.6/src/basefont.cpp
---- zhcon-0.2.6.orig/src/basefont.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/basefont.cpp	2008-04-29 23:15:37.000000000 +0200
-@@ -27,10 +27,12 @@
- #include "global.h"
- #include "debug.h"
- #include "hzdecoder.h"
- #include "basefont.h"
- 
-+#include <cstring>
-+
- BaseFont::BaseFont(string & fn, int w, int h)
- :mFd(0)
- ,mpBuf(0)
- ,mWidth(w)
- ,mHeight(h) {
-diff -NrU5 zhcon-0.2.6.orig/src/display/fblinear4.cpp zhcon-0.2.6/src/display/fblinear4.cpp
---- zhcon-0.2.6.orig/src/display/fblinear4.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/display/fblinear4.cpp	2008-04-29 23:15:37.000000000 +0200
-@@ -20,10 +20,12 @@
- #include <assert.h>
- #include <endian.h>
- #include "global.h"
- #include "fblinear4.h"
- 
-+#include <cstring>
-+
- __u16 FBLinear4::nibbletab_cfb4[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x0000,0xf000,0x0f00,0xff00,
- 0x00f0,0xf0f0,0x0ff0,0xfff0,
- 0x000f,0xf00f,0x0f0f,0xff0f,
-diff -NrU5 zhcon-0.2.6.orig/src/display/fblinear8.cpp zhcon-0.2.6/src/display/fblinear8.cpp
---- zhcon-0.2.6.orig/src/display/fblinear8.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/display/fblinear8.cpp	2008-04-29 23:15:37.000000000 +0200
-@@ -20,10 +20,12 @@
- #include <assert.h>
- #include <endian.h>
- #include "global.h"
- #include "fblinear8.h"
- 
-+#include <cstring>
-+
- __u32 FBLinear8::nibbletab_cfb8[] = {
- #if BYTE_ORDER == LITTLE_ENDIAN
- 0x00000000,0xff000000,0x00ff0000,0xffff0000,
- 0x0000ff00,0xff00ff00,0x00ffff00,0xffffff00,
- 0x000000ff,0xff0000ff,0x00ff00ff,0xffff00ff,
-diff -NrU5 zhcon-0.2.6.orig/src/display/fbvgaplanes.cpp zhcon-0.2.6/src/display/fbvgaplanes.cpp
---- zhcon-0.2.6.orig/src/display/fbvgaplanes.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/display/fbvgaplanes.cpp	2008-04-29 23:15:37.000000000 +0200
-@@ -36,10 +36,12 @@
-         : "a" ((char) value),
-         "d" ((unsigned short) port));
- }
- #endif
- 
-+#include <cstring>
-+
- /* based on kernel
-  * Force strict CPU ordering.
-  * And yes, this is required on UP too when we're talking
-  * to devices.
-  *
-diff -NrU5 zhcon-0.2.6.orig/src/display/vgadev.cpp zhcon-0.2.6/src/display/vgadev.cpp
---- zhcon-0.2.6.orig/src/display/vgadev.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/display/vgadev.cpp	2008-04-29 23:15:37.000000000 +0200
-@@ -35,10 +35,12 @@
- #include <cassert>
- #include "debug.h"
- #include "vgadev.h"
- #include "lrmi.h"
- 
-+#include <cstring>
-+
- #define GRAPH_BASE 0xA0000
- #define GRAPH_ADDR  0x3ce
- #define GRAPH_DATA  0x3cf
- 
- char *VGADev::mpBuf = NULL;
-diff -NrU5 zhcon-0.2.6.orig/src/graphdev.cpp zhcon-0.2.6/src/graphdev.cpp
---- zhcon-0.2.6.orig/src/graphdev.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/graphdev.cpp	2008-04-29 23:16:14.000000000 +0200
-@@ -24,20 +24,23 @@
- #include <fcntl.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- #include <assert.h>
- #include <iostream>
-+#include <cstdlib>
- #include "debug.h"
- 
- #include "display/fbdev.h"
- #include "display/vgadev.h"
- #if defined(linux) || defined(__FreeBSD__)
-     #ifdef HAVE_GGI_LIB
-     #include "display/libggi.h"
-     #endif
- #endif
- 
-+#include <cstring>
-+
- using namespace std;
- // mmap framebuffer address
- GraphDev *GraphDev::mpGraphDev = NULL;
- 
- // font
-diff -NrU5 zhcon-0.2.6.orig/src/inputclient.cpp zhcon-0.2.6/src/inputclient.cpp
---- zhcon-0.2.6.orig/src/inputclient.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/inputclient.cpp	2008-04-29 23:15:37.000000000 +0200
-@@ -14,10 +14,12 @@
-  *   the Free Software Foundation; either version 2 of the License, or     *
-  *   (at your option) any later version.                                   *
-  *                                                                         *
-  ***************************************************************************/
- 
-+#include <cstdlib>
-+
- #include "inputclient.h"
- 
- Console* InputClient::mpCon = NULL;
- InputClient::InputClient()
- : mVisible(false),
-diff -NrU5 zhcon-0.2.6.orig/src/inputmanager.cpp zhcon-0.2.6/src/inputmanager.cpp
---- zhcon-0.2.6.orig/src/inputmanager.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/inputmanager.cpp	2008-04-29 23:19:01.000000000 +0200
-@@ -22,10 +22,11 @@
- using namespace std;
- 
- #include <unistd.h>
- #include <sys/time.h>
- #include <string>
-+#include <cstdlib>
- 
- #include "global.h"
- #include "debug.h"
- #include "keymap.h"
- #include "console.h"
-diff -NrU5 zhcon-0.2.6.orig/src/inputmanager.h zhcon-0.2.6/src/inputmanager.h
---- zhcon-0.2.6.orig/src/inputmanager.h	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/inputmanager.h	2008-04-29 23:15:37.000000000 +0200
-@@ -24,10 +24,11 @@
-   *@author ejoy
-   */
- using namespace std;
- #include <cassert>
- #include <vector>
-+#include <sys/types.h>
- 
- #include "mouse.h"
- #if defined(__FreeBSD__)
-     #include <sys/kbio.h>
- #endif
-diff -NrU5 zhcon-0.2.6.orig/src/window.cpp zhcon-0.2.6/src/window.cpp
---- zhcon-0.2.6.orig/src/window.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/window.cpp	2008-04-29 23:15:37.000000000 +0200
-@@ -22,10 +22,12 @@
- #include <algorithm>
- #include "global.h"
- #include "debug.h"
- #include "window.h"
- 
-+#include <cstring>
-+
- //static members for all the windows
- Window* Window::mpConsole = NULL;
- char* Window::mpOverlaps = NULL;
- 
- Window::Window(int x1, int y1, int x2, int y2, int type)
-diff -NrU5 zhcon-0.2.6.orig/src/zhcon.cpp zhcon-0.2.6/src/zhcon.cpp
---- zhcon-0.2.6.orig/src/zhcon.cpp	2008-04-29 23:15:08.000000000 +0200
-+++ zhcon-0.2.6/src/zhcon.cpp	2008-04-29 23:15:37.000000000 +0200
-@@ -81,10 +81,12 @@
- #ifndef NDEBUG
- #include "debug.h"
- ofstream debug("debug");
- #endif
- 
-+#include <cstring>
-+
- Zhcon* Zhcon::mpZhcon = NULL;
- int Zhcon::mTtyPid = 0;
- Zhcon::STATE Zhcon::mState = STOP;
- 
- void Zhcon::SignalVtLeave(int signo) {
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6+linux-headers-2.6.26.patch b/app-i18n/zhcon/files/zhcon-0.2.6+linux-headers-2.6.26.patch
deleted file mode 100644
index 67d5b961a070..000000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6+linux-headers-2.6.26.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/display/lrmi.c b/src/display/lrmi.c
-index 85c6fe6..5c74260 100644
---- a/src/display/lrmi.c
-+++ b/src/display/lrmi.c
-@@ -33,6 +33,13 @@ This software has NO WARRANTY.  Use it at your own risk.
- 
- #include "lrmi.h"
- 
-+#if defined(__linux__) && !defined(TF_MASK)
-+	#define TF_MASK X86_EFLAGS_TF
-+	#define IF_MASK X86_EFLAGS_IF
-+	#define VIF_MASK X86_EFLAGS_VIF
-+	#define IOPL_MASK X86_EFLAGS_IOPL
-+#endif
-+
- #define REAL_MEM_BASE 	((void *)0x10000)
- #define REAL_MEM_SIZE 	0x10000
- #define REAL_MEM_BLOCKS 	0x100
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch b/app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch
deleted file mode 100644
index 58da5e99766a..000000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6-amd64.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/src/winime.cpp b/src/winime.cpp
-index 0c52393..85729a3 100644
---- a/src/winime.cpp
-+++ b/src/winime.cpp
-@@ -56,10 +56,10 @@ mCandilistBufLen(0)
- 
-     memcpy(&mHead, mpBuf, sizeof(mHead));
-     int len = strlen(mHead.mCodeSet);
--    mpIndex1 = (char **) (mpBuf + sizeof(mHead));
--    mpIndex2 = (char **) (mpBuf + sizeof(mHead) + len * sizeof(char *));
--    mpText = mpBuf + sizeof(mHead) + len * sizeof(char *) +
--                len * len * sizeof(char *);
-+    mpIndex1 = (int *) (mpBuf + sizeof(mHead));
-+    mpIndex2 = (int *) (mpBuf + sizeof(mHead) + len * sizeof(int));
-+    mpText = mpBuf + sizeof(mHead) + len * sizeof(int) +
-+                len * len * sizeof(int);
- }
- 
- WinIme::~WinIme() {
-@@ -246,32 +246,33 @@ int WinIme::Search(char c) {
-             //                p = *t;
-         }
-         else
--            p = mpIndex1[Index(c)];
-+            p = (char *)mpIndex1[Index(c)];
- 
-         if (p == (char *) 0xffffffff)
-             found = false;
--        p = (unsigned int) p + mpText;
-+        p = (unsigned long) p + mpText;
-     } //2nd level index
-     else if (mNum == 1) {
-         int l = strlen(mHead.mCodeSet);
-         if (c == mHead.mWildChar) {
-             char **t;
-             t =
--                find_if(mpIndex2 + Index(mInput[0]) * l,
--                        mpIndex2 + (Index(mInput[0]) + 1) * l,
-+                find_if((char **)(mpIndex2 + Index(mInput[0]) * l),
-+                        (char **)(mpIndex2 + (Index(mInput[0]) + 1) * l),
-                         bind2nd(not_equal_to < char *>(),
-                                 (char *) 0xffffffff));
--            if (t == mpIndex2 + (Index(mInput[0]) + 1) * l)
-+            if (t == ((char **)mpIndex2) + (Index(mInput[0]) + 1) * l)
-                 p = (char *) 0xffffffff;
-             else
-                 p = *t;
--        } else
--            p = mpIndex2[Index(mInput[0]) * l + Index(c)];
-+        } else {
-+            int dd =  Index(mInput[0]) * l + Index(c);
-+            p = (char *)(mpIndex2[Index(mInput[0]) * l + Index(c)]);
-+        }
- 
-         if (p == (char *) 0xffffffff)
-             found = false;
--
--        p = (unsigned int) p + mpText;
-+        p = (unsigned long) p + mpText;
-     } else if (mNum < mHead.mMaxCodes) {
-         p = mpOffset[mNum - 1];
-         if (p == (char *) 0xffffffff)
-diff --git a/src/winime.h b/src/winime.h
-index c2f51ab..816a270 100644
---- a/src/winime.h
-+++ b/src/winime.h
-@@ -83,8 +83,8 @@ class WinIme {
-         char* mpOffset[12];
-         int mFd;
-         char* mpBuf;
--        char** mpIndex1;
--        char** mpIndex2;
-+        int *mpIndex1;
-+        int *mpIndex2;
-         char* mpText;
-         char* mpCur;                  //current search position
-         unsigned int mBufSize;
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-automagic-fix.patch b/app-i18n/zhcon/files/zhcon-0.2.6-automagic-fix.patch
deleted file mode 100644
index 5b4b24137f1e..000000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6-automagic-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- zhcon-0.2.5.orig/configure.in	2010-01-31 15:12:10.521592172 +0100
-+++ zhcon-0.2.5/configure.in	2010-01-31 15:12:33.939593092 +0100
-@@ -170,18 +170,25 @@
- dnl-----------------------------------------------------------------------
- dnl Checks for gpm
- dnl-----------------------------------------------------------------------
--usegpm="yes"
--AC_CHECK_HEADERS(gpm.h,,usegpm="no")
--AC_CHECK_LIB(gpm,Gpm_Open,,usegpm="no")
-+AC_ARG_WITH([gpm], AS_HELP_STRING([--without-gpm], [Build without gpm library (default: test)]))
-+
-+usegpm='no'
-+if test "x$with_gpm" != "xno"; then
-+    AC_CHECK_HEADERS(gpm.h,,AC_ERROR([gpm.h not found]))
-+    AC_CHECK_LIB(gpm,Gpm_Open,,AC_ERROR([libgpm not found]))
-+    usegpm='yes'
-+fi
- 
- dnl-----------------------------------------------------------------------
- dnl Checks for libggi
- dnl-----------------------------------------------------------------------
--useggi="yes"
--AC_CHECK_HEADERS(ggi/ggi.h,,useggi="no")
--AC_CHECK_LIB(ggi, main,,useggi="no")
--if test "$useggi" = 'yes';then
--	AC_DEFINE(HAVE_GGI_LIB)
-+AC_ARG_WITH([ggi], AS_HELP_STRING([--without-ggi], [Build without ggi library (default: test)]))
-+
-+useggi='no'
-+if test "x$with_ggi" != "xno"; then
-+    AC_CHECK_HEADERS(ggi/ggi.h,,AC_ERROR([ggi.h not found]))
-+    AC_CHECK_LIB(ggi, ggiInit,, AC_ERROR([libggi not found]))
-+    useggi='yes'
- fi
- 
- AC_OUTPUT([Makefile
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
deleted file mode 100644
index cf8b07d3de4f..000000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 63172e4..6c2afcc 100644
---- a/configure.in
-+++ b/configure.in
-@@ -132,7 +132,7 @@ fi
- AC_SUBST(ZHCON_LOCALE_DIR)
- 
- AC_CHECK_LIB(util, forkpty)
--AC_CHECK_LIB(curses, main)
-+AC_SEARCH_LIBS([tgetent], [tinfow tinfo cursesw curses ncursesw ncurses], [break;])
- 
- dnl for freebsd
- dnl AC_CHECK_LIB(c, i386_set_ioperm)
-@@ -172,7 +172,7 @@ dnl Checks for gpm
- dnl-----------------------------------------------------------------------
- usegpm="yes"
- AC_CHECK_HEADERS(gpm.h,,usegpm="no")
--AC_CHECK_LIB(gpm,main,,usegpm="no")
-+AC_CHECK_LIB(gpm,Gpm_Open,,usegpm="no")
- 
- dnl-----------------------------------------------------------------------
- dnl Checks for libggi
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6.configure.in.patch b/app-i18n/zhcon/files/zhcon-0.2.6.configure.in.patch
deleted file mode 100644
index 0624a934e02c..000000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6.configure.in.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.in	2006-06-22 13:02:59.197841560 +0800
-+++ b/configure.in	2006-06-22 12:48:59.000000000 +0800
-@@ -55,7 +55,7 @@
- 
- CFLAGS="$CFLAGS -funsigned-char -O2" 
- CXXFLAGS="$CXXFLAGS -funsigned-char -O2"
--if test $enable_debug = 'yes';then
-+if test "x$enable_debug" = "xyes";then
-         CFLAGS="$CFLAGS -O0 -g3 -Wall" 
-         CXXFLAGS="$CXXFLAGS -O0 -g3 -Wall" 
- else
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6.make-fix.patch b/app-i18n/zhcon/files/zhcon-0.2.6.make-fix.patch
deleted file mode 100644
index ccde407ef81a..000000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6.make-fix.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-diff -Naur zhcon-0.2.5.orig/doc/Makefile.am zhcon-0.2.5/doc/Makefile.am
---- zhcon-0.2.5.orig/doc/Makefile.am	2006-05-03 02:57:18.000000000 +0900
-+++ zhcon-0.2.5/doc/Makefile.am	2011-01-25 18:08:26.483746175 +0900
-@@ -3,8 +3,8 @@
- EXTRA_DIST = zhcon.1.in poem.big5 poem.gb poem.gb.utf8 bpsf.txt manual.tex manual.dvi manual.ps README.html default.css html.tar.gz
- 
- install-data-local:
--	$(mkinstalldirs) $(mandir)/man1/
--	$(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(mandir)/man1/zhcon.1
-+	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1/
-+	$(INSTALL_DATA) $(top_builddir)/doc/zhcon.1 $(DESTDIR)$(mandir)/man1/zhcon.1
- 
- uninstall-local:
--	-rm -f $(mandir)/man1/zhcon.1
-+	-rm -f $(DESTDIR)$(mandir)/man1/zhcon.1
-diff -Naur zhcon-0.2.5.orig/font/Makefile.am zhcon-0.2.5/font/Makefile.am
---- zhcon-0.2.5.orig/font/Makefile.am	2006-04-25 01:39:04.000000000 +0900
-+++ zhcon-0.2.5/font/Makefile.am	2011-01-25 18:08:26.483746175 +0900
-@@ -1,8 +1,8 @@
- EXTRA_DIST = *.bpsf
- 
- install-data-local:
--	$(mkinstalldirs) $(libdir)/zhcon/font/
--	$(INSTALL_DATA) $(srcdir)/*.bpsf $(libdir)/zhcon/font/
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/font/
-+	$(INSTALL_DATA) $(srcdir)/*.bpsf $(DESTDIR)$(libdir)/zhcon/font/
- 
- uninstall-local:
--	-rm -f $(libdir)/zhcon/font/*.bpsf
-+	-rm -f $(DESTDIR)$(libdir)/zhcon/font/*.bpsf
-diff -Naur zhcon-0.2.5.orig/input/Makefile.am zhcon-0.2.5/input/Makefile.am
---- zhcon-0.2.5.orig/input/Makefile.am	2006-04-25 01:38:44.000000000 +0900
-+++ zhcon-0.2.5/input/Makefile.am	2011-01-25 18:08:26.483746175 +0900
-@@ -1,8 +1,8 @@
- EXTRA_DIST = *.mb
- 
- install-data-local:
--	$(mkinstalldirs) $(libdir)/zhcon/input/
--	$(INSTALL_DATA) $(srcdir)/*.mb $(libdir)/zhcon/input/
-+	$(mkinstalldirs) $(DESTDIR)$(libdir)/zhcon/input/
-+	$(INSTALL_DATA) $(srcdir)/*.mb $(DESTDIR)$(libdir)/zhcon/input/
- 
- uninstall-local:
--	-rm -f $(libdir)/zhcon/input/*.mb
-+	-rm -f $(DESTDIR)$(libdir)/zhcon/input/*.mb
-diff -Naur zhcon-0.2.5.orig/src/Makefile.am zhcon-0.2.5/src/Makefile.am
---- zhcon-0.2.5.orig/src/Makefile.am	2006-05-03 02:12:41.000000000 +0900
-+++ zhcon-0.2.5/src/Makefile.am	2011-01-25 18:11:42.446555911 +0900
-@@ -7,15 +7,12 @@
- 
- SUBDIRS = display
- 
--install-exec-local:
--	chmod 4755 $(bindir)/zhcon
--
- install-data-local:
--	$(mkinstalldirs) $(prefix)/etc
--	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(prefix)/etc/zhcon.conf
-+	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-+	$(INSTALL_DATA) $(srcdir)/zhcon.conf $(DESTDIR)$(sysconfdir)/zhcon.conf
- 
- uninstall-local:
--	-rm -f $(prefix)/etc/zhcon.conf
-+	-rm -f $(DESTDIR)$(sysconfdir)/zhcon.conf
- 
- # set the include path found by configure
- INCLUDES= $(all_includes)
-diff -Naur zhcon-0.2.5.orig/tools/Makefile.am zhcon-0.2.5/tools/Makefile.am
---- zhcon-0.2.5.orig/tools/Makefile.am	2006-04-25 01:38:46.000000000 +0900
-+++ zhcon-0.2.5/tools/Makefile.am	2011-01-25 18:04:22.701226453 +0900
-@@ -9,11 +9,6 @@
- #getbpsf_LDADD = -L/usr/X11R6/lib -lX11
- #getbpsf_CPPFLAGS = -I/usr/X11R6/include
- 
--LDFLAGS=
--CXXFLAGS=
--CCFLAGS=
--LIBS=
--
- EXTRA_DIST = README getbpsf.txt gpm-1.19.6-pty.diff\
-              gpm-1.19.6-patched.tar.gz
- 
diff --git a/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch b/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch
deleted file mode 100644
index 551d656dd6e2..000000000000
--- a/app-i18n/zhcon/files/zhcon-0.2.6.sysconfdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN /src/Makefile.am /tmp/src/Makefile.am
---- a/src/Makefile.am	2006-06-22 12:35:01.531885552 +0800
-+++ b/src/Makefile.am	2006-06-22 12:31:44.000000000 +0800
-@@ -5,6 +5,8 @@
- 
- zhcon_LDADD = display/libdisplay.a
- 
-+zhcon_CPPFLAGS = -DSYSCONF_DIR=\"${sysconfdir}\"
-+
- SUBDIRS = display
- 
- install-exec-local:
-diff -ruN src/zhcon.cpp /tmp/src/zhcon.cpp
---- a/src/zhcon.cpp	2006-06-22 12:35:01.398905768 +0800
-+++ b/src/zhcon.cpp	2006-06-22 12:32:41.000000000 +0800
-@@ -123,7 +123,7 @@
-     string cfgfile = getenv("HOME");
-     cfgfile += "/.zhconrc";
-     if (access(cfgfile.c_str(), R_OK) != 0)
--        cfgfile = PREFIX "/etc/zhcon.conf";
-+        cfgfile = SYSCONF_DIR"/zhcon.conf";
- 
-     //for debug,a pause enable us to attach zhcon's pid in gdb
-     //char c;cin>>c;
diff --git a/app-i18n/zhcon/metadata.xml b/app-i18n/zhcon/metadata.xml
deleted file mode 100644
index b720aad5796d..000000000000
--- a/app-i18n/zhcon/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-	<longdescription>zhcon is a Fast double-byte virtual console for
-Chinese/Japanese/Korean (CJK) running under GNU/Linux and FreeBSD.
-It adds the ability of displaying and inputting CJK double-byte
-characters on console device. Currently Japanese display and input
-function seems to be broken.</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">zhcon</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
deleted file mode 100644
index e32f503d307b..000000000000
--- a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit autotools
-
-MY_P="${P/6/5}"
-
-DESCRIPTION="A Fast CJK (Chinese/Japanese/Korean) Console Environment"
-HOMEPAGE="http://zhcon.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zhcon/${MY_P}.tar.gz
-		mirror://sourceforge/zhcon/zhcon-0.2.5-to-0.2.6.diff.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ggi gpm"
-
-DEPEND="ggi? ( media-libs/libggi[X] )
-	gpm? ( sys-libs/gpm )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}.sysconfdir.patch
-	"${FILESDIR}"/${P}.configure.in.patch
-	"${FILESDIR}"/${P}+gcc-4.3.patch
-	"${FILESDIR}"/${P}+linux-headers-2.6.26.patch
-	"${FILESDIR}"/${P}-curses.patch
-	"${FILESDIR}"/${P}-amd64.patch
-	"${FILESDIR}"/${P}-automagic-fix.patch
-	"${FILESDIR}"/${P}.make-fix.patch
-)
-
-src_prepare() {
-	eapply "${WORKDIR}"/zhcon-0.2.5-to-0.2.6.diff
-	default
-	for f in $(grep -lir HAVE_GGI_LIB *); do
-		sed -i -e "s/HAVE_GGI_LIB/HAVE_LIBGGI/" "${f}" || die "sed failed"
-	done
-	# Required for newer automake
-	touch config.rpath || die
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_with ggi) \
-		$(use_with gpm)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS ChangeLog README NEWS TODO THANKS
-	dodoc README.BSD README.gpm README.utf8
-}