gentoo resync : 15.02.2018

26 files changed, 80 insertions, 126 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 7e2e09af2158..d8241e4e9d03 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/away/Manifest b/app-misc/away/Manifest
index 8d142d12085b..75a85c9767df 100644
--- a/app-misc/away/Manifest
+++ b/app-misc/away/Manifest
@@ -1,4 +1,4 @@
 DIST away-0.9.5.tar.bz2 16909 BLAKE2B 80bbdf50e565c94f37a51dffaf3650eee05c59c1e0ef499c15be13b7e8c8d90defa689b36489a532007d9b018cebb4c4ac9b791c60678dd34375d7ff286cae01 SHA512 9cb0ab5caf80e337ce524ec88ee0ffc5305080be807494ababd122d7c5a00b7e79711537d74d930eb3768a71a31156e9abe5e0d9d424a201a9af31aa1bbc1c2a
 EBUILD away-0.9.5-r1.ebuild 846 BLAKE2B d774832642767b543d15faf8ed8ef6dc497c4b3147d11e5c2a3a013845d0a9bc9baebc85b6f87259df1b726495d2aebac322e29dbdd9dcea2e7b7fc04b952289 SHA512 1ed2bf3c0a588bd5400c17f71859049b2c24dccaf3f00ac4c8374cf07838542a4e8069d1874b16143ce70daf0857d63adb3677c87d4cdbeb0b4c057ce50714e4
-EBUILD away-0.9.5-r2.ebuild 811 BLAKE2B 2ea94c4d71aea4f8b5933369ff9f3edc9bfc792effe05110660bbbd6e67f95e41576f302f8da78f7e0c637c262f7d9c89096e46e8d5bac77886815a8003feeb6 SHA512 937f62d6dda240ca6e0e14264da32a19f3dd0e209f54e7ae5da85fa47ede297fa57763938d286a255c3628ec8a30ca2f8236a1ee7771ab4d2651e1b57793a67d
+EBUILD away-0.9.5-r2.ebuild 810 BLAKE2B 4161d711c3ced4d61e08b392024b7a502b25b5a6f3e58c139476460281074612210c49684b4cfe83eabe8de80d8af33d7872db9181df37befcd655dbe7324639 SHA512 210917b3ccab3eac9f052d3f985b2f944fc8122cf46e108b0f1713f0cb5080700c92cb87b8cc5500274412bff30c2ee2561c1a27940512c3869ae1761316fe27
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/away/away-0.9.5-r2.ebuild b/app-misc/away/away-0.9.5-r2.ebuild
index ed55ee02ecef..e4f0e4077fa3 100644
--- a/app-misc/away/away-0.9.5-r2.ebuild
+++ b/app-misc/away/away-0.9.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://unbeatenpath.net/software/away/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=">=sys-libs/pam-0.75"
diff --git a/app-misc/calendar/Manifest b/app-misc/calendar/Manifest
index 043b5ad393bb..83c767fb4a49 100644
--- a/app-misc/calendar/Manifest
+++ b/app-misc/calendar/Manifest
@@ -1,4 +1,4 @@
 DIST calendar-0.9.1.tar.bz2 65225 BLAKE2B b8ee591005d57fdb3e18412c9665ee3447f607224efad261ca0cf7a3dc88e94e8bfb8309b19996e38e7e18c26bafcaddc9ebf7d612ed25d7d1d159b63b7b6827 SHA512 c8f373ad06265720ab6ba1edb9066cb5474806d023bf0cb3a35876c5bad72de8bac8ab58c2b6d3a9f418d20d04b1811e256abce9296c9c8547c9b7f8005adfb3
-EBUILD calendar-0.9.1-r1.ebuild 637 BLAKE2B 8d52d0e1cd4ce622984f2e19f4194fc858d64365c827a2288ef21b7308f22d463951d4b44929bd94cd1ea45b95302e1ea82e8e7c4e3a63036db873616574f1fb SHA512 a4c9de7325a74cc93e11de66f54b8d4c5ed1d845bcbf3fccb437aeed0190da6658b065ac93c7e5ee8167dcb8a0f658ce0bb274de940d2583a3a8f3947ff93f03
+EBUILD calendar-0.9.1-r1.ebuild 636 BLAKE2B daa79ee020fb60a151bd609abdc63c98b6babe9b8683e3ccfee26c95f41b5cd51c97935b8a6fcdd6e80e868ce7281fc7c491ba80c16b706323ff0a1edc4974cf SHA512 07c45d10f1765746ee30b103cb7f55841c3a1077b1783c683376f9d51d3d6d27374d509105c0e521409145b986d8ba047261b34c2943202c56698be0471fbb92
 EBUILD calendar-0.9.1.ebuild 641 BLAKE2B 194b76a151bc43eb13e99f2ffa6cb0b3538f96b5aa3c79b52c1bc6f271c26492dc7cc7be4358f7138bfc5ea0819cdcb725e38788dc4ff69bb36c7b77059dd67b SHA512 24d3ca5ae255af3344c3ca2f9ff02af292ca388c7377d2f585e5be00ef6c4753f1ed2e81077138183be9b86eab087fe0861254fa1d3d651f9e4c42e2fc1d7651
 MISC metadata.xml 346 BLAKE2B 365bbcf4fca5fb793b4b9499b021c028eb13d1634d21a1c1627cd528c0fe77c195f7f789ee7cce987297ed8e8e20cc9937e83f6d5292b3878a25426488a3d691 SHA512 9fb15d47c1b5ea5eba7614339ed44e8812550589416f8fdb5aa02dfc899c95b782526577f97a24e024c0298e09af634b8a3dc27474755728d81866100c8d066d
diff --git a/app-misc/calendar/calendar-0.9.1-r1.ebuild b/app-misc/calendar/calendar-0.9.1-r1.ebuild
index 2b4f7f69342c..2d8dc85b28d2 100644
--- a/app-misc/calendar/calendar-0.9.1-r1.ebuild
+++ b/app-misc/calendar/calendar-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="http://bsdcalendar.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 
 DOCS=( README )
 
diff --git a/app-misc/ckb/Manifest b/app-misc/ckb/Manifest
index 28b4eed694aa..27514c0c2370 100644
--- a/app-misc/ckb/Manifest
+++ b/app-misc/ckb/Manifest
@@ -1,4 +1,6 @@
 AUX ckb.initd 659 BLAKE2B 1de2e8b9b555f2d083698e8302c972619dc08ca652bb1ef06e3a72ec9fa026f74aadb5e86491b4a95fe1c44699a21802907c75c67e3d09bc12caa2114052eaf8 SHA512 45c98f5b3cf2868fd7a5b0a015222b1dc6608847d380a1a3ccc95fab306bfde642a74e5dafe1545b380516fb4d41e30d76b9c1f826882dae28a0332f6c3b40ad
 DIST ckb-0.2.6.tar.gz 526737 BLAKE2B c41d4e510fb9226b578d305fbcf1f899f0e4c4ce1334274fde365d50ed8365fff5fa60784a5bbc7b2a1f8c85b9812a78d9d4cf629bea88ea4c4104e2f75c3c65 SHA512 6d92b0e82865748d9731943462d2cb89c3ea0dea4170f8aebcf5e1ed491c5d635dcd69a4f1f385ab891846f2b3437e2cb154f5dae5f5446cf52e557ebf6343a6
+DIST ckb-0.2.9.tar.gz 664625 BLAKE2B 37dc9c75876ca46fb10241da7b223ca67e5b9c0a998386f0f82eba15a97045e269b1f8a75dea18297865826bff241c21b255a507fd26e73747ee2656a228c4ce SHA512 7910f089d7b01ceade5ae8282db931c9decb9296d4c9c5fc2419eb7fb4ba5a2c0f85721a3a6846ed24a72f61b18374baa7fd27e11329b5d2f65b21916e8b96e1
 EBUILD ckb-0.2.6-r1.ebuild 1014 BLAKE2B 5f57f007c70aa8ba83d22bf858af168e6161c28727bc5713ed3b1ba87ca73a3143edf1542a0501d9bd04445acb6d34b52f840a9d90bbbdd35310a4b640a73e94 SHA512 d959ce86b5e088d782438518b50cf787c811374623350ed8134ea468f0f9f19e8e327863ba5077245dcd288a18e68d624d8d78b8de71ded6e12b42793dd8aa35
+EBUILD ckb-0.2.9.ebuild 1115 BLAKE2B 0baa0ffa72e1f9324fa4fa71eef92cdbfbe438f1f7a03519a5f39715930bc7ef4103c7280feeee9a2b2329d6f4ec6a128b869bb5b0fd1e78a710ebb49f52c8f1 SHA512 8a37d8d0814a59d5667de0726e6fbf4890fac2718a046027083e20339f5df69de5175b0b3b7370b3590d7751979ed688f179faf46b3bcb7b05f331fe418e9ae4
 MISC metadata.xml 319 BLAKE2B 5f2728fea7674baeefc2946a7ee7f94c390d10f37c6f90ad7a0c87a31f2e5072d465ac335f056beb332defcd6b66ccc838ff6cc25894751140ad4a8a658a2229 SHA512 62f3e5ae4cdf822445aac43dfb6a42da92230a79f007b15c5af65a802741338ff5008fe4ac9afb14bca120e23a2b947c92f8e132d0b3f5c36a43efd7a22c3183
diff --git a/app-misc/ckb/ckb-0.2.9.ebuild b/app-misc/ckb/ckb-0.2.9.ebuild
new file mode 100644
index 000000000000..0516a27502af
--- /dev/null
+++ 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
+}
diff --git a/app-misc/dailystrips/Manifest b/app-misc/dailystrips/Manifest
index 1041843acc8a..bf6364f92fb8 100644
--- a/app-misc/dailystrips/Manifest
+++ b/app-misc/dailystrips/Manifest
@@ -1,4 +1,4 @@
 DIST dailystrips-1.0.28.tar.gz 58713 BLAKE2B c7d1c04c7bbb655898a21c042636655b058fcdfdba3843d6d42bcce0c0315f765c4080987c95256e37601773b6587654e8d9b9eee197253b7e93a1804823de10 SHA512 a5388d5bd45ce1b8b22420c3d53bbbf4d26fec9737c6edca3b579126443e4f88ae5a7ce5c6770264ca96ea1488ab69b73831ab6bbd20e0f68854fb08714565cb
 EBUILD dailystrips-1.0.28-r2.ebuild 810 BLAKE2B de7b86da861863a1df925985b36033df94d32ba4e919ceb78ec1567ec5ac59bc7ff797f2ab954fee4259df87e6c3e33e2fffd1c3e840fc49f40ba86ffbb1dd08 SHA512 ef444ddf3c8caee991aae8e23fe013b84be795640243ff10f6c3c5af61ec09e4c21a732661c1576dbc752766ff2b2b2c322a6fbe9083f95b7256740fc405a618
-EBUILD dailystrips-1.0.28-r3.ebuild 752 BLAKE2B e13318def4854db0257d7c990e95852f1b0dfb6fae78d14ff2e59358f4a50b63280fb4f5593c2c01e99339aaea2b94881836347eeb7598a98df4fa581229011c SHA512 52fd790664043171c0627e84a3a285336d29a20673677b398181f39db9786859cfb0626044fba3b4cfbe289db3cf5f4e2d404f832511b47ccd13eea8657edf66
+EBUILD dailystrips-1.0.28-r3.ebuild 751 BLAKE2B b0cc15ba88a99c460fa7fcadc320ff60e49aa849a5d902fd6d39e3ed769764e9e94f49ef49edb62bea3abb4dc3008231111ad7f4aff7527b50c27ed2fcc681e2 SHA512 9b00871a38a99a2fb9e6c0845a0fdee6515a056320bb208f57cfb92e1346d169ebe0442a01ad8b7fe24b8f1d84c5e25f771a9ee8f8d1247f8d011cb50b61ca71
 MISC metadata.xml 248 BLAKE2B f0ce888e7f1c4373cc6d4f88a6e2870bb26e24adc5a50f747425399e154b44a93827635635fa82be033506a79d4d033119fabeae8bf24367d1dae19ce4129e67 SHA512 d08bc57fb26bc08dd2c8eb96219fcf98dd63b1e9ac4725dd0bc246ec90db63ed13cf9653d94ad11789ae3efc933d9ed9781bbb4db6f439c5596bac12011b7552
diff --git a/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild b/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
index 1926018367f7..2f22affa9df9 100644
--- a/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
+++ b/app-misc/dailystrips/dailystrips-1.0.28-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
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/dailystrips/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND=">=dev-perl/libwww-perl-5.50
diff --git a/app-misc/inputlircd/Manifest b/app-misc/inputlircd/Manifest
index 07fe7a71da67..6d0e2ed0f39b 100644
--- a/app-misc/inputlircd/Manifest
+++ b/app-misc/inputlircd/Manifest
@@ -7,5 +7,5 @@ DIST inputlircd-0.0.1_pre15.tar.gz 5226 BLAKE2B 92339021451b2575de5adbf6123f1083
 EBUILD inputlircd-0.0.1_pre11-r2.ebuild 788 BLAKE2B 186c968570aa829bf7a4a947f7a6210db4edb38357ac59f3e30afacd97acc6b8473cee1c1e191db7391684c0c582a32921d1d4625e6f2aae3cc63f3440cb6db0 SHA512 dbb451f60f1da705f5d87273dafc96e145bad81f45a3789d900385c6c99d016c8efd71082c6ee9eacd96d25a440755d529a915d44f8e6ecf0d0276918ed5db70
 EBUILD inputlircd-0.0.1_pre11.ebuild 586 BLAKE2B abe1411ab4f1e339b4c4ae6737e3c8f644d15c1b704d6dcdad3ebf0b3754b1bdfbd03d2d9b0a2c0e22cd27e08a86b331a8a2b62809b31b7532b0eccdcd5de281 SHA512 62ca7270bbcc7d621d936753ed7f5fa3f6b572de4313b52ea3d8318f06e1ebb316259b78111aae9a8240ade4523a05b11ce6a286d837d7981f53f18d8d2c48bc
 EBUILD inputlircd-0.0.1_pre15-r1.ebuild 787 BLAKE2B eb23152b943475a63ed158407ec48945574adecf125f700287dc90180181731cb47b644e403bddf53e21a14ba895d41fbdbd9154cd9ad4bbb31b16d81fc9b8aa SHA512 0a6ef5f19829c0d63b2c54baefeae293f693e21af88df9d4a10cec4f27ccaf77f915c4d78c3db6a5b4e43c64ac596a07c654f04b3ede78b8c900945a3718a2fd
-EBUILD inputlircd-0.0.1_pre15-r2.ebuild 919 BLAKE2B 45b8f98bfb02799a4c72204094e5edfec472411a4281c0ce28bd585117b180369a0185a1e6a20aa8285ac6ffb6c1f2f28995ba37e1b46572c30ac5ad9835a684 SHA512 d95464cd756f8d72211bbce18f7a70fe955c339910acba2b07064403ce579c1a3978451c47d97f7e014fbf85249ee89dba8e21f5ebbdd02c0791cf26dbe1949b
+EBUILD inputlircd-0.0.1_pre15-r2.ebuild 918 BLAKE2B 8ef121d05af783c710cca42c3bb0557eca47e3efe36beb4a091b55120fa660d713873c8c6167e02911c22c0bdbf9620ac265733f3e96b244f24be4576cf41146 SHA512 fac8d739132bb197411e82a324e566b5c64ea6604e84f23d74a2604ec4d4691ae1a6c95a43a23a8ed9692d5ac2071dbfbd96beef04c48eb747cdb991af329a37
 MISC metadata.xml 258 BLAKE2B 1878517d827956dbd45c2d86e97fc066cd4293c3cc94d6d4beaff553462c1badb68aa38b3082c01fe6e21ca1519fc482e2670931d007382b8b2c38af715fe02d SHA512 33d52c9b472999f5722ba6a13598524745093ff45394dd1c9f560b051c9d28be465f72db260a148831b1ff8bc175f41d0c1e4b2d038afc0afdd230b039c67c2b
diff --git a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
index 4af5a2785623..a4cae3011502 100644
--- a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
+++ b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 x86"
 
 src_prepare() {
 	local ver="$(best_version sys-kernel/linux-headers)"
diff --git a/app-misc/khard/Manifest b/app-misc/khard/Manifest
index 548f7552e314..4aaae2a4ec92 100644
--- a/app-misc/khard/Manifest
+++ b/app-misc/khard/Manifest
@@ -1,5 +1,5 @@
 DIST khard-0.11.4.tar.gz 5060159 BLAKE2B 2c176c8bc9651dfd05f3792a66a242eae44b64f9114098916ec8c6e91643c5d57a19f916a0f6e0c559738e1a6c59f88596a54068ba048219a7e4a4d60447a0fe SHA512 f8dda3dd34e529e24276933f5f7354891b8259dfabb8818b4d3898174fb3d8b8a1f24cf81038901e521ef8aeeacec37b45b34c6e4c7eb0022b212a2f476cd9ab
 DIST khard-0.12.2.tar.gz 5064055 BLAKE2B 5dde8d4e535e5eecdbcd679e96db51e6d96cf4ad4c8266acd7fb1c02a89c74e3af8fc3537d7b3febbc1a16578a5208ec608396d36d3f3d4c380cfcc247fb08d4 SHA512 476a90b111e903669a34729bf48f28a4108612f65ed7b85a495d3246461f7b82f378e13e417aba2006cf1bf853245d5466d1bb5eba539b840c9e7b6abfb20c76
-EBUILD khard-0.11.4.ebuild 1046 BLAKE2B e4e57caf5ed87cf291f06b264a9479697fb6f875fb5345d7f294f6d41f095332da2ff77a46a4d811befdd30eb1847d306eec2a62c4119398c434ff8f09c0cf5f SHA512 280bee426b66aff557f7db2553ec6c39a4d9a31fea287ed1e80ec7ca2aaaec334f22fd54a06c080740c6fcc61753ae2115ea6d1bca079f18cb7c7b61b50f2923
+EBUILD khard-0.11.4.ebuild 1051 BLAKE2B 5891de1ed28450092504a2d09c34f89ed95e2210c569f315987bf010f19aae8cf733f68e6aff3fc4abca57a4479b3f2b92da005dfc3d117fa65590f86247c5d8 SHA512 048bd52341389756f0b18fc4b57b6e4b2a5a7d8596e9327b14a4fd946a7e6853e5590f981e6be7275998f97b64f25f07ca5fa702b047ac2eb869788c22ab413b
 EBUILD khard-0.12.2.ebuild 1091 BLAKE2B 1ca26abe6df8231997245f32b64b4a47366eec81e0acacb7867a41d3e3ce477c10dda779c076ca9fe067a7be0bfd83c23f829224de46e8ad59a51ac6fa83d611 SHA512 d17264b2be3b752c6c25cd132695d364dc8a1ea606a103a2c49de1c9410501933a3dd18bdc1e096df155276330aabde9259be6cd0fa0055731482ed6d0e798e2
 MISC metadata.xml 343 BLAKE2B 1a688d33284f7637df291ff450cf9c22ed072b2c27b23ced515d0aefc17a82a85d7e6bfbaa35c8c80f676306f26abadd1505c782e9c091734cee17a0541ca464 SHA512 44a220e1d5235c955a516289b53ff2728982ac353a237be83b167373a5ea039ed69d275c16144a8a86059a189dbd74be357e0609bd55b97d820fd92b0731b054
diff --git a/app-misc/khard/khard-0.11.4.ebuild b/app-misc/khard/khard-0.11.4.ebuild
index e80f2ffbfcc4..d903befe0862 100644
--- a/app-misc/khard/khard-0.11.4.ebuild
+++ b/app-misc/khard/khard-0.11.4.ebuild
@@ -15,7 +15,7 @@ if [ "${PV}" == "9999" ]; then
 	EGIT_REPO_URI="https://github.com/scheibler/khard"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/app-misc/linux-logo/Manifest b/app-misc/linux-logo/Manifest
index cc687ad12173..f3042f1df818 100644
--- a/app-misc/linux-logo/Manifest
+++ b/app-misc/linux-logo/Manifest
@@ -8,5 +8,5 @@ AUX linux_logo_creator 604 BLAKE2B f2956ddd3cf79488495262040b1756ffbbab5608a4895
 AUX logo-config 195 BLAKE2B 7ed5aa9a16ebcf27c73672bfc2e9256034c3c1b14c1d0d3d172b0292e658850a10c0cc8835e6fce224fd1664a85e6804f6d69c8fda5dffca257e0403eaa1557e SHA512 d58c60821d60d511f637d9abfd996b1420662df3bc5df8ce3ee2b3bd97974b4996a4a57ac18f8fdf5305cca3221244088d28e6d9ae5ee10d6df49f6247806469
 DIST linux_logo-5.11.tar.gz 103623 BLAKE2B 5790bae07a9496a690e0ef2d6426a68365c4ab91df058a31a5bffed38b8f3caac01b80ce49d52583f77632cc5e3061a20a5530437ca3508e823eeb88eb2e94cb SHA512 3c11d59eeb1ea613eb66d3ea5ef2d7c9ef906cb12430b9350570a6a1937ec174bdd974e6227358339c3fd2e0647a5066a0bea22289c4aa9bc8b03afb0033f114
 EBUILD linux-logo-5.11-r3.ebuild 2185 BLAKE2B 3e1bcd4fbacf8b1a3aa2248748c6711aeaf94858fb33f594e74df8f3afb1c9a70279a20e234b9ab56d1556fd66469421594ef2fe41a820aa8b2a93f980ba904a SHA512 6f0250d887fbe33372d34ab32966dcb08ae7fba7c4dfd3d80055b5c5f676c7dcef03b9f604d17d5da3e227a39b613d4d0f191bd5cc05b8ca1831d5382bcbbd76
-EBUILD linux-logo-5.11-r4.ebuild 2262 BLAKE2B 5bd9fb9e2f49e1a93dfd7abc82eb335a38997333d9b5405ada909d0779b0de7cacd68bfb05f737db0ea430e13eb449189e5a572b535074b3c05a1468c1590f53 SHA512 8d627e314dc3efd3493fe7b597e5f8cc155820164598040d247c5b0a2c5496576c00fc5af878d23c00f35db5c0cca2e74e31870bcd480c4d98ccd6aa857c7122
+EBUILD linux-logo-5.11-r4.ebuild 2261 BLAKE2B 07f78be5618e1413c8ff58c53f2a42e354800f57f3660f55ea9e89c1edbb1c97409ff3ee90a4422cefbcd08e53e1984d7960afbc53c62fb7bd79ac0a49e015e2 SHA512 88f18bd0d00f510183a9bb557f78f7eeb87debd09ec7e28e0e33f4e7262136fa6e06f63546c74126e6b60883b527b33d40546b198a52940dd7d9059f2cb1864a
 MISC metadata.xml 487 BLAKE2B 25ad355aac4b4da399514cf9045159f13a93b47ddf26fc8bf6a75aa6f4ab5a300b0a11d50df5458b7be57a735005de2ce82292807163c71c448d2a3e092322dc SHA512 bbc83554665f6466c688c8e2fc432c30e26cab8193f70c0cd47965a9f603a2284b0e9c147dd486ead65207133655d31fb4919eecd6bb72079290e46a677a6c5e
diff --git a/app-misc/linux-logo/linux-logo-5.11-r4.ebuild b/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
index 41b2d773b41e..1a8a23105ab4 100644
--- a/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
+++ b/app-misc/linux-logo/linux-logo-5.11-r4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.deater.net/weave/vmwprod/linux_logo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls"
 
 RDEPEND="nls? ( virtual/libintl )"
diff --git a/app-misc/mepl/Manifest b/app-misc/mepl/Manifest
index 30a22698aa97..8582385dcc28 100644
--- a/app-misc/mepl/Manifest
+++ b/app-misc/mepl/Manifest
@@ -1,6 +1,6 @@
 AUX gcc433.patch 600 BLAKE2B 12835e147142dbd001bbbb6c8a642a549b6f08d0d85751909ece7eb38010b76506cdc1a38dd44ab2cf105bcc1af1a665df1af61ea502b4ba275b12bcd3f54e1d SHA512 847c3006e2afc2fd0bd5cd614b8893d8b3bd8ebb2ff39662e3f0e38945220609843d1e6d072d1ffc168192e04160a7da7c579e59d7467527f75e9395e9ff0f12
 AUX mepl-0.45-gcc433.patch 600 BLAKE2B 12835e147142dbd001bbbb6c8a642a549b6f08d0d85751909ece7eb38010b76506cdc1a38dd44ab2cf105bcc1af1a665df1af61ea502b4ba275b12bcd3f54e1d SHA512 847c3006e2afc2fd0bd5cd614b8893d8b3bd8ebb2ff39662e3f0e38945220609843d1e6d072d1ffc168192e04160a7da7c579e59d7467527f75e9395e9ff0f12
 DIST mepl0.45.tar.gz 18968 BLAKE2B 15d5e426ea3984e8b6672e1512afcfb6b4e5678bfc473e1b21df7ba66da9596a0971a08114792720de6f779deb767846ad77a9545ee4734906679207a2c690f1 SHA512 679ac7548f6a4870164410db403d9fb8a18d7daa651a29d8e0dd87d8d3fdf1f9e8d381513ab922188951eba0798b1d32eadceafa117236ff54ef3e645d876c1e
-EBUILD mepl-0.45-r1.ebuild 703 BLAKE2B b5c6abb91a1af69eb1ca9d7298ba7a0d3710e0ded9cd9ebe02590c60a9040d52619c20cc08f830626c9224979b4c6c3a7c73aba60ee471b2ecd1e2d4ce3734f8 SHA512 69ee20e09351548d5aed2b080a0455d6e642fdaf6f90aca61ff4c93c14fb504f535bba1cc22d5f67df141ec0c8330cbe36f3da7b8fa7bedbe49599392fab0608
+EBUILD mepl-0.45-r1.ebuild 702 BLAKE2B 21cec2768a0bce49121544a4ddba1a6f675ac30f1218e414a41b504809c63289d6f185782d3bb2a9b6c96e1ced2b10715f10b39d42383fae59e17a82952c23bd SHA512 6868bb0dec7d0841b680ae818dfccc50ba2a67ab606a17b143b800e771678f65829dd6f4eb3dfd021c65b0e1850034eec1bd068fa5e57de45bbcde7bc57bea22
 EBUILD mepl-0.45.ebuild 751 BLAKE2B dc57323a6975a3f7449239fa0b43002fc4513585ab34aeadd447e3c4214ff0bebc037d948373619ba54dad62cbc9920f6667bb2d92e7013bcc49727cf64d7b70 SHA512 4e05c749580e35532731f1aa48fca36efc95be8f49b13b6734c100a9bf347b9f2c92fda2863e2a14f120bf19177c4817f6753adc6d1da73616c7cf8044ff6c45
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/mepl/mepl-0.45-r1.ebuild b/app-misc/mepl/mepl-0.45-r1.ebuild
index a2d1d730c8ec..fc4836b314e9 100644
--- a/app-misc/mepl/mepl-0.45-r1.ebuild
+++ b/app-misc/mepl/mepl-0.45-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="http://www.hof-berlin.de/mepl/mepl${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 S="${WORKDIR}/${PN}${PV}"
 
diff --git a/app-misc/pipeworks/Manifest b/app-misc/pipeworks/Manifest
index d8cd4cfe47fd..c87ea7d6fd73 100644
--- a/app-misc/pipeworks/Manifest
+++ b/app-misc/pipeworks/Manifest
@@ -1,4 +1,4 @@
 DIST pipeworks-0.4.tar.gz 11560 BLAKE2B ddc28cc26e4f6305eacf6f888cb11a205f1ec64b180a328dda7e250cfef8d98f52374301066ef844739f7f85a4d344307d21d4704c33f450db2740121a631182 SHA512 ddd9875deab26d0f0b673846c7838733a2c3ec573fbd06d85e4058adb3b0d5274daeac1165b573743b8b3da6aa05c24b9ecc0ac788b24a42cf0f379a8eb56ebd
-EBUILD pipeworks-0.4-r1.ebuild 646 BLAKE2B b47dbf81dd8edc54ee65f9f59ab5ed2c6cfa1b4a897a2f872ec4fb6afa8d346d2d6fc63cd12ccdaefb07eb6c7cb1ebf4d8f07080aba38ff4ec12543b5168464f SHA512 221f3fba526fbab303f98430ca66b2923e80fde676598a51c45609eec5a92551e5db4bddce622c3954fe66aafcfbfa75f7f8223c9963bf0078e6597c53fc7b72
+EBUILD pipeworks-0.4-r1.ebuild 645 BLAKE2B 850662572b09ec6cef727e56764203e08eef73091af724a73fabd06bbe261b4cbf77a6eb806523cac6900853a4381a35ac6dd82de8e6da13ddfb19c34c467df4 SHA512 da3d06fcd463b5e33a7f115fadbcf19d84983cc7dacb37a0d3c6c11c647ac9c8bda73e0898dbf77d38e0775d5fad06d1ea7ddd01531d357a834743668c16e092
 EBUILD pipeworks-0.4.ebuild 614 BLAKE2B 149f3927c70ba4092d804b6c8e407ad7d6c784f7bf2158a79090f4a497517976e6a7338ec5c323219dbe732a2d6af0c6dd791d0b6933e2eaf8a2ef12cf1dab45 SHA512 ab7c7a5630b261a4a6d1548c8b1e2b8e8f7f0d9eb327b99c0fc58e5fc922c1df70306de325d8bedcb110e71a39a7e396da66fc8344e9599bac231efcd5db65a7
 MISC metadata.xml 520 BLAKE2B 7c3c2102bcdad8698d9970f496002e43a7b93a88368555cf4e6762e0752e1dc56df82b66d4560dccebfa4b1bfb817d2c975019946e269cf074871f184078baa5 SHA512 f95bd764a974893a6ec46c0761a8b7a5edbb467c5b393a771163e42451efb34d75e25b73efb984d960b0aa46f19c233a5fd2df1f90aafebf4365d425d63c7243
diff --git a/app-misc/pipeworks/pipeworks-0.4-r1.ebuild b/app-misc/pipeworks/pipeworks-0.4-r1.ebuild
index 2d278167ebec..3f6c50acf2f2 100644
--- a/app-misc/pipeworks/pipeworks-0.4-r1.ebuild
+++ b/app-misc/pipeworks/pipeworks-0.4-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="mirror://sourceforge/pipeworks/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-misc/timestamp/Manifest b/app-misc/timestamp/Manifest
index 1f16def6a65d..252dba4f40ab 100644
--- a/app-misc/timestamp/Manifest
+++ b/app-misc/timestamp/Manifest
@@ -1,4 +1,4 @@
 DIST timestamp-1.1.tar.gz 61578 BLAKE2B dd33dc27a7353f25ffaeb01cc2fb6af25288e03021b097783fa2a659bd8abe0fd3cff1e9dad7858f16529253e1573bec7f1883ab6f37a462f51374bae591f3dc SHA512 38952f40938e45e178e310dfc3b974c1974485614f4da7617790642f8594a4583e97ec056cb2f4fe2761d86d04595bc0d387312803bf95add929d48863fd6b9b
-EBUILD timestamp-1.1-r1.ebuild 487 BLAKE2B 758e1fb1e7733d1e55f71305aa850eb8a6ea9c1eedea5bd61884bb1dbc3bb33c56c637fe619c4254e3385da47d43915c0c30f463deeec37699b3550d4308e3b3 SHA512 1775fce859aa67d2ced6ea37e2ba60a93f2978d3471822aa1e23eb5b829e9fd4c8e8630d55e77a8908dbb3d806414c3c8502c4b630731949b323fc99310c4b80
+EBUILD timestamp-1.1-r1.ebuild 486 BLAKE2B f3b5455504dedecb03d7f8d6b0b337ae6bd378c1126426f278eeb1b2ea5915f980ee625b643a8304f61b84c0eea41ebe407a4faf8eda8301103366355ca2d302 SHA512 80579fc844d468efbed574e7d3fac14f2e4f497e1a73ba7fb4da413ce2d5ab575c1988ebdf58a64d934d01114a37e38fc76c9a64bb3df4e220d7e2d4de3372fa
 EBUILD timestamp-1.1.ebuild 503 BLAKE2B 15251f7614236e3a4ee0640ad84fc9eb62d621d169d423c4ae6121702b3015c9cefb6b358ea318c8004f273a68c8d5e7db6fcdc7da66b36061c3c7fd7d37740c SHA512 7bd92b0ecf3a40cc7e149ba237b05f6afaaca5a52e4f933e5483a2470a2e0c2b937ddd15069660592f183da0e5d4318ff544b2b70817c2f26408c29cd8883dea
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/timestamp/timestamp-1.1-r1.ebuild b/app-misc/timestamp/timestamp-1.1-r1.ebuild
index ee19c78f56a1..82d8717a12fe 100644
--- a/app-misc/timestamp/timestamp-1.1-r1.ebuild
+++ b/app-misc/timestamp/timestamp-1.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
@@ -9,7 +9,7 @@ SRC_URI="http://math.smsu.edu/~erik/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 DEPEND="!sys-apps/moreutils"
 RDEPEND="${DEPEND}"
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 1c811dfdd26a..27df45df720c 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -15,6 +15,6 @@ EBUILD tmux-2.3-r1.ebuild 2234 BLAKE2B 3bb0de689495b69f479ad605480a0c93a13cbdbd5
 EBUILD tmux-2.3-r2.ebuild 2242 BLAKE2B 75da9813dc3ab1ecb854a15c8c06e84b88feb51bf21f876eaf385040ef07071be1dff7f34c6f9b62402a85f042f0088c4da088b1b882fbafbe292c4d7ec01d1f SHA512 ac9454dafba18b5f76c0f77a620ece677b8d195cb6f50fc57116bea4985e7c01e692d758ac42eb3a20d7c2c18f73c8bfcc2460f9535fc2c80180d3efb1462e6e
 EBUILD tmux-2.5-r2.ebuild 2073 BLAKE2B 1c3ee0f7eb1e2a26f5c7a0bc73442dcdd160d1bdd9a7bdad62a2397854b8ad08b4c055b985df9d8ba3d1bcf49033c30ff28443f8f7abbae55b54a622035c13d0 SHA512 fa557f19858c312918d6190cbd029dcbfec05a494236027e3be78bd8be8843823f5112150387986709881577b0bb3fc66bba42a4001729456136dd89739844d5
 EBUILD tmux-2.5.ebuild 2263 BLAKE2B f03e993159487bd92fe3e328d5f79d7bb3bc6b75ab3ecabae51dc64b156db260c7e2242a173e77a32a16dc14ab6276feec77cf7d94f2145c98d6209e9a8fed4d SHA512 d5abbfd108431a47bab4195e9397d0b2748fd59c0036c0c71caa34b741069eb0a5a3d14fe98d0874d312e740a5831a7df3aecc0de2eb3163842663a94638a389
-EBUILD tmux-2.6.ebuild 2145 BLAKE2B bd4b10f4f4d56043d3aac25e312ac2e51978526b3854853a27c35c81d48908c948abeeb2d85bac018963a1969595ff581d1ee9ed4fc784922d2f6273e9d45222 SHA512 8e9d295be0447556596e157135c58a02463a3763b8f8814775b930830c2f81fdb495527507f9e4a4ba408aaa14689121ea58338f88870dc94bfa3a7e614b7a69
+EBUILD tmux-2.6.ebuild 2144 BLAKE2B 3a59af25ae6fe4f50546180489cda3b1cdf97fac0685e176487556ccea7551c5d1e68e3d3f1ea1a0eb26900a54cdd161e5eee0a26d58a6da13c9671e02b04860 SHA512 c31938eeb6ff25b52737e99da1aa041e25908345063668d2bde4b94e84c7da36449c826392394de3868118995281d97e129caa692ddb64bab94b78faf0f3ba1d
 EBUILD tmux-9999.ebuild 2349 BLAKE2B e4f633dc28e278873941f66efb8adfff9735fd04ad98e505b474dfa657303033ba8cf1cc22f64f7e66ef248c2621858461bf133b2aaad9ee817ae80eba4de847 SHA512 0fd75b67ac3e782f9c6aec6e36bafd69f025555c493961da7945994b0cb3dc1d8991d5a41ad68f85bd176564427e0b5f21ffc53ee9a4db41d50caa043ac0dec2
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/tmux-2.6.ebuild b/app-misc/tmux/tmux-2.6.ebuild
index 78905b54e38c..dabbb790530a 100644
--- 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="
diff --git a/app-misc/xmind/Manifest b/app-misc/xmind/Manifest
index 21af2e11e584..aa7e605947e4 100644
--- a/app-misc/xmind/Manifest
+++ b/app-misc/xmind/Manifest
@@ -2,11 +2,9 @@ AUX xmind-3.4.0-config.ini 1671 BLAKE2B 1db0351ca78f06ebd2966d32c402334ceca45cc9
 AUX xmind-wrapper 488 BLAKE2B 5880ece73df047121bbda1eb8f6b891685bba3e704ac9d47f79970a81be8f8e20c35febd278278a2825692c12ea34a4d24627ef8b9ba91f1c6ea8f602fe8eddf SHA512 f400d3f527897f087d5e20bce43299a20bd64a458f7c95a47447c78bf0c2b951a8f38d29e4a6ce028a9b421c41880fb5850184cb0b190de79f712ec807dbf9d7
 AUX xmind-wrapper-3.5.3 493 BLAKE2B 82aa49de2c90e2f943550d328253749310032e95e1dbd33e092383240950698ccf61bd85e1b9315275ebacc89cef78c518152e6e70f9f3246af8d41f850d7aad SHA512 555e1103dc5714bb5924421899262f1112c83807233c9969afdaa0eb0cba631b13e4fa984af7c2029fe57fb7e135f51a1d00e3dd3fffb8bcf3bb96eb93dfad80
 AUX xmind-wrapper-3.7.0 504 BLAKE2B 3528749643f3686d11afc7817e6b3e3228e3ef22105a013046aa8dd8c0c5463490918182a52d8fbf476332265685a9a80785dfa431dd912ff22145a13a00b99f SHA512 452560c9b1ab68df745616ac032089fb05f1aab61c7e1b247eb241195dd38e11b69459abb5e2b6696db76e2e421291de4dc41030f525f77f0e30522b52540248
-DIST xmind-8-update2-linux.zip 120800791 BLAKE2B 2128d3d6a2c120b226b02128aede12aad062e72e4e322f910100663a37be9ae9a722270c36318a21897aa6489d9bfad118145e0852463e31b17bc1d377c12725 SHA512 e658714a5944e8de62577302c22763e9c55d1f82ce6cbda187ec39801ac7cbd5c34de6e4d7d9735546bcef26795c21c194ff026cebf39b2c9af2663cec98ce58
-DIST xmind-8-update6-linux.zip 120903858 BLAKE2B 8dd45f06a0a1486fe65b99668dcba7f17d4763caa2ec2542c60040f0e3701b76946810b7fa242726a8a3c6d3c46b4b7d9a0a67666d4c2814509215395170ce80 SHA512 0e4871a385c8449da000ee3bcf1a44fe63075af4f592f43a01635e017ab253a996739c63f9c71f098529adf62b5df4018440c7db1c44040488c0e3186abe6248
+DIST xmind-8-update7-linux.zip 119918223 BLAKE2B 83a7c11e9eda40ac5f89458673417cdf98aacd793de66cca91e6b1f8429eaa0dfb276cc5a11a0eb00f055cb1b66e69bc084fd29abcfa6cecd2811de4f7d7b57f SHA512 0f59201f44b23436c7e6e3fd4dd1427337e5a262e5d4f25dbc836c2f4fd42b99232c1988138ba7015523ede50e0ae829ada6359698d5af0eee529ed19cd347e3
 DIST xmind-icons.tar.xz 5024 BLAKE2B 3391d931dc7d3094ad1213c9cbd43c6b3f151c7f7321ff23139c7f1b69c3fdc662902a95714bac240b1962c26210f3edc41752f315c885581e9ba03efa9069e6 SHA512 3ee6b8e42b75305bec8f97f733575f10ca3d08e1c5a76a10700776cb7740ae6f8a0f3dfbc4112d60ab2499915ca4ea0e3d56fd49e55bec00fccdc8710d9f9f0d
 DIST xmind-portable-3.5.3.201506180105.zip 159265180 BLAKE2B dde948c9e16cb02607b8fd23a315b0ff5d5ec75b4feb79d62cde1e0d11f06e477068435dd8856d573b7f01e7959a19169357b477841a1d5057367cd3c4f8b8c3 SHA512 d41deebec769d06276d051c57e546c44e4283feabd5f6c45ce97efdbf755d75e9b99d39b6fd10baf2f4735f25a695d2902ca9888d94ad414318f38c55e3f4af5
 EBUILD xmind-3.5.3.201506180105-r2.ebuild 2215 BLAKE2B e7cfad25893f5c2a9433b0600fa5f96fa1012a4a315c53d3b3f008b42b82dc56711d35bc546501117a4146e9f86f0a501c1e653df6e5b4bda140c1c9d424d241 SHA512 af0c431cca019f4b5b1228daf2931e1bed1d8d01711aa1a19aa3b73d75176f08e10d6353c8a0460f33dff0b13dcd9d4f3b7cd8d32fa89611663ead849674d7a0
-EBUILD xmind-3.7.2.ebuild 2186 BLAKE2B a815fab4ea635fa0b2f2fc22ca6878dd55f9316bbfe23b0b87afa197c5096aa627a7816c99e4d6da0acf2e7f75f84b15a96b4b49e516290cd994ec168f1ef621 SHA512 d5960a6dbedff1000859ced4aee8e43f86bd5fe63ea61e046c78a31c1634e1e653523f2f446e9429fb5d228623e81fad90279c18d29e1111a9b667543e2c9f1a
-EBUILD xmind-3.7.6.ebuild 2186 BLAKE2B 8d28428f983b211f5b7624d8825a9df417c59402a7ecbe77e158dc503abc207f0538179c714bfcffac7765619d98fa8c9635284d3c662694d45f8a3de807e43a SHA512 e90cabd43dbf81d828d79475cda33f7d6dae3edf295d2407355fefdb4a39ad59e0fe95e647559d1f141a4480f49186e95e03a0cf9920ffc76a9ea6872a640bdf
+EBUILD xmind-3.7.6_p201801311814.ebuild 2170 BLAKE2B e45c6fa4d2f074d63b18af8a106ec92038598e75d40e5ba95a45994d64af3cd914b4fa120d05f1ebfc342fc13b0ae53161c279ebe624601988c6555e77b5e305 SHA512 117453801d73331af8f76040e8bc293ac392adf17e75624cd6b5d66301ace686980df8a8d2b37518a3376a1daa08b9c3552486eaf016458c7e800ea63121ade9
 MISC metadata.xml 248 BLAKE2B 756531e249f020913a383436ea184d8617481ef1ddefb311630199224eabe6082d396b3058f1123fa97d7aa6f8026de8a256cf4fb253b16381462d64f45373d6 SHA512 29d9aef2134dc48ca8f1cf14bcb7197920bee680270c75fa551c892c9bbaa325a1a6cc6e97a25e1a33c1dc36e1c7085abb3672559b9803285d755db6eefe12a3
diff --git a/app-misc/xmind/xmind-3.7.6.ebuild b/app-misc/xmind/xmind-3.7.6.ebuild
deleted file mode 100644
index f1ab65c41091..000000000000
--- a/app-misc/xmind/xmind-3.7.6.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib gnome2-utils font
-
-MY_PV="8-update6"
-MY_P="${PN}-${MY_PV}-linux"
-
-DESCRIPTION="A brainstorming and mind mapping software tool"
-HOMEPAGE="http://www.xmind.net"
-SRC_URI="http://dl2.xmind.net/xmind-downloads/${MY_P}.zip
-	https://dev.gentoo.org/~creffett/distfiles/xmind-icons.tar.xz"
-LICENSE="EPL-1.0 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.8
-	x11-libs/gtk+:2
-"
-
-S=${WORKDIR}
-
-QA_PRESTRIPPED="opt/xmind/XMind/libcairo-swt.so"
-QA_FLAGS_IGNORED="
-	opt/xmind/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.1.400.v20160518-1444/eclipse_1617.so
-	opt/xmind/plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.400.v20160518-1444/eclipse_1617.so
-	opt/xmind/XMind/XMind
-"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}/fonts"
-
-src_configure() {
-	if use amd64; then
-		XDIR="XMind_amd64"
-	else
-		XDIR="XMind_i388"
-	fi
-	mv "$XDIR" XMind || die
-	# force data instance & config area to be at home/.xmind directory
-	sed \
-		-e '/-configuration/d' \
-		-e '/\.\/configuration/d' \
-		-e '/-data/d' \
-		-e '/\.\.\/Commons\/data\/workspace-cathy/d' \
-		-e 's/\.\.\/plugins/\/opt\/xmind\/plugins/g' \
-		-e '/-vmargs/i-showsplash' \
-		-e '/vmargs/iorg.xmind.cathy' \
-		-i XMind/XMind.ini || die
-	echo '-Dosgi.instance.area=@user.home/.xmind/workspace-cathy' >> XMind/XMind.ini || die
-	echo '-Dosgi.configuration.area=@user.home/.xmind/configuration-cathy' >> XMind/XMind.ini || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	insinto /opt/xmind
-	doins -r plugins configuration features XMind
-	fperms a+rx  "/opt/xmind/XMind/XMind"
-
-	exeinto /opt/bin
-	newexe "${FILESDIR}/xmind-wrapper-3.7.0" xmind
-
-	# install icons
-	local res
-	for res in 16 32 48; do
-		newicon -s ${res} "${WORKDIR}/xmind-icons/xmind.${res}.png" xmind.png
-	done
-
-	make_desktop_entry ${PN} "XMind" ${PN} "Office" "MimeType=application/x-xmind;"
-	font_src_install
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	font_pkg_postinst
-	elog "For audio notes support, install media-sound/lame"
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/app-misc/xmind/xmind-3.7.2.ebuild b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
index e8a9a4ed312c..21d20c8af343 100644
--- a/app-misc/xmind/xmind-3.7.2.ebuild
+++ b/app-misc/xmind/xmind-3.7.6_p201801311814.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils multilib gnome2-utils font
+inherit gnome2-utils font
 
-MY_PV="8-update2"
+MY_PV="8-update7"
 MY_P="${PN}-${MY_PV}-linux"
 
 DESCRIPTION="A brainstorming and mind mapping software tool"