Sync with portage [Thu Feb 15 09:28:00 MSK 2018].

6 years ago · 8cc1dc69cf
parent 7193a9745c
commit 8cc1dc69cf
652 changed files with 6328 additions and 3498 deletions
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
--- a/app-admin/apachetop/metadata.xml
+++ b/app-admin/apachetop/metadata.xml
@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>oleksandr.trotsenko@gmail.com</email>
+		<name>Oleksandr Trotsenko</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
--- a/app-admin/consul/Manifest
+++ b/app-admin/consul/Manifest
@ -1,2 +1,3 @@
 DIST consul-0.9.3.tar.gz 7278357 BLAKE2B 041164951fe798f51bc79ef4cf322e3c37b583471d66f0d78b0a100b57ee367a5942ef07fc85adafeb6c014b5a6047dae10da42427600de25656614c235dab1a SHA512 a1c9cdd3e197afbf088bd1866af15c1864cb8d042dc65d2fcc0d9070b8bf2f9380cf2ceadaff6d5bba7ecd379d53f4b8191e1ae6832f1b2c82f21c62f07d8b0f
 DIST consul-1.0.0.tar.gz 7354292 BLAKE2B f2e245cec5859e23dd55c991de5c4d68be8526ec7085273660271407d9f1898c803edbffaff3cd4f0d5de114b9d8b2cd205e03002d5685b77f831957b021140c SHA512 8223f79aa1b7bfc5693168b56fbe9a506ca504771c92328afeb99e78dce8699c7532582749a372dfed10dd4b7c440ace0dd248f1ae27247059da3e2f88293a88
+DIST consul-1.0.6.tar.gz 8211299 BLAKE2B 7ea5df497f4796e572a86127e0854935f97439504aff82fb697f33700e9d138048772f32f171dbbe4f1fb4d1ceefa7ca96cf3dce2a22cdffd4e1906f6befa55b SHA512 c55f09272859b828816ddf548952769172331c22be8a70a7f73ab9362744fb1f4bc5fdf81955a0dbc4101584cf3660f182620dcdc56bcf94b42dce644be232a8
--- a/app-admin/consul/consul-1.0.6.ebuild
+++ b/app-admin/consul/consul-1.0.6.ebuild
@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot systemd user
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/hashicorp/consul"
+DESCRIPTION="A tool for service discovery, monitoring and configuration"
+HOMEPAGE="http://www.consul.io"
+SRC_URI="https://github.com/hashicorp/consul/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MPL-2.0"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND="dev-go/gox
+	>=dev-lang/go-1.9:=
+	>=dev-go/go-tools-0_pre20160121"
+RDEPEND=""
+
+pkg_setup() {
+	enewgroup consul
+	enewuser consul -1 -1 /var/lib/${PN} consul
+}
+
+src_prepare() {
+	default
+
+	sed -e 's:^\(GIT_DESCRIBE=\).*:\1v'${PV}':' \
+		-e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e 's:go get -u -v $(GOTOOLS)::' \
+		-e 's:vendorfmt dev-build:dev-build:' \
+		-i "${S}/src/${EGO_PN}/GNUmakefile" || die
+}
+
+src_compile() {
+	# The dev target sets causes build.sh to set appropriate XC_OS
+	# and XC_ARCH, and skips generation of an unused zip file,
+	# avoiding a dependency on app-arch/zip.
+	GOPATH="${S}" GOBIN="${S}/bin" \
+		emake -C "${S}/src/${EGO_PN}" dev
+}
+
+src_install() {
+	local x
+
+	dobin "${S}/bin/${PN}"
+
+	keepdir /etc/consul.d
+	insinto /etc/consul.d
+	doins "${FILESDIR}/"*.json.example
+
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners consul:consul "${x}"
+	done
+
+	newinitd "${FILESDIR}/consul.initd" "${PN}"
+	newconfd "${FILESDIR}/consul.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/consul.service"
+}
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@ -5,4 +5,5 @@ DIST mongo-tools-3.2.13.tar.gz 2712076 BLAKE2B 66e76e049b6a322e05dea21c241d983eb
 DIST mongo-tools-3.2.16.tar.gz 2720003 BLAKE2B e5cb694549b5c70cd07fc8e891b1a78cffec0f99aab62978c70d38c01d9b1ae9c401f9618d24d9afc036ae66657eac40f710076d177497b51c97b963cff31d86 SHA512 61c8cfd04a36e329c3573b73945d20a5623e1aa0a3430b309530e85e4289a27a46a850ec48ede7f04e66e67e23745ef26f5f4ddcf68ffeb647128e3d2526a724
 DIST mongo-tools-3.2.17.tar.gz 2719970 BLAKE2B 666b67d8abdd10f7fa7c557e3c3906fb3cc6bcfa0b97a05e39e5f1ea923d2beb5ec249b3b0a521c4cce4bd595bf18672d8bce38152f84825bb3fffb058fd3b29 SHA512 62c2540027e07b8276621e08d13657864d16021030e3c8f9bc0d351454319d448f889cf6a48b8467ea3270365376ed0c3beb42ceae3f28357910148c6b4054b2
 DIST mongo-tools-3.4.10.tar.gz 4719399 BLAKE2B 8165248bf58f2ea2b02e365a3609c72b72e98dd5902f176e251fa2add1ad26e90900e06c35dc6db4dbe161e541bedfc1776f5e15bbb41dcc9a7be17800424362 SHA512 b861bb3fb1a32c3aa2efefcf6a13bb6d4783ac1a9b006c477fd04deb338cbf6b7adc3944bc6919513b92bd96b8500813ff4af49c9dec0719ebd2fdaa99bc39a5
+DIST mongo-tools-3.4.13.tar.gz 4719488 BLAKE2B 27c7716b21f1a23408d0f31aee111c5877f5172121a987c234ff01eb2690bbc71bca4e00fc13b701ca6b91dce0c9aaae43c2239a60a52e130e1390bf5bafef60 SHA512 c233268328ef868ec06c9a9d83009141b39c84ba642e7de7dece3210717ba8de600f39896a30ed23d1577db9f4697c3a8d720cf35248bca2b00a17642b043237
 DIST mongo-tools-3.6.2.tar.gz 4693924 BLAKE2B 61c44d579f6eb4013ee6c0118ebe89a2d454ef8cf6ad933479885cb71d169185272b03d9c63fa738d67bbd1b9efd4bc964eb17adcc5002508589d198cdb17752 SHA512 5ac2b1d2b33271f63c406c69bd8a576a21f4dcaa6f75839e0f907ebc9968f0e121eb3800e88da050c120856e7ddda4f12d551bb731d4acac0f5cf09f66fc948a
--- a/app-admin/mongo-tools/mongo-tools-3.4.13.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.4.13.ebuild
@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# do not substitute version because it uses git
+	sed -i '/^sed/,+3d' build.sh || die
+	sed -i '/^mv/d' build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+
+	# ensure we use bash wrt #582906
+	sed -i 's@/bin/sh@/bin/bash@g' build.sh || die
+
+	default
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+	  myconf+=(sasl)
+	fi
+
+	if use ssl; then
+	  myconf+=(ssl)
+	fi
+
+	./build.sh ${myconf[@]} || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
--- a/app-admin/mtail/Manifest
+++ b/app-admin/mtail/Manifest
@ -1,21 +1,15 @@
-DIST afero-06b7e5f50606ecd49148a01a6008942d9b669217.tar.gz 40613 BLAKE2B 1c5b0d331418f865e0e81e9f031acc5afc0636e5cc7f6dc13337fe274432d21f98f34b01ab4b2cf05fb6612e1e09c2da9db25d3110475e1e737304f4b709065d SHA512 eb97a0983ba2c8c063ce0f1e8f907095b10b5c2a06730acfe54a9835f8eacba2e5e1db3a1a9438d907c67b507c5a66056a6de22d86405d6b294c51b2543ba355
 DIST github.com-fsnotify-fsnotify-4da3e2cfbabc9f751898f250b49f2439785783a1.tar.gz 30624 BLAKE2B ced6ca6f115eedc954f6b583b28e470ec5dcfe0c279d55a63c00ee942acde095e9eef8fb4c3fa289f34871f43a7562fb71142d070a54398bc5d91122e64b4ad0 SHA512 cff467ffbed22edf4cde7a52e0f0d7a5b4a06446a6140ad7fa018dfcce3b400342223d888a0389042d2e6fd7abe261d0e515adc6e4c03a74e3cf074e88af17ab
+DIST github.com-fsnotify-fsnotify-c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9.tar.gz 31164 BLAKE2B 8ed43520ed7df3f52585b41358e2c89c55cd9bcea78affbf76d11cb2d3660e2de63d2debd91cd4da7c1a1fde3afac1086e616ab632460389cd4f10cc633a3e81 SHA512 809a90dcfbf565d335514257b577150a367e16ef871e2f44584a13fe3bc3ac87cbd789f7c7882a76cf7a7c546740c6552ec7382b4a6d18c4f0e845bcc3a7b0c8
 DIST github.com-golang-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
-DIST github.com-golang-sys-314a259e304ff91bd6985da2a7149bbf91237993.tar.gz 769752 BLAKE2B 3d118ee77f7ff6ada9388fb3c569726aa00e77eb743ca38f51bcb4fbd1c31a8d43103b6cb2a5291224653c699d75143f3c449e84a4dac2b7dd2797e5a035e8e3 SHA512 91c2db2cb798fe0b185602e135b6acea6eaee1c5345581b14439197287ec2d7e9b9a57b951a6e033ff8c40ed8f8f4f8a8c5a68f29f25b048922001fa8290df42
+DIST github.com-golang-sys-37707fdb30a5b38865cfb95e5aab41707daec7fd.tar.gz 796903 BLAKE2B 4e31f27784cdc5781628ac082d7994a5559be59268003366a3185eac6eb514495f6d82ba13c3046f1061c6abc68712ae8d0505ab7567c8e6057b90f3217c272e SHA512 580bd4cfd26d82aa8c6870eabbd289b76f2ba529ed8496428b29e482ec39bc617cdbcd2f2f2d476ee93526bd18550dcd239085b9f74fb4d24ccb87a3b357bff6
 DIST github.com-golang-sys-43eea11bc92608addb41b8a406b0407495c106f6.tar.gz 771129 BLAKE2B 592e1af8d74e77807a65901b576bebacfca5b2331c6943031720a873bc7782ef35cf3300e5307c79164ded89394df97e7342f73168f4e2354b13cca9260785a8 SHA512 96d1b7254d16c107a5496766ddfc2e56b56a31fe9c4bd34c23ee814911036145d8327203302fbdcb6bcb9af1022073608ea123c6df661132392ecb611e427c96
-DIST github.com-golang-text-1cbadb444a806fd9430d14ad08967ed91da4fa0a.tar.gz 4624392 BLAKE2B 514ee46b5316566cbae7fdcae0155ed273455f7514485c6e64833082bbee98893ea61e4aab74e5ad77f2781dbf3fe7211c3c584afb21bc90544616dadc7289ec SHA512 c37cc66e33e89d23a2fa4b707589316f9e28fe1d7131bb6208c0dcbd514f879dfff78328b871eb6d3ea1610f8b3f1d8c3061d94f88bc658d7bd8df2a19851c45
+DIST github.com-golang-text-4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1.tar.gz 6112758 BLAKE2B 88f0ece79f03800d6482430d569fa9b65d8ec4b15d42f65706ca665349346961ab273d3a7d2d0676d0c6c05a12d08f75c1465fd0ef632611b7b606593466e5ae SHA512 9fc536d4971e8861c5b905dec44fc7eddfaf8b0dafd5f904929bc2b63a65ce3fa28108d3f9f954a9db8d4ed24be532a519bad41e09e8076f9b75e6564f75f7ce
 DIST github.com-golang-text-825fc78a2fd6fa0a5447e300189e3219e05e1f25.tar.gz 4624908 BLAKE2B ca7357d28720c08199b206ac0b88ce28ce281767683503a1d09de002d9c97f10360e274d17405d23d565b1f62d42f2f7fa4387138fb5188052c110037cd16114 SHA512 6b2e721540b1f7ad8dc5c0a7ce45d7631721f223f484e58e561ed482bfefca7a8e4068c68abe33ba08e1db9293d7f99223859d8ba525c868798ecb61995c3f93
-DIST github.com-golang-tools-68e087e2a5786de2c035ed544b1c5a42e31f1933.tar.gz 2246337 BLAKE2B be52a8064a94a3c2864bd847a9d1f6c177576786c87b2ecacc0433cc05496d03b46bd9f5fec10ec9fc13073a5e3ffc5f89b65d55ea09f49888f7c7cc9bbe4b3d SHA512 58b95d6f3ecb8f22355d8a29da50c13de1e9dc41be1e4e8fd01b3e5510df12c3837daa76390f7e223c45ccafe56f84c5fff606e46124f99159c902f334b530ac
+DIST github.com-golang-tools-a4ae70923768403983fdab4e1d612d79c08ba465.tar.gz 2255154 BLAKE2B 45597a951f6c1c678a10fe3fb968cf5eca3b9328f78c57335ee9a45801138b8f169b953190fe293a271efa70c6f1419587cc5aa737f87b217c7b2bd6cabc7c9d SHA512 8a8ca4fab9a691bea505c2953974f29c95c488e81f794daba2edd7b9211b8a309db5ca93a008cbeacc0c967760a7b5182f10ac33da1902cd342461348fca56bc
 DIST github.com-golang-tools-f57adc18217d779aa42266ea71a545827755a77b.tar.gz 2246529 BLAKE2B c6a683b6e490b34c219d8210654d87623aae6f2f2fdb8c716daa54927cbf4250d8522dac00c42dde6c1178e5a843f1fcfe15b30e550c57ac7a5175a152e97353 SHA512 147c4541c56f31b030a45eacd6c87afeccd1b8039bcfbc8882b6a4466cf3fcaba504214938085861a9253c36dbb544bd41b3fb4b2be7f2de5712e823c375890e
 DIST github.com-pkg-errors-2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb.tar.gz 11481 BLAKE2B ee1048ff0b0bdbf77b0c6c2102c32b3691efd5bc75a69d327d6c1e7c19b2ebdd2da7cba383fc312a16122fc89d85ad56265f02847adae8b21674e1c200b364cb SHA512 6e8ce6cc7f3e3065fdb3f53da9be99771e7d3981fc091bad6e6f436c44f7891838a879fc6267bc5349fc73a8c896aa1eaf7cb1b17fafb5d7dee39962b6269c6a
+DIST github.com-pkg-errors-30136e27e2ac8d167177e8a583aa4c3fea5be833.tar.gz 10912 BLAKE2B 189f7fc6a465a4841f242f8222681f0a80bc251151407d14abd585c65f84204c0ce80c7f0bfd6ea5b03c8790021b7436bc180d3571440ef98a85dbffd5cfd60d SHA512 c38f35def5c4ddba089250f2fde423c53d1f0b33dbba4495bacf2fe772b1216672305ada0b353882a296e4b7fc49c72e99633ed7465b03c31854f762e2890277
+DIST github.com-spf13-afero-bbf41cb36dffe15dff5bf7e18c447801e7ffe163.tar.gz 43576 BLAKE2B b3eb215e8ae38ded0c85405e63fab7876f23948dce8272e8a3fc4d710c8617982b62aca0f57c97953340f8eecd87eb7eafce63a1d860d2fdc19d3f433b519d3f SHA512 8e200be7a5b8816f5b6ebf7df4ad61a7e0bacad56fc9f269a16a32c83cd0d293530e71fccd671545c812b27e70eb5e947faddaf4d765b67ce8f2eecb9eebbd9c
 DIST github.com-spf13-afero-e67d870304c4bca21331b02f414f970df13aa694.tar.gz 43416 BLAKE2B 0cc5f646df68a0b2cb4625810b730ec49f984e050084933f2686d2d433ee7c9abdf2e37838c8b8e1970ffc630eca10dca142ec112686493664e32ef6ab39c965 SHA512 6b428a8599c132ddda18b6b6fd1ae6dfc8d11b39e4b3e3e0e9b763571339c2a5e0a2c95a54a6953b82c45b92775ed3ccc0b152e9d9a2fc649f10dd754b3fe2f7
-DIST github.com-spf13-afero-ee1bd8ee15a1306d1f9201acc41ef39cd9f99a1b.tar.gz 42570 BLAKE2B d384c30e9c51b84e64e1c7539e292338a013f03b8b3495096105e47d7d58e0baa1d2c74e57eb53bbaa7e53dddb912929bd12a93bbb7da1d9b3f697e8c51f819c SHA512 f39c841114b3d9fb68ced40c9fb7ed86e8a6cc22f2cd7e151ae6d9ed13886536966f3ba325dc4a0a985ffacf47b8eee063db9b07116c190baccbc9e42dd62830
-DIST go-fsnotify-1.4.2.tar.gz 29552 BLAKE2B 3760820cd1c9d1107186c9743fcdf9518c7a8c0a0736e3e7d70cc3d4ac550b284d4aed30a61c30d38a3b3af40c15ff29d508bf073df4daca4af07ad240cbf951 SHA512 fe76ac5f0fac2075a5436a726628ed9abf9a8668482c3b599977cf6167fc1334af738a907ce5bd627fa6b5ff4c4f4ac7dd7515b5f2892e74f32869b2a6c79944
-DIST go-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz 19688 BLAKE2B f9ff73060c3b10603472c3ea4f50b4afa6abb5a4e9e7ac43d2a6c2e62541d43ef9f0ef7a8759d9b3281d72e5f90c516ee174c91de9a640a5bdf6877700450d44 SHA512 e9e70cf2a2d74ca813d0cadc23d213a1112ca4d1167abb63d8e0929585fca90c3a5bab1f49db20095c48bf1fe03b4424353c33728d09a201334eb65770888dc5
-DIST go-sys-30237cf4eefd639b184d1f2cb77a581ea0be8947.tar.gz 623731 BLAKE2B 6d80616b647ac0e44c21d78d37af83acbb516e80c3f232b3aff3153d863346fb42d89a422ec8917308d9e1040aaf59d31f23036114f5ece0027a7f7ee5c07d15 SHA512 a2cc30c19e05fa16e800679da933d842cc49e770e642ae8e49939a660fefe795069b5136a4d2b5fd4c094fd660e90f73a98d17c86503218c4f2f5c76fddf6722
-DIST go-text-b01949dc0793a9af5e4cb3fce4d42999e76e8ca1.tar.gz 4521690 BLAKE2B 88f3629affa5cf868ee7f78c4957126cfb53f71a4b602790c379d3d032e88a01194c9a1c716070039df3f224f3f3135840125f15dd6249787346a28dd7c545e9 SHA512 ac03833a836a4443a0f27a3bdb8701ca97bfed9a158b7f0a8fd78cf99325a10155cef0426c7a722abd739768a1a15e7e82f96690469aeb887743b5fcf37c3854
-DIST go-tools-76b6c242fbd3fa734fbfe26a653f14fd495cb03a.tar.gz 2195990 BLAKE2B 014fc197e8ab2c8ca8ebe434c6a58022d61dd90da5ad88b022818bc413325f8c3e6b358185d073fb203a7672fa27cc9b1cd435847b607bce682908f6bc0906e2 SHA512 397fcf06e4cedaa16de5009ba6b4a29cf2eeaacf3490e04fad265610ddf2159310e8cfd0661b3d75fc34ad1252c165cf490e61164de5dfd9ecd3cdd4e058f40a
-DIST godebug-d99083b96f422f8fd5a93bc02040acec769e178f.tar.gz 14683 BLAKE2B 65e90ce04deb93816544e26b66b9182f71e911bea41aa82e0eccc82596f08cfe74dbfef435ac3bb4c3fa9a282df02c43de3eafa68185e508cea50b511ddfc840 SHA512 8eb131c6aecf7d5691b2d35c53acd08b842735b029b6115bccc0e96a7a7441328603d618f810d1fe740254c71a1f01fcd3e7b2e85fbbb2c3eb9ec3ec9177bb1d
-DIST mtail-0_pre20161108.tar.gz 382393 BLAKE2B aa7cab94e550b7fd2c08d3dcfee6604f9ac42d7a14f8a84acfc56e400b9fa38e0a79718a0a93de4984a9d1fd3e0db219c401b0ffe45daec36debd7adb5de6f5f SHA512 5eb60f57bf267730ec01a07d8bac1abb4b9454610ce52c8ab2acc59a04e36442cc4b570778f9a0eb249d3a85f21cacdc70cce203b28e57f84ab2ef533a5bc2df
-DIST mtail-3.0.0_rc2.tar.gz 410528 BLAKE2B 6cf98f899e8fe0dc0e11de668e23242b964d10ca0610b761bfbc8035bf4df8a41d58d7155eb18d456f48616752b42fa1322a129daf833d6399169937ed7ac040 SHA512 95a1c88d0769f35ce9e9476aacb15f36a82f8a6a0e251e6f39ba97f11936f4d3b471be73d643d88afb51ef0b0f8d6b10555da9011f17381e00e397fe3911f3bd
 DIST mtail-3.0.0_rc4.tar.gz 425781 BLAKE2B c957e8ae735395ce197d805f2e5228511074fda08427f180e7b6110a45b74af2fb6bff9670b3d452c0561b7fa4d93105804c631df03c5d73197a81e44a4a35f8 SHA512 6354d36303e37e440636f965ffe5685cc30a886ac348ad85f33e384e4cf0a3616328857362361fdf0f1759d361323d08f6052d481f76f6dd8454b1efe3a24e8a
+DIST mtail-3.0.0_rc5.tar.gz 432769 BLAKE2B 2098fca72a7ca1564885a6c4d7a0a1b30ceee74d3fc310b0b18542b5e7bdf14dd17d40d4f3cd1bf62d7613375a470fef632bb9b185cc082b5633481e126e0481 SHA512 74c8fe536bde628cb9874a36a4693eb55e2e490d5e6d80a60d7f1f17fea66f8cf7a95345da406b4d4eeca9e6a42d614086d92ed2f8fc9180019f49f8ddccb055
--- a/app-admin/mtail/mtail-0_pre20161108.ebuild
+++ b/app-admin/mtail/mtail-0_pre20161108.ebuild
@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KEYWORDS="~amd64"
-EGO_PN=github.com/google/mtail
-EGIT_COMMIT=a780a6342bd70a8fb8ffe187ef988d5417d43a96
-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
-	https://github.com/spf13/afero/archive/06b7e5f50606ecd49148a01a6008942d9b669217.tar.gz -> afero-06b7e5f50606ecd49148a01a6008942d9b669217.tar.gz
-	https://github.com/golang/glog/archive/23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz -> go-glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998.tar.gz
-	https://github.com/fsnotify/fsnotify/archive/v1.4.2.tar.gz -> go-fsnotify-1.4.2.tar.gz
-	https://github.com/golang/tools/archive/76b6c242fbd3fa734fbfe26a653f14fd495cb03a.tar.gz -> go-tools-76b6c242fbd3fa734fbfe26a653f14fd495cb03a.tar.gz
-	https://github.com/golang/sys/archive/30237cf4eefd639b184d1f2cb77a581ea0be8947.tar.gz -> go-sys-30237cf4eefd639b184d1f2cb77a581ea0be8947.tar.gz
-	https://github.com/golang/text/archive/b01949dc0793a9af5e4cb3fce4d42999e76e8ca1.tar.gz -> go-text-b01949dc0793a9af5e4cb3fce4d42999e76e8ca1.tar.gz
-	test? (
-		https://github.com/kylelemons/godebug/archive/d99083b96f422f8fd5a93bc02040acec769e178f.tar.gz -> godebug-d99083b96f422f8fd5a93bc02040acec769e178f.tar.gz
-	)"
-DESCRIPTION="A tool for extracting metrics from application logs"
-HOMEPAGE="https://${EGO_PN}/"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-DEPEND=">=dev-lang/go-1.6:="
-RDEPEND="!app-misc/mtail"
-
-get_archive_go_package() {
-	local archive=${1} uri x
-	for x in ${SRC_URI}; do
-		if [[ ${x} == http* ]]; then
-			uri=${x}
-		elif [[ ${x} == ${archive} ]]; then
-			break
-		fi
-	done
-	uri=${uri#https://}
-	uri=${uri%/archive/*}
-	case ${uri} in
-		github.com/fsnotify/fsnotify)
-			echo "gopkg.in/fsnotify.v1|fsnotify-*"
-			;;
-		github.com/golang/glog)
-			echo "${uri}|${uri##*/}-*"
-			;;
-		github.com/golang/*)
-			echo "golang.org/x/${uri##*/}|${uri##*/}-*"
-			;;
-		*)
-			echo "${uri}|${uri##*/}-*"
-			;;
-	esac
-}
-
-unpack_go_packages() {
-	local go_package x
-	# Unpack packages to appropriate locations for GOPATH
-	for x in ${A}; do
-		unpack ${x}
-		if [[ ${x} == *.tar.gz ]]; then
-			go_package=$(get_archive_go_package ${x})
-			x=${go_package#*|}
-			go_package=${go_package%|*}
-			mkdir -p src/${go_package%/*}
-			mv ${x} src/${go_package} || die
-		fi
-	done
-}
-
-src_unpack() {
-	mkdir "${S}" || die
-	cd "${S}" || die
-	unpack_go_packages
-}
-
-src_prepare() {
-	default
-	sed '/^[[:space:]]*go get .*/d' -i "${S}/src/${EGO_PN}/Makefile" || die
-}
-
-src_compile() {
-	export GOPATH="${S}"
-	go install -v -work -x ${EGO_BUILD_FLAGS} "golang.org/x/tools/cmd/goyacc" || die
-	PATH=${S}/bin:${PATH} emake -C "${S}/src/${EGO_PN}"
-}
-
-src_test() {
-	cd "${S}/src/${EGO_PN}" || die
-	default
-}
-
-src_install() {
-	dobin bin/mtail
-	dodoc "${S}/src/${EGO_PN}/"{CONTRIBUTING.md,README.md,TODO}
-}
--- a/app-admin/mtail/mtail-3.0.0_rc5.ebuild
+++ b/app-admin/mtail/mtail-3.0.0_rc5.ebuild
@ -1,20 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

-EGO_VENDOR=( "golang.org/x/tools 68e087e2a5786de2c035ed544b1c5a42e31f1933 github.com/golang/tools"
-	"github.com/fsnotify/fsnotify 4da3e2cfbabc9f751898f250b49f2439785783a1"
+EGO_VENDOR=(
+	"golang.org/x/tools a4ae70923768403983fdab4e1d612d79c08ba465 github.com/golang/tools"
+	"github.com/fsnotify/fsnotify c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
 	"github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998"
-	"github.com/pkg/errors 2b3a18b5f0fb6b4f9190549597d3f962c02bc5eb"
-	"github.com/spf13/afero ee1bd8ee15a1306d1f9201acc41ef39cd9f99a1b"
-	"golang.org/x/sys 314a259e304ff91bd6985da2a7149bbf91237993 github.com/golang/sys"
-	"golang.org/x/text 1cbadb444a806fd9430d14ad08967ed91da4fa0a github.com/golang/text" )
+	"github.com/pkg/errors 30136e27e2ac8d167177e8a583aa4c3fea5be833"
+	"github.com/spf13/afero bbf41cb36dffe15dff5bf7e18c447801e7ffe163"
+	"golang.org/x/sys 37707fdb30a5b38865cfb95e5aab41707daec7fd github.com/golang/sys"
+	"golang.org/x/text 4e4a3210bb54bb31f6ab2cdca2edcc0b50c420c1 github.com/golang/text"
+	)

 inherit golang-build golang-vcs-snapshot

 KEYWORDS="~amd64"
-EGIT_COMMIT="5e6d38908091a8648c0f26c44ebd708e241f3814"
+EGIT_COMMIT="04017b5a1241b4e78b0a2dab84e5a332228b54d2"
 EGO_PN="github.com/google/mtail"
 SRC_URI="https://${EGO_PN}/archive/v${PV/_/-}.tar.gz -> ${P}.tar.gz
 	${EGO_VENDOR_URI}"
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@ -1,3 +1,5 @@
 DIST puppet-4.10.10.tar.gz 2995864 BLAKE2B c01e6a7529d70a4481e64b4119cfd9d05e79d655ef17495a98e2ab800ea527ef09f234782e7362b25bf1b1ed11d7c2a48e40815ac6dccc5a2d460886beb604e7 SHA512 e517ee349ead56932c9ff54f910d10842c1cd6b6f28673223a65fb72334662d4eabeccc1c7c7603e17aa712c356edbc27fe53d6e7dd7ba042cc0616d0076d755
 DIST puppet-4.10.8.tar.gz 2979824 BLAKE2B 802b65d48ff7d8303e3cc847a9f753a5e19c0ada6ee02dc1fc9c748da8d69462c34bdfeddeedf0057179ff1133665439c41e970c41ca1728463292ef26e996ab SHA512 9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d
 DIST puppet-5.3.4.tar.gz 2889645 BLAKE2B f1f4e2d9dfe457f89aa7d99724eaa9368ea50027747e2506b5cbfa176c1a9060bf87ce8c037b78f3c86c2e2974087f9ab4fc76cb7374f1a348ff410e9cfa83e1 SHA512 f24008651be15cf5c915f7a03dc0319eb2d076ddfb06c44fd846421fe29baba27ea43b29134077e1dc7c14a48b44104dcaaefe73bfdb00d7667c1c25a1b871fd
+DIST puppet-5.3.5.tar.gz 2890869 BLAKE2B 1baeddbaa47803811e14bfdbbf5624b617ced2ec6ec6b8072d51a556455838bf0934b1e0c578ef6b4d5df763260c0fa0f027295e3c8403c172a25fcc72179283 SHA512 d48b836a9c7db451c73048917e091a1dd3e1c259f4dde7a8867fe9931d9dbab46219f4b4dfa739669bb8d713a9defe13eae0d5b2dd26a6930b589f4cb0ab1361
+DIST puppet-5.4.0.tar.gz 2958138 BLAKE2B 2cb7e890774abde7183a7b3ac33771fe8006f526b7780a566788591cba20c1ff7540429a4ead13830700fc07105fdaec4317de69f4efa44c4b245b31164b6048 SHA512 6b6955416e4f14ba45318c1afce7db77226da2d14f8dbfeca059780caf188f9687bf31dff4a4c57f8172468e09c35e021721a8b8caf99050d72f90b290fbdb71
--- a/app-admin/puppet/puppet-5.3.5.ebuild
+++ b/app-admin/puppet/puppet-5.3.5.ebuild
@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	>=dev-ruby/facter-3.0.0
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# can't be run within portage.
+	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	# backport upstream fix for ruby 2.3.6 compatibility
+	epatch "${FILESDIR}/puppet-4-webrick-ruby.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(get_major_version $v)" = "4" ]; then
+			elog
+			elog "Please see the following url for the release notes for puppet-5"
+			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+			elog
+		fi
+	done
+}
--- a/app-admin/puppet/puppet-5.4.0.ebuild
+++ b/app-admin/puppet/puppet-5.4.0.ebuild
@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/"
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+	dev-ruby/hiera
+	dev-ruby/json:=
+	>=dev-ruby/facter-3.0.0
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl
+	dev-ruby/hocon"
+
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/mocha
+		dev-ruby/rack
+		dev-ruby/rspec-its
+	)"
+# this should go in the above lists, but isn't because of test deps not being keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+	>=app-portage/eix-0.18.0"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+	# Avoid spec that require unpackaged json-schema.
+	rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+	# can't be run within portage.
+	epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+	# fix systemd path
+	epatch "${FILESDIR}/puppet-systemd.patch"
+
+	# backport upstream fix for ruby 2.3.6 compatibility
+	epatch "${FILESDIR}/puppet-4-webrick-ruby.patch"
+
+	# Avoid specs that can only run in the puppet.git repository. This
+	# should be narrowed down to the specific specs.
+	rm spec/integration/parser/compiler_spec.rb || die
+
+	# Avoid failing spec that need further investigation.
+	rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+#	dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	# systemd stuffs
+	insinto /usr/lib/systemd/system
+	doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+	# tmpfiles stuff
+	insinto /usr/lib/tmpfiles.d
+	newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+	# openrc init stuff
+	newinitd "${FILESDIR}"/puppet.init-4.x puppet
+	newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
+	newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
+
+	keepdir /etc/puppetlabs/puppet/ssl
+
+	keepdir /var/lib/puppet/facts
+	keepdir /var/lib/puppet/files
+	fowners -R puppet:puppet /var/lib/puppet
+
+	fperms 0750 /var/lib/puppet
+
+	fperms 0750 /etc/puppetlabs
+	fperms 0750 /etc/puppetlabs/puppet
+	fperms 0750 /etc/puppetlabs/puppet/ssl
+	fowners -R :puppet /etc/puppetlabs
+	fowners -R :puppet /var/lib/puppet
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Portage Puppet module with Gentoo-specific resources:"
+	elog "http://forge.puppetlabs.com/gentoo/portage"
+	elog
+
+	for v in ${REPLACING_VERSIONS}; do
+		if [ "$(get_major_version $v)" = "4" ]; then
+			elog
+			elog "Please see the following url for the release notes for puppet-5"
+			elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
+			elog
+		fi
+	done
+}
--- a/app-admin/restart-services/restart-services-0.14.1.ebuild
+++ b/app-admin/restart-services/restart-services-0.14.1.ebuild
@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mschiff/src/${PN}/${P}.tgz"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""

 DEPEND=""
--- a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz

 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="amqp caps dbi geoip http ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="test"
--- a/app-admin/vault/Manifest
+++ b/app-admin/vault/Manifest
@ -1,2 +1,3 @@
 DIST vault-0.8.3.tar.gz 8128509 BLAKE2B 681b19e7a775e26d396411b137608bc5b68f1226e407dc254c9f498e59a6022d9633aa206b5efe692d35f816a6d8ee6399b7a00b64395b3d775b97fc46a93c6a SHA512 e2b273ebb761246f6d85fc040d911a3f3a7beb0951fed4adcbe5df4106dd0cb013328b5816ef4153b2c4d363f7f2a14ae1c82bae9baaea74ef707ff0934d6c8d
 DIST vault-0.9.0.tar.gz 8457263 BLAKE2B 021887cd3ab8185b3369f8355fc6cac23553e90277dfa2121fedcf170bbac19997f723c995ed0e00b80b25671ee827aa43a15040a6b57c43634abd5030dd7130 SHA512 c5755bd8a696764af2375ac51b955759ece36796e6c138e6fc3e8abd487c10ac41c8927501234e0cdfcd448021254b2f09097d8e00a6278b44f971d8b8442da6
+DIST vault-0.9.3.tar.gz 8694430 BLAKE2B 2ac99f5723b9ecf65382f10b795e51d29659b2d218732c6e9d8cc5a3a788a5dfbdc58926399a98ef27bae05454c74dec028a4ed631417788843c7ca7102263e8 SHA512 3939c952c12497f5fb9d4ba0fa4ca94acfd8ee8bb2f3636364dad680a54be4256d52018521573a0c1499a3cf573ff9daa27a52dee3ff7216181436b9aadea574
--- a/app-admin/vault/vault-0.9.3.ebuild
+++ b/app-admin/vault/vault-0.9.3.ebuild
@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit fcaps golang-base golang-vcs-snapshot systemd user
+
+EGO_PN="github.com/hashicorp/${PN}"
+DESCRIPTION="A tool for managing secrets"
+HOMEPAGE="https://vaultproject.io/"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="0"
+LICENSE="MPL-2.0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test"
+
+DEPEND=">=dev-lang/go-1.9:=
+	dev-go/gox"
+
+FILECAPS=(
+	-m 755 'cap_ipc_lock=+ep' usr/bin/${PN}
+)
+
+src_prepare() {
+	default
+	# Avoid the need to have a git checkout
+	sed -e 's:^\(GIT_COMMIT=\).*:\1:' \
+		-e 's:^\(GIT_DIRTY=\).*:\1:' \
+		-e s:\'\${GIT_COMMIT}\${GIT_DIRTY}\':: \
+		-i src/${EGO_PN}/scripts/build.sh || die
+	sed -e "/hooks/d" -i src/${EGO_PN}/Makefile || die
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+	mkdir bin || die
+	export GOPATH=${S}
+	cd src/${EGO_PN} || die
+	XC_ARCH=$(go env GOARCH) \
+	XC_OS=$(go env GOOS) \
+	XC_OSARCH=$(go env GOOS)/$(go env GOARCH) \
+	emake
+}
+
+src_install() {
+	dodoc src/${EGO_PN}/{CHANGELOG.md,CONTRIBUTING.md,README.md}
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	keepdir /etc/${PN}.d
+	insinto /etc/${PN}.d
+	doins "${FILESDIR}/"*.json.example
+
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+
+	dobin bin/${PN}
+}
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
--- a/app-crypt/cfssl/Manifest
+++ b/app-crypt/cfssl/Manifest
@ -1,2 +1,2 @@
-DIST cfssl-1.2.0_p20170915.tar.gz 8027590 BLAKE2B 5361a9ba7f08d3940aa5e27f65b55359871d85dcf8e4f21b6e59a9f3c9741490b16898e2001133742dfa1294927b0b322ffd5bdf836754851bed0c176bc710da SHA512 247ee892f7785ae11e8b2d38c1fdad0a3bcea9d9e410ce1bc985d15fad65b981c46e317cbb0fe0cacf190dfbbad7b9f8685f6ddd2a24056dd61e621b2cccd232
 DIST cfssl-1.2.0_p20171207.tar.gz 8028127 BLAKE2B 35bb2b6fa08345dd6042742891cc0ad87ffac3cd24e8f16551e7e4e36b7f11caf4baafee961666ed95cf14e77cf4e24e11f7d8d85503abfc42a8fe3fbc2fe758 SHA512 d94f27bcc5f59fb2882f6db802baff9706461f1a823706810f7ab5911fcdd3abc9150060df0aa756478774cf3b5e06aec0b11cefce32ff3c6ff85948b8624356
+DIST cfssl-1.3.0.tar.gz 4378109 BLAKE2B 4bc77b3aa8b47e0e5a434ff50e99cde44b750743dc58c18736acfd0115f6cb03533c0d4ff6e54111cdfc2a8c7d6d83539d07de5fddb03eda8a8a95b8b573e767 SHA512 0db85e82e10982f0c0c03fcae20fbc1936018f7252517cbd9a6150ff5d8f41c5e4719814a8a64a424065e4813b7da073e4ebb50306e1d673f0de7706a0c0e2fd
--- a/app-crypt/cfssl/cfssl-1.2.0_p20170915.ebuild
+++ b/app-crypt/cfssl/cfssl-1.2.0_p20170915.ebuild
@ -1,13 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=6

 EGO_PN="github.com/cloudflare/${PN}"
-EGIT_COMMIT="7d88da830aad9d533c2fb8532da23f6a75331b52"
 inherit golang-build golang-vcs-snapshot

-SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"

 DESCRIPTION="Cloudflare's PKI and TLS toolkit"
--- a/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.2.4-r2.ebuild
@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"

 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb wks-server"

 COMMON_DEPEND_LIBS="
--- a/app-crypt/keybase/Manifest
+++ b/app-crypt/keybase/Manifest
@ -1,4 +1,4 @@
-DIST keybase-1.0.21.tar.gz 21127410 BLAKE2B 9f48b637aefa847ae5737937ed6bc3d9b7d222cda3ce5a388784104655092c1ad5fe0468680a1e0a02f5a7ea4fac1fb8e19430c9e4c3d542057953219976cd02 SHA512 60801ece5dc0df9f0da58143baf00729e1a79183d2b8209c405749f422dd8cecf7f4059e0799c88ca6e3f1e5a7ad8bd6805dd2401b0945954c6b1465c04974b5
 DIST keybase-1.0.33.tar.gz 29170354 BLAKE2B 78799ea49cde32e3c1be781e281b5ca188f7a5d846fcb7e41605d6e2526bc4e36f6ef991567631e9c72eeb6b194ebec740516e886f4af419b01e47622f030c42 SHA512 d02933e88613102e27a4aa5f2494ae2b55456cab8c5cadad9c412069b24c574a20609fc83b88bc8f9aa00bfd300822bc4c882392f65fec3e7a8056cebc6fb9d4
 DIST keybase-1.0.36.tar.gz 30043919 BLAKE2B 0053088754b0a4a47314032e87a7c5165aff59ded585ae20fb12c3dbf0c7437f7f0370f236fec0db501cacb3a75e87ed494df8f688d360c58904e851eb119f60 SHA512 c6bd4805240bdafd27eac382a30fac6e5ac3e6eb313dda027533c3a8f366077c894b38c1b972ff5688104e1ca4231cbf4242eeb168de9782bbac732da5639ed0
 DIST keybase-1.0.39.tar.gz 30226025 BLAKE2B 5d10e4afe3f0f1691221cbf69ff3e427fe318768e74f5891d32416e92ad5c1c45ad3ff0c83ea2d2405f4492a2d2af989ff587c60c9a5677ae580c9502e9a5726 SHA512 def416bad6fc3513a3341aecaf03bce356a890667e4c64f9edc1c469b3a1f167c3022f6c1aabaa48257983aaa9826b45117ada6cc26bf862c97092c904cd32f1
+DIST keybase-1.0.41.tar.gz 31643095 BLAKE2B 72fe94c8996b0dfad3d75f487545d5cb96ffa09c46276104171f103f2fcbb29199013ad8075fdddf3655f63f55cbd2f0d0768b5f0e697b7339262736d9c29ca5 SHA512 1382f008089d8704167842960aec9e4007ac32db589bad45944428ad92ac90b1802338ff6ccc0c570d40b9c9115170a2e15c590f875cdc8261d203c01402385c
--- a/app-crypt/keybase/keybase-1.0.41.ebuild
+++ b/app-crypt/keybase/keybase-1.0.41.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
@ -39,6 +39,7 @@ src_compile() {

 src_install() {
 	dobin "${T}/keybase"
+	dobin "${S}/packaging/linux/run_keybase"
 }

 pkg_postinst() {
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
--- a/app-emacs/mldonkey/files/mldonkey-0.0.4b-emacs-26.patch
+++ b/app-emacs/mldonkey/files/mldonkey-0.0.4b-emacs-26.patch
@ -0,0 +1,14 @@
+Fix byte compilation with Emacs 26.
+https://bugs.gentoo.org/647638
+
+--- mldonkey-el-0.0.4b-orig/mldonkey-vd.el
+++ mldonkey-el-0.0.4b/mldonkey-vd.el
+@@ -801,7 +801,7 @@
+     (insert "\n")))
+ 
+ 
+-(defun mldonkey-vd-insert (&optional ignore-1 &optional ignore-2)
+(defun mldonkey-vd-insert (&optional ignore-1 ignore-2)
+ 
+   "Insert the table with the downloads in the MlDonkey buffer."
+ 
--- a/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild
+++ b/app-emacs/mldonkey/mldonkey-0.0.4b-r1.ebuild
@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2

 EAPI=4
@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"

 S="${WORKDIR}/${MY_P}"
-ELISP_PATCHES="${P}-vd.patch"
+ELISP_PATCHES="${P}-vd.patch ${P}-emacs-26.patch"
 SITEFILE="50${PN}-gentoo.el"

 src_compile() {
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@ -1,3 +1,4 @@
 DIST containerd-0.2.9_p20170917.tar.gz 1140788 BLAKE2B 96effa85f9cb03c3e416d53438376af6c7965660bf9c9931fdfa7fee94cca9386f2732e70dc88ee32b83e902b7d4a3072e22a817d9970ed1e07dc1271e8b33ab SHA512 c749bda691197ec8a7603db9ad92f2800a3f065143430a660333b7862518deb4c158a1c1fd01671dff438b40988d4a64d8f06bab05496b8728c6e2f57cd7da0a
 DIST containerd-1.0.0.tar.gz 3763785 BLAKE2B cd4af679c9028b616aeedd594518f796a350523899c13da5a848a5843b318394166ddfbf5e7ed1f473a3759b26d134659f928d8e15da17ebdf65a41d2fd5f914 SHA512 8c1a03de7f30976675e4482b4f18f4b87da56108de4d92f2e33b4cb4f8c188af5b3fad87971a294eac8442a0fb6ddae48cda81334c363203a8c8bdfc09176a7a
 DIST containerd-1.0.1.tar.gz 3766659 BLAKE2B 36c96a9e3cba22578daff31e46d9a876095e9de7e20e1e84a41076d9936f30a5681e41187a90f9a01884fd02086fa3c9a6ee29c8261401988a1cfa2026952431 SHA512 351c0e298ba6a9a14df2f367df23049a8a833eb18238e3d41cf0066feb2e0b8f2aa7b25fb4484a1b5c95bccf5cba3a8076a5bcfe25602b5368e7cf2a20872160
+DIST containerd-1.0.2.tar.gz 3772144 BLAKE2B 7549f47d1f0ff0244d7dedd41aabb76d2c2fc4942f8da3cf45fe0ca7b808b3aed4e39e0338d30ccc63cf37db3e59412442d43d272d3b073823e210a24d4d991a SHA512 d6b8eeaa942e1dccb21feb0723bb1ee29c878992c0f7128038c967580b4c6a1b4110371aa60962a331627d869d027a20ca47e6c625aedf68cac5d532d7f7094a
--- a/app-emulation/containerd/containerd-1.0.2.ebuild
+++ b/app-emulation/containerd/containerd-1.0.2.ebuild
@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+EGO_PN="github.com/containerd/${PN}"
+
+inherit toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit golang-vcs
+else
+	MY_PV="${PV/_rc/-rc.}"
+	EGIT_COMMIT="v${MY_PV}"
+	CONTAINERD_COMMIT="cfd0439"
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~ppc64"
+	inherit golang-vcs-snapshot
+fi
+
+DESCRIPTION="A daemon to control runC"
+HOMEPAGE="https://containerd.tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+btrfs hardened"
+
+DEPEND="btrfs? ( sys-fs/btrfs-progs )"
+RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
+	>=app-emulation/runc-1.0.0_rc4 )
+	sys-libs/libseccomp"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+src_prepare() {
+	default
+	if [[ ${PV} != *9999* ]]; then
+		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
+			-e "s/-s -w//" \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	local options=( $(usex btrfs "" "no_btrfs") )
+	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
+	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}"
+}
+
+src_install() {
+	dobin bin/containerd{-shim,-stress,} bin/ctr
+}
--- a/app-emulation/kompose/Manifest
+++ b/app-emulation/kompose/Manifest
@ -1,2 +1,2 @@
-DIST kompose-1.7.0.tar.gz 5230263 BLAKE2B c2e50ceadaa3f88b5d6a9c6fbca93a0a45a16fb4d208a9194578174d9b67697f70d52f8f7a517609b56acf0cb646a9ca4e9137e1a830646e1084c10aabfd1cc0 SHA512 bcda4d891cdc8a0e331aad3baca9e88be32d302ed1ab89a561874881ec9e1dd04f7158f9315ee59a49d4906cc9d08821a417ff04a8ebe9871edece842b2e85b9
 DIST kompose-1.8.0.tar.gz 5230179 BLAKE2B 47f2770eb527bb3b40e1734f9e5173ce4de55ef55460f624dcb22374d94d4a4ae650d82db6508dd0e441535c03da8a0f61d7600425e44604b580ecff493ba987 SHA512 4e618f9e9adc65abd2be503dd28b6d7761945a99788e910cc072d04b6088e953152f9354fe168fe7bf22252f698b957e2cc23440d242bed62c4b7415dc513e33
+DIST kompose-1.9.0.tar.gz 5229558 BLAKE2B 41c168dea0311ea4663b4056ec10a0a446f0c714a0d32cb6e75d4cb680335acb31d164d390fbde487856c268fb671a7d2e4238de2a542fd54e64e9c3ce693d41 SHA512 72d575bb79fea88de54740ed7a4809b68781b3473431c2c11213a32b9ff3dc9340ef49ea8009ff6f7f16dce8f36565a91b8c28ab45bc860d53075f42f3fde66b
--- a/app-emulation/kompose/kompose-1.9.0.ebuild
+++ b/app-emulation/kompose/kompose-1.9.0.ebuild
@ -6,7 +6,7 @@ inherit golang-build golang-vcs-snapshot

 EGO_PN="github.com/kubernetes/kompose"
 EGIT_COMMIT="v${PV}"
-KOMPOSE_COMMIT="767ab4b"
+KOMPOSE_COMMIT="093c756"
 ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64"

--- a/app-emulation/virt-viewer/virt-viewer-6.0.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-6.0.ebuild
@ -10,7 +10,7 @@ SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="sasl +spice +vnc"

 RDEPEND=">=app-emulation/libvirt-0.10.0[sasl?]
--- a/app-eselect/Manifest.gz
+++ b/app-eselect/Manifest.gz
--- a/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
@ -8,7 +8,7 @@ HOMEPAGE="https://www.gentoo.org/"
 SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"

 RDEPEND="app-admin/eselect"

--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
--- a/app-i18n/man-pages-ja/Manifest
+++ b/app-i18n/man-pages-ja/Manifest
@ -1,3 +1,2 @@
-DIST man-pages-ja-20130215.tar.gz 4384182 BLAKE2B eb6a4be0a53763776b629369028eeae96f472a8dcb0752559d124cbffc7b18a5d939fe6e37d05c1162aeec79701c63fe1602754f260edbb281cd543144d98c77 SHA512 655e9481dfdfc619013f8cae2928d7ccd70bba31631f7b10b894b1d96ab64bae4846be68d8a633791f1c169faed6d42466bd60ee4d7f92031f596d8f23cb6138
 DIST man-pages-ja-20171215.tar.gz 4802604 BLAKE2B 24ded9e82f20df322fa7e96a05806f37f26796475f64e2b075a60b60762e4b331c96e82e0582896da323a643070779204fb50eb8e68156ba2e74a1a41649f10e SHA512 8cef4489e3210c2e30fd880c1639aaf314005c7f3987001677cd869924275cbf9df27fdc855cba9d887e5a185da72779167227a68a080d370b233bcd4eca4d30
 DIST portage-man-pages-ja-20060415.tar.gz 67347 BLAKE2B 77be89a79be1d4fc3c09cd7c74cd8ccfd18649cdf0121daec008b21114c5a77618a88f4abed266599b944aa5bf11fe55c5b6e89fbba51ebe2a548eb85d9a2c6d SHA512 37364cdcb27b460663bdae31fea1ac653317ba4d928a5325c51814eb1677d7d9fb9bcc55cf64d63a8e6daaefa34d8604e0efe3582308957397cad31325a6eaad
--- a/app-i18n/man-pages-ja/man-pages-ja-20130215.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20130215.ebuild
@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-GENTOO_MAN_P="portage-${PN}-20060415"
-
-DESCRIPTION="A collection of manual pages translated into Japanese"
-HOMEPAGE="http://linuxjm.sourceforge.jp/ http://www.gentoo.gr.jp/jpmain/translation.xml"
-SRC_URI="http://linuxjm.sourceforge.jp/${P}.tar.gz
-	https://dev.gentoo.org/~hattya/distfiles/${GENTOO_MAN_P}.tar.gz"
-
-LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-
-src_prepare() {
-
-	sed -i -e "/^\(man\|shadow\)/s:Y:N:" script/pkgs.list || die
-
-	# remove man pages that are provided by other packages.
-	# - sys-apps/shadow +nls
-	rm -f manual/*/man1/{chfn,chsh,newgrp,su,passwd,groups}.1 || die
-	rm -f manual/*/man8/{vigr,vipw}.8 || die
-	# - app-arch/rpm +nls
-	rm -f manual/rpm/man8/rpm*.8 || die
-
-	for f in manual/*/man8/ld{,-linux}.so.8 ; do
-		mv ${f} ${f/.so.8/.so.ja.8} || die
-	done
-	mv "${WORKDIR}"/${GENTOO_MAN_P}/portage/g-cpan.pl{,.ja}.1 || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-
-	local x y z pkg
-
-	for x in $(tac script/pkgs.list | grep -v '^[#].*'); do
-		if [[ -z "$pkg" ]]; then
-			pkg=$x
-			continue
-		fi
-
-		if [[ "$x" == "N" ]]; then
-			pkg=
-			continue
-		fi
-
-		einfo "install $pkg"
-
-		for y in $(ls -d manual/$pkg/man* 2>/dev/null); do
-			doman -i18n=ja $y/*
-		done
-
-		pkg=
-	done
-
-	dodoc README || die
-
-	cd "${WORKDIR}"/${GENTOO_MAN_P}
-
-	for x in *; do
-		if [ -d "$x" ]; then
-			einfo "install $x"
-
-			for z in $(for y in $x/*.[1-9]; do echo ${y##*.}; done | sort | uniq); do
-				doman -i18n=ja $x/*.$z
-			done
-		fi
-	done
-
-	newdoc ChangeLog ChangeLog.GentooJP || die
-
-}
-
-pkg_postinst() {
-
-	echo
-	elog "You need to set appropriate LANG variables to use"
-	elog "Japanese manpages."
-	elog "e.g."
-	elog "\tLANG=\"ja_JP.eucJP\""
-	elog "\texport LANG"
-	echo
-
-}
--- a/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
+++ b/app-i18n/man-pages-ja/man-pages-ja-20171215.ebuild
@ -11,7 +11,7 @@ SRC_URI="http://linuxjm.osdn.jp/${P}.tar.gz

 LICENSE="GPL-2+ GPL-2 LGPL-2+ LGPL-2 BSD MIT ISC HPND FDL-1.1+ LDP-1 LDP-1a man-pages Texinfo-manual"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""

 RDEPEND="virtual/man"
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@ -1 +1,2 @@
 DIST ckb-0.2.6.tar.gz 526737 BLAKE2B c41d4e510fb9226b578d305fbcf1f899f0e4c4ce1334274fde365d50ed8365fff5fa60784a5bbc7b2a1f8c85b9812a78d9d4cf629bea88ea4c4104e2f75c3c65 SHA512 6d92b0e82865748d9731943462d2cb89c3ea0dea4170f8aebcf5e1ed491c5d635dcd69a4f1f385ab891846f2b3437e2cb154f5dae5f5446cf52e557ebf6343a6
+DIST ckb-0.2.9.tar.gz 664625 BLAKE2B 37dc9c75876ca46fb10241da7b223ca67e5b9c0a998386f0f82eba15a97045e269b1f8a75dea18297865826bff241c21b255a507fd26e73747ee2656a228c4ce SHA512 7910f089d7b01ceade5ae8282db931c9decb9296d4c9c5fc2419eb7fb4ba5a2c0f85721a3a6846ed24a72f61b18374baa7fd27e11329b5d2f65b21916e8b96e1
--- a/app-misc/ckb/ckb-0.2.9.ebuild
+++ b/app-misc/ckb/ckb-0.2.9.ebuild
@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit vcs-snapshot qmake-utils systemd
+
+DESCRIPTION="Corsair K65/K70/K95 Driver"
+HOMEPAGE="https://github.com/ckb-next/ckb-next"
+SRC_URI="https://github.com/ckb-next/ckb-next/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND=">=dev-libs/quazip-0.7.2[qt5(+)]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md BUILD.md DAEMON.md )
+
+src_prepare() {
+	sed -i -e "s/-Werror=all//" src/ckb-daemon/ckb-daemon.pro || die
+	sed -i -e "/quazip/d" -e "s/^.*QUAZIP_STATIC/LIBS += -lquazip5/" src/ckb/ckb.pro || die
+	sed -i -e "s#/usr/lib#/usr/libexec#" src/ckb/animscript.cpp || die
+}
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	dobin bin/ckb bin/ckb-daemon
+	dodir /usr/bin/ckb-animations
+	exeinto /usr/libexec/ckb-animations
+	doexe bin/ckb-animations/*
+
+	newinitd "${FILESDIR}"/ckb.initd ckb-daemon
+	domenu usr/ckb.desktop
+	doicon usr/ckb.png
+	systemd_dounit service/systemd/ckb-daemon.service
+}
--- a/app-misc/tmux/tmux-2.6.ebuild
+++ b/app-misc/tmux/tmux-2.6.ebuild
@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.

 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"

 CDEPEND="
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
--- a/app-office/lyx/Manifest
+++ b/app-office/lyx/Manifest
@ -1,4 +1,2 @@
-DIST lyx-2.0.8.1.tar.xz 10481988 BLAKE2B 121a2f5a86f9b2f92fc211c052a26dfeb0c89c3f3ebb6d9e9eab397af7aec1f696806f79d7fc75c03649bbefa06295ad03d7207135308cb14560596b0c0f4790 SHA512 17e313d3118dfe439f5251384f2fffdb45ffef5ec515953b7af0762d35c8e156a9338de698cea91cf8b3cedca1fc08364d8f3c50c9345f304d57004af695f901
 DIST lyx-2.1.5.tar.xz 10361112 BLAKE2B ddc6e10974f495bb465fced0bfe95e0530831e924c12323267feec59e49900efefda154abac927f3129ab0820706a870fb463e749cff2b5c4b47368d954c9d20 SHA512 6f8c62ff96458d0c8c8057ae1e587be4c63bd3bdf2d4f095c24d447017034eda8c6b645efbd258f0956a9bbfe5fde2f90df36515be7b8a94cb63674bc3a58672
-DIST lyx-2.2.2.tar.xz 15490148 BLAKE2B 16d9b1448da76dd0b02ee4cdec38831a0c3aa7a0798b4f99bb6c93717223dfd3c62145afa76324177ed162d4c45ab341a963831855c9607d8544574ae88766da SHA512 5057a06f0c37cb2beadb92414eec495ba0619f6c8a9fb5372a9feb90fe0d8bf850de5c94bbf618c8e27bd64404ae6687c48ee24aa6e1bd35580eb3b77d71d45e
 DIST lyx-2.2.3.tar.xz 15501856 BLAKE2B 08606f0c18d9cb5891bd7d612361597e3efc7e7855f7607c2620f10ddb22b7078d5085f725911496198d2d8a47ece54cbfe67cfbf4ec8eb15450271cd133b095 SHA512 b5a4a16b22680022651a0f3911c2c24bcd3541a573e672e541cb0af6572089e4b0e0ec1cafb40850e75c377e7da5b286d0314886e0c57d55f57645d8e4a07708
--- a/app-office/lyx/files/2.0.8-python.patch
+++ b/app-office/lyx/files/2.0.8-python.patch
@ -1,29 +0,0 @@
-diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp
-index 97c4f68..8f05e62 100644
--- a/src/graphics/GraphicsConverter.cpp
-+++ b/src/graphics/GraphicsConverter.cpp
-@@ -262,7 +262,7 @@ static void build_script(FileName const & from_file,
- 	LYXERR(Debug::GRAPHICS, "build_script ... ");
- 	typedef Graph::EdgePath EdgePath;
- 
-	script << "#!/usr/bin/env python\n"
-+	script << "#!/usr/bin/env python2\n"
- 		  "# -*- coding: utf-8 -*-\n"
- 		  "import os, shutil, sys\n\n"
- 		  "def unlinkNoThrow(file):\n"
-diff --git a/src/support/os.cpp b/src/support/os.cpp
-index 8f60c68..2f1cb91 100644
--- a/src/support/os.cpp
-+++ b/src/support/os.cpp
-@@ -63,9 +63,9 @@ int timeout_min()
- string const python(bool reset)
- {
- 	// Check whether the first python in PATH is the right one.
-	static string command = python2("python -tt");
-+	static string command = python2("python2 -tt");
- 	if (reset) {
-		command = python2("python -tt");
-+		command = python2("python2 -tt");
- 	}
- 
- 	if (command.empty()) {
--- a/app-office/lyx/lyx-2.0.8.1-r1.ebuild
+++ b/app-office/lyx/lyx-2.0.8.1-r1.ebuild
@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit gnome2-utils eutils fdo-mime flag-o-matic font python-single-r1 toolchain-funcs
-
-MY_P="${P/_}"
-
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}/lib/fonts"
-FONT_SUFFIX="ttf"
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="https://www.lyx.org/"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/${MY_P}.tar.xz
-	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.0/${PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x64-macos ~x86-macos"
-IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant l10n_he"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
-
-COMMONDEPEND="dev-qt/qtgui:4
-	dev-qt/qtcore:4
-	>=dev-libs/boost-1.34
-	${PYTHON_DEPS}"
-
-RDEPEND="${COMMONDEPEND}
-	dev-texlive/texlive-fontsextra
-	virtual/imagemagick-tools[png,svg?]
-	cups? ( net-print/cups )
-	latex? (
-		app-text/texlive
-		app-text/ghostscript-gpl
-		app-text/noweb
-		app-text/dvipng
-		dev-tex/dvipost
-		dev-tex/chktex
-		app-text/ps2eps
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-pictures
-		|| ( dev-texlive/texlive-mathscience dev-texlive/texlive-science )
-		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra )
-		dev-texlive/texlive-fontsrecommended
-		|| (
-			dev-tex/latex2html
-			dev-tex/tth
-			dev-tex/hevea
-			dev-tex/tex4ht[java]
-		)
-	)
-	html? ( dev-tex/html2latex )
-	rtf? (
-			dev-tex/latex2rtf
-			app-text/unrtf
-			dev-tex/html2latex
-		)
-	l10n_he? ( dev-tex/culmus-latex )
-	docbook? ( app-text/sgmltools-lite )
-	dot? ( media-gfx/graphviz )
-	dia? ( app-office/dia )
-	subversion? ( <dev-vcs/subversion-1.7.0 )
-	rcs? ( dev-vcs/rcs )
-	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
-	gnumeric? ( app-office/gnumeric )
-	hunspell? ( app-text/hunspell )
-	aspell? ( app-text/aspell )
-	enchant? ( app-text/enchant )"
-
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	font_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.0.8-python.patch
-	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
-}
-
-src_configure() {
-	tc-export CXX
-	#bug 221921
-	export VARTEXFONTS=${T}/fonts
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		$(use_enable monolithic-build) \
-		$(use_with hunspell) \
-		$(use_with aspell) \
-		$(use_with enchant) \
-		--without-included-boost \
-		--disable-stdlib-debug \
-		--with-packaging=posix
-}
-
-src_install() {
-	default
-
-	if use l10n_he ; then
-		echo "\bind_file cua" > "${T}"/hebrew.bind
-		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
-
-		insinto /usr/share/lyx/bind
-		doins "${T}"/hebrew.bind || die
-	fi
-
-	newicon -s 32 "${S}/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
-	doicon -s 48 "${S}/lib/images/lyx.png"
-	doicon -s scalable "${S}/lib/images/lyx.svg"
-	make_desktop_entry ${PN} "LyX" "${PN}" "Office" "MimeType=application/x-lyx;"
-
-	# fix for bug 91108
-	if use latex ; then
-		dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx || die
-	fi
-
-	# fonts needed for proper math display, see also bug #15629
-	font_src_install
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-
-	if use hunspell ; then
-		dosym ../myspell /usr/share/lyx/dicts
-		dosym ../myspell /usr/share/lyx/thes
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	font_pkg_postinst
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-
-	# fix for bug 91108
-	if use latex ; then
-		texhash
-	fi
-
-	# instructions for RTL support. See also bug 168331.
-	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
-		elog
-		elog "Enabling RTL support in LyX:"
-		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
-		elog "You must enable RTL support in LyX. To do so start LyX and go to"
-		elog "Tools->Preferences->Language settings->Language"
-		elog "and make sure the \"Right-to-left language support\" is checked"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-
-	if use latex ; then
-		texhash
-	fi
-}
--- a/app-office/lyx/lyx-2.2.2-r1.ebuild
+++ b/app-office/lyx/lyx-2.2.2-r1.ebuild
@ -1,183 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit gnome2-utils eutils fdo-mime flag-o-matic font python-single-r1 toolchain-funcs
-
-MY_P="${P/_}"
-
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}/lib/fonts"
-FONT_SUFFIX="ttf"
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="https://www.lyx.org/"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
-	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/${MY_P}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
-IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant +qt4 qt5 l10n_he"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	qt4? ( !qt5 )
-	qt5? ( !qt4 )"
-
-DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
-
-COMMONDEPEND=">=dev-libs/boost-1.34:=
-	${PYTHON_DEPS}
-	qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 dev-qt/qtsvg:4 )
-	qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtsvg:5 dev-qt/qtconcurrent:5 )"
-
-RDEPEND="${COMMONDEPEND}
-	dev-texlive/texlive-fontsextra
-	virtual/imagemagick-tools[png,svg?]
-	cups? ( net-print/cups )
-	latex? (
-		app-text/texlive
-		app-text/ghostscript-gpl
-		app-text/noweb
-		app-text/dvipng
-		dev-tex/dvipost
-		dev-tex/chktex
-		app-text/ps2eps
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-pictures
-		|| ( dev-texlive/texlive-mathscience dev-texlive/texlive-science )
-		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra )
-		dev-texlive/texlive-fontsrecommended
-		|| (
-			dev-tex/latex2html
-			dev-tex/tth
-			dev-tex/hevea
-			dev-tex/tex4ht[java]
-		)
-	)
-	html? ( dev-tex/html2latex )
-	rtf? (
-			dev-tex/latex2rtf
-			app-text/unrtf
-			dev-tex/html2latex
-		)
-	l10n_he? ( dev-tex/culmus-latex )
-	docbook? ( app-text/sgmltools-lite )
-	dot? ( media-gfx/graphviz )
-	dia? ( app-office/dia )
-	subversion? ( dev-vcs/subversion )
-	rcs? ( dev-vcs/rcs )
-	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
-	gnumeric? ( app-office/gnumeric )
-	hunspell? ( app-text/hunspell )
-	aspell? ( app-text/aspell )
-	enchant? ( app-text/enchant )"
-
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	font_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.1-python.patch
-	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
-	if use qt4; then
-		export QT_SELECT=qt4
-	elif use qt5; then
-		export QT_SELECT=qt5
-	fi
-}
-
-src_configure() {
-	tc-export CXX
-	#bug 221921
-	export VARTEXFONTS=${T}/fonts
-	local qt_flag=""
-	if use qt4; then
-		qt_flag=""
-	elif use qt5; then
-		qt_flag="--enable-qt5"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		$(use_enable monolithic-build) \
-		$(use_with hunspell) \
-		$(use_with aspell) \
-		$(use_with enchant) \
-		${qt_flag} \
-		--without-included-boost \
-		--disable-stdlib-debug \
-		--with-packaging=posix
-}
-
-src_install() {
-	default
-
-	if use l10n_he ; then
-		echo "\bind_file cua" > "${T}"/hebrew.bind
-		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
-
-		insinto /usr/share/lyx/bind
-		doins "${T}"/hebrew.bind || die
-	fi
-
-	newicon -s 32 "${S}/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
-	doicon -s 48 "${S}/lib/images/lyx.png"
-	doicon -s scalable "${S}/lib/images/lyx.svg"
-
-	# fix for bug 91108
-	if use latex ; then
-		dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx || die
-	fi
-
-	# fonts needed for proper math display, see also bug #15629
-	font_src_install
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-
-	if use hunspell ; then
-		dosym ../myspell /usr/share/lyx/dicts
-		dosym ../myspell /usr/share/lyx/thes
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	font_pkg_postinst
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-
-	# fix for bug 91108
-	if use latex ; then
-		texhash
-	fi
-
-	# instructions for RTL support. See also bug 168331.
-	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
-		elog
-		elog "Enabling RTL support in LyX:"
-		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
-		elog "You must enable RTL support in LyX. To do so start LyX and go to"
-		elog "Tools->Preferences->Language settings->Language"
-		elog "and make sure the \"Right-to-left language support\" is checked"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-
-	if use latex ; then
-		texhash
-	fi
-}
--- a/app-office/lyx/lyx-2.2.3.ebuild
+++ b/app-office/lyx/lyx-2.2.3.ebuild
@ -1,183 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit gnome2-utils eutils fdo-mime flag-o-matic font python-single-r1 toolchain-funcs
-
-MY_P="${P/_}"
-
-S="${WORKDIR}/${MY_P}"
-FONT_S="${S}/lib/fonts"
-FONT_SUFFIX="ttf"
-DESCRIPTION="WYSIWYM frontend for LaTeX, DocBook, etc."
-HOMEPAGE="https://www.lyx.org/"
-SRC_URI="ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/${MY_P}.tar.xz
-	ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.2/${MY_P}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x86-macos"
-IUSE="cups debug nls +latex monolithic-build html rtf dot docbook dia subversion rcs svg gnumeric +hunspell aspell enchant +qt4 qt5 l10n_he"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	qt4? ( !qt5 )
-	qt5? ( !qt4 )"
-
-DOCS=( ANNOUNCE NEWS README RELEASE-NOTES UPGRADING )
-
-COMMONDEPEND=">=dev-libs/boost-1.34:=
-	${PYTHON_DEPS}
-	qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 dev-qt/qtsvg:4 )
-	qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtsvg:5 dev-qt/qtconcurrent:5 )"
-
-RDEPEND="${COMMONDEPEND}
-	dev-texlive/texlive-fontsextra
-	virtual/imagemagick-tools[png,svg?]
-	cups? ( net-print/cups )
-	latex? (
-		app-text/texlive
-		app-text/ghostscript-gpl
-		app-text/noweb
-		app-text/dvipng
-		dev-tex/dvipost
-		dev-tex/chktex
-		app-text/ps2eps
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-pictures
-		|| ( dev-texlive/texlive-mathscience dev-texlive/texlive-science )
-		|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericextra )
-		dev-texlive/texlive-fontsrecommended
-		|| (
-			dev-tex/latex2html
-			dev-tex/tth
-			dev-tex/hevea
-			dev-tex/tex4ht[java]
-		)
-	)
-	html? ( dev-tex/html2latex )
-	rtf? (
-			dev-tex/latex2rtf
-			app-text/unrtf
-			dev-tex/html2latex
-		)
-	l10n_he? ( dev-tex/culmus-latex )
-	docbook? ( app-text/sgmltools-lite )
-	dot? ( media-gfx/graphviz )
-	dia? ( app-office/dia )
-	subversion? ( dev-vcs/subversion )
-	rcs? ( dev-vcs/rcs )
-	svg? ( || ( gnome-base/librsvg media-gfx/inkscape ) )
-	gnumeric? ( app-office/gnumeric )
-	hunspell? ( app-text/hunspell )
-	aspell? ( app-text/aspell )
-	enchant? ( app-text/enchant )"
-
-DEPEND="${COMMONDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	font_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/2.1-python.patch
-	sed "s:python -tt:${EPYTHON} -tt:g" -i lib/configure.py || die
-	if use qt4; then
-		export QT_SELECT=qt4
-	elif use qt5; then
-		export QT_SELECT=qt5
-	fi
-}
-
-src_configure() {
-	tc-export CXX
-	#bug 221921
-	export VARTEXFONTS=${T}/fonts
-	local qt_flag=""
-	if use qt4; then
-		qt_flag=""
-	elif use qt5; then
-		qt_flag="--enable-qt5"
-	fi
-
-	econf \
-		$(use_enable nls) \
-		$(use_enable debug) \
-		$(use_enable monolithic-build) \
-		$(use_with hunspell) \
-		$(use_with aspell) \
-		$(use_with enchant) \
-		${qt_flag} \
-		--without-included-boost \
-		--disable-stdlib-debug \
-		--with-packaging=posix
-}
-
-src_install() {
-	default
-
-	if use l10n_he ; then
-		echo "\bind_file cua" > "${T}"/hebrew.bind
-		echo "\bind \"F12\" \"language hebrew\"" >> "${T}"/hebrew.bind
-
-		insinto /usr/share/lyx/bind
-		doins "${T}"/hebrew.bind || die
-	fi
-
-	newicon -s 32 "${S}/development/Win32/packaging/icons/lyx_32x32.png" ${PN}.png
-	doicon -s 48 "${S}/lib/images/lyx.png"
-	doicon -s scalable "${S}/lib/images/lyx.svg"
-
-	# fix for bug 91108
-	if use latex ; then
-		dosym ../../../lyx/tex /usr/share/texmf-site/tex/latex/lyx || die
-	fi
-
-	# fonts needed for proper math display, see also bug #15629
-	font_src_install
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-
-	if use hunspell ; then
-		dosym ../myspell /usr/share/lyx/dicts
-		dosym ../myspell /usr/share/lyx/thes
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	font_pkg_postinst
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-
-	# fix for bug 91108
-	if use latex ; then
-		texhash
-	fi
-
-	# instructions for RTL support. See also bug 168331.
-	if use l10n_he || has he ${LINGUAS} || has ar ${LINGUAS} ; then
-		elog
-		elog "Enabling RTL support in LyX:"
-		elog "If you intend to use a RTL language (such as Hebrew or Arabic)"
-		elog "You must enable RTL support in LyX. To do so start LyX and go to"
-		elog "Tools->Preferences->Language settings->Language"
-		elog "and make sure the \"Right-to-left language support\" is checked"
-		elog
-	fi
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	fdo-mime_desktop_database_update
-
-	if use latex ; then
-		texhash
-	fi
-}
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
--- a/app-shells/ksh/Manifest
+++ b/app-shells/ksh/Manifest
@ -2,3 +2,4 @@ DIST INIT.2014-06-25.tgz 385531 BLAKE2B 9bd7fd46db725e134a6a35197c8793ada92a5aa2
 DIST ast-base.2014-06-25.tgz 9609090 BLAKE2B 1a961eee6c4f40abbe92166ea0697c97c97a486165e225c8eceae9899f8cf8df84ba93135d0f64f67e8319d5734c3f9597cd2444a5710f2645639bce9c40bc37 SHA512 3006dd187c6042798ffd6da5aad8d6340bf4fbad687338b2b9797556136966b65d90295eb267dba198a83ea5b651a9a339d9ff48179f3d7e25b3de76c41bf737
 DIST ksh-93.20160110.tar.gz 26416127 BLAKE2B 2e3d7f24e1c7292283f2859b86abca6b31c9104949f870cd5b35dc726dd917eefc826363f19a3ae120bba022fca31a4e38c8998c9010ef46a6c186619068b763 SHA512 cf6e13e5f6b0fd62b12cbcd007c09306ba1ff7e733c207be34cb360b6b269b8e75f2134a32775c65626ea6cfbdf1bbffecab22c7b2ff244fe91981b3d8fa8688
 DIST ksh-93.20180129.tar.gz 16056700 BLAKE2B a4f31243c67aa91d67a2d0f456053b716f0ee3ee58c5ef6c4bea236d7b58676170f236d36e084086c24b53b431cf8b88b174f9c92f8f94f27073c7a6ef2859c6 SHA512 6f2ec44f756bdeb8d8792cf55a2c19b38ea85947658648f521cf895562211604e2395cf60a5e72c451213065326207eb7a67c2efb768581ce84abbe11c237319
+DIST ksh-93.20180213.tar.gz 16055555 BLAKE2B e8a79af8c047f2913f7104a3600f17d61023f756ba6e6b4b1591c748875279d68ed7b00319826ea97acb9b783be3f07c7de1f9ce5e1fbf88ddddab6136285078 SHA512 a9f699e327e1d0446d39aafeda68c66c0b51d773a9e11dbab32471ae1a9db89b718b18bd4a4c2cdf87dcca6d33d8bd7f47f59c13055e7616a67c8b9e32a19b42
--- a/app-shells/ksh/ksh-93.20180213.ebuild
+++ b/app-shells/ksh/ksh-93.20180213.ebuild
@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson prefix
+
+DESCRIPTION="The Original Korn Shell, 1993 revision (ksh93)"
+HOMEPAGE="http://www.kornshell.com/"
+
+COMMIT="b6aaffac8880000a9f5343e9dfd78ff2a7964b51"
+SRC_URI="https://github.com/att/ast/archive/${COMMIT}/${P}.tar.gz"
+
+LICENSE="CPL-1.0 EPL-1.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!app-shells/pdksh"
+
+S="${WORKDIR}/ast-${COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/ksh-prefix-r1.patch
+)
+
+src_prepare() {
+	default
+	eprefixify src/cmd/ksh93/data/msg.c
+}
+
+src_install() {
+	meson_src_install
+	dodir /bin
+	mv "${ED%/}"{/usr,}/bin/ksh || die
+}
--- a/app-shells/zsh-completions/zsh-completions-0.27.0.ebuild
+++ b/app-shells/zsh-completions/zsh-completions-0.27.0.ebuild
@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/zsh-users/zsh-completions.git"
 else
 	SRC_URI="https://github.com/zsh-users/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~sparc ~x86"
 fi

 DESCRIPTION="Additional completion definitions for Zsh"
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
--- a/app-text/convertlit/convertlit-1.8-r3.ebuild
+++ b/app-text/convertlit/convertlit-1.8-r3.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
@ -13,7 +13,7 @@ SRC_URI="http://www.convertlit.com/${MY_P}src.zip"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""

 RDEPEND=">=dev-libs/libtommath-0.36-r1"
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
@ -29,6 +29,8 @@ DEPEND=">=dev-lang/perl-5
 	~app-text/docbook-sgml-dtd-3.1
 	~app-text/docbook-sgml-dtd-4.0
 	~app-text/docbook-sgml-dtd-4.1
+	~app-text/docbook-sgml-dtd-4.2
+	~app-text/docbook-sgml-dtd-4.4
 	jadetex? ( app-text/jadetex )
 	userland_GNU? ( sys-apps/which )
 	|| (
--- a/app-text/tabler/tabler-2-r1.ebuild
+++ b/app-text/tabler/tabler-2-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=6
@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"

 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""

 src_install() {
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
--- a/dev-db/mysql/mysql-5.6.39.ebuild
+++ b/dev-db/mysql/mysql-5.6.39.ebuild
@ -16,7 +16,7 @@ inherit mysql-multilib-r1
 IUSE="$IUSE numa"

 # REMEMBER: also update eclass/mysql*.eclass before committing!
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"

 COMMON_DEPEND="numa? ( sys-process/numactl:= )"

--- a/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild
+++ b/dev-db/psqlodbc/psqlodbc-10.01.0000.ebuild
@ -8,7 +8,7 @@ HOMEPAGE="http://www.postgresql.org/"
 SRC_URI="mirror://postgresql/odbc/versions/src/${P}.tar.gz"
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="doc iodbc ssl threads"

 DEPEND="dev-db/postgresql:*[ssl?]
--- a/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.ebuild
+++ b/dev-db/qt5-sqlcipher/qt5-sqlcipher-0.1.1_pre20171202.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
@ -24,6 +24,8 @@ DOCS=(README.md)
 src_prepare() {
 	eapply "${FILESDIR}"/${PN}-install-path.patch
 	sed -i -e "s/@LIBDIR@/$(get_libdir)/" CMakeLists.txt || die
+	# workaround for bug 647624 (Qt 5.9.3 and 5.9.4 files are identical)
+	cp -R qt-file-cache/5.9.{3,4} || die
 	cmake-utils_src_prepare
 }

--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
--- a/dev-lang/go/go-1.9.4.ebuild
+++ b/dev-lang/go/go-1.9.4.ebuild
@ -39,7 +39,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x64-solaris"
 		# The upstream tests fail under portage but pass if the build is
 		# run according to their documentation [1].
 		# I am restricting the tests on released versions until this is
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
--- a/dev-libs/dbus-glib/Manifest
+++ b/dev-libs/dbus-glib/Manifest
@ -2,3 +2,4 @@ DIST dbus-glib-0.102.tar.gz 783792 BLAKE2B 5dca4d1d4c9d281e46ad9b15307a738698d65
 DIST dbus-glib-0.104.tar.gz 793417 BLAKE2B 87c12f15e7a960acf2071fae9a689780b74ef146e0f776e117fed66248d16d2ae45e52d264fa87eafc336935db5c64f85474a4b16f29389436faabd976beae6f SHA512 eff599f169976055545b51459d77845002d8bc7e8dcd056cec2bf83836d07c66b03baed2023bc87a6d7c021d35c744987830f8ed6f9c3391a49ee199db85134b
 DIST dbus-glib-0.106.tar.gz 793343 BLAKE2B 8444c587bf002a23abe6f0ffedd1dc1c3a60445cbdab923567c74bd80ebb178ae24c9ee685426601782785e5f67ebbcc1524d65379135958bc7d3ede44c48feb SHA512 13a1d4600add29d29dbb8d1271570e6c04f70ddff0862d28fcb7df774bfa76a961f90303f897f3b970070eb959e909d5d02a94941e2edd8ba315b9aaa3a602cb
 DIST dbus-glib-0.108.tar.gz 812488 BLAKE2B e958c4054c09ec98d7bff659917a9c162dc4338aabcc5c6ec6d7ec34304867dd65d373eeb8871cd188424a36dafa337bb713fb2aaa87e47d1ed4f91a4e7ecd7f SHA512 9fa7cd1c22bf6ee1e345dd6fe48aa725abc01b3b180ba430efea9996403ad99636b2c40f682956978ae5049c110c3298fa199470a4cc05907e11773d034ea5b1
+DIST dbus-glib-0.110.tar.gz 836497 BLAKE2B d936402bbaa5c354b2730cbace273974ec0133db052503fea2780d70b128e50e4fdf54f6ebfeed024eb5602fa3725a40627e27320a4727647299f74b2eb75c85 SHA512 c40ccf7118d4951f0e09082216ccd26f21ee906bdf96d912611d3cd29badd7ef446bea74e19f26c28ebceb9e19bb659d11c643c3e712dac499df12907be88a54
--- a/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
+++ b/dev-libs/dbus-glib/dbus-glib-0.110.ebuild
@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit bash-completion-r1 eutils multilib-minimal
+
+DESCRIPTION="D-Bus bindings for glib"
+HOMEPAGE="https://dbus.freedesktop.org/"
+SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 AFL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+IUSE="debug static-libs test"
+
+CDEPEND="
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
+	>=sys-apps/dbus-1.8[${MULTILIB_USEDEP}]
+"
+DEPEND="${CDEPEND}
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig
+"
+RDEPEND="${CDEPEND}
+	abi_x86_32? (
+		!<app-emulation/emul-linux-x86-baselibs-20131008-r8
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
+set_TBD() {
+	# out of sources build dir for make check
+	export TBD="${BUILD_DIR}-tests"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}"/var
+		--enable-bash-completion
+		--disable-gtk-doc
+		$(use_enable debug asserts)
+		$(use_enable static-libs static)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+	ln -s "${S}"/doc/reference/html doc/reference/html || die #460042
+
+	if use test; then
+		set_TBD
+		mkdir "${TBD}" || die
+		cd "${TBD}" || die
+		einfo "Running configure in ${TBD}"
+		ECONF_SOURCE="${S}" econf \
+			"${myconf[@]}" \
+			$(use_enable test checks) \
+			$(use_enable test tests) \
+			$(use_enable test asserts)
+	fi
+}
+
+multilib_src_compile() {
+	emake
+
+	if use test; then
+		set_TBD
+		cd "${TBD}" || die
+		einfo "Running make in ${TBD}"
+		emake
+	fi
+}
+
+multilib_src_test() {
+	set_TBD
+	cd "${TBD}" || die
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	newbashcomp "${ED}"/etc/bash_completion.d/dbus-bash-completion.sh dbus-send
+	rm -rf "${ED}"/etc/bash_completion.d || die
+
+	prune_libtool_files
+}
--- a/dev-libs/keybinder/Manifest
+++ b/dev-libs/keybinder/Manifest
@ -1,2 +1,3 @@
 DIST keybinder-0.3.1.tar.gz 391730 BLAKE2B ea286ab5bbd864709a1290ffd8d7d45468b1d525b4fdb8967159bbcf32ca8dc3d057ba39ad35dc19f5f68f67160fc48d805e107fcaea22f81fdd8bd1125db908 SHA512 aec4070b3d3b6c00900c3cb814e4b6a98beea09817eba3c3f7e6d5ce1ff68c091d183583f09b475e3e56bac67c94c1d912ebbe079dcece8195ac0ed9379d5f82
 DIST keybinder-3.0-0.3.1.tar.gz 358650 BLAKE2B 541ce7cf5bdb9fc8c0cb6d7f1f6326d47c0cb32f71b517a8bfe8aeecc74658cf17bbaff93854bd57aa898e1f22bff1269c20422bab347df6c1e2ca1d8eac13de SHA512 af65ce02707ed2712c70470c9151bffee87e6d5b3b97218b653d3061b74001a7f3ac59e15b71362e4466e7ac16573bdb6331dc00ebccd906ce08ca8176b6770f
+DIST keybinder-3.0-0.3.2.tar.gz 378942 BLAKE2B f998430a14e881b5b1802747ec15967d60bedf8e076e5ace886a665ad168eb297679f30289b6cae835f4b291a0744c12331e420dcafbfca7e63cc5e807e9cd46 SHA512 14171875e03ade88165f28c7267b66cf9efe34259d7a3072a786ba49dacf8f8d6d84753b1aeedec5dfb0a24028be86bceeebee2f6b1bf5ef2eb79ee45f909b11
--- a/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
+++ b/dev-libs/keybinder/keybinder-0.3.1-r201.ebuild
@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="A library for registering global keyboard shortcuts"
+HOMEPAGE="https://github.com/engla/keybinder"
+SRC_URI="https://github.com/engla/keybinder/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="+introspection lua python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND=">=x11-libs/gtk+-2.20:2
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	introspection? ( dev-libs/gobject-introspection )
+	lua? ( >=dev-lang/lua-5.1 )
+	python? ( ${PYTHON_DEPS}
+		>=dev-python/pygobject-2.15.3:2[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.12[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable python)
+	)
+	# upstream failed at AC_ARG_ENABLE
+	use lua || myconf+=( --disable-lua )
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
--- a/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
+++ b/dev-libs/keybinder/keybinder-0.3.2-r300.ebuild
@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${PN}-3.0-${PV}
+DESCRIPTION="A library for registering global keyboard shortcuts"
+HOMEPAGE="https://github.com/engla/keybinder"
+SRC_URI="https://github.com/engla/keybinder/releases/download/${PN}-3.0-v${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="+introspection"
+
+RDEPEND="x11-libs/gtk+:3[X]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	introspection? ( dev-libs/gobject-introspection )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	# remove old symlink as otherwise the files will be installed
+	# in the wrong directory
+	if [[ -h ${EROOT%/}/usr/share/gtk-doc/html/keybinder-3.0 ]]; then
+		rm "${EROOT%/}/usr/share/gtk-doc/html/keybinder-3.0" || die
+	fi
+}
--- a/dev-libs/keybinder/metadata.xml
+++ b/dev-libs/keybinder/metadata.xml
@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <upstream>
-    <remote-id type="github">engla/keybinder</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">engla/keybinder</remote-id>
+	</upstream>
 </pkgmetadata>
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@ -1,3 +1,4 @@
+DIST libinput-1.10.0.tar.xz 491444 BLAKE2B bd7f4a68cd1ebc981cb16f402c8ea6a7bd99d7bbf289fe07923400a5bf9e259b3726c5c1765d5e31fe09b95cf9eadc88769c578d6be0f2fee4c12455d44d6d70 SHA512 173f72f454c534dee755b6121c4577900ae9b8a129ac41de69410c3195950a6d149d6148892c4976f013eeabca66117d53fa67e352cc005960863a5576696928
 DIST libinput-1.7.3.tar.xz 922464 BLAKE2B fa38675905af55931676c22d9e4d56befbb055fba56ba13c61a1917050bc1eb62bcfe1d078b478047006d4c0d06d83186d0d6739cbf9dc49acce487ccb0b7e3a SHA512 2262dc56d213a4d3ea765e870af200e2c336a166baa1bbdf5205e3ce70faefc777429ba09563c5dd79feb5442f53abc84e04a0f32a06bb622d6e120bb8ad152b
 DIST libinput-1.8.3.tar.xz 941832 BLAKE2B cf6464d68387cca23d0f70eaceeec8b453c53f1cac22892722d48983788b43a136617c62ad39c8d435bbf07c0cb9cd720250ea91e31f10526acd5147b1d78237 SHA512 88006d217e3507858fa6b9ac1f25c267255fb51d1bcf1208d2afd423bf2a9292944bc5526ea91f27fad3ff04c2f9f43ab3aa25fd9fb7ace1231ecd33ddf18de6
 DIST libinput-1.9.4.tar.xz 472636 BLAKE2B 692a23047cb0b54d14763b34ce3ce1414101d0097dce10d237ec32a67f29c31cbf2928681084f7561e072e555c932f0e3bc54cfb0ecbcdd0d823426806e357b6 SHA512 302f9497ea9ffb2163c643e9ca2f0a773ea141f6fe0a3aa3d8e86eb11a5d11e75d858b1e679ebfd3f913c645beac059cfd356b37c4ea17a8853068f79a740a4b
--- a/dev-libs/libinput/libinput-1.10.0.ebuild
+++ b/dev-libs/libinput/libinput-1.10.0.ebuild
@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit meson udev
+
+DESCRIPTION="Library to handle input devices in Wayland"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/"
+SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc input_devices_wacom test"
+# Tests require write access to udev rules directory which is a no-no for live system.
+# Other tests are just about logs, exported symbols and autotest of the test library.
+RESTRICT="test"
+
+RDEPEND="
+	input_devices_wacom? ( >=dev-libs/libwacom-0.20 )
+	>=dev-libs/libevdev-1.3
+	>=sys-libs/mtdev-1.1
+	virtual/libudev
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		>=app-doc/doxygen-1.8.3
+		>=media-gfx/graphviz-2.38.0
+	)
+"
+#	test? (
+#		>=dev-libs/check-0.9.10
+#		dev-util/valgrind
+#		sys-libs/libunwind )
+
+src_configure() {
+	# gui can be built but will not be installed
+	local emesonargs=(
+		-Ddebug-gui=false
+		-Ddocumentation="$(usex doc true false)"
+		-Dlibwacom="$(usex input_devices_wacom true false)"
+		-Dtests="$(usex test true false)"
+		-Dudev-dir="$(get_udevdir)"
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc ; then
+		docinto html
+		dodoc -r "${BUILD_DIR}"/html/.
+	fi
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
--- a/dev-libs/openssl/openssl-0.9.8z_p8-r1.ebuild
+++ b/dev-libs/openssl/openssl-0.9.8z_p8-r1.ebuild
@ -18,7 +18,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"

 LICENSE="openssl"
 SLOT="0.9.8"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="bindist gmp kerberos cpu_flags_x86_sse2 test zlib"
 RESTRICT="!bindist? ( bindist )"

--- a/dev-libs/univalue/Manifest
+++ b/dev-libs/univalue/Manifest
@ -1 +1,2 @@
 DIST univalue-1.0.2.tgz 14201 BLAKE2B 47a72a629bc3a0ff193c33d89c3a97e19abca833180473b0a37a6f5a4ba15b7886d1a605a905f7a94af2512e4d1e9f2a7879cae4c5a0af78ac9dfb23a0a581c7 SHA512 727096735dbad082741fb863c9066936a80d7337b1d7c4c289107d240b7f695756a8720f5db320f0c7521b523e299829bd49833b6a31969d8aa43267653a4f2f
+DIST univalue-1.0.3.tar.gz 16820 BLAKE2B 40dd6c4e08e8f4a27731aa0fd6931162f8427a709cc3fc16c049a093d17a08f002a6eb08cf3c4fa9870805f3eed7627c8c9baa7cdc6d6fc8970a085488a955b0 SHA512 1c8358baca82b44d7a762c0cb3b7bef6f36d2f3d0ab29045224c1c39b69fbcbb66573dfb9ee4705f71aadff542cc9f02e98921b1c013748e2c0cd63c386bc1df
--- a/dev-libs/univalue/univalue-1.0.3.ebuild
+++ b/dev-libs/univalue/univalue-1.0.3.ebuild
@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="C++ universal value object and JSON library"
+HOMEPAGE="https://github.com/jgarzik/univalue"
+SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
--- a/dev-libs/userspace-rcu/Manifest
+++ b/dev-libs/userspace-rcu/Manifest
@ -1,3 +1,4 @@
 DIST userspace-rcu-0.10.0.tar.bz2 483899 BLAKE2B 76f7da8290a702c7ab4ce37743be6514df6f0b8a69fc68a7ae65ae32a8d63192efcebe2fbf995d13b60b5e593d1818d6fb201ef914d0390e0209020590370a56 SHA512 e3e458510f97709431caf848b007465110057d6fba7b9e39162fbc8857fa18299e884f0e484302aa8a79ab6e6a941921db9a4adabd863c151c1b547b7276eab8
+DIST userspace-rcu-0.10.1.tar.bz2 503347 BLAKE2B 32e75d5d94b15fdcb28397aa64c871f708a925bef0cfcc90553de7694a85e1562bb2256b0c8d8726b910363d12b3a67f963f5c0213141ea2a4ad8d2bcd23bf7b SHA512 2bb042e1cf8888eab664ea6e88b94646c995bea61c89d49dcf4e844d144329303c600d73e29e0f05c935ad8278857cc08fb5b4b9f7f0c2f120c46b458b51a211
 DIST userspace-rcu-0.9.1.tar.bz2 468197 BLAKE2B ac2ae4ea788feef5463571e1a0d5dac35a5d6e298f628e0b0b2acea68d01e52a513cd5d1b58886d8b42d07455823fdfb91c1548caffb969cb9fe8c6b4d17adc7 SHA512 958234d72319decef07093c13b067e398c1b285ac714ab1dda89c2ad2ba0627d053e0cdabb07d480e399ebd60215445002876bd99f2829ca1e5582ada639f730
 DIST userspace-rcu-0.9.2.tar.bz2 468871 BLAKE2B f8a13b9683e8c32942a3d675ca94715de82b40b1a39be8161e1ea6009373f2ea6ae57b2e9ba4068544db2c9064457aaa8e83bad5e4af600bede248bf0780d11f SHA512 36264119d68569565a7b1222c4b0ca90128d121f032b388f27204ceaa9c964901f35be25584e1553b1a7613aad01d11766983ae245860df09444eb2f8ac913fc
--- a/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
+++ b/dev-libs/userspace-rcu/userspace-rcu-0.10.1.ebuild
@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="userspace RCU (read-copy-update) library"
+HOMEPAGE="http://lttng.org/urcu"
+SRC_URI="http://lttng.org/files/urcu/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0/6" # subslot = soname version
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="static-libs regression-test test"
+
+DEPEND="test? ( sys-process/time )"
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	default
+	if use regression-test; then
+		emake -C tests/regression regtest
+	fi
+}
--- a/dev-ml/Manifest.gz
+++ b/dev-ml/Manifest.gz
--- a/dev-ml/base/base-0.9.3.ebuild
+++ b/dev-ml/base/base-0.9.3.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
@ -9,7 +9,7 @@ SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz

 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

 RDEPEND="
--- a/dev-ml/base/base-0.9.4.ebuild
+++ b/dev-ml/base/base-0.9.4.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
@ -9,7 +9,7 @@ SRC_URI="https://github.com/janestreet/base/archive/v${PV}.tar.gz -> ${P}.tar.gz

 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

 RDEPEND="
--- a/dev-ml/configurator/configurator-0.9.1.ebuild
+++ b/dev-ml/configurator/configurator-0.9.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
@ -9,7 +9,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

 DEPEND="
--- a/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.9.0.ebuild
+++ b/dev-ml/ocaml-compiler-libs/ocaml-compiler-libs-0.9.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
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ocaml-compiler-libs/archive/v${PV}.tar.gz

 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

 RDEPEND=""
--- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.0.ebuild
+++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.2.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=5
@ -14,7 +14,7 @@ SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/${PV}/${MY_P}

 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE=""

 RDEPEND=">=dev-db/sqlite-3.3.3"
--- a/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.0.ebuild
+++ b/dev-ml/ocaml-sqlite3/ocaml-sqlite3-4.3.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=5
@ -14,7 +14,7 @@ SRC_URI="https://github.com/mmottl/sqlite3-ocaml/releases/download/${PV}/${MY_P}

 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE=""

 RDEPEND=">=dev-db/sqlite-3.3.3"
--- a/dev-ml/octavius/octavius-1.1.0.ebuild
+++ b/dev-ml/octavius/octavius-1.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
@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-doc/octavius/archive/v${PV}.tar.gz -> ${P}.tar

 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

 RDEPEND=""
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.0.ebuild
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.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=5
@ -11,7 +11,7 @@ SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}
 LICENSE="LGPL-2.1-with-linking-exception"
 IUSE="examples"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"

 RDEPEND=">=dev-libs/libpcre-4.5"
 DEPEND="${RDEPEND}
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.ebuild
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.2.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
@ -11,7 +11,7 @@ SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}
 LICENSE="LGPL-2.1-with-linking-exception"
 IUSE="examples"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"

 RDEPEND=">=dev-libs/libpcre-4.5"
 DEPEND="${RDEPEND}
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.3.3.ebuild
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.3.3.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
@ -11,7 +11,7 @@ SRC_URI="https://github.com/mmottl/pcre-ocaml/releases/download/${PV}/pcre-${PV}
 LICENSE="LGPL-2.1-with-linking-exception"
 IUSE="examples"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86-fbsd"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"

 RDEPEND=">=dev-libs/libpcre-4.5"
 DEPEND="${RDEPEND}
--- a/dev-ml/ppx_ast/ppx_ast-0.9.1.ebuild
+++ b/dev-ml/ppx_ast/ppx_ast-0.9.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
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_ast/archive/v${PV}.tar.gz -> ${P}.tar

 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

 DEPEND="
--- a/dev-ml/ppx_base/ppx_base-0.9.0.ebuild
+++ b/dev-ml/ppx_base/ppx_base-0.9.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
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

 DEPEND="
--- a/dev-ml/ppx_compare/ppx_compare-0.9.0-r1.ebuild
+++ b/dev-ml/ppx_compare/ppx_compare-0.9.0-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=6
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

 DEPEND="
--- a/dev-ml/ppx_core/ppx_core-0.9.0-r1.ebuild
+++ b/dev-ml/ppx_core/ppx_core-0.9.0-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=6
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_core/archive/v${PV}.tar.gz -> ${P}.ta

 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

 DEPEND="
--- a/dev-ml/ppx_derivers/ppx_derivers-1.0.ebuild
+++ b/dev-ml/ppx_derivers/ppx_derivers-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
@ -11,7 +11,7 @@ SRC_URI="https://github.com/diml/ppx_derivers/archive/${PV}.tar.gz -> ${P}.tar.g

 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

 RDEPEND=""
--- a/dev-ml/ppx_deriving/ppx_deriving-4.2-r1.ebuild
+++ b/dev-ml/ppx_deriving/ppx_deriving-4.2-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"
@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-ppx/ppx_deriving/archive/v${PV}.tar.gz -> ${P}

 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc +ocamlopt test"

 DEPEND="
--- a/dev-ml/ppx_driver/ppx_driver-0.9.1-r1.ebuild
+++ b/dev-ml/ppx_driver/ppx_driver-0.9.1-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=6
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_driver/archive/v${PV}.tar.gz -> ${P}.

 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

 DEPEND="
--- a/dev-ml/ppx_enumerate/ppx_enumerate-0.9.0.ebuild
+++ b/dev-ml/ppx_enumerate/ppx_enumerate-0.9.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
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

 DEPEND="
--- a/dev-ml/ppx_hash/ppx_hash-0.9.0.ebuild
+++ b/dev-ml/ppx_hash/ppx_hash-0.9.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
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

 DEPEND="
--- a/dev-ml/ppx_js_style/ppx_js_style-0.9.0.ebuild
+++ b/dev-ml/ppx_js_style/ppx_js_style-0.9.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
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

 DEPEND="
--- a/dev-ml/ppx_metaquot/ppx_metaquot-0.9.0.ebuild
+++ b/dev-ml/ppx_metaquot/ppx_metaquot-0.9.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
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g

 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

 DEPEND="
--- a/dev-ml/ppx_optcomp/ppx_optcomp-0.9.0-r3.ebuild
+++ b/dev-ml/ppx_optcomp/ppx_optcomp-0.9.0-r3.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
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_optcomp/archive/v${PV}.tar.gz -> ${P}

 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

 DEPEND="
--- a/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.9.0-r1.ebuild
+++ b/dev-ml/ppx_sexp_conv/ppx_sexp_conv-0.9.0-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=6
@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/ppx_sexp_conv/archive/v${PV}.tar.gz -> ${

 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""

 DEPEND="
--- a/Show More
+++ b/Show More