gentoo resync : 08.01.2018

39 files changed, 136 insertions, 136 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 9214631dd9b5..5ea3699813de 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 02a353a02f1a..6ab40672e839 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -2,6 +2,6 @@ DIST cucumber-core-1.5.0.gem 45056 BLAKE2B 39c56fd48386556f36921694940d8d8be7e23
 DIST cucumber-core-3.0.0.gem 52736 BLAKE2B 8c46b6209ffcea6c4840c038f956c90b0cbf4ab6e227ff0d0bcd92202f4bc233c9815bd270baf8d01a9cf15ef32cda2ca9fed172571fa2d8fc00ac024667a725 SHA512 2991bc8e2f3f5042b10cd430273dd1fd4c851ee444defbdfdf16ba920f93c6523e1b503c562438691947a969c95c8f65416a69c4fdf1fe876ad0c274982b9e75
 DIST cucumber-core-3.1.0.tar.gz 49335 BLAKE2B 92b82661a6fb49ebff987fc5c729fee894509667d2a9600dcafa305235097249381b51ba4549f6c465dd7d8733e125d891d7c04e204fd683f68f08792e862a8a SHA512 c50186288bc855e30611dd25956f343bb97c7fc75e0f3341917e5816db2dcb7ea76a189fda7399c1304db7a643d8c10b7a76e3bf98a775e1ef2356a389e3eb7d
 EBUILD cucumber-core-1.5.0.ebuild 724 BLAKE2B 41c92e5eabe95f7589d6c30e6b0fd2f748ddee17347d566b15bb05fb81e2cb6c463a9956bd03e0ac53794c13679e1df84ce1319ae9ada2f8c24a30e7c3f4bee7 SHA512 28435ec6302a732d8a615e9ae7d24038b223313737421863ee35019b2dd6859971586cdac40011651021d39616dea82922a3e02fe972586fac1f10ece77fb0c2
-EBUILD cucumber-core-3.0.0.ebuild 779 BLAKE2B 15fa9d7591182c420bcb4be5234531849646fcb86cb04385a647f2501ffa1ac17203e9ac63ad26076a6eaeb44b77eb5eaa3ca9f7d7a441a06a791c1cb6218df2 SHA512 8de0205309a0aeb31c206458ae7dc161622c313eb5e8993417e552bc0ef16934769a9769b434c16ee3cad0571707fbed0a9355d897fdf0f4e55694f6ce16fc3e
+EBUILD cucumber-core-3.0.0.ebuild 784 BLAKE2B 9cb5d3018b0e754c598fee15f1d4625a4f2fcb99d54c6f8c38af4aecec90e22ac7adb951168fe9d12f1ab8526c1702c29d06cb6b27e2c577198aa57376d1a623 SHA512 079de5e195c9c5359142f7d5edebb826a0ae104b56843ac4e73815bec64ec363b8ead63f81e6c0242986a2851e7754827c70d3f7fb726db792de31d1a8be124c
 EBUILD cucumber-core-3.1.0.ebuild 900 BLAKE2B e03b278e6a39d3c188123ef3c1a67d681581355b75ed6bceaba5de4c7c3687b985e3d3836f8ab85ceebb0613524e43297c36db98828e736ddc88bf5b3b276c8c SHA512 021ad5f6294383d136abaef2f25bb534474da77251d874da7b52a6abd44d5a6f4585ced131401d089fbe4b1ef811d206dd68d85d5a0f39639a2dadd9559f4ea5
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-3.0.0.ebuild b/dev-util/cucumber-core/cucumber-core-3.0.0.ebuild
index b6c827cd9391..fcd8b141a2ea 100644
--- a/dev-util/cucumber-core/cucumber-core-3.0.0.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-3.0.0.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
@@ -14,7 +14,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc"
 SLOT="3.0"
 IUSE="test"
 
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
index c2dffd958d21..ea9366d2c890 100644
--- a/dev-util/cucumber-expressions/Manifest
+++ b/dev-util/cucumber-expressions/Manifest
@@ -2,6 +2,6 @@ DIST cucumber-expressions-4.0.3.gem 16384 BLAKE2B cc33d2885138acd8170a1042a8839a
 DIST cucumber-expressions-4.0.4.gem 16896 BLAKE2B 5e888f63d4c976db4b10bd99b8f8f4122364fb32c106f6485b3b75e3ade15fd573260cc37aaf4abc3754bdf3ad62ac37b4d78a4abc63099a841e256e12425bd3 SHA512 9a52b866545154c9e7d4e8f08cbbf6b2d0dcee28c24486eb95ad4717a757a25ae8ac844702dd2e0c892fa0406f686d3b4eb024c90fc6e7b90be7a6edd7e2dadc
 DIST cucumber-expressions-5.0.7.gem 17408 BLAKE2B 1f958063f276154bd75485e1f2b9beabfc41d26e4029ca7a7e89d6f6d81dc25bbd69626920dfbf1a9323f65b6eea105dab328f06daf15c290a11ea0c86dc69e4 SHA512 af83d028df20ac608ce3fd85850da451f1ec76de688f1d0bc71c1e6a0e70cdbb15f4df6710cccf6b736426f9a547b5a5ae0bb860cd626291237c2bc11371a24f
 EBUILD cucumber-expressions-4.0.3.ebuild 445 BLAKE2B 22cd3fa4e6bbea2ee9dd3209ad4534e225fd0a5389af45f629a96b8e26f764cb08ba41f0305b38a187d3f7fb69da787d9df1a9fde5c46065bb105aac4571447f SHA512 a2796fe49198e5289542ec38b5705fc19b7c6ea527d6536e47d9e7581bb1fd9c326c07defd965cd21abf8b6a0d7b7bc07fb247ca81ac04993c6c1825f1784bf1
-EBUILD cucumber-expressions-4.0.4.ebuild 463 BLAKE2B a6ad44272f514098b61f365722b3257fa4e89cce26fc92e29f5ca68ea912898fe9787b77ebeb6d2935723c884795db7f2dcb218f84ac4df66315060fec78ec5e SHA512 7751c1ad27fdb52ef596c0340f6676b5c862d083f06847658a2e2180b9abd1db56421da140d502cb3c463851ca850835b40ccdd4014197c8fb0e1638e92946b5
+EBUILD cucumber-expressions-4.0.4.ebuild 468 BLAKE2B 83819d3b16012d34b821eafcc30be205c6659ab9ad2833d4420b4d841c8c94c370d0d7925fd01d7f77819f1aeacc4d9ab09de2c64ca242bc11017315a9eecc9b SHA512 52d15c5e95530415e1e1de92a1f9c86cd776538581241aeca9bac696ff232ab9d838e45c89abcf4808a0e10816af6ac47e86d6e6468097529d701ab942022c86
 EBUILD cucumber-expressions-5.0.7.ebuild 456 BLAKE2B e80622ba1002c66ca537b7b7cd60117c227cc9eb60c79a22128c0cf339f446e33a15bf92c51cbd0f84f5e19c8e522ae9d657ae03fac10852876f50a913c8535c SHA512 eaa2c12cd13d6668a9b73ac88568cb9612540d0f19514ad5f1a68965696d4aebeb9c3a684c875a545fbfaa5099c4ede3a7ecf5ede61e0ac83579b6a14b1c6b48
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-4.0.4.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-4.0.4.ebuild
index 2df14d316084..04d0effaea5a 100644
--- a/dev-util/cucumber-expressions/cucumber-expressions-4.0.4.ebuild
+++ b/dev-util/cucumber-expressions/cucumber-expressions-4.0.4.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
@@ -14,5 +14,5 @@ DESCRIPTION="a simpler alternative to Regular Expressions"
 HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc"
 SLOT="4.0"
diff --git a/dev-util/cucumber-tag_expressions/Manifest b/dev-util/cucumber-tag_expressions/Manifest
index 7fd17cd82027..f4d4aee518b5 100644
--- a/dev-util/cucumber-tag_expressions/Manifest
+++ b/dev-util/cucumber-tag_expressions/Manifest
@@ -1,7 +1,7 @@
 DIST cucumber-tag_expressions-1.0.1.gem 8192 BLAKE2B a47f6d1c049e16df641deedd58ef5c7bb12fa1fb3d0a7e894cc04ac5fde05b1de71663af763ea5199b3d53a44f942abb650fb054a0baf3763f7e2f6dd59a76cb SHA512 be19d91c4b267d0f4c5f483e61a13d63cc023719874358bb63ac72fa3104e6068b8edc6231e70c4ee24c4f33e0b4f2254148edb666bec1f617c0d322275582b6
 DIST cucumber-tag_expressions-1.1.0.gem 7680 BLAKE2B c8aa789750c0e33acc0864d85bb7f90c87d9b0872cf027e84eda4be8ea73187e0171abbbc430d7f2fad4cffda3e218bff35c9016800f0eb80877c6acb84fe75f SHA512 471dd0e8cc63cc67e9cd99a446859047683b5e4f4b55461c986b25999240d4b466bf1d3eef4bf7debf56b7ea3ed10e6dac7f19b67496f81bbbe6d2d4c7168aeb
 DIST cucumber-tag_expressions-1.1.1.gem 7680 BLAKE2B 31e1f23c5fc008390c9221307473022107b109d409d8385a111f4fed1911fad15660faa824bee71cd87a2e183ec41a6ac9b5f7ecf5f1c417ed51d649c76712e8 SHA512 9b46d681be78b428c7cd29ca1cae21dbd410f7ca9844ec6f94368170c133f8de662a55e4f4440045704107e5428306ab81d2a90020c64102ef42f647cd8a66a6
-EBUILD cucumber-tag_expressions-1.0.1.ebuild 431 BLAKE2B 6016c11a9f5b6f46f436e6ddb60b5de99e99230f01b8b1d76576860788da467d6a8c19ddebc48136830cd3f46bec6e518f06e19aeddf21a97dc6d95bc1a26073 SHA512 1095dfcb007dff1d9bd4f8931bcc3ab04bf7246fda5d3b6845d5e32619948dc8931ea5257e37e7ee2d10dba46f6597ea9aff0daa504d477cdfacb5b99afbe5c6
+EBUILD cucumber-tag_expressions-1.0.1.ebuild 436 BLAKE2B 82f34e6254f32dcc16fba5e6490d7bbfc7bb9e2a568fd95f4525ed0faadd0b142a157828323dca68ab69209118a828602938cbdbf331e4e52a6ee179f7a535c8 SHA512 5795c79a89fa88041c223b7467870a0175c3157c62b92e9fb1cfc66c8cc10dd4a471ee8c9cfc36b81ef779694ce7b8029936dcfbc8188a85ef07781c4f228478
 EBUILD cucumber-tag_expressions-1.1.0.ebuild 424 BLAKE2B 2941ca6a268eb54e6c24efd7a7b3687e996f3b2a7cb6568cea146c4ab9402bf7943b09e4fbb5466bed050487eb4e58d761132b5e782bcd3bf802742ae103afdf SHA512 5f7886762eff19eff7474d053b3a704dbb88b6bdce329064db2fe93f48001d9d6a826b3574a057599b0c694857ca585f6b07f1f41460e1c292d610a832ea23c0
 EBUILD cucumber-tag_expressions-1.1.1.ebuild 424 BLAKE2B 2941ca6a268eb54e6c24efd7a7b3687e996f3b2a7cb6568cea146c4ab9402bf7943b09e4fbb5466bed050487eb4e58d761132b5e782bcd3bf802742ae103afdf SHA512 5f7886762eff19eff7474d053b3a704dbb88b6bdce329064db2fe93f48001d9d6a826b3574a057599b0c694857ca585f6b07f1f41460e1c292d610a832ea23c0
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.0.1.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.0.1.ebuild
index 45dd2c6517b8..4ffb986a2101 100644
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.0.1.ebuild
+++ b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.0.1.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
@@ -14,5 +14,5 @@ DESCRIPTION="Cucumber tag expressions for ruby"
 HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc"
 SLOT="1"
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index b38d1a5e4ff8..e7ec3be5b973 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -3,5 +3,5 @@ DIST cucumber-2.4.0.gem 250880 BLAKE2B 2d0479695800639340332ab26b745a84cdbe7dfc5
 DIST cucumber-3.0.2.tar.gz 267557 BLAKE2B 0ce098d9c747a6291e53c647f0e6da7adbcf4cd6f85953023f5fa0e14dc7186a706c43b81cf77a55ad56f932e60146e7e0ca7d4107f85e9c6bd46cbc8b2d1f7a SHA512 1506427fb6d9233231497f0e1396143cfb1495673113fbb26344b171413c1bc9d35fd8a8ca86aa14ffc279d1d9db05712618c3a0e96f2288056d76f39bbf2cf6
 EBUILD cucumber-1.3.20-r1.ebuild 2172 BLAKE2B c77fe5c6d6f6fee2edbf04758c1dacad34a7366d3b3c6db97b0c9c0ae08e1b05f12397db76f86cc2dac3c2f3ef5f46d779ef9d7e8051801b2cf425a75fbcba5e SHA512 b0fa2c24c9cb0ba916e9339f904a567562ab0d22337bfc0e92fcc0c28ab386780c689b5aeb5fa5bdb8fa8fb6054866d1f89573ebc0c20206dccc6dfebad8f28e
 EBUILD cucumber-2.4.0-r1.ebuild 2464 BLAKE2B dacfd4540ad642ff74ee7454b4d977250031cc8878ddac2ff6b359a9f7b78415b3771b71558554cc542c662c185ca010bd0cb819e31044b96995281b59f1d345 SHA512 5fed5eb20feaba66a5d000610a5f09b51bc7ec5654b68353b9da57395ed9aeca11c6385c43f0ad5923628de80e7a23aca19e2ec04cc4802f548aaf7a93f2a051
-EBUILD cucumber-3.0.2.ebuild 2624 BLAKE2B ce43a39f1b111e12fb0d0abf7505fd3821db8d33a6635a4a6c18fdf2df91f15caf32cc30b3bfc17388a6f35ea446d77187ddc46d5914ec18744d02639228dac9 SHA512 100846cdbed64964240dd750272a3316df3d16d5758cec396875e93fba8a747714d05a0e07bec599e7d3e4355232cf9eb571938f40b07627c48af668e73f122b
+EBUILD cucumber-3.0.2.ebuild 2629 BLAKE2B 16e2fbb9b79f852cace5f916bbca8d3165bbe281efa46ae9d2ce5511d85b6b9d6ede1f382de1f50e8aaf3aadb68828e96db9ee036f7bf28a499ed002b16b0131 SHA512 fda917aaf4faed30db4b4c067107075abda889fb7719f67e9c9c225cea9e06995b0286ee8f41fbe1d440030f2a9266f44b4c879ee677476a44b1a80d0c742d04
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.0.2.ebuild b/dev-util/cucumber/cucumber-3.0.2.ebuild
index 70e3c8c04bc0..1a6d022df343 100644
--- a/dev-util/cucumber/cucumber-3.0.2.ebuild
+++ b/dev-util/cucumber/cucumber-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 418db280ab58..b9d68f782094 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
 DIST debhelper_10.10.9.tar.xz 431480 BLAKE2B 579a88a45aa74dd8097984bcfba16efb523f8ef5fb7cef8d43433cecddafafabbcb717439aedb847940c382da4f86d7448dbddecd66cbe9a567a9e389476c512 SHA512 45c1357c0e34083f6bad070973d58bdc5388cf7dc71152fce684e38158674baeb436e2d7577d3b5e43918e0788d80968ca6e6e1ee303ea4d3b79be3d55f32e9b
 DIST debhelper_11.tar.xz 439268 BLAKE2B 45c1eeb046a6fbc59b814f696c7320b344ba3cf1ba47b02e9aafd38f88e72943eaba0c0625115fc35cdce9cec0f01232278956644f02b632beda2e2d052ca1aa SHA512 12eabb2f02df24a2c1d8db8e1d88ecec2fce1547c21e99f99bf89f5a44ebd71d09ebbb7e19e0e30ca7e2f17b252769c79968d81989ab7330f870b7ee42e13521
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-10.10.9.ebuild 1561 BLAKE2B e7e5c6cd1116e292e3c2e69eaefe5101ae090ddc7b5e2bd95315b1a70bfb63096465cae7a265ba27fd2dd3d399035b19cc6bc9bc0ab92b49249b3df0c02a62f5 SHA512 5e1efe03d1ca488f0b2948706ade5a8ac9d9e8e321fd40ecb8c92b82e95716e7c4fde7cc21b203095cf9a3640174776d785606ad8ec88e97c093700915d477bb
-EBUILD debhelper-11.ebuild 1554 BLAKE2B 0b1a0efc7aeedede136dbb5d00fd446d3cb1e6fa20f288dbd76f79bc01399645cc5cb2b90f20e457f5ad141820a9eafc3dc31ca6f391e285a323d7d39ab75d1e SHA512 76d95740e86b10247a16736c7a9f8a1e97f56f774c90d04abc64bbfe6f7dae51e924c8201d3798b12fbe2c2dc8bdd1d93dfba02d6c6b1e91d1a0dccd38692851
-EBUILD debhelper-9.20160814.ebuild 1552 BLAKE2B 087f51c1bfedd2063b4bd2e86274a445ae9bd8cd2222a3c06c287be85b37de66beb0da106eb4c178d67cd72ddc5321ca0565a646eaf6d54a713f5f5cb13045fc SHA512 101be0361c520416b32d1584498834583c0ad161f10e472ba82743e5b4322e0f8caf737d6796eac6716225d4e2841127f1d3f869d635fdd1e891b77520dc0db2
+EBUILD debhelper-10.10.9.ebuild 1517 BLAKE2B 22ec088254e5d2c13ef506b03422444c3a8b3089d9a857730455fb447a247d22528267528685350cedfbd23af6d9fb807072727202818a50c748e6d0c67c5794 SHA512 f9534629a2c227b4475838be880ec3bad65f6d8a7c0701a7942c2b6bfc1f61572a4c169b89db181ca144fb577b242a4b355e9bbd6a61e21b0739efda61a9d22c
+EBUILD debhelper-11.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
+EBUILD debhelper-9.20160814.ebuild 1508 BLAKE2B e690fd6e7e568ef0245db0bcc8fbd47131b0bba0bb6c0d0363c2c52b1ab9fbc39b9ff4523c8f48a7a15a0685730fb6af38c82029b35bf3a82ef5fbd7e74d8b5b SHA512 edf4a1242cd0ece4dd3afea0641299fe89be0398a313111ffaaf11f72ce97194e53bcd5cb223d8b271b0e5612704a8f008c06ffc6001198d5e9d39e9a379d411
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-10.10.9.ebuild b/dev-util/debhelper/debhelper-10.10.9.ebuild
index c4f2a7b166cc..f485cb5d4c27 100644
--- a/dev-util/debhelper/debhelper-10.10.9.ebuild
+++ b/dev-util/debhelper/debhelper-10.10.9.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
@@ -12,11 +12,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
 IUSE="test"
-DH_LINGUAS=( de es fr )
-IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
+DH_LANGS=( de es fr )
+IUSE+=" ${DH_LANGS[@]/#/l10n_}"
 
 NLS_DEPEND=$(
-	printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
+	printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
 )
 
 RDEPEND="
@@ -39,10 +39,10 @@ S=${WORKDIR}/${PN}
 src_compile() {
 	tc-export CC
 
-	local LANGS="" USE_NLS=no lingua
-	for lingua in ${DH_LINGUAS[@]}; do
-		if use linguas_${lingua}; then
-			LANGS+=" ${lingua}"
+	local LANGS="" USE_NLS=no lang
+	for lang in ${DH_LANGS[@]}; do
+		if use l10n_${lang}; then
+			LANGS+=" ${lang}"
 			USE_NLS=yes
 		fi
 	done
@@ -55,14 +55,14 @@ src_install() {
 	dodoc doc/* debian/changelog
 	docinto examples
 	dodoc examples/*
-	local lingua
+	local lang
 	for manfile in *.1 *.7 ; do
-		for lingua in ${DH_LINGUAS[@]}; do
+		for lang in ${DH_LANGS[@]}; do
 			case ${manfile} in
-				*.${lingua}.?)
-					use linguas_${lingua} \
-						&& cp ${manfile} "${T}"/${manfile/.${lingua}/} \
-						&& doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
+				*.${lang}.?)
+					use l10n_${lang} \
+						&& cp ${manfile} "${T}"/${manfile/.${lang}/} \
+						&& doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
 					;;
 				*)
 					doman ${manfile}
diff --git a/dev-util/debhelper/debhelper-11.ebuild b/dev-util/debhelper/debhelper-11.ebuild
index 526db42385e6..eb7e5fa626c2 100644
--- a/dev-util/debhelper/debhelper-11.ebuild
+++ b/dev-util/debhelper/debhelper-11.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
@@ -12,11 +12,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
 IUSE="test"
-DH_LINGUAS=( de es fr )
-IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
+DH_LANGS=( de es fr )
+IUSE+=" ${DH_LANGS[@]/#/l10n_}"
 
 NLS_DEPEND=$(
-	printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
+	printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
 )
 
 RDEPEND="
@@ -39,10 +39,10 @@ S=${WORKDIR}/${PN}
 src_compile() {
 	tc-export CC
 
-	local LANGS="" USE_NLS=no lingua
-	for lingua in ${DH_LINGUAS[@]}; do
-		if use linguas_${lingua}; then
-			LANGS+=" ${lingua}"
+	local LANGS="" USE_NLS=no lang
+	for lang in ${DH_LANGS[@]}; do
+		if use l10n_${lang}; then
+			LANGS+=" ${lang}"
 			USE_NLS=yes
 		fi
 	done
@@ -55,14 +55,14 @@ src_install() {
 	dodoc doc/* debian/changelog
 	docinto examples
 	dodoc examples/*
-	local lingua
+	local lang
 	for manfile in *.1 *.7 ; do
-		for lingua in ${DH_LINGUAS[@]}; do
+		for lang in ${DH_LANGS[@]}; do
 			case ${manfile} in
-				*.${lingua}.?)
-					use linguas_${lingua} \
-						&& cp ${manfile} "${T}"/${manfile/.${lingua}/} \
-						&& doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
+				*.${lang}.?)
+					use l10n_${lang} \
+						&& cp ${manfile} "${T}"/${manfile/.${lang}/} \
+						&& doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
 					;;
 				*)
 					doman ${manfile}
diff --git a/dev-util/debhelper/debhelper-9.20160814.ebuild b/dev-util/debhelper/debhelper-9.20160814.ebuild
index 3333a21a303d..10f0449075ea 100644
--- a/dev-util/debhelper/debhelper-9.20160814.ebuild
+++ b/dev-util/debhelper/debhelper-9.20160814.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
@@ -12,11 +12,11 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux"
 IUSE="test"
-DH_LINGUAS=( de es fr )
-IUSE+=" ${DH_LINGUAS[@]/#/linguas_}"
+DH_LANGS=( de es fr )
+IUSE+=" ${DH_LANGS[@]/#/l10n_}"
 
 NLS_DEPEND=$(
-	printf "linguas_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LINGUAS[@]}
+	printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
 )
 
 RDEPEND="
@@ -39,10 +39,10 @@ S=${WORKDIR}/${PN}
 src_compile() {
 	tc-export CC
 
-	local LANGS="" USE_NLS=no lingua
-	for lingua in ${DH_LINGUAS[@]}; do
-		if use linguas_${lingua}; then
-			LANGS+=" ${lingua}"
+	local LANGS="" USE_NLS=no lang
+	for lang in ${DH_LANGS[@]}; do
+		if use l10n_${lang}; then
+			LANGS+=" ${lang}"
 			USE_NLS=yes
 		fi
 	done
@@ -55,14 +55,14 @@ src_install() {
 	dodoc doc/* debian/changelog
 	docinto examples
 	dodoc examples/*
-	local lingua
+	local lang
 	for manfile in *.1 *.7 ; do
-		for lingua in ${DH_LINGUAS[@]}; do
+		for lang in ${DH_LANGS[@]}; do
 			case ${manfile} in
-				*.${lingua}.?)
-					use linguas_${lingua} \
-						&& cp ${manfile} "${T}"/${manfile/.${lingua}/} \
-						&& doman -i18n=${lingua} "${T}"/${manfile/.${lingua}/}
+				*.${lang}.?)
+					use l10n_${lang} \
+						&& cp ${manfile} "${T}"/${manfile/.${lang}/} \
+						&& doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
 					;;
 				*)
 					doman ${manfile}
diff --git a/dev-util/mingw-runtime/Manifest b/dev-util/mingw-runtime/Manifest
index 1a02b83ecd90..3fa29d9dd077 100644
--- a/dev-util/mingw-runtime/Manifest
+++ b/dev-util/mingw-runtime/Manifest
@@ -4,8 +4,8 @@ DIST mingwrt-3.18-mingw32-src.tar.gz 391939 BLAKE2B 9d0164f9292d29937bf01d7110d1
 DIST mingwrt-3.20-2-mingw32-src.tar.lzma 302072 BLAKE2B 93f5efff918e48829fe75018da53d34de1d0eeb782466e4a022740213433d634a41512f44a90676e4bbf8476e81e74ec1785ce127a2c217c755fcb9d6e9f8e72 SHA512 ffb8e3d46a4646b236b67df0d9d21571a0ee8b78125989d506c176e03922e520201770a03093f27789f0e4373bf64f69d41e377d861ddd008b5e29da65fb1d55
 DIST mingwrt-3.20-mingw32-src.tar.gz 393946 BLAKE2B 1efe539aac86ea9fb7b0e258d086a52421d0d23b18670728703ad9153fadd84b9ef50b6d1367839a3dbdfbecfe66ef431d512ca91ca6d6e6ff4b7ed865afd07e SHA512 2d2d3c7decc7b35ab4759034dcd291c8e322a46205ae70fd4c4d68224c9d7c75454b908f61ba8ca7e0fdf18ff121c5b7ffd02e0658b7557e3af1f89ed28ed58c
 DIST mingwrt-4.0.3-1-mingw32-src.tar.lzma 1341612 BLAKE2B 4251c5737af3c209ea0fa22b604c24ffb6b67c6ab83d13e67ffc5750334f668005f321965a3d9cdf10e93e801730758c29cf64c10541a9e192e0a3355e2abd3f SHA512 2aa429f939038c86441ccfd32b4ddd40347582557f9427df92ea7454eb5bf743b8e1aafbb627b527be755976be807f415aad3920f700d93aa86d07bf40f12bde
-EBUILD mingw-runtime-3.18.ebuild 1781 BLAKE2B 2c329ee5839f53d496a31e4ffbbc30834a18e6fc22be9f144ee376c4dbc5cbe95776b4fddd9d8e35116c2f2c60e1dd5348cb84040295f5258f31125c2ab42ca2 SHA512 17d45119f34f9701f7aa9e46a024fd5a5f211f16e2c7565911b8c0f74f32ec399ed38e3e64190d17bc656894a6d0c17b510d4b828747762c9feaeac31b62c01d
-EBUILD mingw-runtime-3.20.2.ebuild 1933 BLAKE2B e9ba7833c38824b12bb805f7aea65bb4a9bfd636d3abeb62ff12f360ae401a21e03221b5e5165c5b3045209b8605316db4d86588c787a54670fa0033f3f2c326 SHA512 e234e784d8c8c0c8683a2479cf7a5e5dbc8b7f54265f3d95ba178954c929788cee50b80e5e5f14051e8ec2fd5ac5ac30d3ebedb763fac4d36a35a5009ae2798f
-EBUILD mingw-runtime-3.20.ebuild 1861 BLAKE2B 13adab2cc9aa1c3504ece8ea1e36d592b2ee3ee310f37cab71ddeccb0527f92954b38490477e5ebf72ea84dedba37d7c4b740e873b6309fc5c9c209ac5aac39c SHA512 324ee8e82c4ad2a8590274100249983d1bd3650800d0b32bc14a9fe7e4fa7efd6b2b32bf710d7a593b886cf784806e951969f99a8a229b9fce1ba383bf9eac51
-EBUILD mingw-runtime-4.0.3.1.ebuild 1922 BLAKE2B 29fb4df07a23b81c67ae59b8606571c1953a922c431657172f13c7c6f165b96137d7215de20c7cb0c1c89cb025904cc9742c3c5c2ca266cb51db06ed9e73471d SHA512 c391f7d5da2530f9d7e8394427a48c0efefbbbdeebc135949894863617c91c76ef846fc289b6b2c0ce62d6576601db80b31f4c2ce4465e356ea8bfedaa223f15
+EBUILD mingw-runtime-3.18.ebuild 1745 BLAKE2B d48831a39438b1b1b67e170d4c3efd97b0d1318dbd82f317cd9c58d5300bd913b057d254abeeb8d3692585766d9e0bc4aa512c88d74281d4fdba26d6d281c46c SHA512 8a772692c4fd85283de7ef0611e25789bcd3d7cf98f76c6a0e045f65b154bc3809b02960e1b80b5bf8e52ab6c5f15fd4f4c6d5b03c54e0fb77fac7e69100ed68
+EBUILD mingw-runtime-3.20.2.ebuild 1897 BLAKE2B f058efb67b87c981a45e8028bba20a1868e2fe125caadeafcd54abc5e857995cfca303e3f5d233186081c188cbffad2d515954aa23501558b7a40b7dfe27ee40 SHA512 edf4ebb0785d83557fe50c7431e254c698e14941189327a5d74d78dbded8c8923fa9e457f031b196822bb4f17f7fc1730d6eb91df04c6da24a51063fb79609cb
+EBUILD mingw-runtime-3.20.ebuild 1825 BLAKE2B 7e6225ddd64235592f791e2da942d8a817686c59d20d146756fce127d33a32f21c45cdc3975a1186cd4651e9601f6eb444ddde887ed6dfa7ab2aa9bee9dce493 SHA512 a450b93e20df831f1ca1df19f9b6205305545ad23ec11aab5aec6172e8ee57a10b31aca5d685acb91bf794045b037de349d29b3e9dfd0b3bab31825cb358a7ec
+EBUILD mingw-runtime-4.0.3.1.ebuild 1886 BLAKE2B 386b09ddab89cfd318edd224ccc827bb6a77a371b4186d5e39ec7a5a67ebc46f324810c0701d6e04a6c008afc6d9eb99945a12a1dedbf8870c00ae093fa38db5 SHA512 e0d87ea7eba4fa833c2b5bde35360dfd73aa6fa10140468a4654966e6e351ebe6c21b6c69dab94660544fde168239a76fa45905e286205c972a0b6668d9d74c6
 MISC metadata.xml 336 BLAKE2B f5b695f0c70efe0aef9843aab32d906407185d04d70d0ca5dc63872ec3f30d08454f4c706ade2f5d6191ac39cb0c3252349f03a50cf9c1726562361634e7d928 SHA512 c15c4f7fe2796147558f99a89942b216159b291e18dfb02358f0985fef55e7ce166dbd0831ef24938a5bc76377634036932e0ce1526d01c2b07be35cac17cbf9
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
index fb7b3aaaadba..9a9542756fcb 100644
--- a/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-3.18.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
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -19,7 +19,7 @@ SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="crosscompile_opts_headers-only"
+IUSE="headers-only"
 RESTRICT="strip"
 
 S=${WORKDIR}/${MY_P}
@@ -28,7 +28,7 @@ is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
 
 pkg_setup() {
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild
index 21f0e6d6c3be..42f4f713402d 100644
--- a/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-3.20.2.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="4"
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="crosscompile_opts_headers-only"
+IUSE="headers-only"
 RESTRICT="strip"
 
 DEPEND="app-arch/xz-utils"
@@ -33,7 +33,7 @@ is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
 
 pkg_setup() {
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
index d456e763daa6..469eac6b9ff4 100644
--- a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-3.20.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="4"
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="crosscompile_opts_headers-only"
+IUSE="headers-only"
 RESTRICT="strip"
 
 S=${WORKDIR}/${MY_P}
@@ -31,7 +31,7 @@ is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
 
 pkg_setup() {
diff --git a/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild b/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild
index 29cc5a875193..0a13e7773d86 100644
--- a/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.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="4"
@@ -23,7 +23,7 @@ LICENSE="BSD"
 SLOT="0"
 # Collides with w32api-4.x
 #KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="crosscompile_opts_headers-only"
+IUSE="headers-only"
 RESTRICT="strip"
 
 DEPEND="app-arch/xz-utils"
@@ -35,7 +35,7 @@ is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
 
 pkg_setup() {
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index 7fcab200b720..756e9ee333a9 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -12,16 +12,16 @@ DIST mingw-w64-v4.0.6.tar.bz2 10853871 BLAKE2B a166692d4ddbf740f566abc844d577d38
 DIST mingw-w64-v5.0.1.tar.bz2 9160780 BLAKE2B 52964e7ae113d8886648cb0395514067fa054840d153e86407317ccd2f299fccb6d21f76c773e1e2ef22b2c00b53728c18065091125a000750395e96fb601f05 SHA512 73b746f227930597a97f117cf9f9aa19ddabb6090907cf6850864cf30089e5d6e1cd07e257b3b0b9ae0ac762cb24a6f5acf7336c9be48760c975ac038569dcfa
 DIST mingw-w64-v5.0.2.tar.bz2 9107077 BLAKE2B b8e3e614fe4a1ea6a4770efdd029300e923e3b7b39b71731692281da44f468b235d487d38d7e1b4396e1b44a4c60fcc7a67a6c1331fb46e339c13c86bf7de7bd SHA512 430065a822afb9901219b1f86ea221ae70ef7820ea298f51828bf1689a014115dade967a806388b7ee3ed1ea1d6c53970514ec64d0185b5024523093d9e96060
 DIST mingw-w64-v5.0.3.tar.bz2 9160627 BLAKE2B 941b40c426548564e8b2da0af8e917dad34bdbf0b05c63ea2127e39139bcce5d86e80433817483c64cd2a6ef6140a7818a76564ff5d9408614ecaa58f17b41e7 SHA512 85bc0244cd30ef38262792d61502a012348b8220ef249352b68ddfa40663ca1cae5f81bed70caa9579469fad6ad16a95f02387c280effeda7ce8287b549f3fc9
-EBUILD mingw64-runtime-3.0.0.ebuild 1813 BLAKE2B 18704b1849cc7cc38d5829fc9f5a22b76c0901147854df8884219cd91ce39d8a472ec24f49caeb8a6d199613ba1d685179d402c79bd1ee6114d36d38b02aa8c3 SHA512 731699be6c251ab07e7e9f82ec0d477ae1b186c595eabbc9d9a7766e2fdecb8799475772d5e51fab134ec43f76e8da9b50fd3fdef68d90dda585223275bfb643
-EBUILD mingw64-runtime-3.1.0.ebuild 1813 BLAKE2B 18704b1849cc7cc38d5829fc9f5a22b76c0901147854df8884219cd91ce39d8a472ec24f49caeb8a6d199613ba1d685179d402c79bd1ee6114d36d38b02aa8c3 SHA512 731699be6c251ab07e7e9f82ec0d477ae1b186c595eabbc9d9a7766e2fdecb8799475772d5e51fab134ec43f76e8da9b50fd3fdef68d90dda585223275bfb643
-EBUILD mingw64-runtime-3.2.0-r1.ebuild 1813 BLAKE2B 18704b1849cc7cc38d5829fc9f5a22b76c0901147854df8884219cd91ce39d8a472ec24f49caeb8a6d199613ba1d685179d402c79bd1ee6114d36d38b02aa8c3 SHA512 731699be6c251ab07e7e9f82ec0d477ae1b186c595eabbc9d9a7766e2fdecb8799475772d5e51fab134ec43f76e8da9b50fd3fdef68d90dda585223275bfb643
-EBUILD mingw64-runtime-4.0.1.ebuild 2584 BLAKE2B 878379c3eb9668b173a84323e2692a4eccd6a3324fb8ba2227011d6fb04f9dbc8139d6d207045459db7639a7c62afd3e0770968f916cad966d7f51909506ee4a SHA512 018a0bc7b950c7899251ed53cfb6e7e4b8253a4e194868d49720db4be3dfaeb84b8eadadc0bfd3a588258c22b6255a7618a2b138003e04fdf518d06422ea982b
-EBUILD mingw64-runtime-4.0.4.ebuild 2598 BLAKE2B a0ae6d234d0e414b096e8a1a82cedd939ebf7c152728f63dc8933eb2a9845c7770ede9e3da4c9db3e9e955c44c0da9584f5e89c11139e62fa38d33f184acd06d SHA512 3d5b65cd965e6ac759d3af02369fcdb8dbc50b699bbc9e2e07ece58d230327533deae68d3cd63844a1905d38e3b9df533069a9e1aa4db59141065c288a48ff97
-EBUILD mingw64-runtime-4.0.6.ebuild 2552 BLAKE2B e3f0dabd3843573ca09113055158b7e84f2fcb5736235a52255302f9069c4f041c7b409e9da267e3d0cee9893b75fa831a05795001d90986129929912ffa4112 SHA512 b3ea1286a87ea536db49b8acf566286feda5a352a5a71d8d4fa49a630161f6a70fa8fa9776736045c1a202ab1546848b2d3a96fdbdbe0cce46671746f821f1a7
-EBUILD mingw64-runtime-5.0.1.ebuild 2560 BLAKE2B caf05db1d9a9a4578c044edb30d2513d028478672c5d1258eddd8863e34c949ed5bea5a44a5a6262e89e80de58b3d298b9bd5f5c21e6d535c955675b23a7c476 SHA512 a701ebddba123544e6c1854beac891ec1104d5bc3c5dbf151d0ed3c1be7e05a13a18885d0c9f5f74cb8e5f615cf30d084692e28770a57bc749a8504a36328392
-EBUILD mingw64-runtime-5.0.2-r1.ebuild 2651 BLAKE2B e3b044350a01e75c1bc32a67ad6593b2a9cee0002ea00f7c6546a6a66d24ec45fb1d2f8cc70a62d1f07c3b347d8da7a672ced76011bab1068845cdbcd955681c SHA512 f8c0fd5cc01431016675bf3831488e5852c29d9a0621216842f72b2bef1bdc57585b98885913d7c859a4aa8de01d1294a65ff1f7bd3224c691db7208d96946fc
-EBUILD mingw64-runtime-5.0.2-r2.ebuild 2691 BLAKE2B f05cbb14202abd1c5ac32c69c872aab7ebb879f020156faf975c1c6d1df63a29b2e59d89ac2b3da2b3271962e8dc569df4f5b53ab5c153d3d4e91842c67c1284 SHA512 33615d4db2e4fe13bc0a63e3b84445392133edbac907514dc41a0bc29f82be0ce54c837bd0dfd6c1872e74f89055cdc3d2b7989f6912f3d8f37e3ffcc72b3106
-EBUILD mingw64-runtime-5.0.2.ebuild 2560 BLAKE2B caf05db1d9a9a4578c044edb30d2513d028478672c5d1258eddd8863e34c949ed5bea5a44a5a6262e89e80de58b3d298b9bd5f5c21e6d535c955675b23a7c476 SHA512 a701ebddba123544e6c1854beac891ec1104d5bc3c5dbf151d0ed3c1be7e05a13a18885d0c9f5f74cb8e5f615cf30d084692e28770a57bc749a8504a36328392
-EBUILD mingw64-runtime-5.0.3-r1.ebuild 2569 BLAKE2B 61fb453aa51120d8c6ef25b1a72d029c579e9759cef08cc1c830907924478a57e8678d20f4b00706ee0b8c242abcec244bcf25a9b24e5ef64d3a5629563d77ba SHA512 1e566d554e2808e30bc952022ad427b8aa0ff46157815eafecbeca0e52740633f55e851a2a4b0bbaa2fde52ed17f5034551895102bbf48ff97e1df2c288d1dd4
-EBUILD mingw64-runtime-5.0.3.ebuild 2533 BLAKE2B 4449ac0eb34c7861c43884328b82983f424f45dc0e1565629a5aaa75e41b894d3144841c0ec25c96b4a7cd4787a958e4b502a08a1b878c7d4f2dce8eb4aa33a3 SHA512 ec22d9a4f4bf860e35167445d521d1e7d8a193b09e334ee17fa5fbb3b8313b565e0d474e18e1e47ddd60bd0dfffdde46a337aa12749502ae550f4d7e341688a5
+EBUILD mingw64-runtime-3.0.0.ebuild 1777 BLAKE2B f561aa2e16d977314513aad7255eed44bf86217c710d66f763ad89b63499674fbe221ab156788588bdfefae74d3501d8f698f1b74f8b130d37cc0949593f8c51 SHA512 f5a3baf2bd4dd0a1526db279cd428d6502f8eed03d001b6de7ff5ff582fcb4de14d12f7290cb881a8eb11810f34108b160fcd220d65cf31fea327329ee5c4664
+EBUILD mingw64-runtime-3.1.0.ebuild 1777 BLAKE2B f561aa2e16d977314513aad7255eed44bf86217c710d66f763ad89b63499674fbe221ab156788588bdfefae74d3501d8f698f1b74f8b130d37cc0949593f8c51 SHA512 f5a3baf2bd4dd0a1526db279cd428d6502f8eed03d001b6de7ff5ff582fcb4de14d12f7290cb881a8eb11810f34108b160fcd220d65cf31fea327329ee5c4664
+EBUILD mingw64-runtime-3.2.0-r1.ebuild 1777 BLAKE2B f561aa2e16d977314513aad7255eed44bf86217c710d66f763ad89b63499674fbe221ab156788588bdfefae74d3501d8f698f1b74f8b130d37cc0949593f8c51 SHA512 f5a3baf2bd4dd0a1526db279cd428d6502f8eed03d001b6de7ff5ff582fcb4de14d12f7290cb881a8eb11810f34108b160fcd220d65cf31fea327329ee5c4664
+EBUILD mingw64-runtime-4.0.1.ebuild 2548 BLAKE2B aef0473dfc7211ac19ff4f57e080a881d1c0c7d282ac2432549f5a2ee425c529a419e25009352daa58188a6d4a07b79fb54b5b07ac9643bd9e170814fa60e1b1 SHA512 38c1ce7514a4fa35931d3fc8b97a0bd5f0e1027ee9d7b07326f7e7f2598fa747f94bfb6d750d98fc15841a2ccaa45a9f321e4ef0a2aecb4ba49e7598003c152b
+EBUILD mingw64-runtime-4.0.4.ebuild 2562 BLAKE2B fde901cf5ecbfb20c0cf94a847f41b6eaa4c2b12a308fc754b2f31808e611574168f80535a71ee8ab55a4ead555a109a944cb492f5fb6cd558ee644c4c2a9b65 SHA512 51bcd841320ca40b48453e4cf8832ca494751a5d5c9f7014b326eff92d3e16a2c11d8e8074aa9066cdbc44007c2914d5f3abeed2a0cc1c4f02434504e12b1149
+EBUILD mingw64-runtime-4.0.6.ebuild 2516 BLAKE2B eba545412da47c8d2adfab359c12071619a0f7b10fb925382dcc3ec09b4de52c51db3c633ef923c0dfcfc3cd55cf9c872216da4d6dc5f0fbb18d623c26f5b777 SHA512 a60f10631f26e8eb26aa7ad071af73115c2c7ec84ef39d73d228a4bc038cc2f10788401424d845264f09b0a74682f53d6bd8362005b8c8abc93e16681faf4392
+EBUILD mingw64-runtime-5.0.1.ebuild 2524 BLAKE2B f9ab5353a35a61bc2f41720825ae5329e7b8fdc81e96c8ebfa5bad6ea99e8b09fbf10c51344c69ff17b3f1892ae6ea2cf92def90d458a0523e86581f5ba6af32 SHA512 91d08c3b756d0ec758a02f3180d1f2f7392b7416e843b2645325469f125fdf6eeca9cf4b236930c6ebcdc595c97734c5c19854763e4051e00a3e272a272d916f
+EBUILD mingw64-runtime-5.0.2-r1.ebuild 2615 BLAKE2B fda70d33c5c91481a162f88e431996582fb0da14b6a6c725aa1879780a9b993fa18bd522a9808f71cdf6b2eda5205b073a5e24ff2f605e74327318cc5ccc88ad SHA512 9c6520b42eaa6f06ab03da66284a6648b6d787323367ebd6b0be57c116a7644f131492779023fd1a8708fd8711347247e199a0aee9783fe51b6d11ef76e33528
+EBUILD mingw64-runtime-5.0.2-r2.ebuild 2655 BLAKE2B 1b9cf748d095cc8c7d7683a07462b8c9ea8116418bd549a93d4392f8bfd61b60d70a50bf4d8102f7b271c56b86768f879a745140b29b7b7a2057feae85e44ce7 SHA512 38e16934a793b9c1fe05a4f611682fffbb336e509d49ada6c9bfacb97d55144815177986b892e9650e3842a47699229efc154ff842f4db034bf91f3e21c86b2b
+EBUILD mingw64-runtime-5.0.2.ebuild 2524 BLAKE2B f9ab5353a35a61bc2f41720825ae5329e7b8fdc81e96c8ebfa5bad6ea99e8b09fbf10c51344c69ff17b3f1892ae6ea2cf92def90d458a0523e86581f5ba6af32 SHA512 91d08c3b756d0ec758a02f3180d1f2f7392b7416e843b2645325469f125fdf6eeca9cf4b236930c6ebcdc595c97734c5c19854763e4051e00a3e272a272d916f
+EBUILD mingw64-runtime-5.0.3-r1.ebuild 2533 BLAKE2B 9a175322ad3422c66dbd29794383bf8e33e8edc35cab995e83213890f80e0a1cf375ffbfb7cd7c3867c4464a660f076b07776625e43e43f865b9d4d50cd40077 SHA512 388ab79e22fc4eb939ef18931e3d34ba8249a04f194bbddd1927791400b7426d5223aad8c6fceebda7aada050eeff97fec361a4dca76906650f63a7700441b5f
+EBUILD mingw64-runtime-5.0.3.ebuild 2497 BLAKE2B ba30e069818937c620dc436e4a3c8d9e9bc0838620c80372f8e30153c2f3903dbfda3e0c6d157e9cccd94241bc3da47dec7ba3b92a39808b85771fc58dc2636d SHA512 8cf13af35caf3ceb2fc8bafdb6e3f980a0d63bc7795ef8bf12e2b6195bf1bb6e8fe0c0c0b5af45350c3e4a83a14ac4d7b98f1e4f9bf3c6807a29533f6eb1947e
 MISC metadata.xml 544 BLAKE2B 5d2a688f8f644b6893efd4f7a2e756d336c569a6a51fc4a0b0df94623ef7f3e8fa317fe6c971f233883b424e1abeaaf03ef92d56434cfea6eab5bdd3798ad6d5 SHA512 297a90e704de81f41a4f29871f96bed47aa00c703e79fd825b3a06ab8850fe67896c66dee2603f86cd6596a0c5cbd533c87cb94c1c674714f65767954341a3c8
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild
index ce8f87cddc9c..4397725c87a9 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.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
@@ -20,7 +20,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="crosscompile_opts_headers-only idl"
+IUSE="headers-only idl"
 RESTRICT="strip"
 
 S="${WORKDIR}/mingw-w64-v${PV}"
@@ -29,7 +29,7 @@ is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
 
 pkg_setup() {
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild
index ce8f87cddc9c..4397725c87a9 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.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
@@ -20,7 +20,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="crosscompile_opts_headers-only idl"
+IUSE="headers-only idl"
 RESTRICT="strip"
 
 S="${WORKDIR}/mingw-w64-v${PV}"
@@ -29,7 +29,7 @@ is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
 
 pkg_setup() {
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild
index ce8f87cddc9c..4397725c87a9 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.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
@@ -20,7 +20,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="crosscompile_opts_headers-only idl"
+IUSE="headers-only idl"
 RESTRICT="strip"
 
 S="${WORKDIR}/mingw-w64-v${PV}"
@@ -29,7 +29,7 @@ is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
 
 pkg_setup() {
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild
index b298a1a53043..3bb7305cf0f7 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.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
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="crosscompile_opts_headers-only idl libraries tools"
+IUSE="headers-only idl libraries tools"
 RESTRICT="strip"
 
 S="${WORKDIR}/mingw-w64-v${PV}"
@@ -31,7 +31,7 @@ is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
 crt_with() {
 	just_headers && echo --without-$1 || echo --with-$1
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild
index 2fc6dd78d673..f279453e0e46 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.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
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="crosscompile_opts_headers-only idl libraries tools"
+IUSE="headers-only idl libraries tools"
 RESTRICT="strip"
 
 S="${WORKDIR}/mingw-w64-v${PV}"
@@ -31,7 +31,7 @@ is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
 crt_with() {
 	just_headers && echo --without-$1 || echo --with-$1
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild
index 8b0d38b204ca..2a6523281428 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="crosscompile_opts_headers-only idl libraries tools"
+IUSE="headers-only idl libraries tools"
 RESTRICT="strip"
 
 S="${WORKDIR}/mingw-w64-v${PV}"
@@ -31,7 +31,7 @@ is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
 crt_with() {
 	just_headers && echo --without-$1 || echo --with-$1
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild
index 408aa8d8e7ba..d013a17c428a 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.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
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="crosscompile_opts_headers-only idl libraries tools"
+IUSE="headers-only idl libraries tools"
 RESTRICT="strip"
 
 S="${WORKDIR}/mingw-w64-v${PV}"
@@ -36,7 +36,7 @@ is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
 crt_with() {
 	just_headers && echo --without-$1 || echo --with-$1
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild
index 534091fe6549..25df5eae738c 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-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
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="crosscompile_opts_headers-only idl libraries tools"
+IUSE="headers-only idl libraries tools"
 RESTRICT="strip"
 
 S="${WORKDIR}/mingw-w64-v${PV}"
@@ -37,7 +37,7 @@ is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
 crt_with() {
 	just_headers && echo --without-$1 || echo --with-$1
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild
index 0edd83c00354..5141174deb44 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="crosscompile_opts_headers-only idl libraries tools"
+IUSE="headers-only idl libraries tools"
 RESTRICT="strip"
 
 S="${WORKDIR}/mingw-w64-v${PV}"
@@ -38,7 +38,7 @@ is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
 crt_with() {
 	just_headers && echo --without-$1 || echo --with-$1
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild
index 408aa8d8e7ba..d013a17c428a 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="crosscompile_opts_headers-only idl libraries tools"
+IUSE="headers-only idl libraries tools"
 RESTRICT="strip"
 
 S="${WORKDIR}/mingw-w64-v${PV}"
@@ -36,7 +36,7 @@ is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
 crt_with() {
 	just_headers && echo --without-$1 || echo --with-$1
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild
index 1b9f05639b8d..0dcbcfe06eea 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.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
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="crosscompile_opts_headers-only idl libraries tools"
+IUSE="headers-only idl libraries tools"
 RESTRICT="strip"
 
 S="${WORKDIR}/mingw-w64-v${PV}"
@@ -35,7 +35,7 @@ is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
 crt_with() {
 	just_headers && echo --without-$1 || echo --with-$1
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild
index a21054499a0c..225bba7d7322 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.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
@@ -22,7 +22,7 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="crosscompile_opts_headers-only idl libraries tools"
+IUSE="headers-only idl libraries tools"
 RESTRICT="strip"
 
 S="${WORKDIR}/mingw-w64-v${PV}"
@@ -35,7 +35,7 @@ is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
 crt_with() {
 	just_headers && echo --without-$1 || echo --with-$1
diff --git a/dev-util/vint/Manifest b/dev-util/vint/Manifest
index 0e550e4570c5..9af211e42a71 100644
--- a/dev-util/vint/Manifest
+++ b/dev-util/vint/Manifest
@@ -1,5 +1,5 @@
 DIST vint-0.3.13.tar.gz 91599 BLAKE2B 7cc9a6aca8cbd259d3ff79659c38e3d51b5f0ba75a7485872fd922543d75867fcc1689b0f7f8915e3195905b47bb0a467d9646bcb29082e9c04a1557e19b3717 SHA512 ef0b811df0250899e23e30ee4b240cf8b54e510231353ca86202661fd5f0826b9faeacc9268849e51bd6a1c71c1514498dec04a7a4ed79f00a5098811525e3d4
-DIST vint-0.3.16.tar.gz 94562 BLAKE2B 626c15cfa995df108b9ca085bbea9a81de6092bf8716fa2e55b5d475cae3c7ded8d2ba2169ec66bc979bd2a9b3a58c15079802b3fd6bd0fe7f091b4aff9f259c SHA512 53bc8077e710cea8356abc6cef06ceb9503db9d4a06b59f5fad724b6aebd3c97665e1e9454b1564f7f2b483e10f7cfcb5230cc679777ffeee1ce3d54a981ff6f
-EBUILD vint-0.3.13-r1.ebuild 1282 BLAKE2B e563b677de8d25eaf1be9387aa2302dabc00f78d9a97f075752fa658958510e38726d7a2710f68ccb8ff75d61eeeb61bccfdf95d36cb244e997815d93294a3a1 SHA512 1cbf63bf0a347168501ec98a386a0d2b91eb4615074f6b8b14027b88f132410b683af3b3ca513c0a4970f7f67856c07ef6e4f2ee9cf14d4d94800f00cbfdc2a7
-EBUILD vint-0.3.16.ebuild 1323 BLAKE2B bea0790c723b31ae6057d1e1f4c55bedb76740ab9093749895a502895d2e13cf44cd2017a8b2eb1cc311f3d01858436e058c9d74b2caf0e935a2fa921d3ef5ff SHA512 4a1ab9c15a8c14ca263b8393d5e3b353a029b738f5c02cf536e290eb579e4c273d222af41a4cc2ea5807bc3385a533db86611073b9a2f903da304fd9e079f190
+DIST vint-0.3.17.tar.gz 95358 BLAKE2B 102840bc2311148af5c20499c65417459d1abcdcaae0b95bd0bbb3e1569f98f0f0abb30ccae653aff844750efa340fc38a0f8905ee70b3aec8fdc5a8fcc0a6f6 SHA512 c3df61d47b4adf68ecfb8903ea0c030acbba3e72ce95514ef25823a5321181ebbf783c1a76613de9927acefb088edd890a0a776b40888cca62b2063e436820e6
+EBUILD vint-0.3.13-r1.ebuild 1286 BLAKE2B a7c10f97ad9a9e03860ff03e78d38e9dc3b8b44fca91b7a4f05c1a80b96917cff3607040f3e45479bbbfbd08d8d61967e8d831bbca6aa464bf4ddd1718050517 SHA512 97029069852754b6a87fe81f3fe79166ede0a34481f1110a4a1dcd7c69e4f319759f41f7e4d1e8312d81ffe5decf90a0a715f1dd36698419c05bba3c107a2cd0
+EBUILD vint-0.3.17.ebuild 1327 BLAKE2B 17167817907a28122568ae874b3b4289aa10a2ce8a7753062d0f095fddaacd3fbf46dd91e9f2178f0bf6936d6500379f160021a6f462c6f967a0146122d3b329 SHA512 8d27cbad3f6fe0faff91c7db523c2c775c0de49417cb7582b7ff3b50a62ac222a84d71d752bf478dc9c4197aaec3c3f67671af7e61c60a44d005e2a091750797
 MISC metadata.xml 555 BLAKE2B e81c06d278624abc6cd0f3d1410a79176ccba036344df6a1d414f8efce803e9395116f5fcf9dfdf791971a6160c0514f2a1d613f21b55805e6288fa1d11b4562 SHA512 ed3b8b8054f549adb826668dc08d364b02e86e0ec83d5455c8a9adc21702a143b488d028a8d12135a28f66bb673c3281d0f79fe20773ec1f78b632a86c859129
diff --git a/dev-util/vint/vint-0.3.13-r1.ebuild b/dev-util/vint/vint-0.3.13-r1.ebuild
index 36f8aa8e66b2..bcc5e5b2c5fd 100644
--- a/dev-util/vint/vint-0.3.13-r1.ebuild
+++ b/dev-util/vint/vint-0.3.13-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-util/vint/vint-0.3.16.ebuild b/dev-util/vint/vint-0.3.17.ebuild
index e7ba6712d64d..e24dcd2fab20 100644
--- a/dev-util/vint/vint-0.3.16.ebuild
+++ b/dev-util/vint/vint-0.3.17.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-util/w32api/Manifest b/dev-util/w32api/Manifest
index 0aeb63e45658..b47779bd2e50 100644
--- a/dev-util/w32api/Manifest
+++ b/dev-util/w32api/Manifest
@@ -1,5 +1,5 @@
 DIST w32api-3.17-2-mingw32-src.tar.lzma 965844 BLAKE2B 9dec25676f57dd7886f83871fee2186e3f9750eba620492aa43e7eeb58e402506c7d30bbd71c26c59c0d2c97b2aff25ffade00df8a3cc7b8835b803da8172045 SHA512 4fc8f319ab895366fb3757713e2724f8f4c90593687f1ccfdbfa6a52881ddc430167326e782117ae937c7e456e029132b971c3a041889bcfb876a84741475a1f
 DIST w32api-4.0.3-1-mingw32-src.tar.lzma 1341804 BLAKE2B cd7811b1291775926b15128b5c5f126ab09b9f7e824d7cf24210473c09563cfc06b3aaea40459502869e4df45d2b5af311b8d14b2bdaf793be483a5c80571fe7 SHA512 9295b7e803b1551dfefbf527e98fa315d60c70f6b63b4565942f7bc3d6032483d5ec4f76265b376fc6776c5ecfd1ad47fd912764c390b0b6917b1ad382250977
-EBUILD w32api-3.17.2.ebuild 1538 BLAKE2B a8d10be0e4cff9ea105d0cfc70d699564ebca126bc5f0b78aef0453e55309db80233c496cb842faf5ec0088ab7b4f8b554b76caf25a320996f9d3418a8529e1a SHA512 b800e604bd25daf552391ab5d01d3738c975bb67b3804ef8d0054bfd45d1dddb7432e65314f176a650ba27f69a73efde7be73b847be8336e0a675754c3b6fa84
-EBUILD w32api-4.0.3.1.ebuild 1634 BLAKE2B 6090c978bc8472f48cbcc182428183ed399ae6004d88ba5b4cae249de1ed0cabd053bf2e4bccf4871a0c1aa6298738171b150fe466e21d41d6a1aa720f458b32 SHA512 dc5c1d2f8f3692ad3ab0c56938e29f4e2a984be0be4675a0be8bc0c306741c456a7b9d1a65f0ff6e377b0123d17a1454c2dc320323ff14a68c6da1141205210d
+EBUILD w32api-3.17.2.ebuild 1502 BLAKE2B 684e294b1998a671d373849fbd20620b92c86ca7e56e4e7730f9016bf678c3a2105f66f7d996ba974b944d8df889ff5967e9822ef4a1a9f409eb1048be95fe15 SHA512 84f663819d1f8aa0c5848b23e28e54e71494a3bff72f0cd8ae8a4f170a1fb87b5087c240d4b2a9566152d82bc395c1765a2683f7833ae4de5a86e8eff3858729
+EBUILD w32api-4.0.3.1.ebuild 1598 BLAKE2B a7039078b084d49eb8438bcd3f3f4df18ded5e0ef8ae10cb976ad9e20b5a50b36bf2303d4d0e0b28fb2ff89fcb7d6b34a1e330aee81e5b451b451371dcd0a212 SHA512 02c252e36293780ff567cfc59dffb93f8ef914bd2eb396e4f40d7880d515ee77a2b5a007baf6e2167715c86c3482f6ba656e2f81bb6b5acc0745335c27e0e622
 MISC metadata.xml 336 BLAKE2B f5b695f0c70efe0aef9843aab32d906407185d04d70d0ca5dc63872ec3f30d08454f4c706ade2f5d6191ac39cb0c3252349f03a50cf9c1726562361634e7d928 SHA512 c15c4f7fe2796147558f99a89942b216159b291e18dfb02358f0985fef55e7ce166dbd0831ef24938a5bc76377634036932e0ce1526d01c2b07be35cac17cbf9
diff --git a/dev-util/w32api/w32api-3.17.2.ebuild b/dev-util/w32api/w32api-3.17.2.ebuild
index c04ebdcfad70..e718e475f226 100644
--- a/dev-util/w32api/w32api-3.17.2.ebuild
+++ b/dev-util/w32api/w32api-3.17.2.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
 
 export CBUILD=${CBUILD:-${CHOST}}
@@ -20,7 +20,7 @@ SRC_URI="mirror://sourceforge/mingw/${MY_P}-src.tar.lzma"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~sparc x86"
-IUSE="crosscompile_opts_headers-only"
+IUSE="headers-only"
 RESTRICT="strip"
 
 DEPEND="app-arch/xz-utils"
@@ -29,7 +29,7 @@ RDEPEND=""
 S=${WORKDIR}/${MY_P}
 
 just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
 
 pkg_setup() {
diff --git a/dev-util/w32api/w32api-4.0.3.1.ebuild b/dev-util/w32api/w32api-4.0.3.1.ebuild
index 0d8deb3895a8..26a1f1cb5bf2 100644
--- a/dev-util/w32api/w32api-4.0.3.1.ebuild
+++ b/dev-util/w32api/w32api-4.0.3.1.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="4"
@@ -23,7 +23,7 @@ LICENSE="BSD"
 SLOT="0"
 # Collides with mingw-runtime-4.x
 #KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="crosscompile_opts_headers-only"
+IUSE="headers-only"
 RESTRICT="strip"
 
 DEPEND="app-arch/xz-utils"
@@ -32,7 +32,7 @@ RDEPEND=""
 S=${WORKDIR}/${MY_P/-m/.m}-src
 
 just_headers() {
-	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
 }
 
 pkg_setup() {
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index 71cc3733e3d1..e236f170cbf8 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,4 +1,4 @@
 DIST xfce4-dev-tools-4.12.0.tar.bz2 309586 BLAKE2B 8ebcc8f133772eb39acba0b2f189a67751b9a2b4d36e5897003d56f6b88d3e97e89e0383b98c4b5ae684786d5aed3409a4b491fdbaa6e37bf8fc7447a33b8605 SHA512 60f90daaaac3eea355779ee1bb6a0cf24fb9e0ba70971c9c26ea681755de41560cfbca59a28241c2fd818031dc46e95c550424577451ceb7a42b1de0b0ff4a31
-EBUILD xfce4-dev-tools-4.12.0-r1.ebuild 630 BLAKE2B 92174f049161affb70bcec1cad126a31f7da45340eacbd1df9a75271a1117a9be21d4d78308535eabc0560957fbc33b9abab952ef075da2c2c4bb860d3ff70c0 SHA512 6203bf47f1cca7a227730e50af4da1a8120143ca36766f56e63e5d8addfb2e046df03f3574bf391c2219f69c10a8b6efdb72b4f5814eaf8f5112b8254c196e4b
+EBUILD xfce4-dev-tools-4.12.0-r1.ebuild 628 BLAKE2B 7db6c2582a443507471892d049fa4b0ccad548b8ed9266e1afffa66df9c9b6c1ea7e9e165b12035094b1f1c8a81f589365e42405f4b7f764ce94777153776cc8 SHA512 acacfdad10ad2df57b74089392d8483187d0f144f842bc0ef8f936a41ba85103204d51d64ff867d56c7b25ffacdf170df3ebfd18a1d805276ec35292d05f7fe5
 EBUILD xfce4-dev-tools-4.12.0.ebuild 656 BLAKE2B 8ac6d5792b533095405de797a2965b03a3cea149f780e65e9db7b6238854f1c2bb36fad06b74bfa0c2a0994ce93ed1cc0f17e6f3ba0c6eaee1264879b43fe85b SHA512 7eedf87afd0397dc9632458762b3471ebbbfd2453d5d2903584f79f05912999631629ea1d221aed8883705e05eeb6beff4dfe99aa38e0c515a9f0944b1b93382
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild
index 5888205ae529..478a1a7c37e1 100644
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild
+++ b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.30"