gentoo resync : 20.06.2021

30 files changed, 53 insertions, 94 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 210c03d60c01..3281d45d1072 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 7a05239a7d53..8bd1144ed37e 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -3,8 +3,8 @@ DIST grpc-1.28.1.tar.gz 6888015 BLAKE2B 92d6f4a655183d34979c668bb7f4187a6670aa8f
 DIST grpc-1.32.0.tar.gz 7174251 BLAKE2B 4ea1b2d6a92f71e0d3703b350778fa4ae78eaeefe4f9052b649abb42e3d5e02e0220695ce2ef52eaf4ecec4194d024bf1ce7a33d52594557c7cceec5b5a3c069 SHA512 90136042327cea4e3680e19484f23cc00322914a7aae7987bf00b6e0901721d14c487555fdd94888192d6beb950172361ac57fbd02d43b40552f7ff5cac442ed
 DIST grpc-1.37.1.tar.gz 8212731 BLAKE2B c306fbe60f5191fe957efb35c75574e00b1948777795e7d116a1d0a47238b53e73055e7c173e69afcf97b77e593f55001141bbef8fb09b9787420203d935eb85 SHA512 fe02447f558116e9ed2de48142b9bd3b8908d496aea7816406eee2c6ad136714ee14c2104a82a32f56ab486c5050b4665c55bacb24c91ceabcf1b998a5fc86b7
 DIST grpc-1.38.0.tar.gz 8296425 BLAKE2B 2a317dbb1ab79a508a301d84ac6aa858f62accf057453b1536900654376d1a1b19549bb1efa52c5f0916c08c3616e9d1cd2efb4f8143ea923633cfc4ed6e04fb SHA512 6ce37b4b87f08c227995f8c8a9649a3d9a4d8622458772f5f32552ff5b00b920a6e57ba7208c2e8f67eb2ee4f503378320866905863598d08e21b226aa0cd1c5
-EBUILD grpc-1.28.1-r1.ebuild 1589 BLAKE2B 8f45534c7e1f1ac0ac037a7a44279ba6919a15d0a4a1d587fad33e4d9ff12a3ace54488a9872d322fa0de22aa9ef934ee81ab17bdfa1edb76ea22e6e3ffb6be1 SHA512 de584b6dc05d75b1bca48adbbbbfb26a88e29287615dbdaa8e832eee097c1840763e1a71a119c49fd75e09209ed105d6edd250a739a93c4e5817cbc04d68d4bc
-EBUILD grpc-1.32.0.ebuild 1932 BLAKE2B b2c797c72c4e5c6da11a593ffc7a45d0d8b81ad24cbe3d778f813a676330e2620f5b12509fc94b4dc98af5e07bc24ff2cc0a76092e1a3416c968f2a82ceb06d9 SHA512 d895cb3981f6a0cf947e133aa0600c1e500a3d4a04899d13b3dcbe22f03dd7269b5530f13c8a2b15309e162bf828f980316ca9f9ee690a806c478e4a0c0a2cd0
-EBUILD grpc-1.37.1-r1.ebuild 2714 BLAKE2B ea8a876d73bfc8a29f9aa60a84ab510cb74fac1486ab526cfa1f9d9de8d5208b93fefc6f08c4d22d2e75adb62d26c1a2e1b3cebb24fc95701b3a315b669c1152 SHA512 ca2ba79a51ffa8130b71492ce04fd7edc0dd8cd8b05c084058eb2f3ef26c4d92f70ad2967d35a2ac9e47ccc662c64e06fbcb7c36b6c6a6649c76b41a888a639a
-EBUILD grpc-1.38.0.ebuild 2721 BLAKE2B 4dcec53ff6a112dc260d819238efd0550203d79c8d7f4639affb264262509a759f06749bc8382bf693d4dd2db28649daf1bce731b5fbeff0ec6cd205ff64921a SHA512 2828d48382a776216be8a0c41a52374b8d3dce5fa28a76d66e5a30415239e2905b22b3f9ef047486407878f62daad4ea98a6c7183b767825b68ad810213afa95
+EBUILD grpc-1.28.1-r2.ebuild 1592 BLAKE2B 027fffc731b0923ef9d60a9617f02796d312f601fa7620bbb7b0ce1b65b89bacd02c1b899f52e7dc6e6d9599b42e7f4f883256b2a70c1699cb7f175b1a6f79d7 SHA512 c7aa0fe04804855bbf01a5f682b6652d0e3f05e8869074e87f987b54738c76378f1fabf033717ec5bd68f2c9b375ebcae92650fce7affc1e19dd78dfb37e5606
+EBUILD grpc-1.32.0-r1.ebuild 1935 BLAKE2B 8bf2be0bd25092b7d6ab2ac0ff8b36555604496272ed249bb38f3ae808ec0e62db1018c9f5ccc4211bc191561982d5f6034c321596f9d87b6eb7ed114b2a9dc5 SHA512 c7d711a3c55e5768c29b522ebee1e26f0e332e62216a0744b9630ef4fc03f571e2b01d8c2a977f5b36526615375a0e78be1444f2610ec8ae0b847117f51a9cd5
+EBUILD grpc-1.37.1-r2.ebuild 2717 BLAKE2B 4b806690625388aa29ce60f40ba918ebacd2e384db9021913dc5e1c61575bc8c5a2382ffd38bc02af8e004a5f4ddd7daa70ba72636d1f0b04bab8f8588f8204e SHA512 e9d838e67b7c8554fc53d74f97b15c431364107b2f50b9459687bd1bb90fa6e3f68a9358fe347011809597da3c5cd39ff195719881e3af8265e9d5da83705b14
+EBUILD grpc-1.38.0-r1.ebuild 2724 BLAKE2B 94125171cf31eef783067a666977e7b853f4003bd3f3eb1dbc49735bbc43ca17cbfbfe3abe16096f74ba69251d547efa64c9d4664b472c685d07512291f8b7bb SHA512 d7e442e456c57a85b747029114a217275e0da072566aba189e885ed849ea1b5b69bb08bec7cd578ba7a298655d9b97a2eafede32087134f8b4c9ec80a7e36f08
 MISC metadata.xml 459 BLAKE2B e12d07ea4d2ecbaec9babc586e2417f1267067aff89d67debc7b4d5cd954bdffdd08f1cac4dbadbcde4dbdbc05147eea60f1dde419d207601bba123dfa59222f SHA512 f6c5483cf4bef3919ce69ca03d28cac0967b2b25d40a3c6d921764f8e451e191b60c5c769ab7554f536564b6b5bd4cb89abcac925d3a87779b0da10f94539bbe
diff --git a/net-libs/grpc/grpc-1.28.1-r1.ebuild b/net-libs/grpc/grpc-1.28.1-r2.ebuild
index f0cc36db8c2c..92abfe8d56e3 100644
--- a/net-libs/grpc/grpc-1.28.1-r1.ebuild
+++ b/net-libs/grpc/grpc-1.28.1-r2.ebuild
@@ -21,7 +21,7 @@ DEPEND="
 	>=dev-libs/protobuf-3.11.2:=
 	>=net-dns/c-ares-1.15.0:=
 	sys-libs/zlib:=
-	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-libs/openssl-1.0.2:0=[-bindist(-)]
 "
 
 RDEPEND="${DEPEND}"
diff --git a/net-libs/grpc/grpc-1.32.0.ebuild b/net-libs/grpc/grpc-1.32.0-r1.ebuild
index e4306625c910..4d48690285c7 100644
--- a/net-libs/grpc/grpc-1.32.0.ebuild
+++ b/net-libs/grpc/grpc-1.32.0-r1.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
 	>=dev-libs/protobuf-3.13.0:=
 	>=net-dns/c-ares-1.15.0:=
 	sys-libs/zlib:=
-	>=dev-libs/openssl-1.1.1:0=[-bindist]
+	>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
 "
 
 DEPEND="${RDEPEND}
diff --git a/net-libs/grpc/grpc-1.37.1-r1.ebuild b/net-libs/grpc/grpc-1.37.1-r2.ebuild
index cf129dc2a38e..468f9b7a6ac4 100644
--- a/net-libs/grpc/grpc-1.37.1-r1.ebuild
+++ b/net-libs/grpc/grpc-1.37.1-r2.ebuild
@@ -21,7 +21,7 @@ IUSE="doc examples test"
 RDEPEND="
 	=dev-cpp/abseil-cpp-20200923*:=[cxx17(+)]
 	>=dev-libs/re2-0.2021.04.01:=
-	>=dev-libs/openssl-1.1.1:0=[-bindist]
+	>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
 	>=dev-libs/protobuf-3.15.2:=
 	>=net-dns/c-ares-1.15.0:=
 	sys-libs/zlib:=
diff --git a/net-libs/grpc/grpc-1.38.0.ebuild b/net-libs/grpc/grpc-1.38.0-r1.ebuild
index 5a30754029f3..6f34a08a4986 100644
--- a/net-libs/grpc/grpc-1.38.0.ebuild
+++ b/net-libs/grpc/grpc-1.38.0-r1.ebuild
@@ -21,7 +21,7 @@ IUSE="doc examples test"
 RDEPEND="
 	=dev-cpp/abseil-cpp-20210324*:=
 	>=dev-libs/re2-0.2021.04.01:=
-	>=dev-libs/openssl-1.1.1:0=[-bindist]
+	>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
 	>=dev-libs/protobuf-3.15.8:=
 	dev-libs/xxhash
 	>=net-dns/c-ares-1.15.0:=
diff --git a/net-libs/ldns/Manifest b/net-libs/ldns/Manifest
index 4c56ecd8b333..ddbeb73771a7 100644
--- a/net-libs/ldns/Manifest
+++ b/net-libs/ldns/Manifest
@@ -1,5 +1,5 @@
 AUX ldns-1.7.1-Makefile.patch 1020 BLAKE2B f49a397df95bfcc0ee2eba4cb3f7aa9202d8b940c04a7097c447356198b04f464f10ed5db98db99f4a34ce04ff6d450282306b855a97b72fdc3bbca24f1c0689 SHA512 3779f61e3f20d593843c5b429b7366b826380fe2fb17b74d76d85432189712e34323dad3a653bb45333740caf01d997025b72a96a58ec75cc2fae8c249108e9d
 DIST ldns-1.7.1.tar.gz 1244394 BLAKE2B 8f2d9c6e34c4f13924ce1531a5757c4a619fc31ebc5a0a3d4aaf43fcfc8b53e8f371984b1c60ab74f735a05a9ca0710fc29a40fffeaef66eb54395eb3a727a0d SHA512 e8f72a4ff4aa544acac5e7be9a8ba38c6b8d388bb26f9a0ed04c1a921622f8582cc8539beafc76a29187a55c94069b7c1875e77522e1a7e7bb3e297dd1e4c2b7
-EBUILD ldns-1.7.1-r1.ebuild 2608 BLAKE2B 602866130ab62202cd8543d0488c9ce574fc64014bbeae405099d7d7b25faa9e87aeb328b0b9770e2e6825ff79f030a338ecc69b8f706b79463df16971be1c8e SHA512 086e756a194ef7fc27b5c6557977fffcf81fcf1391b45bcff06a9c8c1b6a6bcfa5eebcd91f4d963d9595c37688fbae387afe09dab6ecf9c7f1540c913c65a4a8
-EBUILD ldns-1.7.1-r2.ebuild 2612 BLAKE2B b585dd3dd8d1a186570466da9d4d1f5fccba0c040b2c3f7cfe420a74f1a5f7e5b3c6dd02dc688d7b9bd76365be10297443556bfd294a191be1fedbe91ccfc6be SHA512 8f248298a703abdcd426f681d923ad355e92aa1d7324be284ff8c82585daba1547bba6734d8e01feb0ae6a8bcb38e564ad511cb368c4d1953df9aecb7ebfee53
+EBUILD ldns-1.7.1-r3.ebuild 2617 BLAKE2B 1f137bfba50eb15e4390d6466c21ff09ac0b75e4a8abf7c0e9865b1ec7b931fa27eda22c19210ea05ec9dc08905541faf4f01f6e06550f95ca29b6d0f51830ec SHA512 29d8a964da4fbeaa0365d68a1ef9f6fa13ff588bde3fc2ca0281d962e9567ca590414f425feae7bfc7091512693852d75f6a7862446b86c1e52e4d3f54f206a1
+EBUILD ldns-1.7.1-r4.ebuild 2621 BLAKE2B 0585d412d07d38a2dd1744dbd539894c5a4e3d3391d5933464494420e1302cd7d935e39ae16d05bb12fcd9769cd2d1bd4ee15d2bf8e80132ab5ec95a83cd1b69 SHA512 26f81bb4f48a6c1f9f8ae7bf5fbcafc4fcddc1efbf14d34bfd0138cbb75449408731325bedc7179f093861e05696a518de3a7ad877cbf92c26110d3ed2a523d9
 MISC metadata.xml 932 BLAKE2B 263b5d8d54aed15ae710d6f3d60ebe1683699c8aef9fd34fe5865ee5d1aa046ae40be8c1239b2ee3f7df57a8f8f6de57b7b693e2c4d7680fc8cfa269bd3cd832 SHA512 40c5a002f31a00ff586f3af4b1f112760a589aeec5846e5335bf39c6a6b2fd0e248dfcd62c1f4956f81f710db1f9998e0dd7b84acd658252d7006c8100631ae7
diff --git a/net-libs/ldns/ldns-1.7.1-r1.ebuild b/net-libs/ldns/ldns-1.7.1-r3.ebuild
index 046f31d91c8f..4796d3ae7c41 100644
--- a/net-libs/ldns/ldns-1.7.1-r1.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r3.ebuild
@@ -20,13 +20,13 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 	ecdsa? (
-		>=dev-libs/openssl-1.0.1e:0=[-bindist,${MULTILIB_USEDEP}]
+		>=dev-libs/openssl-1.0.1e:0=[-bindist(-),${MULTILIB_USEDEP}]
 	)
 	ed25519? (
-		>=dev-libs/openssl-1.1.0:0=[-bindist,${MULTILIB_USEDEP}]
+		>=dev-libs/openssl-1.1.0:0=[-bindist(-),${MULTILIB_USEDEP}]
 	)
 	ed448? (
-		>=dev-libs/openssl-1.1.1:0=[-bindist,${MULTILIB_USEDEP}]
+		>=dev-libs/openssl-1.1.1:0=[-bindist(-),${MULTILIB_USEDEP}]
 	)
 	>=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}]
 "
diff --git a/net-libs/ldns/ldns-1.7.1-r2.ebuild b/net-libs/ldns/ldns-1.7.1-r4.ebuild
index ca426ee12832..ba6d831e94aa 100644
--- a/net-libs/ldns/ldns-1.7.1-r2.ebuild
+++ b/net-libs/ldns/ldns-1.7.1-r4.ebuild
@@ -22,13 +22,13 @@ REQUIRED_USE="
 RDEPEND="
 	python? ( ${PYTHON_DEPS} )
 	ecdsa? (
-		>=dev-libs/openssl-1.0.1e:0=[-bindist,${MULTILIB_USEDEP}]
+		>=dev-libs/openssl-1.0.1e:0=[-bindist(-),${MULTILIB_USEDEP}]
 	)
 	ed25519? (
-		>=dev-libs/openssl-1.1.0:0=[-bindist,${MULTILIB_USEDEP}]
+		>=dev-libs/openssl-1.1.0:0=[-bindist(-),${MULTILIB_USEDEP}]
 	)
 	ed448? (
-		>=dev-libs/openssl-1.1.1:0=[-bindist,${MULTILIB_USEDEP}]
+		>=dev-libs/openssl-1.1.1:0=[-bindist(-),${MULTILIB_USEDEP}]
 	)
 	>=dev-libs/openssl-1.0.1e:0=[${MULTILIB_USEDEP}]
 "
diff --git a/net-libs/libesmtp/Manifest b/net-libs/libesmtp/Manifest
index 8e3d805f7bbc..7eaa23fe9d34 100644
--- a/net-libs/libesmtp/Manifest
+++ b/net-libs/libesmtp/Manifest
@@ -3,6 +3,6 @@ AUX libesmtp-1.1.0-fix-soname.patch 672 BLAKE2B 2bb9a535b94e444af19597f0ca0c06b0
 DIST libesmtp-1.0.6.tar.bz2 365506 BLAKE2B 9ce8c9f210e6c41c95bba55a7aec79c176c4582f5dafc1aba4fbf9adb411b75ab89d400ac7a12b7d5d24ede414cb8e2ca306299a2e156515e611d074142cf5e8 SHA512 c122fc5995b76771cce2db58c9e59597cc3a76d273feb6fc26b869f118e91bdf98a5721ee2d1de8175c376af018b5806b0379bbeba2f5da95108916028fd8dda
 DIST libesmtp-1.1.0.tar.gz 169134 BLAKE2B 94ef87c65101557f6d60a6bcd7a8b0de638c24d46536ddf602da05c09858780b0a50f9fd8dae1e54a5e9a7826d45fa6da10bad751a9be50475a8f441c94ad455 SHA512 fc2a9d9922a1807cce8c8cee627ea8fd3a79c33f0987c5a487080b1a1659fd504bc45da2f919d30eced33ab3e950105383a46ecf3365493134adc1183eb99e53
 EBUILD libesmtp-1.0.6-r3.ebuild 957 BLAKE2B 5279f6b740d8edcb07f731eb26041e3b5a229dc5960e38070e1b348d32bb205d667377c347b9714631cb82b385a09716b97dd097f06b25f59e203fa05dc3aef5 SHA512 a7e378fe2263209bb204fae15074eaa0af492e0ddb0a9d8e862120d02622b384cea9730c984b7579ad6870d0491392c4c7456a6328d311ca03b19c9aa4f33fcf
-EBUILD libesmtp-1.1.0-r1.ebuild 1283 BLAKE2B 6081406eff69d9ff0cdc94d5a1300175f4b0609f1e5f6475766fc0cd4bea4de5a52dd70c4c1fbc852e969baff0a76ed884c588767eb6825e34b0647f584b01f9 SHA512 ffcedd9df7b620cc2673140e51e097a3deff3c42ffd5d709e9ef8d40aa996072801d752094118ad3f3bb4fb8bafbc1048b7fada3d8cced6074a58f8eb70a41f4
+EBUILD libesmtp-1.1.0-r1.ebuild 1279 BLAKE2B e112228fb18dc0ef14c807e6f4f25842a48d7d523879119b8d28c9407e4462dd8549e4ab6a966affe183c88a3f1d56cf85ecd76c7151e52493b4e54e568d31c3 SHA512 0faf5e81f53d82a30594834f569dcc31eeb56e9fe07e6714cfab3beea5deed0ccd090983d6674d276b4bc685ed253f42716475cf994eeef923e34e6fa42a1a87
 EBUILD libesmtp-9999.ebuild 961 BLAKE2B bf1d5b91f7d31f016aa779b13821dc47af17a926c3457e6ea20455dfc6159654f455c648ca11375d0b38469fe5279bfdabdf04aa4ec398eecb386aa1f12ca7f2 SHA512 01375e20aa83e2f0732891d609c9b55df0b116d7a9b36a2e4a1022326aa75133890276faf13fba046369fa981d892f1891f2c02b5262f652f25d3b7985c57b2d
 MISC metadata.xml 330 BLAKE2B 960a34feef0d9e57b37adc3e5776686215c7476dc5331f39b247786ecec58407e74aae1898d60d54209e00573e5486e3b042ebabfb686d4840172371ed1d5509 SHA512 97671749440b8ca99218706c398b65e45fdd0c6a4529877aafad2deb0598c7a7fdd7b6aa84079b194c345b4eee550551aa5d2af60216f95fa0701f6b4ac3c1d6
diff --git a/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild b/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild
index 68e02d8f71a7..1e8152918fe6 100644
--- a/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild
+++ b/net-libs/libesmtp/libesmtp-1.1.0-r1.ebuild
@@ -14,7 +14,7 @@ else
 	SRC_URI="https://github.com/libesmtp/libESMTP/archive/v${PV/_}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/libESMTP-${PV}"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="LGPL-2.1 GPL-2"
diff --git a/net-libs/libgfbgraph/Manifest b/net-libs/libgfbgraph/Manifest
index a95138c693fe..ce0f6e243aea 100644
--- a/net-libs/libgfbgraph/Manifest
+++ b/net-libs/libgfbgraph/Manifest
@@ -1,3 +1,3 @@
 DIST gfbgraph-0.2.4.tar.xz 39520 BLAKE2B 71ce5a091b5ab7d27b7b5353ff76cb67c90a358371f1afe41a561bab195c7e01353854fbd28c3970c3179ded24daf41f7150f70b5efcb1c81aac89de9fed2c88 SHA512 e6d63e56f4d67b59b0abbfb9dfe3aad8b142023413246015a84078c76f631eaa6e9fa7eb5771f64156ea01e160eb07b17783059e449036b372b4bcb26751ff68
-EBUILD libgfbgraph-0.2.4.ebuild 1248 BLAKE2B 784cf9f67ef6b3fc0248b13e93aea276892d7507996ed13d6078acffd35027497265df0ba6c0bcbca6c7b3802dfb6efc6c66a433b7173c69cf28a5eb621343e0 SHA512 87dbb6516ff6b16084d1de15bbcd9f4982b921d6b03aab6440ad58f48f4433e146de2f9b8bcd0074ba043b336181baf11188eb8d62ef70755ef3aff4a21edf56
+EBUILD libgfbgraph-0.2.4.ebuild 1253 BLAKE2B 13b7673066d2759daba70e95ca4063825190bc82d739c5c5fc3a21b4fcb8d51825f69d81a97cf5daa35e0653cc5678fcb7352f0771e357f0bdcc88e1c32c30aa SHA512 b716d4248eab483e82c4bf05deae33345d5fd1dadd1fbc7f95c2d5c649135343d8261877c96b5fede2e8d7ea9c9ac720116e814f344f136953cababb2e381915
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild b/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild
index fd523668829d..f3649d47e702 100644
--- a/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild
+++ b/net-libs/libgfbgraph/libgfbgraph-0.2.4.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/libgfbgraph/"
 
 LICENSE="LGPL-2.1+"
 SLOT="0.2"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="+introspection"
 
 DEPEND="
diff --git a/net-libs/libslirp/Manifest b/net-libs/libslirp/Manifest
index 7324619eb832..6305e2ef6f78 100644
--- a/net-libs/libslirp/Manifest
+++ b/net-libs/libslirp/Manifest
@@ -1,6 +1,4 @@
 AUX libslirp-4.3.1-bug-756910-check-pkt_len.patch 1404 BLAKE2B 6e9d046f5f25bbdb574534cdd26ab69c708a56893336a09a7e146d654c4e74af338ad178c0067662e696453930f627117f386f8d99d20a555b28452e309884b4 SHA512 2ebf8293aed6c09c1a03123e5b3acca602ad1fd293653f093e1c69d691e2d4db15c1f9d10262fc0e5019771f81e1812788b6e5234a602f13b3b73172d6f6419f
-DIST libslirp-4.3.1.tar.gz 127008 BLAKE2B de40980521a54367fda73b9a67a80159ff14e8ea073086d8df3b42028ffe778b62f0aabe2b3f0929e168c73c453a8eda3fe0bb866d22de5b0712775e9cece19f SHA512 fa38a5e508b00802538f8466b8b52fc4842d6f7f74caa399db1011c15bb37198678415147327a606e3f259fd5def9390012df1d4dc76e8869e9bb77ca6514005
-DIST libslirp-4.6.0.tar.gz 135533 BLAKE2B 62be67192a68b4c8bdc0b84f1ba2f1d3617a2c94c14720f9eb2f4ca317af59b59ce4d2147903b4055e60f4de262db7500345db6341b083a1d6f48e9f6a2edd04 SHA512 f3464818182bd2d8d21fd1f158172acd84523d8c252f21cab4f29317606b01ebd772a612dc522255e7f4a169608e6604b389e433e65d3163ba591f639e744a81
-EBUILD libslirp-4.3.1-r1.ebuild 939 BLAKE2B 0861d47d6072ac25bcd3d723a94b64c11a8298c6c465f506ccfe3316fca3b0f9606233abe7ede127f9726ee01c22a14489528e2efa958248aef2f56a52b763c1 SHA512 96dd32c43a59807a2faba5762d48659b5412b12144085ce6a5f33b088e01f526b12ef4b8c94e4e2efb65a36f94123e390d6e7439858f15a9afcc181048058be7
-EBUILD libslirp-4.6.0.ebuild 822 BLAKE2B 7c3b9b8b78ed14f6d2db3872bab4e01562fe15168ffe837fb3184588da99b00d1afac85d2ef7403c81da4924b693b872e7b3abcd74fe8a395173329be3bd9306 SHA512 3779dad93035135b67295471a281b7a25a137fc327a1e872fb96c8e6b116572bd4d785078242fbd26f19a4029d1cfc04158890eca39f0d21090af0e9c6e43d52
+DIST libslirp-4.6.1.tar.gz 135569 BLAKE2B 7a890912f2a8ce9d6820870e2d29b9c7a2253c403c2bcb127a38e02b2b81d1e262f34571c8a4c05fbf46874b9b2967cb5597cabe169ad54f12702fdd8b90bb3c SHA512 04a9dd88cd58c849a24b9cff405d951952760d99ea2bef0b070463dff088d79f44557a13c9427ba0043f58d4b9e06b68ff64a4f23a7b0d66df594e32e1521cae
+EBUILD libslirp-4.6.1.ebuild 818 BLAKE2B 66dc681fe6639558ed0b6d5f452819d521013109e5b581ec7f2f547c9357a7904d84d88d605b1245c54d6e909691a04df13939b42ef71e6117d0c29143487485 SHA512 034dfd20907fd88bf11c144eccb55e41f3245057155b559f1257b48aa5c2912f8e535aa1ccaaf63c499086a0f08c31e660adf2e64dde0aebfcf81f1ebeed5d0d
 MISC metadata.xml 346 BLAKE2B f8c280b0fc3fadde1f7d8524d281b6c818d0489c98a3d54e9bcb54cf576bf34648041ddd2a9635544378e18fff67d34036626ae4f74ddc8a850347858137b458 SHA512 b237a26cef7a0e4e023b953ad63505c00338d7aab0434bdb346ac3e9810f81813a3567f7dbc2d13b03e0c63d50b9f151a9ece7051a90a0568281e410da2ba9da
diff --git a/net-libs/libslirp/libslirp-4.3.1-r1.ebuild b/net-libs/libslirp/libslirp-4.3.1-r1.ebuild
deleted file mode 100644
index 1ab7f75196c7..000000000000
--- a/net-libs/libslirp/libslirp-4.3.1-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-MY_P="${PN}-v${PV}"
-SRC_URI="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services."
-HOMEPAGE="https://gitlab.freedesktop.org/slirp/libslirp"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="static-libs"
-
-RDEPEND="dev-libs/glib:="
-
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/libslirp-4.3.1-bug-756910-check-pkt_len.patch"
-)
-
-src_prepare() {
-	default
-	echo "${PV}" > .tarball-version || die
-	echo -e "#!${BASH}\necho -n \$(cat '${S}/.tarball-version')" > build-aux/git-version-gen || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Ddefault_library=$(usex static-libs both shared)
-	)
-	meson_src_configure
-}
diff --git a/net-libs/libslirp/libslirp-4.6.0.ebuild b/net-libs/libslirp/libslirp-4.6.1.ebuild
index 26b1487afc74..66229c715845 100644
--- a/net-libs/libslirp/libslirp-4.6.0.ebuild
+++ b/net-libs/libslirp/libslirp-4.6.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit meson
 
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
 MY_P="${PN}-v${PV}"
 SRC_URI="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="A TCP-IP emulator used to provide virtual networking services."
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 9807f467aa18..c748d7939975 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -4,10 +4,10 @@ DIST libtorrent-1.2.12.tar.gz 3604064 BLAKE2B e0eb00aba90e3d5e3ba1bf3984e2eb6065
 DIST libtorrent-1.2.9.tar.gz 3584800 BLAKE2B 5160056e227a54992ca4e490ffe0088d080aa9bade7a76f55eac26a644bab720c39a70b90d94f465ec711893249a084d9f77fa496be770585094b9b3ea4a1cdd SHA512 c547d96470f6a89f22adc0f5579ffb98b877a46f0a163698c49f1de57f23af60a7b0d3c1ca482e3ed8d3e35124d14a1d16a53e455f4d69f347fcb33c6ded75a8
 DIST libtorrent-rasterbar-1.2.6.tar.gz 3611015 BLAKE2B 39323c223927272a4eb9bb93ad70acd62165b9b3eb3f4f45cb76f99a23b1e131b526c8d8370fbd7cc30c7e776a5f9b7990c989ceaa3566272adc25df639fc5ba SHA512 9f03e28449b08e18a98a1f1bf0571f470c56fabd2becde5bde56ad566611c8519b0b387939f285a552d1f0382446633b67d00b6b5ff7083e4d1420a3ce9232fc
 DIST libtorrent-rasterbar-2.0.3.tar.gz 4294340 BLAKE2B 6726be94ea070676a8774d8b16ea1bcfcc2d08bc260914ef5529b0b166d681744c79ab258d251da6d21f7a7f1fbf9b8605ed5e6c8cf26cf878c3c8de1d54dccd SHA512 37211ac165db8542f8c2a29e28f4685b050a825c14d1f6328a4a96c2af1bc1bbf00d9dba4bc81c192f9b57ff358d1b27eeb7df7cebca5a2f751e6fb2bce3d257
-EBUILD libtorrent-rasterbar-1.2.10.ebuild 2648 BLAKE2B ebd430e186bfa02841dbbc63b101fd852e75591d74d8c019d66ab55d348e0abf0f263c153d2a714c82f54867958b3ae014615b6bb3bce6e5d0ca77c450343ce6 SHA512 77398998ebd68636f3f6dfc94fdf983155a2ff750ed381e9557c4d3f442d438b015f6e497d9c325be5c663ac4984328ef28b55733557de96274772d5a4e68e4a
-EBUILD libtorrent-rasterbar-1.2.11.ebuild 2672 BLAKE2B 2a617324db740db57e61cf86e383f9e67baa8fdd7ff7fcc559cca2842c0cfe5c5e1e367a33109abf7c17be213e0c61c0805880983f264d1a492aae3474763439 SHA512 6563b6768d9f9bff05fb6ba16c349abc167438918912d0f9e93c6a9310bf97dae432d0c2a090179add6db02223c36355c8f2d9f76fd3a4fe09d52f541970a276
-EBUILD libtorrent-rasterbar-1.2.12.ebuild 2674 BLAKE2B f175a3330bcde99d77afd59f0f1816b66747bde676844648ea4aacf3e52114be948fe172877b8b8c2d0d74563bb6b38cfec79c5d246ea48bfef249895a4ec135 SHA512 639336c6e9cd5c261f724fdfe2d29dac43f5c2b9fdc042cd76bc82495af3610edf0335db11a5c882376cc250f993092ff7cde993f5e8ec43eea7df8377b0478a
-EBUILD libtorrent-rasterbar-1.2.6.ebuild 2437 BLAKE2B 7e76d208d4cf49fdb389f17eed2d807e1d850f09ec12a710256064ed96fb9c04a6d74f28a9cfa2827b2793e2925d8bc8073632991c90d5ad8e6a039587e62322 SHA512 3d92cd4365731334a988756a2b2925ef882a5ef83ed75b2309aac958f0d6549bdb5fe15b16a2f432755c105b34df9002c6221e58970971ffa8001f0a8d036388
-EBUILD libtorrent-rasterbar-1.2.9.ebuild 2648 BLAKE2B ebd430e186bfa02841dbbc63b101fd852e75591d74d8c019d66ab55d348e0abf0f263c153d2a714c82f54867958b3ae014615b6bb3bce6e5d0ca77c450343ce6 SHA512 77398998ebd68636f3f6dfc94fdf983155a2ff750ed381e9557c4d3f442d438b015f6e497d9c325be5c663ac4984328ef28b55733557de96274772d5a4e68e4a
-EBUILD libtorrent-rasterbar-2.0.3.ebuild 1287 BLAKE2B f72ec9986337dccc9f303c4500698e7a888e8b33b8ab7613e9a9aca211c4b6719e606ede88f6725709e8510e825ba1dd6178b2b22b6b991dc71bc07222846ff9 SHA512 f9be9759db7e2703bda4e2d3507ac10b9e8126bebb08de91d88d84a03a614eb21433fb19f4284137bbaf7c0985f208cf3c1d442532a9fc81de646dcfd48005c1
+EBUILD libtorrent-rasterbar-1.2.10-r1.ebuild 2651 BLAKE2B 93f21eab92ee049b5d89735625e8cb82e6254bf9e1c22037369c6877f92b046746d1c65733132e6ac2c407bdea404dbba22414bc4467359c1c5de821e81dd723 SHA512 d328ecd9d59d26326c841d2638d917c4e67930285478ab337a417fcd9b4a760135b34924986868518398b24d88be99591b8c087b1e12131854f6512332c6fa34
+EBUILD libtorrent-rasterbar-1.2.11-r1.ebuild 2675 BLAKE2B f3eca25e40c12852703a06522b6904d64ae7fcf71b42df5ef3c0d78c06c76898977a29fd51f4cffb60472526c8a99c4b145eca3fb5f02d31e3f7d7be2b647a2f SHA512 2ab394714973bf577cc5ef3d124a2d48dbdad8b9db0178755f53c34a8cc2b4f27d30dcc94f898e3df28c0f37b388836d64fb7beb0cd517c81cdecdcbaa6a9c33
+EBUILD libtorrent-rasterbar-1.2.12-r1.ebuild 2677 BLAKE2B 83ead7b61a014810584e8880f0e6484aa795334f36aa3e46b71faac9036d9a0fa1fdd545bc6732339747f67b2aa7e3f85fba02f6d0662ae42f81df766bc9bc16 SHA512 395be1fc23c0f7eb88a2531ffdfea79b67f4a575ba97dc59f41e0f3cba7bc91defdbc1aeb0532356b5a13c82b540bb76a1ec37d91bbebcdad5694383a30db395
+EBUILD libtorrent-rasterbar-1.2.6-r1.ebuild 2440 BLAKE2B 0c36fbc1882e4f115de629bf842ac1f05378866db3a570e75e7bf2c5da99d663594c2893d7e914b5a8079668ba2f5c89b9c64cb91d93e1c1523cd37dd9eadb52 SHA512 87a88041183f8e5bf981ad19a941951c6341907f1396c0f1a1add6ce00337f57ccac51e0260bb1fcc5623386a990d6662af580242e5384ee270e51a5ba22075f
+EBUILD libtorrent-rasterbar-1.2.9-r1.ebuild 2651 BLAKE2B 93f21eab92ee049b5d89735625e8cb82e6254bf9e1c22037369c6877f92b046746d1c65733132e6ac2c407bdea404dbba22414bc4467359c1c5de821e81dd723 SHA512 d328ecd9d59d26326c841d2638d917c4e67930285478ab337a417fcd9b4a760135b34924986868518398b24d88be99591b8c087b1e12131854f6512332c6fa34
+EBUILD libtorrent-rasterbar-2.0.3-r1.ebuild 1290 BLAKE2B eaf84023ce0ac73e1ae9d378ea0dbacbba7d1a5228554ccb30cf238f71dd4c9fde04c6d053aebb2f608986287ef092f91f01592c166831cf4c630425175b7bd7 SHA512 590d335fb7712265bf185d7f49c45ab3860e0b50fb48703bd03c19000e88eeee16a74cfdbff8eac5d024fcc559aff9f8b425c69a4c3d0cb806ba5ce56b992edb
 MISC metadata.xml 524 BLAKE2B cb56b15139e8d52871acb1f2979178e182c385658d3fb59025e3f19e1844deb4c0442c12ad490c645d456ec09dd68c268fd6863a205f30a0c241a3d02f10a45b SHA512 47c117d10a88cd13375fa10bfaaa827012d0451713bfff80c587295f68f1243051c477611d9b830a7b525ff2bd77d38c2a45f172ecbe18ba66827e3e6ca664f3
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10-r1.ebuild
index 7c0530b8238d..982c7a1fdd1a 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10-r1.ebuild
@@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
 S="${WORKDIR}/libtorrent-libtorrent-${PV}"
 
 RDEPEND="
-	dev-libs/boost:=[threads]
+	dev-libs/boost:=[threads(+)]
 	virtual/libiconv
 	examples? ( !net-p2p/mldonkey )
 	python? (
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11-r1.ebuild
index 30f4a48756a8..6f2a72939805 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.11-r1.ebuild
@@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
 S="${WORKDIR}/libtorrent-${PV}"
 
 RDEPEND="
-	dev-libs/boost:=[threads]
+	dev-libs/boost:=[threads(+)]
 	virtual/libiconv
 	examples? ( !net-p2p/mldonkey )
 	python? (
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12-r1.ebuild
index ead88b37b617..9a57948f7177 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.12-r1.ebuild
@@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
 S="${WORKDIR}/libtorrent-${PV}"
 
 RDEPEND="
-	dev-libs/boost:=[threads]
+	dev-libs/boost:=[threads(+)]
 	virtual/libiconv
 	examples? ( !net-p2p/mldonkey )
 	python? (
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6-r1.ebuild
index 2a7b356cdbfa..185c08bbf394 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.6-r1.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-libs/boost:=[threads]
+	dev-libs/boost:=[threads(+)]
 	virtual/libiconv
 	examples? ( !net-p2p/mldonkey )
 	python? (
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9-r1.ebuild
index 7c0530b8238d..982c7a1fdd1a 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.10.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.2.9-r1.ebuild
@@ -26,7 +26,7 @@ RESTRICT="!test? ( test )"
 S="${WORKDIR}/libtorrent-libtorrent-${PV}"
 
 RDEPEND="
-	dev-libs/boost:=[threads]
+	dev-libs/boost:=[threads(+)]
 	virtual/libiconv
 	examples? ( !net-p2p/mldonkey )
 	python? (
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.3.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.3-r1.ebuild
index fa7e0e64fa83..739fc3f8e91f 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.3.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-2.0.3-r1.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+dht debug gnutls python ssl test"
 
 RESTRICT="!test? ( test ) test" # not yet fixed
-RDEPEND="dev-libs/boost:=[threads]"
+RDEPEND="dev-libs/boost:=[threads(+)]"
 DEPEND="
 	python? (
 		${PYTHON_DEPS}
diff --git a/net-libs/libupnp/Manifest b/net-libs/libupnp/Manifest
index 83666028249b..43d5ccf6633d 100644
--- a/net-libs/libupnp/Manifest
+++ b/net-libs/libupnp/Manifest
@@ -3,5 +3,5 @@ DIST libupnp-1.14.5.tar.gz 782662 BLAKE2B 7b1a4f115d4fb545b26909d8f6feb0a0171608
 DIST libupnp-1.14.7.tar.gz 785084 BLAKE2B 539388737dda0dd037cb50fbc1cca8bcdc43d1d706bdb7da19d1a184cfd61f3d585d9beef2a9c8c33f2cb2640a8479210ad6c358abd7193f304509df574e912c SHA512 92dd80d1bbaa64e6d3909c5bce73d0340fcd3a3c1d247a634bd48ec077ba0ce0b8224d1a670a66f6a8c591e31a54f15526071d62ae5460e85d582d7b6b67c674
 EBUILD libupnp-1.14.0.ebuild 1082 BLAKE2B b0cb48b4ecc17ab31c3f81f7494e08dfe6d88131c7beda7af563f2121dbd668acc487ec44404889b7dbe528b0653625dc86618c93e9169ea1808a47b0b612781 SHA512 c60ace6978721467d52116c7d9d5ae23cef7ace0c48bc67b47d0a455f3dddcf05c207383105e7b241e76a6868f09f41564d00850e8ac933700ae67e0ff095b4e
 EBUILD libupnp-1.14.5.ebuild 1109 BLAKE2B db7b89b42927e6e24cfef3cb8198b17005262b07e4437901178d6e41fcaf02f5e1058e1bd1b2247fd2df94c1699dca5bfd6078f5e3f8ee58640d73a73291a824 SHA512 312d40fd88bbda79fac54af5bfc803c9b49beb7ac7ad8c7e254da6c4e8d1e5aceff084348095bc5a0db48714ad70bc8e0eaed258edde2eb5b6c7ea9498609a5a
-EBUILD libupnp-1.14.7.ebuild 1108 BLAKE2B 6b618ce479246c996a1f6d9d7ac5c8dc0e5ce0f6fef37bf01561332fa41f4b46ae2fdfec96f846574b8e6c6878456031e97bfc9624c3b9efa7bcc58f6a20f227 SHA512 c271974dd9406362c030144c3b2a3f8fc960a8633e78bfdeec6ad761505c35f1c0244107f90dbc88d04a2bf786bdaaae7b19e4e7c91e37f70f44fa07e7acc4e2
+EBUILD libupnp-1.14.7.ebuild 1103 BLAKE2B bc62686ba120eded9494e8dfe66ca864846d598a6cc5ce169408c50a9eaba684d7ea1941b780e90d628b81436505a5fe87e7ccb81436774e05e5639fec3cf7c4 SHA512 344a1ebb883171ac7b5a62de14f0d9a7a7f13502a0a2140bac275faac51a4075b33018e2796609787fcda4d5159f778669ac5c3a256f6f75a9f8dc401527ab76
 MISC metadata.xml 703 BLAKE2B 3c45d613ca370a5dffac938932461d7686e839670743ca7514ffb30c8f632baac6fbbe1fede4e9a1f0caf83808c1d0af4cf184a59763a21a0e2cab9b7e7ca20f SHA512 aabd69bc4b6182452c45172a09007369ce428307dc94dcfe397886045ceb5b302381f0ff0e7fe575fea3fb5d8979ecf5173c7fb0ed402c4045e79a7e494a963e
diff --git a/net-libs/libupnp/libupnp-1.14.7.ebuild b/net-libs/libupnp/libupnp-1.14.7.ebuild
index 271b8a83fe79..c84fa9f25bd2 100644
--- a/net-libs/libupnp/libupnp-1.14.7.ebuild
+++ b/net-libs/libupnp/libupnp-1.14.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/release-${PV}.tar.gz -> ${
 
 LICENSE="BSD"
 SLOT="0/17"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 sparc ~x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux"
 IUSE="blocking-tcp debug doc ipv6 +reuseaddr samples static-libs"
 
 # bug 733750
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index a2fa958dd694..fc9f60bff2f3 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,8 +1,8 @@
 DIST nghttp2-1.41.0.tar.xz 1640712 BLAKE2B 8dbd5f80bb9617d792e2eece09f6cae82907ad3a14a90084578b213191015c32ac38de87d9a39246651087b5d0e9c6c624ff806a0690973b5faa8624ee033d8f SHA512 c92e8022ccc876fa311f21bc5bf5af75feff8232efb56a4b2ab198031e974d15b67c16c046188cc76552f75a1b2e7115925d6ce1e42d6f94ae482fe69727466d
 DIST nghttp2-1.42.0.tar.xz 3973284 BLAKE2B 39431619bd3c9a66eb217065bb29ceba8f3fda376343687b4774ed5e73c634f51142b407f9515ae5ad4363af5cf57c0199f9bfddf5bc08dc587419ec03cf5b45 SHA512 1d93e6262c5538e26fbf36567230b4a239dbdfee26198b1e1d5862bf4459ae435679674c047407f5c604ddff91d7717d8515532e00bcdb2aa75f27ff97dce60c
 DIST nghttp2-1.43.0.tar.xz 3973500 BLAKE2B 0e6c674486c484558a55822501a13ac93c4e890cf62749bc8519690f468912701329b7b9e83b0b68c3f35b72442b1ed47a90050cccd3fc05d79622e1e26634dc SHA512 eac69ba356870a1cba420a06771082897be8dd40a68f4e04223f41f3d22626e4f5b3766d3dbcc496dd212be01f64c3ac280a2ebddd31dd88f7350c20f56e5d39
-EBUILD nghttp2-1.41.0.ebuild 1931 BLAKE2B b7ec4bdf49b8fc75cec64dcf665c0cf6f16f03c367521de85c727d6f9936d0ac29ec50e2c4aa7cb0440147449db38e1c3b00d166edb09a7a3ee884459f741511 SHA512 e53ac58720d4c4aa84240a1d95984ad0974c4da92d545e052aa64df8fa7d831cda81197c53619b686412bf758fe603c132da39141cc4ea872c54da97d700b6fc
-EBUILD nghttp2-1.42.0.ebuild 1991 BLAKE2B 09562f597d5315482334bfc76bf51305fbac84cc3d31b9ccccc3c2d3ddfb1b19d9d3b86fe4c95e0102d4a542e7cae4a154b7bc40ffb980378a827021779cab06 SHA512 f1b36bf3d98195dd80d40062b7274b79128d533b32662168e39cf2a9a8869ef1aaa9b68ae15ab9bf3099c4a9e6ac750d19107cbd13e80fe10034ded11b93f4b7
-EBUILD nghttp2-1.43.0.ebuild 2008 BLAKE2B ba7cf3f832740cefe5f755e9c63188350973d926e813d4b1cbcf47b79ed7fdae01af462375890bb00b001835a87e11ef4534371a905229251156b0c544208f3b SHA512 d9a0339f8fbfe0c8d6f5d4ca471dd724fd32632bd968f05856dab51d119394d79557955cea0ae47fbd7fd59959f3c08a21980fc8e57902ee12011bd3fc0c350a
-EBUILD nghttp2-9999.ebuild 1971 BLAKE2B 4721cececd54f83dc8e20bfea8f364d316dfac60532d2c68b554e18c0fa90751a17d1c5853acc7e6650658eb96d8d2e751b5c33770235a1e91792e94cd4a2e35 SHA512 7ae37db93c2dd2ab7f5a8b7beff11dc5815d392ad50ef65cae4249a4ef04e97123e99518e54b6819dbcc4a7c3efb539cf63ee368c15a4a9a23ce09865ccbbd7e
+EBUILD nghttp2-1.41.0-r2.ebuild 1939 BLAKE2B 2f985404d208614eacd79a7688e58b041b2f3f145b68af46c3047b69589c78da368af2a0f3c36c4905475a5f6bdd3ef7004e537a211b0df9cee7884f68ff58a9 SHA512 79afbb367fd0dd6c13216f8c49cbf756e517892dc5e83b1f55a3989f6248324d0987de2e1025b0e85d9ab9b7b9d39e3982c0084b35eb2d8db6f78feddc7e541f
+EBUILD nghttp2-1.42.0-r2.ebuild 1999 BLAKE2B 256137c46baa1fb83fb7a77535e9523a3f54f0a86c7e300b4a165462f29819457ba53e668a4ba94cc76b4c64a63350b289c12e3c8c325e61b4a77ca363583e54 SHA512 e980e8ff8c71f664abdb59d5e35ed6245de8c13bf8406e8873fc8f1ae3fb822a8b1bebc84cff29efdd550842a0094d222406f9b24f57810d949f335b3cbbe648
+EBUILD nghttp2-1.43.0-r2.ebuild 2016 BLAKE2B 4ea0fe404a634213b1cdf3e4d8cc32dc66d2b5291bb43c90f797b12c115580f2e68d560822ce5704ee41a9fd6ad50bba5af751305a14f1d9d0b1105b92fdcb4f SHA512 e035d8d74e01e4b67124e3d1612ee48779ef892f058be7c527e7fbdb5af3026f69c267c3dd861e759b433af768d415bae9d7633f44e49899a417df5664f3aefc
+EBUILD nghttp2-9999.ebuild 1979 BLAKE2B accfeb064d7750bb523939d9e9f50dc194455d771e0e22b1a5c7138d826f521faa3b0f830cf320d470803636faaaf38f83a6f84a272d875f04bc6d115780cc64 SHA512 f6ea435254aa3f2d2622eee95739a80d9f9e3d9321413a74ed875d71cba1901d87f225b7ed1086db2dd81295bda21bb72152b7502296ff87296cb37485a8a77b
 MISC metadata.xml 492 BLAKE2B 76628f4a35c08fe73292c1c50fc6bc90dd44527ee36fb44ff4630a606fe27d9a950afe412fe1565c9eb85355c6fff13400ecb1da5d8c5de8a4765d40b23686f3 SHA512 0e67d6891d7fef473f906db3456a34b4c61f762bf87af6583ce1d477ff090cb69c749669e5cc1a3ef21ee9de3484ea1a094a5971c539edd32a0ab810a4867dcf
diff --git a/net-libs/nghttp2/nghttp2-1.41.0.ebuild b/net-libs/nghttp2/nghttp2-1.41.0-r2.ebuild
index 23ad9258f82e..b5e85678ffb2 100644
--- a/net-libs/nghttp2/nghttp2-1.41.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.41.0-r2.ebuild
@@ -25,15 +25,15 @@ IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
 RESTRICT="!test? ( test )"
 
 SSL_DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}]
+	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
 "
 RDEPEND="
 	cxx? (
 		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
 	)
 	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
+	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
 	utils? (
 		${SSL_DEPEND}
 		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
diff --git a/net-libs/nghttp2/nghttp2-1.42.0.ebuild b/net-libs/nghttp2/nghttp2-1.42.0-r2.ebuild
index d7631ef5957d..0b93e6d962c2 100644
--- a/net-libs/nghttp2/nghttp2-1.42.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.42.0-r2.ebuild
@@ -25,15 +25,15 @@ IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
 RESTRICT="!test? ( test )"
 
 SSL_DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}]
+	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
 "
 RDEPEND="
 	cxx? (
 		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
 	)
 	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
+	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
 	utils? (
 		${SSL_DEPEND}
 		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
diff --git a/net-libs/nghttp2/nghttp2-1.43.0.ebuild b/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild
index a0d00baaf8f5..cc514dc2d659 100644
--- a/net-libs/nghttp2/nghttp2-1.43.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.43.0-r2.ebuild
@@ -25,15 +25,15 @@ IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
 RESTRICT="!test? ( test )"
 
 SSL_DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}]
+	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
 "
 RDEPEND="
 	cxx? (
 		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
 	)
 	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
+	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
 	utils? (
 		${SSL_DEPEND}
 		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index de9c1c42d032..0c55b0475533 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-9999.ebuild
@@ -25,15 +25,15 @@ IUSE="cxx debug hpack-tools jemalloc static-libs test +threads utils xml"
 RESTRICT="!test? ( test )"
 
 SSL_DEPEND="
-	>=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}]
+	>=dev-libs/openssl-1.0.2:0=[-bindist(-),${MULTILIB_USEDEP}]
 "
 RDEPEND="
 	cxx? (
 		${SSL_DEPEND}
-		dev-libs/boost:=[${MULTILIB_USEDEP},threads]
+		dev-libs/boost:=[${MULTILIB_USEDEP},threads(+)]
 	)
 	hpack-tools? ( >=dev-libs/jansson-2.5 )
-	jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
+	jemalloc? ( dev-libs/jemalloc:=[${MULTILIB_USEDEP}] )
 	utils? (
 		${SSL_DEPEND}
 		>=dev-libs/libev-4.15[${MULTILIB_USEDEP}]