gentoo resync : 13.05.2018

13 files changed, 83 insertions, 259 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 20ed542e7f28..d6eca0f8d8b5 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index cd738da8b041..53083af9674d 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -11,15 +11,9 @@ AUX elasticsearch.service.2 1544 BLAKE2B bb66a0e945df66f84937804461ed51216f8bc45
 AUX elasticsearch.sysctl.d 24 BLAKE2B 4012fbdbc98a8b28df11aed33cb82c113790c44721eae1d69e19c595bfbf329618b9cb67be9528f1994c546233cffd31b20eee39edc142bc86f7a7cf5e08903e SHA512 9f3d8238edff6704bea06b6535ee8915f4a3c9bdc8389d9d4943bcfa49161b61f9a1ca49dbcc415580438f4396fbc3d58eef301554f9426287606a755ada715c
 AUX elasticsearch.tmpfiles.d 56 BLAKE2B 0c28c612fadfdd86321df797527399fa5073a7350de95ec2b32dfbe51cbf52fe5dcf68ebd4e3fba6cccba1cf252a16dee3b701c4c6692121745c41665cf3c972 SHA512 5cc722abcaae68afffde96e38b2c9572faf898178d3c291c945fe49fbf977e319322b99fb6fb5bf49cfb04e86f071dde0db621849288f712a56571b13af9a11a
 DIST elasticsearch-1.7.6.tar.gz 28488767 BLAKE2B 0dc4fb10355e2139ee3a7e7e65366e8aa533b9714bf0f00d2bd8f4ef0669ba9f8f10dc5255c8c7a62abc0362e08ab5fda3c8b6b6f2bacfe5cce7255973293162 SHA512 2746f09b66919912e785c8d25c50ae74dbb38a41d99d9c926550786f9c2d7953d1ae1a54a32dae59a7269e5fbfa74dfbc91c3d412e415efd01c391ef7d329ba7
-DIST elasticsearch-5.6.6.tar.gz 33780290 BLAKE2B ce4014b8eb74098990d97d7d87a0bd88df06f6719772f310c97cc33e740f44e84ebf74750c1f81b77c713c661a0e2e9ca826b6ab91b3625023fb9a061005d8ef SHA512 582fc3c2d1dcd5c208c229307ce387015ef8b25d9974fcac9ad4b8b3bc1c983a27daa171f0f242d367cc0776c545a82c5a4c07f6340104e739d83831e0d2210c
-DIST elasticsearch-5.6.8.tar.gz 33781024 BLAKE2B 8b946b76997ed68baaeaab110f78824c21df7bd7647474f239996191d14c6ca9a5ae4ed564f998d036aa55074f2299e4e3214043058a1984ebfbe9fad1f5d230 SHA512 b306b7e09ad14aaf7e20c3dbac1bc1496b9cb4cfb98b6111aaabf955af88f3fa0d77c72153f278bec11356e022f5c339248d185618b47cb140717bbd3fae09cb
-DIST elasticsearch-6.0.1.tar.gz 28026460 BLAKE2B a70cd36affaccccf1ea552167e585a35cc748de1137cf4b23387798ae31b851104ccc19f8be83ecc645bcebfba344b5e55a397a9cbb0b380c4a118f1f0ffecf2 SHA512 b86a04acd194e7e96e3a32de6ab4983d6569ffb1714f2af9e2b49623004987e13e57c5db055153a188f5d2d7eea63d649fa87769f7625f3fc4923e0cd5b8f3ee
-DIST elasticsearch-6.1.2.tar.gz 28455845 BLAKE2B 36215cf3131c8ac24e9b974d6c12892679e1896242119bf88182a229286a8391fc9575b068c6e692b9931022df299920fdc5dbf8f04651bd4bcfd544c1b65b2e SHA512 c72e69700b60faf3b1a542c2317b83189926738affb38033c4b8d7cc0a1b3c21c4f743f441fb10657d4684111746ebb18c9dba2f54845ea6e02e4fb8dc950e5a
-DIST elasticsearch-6.2.3.tar.gz 29050159 BLAKE2B 32a722e3861abf024a4b82ffe97877896cf3ffc76aac34fd942eeb9ca490ac41f3bf530b6313104fdf2c4900ea377d57837c465c6de6f983afac99802586b1c7 SHA512 8103c2b817cd5e14057c28372f379bb9c2b7833698818882c649d349904163d0c69d147836d03428619535652902532f7e5abc1e23214ad735c54b1d914acabf
+DIST elasticsearch-5.6.9.tar.gz 33794793 BLAKE2B a056443b1f71b3af773b5195147927017456e1c9a6517c549cfe7e4ec70f0ff4ec9363c9ef6376b7b942e82f811cd5927d44eb9f9eb8022a56e54a85b4ba7c46 SHA512 4e61a4c5f79d0439a414f1e9361f855cdb2f79322cf592bad43132605922fb8ded6368b01e05ef6bcbee49911943c2a3b6be5fd6d0900abddfe03c736cca96d6
+DIST elasticsearch-6.2.4.tar.gz 29056810 BLAKE2B 121be27ac1db4fa6bbe285161b3f2b2dd889859b50f46b57b68ed43514568c4aa9629b5ca32edcc2328a6e7245256d64901c8acc8b2dd91337f8ca97b87c46e1 SHA512 9e6c0de8ed0d9e27fdd18ef7bada376af5a8680bb7a4f4d805926da456b349cee731ba90328b5eda5f0e62fa3f00f34646bf1c2b6c662d055f4be338d0690941
 EBUILD elasticsearch-1.7.6.ebuild 1731 BLAKE2B f9f95530464bbb1fe79a3f4ffd0c9421caa4eab078ab3fa1743e7ecaeb7004bcba414fa4d4509ae12b37d8f83f4c96dc0c5d5c179acccaf8c20b15d5b534bbe8 SHA512 8012b00b8e90fb84ed7d75a9fb22ded1a7ca6a0ef820746fc2258fbdc576b73d0cb97d037c8ca5fa08408fc119d9801b73aff6b4785e257d8e4fb658cb5cc730
-EBUILD elasticsearch-5.6.6.ebuild 1689 BLAKE2B 7520b1676de4ded7fbb3691cca543c3a5c6de99cfa1ffff09e40ba55991d086f7004c372387e932213bbf5dbab42952266f4da9cbaf051c1795089c420949dbf SHA512 36d5128d2779abddd535e0918bbe4569c3d1414dbfc43e57fc037ca3056aabf73dbfd43b58811c5a4d0bc3d0e3edbf093ca458add2b90b87b62cb22416552fb0
-EBUILD elasticsearch-5.6.8.ebuild 1689 BLAKE2B 7520b1676de4ded7fbb3691cca543c3a5c6de99cfa1ffff09e40ba55991d086f7004c372387e932213bbf5dbab42952266f4da9cbaf051c1795089c420949dbf SHA512 36d5128d2779abddd535e0918bbe4569c3d1414dbfc43e57fc037ca3056aabf73dbfd43b58811c5a4d0bc3d0e3edbf093ca458add2b90b87b62cb22416552fb0
-EBUILD elasticsearch-6.0.1.ebuild 1690 BLAKE2B 218d513c3bd36d299c362a08541eafb54b3fa20ee41ff117698f221d97e49afe1658705cf091bbef9d92131c0eacf4ebc151e337a1d0d8b9746dcd7e4c25dda3 SHA512 6b4b2fef48924f189089aab2063d7b387135600138889f0d8ce18e236ab9c7aa2cb954ee78e64e7537e8e0ea7de4054903d48f27f4008f4cfb0f7ab1241dcc4b
-EBUILD elasticsearch-6.1.2.ebuild 1691 BLAKE2B 9af52980118337037e21756934db517977a8c9517f52938a83467328d17e67e889eccc4dfe33e14ac22218cb385bd39d3f0caa942c573247dae32d569a35f7b2 SHA512 bd2f35d796476a56fa3e183136b0b3cf556ca73b19243002a392c70da951018526c3c563804b558d4057ec23af497dd0b49afae160f7ac892cbdefdc91db4464
-EBUILD elasticsearch-6.2.3.ebuild 1747 BLAKE2B 2e8ad76bb75a927499cb73a89ede57629db4426ee267a0721e65e8893cdff2799830f7cd136b7e82185effdac60ab8f0d9314edc0179fe2261066514f3c60519 SHA512 e7be527f28b482278376316dd3d6bc969e4d70a8d95a067ac1932f5be0dcffaaaa47064e463bb043665725f73d9605cd150128660ed923de7094f3eeb8af5a3c
+EBUILD elasticsearch-5.6.9.ebuild 1689 BLAKE2B 7520b1676de4ded7fbb3691cca543c3a5c6de99cfa1ffff09e40ba55991d086f7004c372387e932213bbf5dbab42952266f4da9cbaf051c1795089c420949dbf SHA512 36d5128d2779abddd535e0918bbe4569c3d1414dbfc43e57fc037ca3056aabf73dbfd43b58811c5a4d0bc3d0e3edbf093ca458add2b90b87b62cb22416552fb0
+EBUILD elasticsearch-6.2.4.ebuild 1747 BLAKE2B 2e8ad76bb75a927499cb73a89ede57629db4426ee267a0721e65e8893cdff2799830f7cd136b7e82185effdac60ab8f0d9314edc0179fe2261066514f3c60519 SHA512 e7be527f28b482278376316dd3d6bc969e4d70a8d95a067ac1932f5be0dcffaaaa47064e463bb043665725f73d9605cd150128660ed923de7094f3eeb8af5a3c
 MISC metadata.xml 493 BLAKE2B 8149c45c1eb86d156ec0a32f016e8eed79d8e8fb7b6f0294ad606eebe9c63208e3d450796cdfc123fb7b2b2bcd10ff0cf23f2b6d2a99c177cb1e795965984892 SHA512 ce03769abc314d3bf561ff5820a8c8582196e9e6755e1e695dcf1224afbc04b609fdec7a1499d2d7a3aa0a350ad9fea94e0e3b46eff7c3c6150a524edd28d399
diff --git a/app-misc/elasticsearch/elasticsearch-5.6.8.ebuild b/app-misc/elasticsearch/elasticsearch-5.6.8.ebuild
deleted file mode 100644
index 26cfa98675c0..000000000000
--- a/app-misc/elasticsearch/elasticsearch-5.6.8.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="virtual/jre:1.8"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-
-	rm -v bin/*.{bat,exe} LICENSE.txt || die
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins -r config/.
-	rm -rv config || die
-
-	insinto /usr/share/${PN}
-	doins -r .
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.2" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.2" ${PN}
-
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service ${PN}.service
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/elasticsearch into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-}
diff --git a/app-misc/elasticsearch/elasticsearch-5.6.6.ebuild b/app-misc/elasticsearch/elasticsearch-5.6.9.ebuild
index 26cfa98675c0..26cfa98675c0 100644
--- a/app-misc/elasticsearch/elasticsearch-5.6.6.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-5.6.9.ebuild
diff --git a/app-misc/elasticsearch/elasticsearch-6.0.1.ebuild b/app-misc/elasticsearch/elasticsearch-6.0.1.ebuild
deleted file mode 100644
index aeab2b8db112..000000000000
--- a/app-misc/elasticsearch/elasticsearch-6.0.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="virtual/jre:1.8"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
-}
-
-src_prepare() {
-	rm -v bin/*.{bat,exe} LICENSE.txt || die
-
-	default
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins config/*
-	rm -rv config || die
-
-	insinto /usr/share/${PN}
-	doins -r ./*
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.3" ${PN}
-
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service.2 ${PN}.service
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/elasticsearch into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-}
diff --git a/app-misc/elasticsearch/elasticsearch-6.1.2.ebuild b/app-misc/elasticsearch/elasticsearch-6.1.2.ebuild
deleted file mode 100644
index 4a1d5418c70c..000000000000
--- a/app-misc/elasticsearch/elasticsearch-6.1.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="https://www.elastic.co/products/elasticsearch"
-SRC_URI="https://artifacts.elastic.co/downloads/${PN}/${P}.tar.gz"
-LICENSE="Apache-2.0 BSD-2 LGPL-3 MIT public-domain"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="virtual/jre:1.8"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 /bin/bash /usr/share/${PN} ${PN}
-}
-
-src_prepare() {
-	default
-
-	rm -v bin/*.{bat,exe} LICENSE.txt || die
-}
-
-src_install() {
-	keepdir /etc/${PN}
-	keepdir /etc/${PN}/scripts
-
-	insinto /etc/${PN}
-	doins -r config/.
-	rm -rv config || die
-
-	insinto /usr/share/${PN}
-	doins -r .
-
-	exeinto /usr/share/${PN}/bin
-	doexe "${FILESDIR}/elasticsearch-systemd-pre-exec"
-
-	chmod +x "${ED}"/usr/share/${PN}/bin/* || die
-
-	keepdir /var/{lib,log}/${PN}
-	fowners ${PN}:${PN} /var/{lib,log}/${PN}
-	fperms 0750 /var/{lib,log}/${PN}
-	dodir /usr/share/${PN}/plugins
-
-	insinto /etc/sysctl.d
-	newins "${FILESDIR}/${PN}.sysctl.d" ${PN}.conf
-
-	newconfd "${FILESDIR}/${PN}.conf.3" ${PN}
-	newinitd "${FILESDIR}/${PN}.init.3" ${PN}
-
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d" ${PN}.conf
-	systemd_newunit "${FILESDIR}"/${PN}.service.2 ${PN}.service
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${PN} by"
-	elog "symlinking the init script:"
-	elog "ln -sf /etc/init.d/${PN} /etc/init.d/${PN}.instance"
-	elog
-	elog "Please make sure you put elasticsearch.yml, log4j2.properties and scripts"
-	elog "from /etc/elasticsearch into the configuration directory of the instance:"
-	elog "/etc/${PN}/instance"
-	elog
-}
diff --git a/app-misc/elasticsearch/elasticsearch-6.2.3.ebuild b/app-misc/elasticsearch/elasticsearch-6.2.4.ebuild
index ad26d333245a..ad26d333245a 100644
--- a/app-misc/elasticsearch/elasticsearch-6.2.3.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-6.2.4.ebuild
diff --git a/app-misc/neofetch/Manifest b/app-misc/neofetch/Manifest
index a7cd9f5ab1f0..6e55332ff07d 100644
--- a/app-misc/neofetch/Manifest
+++ b/app-misc/neofetch/Manifest
@@ -1,6 +1,4 @@
-DIST neofetch-3.3.0.tar.gz 76325 BLAKE2B c7bd860dd1f89f4b0e64a5a4dcc6551d548103abbdda0606fdbfa5edbe27d91da053198f219e223af56571a87d3af4b93f8f8d615ad4f377b1754da4bee50526 SHA512 aa220f3d177a3f58e7cb665209e6bd70334eb3d2daccf7ec9cb32353b8c23f53e000f7d412422c8d5fcf1132b39f4a9dc51141ed7359f45c1f0f7a189853baf0
 DIST neofetch-3.4.0.tar.gz 82090 BLAKE2B afc00b37d84cdf3ae0fd4037312b1c67fdadcbe99d6d602e8f3b6caa844b3780861c9d2522ec605ba5b7aa08e4e85ef804129da2ce3f6f01ab8b536704cdd182 SHA512 931648e8173eb91fdf5c79b5bb9b6efef132d30cf2f10d6f75dcff42f3661d40ceec712c109e90e2226e1aa85cad7676c438b6cad49e8298a77d990d9a3d197b
-EBUILD neofetch-3.3.0.ebuild 528 BLAKE2B 4d3ec0296e70b97d451c01fb64848095e32acef6018b05a3265940ec77a111fa99210c986f7effab4d3c60183a60175b5299271fb203faeab829656489b02219 SHA512 7b2e63056b104e4cf1b42428311d1d20044f5bcfe601a3ab78bb996a3520a9a7b7f38958efcc44318dc0e0dbe02ee5de223e173beb3e720612f107d37088fe0b
-EBUILD neofetch-3.4.0.ebuild 530 BLAKE2B 84caeb2243d4c3c7b453ef5db69d50a35fc298dd7314fc1a5dfcb008c19bbf6c9e939b1151ff0cf96c357144ec10ef9de272e2bd2bc091d763fd2538a80f30f3 SHA512 d6ff236ed8c216239ffffe0cbe23b8a877d8ea07cdb98dc93577eccf7efdda05ffabf6c575c0993402d1683ab526fcfa7bdd02bfbcf33f56aafd23f4444aa1a1
+EBUILD neofetch-3.4.0.ebuild 528 BLAKE2B 55af7ef9e6137fe42359f3db5af58c3418d4efbb9c1cf2dd5321acb0990e31de3db5258bc1bd6f4784e54cc4e9b3dd6abfc7ebe7c6dc366d72ebba82f6964042 SHA512 21b9a4f2d6df165860872f58794b34550df3dcacc5a9a3673a5ac45eab46fa7e2c3de238f266f7ef3944aacfe6787b1debf70d8f7b85fb4c186029efdf78a2df
 EBUILD neofetch-9999.ebuild 497 BLAKE2B 793b99ff054d95d04540d626558fd57d89378584a0822d231b01f67d177770c6e7abe717bee7c3a7cebfc4d33f8af6df8254005270b68bce442f5228ec5c3b03 SHA512 6e016dd83987b53dd41d90199e6a1cf40d849e033e5f490609fff17d38f21a24756adf88b60ed5f9fe4cbd46a0818dca6d4e20c1aa56d7936a2162c5c6cf0796
 MISC metadata.xml 808 BLAKE2B 8f8f20ac1f262e69c525c9e626c64ea28ae3165982052dcf74fbcf76b8c362fe6407ddb5994d04dbff6f07ead6ad2c0e3bbe7f9a1a73bc194be30346a3f68c4f SHA512 9e28e51cfba1e7c648cc96d32c2c86a0341dc077457e9e62ce42d667f1a689407e65bf0b7d6df87526167b157b16bb7495752932036c9dff12052573c9f9dae3
diff --git a/app-misc/neofetch/neofetch-3.3.0.ebuild b/app-misc/neofetch/neofetch-3.3.0.ebuild
deleted file mode 100644
index 6cba23e37f82..000000000000
--- a/app-misc/neofetch/neofetch-3.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Simple information system script"
-HOMEPAGE="https://github.com/dylanaraps/neofetch"
-SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
-LICENSE="MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-fbsd"
-IUSE="X"
-
-RDEPEND="sys-apps/pciutils
-	X? (
-		x11-apps/xprop
-		x11-apps/xwininfo
-		x11-apps/xrandr
-		www-client/w3m[imlib]
-		media-libs/imlib2
-		media-gfx/imagemagick
-	)"
diff --git a/app-misc/neofetch/neofetch-3.4.0.ebuild b/app-misc/neofetch/neofetch-3.4.0.ebuild
index 02361f6c21ce..861c13b16942 100644
--- a/app-misc/neofetch/neofetch-3.4.0.ebuild
+++ b/app-misc/neofetch/neofetch-3.4.0.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://github.com/dylanaraps/neofetch"
 SRC_URI="https://github.com/dylanaraps/${PN}/archive/${PV}/${P}.tar.gz"
 LICENSE="MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+KEYWORDS="amd64 x86 ~amd64-fbsd"
 IUSE="X"
 
 RDEPEND="sys-apps/pciutils
diff --git a/app-misc/wcd/Manifest b/app-misc/wcd/Manifest
index d181243720d5..c24851403f9e 100644
--- a/app-misc/wcd/Manifest
+++ b/app-misc/wcd/Manifest
@@ -1,12 +1,13 @@
 AUX wcd-5.2.5-gentoo.patch 1468 BLAKE2B 4c1e0998173ca2104fef5f44e206f37c2f7685a518af162f61a6e1aa30ca5f8687bb3a5f1c8cf91279f2865016bedbe676ddf4d21f0c9a7700abaab0551e9a14 SHA512 427befe8be99ca4dc633f4c0e3cb130924027e452d87f3d9463d4edd7418f0864d6b5bd1cd3526734a55e28745db3e93a101c45255bc285c9abd324a6bd27108
 AUX wcd-5.3.4-gentoo.patch 1293 BLAKE2B e60a4da12941d78e4f94ae2e12ddbe2828dea13ebb1ad97fc54b2ec44799446d3fe464e2380086016843f13c8431c0b9d3fbbce1914bba7fb107ba1ebf93ced7 SHA512 2a5508ce61475dff6606a81df9de609d8ff270914ae1b40ffd831dee49d643afbb9654fb807ae6536531c95bfdb5f76a194bed250986b4881504b63e2fb21ddf
 AUX wcd-6.0.1-gentoo.patch 1503 BLAKE2B 0c17f6085ad12b7eccd768ac394ac7965f7fb299aaa7fc3ce2a15341dffc420321534083e253dab3ff673bbee983a063d4698121ab41e7de271de02f99dc8ebc SHA512 0d99727b6b5ae3c665d122ed84fcd3f2a57de3740564acab765cc075c7e05ff9c00e27bc0644eb6e49a7e02b56fd988921b68a5d05894f4ae77d544d6502d952
+AUX wcd-6.0.2-gentoo.patch 1476 BLAKE2B 3c94e459733592c0d90c4fca6cdad936333cdfa7f1347df5780baa667e17ece877318225f818b3cd2a488322e2b78dfec58c08969232378e359e8ca14fab1c16 SHA512 ee464b51e508e863d9cefe22179a39aeed8bafd7dfc6bb435ba1d9e01ca5e254e1121d47f50d9119684fb28d904ea5746b8f433bf52ec82bc221c7778f089f48
 DIST wcd-5.2.7.tar.gz 622613 BLAKE2B 85c473ad607022953338872a46251b2010504608d0385a17c6188e76975058af7370fbc393b0a9a1911b6c200f7397fcf45c4426aaa48f5a3f31a696657c444e SHA512 9f5b89d8160f685b729234cc8c03f16b795797dd6eaf2d9e1bbf1949b27ef971908b78642679d3bf1d99b128b390cd5dbd211e4ff03b0539dd287c578088e02e
 DIST wcd-5.3.4.tar.gz 610630 BLAKE2B f460de38b0ded0da592df31c12d8f28f890555750f972e395b5178665bdd2bf0514b258f5c2c1338e6a7699224c04153e67d088642626b5611abb9b685d305fd SHA512 fdb6e000876fffbc7bce6e6157282c2b8ef9929c896e5dbd8533314d575cf31656df76cd5c408bb2e495a1fda7f179b122ea2a58da94d5d55d1e2b9c658adc94
-DIST wcd-6.0.0.tar.gz 615838 BLAKE2B d4ccb766736ed6c63339089ff2303f63530a769ce76e400b50b10203e297a4471dea3b2693bb6482ce67ceadbc4e4efacbe13cef0f313c45c94a05d7c2e94586 SHA512 965a6e52324605e6de5bb26ee0abc927a5e06a9f843ce1c4b65359b52418973bf84278c2f5f24fabbfa7342f40f79f4648d616df9a6ce0e9eca5c108ee49f50d
 DIST wcd-6.0.1.tar.gz 705577 BLAKE2B 9af2c14bae8cce50ad69b230897f2ae18c6ce899e9ed5d2f9b014ffb5b104c9fd136aa0d8a14110ae08fb1b9d4cc5f7819f42f5f23f5adf34780d16adf801790 SHA512 7a1a97b1dee220f2a425fcd7669ee9a3ca144992fe18444866269499b10bdea1671a5fca13eaa77c12c807d901e7831701e00a35c766021533a922b84b68247e
+DIST wcd-6.0.2.tar.gz 713062 BLAKE2B 13a745fd698b009aedb19e688a5deec7d62c42acf2dc430b7f586f300712ad684e8530a9b2477cf2d7a6540769efc98c245215cbe756b78c3902d03430b034d9 SHA512 587a52efaf0a585e4fc8a04a0eb08445cf4c78d38abd7592658f61827aa6cc0f1e8af8643c411d22d74145479c9970b018b11fc7a2a08b4ba7c850097813b06f
 EBUILD wcd-5.2.7.ebuild 942 BLAKE2B 9ee88dbe9fe9bb3ab1f1810a9f4897a06e18fff8f35b21201fd2b1369592f6e22f5aee66634dc65a5244c3c7df9bb5820cc8c9190edd7ea098fa58874704e4ee SHA512 49cac153d0cb70845500bd789ba3b0927730518abec498767a4d3f9fadc6d333bebe76f72ba86f1d5fd06daaef1fbb1680fbc694649977b46de4ca8ccfe0bc0c
 EBUILD wcd-5.3.4.ebuild 1054 BLAKE2B c0beec9a9b544f6d25492cf17e2e1397ba1d0d0f554cc21c85c9811c1bf2300bec6f2be1085f927efabb48d59d05ab4f293370edebe3f27e73b0428c703bcd12 SHA512 264a5eafe29249dc3d063f4de88e0270cfbed1312e5e3d6f564cd8b1f6e6eb609df52638bbe154d121a53dc65c90df2a2da9819d9df16edc6c66ab1d487eec12
-EBUILD wcd-6.0.0.ebuild 1054 BLAKE2B c0beec9a9b544f6d25492cf17e2e1397ba1d0d0f554cc21c85c9811c1bf2300bec6f2be1085f927efabb48d59d05ab4f293370edebe3f27e73b0428c703bcd12 SHA512 264a5eafe29249dc3d063f4de88e0270cfbed1312e5e3d6f564cd8b1f6e6eb609df52638bbe154d121a53dc65c90df2a2da9819d9df16edc6c66ab1d487eec12
 EBUILD wcd-6.0.1.ebuild 963 BLAKE2B 365293927af0deb49ae842696e610d5e5f061ebbc888bf34f8286ec2d449a2680e63c0da50216bf56cc5718a146ce16240cb8dc97e91c5f5d1c36250ed10125d SHA512 11cdef28a30d7fc63b23e9ba423af74d3f71d9bf4dd28f468a9c4ba2c263defe0bc8b6b3440c28c12a46e9892d4e013ecd67a466067d5d651e17cc1e73b39e63
+EBUILD wcd-6.0.2.ebuild 937 BLAKE2B 203a297cca3c7da36cba1f6c2a62052c80b071dbfff23be95b0bceefe592a9dde79a039de47631eeb29e6b1cbe92eb1ec45309f06c8bab6a8252eab8bb27cacf SHA512 22b0db024a63aa5e30ca1e52771191bd7af8669ead3dfafcdbb76dd8cbbe0da4831cefb6c36f20bf16fa60f37530b444569ef704028061b3cc7f481107d4b522
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/wcd/files/wcd-6.0.2-gentoo.patch b/app-misc/wcd/files/wcd-6.0.2-gentoo.patch
new file mode 100644
index 000000000000..ecd7c530f156
--- /dev/null
+++ b/app-misc/wcd/files/wcd-6.0.2-gentoo.patch
@@ -0,0 +1,67 @@
+--- wcd-6.0.2/src/Makefile
++++ wcd-6.0.2/src/Makefile
+@@ -45,12 +45,12 @@
+ 
+ CC              ?= gcc
+ STATIC          =
+-STRIP           = strip
++STRIP           =
+ 
+ ENABLE_NLS = 1
+ 
+ PACKAGE         = wcd
+-EXT             = .exe
++EXT             =
+ PROGRAM         = $(PACKAGE)$(EXT)
+ BIN             = $(PROGRAM)
+ 
+@@ -328,9 +328,9 @@
+ # possible values: ncurses, curses, pdcurses, pdcursesw or <empty>
+ 
+ ifdef UCS
+-        CURSES = ncursesw
++        CURSES = $(shell pkg-config --libs ncursesw)
+ else
+-        CURSES = ncurses
++        CURSES = $(shell pkg-config --libs ncurses)
+ endif
+ 
+ 
+@@ -360,7 +360,7 @@
+ 
+ ifneq (,$(CURSES))
+         DEFS_CURSES = -DWCD_USECURSES
+-        LIB_CURSES  = -l$(CURSES)
++        LIB_CURSES  = $(CURSES)
+ ifeq (os/2,$(OS))
+         LIB_CURSES  += -ltinfo
+ endif
+@@ -458,15 +458,15 @@
+ 
+ LDFLAGS_USER   =
+ LDFLAGS ?=
+-LDFLAGS += $(RPM_LD_FLAGS) \
++LIBS 	 = $(RPM_LD_FLAGS) \
+            $(LDFLAGS_EXTRA) \
+            $(NLFLAG) \
+            $(LDFLAG_STATIC) \
+            $(LDFLAGS_USER)
+ 
+-LIBS = $(LIB_CURSES) \
+-       $(LIB_UNISTRING) \
+-       $(LIBS_EXTRA)
++LIBS += $(LIB_CURSES) \
++        $(LIB_UNISTRING) \
++        $(LIBS_EXTRA)
+ 
+ DEFS_USER   =
+ DEFS            = $(DEF_UNIX) $(DEFS_CURSES) $(EXTRA_DEFS) $(DEFS_USER)
+@@ -523,7 +523,7 @@
+ 
+ $(BIN): $(OBJS1)
+ 	$(MAKE) status
+-	$(CC) $(OBJS1) $(LDFLAGS) $(LIBS) -o $@
++	$(CC) $(LDFLAGS) $(OBJS1) -o $@ $(LIBS)
+ 
+ %.o: %.c
+ 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@
diff --git a/app-misc/wcd/wcd-6.0.0.ebuild b/app-misc/wcd/wcd-6.0.2.ebuild
index 01d10fdcc1d4..a5b1dabb2ee3 100644
--- a/app-misc/wcd/wcd-6.0.0.ebuild
+++ b/app-misc/wcd/wcd-6.0.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=6
@@ -21,26 +21,19 @@ DEPEND="${CDEPEND}
 	app-text/ghostscript-gpl"
 RDEPEND="${CDEPEND}"
 
-S="${WORKDIR}"/${P}/src
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3.4-gentoo.patch
-)
+S="${WORKDIR}/${P}/src"
 
 src_prepare() {
-	# Required for stupid eapply function
-	pushd .. &>/dev/null || die
-	default
-	popd &>/dev/null || die
+	eapply -p2 "${FILESDIR}"/${PN}-6.0.2-gentoo.patch
+	eapply_user
 	tc-export CC
 }
 
 src_compile() {
 	local mycompile="LFS=1"
-	use nls || mycompile="${mycompile} ENABLE_NLS="
-	use unicode && mycompile="${mycompile} UCS=1 UNINORM=1"
-	emake \
-		${mycompile}
+	use nls || mycompile+=" ENABLE_NLS="
+	use unicode && mycompile+=" UCS=1 UNINORM=1"
+	emake ${mycompile}
 }
 
 src_install() {