gentoo resync : 02.05.2018

50 files changed, 92 insertions, 179 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index d427ce9d7064..d415acb20dcd 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/astrolog-ephemeris/Manifest b/app-misc/astrolog-ephemeris/Manifest
index 7f006ee9cf92..31b6833c6fca 100644
--- a/app-misc/astrolog-ephemeris/Manifest
+++ b/app-misc/astrolog-ephemeris/Manifest
@@ -1,3 +1,3 @@
 DIST ephemall.zip 4604012 BLAKE2B 0caee003272734a71a3f2d10871e1c034c9e9039f5cb0f09ed19d85122ba875794933d53624d6a379838a7f2c33728c2da9aaadbd91887fea018ecfc1c786557 SHA512 e7822cecb87466987107e84aae64d292dad31de9d2c268886869a37ea9e99bf81b2a530129c0f6538c6b55ad46b185e16ee0c5b0d8858acfe189f19e2595c6da
-EBUILD astrolog-ephemeris-5.40.ebuild 611 BLAKE2B 67288ad93ef7c20b8b74a66897531f6952832115a699e934218d8e3c228854e05fb43fa7aa5b8b311a769e563e4c8141b689936f916b0f97d8547b84cabc68b9 SHA512 80f1e03067e187d8b9d96c50b9ee433f565f6117a813d0d523fff0ab082eb0ee03e111626ad5152a3bbc6049d1e599287ac68fddf8a179dc1cfcf1186939528d
+EBUILD astrolog-ephemeris-5.40.ebuild 619 BLAKE2B 6f2b34f72179f26c2c36a4296a9f78e3a7a570339deb0e3b6025a3dcf623910034845201d98a4b02e5f5a4bad71babfd75ed672e9b4061effce7ac1eb0eab889 SHA512 99c8c27eafe99574565ece5935c4982d0e1014c575167c04eb8f98600135aa5911dadbea62d189b7a0912eafa43095c5103661308a7b98c968e7966e785536b6
 MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-misc/astrolog-ephemeris/astrolog-ephemeris-5.40.ebuild b/app-misc/astrolog-ephemeris/astrolog-ephemeris-5.40.ebuild
index e161e7bdf2a3..0e79b4d13905 100644
--- a/app-misc/astrolog-ephemeris/astrolog-ephemeris-5.40.ebuild
+++ b/app-misc/astrolog-ephemeris/astrolog-ephemeris-5.40.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="ephemeris files for optional extended accuracy of astrolog's calculations"
 HOMEPAGE="http://www.astrolog.org/astrolog.htm"
 SRC_URI="http://www.astrolog.org/ftp/ephem/ephemall.zip"
diff --git a/app-misc/bfm/Manifest b/app-misc/bfm/Manifest
index 5b40252c8aff..5b0495fecea7 100644
--- a/app-misc/bfm/Manifest
+++ b/app-misc/bfm/Manifest
@@ -2,6 +2,6 @@ AUX 1.2-build.xml 2000 BLAKE2B 03d37467cab3b1c5810ed3d06abe593f4bd8213eb359cd4f3
 AUX 1.2-r2-build.xml 2020 BLAKE2B 7432c22c7d0ba7b4297455724d365e95ebbc1f0470c06b83539c93275e1cbe281ada6be7cf3578a783782be4911be2bc094a5d36d1343c1e355d4d5e024964bf SHA512 422208eb70459b94b6d5eb831c5796cfe178b2042dd6aee4fc0c1ed15949b46eac5e817460ba3391fbaad7f287e6260f6ed436e49d84ab41fac2453518aae6a4
 AUX 1.2-r2-package.patch 10235 BLAKE2B f767f00a81b8ffe5c831604f2ecc7b6c0b7f3bb86ff22925c4a8e5c2fc2010947c1f5775cb5da857fd66f5d6bd70f5a9c031c1ae59ddfe89ebdd9b9eb2ca5919 SHA512 9b754c0dac3f7f8763acc80ae9fe618dca32df319dc2b928ec856debc4f539f6f39fa6dde92eb871dcccb9197f7aecbac6b65b7705d476c0b73e6611e979dbce
 DIST bfm-1.2.tar.gz 193924 BLAKE2B 8d398188333519b581a8eb4e38fc123672ba0a68077347f4049e5f0ec9dc06010b5e6003500452dad71deb67fe97e5ea896ec9ab425eca82022a12e03320b3ec SHA512 39a9a250a8f3cf3b148c31a9fa5a89ac9a5873884dc1a98840b2f21879b30bd7cc6cc5dd9c5f7e657090a56276dbef2a72594e095aec8c05f3e003f89e91daee
-EBUILD bfm-1.2-r1.ebuild 1507 BLAKE2B 08de9b4aea5dd2acdad9e4e770bcb0420a94530972f07f118723c702910220ee81c1c49841eba94988abff22ac0e95669b287fa7b4c6409306d0610840d30ad3 SHA512 1f491bf6518f3f8629f91af392aaac991d96489ed2072e92eeb37a331528f065e8b124cd99247ad1d8270bb757d4bb3902f3a41683c10f16c591869f891f428f
+EBUILD bfm-1.2-r1.ebuild 1515 BLAKE2B bc9d29590212fe8c051c7a3992c143a66203b5abcad0848c4d067a5dc0d16d5d0f4ac2400fed87264157cb5d4b71ecc13cd227ae45695dae9535c56c8ef87c5f SHA512 4797af9a94a5e4be0827442d27a5a3064b609a515f7f0b2e4003956e72de915064cd93d10d7353003e48a83e311bb7aadf8c9fb8b906e5e2b76afc4f8ae093fc
 EBUILD bfm-1.2-r2.ebuild 1342 BLAKE2B ba316b23f2aa3d0885c791decef0ceadbf15e56933a6ab4f0cd2a322b946576fb9bae58eda0a34798f44a0abcf49452ce0e1d7d23070adda6490a944a1320a18 SHA512 847c1da49ca1d39301a46fc522f8c1c2143cff3ba613413a3aba8c624908aef2401931285b1a003be73bcd7610f6b94bd9a84351fd1fbb74718e952167f5d677
 MISC metadata.xml 550 BLAKE2B df05e7ad2cc4aca624ad2a377fd7e555cb6c5c600b2860558628746ae6361649b0dcdb4e76a4740a4b37e3bfa91b2debbd8019db1a87caa804bee552461e9283 SHA512 755c28c22ed330af89b04ee96ed3912016dc473813b8730bca2eea7548c4e9f4953a7f645512e46627b4e9a6bddb243fe8e41a4a489325a4bd13209b4d83cfdd
diff --git a/app-misc/bfm/bfm-1.2-r1.ebuild b/app-misc/bfm/bfm-1.2-r1.ebuild
index aaeaa2a4f0e8..82b1a274fd54 100644
--- a/app-misc/bfm/bfm-1.2-r1.ebuild
+++ b/app-misc/bfm/bfm-1.2-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
diff --git a/app-misc/cadubi/Manifest b/app-misc/cadubi/Manifest
index e982a1f5e411..c4148955f55b 100644
--- a/app-misc/cadubi/Manifest
+++ b/app-misc/cadubi/Manifest
@@ -1,4 +1,4 @@
 AUX cadubi-1.3-helpfile.patch 347 BLAKE2B 5d04b86623bb7a66691d6dccaf20bb1b6c3480bf080ecba46eeead9fabe95900f789d37d990e6d150d30462179fc0254b8cb7a06b0f77d5582e11f1856a8a0f7 SHA512 2dbc3eaab66d57712c80344802701e354c9dc3602d02deaf19e19c352e398732a7a59ee671bc47159679f728e55ee17447c99edc51b6f54f6dca1dc3956eccae
 DIST cadubi-1.3.tar.gz 12559 BLAKE2B d1a32d602c00d76717e8e6cdf8d376dca12f9f55f9375bb0b8ea781cf923cfb90789cc011a3ab33960339ced3c05c668f6c6ec6e5b33ca89f7eda27c47789639 SHA512 e3b5190850bd4d579934bd5825db2b8bde5a46158862ec66b8604999344138477c0fb3fad34dc186ed9dd67dfbdcacf12763f76adbdfbd0cc4dbf6b51ad53bc7
-EBUILD cadubi-1.3.ebuild 622 BLAKE2B 23578e13e9293fb43b1102dbcff20cd3dee39b622d63f0528a9e5c0dd945e6914258940507ce5744412b36d7c220b2d2661599ee889ec917525e3f9c8a49e991 SHA512 7bcc7b96ec6e348dc2c6b72429525c537417ae7839c7962734974197ddaf000403e9dd6958cf78b075ef6ce4d553283dbb18a2d996197dc00d61e7f2dbe0b340
+EBUILD cadubi-1.3.ebuild 630 BLAKE2B 57659ea06503fa22adb9c3e72a8db7d2a1953021748333f5f685d55d6bf3ecd5dd4caee0c4d6643f6d15e5854152d8d59be284b00b862f2036be726dd138f269 SHA512 0fdc74fc37f9a01f6898103f24323c682e6df89d2e2e3a9a9f6afc30a34054ba666859ecc0e3c93c45e88f9244286a113a8d7088c33c85755991ca5d9768137b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cadubi/cadubi-1.3.ebuild b/app-misc/cadubi/cadubi-1.3.ebuild
index 99c18986c64d..bbc15dfa8a7b 100644
--- a/app-misc/cadubi/cadubi-1.3.ebuild
+++ b/app-misc/cadubi/cadubi-1.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils multilib
 
 DESCRIPTION="CADUBI is an application that allows you to draw ASCII-Art images"
diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index 7500e034122f..552c754474c0 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -8,4 +8,4 @@ DIST carbon-c-relay-3.3.tar.gz 293055 BLAKE2B 96d4d230e233f20ce02d519804f36787fc
 EBUILD carbon-c-relay-3.1-r1.ebuild 765 BLAKE2B 6596ee93330fbe973d42479a8d8b1b1174464a5ffdc513cfb6235ed069873e59177fa1d9be862a579c2ed4c482b2a8df5b8cb3f9b8dc075ce4615133dbc5a381 SHA512 ab94696270aa31b1c4b48320aa211a4488f613a28497c6d08c502a9e14e642ea89d08233f6f128b7ddb5ef31e361bbe7053e91118d1fdbd4b40a9d1e12ce59fa
 EBUILD carbon-c-relay-3.2.ebuild 941 BLAKE2B 08b97db03e44cc14b3b1d3d8f8a5acfb9c23d7dead00c2e1c3088b524e5f19865e8599e915d1b84c7ed7414c66cc1c75dba20ba467b8b4d8b34aa69f942f7e22 SHA512 41808fed0c890a1e335986e93ee3fb0ec764ba3e364f151080d477b8546707857f36a834b755d25caab9c393c5e12409b48a497aab292b49921697c8c5546a85
 EBUILD carbon-c-relay-3.3.ebuild 1468 BLAKE2B 682bd014531308e19c89b5ed966a04929c161d4ef338800e573d06dfa07173a121d490f5b02aeae90a2b76463adf9a03ecce325db8187d2abf04ed35e6568167 SHA512 2d5e58830ac28eefee38f254420d864d30512bd2ef6e60035e9cafe19d3bfa72de752cb672e1191b864d193d8823a4f856bb3f2b6f476dd175e33b2c56c8c967
-MISC metadata.xml 572 BLAKE2B 46f6020c9d2a5187eecbff60365a7d7649e3548c94b4d9f7981dc6efb1a0d66afe82c5e590ef658dbbe763fb6e7f45253420a7e83c181a874fca332035616b62 SHA512 f7811671d545fe45ba401b69c04cdf8118845414bc5f9f1f3869c4517ce72f298a6248752e6c9c140a1877857ca0f03832de83a0e02bb51fd1ef8ecf53f8e7be
+MISC metadata.xml 578 BLAKE2B 6b8f16ecb046eecf1315d39e62dacf5c79896b80375eed7696acf791b3e3324e008f122e8deec4098d2298200a655e497fdac1d059aac3d6b7d8df980b8a29cc SHA512 78615eb4a4d5812d45ede2a138ab70ad2c6152ef5e4f7873cb4e95f29ad643f9a9a7e8db5b52f61a7f464e2c875591bfe359970ed6dde1c7188c59c6ba87d211
diff --git a/app-misc/carbon-c-relay/metadata.xml b/app-misc/carbon-c-relay/metadata.xml
index 5695b7a6de75..c023cb5be2a9 100644
--- a/app-misc/carbon-c-relay/metadata.xml
+++ b/app-misc/carbon-c-relay/metadata.xml
@@ -6,8 +6,8 @@
   </maintainer>
   <use>
     <flag name="lz4">add support for LZ4 compressed transport</flag>
-	<flag name="pcre2">use <pkg>dev-libs/libpcre2</pkg> as regex implementation</flag>
-	<flag name="oniguruma">use <pkg>dev-libs/oniguruma</pkg> as regex implementation</flag>
+    <flag name="pcre2">use <pkg>dev-libs/libpcre2</pkg> as regex implementation</flag>
+    <flag name="oniguruma">use <pkg>dev-libs/oniguruma</pkg> as regex implementation</flag>
   </use>
   <upstream>
     <remote-id type="github">grobian/carbon-c-relay</remote-id>
diff --git a/app-misc/cdcat/Manifest b/app-misc/cdcat/Manifest
index db7b400a1c0c..b964640d32c6 100644
--- a/app-misc/cdcat/Manifest
+++ b/app-misc/cdcat/Manifest
@@ -1,3 +1,3 @@
 DIST cdcat-0.3.tar.gz 7464 BLAKE2B 24d0acce5bca9f84d24944e74a463ec64fee19a989ef89c187dc283d5c87dbdffb76e9471159903603c07924e0affef6f1b48dc7ab5e7292e5ae427510f7a259 SHA512 6d30a22c29a1846a3899f384bcc395444af77b62024cb9f45da877819614c3f1ff495e03f7d7b498716fe4725c569c88a14480a37fc4e4fef5cfd9a640e4cfa3
-EBUILD cdcat-0.3.ebuild 1212 BLAKE2B 5d7c4ec5ac2368ea9c3482aed2fd7b324a083bd647d610c83475fa47754fcad2d319c8ec44baf43cd1c73ce2d5a553b0cfa3615170b87ef60a982c2e4078703b SHA512 bbed8c988d199c4d169bfb886013b8a4a2a5b52cb11d03a51deb4f66ae4d7c6396ea0e3654b30e4ceececc78e56224f35c4ea24c61bef97dd11e87fd857fd63f
+EBUILD cdcat-0.3.ebuild 1220 BLAKE2B 9bdec6ac62b4c2c51dbf5a7652adf90c75d459d45e4969a5b1866523f427d671917f935de3fac4847fc413104de53071db3c9bb975c9a240cc9b53ffc5d778a5 SHA512 98d1f7c4a0bd7ca6c06cbedc6323f2d40cee757c66bc8a6e9d88a86a3f202428dd8f3a681f2d82bbe91b5fb7723d7d44fb29eb1d9cea02e6aebb99fd2f0a1743
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cdcat/cdcat-0.3.ebuild b/app-misc/cdcat/cdcat-0.3.ebuild
index 496a064140db..e97b12414768 100644
--- a/app-misc/cdcat/cdcat-0.3.ebuild
+++ b/app-misc/cdcat/cdcat-0.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="simple yet effective CD indexing program"
 # original src went away: SRC_URI="http://littledragon.home.ro/unix/${P}.tar.gz"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
diff --git a/app-misc/cdctl/Manifest b/app-misc/cdctl/Manifest
index b39717b0242e..e4c6ec525a94 100644
--- a/app-misc/cdctl/Manifest
+++ b/app-misc/cdctl/Manifest
@@ -3,6 +3,6 @@ AUX cdctl-0.15-cdc_ioctls.patch 646 BLAKE2B fb8d93854cccc1cd1b399ea529ea2611606b
 AUX cdctl-0.16-Makefile.in.patch 1474 BLAKE2B 436f47f59a21eea1785c70285532983854a445258eb7a91d01d1c5dc6cd29c4041b1d6999b61a56614bfe9d69bf6824823c783150dcef21a1fb1722ec7929601 SHA512 78d9c1a4b1e3c29fb9b83d6b9250e07157715fa70a00798f6bf49e0af2c2269dfec816df76f1818d401992b793504e8049df836bc0d8a73ab2f0488f4689b5e2
 DIST cdctl-0.15.tar.gz 44163 BLAKE2B f5f3f44fabdff4446eb5d6e3fdcb12f17a4d6ee57e90f4bb772c963d89fd7b22301a6f8ae3b4f4b38f57aabd27cd68a292b96849d66c2b77741d07e129d2a8c5 SHA512 7bcaec8f52cafbe84d87dcb740a952520ceccb197b1491a88bb03d6a993a6385d424f67386a7175bb30c5c8b3ac02abf31c2e8843c1cd7d1d808eee70a5906f4
 DIST cdctl-0.16.tar.gz 34121 BLAKE2B aee95efe468c215102afcd40262f0f3e9196551a661052a9f0909ca068a6b74a25f3cdb01ac62fde2f940dcd6da6e5f4a33328331723b7a14d836bcab1c0c479 SHA512 e1c341cf0acabc28c8aedb3265e65ffe90668b83eb44d23577049cc81a160ab0ec8b6e813cf8ffe20aaf83b4d056a8f07c2e958f5a6086db3843b84b36e060b4
-EBUILD cdctl-0.15.ebuild 692 BLAKE2B 6e2a0d83c75d2d7666c943ae4fa6b5027b305b7317c44c625109aa3af40be55854423fefa3135f92eafa4e2d841bd8a18504f5a7afd6e438dfc880045e95e5ed SHA512 7fb15680883b9108c8eb7d95e77ca0625267c6d7c51f5a7489c0422f23b949c7f67108d24a2e18887896bac59eff3e77c70cfa19b5a8937681cea9f840f349ba
+EBUILD cdctl-0.15.ebuild 700 BLAKE2B 1d66bd0b7393aca38e99f76383a6be950a9e0d03178a9910b5c86a67f0da84156f602576899fe1961b8c87ba96b24229c0c2b55afbf3108d00568ab95992e98c SHA512 935931345e30e6eee205a0e75961b322ba1b167942d7b0f810500c1e02c57b4ac99472029c05064204041d06da6fecf1f712c7d913da13f7d06d5e7af795dad8
 EBUILD cdctl-0.16.ebuild 535 BLAKE2B fbe68f74be781214cfb4c5c507cfbea0685b46c333d4c6674a83571d8930fb5250151cd612c55c068d4dcf5e947317192f7da666c64228e6386e6688e92b23aa SHA512 d4044b97a1b319304916f57f2c8fe381073c381453cf207a189aa953bf74cdb4ac97fd5ae722fd07a1c11ceaaddaf29c13d83e78dbdf5d41301d74b2879123bf
 MISC metadata.xml 242 BLAKE2B 965d7f590657a56f8d90dace39b217902fd1f1f834b1b61d6e4119b92f8a85c090afb74eedc5cd987ba809f193ddf4cbeb44ed27de98e7f96c3bdd4a2332eecd SHA512 289f7a2af6d7c9dc7733456dd71cdc014bd0dd13d84d76605aa3ae4ba4bc39cab188b744309c974c14a2780662761ba2670a44037b40f07394e65c55c985ac6d
diff --git a/app-misc/cdctl/cdctl-0.15.ebuild b/app-misc/cdctl/cdctl-0.15.ebuild
index 103a50ff0759..59b947b72297 100644
--- a/app-misc/cdctl/cdctl-0.15.ebuild
+++ b/app-misc/cdctl/cdctl-0.15.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Utility to control your cd/dvd drive"
diff --git a/app-misc/egads/Manifest b/app-misc/egads/Manifest
index 630677656382..2a9d5d6d4df8 100644
--- a/app-misc/egads/Manifest
+++ b/app-misc/egads/Manifest
@@ -1,4 +1,4 @@
 DIST egads-0.9.5.tar.gz 302708 BLAKE2B d9d08f08d09b4e5dc3f49f9c0fa14f9ed9a96f74576bcfbada9c9490c544711c05e84266e208a251c74d44ccbc453e3dbb8ce7bd5e3171a401cfc91d04e70c20 SHA512 b3138d31165f25c4b4b83b72eeee5fd0ea80e2d89a1a67f1d6d40c82afd849ef76ebdb5e71165eb80c00c971dd0bb4e9660fcb70ffedb7e14a003be90ce91e7b
 EBUILD egads-0.9.5-r1.ebuild 1013 BLAKE2B 8f27b783b53c6082b6d18e7a276042761f6a549eba2e3a626c2f1867d2cef7c2216342152acd6f108c3858ebe8c7b27dd28db372335793dcfe674d54a2cf058c SHA512 5f2c413108bb0442bbba029299bc29fb26a1b648daa1070f810526e61769c9f9bd8d371b8baf43cd84d0516128f175ef03638892597fb279ec1a5c44c1091eb3
-EBUILD egads-0.9.5.ebuild 1048 BLAKE2B 43ccb58e8a3a89a05682f01aa00c5373ab207ce1d4592b2b7aee8e969eb29f79829fc2dc03230201ff3f945729a3f11b933dab2b81b63149b08e4a3341cc8d3d SHA512 6bf5a143d07da7e7f574e8cfb1d5634d3a2bcbf97cbc9ea8e9fda0f3f228864fdec9deef405cbf49f7d4f7a9b6ab502806bac38be5360cb477a9d4cf170fbfb2
+EBUILD egads-0.9.5.ebuild 1056 BLAKE2B 449f25653cd8845e447225efae54cb8c8d804d746ebf3e98cc4c9844d64e85f73e965abe2fc6bd6c7a65947f67fc88c11f1a75b979b31297ea17841d56f8f649 SHA512 7a301f1d8837e972adb342cee703d71463bc7130296f92b6d6cebbb437c0a3dde8ea7098e843ac2225b241ea53c75b2ba4afbb0558b8425acc633333239f6a50
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/app-misc/egads/egads-0.9.5.ebuild b/app-misc/egads/egads-0.9.5.ebuild
index e4c4d575e56b..d5b679a67010 100644
--- a/app-misc/egads/egads-0.9.5.ebuild
+++ b/app-misc/egads/egads-0.9.5.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit multilib toolchain-funcs
 
 DESCRIPTION="Entropy Gathering And Distribution System"
diff --git a/app-misc/fujiplay/Manifest b/app-misc/fujiplay/Manifest
index 6705c152e703..1098bbca8b7b 100644
--- a/app-misc/fujiplay/Manifest
+++ b/app-misc/fujiplay/Manifest
@@ -1,4 +1,4 @@
 AUX fujiplay-1.33-unterminated-strings.patch 3142 BLAKE2B dddbf3b36d07fce5ae216998eb5307b1ac0ac5f251a94308f37b43de8de1180a54c34bd14e07fe79b285982c1d99b76c50ae1b9af7c58174cca2eeb1016332ea SHA512 5e2383ec7f65dce4060b85ad2759f29ad65793b98a77543d098e1ded1895a5996f3d104b27a6f3a0f06dfc6b10d483a3bd9e771207006e73b9995dc3300c5280
 DIST fujiplay.tgz 12588 BLAKE2B 4be2b4d44696f5d43942c19cde308874684c87762b2778026750c4db9ba249c2ec8b7986bca5c526c7199289b3094157c068067db38a015372fd6fbd5a1e285d SHA512 168ce95b6926da2438fb858b2537060877145b28638217214f72833fcc75b76dd7e5bba9ed0ca966cd2f7f1c31ca3302ee4662907bf743c393314d615d795149
-EBUILD fujiplay-1.33.ebuild 1078 BLAKE2B 0cb99503acf675ff12a1be899f5acaab2300e2e990e0e263b2faacb11c4ad5cf43c88a06cec206db318f5809feb694fe578d7635536c61a3863ee985354b2044 SHA512 ff237c0570d258155de3042543c5d8179476074ea973c54504e7994aa96b6f23787047ffe39c747f2ab156b3c8540ee505ef57a79c731e0630778237619cce86
+EBUILD fujiplay-1.33.ebuild 1086 BLAKE2B 719c97d033c92c5a9cccd77eefed0b6dd3fda0acc85a9887bd97e54f4fc9702dca037615776e092cd217800f563bff0c04f2a1e74a02d74c5248208d72d8ba66 SHA512 d5a6e81d91ee1b8b3b21ff0f237904d8485c2291fc664cf782ce42fd73979a2f8a8774829a3c30ec9a61d64ad898f4b1c70bdbcb2de875a0f0f88b9b1ca55ed2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/fujiplay/fujiplay-1.33.ebuild b/app-misc/fujiplay/fujiplay-1.33.ebuild
index 458cb23190cb..17402bcb3856 100644
--- a/app-misc/fujiplay/fujiplay-1.33.ebuild
+++ b/app-misc/fujiplay/fujiplay-1.33.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Utility for Fujifilm/Leica digital cameras (via serial port)"
diff --git a/app-misc/g15mpd/Manifest b/app-misc/g15mpd/Manifest
index c1d834d8b047..c4476e4107f4 100644
--- a/app-misc/g15mpd/Manifest
+++ b/app-misc/g15mpd/Manifest
@@ -1,5 +1,5 @@
 AUX g15mpd-1.0.0-cflags-and-lib-fix.patch 746 BLAKE2B 9fce8bbfc245b8fafc638f31feca90dfa1939f6722c0ad31a8aec175c7f4ed9f755ca325e9309175d790a77012c76bd6cec7df29b0b13345ea0143aaa406c928 SHA512 79b24ec54f55741f7fb5a5a22a547e515b909e69253418de434c032179ed2a2f4e9397eabcc13de460d8c9219b3aeeafce387ba84cff17a79778ee151465b7c2
 AUX g15mpd-1.0.0-libmpd.patch 1460 BLAKE2B 360dd9412aecf2b805145263b9d021484eca3dfb966eec8b44857f263a5b5fbb31d17dfcec276d531c76ef4c1d1e4cdf32d598771b3c414df8bd2660bb6ea5b7 SHA512 240c82b84c4eba2095e6fcfd0e7da7fb54197afa600dcd0ce92b3eacc9f8907e69ac64e44dfa5314a29bc4db793f9e21f8efd44589c0a3c226426cd52445945e
 DIST g15mpd-1.0.0.tar.bz2 220482 BLAKE2B 82103773005566764bab5e8b583633a14b5103887ac7e4c3571cfc85064e483943189e6b4b76e8f3f3b7383d327b29a19b281f23364d3bcc18b10ef44de1e9b5 SHA512 509b634c8ba1f3b9efd0d7af47b553671efe3526c9acd44b292bf5883b1016cfbf18dec69c8bb5b3a35853e76b9b4fe7a51cd2a33acf4c755d2824dc793fa0ca
-EBUILD g15mpd-1.0.0-r1.ebuild 841 BLAKE2B 8f1685abfc8eadac270c3e427f3abcaad9d76cc81459481b58fedc728a21b8759fa962fd7ba38632a8a4c33153dcdf1756773d0e554ac045e6b60c0ae6caef08 SHA512 121052697c540bf51ae95d6c05d187307dfc825334629ae44f050e0346e598b16b45af8f03beccb9a4f3644604f67fc84c78c5cf12d561bbe1e570f049bf08d0
+EBUILD g15mpd-1.0.0-r1.ebuild 823 BLAKE2B 8023552468558f30ae1737d13b2eb27f4ff6f057b845f8631807ea9853f6e6b69432e28f5025aa478e0e04e9b3734666cae0b386f76ddd23455194b6490d9e7c SHA512 c3d0e6dbc656fba7c85ae7f43cfbc58e2ab43678d49ec662bb80740f166e573dff8cb9abd7bac4f301843e9bf999a000c78872f710f204228df83a42022affe9
 MISC metadata.xml 246 BLAKE2B a95774ec5f588845ea4765db8b51d75fe0b71c04129ddfba9706afca19ebf4fcefa5bcee0c71b295d270de24e8942142d2af9449a46b7407cfc24a5797fb6885 SHA512 b9fd89855ed25a0b766566521a33295c6d3f4469ba31da9fed2d4f133d3c56b1a59e7c4cc66171ebf6c8a9137ccded19a942072f80dcded8b7efcf0912fdfce1
diff --git a/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild b/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild
index 7cc98849f96f..13ecc8900f6a 100644
--- a/app-misc/g15mpd/g15mpd-1.0.0-r1.ebuild
+++ b/app-misc/g15mpd/g15mpd-1.0.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=5
@@ -23,8 +23,7 @@ RDEPEND="
 	x11-libs/libXtst
 "
 DEPEND="${RDEPEND}
-	x11-proto/xproto
-	x11-proto/xextproto"
+	x11-base/xorg-proto"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-libmpd.patch
diff --git a/app-misc/hivex/Manifest b/app-misc/hivex/Manifest
index 5fa61da6a0ab..1977e9948fb5 100644
--- a/app-misc/hivex/Manifest
+++ b/app-misc/hivex/Manifest
@@ -1,5 +1,3 @@
-DIST hivex-1.3.11.tar.gz 1264487 BLAKE2B ba2f72d174ed1b807ef97bc3a5cdec10219b01c1719a0a9dd262ce4a8474a808c73d2f14e9d3347ed44485b08b77bb3638212a24159b5aa153189848e755e5e4 SHA512 1ff9fbcfb976fea5bba41c5ff06e4dc68af0e507accc236ca0406644ee2c865619b3b3bf9550124778fcd782ddc257f1d89861b45f48c0c3ceed18dfa1e02ced
 DIST hivex-1.3.14.tar.gz 1332257 BLAKE2B fe7c19e05d29c7e98a334842cc1144aa76b148a3b7aae91449a4923a124eb54227a9a004346ef3558732c688c4f92cacd0c9328056930c33dba0404465634da0 SHA512 dd7dd52dceda580179a815fc48a2a2c7e8f7234614beceb937fba7e317df17984e65453338160c4c467b70d7d4f9bd61b48aad3ca51e19bd5e4cfbca8ee3adb6
-EBUILD hivex-1.3.11-r1.ebuild 2150 BLAKE2B 67f114a0346d1400a0c89a09757013e71c10464bde701ac445dfc2845b7becfee9c016ae6879dfd0242fea532bba506a90769c398dfa1bee4bd37a6ca7344401 SHA512 77b65aa11d50ec1d97ad9bb2f15e2aabbb7652fa509432c748127cec6f1fdda9a4d19814f00a047e28cb48cd360c583c311f40deafb5e8afd23f844e06a7f187
 EBUILD hivex-1.3.14.ebuild 1847 BLAKE2B 4ba68a7ff21627ac4d966ce452f2dfc025e8e49029849162f876c436bd45862883a735328d114296b4dca38cd874492c75d402b3fedf3f539c053fb779564803 SHA512 8b0c81ea83fe75d828a343f9d9aab08cf393c4f6fbc418462b10ca2a482177cad59073c00219d3953f5e3f5edde28553f0087728b31393171c0d60bded8d066e
 MISC metadata.xml 245 BLAKE2B 5599732e8923ea2b90a26adcb5708b6cf95cd3db28e810b9f881ac7d0e2c63745609f4c6e21708bdda7792f769df77bfa4b9d4d135eda71831efcaaab122c384 SHA512 1c6cdb75d4cbbd8d3a5f2cc24950924c030db330e135cf2cacecdaaa99ee65117efd7abd9f8652bf5dfa8169d427f51ff84123aab11fa8ef82498a6834b0805a
diff --git a/app-misc/hivex/hivex-1.3.11-r1.ebuild b/app-misc/hivex/hivex-1.3.11-r1.ebuild
deleted file mode 100644
index 89044477d977..000000000000
--- a/app-misc/hivex/hivex-1.3.11-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-USE_RUBY="ruby21 ruby22"
-RUBY_OPTIONAL=yes
-
-PYTHON_COMPAT=(python2_7 python3_{4,5,6})
-
-inherit autotools-utils eutils perl-app ruby-ng python-single-r1
-
-DESCRIPTION="Library for reading and writing Windows Registry 'hive' binary files"
-HOMEPAGE="http://libguestfs.org"
-SRC_URI="http://libguestfs.org/download/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ocaml readline +perl python test static-libs ruby"
-
-RDEPEND="
-	virtual/libiconv
-	virtual/libintl
-	dev-libs/libxml2:2
-	ocaml? ( dev-lang/ocaml[ocamlopt]
-			 dev-ml/findlib[ocamlopt]
-			 )
-	readline? ( sys-libs/readline:0 )
-	perl? ( dev-perl/IO-stringy )
-	ruby? ( $(ruby_implementations_depend) )
-	python? ( ${PYTHON_DEPS} )
-	"
-
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	perl? (
-		test? ( dev-perl/Pod-Coverage
-			dev-perl/Test-Pod-Coverage )
-		  )
-	"
-
-ruby_add_bdepend "ruby? ( dev-ruby/rake
-			virtual/rubygems
-			dev-ruby/rdoc )"
-ruby_add_rdepend "ruby? ( virtual/rubygems )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( README )
-S="${WORKDIR}/${P}"
-
-#We are aware of rather poor quality of this ebuild, but the bump is required to fix security bug. We will fix other matters later.
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-	if use perl; then
-		perl_set_version
-	fi
-}
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with readline)
-		$(use_enable ocaml)
-		$(use_enable perl)
-		--enable-nls
-		$(use_enable python)
-		$(use_enable ruby)
-		--disable-rpath )
-
-	autotools-utils_src_configure
-
-	if use perl; then
-		pushd perl
-		perl-app_src_configure
-		popd
-	fi
-}
-
-src_compile() {
-	autotools-utils_src_compile
-}
-
-# Test binding's dont't wok properly in gentoo layout
-#src_test() {
-#	if use perl;then
-#		pushd perl
-#		perl-app_src_install
-#		popd
-#	fi
-#
-#	autotools-utils_src_compile check
-#}
-
-src_install() {
-	strip-linguas -i po
-
-	autotools-utils_src_install "LINGUAS=""${LINGUAS}"""
-
-	if use perl; then
-		perl_delete_localpod
-	fi
-}
diff --git a/app-misc/inputlircd/Manifest b/app-misc/inputlircd/Manifest
index 809c48b71fb0..b942bd8922b5 100644
--- a/app-misc/inputlircd/Manifest
+++ b/app-misc/inputlircd/Manifest
@@ -4,6 +4,6 @@ AUX inputlircd.init 259 BLAKE2B 19ed54f2a354fc9efd4a6f48944c5546901d8d23c7e2a45d
 AUX inputlircd.init.2 297 BLAKE2B bf8676b94101dcc9e4ed5480ac5a0f0c3654188892d9049af0fd72359b5da4e160c9e34e371d68278264ca810af0dca4174e97c09e30e4602913a78e3bba5915 SHA512 50f50859ed048b561416e7c21cf083ddda3114331ea14abef470fb04c0108f925f47a75be2b4396fd98b7d140d988288852f2c0ce9fce8218ce2a31e90c48626
 DIST inputlircd-0.0.1_pre11.tar.bz2 4370 BLAKE2B 9fd957a2558d1d81cefc6f40dfe0c9a8939be0a2ebb1c04e6d13759fc94a28f0c958947e36c4cacd05e0e1c8b995a6877730381d1ee06a75fdeb5142a55af5f9 SHA512 e09546340843f4df01f22c2e5347bcbae7078c521c7e4d5216d061beb93f7ae660e96d1942e6e931e0f72c930b8383cf6f83c70f1f242587da82edc4a04b6d76
 DIST inputlircd-0.0.1_pre15.tar.gz 5226 BLAKE2B 92339021451b2575de5adbf6123f1083e93bfbd8cdd3233389301032678160bb622cf4b92837470151494ec87bcbde5462c557e5cef9fa601ad6da71607dbb78 SHA512 6f7dd15875eeccac1f666af82dabba243707c9b3c3b2e39070032fb3d4a40c1c0ae6fbca2e7be02ce7061d289d9ad07b9ee38c5f5b0f33d5a6c413df5bfd6365
-EBUILD inputlircd-0.0.1_pre11.ebuild 586 BLAKE2B abe1411ab4f1e339b4c4ae6737e3c8f644d15c1b704d6dcdad3ebf0b3754b1bdfbd03d2d9b0a2c0e22cd27e08a86b331a8a2b62809b31b7532b0eccdcd5de281 SHA512 62ca7270bbcc7d621d936753ed7f5fa3f6b572de4313b52ea3d8318f06e1ebb316259b78111aae9a8240ade4523a05b11ce6a286d837d7981f53f18d8d2c48bc
+EBUILD inputlircd-0.0.1_pre11.ebuild 594 BLAKE2B dd2d13199c9e1c4c1586e60bf86706b0b382aebee10ca1cb0b2399b72b4b0c89a355606b7c76c7e401e30766f16a8ccfa7ea155e85a06069d0ae5df440d910f7 SHA512 6e630e3b402c2607182730baba43c203582b1d68c0589d54bbaea2af283f6b90d6e556e8ff6a8ce1451ed43846703b7d20dd2be15e77dac8ceec3a4c483eaf2a
 EBUILD inputlircd-0.0.1_pre15-r2.ebuild 907 BLAKE2B 70f9697226ba3a58e6ed1de74bf034dd29814f13fd569524f8e7a5983d1c632446f624e9a4807e5ff6882fcfa0a0305f12b572e64d50a92f8d0bdd91db8801aa SHA512 393bb7e94cfdfab9b037f94476d1f62ee3c1cb38bedf09c22049558f4eb068bcb14d39c9233344091ebfe9d6a1188e60815416d9f95f8433252849007a3cc4e8
 MISC metadata.xml 258 BLAKE2B 1878517d827956dbd45c2d86e97fc066cd4293c3cc94d6d4beaff553462c1badb68aa38b3082c01fe6e21ca1519fc482e2670931d007382b8b2c38af715fe02d SHA512 33d52c9b472999f5722ba6a13598524745093ff45394dd1c9f560b051c9d28be465f72db260a148831b1ff8bc175f41d0c1e4b2d038afc0afdd230b039c67c2b
diff --git a/app-misc/inputlircd/inputlircd-0.0.1_pre11.ebuild b/app-misc/inputlircd/inputlircd-0.0.1_pre11.ebuild
index 517bf8e15f58..fc912181ccaf 100644
--- a/app-misc/inputlircd/inputlircd-0.0.1_pre11.ebuild
+++ b/app-misc/inputlircd/inputlircd-0.0.1_pre11.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="Inputlirc daemon to utilize /dev/input/event*"
 HOMEPAGE="https://github.com/ferdinandhuebner/inputlirc"
 SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.bz2"
diff --git a/app-misc/joy2key/Manifest b/app-misc/joy2key/Manifest
index 807c4e4dab36..f67b7426583c 100644
--- a/app-misc/joy2key/Manifest
+++ b/app-misc/joy2key/Manifest
@@ -1,3 +1,3 @@
 DIST joy2key-1.6.3.tar.bz2 70545 BLAKE2B 6e2d14f5a348cdd684e947685ca73735d4c6580d49296486ee79bc68c5f5d08d07c42f79370a75b5cf629001a5c89c6d334a6f6ed7e845209ac1d8f008e66b1c SHA512 33767058cb32aa18a418d37f48d80200a99ce12b765ec758bde7efdda575ffc78af3039584fe3ef267baaacc3724b3203d858017c945824cc949b9cd6fe97bec
-EBUILD joy2key-1.6.3-r1.ebuild 632 BLAKE2B 8d9fb735e98ccbb38a29eb37e4046516f5087fecc35510b9e7614b673c602772753a6f20745d9291608c287b6a41dfe79b7632ec1f8afbfad5d7991d32b8f9de SHA512 bddf8052faaed510f70e5590a2af27b15b05e8c5b39abb8040777fdae1db3c0b7d241af134052692e8b7b0ac718baec3e0d4768d1f25550da837f2d6377d2933
+EBUILD joy2key-1.6.3-r1.ebuild 635 BLAKE2B 2964b3c159537bc07ee1b97317dffac59233df77ca405c1166e7462368443380f1c7d07d3ecf80f1aaf7426a695201623daf2ba5faa58417d2f9c99a49ab4e84 SHA512 960a68afb4f4166041b9c91e1446faf1f4dfa5e49ca10082c38a9f6e3fed324c288d6e36f87f32798dbbd1351ea14dfb3f7d88e13076c39bae2542eaa6bc156e
 MISC metadata.xml 244 BLAKE2B 743fbbe02778ebafa1c27c9ab5648a3b84111b49d19e939f937f03788164c6409a19c284162e75f210d306b1bd616bd63195df501c8819a4fa7b611bab36f878 SHA512 4bb71014a1a32d8f334488977c78efe9058b5246c77ce6e60c099ad3e56b931cba7b95a3535f7c0a5f030cbac3efaeff8811a9fb43a9bf77eca0afaf0117f182
diff --git a/app-misc/joy2key/joy2key-1.6.3-r1.ebuild b/app-misc/joy2key/joy2key-1.6.3-r1.ebuild
index 11f1f0f98d09..00ef6ed03b4b 100644
--- a/app-misc/joy2key/joy2key-1.6.3-r1.ebuild
+++ b/app-misc/joy2key/joy2key-1.6.3-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
@@ -17,7 +17,7 @@ RDEPEND="
 	x11-apps/xwininfo )"
 DEPEND="
 	${RDEPEND}
-	X? ( x11-proto/xproto )"
+	X? ( x11-base/xorg-proto )"
 
 DOCS=( AUTHORS ChangeLog joy2keyrc.sample rawscancodes README TODO )
 
diff --git a/app-misc/joymouse/Manifest b/app-misc/joymouse/Manifest
index 2cafbe9b3219..8974f755d0f1 100644
--- a/app-misc/joymouse/Manifest
+++ b/app-misc/joymouse/Manifest
@@ -1,3 +1,3 @@
 DIST joymouse-0.5.tar.gz 92464 BLAKE2B 9051107bb11445011f4d9cd5a546ef7652c857dc48d307a168af948de6bb2dc18a5894598ce0b6940a50cc8afca7eefbde9f1301bb620210bce887955dbc470e SHA512 85831ee72bf518dd8337b6d5cc7fac48bfbe9f4e038d3b05e42279e2aef58c6aa191e4027f9a06cd0e4713ac1d3f692cd5d58d1a263cbe234f590011eb8a6c2b
-EBUILD joymouse-0.5.ebuild 591 BLAKE2B 96c231652af9a05a3286cd59ce80f6d32bbc5a2e50befc4b733053922f7a12bda7c9527c6897ddebd50d7ed2cf52669ff2c0751833e2f36232f90ea9352b88fb SHA512 dfa10c18b6db7614f4263ba80193e6e62b616baead60d1142ca8c6821510252b89fe8a96eb2bbcfe8b87abea96bf0154022a4a52ca65c4d7e0ebab95be7d6060
+EBUILD joymouse-0.5.ebuild 581 BLAKE2B 8ab7b839a8337edc617c6986f7dd23f2ab34e0cb3bc07725307fd6cd5f5dae254ef4a2777ee2746a34224b655b6f3c89de92420a98fcb08eac8d99e35a345840 SHA512 aa27ab89637b9f09c6dbb6f57f371bd0fd1fcaa087448ca55a3964d7801928484672085ece5eec72a063c36a26169715dc39674ae2879222d1faaabc4d10005a
 MISC metadata.xml 337 BLAKE2B 966b79dfb4d85c9c7955fd8555421a9e284de99a2a1ae26b428ad9fd4087e537d862426002c6d67e7d39277ae7a1ef2f33dc3174e292c110e985a770788f5ece SHA512 8591ff3f582a6b43725bab8eb4c76c391af184a8845c11d135f2fd029f7e2097f16aef1e76a2794c9305d9f002b33f50b210b58221f4176811f6e8180062d209
diff --git a/app-misc/joymouse/joymouse-0.5.ebuild b/app-misc/joymouse/joymouse-0.5.ebuild
index 7a1886e92a4a..a34fee3f186c 100644
--- a/app-misc/joymouse/joymouse-0.5.ebuild
+++ b/app-misc/joymouse/joymouse-0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,10 +11,10 @@ SLOT="0"
 KEYWORDS="amd64 ~mips ~ppc x86"
 IUSE=""
 
-DEPEND="x11-proto/xextproto
-	x11-proto/inputproto"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXtst"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 
 src_prepare() {
 	sed -i 's/printf(message/fputs(message, stdout/g' src/joymouse.c || die
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index 6a57ec0a090d..4898e52079d3 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -5,7 +5,7 @@ DIST lcdproc-0.5.2-patches.tar.gz 6571 BLAKE2B 11cc34b39ceed329ba1aa9d0750a5c90d
 DIST lcdproc-0.5.2.tar.gz 822695 BLAKE2B f7065c2d6ee1c6305d3682166bb2b4920a9f0ac2a079b57389f76edf75c81fa9ebe954358b216dbad866e2daa10f95857106e125cc54a9207a98553f408ae77b SHA512 e21a1f2d3d5f53aa09477e9aea1f9685c1fe224a8f79f15d0d032214de211c51619a9eea9183743c024859349d481fe35d7999cc51e0de81dc2fa8e0c85d7a5d
 DIST lcdproc-0.5.5.tar.gz 946206 BLAKE2B eb9e1248e84d4c9352a39991a1125e74cbfee9094d19a75da4298811120fcf2ef8fef056b35873b6308af79f92eb9187e504f43c4b28c07ca402de2c5d8fdc97 SHA512 42500188adb018547db4db4a472dded478a03f19974843865e07a466870fbca409b4259b57366b7dfdd4a5fd444a89c1930032d1127ae036128dbd9279a24b29
 DIST lcdproc-0.5.6.tar.gz 998996 BLAKE2B 022ce656390caea0c9394ca7a5458f7285e2655f53c49f6fa7d9f94c0638f9f97cc70af66bb779a6b7ca8024b70c2865d51719b72918a4a7da3f6af7d4451976 SHA512 7c506b4691c8544855dadf939863672230c3e0903bbe4bbde82df04ff932f818cdc406c5b159554ec155d0c46fff23d435121298f4e19bac73658b121c6b8220
-EBUILD lcdproc-0.5.2-r1.ebuild 5503 BLAKE2B d63cbe644fe336f118214a4ea6bc6b7b0ffe4e6f88f58c73a8a13ca304e7084bdbca1abf20e16d343cd8cd4f7918aa6b9cdf22719cbd5ad981b5465d7dba9753 SHA512 acbf6cb8c06a3ffc269a74f083d370005f9a1de5f9bd18eea4af2988f880c2643fed5be52b3cf85e89c22c9b1f33352fdb4f0908045e50ab3aa912f910f30b7c
+EBUILD lcdproc-0.5.2-r1.ebuild 5511 BLAKE2B eaa3431092a1e7794f24b7905e1c6c61a9d268179dfb093bd17a99aeb9a80a88ad9569a29ab8126db6bfeccd54369cce46513a3b625d15e8cdb7c9bc7003a7de SHA512 8a97517fa76ff856a7b56266efd77be52c269c1e651d7ff2bf836554be7bac84db3e0021d18a73592dfcb054a99f9efe7ca4de11f683d59f6a829523aae3f684
 EBUILD lcdproc-0.5.5.ebuild 5888 BLAKE2B 05f74abb99fba00d7cc2b2d633d0c41a743fe0537426b4997970d7fb2df1c89c5bb18e00ae24b7979a51de365f761672516ee266a6b570ed15deec484a8c8403 SHA512 3141859061d9a3d46814e361022c017ad1fab8eb92cad8a3561f371d03eef033908bd5d85391da5aa7a445309006a998699e2e5e412025ca074df5fd0f5ce130
 EBUILD lcdproc-0.5.6-r1.ebuild 6083 BLAKE2B 6d2a29febe9e6ba72fc254fb6d7c34f850dcf5b87f2115d01713b1eeac3b91b0e9004e2306b56774fe64cdbb261822dae08f50490d756a3f7cd2c58c9f52c006 SHA512 b18c7ccd63592c303081500055ada6e08c408002e0ed52e4a14fd6b799d0c70566104380eeaf1422fab424a9a68176fd37dcb2f99d614efb72587711476cd738
 MISC metadata.xml 1423 BLAKE2B b5f4d4202cc8178d0ddb4ace19592e15c5bdd68cd0239a219b866d3b6f7e404110858eadb81a7bbd456bc1db237754edfcf7bd9966a76755a81e4b5742712d7c SHA512 b62797738fd47a23fd83c31a027b1636374183488075e9c2073419ca6c08960c60d0bc6108c7148a144852dd45cad5ddd457879249331426f9594fac43cef306
diff --git a/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild b/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild
index 3db5041fe815..9dfadf6234ce 100644
--- a/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.2-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 WANT_AUTOMAKE="1.9"
 inherit eutils autotools multilib
 
diff --git a/app-misc/lxsplit/Manifest b/app-misc/lxsplit/Manifest
index d6949b4d06eb..ec9295fe498e 100644
--- a/app-misc/lxsplit/Manifest
+++ b/app-misc/lxsplit/Manifest
@@ -1,4 +1,4 @@
 DIST lxsplit-0.2.4.tar.gz 14663 BLAKE2B 48b68304042e728bbf36f22ee10d31b8b42deb3c39bfdca93589cf9417fc0f544c3953b661e06f8f451f71a5a9137348523d563b0db57fae335f9d06be9315a0 SHA512 2483010752177232801029b969a01a2702830c47e5d6a185784d9d945b792aecb778241d08d97cc0c02977afec02bf3f6a20e24da2fdbecad2dcef1de95b0575
 EBUILD lxsplit-0.2.4-r1.ebuild 474 BLAKE2B 4c3aa68845f54cff842b6217ad57613b0802c129fd4cb58fbcc24591c8b8c8e893b8280a90c659846b41642086de6ae35d421c52e64be3eb469ed1342b1b3dd6 SHA512 f78af4c11312d4d93f2b06230996271e77f5a8a8a3d5f984f0b8fa3e2dbe5864a89f200400d2a0573a51c01e375e34e51900b93060263a856882606fadc1ce2c
-EBUILD lxsplit-0.2.4.ebuild 502 BLAKE2B d2d6a38a6dd3212ff71ecdcb2f942fdd68ea1fd51876330b9887e896623add3530d9d2319387a74b6601dd7b27fad3c706e9b0eec4eee95ad99417ddaa5eca23 SHA512 5fecc1afc217af5ae40210a35a4b115d77bb529c17d93263ba619d86ed8475c1826db4bdcb25bbc18c00f6454443b34a82dd000562240b81f993134c62d23ba1
+EBUILD lxsplit-0.2.4.ebuild 510 BLAKE2B 4b1bd18d2462ba6ceef63229906c7f9856e96c2d4009272b049926ed808d032b35750bc5580970073bfd0e8a8775664506876a4236e82589124b0bcc1b1c0ab1 SHA512 182092bdd7d55324ffe448d4de10ea49e2ed44ca627e0a0c9f6f835fb8f8f84c1a41c1b48e21dfeaeb94a2d21fc128605b731e9c7911a2a2c9fc9c2d2f842d9c
 MISC metadata.xml 342 BLAKE2B 4e7c287726a2d2590676082ba973d3253244ca1bc9185ae76f403bc892302cefa17032765c8f72bee607e986ff56a31e0f5a8aa629c328092fb3bb813337dbc0 SHA512 3fd31f236a871424340ae802b5ba0c79dabfed4f309662b74885c56e772fbb7e83bc945430cd25fa0772d5aa550735d662c03bf653c607a77a94dbeee95f6344
diff --git a/app-misc/lxsplit/lxsplit-0.2.4.ebuild b/app-misc/lxsplit/lxsplit-0.2.4.ebuild
index 6371d9fdac51..b4cf94587c86 100644
--- a/app-misc/lxsplit/lxsplit-0.2.4.ebuild
+++ b/app-misc/lxsplit/lxsplit-0.2.4.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit toolchain-funcs
 
 DESCRIPTION="Command-line file splitter/joiner for Linux"
diff --git a/app-misc/matew/Manifest b/app-misc/matew/Manifest
index 7f49465ce0ac..d577de3c5859 100644
--- a/app-misc/matew/Manifest
+++ b/app-misc/matew/Manifest
@@ -1,3 +1,3 @@
 DIST matew-1.9.tar.bz2 29690 BLAKE2B 4bdfca7952ca072d0b2d7749ca9b8a8160db5bb843c600b74439eab1cc38b4302440adfa2e168ba915b27ccd628f693ceca1c4e2976b1ee5346740116a18ea9d SHA512 3d4f37c16567cd93b7a699c4d5f01cd655b57b79aa865aed11cb8aab7afb6cc5dc2cba9aa59f72128efa179e08eb95b1226d068e3ae15aec063bb252d9fa77b9
-EBUILD matew-1.9.ebuild 903 BLAKE2B 21a8d025f1f2abcbdb890205735b6aeda4fe57540627fce073d1991c0dbdfdd72caabd1b9483a1f05275ac167dfd6b566bd2552c12643447a95a59f2ec14690e SHA512 645317deb3ff9034ef11536e1b4ab807abdd3465c6508436e192d207d03155e94541ff1a62d4e11930e597dbef24db2673af282b8dd9ceb0817ef2d9d262a30b
+EBUILD matew-1.9.ebuild 911 BLAKE2B a02a8f2df7bd4c374804ff31f503ec2346c942bc0b628319d0a8163b3e0e4e2e8edc3c044c3eb8f61ff793078d08e6f45ae2eb5567b3bbca2bd2b607fca8f07e SHA512 05441d755fa2c558c4d8cb756e8db3688ff09740bb08f1e3dc6ee7fc6ac9fa86957737a0831c408310ace2bd9f55c780cf91e90fe599ab1ac4ca4993d6bbfe17
 MISC metadata.xml 325 BLAKE2B 98c366a68f5000ec12123f37448baf0f84f2c20ec3724090aaee26029f1bee73090837e446af84e5eec9598749e86a6a9cfb696961fd212f421153f840492908 SHA512 6e9710e9171b11accdf474198ff959c8bf47e8601f156f57885b59a8dd0f81312478ed104111af45578732763127704cfea3dd1ecc51008b26b4c3b8fad46eef
diff --git a/app-misc/matew/matew-1.9.ebuild b/app-misc/matew/matew-1.9.ebuild
index 11a4803cb337..7d27f1b42561 100644
--- a/app-misc/matew/matew-1.9.ebuild
+++ b/app-misc/matew/matew-1.9.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 DESCRIPTION="Make Album The Easy Way (Matew) is an HTML/CSS generator for static image albums"
 HOMEPAGE="http://inquisb.github.io/matew/"
 SRC_URI="mirror://sourceforge/matew/${P}.tar.bz2"
diff --git a/app-misc/oneko/Manifest b/app-misc/oneko/Manifest
index 205e723ff79e..6ee1344b01c2 100644
--- a/app-misc/oneko/Manifest
+++ b/app-misc/oneko/Manifest
@@ -3,5 +3,5 @@ DIST oneko-1.2-cat.png 223 BLAKE2B 35eb9a8aa7e49aa00a7a689187b598ee837b9236715ed
 DIST oneko-1.2-dog.png 236 BLAKE2B 8aa4bb11d75283784e7bef8eb6d887706d90cf6370cfa41433d32bffbb23db0b775e5a23fe9b19ef0d9426d5e98e583b599e477427c3223f4a225f1904da7ad1 SHA512 11e4a4ecfba26a0ea782846ca288da7ba3f68629dc8f4b0d7987923f06afe57971d53c9161ed13711a9a1f737ea3d8ec76f559311dd10234dca49cfa9d20f533
 DIST oneko-1.2-sakura-nobsd.patch.bz2 2967 BLAKE2B 128fe382d81fdd18f077d015fcad41613baae00171149a2d4fd253bb03595ca4c7be16640531140af90edf176754fad2bf7e4d5ae27471bf7079b3a558788189 SHA512 dbab7471b1c76d8bd7b0c0f9512ce274d98b7e96e8f1cb781a07b031d3a23c0c716222465dee16ad77f658c681116e71e6f8f50ab45ee8f24d132e24fed6849e
 DIST oneko-1.2.sakura.5.tar.gz 76825 BLAKE2B e6fbb02823a25e71b6b26d067ca898352d26971bd6595b2f8d33205bf268238e277f8a0a980178704857d50042acd0cb1663d9eb0549764934153864b3602ed1 SHA512 328bc267c027dc2bf9f4d0bf7a3a5cfb0f77e7ffe566dad58ba8728a8d72f905ef0b1b92fea77179d1e79886aea8a6b27cda44dc227d96b69ed34b4fdde3ec15
-EBUILD oneko-1.2-r2.ebuild 1673 BLAKE2B 4bb4ef9732dc13e00c3350fa6f0ad28fe4a91e4d2267125609c19c6839b8344de809a6ac40498002022354aae28a1b2837cc831ea4de40a99838927531c5f6aa SHA512 5ee081642344a1c3b8cf0f694fc1b3f24224c93d049db6340156d0bd8d4696ef42f38f3db10fc0b161ad56b679cd050af562a917155c332b869b32d093a913a1
+EBUILD oneko-1.2-r2.ebuild 1673 BLAKE2B 01fb6acabb5e2d39f3634af2ff7d1998580757e4b17538682f3c8563b3c91c1641f0bedfbe418f3578a499fe9873163e09088e783f18f4c1b4e09fe12db9fb1b SHA512 cca224ca83a61edea8ba92bb3a7157756ed96a9dceac9624c4c221ce955646f797efba918df52856480fc3ceb8dd7859244a4051820263a4c2b0ffaa76ca7505
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/app-misc/oneko/oneko-1.2-r2.ebuild b/app-misc/oneko/oneko-1.2-r2.ebuild
index f0847a294f5a..9866e7ac2964 100644
--- a/app-misc/oneko/oneko-1.2-r2.ebuild
+++ b/app-misc/oneko/oneko-1.2-r2.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=5
@@ -21,10 +21,10 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	app-text/rman
+	x11-base/xorg-proto
 	x11-misc/gccmakedep
 	x11-misc/imake
-	app-text/rman
-	x11-proto/xextproto
 "
 
 S=${WORKDIR}/oneko-${PV}.sakura.5
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index fd8a95402a6f..2897e6400642 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,4 +1,4 @@
 DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c703a96a66973a6248529a2d858ea38adb246a270a1f343a499515f55b25613bb20c46978e2e0dddc03e5ddb9a2aa7 SHA512 efcbce49aa7e5cd433f9b3fbc8fa82f6d7b0eb80ec40aafde453d6fe96e3565e066e5020f04d71537d8d4e820147f4203c0df2dd330ebb1358a26def3dd5484c
 EBUILD pax-utils-1.2.3-r1.ebuild 1698 BLAKE2B 3377c2719fbd8e49d50c166d7a10655570197c84bb42c2a57fc0bdc4ea33c4ce29a4094da408189e5fb9ae0ffe830f39aba1e5fc0c5d04679095f81e9b04d05a SHA512 04678abb457a3206152a37e4c563f424ee551038e10e3dd00149eed4503edf27a370e7d1665fff6fdb60a43ff2492a631f8fed2f53cf3e48e03f21ea62ca7c16
-EBUILD pax-utils-1.2.3.ebuild 1478 BLAKE2B 1b90514bcc6d3a87fff7d23e8b92373ca9ffc9dad879701856fa1de6da23305458d707832ec526060cd490aa43511052c6b2bbc38d4d2d505226acc4be3baaca SHA512 d588e020da343b5dd28303069216ef824e4e562de23786cc0c77062cc9aff82a217910df7e2627d7dc0ea084e079cf9ba2ebcaa834bfe1a1c247041aafdf6b5b
+EBUILD pax-utils-1.2.3.ebuild 1477 BLAKE2B e3e27277bcf7d95983713cb31a0a57b998d500d42d26ba75b364b42da9b3c9b82635b02148daba3e675a816b446b2d9ec09b851635b5800712d1bd61d594211f SHA512 a407d1613f4489687d3d86bae6fb9bf8f527fb123fbd59e56ac9f390e80de5063610e76ca2570b78fb35e05abed5c735939599e7604265aed68185f4cf49e731
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/pax-utils-1.2.3.ebuild b/app-misc/pax-utils/pax-utils-1.2.3.ebuild
index 8312f7bc2df1..5aa96c1c5b57 100644
--- a/app-misc/pax-utils/pax-utils-1.2.3.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/ps3pf_utils/Manifest b/app-misc/ps3pf_utils/Manifest
index 3191a5266264..06586f9f8d56 100644
--- a/app-misc/ps3pf_utils/Manifest
+++ b/app-misc/ps3pf_utils/Manifest
@@ -1,7 +1,7 @@
 DIST ps3-utils-2.2.0.tar.bz2 361144 BLAKE2B f862ecde260873e8b2e6c79d20e3ae833c65b77e92ef02957c319de166bb9ebd7a1b68c61201f1fb0bd378291e418b5aeaf8283fa03faa26f356989050ab32c9 SHA512 278b4430e307493481ccbe5f1c92968921d5af9b2d09a80a9356ccce984318356183be4983ae5c13bd5e79c2e28c839df0402382d8be5d342a8605236cc060f1
 DIST ps3-utils-2.3.tar.bz2 351066 BLAKE2B 2168e6f2d0eb2543ee8efdf6092d9dd21d2bad38ad8459b19b9a2b4bbcc05874cb99768b6d2f090a5866b904c4a0fd5c590eb6ebc431f87fd3686d8a6fcc4adf SHA512 523e8c28325dc77478cc910a62249bfcd29b35b50e9b01d0d6dec600af302a4a3eff532b313d82fb23c4ff5436955629d8a72f1afb03b76f2b1b9cbd534e8396
 DIST ps3pf_utils-2.1.1.tar.bz2 980229 BLAKE2B b0c0081f6938b472285cbf6a0fb03db06447cbde3ade34b1ad5067fde48102f2fc6402e7b0a8a73d03c99e6f9392fb00756347f1d2dabab90a2a4dc06ea8a124 SHA512 5ac971659d946aff3bbaa5090f65018c67bf42309bb855742f1e21d226d619d9f16495396527fe7121d8a5599f5f7496127cb06b011d80b780de19bb73ce668d
-EBUILD ps3pf_utils-2.1.1.ebuild 554 BLAKE2B 8faa31b166e2debe77659701e547cd2affcd2130ca9cfad05d9ad66a5b51e0862281b9fe31764102e3a2f8f7de46c3e29d97be7c2d4ad36724f17ac307d2db5c SHA512 b9da4c443e915819a02ded54e6d786812c34177ddc1e6d9da53f085f65e6a375bf2fad76d4e554c075d171a2c8551f525c3803b53fce22701ce5d91bddacd82e
-EBUILD ps3pf_utils-2.2.0.ebuild 522 BLAKE2B eb625a10944b6c871c49af7bc6c0c9bf3aef6df3375dc1e4c2135af61cef758c6092e3b7349711f55034e2ff6ce89c37e9bc6e04565c2ed51df7931e2ea98353 SHA512 b25c89b67046525579c88d5504f109b22432d60ce75ad9b5107e5f930222bf668d79e19f143293da8d01a65bdaeb5c94afe8be2c6f35841e9d21410f13af317e
-EBUILD ps3pf_utils-2.3.ebuild 563 BLAKE2B 2adc230d48f5b915e9358f61e56d6f22faa12346a24b693732000e79a088ee384862e1384c3fcce2e911bb989e053df9d49491b9ce729abeaa665371db5eb2ab SHA512 4210eb2067a50a82be44936fe0da835036b6f3ddd1f584220d69789d1066d21213bf7887bad74aca5665fbdde7f265aaeeb37b62662c336c6dfb61c911f1621a
+EBUILD ps3pf_utils-2.1.1.ebuild 562 BLAKE2B d33eedbac8bd62dd753bbf784bcba3e1e59196ec45771c7ec2fdd3ded2d60fdebac72fcecee27e23b8437fd372d9555c291dec05f5e298adaf98d41774ca2a5e SHA512 707674204fe04250854e1c9ce1b624699ca6bb26e95854dc7e888e9def2fa00e54c17056a9a4391d3d4aa227d0f4d653a234b908271f94b0bc1b5a02f50f2e0e
+EBUILD ps3pf_utils-2.2.0.ebuild 530 BLAKE2B a2ecc630716580f24eb832071c510bb070175c0eccb186f03054869d423a079fedc86016ca0a9729e0240e463fe9d75339f566987700cf68dac00f514f51f60b SHA512 719e25183766914b53cf20ef630c3d962d20730b5d3bc41e1a3f1144f4c42fa7d3092be9df00c101a663af5802be33f9c9c1d130065ace2a712766b874f8d313
+EBUILD ps3pf_utils-2.3.ebuild 571 BLAKE2B 5cac13fc988e7fe1f3476a77a0055e7592b54cfe80d04d438e08436d8d1bcdb454529bcb73c31f6427b1b3219db98a08bb9662a48a882e4827a3499320afd760 SHA512 c4718000f4b3a8174279d79746ea0c269de6867e962c0824ec5901c6686213496f6528df407be0cd7d6c3b193c823389e5d66128c899cf30a63c7f22cc532e31
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/app-misc/ps3pf_utils/ps3pf_utils-2.1.1.ebuild b/app-misc/ps3pf_utils/ps3pf_utils-2.1.1.ebuild
index 386c4fd3b72e..1df332c4519a 100644
--- a/app-misc/ps3pf_utils/ps3pf_utils-2.1.1.ebuild
+++ b/app-misc/ps3pf_utils/ps3pf_utils-2.1.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit flag-o-matic
 
 DESCRIPTION="Utilities to set the ps3 specific features"
diff --git a/app-misc/ps3pf_utils/ps3pf_utils-2.2.0.ebuild b/app-misc/ps3pf_utils/ps3pf_utils-2.2.0.ebuild
index 62d467d9f500..a7ff984ad3d9 100644
--- a/app-misc/ps3pf_utils/ps3pf_utils-2.2.0.ebuild
+++ b/app-misc/ps3pf_utils/ps3pf_utils-2.2.0.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit flag-o-matic
 
 DESCRIPTION="Utilities to set the ps3 specific features"
diff --git a/app-misc/ps3pf_utils/ps3pf_utils-2.3.ebuild b/app-misc/ps3pf_utils/ps3pf_utils-2.3.ebuild
index b1c991e4dd75..f077de454c08 100644
--- a/app-misc/ps3pf_utils/ps3pf_utils-2.3.ebuild
+++ b/app-misc/ps3pf_utils/ps3pf_utils-2.3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit flag-o-matic
 
 DESCRIPTION="Utilities to set the ps3 specific features"
diff --git a/app-misc/sonypid/Manifest b/app-misc/sonypid/Manifest
index 09b251675802..1ade3bf66955 100644
--- a/app-misc/sonypid/Manifest
+++ b/app-misc/sonypid/Manifest
@@ -1,3 +1,3 @@
 DIST sonypid-1.9.tar.bz2 9710 BLAKE2B edc68ffe6649b6ad7f8afa41666be514b34593bf5f764f29d1ea0d94c335e2f497b7c31b9f0946210b008d6c37e0647b3327476cbc628db24ba7179dc2c25360 SHA512 fcd2b2d2a9db94cd59b8d0f23c41aca2e738e433ecd6818ce84cc1298f5609c84aa16b75e0ce1323e24bf6bb59feccd28c5016549d0690e6dd2f3aae1244e3d0
-EBUILD sonypid-1.9.ebuild 567 BLAKE2B 4b9b73cca16d770fdbed79989f2e8a02108c8b54a835b3fd37ceb228bdca1a63f46b00b5d87d7d03de1c7dcf3de1c7a0bfabdd74cafa9b51022f6a25e5827102 SHA512 ac6673ec399bcfb819820538133ef0a8a8602d2b036e2e2b8c7347d81bb0e175d007fa5ceaab590cee71e6ee90b9e182903e4092da5f036842352606c6847496
+EBUILD sonypid-1.9.ebuild 566 BLAKE2B f72d06446e930e4fb6d3d642778ccf1943ebc2af86cafd6581ab405bf22771ee403ed8ace5aa61965abbf3010973036d4471a3845ab7761e6f7c04c9910fad23 SHA512 16335d49a97f2b3238869c6d39fa791d0db8e88f451110e38686b1d8a39b5fb1eed3d22b43fded02eec79a3f802d4f01ee4e810c86817da831e53532b2ab774f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/sonypid/sonypid-1.9.ebuild b/app-misc/sonypid/sonypid-1.9.ebuild
index 26e9537b63ea..cb8e02458bd0 100644
--- a/app-misc/sonypid/sonypid-1.9.ebuild
+++ b/app-misc/sonypid/sonypid-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND="x11-libs/libXtst"
 DEPEND="${RDEPEND}
-	x11-proto/inputproto"
+	x11-base/xorg-proto"
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}"
diff --git a/app-misc/towitoko/Manifest b/app-misc/towitoko/Manifest
index d6858e4a4517..99d699d7327a 100644
--- a/app-misc/towitoko/Manifest
+++ b/app-misc/towitoko/Manifest
@@ -1,4 +1,4 @@
 DIST towitoko-2.0.7.tar.gz 280177 BLAKE2B 0a58abc81a8106415d25d82a9eab4338d8a1cb8dc04b2d7b1d3790ae1c8429d0fdec2641dae68a9f38b3ce9aa9f14fa5ba1fb4fa9281e75e87a308024ba59873 SHA512 e2e21bda3b1dad55dee1cfb4063e114394a21973b4b2409b9dcff1479fc312fb93bf6e634d38e1f7a30e6f835d87af8268a478b534f65c916eeb13d5dbd07b86
-EBUILD towitoko-2.0.7-r2.ebuild 815 BLAKE2B e5d4a224aac824461a8436c6746c31d441ddedb196cc7957faa58c203d6ca8f0687670e21daab7d0ffbf67ea399461dae0ee16e9a97d0eee0230dcf339a0a08f SHA512 79fc932506b741a364fb6aafc907a62fc42667627959f310e6d4ef0956cec2096c037a6fe3723c050e51ab7b60ac80d801dda4ba41391a0a9aebbb09329d6447
+EBUILD towitoko-2.0.7-r2.ebuild 823 BLAKE2B f4246660a93b0230fe1f83c7b0cf8f813dbde49253ddbe6085feb482250eecf19d551ea10cf877e2c51cc50b6c16ed906b0b2c3c55f01fccaa80fe61dd62f7ba SHA512 9b2df0e8bfc47f14dc22d975b5ba96c02ff91fdfb513f6f95b70e1edd220568ab302193f1b83976999c3b452cb0a127bfffc12e492f65cba177cccc98e832774
 EBUILD towitoko-2.0.7-r3.ebuild 674 BLAKE2B 3b505cf5b7d408c6932b6023ca519e6c6672bbac1e6788c943ae2983b9cf9e594612b15432651b0ee357cdd5dd5660db1500c567902c7c278e90c2a5b756e172 SHA512 bdab3d73bd1326a36c8003729945aab452e59f1e61e2016c74043b0dd7d77983fe4c959add096e488c3f8e79160c9145c4b0138963fc5db28188407dbedb9fce
 MISC metadata.xml 278 BLAKE2B 6cb5d9c1e26e7c00636842a387c8b772f44a284cd24fb44e8133edd04d4d37a2fac01d0cf77768b88137ea7ab302554adf4a32e41df5246b2ab01ac21476f8a9 SHA512 4d69e222be58da2fefd590fa9cdfa2dd6e7108c3f663fb0f491d49609b0ebb8e10b4dccf22966d09f83b81074f0543723837b60015e7d4102b7a7085744c770a
diff --git a/app-misc/towitoko/towitoko-2.0.7-r2.ebuild b/app-misc/towitoko/towitoko-2.0.7-r2.ebuild
index 9ba4886366b9..fb31a59e4793 100644
--- a/app-misc/towitoko/towitoko-2.0.7-r2.ebuild
+++ b/app-misc/towitoko/towitoko-2.0.7-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 IUSE="moneyplex"
 
 DESCRIPTION="Provides a driver for using Towitoko smartcard readers under UNIX environment"
diff --git a/app-misc/tpconfig/Manifest b/app-misc/tpconfig/Manifest
index 8d7eb8d79c6d..e0d86bf633cb 100644
--- a/app-misc/tpconfig/Manifest
+++ b/app-misc/tpconfig/Manifest
@@ -1,6 +1,6 @@
 AUX tpconfig 426 BLAKE2B 8ef3bef0ca0e50d6f220c4ab7cefc9002bdfffb6c018173d181c3e1dab6cc0fca07c3e8fca4c251efc308f24324e382c7477267a18ca792c993a1247e8bf75be SHA512 09c0a954b765404eeee569040b832883f85b2451c41ca4465ef5febf80745fb9a65fdabadff9967f014d064134c353c66953c26e7295b4ced3dbc172975d536e
 AUX tpconfig.conf 132 BLAKE2B 9d5f6490eee22c619d458a5190889867c1995f294aec1ed60bc6edcb2c83b3c47d94c473ec52d367eadf441e73258bcb5e2a0ceb0e578b6c0df6069231514649 SHA512 314f05fb3211790e9c5de47f99d14bcf96788f8baf1d5258eb17d71dea05f0bde7b249a99321f472e4339c066705d9f18b529f97b1c03a72da4f21c14b91f77a
 DIST tpconfig-3.1.3.tar.gz 106789 BLAKE2B 1a02a1c91ce2174ae406888a73ad488d79e60941d0e904f47c9ff1cc82319780cf9874ede6ec4b18cc9176bcaeb465c201fca1bdf5840029565e5a3c5cac85f7 SHA512 b10b709f113dcd526c7521f519466677a1dd37b5c3bd4adf7a0fdbf95428bf56777a726b85e158c4842d406e7659f1b6e161c68bc6f6c6739d376ab84351efc9
-EBUILD tpconfig-3.1.3-r1.ebuild 616 BLAKE2B 42bcffecd879882915dc529e9e57dd5e993819efae6efdb453fec107dafb4294ab48d170b59b106c775ec04daeb5c7ae764889032313dcfa6a01449e52d1d871 SHA512 978265ea39931c1b2a93674c38ced77c68b3f4f3d3831b78c491cbe662b70ea94f0bcf6853483a0d24c4d9d37b1cdf63ebdcd942d42bab0dc79ace73c4ce7f6a
-EBUILD tpconfig-3.1.3-r2.ebuild 563 BLAKE2B 92566e73d5cebe9a02f2e4448262eafbb7713139173c0d92698155460730577eea4fc8799b064b13da1a82b99995d533a244366110f881cfbea244c3a0ec16d3 SHA512 a99a33b57c57691881ff0866e3a36856759a0edab55a19f4113b0c1a7fa71a38ae890a659de38fb72424bec17762bda6209093c3fab321fffb1669aab9f1de71
+EBUILD tpconfig-3.1.3-r1.ebuild 624 BLAKE2B 0b92b934ad41e74ec13dc4b44a1301cd1a1aca10d52ab977db49ad83bbd385dcaeaea58e686813c00a69e8d99750c22344b82df2216debe43f488cc03b2723fd SHA512 2ba37d238c27320b483a041044b552271c077376238bf61c6460fde01e887b23c21ebafc7f5a342ee383b478f526b14d008eaeecf1f58cbb5546024e29f7530c
+EBUILD tpconfig-3.1.3-r2.ebuild 571 BLAKE2B cd7065bdac05e3ea3ab75582f7815b7f2844a8e170dee34aa26b84572f536a68368b99e236bb76f1b8b66593f08bfb22636731115bfdb3edd5324e7d3624249f SHA512 00477cd9e913f37dd58a9a91e2ffd8ed8e195ee1b4afc59389ff6cf334eacb5c71f7a391d5769c7be699741e52e2c49838b042e6fa232d34b78bb62b2df8ef2b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/tpconfig/tpconfig-3.1.3-r1.ebuild b/app-misc/tpconfig/tpconfig-3.1.3-r1.ebuild
index 1b3ced07ded7..4fe0e3cb8031 100644
--- a/app-misc/tpconfig/tpconfig-3.1.3-r1.ebuild
+++ b/app-misc/tpconfig/tpconfig-3.1.3-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit toolchain-funcs
 
 DESCRIPTION="Touchpad config for ALPS and Synaptics TPs. Controls tap/click behaviour"
diff --git a/app-misc/tpconfig/tpconfig-3.1.3-r2.ebuild b/app-misc/tpconfig/tpconfig-3.1.3-r2.ebuild
index 3cbffcaf9542..334811db95d8 100644
--- a/app-misc/tpconfig/tpconfig-3.1.3-r2.ebuild
+++ b/app-misc/tpconfig/tpconfig-3.1.3-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit toolchain-funcs
 
 DESCRIPTION="Touchpad config for ALPS and Synaptics TPs. Controls tap/click behaviour"
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index 68e6948580b4..d7f2c4c19bbe 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -1,4 +1,4 @@
 AUX workrave-1.10.6-automagic-gstreamer.patch 881 BLAKE2B 9d74d1d51d1f351659b6ce237eb174b193e0dd8f4c1387cc8e5e2e787bc329c86249cd8d06e85c7a101c7edb8c51ae3e94c2dcc3ad565fb0c5699350981138f0 SHA512 87b9ee4847a8d3ed7afd479b0eb67864f328991c76c3525837e8fb31df299dfc5be43ab35c884a75a40f756d1a3b929c6a415448f88cbe726a2088e8cafeb290
 DIST workrave-1.10.20.tar.gz 6377941 BLAKE2B 00f573c05ddacd61d50d80a4079d161b18e7e52606cf502f359cf51c4b64407c978fa944e79314146baea62fe77212fa623d54706c62e23fd1ca17cbf25db409 SHA512 fc8d98aa560946f00ee30be0c28648245a425cd3fddeba8fbdd61fb89d107cc8085d5c4d8a326c739b394e6baada2b28cf98ce9ccaf85dca6bfaa1ae78d4ce56
-EBUILD workrave-1.10.20.ebuild 2789 BLAKE2B a43fd847b0075845b3cd44847e02ed02b4e069c4b3b7ddfa662963ba48848ae601fae4cb4d77bc119b1c227e58eb3daf1aebb7d4c9f29ed104621a6b772fb951 SHA512 de4678548aea26e576e2ec82e3a016209210f32897b47250e7ee411f8c32dac2803f1c1958c34501a0bb7e670d0c068f19bf3ff55ecd81ed022968ba071bd9e0
+EBUILD workrave-1.10.20.ebuild 2747 BLAKE2B cc96842b44fc276753dc4eef8ba6fc1d9cdf1e56e3c0173711eeead52b9883d6e92d4b17e8f273a9744242a0da36c47c710eca75f2dadfcfd70345118fdeb78c SHA512 d09af88807d0b98abcbba41d9943595ca947a217c3d17e106550c94e451e754c8b009dc0014a94134a607185e250879a7548fddd60aaf092ce0bd2ec98ce7202
 MISC metadata.xml 766 BLAKE2B 7fdc6a41af2c9048875b633ed213337c255b0449474d9c3052615655a904406ee35e226b652ca5519d3c12be63550da344eeabad3656604a8c5cb8df0b25fc18 SHA512 980b66185f9d02d4c0cfd2fe24700a4bb325741097ecf63e7bcd7e47c183e4693c22a6486c70dfce2b7d80837de7ab7c9c908f3be12ba5d16bba1de5d61f6858
diff --git a/app-misc/workrave/workrave-1.10.20.ebuild b/app-misc/workrave/workrave-1.10.20.ebuild
index eb0accfb92a4..84cbc53fece7 100644
--- a/app-misc/workrave/workrave-1.10.20.ebuild
+++ b/app-misc/workrave/workrave-1.10.20.ebuild
@@ -55,9 +55,7 @@ DEPEND="${RDEPEND}
 	dev-python/cheetah
 	>=dev-util/intltool-0.40.0
 	sys-devel/autoconf-archive
-	x11-proto/xproto
-	x11-proto/inputproto
-	x11-proto/recordproto
+	x11-base/xorg-proto
 	virtual/pkgconfig
 	doc? (
 		app-text/docbook-sgml-utils