gentoo resync : 07.04.2018

35 files changed, 107 insertions, 186 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 16c57433c8bc..144beb57bc4b 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
index 1ef2b0071665..a1e9afe6f37b 100644
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@@ -1,3 +1,3 @@
 DIST ivykis-0.42.2.tar.gz 653885 BLAKE2B e4a5310ce6fd15aea79091edd56221f77c64a68472fa9bd44715da8c21b4b54f55c2e8c886491afcb8c206107b78b20cd7ad727a96690e8c718f2a2aaeb32aac SHA512 0a166869b434668219c379a8acf7b2da17cb1e29aef74f9dde869a322d3b34e36c84bd67800f7fb234a29bf9372061329189f02ab6d7f85bb2622b4c43185270
-EBUILD ivykis-0.42.2.ebuild 381 BLAKE2B a3535cfdc5b0ef486d5817e3f671ce81a59bd3b4d61c9efbc2ff6a199ecb23d1557e6cb456434d8df4e74b859a5a7526f2ce0b107b80bdb8b8d730d56e9aa6d3 SHA512 1652b74d0b10a6179f022889ca7ec1684b26df86897aed3aa3d1b3f6c795dec9d29da4c57e2b592718b3e52f9a0f66b2b8882df2ffb8a3e56f189f6bf07c7adc
+EBUILD ivykis-0.42.2.ebuild 386 BLAKE2B 49f128fa1472c134e839701ab281772d9b743d899eaff9b1a10bffa13ff8bbd18ae8c49c34d6eca975e665fccea32e122c766217a11f033eb2de4aa82b04de9c SHA512 e41256533e703c1569eca81150426b6bed415b006e664f3e87537c95167760a8dd35685a1b8547fa1890c1641777599b0e1b30aa3033c0f59602d48a5aab7191
 MISC metadata.xml 462 BLAKE2B 64b01c11fccd36c0d1c027c8c904ea843adcd233cea786bac604d81044929f420a64ceb9b6a713bfea8637710899254981b44213ac3832173b556026d51b2ee9 SHA512 70b8289fc39f3a8132f8d85577c8795d9ae44fc72934765fa12226f147b43d28472afa77d9a39e65d48d123dfc9a69f509090956317258de3e3cdf8f95a03e9e
diff --git a/dev-libs/ivykis/ivykis-0.42.2.ebuild b/dev-libs/ivykis/ivykis-0.42.2.ebuild
index 2b310b4758f0..3530fb1257a4 100644
--- a/dev-libs/ivykis/ivykis-0.42.2.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.2.ebuild
@@ -9,4 +9,4 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 hppa ia64 ~ppc ~ppc64 sparc x86"
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 570c77a090eb..abca118743e5 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,5 +1,5 @@
 DIST jsoncpp-1.8.1.tar.gz 210629 BLAKE2B 5f9a7f51b463784c5a74a78b7189800a37797f233b1d5a66d34edc0689c77a2b96b230c0ed4dfc749401087c551dd5659a6d152e09342ca92250ce9ea91a293e SHA512 4203826fca4c366b51d28ffc928399c914ffaba8be1cada64ff118b5742e6b469d3fc3e59344587d851447857b479794c5697d4fd11a9a55b32a3a7a801b745b
 DIST jsoncpp-1.8.4.tar.gz 200226 BLAKE2B bbfa8cf7b6cfa6af34762b54de2da0e919849c65b1093b29f7a7ac437524d8b3cf07b42926b250489e9a289105df971fad798f3e73f908fac3e2f52a4e5467b3 SHA512 f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
 EBUILD jsoncpp-1.8.1.ebuild 1353 BLAKE2B a561f153e32b1b81043fc02b64020a51235fb6557626aeceb49ddb58be7a424f8da93c2c8db7bb16a24a4d6cd86e01f8c7290f22926d983794fa2969ce4cbd1f SHA512 1479c2d2c5069ff392f158dc7f0e8320b1414d15ebb941a62a3e1359baf482e3e07093b828e38796180f5b08866e081fe3cd9f62efdca5104e9c583a1ec24a82
-EBUILD jsoncpp-1.8.4.ebuild 1371 BLAKE2B c4eb8408e0151f36d504c95a4acd758e94c5a281b6aeef2ff0dae2ff69dd9d40a75a1bf2285943ceff34e4cdbed03d149cdad5ad69c826e0e1895387faa3b70a SHA512 4c41a98e1e35c593e11232635f3780c473e99b90848dd14d79b00dcab6738aa0af673cec3065e68faccbb6ba9c1cbff939fcb567289b3982d5602ac3c411c3b1
+EBUILD jsoncpp-1.8.4.ebuild 1369 BLAKE2B 7da910bd64137755c85315743ea4066f3685093169dcc31e724af42658d6106113eb22f57f9c3f6f9f976d5c485db47cfd5e5f887ac01863269e967dcf774676 SHA512 4f31c63900a3fcf32e5a465ea5245258e76b4c470981599e9fb9f920772eb22168f411b14c37a93fea864b1c21f9620126a6c1100398bf4769b247049dbf581c
 MISC metadata.xml 522 BLAKE2B 6f34ae666bd7ccce5ccb075abfed8c32b8b5b3b32ac9fde277871ab735626fef6af12bf6b9da75f081726af7846bbe55cb8fe0663f107d6adb4f3bdf2db2dd26 SHA512 95270a54162bd5940602765fc238d7f30fdd0f42b8523774464a3f2e124b586dc0b03913a7b2db4bbb90f83b6384b97d8b8af8bcfabe7ce50dc93e2c87058530
diff --git a/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
index cdce6d23b442..9ad40f8d7dc4 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/19"
-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"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-libs/libbson/Manifest b/dev-libs/libbson/Manifest
index 4d69ce6328f7..9bf2a8f99e66 100644
--- a/dev-libs/libbson/Manifest
+++ b/dev-libs/libbson/Manifest
@@ -12,6 +12,6 @@ EBUILD libbson-1.1.2.ebuild 975 BLAKE2B a7c1cc4f20a4849c54cdec5810b5e157f7560abb
 EBUILD libbson-1.3.5.ebuild 1145 BLAKE2B 6467960799504edf6ad9ecd42af2ec474e0884cc63380cf736a0e771a5994f7aac46236965c5345dc4f5576ea4fdc7070c9d4579a1189e96dd9200dcd079cdf5 SHA512 015f73d09a48b70c80943cccfcba82a4978bcbbf72e41d5f44fb3137b81384f78e3811528f5292b4d57d88ebfdeab03f2779552ecd0359b5a460d054eabe83e5
 EBUILD libbson-1.3.6.ebuild 1123 BLAKE2B b568b6ba2dad1c940d0a77e04b9b3aacc119377f378a496edf2a4757c37110bb89a8325c3f1b6682dfe87209f582e37165290387b0ab4cc98bad51529550a3f8 SHA512 1abff3af97b0a699689d92f5f80affa42228b5abeac36a0eba830c4ae6eacd87e67c192045aa1921d43f4a2fad5e407bea728cee6f2100bb4d0a4df7765b6c57
 EBUILD libbson-1.6.2.ebuild 1029 BLAKE2B f0a06a4ce9183946888f5ccc420e14c14ea2efa69904816355d5cfba5f69ead47bfbd385f2bd9b905e9af670f9476be3163551c1677694c6ebd55091fed46a0c SHA512 1dfdf5109c4ddc3820fa445c22aa0f8ca49bd141cbd6ef733bcfd689dce291b31073f172e53054f241d6860eff34e76411ab77fb381948ee147ff1d1aa4a6843
-EBUILD libbson-1.8.2.ebuild 775 BLAKE2B 757fcbfa99d6faf368f1e8f75470ab94a7fc055d1bd13cd57e4005e8e27852a39ec5cf7adf6d426b0b15e18c4ddd2194ddf7d77768d2c01a855e20f32ed330bf SHA512 0823615caf208dd73db77cff1b45c819b04e597e3a046352c905fe52bb46095baba016362b31684b1d269d1907367e90642a97d6cc684f67fadecf0f5188615f
+EBUILD libbson-1.8.2.ebuild 774 BLAKE2B ab3fd5c073414eebd7d2a13112b3433ab9aa6910b4227c23c2ffdc903c38ec739795ad6c8ef3192b8d84a4b9df5da5454a262432f6f4cbef43b48cccf9c5b62e SHA512 27a985090071f8e8084681dc82d310d7a7259a32a3715aac00914e4ee934049e1369b90484b5bd70bd936273fd1ef1314ee568c41f29b188d4f4e7c917cfcd3d
 EBUILD libbson-1.9.3.ebuild 777 BLAKE2B cd5fe3826c1fdf263b86a1e7d4f4247cc5839497c04c88cfe70036a0a33a2c468f8118b1fbd5ea4248b84db948176564db724bdd3eb7951b1464a61def9c9607 SHA512 d847c9bf88596c69f281041dd6bff7b4bf9ee88e5e92f8b2fe4b16105d56ca826bb5fcd9d7f7b33ade37edb74e3c161b6b85c6060b91a7d73332d404214fb463
 MISC metadata.xml 404 BLAKE2B 09f99f8595c089c30e13406a3dfe969c444b325dd1fbbd8ced6c9f3e257556dfe5ef762bd97cc16067c9691dba04fe38e855280c2058d90e7970a01474324a98 SHA512 081d2001bcf61d7cb00a36ddaa1869cdce615fa706693efa907676e4224c297871cb65a3dbc64397f87b29c751125735b35ba595e4344a654f2682092411e8c9
diff --git a/dev-libs/libbson/libbson-1.8.2.ebuild b/dev-libs/libbson/libbson-1.8.2.ebuild
index afa64c6c9047..2a781b8d31cf 100644
--- a/dev-libs/libbson/libbson-1.8.2.ebuild
+++ b/dev-libs/libbson/libbson-1.8.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc x86"
+KEYWORDS="amd64 hppa ~ppc x86"
 IUSE="debug examples static-libs"
 
 src_configure() {
diff --git a/dev-libs/libdaemon/Manifest b/dev-libs/libdaemon/Manifest
index a86fb0c7ec18..3034d41ae438 100644
--- a/dev-libs/libdaemon/Manifest
+++ b/dev-libs/libdaemon/Manifest
@@ -2,5 +2,5 @@ AUX 0.14-man-page-typo-fix.patch 1562 BLAKE2B 3e0bc53ca9cbe959ba6360c6226ee99a82
 DIST libdaemon-0.14.tar.gz 340474 BLAKE2B 1dd6ac48e7b9a31f58688c7a59814435059287a30db80dd7c9cf69f9eaba27245424ecdbfd8719a4cf30d9686f4b61bb5e394821f66c05e770c244a0208e8f3f SHA512 a96b25c09bd63cc192c1c5f8b5bf34cc6ad0c32d42ac14b520add611423b6ad3d64091a47e0c7ab9a94476a5e645529abccea3ed6b23596567163fba88131ff2
 EBUILD libdaemon-0.14-r1.ebuild 1199 BLAKE2B 5dfa0749f2f582edc5003f4c1d9bf4f00d4100ad62d5ff058ea4a996d5e6f23d5f4bd74e18be8b9afebf23bdd45a825c2de0b488652b047c38bbf0c81763e806 SHA512 a4f0679b5702353f0dc05cc959dbe1cacba004093a69430fa71a85e2d0be0a80c07603d3e62152ebc203e8dc0fca412b764614cf9ccabb291e0fbcbd3d0d2070
 EBUILD libdaemon-0.14-r2.ebuild 1446 BLAKE2B 4e43ad8358555b319685431f1f7f3b2598116060cfe0d3dac1f923f06bcfcd84438036dd17fb2e174df5ff8397332ce557d81541b8fe7455cfa2ab1abe3027e1 SHA512 dffc3b0c3bedd18a109b5831009aaa309023645d4b419cf9f3d718cfc6629b2e0de5c738b681a093a3f7207b8076d88abbca880a002c2e7c5e8f1256446ff892
-EBUILD libdaemon-0.14-r3.ebuild 1402 BLAKE2B 823765ac95a9984d0dcf89009e96bdb3a268c0869f6dc29a1de2d5495ea7a1ed7c2cd9de5d64d57c1a6f158401356e08cd3ac491e7e603a4ee69e5927148a9c2 SHA512 2dd942161be0551fd38d0edacf59ccb142b700c1db0ba7e858a8ba733c31e112dbead9927591248fa533d6ce833900e30573898573a5a966369d13f15700c5e7
+EBUILD libdaemon-0.14-r3.ebuild 1401 BLAKE2B 57603ac8bea3e1ab88607e00cfc40b1e05b453d6c3a6f6daaa80fbcf82c49ec2b8cd87a5af9e36b119f4f02f914bf9b529eb3d790edef7dc98390c30e9bf96d0 SHA512 c2113f7bb113a3a12b73e1973ba85b499da6c6803b67956895cbe6aec7c54ab77c5abdf5b9ad9541b7d84418a18df256ebab538547db97917af50c1ebb871957
 MISC metadata.xml 214 BLAKE2B 33eeb62dd1e0788ebdae4c98136c1c6a3b94a197683d1056a2e0c08566d14cde6469852038c1c8a574141f422d7ed3559332415f8ae79ab0fc223bc5fb55a1b8 SHA512 9b8ba52023f39252d9fc270607a4b928d4c961c893ef4f722d7e2ac567c66a3de509849ef754e3c8fef73923144251e5ebcc19b0d2ec93b94ab79ffb5c17cb83
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
index 4517293ee693..8d64d71e16d4 100644
--- a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/5"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-libs/libgpiod/Manifest b/dev-libs/libgpiod/Manifest
new file mode 100644
index 000000000000..8bf405f1fc2e
--- /dev/null
+++ b/dev-libs/libgpiod/Manifest
@@ -0,0 +1,3 @@
+DIST libgpiod-1.0.tar.gz 411974 BLAKE2B e6c962329f7fad374d2771e60aa87e679970e3b593dda73d51f0511b14122d8a9d94eee3355ede2221d4ff0cd10f7116874c535fe90092fd61ccc5aa8f7e9818 SHA512 e8a71a7028fa73a94d8507d4329bee024c3e73d1b619dd5500172bf36509c7ccee521ddb6ef07283e3a4217af9da12ce154af657f8a536883f5495ffccf46e0c
+EBUILD libgpiod-1.0.ebuild 719 BLAKE2B 59a470e86ce2a0ae78030520ef902077d063d1571e5844b7290806e0f1088524d2f80c129ff8b79413d32db1962d595b2ab35ee74a222ae33ce4663c909196e4 SHA512 6b12f160c828d8251715a50c141a316019abec0d954b5a78313249ce2550fcb8466ca85587acc282be64869737fe2ea8033cbdc9682b5bebe0a733023d087222
+MISC metadata.xml 343 BLAKE2B fc70cc41ae2770c509013c4d1a5d8aaa441b6d52d1259b9e2f5cb2e8928e146f5451e399d1345901e88b1b488095990e8c9f9b296b43b38f91b38a22b3507c90 SHA512 051b47fa59f992bf8347e89d17eecf645d4a20457ac1d9db931982c9efa4a61d777df4e215a790d518ac77b2baa7497862fc724fbd581dccfa404bfd232d749b
diff --git a/dev-libs/libgpiod/libgpiod-1.0.ebuild b/dev-libs/libgpiod/libgpiod-1.0.ebuild
new file mode 100644
index 000000000000..c83a38aa5e72
--- /dev/null
+++ b/dev-libs/libgpiod/libgpiod-1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib multilib-minimal
+
+DESCRIPTION="C library and tools for interacting with the linux GPIO character device"
+HOMEPAGE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/"
+SRC_URI="https://dev.gentoo.org/~blueness/libgpiod/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+# Reflects the ABI of libgpiod.so
+SLOT="0/1"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs +tools"
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable tools)
+}
+
+multilib_src_install() {
+	default
+
+	if ! use static-libs; then
+		find "${D}" -name "*.a" -delete || die
+	fi
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libgpiod/metadata.xml b/dev-libs/libgpiod/metadata.xml
new file mode 100644
index 000000000000..e9d3e660684a
--- /dev/null
+++ b/dev-libs/libgpiod/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+	<use>
+		<flag name="tools">Build some useful gpio tools that use libgpiod.</flag>
+	</use>
+</pkgmetadata>
diff --git a/dev-libs/liblinear/Manifest b/dev-libs/liblinear/Manifest
index dc48b8c5b9f6..d46c7114b0b5 100644
--- a/dev-libs/liblinear/Manifest
+++ b/dev-libs/liblinear/Manifest
@@ -3,5 +3,5 @@ DIST liblinear-211.tar.gz 506507 BLAKE2B 31b7677dfbf9dbb060a28dc19c63db4244e55c4
 DIST liblinear-220.tar.gz 517302 BLAKE2B 6aa28c3357f830441ee3cb2e9691d4952e4d4db6592622f6e93be1ed12c8f871e4a9c98abcb35b472a227005bad0cc1e6076678358dc324a7453cbbfb34a0866 SHA512 cde798b7cb221513cf2b8bbe134d6c3dce1ed26c43504d8c09dbed93b82ca47bfd271d4dd3d03384187273906ce140d4ce4418a4a8c21410015ec1631c1042c6
 EBUILD liblinear-210-r1.ebuild 1415 BLAKE2B cb472c95901473cd8f1307b781c501383be43ca8796f158b5b9192e5450ac40705c7a4eb0e0383c13ffcdcf38ff8237a6cf1829d1ed8a2396014653a568b90b9 SHA512 6928d45c94eb3c63bb0d29ffadb4738240e6b24ca71d88e121a8091ccb92fcecb9a6df9c4d27e5c381ad8a9ea2fe3528793fd7a950ae90d8b6daaab95b8c777d
 EBUILD liblinear-211.ebuild 1433 BLAKE2B c809f415ff402c093fca9376b57990df962c67281da12dcb4bd6dd2e4740fc2d805204318e20b4f10c7be292c10a87c55c52bb9404c8abcd0ad4eecf599afd84 SHA512 650c1cd319cc802c3fe3cc2dd7a1d95b5527c49ba5215f58923c39bf77ca74d61b710ecc2aee6bb091315c7b7b51297141d0f167eabdbb022c9f2596bd43ac24
-EBUILD liblinear-220.ebuild 1433 BLAKE2B c809f415ff402c093fca9376b57990df962c67281da12dcb4bd6dd2e4740fc2d805204318e20b4f10c7be292c10a87c55c52bb9404c8abcd0ad4eecf599afd84 SHA512 650c1cd319cc802c3fe3cc2dd7a1d95b5527c49ba5215f58923c39bf77ca74d61b710ecc2aee6bb091315c7b7b51297141d0f167eabdbb022c9f2596bd43ac24
+EBUILD liblinear-220.ebuild 1444 BLAKE2B ec77b7c029d529bcc4948d61fa9f92c9d8fe0469c702068cc90595fb5eb54e9d13f72c2966d26b2fe62d8954acefd11cefb3416545d3abf7a57d9c70ad34dc2b SHA512 02df3d95f6ce2f3d406b7ce476c0c033d85e17bf3a98e35c8d0f13f7d479404672f1e8f5679a861aee5b018c5a5f4b1e425f2d3ec63d62b631574e52343b3de3
 MISC metadata.xml 335 BLAKE2B 2a905547b4dbf1ea8870dc8816a63252e142edcba93710b5d2cb57c2b6603c165ea06a3b459f442e1d08653cb9c6530a56bbaa8685c8147a280d917b4cd1f342 SHA512 efd0a36cca5d21c4a5e94388d125870af42ae9091234a44ae53b8ac6ea7e6ad0b637a5629d3c9ceabfebddce71fde8fa94285e5b1c7edefddebb8bab9e99f0bd
diff --git a/dev-libs/liblinear/liblinear-220.ebuild b/dev-libs/liblinear/liblinear-220.ebuild
index aa78ae616b61..3080e1452cc5 100644
--- a/dev-libs/liblinear/liblinear-220.ebuild
+++ b/dev-libs/liblinear/liblinear-220.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/cjlin1/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-macos"
 IUSE="blas"
 
 RDEPEND="
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index dfb35e50868f..e9775a8b4b5c 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -8,8 +8,6 @@ DIST libressl-2.6.1.tar.gz 3219005 BLAKE2B ca5c1b2f1c824f9faf26cf335a533b98a9af4
 DIST libressl-2.6.2.tar.gz 3229140 BLAKE2B 65ee69ac9d5754a153ed8e9ca20240cf6d584093731a0fc53fc847f6c2a6516fa709f347ef58059a3dfde7a6013cef0188d6632a15ace172f6a371f1fcdb7756 SHA512 2896d52185b84edfb23eae73949f5a537966b42e659f00b0b2e0635e69daf546fc41e0e7b97cb52a85e73b2d27ead221a3225977f6b5ee998aefdabf0908a9e4
 DIST libressl-2.6.3.tar.gz 3228661 BLAKE2B 01d1e09a5c4541e1d6b35d0a1cd9246671a7cda404c9818885cce55897dd405585a656b748ca6c959224b7d6155c20700fb4a92c37af42429959162a7ad8fb87 SHA512 5c0a0f86ecad1226c2d9a3a8a2e6f412ac0941d402c213ae1d293cd90c6a684198410db8c5250f83b8e2b00968a089afc39e90e053669fc27f82a4eb7c65f5c9
 DIST libressl-2.6.4.tar.gz 3227935 BLAKE2B 48e865448a9e5b0b604b06060091073276aebd376506de73773a5eb9cb0bb4c5b93aa16353b4892abaee97ec933ad77e89775c3f52263d77bb17c68e481b4f70 SHA512 181761da573ff392aaee17dd3dde416d7cbb299ab3e07b49c97e279ceb3f619e78d1dc9ec4c59b0af024f0a8270ff31fe37f8282d0392be34c3143c9647cd246
-DIST libressl-2.7.0.tar.gz 3286436 BLAKE2B 883f24f70dc39c0547d63b852274ce12e03910d5b8eced70dbcffb062d236ad03b3e7dc0c265277f33666616f682b454130be18fb2f8112d42aabcaab8882a69 SHA512 d0e51fa7143f71266e9193fbda151c6e65ba403fa93b4030edcfd4909f5905b03586cc5605e58a62a190d46e9caf7191b6572106b8e92bc5400b2e1b6b7e025e
-DIST libressl-2.7.1.tar.gz 3362461 BLAKE2B 48b62160298ea7628c6671271b7ae9249cc3355cf6e504b504f7fef4ce62337f07e0a8117eef88fee7ae2a0517859f83e8540003dfd2c577f10841088d9eb180 SHA512 b7adc4250ba3fa5a3db20890aacb6b40dc9fbc29cc470c55dc9742430b9ba10ec122e6edf6f1671d77dea6347be1a23dc3d81b3b70f9b6e722212f356c36dfbc
 DIST libressl-2.7.2.tar.gz 3364227 BLAKE2B 49da6903a63425ac246c574b4c842706eaff184ba4a1768f61b2007296cb915f944f80f79edbad12b1a28a5552282522aa2b037195e2f917c06cf6917f1642e6 SHA512 12d00d057d449eb4119fc2f07034ebc0f1bbcb1602c0e07ef03b50440045eafd70594ddee352946cd9409aed8aceeb6988ba1643f582566fe3498499d94ece49
 EBUILD libressl-2.3.10.ebuild 1288 BLAKE2B 2fb26bb56c7a74b209df032d421e1ee8f47a3817878b145bbb3bf9c11a1630bed51d9203b4af28af83a2d59a92d0997cfdddb9de065537198b9e555b81a21ad5 SHA512 11102214e13ba952be7d85b3dc46b98e2330ad4139f9205bb5992e955092d647865bd2a3c31e3d9ac60404d5ed19aade4e322169c896cade2d5ae0164f9d52c2
 EBUILD libressl-2.4.5.ebuild 1288 BLAKE2B b0b15886c79d4711057dce71dd0bd087740a07799c9ecc529ff46572cbf4471cfd555ef3b95d9266a4c087bfc5f1b992e6112914500f7e4f04b0e67b2c66ce3c SHA512 52803ee1f7f98e2dbb84eccd2cdf69336572d90becee991f3b8866661c9473c01a102ea286396f9909f0ca69b4551356d3d64188f9a8b0c1c3fe2f2aa8b4f865
@@ -21,7 +19,5 @@ EBUILD libressl-2.6.1.ebuild 1308 BLAKE2B 005fc03aa6f53f0b66029e24e322360c126d87
 EBUILD libressl-2.6.2.ebuild 1308 BLAKE2B 005fc03aa6f53f0b66029e24e322360c126d87e63c011d70e6628341397b266d7fb1fd3ff029e2bbe6a5a3e38f3f2e344c9b255389de51ec9f8391bead806253 SHA512 c4463fe8f0829a9714fe072971d744b991ae6578324ad4c313076d8294814dee6ee3c7827d5bc530fc3ce7e2f91aaa8c307c98d98161477495ad526f7d6daefb
 EBUILD libressl-2.6.3-r2.ebuild 1315 BLAKE2B 27557c431220c36ead74810a6bec36f8c50e45efff1f76a57c26b0546d6a2a309a91e68e4156415f3bed7f2c1080a8c90764d00a3e5d1f91cbbd7a7f5574cad9 SHA512 817ac8f8a17a757cbada0e6978a880fd8ea1d84fae02c43b7ef0c48ea5a57c88fbb71e540bf4ac93d7fdf0698b0b8464fd482a6c9add2621215bafce8ecc46e2
 EBUILD libressl-2.6.4.ebuild 1313 BLAKE2B 6e9c7908dc7d757ce44897c72dac0b9ea92503d650c6df46eda5dbf65efd9e89a92ab52203c91a3e40c9f1f23c1a99851ef2fd54ffeba81fa80872f0cd2a2445 SHA512 587f95f4fe9824fe09a2654f5a0d16a2bc9de9fc4d40e3e263259067f6dd3bbe8d1a4ef89cf90952a602acbfe2171dc16bee030350956d87864437905fafd6ac
-EBUILD libressl-2.7.0.ebuild 1328 BLAKE2B 5336c18471c6bf59da562fcac0b531d6e698dd51ebe0278c3289c4f4cdbb55842d1f8a5df6d9c7b1d4156fa85f3629904e33b551803d2e909bfe90508e79523a SHA512 52e36b6f5ca5a65e4ec331f141c77c1effa072db202d9668735301f2f704e9aa4e347f4f0a4d2f1b53f90c6aa5b6abbbe6bdfef4ed5a55b4c4b9f0bd19f2f730
-EBUILD libressl-2.7.1.ebuild 1328 BLAKE2B 5336c18471c6bf59da562fcac0b531d6e698dd51ebe0278c3289c4f4cdbb55842d1f8a5df6d9c7b1d4156fa85f3629904e33b551803d2e909bfe90508e79523a SHA512 52e36b6f5ca5a65e4ec331f141c77c1effa072db202d9668735301f2f704e9aa4e347f4f0a4d2f1b53f90c6aa5b6abbbe6bdfef4ed5a55b4c4b9f0bd19f2f730
 EBUILD libressl-2.7.2.ebuild 1328 BLAKE2B 5336c18471c6bf59da562fcac0b531d6e698dd51ebe0278c3289c4f4cdbb55842d1f8a5df6d9c7b1d4156fa85f3629904e33b551803d2e909bfe90508e79523a SHA512 52e36b6f5ca5a65e4ec331f141c77c1effa072db202d9668735301f2f704e9aa4e347f4f0a4d2f1b53f90c6aa5b6abbbe6bdfef4ed5a55b4c4b9f0bd19f2f730
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.7.0.ebuild b/dev-libs/libressl/libressl-2.7.0.ebuild
deleted file mode 100644
index af207c40014f..000000000000
--- a/dev-libs/libressl/libressl-2.7.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="https://www.libressl.org/"
-SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
-
-LICENSE="ISC openssl"
-# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
-# we'll try to use the max of either.  However, if either change between
-# versions, we have to change the subslot to trigger rebuild of consumers.
-SLOT="0/45"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS=""
-IUSE="+asm static-libs"
-
-RDEPEND="!dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-	touch crypto/Makefile.in
-
-	sed -i \
-		-e '/^[ \t]*CFLAGS=/s#-g ##' \
-		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
-		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
-		configure || die "fixing CFLAGS failed"
-
-	eapply_user
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable asm) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/libressl/libressl-2.7.1.ebuild b/dev-libs/libressl/libressl-2.7.1.ebuild
deleted file mode 100644
index af207c40014f..000000000000
--- a/dev-libs/libressl/libressl-2.7.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib-minimal
-
-DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
-HOMEPAGE="https://www.libressl.org/"
-SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
-
-LICENSE="ISC openssl"
-# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
-# we'll try to use the max of either.  However, if either change between
-# versions, we have to change the subslot to trigger rebuild of consumers.
-SLOT="0/45"
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS=""
-IUSE="+asm static-libs"
-
-RDEPEND="!dev-libs/openssl:0"
-DEPEND="${RDEPEND}"
-PDEPEND="app-misc/ca-certificates"
-
-src_prepare() {
-	touch crypto/Makefile.in
-
-	sed -i \
-		-e '/^[ \t]*CFLAGS=/s#-g ##' \
-		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
-		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
-		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
-		configure || die "fixing CFLAGS failed"
-
-	eapply_user
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		$(use_enable asm) \
-		$(use_enable static-libs static)
-}
-
-multilib_src_test() {
-	emake check
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/libusb-compat/Manifest b/dev-libs/libusb-compat/Manifest
index d2c317632687..c3f9859ef6b0 100644
--- a/dev-libs/libusb-compat/Manifest
+++ b/dev-libs/libusb-compat/Manifest
@@ -1,5 +1,5 @@
-AUX libusb-0.1-ansi.patch 4461 BLAKE2B 025a91854a30dbee880eb27cc23756bc42af773ca25a82f5255d2917ca9948642410b14d11ef4f65ba52bd1c26e71b6ca14bc5327b7e941a1793f76deeee9032 SHA512 0256487ce4916e74154b18c9f57d88dc31344d0d047e70e7a0231c066747779e1455a422483f4d4ba182b57bd2be5038c9f091a8e0cef326128fee51efc04eb1
+AUX libusb-0.1-ansi.patch 4390 BLAKE2B c64a22623907ee5432d7f636642214221840df3721f226fedbe97da998e3503f9b6eb808e99a58f115f4bc1ac04a75b55928abd30786b9a6b5e3baa4b0f1edd9 SHA512 a3745567934bb8551b1fb0c7e43d5f749334ac763b05a23e15fb77af85034ca76fa6c65121c83cbfc44d82d6a879a43249148b1b894425956deb8eed3cf39e95
 DIST libusb-compat-0.1.5.tar.bz2 276769 BLAKE2B 66fa89c507d0454a587fa84d2ee2c34428963fa1770b44038fa45063466611ae263a3c790a167e5049393ef4d87073d1b16135d63cd0666256c3430bf36dae49 SHA512 fe63bd1c65e67588a83ebfdd329025ecf75f33f877fb80dd83eb528df057efb591e010416027f9054294504562299166e8e2811a7681fa1967a03baae9b88857
-EBUILD libusb-compat-0.1.5-r2.ebuild 1271 BLAKE2B ce9a6378324f2de24587c130ba87475551c207ef0e462cd74ff4cf93670a02e9dc78bff4681e2fc05bcbdd00a796600fbb0569296d32455b522bcb02b39b80a9 SHA512 6d0ab2dcc8a5b06f8bb78e83b7f46be1edd56b20acfdc19919686587c311e9cc65e7efa084407d1e38db0510fa8d43a5f1e1246cddc44ec134629612cf541e75
-EBUILD libusb-compat-0.1.5-r3.ebuild 1334 BLAKE2B cefc444f98e4ae5e1c51af4ee18f96f4db5fa9d93ed819b05a5a055b472b9d8675df8c6477c97076b6ca103990bae41100ddeb072dadc7611a9aa740afcdf8b4 SHA512 b008b9cc74a1a70cd34ba2ef93a2f50b0c27161f84c4c655d94e6c26991bf6e3a1ef051e8a6619b71982367f4b22a9f7ca7af887460ae5412cb1a3360ea16b99
+EBUILD libusb-compat-0.1.5-r2.ebuild 1143 BLAKE2B 3dbf21d533128c603b5dd5963e0201b62c7507d59c38687d16b3c14c93b309f8fdb28dd5feb392fb7a1fd6cc5cc000cf43d4ca595ccd2b16a6e002899a1e8186 SHA512 f5bd9084c0f64ac9852506a98ba38b612b8697743b031980edaeef7c2deac8f997ba3dd6f22ed372ac73b8488b1fa17eb6c6918e98ce3fcb5f53b4c41f498659
+EBUILD libusb-compat-0.1.5-r3.ebuild 1206 BLAKE2B 686518c59e3a51105e166e59f6d688f5fd8598fc5a1aa5cde02507c29f362b8a9aa32d190d2ef8f4e12dc7d25b06069e32a5b370d02072f175cfacfea205d60d SHA512 7307eedecc091e0fc2fdc721d853d79534d88c236ea9c47abaf5de4c2c4464a3aa7031458ca9f38327e5bab3228cdb301602387c4cb57a4369752478ffd8ba4f
 MISC metadata.xml 552 BLAKE2B b177713b8523c97bb9cbe9044b69207060489656f4369ebfd44051530f45eaac3500df7c3ba085a015ae8de96cc95777fa9ad1b900cdb3b1fc87395cd865feca SHA512 546ff60c99c3e575534cd660384429b4b4ea8c19fac29ab4ea8e432831f4c69452e08f50b70a038b233c2bd7ccd547e65ad25716d9521c0b5573f1b7d80fc052
diff --git a/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch b/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch
index ba3436f6d7b4..c04f7172f3ed 100644
--- a/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch
+++ b/dev-libs/libusb-compat/files/libusb-0.1-ansi.patch
@@ -1,5 +1,3 @@
-diff --git a/libusb/usb.h b/libusb/usb.h
-index b7af749..c9726ed 100644
 --- a/libusb/usb.h
 +++ b/libusb/usb.h
 @@ -27,8 +27,10 @@
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
index cdb691d5acf2..a6572e20ab75 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs multilib-minimal
+EAPI=6
+
+inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)"
 HOMEPAGE="http://libusb.sourceforge.net/"
@@ -14,19 +15,15 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86
 IUSE="debug examples static-libs"
 
 RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
-	!dev-libs/libusb:0
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	!dev-libs/libusb:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN/-compat}-0.1-ansi.patch
+)
 
 multilib_src_configure() {
 	ECONF_SOURCE=${S} \
@@ -42,7 +39,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 	einstalldocs
 
 	if use examples; then
diff --git a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
index 0fb988759d93..4e620b5b8fb4 100644
--- a/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
+++ b/dev-libs/libusb-compat/libusb-compat-0.1.5-r3.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs multilib-minimal
+EAPI=6
+
+inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="Userspace access to USB devices (libusb-0.1 compat wrapper)"
 HOMEPAGE="http://libusb.sourceforge.net/"
@@ -14,19 +15,15 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="debug examples static-libs"
 
 RDEPEND=">=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
-	!dev-libs/libusb:0
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+	!dev-libs/libusb:0"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN/-compat}-0.1-ansi.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${PN/-compat}-0.1-ansi.patch
+)
 
 MULTILIB_CHOST_TOOLS=(
 	/usr/bin/libusb-config
@@ -46,7 +43,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 	einstalldocs
 
 	if use examples; then
diff --git a/dev-libs/libusb/Manifest b/dev-libs/libusb/Manifest
index 0607c3b824ef..d4e3d80444c9 100644
--- a/dev-libs/libusb/Manifest
+++ b/dev-libs/libusb/Manifest
@@ -2,8 +2,8 @@ DIST libusb-1.0.19.tar.bz2 521496 BLAKE2B 9f38dcb8f053019511dc2eed93772183c54879
 DIST libusb-1.0.20.tar.bz2 795247 BLAKE2B 9b3b4b9e372487ca355611917eb00a41d439df391796edf0b4fea28fcd88ca92214d05c4beb8eaf918028d833544e385e59ca38426880c293e070c5f1fc64647 SHA512 4230047dbc18db402f399a6b228f70da37ce4f9da9d57203e5c31cf0edec5ddd664865b4f16038a2ae72c26097e713b709b9e882a11b65a274e84993d617c765
 DIST libusb-1.0.21.tar.bz2 607417 BLAKE2B c76352a19f416ad27b8940e99f38878e248cdbc04ef97752f8c8468ab0391869ab611197e3e143d69e0e23563da59f1691c14fce72958fdf28ebf10dd8c1521b SHA512 015ca07bdb559aa40af5db1302ab0b1c8a30d593699fe2f3c9f45162673dc7b608cecc58d60fde8f3bde2a68370794a045e8efa48fc55402eece11261e525762
 DIST libusb-1.0.22.tar.bz2 598833 BLAKE2B 38d01c1dd1837434c24008151a27cdfb2b2e9aab30fe95e4403bad613a0147a13b9b029814e15520bcfc2c181b00e3c5cc1ffdc3a586a604190bf441d3c89318 SHA512 2a93ba48bb66b9775838c16d74f7269348d9bc163f94ccf2842d1108d95a41cf79f8c8065233bea410fb94261a462dbb08ecfa1a9b6d3ddf4a5980e6043f74f4
-EBUILD libusb-1.0.19-r1.ebuild 1640 BLAKE2B b772c5fc3e9b8c7dfb4923da67d1eea3f8c8358f0784643f42ddb2414423daa9f922b650d06c4fa9e6457018e77f450376a81cae98e9ce1c22375317602194b6 SHA512 141aee9763ccc76e11ce4d074cece02369c7f65fda639a3c754e548b9ff1bd7ac00f3244cc1a04d8f2a5ca4507a5a8192eb11e8f30908ca239700012c982239a
-EBUILD libusb-1.0.20.ebuild 1733 BLAKE2B a0281c5ce42922e235c7ad7b78bf76d62dd5441fff8e7cd7b98f334c5e0906de32c284067d5bbcfd92b7b1c3a82041bcf411bf9ec53159516fa74933025dbfbe SHA512 5f926dcca1eb2e7bc614626fe1a751a2632e88abcf4b9152781e23ffb77a4d1a72971ea5a0bd5f4e7679d348eba294db30d18c55298860a9d09555e0126d0eea
-EBUILD libusb-1.0.21.ebuild 1577 BLAKE2B 4e51f54f8c8b10b0a21ea9f5ea3111c2df9e14a32ca387ce96a3f3b5e26da63baf8ffd26d69deee04b55c50cc351024e719d3fc52d0b3a54c3301272ca21ac1d SHA512 0e42d007ce9ad04d9de74737eb9ff417ea9725cdedcbc0a5410722bf648ea3255f8e08cf0b8d4126d5bb48d3f543e082574fb551402d62255813c1cd4fd5a8ec
+EBUILD libusb-1.0.19-r1.ebuild 1525 BLAKE2B 396f17ba82cc048c5d932c359d13f2567edea36b7b179d2b298c166b6e676470f00e1fa792fd087b60cb33f809ceadaa7ae19363147978b3f8619959b2ef656e SHA512 83c518f8cfeb5ad805d339f7327f5f45fae16d14b13e5d5815a453f0d9579cf5337b050da0aa598cd3c9917a3e486416154b8a8c53aee91a9369a7b199a00ff7
+EBUILD libusb-1.0.20.ebuild 1618 BLAKE2B 20ce9de797636977a9c063bfe00aef8c875e506be46a5f56d77d594a1877fe8ef13dc915289840ad015c75456261e2ee17977829259b46ebe8dbb8aa9703e95e SHA512 dbcf005dfd2090bbc49e1b8993a373f88978c9c924dc9cb4fa1508fda82863794889ad815c92105a163648ddba57578751804b8a82ca7755faaea9920fd3ef09
+EBUILD libusb-1.0.21.ebuild 1592 BLAKE2B 6caedd7599d9a0ba58074ae1e1fab39e4a5956e3e8ecd702ac9791ec02fa95e485fcd65b3fa1e37c368a9cabfece2bebfb303186058c795c2b1bebb2e0d6158f SHA512 6923651eca2d43482eecc331d662870b9d107671d18f2e492d3740797fee21d05010ac1db9f0153dc8aa61c3803021b8c1373edf57ab0a5b970772b4fdad530c
 EBUILD libusb-1.0.22.ebuild 1586 BLAKE2B 977c9b824b037a5f667547ed24e0a3628f30c1023f69e01e371f7afe24876c8a404d903544da6d0053f00974f9bbb8c5205e29e8ea68762315bbd66cce1a0f1b SHA512 43174dbbfc73f2db901de5670d8abb67dcf431b205cff0b03fedadd463d017411a332b5610944964a2cbd905867b0d7dcdbe35503885c400b4402fcb9e8fe359
 MISC metadata.xml 437 BLAKE2B 19a1ea2b26db27c6441a15502f61ca4240b1180b9aaaaf3942ce5b8cce5ee45724385401ec067901e31a0da785a636ca2e2a9d27efe231094d3952288374d169 SHA512 a67b2294e73782a948e338bc8820bc023e39ad612319a38387b3ee15e63903687ce4d90d8246df93cf2ea498c5c8dab25cb760c3f333d6dffc5d4d7b8c77a0a0
diff --git a/dev-libs/libusb/libusb-1.0.19-r1.ebuild b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
index e6a4ae67ceec..fbff28cd33df 100644
--- a/dev-libs/libusb/libusb-1.0.19-r1.ebuild
+++ b/dev-libs/libusb/libusb-1.0.19-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs multilib-minimal
+EAPI=6
+
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="Userspace access to USB devices"
 HOMEPAGE="http://libusb.info/"
@@ -13,11 +14,7 @@ SLOT="1"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 
-RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	!udev? ( virtual/os-headers )"
@@ -57,7 +54,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	dodoc AUTHORS ChangeLog NEWS PORTING README TODO
 
diff --git a/dev-libs/libusb/libusb-1.0.20.ebuild b/dev-libs/libusb/libusb-1.0.20.ebuild
index 5ac36c1e04ba..4cb30544b999 100644
--- a/dev-libs/libusb/libusb-1.0.20.ebuild
+++ b/dev-libs/libusb/libusb-1.0.20.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs multilib-minimal
+EAPI=6
+
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="Userspace access to USB devices"
 HOMEPAGE="http://libusb.info/ https://github.com/libusb/libusb"
@@ -13,11 +14,7 @@ SLOT="1"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc examples static-libs test udev"
 
-RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r7
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
+RDEPEND="udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP},static-libs?] )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
 	!udev? ( virtual/os-headers )"
@@ -58,7 +55,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	dodoc AUTHORS ChangeLog NEWS PORTING README TODO
 
diff --git a/dev-libs/libusb/libusb-1.0.21.ebuild b/dev-libs/libusb/libusb-1.0.21.ebuild
index 18cbced9c97c..d7128f492b8c 100644
--- a/dev-libs/libusb/libusb-1.0.21.ebuild
+++ b/dev-libs/libusb/libusb-1.0.21.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs multilib-minimal
+EAPI=6
+
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="Userspace access to USB devices"
 HOMEPAGE="http://libusb.info/ https://github.com/libusb/libusb"
@@ -53,7 +54,7 @@ multilib_src_install() {
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 
 	dodoc AUTHORS ChangeLog NEWS PORTING README TODO
 
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index c57c8a2d0490..93bac43951c4 100644
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -1,5 +1,5 @@
 DIST lzo-2.09.tar.gz 594855 BLAKE2B e2a3f3582ce8290f4c66e80e5703af7074a4f097f8b8dd953d8ebcfeea42bad13bbc724c268ef09f5344ff9857ed60cb5092085b225a1b33f0d1252369516cd4 SHA512 7c64e5e7d2050d75ac8c59d613f6f7230b74746b1d207666755b07450053c8b73980f12f8a1ec59d2af0bada02beec126aaacb675b8088b5fe65e97ff7e6bfc7
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
 EBUILD lzo-2.09.ebuild 1264 BLAKE2B 7c75a964bdebeea828ece72bfe7c57f45eb12f53f8df7334dfcd977c96b6b56cc10849667fcc1483e9955e4e7fd61cc0c44a29e5ef3a2ac60b3eb501a7414660 SHA512 09ef14f13313574994a9c2386eb3cbead83f9ac807394a0138dac0c507b7f1dafa00a97f0997351b52d4d84507b7022d697de03c96b0e5ff3ae98950e03ff29d
-EBUILD lzo-2.10.ebuild 1048 BLAKE2B 9afa3325e09fcd29817af2ba68231ed5f53330c2be314a993e8610cc7e61d24afda69ffe59a402aa88dab7b8ed7d068afb49efb42d34a7c863cd7dcc3db4044a SHA512 76a1c74dc5dd42db124a6701315fd9a0916b293003429aa4c7059f226b482a50bb558a17db6f976406bdb951e5e93080344be7c108ea49bb5414495f42077be0
+EBUILD lzo-2.10.ebuild 1044 BLAKE2B 02531619cbb883c2b3d4a552e52a064aaefc67ebb79f74bcf0e47e82f255e0a05cc9eef4d6904a559db88287ef2a7fb9f19cf1289ab383d464db8c1acded0ea8 SHA512 ee83f8a6261a49d071b280470ed5a91e75914b71ff48824b20b2a0bdd48aadf93c2bd551783497832939be7543fda17e277a56d94edaf9a5afa3c24cc6cbba99
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-libs/lzo/lzo-2.10.ebuild b/dev-libs/lzo/lzo-2.10.ebuild
index 7a1999d9443f..e7f8186b70bc 100644
--- a/dev-libs/lzo/lzo-2.10.ebuild
+++ b/dev-libs/lzo/lzo-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples static-libs"
 
 multilib_src_configure() {
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index b2bffb27bee6..2763af21a13b 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -15,6 +15,6 @@ EBUILD mongo-c-driver-1.1.10.ebuild 1803 BLAKE2B ed8a0f4296418db9836fe3cc4052a9d
 EBUILD mongo-c-driver-1.1.2-r1.ebuild 1800 BLAKE2B 61782ec9c74e2d67bd884c1e1aa1b51eda2aa7148b3df90de3b45187c2823efb3afff7edff1eb5047bb205004a3b9cb8977c0945e6609df7a7c037ca97ab2bf1 SHA512 0183addeff7e2bac1add74db48b727edaf09f1b24b774bafe717c43c0e9a4a083081f12ab1d2afb743b61fd3591d6d3fa04f1b6c2be9339a2ab55a27ef4791ea
 EBUILD mongo-c-driver-1.3.5.ebuild 2023 BLAKE2B fc14f7ffb1d3f6c6d8495b10276944240d57a712d76ce58f909de934ee3f1ddd9f9d57723d1e686692de422033859dbec384aff65eb0e16a4a915674980d923f SHA512 30eb5a0bdd2d92de202dc28df98b3038a8015af39d6bc8fdc7b76299efd509bc9bf0690f824d34c1d7ff4a59dabd036567d18e4846411759560a65ae027f4469
 EBUILD mongo-c-driver-1.6.2.ebuild 1963 BLAKE2B 6a65450eb17c0de23d4525d9028ecba3b69f8cf6b8be52af3ec81893d3295d30cb25f06869b915da4c6f87e2344777356dac99f1aeb506eaca2def1e1550bae4 SHA512 776b41fa17aa7859aae0a8861647cfa4072e31c75a9189cf59da53b3798d5832b45abb60073cf37176ee05a2abc734da3c9e1f9e5fdad718002670bb99e54cfc
-EBUILD mongo-c-driver-1.8.2.ebuild 2151 BLAKE2B cbb1bb297830b3cfd66c082be4fd04732b26fe7e23d0edb4a63b69556d326f6d8be143f5ae6e684fa8111ee45ed77be215f830802126ff508b8e216332ee5bbb SHA512 426c0848aad3a0c2ca11cf308a72789ad9cd4e7a3e9ffed267a0ce3fcdb34f51054957eda4d8b9280900cab2ae8bb3da6405e92fc527eb8cf1c9d74f5a8b9aaf
+EBUILD mongo-c-driver-1.8.2.ebuild 2150 BLAKE2B 1ff46d08933c2d525b4dd60cfbd1ba4c3e8183cea11923f3b851b9fe1e0b25bdaf1d08e70f68a3dde383ff4ee7ca9127ea0cb7d0ac011c4aac2f42f46dd4a6f8 SHA512 55338086d4a8c91527f62758b153031751385b975eec7b8dc35a0d07132eb8120b4d0ccf8cdce419f4623ddb8b7deea62556dd7c9c41ad8a01abf04bad6869a9
 EBUILD mongo-c-driver-1.9.3.ebuild 2153 BLAKE2B d6abb8f98f741dc893ad46c50b8ff92f7f151b83ac402bb07c5a3335f648c04eafa26e85f4f9dceaa3bd2a89e96df4d673f755135fd1e31cd03a203ba4643193 SHA512 75657ac140fc3aeac90342be78a18e999f62813a5ac0dd6de782c1ab603e7b602c2d6351650563d95113d9d936413178650bcdeac66d6774255708a6e4d025d7
 MISC metadata.xml 334 BLAKE2B 7e10c3396a8bf28586240a95cc10a42de507d995b9f67dcf3b016cd586a973ce7478fe3974188dfb215123c8ca7188479d0d5be46ebcbb6b7790472f4e6ce225 SHA512 80ff1ae78c264618a7d5253d80ea5f4d1a15a568d5215d03dbe3062a591ec1c99d6625feff3b7baabe314bb284b5e5340c873b8846d05fd932f8cbc78df00d34
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
index 1ea4eb35a6d1..d034808158e7 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mongodb/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~hppa x86"
+KEYWORDS="amd64 hppa x86"
 IUSE="debug examples libressl sasl ssl static-libs test"
 
 RDEPEND="app-arch/snappy:=
diff --git a/dev-libs/ossp-uuid/Manifest b/dev-libs/ossp-uuid/Manifest
index 4f7e5855968f..751121a7b7d6 100644
--- a/dev-libs/ossp-uuid/Manifest
+++ b/dev-libs/ossp-uuid/Manifest
@@ -11,5 +11,5 @@ AUX ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch 253
 AUX uuid-1.6.2-php54.patch 6096 BLAKE2B fcfc58f1c1e1e7b00b669a212d6154db0c2512da137c1cf43efc6703c0e7cbe3623cff2a30607e971f25a8bdd59fb5fc18b7532397ecf7cfbc9ce05e98011069 SHA512 6e3919ffa87e2bb16487761e1b33c0096c8db51bf49e6ba82c3c8f7275d2585c7a7196651a679827c547d8d73ce3739b9f44e44d3f3866aca10ded520547c527
 DIST uuid-1.6.2.tar.gz 397048 BLAKE2B 2240c2e19a09c7b7df0428fc316b46a69b3476ec852321f1ca43c0688b73da647cebf06e8efd8a89f55c11108ef4b9627a33ae1ec235cdda1ac7922389903c3c SHA512 16c7e016ce08d7679cc6ee7dec43a886a8c351960acdde99f8f9b590c7232d521bc6e66e4766d969d22c3f835dcc2814fdecc44eef1cd11e7b9b0f9c41b5c03e
 EBUILD ossp-uuid-1.6.2-r4.ebuild 2780 BLAKE2B 8d9477201e7115689ce78730fb57a71a26809b8f8ae42081cc7bd6a04445c6f7f007d3a3659034db79b4cfa215e65d9899deaf368366cdb80608589265934962 SHA512 2f36c1de9803540f124372dfbc5ba82cb8e31a7b168cda04a43c95b24c265ec4386794b00d44d6d24d9f1a98876bbceae94c459daf3cee559b1670b78d718721
-EBUILD ossp-uuid-1.6.2-r6.ebuild 3035 BLAKE2B 833e8ebacca2ed01e5da0c8e5ab3a14d712b8b5d23df6d9f25999a9117bf41ad38884d757c339a91b41a0f5640ba72ef8c709bab78f39e1c1b0ae2d5b9fa6d97 SHA512 016fb7fe17d4073f7b8363a5fdd644309336c09822404be1108d07642f94bc639f8cba29d66609e84f8b2fec0d83272da763cdfaa1a37ef9defb96c8a0f98356
+EBUILD ossp-uuid-1.6.2-r6.ebuild 3046 BLAKE2B bf9673f52ac3d58bf47b771634fea820c442a1a71a4a8df2ad9c388249b1b2b3e49ef1da018e3d7c89196cf91a76dc96f448ecfcb547f6f676c9ce57be42ea31 SHA512 bb046bc2d048892e8fa8acbcd0941f548aac5300829d338be94233db5b70fd96b0ed7910edbae181b20d95f6837b941d13bdc389ac65319213c18bdc15b351fa
 MISC metadata.xml 248 BLAKE2B 491e9ad2de37296d9a80e8149cc62db2e8fbf8c8fea001ff675c244f9f61740ee1dbceef0b5f467b88ad105f9be751fc99420eff8429f4a1dbb4a00e2b763e6e SHA512 ceeb1d27ec5afa7cd117c05220a5191629c08a008f5640050fab3deb9610d48610a314cff6f1a73577b3e771c3015e14fbc6273377cad6c559f277982f1b0b80
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
index 67d3db311450..f0bc8e587ac4 100644
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild
@@ -23,7 +23,7 @@ SRC_URI="ftp://ftp.ossp.org/pkg/lib/uuid/${MY_P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="+cxx perl php static-libs"
 
 DEPEND="perl? ( dev-lang/perl:= )"
diff --git a/dev-libs/ptexenc/Manifest b/dev-libs/ptexenc/Manifest
index d85dd961e9e7..5e8a5f736624 100644
--- a/dev-libs/ptexenc/Manifest
+++ b/dev-libs/ptexenc/Manifest
@@ -1,5 +1,5 @@
 DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
 DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 EBUILD ptexenc-1.3.4_p20160523.ebuild 1316 BLAKE2B 5bfb94b2c8768f015452935dc3cfab18f49c37c2de9b1adcc077509a99ab654c6f91bb379ca022805aef2bc79cb20c2554ab313566252e25f5ed4937d3b9c4cc SHA512 e3bb57562cb7215109bddafa5182e8636cc32aa0953d98f33b88cd692df4598c85bac94ee9787e6820779607fefd3c2f09c65a77498bb5ae2fd4cd00e409bb09
-EBUILD ptexenc-1.3.5_p20170524.ebuild 1317 BLAKE2B ae1f43ca61627a05d17e812c47b6f2b74cbce0f63c5e6e364be8a76ec9fb641c0f5ec9140fee57612069b0c32ecaa6fd418e267c8b39e04f8e93b9fdf926a69b SHA512 64991d55a53965e5c39b30a06740857e8734f82d110ee267979954ab359cfbc9f28b6b929d1307dc0ed9457d9a34eb37c6363dac47579ab44603be7d2aa9796d
+EBUILD ptexenc-1.3.5_p20170524.ebuild 1328 BLAKE2B 799fa7d97579d54c2c141b078e2684651357fdea5d2409a95f81037af3a15a525b9c24b5fb9ff88b2565210f86ee27a1e2d44af77e74a60c9229fd3d4720c4fd SHA512 42b23afb1ee91c90d619a9ed310d5c67c71e0635d1300c85c8830166be0ca1c6f0492fe9d7dcaf9c13b58987063448da7b0cd878ec37e789ce99d4aeb8033593
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/dev-libs/ptexenc/ptexenc-1.3.5_p20170524.ebuild b/dev-libs/ptexenc/ptexenc-1.3.5_p20170524.ebuild
index bc01b4e78eb5..502e4b76cbb2 100644
--- a/dev-libs/ptexenc/ptexenc-1.3.5_p20170524.ebuild
+++ b/dev-libs/ptexenc/ptexenc-1.3.5_p20170524.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,7 +12,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="iconv static-libs"
 
 DEPEND="iconv? ( virtual/libiconv )
diff --git a/dev-libs/qcustomplot/Manifest b/dev-libs/qcustomplot/Manifest
index da440575d551..d16017c652b5 100644
--- a/dev-libs/qcustomplot/Manifest
+++ b/dev-libs/qcustomplot/Manifest
@@ -3,5 +3,5 @@ DIST qcustomplot-sharedlib-2.0.0.tar.gz 1949 BLAKE2B 6d2d1b7da0dbdb83485ce1a1b69
 DIST qcustomplot-source-1.3.2.tar.gz 225912 BLAKE2B 9bdcb9ace79c0bc657838d6c0fc5660a61a0ba64893192f263c0e30473c176322b3f9da87341a762032ef1879a46dd89dd7e42ba0127dd22c969d72b0269d9c0 SHA512 0e9fefd3f6e4428009428d3155b1a26e1d4b2a62567ca7812cefa67c06fa53f301229d8bd2c3abbe0fb7ddacb9a07515522ded56c0745cd31b1f85323d4499fb
 DIST qcustomplot-source-2.0.0.tar.gz 317398 BLAKE2B c2d587e06026789a164f16ffdd00d324172654b6953ace637815b022dc14cc96362cf4022512ec3feea3725a651c1af0f50f09d0ca1c5e86ebcfbe3f50aa3ff2 SHA512 66c648877ed0a14cf527ac8526788065f494119cc61993d20268a0046c8e6c5a1c73a61f50a73e6a39ec55435bc5f74c613ee21254293ddab34ba7c2484c4f5a
 EBUILD qcustomplot-1.3.2.ebuild 973 BLAKE2B ecfe3daee292b7b0c279c733893c3a9de54ed672995bdbd51d960a045d2884a461e077c6881ceda560fa55f6d535d618248e0d500e202ce34f109417fe62128f SHA512 abee37f917b66122131a95078d56074674e11d87e4177bfc4e1623ed8dbe259397833c8578eb98952e8a30dc906be4f2ac80ec0303eca196a8044fbc5eb997bb
-EBUILD qcustomplot-2.0.0.ebuild 975 BLAKE2B 423093fb0eb12b4005836172126792017671789ddf432972ee3d40ea45d7cd3148f4dbbf0ee7e608a1604fba1ae1c50127b07c96a8f191d1bd2990736be582d5 SHA512 342b2a10359a06361d7c312f0095f6767c8a2b85e84adba909200348c660365e94cbe2064e9b157ff935c17c0845035fec31a292b371394ff2559f04f590d42d
+EBUILD qcustomplot-2.0.0.ebuild 974 BLAKE2B 0e2ac3dfb1bcbce0badfd87e10af8ab69647ab3a42c06d503c45a70c1d061c1eed2ca5b712933f4b6c864a7328df178fe708e7fab7db83560084ec6fc5141687 SHA512 4c4409994a5a44fb137dcc5f265e308ab2c1367a524a133fee74b308394d1b7b41495b2e0f038da08c484a3bfbf036c5bbc1ce0688069b2627024071020a0cd2
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/dev-libs/qcustomplot/qcustomplot-2.0.0.ebuild b/dev-libs/qcustomplot/qcustomplot-2.0.0.ebuild
index fdd27dd99daf..4a331d4ce700 100644
--- a/dev-libs/qcustomplot/qcustomplot-2.0.0.ebuild
+++ b/dev-libs/qcustomplot/qcustomplot-2.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
@@ -13,7 +13,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="