gentoo resync : 17.10.2017

19 files changed, 84 insertions, 377 deletions

diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 3fb68bc14938..16adcba3e1b2 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -2,7 +2,7 @@ DIST gnutls-3.5.13.tar.xz 7226468 SHA256 79f5480ad198dad5bc78e075f4a40c4a315a1b2
 DIST gnutls-3.5.15.tar.xz 7238928 SHA256 046081108b8b1fe455a13a4c5a4eaa0368e185b678f1670fe09a11a2d7ecfad5 SHA512 046cf3adf6cc3d38fd431f2ff28ddabb65f3c13379516d105316a04c7128be89c5f7ed3df6a034fc06e9ab2e154c2cde2f5cbe8530a1e58cc4b4fb72e158134b WHIRLPOOL 811cca49bdd144107b6c25de31b3209694a8590107953fc3c4ecafddba48339e98cf1dc8e489addb04f0ac525411e96e505fd8edb342dca4e02f97dde3f26ffe
 DIST gnutls-3.6.0.tar.xz 8024972 SHA256 2ab9e3c0131fcd9142382f37ba9c6d20022b76cba83560cbcaa8e4002d71fb72 SHA512 e5f36d7e8d64e8432098e30549c321745d3605eeb85aba2a04bfa92146ca771961f0e2f3682bcae36be5b6095acd25996104a4213ce7b3466d61332a5188dc03 WHIRLPOOL e8e479d7a0adc14c969b7364f58505f68ed92054fb8d8ba862f59d9ab64578e83ae02309ec9b5da2e63fc5dec799d86e434abc32394dbf414dc46bf46b15b0c8
 EBUILD gnutls-3.5.13.ebuild 4239 SHA256 1a469cfd52bb5ae35dd8c082d92da70eb95df5d31d6408ebce877e4ee5414367 SHA512 7a3ab4ada4edc640dac61f6fa7054d4ef1b8e3c434634cbe6edfbc1d7a99694e9612c5d2f6bf39c57389ef55f73f602b90c3a4e472ae3a0e571d83d6bc54fd42 WHIRLPOOL 7558a9899237bd14695304d52e108b0aaf314e489d5635a7180dd063c0c09e95b0ac17482759f59c7a23f38d2188a6030f9ea9fc2bb82d8e45d33247ce933970
-EBUILD gnutls-3.5.15.ebuild 4343 SHA256 913dd405ef17219938866e91e0dbc0bc1fdb3103ac790235b59104d940a326f7 SHA512 dff41b697330086b7856fbc6fabf3bd8958864f674e14ab9a8b35919ee858015d599f79b8b40c1ac66f78e4a4b331ffa0b3ad9eca33ec1e78d1e5b0091917aa2 WHIRLPOOL fc2363e180a918fa8ad5358aa54612b0607aae912b00a377b0f2f4a7c98dec347bb08fdadae6bb319c450e64f105c3eb6b0fb83fa401dff5258930cde54ebfab
+EBUILD gnutls-3.5.15.ebuild 4341 SHA256 41d87ba00de0d1e4410a9fc6b08c275ee698c05fc991131dc87a389b27e3edb9 SHA512 46fd00d54ef3db933d62b1c51290e24e7f7c4972925ede37fd6083e421fb90bb8adb215d446fa201661703020555c443c38090fda2086976b3e8d679221c317f WHIRLPOOL 7ebd1870bf98d39d0bf2d5652f7da5294c4ac1d6df9ad402f2f642e967bba8c5060a092534733d1984088b2978ccd0a0c08adbc4c71df490b6fded931bb6fe62
 EBUILD gnutls-3.6.0.ebuild 3965 SHA256 9711114c2b419436ccfa3fae4044802e22fa35471bd9285cfc3408f36be50989 SHA512 87f609adfed0b553b68dac75a4a89a17b6e51a28be4ebb8a4ba810bfa1f984ee6d57a5f0a7c91f32a5af3c0e7548b7abe9ec471352b905227a8897ffbc435f29 WHIRLPOOL 5466e3f81ca9c0ff730274225c38c36d0addb985b2e3c3cf27522cf71d7ae2602039398b4f695185391f77233cd6045edb9cf371988b6d48cb3509fc3f1fcafb
 MISC ChangeLog 17487 SHA256 745581f186ce927f027e522a8526063db87e0f641ee11341812bb5f63f9b33f4 SHA512 c002d5c6d3dbfb1b0d6fb98971e1a0863984504f8f8dd6a3e14e14b8345e3e1707ae5048cdddd84417a527c8c654f5d947d4dd5d722f98b21349a1ec199c03e1 WHIRLPOOL 1497e5ef4f12af6e20ab11ce5fedd3b90e590886d423e5cf2aeb3839ce1b5a0077370b13683c2c17f921524e8e4e988a4c72cbfd757148097bed92ce1ef6f803
 MISC ChangeLog-2015 82624 SHA256 4fe397e159cdb07634ca978c94cc0b39eca917b0ba6ba076d8a604a493048226 SHA512 5e51b3daec255369511ffdab025e38c8b0328981534f78ee9b878ce53b101c2a66227b6990743010dc842fbf283748227a39edee290ddcb0c9caabb783c248c1 WHIRLPOOL 7eac80b27265b5035b09fc24c318602153f84bbaa242b5a490380fa2134a5bbe2ba4f946d5d34057c7f99b4c6a1a8fcbb2e53026418347ffda04d6477cd95be7
diff --git a/net-libs/gnutls/gnutls-3.5.15.ebuild b/net-libs/gnutls/gnutls-3.5.15.ebuild
index 24e4bb0fef56..a227bc366700 100644
--- a/net-libs/gnutls/gnutls-3.5.15.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.15.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE_LINGUAS=" en cs de fi fr it ms nl pl sv uk vi zh_CN"
 IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib ${IUSE_LINGUAS// / linguas_}"
 
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index e5952cc6bcba..eeecbfd43c40 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,9 +1,9 @@
-DIST libnftnl-1.0.5.tar.bz2 367016 SHA256 f6d4f5a702e38bc7987f2363f9fcd65930e8b702595c221a497e2f3a359be497 SHA512 85c71aaaeeafdffe09f2591f26d49d41e9f511a53ed313fe642b4968eae8aac1246a53d5908fc737c6eb9cc4f5f3ef2a4eaa17fe33db453a1fd60f2f9d5c5a1d WHIRLPOOL 15fb25aa9e23bfdcb19ab21ea1d6eadd22e5acc0c38e761e4637a06136c809f5a5827ac58643515432e1394e3e8d4575df11e52b5f16ca787157317e5e2ae463
 DIST libnftnl-1.0.6.tar.bz2 381897 SHA256 ad3b932a39a1e567308e91b683b32239a5e1aea9b4582dfffe2288c3400ab07e SHA512 d813c9d0dbdeaffc30695fb0b5dbf987849339d119774c4f0e219db835f2ad9111a7436fd474ffa96b07e288d537cb4a1be153afcca23dabce0c264e1c4a3c62 WHIRLPOOL c4221c99ee437125c1b10d1d47db7586b979e0ce8e7187a2a9fd5ad3b866e0e6b451aba0956c9a48cec9fb7fc411f523c5f35cd9ef2cd1a939aaab7cb7570728
 DIST libnftnl-1.0.7.tar.bz2 384969 SHA256 9bb66ecbc64b8508249402f0093829f44177770ad99f6042b86b3a467d963982 SHA512 a220c6a2857b4ff7325bfa4fbf537c5afeb66232a7e190b50c3077f01b86f0fb1842055ccc719280b36820ac7103cbe8168944ffe10c55444830ff77449fa6a5 WHIRLPOOL 400edc3bf8268e6c7d4a6804fe36eaca271144019c2220b27865e755466318fe18e1ee5be583d63fc3cfcb1c6819ab557e17fefcba4b96c74e918d024012aadc
-EBUILD libnftnl-1.0.5.ebuild 1241 SHA256 6486443fe61c326e7f83f5d6006a76b3c4b58496e3ea827e2fa8db2e3fab7ea0 SHA512 fb6a9a2c52589f525041f51d0d3eded69e23f253036c0c8fd26b372683799605554473813f0801170d54c00b1c955c059575578e5b41d179fcafc52423fe86e1 WHIRLPOOL 1673c764d2e0ae2fbe0cd61f10c69b0a21d8d56b6081237fb546c329069f3874f6c51731a329508793d8fbd4abc7bac502e2f1886e8e8c690f767a9aa354019e
+DIST libnftnl-1.0.8.tar.bz2 400496 SHA256 e6bdd799ef9c59fc247954aba9f2c6469d8e04cfaee73526728011eaa3632038 SHA512 df9f5967908ce5e6a6a85fe4328bdf6e7501ce6b0e42239b750782aeb76c30b1aae80dd07f73a06fb077d072b1269c4e0c5fd525feed1055400201567d215ef9 WHIRLPOOL f56667a5b385414d620e33c17e2fe2daafee3770cb61bdad89d7b3d5396677ed8ad8cf9f3bd6a5dbf6ce92c031bdf451727e70e0054f8d971c2dc76fb63aa120
 EBUILD libnftnl-1.0.6.ebuild 1302 SHA256 18fd375302a2e9ee606c89fb2a57e3fb6e74e31b8ffb195910ac8b6106b4b83e SHA512 11a9d9694a2a01e539d6d81651828efaa4972c6fcfcdfa541ceed13cb4b553f4d9cdc07d23ffdb5c86f239840f970994d1af9c1f742374b0abf998f2e4d4294f WHIRLPOOL 09b51f49fec9a7603a0b7c57832c641919f6d70184c9f3526e974ae8c6acff31be908a85dc32841d51313dee579b9c7140a08f983f5800a3e018ec90a6bae9f2
 EBUILD libnftnl-1.0.7.ebuild 1305 SHA256 546e7c5254d3660511a5edae0483b0fe05d1bbba680e9d1bc23610bd40b63b3c SHA512 06aee62633e1b83ec9f1a7f484657901f93fac559cea7e7cc7cd53b617615392a63bbdc7989b2f197215c986fca67c7dabde7f12fa494b23f0e7b0788ed35cd1 WHIRLPOOL e7d6440e2654e76257273acd7ce831b7bb7c7a3282e5fc4b99d6b82adb94049ad3bab70a7a23873f2880adfb7088fc59741a6a1c40b87c9884594cce15dd5ff8
+EBUILD libnftnl-1.0.8.ebuild 1347 SHA256 60a89aa6ed919e7cca01458662c5c374de98dd8946af7d2798f9b54daf1810aa SHA512 96d37c31c76df6ae63ae870d43ad450aec088a2cdb67cef87bec5acef35afa4f1719697f2746869a706cc87dad214641373d12fa65d1957880c1f76a091906f1 WHIRLPOOL f3b7a83ddc229eaa7bc5bafebfb75708463adc15b6c75af2448444c8fa48fffd2efec6a8cc2f0c3ce6639691219451b9b6d93d8c8d77f17158179b93dca2e7bf
 MISC ChangeLog 4504 SHA256 b3a85750687dc6beff070b8fefd9307d1b7b5759894c34534fde17eca4a6e56f SHA512 b067d05881eea93e6c4da941ea542e1350cc6f6553f138de01a981f9738763554668e317c0159dd2a4659bd71f46fa19353b6c2c76e05803126351207b2d5105 WHIRLPOOL ea66000f5d372511130733255d10215ac358ac4ef6a4768e200468eeccd38b5bc2e56577dcb9f30e33c7e57fba45241bec074cf6bab833eab93d0b5acb020695
 MISC ChangeLog-2015 1730 SHA256 787f672eccae45f586a44c4a72c8457836f67af7f78fe5415c9c711b88866101 SHA512 46f4a9f4f1f6556d0b33c4a55ff3531857a0806f1ec8970df7d2b00172c54789e6b406041119e62636bdee3f25956b7a0e82daa4d081ff9aec278b2811bfd6cb WHIRLPOOL 21ac9d47fc9c5397d9ae0a7cbbc4ade36611d3a88d1230ab5d356ef4d1fb9caa84fdadb27bcc5bdbea981ca9fc794ba6ea4f9802af63a966b1094051fffba807
 MISC metadata.xml 317 SHA256 f4ad1fedcbebe8c51c0dbcac6dce2901ffb8b4a5ff4bdb4d67d94e8085e2915b SHA512 bfdf498de4ccd1d1a4f78c7e94a90b2bf203e16b8ddec5949bb88c953279026f95da956ef94b39140d44bbcd8cb4008f9f4b777fd895576da8414051c4487beb WHIRLPOOL 1a8c37ba113795d9e123cc5016ac4644e50981409f6ae5dae6a6e28134bc116966721dde550688e2f63f51fcd32767695577d983287fc8a66649386afb2b31d8
diff --git a/net-libs/libnftnl/libnftnl-1.0.5.ebuild b/net-libs/libnftnl/libnftnl-1.0.8.ebuild
index d581d38d35d9..e3b959e4f8a9 100644
--- a/net-libs/libnftnl/libnftnl-1.0.5.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.0.8.ebuild
@@ -1,26 +1,25 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit base linux-info toolchain-funcs eutils
+inherit autotools linux-info toolchain-funcs
 
 DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
-HOMEPAGE="http://netfilter.org/projects/nftables/"
-SRC_URI="http://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="examples json static-libs test xml"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="examples json static-libs test threads"
 
 RDEPEND=">=net-libs/libmnl-1.0.0
-	xml? ( >=dev-libs/mini-xml-2.6 )
 	json? ( >=dev-libs/jansson-2.3 )"
 DEPEND="virtual/pkgconfig
 	${RDEPEND}"
 
-REQUIRED_USE="test? ( json xml )"
+REQUIRED_USE="test? ( json )"
 
 pkg_setup() {
 	if kernel_is ge 3 13; then
@@ -30,28 +29,33 @@ pkg_setup() {
 		eerror "This package requires kernel version 3.13 or newer to work properly."
 	fi
 }
+src_prepare() {
+	default
+	eautoreconf
+}
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_with xml xml-parsing) \
+	local myeconfargs=(
+		$(use_enable static-libs static)
 		$(use_with json json-parsing)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	default
+	cd tests || die
+	./test-script.sh || die
 }
 
 src_install() {
 	default
 	gen_usr_ldscript -a nftnl
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die "Could not rm libtool files"
 
 	if use examples; then
-		find examples/ -name 'Makefile*' -delete
-		dodoc -r examples/
+		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
+		dodoc -r examples
 		docompress -x /usr/share/doc/${PF}/examples
 	fi
 }
-
-src_test() {
-	default
-	cd tests || die
-	./test-script.sh || die
-}
diff --git a/net-libs/libtorrent-rasterbar/Manifest b/net-libs/libtorrent-rasterbar/Manifest
index 5fbc7f264d25..49a9d700ac25 100644
--- a/net-libs/libtorrent-rasterbar/Manifest
+++ b/net-libs/libtorrent-rasterbar/Manifest
@@ -5,15 +5,10 @@ AUX libtorrent-rasterbar-1.0.11-move-header.patch 1277 SHA256 76b30ae734a927ac8f
 AUX libtorrent-rasterbar-1.0.9-test_torrent_parse.patch 1240 SHA256 c736e1e6641b19d47f11b13e7e732a6344357c47b1c65aa6108ed9eaae641002 SHA512 8e6cca0ac5d1e1b43e771921c64258b61e5c3c1249ae9c1b80d784153d919aff1eb7ebf3141a7bc5b926553b2c3c027a5659703da52b9f901c77bb288436edbb WHIRLPOOL 8ed51aa4b0aecb65c886f73cc1276e845a7e1527a76cc623b49965754018f399721d0f19a5c40452927a69ac390439b40ecbca5c09f68d131f5d935a0c4bce10
 DIST libtorrent-rasterbar-1.0.10.tar.gz 3324494 SHA256 a865ceaca8b14acdd7be56d361ce4e64361299647e157ef7b3ac7e2812ca4c3e SHA512 08976239ec12e2d67a974dadf3f16330f48e4b6de314f9d97c5fbbdbc696b76b6b1f8e20ceab6830d46d17b1bfd7e2fe4048fb1a5a97ece12c242c0cd0f7ded2 WHIRLPOOL 1e4ef2fb41eef0b825bd7c8c665638e3f689c3cefca3caa18a01c328caad9d31cd417fb49d25a7d55da6457a89e35a891427d70fb4f4d070c74be2e2e0347a60
 DIST libtorrent-rasterbar-1.0.11.tar.gz 3325786 SHA256 828d686770346f6da2c143c5a2844c5f5e407eb4a37982e90022763508abd62f SHA512 770d16b241174ae4b121af9b2ac7bcde8b14c6ed99352b827b760a3cbdc2c0ebd0d505319762897720c5f72acdff506ee9948ac1140e6d4591805eca5439b184 WHIRLPOOL e56bfe0830cfc7776436552171b14b08913d99a2c726c9eefa828027caaa96d9c3d97e6442a3b53f315eaa3e7e0f68175d813dbab1d6de1da5937054fc6cac9c
-DIST libtorrent-rasterbar-1.1.1.tar.gz 3641815 SHA256 f70c82367b0980460ef95aff3e117fd4a174477892d529beec434f74d615b31f SHA512 9d2409ee733f7579df61a63e37092d3c59a386b94031bae6a7ea64ffff617131d2c347ba0825b3d337ce2fedad3b527c8f697e3b49cea643d6543c972a1ebc12 WHIRLPOOL 36c4a007e0bf684e9603cd88b594a8ff91193b7d73447375e5651f945dba713c91daf0c625f90af6bb35c2ab017ca69da50d856ac6ce6be2e13f6d04ee7b2e35
-DIST libtorrent-rasterbar-1.1.2.tar.gz 3909420 SHA256 45e55f2374507bb67a9b9125f6b8d1c45e6cd33849c62b1d9cb56657354e359a SHA512 8cbf6b08bb21c6cbc3b5215a74ecdcce81e312484c688f2b20f95b7288d7f154e7f1337dd0c7d213687159d731bd4518166a964d6a1bda47dc2bd46115a55600 WHIRLPOOL ffd8f1afaece5762298fc8d3380ffe23ed79b5eb019e923d92fd408594054c2caf25e01b237b4cdc2c11181d93df6978301eecb44661378dc944dc89b3e6838a
-DIST libtorrent-rasterbar-1.1.3.tar.gz 3912760 SHA256 44196a89932c26528f5db19289d0f0f4130730a61dccc61c9f1eac9ad3e881d8 SHA512 c9d45ceed5cb56b0d7eb7961c3e641158738c5587ef921d98c73b4918b6f1ae0b40e50792b5289062267cc023e36aaa1f64f0f58d363f59875864791434229a5 WHIRLPOOL 4feb345444583317541639f8b42a53026b8ee87d7060254c3e32ef50f697f1f37ee678b3529dae7614938b336a6e937bba4c37cd1a62255594ec4b2f97cf5192
 DIST libtorrent-rasterbar-1.1.4.tar.gz 3917557 SHA256 ccf42367803a6df7edcf4756d1f7d0a9ce6158ec33b851b3b58fd470ac4eeba6 SHA512 50f5dfffbd9e6ba21dbe328be17962f29088a326c2c2bf177e1137ed2900323b9a5bae75ee63635404928452f206c72dd4f9100438a6b802bd36b11430e51bc3 WHIRLPOOL f1231e97cdaf820910dafbaf83f9edadf3b70a8fadc71b370e9813d9b9893e6ee893fccfc71a20438ca0b138ac9035c220b656843e7af2755451bf6587f07fc5
+DIST libtorrent-rasterbar-1.1.5.tar.gz 3942894 SHA256 103134068389155a0f2bccaca72a57765460eb8188495089dcad280dcf426930 SHA512 d0e7fe944c8a396aaf79ce80c7513be07a855bc8a9eee3bca46ed83d5e190aaa5ea4dc9a8a7208e27e18ae8f15733e6e34eabd375f0bde43d4dc4607840782e7 WHIRLPOOL 1f78afceb67a69418d2afac915616812fe3a223c548ba2baf7e643fc5e63c79bd87998473ac4b6cab6ac0093d7f43ac91bcfba41c9d6ce0fc1ac46914fce74d2
 EBUILD libtorrent-rasterbar-1.0.10.ebuild 2431 SHA256 c2b6473d53562301ec57d3ea147d30a61715b5ba3ca027f9c2c90bd4c63c6f44 SHA512 44a727e1e5f8fc1e18d1ba64807fc822e166afb1e2b7b274343232f526972d865c22feccd593dcbdcc488557f139a7aeb6a85bae4cf2e29f8c271a204dfd6857 WHIRLPOOL 8a8ebff96da931f3c402189b1d040998a14f578efcc5efedb5d4b80f71ff3ac94c757c76e6ff0bb832c8bb4dc8cd93b665ed903f05675c10cc1f3f931302ba8c
 EBUILD libtorrent-rasterbar-1.0.11-r1.ebuild 2623 SHA256 5cbf92b7321c8ace0bb9f09219c049ecb09631fe00394d4b4e9840f318bd1362 SHA512 486a328d3ee6cb6d434a75f3368995a28b85193e9aa3b8a761d52c710e201112b2a9a89fd127ae87370d2eebc5cc06c4122f792c21d80c0d698c1125f673bd77 WHIRLPOOL c3b2a633fdc1535e3da2381c79a49da4baf0a94d06dca1a4483cd46388c3c3ae8a2aab04ada68e5895c1226b87bc2d479fc9cb71b2e050aaf0cfeaacfdd8b838
-EBUILD libtorrent-rasterbar-1.0.11.ebuild 2577 SHA256 dc80520a860ed7ca8fc19bda2011b6fbca69d6c116dc283ac12951ba0f5f78da SHA512 1a1a86210ae665708eb7ee487fa67d2aa6c6ec1c83c3d609ca173ad1bfb2afacea84f0106452d61635d6b5c9505594e3143dc9d600d88d58e62d78289f9f60f8 WHIRLPOOL 9cd1fcb35a65e63df0660dd33f2572027747bd07bf71a3d777e5bcea99141bba965f58bb6a4742c8c4386cc723693773c66565213a3a16432bd24e84e02f8958
-EBUILD libtorrent-rasterbar-1.1.1.ebuild 2188 SHA256 7ca1da0e3d7ffb97ef96727cca9eb1d1549f2d4e51de776f150d9fe369facefa SHA512 3c8aabf70f33df759405ec00e1433e3cf922a8a520a7976f23ef3e9fae7e3e894c14519c0fd1951e5282423351e7c8d76f0f2e642a3914aece6be05f9b6096be WHIRLPOOL 525ffa1b4357cd372617f4fe59667a7a06180fe89f69a911d85cdc6a15f3b9b77a4ab631cb7d57e1bd2226260bab06addf9ff7942efacb510cb926c5815cb9d0
-EBUILD libtorrent-rasterbar-1.1.2.ebuild 2332 SHA256 feb05104e2114cc53eb58bdb0cd87d0d8a70699f9c50042408b4b6143bf6848e SHA512 6c6571cfc34cc298e421b7b7896263825b31ada0e886e3b1ad51c9fc39a0fd2bc0e0bda6c91c764fa65381dfb6b8fcf6c6d96c59f4ede276f92f6fc8ee784d27 WHIRLPOOL ebfc0b8388e758bacf29de117ca81bf5fdb9448cfe6fa276c8e02b9d36847a1e9f3cbf74ab680823612d2de078d9e8f03d4f6026680de197abe59ea0273f1da8
-EBUILD libtorrent-rasterbar-1.1.3.ebuild 2334 SHA256 99111ace0270ab88dc27cf8542285b6d603f26bf7889d063c17175f5d40a272d SHA512 c40d33148287943821e6da1ac724cf7124af40d44364b2875ca1f429dd021d8fc237244d0eb23f5df70dcd4d1276f251033e329caafef647c6a731d82c23fbae WHIRLPOOL 12d6e247f9894f3c8a9c056547e4705d161bb87e0d9a2ea4488b88295e41dac69274c9dd38353f0eb678a151653685e97af15a52f8b6d92dfe2841b7a2c4f5fb
 EBUILD libtorrent-rasterbar-1.1.4.ebuild 2334 SHA256 99111ace0270ab88dc27cf8542285b6d603f26bf7889d063c17175f5d40a272d SHA512 c40d33148287943821e6da1ac724cf7124af40d44364b2875ca1f429dd021d8fc237244d0eb23f5df70dcd4d1276f251033e329caafef647c6a731d82c23fbae WHIRLPOOL 12d6e247f9894f3c8a9c056547e4705d161bb87e0d9a2ea4488b88295e41dac69274c9dd38353f0eb678a151653685e97af15a52f8b6d92dfe2841b7a2c4f5fb
-MISC metadata.xml 545 SHA256 88fc784b68bc30256b8375dd4b1ef6b6269e724ff0464f70d7dfa62af0779966 SHA512 1f470cdd58093c59cd53f4f1cd49176d1d1fb9fdcec04f72b1a477c2527848664f13de09461d918f83053564b9335b489e5c553689c78ef2d3fbe47b07872f7f WHIRLPOOL 7e4969c5ed50840d199fcf3913e21d4ce67c1f7926cc1cae9d5303d2a3a1bd921473a518863dd747d0cbe27f5907227c44ea1bbc712f36d802906ad0c4532573
+EBUILD libtorrent-rasterbar-1.1.5.ebuild 2334 SHA256 99111ace0270ab88dc27cf8542285b6d603f26bf7889d063c17175f5d40a272d SHA512 c40d33148287943821e6da1ac724cf7124af40d44364b2875ca1f429dd021d8fc237244d0eb23f5df70dcd4d1276f251033e329caafef647c6a731d82c23fbae WHIRLPOOL 12d6e247f9894f3c8a9c056547e4705d161bb87e0d9a2ea4488b88295e41dac69274c9dd38353f0eb678a151653685e97af15a52f8b6d92dfe2841b7a2c4f5fb
+MISC metadata.xml 527 SHA256 e53fe78e5ff72e704f0119e0226da2416169291e7a840340c811dd123d72538e SHA512 7dd3d0492dd77ffb05fa50b96253d8e7cc01c86b9eedf3891a5b8b09e49ef8d51747890a874609c077d95d5144f949bb31db9bb40e0ba520a3917a548db129f3 WHIRLPOOL 8f531637c7660ea459f60795f94db29f575552fb6a015283c9253d01d7c7140028b645985109e838bdb45ecab9e43acb57b58269c8af69523e3eb7ba1f07f06e
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.11.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.11.ebuild
deleted file mode 100644
index 956de7c8054b..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.0.11.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit distutils-r1 versionator
-
-MY_PV=$(replace_all_version_separators _)
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="http://libtorrent.org"
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/8"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug +dht doc examples +geoip libressl python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
-	dev-libs/boost:=[threads]
-	virtual/libiconv
-	geoip? ( dev-libs/geoip )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sys-devel/libtool
-"
-RDEPEND="${COMMON_DEPEND}
-	examples? ( !net-p2p/mldonkey )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.9-test_torrent_parse.patch"
-	# RC_1_0 branch
-	"${FILESDIR}/${P}-fix-abicompat.patch"
-	"${FILESDIR}/${P}-move-header.patch"
-	# master branch
-	"${FILESDIR}/${P}-fix-test_ssl.patch"
-)
-
-src_prepare() {
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug logging)
-		$(use_enable debug statistics)
-		$(use_enable debug disk-stats)
-		$(use_enable dht dht $(usex debug logging yes))
-		$(use_enable examples)
-		$(use_enable geoip)
-		$(use_with   geoip libgeoip)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-libiconv
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		myeconfargs+=(
-			--enable-python-binding
-			--with-boost-python
-		)
-		python_configure() {
-			econf "${myeconfargs[@]}"
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.1.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.1.ebuild
deleted file mode 100644
index 3de47f94ee69..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit distutils-r1 eutils versionator
-
-MY_PV=$(replace_all_version_separators _)
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="http://libtorrent.org"
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug +dht doc examples libressl python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-src_prepare() {
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug logging)
-		$(use_enable debug disk-stats)
-		$(use_enable dht dht $(usex debug logging yes))
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-libiconv
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		myeconfargs+=(
-			--enable-python-binding
-			--with-boost-python
-		)
-		python_configure() {
-			econf "${myeconfargs[@]}"
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	prune_libtool_files
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.2.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.2.ebuild
deleted file mode 100644
index 91626938f9c7..000000000000
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-PYTHON_REQ_USE="threads"
-DISTUTILS_OPTIONAL=true
-DISTUTILS_IN_SOURCE_BUILD=true
-
-inherit distutils-r1 eutils versionator
-
-MY_PV=$(replace_all_version_separators _)
-
-DESCRIPTION="C++ BitTorrent implementation focusing on efficiency and scalability"
-HOMEPAGE="http://libtorrent.org"
-SRC_URI="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${MY_PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/9"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug +dht doc examples libressl python +ssl static-libs test"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	virtual/libiconv
-	examples? ( !net-p2p/mldonkey )
-	python? (
-		${PYTHON_DEPS}
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-	)
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:= )
-	)
-"
-DEPEND="${RDEPEND}
-	sys-devel/libtool
-"
-
-src_prepare() {
-	default
-
-	# bug 578026
-	# prepend -L${S}/... to ensure bindings link against the lib we just built
-	sed -i -e "s|^|-L${S}/src/.libs |" bindings/python/link_flags.in || die
-
-	# prepend -I${S}/... to ensure bindings use the right headers
-	sed -i -e "s|^|-I${S}/src/include |" bindings/python/compile_flags.in || die
-
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable debug logging)
-		$(use_enable debug disk-stats)
-		$(use_enable dht dht $(usex debug logging yes))
-		$(use_enable examples)
-		$(use_enable ssl encryption)
-		$(use_enable static-libs static)
-		$(use_enable test tests)
-		--with-libiconv
-	)
-	econf "${myeconfargs[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myeconfargs[@]}" \
-				--enable-python-binding \
-				--with-boost-python="${EPYTHON#python}"
-		}
-		distutils-r1_src_configure
-	fi
-}
-
-src_compile() {
-	default
-
-	python_compile() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_compile
-	}
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	use doc && HTML_DOCS+=( "${S}"/docs )
-
-	default
-
-	python_install() {
-		cd "${BUILD_DIR}/../bindings/python" || die
-		distutils-r1_python_install
-	}
-	use python && distutils-r1_src_install
-
-	prune_libtool_files
-}
diff --git a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.3.ebuild b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.5.ebuild
index 86fa8d7e920c..86fa8d7e920c 100644
--- a/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.3.ebuild
+++ b/net-libs/libtorrent-rasterbar/libtorrent-rasterbar-1.1.5.ebuild
diff --git a/net-libs/libtorrent-rasterbar/metadata.xml b/net-libs/libtorrent-rasterbar/metadata.xml
index 4133516fb4f6..7cac58e92207 100644
--- a/net-libs/libtorrent-rasterbar/metadata.xml
+++ b/net-libs/libtorrent-rasterbar/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>hwoarang@gentoo.org</email>
-    <name>Markos Chandras</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="google-code">libtorrent</remote-id>
-    <remote-id type="sourceforge">libtorrent</remote-id>
-    <remote-id type="github">arvidn/libtorrent</remote-id>
-  </upstream>
-  <use>
-    <flag name="dht">Enable DHT (distributed hash table) support</flag>
-  </use>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">libtorrent</remote-id>
+		<remote-id type="sourceforge">libtorrent</remote-id>
+		<remote-id type="github">arvidn/libtorrent</remote-id>
+	</upstream>
+	<use>
+		<flag name="dht">Enable DHT (distributed hash table) support</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-libs/libwebsockets/Manifest b/net-libs/libwebsockets/Manifest
index c522584f4e41..4291ea14ae51 100644
--- a/net-libs/libwebsockets/Manifest
+++ b/net-libs/libwebsockets/Manifest
@@ -4,6 +4,6 @@ DIST libwebsockets-2.0.2.tar.gz 2998585 SHA256 7ab40b7c28b25d7a37762832194478765
 DIST libwebsockets-2.1.1.tar.gz 3769593 SHA256 96183cbdfcd6e6a3d9465e854a924b7bfde6c8c6d3384d6159ad797c2e823b4d SHA512 429bca62feb75136d8aff1783a6024468033536356fb3501e4dcf0819d9e9a4457f2a94248fdafe6fdceb7e0ded146ff6c4c04040e069f34a9b27a4e090d2683 WHIRLPOOL 7eae91b00d0c80c7589114ff4d3544aded742babdf2ff1c0cf1091f846f844c86b20b1983709e20c429c5caa98ae808b4094723695e36fdc124ea81d4ad49747
 EBUILD libwebsockets-1.7.9.ebuild 1190 SHA256 d86c36ba7fb012ebd854919af11f8fdcb0ba2c1a4b90d4e468fb898b9cf0b271 SHA512 ae405094c922c0004a2b5f312b8a8c0c8b7674208bdb89b969643ba0444624ade3bbb5a8264c1c58c955e320ddb60ca6b06f0d6ab1a823e12bf1e8a8890c8afa WHIRLPOOL f01926a5d0942a68d3985c89246ce3cfce10a16661f7bad4081ad6ff1e1da2962484823f8ef3c82000e7bf3960f4cb0fa97a61b6589dad9d0b5b0de23631a91f
 EBUILD libwebsockets-2.0.2.ebuild 1191 SHA256 643d7184916e7b7cf6516520821a8b7c8cb46e9d4b822b149fd1883f7dd11d17 SHA512 8f4c590d1a9c72d752190dbfb8e4e9a99f940851ea52e3ef2e1959a981a03169409d71c38e3adda3284d554bf7126342984f1861844d9f762227bdd7c7611d8b WHIRLPOOL d0a2c0530efd79f9d79479dd0c5e46747e601efa1e937ea9a6640c1d07ceb996d2af3e5e079a94c494929b0dbcea479a0e7ae91be2af312b55b4cd0db53d3898
-EBUILD libwebsockets-2.1.1.ebuild 1887 SHA256 493d7c2df331ede9f4cf0c4d6d25a7bb9bcbae10c1d4814a836803cebce29f67 SHA512 20544fcb958345dab6e070980ecdc54b7b38abf967f0c9ed3704ffe7300433d7e773ab3e6d85a0500ea433de73730d97b535e9c120af3d0cbfcaeb75f7a04837 WHIRLPOOL 8f0197fbd607bd52e2842cfc4d98c74d68f535061626aee07812655e80efca214b0bba9a1637c0ef349ebff22890c9637551971e078dc4d2e30cb5c57f1b168d
+EBUILD libwebsockets-2.1.1.ebuild 1864 SHA256 9bd4e435379275e1f177d6020887475ab57c4250c8b88dc3b0e1ffc0574174e7 SHA512 ce55d4465133c73062ebb2fdcd28e58b277da6f099f3c020d1921e66dac3b64838ada69eb6ce5b6b3d8a4551e8d714600cf1d5d42a348096d1d8b5de7b3b4d99 WHIRLPOOL c434f221eb0d91e1f8144ffd466f8543459555ba691a24720b224af5e7b239cc84241058c2720e68b36c306753e4505a9b1db53add1b1fad22bd655811983c0c
 MISC ChangeLog 3051 SHA256 0eae7ed440343cdf0689c1acda40b7014907334a90a0905d271e2da7ebde126c SHA512 c042afeebb82c2d055e84799b58d91407d683561eee91d46025746726779eecf8b74dfd72bcd9522ddb89288f30f1a65ceff47120ce42ddf3048cfdd23ee4a30 WHIRLPOOL 6b26abc246d912caaf5b00978ac705f3d93dbede491ec4807b1980cb1502bc4e6428a84886c685d9367ec197e6577d3d37e1dfa839d081c9c30cd377795f01ab
 MISC metadata.xml 1524 SHA256 d2ec4b3f2b776dbf5ab1328ead2ba634d0d3fa936a65273aacae726cb4db440a SHA512 d43b3715a0387a4662aa7b3def3384a1eed5f840f4c187a74df33785efc855d4879bd1bdc4d339326787984cece87cfeafe957f6abe91d30de854199968cd406 WHIRLPOOL bc1317047e1fa3c4cf152abfa79660903db19e07da5a760bc334dc5f8f0161c991fcee7f0eeb17510f1b56decc82dca74f8aff37978f61ce6dda3cca6b56d7ee
diff --git a/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild b/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild
index 46a8522c0225..86151e80cb69 100644
--- a/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild
@@ -36,10 +36,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-lang/perl
 "
-src_prepare() {
-	epatch "${FILESDIR}/${P}-x86-build.patch"
-	default
-}
+PATCHES=( "${FILESDIR}/${P}-x86-build.patch" )
 
 src_configure() {
 	local mycmakeargs=(
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index 95ee8aae7415..098be868034f 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -5,7 +5,7 @@ DIST miniupnpc-2.0.20170509.tar.gz 86055 SHA256 d3c368627f5cdfb66d3ebd64ca39ba54
 EBUILD miniupnpc-1.8.ebuild 1084 SHA256 ae53ca70e3b8d415d405a123f071c02b0fbdb149ba28b230d0f044c47f1ec4ac SHA512 d93e0bc6286ddc99141a69ee2bfc1f8a7b14adc83a9f8151de7f052cc1ddca3fde1af489e7a6d75558ca9a2877965a59755ef202ee515582b0999c253d5c9f95 WHIRLPOOL a1a9cc96372f759b5791edce8e1a5af2dd9fa60d3cf38f65358c8a5838663e1a8d5cf12a48fdfca2da9d45ad82f86ef9eb4a15fb8f13386ae290ed6ef82c02c9
 EBUILD miniupnpc-1.9.20151008.ebuild 1394 SHA256 67ce745d5526412346cf2d59c62427ded064ff933bb8d3c079a0018b48bacb3a SHA512 084b7d43fed8bdf81b5e05872e9e3b39091d6a401bb3e69575e3b62fb0dfa5d51de9aa9f82efaad7b726385dd79d10278535df44adcdff0831006607dc91ea6a WHIRLPOOL 67dc28fd574000f75998f9a81733bbbb9093bc4ed2297fc9daf53c604911a3acbf24d71cac7e2f048fff8ecda46c95df2aaa63256e1d6d86717b385b33e781b3
 EBUILD miniupnpc-2.0.20161216.ebuild 1266 SHA256 e3847f78abc25254eea36c0ca5bb97ebd05b2a9f5fc71be66d88c1b851a584e8 SHA512 5523f1337949a3ad51e9853a434bd8eae1e37b2bde0a0fad0a4fb9e930c035922389c31e78a265112d23ae06d4f3ab70cff7bf46b65a782cc520f790e8ecb07f WHIRLPOOL 8479240c6c5689e67fc469768a574aa978ce8c418e0be36030dd543d39b8aa7aac6f92cf8a965f423d816de9336b6e1ec7f67465327c0997607bf97a67a7cccc
-EBUILD miniupnpc-2.0.20170509.ebuild 1267 SHA256 175c924a6ddfa7712c46da07e9febc1b2a5cb28b0305ae581d1f55c4f8cec71b SHA512 777fc687631b6ae71ca8ebc38470aa5cb5014e9adac2062a8df028f5e412bb4faddb8ddcc5d79a209c49b263c58a67d2d8ae184d94a24699afcf6d4468c6663d WHIRLPOOL 2fe581e2ccae26fa53058d5ce7a2db334db95c3b2aeb6873df643f85e828e454873e54ef95932cd40d6bff1632d96a16273cd036061f06e2f35dc310ccc605d6
+EBUILD miniupnpc-2.0.20170509.ebuild 1266 SHA256 8c495fe697ff82d80a4388292168102f2553ec8ffe475f3b770219cdc7b8870f SHA512 aeeaba172f38162342256afc17223e1efce42f149561ca0e19bcd8336d32dd74d51a55951f4df79663d1999702930eb4dcd6ceebeea9afe82d9f376432dd7271 WHIRLPOOL 3fd57014d5415287f9e3afb9e6608688a1e218a6ed60458482e5a54e61be9a6adfd345aaf8c149065ab490dd3ed4267e72f26fe0324c482774e84c20909bef65
 MISC ChangeLog 5006 SHA256 b2966562c59615a6c8d7673f1467b53db8f81ac8b60218eef83384d0f057bdde SHA512 a929566fe2d983c98cf9a3b5fcbe7cbc108356068fe3fa0b6ec0de45c380f8cf69d6fe276f9dbbc427abeaa62151394c15f7125fcb656b81a926e5b37dc66325 WHIRLPOOL fdba3a93ae4e78ed694819729140cd64391f55c519eea3dfcd4d07db3e3e0ec008ccc311315c18a93941c7a84b83f82feadee98efe2727f481bf428327f8f68c
 MISC ChangeLog-2015 6514 SHA256 bf24a161ef7dba7be7ae7511c70714cd029bd6026853bc61f8688c64095a3240 SHA512 69e8c332b1bef1a076dee904fbe65647a5031387e6bb70b22e0b2999ec9a31a39f0d2a031ded5af7379af50671af36bf7dc94be8e81f0e018004e546c82466ce WHIRLPOOL fac0f5730c93993dafd16ad3b8d48fd51a1ca7ee94b52ebb8de127c4c3dd2880efb4dddad5d8a08e8dd4c59908f2aa3d319cf62ba4dc986ee3877c243a5bc334
 MISC metadata.xml 243 SHA256 a90d5777b80d7ed5f0f322ff9cafae7a96dd513f4af28b60e36c060305157906 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28 WHIRLPOOL 10702c61e2ae8d5ddb862621065c0ed6b1d05b4a4ff0a30407d29edca19629cead238e10a9f1889f4c41f64d7ef88f0031f746a2e5d9502ca7b088c2039f5751
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20170509.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20170509.ebuild
index 0386b63326bb..72c1c30a7f7e 100644
--- a/net-libs/miniupnpc/miniupnpc-2.0.20170509.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.0.20170509.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/16"
-KEYWORDS="amd64 arm ~arm64 ~hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="ipv6 kernel_linux static-libs"
 
 RDEPEND=""
diff --git a/net-libs/polarssl/Manifest b/net-libs/polarssl/Manifest
index 677d94c5f502..ada58966df23 100644
--- a/net-libs/polarssl/Manifest
+++ b/net-libs/polarssl/Manifest
@@ -1,7 +1,7 @@
 AUX polarssl-1.3.9-respect-cflags.patch 619 SHA256 8b494d78d13504b56f345ba39f9dc7fef79f97efcd72ae8b40ffa087425828be SHA512 1dc7d7ea34b95c379b8d035497b8975c0de8befadb8f918021bafa726e11ecab83f9aed1d9e295c03c4b50e1cd12efb0956322b82ac6413222a30a5079fc6cea WHIRLPOOL e739a3a0e6330931caf0b522312c2d47ee5c0647de7ac1151aea004251937ce6bc302fb0360c2c49c516af88fd9811d50ba60f75bf04ea5c904614196925fcbb
 DIST polarssl-1.3.9-gpl.tgz 1741396 SHA256 d3605afc28ed4b7d1d9e3142d72e42855e4a23c07c951bbb0299556b02d36755 SHA512 e8958f834fd80ac996ac58152a0a5d4e31449e8b7b79ee6daac6f45bed60c5c5ad31f84b211d5e36ad0d6c82a742841e986a738735af048c286bce0e8fe4d62d WHIRLPOOL 21f27e50a8563df18c9b27a595da47715b1f04114d900dee2dfac3de51db58e4094da680a44007cf9f02fcc30689bca02d79a957509d1715dce1673d7713fa93
-EBUILD polarssl-1.3.9-r1.ebuild 2503 SHA256 a54fd5918f3d13cd80ca789f7e9a9d2268f0007b3228cde9dddd3394d1806061 SHA512 ed2fb511fbb1c6e63d7fe9cbf87753d6371282bdce0df889356d278d65c163c666a6192674199cce9c2b118f60bfaee2b2cf4d33b51bd6ffcaf08e0f0226da14 WHIRLPOOL 08d37832d486dfb0ffbc522ba33af74225fe2e5cb7dce9c522ae7a1a3861d55622680cdbb45b286a8a4bcdd7ad37df40292a3c18c33fd5941019290a8acedf64
-EBUILD polarssl-1.3.9.ebuild 2434 SHA256 561cc045be945364bda5daa8401f3f0b703d3f7d2456668c44f35d7356f9e204 SHA512 6b63b637ca5386749180730634bf4748d8ec9c75b260a5498596a6ca654e80805d7033e95b8d45952f2265bcbdabe78ebb1555330e46a8bf527bb5cae78c8527 WHIRLPOOL a3ec4b20b95bc5f21af7d91c8cb07d61d1e038ab6a777456ab1c5183d5a41d173ed580a0bd0d2b2fcfc09d131037302dcfb42e633943da6ff77489335444f449
+EBUILD polarssl-1.3.9-r1.ebuild 2533 SHA256 fa5dd7a42bab3764da09755bb4f469049902e361717994b624e27c9ccbdff340 SHA512 99ba3357af30f58f312d009e90f0c5593326483fc1ecb8ef0ef7e744526a6c4831ab6f38ab44baf89d991e99d57f600e20cd9bf53684c5766cb73cccde8cb2eb WHIRLPOOL 50c4ed24ab4a748061cc41d788607b2c801fb09e8b5ebe8ec493576ad7ed206a8172f8639cdef2c1ef75c9baa732635c301b3784f2fff4b649a58e0fcd22d42d
+EBUILD polarssl-1.3.9.ebuild 2464 SHA256 506f2742abf2f5ca137f3176a04e5ba545d2299c17fb3548b654bc536f3fa78c SHA512 35f4f764b2786babea5e76beab7d9d592d2d3516cefc0bacf1bd3fd839492a34facb7b00ec4ac2534d2af032859343f5448fb55ddedbfddd7a398422e74f35d8 WHIRLPOOL 5dd17c48a3bcff97e53ecdc9bfed6785b781b5b817914bbce54ede1e4d467279e7010188a9187e0836f80e1580c22c18abea6be1b659dbb52181422f852ab0dd
 MISC ChangeLog 4186 SHA256 9060dae254ed0e1572d3e713d6ce6f045674c64beb7cadeefee2661ca447c295 SHA512 61a18dd5bd880a455df8b19c86a5b7525352f5b13f329844c09400997a21ebacf2a07c182fcedd692454849f5354fad7a84184676cb76345915c21a612df8e0e WHIRLPOOL c39dbee48f9c74aa9dd6bc5fee3c39819e787095d3ecd059bfeb44425e8b44c1a4e4da938cec018640b35318f1c36537c2320929223b6208c31220119b227092
 MISC ChangeLog-2015 12426 SHA256 b089206f7b85970545bb20a12bbf45ebe91e9c7265ceaf3159077313d0442164 SHA512 1ab51ceac0d09efb6c9b89482ca54f02b2cd46a4bb3e3c7f0ec8b5cbac4b17f60abdfea07077a3abb537eebc6954750f7635cafd00760cd9ccc888d6913ba786 WHIRLPOOL e3690e06100bc36a455bb8a4a93c49aebf8ed26b207e216c1252134b1a41969055ca798698475fdd5a70c96d2f708a45136a390c3e111ce18c75dcc464845d35
 MISC metadata.xml 633 SHA256 5b0902a9b09cf40880365c57cba7b6bdf2118d2984ff69be96ea035b1d40540d SHA512 57018df16efca7e15c3836d744d4276bea309816dd9c345467c280d737284a45c3c4828b8dc93013d284d5f2b153ec01d4a0deed5df130c782d71d0e0553d4ab WHIRLPOOL ea3396b54474a083776784a94551e7c3bbb173f4cead0a0b02fe18e41759d0a565dd980040190b8abd5bb17ec0eb2ce5e68e41f08055149e7f5f46b552e371a2
diff --git a/net-libs/polarssl/polarssl-1.3.9-r1.ebuild b/net-libs/polarssl/polarssl-1.3.9-r1.ebuild
index a8b641680e7f..01f8abbeec11 100644
--- a/net-libs/polarssl/polarssl-1.3.9-r1.ebuild
+++ b/net-libs/polarssl/polarssl-1.3.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -24,6 +24,8 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen media-gfx/graphviz )
 	test? ( dev-lang/perl )"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.3.9-respect-cflags.patch )
+
 enable_polarssl_option() {
 	local myopt="$@"
 	# check that config.h syntax is the same at version bump
@@ -39,7 +41,7 @@ src_prepare() {
 	use threads && enable_polarssl_option POLARSSL_THREADING_C
 	use threads && enable_polarssl_option POLARSSL_THREADING_PTHREAD
 
-	epatch "${FILESDIR}"/${PN}-1.3.9-respect-cflags.patch
+	cmake-utils_src_prepare
 }
 
 multilib_src_configure() {
diff --git a/net-libs/polarssl/polarssl-1.3.9.ebuild b/net-libs/polarssl/polarssl-1.3.9.ebuild
index 1e9b0680450e..6dce83e4878f 100644
--- a/net-libs/polarssl/polarssl-1.3.9.ebuild
+++ b/net-libs/polarssl/polarssl-1.3.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,6 +21,8 @@ DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen media-gfx/graphviz )
 	test? ( dev-lang/perl )"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.3.9-respect-cflags.patch )
+
 enable_polarssl_option() {
 	local myopt="$@"
 	# check that config.h syntax is the same at version bump
@@ -36,7 +38,7 @@ src_prepare() {
 	use threads && enable_polarssl_option POLARSSL_THREADING_C
 	use threads && enable_polarssl_option POLARSSL_THREADING_PTHREAD
 
-	epatch "${FILESDIR}"/${PN}-1.3.9-respect-cflags.patch
+	cmake-utils_src_prepare
 }
 
 multilib_src_configure() {
diff --git a/net-libs/socket_wrapper/Manifest b/net-libs/socket_wrapper/Manifest
index 8eabd80d6cfb..19e0eac65b0b 100644
--- a/net-libs/socket_wrapper/Manifest
+++ b/net-libs/socket_wrapper/Manifest
@@ -1,7 +1,9 @@
 DIST socket_wrapper-1.1.6.tar.gz 54150 SHA256 b97265e98e4da58cd0b438c1f17cdfb65b5c4e4a8fe2aab9360042a812931220 SHA512 8d5868877cdc7b20efbb8073276574d65d61a8fea73df2924a3fa4581284d30d7a1f03351c470a473e0e2eb6ed1a1513a98559a620b3976741892bb807cfe7ea WHIRLPOOL b46992b84e96238f4f4a6074734976d48e4ccced4f7a555a9a779935aa934620215863dc0d561621d7f0288eb17943f6628d9b9002f0eca1a639bac2fa0cc65e
 DIST socket_wrapper-1.1.7.tar.gz 54774 SHA256 a3488125a3eee4e5189a69f3ff132e5d637b56bc208bbd6ecee6017d66edf89a SHA512 3ddf7c1e0bf75268ed9bb44dfb02028d2d678a206ce6290ee1fc8da851ccf0cf97255c2cc498212abf65b96a9114563c4f922816d0109d379b096682a6bfe1f1 WHIRLPOOL b09ed79623bd853eaafda7fa4d59a7ad3e7d027b8105f66fe045e5c81a7a78e730ec8f2b9cd3eb9752b6b2dcf0dfdd9b1c123bd88c38b35d122b13d615a0795e
+DIST socket_wrapper-1.1.8.tar.gz 771657 SHA256 a382e1a59db74415ecc0b8a8b951b82d922b9019c3ee20bbb33a041c99c17b15 SHA512 55c64a4897a09bf2680132337d24bdd5f01e57369b0e1611dea9daca8a57f44d3b6625d3c3e631f954db3f4fc7e85f7ca229ec647f4bfd756f0bcabc6558498d WHIRLPOOL 8652d0df5ee8d0bce3cb16c1f8cdf71ee1c60c28867e41d99788e922f8e810764fba2964fd9eabd1ec360f7615bde7ce019884f1953f8428317f27c1febcd287
 EBUILD socket_wrapper-1.1.6.ebuild 701 SHA256 5ddeb26a497b8cbe9943d39f3c7f0cffbf528bf878154f01fb94e32acbe73679 SHA512 f3929eaf574cb4eee26e44015436160149d000f49c385b8d543c685e6ccb650d8c3b0b18ea2a13d9ca41e45be44874c0ef80106c4eb8a4f0187daa1c7d2661f0 WHIRLPOOL 0f51d9b1e0ce896a6ca5f91a638ce2e29a618f70eb60b117141f04d433acb91fb7dd236ca7d57d5713ad7cded11739ae8fd85b7cd7b08637abd0e5266132bc2a
 EBUILD socket_wrapper-1.1.7.ebuild 709 SHA256 f5bcd8902d9fab06452480f3cd1d99fb660c4f2acaee5daffd4c9f7a78d8c2eb SHA512 15be0a8e54836a01abbdea3f76f86383cbda45da334758bb5d58d7dd46e3b83f1bd35b9832fd76d8887c03acba87fe1f0f29f2ed066fca4787134c029527d2e9 WHIRLPOOL 1aca30ccac615dbda9b28663afbe72e0d2838cbf315ca452fb1c30a904350994030ee84fee6f8c813e90bcba04f46e8794a757de9618877241aa218a0958496a
+EBUILD socket_wrapper-1.1.8.ebuild 716 SHA256 1dc824b9e6a70b8453401c1058139d44e083962d6c78663567ab9ab10defeafe SHA512 5cbc2731f5ed327e10149267c2fd6e2b4517dca4196d30fc99cacf85127835677e013dc88393b9811ffbcec585564fb04c84cd6622e8f0699429b65742855991 WHIRLPOOL d701ce128b15a3660d15f281e407aee7ff190c90ec1d01cf1501ea22b61140094f424485c9fb8a070434c560bced9159c43e21266f99d8a204d6d61d18418429
 MISC ChangeLog 6900 SHA256 1bd818d7d2aa03dd0f30468968ecfdaa7a3b3cf5041561329fb53a4e14314ab9 SHA512 44c44506a81053c11609f3a0aeee80f07d441312466b5e4034a3cfdfeca9cf64bc6534e55912292b1854a3b1494ccb6284b17181219c1cf1d61e7f40e939fc31 WHIRLPOOL 7a9766ce1815d48104a1a6b92ea3a5ad0981cba0ac2fc86daa8f311b47378e2b8a36a17ad67a6365a7711bf9f6ab7a5b572524de0163a9c8799ab4942e20d44f
 MISC ChangeLog-2015 403 SHA256 1f9dce14b2fe67460973a5840c57276a337e68df2a82151fb37d7e79a5e86d5f SHA512 023cc2b2cc40603b62de67e8336b84a1fdff77b06062ef5f970c8175d59e9c41150319d6788b28e8d45256d999a9ece55a3188b28456ecedc261d6dfe6ec9cb9 WHIRLPOOL 1556e29f22ee6933e553b8848666fbcd63061ea04b689e3be618af41e5772767dee22e2d9e9aaff9e03f3c381890471b77288a485884ac83b7eb79a419ce499c
 MISC metadata.xml 360 SHA256 debc337b7549e12f55cf6ebdf900a95eb3b2370aa60daa49fd7ae97659ca5a85 SHA512 6cfeb9ed18b5c3b6c6e6875311bad627e9baffdf7b0846d70c8e0e36ce053ce849f867e963f7504292bbeb4b133c828e75a2d877c34fe7858ab3b9403ce533d2 WHIRLPOOL 1e6aa7563470c001516ce0b5f398d4fb5d854bb8a3a47a6631bd53f9b377950644ccb487a651f9648ead2815b815e8fd16d3cf7b6cd5c2d18958472b2a25c421
diff --git a/net-libs/socket_wrapper/socket_wrapper-1.1.8.ebuild b/net-libs/socket_wrapper/socket_wrapper-1.1.8.ebuild
new file mode 100644
index 000000000000..4cbcd2bedf10
--- /dev/null
+++ b/net-libs/socket_wrapper/socket_wrapper-1.1.8.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="A library passing all socket communications through unix sockets"
+HOMEPAGE="https://cwrap.org/socket_wrapper.html"
+SRC_URI="https://ftp.samba.org/pub/cwrap/${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+# Work around a problem with >=dev-util/cmake-3.3.0 (bug #558340)
+# Because of this we cannot use cmake-multilib_src_configure() here.
+multilib_src_configure() {
+	local mycmakeargs=( -DCMAKE_LIBRARY_PATH=/usr/$(get_libdir) )
+	cmake-utils_src_configure
+}