gentoo resync : 29.05.2018

18 files changed, 76 insertions, 43 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index eddbf3415a15..3c29889a4cd7 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/acdctl/Manifest b/app-misc/acdctl/Manifest
index 746129e7f7d3..4ff6c3542a4c 100644
--- a/app-misc/acdctl/Manifest
+++ b/app-misc/acdctl/Manifest
@@ -1,4 +1,4 @@
 DIST acdctl-1.1.tar.bz2 10827 BLAKE2B d52f1df87844ecfd5fe361b43d20ddef9d10b1f53cbd692540a869e1f26974abd8e758167d781ce8ebdc17cb09548ae9aeb4ebe4553bb55a2fd14280874127bb SHA512 3a41aba7b6385f4d823694bfd387036759b7d47355f2d69e92de9e80bb9491aeaf5e060cf6695ae5ec23ba7580e203c13210b7d2bc5aaf796adf52925557043d
-EBUILD acdctl-1.1-r1.ebuild 460 BLAKE2B d55ed4fd818d239c24aaaec6fb42413c0bf52e6a3e9ffd54a3489af93f99de405aacd7023e8b7b3964d1613746bc6dad2b04ed4dd858b7c43d4f286be45cadba SHA512 864beee93b27973c18660e998820a3a7fd4ed046e61c78245c64faa4015e8a0b308013fc1695a09b660eb4c659ca687b838ca04217796f9f720310dee1c156d4
+EBUILD acdctl-1.1-r1.ebuild 465 BLAKE2B fadbb063e7218a44f22e8a37c800d39bc7ee805bb56add0af954e40a3992d0730eeee99f5a2702a7ddda6ca74c86ce6aaea5fc85c234ab4d2dc33c1f08bfba5b SHA512 a97c53a0e9a94044184884f1d5532a2758a6a72fa3ef0edeca7b369b6327219d8ef74e7a1d6c77fe7211577f152421e7306c7a8a93186f1bec8eba31edee92b8
 EBUILD acdctl-1.1.ebuild 481 BLAKE2B 19d0783b6e3bb33f86922e0bbb4e59dd033f1f047a6656dbb938372483bb2eb8c685fdcbbb74d06e2627f064788ba55c54374d2b344526fddaeab9e52c81047e SHA512 40957c72e6d3a0543a0dfaf84966f6d48fb050b037c5e17dc792a8d25a66170005cb3d7143ac018cf6b107bd7386b587ec097d47c336451727fc40b7f69d000f
 MISC metadata.xml 373 BLAKE2B 46b320638ecd40790e2270ead4ec1dda08b8f4b9040dba3587ff41b6d98693569115c369b266578e188911b3baa39c3bd704617c576edc0dfc686724e844d6cc SHA512 67c365f43ba3e1afc711315248dfec34e462e719e7ceb799e343c5ca15e189683f52553e3bfdce9c438d4d7b2cbcac84b56f17d5c3665e301f58ef3530286272
diff --git a/app-misc/acdctl/acdctl-1.1-r1.ebuild b/app-misc/acdctl/acdctl-1.1-r1.ebuild
index 46e06c8e3427..bd0e3980495f 100644
--- a/app-misc/acdctl/acdctl-1.1-r1.ebuild
+++ b/app-misc/acdctl/acdctl-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
@@ -15,6 +15,6 @@ RDEPEND="virtual/libusb:0"
 DEPEND="${RDEPEND}"
 
 src_install() {
-	default
+	einstalldocs
 	dobin "${PN}"
 }
diff --git a/app-misc/cmatrix/Manifest b/app-misc/cmatrix/Manifest
index e008248507d9..66b47ac45fa2 100644
--- a/app-misc/cmatrix/Manifest
+++ b/app-misc/cmatrix/Manifest
@@ -2,5 +2,5 @@ AUX cmatrix-1.2a-fontdir.patch 1794 BLAKE2B 2355315f4d119ba4df43b99b6aa7485eb933
 AUX cmatrix-1.2a-gentoo.patch 3034 BLAKE2B f882f43ffe02f966bad26f560bd9eefc726f8b5974657b267699cb111e9dc02dd1106d4effdbc2b13cc34273f591e2eb1d4d33ff508907f98d65f687b3046a9e SHA512 a72651c778fae74d0b05f59a7a94bf7a9807be0367dbceef9086d9a94da0062ab9f727c6708f5a573450c8e28fcbf729828ff4c8813b68a0fbfbf9106f451c92
 AUX cmatrix-1.2a-tinfo.patch 827 BLAKE2B acc326c3c70d3844ab9bd87751b590d357e8b29e5dd3f19381e8af69c78588b383982cdca292854f0bb95ce6fd829f34dabe22c61338ff35a187c3910e2f0df3 SHA512 cadf16edbdb2c43716de77b00bca725faa8802ab9cb6a4d5665bd20f3e1b0bf5aa5ac4b6d36c57573aa24985fe2abce4cef40b31ee288c1f13f87e31bab1922b
 DIST cmatrix-1.2a.tar.gz 74376 BLAKE2B 03319cecc8b15c441f36aa6c3267c4c0793855835c374e6fc45be731fd5907333ecf1f179b6761da8499a40bd199afc0c3c018949a325f5ca139c8a09662917f SHA512 a653a840378da87877bda1b48fc4087e7789b548e0f943ae15b81b5dc7a847aed28c69d2ad955bd467f38d6a08b0960349490b61c30260767e7d1560bb542d82
-EBUILD cmatrix-1.2a-r3.ebuild 972 BLAKE2B 0376f831ba6c1754320d16faaf42d7692e42eec6c6b5d66ff50ffca72f08d8bdbb34e785263dbd4fe0ebe9def34bc2406dcc83f66b53876fa7e20d08cf33a50b SHA512 fa9d5f7121b8c62a2df9e50eea0be0393c66449fe807c6bfa9ff02d2d2c6b19977ca2e34a3486124caf4eac3d66dea7c874e50cc25b0c2bd8e173ba7d6ca73d4
+EBUILD cmatrix-1.2a-r3.ebuild 982 BLAKE2B 0a2dec12a99b9d437f51f0a8ec0d1cd33bcfdbd735f8b4f0dde4a051117e99c44cced188f20b2cf148cdec3063b8099a75fcadd90913c9a3afcb2d1936b4dba1 SHA512 60657881884e4fa0bc5685aab5e75a2c9beaa70311f568be22dc5c5e374dc1b33c5096d59454877998d945759fad573b6bcf473ef4180d1f095c0703880c65ce
 MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
diff --git a/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild b/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
index d3d8c549c732..86d198d57acd 100644
--- a/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
+++ b/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
@@ -1,12 +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
 inherit autotools
 
 DESCRIPTION="An ncurses based app to show a scrolling screen from the Matrix"
-HOMEPAGE="http://www.asty.org/cmatrix"
-SRC_URI="http://www.asty.org/${PN}/dist/${P}.tar.gz"
+HOMEPAGE="https://sourceforge.net/projects/cmatrix/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-misc/dtach/Manifest b/app-misc/dtach/Manifest
index 68ef9debd17b..eab6b4a8bf5c 100644
--- a/app-misc/dtach/Manifest
+++ b/app-misc/dtach/Manifest
@@ -2,5 +2,5 @@ AUX dtach-0.8-CVE-2012-3368.patch 1040 BLAKE2B ded617740765ca7aa814cc98acb46a368
 DIST dtach-0.8.tar.gz 55472 BLAKE2B 9627075763f02787d7071658d1ae040d0c18dfe91f2954546398431e677b7c90cf67c23af0cc20182b354656d50b579c378f54d9f691853b7707a5761bc69b4f SHA512 ad0a788d10a5e1e1be4c353b64e1e4a0dc8c888492a638b2442d7c59ef31d67975357116435a1059141bfc2c82a3a6e9e490faa87cf81e5fc3bc7457a99c1193
 DIST dtach-0.9.tar.gz 60608 BLAKE2B 915b3a13cfd86a2e72505c9f8778ebbc9f25db761815e1352c0bc1281aaddcc95a837a880999379c19912fd3980bb77a20711796ef71b06282f1a27a6cc3572d SHA512 28c13dc8c96c16b9c6153a3a11fdeb4a4bc72e84e1f2575043b047cd8e600a47232f29544ffd87d82e2575623ec2e999a26e23e9eac25ec81c7722bdf98cfb18
 EBUILD dtach-0.8-r1.ebuild 472 BLAKE2B fe7f93c1bb254d2d1115f0cc96ead198ab266712fab96a4dc55bf93e04311cbbeea74b1f25b2bdb16e70520c3f3b70d2c3f4dd167271d1d4ba0c54cb46a28d4e SHA512 cddc92673cb9ab6153c477c2a77f95584edcb4a7140c5e275ddb9ad64773c56084e9609d06c9a00cb226ac3cbe71842114b6fd3522e0db6b624f4adb1fdd216a
-EBUILD dtach-0.9.ebuild 460 BLAKE2B 85a124bdde143018cb8f8fe0268f6abf6e90573e012d480681b648fb7b74ca1531bdda5a1bd52815b2b759de4ff0a689d18de18162f1d0886d4742b3fe8deb72 SHA512 22dc9e835d3d9e38130f4d295634b476a1ac2f24db4e2fbc2f403fce31d84b2f5d9431c8168f326783da5a1ae744c0d2457ccc0eb9d13c6bd851f761e83530c3
+EBUILD dtach-0.9.ebuild 459 BLAKE2B bac53b6fa06b94f3eb96ad7bd1e021d0eeb2c9a5e724d590b686abdee561bf154f47dd4dadb2e8a050bb6c9a01941f81e54de6d1d83b74eddea98a0d434e06b9 SHA512 eb74120ba5fe2edd04c209ceafe34be6965fca765c7e36b4de50b6de8c6622a1db2fab7504f273c031df505d4821237ffaf7804e2a642bfb348b6273e896b01a
 MISC metadata.xml 393 BLAKE2B 0a07b0eac6407190f07439b29f3cfbe185450ba5dfe0c4d3988c6d6abfe12c728029bda874cfaef61c48abe6182288e70ceee27d5db22b8eec03b20476db2991 SHA512 39071ddc8ee3913fb6898bbf5ce5488c76f6a7fa5f3f3905359a228d432cc76fe0336c0640d0fcd26c1be97abc220626c4258c5cd1de280a50d033b57d84aaa7
diff --git a/app-misc/dtach/dtach-0.9.ebuild b/app-misc/dtach/dtach-0.9.ebuild
index f7ad24e1dff8..018464cbc478 100644
--- a/app-misc/dtach/dtach-0.9.ebuild
+++ b/app-misc/dtach/dtach-0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ppc ~ppc64 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 src_install() {
diff --git a/app-misc/ifp-line/Manifest b/app-misc/ifp-line/Manifest
index 31bc53bcb88b..27009e440a7e 100644
--- a/app-misc/ifp-line/Manifest
+++ b/app-misc/ifp-line/Manifest
@@ -1,4 +1,4 @@
-AUX ifp-line-0.3-fix-warnings.patch 1082 BLAKE2B ceef7ef0ed2c0f651d80878c87e887c0598b8c5e064d98acebfc1f679bcd204a31eed4fe4585a30a684bead0035d808d4a0d3be8bc482473e429d304477f52d9 SHA512 58802e40eb866663c5a2f32598ff827fb13bc2f28ea5b73f8a9d59f7013cf62283b7656cfd2d2d2bf796a618d4a56565a9c0a2354f5ad41329ab57780d2b9765
+AUX ifp-line-0.3-fix-warnings.patch 1080 BLAKE2B 72e77b8d09dd077d399275ab5f46365be07278208281629416ccff43667c86d709b814c32163161c0e1e5bd4b5bf3dce76306b34a98e874ccb850065a3b83d3c SHA512 348fea237990df0531c32f688f888af2f247a318c711582d5a113531f1e28380c5b62d79947751c7f1180360459a883cd1e505f8e9ac04869fa68392d3a2b400
 DIST ifp-line-0.3.tar.gz 138272 BLAKE2B 249476938d111cc7609069f448b248921211cf298415951f4ea5043a8eff0eb80d11aeb1dab3d5d9db1aeed82b0de205d79945d4b0379762b62bc979485eb95e SHA512 516ad85fdaf69111581b013b2517c7083656436d429a86ec5ca4b7dcaf1c841538f98138cce8839d990a34550f11cc6bc9dedc701b0123b9cb73a91a7d78694d
-EBUILD ifp-line-0.3.ebuild 831 BLAKE2B 71b2b175309e05e203cc9f208639ff2f9e1f6d0897d65e756c68a46997763f0a6aa7fedf971a62dd88f74d92307e0b67f57fe61f69065940dc22e8366914626d SHA512 d50131f66ca9ce335db6cd0e855f9b6afed1da3cdddaba783d6be9e3e07146f109bee691a7167dae6a02358ddfd7ed9187d610fb528f19cc1029f46d307304bf
+EBUILD ifp-line-0.3.ebuild 777 BLAKE2B dfec032550f13547f349b5c23fe570654e4fd04c7352c834eebe87324414dbafb8b1dd64d460cd24500ee329b708f6e65250120ca3b7556845b95cd575f14654 SHA512 f8359d1073a39edb527ded74cde0819675769c07d62a8da2505da31495cb338bb39bc15205d371d5cfec11787e7c1335cb8277ad6f40078409600e19a9080e0c
 MISC metadata.xml 333 BLAKE2B 87a4530824fff1355c5d2af1b6483b6fb1752c5a346b5848500b7962307a2e9956727f08e753b1548fbd941352a4563e9c14ae386bd46f238f8929cc2d46970b SHA512 d0cd8f6fc7bdc757d2a1ef5443f30410514ac335bcd2a84829995c527862b994fc75a8dfc5ceff2b8e2a3d7b0b081a57cbc50e4b825567b8a56d0f9eb00c13c7
diff --git a/app-misc/ifp-line/files/ifp-line-0.3-fix-warnings.patch b/app-misc/ifp-line/files/ifp-line-0.3-fix-warnings.patch
index f7fe1de4b1ff..a3bf5c24b95d 100644
--- a/app-misc/ifp-line/files/ifp-line-0.3-fix-warnings.patch
+++ b/app-misc/ifp-line/files/ifp-line-0.3-fix-warnings.patch
@@ -1,5 +1,5 @@
---- unicodehack.c.orig	2006-01-31 20:18:16.000000000 -0500
-+++ unicodehack.c	2006-01-31 20:18:39.000000000 -0500
+--- a/unicodehack.c	2006-01-31 20:18:16.000000000 -0500
++++ b/unicodehack.c	2006-01-31 20:18:39.000000000 -0500
 @@ -26,7 +26,7 @@
  	return -1;
      }
@@ -18,8 +18,8 @@
      iconv_t cd;
      int retval;
  
---- unicodehack.h.orig	2006-01-31 20:19:05.000000000 -0500
-+++ unicodehack.h	2006-01-31 20:19:26.000000000 -0500
+--- a/unicodehack.h	2006-01-31 20:19:05.000000000 -0500
++++ b/unicodehack.h	2006-01-31 20:19:26.000000000 -0500
 @@ -4,6 +4,6 @@
  #define IFPLINE_UNICODEHACK_H
  
diff --git a/app-misc/ifp-line/ifp-line-0.3.ebuild b/app-misc/ifp-line/ifp-line-0.3.ebuild
index 0436505fbe7b..ca5f7b8af6aa 100644
--- a/app-misc/ifp-line/ifp-line-0.3.ebuild
+++ b/app-misc/ifp-line/ifp-line-0.3.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils
+EAPI=6
 
 DESCRIPTION="iRiver iFP open-source driver"
 HOMEPAGE="http://ifp-driver.sourceforge.net/"
@@ -16,17 +15,15 @@ IUSE=""
 RDEPEND="virtual/libusb:0"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-warnings.patch
-}
+PATCHES=( "${FILESDIR}/${P}-fix-warnings.patch" )
 
 src_install() {
 	dobin ifp || die
-	dodoc NEWS README TIPS ChangeLog
 	doman ifp.1
 
 	exeinto /usr/share/${PN}
 	doexe nonroot.sh || die
+	default
 }
 
 pkg_postinst() {
diff --git a/app-misc/livecd-tools/Manifest b/app-misc/livecd-tools/Manifest
index d96df1b53f3c..b1fa9e0cd8df 100644
--- a/app-misc/livecd-tools/Manifest
+++ b/app-misc/livecd-tools/Manifest
@@ -1,6 +1,8 @@
 DIST livecd-tools-2.2.tar.gz 11419 BLAKE2B 4dca047acd82bb8fa14bb117b42141c2b4a0cd441b965a677c33932c77166c2e89af2d396bc2f1e699174ad0f911e54c16431d93dfe7f8796ce66859e8e69fc3 SHA512 62891c132b0f392b775116d90740ea30a546a75736b17d10e5915ededa72ed730934555cab9a0b81a6def49e687c13db3e92e1e4f325854151569ad3e814bec0
 DIST livecd-tools-2.3.tar.bz2 11128 BLAKE2B f89c02fac4ec60b36a1e11c547d52290c80e028e1b07d25533846bba8b8b861faa7b1d85ebffd4936593b5f975851b680e73e6502c23d62c68c03646d1373dbc SHA512 93a5742a4cc243fee07088f5957c1eb48c2276460c391c089502eccba5bfe80b52fa7a7d058502b18086130bd8686c8c0e4af8f3f03f72c98b482776e0f225a9
+DIST livecd-tools-2.4.tar.bz2 11506 BLAKE2B 0e7fc54ab4185ba725f2672dbd15a87e7cef249224e51895e2cedb1e163d8fc25566f989eb8fa118111d0d50bed2b6c7e303586b322b1e9b41bf746778a056f0 SHA512 52c2ecf583bca68ee5d3dfce9973268758753069a3255dd3d435b9240feb8c99d7c7595c0c009ddc89566d79c01552eab7dbc8a9055d4841104dfe4e224d832b
 EBUILD livecd-tools-2.2.ebuild 968 BLAKE2B d405700c03c96d8188c4c859b0eb074ff80a6acf68454c4b9e42ad1e04af8d509565ba83548408f6490edeca55cbb4713f021b3a1b08c33f530fe5dc7eecfc3f SHA512 7aac852fb8a30b438d77776a308942f73f9415602c2d9cf38c063b23fdf1765e26e53b99266c049150533db20e67dfa1168c803597c612f816be962d53991329
 EBUILD livecd-tools-2.3.ebuild 969 BLAKE2B bb26696ff9a37f11bf52c394f5aa05d7bf024f287fef9d1c12e7f795699a1101ba26e478ef996cb761f9a81d089114c0959bcc9a496bfc196c5f9bcc80a85896 SHA512 79d62b217c1699a022f7b3076e1d8537c9d3cded37a8cd995cb4a1d5efda129cf12e36d0a934e90fe139d470a1eaadf929e5addbcdcf84797c0569b7a3a56d16
+EBUILD livecd-tools-2.4.ebuild 969 BLAKE2B 6d9e46f8b4767c19d1305c1a54b50e31268ca9f80e3947423d1bbcef7eb8d823de7490c1c6e81fbef6680c4b21b371dda9481d94c34529b30deb951d04318baa SHA512 65cb9f341e8e3a018183918ca746946f43a2d710117c13530ada1e555ba1ecaf37b19315bcde6051aab1305fd532eb57bc67e8c1b3ec250ca2da080e9d0d68a4
 EBUILD livecd-tools-9999.ebuild 968 BLAKE2B 6720c8fceda58a958761af9730dcb671e7fced6f59aa1a46205ae9842b7fb6af3d23dc6fb758c99fd503bad4d2d32bb0ece131b531b6ef938f8dc1c73f71179e SHA512 46c70eb5076b1053ca7ffeb7f765c7bb9b4b691a856d556d12d3bb85be95e083db5e88943482fa060d9b113c757417e4d27b0511ce6b6f172fd589db5b2b0dad
 MISC metadata.xml 251 BLAKE2B 914f6ce3b97ef33310dd17c219739df48b081adb06e58d6a38a10cf4368eea50a9096c7b274077b6ca67d17ab9601b7c46995bbc89479d2842705dcc3ba75461 SHA512 2da7a6b2b1b7153b8803cc52201fa006313bf75a25f7d917f26eadd7a6426529e4b30a57c3c24cca20865d9dc4f3d56fdfa14b10254158bea2dfeb2c64fcc18c
diff --git a/app-misc/livecd-tools/livecd-tools-2.4.ebuild b/app-misc/livecd-tools/livecd-tools-2.4.ebuild
new file mode 100644
index 000000000000..6304b890ff88
--- /dev/null
+++ b/app-misc/livecd-tools/livecd-tools-2.4.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/livecd-tools.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/${P}.tar.bz2"
+	KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+fi
+
+DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
+HOMEPAGE="https://www.gentoo.org"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+RDEPEND="dev-util/dialog
+	net-dialup/mingetty
+	>=sys-apps/baselayout-2
+	>=sys-apps/openrc-0.8.2-r1
+	sys-apps/pciutils
+	sys-apps/gawk
+	sys-apps/sed"
+
+pkg_setup() {
+		ewarn "This package is designed for use on the LiveCD only and will do"
+		ewarn "unspeakably horrible and unexpected things on a normal system."
+		ewarn "YOU HAVE BEEN WARNED!!!"
+}
+
+src_install() {
+	doconfd conf.d/*
+	doinitd init.d/*
+	dosbin net-setup
+	into /
+	dosbin livecd-functions.sh
+}
diff --git a/app-misc/logserial/Manifest b/app-misc/logserial/Manifest
index 9027d5c00939..924945d80319 100644
--- a/app-misc/logserial/Manifest
+++ b/app-misc/logserial/Manifest
@@ -1,4 +1,4 @@
 AUX logserial-0.4.2-gentoo.patch 704 BLAKE2B 7591caa786188f9ba051b3e43462c85a096f5d09cad3b7992f03af7329d31e96600d96d450107a6dc3e6ae19cf7a78030e99119a6d4eb3ac6f36c1f1ca2e1008 SHA512 53874fd3d8c1e15af3614f779c1a85c53d43218c13ac508166dfca8c9012d7e251d9fbb3fe22cbcd2167594848ebff5f2e9f48dcad11c153f18abdf2e46233bc
 DIST logserial-0.4.2.tar.gz 9697 BLAKE2B d32b03e50459a65d0072aa961421c6aaef67483d16d6e95b6071fe805f69b79fa1b3a63fb8ce5945fa19f3c912fd6de051549da3edbb2814b7eb4c68c036cc19 SHA512 63784f5f3b84c1fbf85e0b5295ab33c427626562d880de3202b792ad354f93d645d4c2ddb7dc38d48ee25a15df51f1544aa0abea45fccef333553492ed86e9ad
-EBUILD logserial-0.4.2.ebuild 653 BLAKE2B d0d24bda8ba56c82749689747f0264e2869e848b17e16d487f431fb693426b6a7628ede313f7a7fb113f6ff7e630054cca86797eac36c36e737ec12e65b9d54e SHA512 49e6eb08d8e0f93f27192df6afe3ff8c4f594ec77e10b145dfe7c29e34175689610c01f953e61f27aad984ca69d2222d1ab67f8195037c20d1d9ec8c16e636db
+EBUILD logserial-0.4.2.ebuild 583 BLAKE2B fcd1d9558c8147632dc0f7e86408a52ee57af6b007dbed3f1b7408295e1ccd335a2b366e0db14ed812c4deec952015721e6d5034cdc127e187b378edd51ab2fd SHA512 390d0561a8b6e6177ba66468f850fcde1e4ff63086f5d061674bd8bdad0f94f0d10873d73e361caa6e84daccde05df2944010a2e5272fedeb2fd1ca65b7da737
 MISC metadata.xml 483 BLAKE2B f185b1ee76bdbd2d69171cc52fd98e2859137b5fd4bda92e0917585f589c6ac1e58d97b72c22d2d87d2921c16820367169836dccc5bb44a0259e2d73f34b5860 SHA512 8c7789cc64787fd8a2590921ef0adcf4720d96d211b0308bcfe97e32014d0aa36ae9c2b7bee8cef042617c421787ff4a837ee7b1e1dda789bae4823dfe7d2e8f
diff --git a/app-misc/logserial/logserial-0.4.2.ebuild b/app-misc/logserial/logserial-0.4.2.ebuild
index 393a5f4451e6..62f267f92996 100644
--- a/app-misc/logserial/logserial-0.4.2.ebuild
+++ b/app-misc/logserial/logserial-0.4.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=2
-inherit eutils toolchain-funcs
+EAPI=6
+inherit toolchain-funcs
 
 DESCRIPTION="A tool for logging raw data from a serial device"
 HOMEPAGE="http://www.gtlib.cc.gatech.edu/pub/Linux/system/serial/logserial-0.4.2.lsm"
@@ -16,16 +16,13 @@ IUSE=""
 RDEPEND=""
 DEPEND=""
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
+PATCHES=( "${FILESDIR}/${P}-gentoo.patch" )
 
-src_compile() {
+src_configure() {
 	tc-export CC
-	emake || die "emake failed"
 }
 
 src_install() {
-	dobin logserial || die "dobin failed"
+	dobin logserial
 	dodoc CHANGELOG README
 }
diff --git a/app-misc/screenie/Manifest b/app-misc/screenie/Manifest
index 9a70e82dbdcb..c6340fea67ae 100644
--- a/app-misc/screenie/Manifest
+++ b/app-misc/screenie/Manifest
@@ -1,4 +1,4 @@
 AUX screenie-CVE-2008-5371.patch 636 BLAKE2B bf756636c9a7258fff968aaf5d8eba093ea4f41efc16fe9dd16c56ffb779f10ba097f52015c4acf0b82b68daca7e7b8a3243a230b8bb24928e8e9add323f2285 SHA512 64fb52e614d281e8302b6a664d28692b88c5f56301fec1f5f9be546eb71a17aaf462b9a96ea1f0ad1176583613edea292cfd08e10f4a144c12f67c575696a084
 DIST screenie-1.30.0.tar.bz2 10068 BLAKE2B 49bbb8f81141c2b0707aab04e8a43f27e5ccd5c4241cf0e0e7ee3a7bd7944dc61c11f3a9ac5ae3040fecae1947a4271561e9b164b64512043916e3b39f25901c SHA512 8068421aaa461df32bccbe72e23474b20ef3f761e78a3e520c1f9f19a383d9ad9fd0377e2cdf1c4f023ca570b172a40ebff63d3cb538b96d1e1706fe83d03fdd
-EBUILD screenie-1.30.0-r1.ebuild 627 BLAKE2B 6c1256af9a337e15da4aa437eb0101d3cf71db101afeefc336671ab2c070e999f17104688f901b8a967d8891e67c31a3b1b31ffb426828cd2ff53d45492c882a SHA512 4a0f2754a1e720a939d77947793b7dcb5f4ef29063bddeccb766c82b4585182fd9dcfc31da0095a2f0cb36bf4df69e0fa3c111e4b3f144f7e9f67d41f16126df
+EBUILD screenie-1.30.0-r1.ebuild 537 BLAKE2B 59e03a7925ea5ae22b3bfa3c4f8c915a804137a35b75e5e5c8fbb621c13856805bdc9383670a602e609d5ae5d5f9f8dbe5ba874eaa5cc8dc0535fc4b0f3a10dd SHA512 6cb6a54c1dde75c1d1fb186e4f9f052ae8b0a0d692304005758bfe7197c2b03432692091e75d1fc42a4468700fef1bd7935322ccf10b0ff41978c067f5fe41c0
 MISC metadata.xml 871 BLAKE2B 3cf071210cf3bfc338d2fde113d2772ef7e5dc78eb10c02c54a5db40167a7eece309bb7fca7392d8db8ae73cd3a9fc1da76e725ef769bed449d1517ea42527f3 SHA512 83ad049486ff6a1906c114b90eaa757b7da5f1f365b7fd76a38e4896ab92e42141841ef084aa6237ffdaaa8e2fc0090fe52bef71f9a9479730174ec282f2a023
diff --git a/app-misc/screenie/screenie-1.30.0-r1.ebuild b/app-misc/screenie/screenie-1.30.0-r1.ebuild
index 248b1f0c3a4b..24d0adb2af8f 100644
--- a/app-misc/screenie/screenie-1.30.0-r1.ebuild
+++ b/app-misc/screenie/screenie-1.30.0-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-
-inherit eutils
+EAPI=6
 
 DESCRIPTION="screen(1) frontend that is designed to be a session handler"
 HOMEPAGE="http://pubwww.hsz-t.ch/~mgloor/screenie.html"
@@ -16,11 +14,9 @@ IUSE=""
 
 RDEPEND="app-misc/screen"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-CVE-2008-5371.patch"
-}
+PATCHES=( "${FILESDIR}/${PN}-CVE-2008-5371.patch" )
 
 src_install() {
 	dobin screenie || die "dobin failed"
-	dodoc AUTHORS ChangeLog INSTALL README TODO || die "dodoc failed"
+	default
 }
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index b1b58650e294..521780d3cacc 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,6 +1,6 @@
 AUX vifm-0.9.1-fix-ncurses-linking.patch 1562 BLAKE2B 415cd5421a7bf74cc48ec77919181e0fb0b101b455dee470ceb8875c861b14a8835b5f912c517efd9f1f1a8b3db93d633b6b4b68462fae66ec7a2ff0ced2521b SHA512 4b6dc0945f5afd2d0395775ceef94c007e604b30184e86653bc8c2f306b7d726d1a1a7273c4601502e6602fdff86b8b3f596409cf2e55f2e4c2691d342e7088a
 DIST vifm-0.9.1.tar.bz2 1002758 BLAKE2B 8eb9cc4c299877485bb4a44d95fe2412e196686399a6246bc1b5036dbc34ecbcf1cd43d1d55bdacdcc099a65e03f589f360d39ee38da4e12bff0a4bfcbdd180b SHA512 a30457329bf9501efd7e9e0853107b5ecd653ab70e7081764677d035bd0f61876bc96b35bea5258153d68b7be075091168331be79d7398f94353f73bbf78933d
 DIST vifm-0.9.tar.bz2 971539 BLAKE2B 5d6dd8c399e38886ab3e2d548b93492bf31b464e5661c6f6d54504701bf1eab8338155a9ddc9b220c4cb2a67417d5622094e9ffb717ddf594984fe475214af60 SHA512 5ae2b03e672bd9a7f95a5c59141dabac8bc7946a4e307d6a3df70bdb52e1f7665b960a3d20709c811cbfbcf76f7836d23b5edb191968e5277fb705a291ab3a9a
-EBUILD vifm-0.9.1.ebuild 2173 BLAKE2B 42ae6a417ea8ee4f687a0b8185b91be802b286a99cec28b8534a8fc567a53d21847ac7450f2ad7225beac057c8adaad2b6e4dffc6351a41e29c7eedc61fac9b7 SHA512 2e48d1ba2caf0d7c72dd4a43a69cb6cd6296b5b5612eb235b6c23c3927e32690eb5d191c5b41720d304ab5ba0fdef0f358b48723313e2375b53251ec32970866
+EBUILD vifm-0.9.1.ebuild 2172 BLAKE2B f44e5b8870c2b25b439f4016a7b07dc3d6bba4c46f7e67395881d35deca3c097a1141362370cce1ebf5aa904dc324f7fd8fe3869db0e8934f00a225383c53bea SHA512 39937e2459f3c8d6d11ab8d3980083aa93527cd3229527d1d3c180ab739154a9cd34ebb0fe333bab77c44dcc3cbd08f757dc02c8f706253a0135c19bbdf0c425
 EBUILD vifm-0.9.ebuild 1975 BLAKE2B 109e5ed44f8297e6283ecb2443bbb89f8c4da9170e8e5d5cdb50d26d8bb44db2b84461c06cd8a5711271f76d405f5522a31ae86218a98878ee6083ded5bfd6d5 SHA512 f6e33c5c1fbc1990c0aab33a191071ae79de4ffc7034d1c8c0feab3ab0cb32476c8a826983319c677191f8e3713db7a5be6ff657a5cd85873fb33a8ef6250bb5
 MISC metadata.xml 1315 BLAKE2B 2e31d51dfdd5df5d84edbb860f2b981513490ff58d776d3c75669e961da6d8eceb55e9957f7ad65e428645e0d39983fbde164940a679f5931ade43397fcec1ea SHA512 09965612c0613b994ea1b5780fdf79d4eddbb2464225132375390980b8bf29e2a2622dc3dd2c43a8650d1f90f888db9d30e9449e37b0311d1abc1cf9fca82812
diff --git a/app-misc/vifm/vifm-0.9.1.ebuild b/app-misc/vifm/vifm-0.9.1.ebuild
index 55fc501b520e..bc79abdf6fcc 100644
--- a/app-misc/vifm/vifm-0.9.1.ebuild
+++ b/app-misc/vifm/vifm-0.9.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/vifm/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="X developer +extended-keys gtk +magic vim vim-syntax"
 
 DEPEND="