gentoo resync : 28.04.2018

30 files changed, 208 insertions, 47 deletions

diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 6f2158986478..637b58633a8b 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/libchewing/Manifest b/app-i18n/libchewing/Manifest
index 69ae748c3516..4e2d2eff234b 100644
--- a/app-i18n/libchewing/Manifest
+++ b/app-i18n/libchewing/Manifest
@@ -1,4 +1,4 @@
 DIST libchewing-0.5.1.tar.bz2 3141084 BLAKE2B 28f9e803c8815c0e1b1a1134becffe12f92c1ae24b4b6d4163769d898861fec024db8332befe7130487a72fc20859b6292837e9d68ab1b6477de4cf4f789f2ee SHA512 a6551661bb5e56bba59730b93b373db56af7d42f2ab4881fbfff8727689dd2604d42d2e5c0b04820df66a431dfb5fcb73cc5c9b538615da76198ee3635501c1f
-EBUILD libchewing-0.5.1.ebuild 1128 BLAKE2B 20651dd2180990c06d3b48b2617abbecc441a8b626cd67bad6d9004aec9dcd617c3faf3621e83063ccae58ab580bf3e1e1599b0ee68a9987d1e83c327f3c8ef5 SHA512 37bf5f22627b97b6f44aefe9602a27a3085ab2048922cbd21330eba5dffc8195c136c553f2fb6b02eae677d35aa06b9d4ad1bd5360f6a2d94c0579662655e9e1
+EBUILD libchewing-0.5.1.ebuild 1133 BLAKE2B 69e6ebe58d26ab7f69e3c76c096af888d1726fb218fb34b12fadfbcdc19d498f3b17c1c34ca4dff2a11db59e4011e62c24cb79c6136a0235b09bfe9c62123a62 SHA512 c34891aecf91306810278c0ad7e21d34da6a1dd93195fc23b23e871f3dfd9791c0da317fac2c96d2ea63898c1e82e94fe7837a75b7eede5923f4be3b563e52e8
 EBUILD libchewing-9999.ebuild 1102 BLAKE2B 20874411d7bbae1684458fc28a83af4b20620409612c5401982e28c070761da991000f5a144f8a71e8967d6afabc788da0b1eae8803d2033785e5559b394410f SHA512 a6b0d950c98c5635e87557f3b7a59b38363345111ade7679f2f8d289c61fe15accc7e771e911a205dfe4934b1ca63839ef45c7b55a839e0f738df0c8130388ab
 MISC metadata.xml 327 BLAKE2B 3f9b234590aef775dc0ae62f4eef42cc1e363e04c3dabc2464eee9cfb44ec0b1fc4fe9b233f781c15784b3a699537d67e884ee7f1648a62b3a863480a5e831cd SHA512 c9ab28ab34d940a30e97b989fd96904d2e0816e4b1bc5b843b082d64d6cd476335d9402640e71f2cf8f57f44dcae9af66d5e07075b189fa74f21faba40d819e3
diff --git a/app-i18n/libchewing/libchewing-0.5.1.ebuild b/app-i18n/libchewing/libchewing-0.5.1.ebuild
index af3a7f15e633..1d3529dc744e 100644
--- a/app-i18n/libchewing/libchewing-0.5.1.ebuild
+++ b/app-i18n/libchewing/libchewing-0.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -19,7 +19,7 @@ fi
 
 LICENSE="LGPL-2.1"
 SLOT="0/3"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 IUSE="static-libs test"
 
 RDEPEND="dev-db/sqlite:3"
diff --git a/app-i18n/libpinyin/Manifest b/app-i18n/libpinyin/Manifest
index 0f758a5d939e..84d4a60b204e 100644
--- a/app-i18n/libpinyin/Manifest
+++ b/app-i18n/libpinyin/Manifest
@@ -1,8 +1,10 @@
 DIST libpinyin-2.1.0.tar.gz 246219 BLAKE2B cae5b41faeb2e0eedc2ae2c098b2db04b22e36d0bd9fd222a4516f71ab9b3e8ade7fa96e0d6d898e197bf91c1cb6a0b98a9fff97e7be31bb4f901400c87bfea7 SHA512 e6aa3998ac466cb155750b574140dd43673bfeb4f13d1b88c4892b61bb773aee84610dd67ad17871961d51a48067c535eab33a6fb6c9ac28179a9958c4e9b518
 DIST libpinyin-2.1.91.tar.gz 256045 BLAKE2B 148a2617cbe335ebda5b9fb26f63f7c75f06d2dfd3fb950f60b4db37762a5bb3a91459dba0759abd33fbc01d38fe26d7cce92dfaaa2c6e45c80552f0bbeb3d27 SHA512 568b263726a022bdca52fd54c7583a36a31385a8f19bb5c5903918a6036c5499ef8c8bb91ebb2db877449ec5177d2d4e4f0a20e7bb528534361ba1405dd1fd92
+DIST libpinyin-2.2.0.tar.gz 256221 BLAKE2B 72c0dc42ca6e63852c92975b871706d24c1066cb9bb37faf9ff0ccde9773308e1a29c7587f00ab337c52a1f957c8e67d6241bdff13a50d9dbf73c3b4e530d2be SHA512 7327e6726acaf984492fdecb5ed04f81624da261aeac3cbea9a8ea5540d84f39ca8d41ec8835b509da97b9de5837534885e4ba5f4041ce9c7252c8a438480598
 DIST libpinyin-model14.text.tar.gz 19361973 BLAKE2B 702f0c2cb0c8157758f8c46e7b47221475f2a96a5e4f6181b5dee605bd72002827431f017a913275b4e9cf6b4b07bccec4b9a5b7960a9b2c42ffba4631c57ed6 SHA512 792d3cf7ab7fdea701737cea66d18f697015f19d18b6d26273db2da0ae28291f38b3d8a5717f595da63fbe573921c552bdce10c4bec9a0834947dfec92265da9
 DIST libpinyin-model15.text.tar.gz 19361973 BLAKE2B 3d24321db407e28c1adf49373dd9bacafe0e89409511c0656d7b9a85f1d1ac8693249088dd99beef069576f4a8d0d5db3fd47f98822b32aa3098315cf2660d22 SHA512 d3f5b42f6ea6b22570b5ba67cf23d94a3fee2d7d894191ebc11eb72edc162c72b90b2fe10b312bfd8d77d110654ee5dc00c21b25fb8b7c3f905d4088c9895ac1
-EBUILD libpinyin-2.1.0.ebuild 1350 BLAKE2B bd3e4ccd07dc7cdfb87558edc664cedf6a0fd6a2c8ab8b6e89007b5157ed4a055483370a1eb314c21139a9bc32b92eb07b04cad3c8568969cf435fed947d1355 SHA512 22c4a8e787b2b74e8150440f67a8a9e7ee93d0a2080f6023358cebc74be1de6ddde1263caf243f37ced254d408f08558752e1744468a66d6111235029c753085
-EBUILD libpinyin-2.1.91.ebuild 1409 BLAKE2B beda549a27fa4a635755a44f372ad82817f935f33af25b95efae307e43c54402d8f929ba0b28879eb241cb4249ae8100c32ba22714de1254a0cc94547bbe7d13 SHA512 c142b0755dfebbc6f803b2722274949e278273cfe5cfdba51565822e8a1ec97ab8a46a714a2676f89619a2ce4fd9525c8c4bb7b6cb23fe8ca8f8fa910a472133
-EBUILD libpinyin-9999.ebuild 1379 BLAKE2B bdeff67c490facc1d2ad114cb7e0e35ef5cd444512e7d453ac87f5e9455f941c6027ec5ffed5960a8f27ca3921d660ec0694b59d44749f70d06f8d1f44f1e39e SHA512 e04c290416fb6e7c7a995a1e638fcda5c5a21c39620d05fdbbd29246ca06a406bbc53dfbfc7638bfeba5f47545665d96831bf095c7a64be1e9434a8c10268668
+EBUILD libpinyin-2.1.0.ebuild 1336 BLAKE2B 278b7906485b7cbc0f4b3d2ae89af99a074cd9ad9a773521e3df1eeb869b8035e6a971cb8745fde6a659455b467a7bb63b29cc45cb883edd7906839dfcbabc60 SHA512 2c750d9f7dba999d155f0a1f587a12aab7fc4f0356ce2a241b8a884539732d3ed310ce5b7ada5226b519e18a8335cc7f9fb9bca41700c60049bb2c291af545ae
+EBUILD libpinyin-2.1.91.ebuild 1395 BLAKE2B e14ab61ce077f41ddefbf6d28231d9af8a4f1ecc5435ac46536a7c8c3c3af799c6bf7ebbcfe10c26a35a354f89ec9595e90d88d8393e265004cceff57c0bd67c SHA512 62eb6b628fa4dd91a89ebbf1c6d894b646015f7a445d4f96283ebf14a80ffad4b6fc17cf7f81848f482c2a9c595221f73d5208a0805fb15ceac7ce07d29ff0a0
+EBUILD libpinyin-2.2.0.ebuild 1395 BLAKE2B e14ab61ce077f41ddefbf6d28231d9af8a4f1ecc5435ac46536a7c8c3c3af799c6bf7ebbcfe10c26a35a354f89ec9595e90d88d8393e265004cceff57c0bd67c SHA512 62eb6b628fa4dd91a89ebbf1c6d894b646015f7a445d4f96283ebf14a80ffad4b6fc17cf7f81848f482c2a9c595221f73d5208a0805fb15ceac7ce07d29ff0a0
+EBUILD libpinyin-9999.ebuild 1365 BLAKE2B 5f01c5204f4d9ee246c43636fdf77f73a9001d64412c783d713c47e192fcbdbf6c3f9726a424e6f632450f46215188793d454de4bc7e0497d430b97857d3b718 SHA512 a65a580228b8f0024366c4462aee347182b233d736231234bd8ecb5bfc2d6733860019ce3be354f0e830259bcd8b253705b1eb382f8914c42d72e911ec6650fa
 MISC metadata.xml 384 BLAKE2B b3f62b356f505bb69731e6f56d43a080e509b578da0762be6ccc112ed1262446034b82d89cbdcca87d502c006319fd11cb4069804b8d8c12f4263a15bbf4f525 SHA512 4317a502e82b23aa2c66d406148eab83996139b4522f999884559b7b6d15709ded6779dc64aeedc657a1be3cd1337281c9e1297ae22dc6b227aef419dc707518
diff --git a/app-i18n/libpinyin/libpinyin-2.1.0.ebuild b/app-i18n/libpinyin/libpinyin-2.1.0.ebuild
index c6e54768bc3a..949814bc8171 100644
--- a/app-i18n/libpinyin/libpinyin-2.1.0.ebuild
+++ b/app-i18n/libpinyin/libpinyin-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/project
 if [[ "${PV}" == "9999" ]]; then
 	SRC_URI=""
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
 
@@ -29,9 +29,7 @@ IUSE=""
 
 RDEPEND="dev-libs/glib:2
 	sys-libs/db:="
-
 DEPEND="${RDEPEND}
-	virtual/libintl
 	virtual/pkgconfig"
 
 src_unpack() {
diff --git a/app-i18n/libpinyin/libpinyin-2.1.91.ebuild b/app-i18n/libpinyin/libpinyin-2.1.91.ebuild
index 528e0eee1113..0529ee397abe 100644
--- a/app-i18n/libpinyin/libpinyin-2.1.91.ebuild
+++ b/app-i18n/libpinyin/libpinyin-2.1.91.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/project
 if [[ "${PV}" == "9999" ]]; then
 	SRC_URI=""
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
 
@@ -29,9 +29,7 @@ IUSE=""
 
 RDEPEND="dev-libs/glib:2
 	sys-libs/db:="
-
 DEPEND="${RDEPEND}
-	virtual/libintl
 	virtual/pkgconfig"
 
 src_unpack() {
diff --git a/app-i18n/libpinyin/libpinyin-2.2.0.ebuild b/app-i18n/libpinyin/libpinyin-2.2.0.ebuild
new file mode 100644
index 000000000000..0529ee397abe
--- /dev/null
+++ b/app-i18n/libpinyin/libpinyin-2.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/libpinyin/libpinyin"
+fi
+
+LIBPINYIN_MODEL_VERSION="15"
+
+DESCRIPTION="Libraries for handling of Hanyu Pinyin and Zhuyin Fuhao"
+HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/projects/libpinyin/"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0/13"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+	sys-libs/db:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+	else
+		unpack ${P}.tar.gz
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -e "/^\twget .*\/model${LIBPINYIN_MODEL_VERSION}\.text\.tar\.gz$/d" -i data/Makefile.am || die
+	ln -s "${DISTDIR}/${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" "data/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz" || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libzhuyin \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/app-i18n/libpinyin/libpinyin-9999.ebuild b/app-i18n/libpinyin/libpinyin-9999.ebuild
index 4d8960cc6eda..20abcddac60e 100644
--- a/app-i18n/libpinyin/libpinyin-9999.ebuild
+++ b/app-i18n/libpinyin/libpinyin-9999.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/libpinyin/libpinyin https://sourceforge.net/project
 if [[ "${PV}" == "9999" ]]; then
 	SRC_URI=""
 else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/libpinyin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 SRC_URI+=" mirror://sourceforge/${PN}/models/model${LIBPINYIN_MODEL_VERSION}.text.tar.gz -> ${PN}-model${LIBPINYIN_MODEL_VERSION}.text.tar.gz"
 
@@ -29,9 +29,7 @@ IUSE=""
 
 RDEPEND="dev-libs/glib:2
 	sys-libs/db:="
-
 DEPEND="${RDEPEND}
-	virtual/libintl
 	virtual/pkgconfig"
 
 src_unpack() {
diff --git a/app-i18n/librime/Manifest b/app-i18n/librime/Manifest
index cca46bfae4d6..9edf620ec981 100644
--- a/app-i18n/librime/Manifest
+++ b/app-i18n/librime/Manifest
@@ -1,3 +1,3 @@
 DIST librime-1.2.9.tar.gz 5516609 BLAKE2B 7b05fedb093f7595c7bf7f4893624b35b0cdde1816c9c99f9ed5d408c8fd21d34a361d16b94c43b3e5e23b10945f075711762f08ca30abee35849a332ecfee2d SHA512 2266ef96ad21ec5981b4ca5371d4e16eefed545ffbde07093ae0d0be070a64f9869baa09b6bdcee2522438e08c72a842a7e0b225a6ca1b661708a80cf3aba83a
-EBUILD librime-1.2.9.ebuild 892 BLAKE2B e768dd801d40523427bc613c02034707d7960e2576d2722d6135d5c62d3e610087986be181c68ee33299f2ab76115c284eefbe67ab18ef5aef9a307b6d7b35bf SHA512 88be6b3d55f057ebbc5048162a676f56e611ccdcb2cca37b9fb5ef39ec554e478c96e577102858cdb5a3e02e0001b3ea5469f8673d5d9d8a0d3211f4e5d88f4c
+EBUILD librime-1.2.9.ebuild 895 BLAKE2B 07b6892c4f14fb61e21849fcf337460d1042a7f78708905db97623f6b5d4dcc8d28c0f6456fbb7055e4dffa297b42c581c9a8c08d9ae6d30b09b7972f6f4476f SHA512 27e10fae37861e123e955f9342449204a091116f1324382b778fcb78f4940a6585cf5896a7df9af2d7d31d16eb41430be7054f99df44230e844d7c377df8942c
 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 11ec817ae96d..e897af759e35 100644
--- a/app-i18n/librime/librime-1.2.9.ebuild
+++ b/app-i18n/librime/librime-1.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -21,7 +21,7 @@ RDEPEND="app-i18n/opencc:=
 	dev-libs/leveldb:=
 	dev-libs/marisa:="
 DEPEND="${RDEPEND}
-	x11-proto/xproto
+	x11-base/xorg-proto
 	test? ( dev-cpp/gtest )"
 
 src_configure() {
diff --git a/app-i18n/man-pages-zh_CN/Manifest b/app-i18n/man-pages-zh_CN/Manifest
index ecd8c0b1fa38..1e198de5cc12 100644
--- a/app-i18n/man-pages-zh_CN/Manifest
+++ b/app-i18n/man-pages-zh_CN/Manifest
@@ -1,3 +1,5 @@
 DIST man-pages-zh_CN-1.5.tar.gz 3762338 BLAKE2B c2c740e6ae6f6e0cb26af7bca4e9d5ce75b20eb535362030565c8ed794c984ac8d1c7fe0ee354f58cbb37bc2dba1067afc33dbe4af07257938b0137156b43790 SHA512 799eac7e6c64dd9bb647bf490457bc6ece76870d261606e33f48df977762b66f778fb5afe3608443be100e516988c700ddb53de2a226e7b29d32348fa240ce91
+DIST man-pages-zh_CN-1.6.3.2.tar.gz 1845997 BLAKE2B 3af6859593e4b2a52ef3ce93f2d18fe0f102e63cee3c7035de04ab4d8b8ac491ceff284b1a2f01a5e4dcdc4869c2a9768ff7dfde48b9e89813a2e558bf7b259e SHA512 61171406482a24c3dfd1b6303af3d7fb086466d5f05d5799f50488beb78c91c5d1bcf574aab669b71fa0f027691a0be1a1d254d08f823ff4bd8bf976e0c83dff
 EBUILD man-pages-zh_CN-1.5.ebuild 643 BLAKE2B ec1026616838e311022ba6f1792b29e7e2529d869aade168aa7384995ba4ade5d7d97d4f2d7b18fc6e825289f999575ee618733ab0c0d7a7ca6a9b31ef36c7b7 SHA512 2311e3c84969eb1a5654b5e5f1eabf6c6331ffec4d566e3035f36946c830104171f65da7c5b2564e37f0dff3c72581cf94d44a979370cb2f223a06696fcea12b
+EBUILD man-pages-zh_CN-1.6.3.2.ebuild 840 BLAKE2B 3c3d0bcb492e4abb5a4a789d6250be66ee945a95932fd7eb5f85a3e64e162f1ad833d1c99258fb961d78557e446ab9a12e9b92e1f84e5af2472d0d2063c50ced SHA512 f8e426425001fda818a94c310286c248ce0c5ca13e67b2ebc7abd5a9c9704c1f89ba06c98d0d70a2218b87e42e8be3e5889924d26c0f35ae64f4c9e876fcb088
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild
new file mode 100644
index 000000000000..571125909774
--- /dev/null
+++ b/app-i18n/man-pages-zh_CN/man-pages-zh_CN-1.6.3.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A somewhat comprehensive collection of Chinese Linux man pages"
+HOMEPAGE="https://github.com/man-pages-zh/manpages-zh"
+MY_PN="manpages-zh"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="https://github.com/man-pages-zh/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="FDL-1.2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="virtual/man"
+
+src_prepare() {
+	# remove man pages that are provided by other packages.
+	rm src/man1/groups.1 || die
+
+	eapply_user
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	doman -i18n=zh_CN src/man?/*.[1-9]*
+	dodoc README.md AUTHORS ChangeLog NEWS
+}
diff --git a/app-i18n/tagainijisho/Manifest b/app-i18n/tagainijisho/Manifest
index 007462d917e2..7204df090cc0 100644
--- a/app-i18n/tagainijisho/Manifest
+++ b/app-i18n/tagainijisho/Manifest
@@ -1,4 +1,4 @@
 AUX tagainijisho-1.0.3-sqlite.patch 425 BLAKE2B 0d14c8619933ca9218ccae185c21d57453b95ec96d7ce7fcd64b0596fd6746df8f9f5d98429c799a9e5a00795875ca7ea0d029b0a888969681f13a2ba0800498 SHA512 aca8593bc860f3bb640134e49898106414ff57b1cd6a39be5371151ed32e8bdb45a0747535f5f0d4710367919cf329fc2c308df38731b3c94be16f4992d7d174
 DIST tagainijisho-1.0.3.tar.gz 24816175 BLAKE2B fbe9e671675b2a938aa13aaae87af7f076f4f20c6024d90fa70f2c86f5e1964998d83047b69473e4f9a43e46eacde6b61bc6620b5cfb13c1b4d12a3b1317a280 SHA512 3afd75cc27e8701d93df54a2244b83090770cc80ac20ab8fb843d2ab925ab575f73d731a2ce736179fb7361af68e94694ec91f813d186c87e730368c41535c53
-EBUILD tagainijisho-1.0.3-r1.ebuild 1750 BLAKE2B 806074d83e8c60b5e1a2b1651655e34dcbe2e9065a32a7598b7f2fc05524e133adefac68206c80ac4da08cc601b829e38106f5ecf5e52ad9f74e21a7e3b8011f SHA512 3063dbebd0b86d27afe05507270d1d2f681f13a748c46490c49db38f21eae5c9653233678b2c503d3203b07b5d0992162fac738aa77e9116f86745ebdbda4262
+EBUILD tagainijisho-1.0.3-r1.ebuild 1751 BLAKE2B 98b42350d471ef3f42ee092b6a2952e6eda8347efb229447666a00bbc0f195e1d366de08857864d4e7df18558a7202abfcffcb16b7f59ba20bbba3124eb908bf SHA512 2d664fc8ab217d57fabde412368b368fd02b1e04918fe3aa7d6f348035bc29583956c07d295549b32b1d0abc60cdd572b16efa74e0184e9f6861cf40ea584161
 MISC metadata.xml 993 BLAKE2B b628e44a061d94a8f800c97d31a780bb028e04b0e74f3ea1896b0d2eee51d7d6253a1df2c81ac63807ec96256c01d8b8a255f511dd630276198caa5fc8424859 SHA512 04b51cecbf4cd124c47707ade93e4b314e106b4384eff831466030a6b58e081bef6c4f00d66a1658eb4e07828ec8fba2f980869ee7a65982c47f201fe232a412
diff --git a/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild b/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild
index 6b4b8db7eed2..b89dc7ed279b 100644
--- a/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild
+++ b/app-i18n/tagainijisho/tagainijisho-1.0.3-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit cmake-utils gnome2-utils
 
 DESCRIPTION="Open-source Japanese dictionary and kanji lookup tool"
-HOMEPAGE="http://www.tagaini.net/"
+HOMEPAGE="https://www.tagaini.net/"
 SRC_URI="https://github.com/Gnurou/tagainijisho/releases/download/${PV}/${P}.tar.gz"
 LICENSE="GPL-3+ public-domain"
 
diff --git a/app-i18n/tomoe/Manifest b/app-i18n/tomoe/Manifest
index 18ab05721d55..32af54cdccb6 100644
--- a/app-i18n/tomoe/Manifest
+++ b/app-i18n/tomoe/Manifest
@@ -3,5 +3,5 @@ AUX tomoe-gentoo.patch 599 BLAKE2B d297c41007f17ac07f6a80fb451c2d605ebf275b64af9
 AUX tomoe-glib-2.32.patch 688 BLAKE2B 5aeb0fa73f54331e20d8a3cd360a4e7c06e770f988686bd3ddd055b49390abd1c064a9369d89c7a4f6cd6c9631a075ba56857b0db54befeace96c233cf9e7947 SHA512 ec0344ccb48ecc8f0df3a76424ed93c9e223a3b22733626a460c4729681d7f9f072ddb84311d22e161c04503dd845c7da774ea9832df32cb79199ca47589073c
 AUX tomoe-ruby19.patch 2646 BLAKE2B 7b2289af7e87946bb9c4cb197b493bc2b8625a3bc3f22ee42270a403bd36b1bee4efcbb46117f11d537e3c8a38dfbcfca6484c0a1db6ec2f0b7a5469dac35b47 SHA512 52f555412853c3485e8d3ab7b7739f030e2c3d2b5c4aac14ebb967c93427fe04cbcfec2f5997f09f0f7611dc268ee63437b256ef4cac1ea805f0ae84a522b836
 DIST tomoe-0.6.0.tar.gz 4918949 BLAKE2B c9f4accc77fe7c6214c4d19dbbac7d0d39ed7947588ab1b8a1416f6cfeda33a6cfa84352f888d02848c8e2026bd5c36d2fe52d099bda6ca41a6d215733b11aa3 SHA512 eab618d7b28fc9613c175fab6f80fc7d6acc34af3a47f20c11b42a32acd87143ae10caca67fa1a5e2e75441d431799a5725a5d507604f8bd7447bbc1826f0bb8
-EBUILD tomoe-0.6.0-r3.ebuild 2143 BLAKE2B 341ed2eb5e7408e054f9578f62c1cffc5d4eac8dd0577b1fc0a686a39c8e29bae7fa49f4de54ca044a71f1b8000c33a58c69900ef28db7e329ef886b45aaa08e SHA512 8404db587e1776a864801d9a9ff7396a2c4a63bd0f780821f8a3a1857d74bb6c2fc3edfe13f2989bdcc5b597a481316ba363c53045d025b383beccac7dfd63d4
+EBUILD tomoe-0.6.0-r3.ebuild 2136 BLAKE2B 62990d33dbb526e9e82e2e1dc754f8cfe735000b39196250ccf7c78fdbfa4ed1ed17b7a1591048efc4e0f844656762176cc27cc260d71bcad0a2b26ef1bc5e26 SHA512 70814b92e3da0d39d38dba7380c59f3d1c265cb4afb8c56abcde02ac4ea3b95c58b352f1d09b6b0c30749ec037112d98da68cef42427c9274ce6812c4cd134d3
 MISC metadata.xml 482 BLAKE2B 454f6c496dda5f9ca738bb81c843a650be203b58bbaf4f0775204be463de6eccdd11023705295e89d1cc8513eead67dbe1fb26740bdc39216e8e2d4ee838e8ca SHA512 0898e0ba0bd42458870d268ee6bc881da1c88ab01969037d57f0d4abf5f140a7ce77bf87d918976bd763a33c8869e73d0fb2ec744be747d5bc30d594cc54efeb
diff --git a/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild b/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
index dfa2430580ed..249cf77a5630 100644
--- a/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
+++ b/app-i18n/tomoe/tomoe-0.6.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby23 ruby24"
 
 inherit autotools ltprune python-single-r1 ruby-single
 
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index 7ca0666c036f..72549074ff75 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1,7 +1,7 @@
 DIST transifex-client-0.10.tar.gz 71817 BLAKE2B ff98cf6ec54131fb7fe25f3eb5b10d204b4269db1d72ec45cd1646fefca9e71e8493846560ad380778ab27119ae81f10a01b3405fb39a20839098f86de8756cc SHA512 c8134f3fc04953d468c2e6ceb0ef90e8335709bde778c5d7d532b3ea390e71abdf8856b8eaa5acf6507c4e6fd2f918e6b0989b3913ee603cc5987b1a9d6b3964
 DIST transifex-client-0.12.2.tar.gz 177046 BLAKE2B e676930ef1269db6b28cd9aebeab20749ed51d27428d0ff7f7b2ac3427812d1a36598d51593d739b5447e088f82e34c6c0b7b209f3c9568f3577bbb640ce0399 SHA512 5cf1df26a195b85cbb20dc6b53ce9e6a39330347edee7e294f8f50bfa954bc47304dcaed1109e405794c67bef0fb62ae6eace90e69556c89ec48d14d6990fdb7
 DIST transifex-client-0.12.4.tar.gz 179349 BLAKE2B 4287bf32a31a5319f54ae5f141f53fa00554c542d7f0f1000e985547f01029b05dc18f38ef992d37c08c6c0ab54d934a4ab37c37f0bfee299d824224316acbad SHA512 516531a0c5a7242da27e8b34a0513b24b806d3b3a271cfe29b31ef7969472f82a37e6fbb1d6198feb1c5bd99d7503bacf3f162808504415ea46670af3fe2369e
-EBUILD transifex-client-0.10.ebuild 496 BLAKE2B 6f353fa9656efeb09dd9c36631b4d726ba1026a9af84de11340f92ed4d49f42defc1993e1997904385e34aa6a7aeeac2afe984a09d119f71a61f82b7513c4e95 SHA512 4eaeeb5ca90a3d4afd3c7f46ea6a2914d9877b34894f5a5dda51e397d874e0e53e47df05d607200dcb90601af47c4a077b6d066ff49bfa330c9fdabc81776a18
-EBUILD transifex-client-0.12.2.ebuild 511 BLAKE2B d43cd80a3d5a191860248c2e677623ba39d826c2a5be8ba1162362be737b5356ab69d4d20f6c36d6c1668a345dc121dfafa23de86fb3bd249155a26154bfa22f SHA512 57e7f7c40e0d39bcff8742fb9d50394fc3c501646c2ea2a06809c204037aff8b6e3b0bdecd4187a3f1002b594d649b80709b243ab70c3700c30455d53fbd3fcf
-EBUILD transifex-client-0.12.4.ebuild 629 BLAKE2B 5b471f0702f1190d92a6bd8a54064aa3b3b557fe0cd579af33bea1954644c6b2ffddae5bf8826581ac2347c02fb87e4f4f33ae6ff01877e1a7c96a9de0665ce0 SHA512 4c4340ab25fd3e3852ee6da819ab761f98c7903fc03022c08315765e7ad189a1ab92238f12e4af7abcd0c7d7b4a47894e7f393862ef684f9adda1490d19b0281
+EBUILD transifex-client-0.10.ebuild 497 BLAKE2B aa3269d370a187f15c506f560af4d24587a72ef05816a2af668be4995805d2c02a245c57a70834fb4e2501be35313c76842a72ea766e71ef426802292924f2fd SHA512 fb907677958cfa3278922b22b420511f0243302b82d18aff21459e85b0a5d6f58ce5a5ac00bbf939d05a9d88c1104886078e907f88bb6116aa011472659deecc
+EBUILD transifex-client-0.12.2.ebuild 512 BLAKE2B 5c8bf4e477d373f8e57065baf1bc9e5040dd67c4fa5a39ce567c163521c8a6ab381075b6b16d9f0bce16f7d375970caca6d4365162e2f6fba04f67475b767536 SHA512 284e9383b5399b098e7bc26806cec41affcc6c8b254a4491c389123d1d29716b01263d7c48a10eda51bc255f71e7492689580bf309bea6cf333c484b5dd8b849
+EBUILD transifex-client-0.12.4.ebuild 630 BLAKE2B 87aac93ffaa04f2a103643f91d6914eb223d88285aee8b590cb13e61175e12ea8ddaee4c1a7a1b5a3385ad6c9f86fa53460a902c58b210046238446b8a752ddb SHA512 edc94334592b18b96de1390fede7a91abfee5f200ef8be3b77e4929a57979f9db12b3aecd2493cbe570e6f651c6da39b1250e84a8e9241d17bbbaf0505dd48e2
 MISC metadata.xml 395 BLAKE2B e5566817de8587a0b985f3c608a62a389fac50cd352ba62de05cd33d741129e9ca5feea892c2ae0b46d22882a7c3aea8623b83f00d1fd62f94c5e0b91b9f769c SHA512 142f6e0d75c0dcc6cc315899a48f0362c08977c0f8f70c23d33715080a979f2320050df48d320747ca73c9651fa94411179f335aea5b4713b3640122ffd43cb1
diff --git a/app-i18n/transifex-client/transifex-client-0.10.ebuild b/app-i18n/transifex-client/transifex-client-0.10.ebuild
index aacf51b512dc..ffa6e59029dd 100644
--- a/app-i18n/transifex-client/transifex-client-0.10.ebuild
+++ b/app-i18n/transifex-client/transifex-client-0.10.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="A command line interface for Transifex"
-HOMEPAGE="https://pypi.org/project/transifex-client http://www.transifex.net/"
+HOMEPAGE="https://pypi.org/project/transifex-client/ http://www.transifex.net/"
 SRC_URI="https://github.com/transifex/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-i18n/transifex-client/transifex-client-0.12.2.ebuild b/app-i18n/transifex-client/transifex-client-0.12.2.ebuild
index c2aa8411acd1..267aa3228929 100644
--- a/app-i18n/transifex-client/transifex-client-0.12.2.ebuild
+++ b/app-i18n/transifex-client/transifex-client-0.12.2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="A command line interface for Transifex"
-HOMEPAGE="https://pypi.org/project/transifex-client http://www.transifex.net/"
+HOMEPAGE="https://pypi.org/project/transifex-client/ http://www.transifex.net/"
 SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-i18n/transifex-client/transifex-client-0.12.4.ebuild b/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
index 0ed9178bed17..49b915494430 100644
--- a/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
+++ b/app-i18n/transifex-client/transifex-client-0.12.4.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 inherit distutils-r1
 
 DESCRIPTION="A command line interface for Transifex"
-HOMEPAGE="https://pypi.org/project/transifex-client http://www.transifex.net/"
+HOMEPAGE="https://pypi.org/project/transifex-client/ http://www.transifex.net/"
 SRC_URI="mirror://pypi/t/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-i18n/uim/Manifest b/app-i18n/uim/Manifest
index 25a2c20414d3..fb4dc091738d 100644
--- a/app-i18n/uim/Manifest
+++ b/app-i18n/uim/Manifest
@@ -4,6 +4,6 @@ AUX uim-1.6.0-gentoo.patch 381 BLAKE2B 4a9184a9c5e28258691a116c4b7bde8bca200d27e
 AUX uim-1.8.6-libressl.patch 2041 BLAKE2B d13fc555ce0351b46a08f6fd258a5f222ac104e5107281548a97d2251cfcec89ece8addc2bd5be51f192a854b72701bb9abdc1f97e2c717cd2ae907a088579c1 SHA512 a1af2af13b26b631064165c8f6d6dafaba09d236b489e0e8fd84a7ab6d9c0720a8a91cd9f8baabcc1e640157559fd77f68e18d5e85aaf0c335e25b69e0ef120a
 AUX xinput-uim 108 BLAKE2B f66525e52af923170224ca9953e82489d7f6f92c3e83d96452663ebd538723d1dbaaaa4233bf2bebe1ad6f783fffd4e3e4e82bba5f6fd92d0ef88e3cbaaff6eb SHA512 b3ba31a87e19f589ac8051ece45b6b6c44b295dde76a5ce6164d1e435d791c4e7cafc7192177384f4052fd928caabb8574a9192cf783f4cb22e4ee16741343fc
 DIST uim-1.8.6.tar.bz2 6500739 BLAKE2B 78623c015cafafa1fbaf32542535de1f0207f8452a422d929a15f4421e4c9926192d0d3b761a7865a38affdf616dc5477e083c0fd8655261ff80ca817fd37029 SHA512 26a95d3b51ef7a99108234b9af30ee7b74141cb3af13d092d4cdbf0749f630934cfd67f74b09dacc3adcdce4a390104489d68a4e2419ec07418645a9b4e5715b
-EBUILD uim-1.8.6-r1.ebuild 5791 BLAKE2B cb61ee664c059f9c68d6625d6d59b937c0d518d284094db9cb1b7f54fed48300483f75553d83328b314a71227ebd935a15bfa361d005d07860bbb8892af99231 SHA512 ef2acdb2a57f4a809790bbd2e8d6886a32fa6581dd2ccf19578cc54030433eb7ca7bad1ff1cb3f2bd1d1cd275ac98500f81392da6b4062a99cff9a50911b44f3
-EBUILD uim-1.8.6-r2.ebuild 5899 BLAKE2B 435a763610a8ecd15ebf877d41b9fa86615302aa1e312af1a0e8966220821eb7e3c82c54f63c8da0493ea55fb6a77e1121e9885995d1c20c698550fb1492dfce SHA512 8582ea76d6ba9ad94d3bbc4e4b721c36dbcb3353529f0f5d64e1c0c17b5f48880e4841b72436734539629c00973e432c464b38b197e6fa66d9fa54390bb3eaff
+EBUILD uim-1.8.6-r1.ebuild 5769 BLAKE2B 141384df6fcbd6b2ebf91889c7316335b1edfa8ef048ae13db71f0ec0dd0d44cf38be7a7440c29e0e20ab8dd560442ba17d3fd60e17dc36de62f283182797fb8 SHA512 aa884381f32be8dd47ec7c74f0dff1d97593b6eede94fb47b8fec7acace65b5d96456765970e58f8c2d8315f5fd33e627c40b650fe3a1da12592af0962864687
+EBUILD uim-1.8.6-r2.ebuild 5877 BLAKE2B 0674d551262472928874bd15b48dc686a7aebf62b3e354681701690a9d1ac939a21cff544bd3f4a43267662028fec12162b3d54a12290edd7121d41304ffbf85 SHA512 c7a9e994ed6d0e365ae68615c9de0864533ad6f578cbd1b7794bd63cf75596aad837b299e8b953e71bc42e114a4bd0e0d965e17edcb42c62ce142a24bf0f443f
 MISC metadata.xml 1064 BLAKE2B 627c105f3c768168368bfa609de02f0fa067902f6975926e50c4b36983f44b34fcd46905d2d59cbda4533e045f8c7dfb1a1c4a58c92ccc78a3217232a6a67b60 SHA512 e265b2bab3338a8cc89b456fbbd46b8a2a1c59f50704e66fe3505e955b75226b786fff3abc061b9c7fe2edb5039fe265d59cf5b4750fd73ad092aafe4b390a56
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index 4689635b1b7f..f72b7d26bba5 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -55,10 +55,7 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
 	>=sys-devel/gettext-0.15
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)"
+	X? ( x11-base/xorg-proto )"
 
 RDEPEND="${RDEPEND}
 	X? (
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
index ffe51b96501d..cac96b004b75 100644
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -58,10 +58,7 @@ DEPEND="${RDEPEND}
 	dev-util/intltool
 	virtual/pkgconfig
 	>=sys-devel/gettext-0.15
-	X? (
-		x11-proto/xextproto
-		x11-proto/xproto
-	)"
+	X? ( x11-base/xorg-proto )"
 
 RDEPEND="${RDEPEND}
 	X? (
diff --git a/app-i18n/unicode-cldr/Manifest b/app-i18n/unicode-cldr/Manifest
index ee0f93d5533f..366c6b5708c7 100644
--- a/app-i18n/unicode-cldr/Manifest
+++ b/app-i18n/unicode-cldr/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD unicode-cldr-31.0.1.ebuild 496 BLAKE2B 8df1bcb6bbc05a9177c20aab6337a752e65d21ac11993aaa85a48025f5e196eb151a09dd3525ee76ffdae1710c0ff399fe6428dbada25ae89d83f64300b445ff SHA512 93ba56c3abf39bc27c7d825c63255fcea2c1c2d942b3984fd5a98cd911399f5ac4002e1e89972ca5495e9787cba266d0ce82f4d83ff9699d4c33bce90a02a880
+EBUILD unicode-cldr-33.0.ebuild 717 BLAKE2B b006633e8110d3192fd50b056a65284e2f2968596f9188915ea0775385740021cabe5ee4e57c81cfc2fbc78de8de3503962512df6427818120d1436799238ffa SHA512 b43596ab85bbd46cca4ae3418344b407d2907e3570e7608d5a1c8810a51f51ab532719e5171a4877700ea3cc2aa9ef2c938a30e5ee89ace26ba016a486160a30
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
new file mode 100644
index 000000000000..2b0a7f62b66a
--- /dev/null
+++ b/app-i18n/unicode-cldr/unicode-cldr-33.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Unicode Common Locale Data Repository"
+HOMEPAGE="http://cldr.unicode.org/"
+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-emoji/Manifest b/app-i18n/unicode-emoji/Manifest
index a6a5c2e0ef04..599e7183bfd6 100644
--- a/app-i18n/unicode-emoji/Manifest
+++ b/app-i18n/unicode-emoji/Manifest
@@ -1,7 +1,13 @@
+DIST unicode-emoji-data-11.0.txt 59720 BLAKE2B f1416d01d384245769549cc6ea93a2fe28bbfe77d30b26c9042965e3f9aee546572ef593284f767017b3a76acbc8015987c924be3afcc06df60b31588962a455 SHA512 501847414275564c7753b7d2b8e45cdfbf9fe96a96f0f3eea81f34c480da551b317b432ca426f6441c95eea520992e8888ead749e9c60da38233afd159d9b555
 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-5.0.txt 103383 BLAKE2B 1fc122b617963090d7ce165c9bc13a0507c5c26e60c36fa320f3527bae72e7362be944aa28cc4ea29598551361c304d43c7fe276a0452c2c5fae7e584b3169da SHA512 729bbf862b8d7ff6225b7416a0a464592f89040e4c27674c0d9afb6e0d997162c0a336c2a1e9de41313dcd45b504b3b27915ee8c67e45186c942c2996076d554
+DIST unicode-emoji-test-11.0.txt 361356 BLAKE2B 0e3b035fff3a4e542b3dd1172cf1438648a273ec0490316f843009b725c04764180a3ce0581b3e9819a0a5724c95ae5b536065e80401510d0b8e174636544184 SHA512 89c5a0f2eb460234e50dcc0fc904fbb254a1c0afa54b5bb672032f01764e0bed3624d1a4cd5627c83fcf1ea1347c9e3baaca05b2c685890afa505763baf8be79
 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-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-5.0.txt 115207 BLAKE2B beb8f304be16ffe34fde4cab20bfb981f3ae61ffc6827ced0b3160de7e405459fdf38c6e7fcafdd3887da16da7870b84520f1c68e661480efbd0cb9510a04649 SHA512 26398ac77035d2f5df7a61f4c2a8a098af8e551576c9c9f157379c05aa8f75de5a0827c9bc476eb20f32c38b0c3605f6a1d9e07fe27f0e75df359ed2a7e6d25b
+EBUILD unicode-emoji-11.0.ebuild 950 BLAKE2B d110d84d78d73537a9eb88337e4291ddd0f551de709d6cb20ca2b9369e05330d6cc6289364139e7ce9a4c2ef86943211cff284c11848c136b7364a2032a7e892 SHA512 91ca9016c7d22cc16f1fdb233f3c931a4fcbada09eb2026348aee712fe5ce05dfd7b22a8969b38831eb6e3b51f34af8db2d5680e50c93ac59e9fcdad191bdd43
 EBUILD unicode-emoji-5.0.ebuild 878 BLAKE2B 6ba9e72ea96c5e0f747bdf09c1fb172b30a36e4195ec50c7f6c598370b25f0a9227a26a31eebc71c0e84d651599df8f2e9163ff42651a1aa55cec98dbaac7bb5 SHA512 be5759f2f41f8640817ee94ddc21e6f9cd58dec8253d5c7c147c1870ec01814e420c0d2ab72c6681b408774865157d2d3bd8766b090fcf28a62092351ef64ba0
 MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
new file mode 100644
index 000000000000..8a9a211570ba
--- /dev/null
+++ b/app-i18n/unicode-emoji/unicode-emoji-11.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+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 file
+	for file in ${A}; do
+		newins "${DISTDIR}/${file}" "$(sed -e "s/${PN%-*}-\(.*\)-${PV}/\1/" <<< "${file}")"
+	done
+}
diff --git a/app-i18n/xvnkb/Manifest b/app-i18n/xvnkb/Manifest
index c99d1e9a4ded..f4b36899a583 100644
--- a/app-i18n/xvnkb/Manifest
+++ b/app-i18n/xvnkb/Manifest
@@ -3,6 +3,6 @@ AUX xvnkb-0.2.8a.patch 562 BLAKE2B 9302bfc3e510b555995f00efb9bc9d51276ce557a8b4c
 AUX xvnkb-0.2.9a-ldflags.patch 1261 BLAKE2B cfa566937710bc9c45f9faa0cb6d5dc4d62ef96383c957e7e0d3d731814d5112978062dd873e5428b1035f77f2a96e5e76973258c35da859f98b76cc1773cc52 SHA512 5b54ce3d25a9f634f53347e553ce45b35456228b0cb00f9308d872dcbb33c18218e27921a54e4b9e91d98892f0490c864662d96cee09e99a8400fba46f590afb
 DIST xvnkb-0.2.8a.tar.bz2 76221 BLAKE2B a9bc825ba9412f7e2fa1fdd400ba5f648ad9001dbac7e3b804fc444d5b88534b4f75cb529bf489cb0b107564d4c562be419ea9883b29d154cb3141e0d52fec1e SHA512 76ed49fec52fbcfa4a81a7d80208b3f11d911695e2f8f37d9fbb5e6e1899ffffa722c26a577d4236dfd459769d08d0180593ee0db971910b0cd62e77c49516d5
 DIST xvnkb-0.2.9a.tar.bz2 76429 BLAKE2B 33205bfe8dcc2fd68eaffb507dfb2db55cc1a71d33765f807b3804091a29f8c34ca8dcaf65a3f3978da921534d054096fb22abded3c4829d5ca256d3e51fff34 SHA512 3dbf4adb65f321d721fc74e05e92d2d1460e63c49e8a1ab2e10ab9f015e1a57bd3e641645d1283f1d0c5592eb7b342bf210d9fcab9ba441b6416c2f8fd1af6da
-EBUILD xvnkb-0.2.8a-r1.ebuild 1472 BLAKE2B 0f93294be1935553be9a2977ddd0495a9363bd780215fd6f450732fa4138fd5832eec86d3800a83909beee4d7a0a603b4e31b280e4a5d6f802d7eec53ba0707d SHA512 626665662d5d52dabd211c03724ed3ed71b3fc956481d902b3eb7ff7f8163bd1a8fa7b93413ff0d1c1a33e2d07c10a8209f18e727e6423dd4300fad10158b688
-EBUILD xvnkb-0.2.9a-r1.ebuild 1415 BLAKE2B 9db4fadac60f28f18cf9d55248736aff7426173ba234118910081920884f3cc6c1adf3ace0246867144dfef666efbf9bee8bcdc50734a4de61e5cbd3b9c45416 SHA512 a03f00b5454b19af34189be817166fdc3186a451c07a6719727bd949d39b1ef0fa986158323136411fc98fb931d5f03bfddf8a51956875df4e0d85a59181eb01
+EBUILD xvnkb-0.2.8a-r1.ebuild 1475 BLAKE2B ee9a28a876916552ffaa30a53caf3b5adad82d6ac91fbba9edad9bb86b7774104529d1e47c2c88d0fb8e29d58856d05327171b7e3ac9105a827430f1212e23ea SHA512 1106b935a4bf289caeff5ffabaab1e7fe162d70142d015264e05659e76d6e07ff032d4c38430d3700b968cfb6154f879b0e5d0502ce7f1660c38b31dbfb33ae7
+EBUILD xvnkb-0.2.9a-r1.ebuild 1418 BLAKE2B 9525e9568e5d0326735b57cf7a0ae063ec9a82cd40d8b685e2a9004c6e7df1e6f42772fc7372ee94d601cb00486ff11cff1e41562ffe0ebc3ea52e6f80ead995 SHA512 05278f944e057721b635cbecf06c11d1b1f7699537c2f0843455a0c70937608c49ec9d008105b9fd5f1259ae28347e34823d99aa2fe80e89b33fb19c1c4ce3a9
 MISC metadata.xml 319 BLAKE2B d651b6c56f28bb3735d1ee4cbe42ab1cd6f0db55692494fbb78ad9e61aa5655a9003dd12d2da620d184bae5739f79c9642b69e182fc134ed0401b8b135e78694 SHA512 72d8e0bd2181f6f9ab0b0d9a688a718b6e5b606abb7882cb50d36c0e273308055eeb87f0a55834d85240fea60278c8933c828a79822a24b9700189bc1bea77b1
diff --git a/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild
index e16c7b2cef1c..d69068c2ea85 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.8a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils
@@ -16,7 +16,7 @@ KEYWORDS="x86 ppc"
 RDEPEND="x11-libs/libX11
 	xft? ( x11-libs/libXft )"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
index 8d9cdf902b59..e2d8f9a37aca 100644
--- a/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
+++ b/app-i18n/xvnkb/xvnkb-0.2.9a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils multilib toolchain-funcs
@@ -16,7 +16,7 @@ KEYWORDS="amd64 ~ppc x86"
 RDEPEND="x11-libs/libX11
 	xft? ( x11-libs/libXft )"
 DEPEND="${RDEPEND}
-	x11-proto/xproto"
+	x11-base/xorg-proto"
 
 src_unpack() {
 	unpack ${A}