gentoo resync : 31.10.2017

18 files changed, 30 insertions, 650 deletions

diff --git a/net-libs/daq/Manifest b/net-libs/daq/Manifest
index 76e7231ed7ba..3c153788a676 100644
--- a/net-libs/daq/Manifest
+++ b/net-libs/daq/Manifest
@@ -9,4 +9,4 @@ EBUILD daq-2.0.0.ebuild 1901 SHA256 976b0754552e41a344151645e5d28d863e1eeadc005c
 EBUILD daq-2.0.2.ebuild 2001 SHA256 24c3204d1b70cce54823809dfec6539950c7d88e3c5e39a376a547f5dc9bbb7e SHA512 554b8c496b10d62ca9cefd1239738c64108b6d63a61401dbfc57109f22b255f7a24a5f419f859bd8672b073850b6604f233ac0be15d4739da15c2c0bad6435a5 WHIRLPOOL 581b24dcaf1ba9aabd50e0e4f69ee80cfda494503ec5d963ddcdbbab8b6c7b80b64a555eaf8869f701a505f0bc098ccba057b49fe0b8b3ef4878b99dafa5e242
 MISC ChangeLog 3029 SHA256 0a6fa8232c41026525f49bc40031d0b0d4d4833d81b16e21bdcb3f9e271b15ce SHA512 a5f4ef43166b803b2dc9db885f1c4f1f5eb78b444751e7a9cbda0760814e59b91edae0a9904c08e0794b2a8dd597aebee5055a97a8d2647bcb8fa93fad9c530d WHIRLPOOL a3060a3a9db7de0133e51327bc1dd650119095cb68eadf0bb83552f5cd9fde494bd71bceb747c252b66d47eadde755cc954754c7351f7174d75d5373e1792e30
 MISC ChangeLog-2015 3584 SHA256 d4d0c74ec18e5090d114ae03afe2bca5369d019a6b2779c7e71b616d64cf22d7 SHA512 5da373fb017e428285e808b72e5297fb53fb550f85433c7886d2ea22a03b7092ada1fb85c2ded74128f216d6448465eb2bc7d7f2ed9b93973bb5b2df70fac102 WHIRLPOOL 956c1bb58c42f4d85b5eb8eb9ba0e4cc52417ea6e9ceecd53341e53edbdfddecf8ba60ee5cb817390b56988b90f9e5479e0e93ac3bf92fcd217582052b01cf24
-MISC metadata.xml 1632 SHA256 1570226e470f608acb9c136149529c6c6d6d7237bdc3e0c6d3d5876b6e157745 SHA512 4c42b743534c4466ba4ccf566e01b6e9a8805e09312fd4fe6622cd318e062d1a68f17c9698333a5d65c199418234d80f05f660ae9e1ce9b664e11b2ca46afd29 WHIRLPOOL ca1f5264c681eba87110653f738d3753a3b3666f24ddac2b665e7ef3a12bf252bb546e96efc0df0be60084d13286c0682efc91ba68553a577f0462721a515df0
+MISC metadata.xml 1416 SHA256 185be2a7d5bb9b7bad49c9c1d8164f0f7970408feede033aaff4d60e4fb5c996 SHA512 77a8d9f238958948d3582b3d9a9bf859c03bae5d544728270a18a5db1c221745c4fa7044fb1959e4b0811864f33de5f9bae67bcd25aa6c74d3ca74f386e6bdaa WHIRLPOOL 41e51b407320936074dcd2274d9a0043538c2ff923d3a5c9dfa18a2ac1a357abd9151afa7436b6c90b331bf4ace75778cdbfeda4f3736b23ad7ce90d11e9358a
diff --git a/net-libs/daq/metadata.xml b/net-libs/daq/metadata.xml
index 0c66111f5409..a114c5f02043 100644
--- a/net-libs/daq/metadata.xml
+++ b/net-libs/daq/metadata.xml
@@ -1,41 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-  <email>jason.r.wallace@gmail.com</email>
-  <name>Jason Wallace</name>
-</maintainer>
-<maintainer type="person">
-  <email>patrick@gentoo.org</email>
-  <name>Patrick Lauer</name>
-</maintainer>
-<maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
-</maintainer>
-<maintainer type="project">
-  <email>netmon@gentoo.org</email>
-  <name>Gentoo network monitoring and analysis project</name>
-</maintainer>
-<longdescription>Data Acquisition library, for packet I/O with Snort 2.9 and later</longdescription>
-<use>
-	<flag name="afpacket">
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription>Data Acquisition library, for packet I/O with Snort 2.9 and later</longdescription>
+	<use>
+		<flag name="afpacket">
 		Build the AFPacket data acquisition module. Functions similar to the PCAP 
 		module but with better performance. Snort can run unprivileged when using 
 		this module. AFpacket supports both inline and passive modes.
 	</flag>
-	<flag name="dump">Build the Dump data acquisition module. The dump DAQ
+		<flag name="dump">Build the Dump data acquisition module. The dump DAQ
 		allows you to test the various inline mode features available in
 		2.9 Snort like injection and normalization.
 	</flag>
-	<flag name="pcap">Build the PCAP data acquisition module.</flag>
-	<flag name="nfq">
+		<flag name="pcap">Build the PCAP data acquisition module.</flag>
+		<flag name="nfq">
 		Build the NFQ data acquisition module. NFQ is the new way to process iptables 
 		packets for inline deployments. Snort can not run unprivileged when using this module.
 	</flag>
-	<flag name="ipq">
+		<flag name="ipq">
 		Build the IPQ data acquisition module. IPQ is the old way to process iptables
 		packets for inline deployments. Snort can not run unprivileged when using this module.
 	</flag>
-</use>
+	</use>
 </pkgmetadata>
diff --git a/net-libs/http-parser/Manifest b/net-libs/http-parser/Manifest
index b0d1efda4d3b..3a0df52c9e2f 100644
--- a/net-libs/http-parser/Manifest
+++ b/net-libs/http-parser/Manifest
@@ -10,4 +10,4 @@ EBUILD http-parser-2.6.2.ebuild 1395 SHA256 16a3ff3d919f5d2db9a691e838b6aaddcf84
 EBUILD http-parser-2.7.1.ebuild 1353 SHA256 f8e27451128c6a61cd43ec0e430c79400fd7f7e41f9f317d67aa4b505c2acc38 SHA512 0a7730443f49ec26ea9b0c146adbc1a86902446a04a4ee927017ca6c89af193d760758277656204d5f26562dba41dd70c26fae6d2f562d3a07b4fd074b1e8464 WHIRLPOOL 17afb9ef655dcfd1a66b5744584a6004a156795469a0099847a8f4993f75ee573435d3545009d80a0e05426f20604c7da988b7bb9e69cd00a860f8016f641b0e
 MISC ChangeLog 5050 SHA256 f0a226799e7a51377005b1e91012fa66a202af5e902e344594301d452dc08e80 SHA512 3017ad7480f15e28f2b2f18cb90362020cce0aadf844a608e4bbcb37ec97261e25bcbd5c0ae1a78f485c60ef3e6d5c144e009d44fd43f2d50aae121e1f09b637 WHIRLPOOL e8d64ac62705400f31d85c221380a036ba5203e6946e66ede6433847ef38a21aa420792b6616ed59483445351bc7b8f82325b3f98cd530ba1d72f316c60527c8
 MISC ChangeLog-2015 2207 SHA256 a4e427c1f74e2d4d526f67acb0556015956bb98236bfefba4935f7ff7f6de6ad SHA512 dcd33ae28a0652cbe4ab4b86e84ccec084613bde19cd83e74a1c18a90fde1dd97ed820957128f9e0039772d9bbc724b744836fe117ed83ea89e1c8c8811dea2c WHIRLPOOL 05b8b8baa9221698172d95565fc1f937137e663cb95a76fd1e5dc4fce2d390797e512cc4dc48637f5fbd5683ad4e3388975d75faa963afc0ce28a86828779808
-MISC metadata.xml 450 SHA256 49a13ea0730b767e16e500d6cc7b0f7efba56aebea798c63c510cb5db7c6460f SHA512 6204bade65b7aad07bc628a4c0b24ee4fb14d145356732a43b51d41c3fdc92c2592497ecf5e92fcbd6423a2ae2eaa8a46edacd92e92e0fe99aed3da4499889a3 WHIRLPOOL d6c9600d03c3913a3e598f56fcb7c0e3fd7b9b296fbef70c89cc77ecf83792be94343b24cbd5ccb041d6ba6ea442e197e0c961869a39789cfbf1f47edbf5b39c
+MISC metadata.xml 249 SHA256 a80a4d6476e61a1c7075fa18bf9ddf2349edfb7ec5855780e93396c98d02b104 SHA512 351add04d965fc4fc30dfa0ca7122b2a3b1970405bdde901205d55024d8830b980d42c745b8c4605e26237d91396061e446640bc68a18303e3aa1bbb396212ae WHIRLPOOL 231b678bb44c172df437ca1c45e3f27cdf989572a764a696c83533da8c39e2f6d3059e5e43ca0ef36d454be35931790646b2a0452f68bd969e36c1d8594cdc3d
diff --git a/net-libs/http-parser/metadata.xml b/net-libs/http-parser/metadata.xml
index 58faa9ffa1f1..965fb2a74d86 100644
--- a/net-libs/http-parser/metadata.xml
+++ b/net-libs/http-parser/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>bugs@bergstroem.nu</email>
-		<name>Johan Bergström</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">nodejs/http-parser</remote-id>
 	</upstream>
diff --git a/net-libs/libqmi/Manifest b/net-libs/libqmi/Manifest
index 2befe3513905..78e4fff1f372 100644
--- a/net-libs/libqmi/Manifest
+++ b/net-libs/libqmi/Manifest
@@ -7,8 +7,8 @@ EBUILD libqmi-1.12.6.ebuild 936 SHA256 dd4e34978465446201b6942f03bb6bd072c4f83ea
 EBUILD libqmi-1.14.0.ebuild 939 SHA256 61243dcc8abbda0e73798aca5ac0e5e1c6fb83ac4acbc29d70e0d9984545be74 SHA512 b7a1ef6349c65602ba2117a211345850681bb9166118cd9f96bdb8d24cc64751f3d2654c7bbae3c08797ea1378457e852512a73d2b35162f888282d52b8476bd WHIRLPOOL 2286932735f1f6f44a06444b7e77d8c9eef3dd105e16b3b8dc55da5356c695b104a57eb347d108b802134f3786148959192df9ad1494ee5e954220ec31a8f655
 EBUILD libqmi-1.16.0.ebuild 1033 SHA256 7df81e03f5ac6eab9f61701228127b17b0fa0ca330561a69a98023efb0422399 SHA512 18dca52d046cfb903f792a6d0b3b1bb668a249ea531db723481c8e0665640b85a911edebe62164865e9c865f8ee7a923cc23da07879cf81d741fe379141ede4b WHIRLPOOL 53f220ba7aa477aebaf6bdfb247890b936946f19b9caab809e37f40333a99b2b4d9537aff256bb87ff78cbe4add2eca29bd34d1651af0f30a31c9589ae7c929a
 EBUILD libqmi-1.16.2.ebuild 1104 SHA256 8617c874062ae66fa04b99f724230204f319440c5791a04bfbd057f3f204f027 SHA512 1167f68f0a0d6edd26a8d66443c05c4bf7c4feced8ee7cbce1a1a7afc8a65e21eb2b7b02d8e79685d89a74f075b50e6852da6dfe6254a9a64677041112c9b3f6 WHIRLPOOL 6820a193fc2365b40e26c7623fc9cb81aeb6c5776af623ce05d752094e545798a4e3f6dd5012f398476b6dffc6568a137d2fed4d6189af7341bd071cb355bb25
-EBUILD libqmi-1.18.0.ebuild 1110 SHA256 2caf5c0593d88f3cc183f4e175ac3b6daf8a0c1220b8110e8d02dacb7f6f2f64 SHA512 f82370dac0b09e744b98b3f96ff252c05d16a4e14047784bfa27867bc209e09182215611bbf0eb1dc97177dc205d5268bb89ff8603392229d82677a27427f441 WHIRLPOOL 74329ed5223d9590cead2f3b4c14ca28f296dd04d0bfb9cd2370cf2d60bd5642e467088f1414ac2a9a5f02edc32f19d225e13a7ab2d41ee6562218ca24a607dc
-EBUILD libqmi-9999.ebuild 1110 SHA256 b718dada331f5cb381983825514dd432b884f87d57871aa1a8f432721ed04733 SHA512 d1f40536055bab1cd0d0a8ce837d1b0a7160b93f4187537ee5046692cfc590f89b3f9cff2c7dafe4e0a71008250f092d5a60771936e6e6c849777907ef4a176f WHIRLPOOL 0e04be390ac07187e1ffb1158e962421c9a2c9e3fd9a1d46a97b18beab696016a4ed28aa29d20f8d7bc0c7af05610384b41dfa8feb6e83e37edf7c6d42eb6410
+EBUILD libqmi-1.18.0.ebuild 1128 SHA256 78d5efb3c1077b7de85911c57283c296196dd13bb9caa991d717b06b7827cb1c SHA512 bc8d931bf49382b5955298516000fee2fb64a23ad1f1fa7b3ea5cca14e0017683fc94ddb078be344364e04164526e862a16e702cc8aa7564f52511fc7a852f31 WHIRLPOOL 69036cc092e3c73730dc1382e3972ea1b9017acaf5535781a3b53a1034c5ba86e04d0ba14262c012c3370336a35174637938a2736e12042b3cfd891cbc27045e
+EBUILD libqmi-9999.ebuild 1128 SHA256 9a8934bc20bef8ae77b0efd2b58f54a21ea51713f40206fc197296fb82b2cd14 SHA512 57703ca8652c1ff10d999184b55f0e69006602d4ac29faf66eb044f9b3db961adb92c4aab91196e089724755f947c4af203e76aa91e612dd7a140ecb53197c8d WHIRLPOOL c8e4cf8d0fc1604cdec14741d2679470a8e9b5755dcdf6e9fbf7efb3a19ead4817b302e0ec16804b68b1f1a03ff26ecacd69f13024bfad9e623d5909dd6bc4ae
 MISC ChangeLog 4413 SHA256 9ffbf5ba93116a1d7850e56e3e6d7a0b4acead01d497d1886c3164ba352193c2 SHA512 b50cc42d763e282ba1a892e10869a55c8e91c1c5cd910cf03fa158b49db8f8e4726a0f203194b51eb05e4845823b9155eb694d64429a4a91300d0d6ebb8cfeee WHIRLPOOL a831722ef39ff6c2a37b880477f3a93f40aaa17d3da822ae9d1098a08254fe7db1aaab453bb133fbf7ea6b5e2c5c83ff898b455d5674b20da317c7895961df07
 MISC ChangeLog-2015 3727 SHA256 8c70c4d7a33dd013c9097b969d0f475d3fe6b2ecab311732d9a0f8043604f336 SHA512 175d868d3427009bdae16df832a8d87d8de88fc61f1f3b95c480878a033e353e2092cbf010b0a9830b0e0fdff00feb88b68aaa29c749034d3bbbfd2ae61132bb WHIRLPOOL bee4ed2e3b4a19ffa667dc20d6acb2776a91ab2af8ebc8b8c1314afe0ebaf7028cceb54348fe83802e5efde2f7a651e51c11c693befc98ec6e4ba6eb1b427511
 MISC metadata.xml 543 SHA256 4e1856ce0b67c34942d29148d08024374d9ff75c29e59e0a564de4e8026d9301 SHA512 b0285ce2d4cb22f9e3724a53f77dbdd0b029f7402aab7fa223169482cfe6e848403d309561e3c1ddd9ee7ea47e5175ce849ba9c212a3d3ee1fe9c05071a0f690 WHIRLPOOL 17037d5da3beb52cf1bb417adbf18ca13db0366135ba0be56758dccf01b74486c13749e2d9f21d015b867d6f3684665b3feab18f09f4aa7461320150dc323ffd
diff --git a/net-libs/libqmi/libqmi-1.18.0.ebuild b/net-libs/libqmi/libqmi-1.18.0.ebuild
index 50335f2fc35b..b779f7ac0bae 100644
--- a/net-libs/libqmi/libqmi-1.18.0.ebuild
+++ b/net-libs/libqmi/libqmi-1.18.0.ebuild
@@ -20,6 +20,7 @@ SLOT="0/5.1"	# soname of libqmi-glib.so
 IUSE="doc +mbim static-libs"
 
 RDEPEND=">=dev-libs/glib-2.32
+	virtual/libgudev
 	mbim? ( >=net-libs/libmbim-1.14.0 )"
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )
diff --git a/net-libs/libqmi/libqmi-9999.ebuild b/net-libs/libqmi/libqmi-9999.ebuild
index 1508e965a7e2..37e9191d90cb 100644
--- a/net-libs/libqmi/libqmi-9999.ebuild
+++ b/net-libs/libqmi/libqmi-9999.ebuild
@@ -20,6 +20,7 @@ SLOT="0/5.1"	# soname of libqmi-glib.so
 IUSE="doc +mbim static-libs"
 
 RDEPEND=">=dev-libs/glib-2.36
+	virtual/libgudev
 	mbim? ( >=net-libs/libmbim-1.14.0 )"
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index 60223255bc6a..1ce1910499f3 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -7,7 +7,7 @@ AUX librsync-2.0.0-search.patch 358 SHA256 3a94ba9d2b0847d0dade733c9f4f456f910f2
 DIST librsync-0.9.7.tar.gz 453802 SHA256 6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6 SHA512 339362fd01c94411849d3e4a6e95db1bef6cffa0475b1af49d73f11be0421a12d4c73ecbf1a272af01b2a21cec81b4a801c1f7d735e107d0242707fb4c45f9ef WHIRLPOOL 7cf5cc675c4bf4e041d9132f0a8311f83e827bfa7dd75180f3153cabeab41a94011e1a9b56e63a61dbe119444e2c24a39054986d97b686db99293ad9177b2bf7
 DIST librsync-2.0.0.tar.gz 155049 SHA256 b5c4dd114289832039397789e42d4ff0d1108ada89ce74f1999398593fae2169 SHA512 1a88dcc3aa60949e058c57eb0df3e0086823c493de40fed927246f5aada6274db57202074456a0ce5d9aa8b81b41836b0d6221ded6a75d43829572584177e8c0 WHIRLPOOL a09e76a712ca21a37bc3d06cf2f97a0e7201cfcf82c18cbebf3f07bfd453ac3503d18c900b7c1136e0319ec7f3b7c4a6c43611648c78b31fe13c7298ccf016e0
 EBUILD librsync-0.9.7-r3.ebuild 879 SHA256 10d0895baf99f03c235de45ee3d334759e433dc23a3444e4e4d7e9edecc2c864 SHA512 9c47fefe790a75f0b8921ae400bfc811e8376dcacbd50a4399b49cf390c56dd942dc9f535210f5228606c4069743f1399eb6add6dba7182bdbce89935f02bf8a WHIRLPOOL 784d22288456cf9d994beb650a6631f3e4e0c17d1d22b673fcca2aa611aa81049f0e0ccca09883d5a90348f2f84c6f15512cd92df62a5cbbc62ff67020e4a1b2
-EBUILD librsync-2.0.0-r1.ebuild 830 SHA256 1467809bcff3d5ed61653ab67ce4ce145f71174717b7833c7831fb9e84f0f1d6 SHA512 460aaf5472e2aa2dbe1cd3e6962529df47d4b47c03780017e5aa29cde6dc61ca00c2522c222f506b178c87a2b1ba6d8d6c515e5d302e66a945cdac3079356216 WHIRLPOOL 3c72a93d56dae52717b44105ebe7925bd31d60e304df07e87197220c30a501489ae433d5d50030254b1b680b78dcd817fe524c043e9aabd8370062c8202a82ac
+EBUILD librsync-2.0.0-r1.ebuild 827 SHA256 9be378c61abb8ca1c255949ce931bbab2e439aebd4491eecc9ca17889854f1cc SHA512 ec7d210bb45a24304915290e89420136b38faae1f848c594bc0d66d4c9b57a395e02ab11debe9c531ded18ac2f28e5c46f340481e7bd3106e3d3d09da0d46d91 WHIRLPOOL 2da2c063b228d262dc439eff7236185c3c5c0cfd95abd889f4cae8b26da35cffc4fffed006fe907ff57f1b8d9e52a95ca889f2be535ea5096918a870c36a7a1f
 EBUILD librsync-2.0.0.ebuild 764 SHA256 cd23c43d8611be927f3ff3d7c6500e2c07eeba3aebd44c694dafacba84afc616 SHA512 6a838f1028a13fc27a224fc3be357efc647218bec0b2fd6d0a147118ddaa56f65da13801bddb616a5a1f63b3b9fa3ba971df51c379d985285815cbe8d0ce2f86 WHIRLPOOL 8d2c72e537d85ebe6731cbe01173ba5076f94a04d7183e1b45d241afbe10e09534ba141c9a85596818b8edfa778493b810c66eebc6892bf84bb1a75be5a5ec89
 MISC ChangeLog 6265 SHA256 f7570dcc522328911493ce9390eb94c934819f1fdb527afbedabc0cff0e18a3a SHA512 aee1a18202c634b5e69186f161ec8682bd6051b3c24f44302579b9ed753d710c062f500d0fe3e66ef4418e7122fb574188f6da74e238608dceee7c67dffa08f8 WHIRLPOOL c29ce69104b65ff1588ce5e6266224dbecde9503e437654e4ed738794107c6ae6f3ae8b1136c7da847881566bdc29bc41304c2e1ef197449f1e8d8fa25e8a92f
 MISC ChangeLog-2015 6029 SHA256 89da3593c12b4488f605a06b090d097763499cf690588d88003ac46669653bce SHA512 3156822c3f2131358e41252515b0957e0ce7d9ed49ffd66cc3a7a2572a75f6e89e67f964981e1dfc1e961f5987b508a672f67a6d3cff0a88ed2bfdf6063d2a31 WHIRLPOOL c3cbdf9e6a55298c24b97f7d5f0f0f003bdbc4b6fb79343f7f55668b7590ffbf5ca46aa57ee8c120c8d5846372b185150ea35592173566ed2af7654e996b008c
diff --git a/net-libs/librsync/librsync-2.0.0-r1.ebuild b/net-libs/librsync/librsync-2.0.0-r1.ebuild
index 6cfffd0e4a3d..6d328f9cacf3 100644
--- a/net-libs/librsync/librsync-2.0.0-r1.ebuild
+++ b/net-libs/librsync/librsync-2.0.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="dev-libs/popt"
 DEPEND="${RDEPEND}"
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index b8c3484c67c6..46929dc75b55 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -15,4 +15,4 @@ EBUILD nodejs-6.9.4.ebuild 6073 SHA256 150fdc85c99024a7280f3b5c23f11c9a5c7f99ac5
 EBUILD nodejs-8.8.1.ebuild 6245 SHA256 7bb3d99a63a7847de0fe72029efc4268edffccc4e61a1399ffc0ae7a81660670 SHA512 af76765d0385310b96e5e6b9645255874d9c36be8582c83f0bf2f8be810dcf175a827ccacb1f8ad38ed4a99ed390f78c3a0996d433ccc4edc540f38de89a8984 WHIRLPOOL 416ae7ebf0fed3615d0f23e2491654962a78f9839bdcaafe2ae051fddb80ea1a4669d1ac1458bdabd23425993312bc6e8c25172a7d5b170c34732a9fe4ab8476
 MISC ChangeLog 16331 SHA256 16702a204cff5e2c71e5b982f323aa3aeaa29a6f3b2da7d23745b81a7f9e01bc SHA512 a98fae5176a945e301bb763d80c44c641295dabdd8cd6d8226106db206b5e3d90654f3b9d98f5adb2291218c97c1707daec05f68f5d1036edba0129c5d86169d WHIRLPOOL 7a409b0f4f81d549f26f777325c4149a645e275fd83b5128252dd27596654e6800454692664e3cf5d41030794215e8e39cbc05ff3cd6db7bd681a12a96eeffec
 MISC ChangeLog-2015 23934 SHA256 354bd9c41192f651dd4426b236bc63a6bb41ea76831855a0ec00550a369a1b97 SHA512 28421b67fa37d71d97f976bd938cdaded4c994c08fa68d469b1d193a4cb380da633acb352cdcbda0f4cdfaf6cf671c82132c3e64bb48721df9d78843bcf49d74 WHIRLPOOL 65cad5043c8d83e0d342c1e593a7c0eb2d2400968507ef48e2de0384baab13861c99ed7e44cdf41eb6027826b174695be598d77077587a01ce96adbb43a5b633
-MISC metadata.xml 749 SHA256 7bd1463235daf323e99518809d179f158263c5b702cb3b06433e33527a78f0ba SHA512 6b1115136449fad2edd373b2b853874b54da2dfab5a30a36f54bd8c0ac61636139f3c59bbd4618460c725bf9981c71731c33ccb07900c38c58bf4b9511254ee3 WHIRLPOOL 3bb964d5b3a51c2895fdf5c0d6cfcde5391f8cabf4f559e78c0988558f14c6c026d9523a89e14a8d8ff605d33a39982884d85397b6871aec4d5a862b2b3e2777
+MISC metadata.xml 451 SHA256 d2b12ec796c41fd4010281119313aaad1248591cc31c8e570a44a1dd28f49e80 SHA512 d3baf438dbd581a2b8a980ab591044fd929467f3872556e04e422f09568b63ac4fe4f0841841f1e37e702ff2cd8e10fdce8e754fba83cc0bc14b3dd5944ab12f WHIRLPOOL e8a5f8efd991292d27bd33f620be996cb1be1993f580b63824d70ad5f384082ba4591cc7a37dd5e34411ed0a53054b66972a5628004e67d487be4cc074d6b36b
diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml
index ddbfaa7ad24d..2950626d4ef6 100644
--- a/net-libs/nodejs/metadata.xml
+++ b/net-libs/nodejs/metadata.xml
@@ -2,17 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-                <email>bugs@bergstroem.nu</email>
-                <name>Johan Bergstroem</name>
-        </maintainer>
-	<maintainer type="person">
 		<email>patrick@gentoo.org</email>
 		<name>Patrick Lauer</name>
 	</maintainer>
-	<maintainer type="project">
-                <email>proxy-maint@gentoo.org</email>
-                <name>Proxy Maintainers</name>
-        </maintainer>
 	<use>
 	<flag name="npm">Enable NPM package manager</flag>
 	<flag name="snapshot">Enable snapshot creation for faster startup</flag>
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index 6bcc13e0780f..0dbd81848d97 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -8,15 +8,10 @@ AUX webkit-gtk-2.4.4-atomic-ppc.patch 1294 SHA256 64fc5b9e019fb759cfcf2dc65d7bf0
 AUX webkit-gtk-2.4.4-jpeg-9a.patch 1262 SHA256 b442a8021ec5bfc751708fe6409baff6ae8576d7fb49da95245b6ba2c1557536 SHA512 8bfc1255f083b7d4cdbe5e03d7a006efae976988847f36c27758589a2410cf6b84e0c81a3c9673ec9b552e34af92e6d833a8db5413c03d0c85c3d82f4628c583 WHIRLPOOL 25e62e4c95b99bad82a45a82091c6ac7a7cbe02391b4873d383649413fa6eea236130a62aef7ba1f0a24f172554e9b6d650f7bfeb41abb96b8387ef85f807932
 AUX webkit-gtk-2.4.7-disable-webgl.patch 442 SHA256 6fb78d5f94806ddb976ceb076e623a2fd67e80111d624a2b3c01fde2fbbcd64e SHA512 742854749e674b3fec33652709921630a5fd3d7afd10446b3121a8cf94fb4fef70cc4de6ffe1a08143f518fd76aa05d0f4b54a041192cbc8eb9fbd5766faa5b8 WHIRLPOOL ba3f9b9dbee12f6dae05db9f343a46fd7d182d377e1a951e1785a5aff9a046d057bbf85821642e948c15a084e69d01054fe5632d7460892b196334adea582e72
 AUX webkit-gtk-2.4.9-gcc-6.patch 1890 SHA256 d0d82c1a1e955e03dd7667e351d99da485d7297acf378e715820202e48d4088e SHA512 cfcfe95b08d503456b1ea6e1770dd4ca4cd61f613ef76962cd01bc4826fbb25aed04834f820da987fd1c80941b90da73086ec5e7e19285e54082f5e90598fd9c WHIRLPOOL 1ebbeb9564978b3ddf4488c9fe72113da0ff10a0ba8c3bcd418b913a936ebe09da907e86714b7419f2746af1648ab786850559c4a5c6a0f1b51ed98e9aab0334
-AUX webkit-gtk-2.8.5-fix-alpha-build.patch 914 SHA256 aa6617505fe9342153ba9442ea109d880ca6c3315777c57ab599f67515e2a9f7 SHA512 c3599c21dbcc709cf1bbc56eafdff8f8d30d65732fff73e601a828b397523d9a0cec96a4e7940ad1b4b3d9b4711f6d5f2935dcd34cac9adec63b73401638fd5e WHIRLPOOL 68a39ccf49e7719393f14cd5d53497148527bd697b010378bdec4cdefb21c5fc7ce5081ce10b412c61390a82e45fa44d9d34aa7f223c51ad15eb1d0288ccbe60
 AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 SHA256 d076739707de117fbc9aebc684c4a43024e1673e4c30fdfa3be529331f0c1f78 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc WHIRLPOOL adf8e11ee3060bcba606cf17673d06d9c98034a71f6a7406832fabf461c4697abcd0c3d4cdb8d8298caf221c797e0732a9f865d761fcf05753a1dfd96dfd3d82
-DIST webkitgtk-2.16.6.tar.xz 14658120 SHA256 fc23650df953123c59b9c0edf3855e7bd55bd107820997fc72375811e1ea4b21 SHA512 bb488d7a60e4d6f9683ac343852a75854ef73e6b5aa093361ffe2d08e71e2f11c19da4447f9937221e518cda784bdacfcfd151f9395605a1957380fbc5b1533b WHIRLPOOL b3053979c1837d97ba525e078d4a14c64a66c61cb0117041af02c8fd250b2062fda66e782134d6bf44f3f80a04917a9b2ac61aa4e800f0011e5243d7eb8583f4
-DIST webkitgtk-2.18.1.tar.xz 14823708 SHA256 9cdb7b302fbc8a2a7e1e783b80391e64f8b12d70d6ebad4eb756dd59bf3ed795 SHA512 671392f46a34def51df34e5ce384acdcf7526b286e64f1220921f6c654a28148553e815f6f0fd02252b642dcabef9c646f5386b9ec3d2cb01520782833bb650b WHIRLPOOL e16e1e295d99d6589787fb51e2e3c5867877206428294b824307a5e7af43bdebeda3050a397fffee154c1a624fd21d59e25387fba58c91ce5ab30613773db056
 DIST webkitgtk-2.18.2.tar.xz 14823612 SHA256 b14cb3f1b5321b1dc50abcc0445a97f8e2f8813562bca7ce4d2f8069f6fec8e7 SHA512 94c8ce0fcee741dc9c054fa3f8ecac9756245c623f36e6b0bb5588d12b660aaa8bbbe28e82d0f694b94b75f1985f9dbf9231a4b63832fcf4efbe7a0116c7585c WHIRLPOOL a1ccd765d6699f07ecad8b4c899398bb2152076eda4f3a86af61d67c741229cf3d0ef02a7c8fbca2fb494e1bb1822518a18aa4f88026e91ebd2d4835d6807545
 DIST webkitgtk-2.4.11.tar.xz 9869100 SHA256 588aea051bfbacced27fdfe0335a957dca839ebe36aa548df39c7bbafdb65bf7 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb WHIRLPOOL de86c4abfb22aacbf62163d0398158931c9cf6ab628547d3b30e613f0505d67c85c3200f7db96500e7c2b35f640cdaa7f501346fc13f492c9439dff4056849a3
-EBUILD webkit-gtk-2.16.6.ebuild 8423 SHA256 9043479f20882e6ba2c68cdfdeebb2bc15802cbc910764ae1a9fde04698a0496 SHA512 aecbca385defdaaf9f24aedbac7c149007fb6f2367ec2efa704083c9dbd24f7d38bee04a3c8b42b412f66c2d0228e5183b9aaa3316b528b9771cb6b00e26fb0d WHIRLPOOL 0a048e4ffffca3ba71a174da7a211d5213c0291e01a7e09a0eb9b0048613726c0514bdcac0f503571c70a92975f70cb1ac6bc64ce665fc0ee52a19b5915de66b
-EBUILD webkit-gtk-2.18.1.ebuild 8284 SHA256 5d7e8f4d89b47210692d1eb6066ad29cba1a8d7946aafc0b07cfa7d6e0d57c0f SHA512 10541ed0a4758e99c50e8c2f2470bea744476231041f2a4ba3f6669f043dfc02ed5a334c649c3a8d841ed54057ff46537fc4efd3ab50cce569339d987c09866e WHIRLPOOL 8443233bdde89e8bcf60df0b96268d258795e7640fc5908917d0759c49a542eacf3bae0f6d57da4f88a0d57740f782c10bcb88821326162682f5aaed43f5f513
-EBUILD webkit-gtk-2.18.2.ebuild 8284 SHA256 5d7e8f4d89b47210692d1eb6066ad29cba1a8d7946aafc0b07cfa7d6e0d57c0f SHA512 10541ed0a4758e99c50e8c2f2470bea744476231041f2a4ba3f6669f043dfc02ed5a334c649c3a8d841ed54057ff46537fc4efd3ab50cce569339d987c09866e WHIRLPOOL 8443233bdde89e8bcf60df0b96268d258795e7640fc5908917d0759c49a542eacf3bae0f6d57da4f88a0d57740f782c10bcb88821326162682f5aaed43f5f513
+EBUILD webkit-gtk-2.18.2.ebuild 8282 SHA256 b875c89237e1bf8af8c09288914fd8f41ab81e8cfa2c6cf3ef98ccba022a2427 SHA512 442d5e8b7ed6aed95366620cf61ea335d504db7cf06d5faf791bd77a1ad0cbb8e0bad556d85bedb2c6aca50523def4fdb7a413d15621e87552e5b321c8614386 WHIRLPOOL b743928bfff2a03407d6ea5153775c56f126545061f738aae9757369bf88c9d732defccbabb1a874aecb2f129e7c3df9471f052cad0e33b800d4b87694ce44c4
 EBUILD webkit-gtk-2.4.11-r1.ebuild 8966 SHA256 7f1f65d1ae35ca378ff6f349e8a11abf470eb123e45a3bdbe9c52ecbc779a744 SHA512 559a7228b2c7f2dd00c26c7d4b0b935850eb93cc1e192c2e6695e5a418766050c80181d3b96254dcbfc3b9a8419c0605835a13b7640ceb6b750ec40edff35cd9 WHIRLPOOL 9c2fc07c2b3bdb5dc87ab91054df2bbc5605208167940e9604dc5e680a57a72958fed48b09fd64c95888e5bc0aafbfaa33821322a3cc040691a29b50a7ab989a
 EBUILD webkit-gtk-2.4.11-r200.ebuild 8373 SHA256 fd9192efa1b99815a456576fb1c2546747b7d4ebe07bbba2a79df26db0aee254 SHA512 7b96440750ed9f5e6402aed773cfe1e40e419364d7d526922247e58c9cb7ead97960f9866d90cc990abce8e183d06bd66191d09991d137b7b9ba86faee4f4dca WHIRLPOOL 49a2b920b0fdc7b0bc4846279060ab842494ca04a6748617b54d3ee7ec6622225c6405097c797402bf208b495802588fb1e08ef659ce3393c762821b1745bbaa
 MISC ChangeLog 15451 SHA256 0b65bc7fdc313946992c6be4dc78e9eab37283a4f68e5597dc30b51d667f8e73 SHA512 4baaa1690d1b2b0aff0bf6c82e3f3dcfe51c2100e64874f350c57f74da673f82248280ba6459c7a11f54c59687b1e7780e92ba0076fe365d390e8ed740aa7f32 WHIRLPOOL 7cafcdfcc3450bd74ff57f7f845ea814284fcc29aa9eb1a97254898fd1032c3a6994fb4aafc6a1d914a804a3e6d40e4e3e6e5a8049e760645e59dc0fbe930c53
diff --git a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch
deleted file mode 100644
index 3817bce4084a..000000000000
--- a/net-libs/webkit-gtk/files/webkit-gtk-2.8.5-fix-alpha-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/Source/JavaScriptCore/CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300
-+++ b/Source/JavaScriptCore/CMakeLists.txt      2015-10-29 17:47:10.535712494 +0300
-@@ -1146,6 +1146,7 @@
-         list(APPEND JavaScriptCore_SOURCES ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj)
-     endif ()
- elseif (WTF_CPU_ARM64)
-+elseif (WTF_CPU_ALPHA)
- elseif (WTF_CPU_HPPA)
- elseif (WTF_CPU_IA64)
- elseif (WTF_CPU_PPC)
- elseif (WTF_CPU_PPC64)
---- a/CMakeLists.txt.orig 2015-08-06 11:21:27.000000000 +0300
-+++ b/CMakeLists.txt      2015-10-29 01:23:37.416886279 +0300
-@@ -82,6 +82,8 @@
-     set(WTF_CPU_ARM 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64")
-     set(WTF_CPU_ARM64 1)
-+elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "alpha")
-+    set(WTF_CPU_ALPHA 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^mips")
-     set(WTF_CPU_MIPS 1)
- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "sh4")
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild
deleted file mode 100644
index 44c39f369684..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.16.6.ebuild
+++ /dev/null
@@ -1,288 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# use sqlite, svg by default
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-RDEPEND="
-	dev-db/sqlite:3=
-	>=dev-libs/glib-2.36:2
-	dev-libs/hyphen
-	>=dev-libs/icu-3.8.1-r1:=
-	>=dev-libs/libxml2-2.8:2
-	>=dev-libs/libxslt-1.1.7
-	>=media-libs/fontconfig-2.8:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=media-libs/libpng-1.4:0=
-	media-libs/libwebp:=
-	dev-libs/libgcrypt:0=
-	>=net-libs/libsoup-2.42:2.4[introspection?]
-	>=x11-libs/cairo-1.10.2:=
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=x11-libs/pango-1.30.0
-	virtual/jpeg:0=
-
-	aqua? ( >=x11-libs/gtk+-3.14:3[aqua] )
-	egl? ( media-libs/mesa[egl] )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	gles2? ( media-libs/mesa[gles2] )
-	gnome-keyring? ( app-crypt/libsecret )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2.3:1.0
-		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-bad-1.8:1.0[opengl?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	libnotify? ( x11-libs/libnotify )
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	spell? ( >=app-text/enchant-0.22:= )
-	wayland? ( >=x11-libs/gtk+-3.14:3[wayland] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-	X? (
-		x11-libs/cairo[X]
-		>=x11-libs/gtk+-3.14:3[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXrender
-		x11-libs/libXt )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=dev-lang/perl-5.10
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-libs/atk-2.8.0
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-PATCHES=(
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	"${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=564352
-	# https://bugs.webkit.org/show_bug.cgi?id=167283
-	"${FILESDIR}"/${PN}-2.8.5-fix-alpha-build.patch
-)
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# older glibc needs this for INTPTR_MAX, bug #533976
-	if has_version "<sys-libs/glibc-2.18" ; then
-		append-cppflags "-D__STDC_LIMIT_MACROS"
-	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	# support for webgl (aka 2d-canvas accelerating)
-	local canvas_enabled
-	if use webgl && ! use gles2 ; then
-		canvas_enabled=ON
-	else
-		canvas_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/bin/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild
deleted file mode 100644
index 2be3f452f740..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.1.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby22 ruby23 ruby24"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
-	wayland? ( egl )
-	|| ( aqua wayland X )
-"
-
-# Tests fail to link for inexplicable reasons
-# https://bugs.webkit.org/show_bug.cgi?id=148210
-RESTRICT="test"
-
-# Aqua support in gtk3 is untested
-# Dependencies found at Source/cmake/OptionsGTK.cmake
-# Various compile-time optionals for gtk+-3.22.0 - ensure it
-# Missing OpenWebRTC checks and conditionals, but ENABLE_MEDIA_STREAM/ENABLE_WEB_RTC is experimental upstream (PRIVATE OFF)
-RDEPEND="
-	>=x11-libs/cairo-1.10.2:=
-	>=media-libs/fontconfig-2.8.0:1.0
-	>=media-libs/freetype-2.4.2:2
-	>=dev-libs/libgcrypt-1.6.0:0=
-	>=x11-libs/gtk+-3.22:3[aqua?,introspection?,wayland?,X?]
-	>=media-libs/harfbuzz-1.3.3:=[icu(+)]
-	>=dev-libs/icu-3.8.1-r1:=
-	virtual/jpeg:0=
-	>=net-libs/libsoup-2.48:2.4[introspection?]
-	>=dev-libs/libxml2-2.8.0:2
-	>=media-libs/libpng-1.4:0=
-	dev-db/sqlite:3=
-	sys-libs/zlib:0
-	>=dev-libs/atk-2.8.0
-	media-libs/libwebp:=
-
-	>=dev-libs/glib-2.40:2
-	>=dev-libs/libxslt-1.1.7
-	gnome-keyring? ( app-crypt/libsecret )
-	geolocation? ( >=app-misc/geoclue-2.1.5:2.0 )
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	dev-libs/libtasn1:=
-	>=dev-libs/libgcrypt-1.7.0:0=
-	nsplugin? ( >=x11-libs/gtk+-2.24.10:2 )
-	spell? ( >=app-text/enchant-0.22:= )
-	gstreamer? (
-		>=media-libs/gstreamer-1.2.3:1.0
-		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
-
-	X? (
-		x11-libs/cairo[X]
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXdamage
-		x11-libs/libXrender
-		x11-libs/libXt )
-
-	libnotify? ( x11-libs/libnotify )
-	dev-libs/hyphen
-
-	egl? ( media-libs/mesa[egl] )
-	gles2? ( media-libs/mesa[gles2] )
-	opengl? ( virtual/opengl
-		x11-libs/cairo[opengl] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		x11-libs/libXcomposite
-		x11-libs/libXdamage )
-"
-
-# paxctl needed for bug #407085
-# Need real bison, not yacc
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	${RUBY_DEPS}
-	>=app-accessibility/at-spi2-core-2.5.3
-	>=dev-lang/perl-5.10
-	>=dev-util/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-CHECKREQS_DISK_BUILD="18G" # and even this might not be enough, bug #417307
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			einfo "Checking for sufficient disk space to build ${PN} with debugging CFLAGS"
-			check-reqs_pkg_pretend
-		fi
-
-		if ! test-flag-CXX -std=c++11 ; then
-			die "You need at least GCC 4.9.x or Clang >= 3.3 for C++11-specific compiler flags"
-		fi
-
-		if tc-is-gcc && [[ $(gcc-version) < 4.9 ]] ; then
-			die 'The active compiler needs to be gcc 4.9 (or newer)'
-		fi
-	fi
-}
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != "binary" ]] && is-flagq "-g*" && ! is-flagq "-g*0" ; then
-		check-reqs_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-	cmake-utils_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Respect CC, otherwise fails on prefix #395875
-	tc-export CC
-
-	# Arches without JIT support also need this to really disable it in all places
-	use jit || append-cppflags -DENABLE_JIT=0 -DENABLE_YARR_JIT=0 -DENABLE_ASSEMBLER=0
-
-	# It does not compile on alpha without this in LDFLAGS
-	# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648761
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# ld segfaults on ia64 with LDFLAGS --as-needed, bug #555504
-	use ia64 && append-ldflags "-Wl,--no-as-needed"
-
-	# Sigbuses on SPARC with mcpu and co., bug #???
-	use sparc && filter-flags "-mvis"
-
-	# https://bugs.webkit.org/show_bug.cgi?id=42070 , #301634
-	use ppc64 && append-flags "-mminimal-toc"
-
-	# Try to use less memory, bug #469942 (see Fedora .spec for reference)
-	# --no-keep-memory doesn't work on ia64, bug #502492
-	if ! use ia64; then
-		append-ldflags "-Wl,--no-keep-memory"
-	fi
-
-	# We try to use gold when possible for this package
-#	if ! tc-ld-is-gold ; then
-#		append-ldflags "-Wl,--reduce-memory-overheads"
-#	fi
-
-	# Multiple rendering bugs on youtube, github, etc without this, bug #547224
-	append-flags $(test-flags -fno-strict-aliasing)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	fi
-
-	# TODO: Check Web Audio support
-	# should somehow let user select between them?
-	#
-	# FTL_JIT requires llvm
-	#
-	# opengl needs to be explicetly handled, bug #576634
-
-	local opengl_enabled
-	if use opengl || use gles2; then
-		opengl_enabled=ON
-	else
-		opengl_enabled=OFF
-	fi
-
-	# support for webgl (aka 2d-canvas accelerating)
-	local canvas_enabled
-	if use webgl && ! use gles2 ; then
-		canvas_enabled=ON
-	else
-		canvas_enabled=OFF
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_QUARTZ_TARGET=$(usex aqua)
-		-DENABLE_API_TESTS=$(usex test)
-		-DENABLE_GTKDOC=$(usex doc)
-		-DENABLE_GEOLOCATION=$(usex geolocation)
-		$(cmake-utils_use_find_package gles2 OpenGLES2)
-		-DENABLE_GLES2=$(usex gles2)
-		-DENABLE_VIDEO=$(usex gstreamer)
-		-DENABLE_WEB_AUDIO=$(usex gstreamer)
-		-DENABLE_INTROSPECTION=$(usex introspection)
-		-DENABLE_JIT=$(usex jit)
-		-DUSE_LIBNOTIFY=$(usex libnotify)
-		-DUSE_LIBSECRET=$(usex gnome-keyring)
-		-DENABLE_PLUGIN_PROCESS_GTK2=$(usex nsplugin)
-		-DENABLE_SPELLCHECK=$(usex spell)
-		-DENABLE_WAYLAND_TARGET=$(usex wayland)
-		-DENABLE_WEBGL=$(usex webgl)
-		$(cmake-utils_use_find_package egl EGL)
-		$(cmake-utils_use_find_package opengl OpenGL)
-		-DENABLE_X11_TARGET=$(usex X)
-		-DENABLE_OPENGL=${opengl_enabled}
-		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_enabled}
-		-DCMAKE_BUILD_TYPE=Release
-		-DPORT=GTK
-		${ruby_interpreter}
-	)
-
-	# Allow it to use GOLD when possible as it has all the magic to
-	# detect when to use it and using gold for this concrete package has
-	# multiple advantages and is also the upstream default, bug #585788
-#	if tc-ld-is-gold ; then
-#		mycmakeargs+=( -DUSE_LD_GOLD=ON )
-#	else
-#		mycmakeargs+=( -DUSE_LD_GOLD=OFF )
-#	fi
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	# Prevents test failures on PaX systems
-	use jit && pax-mark m $(list-paxables Programs/*[Tt]ests/*) # Programs/unittests/.libs/test*
-
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Prevents crashes on PaX systems, bug #522808
-	use jit && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/jsc" "${ED}usr/libexec/webkit2gtk-4.0/WebKitWebProcess"
-	pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"
-	use nsplugin && pax-mark m "${ED}usr/libexec/webkit2gtk-4.0/WebKitPluginProcess"2
-}
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild
index 2be3f452f740..b05d77618c66 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 0080984c0a6e..729bba372c57 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -18,7 +18,7 @@ EBUILD zeromq-4.1.6.ebuild 1154 SHA256 ef66d74781366df3528c621badcdd276f437597a4
 EBUILD zeromq-4.2.0-r1.ebuild 1268 SHA256 75bc198b2329465b1ec660fd47824e6c163ecfb7e2787c7c1de5a9976d9416d9 SHA512 e899d165a43f8d07a1f653e046483219f1dc1827e946c48490af8ce7a156e229a7041a4051076a3584d3768fbc80f8220d8453e7f5e8c0129abf86f411c098a1 WHIRLPOOL 2331c987bda2e176c811b0d0a5576ecba9dfe5da49328eec582649b14b898bf65385b266f8750efe117107c27937f4a8a6fe34951c61e66f4d3c5e2693e52509
 EBUILD zeromq-4.2.1.ebuild 1209 SHA256 5aa692b77bdcc6976cfb9e2da25a5b402e1ebe53d1eb2cc879e07b29048fe5b1 SHA512 d748d27548088f9121f1b3143fed334f5d69527a2868f46d6a1cc74daf0e6164801573d2c4065b9383245ec686680245dc46a036e1e6432d7f138f7a39136154 WHIRLPOOL 7fe0b358f2825a828f7f07272468cbe72d32c36a70165d37de61a0d85ca498ed42d0d3066920cfb2755ce67bfe5f22cbf2478919512b3cb9300c23e1fbc7aea0
 EBUILD zeromq-4.2.2-r1.ebuild 1380 SHA256 66efe92bf053d55886ce2b04f9d50d47292329fff2e02781c9085bf824e79432 SHA512 5ce25d3196c4be51420af99b4590d54c79b687d74a3b64ee44b1322bbce829e3e04b99ea5cb840f1f991f36cc12f9080806aa91666ba183372dee6963442b7d9 WHIRLPOOL e04341b6e82e0bd3fed692a1b1ed197bdca0ff0665291ab338baa5955061ad767ee40c2c6aa4a3da81b1c0de1e7e4f12d42d2af886d69c2cd1758aac92b80257
-EBUILD zeromq-4.2.2-r2.ebuild 1519 SHA256 3ae27be8bb2a9eb78327c224685847f7747faee362954181ca37025e5b88cbd3 SHA512 6b2c909473551ed11fbf3ebf319651e2cec2fb3a0ed0e920d8fc12ea9aae9a1475648daedb4d61bbf3c8c3afdfa47f0baca52db1b12f792b2f7afa71c1e87077 WHIRLPOOL 3657373c4e3526e3a6376a311653b6b0cfda94b444da64baf38fe20ff7057131da273139488ca2c084e6831bf6b7fc9b602b8c2420a502a4534a39acb1f40ff3
+EBUILD zeromq-4.2.2-r2.ebuild 1518 SHA256 0ceef6ad6278840dae89a5c51974aec53cb7a4fc0c6de51df7791e0da338135a SHA512 34b6d885475c3129452ddbec7f524ca44f296df3fbcf9dac505955fdf2579cb51b6ec2acf717e69961705a145d0277862cfab82cfd0a9deb31dc7224ea8cdecf WHIRLPOOL b53e0a970691152e490fdf1433c54c66f07eb009cffa41dbfa759e16dd099c3f1e2a00af53469f7e55b8998ce6c77afaf9d6dea653de904ba3581d807e67c645
 EBUILD zeromq-4.2.2.ebuild 1217 SHA256 e3f0fa3c5448ff5a22003c12e9bbc7a8fec740d23a56fa2c0ab9ec239131a8b1 SHA512 097c10c8db5d2526d8eb5b0958d92be09c842373aad9b22dfa4c8d26cc6fa982440d28b8ac1ddabf1bce0e4a8f5e71ba16ebeecd7de02304ccdf2e5509da655c WHIRLPOOL e7d225fa284a750650e338f88913d7e1c0f861be4edea16ac0d716c58f8cf75e3612134569554ce87766f912cadf5055390dab495f4bbf20c674d4f7d8a588a4
 MISC ChangeLog 6676 SHA256 311b48768020ed8e2252dcc9a034995b81f00a182e02b8ec5f8e37617b78f97b SHA512 e4494ca72365f8c03f0bedec66ac2860f5c120ad2858a9204a674b72a318bedddd7db1581d5941af7fbde3cba57010f1447d54c1fd96c5f0abfedc6e95944ce6 WHIRLPOOL 351de5f5eaefecf51db8692b7677409b96560272e80df1d535a106a8ae38d21412b2f6a167322d71f90604e23f8a88217cb0c640a8017b9ba464885a4dd64cfd
 MISC ChangeLog-2015 10008 SHA256 7d620c3e362a41c8fadacd9c1e7ab9c058189ff9b5340265782937b21f89759a SHA512 15977242729f75e7c57e0f89698576afbd09d3b7ed30f79ef9fd41dd05db1290f37c92e9a5f1eefaea619ee21ed182826535c59519755669be2cf9661f5a9b54 WHIRLPOOL 61d74b6551db99a8d15ebc2e70bd9f86a04272c895dd78676bf11ecc46d6f3101df8306e44375b0eb219b1f0ecfaaed0108a6ae02baf2a9babe31a905f0edb66
diff --git a/net-libs/zeromq/zeromq-4.2.2-r2.ebuild b/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
index dc958dca3e4b..9385961fb2c8 100644
--- a/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
+++ b/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/5"
-KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~mips ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc pgm +sodium static-libs test unwind elibc_Darwin"
 
 RDEPEND="