gentoo resync : 18.08.2019

36 files changed, 1128 insertions, 141 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 7b903fb39ce5..edb30db19543 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/ibus-rime/Manifest b/app-i18n/ibus-rime/Manifest
index 8c1230535516..7effea8dc8c2 100644
--- a/app-i18n/ibus-rime/Manifest
+++ b/app-i18n/ibus-rime/Manifest
@@ -3,5 +3,5 @@ DIST ibus-rime-1.3.0.tar.gz 33930 BLAKE2B 14e086382d89c990ca9f07401b68dbe26d58da
 DIST ibus-rime-1.4.0.tar.gz 34176 BLAKE2B 69d0392adc78b2b8935f2239c4567d001d3636d0e8ff59aca0b04b3189751a3edd0350eea9e2262b3ae3e639dbd9715c157e44727cc48ba9521801161a1508f4 SHA512 3fc24f4ce390e27d37e41775e4c075c7465cd3e90a9ab61d13ec47c2ca1c2afaafb322f327e18be573aa254a43b8cf6426415500a5d817b835bf4e0615ab9145
 EBUILD ibus-rime-1.2.ebuild 759 BLAKE2B 270180498169d6f2a503dcebc3cf01b78bbdfae03a45dc8fa8cbdecbb999fb40b1d8c675c002a51e625fbeb277e9abcaffcb23ba6a8a5d0c05af46c54a21d37d SHA512 2a28941562893dd9827bd9621abc7d89ae51e50132671f8fd3fa5533df340b523a1964eeb1d71df6492c074f286a4337a2ab93863d9d303b82af62768ebcefb4
 EBUILD ibus-rime-1.3.0.ebuild 759 BLAKE2B 44bd36ab9b90c93c4a7338f3921ca100c06506acd2ee65c434d26802882b41b66168910cf7ae4cdf8045bbf54222b7200314e488251156c4e8fbdd2b07e3a9fd SHA512 ee0fbc41180122bcb9aa0cb793cb248d0100f813b3bf63b4737e24fc760029299e9d701e08ed2d68cc27ecfb0286a4c76c93cbb42c9d84d21be7b7c9a3d6fffb
-EBUILD ibus-rime-1.4.0.ebuild 754 BLAKE2B f44276123c3dc529d62f5ff648dff08fd2fa83ea76b1409f8a52871b38671842db74ead442374aea46ff0ca92168b04e295123861bcbbda16d828e8f3305204f SHA512 e9d7bc424b02a0e481b2bc72b6c4309281ee08b7056daa5ed4d46f0d2d9bd675790e49b531bc9a8b3a7f624ef99e5f6950b13b9a208df86cad41dca31121bdb4
+EBUILD ibus-rime-1.4.0.ebuild 761 BLAKE2B 346a2abea3aa85ea4c2f877f8321a61137106d2d2d4409d8fec47195d992afe838bb0e97a02d5ecac2ca173e880388f01c76ef0b4af4279552a4e25d6854cce2 SHA512 9bc441c6ef302907057cf44dd3f6ff1028a52e1804ab4be6258c30c54d382e6f904dd31193d2e7a6ee995047865ee9414e84a8286e76d7fad569db33965fb544
 MISC metadata.xml 534 BLAKE2B 0d1888080b3fcf1b2bd5ef07456c8ed3f91dad7e11bb1c34882a43ad2396bc6b5bb62f49bf8af4936d3d5df84b6af30dd4dfcf48ef343865ac36e50da26d061b SHA512 78e2d7631f65652305b451e5b4ab95886dd8a1c2436fb95c0f344daae87feab1eb57486a0815348363858faf91f9b931f32166a9b22b7613bd3b1407ac19e317
diff --git a/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild b/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild
index f59ab58a8622..c5d297d74fec 100644
--- a/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild
+++ b/app-i18n/ibus-rime/ibus-rime-1.4.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 CDEPEND="app-i18n/ibus
diff --git a/app-i18n/ibus-skk/Manifest b/app-i18n/ibus-skk/Manifest
index bacd74d6e5ae..d40442def3fc 100644
--- a/app-i18n/ibus-skk/Manifest
+++ b/app-i18n/ibus-skk/Manifest
@@ -1,5 +1,3 @@
-DIST ibus-skk-1.4.1.tar.gz 478018 BLAKE2B 7e5cb7cf69b5a8949c462644ca7c871d8eccfff272d553986d687bc5ede02d4f35b5830d2a96823bf1d17ea17ec32b5eec59f75713d5a3bfc52424fc234ad5a7 SHA512 d8c0bf2c92fd96486ed10e9dcac861b4fc16e741fd96764671352e9e67226887ad6aa4b76c4891411029d3f5bf692de1162f996a294cecc9e5231e90ea0df5f0
 DIST ibus-skk-1.4.2.tar.gz 491882 BLAKE2B 999eb9f1b36406a8d665b2c929fcdef5e57bef5c6206075333435f46774445497d6d953bc695c22f6afa5700283c32a20c2d4e9227fd30e5552f5688cd524aab SHA512 cec7fbffaa78c406f3b9502bc64e2290fec579102a37ce61cb6424c3e06d159653f165b48e09f1256f38491bce6819460c6d226cd765ab150a8dfa80e2707fe1
-EBUILD ibus-skk-1.4.1-r1.ebuild 615 BLAKE2B 7a739e70f37df02499ff1efbc4a2074f5eb0c23662eea60d487e2ed0d73c32565258caf6a8a2c6400c216b64c0d7312a11538bcf7565b6f6f8bce955cebf6a5f SHA512 573ff5b1078f90f33cab2a021250352590cae460abbf86af793078fbe3c2ed483603aac9fa4dba7a3124c9501b34d16421512ae62a50362d32f83eb83655f937
-EBUILD ibus-skk-1.4.2.ebuild 682 BLAKE2B f314ea7ec040f6abf272a6e3b2bec66da61d150bcccf4e39d11cc4612e7f41d24a6e167340f7bc08a5eec6b47aadb47be31de1f4f9817f3f1c67152240ecd192 SHA512 18c68cf809833a68dc98e71461c008f6ae0ce987cb519a35cc275191693bf07e24cc910f4acf4322f40688ad17ec3815e65110e2c3b23ad88d81555342804bc2
+EBUILD ibus-skk-1.4.2.ebuild 677 BLAKE2B 5538513d4f7b79c2e51510fc470a0e4067d93eb3a8bfe0c33a86b64e830dcd37c05e5fec6defc0b0246e79c4e16539ba4a56ff926d6e045ab8cfa98a91847549 SHA512 52cce129f1d192217aae798513411a769cacb00fdd9449068cf00398c0dcae753c18d5194cb00caf55c91a3c49e0eea56f77b4af58f18138727823d84deeae5b
 MISC metadata.xml 473 BLAKE2B 8902e2b4a2bffb4243bef33353868e2c4c75c3bf36efaac1572f17a265b7084f0c136a4bf77f123016c3fe3cead11463dc1de34a981284c36228667240759705 SHA512 dc943537d163c1197dae0d85ee91fec23eba4026f0bb91d3211cf7ef2cba414c6ab65eb69c74205af35e0620f89afa553927d70b4883590b4a06823e442ae771
diff --git a/app-i18n/ibus-skk/ibus-skk-1.4.1-r1.ebuild b/app-i18n/ibus-skk/ibus-skk-1.4.1-r1.ebuild
deleted file mode 100644
index 40c0d245e466..000000000000
--- a/app-i18n/ibus-skk/ibus-skk-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="Japanese SKK engine for IBus"
-HOMEPAGE="https://github.com/ueno/ibus-skk"
-SRC_URI="mirror://github/ueno/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-CDEPEND="app-i18n/ibus
-	<=app-i18n/libskk-1.0.1
-	x11-libs/gtk+:3
-	nls? ( virtual/libintl )"
-RDEPEND="${CDEPEND}
-	app-i18n/skk-jisyo"
-DEPEND="${CDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-DOCS="ChangeLog NEWS README THANKS"
-
-src_configure() {
-	econf $(use_enable nls)
-}
diff --git a/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild b/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild
index fe548e75e5cf..0ad3a06bbcb0 100644
--- a/app-i18n/ibus-skk/ibus-skk-1.4.2.ebuild
+++ b/app-i18n/ibus-skk/ibus-skk-1.4.2.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"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ueno/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
 CDEPEND="app-i18n/ibus
diff --git a/app-i18n/kcc/Manifest b/app-i18n/kcc/Manifest
index e1a351a221f4..b85505cbafe2 100644
--- a/app-i18n/kcc/Manifest
+++ b/app-i18n/kcc/Manifest
@@ -1,5 +1,6 @@
+AUX kcc-1.0-fix-build-system.patch 501 BLAKE2B 716e34d3fec17ed1d5acd62502b65f4345318c112220cc22684e5c2589e479ec1060b5b75f9835047487d3a6419a66135ed06b267388844fac7ac74da997eff5 SHA512 21f5ebbaaf478cf7f5e881ffb708266de4f41ea50898cffb596869b74e55c5bea98acbcbc318257da80f383ebd7626ab7640ccbd42db86fe67e1fec129aab9cb
 AUX kcc-exit.diff 161 BLAKE2B 48570ac2b258a9567e9dad4075a248f5a4d685225e4f676322a3430ef43764b95d5d36fac5f68ba6de1537b59d6750be8111ea79407019debf9f3928f069427e SHA512 8ee69339db13935d54562189e86941384dc5c01caa30e4efba11e783690b863a1210a5e841ab8a5ac907af9002ac6debd3516a6928f15777a8b31c2089907214
 AUX kcc-gcc3-gentoo.diff 1026 BLAKE2B e7db744d0ce7b34e5686f5e5d256eb16def94cdf83aaeac1d21a77831c7b21df3852b50313af79a570a2fe21ca24dbcdc545d9f9afa498cbb78a9a867261f5c6 SHA512 59c57ee4c34e27b8a0558896e5a94b21f976351e0cd372bc9bd85ac83757276eecdcabd81e4fb02b6f2513e06542d63bcf656140d5407a0e2804f04d5ab55303
-DIST kcc.tar.gz 18869 BLAKE2B 122e6e749a0cc6a63244d32d735a23ea3bdc6ce81e90674d4aa8c6460b57c631e504490454710601a3e057c413d5579495533320f37820d4c3afd9053325c1dc SHA512 2ec1645bb7edbe49c6845cd6e6794568bd48efec367d2d9628ddb8a72d2b5edd590be101f4d9c8856764ae85c9aad7b0adf69601b78fddffdc23235b96f65145
-EBUILD kcc-1.0.ebuild 719 BLAKE2B 12e16f98ff4a63dba5f5f1258f42d7f489fb7ed20b1d67bb8113d8796ba624655369ced9152ed31cb35a14219e2c29fa8bd658e8088e4a8e1a3aa3b5f5acb87d SHA512 be0ae39180e876b6b7a64f5e45e82d88ab8e5276f6662954b807c5082169982344b096c79f08fc820f25717438a6e0bbfba4f32f690fd2df27b62dde904e9450
+DIST kcc-1.0.tar.gz 18869 BLAKE2B 122e6e749a0cc6a63244d32d735a23ea3bdc6ce81e90674d4aa8c6460b57c631e504490454710601a3e057c413d5579495533320f37820d4c3afd9053325c1dc SHA512 2ec1645bb7edbe49c6845cd6e6794568bd48efec367d2d9628ddb8a72d2b5edd590be101f4d9c8856764ae85c9aad7b0adf69601b78fddffdc23235b96f65145
+EBUILD kcc-1.0.ebuild 609 BLAKE2B fc0121ea4e198fb75d3056a7e56133f8bfedcdf9ffcb078461e6db28b9ccec34fa742524bb9f9897e203e617e7ba159b838478d05ef834c8f0f5f0d1c9b8f259 SHA512 516f3b811dc6204ec9dab414926a9d00aed49fd5341ea8be5219316775ce9e32148c122ea7b23cca6d8fc01e61c76176843a97542fafb8db772ebe2e72c43ef5
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/kcc/files/kcc-1.0-fix-build-system.patch b/app-i18n/kcc/files/kcc-1.0-fix-build-system.patch
new file mode 100644
index 000000000000..7818215d62fc
--- /dev/null
+++ b/app-i18n/kcc/files/kcc-1.0-fix-build-system.patch
@@ -0,0 +1,24 @@
+--- a/Makefile
++++ b/Makefile
+@@ -10,11 +10,9 @@
+           BINPATH = /usr/local/bin
+           MANPATH = /usr/local/man
+           JMANDIR = japanese
+-           CFLAGS = -O
+ 
+             SHELL = /bin/sh
+                CP = cp
+-             MAKE = make
+           INSTALL = install
+ 
+              CMDS = kcc
+@@ -23,9 +21,6 @@
+ 
+ all:	kcc
+ 
+-kcc:	kcc.o
+-	$(CC) $(CFLAGS) -o kcc kcc.o
+-
+ install: $(BINPATH)/kcc
+ 	@echo "\`make install' done."
+ 	@echo "Run \`make install.man' to install a manual."
diff --git a/app-i18n/kcc/kcc-1.0.ebuild b/app-i18n/kcc/kcc-1.0.ebuild
index bcb220713949..20ee1ee57350 100644
--- a/app-i18n/kcc/kcc-1.0.ebuild
+++ b/app-i18n/kcc/kcc-1.0.ebuild
@@ -1,34 +1,33 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A Kanji code converter"
 HOMEPAGE="http://www2s.biglobe.ne.jp/~Nori/ruby/"
-SRC_URI="ftp://ftp.jp.freebsd.org/pub/FreeBSD/ports/distfiles/${PN}.tar.gz"
+SRC_URI="mirror://gentoo/${PN}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE=""
 
 S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-gcc3-gentoo.diff"
-	epatch "${FILESDIR}/${PN}-exit.diff"
-	sed -i "s:\(-o kcc\):\$(LDFLAGS) \1:" Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+PATCHES=(
+	"${FILESDIR}"/${PN}-gcc3-gentoo.diff
+	"${FILESDIR}"/${PN}-exit.diff
+	"${FILESDIR}"/${PN}-1.0-fix-build-system.patch
+)
+
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
 	dobin kcc
-	dodoc README
+	einstalldocs
+
 	cp -f kcc.jman kcc.1 || die
 	doman -i18n=ja kcc.1
 }
diff --git a/app-i18n/libchewing/Manifest b/app-i18n/libchewing/Manifest
index 2cfcde2e9252..12330029963b 100644
--- a/app-i18n/libchewing/Manifest
+++ b/app-i18n/libchewing/Manifest
@@ -1,4 +1,5 @@
+AUX libchewing-0.5.1-autoconf-archive-2019.01.06.patch 34944 BLAKE2B 582e2041ff8e99c90df6726ffe0fe7c3f09672ba841def4ded4f367d704a56349da9fe8c555e9b24ec5c82d73774c8690219532c08904cda29a2a33845d2f3d6 SHA512 8e93539fdea3fc6ef01ea070a64d6bdd873ec1c2555fbcb40cc639a22c74a07f8c2936eb100ebb36d146c0e17ce5f80afa8dd3468ff1f5c26a835c3d12b98bb2
 DIST libchewing-0.5.1.tar.bz2 3141084 BLAKE2B 28f9e803c8815c0e1b1a1134becffe12f92c1ae24b4b6d4163769d898861fec024db8332befe7130487a72fc20859b6292837e9d68ab1b6477de4cf4f789f2ee SHA512 a6551661bb5e56bba59730b93b373db56af7d42f2ab4881fbfff8727689dd2604d42d2e5c0b04820df66a431dfb5fcb73cc5c9b538615da76198ee3635501c1f
-EBUILD libchewing-0.5.1.ebuild 1157 BLAKE2B f9e817f8ef01af9e0e7519784030e1fcfcee909aa1e0668c48b4bcaac1e19f751339d06438629792edf0e16e1637f4f97d8e69dec1841430bbacaf55de86c2f4 SHA512 dbf2d3b7ff80fe5ec410ce3dd8aa3ae3633d98611e053e7d7178d197669364043d9df558a9f4c3e5ba19958a4d951cb04d47da4c2e6e60c063254dbc81d85f59
-EBUILD libchewing-9999.ebuild 1126 BLAKE2B 4e5e2f52f0794e5d411be7b0fcbe28a8e1fc8abfa08e79d57554cfe2f82233072036239ec651bc53ce0cbeaf8ffb6e7c01b6ac41ac02039561afa93e78dea8cd SHA512 b346f7510b75aa0f7e28db5e66b366ae082a5fc4fcdc4b6c21679604c3021de659aa643b7da47e47ad172b11c3009411f51fbcd1179f37e8942fd2896ebe3649
+EBUILD libchewing-0.5.1.ebuild 1313 BLAKE2B b6790434e94f5e82811dfc421c00e23199fe6e6748bebd53bd370a9bd6a3dbc5747e727036de51134607728e60875f11a1df083b2da3f7224f5031aa32fdca0f SHA512 da6256d7a243a8cfb5fcd019deb9dea17fed8cdc54c0c9849efcf5e16cf8b99d3fa3587a9dbfcd22c0d11e3b0a62d6a852c8a3e6957304cbfced95195062fccb
+EBUILD libchewing-9999.ebuild 1282 BLAKE2B 2f634e9bbfbd708e33a907639066f90dacf2e4d68463642223f92fadee8e43940d8a738771dba712d0326fd0689fcef313b3cafe0819fbfe799ea4c31cf6dbf0 SHA512 d31d22a67c4a7f0f5690313b11792fee0e0e3489131361ecacbd0b9e9992f19e3031de13dae03c8d0864c6aeda710663d1f8ad4f48be9b09321481961afb1f06
 MISC metadata.xml 327 BLAKE2B 3f9b234590aef775dc0ae62f4eef42cc1e363e04c3dabc2464eee9cfb44ec0b1fc4fe9b233f781c15784b3a699537d67e884ee7f1648a62b3a863480a5e831cd SHA512 c9ab28ab34d940a30e97b989fd96904d2e0816e4b1bc5b843b082d64d6cd476335d9402640e71f2cf8f57f44dcae9af66d5e07075b189fa74f21faba40d819e3
diff --git a/app-i18n/libchewing/files/libchewing-0.5.1-autoconf-archive-2019.01.06.patch b/app-i18n/libchewing/files/libchewing-0.5.1-autoconf-archive-2019.01.06.patch
new file mode 100644
index 000000000000..5db3d0a23ab0
--- /dev/null
+++ b/app-i18n/libchewing/files/libchewing-0.5.1-autoconf-archive-2019.01.06.patch
@@ -0,0 +1,809 @@
+https://github.com/chewing/libchewing/issues/308
+
+--- /m4/ax_pthread.m4
++++ /m4/ax_pthread.m4
+@@ -1,5 +1,5 @@
+ # ===========================================================================
+-#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
++#        https://www.gnu.org/software/autoconf-archive/ax_pthread.html
+ # ===========================================================================
+ #
+ # SYNOPSIS
+@@ -19,10 +19,10 @@
+ #   is necessary on AIX to use the special cc_r compiler alias.)
+ #
+ #   NOTE: You are assumed to not only compile your program with these flags,
+-#   but also link it with them as well. e.g. you should link with
++#   but also to link with them as well. For example, you might link with
+ #   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
+ #
+-#   If you are only building threads programs, you may wish to use these
++#   If you are only building threaded programs, you may wish to use these
+ #   variables in your default LIBS, CFLAGS, and CC:
+ #
+ #     LIBS="$PTHREAD_LIBS $LIBS"
+@@ -30,8 +30,8 @@
+ #     CC="$PTHREAD_CC"
+ #
+ #   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
+-#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
+-#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
++#   has a nonstandard name, this macro defines PTHREAD_CREATE_JOINABLE to
++#   that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+ #
+ #   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
+ #   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
+@@ -67,7 +67,7 @@
+ #   Public License for more details.
+ #
+ #   You should have received a copy of the GNU General Public License along
+-#   with this program. If not, see <http://www.gnu.org/licenses/>.
++#   with this program. If not, see <https://www.gnu.org/licenses/>.
+ #
+ #   As a special exception, the respective Autoconf Macro's copyright owner
+ #   gives unlimited permission to copy, distribute and modify the configure
+@@ -82,35 +82,40 @@
+ #   modified version of the Autoconf Macro, you may extend this special
+ #   exception to the GPL to apply to your modified version as well.
+ 
+-#serial 20
++#serial 24
+ 
+ AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
+ AC_DEFUN([AX_PTHREAD], [
+ AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([AC_PROG_CC])
++AC_REQUIRE([AC_PROG_SED])
+ AC_LANG_PUSH([C])
+ ax_pthread_ok=no
+ 
+ # We used to check for pthread.h first, but this fails if pthread.h
+-# requires special compiler flags (e.g. on True64 or Sequent).
++# requires special compiler flags (e.g. on Tru64 or Sequent).
+ # It gets checked for in the link test anyway.
+ 
+ # First of all, check if the user has set any of the PTHREAD_LIBS,
+ # etcetera environment variables, and if threads linking works using
+ # them:
+-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+-        save_CFLAGS="$CFLAGS"
++if test "x$PTHREAD_CFLAGS$PTHREAD_LIBS" != "x"; then
++        ax_pthread_save_CC="$CC"
++        ax_pthread_save_CFLAGS="$CFLAGS"
++        ax_pthread_save_LIBS="$LIBS"
++        AS_IF([test "x$PTHREAD_CC" != "x"], [CC="$PTHREAD_CC"])
+         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+-        save_LIBS="$LIBS"
+         LIBS="$PTHREAD_LIBS $LIBS"
+-        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+-        AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes)
+-        AC_MSG_RESULT($ax_pthread_ok)
+-        if test x"$ax_pthread_ok" = xno; then
++        AC_MSG_CHECKING([for pthread_join using $CC $PTHREAD_CFLAGS $PTHREAD_LIBS])
++        AC_LINK_IFELSE([AC_LANG_CALL([], [pthread_join])], [ax_pthread_ok=yes])
++        AC_MSG_RESULT([$ax_pthread_ok])
++        if test "x$ax_pthread_ok" = "xno"; then
+                 PTHREAD_LIBS=""
+                 PTHREAD_CFLAGS=""
+         fi
+-        LIBS="$save_LIBS"
+-        CFLAGS="$save_CFLAGS"
++        CC="$ax_pthread_save_CC"
++        CFLAGS="$ax_pthread_save_CFLAGS"
++        LIBS="$ax_pthread_save_LIBS"
+ fi
+ 
+ # We must check for the threads library under a number of different
+@@ -123,7 +128,7 @@
+ # which indicates that we try without any flags at all, and "pthread-config"
+ # which is a program returning the flags for the Pth emulation library.
+ 
+-ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
++ax_pthread_flags="pthreads none -Kthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+ 
+ # The ordering *is* (sometimes) important.  Some notes on the
+ # individual items follow:
+@@ -132,68 +137,225 @@
+ # none: in case threads are in libc; should be tried before -Kthread and
+ #       other compiler flags to prevent continual compiler warnings
+ # -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+-# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+-# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+-# -pthreads: Solaris/gcc
+-# -mthreads: Mingw32/gcc, Lynx/gcc
++# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads), Tru64
++#           (Note: HP C rejects this with "bad form for `-t' option")
++# -pthreads: Solaris/gcc (Note: HP C also rejects)
+ # -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+-#      doesn't hurt to check since this sometimes defines pthreads too;
+-#      also defines -D_REENTRANT)
+-#      ... -mt is also the pthreads flag for HP/aCC
++#      doesn't hurt to check since this sometimes defines pthreads and
++#      -D_REENTRANT too), HP C (must be checked before -lpthread, which
++#      is present but should not be used directly; and before -mthreads,
++#      because the compiler interprets this as "-mt" + "-hreads")
++# -mthreads: Mingw32/gcc, Lynx/gcc
+ # pthread: Linux, etcetera
+ # --thread-safe: KAI C++
+ # pthread-config: use pthread-config program (for GNU Pth library)
+ 
+-case ${host_os} in
++case $host_os in
++
++        freebsd*)
++
++        # -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
++        # lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
++
++        ax_pthread_flags="-kthread lthread $ax_pthread_flags"
++        ;;
++
++        hpux*)
++
++        # From the cc(1) man page: "[-mt] Sets various -D flags to enable
++        # multi-threading and also sets -lpthread."
++
++        ax_pthread_flags="-mt -pthread pthread $ax_pthread_flags"
++        ;;
++
++        openedition*)
++
++        # IBM z/OS requires a feature-test macro to be defined in order to
++        # enable POSIX threads at all, so give the user a hint if this is
++        # not set. (We don't define these ourselves, as they can affect
++        # other portions of the system API in unpredictable ways.)
++
++        AC_EGREP_CPP([AX_PTHREAD_ZOS_MISSING],
++            [
++#            if !defined(_OPEN_THREADS) && !defined(_UNIX03_THREADS)
++             AX_PTHREAD_ZOS_MISSING
++#            endif
++            ],
++            [AC_MSG_WARN([IBM z/OS requires -D_OPEN_THREADS or -D_UNIX03_THREADS to enable pthreads support.])])
++        ;;
++
+         solaris*)
+ 
+         # On Solaris (at least, for some versions), libc contains stubbed
+         # (non-functional) versions of the pthreads routines, so link-based
+-        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
+-        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+-        # a function called by this macro, so we could check for that, but
+-        # who knows whether they'll stub that too in a future libc.)  So,
+-        # we'll just look for -pthreads and -lpthread first:
++        # tests will erroneously succeed. (N.B.: The stubs are missing
++        # pthread_cleanup_push, or rather a function called by this macro,
++        # so we could check for that, but who knows whether they'll stub
++        # that too in a future libc.)  So we'll check first for the
++        # standard Solaris way of linking pthreads (-mt -lpthread).
++
++        ax_pthread_flags="-mt,pthread pthread $ax_pthread_flags"
++        ;;
++esac
++
++# GCC generally uses -pthread, or -pthreads on some platforms (e.g. SPARC)
+ 
+-        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
++AS_IF([test "x$GCC" = "xyes"],
++      [ax_pthread_flags="-pthread -pthreads $ax_pthread_flags"])
++
++# The presence of a feature test macro requesting re-entrant function
++# definitions is, on some systems, a strong hint that pthreads support is
++# correctly enabled
++
++case $host_os in
++        darwin* | hpux* | linux* | osf* | solaris*)
++        ax_pthread_check_macro="_REENTRANT"
+         ;;
+ 
+-        darwin*)
+-        ax_pthread_flags="-pthread $ax_pthread_flags"
++        aix*)
++        ax_pthread_check_macro="_THREAD_SAFE"
++        ;;
++
++        *)
++        ax_pthread_check_macro="--"
+         ;;
+ esac
++AS_IF([test "x$ax_pthread_check_macro" = "x--"],
++      [ax_pthread_check_cond=0],
++      [ax_pthread_check_cond="!defined($ax_pthread_check_macro)"])
++
++# Are we compiling with Clang?
++
++AC_CACHE_CHECK([whether $CC is Clang],
++    [ax_cv_PTHREAD_CLANG],
++    [ax_cv_PTHREAD_CLANG=no
++     # Note that Autoconf sets GCC=yes for Clang as well as GCC
++     if test "x$GCC" = "xyes"; then
++        AC_EGREP_CPP([AX_PTHREAD_CC_IS_CLANG],
++            [/* Note: Clang 2.7 lacks __clang_[a-z]+__ */
++#            if defined(__clang__) && defined(__llvm__)
++             AX_PTHREAD_CC_IS_CLANG
++#            endif
++            ],
++            [ax_cv_PTHREAD_CLANG=yes])
++     fi
++    ])
++ax_pthread_clang="$ax_cv_PTHREAD_CLANG"
++
++ax_pthread_clang_warning=no
++
++# Clang needs special handling, because older versions handle the -pthread
++# option in a rather... idiosyncratic way
++
++if test "x$ax_pthread_clang" = "xyes"; then
++
++        # Clang takes -pthread; it has never supported any other flag
++
++        # (Note 1: This will need to be revisited if a system that Clang
++        # supports has POSIX threads in a separate library.  This tends not
++        # to be the way of modern systems, but it's conceivable.)
++
++        # (Note 2: On some systems, notably Darwin, -pthread is not needed
++        # to get POSIX threads support; the API is always present and
++        # active.  We could reasonably leave PTHREAD_CFLAGS empty.  But
++        # -pthread does define _REENTRANT, and while the Darwin headers
++        # ignore this macro, third-party headers might not.)
++
++        PTHREAD_CFLAGS="-pthread"
++        PTHREAD_LIBS=
++
++        ax_pthread_ok=yes
++
++        # However, older versions of Clang make a point of warning the user
++        # that, in an invocation where only linking and no compilation is
++        # taking place, the -pthread option has no effect ("argument unused
++        # during compilation").  They expect -pthread to be passed in only
++        # when source code is being compiled.
++        #
++        # Problem is, this is at odds with the way Automake and most other
++        # C build frameworks function, which is that the same flags used in
++        # compilation (CFLAGS) are also used in linking.  Many systems
++        # supported by AX_PTHREAD require exactly this for POSIX threads
++        # support, and in fact it is often not straightforward to specify a
++        # flag that is used only in the compilation phase and not in
++        # linking.  Such a scenario is extremely rare in practice.
++        #
++        # Even though use of the -pthread flag in linking would only print
++        # a warning, this can be a nuisance for well-run software projects
++        # that build with -Werror.  So if the active version of Clang has
++        # this misfeature, we search for an option to squash it.
++
++        AC_CACHE_CHECK([whether Clang needs flag to prevent "argument unused" warning when linking with -pthread],
++            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG],
++            [ax_cv_PTHREAD_CLANG_NO_WARN_FLAG=unknown
++             # Create an alternate version of $ac_link that compiles and
++             # links in two steps (.c -> .o, .o -> exe) instead of one
++             # (.c -> exe), because the warning occurs only in the second
++             # step
++             ax_pthread_save_ac_link="$ac_link"
++             ax_pthread_sed='s/conftest\.\$ac_ext/conftest.$ac_objext/g'
++             ax_pthread_link_step=`$as_echo "$ac_link" | sed "$ax_pthread_sed"`
++             ax_pthread_2step_ac_link="($ac_compile) && (echo ==== >&5) && ($ax_pthread_link_step)"
++             ax_pthread_save_CFLAGS="$CFLAGS"
++             for ax_pthread_try in '' -Qunused-arguments -Wno-unused-command-line-argument unknown; do
++                AS_IF([test "x$ax_pthread_try" = "xunknown"], [break])
++                CFLAGS="-Werror -Wunknown-warning-option $ax_pthread_try -pthread $ax_pthread_save_CFLAGS"
++                ac_link="$ax_pthread_save_ac_link"
++                AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
++                    [ac_link="$ax_pthread_2step_ac_link"
++                     AC_LINK_IFELSE([AC_LANG_SOURCE([[int main(void){return 0;}]])],
++                         [break])
++                    ])
++             done
++             ac_link="$ax_pthread_save_ac_link"
++             CFLAGS="$ax_pthread_save_CFLAGS"
++             AS_IF([test "x$ax_pthread_try" = "x"], [ax_pthread_try=no])
++             ax_cv_PTHREAD_CLANG_NO_WARN_FLAG="$ax_pthread_try"
++            ])
++
++        case "$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG" in
++                no | unknown) ;;
++                *) PTHREAD_CFLAGS="$ax_cv_PTHREAD_CLANG_NO_WARN_FLAG $PTHREAD_CFLAGS" ;;
++        esac
++
++fi # $ax_pthread_clang = yes
+ 
+-if test x"$ax_pthread_ok" = xno; then
+-for flag in $ax_pthread_flags; do
++if test "x$ax_pthread_ok" = "xno"; then
++for ax_pthread_try_flag in $ax_pthread_flags; do
+ 
+-        case $flag in
++        case $ax_pthread_try_flag in
+                 none)
+                 AC_MSG_CHECKING([whether pthreads work without any flags])
+                 ;;
+ 
++                -mt,pthread)
++                AC_MSG_CHECKING([whether pthreads work with -mt -lpthread])
++                PTHREAD_CFLAGS="-mt"
++                PTHREAD_LIBS="-lpthread"
++                ;;
++
+                 -*)
+-                AC_MSG_CHECKING([whether pthreads work with $flag])
+-                PTHREAD_CFLAGS="$flag"
++                AC_MSG_CHECKING([whether pthreads work with $ax_pthread_try_flag])
++                PTHREAD_CFLAGS="$ax_pthread_try_flag"
+                 ;;
+ 
+                 pthread-config)
+-                AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no)
+-                if test x"$ax_pthread_config" = xno; then continue; fi
++                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
++                AS_IF([test "x$ax_pthread_config" = "xno"], [continue])
+                 PTHREAD_CFLAGS="`pthread-config --cflags`"
+                 PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+                 ;;
+ 
+                 *)
+-                AC_MSG_CHECKING([for the pthreads library -l$flag])
+-                PTHREAD_LIBS="-l$flag"
++                AC_MSG_CHECKING([for the pthreads library -l$ax_pthread_try_flag])
++                PTHREAD_LIBS="-l$ax_pthread_try_flag"
+                 ;;
+         esac
+ 
+-        save_LIBS="$LIBS"
+-        save_CFLAGS="$CFLAGS"
+-        LIBS="$PTHREAD_LIBS $LIBS"
++        ax_pthread_save_CFLAGS="$CFLAGS"
++        ax_pthread_save_LIBS="$LIBS"
+         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++        LIBS="$PTHREAD_LIBS $LIBS"
+ 
+         # Check for various functions.  We must include pthread.h,
+         # since some functions may be macros.  (On the Sequent, we
+@@ -204,7 +366,11 @@
+         # pthread_cleanup_push because it is one of the few pthread
+         # functions on Solaris that doesn't have a non-functional libc stub.
+         # We try pthread_create on general principles.
++
+         AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
++#                       if $ax_pthread_check_cond
++#                        error "$ax_pthread_check_macro must be defined"
++#                       endif
+                         static void routine(void *a) { a = 0; }
+                         static void *start_routine(void *a) { return a; }],
+                        [pthread_t th; pthread_attr_t attr;
+@@ -213,16 +379,14 @@
+                         pthread_attr_init(&attr);
+                         pthread_cleanup_push(routine, 0);
+                         pthread_cleanup_pop(0) /* ; */])],
+-                [ax_pthread_ok=yes],
+-                [])
++            [ax_pthread_ok=yes],
++            [])
+ 
+-        LIBS="$save_LIBS"
+-        CFLAGS="$save_CFLAGS"
++        CFLAGS="$ax_pthread_save_CFLAGS"
++        LIBS="$ax_pthread_save_LIBS"
+ 
+-        AC_MSG_RESULT($ax_pthread_ok)
+-        if test "x$ax_pthread_ok" = xyes; then
+-                break;
+-        fi
++        AC_MSG_RESULT([$ax_pthread_ok])
++        AS_IF([test "x$ax_pthread_ok" = "xyes"], [break])
+ 
+         PTHREAD_LIBS=""
+         PTHREAD_CFLAGS=""
+@@ -230,70 +394,74 @@
+ fi
+ 
+ # Various other checks:
+-if test "x$ax_pthread_ok" = xyes; then
+-        save_LIBS="$LIBS"
+-        LIBS="$PTHREAD_LIBS $LIBS"
+-        save_CFLAGS="$CFLAGS"
++if test "x$ax_pthread_ok" = "xyes"; then
++        ax_pthread_save_CFLAGS="$CFLAGS"
++        ax_pthread_save_LIBS="$LIBS"
+         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
++        LIBS="$PTHREAD_LIBS $LIBS"
+ 
+         # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+-        AC_MSG_CHECKING([for joinable pthread attribute])
+-        attr_name=unknown
+-        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+-            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+-                           [int attr = $attr; return attr /* ; */])],
+-                [attr_name=$attr; break],
+-                [])
+-        done
+-        AC_MSG_RESULT($attr_name)
+-        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+-            AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
+-                               [Define to necessary symbol if this constant
+-                                uses a non-standard name on your system.])
+-        fi
+-
+-        AC_MSG_CHECKING([if more special flags are required for pthreads])
+-        flag=no
+-        case ${host_os} in
+-            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
+-            osf* | hpux*) flag="-D_REENTRANT";;
+-            solaris*)
+-            if test "$GCC" = "yes"; then
+-                flag="-D_REENTRANT"
+-            else
+-                flag="-mt -D_REENTRANT"
+-            fi
+-            ;;
+-        esac
+-        AC_MSG_RESULT(${flag})
+-        if test "x$flag" != xno; then
+-            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+-        fi
++        AC_CACHE_CHECK([for joinable pthread attribute],
++            [ax_cv_PTHREAD_JOINABLE_ATTR],
++            [ax_cv_PTHREAD_JOINABLE_ATTR=unknown
++             for ax_pthread_attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
++                 AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
++                                                 [int attr = $ax_pthread_attr; return attr /* ; */])],
++                                [ax_cv_PTHREAD_JOINABLE_ATTR=$ax_pthread_attr; break],
++                                [])
++             done
++            ])
++        AS_IF([test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xunknown" && \
++               test "x$ax_cv_PTHREAD_JOINABLE_ATTR" != "xPTHREAD_CREATE_JOINABLE" && \
++               test "x$ax_pthread_joinable_attr_defined" != "xyes"],
++              [AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE],
++                                  [$ax_cv_PTHREAD_JOINABLE_ATTR],
++                                  [Define to necessary symbol if this constant
++                                   uses a non-standard name on your system.])
++               ax_pthread_joinable_attr_defined=yes
++              ])
++
++        AC_CACHE_CHECK([whether more special flags are required for pthreads],
++            [ax_cv_PTHREAD_SPECIAL_FLAGS],
++            [ax_cv_PTHREAD_SPECIAL_FLAGS=no
++             case $host_os in
++             solaris*)
++             ax_cv_PTHREAD_SPECIAL_FLAGS="-D_POSIX_PTHREAD_SEMANTICS"
++             ;;
++             esac
++            ])
++        AS_IF([test "x$ax_cv_PTHREAD_SPECIAL_FLAGS" != "xno" && \
++               test "x$ax_pthread_special_flags_added" != "xyes"],
++              [PTHREAD_CFLAGS="$ax_cv_PTHREAD_SPECIAL_FLAGS $PTHREAD_CFLAGS"
++               ax_pthread_special_flags_added=yes])
+ 
+         AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
+-            ax_cv_PTHREAD_PRIO_INHERIT, [
+-                AC_LINK_IFELSE([
+-                    AC_LANG_PROGRAM([[#include <pthread.h>]], [[int i = PTHREAD_PRIO_INHERIT;]])],
+-                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
+-                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
++            [ax_cv_PTHREAD_PRIO_INHERIT],
++            [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
++                                             [[int i = PTHREAD_PRIO_INHERIT;]])],
++                            [ax_cv_PTHREAD_PRIO_INHERIT=yes],
++                            [ax_cv_PTHREAD_PRIO_INHERIT=no])
+             ])
+-        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
+-            AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.]))
++        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes" && \
++               test "x$ax_pthread_prio_inherit_defined" != "xyes"],
++              [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])
++               ax_pthread_prio_inherit_defined=yes
++              ])
+ 
+-        LIBS="$save_LIBS"
+-        CFLAGS="$save_CFLAGS"
++        CFLAGS="$ax_pthread_save_CFLAGS"
++        LIBS="$ax_pthread_save_LIBS"
+ 
+         # More AIX lossage: compile with *_r variant
+-        if test "x$GCC" != xyes; then
++        if test "x$GCC" != "xyes"; then
+             case $host_os in
+                 aix*)
+                 AS_CASE(["x/$CC"],
+-                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
+-                  [#handle absolute path differently from PATH based program lookup
+-                   AS_CASE(["x$CC"],
+-                     [x/*],
+-                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
+-                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
++                    [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
++                    [#handle absolute path differently from PATH based program lookup
++                     AS_CASE(["x$CC"],
++                         [x/*],
++                         [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
++                         [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
+                 ;;
+             esac
+         fi
+@@ -301,13 +469,13 @@
+ 
+ test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+ 
+-AC_SUBST(PTHREAD_LIBS)
+-AC_SUBST(PTHREAD_CFLAGS)
+-AC_SUBST(PTHREAD_CC)
++AC_SUBST([PTHREAD_LIBS])
++AC_SUBST([PTHREAD_CFLAGS])
++AC_SUBST([PTHREAD_CC])
+ 
+ # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+-if test x"$ax_pthread_ok" = xyes; then
+-        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
++if test "x$ax_pthread_ok" = "xyes"; then
++        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
+         :
+ else
+         ax_pthread_ok=no
+--- /m4/ax_with_curses.m4
++++ /m4/ax_with_curses.m4
+@@ -1,5 +1,5 @@
+ # ===========================================================================
+-#      http://www.gnu.org/software/autoconf-archive/ax_with_curses.html
++#      https://www.gnu.org/software/autoconf-archive/ax_with_curses.html
+ # ===========================================================================
+ #
+ # SYNOPSIS
+@@ -12,7 +12,9 @@
+ #   present, along with the associated header file.  The NcursesW
+ #   (wide-character) library is searched for first, followed by Ncurses,
+ #   then the system-default plain Curses.  The first library found is the
+-#   one returned.
++#   one returned. Finding libraries will first be attempted by using
++#   pkg-config, and should the pkg-config files not be available, will
++#   fallback to combinations of known flags itself.
+ #
+ #   The following options are understood: --with-ncursesw, --with-ncurses,
+ #   --without-ncursesw, --without-ncurses.  The "--with" options force the
+@@ -52,23 +54,29 @@
+ #
+ #   (These preprocessor symbols are discussed later in this document.)
+ #
+-#   The following output variable is defined by this macro; it is precious
+-#   and may be overridden on the ./configure command line:
++#   The following output variables are defined by this macro; they are
++#   precious and may be overridden on the ./configure command line:
+ #
+-#     CURSES_LIB  - library to add to xxx_LDADD
++#     CURSES_LIBS  - library to add to xxx_LDADD
++#     CURSES_CFLAGS  - include paths to add to xxx_CPPFLAGS
+ #
+-#   The library listed in CURSES_LIB is NOT added to LIBS by default. You
+-#   need to add CURSES_LIB to the appropriate xxx_LDADD line in your
+-#   Makefile.am.  For example:
+-#
+-#     prog_LDADD = @CURSES_LIB@
+-#
+-#   If CURSES_LIB is set on the configure command line (such as by running
+-#   "./configure CURSES_LIB=-lmycurses"), then the only header searched for
+-#   is <curses.h>.  The user may use the CPPFLAGS precious variable to
+-#   override the standard #include search path.  If the user needs to
+-#   specify an alternative path for a library (such as for a non-standard
+-#   NcurseW), the user should use the LDFLAGS variable.
++#   In previous versions of this macro, the flags CURSES_LIB and
++#   CURSES_CPPFLAGS were defined. These have been renamed, in keeping with
++#   AX_WITH_CURSES's close bigger brother, PKG_CHECK_MODULES, which should
++#   eventually supersede the use of AX_WITH_CURSES. Neither the library
++#   listed in CURSES_LIBS, nor the flags in CURSES_CFLAGS are added to LIBS,
++#   respectively CPPFLAGS, by default. You need to add both to the
++#   appropriate xxx_LDADD/xxx_CPPFLAGS line in your Makefile.am. For
++#   example:
++#
++#     prog_LDADD = @CURSES_LIBS@
++#     prog_CPPFLAGS = @CURSES_CFLAGS@
++#
++#   If CURSES_LIBS is set on the configure command line (such as by running
++#   "./configure CURSES_LIBS=-lmycurses"), then the only header searched for
++#   is <curses.h>. If the user needs to specify an alternative path for a
++#   library (such as for a non-standard NcurseW), the user should use the
++#   LDFLAGS variable.
+ #
+ #   The following shell variables may be defined by this macro:
+ #
+@@ -88,7 +96,7 @@
+ #
+ #     AX_WITH_CURSES
+ #     if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
+-#         AX_MSG_ERROR([requires either NcursesW or Ncurses library])
++#         AC_MSG_ERROR([requires either NcursesW or Ncurses library])
+ #     fi
+ #
+ #   If any Curses library will do (but one must be present and must support
+@@ -167,7 +175,7 @@
+ #   Public License for more details.
+ #
+ #   You should have received a copy of the GNU General Public License along
+-#   with this program. If not, see <http://www.gnu.org/licenses/>.
++#   with this program. If not, see <https://www.gnu.org/licenses/>.
+ #
+ #   As a special exception, the respective Autoconf Macro's copyright owner
+ #   gives unlimited permission to copy, distribute and modify the configure
+@@ -182,11 +190,66 @@
+ #   modified version of the Autoconf Macro, you may extend this special
+ #   exception to the GPL to apply to your modified version as well.
+ 
+-#serial 13
++#serial 18
++
++# internal function to factorize common code that is used by both ncurses
++# and ncursesw
++AC_DEFUN([_FIND_CURSES_FLAGS], [
++    AC_MSG_CHECKING([for $1 via pkg-config])
++
++    AX_REQUIRE_DEFINED([PKG_CHECK_EXISTS])
++    _PKG_CONFIG([_ax_cv_$1_libs], [libs], [$1])
++    _PKG_CONFIG([_ax_cv_$1_cppflags], [cflags], [$1])
++
++    AS_IF([test "x$pkg_failed" = "xyes" || test "x$pkg_failed" = "xuntried"],[
++        AC_MSG_RESULT([no])
++        # No suitable .pc file found, have to find flags via fallback
++        AC_CACHE_CHECK([for $1 via fallback], [ax_cv_$1], [
++            AS_ECHO()
++            pkg_cv__ax_cv_$1_libs="-l$1"
++            pkg_cv__ax_cv_$1_cppflags="-D_GNU_SOURCE $CURSES_CFLAGS"
++            LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs"
++            CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_$1_cppflags"
++
++            AC_MSG_CHECKING([for initscr() with $pkg_cv__ax_cv_$1_libs])
++            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
++                [
++                    AC_MSG_RESULT([yes])
++                    AC_MSG_CHECKING([for nodelay() with $pkg_cv__ax_cv_$1_libs])
++                    AC_LINK_IFELSE([AC_LANG_CALL([], [nodelay])],[
++                        ax_cv_$1=yes
++                        ],[
++                        AC_MSG_RESULT([no])
++                        m4_if(
++                            [$1],[ncursesw],[pkg_cv__ax_cv_$1_libs="$pkg_cv__ax_cv_$1_libs -ltinfow"],
++                            [$1],[ncurses],[pkg_cv__ax_cv_$1_libs="$pkg_cv__ax_cv_$1_libs -ltinfo"]
++                        )
++                        LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs"
++
++                        AC_MSG_CHECKING([for nodelay() with $pkg_cv__ax_cv_$1_libs])
++                        AC_LINK_IFELSE([AC_LANG_CALL([], [nodelay])],[
++                            ax_cv_$1=yes
++                            ],[
++                            ax_cv_$1=no
++                        ])
++                    ])
++                ],[
++                    ax_cv_$1=no
++            ])
++        ])
++        ],[
++        AC_MSG_RESULT([yes])
++        # Found .pc file, using its information
++        LIBS="$ax_saved_LIBS $pkg_cv__ax_cv_$1_libs"
++        CPPFLAGS="$ax_saved_CPPFLAGS $pkg_cv__ax_cv_$1_cppflags"
++        ax_cv_$1=yes
++    ])
++])
+ 
+ AU_ALIAS([MP_WITH_CURSES], [AX_WITH_CURSES])
+ AC_DEFUN([AX_WITH_CURSES], [
+-    AC_ARG_VAR([CURSES_LIB], [linker library for Curses, e.g. -lcurses])
++    AC_ARG_VAR([CURSES_LIBS], [linker library for Curses, e.g. -lcurses])
++    AC_ARG_VAR([CURSES_CFLAGS], [preprocessor flags for Curses, e.g. -I/usr/include/ncursesw])
+     AC_ARG_WITH([ncurses], [AS_HELP_STRING([--with-ncurses],
+         [force the use of Ncurses or NcursesW])],
+         [], [with_ncurses=check])
+@@ -195,20 +258,17 @@
+         [], [with_ncursesw=check])
+ 
+     ax_saved_LIBS=$LIBS
++    ax_saved_CPPFLAGS=$CPPFLAGS
++
+     AS_IF([test "x$with_ncurses" = xyes || test "x$with_ncursesw" = xyes],
+         [ax_with_plaincurses=no], [ax_with_plaincurses=check])
+ 
+     ax_cv_curses_which=no
+ 
+     # Test for NcursesW
++    AS_IF([test "x$CURSES_LIBS" = x && test "x$with_ncursesw" != xno], [
++        _FIND_CURSES_FLAGS([ncursesw])
+ 
+-    AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncursesw" != xno], [
+-        LIBS="$ax_saved_LIBS -lncursesw"
+-
+-        AC_CACHE_CHECK([for NcursesW wide-character library], [ax_cv_ncursesw], [
+-            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
+-                [ax_cv_ncursesw=yes], [ax_cv_ncursesw=no])
+-        ])
+         AS_IF([test "x$ax_cv_ncursesw" = xno && test "x$with_ncursesw" = xyes], [
+             AC_MSG_ERROR([--with-ncursesw specified but could not find NcursesW library])
+         ])
+@@ -216,7 +276,8 @@
+         AS_IF([test "x$ax_cv_ncursesw" = xyes], [
+             ax_cv_curses=yes
+             ax_cv_curses_which=ncursesw
+-            CURSES_LIB="-lncursesw"
++            CURSES_LIBS="$pkg_cv__ax_cv_ncursesw_libs"
++            CURSES_CFLAGS="$pkg_cv__ax_cv_ncursesw_cppflags"
+             AC_DEFINE([HAVE_NCURSESW], [1], [Define to 1 if the NcursesW library is present])
+             AC_DEFINE([HAVE_CURSES],   [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
+ 
+@@ -318,16 +379,13 @@
+             ])
+         ])
+     ])
++    unset pkg_cv__ax_cv_ncursesw_libs
++    unset pkg_cv__ax_cv_ncursesw_cppflags
+ 
+     # Test for Ncurses
++    AS_IF([test "x$CURSES_LIBS" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [
++        _FIND_CURSES_FLAGS([ncurses])
+ 
+-    AS_IF([test "x$CURSES_LIB" = x && test "x$with_ncurses" != xno && test "x$ax_cv_curses_which" = xno], [
+-        LIBS="$ax_saved_LIBS -lncurses"
+-
+-        AC_CACHE_CHECK([for Ncurses library], [ax_cv_ncurses], [
+-            AC_LINK_IFELSE([AC_LANG_CALL([], [initscr])],
+-                [ax_cv_ncurses=yes], [ax_cv_ncurses=no])
+-        ])
+         AS_IF([test "x$ax_cv_ncurses" = xno && test "x$with_ncurses" = xyes], [
+             AC_MSG_ERROR([--with-ncurses specified but could not find Ncurses library])
+         ])
+@@ -335,7 +393,8 @@
+         AS_IF([test "x$ax_cv_ncurses" = xyes], [
+             ax_cv_curses=yes
+             ax_cv_curses_which=ncurses
+-            CURSES_LIB="-lncurses"
++            CURSES_LIBS="$pkg_cv__ax_cv_ncurses_libs"
++            CURSES_CFLAGS="$pkg_cv__ax_cv_ncurses_cppflags"
+             AC_DEFINE([HAVE_NCURSES], [1], [Define to 1 if the Ncurses library is present])
+             AC_DEFINE([HAVE_CURSES],  [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
+ 
+@@ -390,12 +449,13 @@
+             ])
+         ])
+     ])
++    unset pkg_cv__ax_cv_ncurses_libs
++    unset pkg_cv__ax_cv_ncurses_cppflags
+ 
+-    # Test for plain Curses (or if CURSES_LIB was set by user)
+-
++    # Test for plain Curses (or if CURSES_LIBS was set by user)
+     AS_IF([test "x$with_plaincurses" != xno && test "x$ax_cv_curses_which" = xno], [
+-        AS_IF([test "x$CURSES_LIB" != x], [
+-            LIBS="$ax_saved_LIBS $CURSES_LIB"
++        AS_IF([test "x$CURSES_LIBS" != x], [
++            LIBS="$ax_saved_LIBS $CURSES_LIBS"
+         ], [
+             LIBS="$ax_saved_LIBS -lcurses"
+         ])
+@@ -408,8 +468,8 @@
+         AS_IF([test "x$ax_cv_plaincurses" = xyes], [
+             ax_cv_curses=yes
+             ax_cv_curses_which=plaincurses
+-            AS_IF([test "x$CURSES_LIB" = x], [
+-                CURSES_LIB="-lcurses"
++            AS_IF([test "x$CURSES_LIBS" = x], [
++                CURSES_LIBS="-lcurses"
+             ])
+             AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present])
+ 
+@@ -515,4 +575,8 @@
+     AS_IF([test "x$ax_cv_curses_obsolete" != xyes], [ax_cv_curses_obsolete=no])
+ 
+     LIBS=$ax_saved_LIBS
++    CPPFLAGS=$ax_saved_CPPFLAGS
++
++    unset ax_saved_LIBS
++    unset ax_saved_CPPFLAGS
+ ])dnl
+--- /test/Makefile.am
++++ /test/Makefile.am
+@@ -65,7 +65,8 @@
+ if ENABLE_TEXT_UI
+ TEXT_UI_BIN=genkeystroke
+ genkeystroke_SOURCES = genkeystroke.c
+-genkeystroke_LDADD = $(LDADD) @CURSES_LIB@
++genkeystroke_CPPFLAGS = $(AM_CPPFLAGS) @CURSES_CFLAGS@
++genkeystroke_LDADD = $(LDADD) @CURSES_LIBS@
+ else
+ TEXT_UI_BIN=
+ endif
diff --git a/app-i18n/libchewing/libchewing-0.5.1.ebuild b/app-i18n/libchewing/libchewing-0.5.1.ebuild
index 4a2f116c20e0..1c78e61d60e1 100644
--- a/app-i18n/libchewing/libchewing-0.5.1.ebuild
+++ b/app-i18n/libchewing/libchewing-0.5.1.ebuild
@@ -3,8 +3,11 @@
 
 EAPI="7"
 
+inherit autotools
+
 if [[ "${PV}" == "9999" ]]; then
-	inherit autotools git-r3
+#	inherit autotools git-r3
+	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/chewing/libchewing"
 fi
@@ -27,12 +30,17 @@ RDEPEND="dev-db/sqlite:3"
 DEPEND="${RDEPEND}
 	test? ( sys-libs/ncurses[unicode] )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.1-autoconf-archive-2019.01.06.patch"
+)
+
 src_prepare() {
 	default
+	eautoreconf
 
-	if [[ "${PV}" == "9999" ]]; then
-		eautoreconf
-	fi
+#	if [[ "${PV}" == "9999" ]]; then
+#		eautoreconf
+#	fi
 }
 
 src_configure() {
@@ -48,6 +56,8 @@ src_test() {
 
 src_install() {
 	default
-	find "${D}" -name "*.la" -delete || die
-	use static-libs || find "${D}" -name "*.a" -delete || die
+	find "${D}" -name "*.la" -type f -delete || die
+	if ! use static-libs; then
+		find "${D}" -name "*.a" -type f -delete || die
+	fi
 }
diff --git a/app-i18n/libchewing/libchewing-9999.ebuild b/app-i18n/libchewing/libchewing-9999.ebuild
index 9353fc5f3dd0..e059c2147b15 100644
--- a/app-i18n/libchewing/libchewing-9999.ebuild
+++ b/app-i18n/libchewing/libchewing-9999.ebuild
@@ -3,8 +3,11 @@
 
 EAPI="7"
 
+inherit autotools
+
 if [[ "${PV}" == "9999" ]]; then
-	inherit autotools git-r3
+#	inherit autotools git-r3
+	inherit git-r3
 
 	EGIT_REPO_URI="https://github.com/chewing/libchewing"
 fi
@@ -27,12 +30,17 @@ RDEPEND="dev-db/sqlite:3"
 DEPEND="${RDEPEND}
 	test? ( sys-libs/ncurses[unicode] )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.1-autoconf-archive-2019.01.06.patch"
+)
+
 src_prepare() {
 	default
+	eautoreconf
 
-	if [[ "${PV}" == "9999" ]]; then
-		eautoreconf
-	fi
+#	if [[ "${PV}" == "9999" ]]; then
+#		eautoreconf
+#	fi
 }
 
 src_configure() {
@@ -48,6 +56,8 @@ src_test() {
 
 src_install() {
 	default
-	find "${D}" -name "*.la" -delete || die
-	use static-libs || find "${D}" -name "*.a" -delete || die
+	find "${D}" -name "*.la" -type f -delete || die
+	if ! use static-libs; then
+		find "${D}" -name "*.a" -type f -delete || die
+	fi
 }
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index f6be7020f4be..3c48624a82f8 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -1,7 +1,9 @@
 DIST librime-1.2.9.tar.gz 5516609 BLAKE2B 7b05fedb093f7595c7bf7f4893624b35b0cdde1816c9c99f9ed5d408c8fd21d34a361d16b94c43b3e5e23b10945f075711762f08ca30abee35849a332ecfee2d SHA512 2266ef96ad21ec5981b4ca5371d4e16eefed545ffbde07093ae0d0be070a64f9869baa09b6bdcee2522438e08c72a842a7e0b225a6ca1b661708a80cf3aba83a
 DIST librime-1.3.1.tar.gz 8598357 BLAKE2B cd6bc6b63a89f7f11e78ceaf92007c099be34ce38f26d611b67a3d8f868a27a0e4de7b94da44d8483618f37a0c2bcfd3a1bc1c1ecb4f81829f8e12fdd777e283 SHA512 b35d3635fd776ed9be32c0998e4aac441433bc9e624765a57582690108cccf5c3beaedad4f8f1682d99533384cd10996ee8c18fd5adcea70878d6a410124922e
 DIST librime-1.4.0.tar.gz 8609316 BLAKE2B cce58c398057ac82f076e3b9e9a25cd6410e738460bd58277a9e3ed6cd11e80922bbb30e8b42828cdd5dd83f6058794b4b32fedb359315186b018ca88161794d SHA512 da68983638c6f25d994060a607f2ccab8917a71dbf10b9c6f1140c87c9ef4124e29a1d0ef16bbd0edc9a3a22bd5845aa894888d678607db372750f300638f562
-EBUILD librime-1.2.9.ebuild 789 BLAKE2B 7dfe12de3358c792d966dbda125976bf8c49dcd53f277d0d4e6e7ab1e5aa135810685f1586dc26d5faa4920e306d4dc98205f5376c0e6d0713b3c7ef452d5207 SHA512 8cf6bdfdac20eccfc361be603b6e8e170360655898024463e8d29cb1073a8cfa4fd5808492c759ac460ec0e6a0b72368b8c510cca9bc10d9fa5faacc8e05e10b
-EBUILD librime-1.3.1.ebuild 820 BLAKE2B ddaaf7b8d38b2a344043c4582b63c07b85aa7bf540c46a0b83ec3eef2c3cad7d786c7d0ad982c9b2c3cf7df34d0a99b44078d32c5255ebd20eabecff5cf9e519 SHA512 cedf9f7fc5b31468fb4b5ea649d058b9c732de739ae6c546248b8baadf2d23399090568d968473da7511c329a3e9c3ad63cef3c1fb3eeda008bb31789cb36220
-EBUILD librime-1.4.0.ebuild 818 BLAKE2B c099f1c729f570c92c2d059d9d8645a9f67818589f6f5cc2d3c2e8480c265af5c44e9553c7513ee00554a359c3fbcd2dc664d83689ade098a6baa57c2a15a36f SHA512 a1122708179e0cdd0d75d1c3da811711ba93cb79dc24071f787206b031cac83c0b19e66cfdad9aea3e3478905e73970d53d98c4edd8f1e7c7552775a2237b212
+DIST librime-1.5.3.tar.gz 2847083 BLAKE2B 4ffb2c5ddaf52f9c9227fa4ea019ef2965e61139f678798c08ef37dc52b863763651b63ed820caad0de1b06f48ab5c1a7a2682653340d2ae7f5f9eec3cec80b2 SHA512 4d7f6ec43bd5728f59f0b3581bcd8a46128651430b6873017d80659942b8f6aa1a2f25f439ba8fba461fe22acbf701c2da7a786104a2e4852a70a89cdc0452d3
+EBUILD librime-1.2.9.ebuild 822 BLAKE2B efd4b54152a4251ddb8351e6be2387b3671227dd13500a670fb7ee0398e5a5a8a28543bdd29740cb617b911ab870e8fe29ef5abb00ed4400c57aa232379208a2 SHA512 2031060b96288f7e2e146d3f044369911ffb3f0a3df12016583a00f2d80c638fa39e4022ca0dd24da23defb93f63d2b0d06495305459f74db4aa38b28140d597
+EBUILD librime-1.3.1.ebuild 851 BLAKE2B 91a6651e7b7dc00faf653c4ed539174ce3c6efda8e4161c5edb23aeeefbd574f3c8874a7c1ff2a89ab80b9bd61276c810fb9f8ae7a501255b01d51453468a868 SHA512 2048f949b95239924ea40515fdfd7158912b3cae0a158b69031e7f388ed5633c21cb3d9a3ce1d23802c9cf5808db2cf90c7c41f83357962a998535e1c710aabb
+EBUILD librime-1.4.0.ebuild 839 BLAKE2B cccdb15cf60fa3cdb163e0e02210e84855c52d3f8fde58c6ecee1645ff90a0d3711474a088ac9292b56d5b2426f911713a36c0ca5afc1a22f9be72ebf4856467 SHA512 c63a7fd8f6dfb89fcb4566f63efccda29c962e9679aeaa384685822da9f7586ef1e96e04c024bf1c4737e620a18dcd99754ce5d0e41de5b62a60ff77fad71b98
+EBUILD librime-1.5.3.ebuild 1431 BLAKE2B ba8f6993ea9fc606c2d48d3644049604ca3769bbb1be8bad44e0e5222253b20ea99cffe22a9d826e83fee2935c422478a8e219888a39c96a8b50637463e876cc SHA512 8df0bdfe9e473bc1ad1640a210c7fc467a7c813b69aba47d9d16dce46f4ee70c3a63af56a64fb6886fb4134e23ab948f784560d5983334ad5e1b386989e9ff6a
 MISC metadata.xml 532 BLAKE2B 200096c7c818b877dd156ab1456309ae4e42a8bf78075d8aeee30a79f09bbf57c6053a41369102becf87aaf3ea4481a0bf6edf1dee258f650661b61c65a9aaee SHA512 83904c4885a57569f4e74483bd5efed886ca1fd6708c1e7146ce4893bcbdd66efa82dfd4e563c7b888603e23566de21e928772a597dd2e6fc75d00793c788800
diff --git a/app-i18n/librime/librime-1.2.9.ebuild b/app-i18n/librime/librime-1.2.9.ebuild
index 3a095f779484..da4b3ecb895a 100644
--- a/app-i18n/librime/librime-1.2.9.ebuild
+++ b/app-i18n/librime/librime-1.2.9.ebuild
@@ -13,11 +13,12 @@ LICENSE="GPL-3"
 SLOT="0/1"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-i18n/opencc:=
 	dev-cpp/glog:=
 	dev-cpp/yaml-cpp:=
-	dev-libs/boost:=[threads]
+	<dev-libs/boost-1.69:=[threads]
 	dev-libs/leveldb:=
 	dev-libs/marisa:="
 DEPEND="${RDEPEND}
diff --git a/app-i18n/librime/librime-1.3.1.ebuild b/app-i18n/librime/librime-1.3.1.ebuild
index 6adbfbf2ddc8..d2ed92eef3b2 100644
--- a/app-i18n/librime/librime-1.3.1.ebuild
+++ b/app-i18n/librime/librime-1.3.1.ebuild
@@ -9,15 +9,16 @@ DESCRIPTION="Rime Input Method Engine, the core library"
 HOMEPAGE="https://rime.im/ https://github.com/rime/librime"
 SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="BSD"
 SLOT="0/1"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-i18n/opencc:=
 	dev-cpp/glog:=
 	dev-cpp/yaml-cpp:=
-	dev-libs/boost:=[threads]
+	<dev-libs/boost-1.69:=[threads]
 	dev-libs/leveldb:=
 	dev-libs/marisa:="
 DEPEND="${RDEPEND}
diff --git a/app-i18n/librime/librime-1.4.0.ebuild b/app-i18n/librime/librime-1.4.0.ebuild
index 0b7c3762df21..fe6219f824f3 100644
--- a/app-i18n/librime/librime-1.4.0.ebuild
+++ b/app-i18n/librime/librime-1.4.0.ebuild
@@ -9,10 +9,11 @@ DESCRIPTION="Rime Input Method Engine, the core library"
 HOMEPAGE="https://rime.im/ https://github.com/rime/librime"
 SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-i18n/opencc:=
 	dev-cpp/glog:=
diff --git a/app-i18n/librime/librime-1.5.3.ebuild b/app-i18n/librime/librime-1.5.3.ebuild
new file mode 100644
index 000000000000..0a8bfd8b1370
--- /dev/null
+++ b/app-i18n/librime/librime-1.5.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2012-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit cmake-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/rime/librime"
+	EGIT_SUBMODULES=()
+fi
+
+DESCRIPTION="RIME (Rime Input Method Engine) core library"
+HOMEPAGE="https://rime.im/ https://github.com/rime/librime"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/rime/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="BSD"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND=""
+RDEPEND="app-i18n/opencc:0=
+	dev-cpp/glog:0=
+	dev-cpp/yaml-cpp:0=
+	dev-libs/boost:0=[threads]
+	dev-libs/leveldb:0=
+	dev-libs/marisa:0="
+DEPEND="${RDEPEND}
+	dev-libs/darts
+	dev-libs/utfcpp
+	x11-base/xorg-proto
+	test? ( dev-cpp/gtest )"
+
+DOCS=(CHANGELOG.md README.md)
+
+src_prepare() {
+	# Use headers of dev-libs/darts, dev-libs/utfcpp and x11-base/xorg-proto.
+	sed -e "/\${PROJECT_SOURCE_DIR}\/thirdparty/d" -i CMakeLists.txt || die
+	rm -r thirdparty || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local -x CXXFLAGS="${CXXFLAGS} -I/usr/include/utf8cpp"
+
+	local mycmakeargs=(
+		-DBOOST_USE_CXX11=ON
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Gflags=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Iconv=ON
+		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/app-i18n/libskk/Manifest b/app-i18n/libskk/Manifest
index 202f8d51ede9..fe515d78cdc0 100644
--- a/app-i18n/libskk/Manifest
+++ b/app-i18n/libskk/Manifest
@@ -1,5 +1,3 @@
-DIST libskk-1.0.1.tar.gz 860453 BLAKE2B 95f386e34f479548c7b4a37c3d70d16e27fd238a83e09c9dfc539ec9c3cc1466bea6a1d694e9b1027d66955053b2af1719a96ea4b5a37f61fda82118250576cf SHA512 17dc7c0361083c08c29267b4fe2d066b079e5156728f461717044f99579ec2674b56c960d2be5a42a2dffb693106d2d3d78ec8cb833e8f189d48e421a25d91b0
 DIST libskk-1.0.2.tar.gz 867572 BLAKE2B 32f599e83bf7ced796d2f37f6f4bf5e45f47c90e144784b7b3e082866cc619a26e3aca4f16051685baa4d8ac54b0462930193f978bc1e8220b378679269c5833 SHA512 f8fff94b216c18f66bf1004ee068f8d737177f1b70ac36d054d9a68ce02ba9b8d1b7b4127d9a330f64054b2fe06f352070c750a3562d4be36fecf20cb854e6c0
-EBUILD libskk-1.0.1.ebuild 961 BLAKE2B 8fe2f6b546c554fd711ac6c40aef4a2ebdef29c009496afe0539fa95d3fafa76e80b6d7b400dc53b73312eb9bd90a85a310d88d4c9ab8d2db9c034367a8c4cdb SHA512 4ecdb60279c8ab8f7d90c19085a96b42892efad51879e841a0a54282ccba5dedd82b74ba5ce088ef25d23d8a51a7af16b51a4fe810be34d988516b46c1a7a141
-EBUILD libskk-1.0.2.ebuild 975 BLAKE2B f1af68240054e34cdf6c0c686f8c2c946d70b8fe8810837b9e5041155f3482f4f36d3f0c6827e186008be5756ca36576f7f8310e0e0de03759cc47e3a4611476 SHA512 04828d59aaa7b088bb1b2b567befc32abb937cd0b41a8c3e54114d67d68fa9d08940e501bb933897c510b39b92f00072f6649e259209fb83fa6b40468ba31db8
+EBUILD libskk-1.0.2.ebuild 970 BLAKE2B 0f32293b6de350ef5520297717534a513a733886916ca04bb734a0e7a64fa6e3737955c4d6cafe3d59c67913c7e99cba777a9acde8c1b3a1213af555de8ef84a SHA512 59036b59358024d1b7fe583c59b6b7fdb9638678d91dfd7ec6c168079b79b08571e444d4aab8d54d52a32c3260aa594d7d7f66f5730a5b3e8ca8934d3c67a590
 MISC metadata.xml 320 BLAKE2B d8aac0823caa1962d5f1219492766ddec90fc92728b0f9f6f802d8f98d4d1c4cce00d3f6e688faf43729e8872f981582d9bbd586fcdc1cbf82aa7d54cd759d78 SHA512 a62e6d05067067cbcae666b635047834bca3c4ca7a4b217ffb20ace08fb05ba8917d8f413319a0ebe14d54c9fdf803c247644da9b22764335f5e9fc41529f67d
diff --git a/app-i18n/libskk/libskk-1.0.1.ebuild b/app-i18n/libskk/libskk-1.0.1.ebuild
deleted file mode 100644
index 9dfbf773269b..000000000000
--- a/app-i18n/libskk/libskk-1.0.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit ltprune vala virtualx
-
-DESCRIPTION="GObject-based library to deal with Japanese kana-to-kanji conversion method"
-HOMEPAGE="https://github.com/ueno/libskk"
-SRC_URI="https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+introspection nls static-libs"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/json-glib
-	dev-libs/libgee:0
-	introspection? ( dev-libs/gobject-introspection )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	dev-util/intltool
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	vala_src_prepare
-	default
-}
-
-src_configure() {
-	econf \
-		$(use_enable introspection) \
-		$(use_enable nls) \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	export GSETTINGS_BACKEND="memory"
-	virtx emake check
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/app-i18n/libskk/libskk-1.0.2.ebuild b/app-i18n/libskk/libskk-1.0.2.ebuild
index c2a5d159fe18..559b09d8e283 100644
--- a/app-i18n/libskk/libskk-1.0.2.ebuild
+++ b/app-i18n/libskk/libskk-1.0.2.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"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ueno/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+introspection nls static-libs"
 
 RDEPEND="dev-libs/glib:2
diff --git a/app-i18n/mozc/Manifest b/app-i18n/mozc/Manifest
index f73abd9c958f..ffd1c3bb3200 100644
--- a/app-i18n/mozc/Manifest
+++ b/app-i18n/mozc/Manifest
@@ -3,10 +3,11 @@ AUX mozc-2.20.2673.102-tests_build.patch 1037 BLAKE2B 8f3c0b3361371a994957a89f5b
 AUX mozc-2.20.2673.102-tests_skipping.patch 2086 BLAKE2B a104d6a83b02b49e1208be1b39699b90ad419d8befa29ed0366f7cbc454fe9ce27361f21897a5c74dadfc2d9eb31a30d7237e20db8c1fb205b8e71b40f4a0e57 SHA512 4a2e5a35c5e65ebeb737f656d6efb313c660c2c7cf62abd5d9295fd16e2dffde21d069cd74fd0cfd2454cd7f7c9d136dfbadbf79832db8441c619ff37c7e4b0e
 AUX mozc-2.23.2815.102-gcc-8.patch 496 BLAKE2B 318fcda19cf4f7e95920b5df4f5638621bcae992891941fa6f220d4dac1b2eac0faeda7a857a587baed41b361608f20c4bbda0d9a69a60b823572482c6789f46 SHA512 9c2b0e9695f4cd050f0d5f35d0e23f22715b9c6e5607629c7dc023560a5191bd755497fe6fe5306789c00e68d5bd9b7179d5515c982967788fca432134b71cad
 AUX mozc-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch 40296 BLAKE2B 982f43fa68031eb0f779ec4d034fef838a4fce7834291db889c9edffba3df4acd5bfdf187dd4a52ee8fd0714de943f9d5112070cd69502e1449dab4dbf8543b2 SHA512 6e05b2f22663ddbfb24a8344928ec24c0b4cf523728c1623367970b8f263142af95c056c82d0827414833d5b9f26c3a024a04a688851021601a5cbcc1474e754
+AUX mozc-2.23.2815.102-reiwa.patch 924 BLAKE2B 3893f975d43ce29a962c5e712503442b178847acebd92e797040b6b699a37cb051f88a37965e0f194f73bca2e2397a8b070eb6d14bbe92adbba3e17a864e8c8b SHA512 df3f98ab93d7662b5ab038c732d3342b3f5860774559242eca1d0f1cd67275f315c6e4ffad83c6990ef5eb23fc19c0379ed7d3bdd0a377fcb080c066aecd16cc
 AUX mozc-2.23.2815.102-system_libraries.patch 9064 BLAKE2B 0cdf732a1bbf16d4af1d6dee81aacf3f3cb1f1c00c6aeb0fc12dac9dcd8611124e388e5fc721eb9b9472e073515d7457b182ee7cfe466b83bf319d572ae55240 SHA512 2d5b06e855f8c1889367b9b672e3ec81a037bc592872e28319e0180a0dcd177cdff817775a1a0f74ebf48e0b7558cf3b67953120411be753c662c43f409b05ce
 DIST fcitx-mozc-2.23.2815.102.1.patch 295112 BLAKE2B 709b84f6eaed16da38a173f40ae7cccff362fd167e6deb4090ae8a9ec522ac8e11ccff3c9ef6433907249af8c9eb4b7be12d2c05564cabd45c25e26764286ed3 SHA512 e0d4645df919838f0fe31a97bf6dd759c222a696f68133f7584d2c771f70734ea634a25bebb03a756221000d3552423207ee5163d75778dbf480b6e267ba4cd0
 DIST japanese-usage-dictionary-20120416091336.tar.gz 71051 BLAKE2B 08eecf0aa021e27a2813f58c2d37f1cec760448f6ae086ae7468b8a11575c6ef9f72f656cb4d53e0179b8a7b00f2d91ff51a0ad7825e078dcbac0810f1d8b3e1 SHA512 b7e997a979b6d50e49b9af5dc830ea4df0532f6ab1321b9ef14983f65bb54f1b2967375c82e07957ae7693ebbf43c9b56ecea6bfea8dd1fdaee444bd549d83a7
 DIST mozc-2.23.2815.102.tar.gz 47739041 BLAKE2B 045a8a4a07e09cf923b67824111cdf672febc30256a6aef951ae779a3f582b3860042750d766120e376898c63be5b4baea870798a192cee34b0d48647e1ec5e6 SHA512 a3face616ca89990bca52371dcc8003604ebe0e9633116a64550add070152b1bc4d9b21e9f102c5afa6f8b1aa11d8dbc4bafbcebfaf4a12a934f085f245d548f
-EBUILD mozc-2.23.2815.102.ebuild 9621 BLAKE2B 56f0645ce5d3075e8cd1151824f3f3d3caafffe569b62bbda103d8145c58832daf9212b583521f5467386bc647da8b7b327a8cfcb600725f674383658f5772a2 SHA512 4dc52da2c73b5852b55ebc06e73880cd4935c4f0197a1510ad3827184b64d0b5c19a3cdb9d5a09dc03688cecc40530a93d43d9a555bf5c8250acc8ee425f6777
-EBUILD mozc-9999.ebuild 9461 BLAKE2B 24399188dfbeaa18d19116300d0921c568c4a7518a5dc0ac1161f76358955b7a8b8c5ac2ac42e1c7be138ce335f9e7c43063736c80fab5bafc8c8bca06eb25a1 SHA512 bfd7fb36c1e7919fdf3f47c5414737bd37436564024b993936de164a85f6914b28d50cb9bbaaf4278d1e06f4c6292cc4d6a86b6e0c54ba7ee5e5dd305efec0ee
+EBUILD mozc-2.23.2815.102.ebuild 9674 BLAKE2B f36a730420f6e6b2dc9fb1643458f942581b04991c1f87508dec3239d28228e545460c15960fe70d77642923bbd2d728e4e63b459e5fe4381f0040b2809c7837 SHA512 309c0975e2c9c2575c1cbf29039127e450837a214a4bb2a343cac0a58e9ea6ed45a096f0cdb72c1ab2846fc73aa44a4b6c3f2f0c79ceffc6b6b6a6131966f164
+EBUILD mozc-9999.ebuild 9514 BLAKE2B 23d6960f9eb6551808b264bc278e647339afadd34133397c55538fe3e361cf174edb9f6654204df25cd51306347cdaed97ac530774aceb1b7b48772737992075 SHA512 4caf2575ff9a41e89c4196e7babd321d7abe14f73eeb2d6b03cfccbb2d488a8d2f69761c447a6f7a70cc51178fa3c580651297d394b38bb85d7b3ab699cf226b
 MISC metadata.xml 1127 BLAKE2B 55c44374c1d0c03845435544fb8bcd254bfa59faa54e773110fe2a9bcfba0f6863a1f5c167e3ca7d2a1108e566ae4d7d4155a1a1994bef006bbde906265fffe1 SHA512 8d1ee79d5e359c746627cc10ddae170088dd1be8a69379f60969e588c0c6141fea80ebcba0183a91e786116e8937c14e76888c9232526244aab584ed4ef27a54
diff --git a/app-i18n/mozc/files/mozc-2.23.2815.102-reiwa.patch b/app-i18n/mozc/files/mozc-2.23.2815.102-reiwa.patch
new file mode 100644
index 000000000000..561a989a41d3
--- /dev/null
+++ b/app-i18n/mozc/files/mozc-2.23.2815.102-reiwa.patch
@@ -0,0 +1,35 @@
+https://github.com/google/mozc/issues/461
+
+--- /src/data/symbol/categorized.tsv
++++ /src/data/symbol/categorized.tsv
+@@ -405,6 +405,7 @@
+ ㍽	MATH	たいしょう  ねんごう
+ ㍼	MATH	しょうわ  ねんごう
+ ㍻	MATH	へいせい ねんごう
++㋿	MATH	れいわ ねんごう
+ 
+ ㌣	MATH	せんと たんい
+ ㌦	MATH	どる たんい
+--- /src/data/symbol/symbol.tsv
++++ /src/data/symbol/symbol.tsv
+@@ -528,6 +528,7 @@
+ 記号	㊦	した げ	丸下
+ 記号	㊧	ひだり	丸左
+ 記号	㊨	みぎ	丸右
++記号	㋿	れいわ ねんごう	年号		OTHER
+ 記号	㍻	へいせい ねんごう	年号		OTHER
+ 記号	㍼	しょうわ  ねんごう	年号		OTHER
+ 記号	㍽	たいしょう  ねんごう	年号		OTHER
+--- /src/rewriter/date_rewriter.cc
++++ /src/rewriter/date_rewriter.cc
+@@ -1239,6 +1239,10 @@
+     1989,
+     "平成",
+     "へいせい",
++  }, {
++    2019,
++    "令和",
++    "れいわ",
+   }
+ };
+ 
diff --git a/app-i18n/mozc/mozc-2.23.2815.102.ebuild b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
index d4572c6e9708..f198c294cea6 100644
--- a/app-i18n/mozc/mozc-2.23.2815.102.ebuild
+++ b/app-i18n/mozc/mozc-2.23.2815.102.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2019 Arfrever Frehtes Taifersar Arahesis and others
+# Copyright 2010-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -37,6 +37,7 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc64 x86"
 IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
 REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
+RESTRICT="!test? ( test )"
 
 BDEPEND="${PYTHON_DEPS}
 	>=dev-libs/protobuf-3.0.0
@@ -107,6 +108,7 @@ src_prepare() {
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-reiwa.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
 
diff --git a/app-i18n/mozc/mozc-9999.ebuild b/app-i18n/mozc/mozc-9999.ebuild
index 144d03b4d78f..037a8d2d2567 100644
--- a/app-i18n/mozc/mozc-9999.ebuild
+++ b/app-i18n/mozc/mozc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2019 Arfrever Frehtes Taifersar Arahesis and others
+# Copyright 2010-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -37,6 +37,7 @@ SLOT="0"
 KEYWORDS=""
 IUSE="debug emacs fcitx4 +gui +handwriting-tegaki handwriting-tomoe ibus renderer test"
 REQUIRED_USE="|| ( emacs fcitx4 ibus ) gui? ( ^^ ( handwriting-tegaki handwriting-tomoe ) ) !gui? ( !handwriting-tegaki !handwriting-tomoe )"
+RESTRICT="!test? ( test )"
 
 BDEPEND="${PYTHON_DEPS}
 	>=dev-libs/protobuf-3.0.0
@@ -107,6 +108,7 @@ src_prepare() {
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-system_libraries.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-gcc-8.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-protobuf_generated_classes_no_inheritance.patch"
+	eapply -p2 "${FILESDIR}/${PN}-2.23.2815.102-reiwa.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_build.patch"
 	eapply -p2 "${FILESDIR}/${PN}-2.20.2673.102-tests_skipping.patch"
 
diff --git a/app-i18n/opencc/Manifest b/app-i18n/opencc/Manifest
index 28a34dfa509d..0155510e9c1d 100644
--- a/app-i18n/opencc/Manifest
+++ b/app-i18n/opencc/Manifest
@@ -1,6 +1,6 @@
 AUX opencc-stop-copy.patch 625 BLAKE2B ab2f98a03bb079ad116994c4d05e59e3638f648b3e03ea4e6a357a8658612a1425f2578989c0086e31d749e3533ffb814457071582f9fbf3fbcdf0d184892940 SHA512 e34388bc5d1841e3655c6209e31cf18957a9a02f23d49d9b1f184e48005cf5d5c108656439900f0d79fc1801700872a433ab761154abc424b717e12a616487ca
 AUX opencc-test.patch 202 BLAKE2B 1dd3bc35c1f8644cd4f27ce8a5b5dea3b0ef2750612f112d7dc6de658634ad5151972b80c7b2ede9f41ea98ac7a2d29eaeb961132c862f66dd160dc2dd522a6d SHA512 5318058587b41fb7021ffce64d4b999b1beed294ce4c00137fb4b0396dd2cb471af789bceb8a8076b1d4ec2226d3c3fdf8b3d3d6a1f5d80936cf2407b8bdd3ec
 DIST opencc-1.0.5.tar.gz 1598354 BLAKE2B a66b32b96dab543d8401960ff0548a4e3f9414606513941426eacf105bca0755a7b364c68b7eb996ef82444e52f849d2f8151353a14fb97a358ad1463fbea2d3 SHA512 3fbefbafe5c3c2491032158577ab97b5a3edf6ea98a03a7250deba082b72c3112ad4a3396d1a469936ec32e1d141f0a2236001c2891ac9c793add2b082596cc1
-EBUILD opencc-1.0.5.ebuild 986 BLAKE2B 7c74849f384202578f91e0b597415e6aa93f37e44537d6a4792d366ce997eb9d4c72d1a689fea400e2c900b73ea6ab83616379d3507f078b7a556bc706212d7d SHA512 a0fb31fe4ff4d791bdd837080e08844728c1da240f92dfa6a465e56cd3d733e5c592a62b92a9343837d6a47c062e2211f28e9ff3fb2bd47bce663ce19630880e
+EBUILD opencc-1.0.5.ebuild 993 BLAKE2B 2127a2973d73918f2df868f650319d26c005f79c16cd54180ff5ec5b6925dd6275909156c0da8b2b9c9c5cedf01cc431fc23f5f0d877e4e2f7d3230a6bc4025a SHA512 a1844ad4b0e9ac7ca466a5a1ff0409ea265d173292e28237584ed426c6952ba588a0a19598367906bc72470233323e97e9c3f48e86772f0e4d172cef2b332cb3
 EBUILD opencc-9999.ebuild 962 BLAKE2B 030f0cffd01ec8ebd917e2803d4222a7b365707fb2b5a18ccf4c61e6615522cc61c67f4a65eb2b01bcbfba56a4bf86e633d41fb1cbca620b9285c9c32c54d1db SHA512 1509dc3acde4d1d54ec538e6fad7b4310e0f0ce1616114f6200b6edfa7239e035483b03fe9ca033b3113cbf2d037ba272154181a754a34efe7a164e9b22363fe
 MISC metadata.xml 491 BLAKE2B ec523a795afb6ae99cc5835e3df9fe07916aac4bf8552254f3bacbb9e1764a3ba5a79eddcabd8f34417544709a10a0bd34e6133a01b9b7a15156a9d282316d86 SHA512 303cf35b932c5d5a1fdd1a25b2c71a65a4aab761fe3c66d72439d691255a5edd1b943287afe8b4c53ab62531a012dafb5f416471a172f5b487557684dc6655df
diff --git a/app-i18n/opencc/opencc-1.0.5.ebuild b/app-i18n/opencc/opencc-1.0.5.ebuild
index 2ddcaab943f2..309ec8cea25f 100644
--- a/app-i18n/opencc/opencc-1.0.5.ebuild
+++ b/app-i18n/opencc/opencc-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/BYVoid/OpenCC"
 
 LICENSE="Apache-2.0"
 SLOT="0/2"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~arm64 hppa ppc ppc64 x86"
 IUSE="doc test"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/app-i18n/rime-data/Manifest b/app-i18n/rime-data/Manifest
index da7fc5cd1b08..06b4c6c55ea1 100644
--- a/app-i18n/rime-data/Manifest
+++ b/app-i18n/rime-data/Manifest
@@ -1,5 +1,5 @@
 DIST brise-0.35.tar.gz 6707277 BLAKE2B 610ea2e58800676b88bc79ce7075ed5fa8ec041f2ee34e3dfbcbfa642f84413d8b188af8e49de56d815eac2e5188d18287749976aa4e28ba5c7c7dfc6dece30a SHA512 1a2a3ddba9be7089a1b82ce446a3e5dc93a13fff121f861aa1acbdea950f490c9367866902a056296e17de5076a59a54741ceb3a59a9c0ec58b6b7c54f519f3d
 DIST brise-0.38.20180515.tar.gz 7116807 BLAKE2B abf73b5813b18f4cd3ef68b3f6e8ad2c54ac90a0969a57e7786b53b99c162efeea9e82d962b3e8d7b8b1742852beb5d0eb4b07de65bdc1881c43388de552ee4a SHA512 60b3d37486b6858114036664327c9be00d09d3f7d3f5aaf337c6bc5a46134e5785fc1732db5aad15e1e628241a70c9c34b03f982fb13cae6d91220731b451bb9
 EBUILD rime-data-0.35.ebuild 558 BLAKE2B ea665052bd0668d772e2c556b7ffa9784eb1d89d8aa082deab295f8cea5c1b65597e5390a9a96aaeeca1cf5c2891270454f9ba35867fdd91da220c75dd561e9f SHA512 fa661b513b6a36e180d791230f293f950f4274f7349500d871df325fe995967e993bcee9e6569e76ba604efb3a2b46bac72503117c16c0a6e2e75bc134b8779b
-EBUILD rime-data-0.38.20180515.ebuild 675 BLAKE2B b49321650256105bd272ee6242e615e9df86bfe28aec980897b06f76a601ad223817d52a81208548ee88bffa2f8f761c4730f23c038ec1fe2000ebd2b901e28f SHA512 c4b22812e37d0f3d36f58ed36fa3db96307a6473d83a0bd6331864fb7e8712ed356d1ff0d6c04411ca435bf90b33ad583b2dc0f311c1b798dcbfe14f1f462064
+EBUILD rime-data-0.38.20180515.ebuild 675 BLAKE2B b0bc6ff6e9351382e5883c3968d7dd197a353fc62a522e30e90908b08d520d29b54b2268126cd5dd661e4b3654aa9949d75211d4d8831feb3d4b7499b72f9169 SHA512 e6a0b43c0ed183c461f7ec8343f772853559b5d2e36d8f38c1a3c85981e1dada23d84145a9368849d3bc597bc8fdbbece854496434d71e0c6c688ba08d21d37f
 MISC metadata.xml 600 BLAKE2B 3c4ba0371ca7088b9142f7fdad617c1b149cf7d5e6b9f93a5a4f12af1de4d276e3973a8092450bcc86e1acab4389d04f6a1ec9ee5cf599b7b7c1ee43cb0064bb SHA512 759252765da22d73f9e907c0095d7e60fa73aac194929da36757eab25ecb57311381459c444345eb4da5305ea15ba5ee5b89d458f39101ad887d5d9766282723
diff --git a/app-i18n/rime-data/rime-data-0.38.20180515.ebuild b/app-i18n/rime-data/rime-data-0.38.20180515.ebuild
index ecbace625b4d..5a80e686b286 100644
--- a/app-i18n/rime-data/rime-data-0.38.20180515.ebuild
+++ b/app-i18n/rime-data/rime-data-0.38.20180515.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rime/${MY_PN}/releases/download/${MY_P%.*}/${MY_P}.t
 
 LICENSE="GPL-3 LGPL-3 extra? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 IUSE="extra"
 
 DEPEND="app-i18n/librime"
diff --git a/app-i18n/unicode-cldr/Manifest b/app-i18n/unicode-cldr/Manifest
index 30f8fa5d2d59..4cdfc82c3cdb 100644
--- a/app-i18n/unicode-cldr/Manifest
+++ b/app-i18n/unicode-cldr/Manifest
@@ -1,5 +1,7 @@
 DIST unicode-cldr-common-31.0.1.zip 16370865 BLAKE2B 46e941471074116eb00ba81848b37c82e025e12841d75ef9e4e2620f887384c4dbb3f8c36febcd86d19cd17d4d84e77e11121d1ed1cf2ccf67a09260cdddc9f7 SHA512 6ef4a73b31bde5dead5af9145e5befa5969e9449b4072c94c5370c979db54e3072ec5bf15f54152045da329bf4382e54edb532c0ec77a2ce451bacc8778b73bc
 DIST unicode-cldr-common-33.0.zip 20401984 BLAKE2B 1318f8c73678f4ed2ff6a2d947171515d52825c2395e77c8149fb6a5646110876dd8e1bc30a3b918cb25c4bf106b42fe2a372a9938ff0dbf106cf0d7dc33d75a SHA512 f2f9fa5242702fd8044c9b239e175b7ead41e36da39c9e67e70b4fde7ed5d28115141ea457cda4f645b10a2d29734b35590bd0f012296bdf4986a920b87532dd
+DIST unicode-cldr-common-35.1.zip 22368309 BLAKE2B 3d00bafccca8d0b8821083fdf94440adca6f8931951de33f5914308bccddaf5c3b642d59c2b7d04588995c9a284852677ae3ab2feeb9fe531e7479d08f4ee7be SHA512 e06594da3d6dc376457e507fe234281fcb04d08daabfdaed60afb3aa59f88cdc0a7c27974c52ebd432746fcc7664948f9d6e6fde5874ad85c6c73a6441425465
 EBUILD unicode-cldr-31.0.1.ebuild 496 BLAKE2B 8df1bcb6bbc05a9177c20aab6337a752e65d21ac11993aaa85a48025f5e196eb151a09dd3525ee76ffdae1710c0ff399fe6428dbada25ae89d83f64300b445ff SHA512 93ba56c3abf39bc27c7d825c63255fcea2c1c2d942b3984fd5a98cd911399f5ac4002e1e89972ca5495e9787cba266d0ce82f4d83ff9699d4c33bce90a02a880
 EBUILD unicode-cldr-33.0.ebuild 705 BLAKE2B 73ea6797b4239c42a965749a75c0b3518010604f4b00a9d644ee4ed88cc73dfab1538da90e7715997695e3e43e7ac5499e84ffd82cad40bf6e43f7827291047a SHA512 dbbcedd585bcb20a8371dccc438dcd9af8653f211bb2514b30723326153d438a30477cec3619dcd9d31a51e1382dc0badb3219025895bc289f3ed47cc0bf9495
+EBUILD unicode-cldr-35.1.ebuild 714 BLAKE2B 660aa4e4733954759697589d9c6bdfeecafd650e29c67d2b3b70030cfef9d757c46d2ce0308c424520ea551fef793bdc383004b4b628c44cb21ec333efe07120 SHA512 a67513fd77f045cbf113baacc41a24e3637c9765719b26db0fb47f7ae44bccfccb4c4f5895253334fd2844978f6dff67fd5dabc7007863f338f92b715734ab28
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-cldr/unicode-cldr-35.1.ebuild b/app-i18n/unicode-cldr/unicode-cldr-35.1.ebuild
new file mode 100644
index 000000000000..b79862fb4e50
--- /dev/null
+++ b/app-i18n/unicode-cldr/unicode-cldr-35.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="Unicode Common Locale Data Repository"
+HOMEPAGE="http://cldr.unicode.org/"
+if [[ "${PV}" =~ ^[[:digit:]]+\.0$ ]]; then
+	SRC_URI="https://unicode.org/Public/${PN#*-}/${PV%.0}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip"
+else
+	SRC_URI="https://unicode.org/Public/${PN#*-}/${PV}/${PN#*-}-common-${PV}.zip -> ${PN}-common-${PV}.zip"
+fi
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/unicode/cldr
+	doins -r common
+}
diff --git a/app-i18n/unicode-data/Manifest b/app-i18n/unicode-data/Manifest
index a18b922be1aa..7ea58c18a9d1 100644
--- a/app-i18n/unicode-data/Manifest
+++ b/app-i18n/unicode-data/Manifest
@@ -4,10 +4,13 @@ DIST unicode-data-11.0.0-UCD.zip 5751718 BLAKE2B e9ad8eb47b5b5753e345836b19b72b5
 DIST unicode-data-11.0.0-Unihan.zip 6747669 BLAKE2B 522291be19f68978f6701c0e624d6d0589b94798d0c1099f8c554c778497383c04422b0ff3613c59af9ea496243f4aa4354ea5b85e66f601a24435da96a3ec00 SHA512 a045e79545f1ec3529a8556d41c73b20809979e002f98314068c6f91daa79abb2ab3ab383090651b55fb55e343d8fcf67bea822d93d6e3221a206d58ef9e3a7b
 DIST unicode-data-12.0.0-UCD.zip 8410561 BLAKE2B 10d34faaad501ddaba6de73a126b8dc5acc2941f81050ec4ff432f9a6aeabe1e13004e0ee190d37751517e3c2ea07c879d3bf2e39b8430d473f93f7fe05b08a8 SHA512 f9d845170df7e4952f90c6c75b256c2d330e174b95534fd6e8076bc6ad827a007b5e2b49562d29a4f7e6a529a41bb59330fb2acf94993f983049114d7b294a33
 DIST unicode-data-12.0.0-Unihan.zip 6749737 BLAKE2B a6caeb86f5c9dc13bc265c81acaa8ae791fdc8dbf728d3fba7a7004edcfbfa655424371cd4c9e667e1f1d6a5623b0ac1d320f0709c232b58b02494a728c7d2dd SHA512 7fdefad078284c14a9105655d1cb4d2b0dc1c89c56effe92ffcbd5a30b325559a56d97574b6077144d7a4ed02df6e6a402a2a5360e4abc0c84bae5c589044375
+DIST unicode-data-12.1.0-UCD.zip 8410738 BLAKE2B b635b449a04f3ffed8ec7311064cf2093cec5e7ebf8ec9a52b753a1c9a3f50374bdfe41a4e3e61bceefb69a847474b086b24a43f7f02de7183474737086f869f SHA512 68512627ecb75520b354160216cc14622c0d5321356f03429a102f734bddf6859c4ab266ed15db177dcbffd76c97d13d90de9a4fc38b10082a0e58fe3c82cda4
+DIST unicode-data-12.1.0-Unihan.zip 6749737 BLAKE2B a6caeb86f5c9dc13bc265c81acaa8ae791fdc8dbf728d3fba7a7004edcfbfa655424371cd4c9e667e1f1d6a5623b0ac1d320f0709c232b58b02494a728c7d2dd SHA512 7fdefad078284c14a9105655d1cb4d2b0dc1c89c56effe92ffcbd5a30b325559a56d97574b6077144d7a4ed02df6e6a402a2a5360e4abc0c84bae5c589044375
 DIST unicode-data-9.0.0-UCD.zip 5655592 BLAKE2B bacfd82142e2327d5633a927d6283d1bf3d43d0476b43ca5b23190abafba5aec3f29a59f096a651acc320a7bbf5f511aaa39e1f09b9fe24e96b0623610bec6a0 SHA512 e9bdf8ed6647b4d0bd83c6fcd885cb450fddbf84dac376e9771bddbb7ee1e8ea1ca8c2ca79e23832c26a4819dd62f86fcfa6eb6a1fcc7294185f5bc78be8fa2a
 DIST unicode-data-9.0.0-Unihan.zip 6558824 BLAKE2B 18900bacb9ec84eef99758a1647f657685f2fc40d705b7cd8f88ea727d9494aab38cf4d40829d52afca7c11087e6b2b2c03547c14980b7d206ba241bff3d3e47 SHA512 9856d30afe5d7b0b088bde36c12431eae267992b315944ca8a7ddb3559adee7474fedd2d0d6b22716439f9cddad573a4bb45c6209036b0066a85fbd19412852e
 EBUILD unicode-data-10.0.0.ebuild 805 BLAKE2B 541f56221efd9e3e525ddd8812c3f417f254ec51550fb42ccbb7f73b8ba470e77769c991c0e5eec5471827ed275f4a2578ebf39c48ed5bae0b71942bfd5214c7 SHA512 9b4edc49c53726cc5daf1a243605956a70469976d6bb1d631032be5cc2beb11298271d180928dac2f66f4db4cbf228858ba56484a39f72262065210cae5c4be9
 EBUILD unicode-data-11.0.0.ebuild 802 BLAKE2B a64cb2b75c1fa941c00cddc85ad04970a5322b5fcd589315bcbbf5188f3a52b7427e1306c273900a70bd3cbd9adea388903ad76592e845789ad6744558c49e13 SHA512 0ccbc6f2a2dff02b5fc72e28e2e87b378001f20415e5ef00384f70f3b17e63d59420ab53a85cb1fa0a5dde0b20475eb72bfe327f14ea8b7571c6917ce080f58b
-EBUILD unicode-data-12.0.0.ebuild 812 BLAKE2B 637a6d363e1a8237064fb19eedb29b5f187fc0d9d77b66ce662868c07ba6893e505c5a082fa2d0c61374dfd87a8d62610cac8397f4af33672797a4e969c1d302 SHA512 dab6a3362c66e62491e248ddaf72421e7246782f830d42e1086e471a819985a5ed7c0c61ad40217158fe220ed62656aeadbb0230f337b9bbebc5ae4629af1d5d
+EBUILD unicode-data-12.0.0.ebuild 801 BLAKE2B 03580aa0bcb94d89a74bceca03253a4be1dd8fc461b3d027d337853b05e00b9a16cc509d454b851302e8f0b2c7dae41ea4260bd9eebb1b02b33b68d2d0e99fb6 SHA512 9a39d83b76dd8e2f1c1c7c93f27f7bb967597590802b4acd36693b9f5f1298ffef5c24b3d13e9758ba952efb93c6158a319d4dbd37589ae3565f6bc9dee6736b
+EBUILD unicode-data-12.1.0.ebuild 815 BLAKE2B 8be607c4cdd73b237e95930c822b4dd0f9e26f51478535ac818bff7ceb1cc6c07a007498994937946679eb24fcc26523ca2cd007f64ad53e54f0287bee225152 SHA512 16a0eabc8686cbe00b58daf73019eaa4aa11e3503c930847eb75c2538c187bc0780fb5ded0d805585113e1251e6fc2fcaab4f4a01ab41f037a3ee2aec72abdf8
 EBUILD unicode-data-9.0.0.ebuild 799 BLAKE2B c384b186534f8d15cb0531293d091231b8594148500d7e620be5e4915a3b1b7ca8a4018f8d0dc660d438b2216c507f8aa92b1ebfd701224857bd9e29311c1c4d SHA512 3138843b7a6df197b6394e4b521f41c1e7351f615b037ed6a7a0fe7f7a8534ca45cc0161939516dc00c1b16ca70feacabe9e11c621ecb57d4fdcf7f47afd00e0
 MISC metadata.xml 238 BLAKE2B 17d20fcdaa0f86ce589db9b1e55e6fffbe693f41d7a05bde4a82faa8f6b5e237bc754e02e67d8116a9e5053c5164dc47edb679c086bce8a866dc224728ef4a52 SHA512 5ecba42349e9c39d750f007ac73f6100b85cf54174805a6673b0373434ea83c0f2b64c8a5b167e1fdd5a6c55d366f50cb9ba5a367b9d6dd8d53d797b8839fd5e
diff --git a/app-i18n/unicode-data/unicode-data-12.0.0.ebuild b/app-i18n/unicode-data/unicode-data-12.0.0.ebuild
index 2f8edc45c49d..dad13b4d6cf0 100644
--- a/app-i18n/unicode-data/unicode-data-12.0.0.ebuild
+++ b/app-i18n/unicode-data/unicode-data-12.0.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
 
 LICENSE="unicode"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/app-i18n/unicode-data/unicode-data-12.1.0.ebuild b/app-i18n/unicode-data/unicode-data-12.1.0.ebuild
new file mode 100644
index 000000000000..c6c8d2f851f7
--- /dev/null
+++ b/app-i18n/unicode-data/unicode-data-12.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Unicode data from unicode.org"
+HOMEPAGE="https://www.unicode.org/ucd/"
+SRC_URI="https://www.unicode.org/Public/zipped/${PV}/UCD.zip -> ${P}-UCD.zip
+	https://www.unicode.org/Public/zipped/${PV}/Unihan.zip -> ${P}-Unihan.zip"
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_unpack() {
+	# Unihan.zip needs to be installed as a zip for reverse deps
+	# https://bugzilla.gnome.org/show_bug.cgi?id=768210
+	unpack ${P}-UCD.zip
+}
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r "${S}"/*
+	newins "${DISTDIR}"/${P}-Unihan.zip Unihan.zip
+}
diff --git a/app-i18n/unicode-emoji/Manifest b/app-i18n/unicode-emoji/Manifest
index 3a705253a30b..b55370298012 100644
--- a/app-i18n/unicode-emoji/Manifest
+++ b/app-i18n/unicode-emoji/Manifest
@@ -1,13 +1,19 @@
 DIST unicode-emoji-data-11.0.txt 59720 BLAKE2B f1416d01d384245769549cc6ea93a2fe28bbfe77d30b26c9042965e3f9aee546572ef593284f767017b3a76acbc8015987c924be3afcc06df60b31588962a455 SHA512 501847414275564c7753b7d2b8e45cdfbf9fe96a96f0f3eea81f34c480da551b317b432ca426f6441c95eea520992e8888ead749e9c60da38233afd159d9b555
+DIST unicode-emoji-data-12.0.txt 63812 BLAKE2B 7e21860d73372aeebf487c2c4ddebe76585fef30670bdb4d27cd4d1f62ce863009524f1c4eaef62be693b127fb08b20585b2b1ca059bf993412b0f7d1530d061 SHA512 3e60e8a63abb40332a7ace61d1790b29e00251edca92afe52075627fb210a1097eea6033b727b458b6a5c7935018706ae71a2c1ec439bea3ccb8501c47c4abb5
 DIST unicode-emoji-data-5.0.txt 35041 BLAKE2B 83e52d46495e9e657717aa2c59a6f7eb457ef0592a88b86b72558bb12edf30587c833877d23739bb245a77b946ad983c967fa6706a7482132ac793a4823da570 SHA512 3b68cb709700cf871f545f357a54864c6cf1dee2ee7046f42d895c0811a75129206edf2c0617a5f1183417066f0fdf2e74086e880a65826590aac9d1d31f568f
 DIST unicode-emoji-sequences-11.0.txt 105983 BLAKE2B 5b929faa3cfdbcfa11fa72f77386d3a7aee2dddc5ceb3d110d275a3ed523ddadc7be71b3fb857901d880970d5ab48dfc4b024d7e379b5efb0992e7424bfde80a SHA512 c9af23e0738350b6d61691498ac82cccec970bb2cd4a0c5d6fab6c86fef742c09c6a83f50124c1f98c285e706d145786bb29cbf4339ff1a01c75ad7515b159a6
+DIST unicode-emoji-sequences-12.0.txt 155539 BLAKE2B 701e283fcfda3582a7ec1e0922a8fa584c2e77bb7d59aaa826324d2163972b59b004107c778dc41880c7768f9c884f64d6e41639696c91052d8c81e5fb409f22 SHA512 7ddadff1259c08d503b5936aecac9ad51e9cb2b0ed84c70fdaf0df370b2edd5e24ebed99d5df7325becf269e9f2d931d1bbbabe5d95c1b9af08111bf37bd29b3
 DIST unicode-emoji-sequences-5.0.txt 103383 BLAKE2B 1fc122b617963090d7ce165c9bc13a0507c5c26e60c36fa320f3527bae72e7362be944aa28cc4ea29598551361c304d43c7fe276a0452c2c5fae7e584b3169da SHA512 729bbf862b8d7ff6225b7416a0a464592f89040e4c27674c0d9afb6e0d997162c0a336c2a1e9de41313dcd45b504b3b27915ee8c67e45186c942c2996076d554
 DIST unicode-emoji-test-11.0.txt 361356 BLAKE2B 0e3b035fff3a4e542b3dd1172cf1438648a273ec0490316f843009b725c04764180a3ce0581b3e9819a0a5724c95ae5b536065e80401510d0b8e174636544184 SHA512 89c5a0f2eb460234e50dcc0fc904fbb254a1c0afa54b5bb672032f01764e0bed3624d1a4cd5627c83fcf1ea1347c9e3baaca05b2c685890afa505763baf8be79
+DIST unicode-emoji-test-12.0.txt 394898 BLAKE2B bdb5d32b657edfac1693fc8748653f2cbd513dc5b5cd558d24c2667bb5e7efa1c3bbf25c042bff509722acf448fb633baea24ddaac8c0144e0b368a394ea6b18 SHA512 b02c7977961f1b9a8c52322ba6b8d27afb84a2d131887add18352460dc6eb2488afd7bb9dac2e3f62b88604b69d02e4289bbaad551463d8b4b0589fbc16b64b9
 DIST unicode-emoji-test-5.0.txt 341770 BLAKE2B ab4e0900dd685172ba686c3a8e501cb3333be5594338526179a3d851970546fdde2793f9c31c501e978608bcee57d7281b4722bc6f657f0626c4a48ca2ad8490 SHA512 368483fadaa2c87e1197d0b0351c1e68b4244e73ab93542d73df7169d1dfcdf98b0fc1da8a969645f6a2d45db1f2db5f75ba919dd05f1012fbc2f3fb524f5c5d
 DIST unicode-emoji-variation-sequences-11.0.txt 36333 BLAKE2B c32b674969a102d24645d33fb000c31997c26c1e6de956fc82ae41c2fd43b244f3757e8ab217cbb03434defca16373fd33affa25c6df0b7b9393f0ab191ec65f SHA512 a0a487ef43d9cd49ff2ced654794e7190f357b00dd70ec9b84e640181dc5b2df44b2063aa4b16447d00815094155b24531f115e9121c51c95635b0af4b043643
+DIST unicode-emoji-variation-sequences-12.0.txt 36333 BLAKE2B 812dfa33f4c21aee0ac7895339d81ab6fb36c550f72df0dbfc491390082223e3babc55cf6a78b7f2ce1ed5bf739ae5eef8c7fc2afe223c5c1c14491d3d29490b SHA512 aaf6c964db27ba41b0becc6aad87e40ea7b3d7a593d33052a4ad1a67528cdf663a46622c367830b6ac47e3efccf1e52eeb18802b235560b47a7fc485097e1fba
 DIST unicode-emoji-variation-sequences-5.0.txt 36120 BLAKE2B 50e19bd7147486437dc4fd7784ec9bd5869e58f934738fa1d46edc030202fb9490ddebd6f1cefb98dd78b3be2c4da7e3f2acef0ce54487a183123311efbf7205 SHA512 484509ed56c5ea5e73160e211643a938d3fa08474281d316e5ed2d2346f38f5140a147454a9cb81c9f463d6c62befd98a8b70b695ee50effdbcfc6085dcaa520
 DIST unicode-emoji-zwj-sequences-11.0.txt 126959 BLAKE2B 82d78fd5fd47bb4201001903c0610e3950a2fa1c315fe8494e15977999ba0b8f0d4431eb842db6f01ab765fd181067b07258ddb4c547ddfc01fc0da7680ea540 SHA512 a2a50cd5451d3ba1da0f3b46e18a10d621ead0372599b98dad0fd47fdb271407f72bd72854136c93311b13950cedc2b1594f06d460e551ab120ed30ba8abce4d
+DIST unicode-emoji-zwj-sequences-12.0.txt 148234 BLAKE2B d5facf566e48f49f87df30b928b4d60cfeafa11da383aa34cefae0b05a796f3a9c78bbaa79ee8b460eea92c753b7e7d7840849fdc9f7bc57b2752f8b63d2988c SHA512 8d7c59d01d702d10f162476d7f96feea0d515521d1dca6aa819ed4d482a83d54c26ed225fcf864b607999a7016dddc89961b0760584d7ec0b5cbdf8e12b85051
 DIST unicode-emoji-zwj-sequences-5.0.txt 115207 BLAKE2B beb8f304be16ffe34fde4cab20bfb981f3ae61ffc6827ced0b3160de7e405459fdf38c6e7fcafdd3887da16da7870b84520f1c68e661480efbd0cb9510a04649 SHA512 26398ac77035d2f5df7a61f4c2a8a098af8e551576c9c9f157379c05aa8f75de5a0827c9bc476eb20f32c38b0c3605f6a1d9e07fe27f0e75df359ed2a7e6d25b
 EBUILD unicode-emoji-11.0.ebuild 1019 BLAKE2B eaf29ee5adc2ef74b2d7b74d57fbb7a97665d89ff092e7f5c93df72b7891d32b6e1ef078c2fb2259aba912bf9fd4b8a3a6fff21c5ca8495ecfa48bcf580073dc SHA512 3db83763f3415b6f8ede1ff61ae781ea8cbf3ebe4188a64ec773cde558ba9ce54cc09425ec44ec7377a78b8f28dc92773d5861d9853f806267e005899e5d4519
+EBUILD unicode-emoji-12.0.ebuild 1028 BLAKE2B ae016b05e8c3730ed541a54d0d3b394f1d54fda85bab777e1fc690532c4afde6b03ae5a496a619d1a63b9340646af84945e3bf9821473184e3b5a29636dab6a9 SHA512 8ff247a3fd2c1cee31ef9b46b1283463d69641f97233aad86b3e2ffaf5680fecd9208b2b38ef98902a3900ce606b8e375169c3d3b600d2998f202902295f4eb2
 EBUILD unicode-emoji-5.0.ebuild 880 BLAKE2B 08d91ce21e632d7a1befe8be1ca4495ece3e56d38d9bf2f062d086ebe10c0b8db89d021ddde659f0c1a383edfae80bdc5becbcd0ca37c7edc158c1d93ef8775a SHA512 b23eae90ba1df31c6965028ebc6d9b0f3064cfdb16f1069a7774e20ea61780bc4b4c086113f45aaa7e5aa00c4501782ed01972186cb5b753b61d9b33dbc328c5
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-emoji/unicode-emoji-12.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-12.0.ebuild
new file mode 100644
index 000000000000..fb64854ccb1a
--- /dev/null
+++ b/app-i18n/unicode-emoji/unicode-emoji-12.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="UTS #51 Unicode Emoji"
+HOMEPAGE="https://unicode.org/emoji/"
+BASE_URI="https://unicode.org/Public/${PN#*-}/${PV}"
+SRC_URI="${BASE_URI}/${PN#*-}-data.txt -> ${PN}-data-${PV}.txt
+	${BASE_URI}/${PN#*-}-sequences.txt -> ${PN}-sequences-${PV}.txt
+	${BASE_URI}/${PN#*-}-test.txt -> ${PN}-test-${PV}.txt
+	${BASE_URI}/${PN#*-}-variation-sequences.txt -> ${PN}-variation-sequences-${PV}.txt
+	${BASE_URI}/${PN#*-}-zwj-sequences.txt -> ${PN}-zwj-sequences-${PV}.txt"
+
+LICENSE="unicode"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}"
+
+src_unpack() {
+	:
+}
+
+src_install() {
+	insinto /usr/share/unicode/emoji
+	local source_file target_file
+	for source_file in ${A}; do
+		target_file="${source_file#${PN%-*}-}"
+		target_file="${target_file%-${PV}.txt}.txt"
+		newins "${DISTDIR}/${source_file}" "${target_file}"
+	done
+}