gentoo resync : 25.03.2018

18 files changed, 154 insertions, 48 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 8df4feba8126..68f05f3f85e0 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 887d3c1fb0ba..e88fd4b91d30 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,7 +1,7 @@
 DIST clion-143.1186.tar.gz 220702330 BLAKE2B 05799e66aff500adbb66f553f6fc00c58d1ea5e352b0f3d2e50897fbaa48c0977438027ec6282133502c0ce29d2392c49b2c000eae35407d8c3947b7e2d5ebe7 SHA512 d4ea1bad5f3da3bab569380114011798c29e633009867c8020363c9af72326ebaa3232dff9c931a67dd0a0195bf4903647e250963c7aeebe9ad83340c988cbad
 DIST clion-2016.2.1.tar.gz 287103613 BLAKE2B a3b31d5a5de5a9640cc7298ee6431030ed3e5954455a34845ee525b0edd73a265d0ac38df50094564f68f9f7c17883571c61c2e5dadcdfe504f7320492d7380c SHA512 a4734c1b5d544cb7f6bd4752f5853d3c44e123e8ad8584b76098ef51a00261350d49bdd628d08c171f7c04b77862e8f28b5d8f16813c282542f83a16100c7415
-DIST clion-2017.3.3.tar.gz 331047955 BLAKE2B eb12a2c5a22fe6541127f187da55eb2841ba878a1d8d1ff1b7c3bebf7e1a7895b451f089507306ecc5fa50190448826be69056ff848e1a25440330f3cb048f7c SHA512 b3003b8e3edd623f8356fae290a3c567b6712cd4dee335e7e4b35aed02bdf16abc57e8b4944e654d854d34f3e18d643bb4a3e0caf9e0ddac178d1e9d4bdb55ce
+DIST clion-2017.3.4.tar.gz 331195446 BLAKE2B 5d868de5b1d97a80dd2d63977dfda8d3ab56840c95e4cdba5b8e55cf626dbd68e1015fd8dae664dbdf8161853a96a492ce43a78e0e6bd13138144d28e1146f78 SHA512 044e713e2ab3724b891b48a1d75936dce1580be0fded174101f768f6976f76f2557768128fd596cc8855c15f27dbd9a1e9d4299b947ad00ca458c537d81fd0b8
 EBUILD clion-1.2.4.143.1186.ebuild 1777 BLAKE2B 5343a168bac0f2e2b84c6eff58711debab6a6e0ee1f6f8f3eab9d60694a4090d33200a496c54c4de0c31a44dd66fb7ceede10f6018b8c4f11ca2c1f6cf4117f2 SHA512 60327f78d5189ca3bbfd892d3d5c760d563ca4026acd1fc38bcd0d21dfee2bea8a22b2bebf91c2529a8bd100e05b218d2409e2a19b1b50c411ba2f4d18d7ad72
 EBUILD clion-2016.2.1.ebuild 1775 BLAKE2B 301d7f82b5d8275d205553b51076eb6d06906e51e50f0b6a0cf21c9dec2be61954b63a87e007ffcd8c44fb5072bfb2afecef21c17c9feaa083cc88dfb65a3dda SHA512 8370b3ca5696952e2d25da79e0b9715ab901d5eedeb93753d343582108f33a76535fb7187c2f3d291b04578a201c0b912e667132a48bf3bdf32f4f586151d37e
-EBUILD clion-2017.3.3.ebuild 1691 BLAKE2B 8a328cc12143812aff6bf86448d8fa3b8967e9ca76c346315b7f73943dc47004ed33803004fa924a340faf3732d49cb7c82ae100ea14680ff9af66bd2474eda2 SHA512 06f8220b6fd19196d4e62c0620ab7f7d2ae533b7c34427eb202a458fef60703c96679fb629b6ed5935121fceaad9a8506346778a8ca9ef11e3cbf79959915c1c
+EBUILD clion-2017.3.4.ebuild 1675 BLAKE2B 7f783320aa718aa64c41d88665428cef1007d96e63a0862b871fc7efb73b6402fe4a934e841a42733588d166107872c84c39f3caebba41532b237a092bcb4690 SHA512 dcc1430ceb9e5e137e11601503ef47f962644b06ec9e2785916dc4dbe0fbd9c6d71e9d193ac6601b87a4f665eae031afc697dbcff313f1be6c5a624448abbe3c
 MISC metadata.xml 470 BLAKE2B 839c416b941a14b2025a68ad5bf7cb1ea2d1be8b5f7cff2cd87cb5eff6ef73d37a462b868ee56ec70d9270d9ed15fc01533fb3a217fd1273de9b839c6dc8af82 SHA512 9aa5a4724a19a45cbd03c4d71005265509546d8e3134dbf634ed19ae4d7d3d56f2cf17edd9d7e3d2882e57c2f07a1229f0b76af11f2c95a3cfd56dd0db3b6757
diff --git a/dev-util/clion/clion-2017.3.3.ebuild b/dev-util/clion/clion-2017.3.4.ebuild
index e648402ebdbb..376319ea602b 100644
--- a/dev-util/clion/clion-2017.3.3.ebuild
+++ b/dev-util/clion/clion-2017.3.4.ebuild
@@ -3,18 +3,16 @@
 
 EAPI=6
 
-inherit desktop
-inherit eutils
+inherit desktop eutils
 
-SLOT="0"
-
-SRC_URI="http://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="A complete toolset for C and C++ development"
 HOMEPAGE="http://www.jetbrains.com/clion"
+SRC_URI="http://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
 LICENSE="IDEA
 	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
 
 # RDEPENDS may cause false positives in repoman.
 # clion requires cmake and gdb at runtime to build and debug C/C++ projects
@@ -57,6 +55,6 @@ src_install() {
 	make_desktop_entry "${PN}" "clion" "${PN}" "Development;IDE;"
 
 	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+	dodir /usr/lib/sysctl.d/
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/usr/lib/sysctl.d/30-clion-inotify-watches.conf" || die
 }
diff --git a/dev-util/cmdtest/Manifest b/dev-util/cmdtest/Manifest
index 644e95fbb172..afae394a80db 100644
--- a/dev-util/cmdtest/Manifest
+++ b/dev-util/cmdtest/Manifest
@@ -5,5 +5,5 @@ DIST cmdtest_0.30.orig.tar.xz 38508 BLAKE2B 7a27ed4930decdfbc49e922af9724ddba2da
 EBUILD cmdtest-0.16.ebuild 565 BLAKE2B 995a4abe2db0272e6f806937b4990fb89843ed2fcf825140e6ce963bf4beb14223aee7b50cbbd9f68a7e80249ef11f2f5253f34b889e821f8c7804e3261809d3 SHA512 35a3ab987715ec0af7dc3665c766a9c1b4d35005d7799eadb7478c0125add44761a61b17f8e2d8b80cf79421c0b0a3b7ca6f886153934728a5e2809f291fabe3
 EBUILD cmdtest-0.18.ebuild 601 BLAKE2B 77c1b49917bf33964f7f2075ccd9e2b2f068a5d50d7d3744b388db2d69870605813486e6ac6858a19fce0c2bfedcda576af3a09b2b1386afb95e8e5dad4207e3 SHA512 432135a76f50e12791623ceab1e1866dfdce2b038f0a82bc6c884f85f2aa50ba6371c6ba0bd1a9e1ac5d155dd6467e012b566ec22c1512a5e19553a6bc39970b
 EBUILD cmdtest-0.27.ebuild 641 BLAKE2B 0719f9ee8398d9651210172815b72314c5ce0a4f4aca2b676c54144a182e12de4a1b33670584401e3080cea867f02a74f14989aa9578394f0cad5759cf3d7094 SHA512 47d71f682e2f37c913593a768097bc1c04ccbcb393057428e89de3ea7ce214160fc25b785b7689327d73ed8fedd4c0e6b3269b51cd2ec33463cea4aeb26091d3
-EBUILD cmdtest-0.30.ebuild 741 BLAKE2B 0d14f47ee33ec07e93411ac7a266e506235190462028a4fcf62de0bccb2fddca10b8d390fe6f17d4c73d16e6e1d575d8df02f2ee44bbb75db9e0a3ba82d311b6 SHA512 aea730fbfcf304fbb99685f19e185349c96e6b9c7c23211173f7c635120f3c24e6c598a5d18b3be97ae2fc501628850ac9db5d6fa884714650c98d0596e96aac
+EBUILD cmdtest-0.30.ebuild 740 BLAKE2B 7389472d1479c094627eb8b89e81f077dae31219a4a30ff1855245f2d46ebaadfb5651c51e61ee965323af9a9011a3c0e006ee5c647abde709873fe34991e83b SHA512 8d8b8c897dcb2fa38b67006016f4af46b0264f18758eec9be88b02f2d0f988d05878fbeda63639441e7c639f6f57411f35eb2e3204c7cc8628762b0ead322b2a
 MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
diff --git a/dev-util/cmdtest/cmdtest-0.30.ebuild b/dev-util/cmdtest/cmdtest-0.30.ebuild
index 4babd4548541..aaef1d8ec955 100644
--- a/dev-util/cmdtest/cmdtest-0.30.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.30.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
 
 RDEPEND="
 	dev-python/cliapp[${PYTHON_USEDEP}]
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 1eae570bb88c..9ac669450db2 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -2,6 +2,6 @@ DIST dialog-1.3-20160828.tgz 501960 BLAKE2B a9ec14a56dfa165345b5cc60e2f91b3da6c3
 DIST dialog-1.3-20170131.tgz 507783 BLAKE2B a98c436eabc8d06619bd64a8b1d647a0712630f0f89565253636ef2f38333ca6926177aa0c2001305b0c06fc7a1f576cda87da493183402ef9ec3cdc3fa8be23 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786
 DIST dialog-1.3-20170509.tgz 509135 BLAKE2B 30f443953701f79db86a317d3c1a3a7743685388cf432a4d48e10f0df5181207e0a182f96566cd868d9ee5db8296f362e57f40a8e58c99d3b372eb967bc56ebe SHA512 dd3fe2041a15dd344ea39a1ba111d3b26daca1cda91a4e82f1223385a49cdf3de15f11129366a20c5a24b16b5301f215543850a390d70d0559f98247bbd49a56
 EBUILD dialog-1.3.20160828.ebuild 1278 BLAKE2B bd9847da9f7f35cdccc3639ffe919e1dd4265ba495f5a12fb1062b10cf2214309cd84fbc9b42208e4585d6cd2688628ff042c23b239513c64a3417408b03a943 SHA512 fe6672bf50566bab89d8a3c8938e647961fedc0f00ab1f33fe5d02b1973fbccea9c7bf258f96625f115dd4805aa3f8c6d26977547d49c32018b2e73881fe581a
-EBUILD dialog-1.3.20170131.ebuild 1283 BLAKE2B 98c8e145993e5faa0b1855eec45d7f1cc0b5f67c23186ac9d5d435641ece1e368080d6899368db324a1c8a2e71a14f19b5f815e7fe343bb622bc4a734195792d SHA512 66cc689d80812e5f87d480fbf1d376492090c9a85560612151facf102515d7aa3325e21cbe2ae25675613a5bc180294c7ef9c3e8674d12b61ec780b5d7db714f
+EBUILD dialog-1.3.20170131.ebuild 1282 BLAKE2B 5c4f7825d15cd72dfe9dd6c8d1f52da7260f54ed1ef0c54c08be884a8ce9fa094391436a47091a0fea52ce607268b1da51b167c905dd98698b8a7cc17c017ec9 SHA512 9ec24863c2597b4937a575b7e8d6ff6e1bdd1b54d8fd04b9382fa780a97765ab50dce65e469716052efd5800faf4d84c02397ff1e3cc81f1dde3f454a2bf41b4
 EBUILD dialog-1.3.20170509.ebuild 1290 BLAKE2B a9cc5c942135ea7ddede6b99f89a2b809b845a96bc6048d079e407a7cde93824a24795b9b3a0054cccdc541dee503322dea52d5fab87feacd7de55c206839263 SHA512 d0446c58fa792ad28393ee9946b866a7b45280e2aaa8d63add0f8c53a68229eaef793d9b65822edc1de13e354476c12a2bbbffa9aafe6c06adfb92648a520beb
 MISC metadata.xml 341 BLAKE2B 84cb58bb0ffe236825ae28f7f277c172eb8e8ec279aec915cdac1078342272a180aceb72400817be94b01568c24c4588d6423baa2be02c70a9971840a7e62650 SHA512 b194bfc5daa545724eaa7ec7dcc5618ec87249158d5e8fcb01a76375960b2d9dd012e596c0fc8e0d9c94eb39175a6b4424257cf0828cc73956c7a68ff4749da8
diff --git a/dev-util/dialog/dialog-1.3.20170131.ebuild b/dev-util/dialog/dialog-1.3.20170131.ebuild
index a3edce261da8..c73170b22412 100644
--- a/dev-util/dialog/dialog-1.3.20170131.ebuild
+++ b/dev-util/dialog/dialog-1.3.20170131.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0/14"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="examples minimal nls static-libs unicode"
 
 RDEPEND="
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 38632de9b4b3..52bc8f033588 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,6 +1,6 @@
 DIST meson-0.44.1.tar.gz 1136337 BLAKE2B 7391776d2f480f43c6cf0bfae3665c16a61c4a28fc4310dc8659ab4165ef76ad1729a9daf645330ea213aeb59e5ba9d991d021d1ad620f6673cebfd64b085d93 SHA512 3c350d1752ae4463ec47060e051d79cc0855385e9552deff34fad8431175fb5d0f04b51a242f8f8f737726d06e504339d6b02a5aa9558ee673fb867dbb4e5b2d
-DIST meson-0.45.0.tar.gz 1161584 BLAKE2B 4344d2eaa9f6242c69fa94603b948a43bb32143791aa9ebcb1e8ec4504af76696bca5b6da903551b4511ab498c4b5a8df4d231c965b304396224c646323d18f9 SHA512 9bc08655e113dc09857a71fe17bb3101d7aea625b65ae73054b0119069af71028d3b46ceee9f3a4eba02f5d21dbfab533c7c113c416881f213fdf01d452037e3
+DIST meson-0.45.1.tar.gz 1163287 BLAKE2B 820ab763193322c75ebf3a79cd38f49f9fa06f9645f382961eddab9bb088263f5ecc603d3ba6db9e038db1ea150d6897dc202bad24ff985ab1ef2dea3f08b724 SHA512 704731aae28ba5fe4c2040464d42489cfc1946c95c39e28eef170ba5ab929b8672c782ed18798528b59aeb38abd23e4930f38e38f1e8c45f1ccf96071b097731
 EBUILD meson-0.44.1.ebuild 923 BLAKE2B bd78fd51af575678067d4fad1c4c240fb4582607ad1dd0eb9bc2c114ac61942956bc93b2b419bbf95edc0c6c7ba4326833aa01a39036a67bf0ff504e4b9054a5 SHA512 3b69e8a6d79476bc93185865c6795b239eb8c4b91d6aab48b8fe6dfb14288e7c53b59ec2418795270f1901debe0ebdcf1167e5817bffb37b62cb6f270df9a4a9
-EBUILD meson-0.45.0-r1.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
+EBUILD meson-0.45.1.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
 EBUILD meson-9999.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.45.0-r1.ebuild b/dev-util/meson/meson-0.45.1.ebuild
index 37aab5a3b433..37aab5a3b433 100644
--- a/dev-util/meson/meson-0.45.0-r1.ebuild
+++ b/dev-util/meson/meson-0.45.1.ebuild
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index 756e9ee333a9..264bf2aef55d 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -22,6 +22,7 @@ EBUILD mingw64-runtime-5.0.1.ebuild 2524 BLAKE2B f9ab5353a35a61bc2f41720825ae532
 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-r1.ebuild 2572 BLAKE2B 9caca29d8aa7fdf54d3437a3801d7640bac7e4c9becd805b311a7247103d8772b8cfcef553db1175ed7b4973bd6667a5f7715b2179b1e66a0e44f90d366e9fae SHA512 c7b33d49e829790eaddd9739c5077a036a68ec0beae3e9d0a39687870028fc4a757878d6be89900ba56ac08cedfd5e7f90f4c1a26591902332de2b0a23dbde9f
+EBUILD mingw64-runtime-5.0.3-r2.ebuild 2683 BLAKE2B 92ccdb40cc2ebdc49bc903da98384f82a5fd7836f990b861662bdfb338478339702831b1e13c46301fd2329f2718e22357af0edc56dee238a75ff938207975bb SHA512 67946916dcc13cbae20ed39e8d90ad0905fd3179f3aed454e41dc48d417db33db61e374bbe00764ab373972cfd88a405a296950f5e13a4c4e34c73cb7d22f85c
 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-5.0.3-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild
index 0dcbcfe06eea..68655a1ed3a5 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
@@ -35,7 +35,10 @@ is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
 just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
+	is_crosscompile && use headers-only
+}
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
 }
 crt_with() {
 	just_headers && echo --without-$1 || echo --with-$1
@@ -74,9 +77,9 @@ src_configure() {
 	fi
 
 	CHOST=${CTARGET} econf \
-		--prefix="${EPREFIX}"/usr/${CTARGET} \
-		--includedir="${EPREFIX}"/usr/${CTARGET}/usr/include \
-		--libdir="${EPREFIX}"/usr/${CTARGET}/usr/lib \
+		--prefix="${EPREFIX}"$(alt_prefix) \
+		--includedir="${EPREFIX}"$(alt_prefix)/usr/include \
+		--libdir="${EPREFIX}"$(alt_prefix)/usr/lib \
 		--with-headers \
 		--enable-sdk \
 		$(crt_with crt) \
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r2.ebuild
new file mode 100644
index 000000000000..e52536087f3e
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r2.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+WANT_AUTOMAKE="1.15"
+
+inherit autotools flag-o-matic eutils
+
+DESCRIPTION="Free Win64 runtime and import library definitions"
+HOMEPAGE="http://mingw-w64.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="headers-only idl libraries tools"
+RESTRICT="strip"
+
+S="${WORKDIR}/mingw-w64-v${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use headers-only
+}
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+crt_with() {
+	just_headers && echo --without-$1 || echo --with-$1
+}
+crt_use_enable() {
+	just_headers && echo --without-$2 || use_enable "$@"
+}
+crt_use_with() {
+	just_headers && echo --without-$2 || use_with "$@"
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	CHOST=${CTARGET} strip-unsupported-flags
+
+	if ! just_headers; then
+		mkdir "${WORKDIR}/headers"
+		pushd "${WORKDIR}/headers" > /dev/null
+		CHOST=${CTARGET} "${S}/configure" \
+			--prefix="${T}/tmproot" \
+			--with-headers \
+			--without-crt \
+			|| die
+		popd > /dev/null
+		append-cppflags "-I${T}/tmproot/include"
+	fi
+
+	# By default configure tries to set --sysroot=${prefix}. We disable
+	# this behaviour with --with-sysroot=no to use gcc's sysroot default.
+	# That way we can cross-build mingw64-runtime with cross-emerge.
+	CHOST=${CTARGET} econf \
+		--with-sysroot=no \
+		--prefix="${EPREFIX}"$(alt_prefix)/usr \
+		--with-headers \
+		--enable-sdk \
+		$(crt_with crt) \
+		$(crt_use_enable idl idl) \
+		$(crt_use_with libraries libraries) \
+		$(crt_use_with tools tools) \
+		$(
+			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
+				&& echo --disable-lib32 --enable-lib64 \
+				|| echo --enable-lib32 --disable-lib64
+		)
+}
+
+src_compile() {
+	if ! just_headers; then
+		emake -C "${WORKDIR}/headers" install
+	fi
+	default
+}
+
+src_install() {
+	default
+
+	if is_crosscompile ; then
+		# gcc is configured to look at specific hard-coded paths for mingw #419601
+		dosym usr /usr/${CTARGET}/mingw
+		dosym usr /usr/${CTARGET}/${CTARGET}
+		dosym usr/include /usr/${CTARGET}/sys-include
+	fi
+
+	env -uRESTRICT CHOST=${CTARGET} prepallstrip
+	rm -rf "${ED}/usr/share"
+}
diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
index b7e8ad14c69e..6d24d1d6d670 100644
--- a/dev-util/rosdep/Manifest
+++ b/dev-util/rosdep/Manifest
@@ -1,6 +1,6 @@
-DIST rosdep-0.11.8.tar.gz 112899 BLAKE2B 863cb6caaa1748477ec6216dbcdaf1c547135e2aaddb533373d20cc84bef51f640ce3544aaf99821c749b953effd594cc1909ca7e05d6fb3e277ae806747c5a8 SHA512 9fe44eb2dbcdfce0ac6df9b4f6926d26fa12d9fe4089976a460448dc6d4ecb893c0c7cb6b6e9f16bd07da0be4088d7d3eb594d2c0fad6f77d8728e2873cbc344
 DIST rosdep-0.12.1.tar.gz 117102 BLAKE2B 42b0f6e7b6b0c2a4219bce24ff74ec01efb61ac0799a89baa5dc7f6b698e8f69a1578f744179252e7123c87c9fb0368b43a9a293609b28f6bfbc32c87b5f4627 SHA512 031bdfb4877865cacfab63a4494807ecf157d8514e89c7ab15e38fcbd4664df1247874975d7b1af42a8a1fc24cb62a558bd6b43732946f3122ffa6448a7631da
-EBUILD rosdep-0.11.8.ebuild 1455 BLAKE2B 89878ff04c2eb0036974e95d0b25071c45c57c705c3e737a1df99748f43c14192e9ae274c70be0963780557882fa2bfa3fb0e5928dd8e004b97be70faf95b7fe SHA512 26863413617e4a0a251aec84c1e2fddf297333ac7e00eff1e95ea2d4f76526bc7db89540f4371b12e1e5b93a6435e1eedc5ffd05c534025aea2e29badaa3ea07
+DIST rosdep-0.12.2.tar.gz 118343 BLAKE2B 98163feef406707772a54bf6d1825900ac593113d635de92adcac0ae7ce201c2e312116104c76c13b9c1e3b1847ef4dcc0cfb4fd1edcb2795c6b323fa9cc7167 SHA512 0932a5ff9874bbdffa1160fe0a391d27eef9a2f2435d7a89fa3b5e4eab0fc08205d4417aaea1254ab7bfe679cfeb61a6f1b199f06d65154b30505e2a280c0b61
 EBUILD rosdep-0.12.1.ebuild 1493 BLAKE2B 14848d0cc919de003bdf86d87fcb942ca22aaa66b5c19eee08c288529682f152b0d25c542573261df6a18929dd54e7282df704c193e2f1bb8e9e3432d10ac418 SHA512 ec31c55b9e7c4de2b5eb7ebeec2b877fc10492324cbc46bb17961efde0fca52ad7be3f61559d845ea101afd9700fb01640b11b9ee30e32e07828b5bf4a1eab67
+EBUILD rosdep-0.12.2.ebuild 1493 BLAKE2B 14848d0cc919de003bdf86d87fcb942ca22aaa66b5c19eee08c288529682f152b0d25c542573261df6a18929dd54e7282df704c193e2f1bb8e9e3432d10ac418 SHA512 ec31c55b9e7c4de2b5eb7ebeec2b877fc10492324cbc46bb17961efde0fca52ad7be3f61559d845ea101afd9700fb01640b11b9ee30e32e07828b5bf4a1eab67
 EBUILD rosdep-9999.ebuild 1493 BLAKE2B 14848d0cc919de003bdf86d87fcb942ca22aaa66b5c19eee08c288529682f152b0d25c542573261df6a18929dd54e7282df704c193e2f1bb8e9e3432d10ac418 SHA512 ec31c55b9e7c4de2b5eb7ebeec2b877fc10492324cbc46bb17961efde0fca52ad7be3f61559d845ea101afd9700fb01640b11b9ee30e32e07828b5bf4a1eab67
 MISC metadata.xml 339 BLAKE2B 98c570641ca07f96e5fcfaece9d49977136f720d77c9cf6dcecbb06bc4016410e082201d69d3c36af5de03cc70ea5a1b726289124324e2f11266e5db69a6ea97 SHA512 62ab4dc2638e4af95290eba19e1755d3bade56e5d1e7251d3cc9da410fcf7ead48562193b2cb6b6f8800daf7df31786e70ce153780b9e278891c31d2b9c257bf
diff --git a/dev-util/rosdep/rosdep-0.11.8.ebuild b/dev-util/rosdep/rosdep-0.12.2.ebuild
index 463cc83cafbd..842ec4941e9e 100644
--- a/dev-util/rosdep/rosdep-0.11.8.ebuild
+++ b/dev-util/rosdep/rosdep-0.12.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=5
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-util/statifier/Manifest b/dev-util/statifier/Manifest
index da553fcaf404..eec7d8663ae2 100644
--- a/dev-util/statifier/Manifest
+++ b/dev-util/statifier/Manifest
@@ -1,3 +1,3 @@
 DIST statifier-1.7.4.tar.gz 73245 BLAKE2B 897b78b31aa4f148b6a6a986251ba9d4f40ebad3209f71896ffffb71e06ab25d337a4a79adc0217592051f917bc71428d3032f6216ec053f62c4632edef474d5 SHA512 22d4873130bafe06144c8f6ce7089aa25e3eb047bbee5709344fee1e8d85b24aac689c88d34537fe4a690e231d768e56a2fa13672b9eccf27d945b3f8bcda756
-EBUILD statifier-1.7.4.ebuild 917 BLAKE2B be4f41d9863a281f8743df62e5f5472fe6414dbee1e12a880b72dbe67ac1a41ffbab86fe7c5ccff3a7aea8032d14ad2677154a0867f77a09e5226c6b726f7229 SHA512 c5ce6da61b64a14d3a443ec46b21cd650c25c51c86860750c60723455c9b5e0553f8c702c21674df9b6b98e3ed16ebf67211002ecc81576520b2620bc88a0fef
+EBUILD statifier-1.7.4.ebuild 1131 BLAKE2B a278f994399923631a587542e2e8fda7f22f53210c9d2e4ab594aedaa3afede3effd0921d8b89128e36dd5b5796005c70e21b23314b5de4e9ac848a4b11cd10c SHA512 3359e99cc8ab99dfbf80b780dcb3f7acfc1843ae17b55815591bdd20b6669e736013ce3d4157e7e6878e74503c3dc286746717d4ecfeec4d1c632967e49f85cc
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/dev-util/statifier/statifier-1.7.4.ebuild b/dev-util/statifier/statifier-1.7.4.ebuild
index 2e2867cd1b96..a90f4825f90a 100644
--- a/dev-util/statifier/statifier-1.7.4.ebuild
+++ b/dev-util/statifier/statifier-1.7.4.ebuild
@@ -3,6 +3,10 @@
 
 EAPI="6"
 
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit multilib-build
+
 DESCRIPTION="Statifier is a tool for creating portable, self-containing Linux executables"
 HOMEPAGE="http://statifier.sourceforge.net"
 SRC_URI="https://sourceforge.net/projects/${PN}/files/${PN}/${PV}/${P}.tar.gz"
@@ -20,6 +24,11 @@ src_prepare() {
 	# Respect users CFLAGS and LDFLAGS
 	sed -i -e 's/-Wall -O2/$(CFLAGS) $(LDFLAGS)/g' src/Makefile || die
 
+	# Don't compile 32-bit on amd64 no-multilib profile
+	if ! use abi_x86_32; then
+		sed -i -e 's/ELF32 .*/ELF32 := no/g' configs/config.x86_64 || die
+	fi
+
 	# Apply user patches
 	eapply_user
 }
diff --git a/dev-util/xfce4-dev-tools/Manifest b/dev-util/xfce4-dev-tools/Manifest
index da55a86b08b9..1becaeeda521 100644
--- a/dev-util/xfce4-dev-tools/Manifest
+++ b/dev-util/xfce4-dev-tools/Manifest
@@ -1,4 +1,3 @@
 DIST xfce4-dev-tools-4.12.0.tar.bz2 309586 BLAKE2B 8ebcc8f133772eb39acba0b2f189a67751b9a2b4d36e5897003d56f6b88d3e97e89e0383b98c4b5ae684786d5aed3409a4b491fdbaa6e37bf8fc7447a33b8605 SHA512 60f90daaaac3eea355779ee1bb6a0cf24fb9e0ba70971c9c26ea681755de41560cfbca59a28241c2fd818031dc46e95c550424577451ceb7a42b1de0b0ff4a31
 EBUILD xfce4-dev-tools-4.12.0-r1.ebuild 625 BLAKE2B 4f1d21d96f00d66c831dcdd3da7227245c728b209a850af016d60b6464ea09ca705b14e51419d4104a19737cb4bbfed3bbbf491b2eb38f9cbd215042fc35bdb2 SHA512 8095e118fcfbfeffd6482cef19762cae62406bda526a5488ade91157592881519ca99adb4b3f3f832941ac021ce6e3d47bea02180d42c5ee8269870685bf1241
-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.ebuild b/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild
deleted file mode 100644
index 1f2adf858832..000000000000
--- a/dev-util/xfce4-dev-tools/xfce4-dev-tools-4.12.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit xfconf
-
-DESCRIPTION="A set of scripts and m4/autoconf macros that ease build system maintenance"
-HOMEPAGE="https://www.xfce.org/ http://users.xfce.org/~benny/projects/xfce4-dev-tools/"
-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"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.30"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_setup() {
-	DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-}