gentoo resync : 18.11.2017

15 files changed, 32 insertions, 19 deletions

diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 5854cb2dd574..2e49036baa3e 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,8 +1,8 @@
-DIST debhelper_10.10.3.tar.xz 428548 SHA256 54a381b7bf70f5fa22afe33ccddb13785f26661f03b3ff8b98b7c2e50eb81902 SHA512 b1e78b4894285070f08833a84837ef1cbd8da6cfb04f43538944b9bfb7b9f56e9fe1f9f6ece42c1b4bc2abc6e421c68e42e2517f1d45f90511d213f690a6409d WHIRLPOOL d77bbafaca4b6c7d1752e174d078a03de6541536b15a9d2cf1f176f98836282b777b371c585f301b422b5b049e5615ffda0c6a0222bc2c91ca78c6a77b317481
 DIST debhelper_10.10.5.tar.xz 429752 SHA256 930cb5bd922149e797a2b90c7bec55bf8c819b275698abdf52d8290bafd801c5 SHA512 0bd4310318f85039326b516ba854193b72d850b9e11661233b401c7ba45be3137ee67d1c894b227a8432de025a62e9b176dd5dcb194c739f29007d9e73b32448 WHIRLPOOL 13de9aca3d49bcef498bf7af05dca0f0f10908249d1cbfd960e0158afa4d83072e16dd3d11b3590d12111376b6fc82963864eaba8b52460ef2f883107c285c7a
+DIST debhelper_10.10.8.tar.xz 430984 SHA256 a5437bd0629233aeb14133b387506b37c5dc4a3098cc22f8a5d519eca0fb76c1 SHA512 90f03a354647e55614b2f13b869525a4800fd347cce2ed370be9e8591219c353170d04dcf976c52d64194321410cc4fbdb042166145479ee4bae833009d44100 WHIRLPOOL 859ba205c6e6b1fd4fc7d647f5579bab3ee81d1b89d09d76f17686e2bb15f002daab0146ddf9b7bd886795ce5ef52d8ce5dee0f1e53d14a93e84615946ab04f9
 DIST debhelper_9.20160814.tar.xz 344328 SHA256 2834a7c1dbeafd9402ea68948c815dab19d903503c45fd70e676269fccd359c0 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62 WHIRLPOOL 334f0aa8075896ec13a061b9841adb5f2b7c5fa6996b507785f50389c86c48e3c89a84ff1049ae7d7cbe4876b649010f892f54f1074ecafd76061bf0588e65d6
-EBUILD debhelper-10.10.3.ebuild 1561 SHA256 a49fc3ff25cb7de20487f6c892531f5f0d74862cfdba2aad606285cc6ab711c5 SHA512 5e1efe03d1ca488f0b2948706ade5a8ac9d9e8e321fd40ecb8c92b82e95716e7c4fde7cc21b203095cf9a3640174776d785606ad8ec88e97c093700915d477bb WHIRLPOOL c15d0c43fa16e42d31a8a38272d7988f2a3e28782c5b81572dde018cabf2ba67077e1dfea861992dc20751a9576b429f1eceb9ce3d9c6d625413407d78d0ccd0
 EBUILD debhelper-10.10.5.ebuild 1561 SHA256 a49fc3ff25cb7de20487f6c892531f5f0d74862cfdba2aad606285cc6ab711c5 SHA512 5e1efe03d1ca488f0b2948706ade5a8ac9d9e8e321fd40ecb8c92b82e95716e7c4fde7cc21b203095cf9a3640174776d785606ad8ec88e97c093700915d477bb WHIRLPOOL c15d0c43fa16e42d31a8a38272d7988f2a3e28782c5b81572dde018cabf2ba67077e1dfea861992dc20751a9576b429f1eceb9ce3d9c6d625413407d78d0ccd0
+EBUILD debhelper-10.10.8.ebuild 1561 SHA256 a49fc3ff25cb7de20487f6c892531f5f0d74862cfdba2aad606285cc6ab711c5 SHA512 5e1efe03d1ca488f0b2948706ade5a8ac9d9e8e321fd40ecb8c92b82e95716e7c4fde7cc21b203095cf9a3640174776d785606ad8ec88e97c093700915d477bb WHIRLPOOL c15d0c43fa16e42d31a8a38272d7988f2a3e28782c5b81572dde018cabf2ba67077e1dfea861992dc20751a9576b429f1eceb9ce3d9c6d625413407d78d0ccd0
 EBUILD debhelper-9.20160814.ebuild 1552 SHA256 f5c72e8da17e980a58499ee9012a0ee5d4fe6d0f86eae76bf2cfea3a8872d32e SHA512 101be0361c520416b32d1584498834583c0ad161f10e472ba82743e5b4322e0f8caf737d6796eac6716225d4e2841127f1d3f869d635fdd1e891b77520dc0db2 WHIRLPOOL b1202695449e78a51dc83f0fa96f308faf17326b31a90f8f89c3625aa658e115258b8eb3403552ce57e544ad05069ef89ff0d62354c0d424bfcf26f794a9f3ae
 MISC ChangeLog 7636 SHA256 fa311f8535f6aff2ced962b7bc47e2e87f3d78b1d5077a4024793714d8388dc2 SHA512 58765119b2e1ab49da678f4cc3b3c400adb6722bcdd80db57434e1a36b533dca6efa0b68bc167be14939fc08d23f32c50583c0d07255432abc964d976d2d823c WHIRLPOOL daa41e2c4ddbfa908603ea6dcdd7fc87dd6fdda72c179962d16e18547c703f37288eeba6c78c58b0fb53385e3c5c45a455f6c66a7f9c696d9b65618869d40374
 MISC ChangeLog-2015 18510 SHA256 7f92f884e9115b587c3a5838b527e388ac5198ab4579f59be668f928e15d33ab SHA512 21463637e19558c87c1eaf0b3b7e86c6c5c337b6f7c9c432ccbbe5be8427727ce317dcd239df3e99043c093256d35232718b9628553cdcf786e1db72ffd102b1 WHIRLPOOL 7af51dc5bea277f47477f30582e0f78894f37d282e1bf1d72a63961e753f2aa54ac7a5d07f35f2f1d801e5a27f74b452aae9d18c88b2ed3257f066a995c88714
diff --git a/dev-util/debhelper/debhelper-10.10.3.ebuild b/dev-util/debhelper/debhelper-10.10.8.ebuild
index c4f2a7b166cc..c4f2a7b166cc 100644
--- a/dev-util/debhelper/debhelper-10.10.3.ebuild
+++ b/dev-util/debhelper/debhelper-10.10.8.ebuild
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index a26412cd9e07..0184e25396de 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,6 +1,6 @@
 DIST gtk-update-icon-cache-3.22.19.tar.xz 367224 SHA256 1e2b2e8f73ceac4816df2108a4a38a5ec1a3fd6beab95c67ea4750619e186d82 SHA512 3ca12d38781a716c1b3f8584089e2c038aa18584c5e1b4c41098173f73f839cabdbb0e8b25b1c69a8b9b9f016b9c3c8594c4b26c2463cea278754f13afb7c795 WHIRLPOOL 55f92eb65d50292027419292b4d611b72fa5d17631f7fa79b8bcfc6649e0167891bd3b5f612899872db38ca2bfc94e1dfb6dd2038c3e204b8f3e6cafa28583ba
 DIST gtk-update-icon-cache-3.22.2.tar.xz 366364 SHA256 6ad38b0fbd84b5a262dbc8dd3102415f8e2b81d5a05a27c0b1e4b28423bc9dd0 SHA512 a9e7f6c865c0648186954bb75f8032666ef8920513f24ecf5a05388f3b739b4418d4513c7eb81fce91ba4eb7efd6d37ade91950bb40c52f50a5b57c0632be959 WHIRLPOOL 904fef0db243ad6368eeda0207b8e0ca2d3219986191b9fab799c4b7cdd5b1606fcb4241e6a16f07b3ac265163899b4afe1d528b3c60b856eaf71d2a767bd80b
-EBUILD gtk-update-icon-cache-3.22.19.ebuild 973 SHA256 704a5381320724d938b109a7818cf587339f5585895dc7aa391bae0114f4a01f SHA512 641bc0a216a58e40568a0826cadabc82b58e0d353b61d068ae324e5e771c82686a74b65b975d4510d755afdca03a8f20ae18d4d20beb4f6bc99be109a8b43a57 WHIRLPOOL c34b44d542dca95912456ddc474a8b6ce9e289edda4c0df5489b155c6be4d8db9c46ac73903808edddefa51984d4fb39725b26a6f9c2ebc9eaf5c56075adc9bc
+EBUILD gtk-update-icon-cache-3.22.19.ebuild 971 SHA256 bf0c336819811791fd411a3c309df9789d0df531e87faa1c69395074a19b0140 SHA512 bf43ae5ea0ecff58da78dec63c1dfff28e6b6d0d400becdefcb12bb4d7b8711478b176ddbb4972a93cb808c9f61576a67505f7211d892204a7f0d7934e1c8b62 WHIRLPOOL 94a10758838c3a0492550e400f6b75b72d80334d971ebbc82011dd48210a72f47689293c89407c9fdfa746299f097795edd5549d5104220874c93ca00f3e8cf8
 EBUILD gtk-update-icon-cache-3.22.2.ebuild 966 SHA256 3ca3e273c3e3a082aa74b4ef10ef79c804d73bbc2f0a7adc4f8c46f7624d8533 SHA512 f08a2be5aeb4f835c9ba482b0af79717d5d0c505d4782fdfe461b82237e67a52958e68b10936cc70f6cec18982b0386f64c37e91610c611bec9424baf81feab1 WHIRLPOOL 360815d3232a83c5b14cbbfa02d15f1a0dada3c619d0ccb9d66ce911863dc3487746846d4164fd8f1fae6f7c0b08267f149e62d6099dad35adf7ae5bc6874e43
 MISC ChangeLog 10154 SHA256 04f9ee9f6925c9dd36d97aebaee6db510a06dd77b7f8e13c50ff6a0b4dd50122 SHA512 5edb1c6439075bf9dd3e8261bef1291537294153315d826fdf9b3aaf30ab50e54924a1f61a0baa5ce6bbde3bf29571c04979481f95ad179b21309b51091d29d2 WHIRLPOOL 0d807741c25df62c0068c0d718ba9aa72d312f2b3d98303598a23a5603642eba2bbe8126071c98356e594ba3fd7ca6844516c37fbedfb2d0d2097d8600dc404a
 MISC ChangeLog-2015 2331 SHA256 b1af82791f72dee2e76b01d97a994886580332d25a418a41e1336544c40c7abd SHA512 1d3c0131d48409779049d5165ab80360ebff1e00bdb2be5f7f8ab4674c86d95080a2e952aacc4fe3d06a535678bdbca13e344b67bfe13f33169495d0a9294a01 WHIRLPOOL a54bac987f3f528651edaaf55c731c348f0564ad27612e48909e6946986096c302700a78aa2a36678dfa7192a795c6a716fe8cb6f0bace551ebaede5d4a8b628
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild
index 6e3d2ef65b1e..22d0617f1a2b 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index b828b90cec86..00191e1be804 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -7,6 +7,6 @@ DIST llvm-5.0.0.src.tar.xz 23411980 SHA256 e35dcbae6084adcf4abb32514127c5eabd7d6
 EBUILD lldb-4.0.1.ebuild 3061 SHA256 2b5344d52b42017c07f98399302b4f9cb0283737baa273e905e0c980976c051c SHA512 d88dc965435cddf490e5fb7ba36ecb43cdc3c4ecf5865d531f3141f40226bba0cc63ff604d62e8e1d436da2c48c4f5a435e0561f265b0e2961423770e9edc43a WHIRLPOOL 8b71979e005adbdd507c4adef7f5fab0555a3726178c7197dd635bc265b29f011c50eb03edae04a04f7387aa62bc317a6975cde5baeb42aa79e07e88e38c3f65
 EBUILD lldb-5.0.0.ebuild 2811 SHA256 84ebaf8be3ca7cfb2538ea2aa360d099c6dd665a43fe2bee3d193c0070abb253 SHA512 e4b38ef25db0a8b764bc7b1540190024557ddafcae6613d3c55fb98b67ca72a922b5224b8f65144050cc3055418bbde6769ae30bd90cb5d30083c018e1fee8f4 WHIRLPOOL 3f70c4841d689de7861a6eae5a4b01b999e9a67311741f989462334805d8991110539f4d39a4988a5d6b8008f77e92d60b7200e372aa80df096f0221f995a117
 EBUILD lldb-5.0.9999.ebuild 2979 SHA256 65d38020b4bdc857d948160870a708d8a052c0d9c236765f6e6d7b6fc28e104b SHA512 46a0d9d7cc2d495037134f0ba7fd3538c974d9d1ba01290f893d2dddec4ab92905fb05c070a9b475f0a6d28c8fb132172784918ff03eccc0b2472573df05fbcd WHIRLPOOL c0948a0c48049a4e8e68305bcd13e650df058291e3bfd62f643f2401a2425bb98a9263a8f76c0012dc23b13255c8f3359ee78d484936c675401abc9d37cb72dc
-EBUILD lldb-9999.ebuild 2960 SHA256 a93f53f6edef42d3e11e40fba7633116c99a0566030e4d25c0c2ecf31b89a2ff SHA512 9b0d27b2508d5814ac7643bf17bccba07ce3fbdddf1708e96971116b2640d6fe84642ff6356acb5f1245cbb614e93ab888c106dc063efc42a3eb87ce5d98ed9a WHIRLPOOL dc1fa2b7ef45c0fb8e7234a7c2edba0091c882ded2783d5da8abbe0a7512e3149e6b9cf489ffb172e23286df92c1ab4fb8f71b215ffeab57166b960bba508796
+EBUILD lldb-9999.ebuild 2996 SHA256 a6403f0f91f0aee6eb0dc9632c433c6d1fb1ce383c1243757e0b6464a742f03e SHA512 b4a20858c088c351ec69bb7989c8cddb98b6fe9eec55ef36163790771bdcd7dd51dcce44d1866ead97c74e187b86e4761e47a7ae9d962fa3e2149fb4943811d1 WHIRLPOOL aaf9b0d08b1b0cb9cbf908e3c2e2ca026481206e43c01672eb3a065cf8f74e42d2d551d2968260034d816e99d589c3fb6d96299cab8deffcf7bc41e058dae960
 MISC ChangeLog 896 SHA256 45fa8891008f733b1dc64963fcc074d79d910d3fa0247a5363c27a5629c28657 SHA512 0b80df074c10b4b65da01b02444386ebdd8f495605de7adc0ef57e8c40eb8c59b888d3d3b85bbc49d351715062b04e1d55ee304b3572592fef62c262546ed092 WHIRLPOOL 6c45ed0905574bb8ad09f56c073d35c1909f542704f6fced3a068e25e7ca00316d4659d5ed36d6a84b812a2a249c7cb9b5ff4764cc10eb9581690406dab761d5
 MISC metadata.xml 216 SHA256 e94ba81dd2791908508a3993afdebf723cc617314c53c273b9bcca15a9c48327 SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5 WHIRLPOOL 29145f5721e079e0548c5ef22424c65e6a5b2bfc4428918e923fcfdfc37e9b8749fb63e3c2eb5773c17fab276f7513dd66e326b906f1848911dceba7ae4b419a
diff --git a/dev-util/lldb/lldb-9999.ebuild b/dev-util/lldb/lldb-9999.ebuild
index 8dd6d2049e91..143975f66c9a 100644
--- a/dev-util/lldb/lldb-9999.ebuild
+++ b/dev-util/lldb/lldb-9999.ebuild
@@ -68,6 +68,7 @@ src_configure() {
 		-DLLDB_DISABLE_PYTHON=$(usex !python)
 		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
 
+		-DLLDB_INCLUDE_TESTS=$(usex test)
 		-DLLVM_BUILD_TESTS=$(usex test)
 		# compilers for lit tests
 		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
diff --git a/dev-util/ragel/Manifest b/dev-util/ragel/Manifest
index 614f33019557..725bd930e231 100644
--- a/dev-util/ragel/Manifest
+++ b/dev-util/ragel/Manifest
@@ -6,7 +6,7 @@ DIST ragel-6.8.tar.gz 1211146 SHA256 dd7f7d22f3a58147379bda61334d341c2caa0caf9f7
 DIST ragel-6.9.tar.gz 1226871 SHA256 6e07be0fab5ca1d9c2d9e177718a018fc666141f594a5d6e7025658620cf660a SHA512 46886a37fa0b785574c03ba6581d99bbeaa11ca65cf4fdc37ceef42f4869bd695694cd69b4b974a25cf539f004cb106e3debda17fc26e1a9a6a4295992733dbd WHIRLPOOL c802e3020842b28ecfe604ca13c8f205ed98fb4c180c65a88be9001e7b73dc4facc6a716f55623da4f9c7cdc43c79d958c4c26fa89622bdabf9b3989e0c9682e
 DIST ragel-7.0.0.10.tar.gz 779503 SHA256 40562bcac66a22dbea8357a35745bbcb1ab596c262d8691145ee11aafa6f8dec SHA512 2d1d4c469d8581239ec21f128e94ab452b398903302f82ef59ce03d6fb89bc89de6441dbe53ea99d7689866f7aec485ab1ec9c537908f21eb1394650b55413ba WHIRLPOOL d99108785163de286d426d805409a23c6ac7d82ea2887e6900ab184758bad3945ccdc1a692c3577ccb084c492c2fe7e8052e45ecc622fe754f08dc8da9f85fc2
 DIST ragel-7.0.0.9.tar.gz 850078 SHA256 b9e6cac5d388398ac05d8ef15a07628f5e6de292e39f5ad92b8176379e8352f0 SHA512 87de7d41af4a08f09d422a0e58820f9b5b1218acc4733c58690feea4f872790813b5f2d7505ce147a2a6e1bcd341926c35fed7c6b55f543bdf864b119868bcde WHIRLPOOL 0ae6c3d589caf967c30d9ccc30a6801cdf55032aa7f2939dc101e6ca3ef5b3e15df4a311164128bca63f9d2e3500d601739b9296a276de3b3b58755e5db0d646
-EBUILD ragel-6.10.ebuild 959 SHA256 08f6d29b736375d9fa61bee840913411848cc3707543e60308fbbfe94c70eb0d SHA512 388f63f4bd193a74c33ff2124a590b86fd62c9653c3905923b56a1a514a42dc47d8d7cfa272edc60502975e5da867cef4644dd5a112e110a68fbcaf452abc8fa WHIRLPOOL 79f7d41da15118fe75b8379141e44a66904d267de392ba94571d200ac2b16aafee87f0718039dda6c466b12a9858ef65af4ebdb974467f0c128c85c39ffac68f
+EBUILD ragel-6.10.ebuild 958 SHA256 8b45425e61cde1e0bbf1ec1355283cbc1761335a16d012ed54bf2bace5af6aee SHA512 87ff03ccebba39317af5320658412ddca8486678b673e5a0541490240da799fc67ceabe533b61f7ee8dfe09f5aa07e5afee81f8f6e9cbd411872b5aef597271b WHIRLPOOL ad90dde591b1336ee5200d590de36bad2ff37066ec6bde1477ba78342ae528077cffbf6014e882ceea95403c59e9830e395548beaea86a6c474d2550f2f40a05
 EBUILD ragel-6.7-r1.ebuild 1152 SHA256 e99b2083ae13a8d1a7d784b5a9cb4a6e02fa4d91a35dd5184c31d190813acc9e SHA512 46bee68ca0e22ef5f64a827af52f3dc14374920a31e2817a4430726bb2278447b0515acf1e0b77d58e3a6330e580f71c735e2170e4503734dd31186c10907822 WHIRLPOOL 92150dac5227a015f614531a3670e713167233b27067644ad98788d5d8e0fd49ae44a5ed05edfeda66f5ea0ff76f1befd3ab47903e4ca351839d3b894cd5ff31
 EBUILD ragel-6.8.ebuild 1094 SHA256 507b280002f2df0a5a5cde11713ebce68d9d2f07a9936c39efe5e9ed475e6db3 SHA512 f290a2edb43b60b52a563927343cb5f3672dcac30a598b6e95afe66858cfb33f0af5bc1d960e9b8efc05e9eea9a369045fe8dc7dc77abd596813d80f324d03ce WHIRLPOOL 77384425e2ecfbfc453a876e43387533ff7c97773bf42f6348f83f3745d7751a177f38c172ef574ec81195f4d0b1bdf7b876f7341dfc1ba4d2684df900cdfaca
 EBUILD ragel-6.9.ebuild 966 SHA256 d96f2cfa1bf988e10b3ff77cb4dfaba1dfc93d59d9351e33d8d859c7d0bd5f95 SHA512 14f09d54403f9eb38ad6a6b2640940475514a819f134102920c57700327886094aa94c723e829076540e9cef02b763c6e2204bc665f9ab80aa60f5d47ccff41a WHIRLPOOL 6ff83b36c3401f88b9d6be1a27f78bae62bf35cbe8306edde993297cd5d550bfebd90688a330087998cc8fa6ee7af059b01748a4a85cae3f626aa450b7e0d90b
diff --git a/dev-util/ragel/ragel-6.10.ebuild b/dev-util/ragel/ragel-6.10.ebuild
index 0072ba228931..4e772afd82f9 100644
--- a/dev-util/ragel/ragel-6.10.ebuild
+++ b/dev-util/ragel/ragel-6.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.colm.net/files/ragel/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="vim-syntax"
 
 DEPEND=""
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index ffde98a5c080..7a170c69cdc1 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -3,12 +3,12 @@ DIST strace-4.16.tar.xz 966668 SHA256 98487cb5178ec1259986cc9f6e2a844f50e5d1208c
 DIST strace-4.17.tar.xz 1001808 SHA256 81f35b085fbb3cfa806eb521a8522ac3406deaccfe121ce35064bad268237419 SHA512 dab376d9c5ac7db98e864f3cfb165eeec714e3ea492f32ee873cebe01fbd3a0793db09983af1da6530480666a59973ccd9855d348e754be1eead9c0a5d524029 WHIRLPOOL 5d1aaa0405288695d73523eb0171e9c56e966db44a58dbd7ae6aed16af66a151be5ad58fb716ce2305ea9435e29dc36bd3be5ade73e09fef69fcbcf32599a036
 DIST strace-4.18.tar.xz 1040676 SHA256 89ad887c1e6226bdbca8da31d589cadea4be0744b142eb47b768086c937fca08 SHA512 4fcabc11ef8055c09a5a4777e66f006dd9d67d74740dc0d6e31eb16fa8496062b848c1f21adeeeba7895f57af851103a384c19000ac15cd2f5521e78a5e7a8ad WHIRLPOOL 740d8a19ed3cc0822ec3bbdae72dd3cbe892f78a9161ee824735599ac316788a3fa8c54a18ba32b79c6225930e57f9a74f00fd8e11a1b96514bce9b40d124edc
 DIST strace-4.19.tar.xz 1113124 SHA256 7c93ebc6c29280f47c24a0eb86873a99ccb2cac6512c60a60ba4ef99ab807281 SHA512 91d57f58ac0e70ff4dcd69fda3cb835de7f40a9152817427e9c264773f99015badbad7bab047ce7f69001b689b1ce54af9522a9738060823de8873bee1e0c629 WHIRLPOOL 426bca505798a70f623f263de2fe3b02ee603ae513523d3b3fe781780ffc31a0a365214f76c1afdcdb32ec72a37178dd342f594fafe596a3c64d3b99ba38f2fb
-EBUILD strace-4.13.ebuild 1801 SHA256 14172303370e5e18803a54a99f2191e588a7574d82aa8e8a8ea07a25e4dbad3f SHA512 5bcb19d5ebd468ea79087df89f3ff0b8755932aeb1bbc447b1e52fbfc29897cfff520b3baf4f8534a248488dc9cd19a5a694b9d1a471d8598931e1941c97b2e7 WHIRLPOOL 2f20be7255740520d80b3b83cb5e02ed6e4544f10c580e8879aae4754b82de6a31d7906f4656473afc0da388fb535ae5c136d2a5689bc9ff13489072f7bcb56c
-EBUILD strace-4.16.ebuild 1805 SHA256 7f465571feb8b49810ef962bae4ebc34a6651bae36ce2f8a0566d4e12cf6d0b1 SHA512 f83b6233e57cfae2fbdfb3c09a973f70d2bd12c505bd8b754f34524a7967f72b82b395f0daa938bba1a2a816fcfdc14ffa6a8388d67271e7d13456fcbf3490e0 WHIRLPOOL a97f00564a365f335f7a2fb0572a2da9ecadbfb3918215b9f2b11aeda8691a0f6a2a65c6bade3f2fb46d92b457991caaff80d1609c481d5e476192e2063f2cd1
-EBUILD strace-4.17.ebuild 1814 SHA256 ad5a4bdbc5770e4d372f3d1086b723f8b6d395f15c5be333e8437cd743afc882 SHA512 6aadd722d04b46a84dd535688c6cd7c7ca64860cfe7f5aa90b636ceb953f7f603894b546e4ab94558607c7e6781817ffe41695b7e1e0000f0bdc7e5d0a07e47e WHIRLPOOL 18bf7ca566489826261da5bcec13dd5a8802bb626ff2cbd01a329d0f0ce0c10ac9c76e6007ac908d9e5de28102c64f1cfb49ad08fb97cf7f530cb48e41d3f603
-EBUILD strace-4.18.ebuild 1818 SHA256 1715bfb7932b81e56ad4459e8a041afc8a8530e3ba80046c62c543e3f57cb485 SHA512 b33cbc9ae5ce9bddd739dee78b9f81b8a0ec2481074a33a1f341f33362a52625768d3db1649c61449c9089e1457697614d906b04fe660354c6d74118aa071121 WHIRLPOOL 3893f1e234ee861fcfcb6869b524c2a5d78a050cbb0c8588fc374e084b6e195cb5903e6dacce3c263b0f7925749018c8a95069cd303e5efda86629ab9274cca9
-EBUILD strace-4.19.ebuild 1818 SHA256 1715bfb7932b81e56ad4459e8a041afc8a8530e3ba80046c62c543e3f57cb485 SHA512 b33cbc9ae5ce9bddd739dee78b9f81b8a0ec2481074a33a1f341f33362a52625768d3db1649c61449c9089e1457697614d906b04fe660354c6d74118aa071121 WHIRLPOOL 3893f1e234ee861fcfcb6869b524c2a5d78a050cbb0c8588fc374e084b6e195cb5903e6dacce3c263b0f7925749018c8a95069cd303e5efda86629ab9274cca9
-EBUILD strace-9999.ebuild 1818 SHA256 1715bfb7932b81e56ad4459e8a041afc8a8530e3ba80046c62c543e3f57cb485 SHA512 b33cbc9ae5ce9bddd739dee78b9f81b8a0ec2481074a33a1f341f33362a52625768d3db1649c61449c9089e1457697614d906b04fe660354c6d74118aa071121 WHIRLPOOL 3893f1e234ee861fcfcb6869b524c2a5d78a050cbb0c8588fc374e084b6e195cb5903e6dacce3c263b0f7925749018c8a95069cd303e5efda86629ab9274cca9
+EBUILD strace-4.13.ebuild 1800 SHA256 e8fe3974786f448e785e96e05a4390a2c6d35e1bd51b8d5253b87badd1d3d935 SHA512 2aa3389c2d06aa98a3a2b5702cad42fcba83d7e0a0d7a7cea94d79d8e7e029fbe020425e10e8a03509e7458d84ae0c47036532cf12d133f53cb9692a624feaca WHIRLPOOL ffacf9c81b8e56ea572d09afb394828aa1a9ed454129a8272f1dba4cc45ee020a01886d89351b6f335339d0c3dcd4a1aec120d8581a3d71935bc18e1b16f6e28
+EBUILD strace-4.16.ebuild 1804 SHA256 a329d855bf9f805b1a687acecb0d64dbaf58f646de6fbdf465dcb1f8c942c28f SHA512 cfd07c1a3cc8794c4eb518b41ee9ba256e5019b68c0b8cae5dbf3c395731b918114da43289bd5c29ff0d06b2f169d23fbe76fcef2f5364a6dd72942f24ebbcaf WHIRLPOOL 9f3542c671bc334123382b9f678165403a2cb29899c38dac1c020036c021ff074d87d1fb39335d8fb5dd80c5a9437a32adc45a06ec50d9848f313800533bf1cc
+EBUILD strace-4.17.ebuild 1813 SHA256 3672eda237edd674c0352f4106e49b5369f06e5747f2c2b9a8a9e8133822a91f SHA512 41dee05059e875a00e44acdd89f2851a8d409f84ffe260f0124bd5cec3dfb38f562a043b4804a8840f2d4cd7cc2fb9465078f8f7135c5477e2b51c989f21bfdb WHIRLPOOL 14a285c45f9c9513c89355f888c802369d85d57936141467e30cd6fdaa119ea341cade0f93e3b1dff2b0e10de699e83a6dfb36523492c77dcfb47e9ff85621d3
+EBUILD strace-4.18.ebuild 1817 SHA256 5d55f9d85ea9525139e03028ea5cc6ae49a05f6549d57e9629f1ee12c46caf53 SHA512 93dbae7968097b2283344eac1fa152d3d279d358f025b647c49c250e045a46fd85243a79463a619d80a0748bbee67f8051dc8b640f0f187567d24f8609a6e24e WHIRLPOOL 6fd3025cbf06f447893f20bf084e814df176794fe003064fa14092d92c97f2e4b9166b611aef6f8a3984c4f2c1ef114fdd7b01d71e2dfd0ad37f27417c3e3108
+EBUILD strace-4.19.ebuild 1817 SHA256 5d55f9d85ea9525139e03028ea5cc6ae49a05f6549d57e9629f1ee12c46caf53 SHA512 93dbae7968097b2283344eac1fa152d3d279d358f025b647c49c250e045a46fd85243a79463a619d80a0748bbee67f8051dc8b640f0f187567d24f8609a6e24e WHIRLPOOL 6fd3025cbf06f447893f20bf084e814df176794fe003064fa14092d92c97f2e4b9166b611aef6f8a3984c4f2c1ef114fdd7b01d71e2dfd0ad37f27417c3e3108
+EBUILD strace-9999.ebuild 1817 SHA256 5d55f9d85ea9525139e03028ea5cc6ae49a05f6549d57e9629f1ee12c46caf53 SHA512 93dbae7968097b2283344eac1fa152d3d279d358f025b647c49c250e045a46fd85243a79463a619d80a0748bbee67f8051dc8b640f0f187567d24f8609a6e24e WHIRLPOOL 6fd3025cbf06f447893f20bf084e814df176794fe003064fa14092d92c97f2e4b9166b611aef6f8a3984c4f2c1ef114fdd7b01d71e2dfd0ad37f27417c3e3108
 MISC ChangeLog 6475 SHA256 cb6f88a0781d3ae1ad956eea89528142607b55ffac120fc6ce3cda8ba73f715f SHA512 bb2e8128d7522634f95dcc3af8d3902c904ba2c666ae89106f9673f844880b1dddda45564251e711899f72a81c73dbfaf8b0088d1567d2db9dcbdd29e7cf36f8 WHIRLPOOL ad4ccff60ab2379c2bbb5f29e43f800f03d0d0b060f8f4a4d969a62b48c487b0681f7f04accaba2c766728224e20a5b830d49b1340fbf98c280cf7162ae9a519
 MISC ChangeLog-2015 25514 SHA256 89a5d54c7b85ba428f52c74535710e834504ff846ba4491e2ec8fb9c23523e1b SHA512 fc6c2a4a4c0e9acf27604cdef5383a5789e5e0ee633b301706a7d4e44556a7608fbda5e23c6a59c403d2fad7693f55a90aad4d3b5265a713134e33a514b3970c WHIRLPOOL ef1ffe8a0dedc7a533a32d4c73802ea0f86d88c6076acd0a3b598fa97e4d49b440335d610231b148cd01dac0b2610c70d6741e681685543ae34d1d8e0def26d5
 MISC metadata.xml 593 SHA256 e109b90d149d7f0a92316f83f9695c40f2d702625c274b3a9c48bfab2b38dd53 SHA512 67300cfcaba830a47e49cd327bf2d8490b084b016a321fd6e19e52d8dc28968395b3ffc114675a7d4dc723a9ddd7b57c3ede10207a226d60a2225f88aceb59e4 WHIRLPOOL 1af581a8525b849b93b4e2f1c7106fb4805c61818d374e451b5cdf88d7e0d87a41e5175d08e789daab6daf4832ed4b055e9b7de4ad7516220c9da0c203bdc910
diff --git a/dev-util/strace/strace-4.13.ebuild b/dev-util/strace/strace-4.13.ebuild
index 8cc44de60594..5b110f03e767 100644
--- a/dev-util/strace/strace-4.13.ebuild
+++ b/dev-util/strace/strace-4.13.ebuild
@@ -30,7 +30,9 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	perl? ( dev-lang/perl )"
 
 src_prepare() {
-	if epatch_user || [[ ! -e configure ]] ; then
+	epatch_user
+
+	if [[ ! -e configure ]] ; then
 		# git generation
 		./xlat/gen.sh || die
 		./generate_mpers_am.sh || die
diff --git a/dev-util/strace/strace-4.16.ebuild b/dev-util/strace/strace-4.16.ebuild
index 29011899d9d0..ad9e35e242c1 100644
--- a/dev-util/strace/strace-4.16.ebuild
+++ b/dev-util/strace/strace-4.16.ebuild
@@ -30,7 +30,9 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	perl? ( dev-lang/perl )"
 
 src_prepare() {
-	if epatch_user || [[ ! -e configure ]] ; then
+	epatch_user
+
+	if [[ ! -e configure ]] ; then
 		# git generation
 		./xlat/gen.sh || die
 		./generate_mpers_am.sh || die
diff --git a/dev-util/strace/strace-4.17.ebuild b/dev-util/strace/strace-4.17.ebuild
index 9ec77eb9b806..e7f4e44ab5b5 100644
--- a/dev-util/strace/strace-4.17.ebuild
+++ b/dev-util/strace/strace-4.17.ebuild
@@ -30,7 +30,9 @@ RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	perl? ( dev-lang/perl )"
 
 src_prepare() {
-	if epatch_user || [[ ! -e configure ]] ; then
+	epatch_user
+
+	if [[ ! -e configure ]] ; then
 		# git generation
 		./xlat/gen.sh || die
 		./generate_mpers_am.sh || die
diff --git a/dev-util/strace/strace-4.18.ebuild b/dev-util/strace/strace-4.18.ebuild
index 5d4fba688f4b..24bc92be859d 100644
--- a/dev-util/strace/strace-4.18.ebuild
+++ b/dev-util/strace/strace-4.18.ebuild
@@ -34,7 +34,9 @@ RDEPEND="
 "
 
 src_prepare() {
-	if epatch_user || [[ ! -e configure ]] ; then
+	epatch_user
+
+	if [[ ! -e configure ]] ; then
 		# git generation
 		./xlat/gen.sh || die
 		./generate_mpers_am.sh || die
diff --git a/dev-util/strace/strace-4.19.ebuild b/dev-util/strace/strace-4.19.ebuild
index 5d4fba688f4b..24bc92be859d 100644
--- a/dev-util/strace/strace-4.19.ebuild
+++ b/dev-util/strace/strace-4.19.ebuild
@@ -34,7 +34,9 @@ RDEPEND="
 "
 
 src_prepare() {
-	if epatch_user || [[ ! -e configure ]] ; then
+	epatch_user
+
+	if [[ ! -e configure ]] ; then
 		# git generation
 		./xlat/gen.sh || die
 		./generate_mpers_am.sh || die
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index 5d4fba688f4b..24bc92be859d 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -34,7 +34,9 @@ RDEPEND="
 "
 
 src_prepare() {
-	if epatch_user || [[ ! -e configure ]] ; then
+	epatch_user
+
+	if [[ ! -e configure ]] ; then
 		# git generation
 		./xlat/gen.sh || die
 		./generate_mpers_am.sh || die