gentoo resync : 11.10.2017

177 files changed, 5905 insertions, 201 deletions

diff --git a/app-admin/sshguard/Manifest b/app-admin/sshguard/Manifest
index fcb9a5b86caa..b539e366f382 100644
--- a/app-admin/sshguard/Manifest
+++ b/app-admin/sshguard/Manifest
@@ -2,8 +2,10 @@ AUX sshguard.confd 634 SHA256 ee121f8c4c045ba1cfa67a173040358b1ea5c0561427d64dbd
 AUX sshguard.initd 572 SHA256 759ef54c0f54a27023020ff8da7811b38459a194d7d75d15ea88f7609b2a013c SHA512 0a38cdc6121c6f981bccfd75648843f16b724d412648773f1838e8c67a6c7231df756da8ac1c3651a18b5a271337c07ab97a3314d3a81904bf3c2c68dd00f9f7 WHIRLPOOL 855f2823d38a80c208e754e249a31b31d00a019d7adb976216720a3fb98e48e15d829466c96afcae3da1ef4872af2cc94e1305cbde2ef3dc333027cf99ea480a
 DIST sshguard-1.7.1.tar.gz 832220 SHA256 2e527589c9b33219222d827dff63974229d044de945729aa47271c4a29aaa195 SHA512 205f45f0f1260ebf2a1efabe5b4391b23c219f37df096383d87c220e7392cf58827a4e509be65287bac5b2af49fa0fc390775e1472cff4fb28f2323821f00fd1 WHIRLPOOL 2810c8c77d623dd21baace30bcd4c20efe1f7544e0db3a8abe84ca823e4cc391ecde072d56e63e10c2a490d1417e18fcd9cae16692ac72fffbf216a23036798e
 DIST sshguard-2.0.0.tar.gz 886995 SHA256 e87c6c4a6dddf06f440ea76464eb6197869c0293f0a60ffa51f8a6a0d7b0cb06 SHA512 c9f7ef4b8d4b1ecbcee33b95e013c51f37b4a05226c6cd1f3c85006c83a32cf555644069d529a7317dcf6616f86a399d7338a5a414238de05bd41dc3005488e4 WHIRLPOOL 9ee1dc00c8f5571b3f36575e793a263dd70fa61f23c52bb446df5ffcddae981adbf7eb3c9dd6ad3894c1e434293297ab4894537a697df6282678ff5ebb5c3af9
+DIST sshguard-2.0.99.tar.gz 1110725 SHA256 189b99b582ac70e2130402493b205b3608893301b49cedec84aa36c80ae2a308 SHA512 776a241b7af9a4afb048c99791202c0bf0f5130e265116a0f049853f8eb3d108e056c75f9dc009cf93a0dffe8d34b18b6fddc63febd54cc35bb6e71d6d2e77bb WHIRLPOOL 7905324d09974790412d16f3da775fb03f76cb0e4802268e78fd09e59c1586c290a3b70b820b833ebb9f7f9e0184bd1c91784d38036c36a65f5796f998529ba9
 EBUILD sshguard-1.7.1.ebuild 1226 SHA256 ceb2f79d92f976569c597fa0be6afd77e23d2403d30abf0c5f23e723c624e5fb SHA512 c0e4e5219c2e95e07d83cdb8b2d9fc9efdc666b74eca4de0adea96fe50539da23d5e143d81dfc2c71e738fd5ba182309c0b51530bafe19b6ee6fc2c96d063973 WHIRLPOOL c1308912e922af560269eeded9c6b267a3cb7e5788b0254060b0ac120afa0d500f036994728368fbfd0ee0b0efad122a58a6aad819ef9f6191603c126cd449ee
 EBUILD sshguard-2.0.0.ebuild 891 SHA256 2e34ac923f39347d82ee0b280d8bf60ead891ed38bc4bd14e1244a094fed7f16 SHA512 9fe8e23d3ff513956d40835a93e97f008ffdecd989a4602bf2069505bda63df62fd854756e90a1ab04536943a5832416ad74e6dcea765be2780a910f04b42965 WHIRLPOOL 61fcebccc60c97fed4f6a57642895227bae7cd9a247870c6481c2791acbd156393121907801ee9467044ccef2a4e33616269870315115493c9dc730db3834923
+EBUILD sshguard-2.0.99.ebuild 710 SHA256 113d4ea05bb7ae32cf23826be1524f1e7d6779d503e83c2c5480bdc6b879400c SHA512 c378de845ef6b78eac17757bea66c67ea73d244abaacb8674a52e1c6297761cc7b65d2b35ba92e5f8ac5faa5c24e07b7f4c2be9f009a172546501bb05f88a268 WHIRLPOOL 32eb71ce76377241aa736b7ea0dda8fe76e13c9dee8456c9450326cc3327b32fbe293a6ec2f589cca3a33eb71b09fda53a23dbd72c7050cf7e68020d735cca96
 MISC ChangeLog 4254 SHA256 eaa6f2711106460318d556aef3f7f0e62dc82f10177d193f60f3a400e4ba94ca SHA512 ef97796e890fab12c8b03707a42d76759457dd1350ecbd772f40e66f39f5b1a643958fa20c8c0c2324b630ecd6ebb3ef890aad477a0457b77fd6e29172a1b296 WHIRLPOOL 109df28dadc52bdbf8d5d3d6fbbee7a0c5e34b936331a0a22284f7367ba063bb6705d65044413e40a8b87ca3568e96f73484376372d5713cabd62c928dcb6ea8
 MISC ChangeLog-2015 3411 SHA256 0b12c834f0a95041a023e9e36432da480f9ca49dd19d105865cc8d02517ed16a SHA512 5bd3f8a5f63a0dc036f5320243bb07d96953bc03d9a2ff51820778a817612f2ab9e07e59db9f2e76d68db5cdce39dfa93cb90955db18caa06a9d96407b914edd WHIRLPOOL 19d9a00d8dcfc869cf49618f20b1debb59c3cd967cbb1b8591749f5d97669084589d8af2a68a2302e7abcea8ae85526785e4ce5e0de843fa098437d7ae212de1
 MISC metadata.xml 467 SHA256 b423370fb24f542610016f009bfab7cbd668b4211c9fb0e88e4c14302f4c9993 SHA512 3d936c9b01370bdee03cf23d2ff8632eabc3352054b1b7797baa6e8f1496adc35e79ae286a63bc9a9d6ae5f1e920300f417c08f637ad78e0c40711f2e51dc7b9 WHIRLPOOL 138db6422139317a253113f2cce164cfe6d91c330ed0f6963ddd5b620fdd5b0941454276e511f9f2c8f49c1d50ec6904b15db43a67bbdcbd3a185822888780cb
diff --git a/app-admin/sshguard/sshguard-2.0.99.ebuild b/app-admin/sshguard/sshguard-2.0.99.ebuild
new file mode 100644
index 000000000000..1e45c36ba086
--- /dev/null
+++ b/app-admin/sshguard/sshguard-2.0.99.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="protects hosts from brute force attacks against ssh"
+HOMEPAGE="http://sshguard.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+
+DEPEND="
+	sys-devel/flex
+"
+RDEPEND="
+	virtual/logger
+"
+DOCS=(
+	CHANGELOG.rst
+	CONTRIBUTING.rst
+	README.rst
+	examples/net.sshguard.plist
+	examples/sshguard.service
+	examples/whitelistfile.example
+)
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	insinto /etc
+	newins examples/sshguard.conf.sample sshguard.conf
+}
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index a0f7802ceed6..bd99a351d8c7 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -3,9 +3,11 @@ DIST zstd-1.1.0.tar.gz 716327 SHA256 61cbbd28ff78f658f0564c2ccc206ac1ac6abe7f2c6
 DIST zstd-1.1.3.tar.gz 845902 SHA256 106c532ae840a6ee4aee5258f04f3acab7b3e09b9e9584ebe94e4fbfd899af0a SHA512 6c025ca3899d0487bf2b4a9b333b47c6e2bb525ae3fc7328cc040f50d6f3c53a1bb9bd17e104352ddbc7b96b240c250c60d5be99e0a980332dbd3c518b2a81e1 WHIRLPOOL 1ff898dce54bd13a45a27ee6e395aa38adc88f1767321e5393148d76e443b539eddee65ccbc00ccf691ab51019a7f1ec6e19f1d7dc734b5982a29d47a432c1e2
 DIST zstd-1.2.0.tar.gz 1300584 SHA256 4a7e4593a3638276ca7f2a09dc4f38e674d8317bbea51626393ca73fc047cbfb SHA512 b21910c6bdcfad3199c07b9f70f7c049062ebd1cce9249dd33c36153e29f24dd9e796ddbc2f37846b9f508c14b0d0f67651fd8d2bdce558128f20bdfff50a7df WHIRLPOOL dc52eee5d075d952e870c1e12c73120a664337585f6d81456c98341f4bd3f5ecfccb51fbc22063e64cb4287e429d4e12c4395007d78df74a2f1787e01cc29007
 DIST zstd-1.3.0.tar.gz 1469911 SHA256 0fdba643b438b7cbce700dcc0e7b3e3da6d829088c63757a5984930e2f70b348 SHA512 5eb9e001e14d3342e76eb57b672c636fd56839ba8fc0ba9a751484ea93389c72c494ad2125dc2f9be1f72481f3af34568477123f7e9d3c7504e061e4c083cb30 WHIRLPOOL 61d20ecb675d95ef972b73e5cec144dde6f8a784423b136f4520f51ff8429aa3a59600a371b9b8eea7b2a1949d85508346f620c3cb1852162b27827ba99a7c73
+DIST zstd-1.3.2.tar.gz 1618939 SHA256 ac5054a3c64e6510bc1ae890d05e3d271cc33ceebc9d06ac9f08105766d2798a SHA512 e2848d08b38d2fe98cd327611044bdac2f948547124321c8d63d5bdc2e6694d623c40c7bcc7d499fa83531f9cb92ddcb8be67614a49f855a9103f0ee6af0985c WHIRLPOOL 138bfc242ffb14a1c0b59fa80eb0971df14056dfe69a6f13e3dd1b42ecdd5ad5b2b7c908f086aff0a965d0497b912588a4b15ebee179e44112b93bd406e015f0
 EBUILD zstd-1.1.0.ebuild 928 SHA256 2b56b5bdb902b1357e37489cce468b36c80c854ba0e0d1016ecba8b8f8f0427c SHA512 46c64fe1cbdbb0d4cc6233517253e7ea9d098b7ae355aa93fd972f9b10fb07fb7ad19b6dd7bb1bcba36c24c3be4fc3ed14d06f96ab547f428d60f5115bc0d971 WHIRLPOOL a48f61f75081c876009fc62e24e572693b66225432b4d26ff1edf71c9948fe69bf31162f626221d2b55f2cd8ed53ae8802b7b776bc5035c879e05918858397ac
 EBUILD zstd-1.1.3.ebuild 895 SHA256 b1817039ab1be2095ba28c88312041df9e881b139da9097cde5029117ac34d66 SHA512 aaae58ce1141b04f8c90daec424f5b2a52ef49b12a4073c4687ebb73013785e0fe39d617693c25c3e180dfafbf2c6c953f9029174f8749b9470cda028759c6a3 WHIRLPOOL f526e6b3bd85ec27c32fa6c499b7c4ad41e5f05f8da5eaf00198207d10e9a97de40f21d6eea5f89d47255084464b96044162f4484a0c2e4d6b1b2e21f50f5a93
 EBUILD zstd-1.2.0.ebuild 904 SHA256 bf8d6a21977ac1b1083602cf02719cbe2feba9b08a3f6200fc5fed9e2720814b SHA512 f74706f6936df707e5e6999f3c642e7f833a611faed7db59c0c7b85ea553ec886d52365160967f10e4b8be35bdf0afbb8193156d4b11a3f49deca53ce95796e0 WHIRLPOOL 2bc2b7ffaec806e2aab878a172b04070d06ab3d23c9242bd4bc54dec297f62da2d6554529864b499874d3d83b8a6e765dc81ce0ce8231b8633ccb8dca61b6ad6
 EBUILD zstd-1.3.0.ebuild 1239 SHA256 6ea8e8de8ae955ec563aadf78b1ca60c1d8463b64704d6b6858a37ac1be55602 SHA512 07c505650dfd7e475337e2d9b503256b0709f794f9822dbf1947c257493b4c6ea44e9eea1b2abd9b8fd3dad7a569102b823e08167686b8d80eb00222113768d5 WHIRLPOOL 88e235da82e810440fbd560589c1d391d401c06b15102394f73d989c108b09cb304ab369e851ee07f75f1ffb82980d173d5d417b0aed9a7c79af7ad5972f73e7
+EBUILD zstd-1.3.2.ebuild 1252 SHA256 0e38cecd5f0e33b6dda7497dce1519ef5a1fcf68eac401e1a8accf060f3f7b4e SHA512 c9752586de3b28863a9326100a9e1219fa39e552c41b5b4ad7ef4c4928067adeba4df456125e9e1ca763d07bdf4cc28cec31d75a66b3f81be0a8277269aa6be0 WHIRLPOOL 5e0b09ddb81f2a522a747d13a38b3fcafd1fbbc4581246d28785f1a5924d8f0f538cde96fdf0b27234635073a76141733c12abaf691d5c0b1c27a4791b044781
 MISC ChangeLog 1336 SHA256 0458cf9031095580000f282f751531d4401321a2e71d4ada520f934fa077f150 SHA512 405e90f9065dd8b727d40ccca61b387b046d2d3560bdc07ca56a94001414c7903d63da5540dc44fb460d2dfb8fcadea695bfe64a7354c5eb47a08c529f880b0d WHIRLPOOL a1b7181df2c485254c980cf2f08f38bd2e257b75d2e7e3b266f10ae28fdddcdcbc18222b353d50e19824c6ffa1c9a866044f5ddce6a6fe680d4f0db9c811cffb
 MISC metadata.xml 335 SHA256 f037a36869488c95518aa3577c4ab1c644df5b682bd569ce8fc95433397dcf85 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6 WHIRLPOOL 18f946ccabf43f944251cb5f73eae533221f4a19af5195bbdd11170cb82ea438d9a48ee3ca070c8bf9abc365e7bdcb038e0997261139be0deb062ee635e4e44d
diff --git a/app-arch/zstd/zstd-1.3.2.ebuild b/app-arch/zstd/zstd-1.3.2.ebuild
new file mode 100644
index 000000000000..32107dd78a97
--- /dev/null
+++ b/app-arch/zstd/zstd-1.3.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="app-arch/xz-utils"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
+
+	emake -C lib \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" libzstd
+
+	emake -C contrib/pzstd \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
+	emake -C contrib/pzstd \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+
+	einstalldocs
+
+	if ! use static-libs; then
+		rm "${ED%/}"/usr/$(get_libdir)/libzstd.a || die
+	fi
+}
diff --git a/app-backup/backupninja/Manifest b/app-backup/backupninja/Manifest
index 3d1c129919dc..450cca7ae3da 100644
--- a/app-backup/backupninja/Manifest
+++ b/app-backup/backupninja/Manifest
@@ -2,4 +2,4 @@ DIST backupninja-1.0.1.tar.gz 167991 SHA256 10fa5dbcd569a082b8164cd30276dd04a238
 EBUILD backupninja-1.0.1.ebuild 551 SHA256 9c5809d4b6e1cd24d7028eb303e5269d3171a0e1ddcca1735e2bad61ff532b1d SHA512 98be990b26dabd570740bda02d06bb5b63acd633014918b866e58ddf963f002b319858cf03e17aa0dc5ed2a4f386b889c274c7d32885f4f6e6bff6a058aa616b WHIRLPOOL fd7132af77105049f9a19d2ae70ba852d246cba3d35a987ed544959083da1fe432a7d3ad39b6d45c6c87e6b5b52465f11a442353ae95efa71fa3bacd661a4340
 MISC ChangeLog 2627 SHA256 342991db43144151934664849acc6cf35aefcffe0e982e64ebba8db91bf91381 SHA512 b88e2815b05b52a5ec67c587c0b88cc432aa8fdc4bd7933496b48874ef948fefe49a35ea1c85cbcff90a97e85cfe2e320eadc48fe188559ecb3cbae8c7af9a77 WHIRLPOOL d708c53483c82d4af53804ad4b0c2dcd7909c8b1d6970abaf1a624b2c3f03a1c9946770b5c9469de048426ebb0c96397539207ad2a038362d4169eab8e543430
 MISC ChangeLog-2015 1937 SHA256 df27b080818d3d7a130d76b191783f8548c5295dcc0b0b353b0f317d706bb84b SHA512 b987fb3ba30faba3083b61dd03c60b35dc145976f5c574bd981cb394919314210edcfbe1eabc5014299f6a8588f76e0f2b55754be0ea07905eebb09016fcdcdb WHIRLPOOL fbfb7b2744955acbb28d24e68c6a2483959fd85dedf556f28902c396729a62bfa02e8f045c3d1a6be47b222d3146f2280e7ba86d54bed0ebab870db464b4cd2a
-MISC metadata.xml 434 SHA256 9e16f305fac5380b5a71cbf7b303471e9752b68b294429ff1ffaa20e7cb6bbe4 SHA512 5f17f1115e5b5cf2b3d5240efe30f378707743203e034a8bb8de8ebe1697e011cbb669db744dd091cdcdb78730c89720be92d78a15a2dd171f7d5f4867fca347 WHIRLPOOL 9b62374ea281fe8aa24cb5bf59a08649b63db768506a77f7f1c6a2ef96ce9f3e45362da4b75dc996911895f73596f396e8febe6a12958f1fac89404f5271262c
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-backup/backupninja/metadata.xml b/app-backup/backupninja/metadata.xml
index c0284962eeb9..6f49eba8f496 100644
--- a/app-backup/backupninja/metadata.xml
+++ b/app-backup/backupninja/metadata.xml
@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>premek@vohnout.cz</email>
-	<name>Přemysl Vohnout</name>
-	<description>Proxied maintainer; set to assignee in all bugs</description>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-misc/vit/Manifest b/app-misc/vit/Manifest
index 3912a0753509..f5fbe4aa4db5 100644
--- a/app-misc/vit/Manifest
+++ b/app-misc/vit/Manifest
@@ -1,7 +1,7 @@
 AUX vit-allow-nonsudo-install.patch 978 SHA256 280add74e4c57264bcac1b48fa75f60093a2a8abcb98af43818a265125947b64 SHA512 11b50594481934dd33a5f59bf04c61c7a347e517f1f0408be8c7463731490bf49c0c823c4b9ac1b951ac1f7e66d531f2d0df74ee12c3d25f47a299a2b16da628 WHIRLPOOL 9cb3859752e9af3eb379492e9213f1955a9f17f315d3d92afbebbb9ada9673a9cf37396bd48819a5ea05f112964f087de6f97b47532e9fd0290b3b8093bac4f2
 AUX vit-fix-man-installs.patch 739 SHA256 4d70541ce26a70b07480d1f5055b8c5f04e6777d88b3048552abd20d6f0241b8 SHA512 9b1795690ba090bf0487b35da28f3563f5bae4a8133d85f469a9b0104a84588d8948b98a2935b83c9c321fcffcf5a44027500eb87a736de4b254374f142dc572 WHIRLPOOL 492203fbc0dde0fbf651f9538beba6baea18e52fad918e50e0b681f0aa76681ca63cb79a04e2a3b6dbbd0140b3785206a1d4ddafcb1ee9655b4bf501b8a3ac78
 DIST vit-1.2.tar.gz 49346 SHA256 2c3a146914c2d572884f2d9cc745d3422cea1db2d8a2e9a13a633449844df637 SHA512 dc0e09fbec7d77817b044f437e42108a9282e387698dfe23bfbe50a083b708d5d3b432ce9b1fdb93f3fef495af2a5f16107351557a4bb9184c7c762b264f0ed3 WHIRLPOOL 13fbd501e84eae4ea91805b10acf205e2f9d62caeb82e5e33cd6cd782383e62623d38ed90d836e8cb048c4887fece4f3ba7682fdce381df6882a7c3111af9880
-EBUILD vit-1.2-r1.ebuild 745 SHA256 aaf53432a63c4bee9afacdffa69fdc4b244dff2f480c3b8d73c3452dd1395859 SHA512 70dd9a9d5aa58a99a6f07671a5e80a8d73ced24971ce3e776c0a01b79efb3e52dac844844398a976c4fcc7bf47eea71c5f0b2016b680f4bfefc4de48100a6332 WHIRLPOOL fd80e60e4882e0ef6e0c248237e508196b287811318b555518f464f28f789e611fd810b27c17b1a620eada740f90cacee0ced3b83e5cb4eb9dcc0328de1af5a5
+EBUILD vit-1.2-r1.ebuild 822 SHA256 94078de4de321949183980c7ad650415b1bf8a4ffb60afa4f06b2a6062768bf2 SHA512 63fb6e2ebe073435260630f4be7b85e4afdb4d05e3546652487fb39ba9820af1a9c33b31b02d8a5432fad35b20a53c2bfd3bc09a387c370b1f14a9286899ff32 WHIRLPOOL 9654f0cb82f23799292ed9f0363d68ba02ddd270af3c0567b5aa9a2a198c9d190b2eaf8384c48f13c9a583b5585cdb91c298065b57cfa34fecc90d02eec4dcbc
 EBUILD vit-9999.ebuild 777 SHA256 318e2e8edec61a83669f0f5b6546260d8851445f4d5148ec80a6636e99cd8f9e SHA512 e8779d3179f4eea0344b238860c8019447d91d38fc4b0d2173a55c70e29027c3d0fef5cd246faaed173535531f465e5bd967d8bd78fcd83676f5174229926ae3 WHIRLPOOL 64535154a086e18d244358e281363fe2bd4f173d7ea3b9da9041b54d009c5fda9cf690faba787c87974506ea6bfbfb43a8d074ca6a6578eec49c4360366ecdf3
 MISC ChangeLog 928 SHA256 38cfa33ebc93c84399d7d9d16de71c96b402e2e058b5f3c4623c289ecbbea839 SHA512 fd2eec3adbd1940a4fda0d7a9e9cacffad4e4d691e965ad6d21a138cfe96706b395c8edf59df509ac4d21a13c69cfbb3b583e0a59f2fe05e75b08f6c18319f65 WHIRLPOOL 83a0ef86300e3989764f634314079660b4e6b26461d077e6e9e607e0d84cc5c608e6bde9d4d1942470c815dd13cb4de843dda8f60652aa15635fccf0226a78cc
 MISC metadata.xml 457 SHA256 fe965c39f7fc6aa0ddbe90a379d24656b8f0faaff01a02f60d718ca781ee2837 SHA512 fa9700903506961b1d8c62718b77a7219c811b99039d8f73d331dcd448f2df8fa638f152b956c9f41e2989007402860a1a036427d38d754a4385cebfa7a5b5c7 WHIRLPOOL eaa9f939a6784a996a33aa598b67cf5c5ec01c9c8f207bdf6c2bbc3f71196bc7ee4eb01e601f4a20a5b026d29b43f933028f41495abd57b320cb17ed47f26e24
diff --git a/app-misc/vit/vit-1.2-r1.ebuild b/app-misc/vit/vit-1.2-r1.ebuild
index ca5df43d3f3e..6ab360543842 100644
--- a/app-misc/vit/vit-1.2-r1.ebuild
+++ b/app-misc/vit/vit-1.2-r1.ebuild
@@ -20,6 +20,8 @@ DEPEND="
 	dev-perl/Curses"
 RDEPEND="${DEPEND}"
 
+RESTRICT="test" # missing the extra .makefile for extra targets (like test)
+
 S="${WORKDIR}/${PN}"
 
 src_prepare() {
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index a351156fffea..19555eb89c15 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,7 +1,9 @@
 DIST dos2unix-7.3.4.tar.gz 640991 SHA256 8ccda7bbc5a2f903dafd95900abb5bf5e77a769b572ef25150fde4056c5f30c5 SHA512 29958a2c702acc112b10f3fcb43fbff3b860c6d1f725c153af9a52dc20736755604f77bec37299dc88923a9e9b2ad73b994e9bc6f42f2757fe1819dd9873d710 WHIRLPOOL 46c771c63572d0d0301db5bde4734297df037654cbc71e5a8f93003fbf503399ec5026bc53fea3b3b10e346e2b59d24bdcd6d9139342354cdb1b8a6e240deaeb
 DIST dos2unix-7.3.5.tar.gz 662133 SHA256 a72caa2fb5cb739403315472fe522eda41aabab2a02ad6f5589639330af262e5 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58 WHIRLPOOL e1cda793c7e9a2b0f0000c61f5c4b9a48db37d41020af14e253b838768e81b0e94ea7a0666be712f79f89b05e5a6f72a1bf8516a01822f5da39062cc0bedf01f
+DIST dos2unix-7.4.0.tar.gz 710339 SHA256 bac765abdbd95cdd87a71989d4382c32cf3cbfeee2153f0086cb9cf18261048a SHA512 41be6b0c747f4a8e316eccecd468c8250aa6791962485569eb9496def60818ae434d619b5cfb5f80f15f8d17800314f5aefe229dc5d37faaa34e1270575175e9 WHIRLPOOL 89f093ff96aadbe64f5fb448d2be337464a0059cee3009cd513dbd0315b486c012efe53273467774dc9f884dfe5b1a4ee65903b94c2c5dd8c062ed3e41eed94a
 EBUILD dos2unix-7.3.4.ebuild 2026 SHA256 2740f83a639d0e3de27e615e429dbbd9bc61a6ba67addcea2ff5514f9d288e71 SHA512 5e251e9ff961e07e91fef0c462d32f4e3b0ad7b7cfbb38a35b11c9a784b79256a4a4073a55adc4e96ff67fc896f85f2d007662cef8cfb09061709a02ddb4d760 WHIRLPOOL 3a6302216ca7ffc009902dae8475991151f0dcb9f8a38b7b46deb2a05b54eb6fc0388021130f911a2af5c36006631bbbfa4ace248a5614319da0cf2b3c77c923
-EBUILD dos2unix-7.3.5.ebuild 2046 SHA256 c619db5f4357058ed36ddc65f95fc97996c4a5886863211c4dbc488d245a393c SHA512 27fc2bd3e3e43512d4ab571ca5ddfb4f6ba8e0940eb8bd65c9d90f0c602822334f5789f3a2101311006fb614708ca32396ae8c3d24b8b313aa9248c8cd76d350 WHIRLPOOL a56b643af417670b4eff43acbd543dd688e1f2dac13f46f673d54f45529900456191815a5fea34690ec73396b40adf1aed94e9e6104bf5754855ef9173fa7c67
+EBUILD dos2unix-7.3.5.ebuild 2044 SHA256 2144a701845e01d69b6fbb7c91161b2647297a1e6fe6468c1cb5712f6e15049e SHA512 023e040e54131654d87cd1c991576b243920e31524ad02bdd1c9cce9cb25dae8536fe6ab989ddd734f53dbc8b4ec785ad8cb778cb6cf4bb125e915046efdbc6e WHIRLPOOL c1b5d999e690af188f3236ef14e002ac50a7a275ebae335166bbd7d02479638382f272ef333e6e2aee914593e7c7ef56160c8d7a97b896b02dd40b0fa559c6da
+EBUILD dos2unix-7.4.0.ebuild 2046 SHA256 c619db5f4357058ed36ddc65f95fc97996c4a5886863211c4dbc488d245a393c SHA512 27fc2bd3e3e43512d4ab571ca5ddfb4f6ba8e0940eb8bd65c9d90f0c602822334f5789f3a2101311006fb614708ca32396ae8c3d24b8b313aa9248c8cd76d350 WHIRLPOOL a56b643af417670b4eff43acbd543dd688e1f2dac13f46f673d54f45529900456191815a5fea34690ec73396b40adf1aed94e9e6104bf5754855ef9173fa7c67
 MISC ChangeLog 7196 SHA256 4a2c232190d6729640540918b5be7b533c2edaaa445f850cc6a47b9c3a59f04a SHA512 66da70a04731f3bd299bc577885b31e3c278016b38b1f5228394a384f960c49a0c3e97154ec82ef1489c9a9fce195077254240e458f649037e6859b0c060fe50 WHIRLPOOL 48484b065ae3a96f6c15a454e701ce60cac060d2a1e1466afc29d18544ca2f9d2d5cddb60820b6d8f400c568d1a2386febc868662587b5ddf6c9996ec7adf5d3
 MISC ChangeLog-2015 19680 SHA256 99b0f5f0d9a2a0ae8117f683cd295d8a8c5b0cfc2208325fc96cdb7c6ad416db SHA512 6921c2763ca5d07eba46899fc0ba3869042972fc9d60e85c835eb50d08b56ebc6a176a64d1e808802b1afe5ea7b6c2ad74f773fc50e55fbd83ee224c317a003e WHIRLPOOL f9e49b2959b16982e507cd9b67e24d9d5fd535d1b61676f1621a012ec2c15541a5382ab54aedd635669c13be995ce008d77dc52e0110c168da42a6d407465cf5
 MISC metadata.xml 343 SHA256 accb2d04b009f465af9d869da452b1c3d87b42cf599aeb5dad3a9fee04d3d225 SHA512 12f79ed9fdd8df3c05110ea2a31123ca92a855cdf9287910802cb4e68c384764cc84c29929376426b23bfe9699574dbbdc2105d82c6e2701aa9fe67079d867f3 WHIRLPOOL da97fdf7c8ac3e5877f177dfc34336c261e7317551ded69c7e4cdc92569091ff2d6b6f491995c3cb57db3483a5136ac0a9bba8c2471025b31bb290e94062f1f1
diff --git a/app-text/dos2unix/dos2unix-7.3.5.ebuild b/app-text/dos2unix/dos2unix-7.3.5.ebuild
index 7e09f7d15bea..3ed4ddaa73ab 100644
--- a/app-text/dos2unix/dos2unix-7.3.5.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/dos2unix/dos2unix-7.4.0.ebuild b/app-text/dos2unix/dos2unix-7.4.0.ebuild
new file mode 100644
index 000000000000..7e09f7d15bea
--- /dev/null
+++ b/app-text/dos2unix/dos2unix-7.4.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="da de eo es fr hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
+
+inherit l10n toolchain-funcs
+
+DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
+HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
+SRC_URI="
+	http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
+	mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug nls test"
+
+RDEPEND="
+	!app-text/hd2u
+	virtual/libintl"
+
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+	test? ( virtual/perl-Test-Simple )
+	dev-lang/perl"
+
+handle_locales() {
+	# Make sure locale list is kept up-to-date.
+	local detected sorted
+	detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u))
+	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "PLOCALES: ${sorted}"
+		eerror "po*/*.po: ${detected}"
+		die "sync PLOCALES"
+	fi
+
+	# Deal with selective install of locales.
+	rm_loc() { rm po*/$1.po || die; }
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_prepare() {
+	default
+
+	handle_locales
+
+	sed \
+		-e '/^LDFLAGS/s|=|+=|' \
+		-e '/CFLAGS_OS \+=/d' \
+		-e '/LDFLAGS_EXTRA \+=/d' \
+		-e "/^CFLAGS/s|-O2|${CFLAGS}|" \
+		-i Makefile || die
+
+	if use debug ; then
+		sed -e "/^DEBUG/s:0:1:" \
+			-e "/EXTRA_CFLAGS +=/s:-g::" \
+			-i Makefile || die
+	fi
+
+	tc-export CC
+}
+
+lintl() {
+	# same logic as from virtual/libintl
+	use !elibc_glibc && use !elibc_uclibc && use !elibc_musl && echo "-lintl"
+}
+
+src_compile() {
+	emake prefix="${EPREFIX}/usr" \
+		$(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+		$(usex nls "" "ENABLE_NLS=") install
+}
diff --git a/app-text/jabref-bin/Manifest b/app-text/jabref-bin/Manifest
index 47c07c999f13..1d6f825b864e 100644
--- a/app-text/jabref-bin/Manifest
+++ b/app-text/jabref-bin/Manifest
@@ -23,7 +23,7 @@ EBUILD jabref-bin-3.7.ebuild 864 SHA256 0c8bb85eb692aab866229f838ba3d79a6f77b85a
 EBUILD jabref-bin-3.8.1.ebuild 951 SHA256 ef3e46804615b165fbc911ec3ca1cdd88adb97787f033e4ca246e55f038dff48 SHA512 6694b2a83bcb8830c754b5fe79284dd4936070b2ce0ae65426482fe869390d8534212b6824c39a3be1bc5755d7bc458959185e9ca483f7d2444ec0bd30b8dcdf WHIRLPOOL 439fce1e6bdc24602642679ad92b38bcc136144e1da9a34061c5d5fcaa923daf4c74eca58da1386c32e079625fcfad8e7e9777762acfa98865701bf76a5ca3dc
 EBUILD jabref-bin-3.8.2.ebuild 949 SHA256 7a6ab8c10f1cd6d06cb9f1a053d8b6abe69bae328641a53279c19da16bec4bc5 SHA512 a45a9fd77aaf59d172f2e12d49f720af8f5d6de9f53756941612d614ab1391767a79731a5fb0321d724330c483280df9883b76c64ca21635909434ca11e57ff7 WHIRLPOOL f91affa8bbf306f734b99a12abb136ef9663f68b37d1f3f29ee395b1f4bfb7dd2bf7215c006a388acbcaafa3b459b4aea719fd202cdd27064f4b759ff0cdec02
 EBUILD jabref-bin-3.8.ebuild 956 SHA256 430e2a4bc90f99001d78dd7eb21128455cac12ef5b71c688648016b1ce5ba272 SHA512 fc4c01169ba38ac8beaece6f2240791eec8c361b0a72bdca2fa26262115ef8d7e5c64b69d8398c21c7ee6d41597c837da6fb1aa3aedeff18f216228bab96de1e WHIRLPOOL 8e2aec29ea93e8385ba19f04742a2cab9017091207a1e10348c8128b3d8e619ea463119417759aa056771e6ca406dbe5237777e358afc0b8c8ffd78ed6731ef5
-EBUILD jabref-bin-4.0.ebuild 956 SHA256 c139358f7724efeab9bd90f6a79c796a142146fd9a7a379ed19973a086d588f0 SHA512 d80f47fabe97fcd54dab91e84d788549c7c40d1fbc3c410f886e719539e6ebbd997b47a96c1ca89f770844c147639a026d8f8b191ca65886facca8d08f221d76 WHIRLPOOL da96d23405a2958e295106b84f2e5a26cfdd06a0d90305f304b68e41182213303f6704f6efb28e06d927557a2eff8e604696586162b88f562db25ea8d19b92e6
+EBUILD jabref-bin-4.0.ebuild 965 SHA256 ab12b862e6f451ba4ca904591e72265652ff0d2b7c39d57e44373dde899de92b SHA512 d34674ce400cdd2b80291ffb60cf2409bba817d0a8e2e862ee1e1b405c2584841a09bc9b22581d3ded90a4298d8c37384bcbca326739163f9056739bc0ca1add WHIRLPOOL 0b29a5a926c54c98fff9309f128adeb8bb0b1ceba8eb334dd32af3d2e525eefecb6bd3784d9e9c5641dfb9638ead621ddbfffa9b7e41dae3ee1af2e46cfdad72
 MISC ChangeLog 6179 SHA256 2ded29d71e74422e71644639b0552a2ad2b16e5f865b917bfbcb3e39f6e4b56a SHA512 0e72d7494e5cc56699ec4dc63b3ee40c4c2aa4fd0351828b99fe1b3003e0e8326c92313154863918c38f48b02b9abfab12cb659cadacdb0bd86b380501ede9f5 WHIRLPOOL 2ab3b0307abc8e378644dfedf72c5314b9a46ef05b30460459acff798c50903dc402ae62f1307298ded3fc2d54d858014a36183cb4af5466b6a241312af000b4
 MISC ChangeLog-2015 1106 SHA256 ee587b34ef9ffa585089c57bbd8dfb4c51b50dffb590d4982a1a126ec04cfb5d SHA512 2855bd32273bdc948e20052168b52da82376a47c077a49fd6f7733e747660f690019b6b74a191c4eb5f7d77997ef66a38f8b38ee2095024c23cb5498f4c2b412 WHIRLPOOL f16c439fce25a059db2d30f4e88b70b224b5cb0faef0b35b161a54dd07dd4ce95e3b0576c54cf0258e7af85e24da791b553d8243c9bbc6924679a8e003ee7d78
 MISC metadata.xml 911 SHA256 3e1c02120f04c3bb62cf5d1f6e668ffe60db3317f683b8df3e03dd78b798985d SHA512 7a3e7ab167709c28857aed83ffd4e3ec5b202b9d444b4fc7a07c33d2415316e4aa8f22b80cc2bd281a1625e02503bbb5b517c01efe6a70558b2b9815b3b7f2b3 WHIRLPOOL fdd0992350101881fb1a82cf50d2e5ef616eb0c4f9ceeeaf623e55d66b97d5ad4499650dda10b4337e9bc8f705d730b5a2ae9e921f43820453f4dddaa56b9d8a
diff --git a/app-text/jabref-bin/jabref-bin-4.0.ebuild b/app-text/jabref-bin/jabref-bin-4.0.ebuild
index 5f6f30990ea9..8327029bd246 100644
--- a/app-text/jabref-bin/jabref-bin-4.0.ebuild
+++ b/app-text/jabref-bin/jabref-bin-4.0.ebuild
@@ -12,7 +12,6 @@ MY_URI_PV="${MY_URI_PV_1//_/%20}"
 
 DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
 HOMEPAGE="http://www.jabref.org/"
-# SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
 SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar"
 
 LICENSE="MIT"
@@ -21,7 +20,12 @@ KEYWORDS="~amd64 ~x86"
 
 DEPEND="app-arch/unzip"
 
-RDEPEND=">=virtual/jre-1.8"
+RDEPEND="
+	|| (
+		dev-java/oracle-jre-bin:1.8[javafx]
+		dev-java/oracle-jdk-bin:1.8[javafx]
+	)
+"
 
 S="${WORKDIR}"
 
diff --git a/app-vim/vim-spell-cs/Manifest b/app-vim/vim-spell-cs/Manifest
index 3270cef59be6..529eea257922 100644
--- a/app-vim/vim-spell-cs/Manifest
+++ b/app-vim/vim-spell-cs/Manifest
@@ -1,4 +1,5 @@
 DIST vim-spell-cs-20061021.tar.bz2 1320356 SHA256 f15748bfc46761c4d8d2056740553a3aeebb449a5071dbf79434a2afcae977f2 SHA512 cb9cae6dab11c5cbbe16e0902b18cdbea81dbd7844eda4774f45c6e5a5f3eebb09e062a37845a0e6ff5bc5c0abf7219001824768c0e058998a7c922790006e99 WHIRLPOOL daef13d6398718e9483c58742a1c9f29097d52d152cb87cf63a756f2d5db7e07f68e06b7f90c08aa0b06006e93ae9103a5aeecb3244a1bbff8ffce4f3cd4cb6a
+EBUILD vim-spell-cs-20061021-r1.ebuild 261 SHA256 8aeac64aa638085818f24b176b33df07e93e4b1265ca6760da61e039532642a5 SHA512 c4704b1ba527bab0334dc092d95cb67b16c566626dc4b73de8e2f250de16ab9b7ebc68b7261e156cb758b620af96d2f1ad36cebf8c8144b4746aff8994195032 WHIRLPOOL 0fa05230201d7c9ec0fc8781c071c8c73fe946cc818b5d9fc98b704b8544fd9967c92c2e5e34d286643e36c9d208f71dd0882dc96ee4d306bd24c3f64833c28d
 EBUILD vim-spell-cs-20061021.ebuild 206 SHA256 1c17972929a83ed502426791cb8276737cb74fee14589aa16b0f622880221bb3 SHA512 71312071d9a1bce0e9ef5c00f2bedb1e28991f5462715f08a00ae84a1e96506101ddb69b0db786bd8ef61b3a27cd59fbcacc8d260990c83fe895bb5a5e6cbefb WHIRLPOOL 7dd72a471000e673f90aae075b285265a5aa0ceff15a6c5bad219cffe6fa5dfe437a556a7a72a2a1acda03f9aa2f1e440428442fe01f273e5a7f2ebebc84c9c3
 MISC ChangeLog 2840 SHA256 ddcf7758384ecefdf0d8455399f0eafa264a76e67844b34052c400821220a743 SHA512 c4540339c2fe435b6d19a2f01454ba2baa170c58b14db162cc711e0e5bfcea0b3718ab0d6b360f524276d4357b205d744577bde5c70ab2e72d72bd855704a30b WHIRLPOOL 13d6dd7ba0189057e722fa53f8068a3788fd4576a601d9f5af827c4171fe6f4ed2a9d6704513f780b142df358e07563dc13eb751f265664eec7eabbbf2424d68
 MISC ChangeLog-2015 1156 SHA256 ac1b08cee8cf7091fecc4fb03bcbb313a01358561662618ecfd910fd4a40c62e SHA512 415e6dc4b07eecfccde05f8b1c2b67cef7dd4283dc6122cb76808823170c4c7d51a3527312b11e176e1e60130828a6fb73bac09232fde533c11894f40df466bb WHIRLPOOL b1f861448def5ad7e27438014896cb45f3d9fd202069e458acf854392a0c4fc9b620eaca764c5dd190cb3ea958b539a2f94819e92f436a21d37a6b1aa4e2b750
diff --git a/app-vim/vim-spell-cs/vim-spell-cs-20061021-r1.ebuild b/app-vim/vim-spell-cs/vim-spell-cs-20061021-r1.ebuild
new file mode 100644
index 000000000000..44c376464e95
--- /dev/null
+++ b/app-vim/vim-spell-cs/vim-spell-cs-20061021-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="Czech"
+
+inherit vim-spell
+
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+KEYWORDS="~amd64 ~sparc ~x86"
+LICENSE="GPL-2"
diff --git a/app-vim/vim-spell-de/Manifest b/app-vim/vim-spell-de/Manifest
index 4ee064ec6ebc..cc997ef6787e 100644
--- a/app-vim/vim-spell-de/Manifest
+++ b/app-vim/vim-spell-de/Manifest
@@ -1,8 +1,5 @@
-DIST vim-spell-de-20051008.tar.bz2 2156892 SHA256 d54c6dd12a4ffc5374c4957c7510cc48416a0f27dcfcbb97dc2e130b7284fd65 SHA512 015620f87a44709fc73b69465eddf8fb5658f9962370c33eda51a7546f3b8ccafa84b756217f230759b2b1c3b15c0500581c34ad6115d232c5b0353fe08a023c WHIRLPOOL 0bd599686cb3ac26fcc08f3c041b419f38a69a6a5c8975eda8ff01f341ad6b5577f8fc83703132ffb9ce5d722d8779eee217088aa7ed5139aafca1807f0fff58
 DIST vim-spell-de-20080213.tar.bz2 11171578 SHA256 33ba51cb41f2c5d6f6366efb2219e00d9214f7b487f8d0d2ecb7e21699fe8d48 SHA512 6b18d527a61573f865dc51bad1c8f4aca17453c2605c390e330a52f041f1392c438190dcc6168803bf415b4e9e470055a52013ee16ea32c7a8c42b2843fb3698 WHIRLPOOL e550cb191c1bbfe5042ad1cc949d599cbe4a7874bdf7e10f5ceb1a3b50e2a273fad494727ec175a6465d90413f03769298c5ecab8ab4281fc5613d0c9815d9b9
-EBUILD vim-spell-de-20051008.ebuild 246 SHA256 c59a9edacdbe518a6ea1941878a767f7cea5517357910c7e161688a5dc0e8756 SHA512 060e635c9935faf3c5b106ae231e771564f6d69c3710374066536efdb6b848fdaa5f45330aee31ad82eb5a8d1f0eb9e07a8085f424f040d086afaf13d3376ded WHIRLPOOL 19730aa8c379e3c1f773960ad10ba89cd9b971d9b08e6ffaa0766d261801f5e6493a43caf44f89c87a9e1a825461f1f7cfe6cab9dfee41a3072b41b987e1d6be
-EBUILD vim-spell-de-20080213-r1.ebuild 265 SHA256 a368f8bac3bd29bf7796a4c93e088b8980d7db674ed6b1f0d54808948f4bb434 SHA512 cca3ddc0ed01f158aa04e56f8e95f2e999d4ffbe4058d1f3c72a5c728c1b2f15736e4e9933eb1e8e0d22c9e22b68dd8cc201929ef3c7038af1664307d540f77a WHIRLPOOL e58de24f7ce9f1474aa872cc49fa4a4b25a1268de3bb0f1154fcc9aa524a0ebcff648a3b24079622eebe25ea409a8b2c2d44ba84847c4255cc32d9f1bff07d00
-EBUILD vim-spell-de-20080213.ebuild 261 SHA256 f00dbd2f9ea063326bb1ded3c26df1f9af2d939c2830232d04fa802e4a554280 SHA512 e85dd1281e7ee6f946e659472219b080eae65c2d0ef8d8726cb0968fa3a19efd1f75c60529d80522f890ad0dfc244c4947b1797b46fb497173e67e6f1e578d61 WHIRLPOOL aa0ea4684e8c30526dccdb64fc25dc6454b980c50fa102c634c19119c0934f82e871460166acfc8240d162b57236efc1569f9686f24c30957aff8839efd11ddf
+EBUILD vim-spell-de-20080213-r1.ebuild 314 SHA256 c2ebd812197c1117f5933c268b515991a184e5bb75d904162c5520061f8ad7cb SHA512 8661aaa8fe25f8d3d3676b6c4eb590cca61cc9af462e16f9f00d6dd3a864cdd3a296f5704bf1e964ff1f1c83a0ffdf0cbb09be65113658a844bcbf3c072f2897 WHIRLPOOL fe528fbb7582785602a302943572011800cf23b80720b5d0b80a9a8839e934e7e567941d98fc5426059da179b1195e1c42a153a8b1746fb11e8ddfaeb62933f4
 MISC ChangeLog 2515 SHA256 074a3be50512e091991555f5e72f16d0f0bd365720fd335b48e542a2f3a137a3 SHA512 063c703d6cd642c005825b5d3af63f5d0281a552aa894f283609a11048c7dc2973992977b81fdf0a88d7fef0cfec7caa92ab30dd78f81985b127da318d403497 WHIRLPOOL edffedd842791f7b85805be65e0e16f71238ab9aad18dd7037246b48476fedeb9b66939a82e435e0fbfab4203d809af70a94b639c1c5c3535786e781e23cd71e
 MISC ChangeLog-2015 1904 SHA256 1290f8e40b0e332c02e3c9d7c0c5bc9f41839470066685616d3c34bdee863fb7 SHA512 f8991589f06399e506f115ba24886a505a9c6b4c4b3bc6def721894ae5a9f879d9812f0f9d4f491523919a2fbc04bde872b5fc9068bad98bd446134ca25891c4 WHIRLPOOL cac9f91d34e4f03c5761fb358088e606beefefbafc11d2ce24e0c0b2c664a9cf32ff7eac77e02d7cf08263be7843136ac26f224fc40c18fc3051d220bfaedaed
 MISC metadata.xml 383 SHA256 f5fe66ebe176d517127ec18c74f8f3b8f855dc3bf4cd0d4f65c12209787cb126 SHA512 ada270f71eeddd0c7395561b48093bf12933507593334d74e33999432cb2c4665d3f7008779141dab56f4d33e8e6bd08805a125d9643a0cc493025c8fea6784f WHIRLPOOL edd1bbd9bf5609431638ba35925de26ea5b93bce53f58cffab66951857486bc1a02181fdc8f77ec03928ad1e057a6300968760bf7c769aa46d4f1f31e8644792
diff --git a/app-vim/vim-spell-de/vim-spell-de-20080213-r1.ebuild b/app-vim/vim-spell-de/vim-spell-de-20080213-r1.ebuild
index 94e0a48b5dcd..bb19502e99b0 100644
--- a/app-vim/vim-spell-de/vim-spell-de-20080213-r1.ebuild
+++ b/app-vim/vim-spell-de/vim-spell-de-20080213-r1.ebuild
@@ -1,5 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=6
 
 VIM_SPELL_LANGUAGE="German"
@@ -7,4 +8,5 @@ VIM_SPELL_LANGUAGE="German"
 inherit vim-spell
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~arm ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ppc sparc x86 ~arm ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/app-vim/vim-spell-en/Manifest b/app-vim/vim-spell-en/Manifest
index c1ec7c041a97..7dc46811734e 100644
--- a/app-vim/vim-spell-en/Manifest
+++ b/app-vim/vim-spell-en/Manifest
@@ -1,4 +1,5 @@
 DIST vim-spell-en-20060123.tar.bz2 1819791 SHA256 e9e8b8714a940226de8936914a6e77296b277658d5f0fdb7e9e8d42e08fe8365 SHA512 145a4cbf976b5472b2474f9d84978e9907f0dabdee05fa55b0b4ce5f56dc27ef568e8c28fe67d9d8b86a33e0392b1fc6af6f44d6f147ce894070b58e40109dc0 WHIRLPOOL 2ac5d667befe3079618239ec8291e1a58c7b5f174239bd5db5f61ee39b155db64653f58d6d4dfe75856923d4d35d274774a726994ff2fae7b7f39b98b446c8d0
+EBUILD vim-spell-en-20060123-r1.ebuild 347 SHA256 ab5d1a0bddd4a0e9d177fd7ecaa87c6107c0049b7122fa53a4fecd8095a03d6b SHA512 8d05a699227a1301fb25eb31ba0362b4c147c73e0f4d646dc5b02923638fa9bbe154ad7c27d8f66ea56b22d24ccc4e112fb3ffc8c62a130f13e5f511e2d93b69 WHIRLPOOL 403183349696b2057401405f0feaa83960b689e866f6e74ac79d15cd7d552c2963142d11fc333740c8f2043795b689b8c462558c4caf003614f9961466d89cfb
 EBUILD vim-spell-en-20060123.ebuild 291 SHA256 b6f2010ce30584ebe4e2f81218d7bf96baa8665aaf1a1be7fa20d32f3b32c0b2 SHA512 5ff59b0d1c4674d677d1e5eab96afb43788835fac6962090cbb1334fa55bad2d617a272ee39ffca3fdd0b05a1965403bc4f9bc73b8c13aa4adc9015a49686f38 WHIRLPOOL 37153e3e37e7a2375d78ccce2498a660e50da524f35c08210c845bc3a653b1548143cb3f21282899ff27c92ff22ad319950742444a08c326bc2b4a66a76ac6ba
 MISC ChangeLog 2840 SHA256 723a3b06e07602f05e88f8cb9d6f43be38c756349ce08ba073fbc6a66389ddfd SHA512 853df8dee30fdfb0b33c28cce2e9976cf8444c0255d79c63ba7ad3b627c8d80f0e2b266904c6c06029638e1d62f00005cf4f1a2faa7cd4569402ad2bc225ebb0 WHIRLPOOL c29047d7580f2afee5797417c3a87b16da4262be3182e8e8d1246885816a3b0e0ed9114ed4a7f295a396a35be6b494226f23abb036456f37dadd2d5ffe921c4d
 MISC ChangeLog-2015 2132 SHA256 238c5cc5dc023e6120f3c5e9bd259ddf3968603032bf53f40a8cf7e829dadeb1 SHA512 b4e7a7c5c0c505aab9501873021ee635b97f2b1e37941f3998e766bb2773aaaa5cecc65a8fd45bd9a2fdf81e208e59a3d320e792c762d8221adf8898084d2f0b WHIRLPOOL ed09110ea824f5782f5a0bd7f3994b0f86275cfb1a39874521168bb31e61105c8d07c1d391c603959a20a281b1b368118c7c9e0bf7bda7c9a7568a66f06c6aa6
diff --git a/app-vim/vim-spell-en/vim-spell-en-20060123-r1.ebuild b/app-vim/vim-spell-en/vim-spell-en-20060123-r1.ebuild
new file mode 100644
index 000000000000..6b62b9a86d99
--- /dev/null
+++ b/app-vim/vim-spell-en/vim-spell-en-20060123-r1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_SPELL_LANGUAGE="English"
+
+inherit vim-spell
+
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+LICENSE="BSD LGPL-2.1 public-domain"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 2cb840f3f043..275ab9c6c080 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -14,9 +14,11 @@ DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 b5373951afe41ffd27348bb57cff
 DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 fca79afb210cfbc8f9ebcdebdd048ecb7ea370ac0f94040cbcc0287fe5d85e66 SHA512 25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b WHIRLPOOL 1016a02b4a30b7e02eb2f7fad3080153012dd3e3f84df34d006c89bc2c89b7b3d370334800170008482d3dbf339c62f249064eb48ab24ca17588026ba515d487
 DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04 WHIRLPOOL c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
 DIST apache-tomcat-8.0.46-src.tar.gz 4985079 SHA256 b5b9e560b3f75dd68b3103915c754ac47cf526f26f18cd6e9baba9580be25161 SHA512 9adbea9faf61f782ede1c657e833dea55ad1b4a874a1eb9801eab82ac9999de847e7f08ff7a49b3389b9d0683d185c6d4981f9f8d2f607f68c077a682af508d5 WHIRLPOOL eafb2768555261836b04f12f95ba2755d2a7ef98754a5a009099e377220dff1251c6ad1cbe672764787c485b3f922bf1fda8db663890db36e356e7a5139b83e9
+DIST apache-tomcat-8.0.47-src.tar.gz 4996505 SHA256 a2e34a707f1d2ab03aae194db2aed7aa525e62ee3cd648e7058bee49ac1b578c SHA512 135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702 WHIRLPOOL 7add2b564ca9dfac647cd8338ef90229dd61e97d2ad7420f883c98b62760952904ad170f72029153da592a6f2c8c003d7229b4b32a1e870b6e7c2c99d34566c8
 DIST apache-tomcat-8.5.11-src.tar.gz 4996153 SHA256 81fb94243600d950375c4622f76b39c06c5615b7a8a6f70d387ea249bed1dddf SHA512 d1a9513535773805c26825f8843fa502e044c9f1ccc22176db5418a7a0abb6d1bcff3db401b449a5867065359abbc8277d14085d807fe00c95dd267d9091620d WHIRLPOOL 41ff9daec144c2481d3bb7a49bcd071eb2d21b34c11356a9911a139b404779971c31282f73b7b336b7e02d16156749e8e816dca8d5c727ef871ff0216577398d
 DIST apache-tomcat-8.5.20-src.tar.gz 5063310 SHA256 6bc40ae61b77906325bf8bdb2b0767aeb96f4c5a7a9b618aa496db59387d6610 SHA512 dea3095792de76a3a56bd6fd6c9ed5702ca539856d0e07a5de2600f456e7255929d14748a2dc9b3c626b3a67aaac8795ef3f5a6a1351991a0e89443e0c9d0807 WHIRLPOOL 1924f12c5068574424587d5b8b7261efb7496dbc53915d8cb2558b4a643aedecc98823ac7dec238fe7cb1a1874734e05de2dc6b7b28e48ffdae9e8c5c586e895
-DIST apache-tomcat-9.0.0.M26-src.tar.gz 5011957 SHA256 02ba2c9a3a2d78994fc14f2b304c3b3f46615538a48a9193e475b08565cb9b7e SHA512 8c25932aa244edb46eee26aa837636e78c8104ca6617cb5ba924e0e45c2f9dbcd7d196ddf69ee2f1c1b6053dda818a3b92f8f46c156f3048c46cee919fc22c13 WHIRLPOOL 11e00a6e6a5822bd4e357e375b026dd732bf33319e30dde25f11bc1b99994617be3ce6d4976870f725e56646e5ffee92acb6fc23f46b53a46ebbf6c53707ea07
+DIST apache-tomcat-8.5.23-src.tar.gz 5086043 SHA256 eaaf35752841356dec976fa6250cd71680b8b5b9c0bdf4df9a86ac38630bcbd4 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef WHIRLPOOL 77b35de4ede2beecab71dcd7c5494bded1516deac4b5c2cbd2f48e1ae728cfa41f4193369bd464946869e9ba4565c0e6f1c7ad57578459d3be67159ea8cd9a64
+DIST apache-tomcat-9.0.1-src.tar.gz 5029499 SHA256 f4da8ef7a03dd7280a9a4b6c66cc9bd34dddc6429c33d9db1a8acfc1596c4e90 SHA512 6116b05f448c24e691c4b56372a41cfd8900adc5e759f2f5026c808de48d65705763236fca46f69321d351f37f5dbc7aa49db8c097b8a3155e367fe21aa0d384 WHIRLPOOL 2e0f05001b9f0d57a241db8ddf0212d3adce2c1b829a03318b5cc1b5a250ae32a50d801e23d9b6a2943c208a478dd00d1f5ae07d1c3c736fbf059554a40caf66
 DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1
 EBUILD tomcat-servlet-api-3.ebuild 851 SHA256 e4073dfbab92d608c8621117fa90ff8ce74b3c6a1529c12d95232f30d532b3e9 SHA512 bfd11aea2c322478caf3b70ea098c9f3fe060e094fd52a81e0bf89e47db33374ae6a13205c065da5e21571269ab678f65f1f0eb0385704a54a955a38f243cef0 WHIRLPOOL 830ae5df52116458235a6b7e0cbac3a632dd17fb8a43ad99b24b3d10cf6d63f59fcc48176babf1ba842c5b86af7e2586ba700d930ed7991922b724a29984962f
 EBUILD tomcat-servlet-api-4.1.36.ebuild 984 SHA256 739cb31d4539f3d96ada8f904caa6de8c0086c7e047d7213009fae00573515de SHA512 7c0ea4dac09a7d916213bc78c5b3824f0b34703810d8d6ab27fe43b2310b352dcd74a1178e607d1ef3f24af424354b6d1955013b67bd6419de4d0501e1825e63 WHIRLPOOL 7066628b3cb3240ae9fe7f423d2bca5acea810b6875cd32a38db437e36a936bcec2c6ae9f8af34ef7aa9162d77ef1d4299caff22696f0a978ff581ba98593e35
@@ -28,10 +30,12 @@ EBUILD tomcat-servlet-api-6.0.53.ebuild 966 SHA256 dba97329db1d2296bb9981ecf4e1a
 EBUILD tomcat-servlet-api-7.0.79.ebuild 927 SHA256 5edfb1a431cb6185ba619738d19cd1290e599a69a16015eaf1ec124620079f93 SHA512 96113b7743840fed2384b5e66e5e827d8d1c964270013109477d0da876aabe77bbd8d1951402f05a3aeeb394ef32103a093f5176129fab0d5ab348cf39bc584f WHIRLPOOL 73743a06471fa91c719dcde9330cfc5549701b54d591f0f8a1393aa21259d526ee0d115efaeca503f36aa1b201991fe6f627b3ce0fd7eaa31f504805529c6c3b
 EBUILD tomcat-servlet-api-7.0.81.ebuild 928 SHA256 9b7d9abc5e90e0b87055bb87791b9d4905b90ccf5923093bde16ded77899a7ff SHA512 5212f6321c60b15ed8582ed55acf7ff4b8bd691d1dcbff847059afa20db7cd26894a3b0d0eeafa6cda6b4ccda9297900330e4182b38ff1f5a2236176b1b72b90 WHIRLPOOL 8efc93913bf6d8349d446f27dfd6c756d7d46ef507c7fef603c5c80948e13baada545bc4768242cde8885938b4ee723c2a3fedaab9078af46008208f97583572
 EBUILD tomcat-servlet-api-8.0.45.ebuild 984 SHA256 2229d012d8c674186822e3c000fbccb613dd384bba0cc21b352f3bc13b4ed125 SHA512 b637bca8b28b3f540ee616da3f514d4b391cd0845b7875d3c0ab4d737e398cc8fc6c96f94bacc505af2eb9a5ab26a20da1e4b19b9a63be51d2f2dd6aa6392736 WHIRLPOOL d578941e6f15a4c09b42f8a198ca1dce941ca3e64714e62b0e3e7fcb15ac1a2db39c2ed9fad7d534293486e7c82171fddac52d1d0dcee187f942c715315d0e94
-EBUILD tomcat-servlet-api-8.0.46.ebuild 987 SHA256 42d99f04dc3abd88003d9bb9b98009ed99d0c43c3ea0ded318e7983d611eaf33 SHA512 099a8a34aa8b90ddc7e005b3d5c65658ec3f112f68144d1ed9dd8085de62ac77472f238edfc7588a43a4f9cd598ff5c491f27cbb54192b3ad5322d6679adb945 WHIRLPOOL 0d635f1f9e3e391af6206f67ca69a6bf69b0fc6e2c126f056f6b862eaa964aba9cf9e63b33b08123a45d8bff4c067396f79a88fda542799b1b20c1828dd55e67
+EBUILD tomcat-servlet-api-8.0.46.ebuild 986 SHA256 4b7dfff5eb9a6c3e2c9cffe1b719354483636836cbff40c3eb28ba591ebe28d9 SHA512 0d6034c322f7c5b09c093312b6316148a74261cc8889a6cb6040dad41134e451dbb2b42820c62a73a19645bd652e9f3cf8071235b10c7499fb3053acb464592e WHIRLPOOL f1e653bbca5a73dfb121bbf29a6ad032f06f868bf146db664a5045e6f90a6a2445c26192e66cf61e2fa22c0f20f809d8e7adc2e5333f2ee0b0ff7a77cfdd8471
+EBUILD tomcat-servlet-api-8.0.47.ebuild 987 SHA256 42d99f04dc3abd88003d9bb9b98009ed99d0c43c3ea0ded318e7983d611eaf33 SHA512 099a8a34aa8b90ddc7e005b3d5c65658ec3f112f68144d1ed9dd8085de62ac77472f238edfc7588a43a4f9cd598ff5c491f27cbb54192b3ad5322d6679adb945 WHIRLPOOL 0d635f1f9e3e391af6206f67ca69a6bf69b0fc6e2c126f056f6b862eaa964aba9cf9e63b33b08123a45d8bff4c067396f79a88fda542799b1b20c1828dd55e67
 EBUILD tomcat-servlet-api-8.5.11.ebuild 1026 SHA256 82596ca542bcb30282b47144458afbcd4027da26161b6182ff0bae3715e14542 SHA512 2832c7f1e4e310ba6e220f7f69529d257e77b655a82dc1cf44e1580032773d31edffdef902c99b139bd8b52b913d7aa1578af2860d5d1967332a5f6a86dff48b WHIRLPOOL 8578559ce5171e0e9b5181fab5f96f643c19ca444ac3ab1765cb0127d9ea9503668ff2d1ab606bc5095ac172b47be7ad9322a16215109bdeccf13cf81de92e0c
 EBUILD tomcat-servlet-api-8.5.20.ebuild 1033 SHA256 02888bd97fa3c2cedee2f77bbe2e63ab5bc8d426192b0b1c8ce0594a064128ae SHA512 ed93f5f5d38e9b94ad4cb2458208d73d643c768926ac346c9cb80308c3f78b7566aa0db1b039aefb17fdbb122f15b677dd5e926c63d57acd2ad4ee7f2e86c3b0 WHIRLPOOL 40e40ea0be0cc8b281efaab7a351fb04e80f9785eabbd223e567f8aa8b47c189add1891dba7c39ae22274e9df3d75596816f8bb1edb7a4e3c31e324705ba87e3
-EBUILD tomcat-servlet-api-9.0.0_alpha26.ebuild 1059 SHA256 bea2dd3172f0cdceed928f18751272b92f9883a978406587e934236e82ee8176 SHA512 e878ae24ff99c94f1f160a61b849b0ff91558810207579323ba5aa645459177c359820d7db6f3af14255f4d7d025b131d120f4e396547a73cd5510c43473303a WHIRLPOOL c38b5ce0b70c681cf1ec936684f6c226d004cdf76110bd100918cefa0b4eed793d1f66311b4de44bccc4438ac575cf59d152ed6addbad432b1a3fef8915e58b5
+EBUILD tomcat-servlet-api-8.5.23.ebuild 1035 SHA256 39306aea73523dc31c82b76d1054a18abb170fbc311db5f7bc82b139431d86fd SHA512 355eee48ce5c0c5b0db44a7d4d0199ed4b11b2f59ea9b2395164673432245511df316e84402289ab7d93df223a3e1ba434ff2edc4aa1085b9a4e92a42950fc7b WHIRLPOOL 9481c7bb3a2a4b5adfcf4f6d9aef2ecb38412bd5d1d074f988c0e40eb93c3bb97ac032f5d28e913158b1582481ded87be3fe45f91ff5094cd23d79db4c68ecfb
+EBUILD tomcat-servlet-api-9.0.1_beta.ebuild 1056 SHA256 5602b6fded7a7a28759417cc3047c838a80e95f6b6083d28ab4652da266b8b9a SHA512 c805996dea68bb3226da5dfa71caa6a787e7ff9815812501c7db8e5baf4fa222e779662e5fd132d339c41e5f40924b02bc265abc29fdbf81f16ad06903c7d933 WHIRLPOOL db7009e4488b83ee2b8e626974f0dba35a74a66311b33cbb7b5d1d48876614e539fb52eed5873ba0074d865c4db4ce640325d9668202ca3b252460980204df8a
 MISC ChangeLog 17432 SHA256 8b6288a8095ed64e177d6cb9f5373e9a3e65a54e1e25cde51d2bd3b6e8b3b17e SHA512 140569db363b9b6310904a01902a7ae4c27fbb95c8dfda7d0afea9d9e87734c1bd05498936d01966e320608baef77f3c08efbbd3fdf262135b67543c4d2b808c WHIRLPOOL bd28e9fbe25c5f1e85503be1446349b2429cc44cd7a31a6fb3055ffea894a124f56d01258f73b2a120e9675c530c85da0ddce5e14fbb3a94c54e87f3101d6a35
 MISC ChangeLog-2015 30850 SHA256 18cfe0d4d26a564a69b143cfaf08d42730974d66f957b9567449450c41e0a548 SHA512 e434b831101df030125fdaf248eed561c6fde8f99b39cf3ceef4e792c6f63686f6e4b525175f6cc489a2539fac287e87efccb62511afc722eafa341d4de9b764 WHIRLPOOL 33db2f588bf6e4266be779c3d8f63ddb351fada11efcbc7d19197c3491ba8bec65dd75034f95b19519fe2c2c1c6e0dfcedde7a148fc53a7920b953d08a18c972
 MISC metadata.xml 343 SHA256 62c7a4ea1333a9631a516e6cd02f524ede7f3d7ad467feeca0777ed556d8a298 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3 WHIRLPOOL b923a685ccba79b4ef25d2e64341112df472bbc31c281179947929d3075f652d3490f0a2fdf3963e2ad83b73b19d808574e9e7b7816b0a3e8b7694534dfe66a1
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.46.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.46.ebuild
index 4dfe83e0e403..c987d5ccd920 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.46.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.46.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.1"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=virtual/jdk-1.7"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.47.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.47.ebuild
new file mode 100644
index 000000000000..4dfe83e0e403
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.0.47.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+java_prepare() {
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild
new file mode 100644
index 000000000000..4fcff024f711
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.23.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_A="apache-${P}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.7"
+RDEPEND=">=virtual/jre-1.7"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.1_beta.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.1_beta.ebuild
new file mode 100644
index 000000000000..58ce612254a0
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.1_beta.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+JAVA_PKG_IUSE="source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_PV="${PV/_beta/}"
+MY_A="apache-${PN}-${MY_PV}-src"
+MY_P="${MY_A/-servlet-api/}"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}/${MY_P}/"
+
+src_prepare() {
+	default
+
+	cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
+	rm -fR */*/build.xml
+	einfo "Removing bundled jars and classes"
+	find "${S}" '(' -name '*.class' -o -name '*.jar' ')' -exec rm -frv {} +
+
+	java-pkg-2_src_prepare
+}
+
+src_install() {
+	java-pkg_dojar "${S}"/output/build/lib/*.jar
+	use source && java-pkg_dosrc java/javax/servlet/
+}
diff --git a/dev-lang/elixir/Manifest b/dev-lang/elixir/Manifest
index a97e3f04a03c..937ed35530d0 100644
--- a/dev-lang/elixir/Manifest
+++ b/dev-lang/elixir/Manifest
@@ -3,11 +3,13 @@ DIST elixir-1.4.4.tar.gz 1828694 SHA256 2d9d5faee079949f780c8f6a1ccba015d64ecf85
 DIST elixir-1.4.5.tar.gz 1829098 SHA256 bef1a0ea7a36539eed4b104ec26a82e46940959345ed66509ec6cc3d987bada0 SHA512 3fe659a739ded54bfc7d05a96acf3061c860e44cfd7700651d138c7e21997c5703cc62d2bd3b7a258b27064bb222dfdcdc01e4d017451f522f9658a039073611 WHIRLPOOL c9e59b2de0756aecab11c480e60278ba8d87ae1bec74e8db47b5780a0c417858596c00c7f790a2bfa4c15f4d53e76918660e976b23a320a512a6b2f6652b295f
 DIST elixir-1.5.0.tar.gz 1944255 SHA256 0857550097d0bf078a218f7663372f5c9a899847d73399f05ca9fa9087edf462 SHA512 8323eacf14cae4c01566b2958642f16b80b3a83a97bc870b0fb464c5880c5d04f05fb5cdd3470d6c3cdc3890d17ca67d17face9d6ef23c3e7d608cb743e67c49 WHIRLPOOL 5ea9cab89f08354bb29acdfd71e8a606194be48ebaa852b7d35b99adbe69bd47da53d78e9ab6d70dd41e175c49a7d80c612187b732dd23f6bb92334bfe60307f
 DIST elixir-1.5.1.tar.gz 1945765 SHA256 9a903dc71800c6ce8f4f4b84a1e4849e3433e68243958fd6413a144857b61f6a SHA512 92895e5a688b5a906656c0fe974ca28a25b35c7ea9cdb3739290cf8f6ce5e4bdc61ca96309e8d87d6d73607f8f5eb22ce4385da10954582136a02f4b15b3cbc1 WHIRLPOOL d7d587033cf32ee8ea7167cbad7c3482cc843a7ea3a7b353eb144f8162d24569a327a24d49b0196e913e2d276993f7a5d794e6d520f363d7a1684d07447b8949
+DIST elixir-1.5.2.tar.gz 1947836 SHA256 7317b7a9d3b5bef2b5cd56de738f2b37fd4111e24efbe71a3e39bea1b702ff6c SHA512 ca8bdd8d97d68a49f9db1cffbb2ff028363ff7679c88aad543208688909f915c55f5a69293c423747f34be6171b38e0180f3654581ab38014c4988a3972cd024 WHIRLPOOL 08d2334580acde45faadd71b5aced712102ba7b39fcd9ead6a42d263acb6353ca7cb6017299bab6be1d9859c27295ffecb58b2fe737fcadf58929cdd7c1f9b82
 EBUILD elixir-1.3.0-r1.ebuild 610 SHA256 12b8b8269d46ca4c34bf0c06d88c7ae7211e5ecb8899b6f032fc4b59acd4c9ca SHA512 17c8068a7ac20a001171041fff35ebfe2b2b3491df2cae76d770247dc9dff2ca43b7008dbacca4736105f032cfae1f138ccc2f71e40a18f034ba16bd835d769e WHIRLPOOL b11836d8779664053604a897945d5f25b1698b0158e7e765c313decd74fcd198658eafdce991cf2b264bd46a7dda9ffc88bbab0a66e43fd438d64cc49b61a231
 EBUILD elixir-1.4.4.ebuild 613 SHA256 e0fec370d457726cb84996bce79309d9ce822a8c3066ca63a03f6ddf20653ad5 SHA512 2b1c5a2238279be2ddf24cb2c9b74be9bb075c2d1da6bbb1ca7ac2c8c996057b89ea92611856c0e68fcead4310d1eb67ae04b4cbac53a68fed90fe11ab02bf76 WHIRLPOOL 6e5e105edeff6d712a5abc2f595ac52abb6c917dac26dd5224e53064c5a16bede43c70f4f572925740d6812cda2e3295a7f83da25e9f55a0a9e9ec1fbbdcbab8
 EBUILD elixir-1.4.5.ebuild 610 SHA256 2619980708dbbe918407e6d6790ea20e3ada2dfef16e1b8eda9c135c14f42d76 SHA512 a05d132efcde374b0772b17a92cd13ffb78ab4a8d72c4b33c9cee3ab1312df0d1c7621627042895594ab563f75161f55f0382a348867254be4b3706440f77c17 WHIRLPOOL 6445235a95c70c39b7aee383a900c832d61e9505950fd7ced1507081664aeb61aeeb703b0ba59797cec53e68ecceaacad55ea46117396f07015c542ebcca06d1
 EBUILD elixir-1.5.0.ebuild 674 SHA256 4b0dac8b48415518ea3868c13b2d3cb91c1be381f3d6e0b199ce0b18d9de09ea SHA512 626d46ea82a7062e754923847bed2512ac86cfd0cc50fc825c3a4b307055fe027b172353bd319965a397621c960d297c806bb7cd99dcd45a874e54cbd0eb37a9 WHIRLPOOL 436f1f7c95966ba0158f48c3a2d434f653b7b20a96cdee11e0d8620ecb6ea6ce728027ddc75ace62c6bb171f3e1fc23db879bdb7f81ca4799951cd6089720e08
 EBUILD elixir-1.5.1.ebuild 650 SHA256 d38f343e9ec1082c72d5fc6f18a4f2e96e3f635e1f5ba4cd178dc0053a3208be SHA512 56ce6f6ac4e9ead557327f04e60bc18508135855e81e4cb3ea7144653ea9b8027680f5d4ac396dd93f7a905f905e58ff4c51d9640c7860420bfc2a1d7c129138 WHIRLPOOL 0762eeca1121201447aa5a92a65b6c3c03ae90c9b50c1dd307fa4b8131b8bd80bcfefae5bb00beba721fd559b59d8a80543696e8de0863c0e85c3c8ba6b4f843
+EBUILD elixir-1.5.2.ebuild 650 SHA256 d38f343e9ec1082c72d5fc6f18a4f2e96e3f635e1f5ba4cd178dc0053a3208be SHA512 56ce6f6ac4e9ead557327f04e60bc18508135855e81e4cb3ea7144653ea9b8027680f5d4ac396dd93f7a905f905e58ff4c51d9640c7860420bfc2a1d7c129138 WHIRLPOOL 0762eeca1121201447aa5a92a65b6c3c03ae90c9b50c1dd307fa4b8131b8bd80bcfefae5bb00beba721fd559b59d8a80543696e8de0863c0e85c3c8ba6b4f843
 MISC ChangeLog 7068 SHA256 84686d1641a91c9f08c67873bcbe3967237228c9862f7fdf851d4f8bdfe7463a SHA512 0aed5572bbf0dca73f6a4c9eccace406429f861611d910f90d38c74072b98904b03a9b3a932a59aee215e456d828b1d0fd5439c2169dc8b4e8143852a97221ed WHIRLPOOL 03e5d51e94800827417e13c6635fc58cb7bdddcf3f2228d565ed9ed728d66826d64092d890bb5ae89f002a60d301f96f55feda26b07ba4c345f4c9e551327458
 MISC ChangeLog-2015 3828 SHA256 005405612cc57d68afa6a0c08197634df436fb599ade0cfec4dec0a3b5db52e3 SHA512 87d65a936e1a371328eb03d104864156638bbdd0ca1d911849e1e31506a37c3723ae07d07ab59680a311f1350ddf4f243c81a4d87ab3cb358ae013da3b71dcba WHIRLPOOL 91a56e0fd7437cbd3ad187238572b651de6618c16c59efa4194affcc46bc6fd6270814eff5336cfe60f13c41cd36d5084ede20fe6eeede413b50963bbb4d5f75
 MISC metadata.xml 790 SHA256 1d0ffd3dabb38d0533d55274495d49522155b0fcf03d07a24f79167ec744aa1a SHA512 e96737086e81fac63d37ec20b0f932b538f7548984e8378c2b1746c173afc84644f35215b75ab39ac24338fe9dacda94614c5f50291b483d38133bb1cf46e970 WHIRLPOOL 23b2252514f8ec6c59e3de570e7bfd61787fa1a7910e52c0dcd396bfdc2c1439dd800df881057d0f6b56a20c1ce239ffa2261405161f51db03987a1debf24e54
diff --git a/dev-lang/elixir/elixir-1.5.2.ebuild b/dev-lang/elixir/elixir-1.5.2.ebuild
new file mode 100644
index 000000000000..a08ea4e9f6a9
--- /dev/null
+++ b/dev-lang/elixir/elixir-1.5.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib
+
+DESCRIPTION="Elixir programming language"
+HOMEPAGE="https://elixir-lang.org"
+SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 ErlPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND=">=dev-lang/erlang-18[ssl]"
+RDEPEND="${DEPEND}"
+
+RESTRICT=test # needs debug symbols
+
+src_compile() {
+	emake Q=""
+}
+
+src_install() {
+	emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="/usr" install
+	dodoc README.md CHANGELOG.md CODE_OF_CONDUCT.md
+}
diff --git a/dev-lang/swi-prolog/Manifest b/dev-lang/swi-prolog/Manifest
index e1ac8f3028b6..19fb9538575f 100644
--- a/dev-lang/swi-prolog/Manifest
+++ b/dev-lang/swi-prolog/Manifest
@@ -12,6 +12,7 @@ DIST swipl-7.5.14.tar.gz 16743212 SHA256 2e83e96a0eace037da3f75fc44e9c8f4e3b2cf8
 DIST swipl-7.5.15.tar.gz 16757246 SHA256 aca07ce9c564e608586e7ae7b9a56c82ca5dd919cde1a1edf1121efa16bda568 SHA512 07344914726a5a1d3e9d6542c06be7c0937cbe3ac59b64025e068e513c99c66be991af9da0d4200364edec24c143295740c232621173039bffda2fbf379fbf33 WHIRLPOOL 5b0cc1b9cfb1f362d4145759a6f575c9bd606a717e33bd02c741321ce7303855bb472ea12ce058b02de0b96a3300807774c8697033403cf183dc9d67c6f95c88
 DIST swipl-7.6.0-rc1.tar.gz 16750608 SHA256 83f1e0038fc8c19bc90974a404bc4d696fa61976a1ce8b34a7aec672d21b88df SHA512 1cf61e4c8d92ed734e006a69f1ea025932cdd5b9d4efc3e9e1336347440dddc4ec9e4cabdf53892576f74c81ffdbc94dcfec605b7f7e42d6b2fd815e6f63a398 WHIRLPOOL 432812cfe1a921729c97e25ddf9e4112177df80bd77eda3aff81f47df7eddbeae658c221bcfa5c979f3d603e110b9928feecb6d16748e9703e3c2a4b4f5d7e4c
 DIST swipl-7.6.0-rc2.tar.gz 16752769 SHA256 df3677b24866fffad103cd252b5dbd00cf63a9daec7862a21f204aa048641644 SHA512 149f9a7106e19d848e53514fac5f553afc540b7eca7d4936ff9ebd79c616327d561081b10b8b7cb2075b9bedf691d0bd4ad843b209548715b1e928d14a73cc78 WHIRLPOOL 10ce442b72b6d20e7e6644d227f2343ae15c853fa213dbb99a1b7ab3378375eed8a7a4f7ccdaf412e02f8b2e291e475214ec7c601c255f19389a2aa0cbbeb2e8
+DIST swipl-7.6.0.tar.gz 16763479 SHA256 591c76bdeff29ded4d1dbb009fcba1c51067a5f6f3a69fada7e4327fcef4b0ff SHA512 4c9a857bcb612361e8248a39616e07fe36d8b68e1099e00917320a0177b454bc13f89f32fee1d961a1facd46bef3814f717dbaf12ab4f00ca8ea313242feb8bf WHIRLPOOL 512e64aba8f22027720762f0751b8de13f701a95abef0df66f2ce5279d769a08317b00524b6a7de60a1225edcfdd80c6d78a6ee55716d8615e4396fc115a5e12
 DIST swipl-7.7.0.tar.gz 16761831 SHA256 a1f603302fee12bfc390272ca76381401f5483c3a5521d391265404af58fdfcb SHA512 196e0c17cfaa9368a0032372cfc64e4b96f55048a4457c9ca28b1180b9277fba7811c2a72f410502f12544ca21751013b73002bf7c84cfb79ed0f909a871a24e WHIRLPOOL d2665b75a2bcb147b207bfc3b6c66be1344a7411420d8e016ae1e6e89f27f70325ef6b4804107a76f6d1714a961d5b689655037b0cb596efb8028fd85cc86a3e
 DIST swipl-7.7.1.tar.gz 16762129 SHA256 fda2c8b6b606ff199ea8a6f019008aa8272b7c349cb9312ccd5944153509503a SHA512 d95cc460c5eecf3d122c5e558266fd9203a0e8fe389ea1c83f08783e819bae04fe5e55f727ac6fffe89242dae7dc059fdabe09f1093915ba0e5675ee0e278de5 WHIRLPOOL 812eb2c5098f737b99cd063f156b11fed0151e59b949403620b498e2aa477dc08aa2fdd4da7669f2c7998cfbaabbfb0edb85f43aaeee32ae0b347880d577c4d2
 EBUILD swi-prolog-6.6.6.ebuild 2799 SHA256 f594618139b822a56033b10654c553dfeeae3d7dfba7eac055860f67417d6d02 SHA512 1d30fcb84653a0cdf7cf4f5a78898d5fb29f939095d19a21324a9587ee6ca98543ae16d564ff8880cdf99c6d5a091c2f0e5dc79074ceadc5a7cd3fe340609d22 WHIRLPOOL 4b867a595ab6e519a4d8229e6471d0ee0e9e2bac1f9cc7c6ee6687f739d88ae0b22b2d319caccf83d74e33df3968a979b3e4fca2284069df4f5fcdef57e764b0
@@ -21,6 +22,7 @@ EBUILD swi-prolog-7.4.2.ebuild 3396 SHA256 63dc0f4b5ceda321e41f101dd2f08ce65bde2
 EBUILD swi-prolog-7.5.13.ebuild 3336 SHA256 5a2788d78cfacd7b2f3a62c6a46cd661c51321195ebecc8e93b832224edc0b6e SHA512 03a82c309398b0daf4eb41f11118ad7c3352f419c5d630c6de211ad8e25a466a4b0cd77523de068af09df6482d76a76efc5c08e4c469f56125c3ce1bc201f5f8 WHIRLPOOL e065d9725a18f226d9d3c9d38c20d5926f281f849907c880113f0de3595f9a7fb913feec5770a1a8eb013676f69d2f5abb06073b8da5c75efff59f0ce1fa3d5c
 EBUILD swi-prolog-7.5.14.ebuild 3391 SHA256 f6d63116c907b1e9a785a71c3cbfcef23a120274bacb7e1c70304a3131e7d748 SHA512 0ff31376662be4aa72867e0f419ff3b9953eecc80912171fd0f5b415d467dadb996e1d12e8aa27224c1cf1eace75e18592c1ba57f1077400b4e1323f1f8e4b43 WHIRLPOOL 205ea479ff8faf0ac95a7c497a729bb5930c47f3b534b639365cd752fdc5f2d060e505b4b4f4ad63c7fd726769757acc11b4db3f96293541afa1ded34de6c3f8
 EBUILD swi-prolog-7.5.15.ebuild 3452 SHA256 726e440384a02302a2165e55c90123c8cf2863a39ddd8b72295fbf839a051983 SHA512 da0c9dee16a6bddd98bb8850086fa1562988398be3ca6698d249bdb85e6cebd1d491a1270f9cd1b16212ec36d0811e2cf0cbbb49ebbcc62840eb0cf2bbaf3bf6 WHIRLPOOL e45ba31f8fa7cd617af92bb3c4568d12ad28557fc10ec24a201ffb6292ca149d9f2b7bd896ed56f8dfe8371e85109e8f158648778e29904650d90aa34313ba02
+EBUILD swi-prolog-7.6.0.ebuild 3392 SHA256 83f9c8bde6101e89cb6dc8616adf499e304f79a076d36f738fc9e546eeabaac3 SHA512 486bc74f0e77862452cf7bc63687cb1ba1395b9d10a2bb50dcb6334ad986d09153595a325703dc9413a2b22675aa838c66c94b5fe4ca582e1418701a31da002a WHIRLPOOL 3ae770453543c4c1bbea407802344e01a44aae3d8bed21f665a2ac97ad147fbfcdce820ba0271d47ee2e1eb7c56e2cff385ede87abb684ac7c2b1183f370b618
 EBUILD swi-prolog-7.6.0_rc1.ebuild 3415 SHA256 bc63195c2d675210ec4a000603d0e62f66efaf311b11203f234a3fdb10e62827 SHA512 f2a8da35ab1a7b502b302b32a28be06f5ba13df635bf4e0198588bf3f567ef6d3c46ee8a0946f25718a0a4fe7e29ca219e984024be051ae5f3524e05d36cd4dd WHIRLPOOL 8b9c4f072fe69072c3329c84cc2bfb99eca4acdbe33498ab6d74b1c853d01efeb16808c266d00cd22a93e7198b7818a2bf862e9d0f154ed6b0747598f64191b6
 EBUILD swi-prolog-7.6.0_rc2.ebuild 3415 SHA256 bc63195c2d675210ec4a000603d0e62f66efaf311b11203f234a3fdb10e62827 SHA512 f2a8da35ab1a7b502b302b32a28be06f5ba13df635bf4e0198588bf3f567ef6d3c46ee8a0946f25718a0a4fe7e29ca219e984024be051ae5f3524e05d36cd4dd WHIRLPOOL 8b9c4f072fe69072c3329c84cc2bfb99eca4acdbe33498ab6d74b1c853d01efeb16808c266d00cd22a93e7198b7818a2bf862e9d0f154ed6b0747598f64191b6
 EBUILD swi-prolog-7.7.0.ebuild 3391 SHA256 867b36258068e852e79df64ca2ddece56f18148598c9d581f501d2c925990937 SHA512 43ae2aa636d09515efb8e25455b4ece4f3b5657a9d4deb651579843791014c04785c5279293f7fa04df39ba87d1e7b4eda786f4e455389cfed111c984a13dbc9 WHIRLPOOL d53639daca037ac83e9810f6a8731c9a87ece5f5e287fc8c290b094b4ae3aa1afc22b01508f4df8cadd2cf6da1cf965486508678e7dd570e710a47ed00447d0f
diff --git a/dev-lang/swi-prolog/swi-prolog-7.6.0.ebuild b/dev-lang/swi-prolog/swi-prolog-7.6.0.ebuild
new file mode 100644
index 000000000000..ac17db45d196
--- /dev/null
+++ b/dev-lang/swi-prolog/swi-prolog-7.6.0.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic java-pkg-opt-2 multilib
+
+PATCHSET_VER="0"
+
+DESCRIPTION="free, small, and standard compliant Prolog compiler"
+HOMEPAGE="http://www.swi-prolog.org/"
+SRC_URI="http://www.swi-prolog.org/download/stable/src/swipl-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X"
+
+RDEPEND="sys-libs/ncurses:=
+	archive? ( app-arch/libarchive )
+	berkdb? ( >=sys-libs/db-4:= )
+	zlib? ( sys-libs/zlib )
+	odbc? ( dev-db/unixODBC )
+	pcre? ( dev-libs/libpcre )
+	readline? ( sys-libs/readline:= )
+	libedit? ( dev-libs/libedit )
+	gmp? ( dev-libs/gmp:0 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)
+	java? ( >=virtual/jdk-1.7:= )
+	uuid? ( dev-libs/ossp-uuid )
+	X? (
+		virtual/jpeg:0
+		x11-libs/libX11
+		x11-libs/libXft
+		x11-libs/libXpm
+		x11-libs/libXt
+		x11-libs/libICE
+		x11-libs/libSM )"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xproto )
+	java? ( test? ( =dev-java/junit-3.8* ) )"
+
+S="${WORKDIR}/swipl-${PV}"
+
+src_prepare() {
+	EPATCH_FORCE=yes
+	EPATCH_SUFFIX=patch
+	if [[ -d "${WORKDIR}"/${PV} ]] ; then
+		epatch "${WORKDIR}"/${PV}
+	fi
+
+	if ! use uuid; then
+		mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
+	fi
+
+	# OSX/Intel ld doesn't like an archive without table of contents
+	sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+	use ppc && append-flags -mno-altivec
+	use hardened && append-flags -fno-unit-at-a-time
+	use debug && append-flags -DO_DEBUG
+
+	# ARCH is used in the configure script to figure out host and target
+	# specific stuff
+	export ARCH=${CHOST}
+
+	export CC_FOR_BUILD=$(tc-getBUILD_CC)
+
+	cd "${S}"/src || die
+	econf \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_enable gmp) \
+		$(use_enable static-libs static) \
+		--enable-shared \
+		--enable-custom-flags COFLAGS="${CFLAGS}"
+
+	if ! use minimal ; then
+		local jpltestconf
+		if use java && use test ; then
+			jpltestconf="--with-junit=$(java-config --classpath junit)"
+		fi
+
+		cd "${S}/packages" || die
+		econf \
+			--libdir="${EPREFIX}"/usr/$(get_libdir) \
+			$(use_with archive) \
+			$(use_with berkdb bdb ) \
+			$(use_with java jpl) \
+			${jpltestconf} \
+			$(use_with libedit) \
+			$(use_with pcre) \
+			$(use_with odbc) \
+			$(use_with readline) \
+			$(use_with ssl) \
+			$(use_with X xpce) \
+			$(use_with zlib) \
+			COFLAGS='"${CFLAGS}"'
+	fi
+}
+
+src_compile() {
+	cd "${S}"/src || die
+	emake
+
+	if ! use minimal ; then
+		cd "${S}/packages" || die
+		emake
+		./report-failed || die "Cannot report failed packages"
+	fi
+}
+
+src_test() {
+	cd "${S}/src" || die
+	emake check
+
+	if ! use minimal ; then
+		unset DISPLAY
+		cd "${S}/packages" || die
+		emake \
+			USE_PUBLIC_NETWORK_TESTS=false \
+			USE_ODBC_TESTS=false \
+			check
+		./report-failed || die
+	fi
+}
+
+src_install() {
+	emake -C src DESTDIR="${D}" install
+
+	if ! use minimal ; then
+		emake -C packages DESTDIR="${D}" install
+		if use doc ; then
+			emake -C packages DESTDIR="${D}" html-install
+		fi
+		./packages/report-failed || die "Cannot report failed packages"
+	fi
+
+	dodoc ReleaseNotes/relnotes-5.10 INSTALL README.md VERSION
+}
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index d1c995bb9ea9..23a33c8c0ab5 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,8 +1,10 @@
 AUX libfilezilla-0.9.2-cppunit-pkgconfig.patch 15391 SHA256 a28835dab9df59b4dd0ab611379a38f07a853529b11889961bb795592f1aedaf SHA512 99e8c3ee7784a730d975279521e6e1a5d5dcd63ec0e30181dbfa8b23d080243a77d3a04e5aee124435030380df26df92509a61ff1cce48a5c9c64e00b48c900e WHIRLPOOL 1b73dac7deae6fd9d6cf4bd895f8e66efb486cb4060eb8616f22eae6ebed242407d41519ce8bd401c2e18fb187eba0310d84cb60fb87820c97a0cba1c3d76c9e
 DIST libfilezilla-0.10.0.tar.bz2 394078 SHA256 bd10176c44f421a20c92c66d85a7a277dcc0d1c4b57cf20b7b6ba24cb4493382 SHA512 b21efe77e7555fbed29ff798a19c922d12446295467af38683009770d6db753518fb5b2d8f14a77803e2559bc4038e5794c1750544527351f9526170ff591800 WHIRLPOOL b47187271509ec7b72ff84cdd2baf48498b9296086e947414cbc7bf79644259c90cd67c3a5e19cec41d638101e800568b741afc018d4fa14d2085059eaf48d3a
+DIST libfilezilla-0.11.0.tar.bz2 395727 SHA256 cc7467241c8905de98773b414ce445d6f9ff3bf3105f2d16cecab76404879ed0 SHA512 aa5356a8fbb9488072c9d32c7ab2de51de426a97cb30ec8b07c9e55bca351f82d8c4879f413aae05d5a2602bb153c0832f6bd7a71b8510a4957bafe9926d1d19 WHIRLPOOL d6b139249d27012b67c7256217d42be97157b33021f7efcb2d2151419613e9a09d90837c4758f2d69ff5c4804a07fa67307249d2f2b24fc3c4cd7a2f1a8d477c
 DIST libfilezilla-0.9.1.tar.bz2 383315 SHA256 18b2391771f330cccab2c55a66197b9098f236e616f26f86326795b900913b1a SHA512 bbcd826675e9c3e2f8cf1cea4da01434a66359ae816efdc5c981fbfebde0b73ce44a6d37546196fc00cb118d9b4d7772b73e30f8d5a78294f97b9899e9ba3393 WHIRLPOOL cbe3c1b30cd4dad6d6806c01921fe4bd15a8797f7dcf92737b34d04e3d35954a584d9155ea8385beecf52b176ac41b114814047f1b570791ff2a4314fa787a58
 DIST libfilezilla-0.9.2.tar.bz2 383522 SHA256 c162e8a23555b3bbc707cf240b0b4122ea2975d6d8b10744325b968f656b3be3 SHA512 f825d116e252786801115189f9966ba7ab8663863d921cce530569a172ab33dbc31234d6286b0b3e6edc19ec0a5ba009788382ec5d5359f97a9cb10f30715f88 WHIRLPOOL 16adf902b1a27766f86221e08e3599f84e64da30893ca3f67d3e467ef74c00eaa9db6abaef360a8a4ba4c47ebbfb92239344335a0fedd4cb9263b2542fde8147
 EBUILD libfilezilla-0.10.0.ebuild 923 SHA256 6363cef9813b4e1347dc8e4cc346929d5aed88ecbb468d325a9570eeff53bdd0 SHA512 a0528f93114da82ee995455260f0e443658ed17e9a0d2771c254869503f9d83e568dd18bd0aa110b991fe32859632ba245e36ec6b9274eb9d22742399ff949e9 WHIRLPOOL ac127414f8c50e4def90e5f39e573630c2617b8d77db503a96a5e6410eee40902360be7bfcdc7d24377539333575a806b9dcab929099f6f2410a6a6451436e48
+EBUILD libfilezilla-0.11.0.ebuild 923 SHA256 6363cef9813b4e1347dc8e4cc346929d5aed88ecbb468d325a9570eeff53bdd0 SHA512 a0528f93114da82ee995455260f0e443658ed17e9a0d2771c254869503f9d83e568dd18bd0aa110b991fe32859632ba245e36ec6b9274eb9d22742399ff949e9 WHIRLPOOL ac127414f8c50e4def90e5f39e573630c2617b8d77db503a96a5e6410eee40902360be7bfcdc7d24377539333575a806b9dcab929099f6f2410a6a6451436e48
 EBUILD libfilezilla-0.9.1.ebuild 921 SHA256 4348060c70292f11bbce101160d6f9f842366ef5cc69480f97fed52006291d36 SHA512 73c7ba2f0180dc26580e0e0d9226b1a8dfa70818720e8bbb78c53fada8ec68e690278859416694aefd7fe69178b401485e4da48591da96b4f848cc34b18b6bd8 WHIRLPOOL 472d6006d2d4213468bcb2493a46dcf6250a98faad0e7d59ac5ba54b0719ade8af5fb00092dfcb51594d06f3f861b739c49c7726b8b9d4248562239d12cfaa4b
 EBUILD libfilezilla-0.9.2.ebuild 1065 SHA256 c0f4563392c08c4ac5e5f6a453a4b71a4e742f9d6ac23ef90077e37eb07cf9c8 SHA512 880341a0f71b1bb08b48c9f7e6fe78dbdf8197e62faf9f82cafabf561e675b01f4f084d409eb815ee509c99c4da2ca88acbf92638c88a53dd23cf3456e3e4572 WHIRLPOOL e6c5676f97052f1d6f757cd8205dee15205ee953a7e05a8a3f628e96413b504a102333e449e092f5b8b102351365ab455e04c6ef2fedbcbdb4beb01c15bd8451
 MISC ChangeLog 5031 SHA256 4db313bb58df81aa2efedde521df37c2bdf97e8f4a08a82e4cc3bcb34321b1ee SHA512 e2918667f6dc3aed64a67c12326fd2bf68dc8ca4ae04646a5d0cf33ae729e979e0557e0d80ce236623ca6fd7357f470ae1a7b340ea54d23c4ca46edb4c5bbf06 WHIRLPOOL a3f943549ff05ba3c5cbcfc2a6e8c7b88dc6765dd7145b3ea8390615170d2f84b9b396aacda3ba0fd9da5837653bbb750ee2de5ff2e612cf0ffc9f85c0360b0e
diff --git a/dev-libs/libfilezilla/libfilezilla-0.11.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.11.0.ebuild
new file mode 100644
index 000000000000..31545f46bee8
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.11.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="mirror://sourceforge/filezilla/${P}.tar.bz2
+	http://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="test"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index 5bff8e7e24c4..32b4e232f1d4 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -69,7 +69,7 @@ EBUILD sbcl-1.3.18.ebuild 8075 SHA256 6f35890ba2eab375cdb70e626c985c635eb14d98e4
 EBUILD sbcl-1.3.19.ebuild 8164 SHA256 11a6409b81ca7935f045a5fc5a6639efd9771ac9bc172aefd051e3b4f7180f77 SHA512 c878588b4c15951c327981937b960a4649c1a719cdf4bdba4a4d125894963b5524323019fe4f58b9a4b923736ef41866e1a5b237909666c5aa823b0076229ce2 WHIRLPOOL bd87c481219a9ed4f7414784fcb94d2696a0af5a5e22c15752a6c8f7c7f1fffae0d3d8f99e87c2fb2005807a784b6790a0f26f9fbb3dc9d57a50bcb5f45dd0cd
 EBUILD sbcl-1.3.20.ebuild 8321 SHA256 a0b535cf23b959107df5bbaae02838fb098f34d54b1656906bba52ad7d61be17 SHA512 73405b1915e42e0aad14a8e4ed02df24a1230ee7be80c8fcfd99a8b43836a29c46ea68ba98c5ae793516aa685be115a263a5ac9eb79e738bd44c1d8a8f008fb6 WHIRLPOOL 27571a3f0a451257742e685ea67c3086d59b167b5b14d303e652fba589e3e68a2286f98a39f34dae313a04a3dbe45524f477989c3ba05003df0d36afde0a02ad
 EBUILD sbcl-1.3.21.ebuild 8320 SHA256 3118f5623bfb25fd40fff296029466a89ab6ccda8a67ce7b64b7d9c7a9e66bbc SHA512 b4f2a7c14f85a171dc3484e5743945493e9aab7fdfe848822ace3e0bd91e9c63840520af11a63a6c5371a055eb0430abdb76f338c30acbd2def16d9b323f0465 WHIRLPOOL 56430264a472acef6b2db13abd8bc323c0d241efc3093bb4f0a36a315e33b9f1af5edcf9fbb758ca801b977075c4776ab2c6e9c89498ef4aa051009c67ab23aa
-EBUILD sbcl-1.4.0.ebuild 8464 SHA256 ab68d98bf91b238678b1acf6165477f08e4a1089cfcb19b7c0c2a18e3d77fcb9 SHA512 c2cc70c76972d32852bfc6060d3241671e95619f043ba8c2f294747b884be9b42e9b73e18dc0d5c4a8e2d9d577cebe9e500c0638e83a565722b6beb11396e4ac WHIRLPOOL 4a6fb75ad6d0d3ba06bd05fb427b94d4e794f45a202c467b5482d0cbe3f430cbbdea6245b8ee84f344c171f7b272ea0b29e93cf7bbecb58b69eda9b37250bef5
+EBUILD sbcl-1.4.0.ebuild 8670 SHA256 6c97aef48183fe91250292379df5d72b5597568e69f7a321d510a67cd6fa366a SHA512 789f5102bc7f4e00ef4ba2baf5602ee08aaa1cfc9748d1b91d932c8a59aefe74f50599c22c1ee888d320a01a1168027786037b087d193b0b9994591e3dae48de WHIRLPOOL ff78edae2d2c2d811077f9fc81e68ef898ef26fca7dab155b0ca0006615d86566fcc94e86809e004d92a3c5020c7b986665576098a89919455d6fa4ef6823a67
 MISC ChangeLog 11602 SHA256 9af6af5a1bef12d483d7b86578e1db51636668715de7366070298478f11c52ff SHA512 b79217e2bc0f007863cdeaea277e0315eefec413eeba2a5b740e1b5760f6e10803009e005a5da5a97d7a754e456833454a7d36baa8442293f2ef4fb8a741ebc4 WHIRLPOOL 326dbf8f3d7cdad839af37e90b11a1aa5be1ceb58f2ff87024423c8cc67f64e2e980412ce644de04d17f6da13e78cfeebbe7591821a3580f025a69deb62ced4c
 MISC ChangeLog-2015 59251 SHA256 0853c0abb1c70d1f165f084a6d1c2927dca9a698e142457a391273cc59f9fb8b SHA512 de4457c148436f486b884367d526f4aab3a04e46d3fa7c2f13be5b469572cf6187024dd447114c7bdfbc587ae21889e4b5e54c091ba7110b55d542951b8ad12b WHIRLPOOL 809b96091fba9fd87c2fe31763714ddc15f699e96e9e202d8ea0682e3c937dfaf2e3fc8cdafde6a3e88bcff94f8fe2164494e77b6fe24a0bf8b16b0ddcc1d6d7
 MISC metadata.xml 1771 SHA256 8b4f304c48df97da17bf377fc6d2b36ca5778654cf34cea2e59ea1dd64972d5f SHA512 58c44f7632aade5faefeac78dbcdb09d8dc23d8913571f7022d2a9310e32c041f21589e4f9c80b44e9b3d89ea323fb19c87b49e401340584ae701dd4d39108b9 WHIRLPOOL 0f86b49ecc857531405619b0fbf81a79d48f43e7f409ca99b88b2fd260f3f81ca84f612b766405aa33042e1af4caffe5378e638fdfb614a5ce1afbbb4d6123a6
diff --git a/dev-lisp/sbcl/sbcl-1.4.0.ebuild b/dev-lisp/sbcl/sbcl-1.4.0.ebuild
index 9f565e6c9e05..962d6c37cbef 100644
--- a/dev-lisp/sbcl/sbcl-1.4.0.ebuild
+++ b/dev-lisp/sbcl/sbcl-1.4.0.ebuild
@@ -107,11 +107,19 @@ src_prepare() {
 
 	eapply_user
 
-	# bugs #526194, #620532
-	sed -e "s@CFLAGS +=.*\$@CFLAGS = ${CFLAGS} -Wall -Wsign-compare -Wpointer-arith@" \
-		-e "s@LINKFLAGS += -g\$@LINKFLAGS = ${LDFLAGS}@" \
-		-e "s@LINKFLAGS += -no-pie\$@LINKFLAGS = ${LDFLAGS} -no-pie@" \
-		-e "s@LINKFLAGS += -nopie\$@LINKFLAGS = ${LDFLAGS} -nopie@" \
+	# Make sure the *FLAGS variables are sane.
+	# sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail.
+	strip-unsupported-flags
+	filter-flags -fomit-frame-pointer -Wl,-s
+	filter-ldflags -s
+
+	# original bugs #526194, #620532
+	# this broke no-pie default builds, c.f. bug #632670
+	# Pass CFLAGS down by appending our value, to let users override
+	# the default values.
+	# Keep passing LDFLAGS down via the LINKFLAGS variable.
+	sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \
+		-e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \
 		-i src/runtime/GNUmakefile || die
 
 	sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \
@@ -148,8 +156,6 @@ src_configure() {
 src_compile() {
 	local bindir="${WORKDIR}"/sbcl-binary
 
-	strip-unsupported-flags ; filter-flags -fomit-frame-pointer
-
 	if use pax_kernel ; then
 		# To disable PaX on hardened systems
 		pax-mark -mr "${bindir}"/src/runtime/sbcl
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-3.600.0.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-3.600.0.ebuild
new file mode 100644
index 000000000000..5acf5dfbf16d
--- /dev/null
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-3.600.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ "${PV}" != "9999" ]]; then
+	DIST_VERSION=${PV%.0}
+	DIST_AUTHOR="AKHUETTEL"
+	KEYWORDS="~amd64 ~x86"
+	inherit perl-module
+else
+	EGIT_REPO_URI="https://github.com/lab-measurement/Lab-Measurement.git"
+	EGIT_BRANCH="master"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git"
+	inherit perl-module git-r3
+fi
+
+DESCRIPTION="Measurement control and automation with Perl"
+HOMEPAGE="http://www.labmeasurement.de/"
+
+SLOT="0"
+IUSE="test"
+
+DZIL_PLUGINS=( Git SurgicalPodWeaver RPM AuthorsFromGit )
+
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/Class-ISA
+	>=dev-perl/Class-Method-Modifiers-2.110.0
+	>=dev-perl/Clone-0.310.0
+	virtual/perl-Data-Dumper
+	virtual/perl-Encode
+	>=dev-perl/Exception-Class-1.0.0
+	virtual/perl-Exporter
+	virtual/perl-File-Path
+	virtual/perl-File-Spec
+	virtual/perl-Getopt-Long
+	dev-perl/Hook-LexWrap
+	virtual/perl-IO
+	>=dev-perl/IO-Socket-Timeout-0.320.0
+	dev-perl/List-MoreUtils
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-Math-Complex
+	>=virtual/perl-Module-Load-0.260.0
+	>=dev-perl/Moose-2.121.300
+	>=dev-perl/MooseX-Params-Validate-0.180.0
+	>=dev-perl/PDL-2.7.0
+	dev-perl/PDL-Graphics-Gnuplot
+	>=dev-perl/Role-Tiny-1.3.4
+	virtual/perl-Socket
+	dev-perl/Statistics-Descriptive
+	virtual/perl-Storable
+	>=dev-perl/TermReadKey-2.300.0
+	virtual/perl-Thread-Semaphore
+	virtual/perl-Time-HiRes
+	>=dev-perl/Try-Tiny-0.220.0
+	>=dev-perl/YAML-LibYAML-0.410.0
+	virtual/perl-autodie
+	>=dev-perl/namespace-autoclean-0.200.0
+	virtual/perl-parent
+	sci-visualization/gnuplot
+"
+DEPEND="
+	${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/File-Slurper
+		virtual/perl-File-Temp
+		dev-perl/Test-Fatal
+		dev-perl/Test-File
+		virtual/perl-Test-Simple
+		dev-perl/Text-Diff
+		dev-perl/aliased
+	)
+"
+if [[ "${PV}" == "9999" ]]; then
+	DEPEND="${DEPEND}
+		dev-perl/Dist-Zilla"
+	for dzp in "${DZIL_PLUGINS[@]}" ; do
+		DEPEND="${DEPEND}
+		dev-perl/Dist-Zilla-Plugin-${dzp}"
+	done
+fi
+
+src_unpack() {
+	if [[ "${PV}" == "9999" ]]; then
+		git-r3_src_unpack
+		mkdir -p "${S}" || die "Can't make ${S}"
+	else
+		default
+	fi
+}
+
+dzil_to_distdir() {
+	local dzil_root dest has_missing modname dzil_version
+	dzil_root="$1"
+	dest="$2"
+
+	cd "${dzil_root}" || die "Can't enter git workdir '${dzil_root}'";
+
+	dzil_version="$(dzil version)" || die "Error invoking 'dzil version'"
+	einfo "Generating CPAN dist with ${dzil_version}"
+
+	has_missing=""
+
+	einfo "Checking dzil authordeps"
+	while IFS= read -d $'\n' -r modname; do
+		if [[ -z "${has_missing}" ]]; then
+			has_missing=1
+			eerror "'dzil authordeps' indicates missing build dependencies"
+			eerror "These will prevent building, please report a bug"
+			eerror "Missing:"
+		fi
+		eerror "  ${modname}"
+	done < <( dzil authordeps --missing --versions )
+
+	[[ -z "${has_missing}" ]] || die "Satisfy all missing authordeps first"
+
+	einfo "Checking dzil build deps"
+	while IFS= read -d $'\n' -r modname; do
+		if [[ -z "${has_missing}" ]]; then
+			has_missing=1
+			ewarn "'dzil listdeps' indicates missing build dependencies"
+			ewarn "These may prevent building, please report a bug if they do"
+			ewarn "Missing:"
+		fi
+		ewarn "  ${modname}"
+	done < <( dzil listdeps --missing --versions --author )
+
+	einfo "Generating release"
+	dzil build --notgz --in "${dest}" || die "Unable to build CPAN dist in '${dest}'"
+}
+
+src_prepare() {
+	if [[ ${PV} == 9999 ]]; then
+		dzil_to_distdir "${EGIT_CHECKOUT_DIR}" "${S}"
+	fi
+	cd "${S}" || die "Can't enter build dir"
+	perl-module_src_prepare
+}
diff --git a/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild b/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
index 184a38271fdb..5acf5dfbf16d 100644
--- a/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
+++ b/dev-perl/Lab-Measurement/Lab-Measurement-9999.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" != "9999" ]]; then
 	KEYWORDS="~amd64 ~x86"
 	inherit perl-module
 else
-	EGIT_REPO_URI="https://github.com/lab-measurement/lab-measurement.git"
+	EGIT_REPO_URI="https://github.com/lab-measurement/Lab-Measurement.git"
 	EGIT_BRANCH="master"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${PN}-git"
 	inherit perl-module git-r3
@@ -31,6 +31,7 @@ RDEPEND="
 	virtual/perl-Data-Dumper
 	virtual/perl-Encode
 	>=dev-perl/Exception-Class-1.0.0
+	virtual/perl-Exporter
 	virtual/perl-File-Path
 	virtual/perl-File-Spec
 	virtual/perl-Getopt-Long
diff --git a/dev-perl/Lab-Measurement/Manifest b/dev-perl/Lab-Measurement/Manifest
index edf45a40c0da..3a0bd2b4d817 100644
--- a/dev-perl/Lab-Measurement/Manifest
+++ b/dev-perl/Lab-Measurement/Manifest
@@ -1,8 +1,10 @@
 DIST Lab-Measurement-3.531.tar.gz 483289 SHA256 656cab0028f840065120ac67975e70c2f42739fa0e6788f4f07e93fd8d518d3c SHA512 28db6db91db281aec1b57d48f94d31c7f01731ad944b891332496329f91b4b5985ab474b645fa70ed396dd5662d5086722128cf1db9d88c5a766d500694ef5c7 WHIRLPOOL e1e85ef42a531e60cb04e715924e574925e78a9a45e58603e78627953d154d5df5569ab2991f48a3b9b3fa92994c432966f300a074b507f3669fe816d6204a4b
 DIST Lab-Measurement-3.550.tar.gz 510971 SHA256 5204bcd88db31156fec717b546eb4ed6e4a43a781d36a28141c5477d3c714768 SHA512 e3ab254909b5d6644ac0938233b643ccfa851631b54de0f409175020d4d577e61f90af2b797ad1418366b3876c917c7cc30109abc8b13f1d3b93fdcad439acaa WHIRLPOOL 7c9dbee0743fa6b21c0041ea67cbb0d5e6e083c8d81bc9fd5f0bd11dd12daf79856a174145a61f11916668a59d82f1d2e8cf6c372295cbc2eafddf12d6487c68
+DIST Lab-Measurement-3.600.tar.gz 513213 SHA256 06ab0e17fa929fb2f2c73cf455370306034d93614b4ee2e32ec9f468235364a7 SHA512 427e99594a9916e0e1f95d58d84d21e62ea619d9887badb3a8472c780842227acb0f50d2e5ab68c01b7fab487ca32585a83475de920d88936dd9fad65447a8d5 WHIRLPOOL bcbde2e7b7b78b64f5023f51be1e18811c8d384ac557bc90b2760fdd5bccfaa235ac0115e6ec2b1523429c16169214900e1f4a3ec1eea2221ccaad28c74d00e7
 EBUILD Lab-Measurement-3.531.0.ebuild 1835 SHA256 f749d8f0a525df5add59cc32fc37b8c771f1c2e2478b5ad53a7c84adfcc4f6d2 SHA512 3b5f84cce308b12b1e3d64df5fb7eb47eed0042d67be7b48d382a4582e7456c8e0f2eab411a6ded483f3c5d375cdb4d02794a3aa6ed5ea8c9da42bc2f93ce755 WHIRLPOOL 66a2e1dce61c1320c1bb1ff0cbfb8b1737041d2ee426ae819c85269c9979599be8fae4cd6f221b7afa5d4ac1dc78b8018f3bc591ad9241648aff0568a0245a2e
 EBUILD Lab-Measurement-3.550.0.ebuild 4009 SHA256 b8e4377ce7583872e81dba8405b85c0ba40ba5a7b21a500732cd82f316762070 SHA512 d26245ed21b7460b541bd2f219ff96e54d7ee5c2879d292acd30f9d5d57428f5e63f575885dbf46295bc35a7570cb22cec2dae748ec3812396c33a440cf7c9dd WHIRLPOOL 1cb66824f4f137e517a15d96f99add49dc2df3571506598319b4aa535526205338060088f096c997386b6e7202df5b295a324b2f030601ac3418be102b668e38
-EBUILD Lab-Measurement-9999.ebuild 3495 SHA256 a9085240bf510e65e61593771034ff7616381b6508f7456f8ad5adfbee5a7a23 SHA512 53ecd68ca8d503f0d086923c47091b9338be8089fb67b0205e9989a44200cb491183764a375dc7c98be06668497a3a590455cf14f0253cec02fa34ba60ec06d7 WHIRLPOOL 88892e619c9ae7606dc763ea347ab40a9e9aedf9109307abea45f6472686cabfb984aa84823881efb8f800df0ff3aa728c7928865e9e46aa63eb0fce21f77ec2
+EBUILD Lab-Measurement-3.600.0.ebuild 3518 SHA256 a2ef714fe55867b7efe4adb7feb7eecb53c41c3b617ede70e59924a7219ac928 SHA512 a4d2a881955befee0906d967baacb4fcb8387cfff7d5d367c3965748e4f66a1c65abcc4374ed6eed29881c09c0d6ffec613f35cafa5cf83350a063c818e499ee WHIRLPOOL b720198f87040af229ce999575f4c8f4d1415b8f2e00604fb0e9f80e8c52f6f85b3c880c7a364cb3f4ae778a164d8ff813681efd0adf3dd116cd3f2fd73e0a55
+EBUILD Lab-Measurement-9999.ebuild 3518 SHA256 a2ef714fe55867b7efe4adb7feb7eecb53c41c3b617ede70e59924a7219ac928 SHA512 a4d2a881955befee0906d967baacb4fcb8387cfff7d5d367c3965748e4f66a1c65abcc4374ed6eed29881c09c0d6ffec613f35cafa5cf83350a063c818e499ee WHIRLPOOL b720198f87040af229ce999575f4c8f4d1415b8f2e00604fb0e9f80e8c52f6f85b3c880c7a364cb3f4ae778a164d8ff813681efd0adf3dd116cd3f2fd73e0a55
 MISC ChangeLog 4715 SHA256 bfc0c1f234855a7b9ef170e9cba196e79e982b5f06b36f3d2a7ddcaf77b6ff1c SHA512 f622cf280e42fbcaa98d91e44d927c0910653353b9d71229d9f84cc6fabf43baaa7be9dbfede8df2ae230ef8c1e472a98f1e09502310f8f111e7518817bdfed1 WHIRLPOOL b718b7bdde45388eb6ff4dc16cfdaa1e3f851669653ad2260f8981fc9912f758413f8cca457c250ca1cac99693c42265fa060a18636d02b8f6d873afb351acef
 MISC ChangeLog-2015 4747 SHA256 0929c319a2f8cfb21df21c4aa441e14bc6cce077204c75cf78dc087c4c2054fe SHA512 bdf08c7ee2e64fc9f75db62f0b0384c44a4d3a82f657fd07cd18ab82ffcfd3c5cbbbe9a94492dabd524ff5e92be317ce023f047c02e7a12175b3da8ebda41891 WHIRLPOOL 20e4d7c346b070730a007c7bc4cf1772180adbe62b75cd17eadcae279164e4fda81ef2c507ee8517635d1646a268ce4a4f0cd5f4aa6a8c3368906cd9e80ba93d
 MISC metadata.xml 3300 SHA256 03c08d94868e5f845defee6fc3af45d3ebb7073ced87d6cc4d6404b1ce870b12 SHA512 2166ffdc8f917146ad3c8c5cfd6776b1b366987bff5774034277c8f0317d94b991145f3e367c6e4b5c025758ec25ba7e944f6ccb9e7d3d3e5c3aae03830e84ab WHIRLPOOL 33b7d1d2b14ba60eecf650c6a037aacdeb50a82a95b96c5eebe8dea7e9511cabfca0448d59b6cbc98252a4eedb266e206bab3756c31b4725fa538a0218f34d80
diff --git a/dev-python/python-gudev/Manifest b/dev-python/python-gudev/Manifest
index 00eda729b873..2ba19baa5829 100644
--- a/dev-python/python-gudev/Manifest
+++ b/dev-python/python-gudev/Manifest
@@ -3,4 +3,4 @@ DIST python-gudev-147.2.tar.gz 10111 SHA256 09a79c4b8dcf18b55725ac258108551456da
 EBUILD python-gudev-147.2-r1.ebuild 1019 SHA256 2fad8367b2d2b8c9dd18c313fa115f9a028485a7754c1b1c412a53e463e12537 SHA512 7d609b0338d015d4557b10e00facc2f46d48c4e10fb203b184f3caa4708e86c03139e356c7515cf9940688ebc6c03039dfc493abdbf7f70fe1e34550cb443e86 WHIRLPOOL 3defdf9027cf3921cfb0391e59a02da03e502fa441631fd395f1da318a9b7512c9aafe839141183bca41574920083119657309adfb3676ee8c08d9d66ffa2d0c
 MISC ChangeLog 2963 SHA256 8a87036125566a4e4e3c36799b85bf2dc4b82f9dc8726ec93dfbe60fb917ee22 SHA512 5ee798ed86c6208c44fcb969a6dde58416414dfe728193c46a9a6dea68a6a9c36202df9bfe3d235b88338f203302155dd5a6a289df2426d301bac1e6e8662ae4 WHIRLPOOL 6ded493fb5c5bfeb0551ef604726f9ec9edd3f05ed8bba4ff3af756e424963bcd0599bdb5c4d5d092f04c8bb664acedf90a62bad8437293fab222a86c27b8578
 MISC ChangeLog-2015 2515 SHA256 31f90b8835e3a0644014a6d74fd37c5d93ac70b23c03b022ce4c271ca7c72555 SHA512 b16471fb7d31dc6b07a5f6f225310832df438513862b7e94bea9d07b96061dda257a4c84e0d995df23b562f7dab62d4f7effca5cd13e2d583c61f0e3607e6ac8 WHIRLPOOL a0d451d4f284bdab1da7e9a81c6bab2833ead91bff45f31fda5a4036fc2fc9aa1836d0c3ca78e7a0a8e1a376cac93bf22258cee6114660ebe509ee16064beb02
-MISC metadata.xml 510 SHA256 b7406f81d6dfc2a2dc19320daa4a182273f2e67f83d3930c8a8e0ef3a97bf843 SHA512 08ed61c5488c6adff26767ffe2c22cc1dcd14bab56e2ef546e9364ad212d65a66f52009560bb32ddbeabbff8abaa51e1720c413a46ed067d3b97188aab8a9b6e WHIRLPOOL 9219caaa2783a1f795d804bf7eab94ea141527c0034fbc16b48713baf5bd8aa6ace262b6a599c0f4dc5e671397c9e6afb7b383d5ed2d50a0591f4457a92eee64
+MISC metadata.xml 249 SHA256 84d2ba2fcc44152e555694d7dc4473a6f37fd6af5449484ff66bc4b2fa191ee8 SHA512 184548c150dc06fa334ae7e2efaa90a176d4dab5a04c0d3afe034bc4207272438041e814fba7f1c305beb154800c12d6d73c2fe04c76e83f1b11e305b5aea7be WHIRLPOOL 58c599aeb055a885018f7cc5e5677d302b6a0fdca023bbede561938c7ff9d784450749b64e2a4800f1dd60ef1009c10b873e00f8dec9dbac34582357fd652055
diff --git a/dev-python/python-gudev/metadata.xml b/dev-python/python-gudev/metadata.xml
index a6170ed0429d..4d742adbfbd6 100644
--- a/dev-python/python-gudev/metadata.xml
+++ b/dev-python/python-gudev/metadata.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>laurento.frittella@gmail.com</email>
-    <description>Proxy Maintainer (please CC on bugs)</description>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">nzjrs/python-gudev</remote-id>
-  </upstream>
+<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">nzjrs/python-gudev</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/wsgilog/Manifest b/dev-python/wsgilog/Manifest
index a23cd3409b7b..ff74c1cad0ec 100644
--- a/dev-python/wsgilog/Manifest
+++ b/dev-python/wsgilog/Manifest
@@ -2,4 +2,4 @@ DIST wsgilog-0.3.tar.gz 4299 SHA256 2193c7eadb7c341970c50b2607f48f12c8031cbd2ce1
 EBUILD wsgilog-0.3-r1.ebuild 440 SHA256 977dddc87c8a5e5f132b11afb7370bb1499667661f14c8a27ab61c470197981c SHA512 cecfcb7e3b6ed3035eb3c1ee8e20edbc085ecb1026c01dabf7a4fb30b0f153a517e6f379627e907d58974b0ae9644a1f4c453fdb174440f6787abdd530c82774 WHIRLPOOL 5a1d8c5cbda1016ad62c9bf81972b3b7007fdc4d7df147f53a205f9540a71fd2f365aa03ccf81659dad57ce53630e2119d0dd8ef5df021478bc5e3eb4be99739
 MISC ChangeLog 2575 SHA256 554b0118e9ca0e38b9be59866d8e16af70b6d0672032bf054379319e78fd3f3f SHA512 e2c50af0165cf993864096ac01f7101aa3d3477ee28cf9d3f833438f8e04dbb4f840eabb3596e6dc915fa6b0ada5bbb0873b27ed896e39f4899b3f2325dc204f WHIRLPOOL 9779788db309ea72c2b599a980fd1994c3fc79087e60652c246e8c764c2d685b01ca64a23892b1ee83a4166da12cc0e4750f62f07a539907a3f99671ded89368
 MISC ChangeLog-2015 1080 SHA256 83260ee35eb45d0000ca4bbacd0ddfbdc28c56012ef294ab5a0ded687930339f SHA512 22c6a8634c760d5166033c203261c20e7f21b4bd07fc9275756fc868e803f1a201fa21824879c66599b79fb824caec4f1f72a117a8f0893c4267539509dbf349 WHIRLPOOL eebfb4492abe568db5905e4278d77915222afba90c338755c60490b8754b9f31fd9b28a1c891ed53a95ac3f2d897b70660164fe03e31ce266fa8a38f5e47fc57
-MISC metadata.xml 441 SHA256 a56ce450ead27700f5b8610e0f736873f8aaa2322dd8f44782a294ece3ccd3eb SHA512 f9a706f666f879424727372152fb2aa19a46366cd10be72ec3a3673c8df342a63378e117fb170eb5f90d50aff3c8f1a0b7408942526a0599852e9716e6458f33 WHIRLPOOL 5436bee7fad83f3f8d35d1cde2c7bb977e2ab685e5fccf4a535401f779853f1229ef37e0bd32bd097c7a31da11dc7a9be7c34220fae3a78e95152e977b43b30f
+MISC metadata.xml 237 SHA256 d24e58b51f8398b2e47d97448dd7b642bc08782d7140d4070a95df45d4f42d53 SHA512 5a666dae911b6aa7e75d85d61503a786b70676d14cef28f99968cffbdecd7175ae722e4cb0da9abb0926d9909e5eeb6bded9363a38c681b60c35d2fad221c8d7 WHIRLPOOL 1ef66e8ce99588f0b08b3a9dc250e6b151541b3b500dfd4cb48677cabbfd40da63801914d9ed1d586e21310a288f4c5b0fd01779ba8a7d98d433148fc3222d61
diff --git a/dev-python/wsgilog/metadata.xml b/dev-python/wsgilog/metadata.xml
index bdc9b4508447..9a7f68fda601 100644
--- a/dev-python/wsgilog/metadata.xml
+++ b/dev-python/wsgilog/metadata.xml
@@ -1,15 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>jo@opteamax.de</email>
-    <name>Jens Ott</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">wsgilog</remote-id>
-  </upstream>
+<!-- maintainer-needed -->	
+	<upstream>
+		<remote-id type="pypi">wsgilog</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index 3ac1545043e5..88971e72f08a 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -1,8 +1,10 @@
 AUX capistrano-2.15.5-sudo-cleanup.patch 656 SHA256 1511705245ce1bafc7a37c077e00964320241fe4cdf2e696a5c4547f507489ec SHA512 846f9c25b1c7806d082ec73faa2b5b9d4b6be285a33acf1d98dc36b9eddab54d664d915c3bab1da28fa2d86225fb1619fd746354cd605b8e3e8a5d0a05cfb96f WHIRLPOOL 51b8f0f1e1479558b6211b2e6815160ed1faf3532dedc4925c8e09d9ea65753fc9786ae37e3664185c7beb266d4626a92a149f7a68f3a2ae064c39c2ab23ea84
 DIST capistrano-2.15.5.gem 132096 SHA256 3eb22ec58176918f44a71126b9bb8a1a34ae4efb99835eb72e187d03916604aa SHA512 10168080c7481ec6fc6f918ac90a3b1ce8f2b36f77411375e33cc915b02d5196ab061ac47e767edd724c82cffd1c2ad0a23ba1f0519cf1f2aae5b429167b19ff WHIRLPOOL 452b5977e08762e0f01822734517010228fd3398e6d5e19041483dae9a7f6bfb3d4940b15a20c3a3cd30205f62563c919b3057294cd82ccb99cb96abefcb8136
 DIST capistrano-3.4.1.gem 46080 SHA256 4b820c7ddfbeeee186180a04ffcb0158a4819ab12cf8c9eb6411d07a9fe1e338 SHA512 ef3b8735aa91137234937b5704a74b965be729581e71df9794324303dba60eacb91c66c1b38f8154f315cd4d17f98e8ab6f491cd1634b59b51b320f2244f6ae1 WHIRLPOOL a745c9a6b77996ce12da7d9107ce932620478ee4d3884347f92d622c396c80f9553f6995bb209ec4f517e35a498c5b6f4458f8e4b29e0b556973ff194da418a7
+DIST capistrano-3.9.1.gem 77312 SHA256 38bc88eeab067e78af9f77b03b436083b1fdefd06930a9a2208519a14f2c0587 SHA512 b9dcb21c43ee03cb250a5d740a3fb1ccced720efecf5168a394e8dc0ea56130fd77255f0ead260a7b221d222d34361e99ee68f29cbf498e599e6e5c73c099907 WHIRLPOOL 6d21437c110bdc41e9e260ccb66e733920772fe6fbdfa7a52be254ccc8c4a8249da7dbded63c0463c2127ec0b83d9e901fb8fa12fe5161e05c3211156b7ce8c6
 EBUILD capistrano-2.15.5-r2.ebuild 1242 SHA256 715ac5f56e9a04a605a07ad944cbd937d34bc71766a85eccfa8e2d5a67ab3d80 SHA512 cc943bd80e4d1ac7408fb26c3e63590d891469452f7057c2b52ea2d7eaa68f827aabbc90ec76fac1d66aeaac69ffb398a07f1ed66a829dc2d43cbe6ddd6df7c2 WHIRLPOOL 08ccbf3b618262e80657d3e55968470fa2a2be44cc27c307f8f7dacdd5e7f76877ada03a11e53b3674af82db23298c82330eebde44cca13867c8f2460779f72b
 EBUILD capistrano-3.4.1.ebuild 1092 SHA256 81d56311eddc7037dbbd9b97984f1ae9144f77e65cb1322f0dcd351ab76c843a SHA512 7a330bc2593f06a90810871acdaefb3b3f43af1d7085980f00f61f60ae6f8976d5346645fae621cdef7a752069ceb5a06f9ce485351b525826d037bed6712fc4 WHIRLPOOL d3482e75f54d77b1aef4a1f403bcc8f68cc509d8f1f19a4fbf54369e88574dc2a5c86d2099d4fd58085b2493ea5443706abc35e6315a913e769c74d4749fcac0
+EBUILD capistrano-3.9.1.ebuild 1168 SHA256 07ac12c69407ee499258fe7e49193f5a1f92e347a63f487666a08297b78a959a SHA512 033fbc88432314dc90936cc6b138874d6690d705f0e17ee5fe1066794bb11ee57af9bad69e953875d4520c1bbd00a2773015697fd08abd3747bfd52522008b1f WHIRLPOOL b2272cec2d6f5771f42f531bc7a799b2a3cdb82287f7da262f69ec260c45d4b000cfeefd93a0fd9f60038b9c4cf6ce1f2536de0f7ccb38b657ce63a70672686a
 MISC ChangeLog 3677 SHA256 e112ca0c01271a8c99b497f52946f19325360e7ace8914d21d15e176dc6d41a6 SHA512 ea5fcbe629751ce6847e424baa2b606e4f9a7827ccef3743cd37304c912603c67fe58dd0dc3eebda48aa86c82a384e13ea0d44dc4e720cb95919e2c5071866d3 WHIRLPOOL 74ee99772da356ec19296683e426f4f634b1d604c4af4ea3b9e16e5d91df738feb11ea774fc0779b6481f71e0cd71f90b6c15eeff80938eac505375002f40028
 MISC ChangeLog-2015 15734 SHA256 9d04a652aca3dd7f5b340c028b94e67b302f212bb67f67860dd1b022cffdf11d SHA512 4b8709eb640cc78e1ed29885ef4ef7f620e38118ff60730a4c2790c4e2572f44bdbf13b3b34e71c05cc7a375fe67f51d2fb4b0ca0d5f2129240ee4baeb168f1a WHIRLPOOL ba29502653a4f4c77a690e1e9d4d03c6dc0d0ec4bc81fefcc712c330ecc2cd0c78c3f3bdedbab0d17ad641766f0a24be1d717fc7f53ad0ea7939b48257c40759
 MISC metadata.xml 395 SHA256 f4e6801aed288aeecd2e57af451a330d31a523074a95770c854c1e153e286985 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28 WHIRLPOOL 12c257f141ad43013c3c50b88355348b6798f4b84da9fe5f9c8093ce53378c6095c940d9921851cf4e6d0dfb0f64b36453ef58a44aa32432520cffd522dd86fa
diff --git a/dev-ruby/capistrano/capistrano-3.9.1.ebuild b/dev-ruby/capistrano/capistrano-3.9.1.ebuild
new file mode 100644
index 000000000000..624e148e3b74
--- /dev/null
+++ b/dev-ruby/capistrano/capistrano-3.9.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A distributed application deployment system"
+HOMEPAGE="http://capistranorb.com/"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/airbrussh-1.0.0
+	>=dev-ruby/sshkit-1.9:0
+	>=dev-ruby/rake-10.0.0
+	dev-ruby/i18n:*
+	!!<dev-ruby/capistrano-2.15.5-r2"
+ruby_add_bdepend "
+	test? (	dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	# Avoid specs that depend on capistrano already being installed
+	rm -f spec/lib/capistrano/doctor/gems_doctor_spec.rb || die
+}
+
+pkg_postinst() {
+	einfo "Capistrano 3.1 has some breaking changes. Please check the CHANGELOG: http://goo.gl/SxB0lr"
+	einfo "If you're upgrading Capistrano from 2.x, we recommend to read the upgrade guide: http://goo.gl/4536kB"
+	einfo "The 'deploy:restart' hook for passenger applications is now in a separate gem called capistrano-passenger.  Just add it to your Gemfile and require it in your Capfile."
+}
diff --git a/dev-ruby/omniauth/Manifest b/dev-ruby/omniauth/Manifest
index 7c6c356bde7d..8e40a9efd3cf 100644
--- a/dev-ruby/omniauth/Manifest
+++ b/dev-ruby/omniauth/Manifest
@@ -1,9 +1,11 @@
 DIST omniauth-1.6.0.tar.gz 25205 SHA256 9eae49f049f47f646540d21c257b596a25179cd4466927362a97dc852fe4664c SHA512 fb989ba7aef74bd3d2c185d6401cf263ef6169abc3018f51ae7ed99921b9f339c60fc2735582f559a0e0726338bb8d114973588155239fde2bff5805ad520bc2 WHIRLPOOL 33a83c09a775297fdc9346530e0935ccdb7985075e9e520dd8e6d30eb16a33fcc69baa7d9479c12689755122452cff1c8cf1cb1e8f390da3270bb2900b8d6834
 DIST omniauth-1.6.1.tar.gz 25094 SHA256 9a6cb873857f30468cff0024b73ead30ac46bd5da98be2db0b2e72a20b73f0d4 SHA512 5cb372ef4c8b78d5d110eb3f2f828ac3af5d14f230ed3a7d81f0464e21f0d3a434604fe2102874a3b6c341cbe9ad4db4af575229c77592c11e756bb38ab3b80b WHIRLPOOL b7711d6f5526e96e2d249cd2bc83e01b65d7fc8feb4f46bf660ce8f43979177168d9a9065876db6c9062f282907e6750649cfb350d1aa56cd7b3ec168f64e096
 DIST omniauth-1.7.0.tar.gz 25918 SHA256 1b7175f3f1c3d24ee530c590aeca34f16f5e093cf8702efee735c0de38cb29bf SHA512 004475651fba1fe6e737eceb16a1bd89b510cd06d1bcf155dc56fc6793ad5e61755b80b827076583f6f72d17ada0223c22aac34c206cee4b250e5dd126f98fa7 WHIRLPOOL 1afc8fe1a1d645a5dbb32b34a0c692566be08eba7c9af1ff9bdcf784742f61154c2d0fb674b87bd265aa1aa200658d40cb5b8abfb652d04355532cefc7f223e1
+DIST omniauth-1.7.1.tar.gz 26002 SHA256 a7b247773275a56eb672cbb66cd6cfc531d9f73bf3b169803af589c619cb1536 SHA512 ed951394f996eb7eb9ab90fb6e46957f8f85148cc29ffb90697a0f74819014327a8e1fb6e8dbd5be736961c7283dc6132586841d05b87043b8d5a20c12441f68 WHIRLPOOL 5d47ca1ad406455d14403c7e4e13fd9d461bb48eb46c991ec983dc29f1d7d0f12dba2e57300771249807f91e34e702cf2f47e5d295063f6d8ffbe82e54e31111
 EBUILD omniauth-1.6.0.ebuild 1202 SHA256 cdd45b2c05e15b7627466eb570c1e8b9fa022db170c3bce7dcddb1dc934b72c3 SHA512 783c8f94685fa7c6f412ebd587d212326a313305bb5a0d7f8a692d1c58dbd5dab7d76508f098a1a999c46b648b168fa8f85d5adc2a71933314ec426c071a21e1 WHIRLPOOL d22a51d415ecd100f87ce996f07791df11d95f64914539c841d9d95fcf56e094dc8f6bf8fa9b077bd708ae6c6ad3f8b9e4ea42434fed27d9f7fc3bff807ef844
 EBUILD omniauth-1.6.1.ebuild 1227 SHA256 c89766e0812da1b2bc39bb07627a89cc5edfbe62e62ccc50a2bf41c51b359fba SHA512 1254031c4624621ffbca2bcf19acb68cffe17376c73454e51968a46c37209cc6c28e39086c7e1d9d67c01c05a43bbca3684e95ec7bb1fb986da9d09832687063 WHIRLPOOL e03c528e49a3e04fee233e6652583a67133f7510861310fc46d3a87a7892c604c8faa35981cef3064fe1e5c9dcfdc2ea1cb4b5e60a12423f400ff381b9c2441d
 EBUILD omniauth-1.7.0.ebuild 1227 SHA256 fdb95a5d0d00ac966b1c0ef60ba55aa710cc0e3fa7d172320a1aba2a515d01bf SHA512 6af2a8c090c162199aba4d81a990fb2686b970ad48ddf083e9c263a7e0c3d45476a0d60088567659ef75b741b16e9fd81a2caf59e71a74a5673676d6ad4cf129 WHIRLPOOL 83c090750dc2edb4f3b411a905c84540fa2da38810926de8db6d5a7652e2bdde0c1cba8a8fbfde4fb957dd622717117c446e51645585973a2fcf17952493a9e4
+EBUILD omniauth-1.7.1.ebuild 1227 SHA256 fdb95a5d0d00ac966b1c0ef60ba55aa710cc0e3fa7d172320a1aba2a515d01bf SHA512 6af2a8c090c162199aba4d81a990fb2686b970ad48ddf083e9c263a7e0c3d45476a0d60088567659ef75b741b16e9fd81a2caf59e71a74a5673676d6ad4cf129 WHIRLPOOL 83c090750dc2edb4f3b411a905c84540fa2da38810926de8db6d5a7652e2bdde0c1cba8a8fbfde4fb957dd622717117c446e51645585973a2fcf17952493a9e4
 MISC ChangeLog 3186 SHA256 9a62a132511fcfb4cbb2873a2bc9a343339cb515e01e685b7f5119058e9452cc SHA512 f4266766376412745d2d4c0397209fd431a50eda12e1c09ac39db8f0431f14435b9660090ef1ab452b5ce8a134f8d981b4dc09864a1fdd65b35e0858ae29e250 WHIRLPOOL 589bc2fec6eb3995274c52a1be8633aec0ce474bb9f7ef24db58afa18a401b38fe97f1ef466a0d95d998977b23cd4137005979c7b3f93bb317fb409c555e2be4
 MISC ChangeLog-2015 1190 SHA256 e307ebf7a956eae0f1859876475d9ca2908a8b3ee0b27567302b94546db8dc4a SHA512 7998a95be81197a5f24c31063fff408174d356c5f89363636742323c2b49b2eae0f7f30455439f6a54115b38e0e9b8bc3b9b9393437329596c07356b10150953 WHIRLPOOL 5a0b2a2a74ea0487c2fe82723fb8d2865ac4e4a053ed4df8d476bf99539d79acdf16004c0cd7656833ae4bebc11faad0eb3eac4b308350746484a6836e9dc21a
 MISC metadata.xml 343 SHA256 fdd070fb65a69158c4cb346ede5c169e3f1e98ea3a609074253b799003c13f0c SHA512 189a7a11a84b2fa108299499e9f867768246b34237b74029eba64a0895d5c95d39544e340c4340cf50644f602411dfad991ff460c0269f1956061641e3cba130 WHIRLPOOL 8eb13b02d7a9fec3b519a17af8b3ef5e64a6775db1f3d919d25f2b164bdeabccea7b43a90e08cdec0c5665dcc16e77003ae020220cacef4fd9ac107253cef9b2
diff --git a/dev-ruby/omniauth/omniauth-1.7.1.ebuild b/dev-ruby/omniauth/omniauth-1.7.1.ebuild
new file mode 100644
index 000000000000..2c597ca30306
--- /dev/null
+++ b/dev-ruby/omniauth/omniauth-1.7.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A generalized Rack framework for multiple-provider authentication"
+HOMEPAGE="https://github.com/intridea/omniauth"
+SRC_URI="https://github.com/intridea/omniauth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/rack-1.6.2:* <dev-ruby/rack-3:*
+	>=dev-ruby/hashie-3.4.6:3 <dev-ruby/hashie-3.6.0:3"
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	test? ( dev-ruby/rack-test )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' \
+		Rakefile ${PN}.gemspec || die "sed failed"
+	sed -i -e '/RUBY_VERSION/,/^end/ s:^:#:' spec/helper.rb || die "sed failed"
+	# maruku fails, resorting to default markdown implementation
+	sed -i -e '/maruku/d' .yardopts || die "sed failed"
+
+	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		yard || die "yard failed"
+	fi
+}
diff --git a/dev-util/artifactory-bin/Manifest b/dev-util/artifactory-bin/Manifest
index 6405d43f7e10..1f7f15244ee1 100644
--- a/dev-util/artifactory-bin/Manifest
+++ b/dev-util/artifactory-bin/Manifest
@@ -8,10 +8,12 @@ DIST artifactory-4.16.1.zip 41489457 SHA256 f3715397f7e792de76cfecfe2b41ebbf5454
 DIST artifactory-5.3.2.zip 45729254 SHA256 e086a067ad191859cd0a0c996313cf5c7386e6ee892b55697c27b0f42ae2bc14 SHA512 60fbbed97c9915ed4a7627a3b893fa6c5bcec695932415d3102b9788ba6182c8cef937ad48639d4398a682ab2f517771c3dcda9306842e4202bbd45ab4768f1d WHIRLPOOL bf3b31f7a1989ddb90b03396172eeac37dc5230c4bbcc99b54c66326e5d52e26dbb83003824647c6e89926049c31b9644212aee183fa24db7475831dda0ceaec
 DIST artifactory-5.4.4.zip 76841935 SHA256 bf2198a0fefe818fe412579dd008f2a24dc065780da4c9657a923363c70a0a3d SHA512 f949e4c2ecaaf4581bc2e96058403684cab09f10b0bec512eda9b65bb41577a792b08d05f7a16e0e7f1614567dc9b0d1d59bb3c6ad6a4dafeb0c054a3add09a8 WHIRLPOOL c0c27a0ce5b0035d9266b6af4316044cf1aed361dbe0f7aaf66844015a70678e92bb0c6a13330ffd8f5a05903f66a82b48995605c272ba3950a19aa47d1fc85d
 DIST artifactory-5.4.6.zip 76857888 SHA256 43fb4b14ad5350daa200e0282a36903495505ccb536b5f0ac7d7b5487dcdfca6 SHA512 08d7895dc823e61be83026d31eea387eb914f17cb2f13b03d5314c6473f30de9279d230d242d8160dba0d3c8f6981b25b5ad46f52ad12d1c39ee820ac7a676fe WHIRLPOOL dcc86f1326011bb89c3e65a420c9f9ad02afea3a144b4b5eac8b617bec7dbb72256a6ac1f67d2bae034897bd02801b24e59746d1543e957d8e595d7ea83a4964
+DIST artifactory-5.5.1.zip 77406287 SHA256 e4180ec0c6a4ed9bc8da1287ac1d661c421d59bc11e56d47dd106ead31d8a44f SHA512 7327135be0c2a08dd97c575b05be1c3e4be99b38354864313d201334d3276912bcff0c6b0743fb83a2433a82fc8fcf4ec43e98f4183287fc34f1807342abedf8 WHIRLPOOL fcd3c368eafbd956eba15ae1c5cd7362d423acb0e6a0b529c8b7088ff2ec1437e02dd5b5b277c71d7bbba788db11963c2eed784ce95ba1dcb550fd41a0224722
 EBUILD artifactory-bin-4.16.0-r1.ebuild 3336 SHA256 7a1409e38513d16ad42333dcc05be4ca3a7788fc86c876601fd7926fae559af5 SHA512 f7297b2590d5329f851a9783cc066001b76734b8b7e6dc51d79d773d8d167e6d574a5c6ee8e2b4db9b53b4977df909eff796537fba815dd45752223e71b08852 WHIRLPOOL 0942fc42029836b02e2a0048b0c22ba54798696084b421fc45e47a00c48a2b3286dda04783d2809e779f220570827b1d3d78a1e4fb76eb357af3e7066b669770
 EBUILD artifactory-bin-4.16.1.ebuild 3336 SHA256 7a1409e38513d16ad42333dcc05be4ca3a7788fc86c876601fd7926fae559af5 SHA512 f7297b2590d5329f851a9783cc066001b76734b8b7e6dc51d79d773d8d167e6d574a5c6ee8e2b4db9b53b4977df909eff796537fba815dd45752223e71b08852 WHIRLPOOL 0942fc42029836b02e2a0048b0c22ba54798696084b421fc45e47a00c48a2b3286dda04783d2809e779f220570827b1d3d78a1e4fb76eb357af3e7066b669770
 EBUILD artifactory-bin-5.3.2.ebuild 3336 SHA256 f6c54e6480cb47a7ba4e95ec9c38ebc4af75328980302cd55ce38ae5f726819d SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961 WHIRLPOOL ebcca19550c71c7b5264e31d04e46a5bd3ba0f2f1f343e297c7460eb62261ccee331875f1ac249d32a56deec2d9e86139793b4e10b660505015e651cae0442b1
 EBUILD artifactory-bin-5.4.4.ebuild 3336 SHA256 f6c54e6480cb47a7ba4e95ec9c38ebc4af75328980302cd55ce38ae5f726819d SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961 WHIRLPOOL ebcca19550c71c7b5264e31d04e46a5bd3ba0f2f1f343e297c7460eb62261ccee331875f1ac249d32a56deec2d9e86139793b4e10b660505015e651cae0442b1
 EBUILD artifactory-bin-5.4.6.ebuild 3336 SHA256 f6c54e6480cb47a7ba4e95ec9c38ebc4af75328980302cd55ce38ae5f726819d SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961 WHIRLPOOL ebcca19550c71c7b5264e31d04e46a5bd3ba0f2f1f343e297c7460eb62261ccee331875f1ac249d32a56deec2d9e86139793b4e10b660505015e651cae0442b1
+EBUILD artifactory-bin-5.5.1.ebuild 3336 SHA256 f6c54e6480cb47a7ba4e95ec9c38ebc4af75328980302cd55ce38ae5f726819d SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961 WHIRLPOOL ebcca19550c71c7b5264e31d04e46a5bd3ba0f2f1f343e297c7460eb62261ccee331875f1ac249d32a56deec2d9e86139793b4e10b660505015e651cae0442b1
 MISC ChangeLog 4764 SHA256 9a326637b49316fc0f5fd75439f9da89ea2c8f3df2ffb9d05942f339ef8a59dc SHA512 cabc49e593241ac844c41d9ccfb3911b5e2a49a49dc2ee65a488f6c803164fcfbead244e8e5d2dd2085364f8f9fc89ce94bf2bd7a0611082ad2ffedf63098ce0 WHIRLPOOL ebfdbef69fe7a7670a2505a7d7f0d8ae79327552055726fc91ad6fd6ba580b2bd9564a96f3b56ac75b3841113bc30dca45f2781e4a02d4bb5b7267ab9e545ebf
 MISC metadata.xml 368 SHA256 f1527df453967a1e7a353a0dfc4f0fb1c1003d7dfa2c93a72f8337e79797d91c SHA512 889ab0f86261be62dc4988fc99c8526212c7936b3fbb8a078d644046047f653108b3120cef9cc65bce00a1c267227e58dae0cb1eb7d86ac1f4966408fa783beb WHIRLPOOL 38beba1f4815189a40225bcb1b0b7023547eac872439fc627588eed8982589872a37bc674d2ff07671746036457ea094d6fb750f5cf88b7ce507988203e43523
diff --git a/dev-util/artifactory-bin/artifactory-bin-5.5.1.ebuild b/dev-util/artifactory-bin/artifactory-bin-5.5.1.ebuild
new file mode 100644
index 000000000000..242019ded03b
--- /dev/null
+++ b/dev-util/artifactory-bin/artifactory-bin-5.5.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# Using a binary ebuild until a source ebuild is doable.
+# This was previously blocked by two major bugs upstream:
+# A lack of documented build instructions - https://www.jfrog.com/jira/browse/RTFACT-8960
+# A lack of source releases - https://www.jfrog.com/jira/browse/RTFACT-8961
+# Upstream now releases source and instructions (yay!), but most of artifactory's
+# dependencies are not in portage yet.
+
+EAPI=6
+
+inherit user
+
+MY_P="${P/-bin}"
+MY_PN="${PN/-bin}"
+MY_PV="${PV/-bin}"
+
+DESCRIPTION="The world's most advanced repository manager for maven"
+HOMEPAGE="http://www.jfrog.org/products.php"
+SRC_URI="https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-${MY_PV}.zip -> ${MY_P}.zip"
+
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="ssl"
+
+RDEPEND=">=virtual/jre-1.8"
+DEPEND=">=virtual/jdk-1.8
+		app-arch/unzip"
+
+S="${WORKDIR}/${MY_PN}-oss-${MY_PV}"
+
+pkg_setup() {
+	enewgroup artifactory
+	enewuser artifactory -1 /bin/sh -1 artifactory
+}
+
+limitsdfile=40-${MY_PN}.conf
+
+print_limitsdfile() {
+	printf "# Start of ${limitsdfile} from ${P}\n\n"
+	printf "@${MY_PN}\t-\tnofile\t32000\n"
+	printf "\n# End of ${limitsdfile} from ${P}\n"
+}
+
+src_prepare() {
+	default
+
+	if use ssl ; then
+		cp "${FILESDIR}/artifactory.xml" tomcat/conf/Catalina/localhost/artifactory.xml || die
+		cp "${FILESDIR}/server.xml" tomcat/conf/server.xml || die
+	fi
+
+	# Reverse https://www.jfrog.com/jira/browse/RTFACT-7123
+	sed -i -e "s%artifactory.repo.global.disabled=true%artifactory.repo.global.disabled=false%g;" \
+		etc/artifactory.system.properties || die
+
+	# See FIXME in src_install(), this can probably go away,
+	# but catalina.sh may need to be fixed for that:
+	sed -i -e "s%/etc/opt/jfrog/artifactory/default%/etc/conf.d/${MY_PN}%g;" \
+		misc/service/setenv.sh || die
+
+	einfo "Generating ${limitsdfile}"
+	print_limitsdfile > "${S}/${limitsdfile}"
+}
+
+src_install() {
+	local ARTIFACTORY_HOME="/opt/artifactory"
+	local TOMCAT_HOME="${ARTIFACTORY_HOME}/tomcat"
+
+	insinto ${ARTIFACTORY_HOME}
+	doins -r etc logs misc tomcat webapps
+
+	dodir /etc/opt/jfrog
+	dosym ${ARTIFACTORY_HOME}/etc /etc/opt/jfrog/artifactory
+
+	dosym ${ARTIFACTORY_HOME}/logs /var/log/artifactory
+
+	exeinto ${ARTIFACTORY_HOME}/bin
+	doexe bin/*
+
+	# FIXME: this is called by catalina.sh (it echoes the variables before starting
+	# artifactory, as well as makes sure log dir, etc. exists). Those directories
+	# could probably be moved to the ebuild and the script removed from catalina.sh
+	# without consequence (and quieter starts). Would need to check if CATALINA_*
+	# variables are actually used anywhere (from reading code don't appear to be
+	# actually needed)
+	exeinto ${TOMCAT_HOME}/bin
+	doexe misc/service/setenv.sh
+	doexe tomcat/bin/*
+
+	keepdir ${ARTIFACTORY_HOME}/backup
+	keepdir ${ARTIFACTORY_HOME}/data
+	keepdir ${ARTIFACTORY_HOME}/run
+	keepdir ${ARTIFACTORY_HOME}/work
+	keepdir ${TOMCAT_HOME}/logs/catalina
+	keepdir ${TOMCAT_HOME}/temp
+	keepdir ${TOMCAT_HOME}/work
+	keepdir /var/opt/jfrog/artifactory/run
+
+	newconfd "${FILESDIR}/confd" ${MY_PN}
+	newinitd "${FILESDIR}/initd-r3" ${MY_PN}
+
+	fowners -R artifactory:artifactory ${ARTIFACTORY_HOME}
+	fperms -R u+w ${TOMCAT_HOME}/work
+
+	insinto /etc/security/limits.d
+	doins "${S}/${limitsdfile}"
+}
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 257c70b851c9..d4af34ffc7fb 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -6,18 +6,16 @@ AUX postfix.service 662 SHA256 60e79c0b189d48f341313af55e345014cd4ae5ddf3ed04b28
 AUX smtp.pass 29 SHA256 21e672c3c46410d713b359d79126961a12d54ceab309fd2c94c5b4f531206167 SHA512 a8a940099a77ea0547004daf5392a6efc0cd643f10072803d65e37763012464ad25b1b925ae9e32bffb3c3e8a5d4b2d3bb5619a174d58fdc4ea5d4090db0d365 WHIRLPOOL 912d0d1b91a88d1e079f8efdab4cc231a0497907c83ad07f22bb90c5479fcf59bc28694a808c1f23dc67fec8fab5e03f28f0fa40106801dabd2da06e0210fb57
 AUX smtp.sasl 42 SHA256 41637ac35a85827e193564b7dbcaa94eafd0206af8ebcd41bcfc48a314416376 SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47 WHIRLPOOL 0d3132798fbfaa047a3be5b8b1f0a99c2fa22514cdef4908ca7f670210789f432247b4668e063bfe581ad17a4f5ba180e31c5c1e5ed9a0a9ca6417dd14ebd067
 DIST postfix-2.10.9.tar.gz 3820525 SHA256 e47eb56db2d238b9c5a5147a516fa406ab6afb102cedb4bd08273e979ae95d82 SHA512 c77df7ccc051bd72271dc5298da0ca4e45397b1ba96fc8be31e095f5b15cd30ebc0b29cf638e76efc65503cb241efd937f2d64aaa97243402c35e2927b7a7b91 WHIRLPOOL 3a7acb90ae03366e2ed24dfbd2e07619f0694abe098a621c6f9202e4d43a968376b5a52f2a65223634cf921af0a7156b0272ca15ad188a1b61fe4fb9cc97cab7
-DIST postfix-3.1.2.tar.gz 4337569 SHA256 1ab9b4ee6bf9eb37d2467a63244132aab22ac23b91a72f327334e236b0d30f6b SHA512 58493d1890c3235d74a18365294ca764bd3b3f278b9825da931005165af60250342c6cf477c3b3575e50858d99cd3ee40f22bece094eb61e9be6c3cf0313d571 WHIRLPOOL 37e90ef6275a7f2dc8f712bb05348861098697438f274a5c5b69f50b31d55574af262a658657863c93f77fdeba2d37bf7b30dc43bf1629615f496ede19a89c00
 DIST postfix-3.1.6.tar.gz 4341308 SHA256 e5eb005fd133c6a32ca03e796e0192945eb877be8eb727f30d25547c997c5aa6 SHA512 646317393d33fcec99bef7f3dc142a847591927bc034c0c71e578baedad1875040cfeabdaa3436312f60485cb69bbdb31197aa9e7526a457946d7749b781099b WHIRLPOOL 66a087da3b33353a22176b9162fe0679f8ff35e48ae693a3315d52232e662638d48b8827648c0b0368e018161e1ade6a671773c109208ded9659cca26b1b5ea1
 DIST postfix-3.2.2.tar.gz 4390318 SHA256 d06849418d119d09366997b2b481bb23f737629769b4e4a52da42fb3ad8b0576 SHA512 9432fa8b181db99b8e2d72b2a0f640d1456b10c42615f0a002638f7f788d748b8bb55cd36409a368ac4f6d22033d1d059728fa33980fb93d465b6dfd5ae26418 WHIRLPOOL 7681299ffb747316f1366350f5fac5cf5f156ed9681a26ec6ed5dca0ab42a6a95f93e943bd6ccaccac259c2f7dd1cd1ba441a8968a8988d59ac2208fdbb2f480
 DIST postfix-3.2.3.tar.gz 4390567 SHA256 5b0b975d075ea7561028d4109c581549b794aa92d733429ea6d9fa57751140bf SHA512 99ea74a5a0620e739668e55d620a0370b72c4802983a8a4cf4d6c51c6f8f5573128f2d6869386cedadba66b3f741df2f18867a059facd94092ac95f6da3a600c WHIRLPOOL d77c3490b81a43dcb54c7d72c88a62f1d632f00bd37be6969aa16def98877c4761c35cba53672a3aec701b14931d2a4c20c2ed4e4fff4876b1c74d4ac03f4b8d
-DIST postfix-3.3-20170924.tar.gz 4397375 SHA256 b9b8a2dd43cf1ae0002d815946d1f765b775a983ccf3bfbe7c2cae43e3677032 SHA512 10a400fcf2aa8a64f6952e7f66a2076ff6c507d59be015e4e08c1a6d234adb2909ba13bb4323109e5e98a1deea6690b6a0aaba934f47233bccec56de372d484a WHIRLPOOL bb51197c3706061fbb88d8635003e8d37a4070ca2778c4b5a56c5d531a98ed2db837c9c05ee5318dfeee5372263732b30de3792b645a681840c7dd94a01ba023
+DIST postfix-3.3-20171009.tar.gz 4397691 SHA256 48a6e0b08fd503d99351516c83ba06b99f03083149ca5803316a0d4dfca60d27 SHA512 afdfcd343bedcc3596f0bfe7a734d54d60eca503e514b28385117ffa7d4277d310576916e4c73e2e4776540712828101045d232c4b88942a00a5b94d1b9858ba WHIRLPOOL 853ff6922f0a509268bc607a3e09a9efc37341134178a598772a93cebbcbbe63120b858e48fc07ac7dca07aa1955aec8c371d1f7c4c15a8e82a764b092d7c08f
 DIST postfix-vda-v13-2.10.0.patch 55701 SHA256 6208021eb0b37ac6482e334e538ed5700cc22c4d4dd66ed9e975ae5f20bf935f SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 WHIRLPOOL d98b7d2177b8b69738086880fd08c336fa60b99ff7413624e628fd5f17be2064f2ccaa37c047d3013ed41c0ff1bcb76e7962f8390c4179f28ab11733dd3b59d3
 EBUILD postfix-2.10.9.ebuild 8736 SHA256 302ad9f6743a3c50d182a719aeeaa98f3fca34e4e1a19cce2aef0e8443bbfc18 SHA512 09a64554311b5b5c7395770329eb44cf80d3f3e9197adefbb304214feb9ff3d4df9e3d3376b3b4e87f329281e1fb4e03bfb7b3bbfbae463384031b3810e011d0 WHIRLPOOL 06645fdb9da24848cd50241cb67ebfc06d2164c9257d2f665ffc3bba1fb07eb54d9062e0b7c09053a45b6c66c1b2562f07cba0d7d7e6800a1dd5358d7925ee70
-EBUILD postfix-3.1.2-r2.ebuild 8661 SHA256 510503309cf92b68251f60d1291c52374146b8dd6d1fa854aab9913241fb6a4c SHA512 6174266e057ca6110d39c76f6bd6d11fa24f40641599a90c143aa9396822d1cc2b3e72b7de94e849c913c5d34bf3dd081f29feedb41b2bfc349a6e567381550d WHIRLPOOL 77088bc694eed3f4fb385c8322d8dd2b64dccfe53e3ee092a04c0928772937aa1597ec4d05bc64ed8dc1551b7ebf5914af1558ca1f49c67f7861df8189b61ef1
 EBUILD postfix-3.1.6.ebuild 8661 SHA256 510503309cf92b68251f60d1291c52374146b8dd6d1fa854aab9913241fb6a4c SHA512 6174266e057ca6110d39c76f6bd6d11fa24f40641599a90c143aa9396822d1cc2b3e72b7de94e849c913c5d34bf3dd081f29feedb41b2bfc349a6e567381550d WHIRLPOOL 77088bc694eed3f4fb385c8322d8dd2b64dccfe53e3ee092a04c0928772937aa1597ec4d05bc64ed8dc1551b7ebf5914af1558ca1f49c67f7861df8189b61ef1
 EBUILD postfix-3.2.2.ebuild 8669 SHA256 9687e72b0923ccceb2e83d9112b4924072d36fe5eae780a9dd5fabefa257e2c3 SHA512 094bd11212903bfcbf678698765da8f72ed3b34562aca398d47e90d3a2ae7ef252bc29eead3bb92eebe46a7dc2aa4e615dc3b85ec192c6d6872c2370fe99a11a WHIRLPOOL 59edd5b583c3fd6a98d60fe2a6f3dfa0bd0fb924f5721a6c2577a03820c8debf3552f26f75e1b04cbc3c69c605af249e4010824270e6cbf0d1538b44dfaa84fd
 EBUILD postfix-3.2.3.ebuild 8669 SHA256 9687e72b0923ccceb2e83d9112b4924072d36fe5eae780a9dd5fabefa257e2c3 SHA512 094bd11212903bfcbf678698765da8f72ed3b34562aca398d47e90d3a2ae7ef252bc29eead3bb92eebe46a7dc2aa4e615dc3b85ec192c6d6872c2370fe99a11a WHIRLPOOL 59edd5b583c3fd6a98d60fe2a6f3dfa0bd0fb924f5721a6c2577a03820c8debf3552f26f75e1b04cbc3c69c605af249e4010824270e6cbf0d1538b44dfaa84fd
-EBUILD postfix-3.3_pre20170924.ebuild 8764 SHA256 2a1c92f279a0f032c8c6c4aeee1cb29cb24fd899c2ac8b190ffd2c2cb832515d SHA512 7dc624549c5bec88a509372e63256604ce3e899a093508fff914afe7d4a698a0e9c941f9b8fe97fa162eec197d9b3488c4a665822689cc5cfa1686b20ba918f7 WHIRLPOOL a88e2afdffb1469a70149a0702b7bd0dc5512d56128cf61628afa4d6078da26531ff46bd60fe919432bb2b7cb897035f3cf7a556a39ac4ee170b4b24e9dbc7f7
+EBUILD postfix-3.3_pre20171009.ebuild 8764 SHA256 2a1c92f279a0f032c8c6c4aeee1cb29cb24fd899c2ac8b190ffd2c2cb832515d SHA512 7dc624549c5bec88a509372e63256604ce3e899a093508fff914afe7d4a698a0e9c941f9b8fe97fa162eec197d9b3488c4a665822689cc5cfa1686b20ba918f7 WHIRLPOOL a88e2afdffb1469a70149a0702b7bd0dc5512d56128cf61628afa4d6078da26531ff46bd60fe919432bb2b7cb897035f3cf7a556a39ac4ee170b4b24e9dbc7f7
 MISC ChangeLog 19025 SHA256 5001d12e2ccd9bfe9527f6a1c745def53e8cabe9ad88e123ad8d0501d9eb7b35 SHA512 cd9dd569368918afd225460e7a2302677144e622f3c7ee0a919f136828f0038bd19e527e102ca6a0fc8592a199a816048fa47f98820b51bb5c465b5bb00abcd6 WHIRLPOOL a69a4c66a2d2360b93c86c7fb96cd2e72baf982ee7e14a9f24283fdd162263517064bcbd4364c978614fe80abe5389c8836504e3dfa2f0a48dfaa5b109f01f58
 MISC ChangeLog-2013 100301 SHA256 439e93c3f6ea08471888157d2347da51181aa9031d4bfdeef2197a6b26680246 SHA512 c678433163e86def50d59e47d7a1a0e8f4c4af860f80932255a7c95544e1f5b55a70b68905b02a417b2332bcf3aaa59281814d8504d70085f0874a23faa2bf02 WHIRLPOOL 15a12897a576cf98d856c551157b72b47aa45fd61d05c6ed55033ce37ce247045c6bcc8143b7ccce4666900d85e0a04087c977a311e31c20f554a991bec74fbc
 MISC ChangeLog-2015 17803 SHA256 262aa42c56ee443bd557a915e2d5d94f40ab8d674fa7c29e95694f92914bbb43 SHA512 e3985cce53eb10bb6d01494215e37be851b52db3cea7b62db1dd238b793f52f96b302e89b965cd98ae6cea020d1a6c5624d57e98cbd5fc2195faec1b9942d851 WHIRLPOOL ddeab5f49397ddf6d1e48febbcac95a5b5103fbdcd4059a40edd9e9737158aa731073961d058fcc592c3e54ce82941361aeaf6fe4ec8e8557d9a02b1295ecde3
diff --git a/mail-mta/postfix/postfix-3.3_pre20171009.ebuild b/mail-mta/postfix/postfix-3.3_pre20171009.ebuild
new file mode 100644
index 000000000000..a6ac5530fbf4
--- /dev/null
+++ b/mail-mta/postfix/postfix-3.3_pre20171009.ebuild
@@ -0,0 +1,310 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic pam systemd toolchain-funcs user
+
+MY_PV="${PV/_pre/-}"
+MY_SRC="${PN}-${MY_PV}"
+MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
+RC_VER="2.7"
+
+DESCRIPTION="A fast and secure drop-in replacement for sendmail"
+HOMEPAGE="http://www.postfix.org/"
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
+
+LICENSE="IBM"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
+
+DEPEND=">=dev-libs/libpcre-3.4
+	dev-lang/perl
+	berkdb? ( >=sys-libs/db-3.2:* )
+	cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+	eai? ( dev-libs/icu:= )
+	ldap? ( net-nds/openldap )
+	ldap-bind? ( net-nds/openldap[sasl] )
+	lmdb? ( >=dev-db/lmdb-0.9.11 )
+	mysql? ( virtual/mysql )
+	pam? ( virtual/pam )
+	postgres? ( dev-db/postgresql:* )
+	sasl? (  >=dev-libs/cyrus-sasl-2 )
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl )
+	)"
+
+RDEPEND="${DEPEND}
+	dovecot-sasl? ( net-mail/dovecot )
+	memcached? ( net-misc/memcached )
+	net-mail/mailbase
+	!mail-mta/courier
+	!mail-mta/esmtp
+	!mail-mta/exim
+	!mail-mta/mini-qmail
+	!mail-mta/msmtp[mta]
+	!mail-mta/netqmail
+	!mail-mta/nullmailer
+	!mail-mta/qmail-ldap
+	!mail-mta/sendmail
+	!mail-mta/opensmtpd
+	!<mail-mta/ssmtp-2.64-r2
+	!>=mail-mta/ssmtp-2.64-r2[mta]
+	!net-mail/fastforward
+	selinux? ( sec-policy/selinux-postfix )"
+
+REQUIRED_USE="ldap-bind? ( ldap sasl )"
+
+S="${WORKDIR}/${MY_SRC}"
+
+pkg_setup() {
+	# Add postfix, postdrop user/group (bug #77565)
+	enewgroup postfix 207
+	enewgroup postdrop 208
+	enewuser postfix 207 -1 /var/spool/postfix postfix,mail
+}
+
+src_prepare() {
+	default
+	sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
+		src/util/sys_defs.h || die "sed failed"
+	# change default paths to better comply with portage standard paths
+	sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
+	eapply -p0 "${FILESDIR}/${PN}-libressl.patch"
+	eapply -p0 "${FILESDIR}/${PN}-libressl-runtime.patch"
+}
+
+src_configure() {
+	for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+	do
+		local AUXLIBS_${name}=""
+	done
+
+	# Make sure LDFLAGS get passed down to the executables.
+	local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+	AUXLIBS_PCRE="$(pcre-config --libs)"
+
+	use pam && mylibs="${mylibs} -lpam"
+
+	if use ldap; then
+		mycc="${mycc} -DHAS_LDAP"
+		AUXLIBS_LDAP="-lldap -llber"
+	fi
+
+	if use mysql; then
+		mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
+		AUXLIBS_MYSQL="$(mysql_config --libs)"
+	fi
+
+	if use postgres; then
+		mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
+		AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
+	fi
+
+	if use sqlite; then
+		mycc="${mycc} -DHAS_SQLITE"
+		AUXLIBS_SQLITE="-lsqlite3 -lpthread"
+	fi
+
+	if use ssl; then
+		mycc="${mycc} -DUSE_TLS"
+		mylibs="${mylibs} -lssl -lcrypto"
+	fi
+
+	if use lmdb; then
+		mycc="${mycc} -DHAS_LMDB"
+		AUXLIBS_LMDB="-llmdb -lpthread"
+	fi
+
+	if ! use eai; then
+		mycc="${mycc} -DNO_EAI"
+	fi
+
+	# broken. and "in other words, not supported" by upstream.
+	# Use inet_protocols setting in main.cf
+	#if ! use ipv6; then
+	#	mycc="${mycc} -DNO_IPV6"
+	#fi
+
+	if use sasl; then
+		if use dovecot-sasl; then
+			# Set dovecot as default.
+			mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
+		fi
+		if use ldap-bind; then
+			mycc="${mycc} -DUSE_LDAP_SASL"
+		fi
+		mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
+		mylibs="${mylibs} -lsasl2"
+	elif use dovecot-sasl; then
+		mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
+	fi
+
+	if ! use nis; then
+		mycc="${mycc} -DNO_NIS"
+	fi
+
+	if ! use berkdb; then
+		mycc="${mycc} -DNO_DB"
+		if use cdb; then
+			# change default hash format from Berkeley DB to cdb
+			mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
+		fi
+	fi
+
+	if use cdb; then
+		mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
+		# Tinycdb is preferred.
+		if has_version dev-db/tinycdb ; then
+			einfo "Building with dev-db/tinycdb"
+			AUXLIBS_CDB="-lcdb"
+		else
+			einfo "Building with dev-db/cdb"
+			CDB_PATH="/usr/$(get_libdir)"
+			for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
+				AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
+			done
+		fi
+	fi
+
+	# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
+	# Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
+	mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+	filter-lfs-flags
+
+	# Workaround for bug #76512
+	if use hardened; then
+		[[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
+	fi
+
+	# Remove annoying C++ comment style warnings - bug #378099
+	append-flags -Wno-comment
+
+	sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
+
+	emake makefiles shared=yes dynamicmaps=no pie=yes \
+		shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+		DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+		AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+		AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+		AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+		AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
+}
+
+src_install () {
+	local myconf
+	use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
+		html_directory=\"/usr/share/doc/${PF}/html\""
+
+	LD_LIBRARY_PATH="${S}/lib" \
+	/bin/sh postfix-install \
+		-non-interactive \
+		install_root="${D}" \
+		config_directory="/etc/postfix" \
+		manpage_directory="/usr/share/man" \
+		command_directory="/usr/sbin" \
+		mailq_path="/usr/bin/mailq" \
+		newaliases_path="/usr/bin/newaliases" \
+		sendmail_path="/usr/sbin/sendmail" \
+		${myconf} \
+		|| die "postfix-install failed"
+
+	# Fix spool removal on upgrade
+	rm -Rf "${D}"/var
+	keepdir /var/spool/postfix
+
+	# Install rmail for UUCP, closes bug #19127
+	dobin auxiliary/rmail/rmail
+
+	# Provide another link for legacy FSH
+	dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
+
+	# Install qshape, posttls-finger and collate
+	dobin auxiliary/qshape/qshape.pl
+	doman man/man1/qshape.1
+	dobin bin/posttls-finger
+	doman man/man1/posttls-finger.1
+	dobin auxiliary/collate/collate.pl
+	newdoc auxiliary/collate/README README.collate
+
+	# Performance tuning tools and their manuals
+	dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
+	doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
+
+	# Set proper permissions on required files/directories
+	dodir /var/lib/postfix
+	keepdir /var/lib/postfix
+	fowners -R postfix:postfix /var/lib/postfix
+	fperms 0750 /var/lib/postfix
+	fowners root:postdrop /usr/sbin/post{drop,queue}
+	fperms 02711 /usr/sbin/post{drop,queue}
+
+	keepdir /etc/postfix
+	if use mbox; then
+		mypostconf="mail_spool_directory=/var/spool/mail"
+	else
+		mypostconf="home_mailbox=.maildir/"
+	fi
+	LD_LIBRARY_PATH="${S}/lib" \
+	"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
+		-e ${mypostconf} || die "postconf failed"
+
+	insinto /etc/postfix
+	newins "${FILESDIR}"/smtp.pass saslpass
+	fperms 600 /etc/postfix/saslpass
+
+	newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
+	# do not start mysql/postgres unnecessarily - bug #359913
+	use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
+	use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
+
+	dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
+	use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+
+	pamd_mimic_system smtp auth account
+
+	if use sasl; then
+		insinto /etc/sasl2
+		newins "${FILESDIR}"/smtp.sasl smtpd.conf
+	fi
+
+	# header files
+	insinto /usr/include/postfix
+	doins include/*.h
+
+	# Keep config_dir clean
+	rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
+	rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+
+	if has_version mail-mta/postfix; then
+		# let the sysadmin decide when to change the compatibility_level
+		sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+	fi
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
+
+pkg_postinst() {
+	if [[ ! -e /etc/mail/aliases.db ]] ; then
+		ewarn
+		ewarn "You must edit /etc/mail/aliases to suit your needs"
+		ewarn "and then run /usr/bin/newaliases. Postfix will not"
+		ewarn "work correctly without it."
+		ewarn
+	fi
+
+	# configure tls
+	if use ssl ; then
+		if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+			elog "To configure client side TLS settings:"
+			elog "${EROOT}"usr/sbin/postfix tls enable-client
+		fi
+		if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+			elog "To configure server side TLS settings:"
+			elog "${EROOT}"usr/sbin/postfix tls enable-server
+		fi
+	fi
+}
diff --git a/media-libs/faac/Manifest b/media-libs/faac/Manifest
index 08c81459bca4..759e49595d75 100644
--- a/media-libs/faac/Manifest
+++ b/media-libs/faac/Manifest
@@ -3,11 +3,11 @@ AUX faac-1.28-external-libmp4v2.patch 1766 SHA256 8e0bfe501acb7f31a701ab2c797c2a
 AUX faac-1.28-inttypes.patch 1392 SHA256 b135e8441673727a3dbfa8b5237896f985f550594406ddf71d5ad2e85437c69b SHA512 38262b7103cd61cb718e13cd29fe8fb2d416e2a291bdd248b882ec983274c4d16f5c443c5b13eba3aa4efbfb425441bb4c2658434f7718a3e521cdd9ec6cfe4c WHIRLPOOL 79b4f05775b6c7882b7d2db55d2dac9911a053828de7ecaa002ade3a2c33060e32d80968ed50cc3447968418518b8f8a8290c26b3e2325bfc12e1c954660d074
 AUX faac-1.28-libmp4v2_r479_compat.patch 4741 SHA256 4d1d67ad908fd1887212719a12dca6d786784eba7509b84c39b51bf00fa36911 SHA512 7b79664fbd912e069b2c0ce49f97a29db03ed3f339bdf6ef5a4cc668c585a56fbb900b6cf40c014ad40f5e559aa048a9340aab30d393420630c433569393fb5b WHIRLPOOL 5783e0fd48aba3b0d292bc50e931c7f00658f93438079506b5346e85c2cbeddc7e94a8694a0fefa50f99469140b8b56947fc63b67a1d2a254017d9dab065977c
 DIST faac-1.28.tar.gz 678891 SHA256 c5141199f4cfb17d749c36ba8cfe4b25f838da67c22f0fec40228b6b9c3d19df SHA512 0ef721ad28835e95cad41afc0cb6130e1ebb634cb6dd4b40f649bc2269b7bb5bf2887f6d8f023c74628d521f8bdf55b4dd070f972ecff162a5fe0384e026235b WHIRLPOOL fe56f3c2b40670f03e0c1880b253d7f0cc6e318c0b407f4e57fb7eaeac8692c6de9829402e670ddc0f397396935131ade0f8dadfc89b88fcdedecbf404e1b54e
-DIST faac-1.29.7.4.tar.gz 488685 SHA256 374e0a2c166e4c67cc049e6b76b0158ba881156b9c428142104340fb7fcf6abc SHA512 b9f812cf4075ce7ad11833dff19bf6a8ebed5a0d73e0472b1d9798e2764b43e19a55689a6ec0fca86742bb3f62ca1bde21747386816d3d4c45f08e3c558b69d4 WHIRLPOOL 027f919f85d354f7991e778377dafcbad517d45b6599a1fded0a814a4578162e6f21019b58826cbf2a6767d15f3994a68ad2d11b44c006e77880c139e64792d1
 DIST faac-1.29.7.7.tar.gz 477124 SHA256 b898fcf55e7b52f964ee62d077f56fe9b3b35650e228f006fbef4ce903b4d731 SHA512 4461e5ee8dc3e6045e348a1ce50aa2df878aceffdc242fe256853f11f22e4895236bc64e3bbe89aad9c5a806d27368ed9e134699ee739225f407846ff2ebe2b8 WHIRLPOOL 496cc5a1e4f1955d4cd39255f4967ac263724800643eb7bb949b563c44d8ca137db1e2a34a6ce5f53c88566c9494027ed9936804e01cf71e18ba993e9a18b12a
+DIST faac-1.29.7.8.tar.gz 477443 SHA256 316fff598764b93485dc5fb41379768b8c69348bbbb87e0e30ce28b1da487251 SHA512 b837e2a884eb86e70e812404109b6ff5d25c60dd5f98275ed7515836f67afe19c940a4b2574d7fcf7bebc793f5bb509c6ebad37281fe1addf95f815e00ea41a6 WHIRLPOOL 201822a65b0f3855b148a01ec761ef6ee50bbbee18649a41a3a1d03c45096959ac7c2177beaa455f37654290318d708b20880150a67c2b54f5762d2950bc2c69
 EBUILD faac-1.28-r4.ebuild 1716 SHA256 db27c7850f62948c0d91580cf62bb39a1e88415880545ef8d427e9a44ace9b4c SHA512 86a56132cd2b52e5ef8ccbfc2c31969b728cca8889ca15fd5980950c2f6974404d40aaf7499e692a36292e9335d0aff31504f2dd3e0d6a44996bb56b9eeb3ef6 WHIRLPOOL fb30f4461f8b453257e5fb84f0810a5f183863207bab64dccf98e147d187561312e3ea9bd4c9f1c801ee4ec043a57f3a71ae7e5665ee0d89b09994545bf654e2
-EBUILD faac-1.29.7.4.ebuild 1337 SHA256 bf5dfdd60c2099da1fd76cc3dbf57b925a6907e8f40c2b7febab6e656e5eca59 SHA512 a5691a6329ae101a11e09be5bdfd7d0c4268080b3fc97d9dda758d58a68a5d324078c1cd85f868b95bfda77746d44cf1d4238020a69fa3b2cfa74936ea22d4d0 WHIRLPOOL e6ebbb863e4fdc5b9bca24e9ff69a2b389ff36875ac98ad7cc3b97d351ffccb5c516eba9c8c7d16c2e2cce87e1273d0898bb517a0b366d17778c96cb1ea75f44
 EBUILD faac-1.29.7.7.ebuild 1200 SHA256 311b5c1b01f255e7b15d1be06fc8b137c8c8fd046b790f4038bf15cf0cdf5c62 SHA512 230d21c783b52aa838c1d25ee7a964b2d83fa9efb0686d1be03de56ade1075a70a2a0f0053e72f2121a7323496fac834f485f60ae0578d74ee1253b7212f46f1 WHIRLPOOL c54c19f6b0229d9758d717ee893283c1e7de15ebaab6b991c579586feb1c4b1b4cad91481029654e893fa00886b7f5978974ffad7647daf073edac6fcc73cf74
+EBUILD faac-1.29.7.8.ebuild 1200 SHA256 311b5c1b01f255e7b15d1be06fc8b137c8c8fd046b790f4038bf15cf0cdf5c62 SHA512 230d21c783b52aa838c1d25ee7a964b2d83fa9efb0686d1be03de56ade1075a70a2a0f0053e72f2121a7323496fac834f485f60ae0578d74ee1253b7212f46f1 WHIRLPOOL c54c19f6b0229d9758d717ee893283c1e7de15ebaab6b991c579586feb1c4b1b4cad91481029654e893fa00886b7f5978974ffad7647daf073edac6fcc73cf74
 MISC ChangeLog 2766 SHA256 bdc61025dd8ac5f1fd720007d05ed5cb30b517aa84da837f0a77d7b13b4d97b7 SHA512 aece8dd67f8b9bdeeebb412bc78d711d23d1d20a642a68d3610a5b626d4a07af0cc6f9f34b038b5776a290d6a1a395e4828325170bdf02152c6ee0eadd80356b WHIRLPOOL c0f8ff388fb7783ee66e147f687a529366fc6523a496f5ec765f70e95451f6360571af45e0d48f4ea3739064ab0197984c4661bf6ca26a4ab2b6e3e0995c2199
 MISC ChangeLog-2015 13602 SHA256 3075cbee9829e14929773af0ce5e942d18e400fd931612827c7aeee1551d39c6 SHA512 6a66fa11bd38a811b4d8c74778a676e0cf5d431a6972fa8839a51c3f087fcdfeccf4a7725b214a461ba32beab2311a83e0011f317d15b8a6d557007ed1d35545 WHIRLPOOL 07d9c4185664e19816b333a23e6c6c14ea426c9c465d2ffa593d5745b72a9e24e3c63d82e490e100d4027d882d6a896ab5b173d347eae2fd94c4f0a48f4a004d
 MISC metadata.xml 435 SHA256 308844fa468645b066b7c9f88e8584e9f4a84cf6ba9f541defe45e4c983acb42 SHA512 65f7c4d59cab4263199809c0727b82e9e5f059d24be5702e255c5d48a3bf205ba8af27f99164b3b1c8c6bdf47c7116e2a70e3f9da2549da4a7ff70d6fb61ecfa WHIRLPOOL 45b776f6dd2cb82c6ae1353608ba8db1e5d09703e6e4e386efa88a7aa8dd9633b169f88c298fd290e328b30b7f7870e12a9a141046ca12e369b59a6ec4c73ca9
diff --git a/media-libs/faac/faac-1.29.7.8.ebuild b/media-libs/faac/faac-1.29.7.8.ebuild
new file mode 100644
index 000000000000..4dfb024938ef
--- /dev/null
+++ b/media-libs/faac/faac-1.29.7.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# eutils for einstalldocs
+inherit autotools epatch epunt-cxx eutils ltprune multilib-minimal
+
+DESCRIPTION="Free MPEG-4 audio codecs by AudioCoding.com"
+HOMEPAGE="http://www.audiocoding.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1 MPEG-4"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="digitalradio static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	default
+
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #466984
+
+	eautoreconf
+	epunt_cxx
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(use_enable digitalradio drm)
+		$(use_enable static-libs static)
+	)
+
+	ECONF_SOURCE="${S}" econf ${myconf[@]}
+
+	# do not build the frontend for non default abis
+	if [ "${ABI}" != "${DEFAULT_ABI}" ] ; then
+		sed -i -e 's/frontend//' Makefile || die
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	prune_libtool_files
+}
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index faf44ab47424..4df29b61c081 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -1,11 +1,14 @@
 AUX libsdl2-2.0.4-static-libs.patch 4899 SHA256 e9ee478c8f2f70f0849038d448a29aaf9c13079e8a6ca663c6f186fc38ea0c44 SHA512 a71a6807251a8348f14a9dc1c5990d59cc63e067ee611a43b850950d8afde737830cf0bb0b0fd1fe6dc37e16490020fa21fbb9c70285333ee44ae2eb292f1a5a WHIRLPOOL 59b032da6ab86a75b23b8da2418de93a714a18499bd9a3cdbac10b8daf66499bdc1b746c78dcc463add42c334b5fe45eb9c725a497d0360c1f2d110e6f9acd98
 AUX libsdl2-2.0.5-ds3_ds4.patch 10482 SHA256 66a1702baaffa6e565edb72a1be670facbf865ffcc1d3ccd9a0a584354a0a43a SHA512 01e8f09f48b464a7f60d87ea47418b51f26f28b4463f2d55e9b2e9374f6824ac1981e98b599d244c0900409a93f93d4a4f363b51c0f8e1a84e4f04ffb883ca27 WHIRLPOOL 78fc07da0813298fddddadc40d9e83787c7881acefbcb53d7110fc4d6c82c411dc7e943a58a0a576823ed3f64686b5cb5168e08246b7b9702b5ce13d8e647627
 AUX libsdl2-2.0.5-static-libs.patch 4686 SHA256 6bf51c76aa0bd65d9036a415f5edcc17a2a04906538c4a7dce359818ebaf68c0 SHA512 98f02ace8419e25f5feb737fdb39dddf55b8db6188cd517bb720d9d02537ddcd4cc6a0c32efd7ec699a694dd719366866fd9eb5174775749802ee75dd2e944e6 WHIRLPOOL e0a884675211d3761ade50085bead66eec8d4b2205f3d4819da19b358c0f506c5b4bea401df649925709bda85f94a9fdca339d8c846da658f7904284ccb7f26e
+AUX libsdl2-2.0.6-static-libs.patch 2373 SHA256 8baa14187f600e8de74a1d128714bcb931f0cd2b733a23c78e6f50dfd55c4e3a SHA512 c03037185a21ac3e2a664ab85847a0af95a44f579c2959fbc74d55ea8e59f7ed04775dcaea1fc2e284fca7ce6debca15a4062ba0e9bb0086f3dec49ba8044fb0 WHIRLPOOL 58a31dd84f0e420c355b866b6c97890742cbbe63c12f888c5a79933d19d3a94ff1fa55cb7e68710c83f707d34db49f75f85bfb3af77f1e9e85931d09638ff33a
 DIST SDL2-2.0.4.tar.gz 4136230 SHA256 da55e540bf6331824153805d58b590a29c39d2d506c6d02fa409aedeab21174b SHA512 dd0a95878639856c0f4b8a579ace8071379ab64519fa139b22d3ed857a0f0db87a75bc8480c7207e02fbffd1fdbd448e3c0b882c451675b0e2f1a945af02e1d6 WHIRLPOOL 2203061d32d51552e5bcfaa9752de5cb3173c0c733698894de177f9a0c1bad73706633e2d232f9b893e4c3736a93aff00ae94eb044b19a05a1cdd7a4c030b574
 DIST SDL2-2.0.5.tar.gz 4209352 SHA256 442038cf55965969f2ff06d976031813de643af9c9edc9e331bd761c242e8785 SHA512 6401f5df08c08316c09bc6ac5b28345c5184bb25770baa5c94c0a582ae130ddf73bb736e44bb31f4e427c1ddbbeec4755a6a5f530b6b4c3d0f13ebc78ddc1750 WHIRLPOOL 77aff6af67c29aab175f812be0aebbb65a757bd942de872b8330cb7cfabcd4abe0abd0c21b56bd409fb623b97c71981be5807e47dc03bf773aac85361582b796
+DIST SDL2-2.0.6.tar.gz 4420311 SHA256 03658b5660d16d7b31263a691e058ed37acdab155d68dabbad79998fb552c5df SHA512 ad4dad5663834ee0ffbdca1b531d753449b260c9256df2c48da7261aacd9795d91eef1286525cf914f6b92ba5985de7798f041557574b5d978b8224f10041830 WHIRLPOOL ad39ec811ac6f305a58352e1f332e9c29a34587c0eb2c9f163e76f93565418bd910210aea8113f53ca46bc745975ed8cc7b228f517af0a99d782fef44c4e0783
 EBUILD libsdl2-2.0.4.ebuild 4755 SHA256 1b95e513c3f963ff37b9e4ffe788561a9a7c37dbe2e5b4a92cfd81808cbfa0f5 SHA512 a3ee75d9916d1000282f30a7e7a6587ca5b523d08d77a3a0efc220e64ee552df462f1fd9d8f1128dd6b67e799e3046101dc1c3dc0aa30f90a12f0e58f2413210 WHIRLPOOL 728d2749a7aabc6abd66cd513c823d05ff2b875953ba0f0a5b75ecb52ad8b20f6d2b7d2741f7ad06787fb70f31381757cf6787ae363fbf5f4d6bed65fc3e2923
 EBUILD libsdl2-2.0.5-r1.ebuild 4833 SHA256 bb1f34d9cb5aa7dd1e1f19db22e6aded0869d6af5bd929ece2f94791ed600d8d SHA512 9cbb0dc1fdb10c1d2f4c88615874c9c712dc864f8e65629bd0943aba3131dbd9f401a4a64e7b43a6ac393f8c69239e85ee0135ee886b47569dde4f20c4c098f5 WHIRLPOOL 8d44901b1aca11b1ed4aa70eb2bc9c617b429a362bf732e793dce6f0809fc6b11ab6ecfa11071c7aa1fb808018964bd1a7c23bc905de409c8a3d5957ad36794e
 EBUILD libsdl2-2.0.5.ebuild 4791 SHA256 c3c15eb2967f2a35f0fed5fbfe12cbeb4368be3d56752eb22eb72da0bd4e1a28 SHA512 a7ee500df710579bd4be766935984871a0311307b78f35d42cb7459c25d298fe66b00283d044e8ab7353722b30ab5f52327840e87cc08d9ff6fa23e4b4f84e66 WHIRLPOOL 829bb0a737d7fba58c8253455a54914e93e0eca6b7e1dab9f5288e674c45e78a1f5c585d97341fd815ee3205cfdef8d8d9d624f0367503cd6e6fa8532e3927d0
+EBUILD libsdl2-2.0.6.ebuild 4871 SHA256 02adfe1db546a81708f28c02ceeda69769ef4b7d48b695f7470871bc2bbc0b7d SHA512 4ef9025d47d7313788d344ae3addd5256e66d17acf42b5f95557a603077c57e3c81b2932cd1198f59dd5108de81c66757b12d36878f08a7a61d50a9323644ae3 WHIRLPOOL 55d9743974e7a36ed81a7ce3d72bf8662e25ffb8788504250813dab9b40e42196c760df96f7d33ab40fbb14bbc1bb501423c87027291dec37cd74f10dd6d53aa
 MISC ChangeLog 5036 SHA256 d1346c5a7e7ba020de8f72d1f638c8fec4418d962cf9188b9518af6b93b0dc2d SHA512 d2a1dc0decdbd5b0b5754ee4fd14667e41d3e01927b8bbc1cd4bdb4b7499dfd326cdafbebfc80ba9daf8ba4a44a388ccc8d636b17dcfdb949122a7b0265d0871 WHIRLPOOL 03843cb5a80f4bc3f9908355f6c8414278bd69da91a5dc4ce4435c8c25c71412f06278e937d193e9735e762f8dad230e7e626ff71627f3de50fa12475ffa8561
 MISC ChangeLog-2015 5311 SHA256 e543afa31a118561233bf9060d1719933f81ca15415e4798bfb0c4bd8711119e SHA512 09400d6937e900025ffdf6b3d39ef2202b7a9a83df98fed2354e4fe85bcbb1d0f966e608088f1c372bba9559c0ece17405ee0d5115502e84f11642d7789d7c02 WHIRLPOOL c91ea0b26d40e85fd2bc8404d3f6b94cfd670d3e75915482111420012a18ce355cbffb18382cbd81aa5e337227f60399c522aa51dc9905cc591319900a27b96d
 MISC metadata.xml 1626 SHA256 437d69fbda00c8837a4fb18ecfb6ecb1615004434844241aa15c57e7a57a8947 SHA512 bca03557793cab7fe23ff7073add8bc112f4046326dae99cda4079b3adccd56b9179c871b04e97174c178d90b1b82b3f6ff5f42f53a705d4a22c9732e57787de WHIRLPOOL 6d2aea6011e9953b9b1c0e394d0ee54b52173c3c51e12971146d285077e6f199a322e1933387039adfa239456a412ff7274daa8e26260c9943565a029f1d22a1
diff --git a/media-libs/libsdl2/files/libsdl2-2.0.6-static-libs.patch b/media-libs/libsdl2/files/libsdl2-2.0.6-static-libs.patch
new file mode 100644
index 000000000000..a1427a075b4c
--- /dev/null
+++ b/media-libs/libsdl2/files/libsdl2-2.0.6-static-libs.patch
@@ -0,0 +1,44 @@
+--- SDL2-2.0.6/configure.in
++++ SDL2-2.0.6/configure.in
+@@ -3546,7 +3546,7 @@
+         if test -f /lib/w32api/libuuid.a; then
+             LIBUUID=/lib/w32api/libuuid.a
+         else
+-            LIBUUID=-luuid
++            LIBUUID=-Wl,-luuid
+         fi
+         EXTRA_LDFLAGS="$EXTRA_LDFLAGS -luser32 -lgdi32 -lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lversion $LIBUUID -static-libgcc"
+         # The Windows platform requires special setup
+@@ -3956,10 +3956,10 @@
+ 
+ VERSION_OBJECTS=`echo $VERSION_SOURCES`
+ VERSION_DEPENDS=`echo $VERSION_SOURCES`
+-VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'`
++VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'`
+ VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\
+-\\$(objects)/\\2.o: \\1/\\2.rc\\\\
+-	\\$(WINDRES) \\$< \\$@,g"`
++\\$(objects)/\\2.lo: \\1/\\2.rc\\\\
++	\\$(LIBTOOL) --mode=compile --tag=RC \\$(WINDRES) -i \\$< -o \\$@,g"`
+ 
+ SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES`
+ SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES`
+--- SDL2-2.0.6/Makefile.in
++++ SDL2-2.0.6/Makefile.in
+@@ -143,13 +143,13 @@
+ .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
+ 
+ $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS)
+-	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ $(OBJECTS) $(GEN_OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
++	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
+ 
+ $(objects)/$(SDLMAIN_TARGET): $(SDLMAIN_OBJECTS)
+-	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLMAIN_OBJECTS) -rpath $(libdir)
++	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
+ 
+ $(objects)/$(SDLTEST_TARGET): $(SDLTEST_OBJECTS)
+-	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) -static -o $@ $(SDLTEST_OBJECTS) -rpath $(libdir)
++	$(RUN_CMD_LTLINK)$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -all-static
+ 
+ install: all install-bin install-hdrs install-lib install-data
+ install-bin:
diff --git a/media-libs/libsdl2/libsdl2-2.0.6.ebuild b/media-libs/libsdl2/libsdl2-2.0.6.ebuild
new file mode 100644
index 000000000000..4117b57c829b
--- /dev/null
+++ b/media-libs/libsdl2/libsdl2-2.0.6.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# TODO: convert FusionSound #484250
+
+EAPI=6
+inherit autotools flag-o-matic toolchain-funcs ltprune multilib-minimal
+
+MY_P="SDL2-${PV}"
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="http://www.libsdl.org"
+SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+
+IUSE="cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver"
+REQUIRED_USE="
+	alsa? ( sound )
+	fusionsound? ( sound )
+	gles? ( video )
+	nas? ( sound )
+	opengl? ( video )
+	pulseaudio? ( sound )
+	wayland? ( gles )
+	xinerama? ( X )
+	xscreensaver? ( X )"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) )
+	gles? ( >=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},gles2] )
+	nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] )
+	opengl? (
+		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+	)
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
+	udev? ( >=virtual/libudev-208:=[${MULTILIB_USEDEP}] )
+	wayland? (
+		>=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}]
+		>=media-libs/mesa-9.1.6[${MULTILIB_USEDEP},egl,gles2,wayland]
+		>=x11-libs/libxkbcommon-0.2.0[${MULTILIB_USEDEP}]
+	)
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+		>=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}]
+		xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+		xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[${MULTILIB_USEDEP}] )
+	)"
+DEPEND="${RDEPEND}
+	X? (
+		>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+		>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+	)
+	virtual/pkgconfig"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/SDL2/SDL_config.h
+)
+
+PATCHES=(
+	# https://bugzilla.libsdl.org/show_bug.cgi?id=1431
+	"${FILESDIR}"/${PN}-2.0.6-static-libs.patch
+)
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	sed -i -e 's/configure.in/configure.ac/' Makefile.in || die
+	mv configure.{in,ac} || die
+	AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
+}
+
+multilib_src_configure() {
+	use custom-cflags || strip-flags
+
+	# sorted by `./configure --help`
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		--enable-atomic
+		$(use_enable sound audio)
+		$(use_enable video)
+		--enable-render
+		--enable-events
+		$(use_enable joystick)
+		$(use_enable haptic)
+		--enable-power
+		--enable-filesystem
+		$(use_enable threads)
+		--enable-timers
+		--enable-file
+		--disable-loadso
+		--enable-cpuinfo
+		--enable-assembly
+		$(use_enable cpu_flags_x86_sse ssemath)
+		$(use_enable cpu_flags_x86_mmx mmx)
+		$(use_enable cpu_flags_x86_3dnow 3dnow)
+		$(use_enable cpu_flags_x86_sse sse)
+		$(use_enable cpu_flags_x86_sse2 sse2)
+		$(use_enable altivec)
+		$(use_enable oss)
+		$(use_enable alsa)
+		--disable-alsa-shared
+		--disable-esd
+		$(use_enable pulseaudio)
+		--disable-pulseaudio-shared
+		--disable-arts
+		$(use_enable nas)
+		--disable-nas-shared
+		--disable-sndio
+		--disable-sndio-shared
+		$(use_enable sound diskaudio)
+		$(use_enable sound dummyaudio)
+		$(use_enable wayland video-wayland)
+		--disable-wayland-shared
+		--disable-video-mir
+		$(use_enable X video-x11)
+		--disable-x11-shared
+		$(use_enable X video-x11-xcursor)
+		$(use_enable X video-x11-xdbe)
+		$(use_enable xinerama video-x11-xinerama)
+		$(use_enable X video-x11-xinput)
+		$(use_enable X video-x11-xrandr)
+		$(use_enable xscreensaver video-x11-scrnsaver)
+		$(use_enable X video-x11-xshape)
+		$(use_enable X video-x11-vm)
+		--disable-video-cocoa
+		--disable-video-directfb
+		$(multilib_native_use_enable fusionsound)
+		--disable-fusionsound-shared
+		$(use_enable video video-dummy)
+		$(use_enable opengl video-opengl)
+		--disable-video-opengles1
+		$(use_enable gles video-opengles2)
+		--disable-video-vulkan
+		$(use_enable udev libudev)
+		$(use_enable dbus)
+		--disable-ibus
+		$(use_enable tslib input-tslib)
+		--disable-directx
+		--disable-rpath
+		--disable-render-d3d
+		$(use_with X x)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	emake V=1
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+	dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md
+}
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index 3eaecb5769f4..b86b908d9001 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -11,7 +11,7 @@ EBUILD openjpeg-1.5.2.ebuild 1974 SHA256 01988d07b71b18f2885c9b6f09f85e1cdb41b63
 EBUILD openjpeg-2.1.1_p20160922.ebuild 4088 SHA256 ac71ea606718abdb2b6af8a5afbfabc9994a87fe1dada0f800f5442cf485f14b SHA512 47b2f5438a3cf8faeb541abe3f635bb2292543417dda4329e2628a187d9644a2330542f6d6477af2f86f3396240954e4dec5201cfe7a0869e7ab6fbef22e722f WHIRLPOOL dc8edf8a299c3ed7075b3ffc0ade49c537e2cde7124ee0e5dc6a327f410939a1e15274e3e3c862825bae2c0003c2faaf687ee575ffc490427dff90dc35c346ae
 EBUILD openjpeg-2.1.2.ebuild 3997 SHA256 5eb3069223fcc3c3f7d9b83cc3df3a5110480bbd86c7c9d84170c7bfdc03a02d SHA512 565340cbb50143209c30ed3296784d9f42ea48c821abf6bf15045d0b906f08793cb7f0027192279f0e868758f093cf4fcaefcc5528d45f044c345fa1ad892491 WHIRLPOOL 2c58b6d1064eb2097f8274f5d7a9d8c8a2d5fc2a5c9b6fe9616e37f6370a964ae6cf6a47c2e59df0b99b1e551f740da4654b3c2685155c84fae7524f26e8362c
 EBUILD openjpeg-2.2.0.ebuild 3992 SHA256 06f5d4020f9a99839ce9322e22bc2e4fbcec64ec2c898e40dfab338f9db8d2fc SHA512 b11dca2fc9fa15236f0e4b8489d5ae3ea4bc72a536f438e22da5b5e65f79946798b90392acd8a435bc1c74c4da4bedc0851cbbd868da00ded31a636328cba693 WHIRLPOOL 5ebbf9cc48307885f8d0936c2454ccedba814a388c9a36e26dab122eb3c048652a7324603c33ffc2c9188ab5ef5febea742e440d02e40bc39157c006d64d1172
-EBUILD openjpeg-2.3.0.ebuild 4116 SHA256 5b37590b31e5be1b89bc24f175b783105652ad996e1ad89ffd8953945770ba1a SHA512 58194126a700379e4e6f3004db124b621b479180ea94d8f51b863d7523d35dcd81bd5865d137266b84f7a080e0d28bf75cb301a503cefe2a56979dfc26e82b72 WHIRLPOOL 51abb3be5c5cfa0fb06496cf3ae2e83ad3eb11d6fd4350792e271f17e6502ec23af5cadd11071ff27b6a092903544ebb2ce9dbdef0f08c99f5054f5d52d8d3ca
+EBUILD openjpeg-2.3.0.ebuild 4115 SHA256 d62699c6be92cf64c003dcbbfddb1d3245ecec2a531ce4f1cb2b3e83e463bd0f SHA512 3c42579929cd9900e371238ac7e5b2d4d3dcba748c7c6ed0c61a69d2c1b77109de3cbd83543d555a56db174808857e85f3ff7deccda00083e240a0c9080a0fde WHIRLPOOL c0b5fbf082c139219bbc262ceb647bb3cadf65df10b1b9120eab6a20460c041d4c415bedb196ccd53be4fc14730d5c87005b3be9d62009d1bc3e5380c1a58989
 MISC ChangeLog 7107 SHA256 ab91aa79e988c8ada9fdcd3eb581d62b34f06a4d104898fe6a0692b3822a4841 SHA512 34c554fb7c5b542c4a18b851f5aa9ccdcc47f41ca9815d8a5ebfef6fae9ae65b7265de897980c5adf7a57b1b6fcf7bd6ac0a37b945861a317a578b22b2869e7c WHIRLPOOL 75abb312e47fdf966b704d3dafafa73601a44d32930d243a32e50af0013bb9e286d08777abd2b6a0ba965749d39c94d61a8dd29751fd5d49a14b58446985359b
 MISC ChangeLog-2015 16632 SHA256 16e64b73b25390f6136c6685474f98e28e09511117c2cfd3e80199cadb59e362 SHA512 73cc1e6014a2a2bb5941d794d5b8b8f295ce8a207ecf532d67504ef219eb28ecb722d2fc913de8543abbd94dbeca89193bbb68d9dfb9a1dd774c1018efa0c37d WHIRLPOOL 4297848b013d0c4d5e65238759d36e610010e7e3ea7c4467d5e495fd3c88ce989d78170ff17b2ff69cb991fdb2d1a5772cdb32af952e694691e2a079e0da39a7
 MISC metadata.xml 455 SHA256 b4fd557d0fea3afd283e339e0c37bfa73e89d3e9b5714b218c610c1a50db0fa4 SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d WHIRLPOOL a020c98df36a2844fcd319067e6778dc07558368421706da6220a591ad8c21bedc4e572ae959e09a7e48d4adf4dd26a0f6bfedfe1e763068882ef8ec871a03c2
diff --git a/media-libs/openjpeg/openjpeg-2.3.0.ebuild b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
index 9bf6d66e6ade..91b23a7668ef 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="2/7" # based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~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 ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs test"
 
 RDEPEND="media-libs/lcms:2=
diff --git a/media-libs/suil/Manifest b/media-libs/suil/Manifest
index b5dcb1c794c4..85f245e3b1ef 100644
--- a/media-libs/suil/Manifest
+++ b/media-libs/suil/Manifest
@@ -1,5 +1,7 @@
+DIST suil-0.10.0.tar.bz2 159059 SHA256 9895c531f80c7e89a2b4b47de589d73b70bf48db0b0cfe56e5d54237ea4b8848 SHA512 721b73d987c1712e82493386e5d71957002c8a713595fce4372f1a5eb306c64a559db1ca794cec96295f72e22a9c0e9193f9a68b7f5846f2db45ce16b253fbea WHIRLPOOL 47662ddcd46aac1276fb8d8848c6ff3c5c5885345f2edcb299997e8547f251ad06cdaff85e4ed46163fea1b6a5ef59d4dee85ac3b72ab3b4ed23ea440eed6957
 DIST suil-0.8.2.tar.bz2 141929 SHA256 787608c1e5b1f5051137dbf77c671266088583515af152b77b45e9c3a36f6ae8 SHA512 63141aa61a6501b735f38f597763b7190158db7b5bc06afd8989bddd70372d78de937820fa6751192aefaf415c417387426c1c1bdb666cf231f74a2c4c9f7e91 WHIRLPOOL e4aad86de286c29954aa53402cf7bd5c7d6c91c710b53738679ae361eadfa62c69481cdc94e6a4116a838d49f73bae11a7e849c116d95b5a0f57d9a57fdd5470
 DIST suil-0.8.4.tar.bz2 156375 SHA256 6ef2247eaeaf3b5d7fc7a2728bcbca797d40586111c954bbc9d80805211d51ce SHA512 45e59f9c16143094e9a4f27a9fdf5dc293bbab03473f39d8d2266ec7d93826b2790a77220ea665ae405a3a299ef25158c19076482f4b79e843eb97455e37c688 WHIRLPOOL 9298c13a4aa5e9b0919792921a098ac313a32a7aaebdad617cb0cc6167ff36c2d7f85980636dd39521be602c80becdb60ecd2d99a15b961960ea85c43914dbba
+EBUILD suil-0.10.0.ebuild 997 SHA256 a014eacabb27a01975ee255f90df3e8fd78aaaca3103cbe96b5b54289d2778a7 SHA512 af6ca2d4d515badc0ef1ef578d15609ff1813b00adc76a8717b76def502a6c7de4b76d4a27d0b70d55bbbe65636d44625b15527c75f41290766adb404e23c992 WHIRLPOOL d78975681602cbcade3f2a4bd7c62932369ab6a635b0df8f92621c52c1ee3da3e5d26705095690e1897bc03dae56fbfde55f571ec65c951a4abef39cbd38d988
 EBUILD suil-0.8.2.ebuild 947 SHA256 2b8dcc7727936704ef8ade3b0da64769052956f9a66fa8d0778dfc984238fac0 SHA512 65b501769db812f916c949bd215aa03a0d524017a8f92d857c4d629b8167a6360925db17a8d3c60ad5f61d0cdb56a99ab865742d0401d89ff60b179cf9dc6522 WHIRLPOOL 885a5c897bc2b08313ee2f53d71233db4583f938396eda4e5168a6afc73ccb26593c5f30449c7cc0a0ebd32148e0551fcabee3207a62091989333a0b6b047dde
 EBUILD suil-0.8.4.ebuild 1050 SHA256 1c0b4e172dbeb3250e42c0a14abecb98013607380574c1e520f71aefcd951eb6 SHA512 177b674a2c637f4836b2badcea6a1478230c9abc590c877e00066e0f2373c2f2cd2f2baeecc23a236f5d03dbe149a5ee3b733681e7ee06e45d6abcf1bafc9c5f WHIRLPOOL e3250363131a52f652e870c91d74c381e5e8d62e5695bb54cd9fade494f53c9f04184776efdd86174c56d9f73e61ba967d9524f7ae0f4d5665aed4af52571789
 MISC ChangeLog 3080 SHA256 e34a605c16bbcbe29a2d8a33e1cc7b63f642aad35cc16fc3e22a6daa2e10ceea SHA512 d22eb91aceebec35a0c7f4b50ccb7641e8ce2e3d396763e6e6978b4ae0e7c28c416a0c1dc2b0b0d596347d3296840e652499f1c88422974bc7f9fa846a228306 WHIRLPOOL 054b454ccd7d3ec829c810a3785e02c81b2626693fbbef6d606e4a32bf504e93b290d04c2dd04349deed3c1b795c847925579a078bcc05ffa576529e5dfe7736
diff --git a/media-libs/suil/suil-0.10.0.ebuild b/media-libs/suil/suil-0.10.0.ebuild
new file mode 100644
index 000000000000..c45a05c2483f
--- /dev/null
+++ b/media-libs/suil/suil-0.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE='threads(+)'
+
+inherit flag-o-matic python-any-r1 waf-utils
+
+DESCRIPTION="Lightweight C library for loading and wrapping LV2 plugin UIs"
+HOMEPAGE="http://drobilla.net/software/suil/"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gtk qt5"
+
+RDEPEND=">=media-libs/lv2-1.12.0
+	gtk? ( x11-libs/gtk+:2 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+	default
+	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
+}
+
+src_configure() {
+	waf-utils_src_configure \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--no-qt4 \
+		$(usex gtk '' --no-gtk) \
+		$(usex qt5 '' --no-qt5) \
+		$(usex doc --docs '')
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f31eacae7efb..e062da2e3ce3 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 10 Oct 2017 15:09:00 +0000
+Wed, 11 Oct 2017 15:39:47 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f31eacae7efb..e062da2e3ce3 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 10 Oct 2017 15:09:00 +0000
+Wed, 11 Oct 2017 15:39:47 +0000
diff --git a/metadata/md5-cache/app-admin/sshguard-2.0.99 b/metadata/md5-cache/app-admin/sshguard-2.0.99
new file mode 100644
index 000000000000..863fb46cbfba
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sshguard-2.0.99
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DEPEND=sys-devel/flex
+DESCRIPTION=protects hosts from brute force attacks against ssh
+EAPI=6
+HOMEPAGE=http://sshguard.sourceforge.net/
+KEYWORDS=~amd64 ~x86 ~x86-fbsd
+LICENSE=BSD
+RDEPEND=virtual/logger
+SLOT=0
+SRC_URI=mirror://sourceforge/sshguard/sshguard-2.0.99.tar.gz
+_md5_=9cca15d27ebda6d9c26c4106134b562c
diff --git a/metadata/md5-cache/app-arch/zstd-1.3.2 b/metadata/md5-cache/app-arch/zstd-1.3.2
new file mode 100644
index 000000000000..92e5bd573cdd
--- /dev/null
+++ b/metadata/md5-cache/app-arch/zstd-1.3.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=app-arch/xz-utils
+DESCRIPTION=zstd fast compression library
+EAPI=6
+HOMEPAGE=https://facebook.github.io/zstd/
+IUSE=static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86
+LICENSE=|| ( BSD GPL-2 )
+RDEPEND=app-arch/xz-utils
+SLOT=0/1
+SRC_URI=https://github.com/facebook/zstd/archive/v1.3.2.tar.gz -> zstd-1.3.2.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=8e7fcc57c17743402779616a61c4cf62
diff --git a/metadata/md5-cache/app-misc/vit-1.2-r1 b/metadata/md5-cache/app-misc/vit-1.2-r1
index 0156baa02fbc..dee235669e98 100644
--- a/metadata/md5-cache/app-misc/vit-1.2-r1
+++ b/metadata/md5-cache/app-misc/vit-1.2-r1
@@ -6,7 +6,8 @@ HOMEPAGE=http://tasktools.org/projects/vit.html
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
 RDEPEND=app-misc/task dev-lang/perl dev-perl/Curses
+RESTRICT=test
 SLOT=0
 SRC_URI=https://git.tasktools.org/EX/vit/archive/v1.2.tar.gz -> vit-1.2.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=edd174af16f7255c8523aec4cbb58d69
+_md5_=014367f7a4bc70c8a06a6e2723ce9ae1
diff --git a/metadata/md5-cache/app-text/dos2unix-7.3.5 b/metadata/md5-cache/app-text/dos2unix-7.3.5
index ce47dd242f99..97d95ce3ce30 100644
--- a/metadata/md5-cache/app-text/dos2unix-7.3.5
+++ b/metadata/md5-cache/app-text/dos2unix-7.3.5
@@ -4,10 +4,10 @@ DESCRIPTION=Convert DOS or MAC text files to UNIX format or vice versa
 EAPI=6
 HOMEPAGE=http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/
 IUSE=debug nls test linguas_da linguas_de linguas_eo linguas_es linguas_fr linguas_hu linguas_ja linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sr linguas_sv linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
 LICENSE=BSD-2
 RDEPEND=!app-text/hd2u virtual/libintl
 SLOT=0
 SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-7.3.5.tar.gz mirror://sourceforge/dos2unix/dos2unix-7.3.5.tar.gz
 _eclasses_=l10n	2c2e15383ba891d642f51896a7f0ecfe	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=86cc43083509070faffe0aff2cf1c995
+_md5_=9b73c121f8c1988958a58d9e10561893
diff --git a/metadata/md5-cache/app-text/dos2unix-7.4.0 b/metadata/md5-cache/app-text/dos2unix-7.4.0
new file mode 100644
index 000000000000..192ba37cca36
--- /dev/null
+++ b/metadata/md5-cache/app-text/dos2unix-7.4.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=!app-text/hd2u virtual/libintl nls? ( sys-devel/gettext ) test? ( virtual/perl-Test-Simple ) dev-lang/perl
+DESCRIPTION=Convert DOS or MAC text files to UNIX format or vice versa
+EAPI=6
+HOMEPAGE=http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/
+IUSE=debug nls test linguas_da linguas_de linguas_eo linguas_es linguas_fr linguas_hu linguas_ja linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_ru linguas_sr linguas_sv linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+LICENSE=BSD-2
+RDEPEND=!app-text/hd2u virtual/libintl
+SLOT=0
+SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-7.4.0.tar.gz mirror://sourceforge/dos2unix/dos2unix-7.4.0.tar.gz
+_eclasses_=l10n	2c2e15383ba891d642f51896a7f0ecfe	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=86cc43083509070faffe0aff2cf1c995
diff --git a/metadata/md5-cache/app-text/jabref-bin-4.0 b/metadata/md5-cache/app-text/jabref-bin-4.0
index 8e44abb42d5e..af1739f4aa95 100644
--- a/metadata/md5-cache/app-text/jabref-bin-4.0
+++ b/metadata/md5-cache/app-text/jabref-bin-4.0
@@ -6,8 +6,8 @@ HOMEPAGE=http://www.jabref.org/
 IUSE=elibc_FreeBSD
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
+RDEPEND=|| ( dev-java/oracle-jre-bin:1.8[javafx] dev-java/oracle-jdk-bin:1.8[javafx] ) >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/JabRef/jabref/releases/download/v4.0/JabRef-4.0.jar
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7c985cf1cbfa166fc01d7eca9bfe06ec
+_md5_=d38606bb1d704a75be4b6440afa1e09e
diff --git a/metadata/md5-cache/app-vim/vim-spell-cs-20061021-r1 b/metadata/md5-cache/app-vim/vim-spell-cs-20061021-r1
new file mode 100644
index 000000000000..ddedc5c1ae0e
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-spell-cs-20061021-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=vim spell files: Czech (cs)
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=~amd64 ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://gentoo/vim-spell-cs-20061021.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-spell	dcc9ab75ad0c33e288e5feb39a55d2f9
+_md5_=62bd0b75f14f8320674b49e9362a196f
diff --git a/metadata/md5-cache/app-vim/vim-spell-de-20080213-r1 b/metadata/md5-cache/app-vim/vim-spell-de-20080213-r1
index 8206604876b8..6d097c1306bd 100644
--- a/metadata/md5-cache/app-vim/vim-spell-de-20080213-r1
+++ b/metadata/md5-cache/app-vim/vim-spell-de-20080213-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=vim spell files: German (de)
 EAPI=6
-HOMEPAGE=https://www.vim.org
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~arm ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=amd64 ppc sparc x86 ~arm ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/vim-spell-de-20080213.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-spell	dcc9ab75ad0c33e288e5feb39a55d2f9
-_md5_=2fefd21dc40bf717b08f95b763865bdf
+_md5_=cddb55e740a589751db97d7d41df22a6
diff --git a/metadata/md5-cache/app-vim/vim-spell-en-20060123-r1 b/metadata/md5-cache/app-vim/vim-spell-en-20060123-r1
new file mode 100644
index 000000000000..428589d8fd61
--- /dev/null
+++ b/metadata/md5-cache/app-vim/vim-spell-en-20060123-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=vim spell files: English (en)
+EAPI=6
+HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD LGPL-2.1 public-domain
+SLOT=0
+SRC_URI=mirror://gentoo/vim-spell-en-20060123.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	vim-spell	dcc9ab75ad0c33e288e5feb39a55d2f9
+_md5_=32f7865acec826eca7ef9315e3940390
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.46 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.46
index e1553a7868e2..2aedfdf3740b 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.46
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.46
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
 EAPI=5
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.46/src/apache-tomcat-8.0.46-src.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=51bb4d8efc5d28f8596a04d3e562eca6
+_md5_=f0194f60f306a251c3c109de69bbcefa
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.47 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.47
new file mode 100644
index 000000000000..a93644ba410b
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.0.47
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
+EAPI=5
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.1
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.47/src/apache-tomcat-8.0.47-src.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=51bb4d8efc5d28f8596a04d3e562eca6
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.23 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.23
new file mode 100644
index 000000000000..48abacbc6c6a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.23
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
+EAPI=6
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.1
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.23/src/apache-tomcat-8.5.23-src.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=10be5b9b53560f29825aff61e435aec2
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.1_beta b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.1_beta
new file mode 100644
index 000000000000..f2f06d7424c9
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.1_beta
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup
+DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation
+EAPI=6
+HOMEPAGE=http://tomcat.apache.org/
+IUSE=elibc_FreeBSD source elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.1/src/apache-tomcat-9.0.1-src.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=dc16cc2462665da777161a01a4645893
diff --git a/metadata/md5-cache/dev-lang/elixir-1.5.2 b/metadata/md5-cache/dev-lang/elixir-1.5.2
new file mode 100644
index 000000000000..637fd61f995b
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/elixir-1.5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/erlang-18[ssl]
+DESCRIPTION=Elixir programming language
+EAPI=6
+HOMEPAGE=https://elixir-lang.org
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+LICENSE=Apache-2.0 ErlPL-1.1
+RDEPEND=>=dev-lang/erlang-18[ssl]
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/elixir-lang/elixir/archive/v1.5.2.tar.gz -> elixir-1.5.2.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=500141243b39a55a329ba41f81a30bdb
diff --git a/metadata/md5-cache/dev-lang/swi-prolog-7.6.0 b/metadata/md5-cache/dev-lang/swi-prolog-7.6.0
new file mode 100644
index 000000000000..087ba50257d7
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/swi-prolog-7.6.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) X? ( x11-proto/xproto ) java? ( test? ( =dev-java/junit-3.8* ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=free, small, and standard compliant Prolog compiler
+EAPI=5
+HOMEPAGE=http://www.swi-prolog.org/
+IUSE=archive berkdb debug doc +gmp hardened java +libedit libressl minimal odbc pcre readline ssl static-libs test uuid zlib X elibc_FreeBSD java
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:= archive? ( app-arch/libarchive ) berkdb? ( >=sys-libs/db-4:= ) zlib? ( sys-libs/zlib ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) readline? ( sys-libs/readline:= ) libedit? ( dev-libs/libedit ) gmp? ( dev-libs/gmp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) java? ( >=virtual/jdk-1.7:= ) uuid? ( dev-libs/ossp-uuid ) X? ( virtual/jpeg:0 x11-libs/libX11 x11-libs/libXft x11-libs/libXpm x11-libs/libXt x11-libs/libICE x11-libs/libSM ) java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0
+SRC_URI=http://www.swi-prolog.org/download/stable/src/swipl-7.6.0.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=04d5e7b8cf66f3050488f20849caf6b0
diff --git a/metadata/md5-cache/dev-libs/libfilezilla-0.11.0 b/metadata/md5-cache/dev-libs/libfilezilla-0.11.0
new file mode 100644
index 000000000000..2aa411ffee9a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libfilezilla-0.11.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=pretend
+DEPEND=test? ( dev-util/cppunit )
+DESCRIPTION=C++ library offering some basic functionality for platform-independent programs
+EAPI=6
+HOMEPAGE=https://lib.filezilla-project.org/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=mirror://sourceforge/filezilla/libfilezilla-0.11.0.tar.bz2 http://download.filezilla-project.org/libfilezilla/libfilezilla-0.11.0.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=bff18b33f07ad75f5f436d5396bc2432
diff --git a/metadata/md5-cache/dev-lisp/sbcl-1.4.0 b/metadata/md5-cache/dev-lisp/sbcl-1.4.0
index 773d7760c4ab..76d233c20160 100644
--- a/metadata/md5-cache/dev-lisp/sbcl-1.4.0
+++ b/metadata/md5-cache/dev-lisp/sbcl-1.4.0
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lisp/asdf-3.1:= !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
 SLOT=0/1.4.0
 SRC_URI=mirror://sourceforge/sbcl/sbcl-1.4.0-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-1.4.0-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.3.12-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.3.16-arm64-linux-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-macos? ( mirror://sourceforge/sbcl/sbcl-1.1.6-x86-darwin-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=4457bad63cc36cff67cf790233bb8cef
+_md5_=c65c0fe031338ee51bde856908fc9871
diff --git a/metadata/md5-cache/dev-perl/Lab-Measurement-3.600.0 b/metadata/md5-cache/dev-perl/Lab-Measurement-3.600.0
new file mode 100644
index 000000000000..40e2e7d72693
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Lab-Measurement-3.600.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=virtual/perl-Carp dev-perl/Class-ISA >=dev-perl/Class-Method-Modifiers-2.110.0 >=dev-perl/Clone-0.310.0 virtual/perl-Data-Dumper virtual/perl-Encode >=dev-perl/Exception-Class-1.0.0 virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Hook-LexWrap virtual/perl-IO >=dev-perl/IO-Socket-Timeout-0.320.0 dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Math-Complex >=virtual/perl-Module-Load-0.260.0 >=dev-perl/Moose-2.121.300 >=dev-perl/MooseX-Params-Validate-0.180.0 >=dev-perl/PDL-2.7.0 dev-perl/PDL-Graphics-Gnuplot >=dev-perl/Role-Tiny-1.3.4 virtual/perl-Socket dev-perl/Statistics-Descriptive virtual/perl-Storable >=dev-perl/TermReadKey-2.300.0 virtual/perl-Thread-Semaphore virtual/perl-Time-HiRes >=dev-perl/Try-Tiny-0.220.0 >=dev-perl/YAML-LibYAML-0.410.0 virtual/perl-autodie >=dev-perl/namespace-autoclean-0.200.0 virtual/perl-parent sci-visualization/gnuplot virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/File-Slurper virtual/perl-File-Temp dev-perl/Test-Fatal dev-perl/Test-File virtual/perl-Test-Simple dev-perl/Text-Diff dev-perl/aliased ) dev-lang/perl:=
+DESCRIPTION=Measurement control and automation with Perl
+EAPI=6
+HOMEPAGE=http://www.labmeasurement.de/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-perl/Class-ISA >=dev-perl/Class-Method-Modifiers-2.110.0 >=dev-perl/Clone-0.310.0 virtual/perl-Data-Dumper virtual/perl-Encode >=dev-perl/Exception-Class-1.0.0 virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Hook-LexWrap virtual/perl-IO >=dev-perl/IO-Socket-Timeout-0.320.0 dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Math-Complex >=virtual/perl-Module-Load-0.260.0 >=dev-perl/Moose-2.121.300 >=dev-perl/MooseX-Params-Validate-0.180.0 >=dev-perl/PDL-2.7.0 dev-perl/PDL-Graphics-Gnuplot >=dev-perl/Role-Tiny-1.3.4 virtual/perl-Socket dev-perl/Statistics-Descriptive virtual/perl-Storable >=dev-perl/TermReadKey-2.300.0 virtual/perl-Thread-Semaphore virtual/perl-Time-HiRes >=dev-perl/Try-Tiny-0.220.0 >=dev-perl/YAML-LibYAML-0.410.0 virtual/perl-autodie >=dev-perl/namespace-autoclean-0.200.0 virtual/perl-parent sci-visualization/gnuplot dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AK/AKHUETTEL/Lab-Measurement-3.600.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=951cfd94f733f5a577ddc6f85fe379a4
diff --git a/metadata/md5-cache/dev-perl/Lab-Measurement-9999 b/metadata/md5-cache/dev-perl/Lab-Measurement-9999
index e9592bfe844e..8666215147f5 100644
--- a/metadata/md5-cache/dev-perl/Lab-Measurement-9999
+++ b/metadata/md5-cache/dev-perl/Lab-Measurement-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=virtual/perl-Carp dev-perl/Class-ISA >=dev-perl/Class-Method-Modifiers-2.110.0 >=dev-perl/Clone-0.310.0 virtual/perl-Data-Dumper virtual/perl-Encode >=dev-perl/Exception-Class-1.0.0 virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Hook-LexWrap virtual/perl-IO >=dev-perl/IO-Socket-Timeout-0.320.0 dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Math-Complex >=virtual/perl-Module-Load-0.260.0 >=dev-perl/Moose-2.121.300 >=dev-perl/MooseX-Params-Validate-0.180.0 >=dev-perl/PDL-2.7.0 dev-perl/PDL-Graphics-Gnuplot >=dev-perl/Role-Tiny-1.3.4 virtual/perl-Socket dev-perl/Statistics-Descriptive virtual/perl-Storable >=dev-perl/TermReadKey-2.300.0 virtual/perl-Thread-Semaphore virtual/perl-Time-HiRes >=dev-perl/Try-Tiny-0.220.0 >=dev-perl/YAML-LibYAML-0.410.0 virtual/perl-autodie >=dev-perl/namespace-autoclean-0.200.0 virtual/perl-parent sci-visualization/gnuplot virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/File-Slurper virtual/perl-File-Temp dev-perl/Test-Fatal dev-perl/Test-File virtual/perl-Test-Simple dev-perl/Text-Diff dev-perl/aliased ) dev-perl/Dist-Zilla dev-perl/Dist-Zilla-Plugin-Git dev-perl/Dist-Zilla-Plugin-SurgicalPodWeaver dev-perl/Dist-Zilla-Plugin-RPM dev-perl/Dist-Zilla-Plugin-AuthorsFromGit dev-lang/perl:= >=dev-vcs/git-1.8.2.1
+DEPEND=virtual/perl-Carp dev-perl/Class-ISA >=dev-perl/Class-Method-Modifiers-2.110.0 >=dev-perl/Clone-0.310.0 virtual/perl-Data-Dumper virtual/perl-Encode >=dev-perl/Exception-Class-1.0.0 virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Hook-LexWrap virtual/perl-IO >=dev-perl/IO-Socket-Timeout-0.320.0 dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Math-Complex >=virtual/perl-Module-Load-0.260.0 >=dev-perl/Moose-2.121.300 >=dev-perl/MooseX-Params-Validate-0.180.0 >=dev-perl/PDL-2.7.0 dev-perl/PDL-Graphics-Gnuplot >=dev-perl/Role-Tiny-1.3.4 virtual/perl-Socket dev-perl/Statistics-Descriptive virtual/perl-Storable >=dev-perl/TermReadKey-2.300.0 virtual/perl-Thread-Semaphore virtual/perl-Time-HiRes >=dev-perl/Try-Tiny-0.220.0 >=dev-perl/YAML-LibYAML-0.410.0 virtual/perl-autodie >=dev-perl/namespace-autoclean-0.200.0 virtual/perl-parent sci-visualization/gnuplot virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/File-Slurper virtual/perl-File-Temp dev-perl/Test-Fatal dev-perl/Test-File virtual/perl-Test-Simple dev-perl/Text-Diff dev-perl/aliased ) dev-perl/Dist-Zilla dev-perl/Dist-Zilla-Plugin-Git dev-perl/Dist-Zilla-Plugin-SurgicalPodWeaver dev-perl/Dist-Zilla-Plugin-RPM dev-perl/Dist-Zilla-Plugin-AuthorsFromGit dev-lang/perl:= >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Measurement control and automation with Perl
 EAPI=6
 HOMEPAGE=http://www.labmeasurement.de/
 IUSE=test
 LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=virtual/perl-Carp dev-perl/Class-ISA >=dev-perl/Class-Method-Modifiers-2.110.0 >=dev-perl/Clone-0.310.0 virtual/perl-Data-Dumper virtual/perl-Encode >=dev-perl/Exception-Class-1.0.0 virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Hook-LexWrap virtual/perl-IO >=dev-perl/IO-Socket-Timeout-0.320.0 dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Math-Complex >=virtual/perl-Module-Load-0.260.0 >=dev-perl/Moose-2.121.300 >=dev-perl/MooseX-Params-Validate-0.180.0 >=dev-perl/PDL-2.7.0 dev-perl/PDL-Graphics-Gnuplot >=dev-perl/Role-Tiny-1.3.4 virtual/perl-Socket dev-perl/Statistics-Descriptive virtual/perl-Storable >=dev-perl/TermReadKey-2.300.0 virtual/perl-Thread-Semaphore virtual/perl-Time-HiRes >=dev-perl/Try-Tiny-0.220.0 >=dev-perl/YAML-LibYAML-0.410.0 virtual/perl-autodie >=dev-perl/namespace-autoclean-0.200.0 virtual/perl-parent sci-visualization/gnuplot dev-lang/perl:=
+RDEPEND=virtual/perl-Carp dev-perl/Class-ISA >=dev-perl/Class-Method-Modifiers-2.110.0 >=dev-perl/Clone-0.310.0 virtual/perl-Data-Dumper virtual/perl-Encode >=dev-perl/Exception-Class-1.0.0 virtual/perl-Exporter virtual/perl-File-Path virtual/perl-File-Spec virtual/perl-Getopt-Long dev-perl/Hook-LexWrap virtual/perl-IO >=dev-perl/IO-Socket-Timeout-0.320.0 dev-perl/List-MoreUtils virtual/perl-Scalar-List-Utils virtual/perl-Math-Complex >=virtual/perl-Module-Load-0.260.0 >=dev-perl/Moose-2.121.300 >=dev-perl/MooseX-Params-Validate-0.180.0 >=dev-perl/PDL-2.7.0 dev-perl/PDL-Graphics-Gnuplot >=dev-perl/Role-Tiny-1.3.4 virtual/perl-Socket dev-perl/Statistics-Descriptive virtual/perl-Storable >=dev-perl/TermReadKey-2.300.0 virtual/perl-Thread-Semaphore virtual/perl-Time-HiRes >=dev-perl/Try-Tiny-0.220.0 >=dev-perl/YAML-LibYAML-0.410.0 virtual/perl-autodie >=dev-perl/namespace-autoclean-0.200.0 virtual/perl-parent sci-visualization/gnuplot dev-lang/perl:=
 SLOT=0
 _eclasses_=git-r3	52a888802d25387c2c74cb845d1219bc	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=db55422529fd6064541ff9cbc751fc69
+_md5_=951cfd94f733f5a577ddc6f85fe379a4
diff --git a/metadata/md5-cache/dev-ruby/capistrano-3.9.1 b/metadata/md5-cache/dev-ruby/capistrano-3.9.1
new file mode 100644
index 000000000000..2fa36160eca9
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/capistrano-3.9.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby22] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby22] >=dev-ruby/rake-10.0.0[ruby_targets_ruby22] dev-ruby/i18n:*[ruby_targets_ruby22] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby23] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby23] >=dev-ruby/rake-10.0.0[ruby_targets_ruby23] dev-ruby/i18n:*[ruby_targets_ruby23] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/mocha[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/mocha[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
+DESCRIPTION=A distributed application deployment system
+EAPI=6
+HOMEPAGE=http://capistranorb.com/
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby22] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby22] >=dev-ruby/rake-10.0.0[ruby_targets_ruby22] dev-ruby/i18n:*[ruby_targets_ruby22] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/airbrussh-1.0.0[ruby_targets_ruby23] >=dev-ruby/sshkit-1.9:0[ruby_targets_ruby23] >=dev-ruby/rake-10.0.0[ruby_targets_ruby23] dev-ruby/i18n:*[ruby_targets_ruby23] !!<dev-ruby/capistrano-2.15.5-r2[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
+SLOT=3
+SRC_URI=mirror://rubygems/capistrano-3.9.1.gem
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=914d7e8c5f5dbbed04397ed90be4c153
diff --git a/metadata/md5-cache/dev-ruby/omniauth-1.7.1 b/metadata/md5-cache/dev-ruby/omniauth-1.7.1
new file mode 100644
index 000000000000..a629d01f1983
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/omniauth-1.7.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby22] <dev-ruby/hashie-3.6.0:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby23] <dev-ruby/hashie-3.6.0:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby24] <dev-ruby/rack-3:*[ruby_targets_ruby24] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby24] <dev-ruby/hashie-3.6.0:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( doc? ( dev-ruby/yard[ruby_targets_ruby22] ) test? ( dev-ruby/rack-test[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/yard[ruby_targets_ruby23] ) test? ( dev-ruby/rack-test[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/yard[ruby_targets_ruby24] ) test? ( dev-ruby/rack-test[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A generalized Rack framework for multiple-provider authentication
+EAPI=6
+HOMEPAGE=https://github.com/intridea/omniauth
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby22] <dev-ruby/rack-3:*[ruby_targets_ruby22] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby22] <dev-ruby/hashie-3.6.0:3[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby23] <dev-ruby/rack-3:*[ruby_targets_ruby23] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby23] <dev-ruby/hashie-3.6.0:3[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rack-1.6.2:*[ruby_targets_ruby24] <dev-ruby/rack-3:*[ruby_targets_ruby24] >=dev-ruby/hashie-3.4.6:3[ruby_targets_ruby24] <dev-ruby/hashie-3.6.0:3[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://github.com/intridea/omniauth/archive/v1.7.1.tar.gz -> omniauth-1.7.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=7b5deea1cfadc82a034e2e5dc305fc07
diff --git a/metadata/md5-cache/dev-util/artifactory-bin-5.5.1 b/metadata/md5-cache/dev-util/artifactory-bin-5.5.1
new file mode 100644
index 000000000000..620c6dc65064
--- /dev/null
+++ b/metadata/md5-cache/dev-util/artifactory-bin-5.5.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare setup
+DEPEND=>=virtual/jdk-1.8 app-arch/unzip
+DESCRIPTION=The world's most advanced repository manager for maven
+EAPI=6
+HOMEPAGE=http://www.jfrog.org/products.php
+IUSE=ssl
+KEYWORDS=~x86 ~amd64
+LICENSE=AGPL-3+
+RDEPEND=>=virtual/jre-1.8
+SLOT=0
+SRC_URI=https://bintray.com/artifact/download/jfrog/artifactory/jfrog-artifactory-oss-5.5.1.zip -> artifactory-5.5.1.zip
+_eclasses_=user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=26a42f94f47f8eba0a417b9297b2793c
diff --git a/metadata/md5-cache/mail-mta/postfix-3.3_pre20171009 b/metadata/md5-cache/mail-mta/postfix-3.3_pre20171009
new file mode 100644
index 000000000000..72bbbbbd5dc2
--- /dev/null
+++ b/metadata/md5-cache/mail-mta/postfix-3.3_pre20171009
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) virtual/pkgconfig
+DESCRIPTION=A fast and secure drop-in replacement for sendmail
+EAPI=6
+HOMEPAGE=http://www.postfix.org/
+IUSE=+berkdb cdb doc dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+LICENSE=IBM
+RDEPEND=>=dev-libs/libpcre-3.4 dev-lang/perl berkdb? ( >=sys-libs/db-3.2:* ) cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) eai? ( dev-libs/icu:= ) ldap? ( net-nds/openldap ) ldap-bind? ( net-nds/openldap[sasl] ) lmdb? ( >=dev-db/lmdb-0.9.11 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* ) sasl? ( >=dev-libs/cyrus-sasl-2 ) sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) dovecot-sasl? ( net-mail/dovecot ) memcached? ( net-misc/memcached ) net-mail/mailbase !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp[mta] !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd !<mail-mta/ssmtp-2.64-r2 !>=mail-mta/ssmtp-2.64-r2[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )
+REQUIRED_USE=ldap-bind? ( ldap sasl )
+SLOT=0
+SRC_URI=ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/postfix-3.3-20171009.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
+_md5_=35c6073b51e20186792b5b290c65ee02
diff --git a/metadata/md5-cache/media-libs/faac-1.29.7.8 b/metadata/md5-cache/media-libs/faac-1.29.7.8
new file mode 100644
index 000000000000..0ceb710cf0e5
--- /dev/null
+++ b/metadata/md5-cache/media-libs/faac-1.29.7.8
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=app-portage/elt-patches-20170317
+DESCRIPTION=Free MPEG-4 audio codecs by AudioCoding.com
+EAPI=6
+HOMEPAGE=http://www.audiocoding.com
+IUSE=digitalradio static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=LGPL-2.1 MPEG-4
+SLOT=0
+SRC_URI=mirror://sourceforge/faac/faac-1.29.7.8.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=9eca13969aa725c0c8199cb3289948c0
diff --git a/metadata/md5-cache/media-libs/libsdl2-2.0.6 b/metadata/md5-cache/media-libs/libsdl2-2.0.6
new file mode 100644
index 000000000000..13d7fd2fa5e1
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libsdl2-2.0.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) ) gles? ( >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles2] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tslib? ( >=x11-libs/tslib-1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl,gles2,wayland] >=x11-libs/libxkbcommon-0.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) X? ( >=x11-proto/xextproto-7.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-proto/xproto-7.0.24[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Simple Direct Media Layer
+EAPI=6
+HOMEPAGE=http://www.libsdl.org
+IUSE=cpu_flags_x86_3dnow alsa altivec custom-cflags dbus fusionsound gles haptic +joystick cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video wayland X xinerama xscreensaver abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=ZLIB
+RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( >=sys-apps/dbus-1.6.18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) ) gles? ( >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,gles2] ) nas? ( >=media-libs/nas-1.9.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/glu-9.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tslib? ( >=x11-libs/tslib-1.0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) udev? ( >=virtual/libudev-208:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wayland? ( >=dev-libs/wayland-1.0.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/mesa-9.1.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,egl,gles2,wayland] >=x11-libs/libxkbcommon-0.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXcursor-1.1.14[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXi-1.7.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXrandr-1.4.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXxf86vm-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] xinerama? ( >=x11-libs/libXinerama-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xscreensaver? ( >=x11-libs/libXScrnSaver-1.2.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+REQUIRED_USE=alsa? ( sound ) fusionsound? ( sound ) gles? ( video ) nas? ( sound ) opengl? ( video ) pulseaudio? ( sound ) wayland? ( gles ) xinerama? ( X ) xscreensaver? ( X )
+SLOT=0
+SRC_URI=http://www.libsdl.org/release/SDL2-2.0.6.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=240c8b3bfd945543d5f7c04e19f7ec35
diff --git a/metadata/md5-cache/media-libs/openjpeg-2.3.0 b/metadata/md5-cache/media-libs/openjpeg-2.3.0
index 8e79caf1b810..d6ee3fc74572 100644
--- a/metadata/md5-cache/media-libs/openjpeg-2.3.0
+++ b/metadata/md5-cache/media-libs/openjpeg-2.3.0
@@ -4,10 +4,10 @@ DESCRIPTION=An open-source JPEG 2000 library
 EAPI=6
 HOMEPAGE=http://www.openjpeg.org
 IUSE=doc static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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 ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~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 ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=media-libs/lcms:2= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
 SLOT=2/7
 SRC_URI=https://github.com/uclouvain/openjpeg/archive/v2.3.0.tar.gz -> openjpeg-2.3.0.tar.gz test? ( https://github.com/uclouvain/openjpeg-data/archive/c07f38fae1e67adc288c2d6679df5d3652017fbe.tar.gz -> openjpeg-data_20170814.tar.gz )
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=653fb1d446118300ac6bb129e46c3790
+_md5_=8251376ca410143c3697bc1b063fb2ee
diff --git a/metadata/md5-cache/media-libs/suil-0.10.0 b/metadata/md5-cache/media-libs/suil-0.10.0
new file mode 100644
index 000000000000..3432f405ee53
--- /dev/null
+++ b/metadata/md5-cache/media-libs/suil-0.10.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=>=media-libs/lv2-1.12.0 gtk? ( x11-libs/gtk+:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) || ( dev-lang/python:3.6[threads(+)] dev-lang/python:3.5[threads(+)] dev-lang/python:3.4[threads(+)] >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) doc? ( app-doc/doxygen ) virtual/pkgconfig
+DESCRIPTION=Lightweight C library for loading and wrapping LV2 plugin UIs
+EAPI=6
+HOMEPAGE=http://drobilla.net/software/suil/
+IUSE=doc gtk qt5
+KEYWORDS=~amd64 ~x86
+LICENSE=ISC
+RDEPEND=>=media-libs/lv2-1.12.0 gtk? ( x11-libs/gtk+:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 )
+SLOT=0
+SRC_URI=http://download.drobilla.net/suil-0.10.0.tar.bz2
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
+_md5_=66840644042f5fa1fb94b89e19ac35b0
diff --git a/metadata/md5-cache/net-firewall/shorewall-5.1.7.2 b/metadata/md5-cache/net-firewall/shorewall-5.1.7.2
index b039e2c9deae..7d76e8c23f83 100644
--- a/metadata/md5-cache/net-firewall/shorewall-5.1.7.2
+++ b/metadata/md5-cache/net-firewall/shorewall-5.1.7.2
@@ -4,11 +4,11 @@ DESCRIPTION=A high-level tool for configuring Netfilter
 EAPI=6
 HOMEPAGE=http://www.shorewall.net/
 IUSE=doc +init +ipv4 ipv6 lite4 lite6 selinux
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=alpha amd64 hppa ppc ppc64 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=net-firewall/iptables-1.4.20 >=sys-apps/iproute2-3.8.0[-minimal] >=sys-devel/bc-1.06.95 ipv4? ( >=dev-lang/perl-5.16 virtual/perl-Digest-SHA ) ipv6? ( >=dev-perl/Socket6-0.230.0 >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) lite6? ( >=net-firewall/iptables-1.4.20[ipv6] >=sys-apps/iproute2-3.8.0[ipv6] ) init? ( >=sys-apps/coreutils-8.20 ) selinux? ( >=sec-policy/selinux-shorewall-2.20161023-r3 ) !net-firewall/shorewall-core !net-firewall/shorewall6 !net-firewall/shorewall-lite !net-firewall/shorewall6-lite !net-firewall/shorewall-init !<sys-apps/systemd-214
 REQUIRED_USE=ipv6? ( ipv4 ) || ( ipv4 lite4 lite6 )
 SLOT=0
 SRC_URI=http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.7/shorewall-core-5.1.7.2.tar.bz2 ipv4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.7/shorewall-5.1.7.2.tar.bz2 ) ipv6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.7/shorewall6-5.1.7.2.tar.bz2 ) lite4? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.7/shorewall-lite-5.1.7.2.tar.bz2 ) lite6? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.7/shorewall6-lite-5.1.7.2.tar.bz2 ) init? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.7/shorewall-init-5.1.7.2.tar.bz2 ) doc? ( http://www.shorewall.net/pub/shorewall/5.1/shorewall-5.1.7/shorewall-docs-html-5.1.7.2.tar.bz2 )
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=21dcfc97397e82b7fc7f009315134955
+_md5_=b56cc0da51255d6e639d5af08105844f
diff --git a/metadata/md5-cache/net-libs/libpcap-9999 b/metadata/md5-cache/net-libs/libpcap-9999
index 60f97cb28bd7..726ef710b3e9 100644
--- a/metadata/md5-cache/net-libs/libpcap-9999
+++ b/metadata/md5-cache/net-libs/libpcap-9999
@@ -8,4 +8,4 @@ LICENSE=BSD
 RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	git-r3	52a888802d25387c2c74cb845d1219bc	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=82dfd0d64090e6230fd48384dc1baa88
+_md5_=1e422cf3880d83c76c1a301ac11d09a4
diff --git a/metadata/md5-cache/net-misc/openssh-7.6_p1 b/metadata/md5-cache/net-misc/openssh-7.6_p1
index e86a51ef6a4b..638f710fe063 100644
--- a/metadata/md5-cache/net-misc/openssh-7.6_p1
+++ b/metadata/md5-cache/net-misc/openssh-7.6_p1
@@ -9,6 +9,6 @@ LICENSE=BSD GPL-2
 RDEPEND=!static? ( audit? ( sys-process/audit ) ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit:= ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1:0=[bindist=] dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=sys-libs/zlib-1.2.3:= ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
 REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pam ) X509? ( !ldap !sctp ssl ) test? ( ssl )
 SLOT=0
-SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.6p1.tar.gz https://dev.gentoo.org/~polynomial-c/openssh-7.6_p1-sctp.patch.xz ldap? ( mirror://gentoo/openssh-lpk-7.5p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-11.0/openssh-7.6p1+x509-11.0.diff.gz )
+SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.6p1.tar.gz https://dev.gentoo.org/~polynomial-c/openssh-7.6_p1-sctp.patch.xz ldap? ( https://dev.gentoo.org/~polynomial-c/openssh-lpk-7.6p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-11.0/openssh-7.6p1+x509-11.0.diff.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=52e30e402ddfd70b0f240552a8fa48a2
+_md5_=cb64587e65654cee374a62d0bf74ef7c
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2017.10.07 b/metadata/md5-cache/net-misc/youtube-dl-2017.10.07
new file mode 100644
index 000000000000..4291f5f727a6
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2017.10.07
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[coverage(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Download videos from YouTube.com (and more sites...)
+EAPI=6
+HOMEPAGE=https://rg3.github.com/youtube-dl/
+IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://youtube-dl.org/downloads/2017.10.07/youtube-dl-2017.10.07.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=34313dda9d0bc4ea708bbd95bfbaa3d1
diff --git a/metadata/md5-cache/net-vpn/i2pd-2.13.0 b/metadata/md5-cache/net-vpn/i2pd-2.13.0
index bd68ba12bb58..371ea7a13a99 100644
--- a/metadata/md5-cache/net-vpn/i2pd-2.13.0
+++ b/metadata/md5-cache/net-vpn/i2pd-2.13.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!static? ( >=dev-libs/boost-1.49[threads] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) upnp? ( net-libs/miniupnpc ) ) static? ( >=dev-libs/boost-1.49[static-libs,threads] !libressl? ( dev-libs/openssl:0[static-libs] ) libressl? ( dev-libs/libressl[static-libs] ) upnp? ( net-libs/miniupnpc[static-libs] ) ) i2p-hardening? ( >=sys-devel/gcc-4.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=!static? ( dev-libs/boost[threads] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl:0 >=dev-libs/boost-1.65 ) sys-libs/zlib upnp? ( net-libs/miniupnpc ) ) static? ( dev-libs/boost[static-libs,threads] !libressl? ( dev-libs/openssl:0[static-libs] ) libressl? ( dev-libs/libressl:0[static-libs] >=dev-libs/boost-1.65 ) sys-libs/zlib[static-libs] upnp? ( net-libs/miniupnpc[static-libs] ) ) websocket? ( dev-cpp/websocketpp ) i2p-hardening? ( >=sys-devel/gcc-4.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=A C++ daemon for accessing the I2P anonymous network
 EAPI=6
 HOMEPAGE=https://github.com/PurpleI2P/i2pd
-IUSE=cpu_flags_x86_aes i2p-hardening libressl pch static +upnp
+IUSE=cpu_flags_x86_aes i2p-hardening libressl static +upnp websocket
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=!static? ( >=dev-libs/boost-1.49[threads] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) upnp? ( net-libs/miniupnpc ) )
+RDEPEND=!static? ( dev-libs/boost[threads] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl:0 >=dev-libs/boost-1.65 ) sys-libs/zlib upnp? ( net-libs/miniupnpc ) )
 SLOT=0
 SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.13.0.tar.gz -> i2pd-2.13.0.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=a8c1a8f8c5494709d03e72aa17a54e08
+_md5_=e011b8807a400f32a969439f54766564
diff --git a/metadata/md5-cache/net-vpn/i2pd-2.14.0 b/metadata/md5-cache/net-vpn/i2pd-2.14.0
index 7e79681c5642..7947828c7c38 100644
--- a/metadata/md5-cache/net-vpn/i2pd-2.14.0
+++ b/metadata/md5-cache/net-vpn/i2pd-2.14.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!static? ( >=dev-libs/boost-1.49[threads] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) upnp? ( net-libs/miniupnpc ) ) static? ( >=dev-libs/boost-1.49[static-libs,threads] !libressl? ( dev-libs/openssl:0[static-libs] ) libressl? ( dev-libs/libressl[static-libs] ) upnp? ( net-libs/miniupnpc[static-libs] ) ) i2p-hardening? ( >=sys-devel/gcc-4.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=!static? ( dev-libs/boost[threads] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl:0 >=dev-libs/boost-1.65 ) sys-libs/zlib upnp? ( net-libs/miniupnpc ) ) static? ( dev-libs/boost[static-libs,threads] !libressl? ( dev-libs/openssl:0[static-libs] ) libressl? ( dev-libs/libressl:0[static-libs] >=dev-libs/boost-1.65 ) sys-libs/zlib[static-libs] upnp? ( net-libs/miniupnpc[static-libs] ) ) websocket? ( dev-cpp/websocketpp ) i2p-hardening? ( >=sys-devel/gcc-4.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=A C++ daemon for accessing the I2P anonymous network
 EAPI=6
 HOMEPAGE=https://github.com/PurpleI2P/i2pd
-IUSE=cpu_flags_x86_aes i2p-hardening libressl pch static +upnp
+IUSE=cpu_flags_x86_aes i2p-hardening libressl static +upnp websocket
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=!static? ( >=dev-libs/boost-1.49[threads] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) upnp? ( net-libs/miniupnpc ) )
+RDEPEND=!static? ( dev-libs/boost[threads] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl:0 >=dev-libs/boost-1.65 ) sys-libs/zlib upnp? ( net-libs/miniupnpc ) )
 SLOT=0
 SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.14.0.tar.gz -> i2pd-2.14.0.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0494a62347fd7fc519d9993cc2533763
+_md5_=cd319557084a5d5f33760d535de27292
diff --git a/metadata/md5-cache/net-vpn/i2pd-2.15.0 b/metadata/md5-cache/net-vpn/i2pd-2.15.0
index 82ba83b51f24..93dae8130d94 100644
--- a/metadata/md5-cache/net-vpn/i2pd-2.15.0
+++ b/metadata/md5-cache/net-vpn/i2pd-2.15.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=!static? ( >=dev-libs/boost-1.49[threads] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) upnp? ( net-libs/miniupnpc ) websocket? ( dev-cpp/websocketpp ) ) static? ( >=dev-libs/boost-1.49[static-libs,threads] !libressl? ( dev-libs/openssl:0[static-libs] ) libressl? ( dev-libs/libressl[static-libs] ) upnp? ( net-libs/miniupnpc[static-libs] ) ) i2p-hardening? ( >=sys-devel/gcc-4.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=!static? ( dev-libs/boost[threads] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl:0 >=dev-libs/boost-1.65 ) sys-libs/zlib upnp? ( net-libs/miniupnpc ) ) static? ( dev-libs/boost[static-libs,threads] !libressl? ( dev-libs/openssl:0[static-libs] ) libressl? ( dev-libs/libressl:0[static-libs] >=dev-libs/boost-1.65 ) sys-libs/zlib[static-libs] upnp? ( net-libs/miniupnpc[static-libs] ) ) websocket? ( dev-cpp/websocketpp ) i2p-hardening? ( >=sys-devel/gcc-4.7 ) || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=A C++ daemon for accessing the I2P anonymous network
 EAPI=6
 HOMEPAGE=https://github.com/PurpleI2P/i2pd
 IUSE=cpu_flags_x86_aes i2p-hardening libressl static +upnp websocket
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=!static? ( >=dev-libs/boost-1.49[threads] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) upnp? ( net-libs/miniupnpc ) websocket? ( dev-cpp/websocketpp ) )
+RDEPEND=!static? ( dev-libs/boost[threads] !libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl:0 >=dev-libs/boost-1.65 ) sys-libs/zlib upnp? ( net-libs/miniupnpc ) )
 SLOT=0
 SRC_URI=https://github.com/PurpleI2P/i2pd/archive/2.15.0.tar.gz -> i2pd-2.15.0.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c2dfb4ae5222bd8fe4120ab0c5f1d9ab
+_md5_=cd319557084a5d5f33760d535de27292
diff --git a/metadata/md5-cache/net-vpn/wireguard-0.0.20171011 b/metadata/md5-cache/net-vpn/wireguard-0.0.20171011
new file mode 100644
index 000000000000..09a78cc8c6fd
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/wireguard-0.0.20171011
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst setup
+DEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) ) module? ( sys-apps/sed kernel_linux? ( virtual/linux-sources ) )
+DESCRIPTION=Simple yet fast and modern VPN that utilizes state-of-the-art cryptography.
+EAPI=6
+HOMEPAGE=https://www.wireguard.com/
+IUSE=debug +module +tools module-src kernel_linux module
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=tools? ( net-libs/libmnl ) module? ( kernel_linux? ( virtual/modutils ) )
+SLOT=0
+SRC_URI=https://git.zx2c4.com/WireGuard/snapshot/WireGuard-0.0.20171011.tar.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	linux-mod	e77cdec133261f6bfa67560748277269	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fe96341b970d5cc23c6fdbadc9cf47dc
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.27 b/metadata/md5-cache/sys-apps/coreutils-8.27
index bd97c37328a9..5483971e4c2c 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.27
+++ b/metadata/md5-cache/sys-apps/coreutils-8.27
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.gnu.org/software/coreutils/
 IUSE=acl caps gmp hostname kill multicall nls selinux static userland_BSD vanilla xattr
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
+RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !<sys-apps/sandbox-2.10-r4 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-8.27.tar.xz mirror://gentoo/coreutils-8.27-patches-1.1.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.27-patches-1.1.tar.xz mirror://gentoo/coreutils-8.27-man.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.27-man.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=08e116d422c9cc86df0f240a0121b049
+_md5_=40c4fd3bf17ba91aebd366ddfe83db10
diff --git a/metadata/md5-cache/sys-apps/coreutils-8.28 b/metadata/md5-cache/sys-apps/coreutils-8.28
index 518a9bd746f4..304050303b17 100644
--- a/metadata/md5-cache/sys-apps/coreutils-8.28
+++ b/metadata/md5-cache/sys-apps/coreutils-8.28
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.gnu.org/software/coreutils/
 IUSE=acl caps gmp hostname kill multicall nls selinux static userland_BSD vanilla xattr
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
+RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-libs/gmp:= ) xattr? ( !userland_BSD? ( sys-apps/attr ) ) ) selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl ) hostname? ( !sys-apps/net-tools[hostname] ) kill? ( !sys-apps/util-linux[kill] !sys-process/procps[kill] ) !app-misc/realpath !<sys-apps/util-linux-2.13 !<sys-apps/sandbox-2.10-r4 !sys-apps/stat !net-mail/base64 !sys-apps/mktemp !<app-forensics/tct-1.18-r1 !<net-fs/netatalk-2.0.3-r4
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-8.28.tar.xz mirror://gentoo/coreutils-8.28-patches-1.0.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.28-patches-1.0.tar.xz mirror://gentoo/coreutils-8.28-man.tar.xz https://dev.gentoo.org/~polynomial-c/dist/coreutils-8.28-man.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=748b9f53a9015fa340b737c3816d1288
+_md5_=e6fb4aca1933170782e6b7aa9012ef97
diff --git a/metadata/md5-cache/sys-apps/fwupd-1.0.0 b/metadata/md5-cache/sys-apps/fwupd-1.0.0
index e40d87046f50..3b1c5844e774 100644
--- a/metadata/md5-cache/sys-apps/fwupd-1.0.0
+++ b/metadata/md5-cache/sys-apps/fwupd-1.0.0
@@ -11,4 +11,4 @@ REQUIRED_USE=dell? ( uefi )
 SLOT=0
 SRC_URI=https://github.com/hughsie/fwupd/archive/1.0.0.tar.gz -> fwupd-1.0.0.tar.gz
 _eclasses_=meson	958769e8b8b5a79afc3f22f3915cebbc	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cd98e0716137969c3d6e8616b43ac8cc
+_md5_=fabd62078293f847a6770c0c5c5999bc
diff --git a/metadata/md5-cache/sys-apps/iucode_tool-2.2 b/metadata/md5-cache/sys-apps/iucode_tool-2.2
new file mode 100644
index 000000000000..6cc95bce9fda
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/iucode_tool-2.2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=tool to manipulate Intel X86 and X86-64 processor microcode update collections
+EAPI=6
+HOMEPAGE=https://gitlab.com/iucode-tool/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://gitlab.com/iucode-tool/releases/raw/master/iucode-tool_2.2.tar.xz
+_md5_=66d797b526df29125ce0a78192093db3
diff --git a/metadata/md5-cache/sys-apps/openrc-0.32.1 b/metadata/md5-cache/sys-apps/openrc-0.32.1
new file mode 100644
index 000000000000..d346c97f3555
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/openrc-0.32.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare
+DEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
+DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
+EAPI=6
+HOMEPAGE=https://github.com/openrc/openrc/
+IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs unicode kernel_linux kernel_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=BSD-2
+PDEPEND=netifrc? ( net-misc/netifrc )
+RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils >=sys-libs/libselinux-2.6 ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( >=sys-apps/sysvinit-2.86-r6[selinux?] virtual/tmpfiles ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( >=sec-policy/selinux-base-policy-2.20170204-r4 >=sec-policy/selinux-openrc-2.20170204-r4 )
+SLOT=0
+SRC_URI=https://github.com/openrc/openrc/archive/0.32.1.tar.gz -> openrc-0.32.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=4505291b25fea402a2d17f4faa4623dd
diff --git a/metadata/md5-cache/sys-apps/rng-tools-6.1 b/metadata/md5-cache/sys-apps/rng-tools-6.1
new file mode 100644
index 000000000000..c36db7acc103
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/rng-tools-6.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libgcrypt:0 dev-libs/libgpg-error nistbeacon? ( net-misc/curl[ssl] dev-libs/libxml2:2= dev-libs/openssl:0= ) nistbeacon? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DESCRIPTION=Daemon to use hardware random number generators
+EAPI=6
+HOMEPAGE=https://github.com/nhorman/rng-tools
+IUSE=nistbeacon selinux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/libgcrypt:0 dev-libs/libgpg-error nistbeacon? ( net-misc/curl[ssl] dev-libs/libxml2:2= dev-libs/openssl:0= ) sys-fs/sysfsutils selinux? ( sec-policy/selinux-rngd )
+SLOT=0
+SRC_URI=https://github.com/nhorman/rng-tools/archive/v6.1.tar.gz -> rng-tools-6.1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=e10e41bcf75be712c96680f1663287b5
diff --git a/metadata/md5-cache/sys-apps/sg3_utils-1.43 b/metadata/md5-cache/sys-apps/sg3_utils-1.43
new file mode 100644
index 000000000000..82dedbc96d2f
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/sg3_utils-1.43
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-devel/libtool
+DESCRIPTION=Apps for querying the sg SCSI interface
+EAPI=5
+HOMEPAGE=http://sg.danny.cz/sg/
+IUSE=static-libs
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+PDEPEND=>=sys-apps/rescan-scsi-bus-1.24
+SLOT=0
+SRC_URI=https://github.com/hreinecke/sg3_utils/archive/v1.43.tar.gz -> sg3_utils-1.43.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=bfa6272c243739ab54049e06456b190e
diff --git a/metadata/md5-cache/sys-block/mbuffer-20170921 b/metadata/md5-cache/sys-block/mbuffer-20170921
new file mode 100644
index 000000000000..ec0bd5cc5e53
--- /dev/null
+++ b/metadata/md5-cache/sys-block/mbuffer-20170921
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure postinst prepare test
+DEPEND=ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=M(easuring)buffer is a replacement for buffer with additional functionality
+EAPI=6
+HOMEPAGE=http://www.maier-komor.de/mbuffer.html
+IUSE=debug ssl
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=ssl? ( dev-libs/openssl:0= )
+SLOT=0
+SRC_URI=http://www.maier-komor.de/software/mbuffer/mbuffer-20170921.tgz
+_md5_=5fc80cd59a55d108dce7c2bc1dd8dd3a
diff --git a/metadata/md5-cache/sys-fs/cryptsetup-2.0.0_rc0 b/metadata/md5-cache/sys-fs/cryptsetup-2.0.0_rc0
new file mode 100644
index 000000000000..3915c20b0063
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/cryptsetup-2.0.0_rc0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=static-libs? ( dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] sys-apps/util-linux[static-libs(+)] gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/libgpg-error dev-libs/popt sys-apps/util-linux gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) dev-libs/json-c virtual/pkgconfig static? ( dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] sys-apps/util-linux[static-libs(+)] gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Tool to setup encrypted devices with dm-crypt
+EAPI=6
+HOMEPAGE=https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md
+IUSE=+gcrypt kernel nettle openssl libressl nls pwquality python reencrypt static static-libs udev urandom python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+LICENSE=GPL-2+
+RDEPEND=static-libs? ( dev-libs/libgpg-error[static-libs(+)] dev-libs/popt[static-libs(+)] sys-apps/util-linux[static-libs(+)] gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] ) nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] ) openssl? ( !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) libressl? ( dev-libs/libressl:=[static-libs(+)] ) ) pwquality? ( dev-libs/libpwquality[static-libs(+)] ) sys-fs/lvm2[static-libs(+)] udev? ( virtual/libudev[static-libs(+)] ) ) dev-libs/libgpg-error dev-libs/popt sys-apps/util-linux gcrypt? ( dev-libs/libgcrypt:0= ) nettle? ( >=dev-libs/nettle-2.4 ) openssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) pwquality? ( dev-libs/libpwquality ) sys-fs/lvm2 udev? ( virtual/libudev ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+REQUIRED_USE=^^ ( gcrypt kernel nettle openssl ) python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) ) static? ( !gcrypt )
+SLOT=0/12
+SRC_URI=mirror://kernel/linux/utils/cryptsetup/v2.0/cryptsetup-2.0.0-rc0.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=536ee51d551348022c96d194665563af
diff --git a/metadata/md5-cache/sys-fs/multipath-tools-0.7.3 b/metadata/md5-cache/sys-fs/multipath-tools-0.7.3
new file mode 100644
index 000000000000..ae282b5e4ccc
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/multipath-tools-0.7.3
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare pretend setup unpack
+DEPEND=dev-libs/json-c dev-libs/libaio dev-libs/userspace-rcu >=sys-fs/lvm2-2.02.45 >=virtual/udev-171 sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd ) virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Device mapper target autoconfig
+EAPI=6
+HOMEPAGE=http://christophe.varoqui.free.fr/
+IUSE=systemd rbd
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/json-c dev-libs/libaio dev-libs/userspace-rcu >=sys-fs/lvm2-2.02.45 >=virtual/udev-171 sys-libs/readline:0= rbd? ( sys-cluster/ceph ) systemd? ( sys-apps/systemd )
+SLOT=0
+SRC_URI=http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=0.7.3;sf=tgz -> multipath-tools-0.7.3.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=fb81f8651b8dc728c97dc979f980762b
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.11-r1 b/metadata/md5-cache/sys-libs/zlib-1.2.11-r1
index b60e2d86d618..dd2e2eedbe85 100644
--- a/metadata/md5-cache/sys-libs/zlib-1.2.11-r1
+++ b/metadata/md5-cache/sys-libs/zlib-1.2.11-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Standard (de)compression library
 EAPI=5
 HOMEPAGE=https://zlib.net/
 IUSE=minizip static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=ZLIB
 RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<dev-libs/libxml2-2.7.7
 SLOT=0/1
 SRC_URI=https://zlib.net/zlib-1.2.11.tar.gz http://www.gzip.org/zlib/zlib-1.2.11.tar.gz http://www.zlib.net/current/beta/zlib-1.2.11.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=b2f538a2c3774e311579518cde6099e2
+_md5_=584c4326a0917ff84707e7fe147af5b4
diff --git a/metadata/md5-cache/www-client/seamonkey-2.49.4.0_p0 b/metadata/md5-cache/www-client/seamonkey-2.49.4.0_p0
new file mode 100644
index 000000000000..eb9fac320da7
--- /dev/null
+++ b/metadata/md5-cache/www-client/seamonkey-2.49.4.0_p0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare pretend setup unpack
+DEPEND=>=dev-libs/nss-3.28.1 >=dev-libs/nspr-4.13 crypt? ( x11-plugins/enigmail ) jack? ( virtual/jack ) !elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) ) amd64? ( >=dev-lang/yasm-1.1 virtual/opengl ) x86? ( >=dev-lang/yasm-1.1 virtual/opengl ) virtual/pkgconfig || ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,sqlite,ssl,threads] ) app-arch/zip app-arch/unzip >=sys-devel/binutils-2.16.1 sys-apps/findutils pulseaudio? ( media-sound/pulseaudio ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 app-arch/unzip
+DESCRIPTION=Seamonkey Web Browser
+EAPI=6
+HOMEPAGE=http://www.seamonkey-project.org
+IUSE=+calendar +chatzilla +crypt +gmp-autoupdate +ipc jack minimal pulseaudio +roaming selinux test custom-cflags custom-optimization dbus debug +jemalloc neon pulseaudio selinux startup-notification system-cairo system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx force-gtk3 wifi l10n_cs l10n_de l10n_en-GB l10n_es-AR l10n_es-ES l10n_fr l10n_hu l10n_it l10n_ja l10n_lt l10n_nl l10n_pl l10n_pt-PT l10n_ru l10n_sk l10n_sv l10n_zh-CN l10n_zh-TW
+KEYWORDS=~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.28.1 >=dev-libs/nspr-4.13 crypt? ( x11-plugins/enigmail ) jack? ( virtual/jack ) >=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.25:0=[apng] >=media-libs/mesa-10.2:* media-libs/fontconfig >=media-libs/freetype-2.4.10 kernel_linux? ( !pulseaudio? ( media-libs/alsa-lib ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) virtual/freedesktop-icon-theme dbus? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) >=dev-libs/glib-2.26:2 >=sys-libs/zlib-1.2.3 >=virtual/libffi-3.0.10 virtual/ffmpeg x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrender x11-libs/libXt system-cairo? ( >=x11-libs/cairo-1.12[X,xcb] >=x11-libs/pixman-0.19.2 ) system-icu? ( >=dev-libs/icu-58.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0= ) system-sqlite? ( >=dev-db/sqlite-3.17.0:3[secure-delete,debug=] ) system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.3.3:0= >=media-gfx/graphite2-1.3.8 ) force-gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) wifi? ( kernel_linux? ( >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 net-misc/networkmanager ) ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.9 ) ) selinux? ( sec-policy/selinux-mozilla )
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/source/thunderbird-52.4.0.source.tar.xz https://hg.mozilla.org/chatzilla/archive/SEA2_48_RELBRANCH.tar.bz2 -> chatzilla-SEA2_48_RELBRANCH.tar.bz2 https://hg.mozilla.org/dom-inspector/archive/DOMI_2_0_17.tar.bz2 -> dom-inspector-DOMI_2_0_17.tar.bz2 l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/cs.xpi -> seamonkey-2.49.4.0-cs.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/de.xpi -> seamonkey-2.49.4.0-de.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/en-GB.xpi -> seamonkey-2.49.4.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/es-AR.xpi -> seamonkey-2.49.4.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/es-ES.xpi -> seamonkey-2.49.4.0-es-ES.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/fr.xpi -> seamonkey-2.49.4.0-fr.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/hu.xpi -> seamonkey-2.49.4.0-hu.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/it.xpi -> seamonkey-2.49.4.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/ja.xpi -> seamonkey-2.49.4.0-ja.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/lt.xpi -> seamonkey-2.49.4.0-lt.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/nl.xpi -> seamonkey-2.49.4.0-nl.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/pl.xpi -> seamonkey-2.49.4.0-pl.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/pt-PT.xpi -> seamonkey-2.49.4.0-pt-PT.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/ru.xpi -> seamonkey-2.49.4.0-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/sk.xpi -> seamonkey-2.49.4.0-sk.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/sv-SE.xpi -> seamonkey-2.49.4.0-sv-SE.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/zh-CN.xpi -> seamonkey-2.49.4.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/52.4.0/../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/zh-TW.xpi -> seamonkey-2.49.4.0-zh-TW.xpi ) https://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-52.2-patches-03.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-52.2-patches-03.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-52.2-patches-03.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.46-patches-01.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	check-reqs	bd050ce908e4637604ee604ed4b78e8f	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozconfig-v6.52	0c29133650826a0ead684f84f2efe90f	mozcoreconf-v5	dfc58397c1e9ecd4420428e695cf8dc8	mozextension	e5d920147bfccf4930062e462e2a417d	mozlinguas-v2	e7b3bd89af6dc1a3dd10be68ba3d574d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9ce5f5138f2fd1cf7d8ef0afc9e14f38
diff --git a/metadata/md5-cache/www-servers/nginx-1.13.6 b/metadata/md5-cache/www-servers/nginx-1.13.6
new file mode 100644
index 000000000000..2e4150366e6c
--- /dev/null
+++ b/metadata/md5-cache/www-servers/nginx-1.13.6
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) nginx_modules_http_security? ( !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 ) arm? ( dev-libs/libatomic_ops ) libatomic? ( dev-libs/libatomic_ops ) >=app-portage/elt-patches-20170422 virtual/pkgconfig
+DESCRIPTION=Robust, small and high performance http and reverse proxy server
+EAPI=6
+HOMEPAGE=https://nginx.org
+IUSE=aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax +nginx_modules_http_access +nginx_modules_http_auth_basic +nginx_modules_http_autoindex +nginx_modules_http_browser +nginx_modules_http_charset +nginx_modules_http_empty_gif +nginx_modules_http_fastcgi +nginx_modules_http_geo +nginx_modules_http_gzip +nginx_modules_http_limit_req +nginx_modules_http_limit_conn +nginx_modules_http_map +nginx_modules_http_memcached +nginx_modules_http_mirror +nginx_modules_http_proxy +nginx_modules_http_referer +nginx_modules_http_rewrite +nginx_modules_http_scgi +nginx_modules_http_ssi +nginx_modules_http_split_clients +nginx_modules_http_upstream_hash +nginx_modules_http_upstream_ip_hash +nginx_modules_http_upstream_keepalive +nginx_modules_http_upstream_least_conn +nginx_modules_http_upstream_zone +nginx_modules_http_userid +nginx_modules_http_uwsgi nginx_modules_http_addition nginx_modules_http_auth_request nginx_modules_http_dav nginx_modules_http_degradation nginx_modules_http_flv nginx_modules_http_geoip nginx_modules_http_gunzip nginx_modules_http_gzip_static nginx_modules_http_image_filter nginx_modules_http_mp4 nginx_modules_http_perl nginx_modules_http_random_index nginx_modules_http_realip nginx_modules_http_secure_link nginx_modules_http_slice nginx_modules_http_stub_status nginx_modules_http_sub nginx_modules_http_xslt nginx_modules_stream_access nginx_modules_stream_geo nginx_modules_stream_limit_conn nginx_modules_stream_map nginx_modules_stream_return nginx_modules_stream_split_clients nginx_modules_stream_upstream_hash nginx_modules_stream_upstream_least_conn nginx_modules_stream_upstream_zone nginx_modules_stream_geoip nginx_modules_stream_realip nginx_modules_stream_ssl_preread nginx_modules_mail_imap nginx_modules_mail_pop3 nginx_modules_mail_smtp nginx_modules_http_upload_progress nginx_modules_http_headers_more nginx_modules_http_cache_purge nginx_modules_http_slowfs_cache nginx_modules_http_fancyindex nginx_modules_http_lua nginx_modules_http_auth_pam nginx_modules_http_upstream_check nginx_modules_http_metrics nginx_modules_http_naxsi nginx_modules_http_dav_ext nginx_modules_http_echo nginx_modules_http_security nginx_modules_http_push_stream nginx_modules_http_sticky nginx_modules_http_mogilefs nginx_modules_http_memc nginx_modules_http_auth_ldap nginx_modules_http_spdy
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=BSD-2 BSD SSLeay MIT GPL-2 GPL-2+ nginx_modules_http_security? ( Apache-2.0 ) nginx_modules_http_push_stream? ( GPL-3 )
+PDEPEND=vim-syntax? ( app-vim/nginx-syntax )
+RDEPEND=pcre? ( dev-libs/libpcre:= ) pcre-jit? ( dev-libs/libpcre:=[jit] ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) http2? ( !libressl? ( >=dev-libs/openssl-1.0.1c:0= ) libressl? ( dev-libs/libressl:= ) ) http-cache? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_geoip? ( dev-libs/geoip ) nginx_modules_http_gunzip? ( sys-libs/zlib ) nginx_modules_http_gzip? ( sys-libs/zlib ) nginx_modules_http_gzip_static? ( sys-libs/zlib ) nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] ) nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= ) nginx_modules_http_rewrite? ( dev-libs/libpcre:= ) nginx_modules_http_secure_link? ( userland_GNU? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) ) nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt ) nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) ) nginx_modules_http_auth_pam? ( virtual/pam ) nginx_modules_http_metrics? ( dev-libs/yajl:= ) nginx_modules_http_dav_ext? ( dev-libs/expat ) nginx_modules_http_security? ( dev-libs/apr:= dev-libs/apr-util:= dev-libs/libxml2:= net-misc/curl www-servers/apache ) nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] ) selinux? ( sec-policy/selinux-nginx ) !www-servers/nginx:0
+REQUIRED_USE=pcre-jit? ( pcre ) nginx_modules_http_lua? ( nginx_modules_http_rewrite ) nginx_modules_http_naxsi? ( pcre ) nginx_modules_http_dav_ext? ( nginx_modules_http_dav ) nginx_modules_http_metrics? ( nginx_modules_http_stub_status ) nginx_modules_http_security? ( pcre ) nginx_modules_http_push_stream? ( ssl )
+RESTRICT=test
+SLOT=mainline
+SRC_URI=https://nginx.org/download/nginx-1.13.6.tar.gz https://github.com/simpl/ngx_devel_kit/archive/v0.3.0.tar.gz -> ngx_devel_kit-0.3.0-r1.tar.gz nginx_modules_http_upload_progress? ( https://github.com/masterzen/nginx-upload-progress-module/archive/v0.9.2.tar.gz -> ngx_http_upload_progress-0.9.2-r1.tar.gz ) nginx_modules_http_headers_more? ( https://github.com/agentzh/headers-more-nginx-module/archive/v0.32.tar.gz -> ngx_http_headers_more-0.32.tar.gz ) nginx_modules_http_cache_purge? ( http://labs.frickle.com/files/ngx_cache_purge-2.3.tar.gz -> ngx_http_cache_purge-2.3.tar.gz ) nginx_modules_http_slowfs_cache? ( http://labs.frickle.com/files/ngx_slowfs_cache-1.10.tar.gz -> ngx_http_slowfs_cache-1.10.tar.gz ) nginx_modules_http_fancyindex? ( https://github.com/aperezdc/ngx-fancyindex/archive/v0.4.2.tar.gz -> ngx_http_fancyindex-0.4.2.tar.gz ) nginx_modules_http_lua? ( https://github.com/openresty/lua-nginx-module/archive/v0.10.10.tar.gz -> ngx_http_lua-0.10.10.tar.gz ) nginx_modules_http_auth_pam? ( https://github.com/stogh/ngx_http_auth_pam_module/archive/v1.5.1.tar.gz -> ngx_http_auth_pam-1.5.1.tar.gz ) nginx_modules_http_upstream_check? ( https://github.com/yaoweibin/nginx_upstream_check_module/archive/31b1b42873fa56620d8a873ac13f5f26b52d0cd6.tar.gz -> ngx_http_upstream_check-31b1b42873fa56620d8a873ac13f5f26b52d0cd6.tar.gz ) nginx_modules_http_metrics? ( https://github.com/madvertise/ngx_metrics/archive/v0.1.1.tar.gz -> ngx_metrics-0.1.1.tar.gz ) nginx_modules_http_naxsi? ( https://github.com/nbs-system/naxsi/archive/0.55.3.tar.gz -> ngx_http_naxsi-0.55.3.tar.gz ) rtmp? ( https://github.com/arut/nginx-rtmp-module/archive/v1.2.0.tar.gz -> ngx_rtmp-1.2.0.tar.gz ) nginx_modules_http_dav_ext? ( https://github.com/arut/nginx-dav-ext-module/archive/v0.1.0.tar.gz -> ngx_http_dav_ext-0.1.0.tar.gz ) nginx_modules_http_echo? ( https://github.com/openresty/echo-nginx-module/archive/v0.61.tar.gz -> ngx_http_echo-0.61.tar.gz ) nginx_modules_http_security? ( https://www.modsecurity.org/tarball/2.9.2/modsecurity-2.9.2.tar.gz -> modsecurity-2.9.2.tar.gz ) nginx_modules_http_push_stream? ( https://github.com/wandenberg/nginx-push-stream-module/archive/0.5.2.tar.gz -> ngx_http_push_stream-0.5.2.tar.gz ) nginx_modules_http_sticky? ( https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/1.2.6-10-g08a395c66e42.tar.bz2 -> nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 ) nginx_modules_http_mogilefs? ( https://github.com/vkholodkov/nginx-mogilefs-module/archive/1.0.4.tar.gz -> ngx_mogilefs_module-1.0.4.tar.gz ) nginx_modules_http_memc? ( https://github.com/openresty/memc-nginx-module/archive/v0.18.tar.gz -> ngx_memc_module-0.18.tar.gz ) nginx_modules_http_auth_ldap? ( https://github.com/kvspb/nginx-auth-ldap/archive/49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz -> nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz )
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	ssl-cert	b5e85f9a834c71d8bd532de477fe4ce2	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a5883e11eb6ebbe7ae920ff33e665503
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.46 b/metadata/md5-cache/www-servers/tomcat-8.0.46
index 6ec55dd769c4..8f111d235984 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.0.46
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.46
@@ -4,11 +4,11 @@ DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container
 EAPI=6
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.1 !<dev-java/tomcat-native-1.1.24 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=8
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.46/src/apache-tomcat-8.0.46-src.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f8bec380beca2105ee4686e8d930fe33
+_md5_=23183d7d717b77c0f1eb0dae231c98da
diff --git a/metadata/md5-cache/www-servers/tomcat-8.0.47 b/metadata/md5-cache/www-servers/tomcat-8.0.47
new file mode 100644
index 000000000000..610272b597ac
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.0.47
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.1 app-admin/pwgen >=virtual/jdk-1.7 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container
+EAPI=6
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.5 dev-java/tomcat-servlet-api:3.1 !<dev-java/tomcat-native-1.1.24 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=8
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.0.47/src/apache-tomcat-8.0.47-src.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f8bec380beca2105ee4686e8d930fe33
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.23 b/metadata/md5-cache/www-servers/tomcat-8.5.23
new file mode 100644
index 000000000000..cb55083c3db7
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.23
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 app-admin/pwgen >=virtual/jdk-1.7 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=6
+HOMEPAGE=https://tomcat.apache.org/
+IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 !<dev-java/tomcat-native-1.1.24 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=8.5
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.23/src/apache-tomcat-8.5.23-src.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=d7d4c946c7dd3c7e5d0cbef93c28b977
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.1_beta b/metadata/md5-cache/www-servers/tomcat-9.0.1_beta
new file mode 100644
index 000000000000..e771b636a20e
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.1_beta
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test
+DEPEND=dev-java/eclipse-ecj:4.5 =dev-java/tomcat-servlet-api-9.0.1_beta:4.0 app-admin/pwgen >=virtual/jdk-1.8 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container
+EAPI=6
+HOMEPAGE=http://tomcat.apache.org/
+IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
+KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.5 =dev-java/tomcat-servlet-api-9.0.1_beta:4.0 !<dev-java/tomcat-native-1.1.24 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test
+SLOT=9
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.1/src/apache-tomcat-9.0.1-src.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c38912668e7ec6dce49165e16324b2be
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index f31eacae7efb..e062da2e3ce3 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 10 Oct 2017 15:09:00 +0000
+Wed, 11 Oct 2017 15:39:47 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index fb29a20904c4..1cea3bd96c15 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Oct 10 15:09:00 UTC 2017
+Wed Oct 11 15:39:47 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b88b40d06443..84b58c80e522 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 10 Oct 2017 15:15:01 +0000
+Wed, 11 Oct 2017 15:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index ea38fdfa446f..8158fd35c417 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-67ed122114355698e1044631b312b488e260bfd6 1507647577 2017-10-10T14:59:37+00:00
+8c7162e9729eb5edd664593db7d05dfceee57d09 1507735153 2017-10-11T15:19:13+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f9e44db242bd..91807161d716 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1507647901 Tue 10 Oct 2017 03:05:01 PM UTC
+1507736101 Wed 11 Oct 2017 03:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index f31eacae7efb..e062da2e3ce3 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 10 Oct 2017 15:09:00 +0000
+Wed, 11 Oct 2017 15:39:47 +0000
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 04f249ff7fbd..07adf5a83765 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -19,4 +19,4 @@ EBUILD unbound-1.6.4.ebuild 3669 SHA256 6e81fc507a65073bcc3a6ca5b9f9c5f23bab2d12
 EBUILD unbound-1.6.6.ebuild 3676 SHA256 8d2ec13b1eabc2d9adaaec9ebce3c02a31e69b5701ce8361bd5d5bb90f4410df SHA512 112962ccdb8e60f8fb195061e607c449416355bcc5524a7bd6df2964d5a1508d4ddd7f5969b9f2b2e3b0acefc4fa7b6f687ef634cbcf24dc416cecfd9964dc7d WHIRLPOOL bc25f1e89eb85cf2b98dc4fca4a4cea07a04ed0dde33227e022f125a1bad4cfce214a4803319423c1ce2b7a3c3cc65bbb02668e539154fceccb673128522aa8a
 MISC ChangeLog 4993 SHA256 f53fa7175ae0b710ddb0df108b922db89f4449ec5a9b674134629be88164cba9 SHA512 336d83dc5de953102832d944a4ec0df67624a998da034863fac513094ddc08f903a98d7c1b3c255619e4d8b7f6544185f3372cec32c81c0ae406280e4a891042 WHIRLPOOL 8b367cc1e7547c94f2d52c6ff5f2a334dfc78087789e00bb5ad0bfaf9c6ff6e5f91afac6188c28ef5e396104f4dc65f567bfccf847cab9338e91850b76e62780
 MISC ChangeLog-2015 14623 SHA256 5aa53f86707049ae9653275aa1607755fd461a8cea88b2389febaf920423947f SHA512 1081e4336632d07cb6999dd3a09081bc69115139d14ee19c93e9bd282891cfa2695831cd0cf56ec0ce1c2afc10adaa4e3e0d0e3a804c5062cecf965342e6bb96 WHIRLPOOL c7f367a9ead9954dab00363b0e965eb25100c23d35a11371856daec8eb3c14770f0afa6956ef0cc70a57f6308209eb380150f0f8d6441f671ac36ac3695374ec
-MISC metadata.xml 1320 SHA256 6b777d45f60b6c9650a3ff8f3ff27032ee3533c13b9e58a4ba4c798a89aaeb07 SHA512 d9b83f4424bf5cf789ecbc44a0f1a8092dfe84409ae4416653a19cfceb3b544c23161b183d37e1cfaf436a5683e74908a0234fccc80c411455338e705548549f WHIRLPOOL ceaa79330a14546188def51da229062d020fd52d80e765d2b19f4aba69a1e7230ed8fc7fc4d887a1dbc9b6136eb6b42e0889d9d340df38c7958b4c1d710eca1a
+MISC metadata.xml 1008 SHA256 4189849bccab3044b029d6e9af09e41f4c2ac37732fa55fa15f4e227e2b1b35c SHA512 f6654d6d254a4d51a8c454c542f1fbbff16bfeaa1cb681f110b9ae99a4231cdb7c073a5d42faba71168079330f9e01781df7a5b3e1bd70d771c874a5bbe9742a WHIRLPOOL e6149287e108638beeb1e89af5e325f4940251e7eb166ecb442f998f03cbf1246e902d6bf59572910085b2b4b754d717eeba8fce6637491cad7fcc316400a3fc
diff --git a/net-dns/unbound/metadata.xml b/net-dns/unbound/metadata.xml
index f12c6693d624..12f7df40fa28 100644
--- a/net-dns/unbound/metadata.xml
+++ b/net-dns/unbound/metadata.xml
@@ -5,15 +5,6 @@
     <email>mschiff@gentoo.org</email>
     <name>Marc Schiffbauer</name>
   </maintainer>
-  <maintainer type="person">
-    <email>nabeken@tknetworks.org</email>
-    <description>Proxied developer. Please CC on bugs.</description>
-    <name>TANABE Ken-ichi</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <longdescription lang="en">
   Unbound is a validating, recursive, and caching DNS resolver.
 
diff --git a/net-firewall/shorewall/Manifest b/net-firewall/shorewall/Manifest
index fe1674c7e4f7..f5e25baab573 100644
--- a/net-firewall/shorewall/Manifest
+++ b/net-firewall/shorewall/Manifest
@@ -55,7 +55,7 @@ DIST shorewall6-lite-5.1.7.tar.bz2 40346 SHA256 2fa19a4c5046c05e4e5cf28d4b50dab0
 EBUILD shorewall-5.1.5.2.ebuild 16128 SHA256 cba49be9d3db23d946b260230f6bac2cfd2a7129b6c28a347c0ddd7990ae87a3 SHA512 2e7819897605c85866379b0bc9afd6bf89b1aacab27fc74917e0eae5816fdc2907201898be665d292c7a49fcfa1d0055e1b983a6881ab4dc83b691d6c2eaf0b6 WHIRLPOOL b0d80a8a547fce661a54ee4968ea875f33f7bfeba97d05b32aad6ab99e0a3471d77453c50cf678a5eb045056f878ea1dc060d92a61a5392294e344f97acee383
 EBUILD shorewall-5.1.6.1.ebuild 16135 SHA256 ba21c1957048088e635f857f9e4c932b1a60318384b9c89daf1822126eaca9e0 SHA512 f820651601fb30da69461a97cb590ebd519f37f0cd28866c64ad8389348b8700e4f25f43661cc4f3bf4ad13ff3cd0211035f528daa53b72b49597fb2a63ab30d WHIRLPOOL 0ecb98e00a3db7b215a3b5489c73912291aa70ff66f284a9653d97db5218bca9891028f8f0af2d60c1354c24c8fc835bbfe3ed26ec0de41b5701eaf9441f6e9a
 EBUILD shorewall-5.1.7.1.ebuild 16138 SHA256 79e5158f3926ca0ea70430045e62e77d7dd34f22d69cf842bf4c8636220a4d6e SHA512 cfbc716de2ced76ab84b2adf32e7342351ba02ecd5d557e8a60111d655f699f897a4725f4d4f37fe5a2093346fbad9fea923db3d0bd6fe47e995f86477da7a34 WHIRLPOOL 3adc3e8d77686dc96e3f97ae7b93471ea43b3532cf3d78f55b61ec2dc978e2cc438f06cc84d909d6ef1e4c427e2fcf278113ccc7c54c52c9b321afcb3618c252
-EBUILD shorewall-5.1.7.2.ebuild 16138 SHA256 79e5158f3926ca0ea70430045e62e77d7dd34f22d69cf842bf4c8636220a4d6e SHA512 cfbc716de2ced76ab84b2adf32e7342351ba02ecd5d557e8a60111d655f699f897a4725f4d4f37fe5a2093346fbad9fea923db3d0bd6fe47e995f86477da7a34 WHIRLPOOL 3adc3e8d77686dc96e3f97ae7b93471ea43b3532cf3d78f55b61ec2dc978e2cc438f06cc84d909d6ef1e4c427e2fcf278113ccc7c54c52c9b321afcb3618c252
+EBUILD shorewall-5.1.7.2.ebuild 16131 SHA256 a2a91843724b93e5c8d1353a1a8e5f119289ff18ca3ebbd78a1404f246e571d8 SHA512 10c7f8b4c688558b1d97b3b96b089c66be620ff415568d6ac2f6b7860b6e5eb82a2f5bdf630c387450386d326a5a9ff5e7b15c449d2b9a814fc53fe41cf51526 WHIRLPOOL 0f253296d377fd7d4f126dedd3d8228ad00861c9d0b6565b384579ef99519f11c0783f8c30a9e2b83d83de0584d4c3233d9449088ca1ae79b7558b20e37d6749
 EBUILD shorewall-5.1.7.ebuild 16138 SHA256 79e5158f3926ca0ea70430045e62e77d7dd34f22d69cf842bf4c8636220a4d6e SHA512 cfbc716de2ced76ab84b2adf32e7342351ba02ecd5d557e8a60111d655f699f897a4725f4d4f37fe5a2093346fbad9fea923db3d0bd6fe47e995f86477da7a34 WHIRLPOOL 3adc3e8d77686dc96e3f97ae7b93471ea43b3532cf3d78f55b61ec2dc978e2cc438f06cc84d909d6ef1e4c427e2fcf278113ccc7c54c52c9b321afcb3618c252
 MISC ChangeLog 20688 SHA256 7aae34526acf517056612b27d66a66d7ef22cb12bdfdf6e125386397b50ce3b3 SHA512 82bfaee85f9880adf5e5d0c5c116ee1c12f2cdcf09257419a0fed75c899c77569b2e96250d9eb073bfa0af7d80e241d30da88e0e8f8325ad35042fc511d41d4e WHIRLPOOL 6c24b24142e84fbd8b306ffd357bd7b0345e8cf2d498d6158ce2e9d9291defd6fa9aa40447b7cc1a8660ab76e8d167225fe289d57cb9b7b67c15768aeaed157f
 MISC ChangeLog-2015 45029 SHA256 14c5a921b9bf1d140687dca0c9413f6ac23d4e2e9949fae1ce3b904b740fcbb2 SHA512 1140e3d6294d81b9511f6ef68dcf3d7bf84fa19423a7dde2540f9b96dd5dece1c60c1e02881a5ccf2a9a30fc3b7182ee890d59bc99a11827216106227e1ad5ab WHIRLPOOL fe4e74862743493a9cba6889481a081102977a60ee5ff0d31a155e79ca253e3b7740a93dac2ea3a3496949fcd08a6f99f7fe005836155522762d2df404b39621
diff --git a/net-firewall/shorewall/shorewall-5.1.7.2.ebuild b/net-firewall/shorewall/shorewall-5.1.7.2.ebuild
index 3b7545ca47d4..457de2d45f78 100644
--- a/net-firewall/shorewall/shorewall-5.1.7.2.ebuild
+++ b/net-firewall/shorewall/shorewall-5.1.7.2.ebuild
@@ -66,7 +66,7 @@ if [[ ${MY_PV} = *-Beta* ]] || [[ ${MY_PV} = *-RC* ]]; then
 	unset _tmp_last_index
 	unset _tmp_suffix
 else
-	KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
 fi
 
 SRC_URI="
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index 32c83cfa6009..25edf2da9114 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -3,13 +3,12 @@ AUX libpcap-1.8.1-cross-compile.patch 555 SHA256 948df1e4a0b32710fbfbea8856b20d2
 AUX libpcap-1.8.1-darwin.patch 395 SHA256 a40b616c23f1744d1c98948a99b4f10230a508ccde91429f2c2eb9a6903badc0 SHA512 f068ec0a5853451676f6c4f2950880dd22623c5ad4a0c18441b7244914dc9b4db7a4df2ed81687b89adc9e742dbcd5d68bcbfa0fda1d61fd3d322c7fc6180907 WHIRLPOOL 4ea2ba1081c9a5b84986e683321f5f233e2353ce16a5eda7634f7b292e095389e6d53549abb780aa72a8e6f3b0267fa2b2cbc7554b5d223f25486027c67fb830
 AUX libpcap-1.8.1-libnl.patch 688 SHA256 8e73705359ccfa114ac3e6443e58ee659c3e49bef16325f8a0e2e37272b37f81 SHA512 f56a8f4b87c2f9bfb70e2b31b2e4dcb4fb80654b13cf541f9ff42f193cb9bb4e90a3ad9ef7e91c6ebc8667525bfc75ab78b54381d3f1709f10aaf9f48fd3a1f0 WHIRLPOOL 9e898b5e3110acb3ce73cb14000913aea44131cb38484d9a68b83ad4f7ae0e579ef26b7301ecdd78e694781f63e6644772bded1b82e40aeed51c91ed03927603
 AUX libpcap-1.8.1-usbmon.patch 522 SHA256 3a5cac242e383bbd7cfd8ccce545acc150cdd56dc96a707fca67422d6c71f02c SHA512 489c2f20e7935e47d478efb1077e3cf3806614651cdbd6312d0378989c71409e870f9d0fb9d496cf00b7076d8d001714c56d0444144eedbab47c6ed3afd3bf90 WHIRLPOOL 20e2642bf64a2bb88b4ca418a21749bc910b333cd1bb1757318700b82a2658353bef7e5fc2e21d8a622c2794754e7ac4961aab891bd105a92e3223ce13579326
-AUX libpcap-9999-cross-linux.patch 555 SHA256 e691f148436c4732b04f1c1a96b782e1d2d930a57c8bb81fd241aa417f760cf3 SHA512 183e39f75e65ca991fd2cef6ad638044a8f37b9ea713aad805a1f4b0a60cc89aa935bcdfc0634be13927062355c7cee282f25b1bbde64534c12a3390938cb527 WHIRLPOOL ec8b1fd47054f8c1ca161bd43efd8963a8f64aebd5e77565e3df1910c362008b51a64ff41b55f90933376b333cc38250b1f2dd78acc71c0f3dfd65b8ff86fe5a
 AUX libpcap-9999-libnl.patch 688 SHA256 a617c8042812a7f85962c1998801d4ccb64c97a1ca11faabfbf5ce863ae28621 SHA512 e7d839e10335d0a04592efae13031c701fd222e88910e0a4dceeafa2c3bcf3aa8ae726710c963dd2b4c53088af4f4d154d73e41d86dbd723511633628b174fd3 WHIRLPOOL 0e0f66b98acf15b87550b15dd04c693d38553a133ed087fd3fd5062719ecffbc56af3ee26fda69458d737b037ca6e84da54b21785f8e2b9e3ceb992152e9ea62
 AUX libpcap-9999-prefix-darwin.patch 394 SHA256 3754b3ffd8a4ffa531105a613c93660013578a24a6d5db800e1a890818e1a775 SHA512 bfd560b1bba72a84c5afa1cdf166944e9ede10cb817c7273941b3fc0838ca2676adfd143c0e8873f234de343aabb2177f46f2cd062738d2837d42a1da7370083 WHIRLPOOL fef86ba09c697bee308dac793b3f5ade0570c1eb0590f2f85e9ce033a57b9c0019a77559287f725731d92502c1159bdd6b13889ba7b6242ea1425f4aa9b2e4d3
 DIST libpcap-1.8.1.tar.gz 753405 SHA256 35c45ce725933894878707a00f60bb271244902363ec7097f8fa016dae278c5d SHA512 7e6a7351bb4213e1c3dd95ef7a460e91f733d933e39ba518ad8ba6d2f86b6e7cfa50ae667c8dc1300ef47bf8693ac8a1f18e068f41175ca5d0147a0b72278882 WHIRLPOOL dfc172bdecff1b93e549d0fe80068ccf6fcbd5dcf4a1cda0a1c34c2bfd702237988655f5e6bb91fec32299e0517593b192fde2a8179df17ab35b8db98f024cef
 EBUILD libpcap-1.8.1-r1.ebuild 1924 SHA256 8480f392edf6056432e15bb39cf574baa02a5a2a87f270bb30ca55acdccde1cf SHA512 fcf5ddcc40205e24d5654b01b34f065df81c64f8e2b6bc33c0e97b693f00a27bc98a7bb764548487156519a78c9690569dadfcca3f3981eab7ecedc216d44911 WHIRLPOOL 4ff60cb1ac574ea5b02343b409367b95305576cd8ff8468042fc0d9ec7a3a6904b49215a7bb5588213eeb53f3cf44711bb06e9b4f4de48470e9e191d0ea9df65
 EBUILD libpcap-1.8.1.ebuild 1900 SHA256 fd3eb7c6775dbf9b90bc1c8cd4f99f1b593139719923642ab293c5bf3d034f74 SHA512 82f191130f7ae698489ff3011a7d943d9567eaf45155ec3b584a6f6ae383649261c6369e665e61de04baa12dcf674287425db42b88f0b31163753fcdaea549b5 WHIRLPOOL 9e2e920ad1b1b0ea7d02ad0bb725531ae915989ad841881b5b4b030f213300a1cfc15f05166d046dad1520d749fb6044673f2a2ef4b9dfc4de2a1fc29274100b
-EBUILD libpcap-9999.ebuild 1615 SHA256 f062584ca07302a1c5549d024e2479c6bf74abebca3d1f0c3fce970f0333f921 SHA512 7a146488f25a2e05f11f1eab1f7df288389859f0db805ad3a1f88f74c130af3d9cbcdfd42270080fed82eafafda69a1e596a02ee8a1cd0e61634ca9e1455748d WHIRLPOOL 059ef56f12090d5ff47a9d8d2108e75d6a7f1e3c1169b8c79bb4d7090bffe6f311c1d98323d76c9507692da5c18d0e27225172c0f032ace440e7b88043af65a8
+EBUILD libpcap-9999.ebuild 1571 SHA256 88adaffd81fab7756f1d6df97200f36a6ec4e6f35f30354ffe833679d0865daa SHA512 755d4f7f5c1a9651fe2476a5053d9b5c463e029a9eb70d7069798cae0ee3dd958cc771587a92f75f4f43e9382d4171acff3802773e4e87e5d0b63b27e9c4d55f WHIRLPOOL 6efe4bffd1698b13f797491ecb64c8aaa9b4834890738a9481cc2b141a1f37960cd0d38639497a6077198b1362db5f1d6f631ec2540aa765e85ceae91b3b5296
 MISC ChangeLog 5049 SHA256 da87d85f3b36c4c5aaf151b4cbc89bdcee7a7e471690c2ff502642e7e22947ae SHA512 751ec814c5785caa62bb5666ec187ed7a5399ea4ded33a0b60bdb2788d5acf5dfb7c64a334046366a9ad9dfa69ec9b96624293e4e7803a36e94a830104252b75 WHIRLPOOL 1592fa1773b853f9d9183b17ad133fb0cb93f1e0115ad100e8285ee142b96afe3edac6c40f6f97174d320fabffebbd1b4b53ba1864eb1b7ac6ad541097ca2d57
 MISC ChangeLog-2015 32022 SHA256 b7affb0f789fbe92006ca22c34ac9fed5f67fc1d40ec0f745d089324bd1f7eb4 SHA512 3686e8efdf726af0ec9e73a2c4ee97bc0438e13e00e442f05c8e713a15529998098e6267aa746355a098dd7b7b31991765e759656e809e053adec02f0c44b711 WHIRLPOOL e6f26f68d0919d144784ad125022df6b14e3c5d22db52a7a168b66aba6739976a1ff023b7cce09b1d3a23f548bafc44ffe53b77941699126440ae87c6e9ce307
 MISC metadata.xml 475 SHA256 7702da1ffbf68f7f9dfa7b55074581e0b4e54d3a358cfdb919ad59210f5aa17f SHA512 ff92cbd5725e74f72d117b57d85858851ddf3b27046bf7d5b9e29cac8e07c98bb21e2a81ff8ffcec08adb062a42deb051019d60911a8b86ecd232a37e1b88170 WHIRLPOOL ace597d897ac2a2bb668f52adcea305e7453f9c9dc0c97fd20a351b89e75dafb49fc5841b718358a299b41e29da712ba286d497606e3ec4d78cf499d37eea07c
diff --git a/net-libs/libpcap/libpcap-9999.ebuild b/net-libs/libpcap/libpcap-9999.ebuild
index 28f3488e0abd..f7dcbffb9bf8 100644
--- a/net-libs/libpcap/libpcap-9999.ebuild
+++ b/net-libs/libpcap/libpcap-9999.ebuild
@@ -31,7 +31,6 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
-	"${FILESDIR}"/${PN}-9999-cross-linux.patch
 	"${FILESDIR}"/${PN}-9999-libnl.patch
 	"${FILESDIR}"/${PN}-9999-prefix-darwin.patch
 )
diff --git a/net-mail/tnef/Manifest b/net-mail/tnef/Manifest
index a533e9132e7e..f72bd225ccf6 100644
--- a/net-mail/tnef/Manifest
+++ b/net-mail/tnef/Manifest
@@ -1,6 +1,4 @@
-DIST tnef-1.4.14.tar.gz 4649748 SHA256 26cd7c1a91fa080b4a05b9e81cdee4af9fbd5c6cda44db5f112a2ae9b3c37bd8 SHA512 8111797c4185103df8cb662d0a038f386922b51344c5f68300050d012bc2cf5bfa2da509619786e62c4d57d4ac8479d15b2ab526d7252bc82e19117fae9d048f WHIRLPOOL 42e69ac14f0df25d53f0d7e86fcc7755b10760110469bd16e76c290f5549feed3fa568c282df9b4e0eedb9ecb95ca89351c234476b312763359a5c017a6bf4b8
 DIST tnef-1.4.15.tar.gz 4650572 SHA256 ca76ad6d95665549c46f98160f5e4a63903ccf912f5c667727db3304a2978486 SHA512 51a8c3abd99065fda59ab4129b1a6ca4d58919bfe1b8b10951787ddb007fac69a82d93b7d2a7f1799a9b04f531960f3e1bb7424bcb7cd831b1eb3fcdfad0e720 WHIRLPOOL 1fe0a4ff478b224ccf24ee4a33dcfb9af6cace55e3f6bb1e23f18e60b8364cd1a944cd06457a811cb288e2aa5ed7b77fa6588bceb214b9070488c6e76018b01a
-EBUILD tnef-1.4.14.ebuild 457 SHA256 531c6bc02bd74f741a20ee5a04c5ac854a7364bbf270ef5558853ea73977e760 SHA512 9492ac35c4d4de7dabebe65dcdbd6883718fb07ad17181c004dfc09403407a0ac233bde5676c123916951ea93cd17ba46d6d17b0476f6cf86326110a549fa8dd WHIRLPOOL b92e026f221c1aa259169c0c1c98933332cb212e26d365212d023f131a4915096fa6795a55789dd3abb6a8ec609d470b86c55ea6cb7d71e11b202091fa46f6c2
 EBUILD tnef-1.4.15.ebuild 454 SHA256 0d6cc5915793a931c5ba420ded62495393c61d8c1acf7a9829f50f594aa0fc01 SHA512 009dd7688c0511925fd4a47366de2e19efcdad7a543d0e8f357a894aacaef6665af8356fc4e9041f4ba72ce777154630ac45e153a52406cc440d704fccb31bc9 WHIRLPOOL 7ff8d0029909f1b0dcbe3d8bfbea7076f07ad23fd0f5be7f8bbac89c70fcea5db646837887060d905f1648c1c75b537e9f2ea8121af938c8853a8b0c3e59fcfc
 MISC ChangeLog 2420 SHA256 ef6159670fc0778ca5ba8c6a1ae1552a9d432211e1773233517f659f1f7e7085 SHA512 5f03c650b525a31923388db09b0427b1bc18c4b543b79a1f63d199414bddbe765535f5d14a546a042202b8522198bd3ed295f6e713b23e15dda13dffbec678ac WHIRLPOOL 9a261ec761e1745af3cf61abe76ac997053b72e454ae3c12b47db478225b32a4a027402c15ea75a413af20fc32aa2ea729d79304834fed4ab8e12d73f885c285
 MISC ChangeLog-2015 8440 SHA256 12c2796aa07702541c87282744abef5d4b388c6a17448b6ada0e2153300e6ae5 SHA512 17066bcabc7d0f7b30727b46692f02c98de8937fdec800a71900314ea56ebc9f832c827b0c0bd004aedcaebd3befad68ea7341f5c1ed35929818f2272b169280 WHIRLPOOL 0bfed56178572dfb0ef09f518bd8d27c9e0edcb0238d1da0438d84c03845c798a3b9852cccb5ae7c9c5bb37d164e3622df4492e4d54efa3b3194078ada607696
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index 7cb9fc636f28..2678fa7fc8bf 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -21,9 +21,10 @@ DIST openssh-7.6_p1-sctp.patch.xz 6996 SHA256 ca61f0b015d2f7131620a2a4901800b700
 DIST openssh-7.6p1+x509-11.0.diff.gz 440219 SHA256 bc4175ed8efce14579f10e242b25a23c959b1ff0e63b7c15493503eb654a960e SHA512 add86ecdaa696d997f869e6878aaaef285590cc5eddf301be651944bbc6c80af6a891bad6f6aaa4b6e9919ad865a27dc6f45a6e0b923ca52c04f06523fa3197a WHIRLPOOL 1b324f72a6cb0c895b3994d59f3505ff2a4a0529829cea07344a33a68ee4d43c22ba534a55454792618cd9f766cd40fa5af73cc054ee3a08bccdb6e8d0073b29
 DIST openssh-7.6p1.tar.gz 1489788 SHA256 a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723 SHA512 de17fdcb8239401f76740c8d689a8761802f6df94e68d953f3c70b9f4f8bdb403617c48c1d01cc8c368d88e9d50aee540bf03d5a36687dfb39dfd28d73029d72 WHIRLPOOL 537b94555c7b36b2f7ef2ecd89e6671028f7cff9be758e631690ecd068510d59d6518077bf951e779e3c8a39706adb1682c6d5305edd6fc611ec19ce7953c751
 DIST openssh-lpk-7.5p1-0.3.14.patch.xz 17040 SHA256 11060be996b291b8d78de698c68a92428430e4ff440553f5045c6de5c0e1dab3 SHA512 9ce5d7e5d831c972f0f866b686bf93a048a03979ab38627973f5491eeeaa45f9faab0520b3a7ed90a13a67213fdc9cd4cf11e423acad441ea91b71037c8b435b WHIRLPOOL 58526777475786bb5efa193f3a3ec0500c4d48b18fef67698f8b1999cb07f04fbca7b7d3ece469f3a1e1ceca5152cdd08d3dbe7cfa4e7494740dc2c233101b93
+DIST openssh-lpk-7.6p1-0.3.14.patch.xz 17044 SHA256 fd877cf084d4eb682c503b6e5f363b0564da2b50561367558a50ab239adf4017 SHA512 e9a2b18fd6a58354198b6e48199059d055451a5f09c99bf7293d0d54137a59c581a9cb3bd906f31589e03d8450fb017b9015e18c67b7b6ae840e336039436974 WHIRLPOOL 8410dc9dad24d8b3065ba85e7a7a66322b4d37eac0ef68e72143afa3aba2706e91c324798236b9d3e320e6903d27a7e426621bde92ded89ce26a16535e8c3d3c
 EBUILD openssh-7.5_p1-r1.ebuild 11026 SHA256 4454081691292f2bc218292e09724693fb1b9fc54e65d31042a93bf329728a96 SHA512 2441bff83bba61ead49ce69f7682d6ff9e6629eebc7dd9208da86043c07519a4ee1b9639b5ab22b04298b214ef8ccf94149269d3980d5d48ed01bfde409e015d WHIRLPOOL a0e20cbbe1899a18697e64f33c2bf8d4f9ae51c777032d2f994eda31dc70ac6c0a66c65a9fc46783419656554ac6098b32bb27132becb284c8ccfbdc36e44aff
 EBUILD openssh-7.5_p1-r2.ebuild 10966 SHA256 9aa4c233f5832ae36ea3c793828d240577f37ae96b28d3cf60c62df51623e15d SHA512 a461598a75ecb04c04c1c7e7bac216bb8a0e47ea493e8ce95d1545e96f9d0109cfd63b8be3845f31ba53b6d54e2ca99a9416c94ac9428c51666475a0ae65d3ef WHIRLPOOL a97c29508e3359d1d26d7c6f470fd96194e55fa4564e6692153385d839c5f64d37788026ba6123d8350615a515246404ef691ab6bcf079fe1e3ac8d6b05bfde3
-EBUILD openssh-7.6_p1.ebuild 10854 SHA256 1986810f318d4a3588ba96ea291d9d350570338cbeb56e2b827d47b9a0d553b2 SHA512 ae85adf10377428df963766b95414b0bc63e144e1b15600ec70b7dd231a794e36b71978b0f79eca5bc7b91b17067954b5f9d160ca2738786ab5ccea28bb2d5bc WHIRLPOOL 33ff3dcf4d1db9e761ff1145d8bee5de351192ff53e50635d717a53156f1d34947777eeada8a26322828d22a708724fcd5e516305e4328a73024cd2364fcc008
+EBUILD openssh-7.6_p1.ebuild 10875 SHA256 dcdd489fc6c3078416a6f0c620c45b9e6b164b289d21a1b9caf3179b1a9b63a4 SHA512 b92dfde7266d8f41848efe129b0ff6abf1601eac1854874603c565670fa08ce247913c2e1c40695385a659bc56f305ea55032229ad26ba9aba18516970ea45c6 WHIRLPOOL 1af8e6f9083c07c6352c6ce9336e4f943586f858a633761bb84dea74e96102aaf9534d30acdbcb5b9d5c0c8f6169718b375a2a02085bf72d92b0f6c58071e83d
 MISC ChangeLog 25370 SHA256 ad091426a190d89906e9f866e3f9545599b156b39e4b0feeb4f862997faab147 SHA512 cff2020279e7738e82fd0202b0e6de74c837d64a95f931c5ba159a8cc557f596d4b750c1527b96b9a74a8ec16bdaf0ed51457d074046f8049fdf262599394644 WHIRLPOOL ddb4f6ea4aa8051dac3da94bd4ffd94168d4e2cf2030de7841f10384c17f2e803847ccb6777c92ea5e48ce9b65d0bb5d9c77d04aa8e34fcc8fd5cfce04d8e304
 MISC ChangeLog-2015 95783 SHA256 53b51ee42a1faf42d80733382986e4fd606366b7bb6350c76f44df851e071890 SHA512 95a4f4243cb8cd8901208adc3632e191ab27a5ea2ce947e832264833262d8bd1e74a7e4f3545d6f2da8d2b473a59cfc7014aa88d5b0ea30e348c4f5d9323c8e5 WHIRLPOOL 5b56a38ddcf0308b681fc1c1fe8107c37ea1385e30ebc435d22f73c38947f9afdbb37ffb1c22bc48c83117cb91b946831cd83bab2807c248292fd2822002f828
 MISC metadata.xml 2212 SHA256 50f6e3651c8aeb86cfe90d92cef6a2b55640c400584f5fdbb6418cef7ac16f25 SHA512 958845fbdfb4f1d267fdbc3a005c6338da54c6a0715180a1982416a841ab4865c536de5f10bb8493d07830e182786d0c3f2ac710c9168434b3d077a59ed2ddd5 WHIRLPOOL 6d1080bc5c3b10a63836b5286d0d66b925a9d27d35e9855c9f966445458c1d6a752854d019c1740420ea78aef6f60105bef4c771fe61a95aae898034cf100705
diff --git a/net-misc/openssh/openssh-7.6_p1.ebuild b/net-misc/openssh/openssh-7.6_p1.ebuild
index ab6ae787886b..1c315b793a68 100644
--- a/net-misc/openssh/openssh-7.6_p1.ebuild
+++ b/net-misc/openssh/openssh-7.6_p1.ebuild
@@ -11,7 +11,7 @@ PARCH=${P/_}
 
 #HPN_PATCH="${PARCH}-hpnssh14v12.tar.xz"
 SCTP_PATCH="${PN}-7.6_p1-sctp.patch.xz"
-LDAP_PATCH="${PN}-lpk-7.5p1-0.3.14.patch.xz"
+LDAP_PATCH="${PN}-lpk-7.6p1-0.3.14.patch.xz"
 X509_VER="11.0" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
 
 DESCRIPTION="Port of OpenBSD's free SSH release"
@@ -19,7 +19,7 @@ HOMEPAGE="http://www.openssh.org/"
 SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
 	${SCTP_PATCH:+https://dev.gentoo.org/~polynomial-c/${SCTP_PATCH}}
 	${HPN_PATCH:+hpn? ( mirror://gentoo/${HPN_PATCH} )}
-	${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
+	${LDAP_PATCH:+ldap? ( https://dev.gentoo.org/~polynomial-c/${LDAP_PATCH} )}
 	${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
 	"
 
diff --git a/net-misc/slimrat/Manifest b/net-misc/slimrat/Manifest
index 8bd1ba815dcd..b0a9d9470dec 100644
--- a/net-misc/slimrat/Manifest
+++ b/net-misc/slimrat/Manifest
@@ -1,4 +1,4 @@
 EBUILD slimrat-9999.ebuild 1081 SHA256 baae7d2d04eb130b94eb56aab91c10a3425277c33ce4d88b19de1e517f2fe0fe SHA512 e6e17e8f17ffbc31261556098147f20b9b2eeac032a7c7f6c5aaa69128abec116a702b1dc1a3bd3c33ccf63d457019377ed440ad123117cc801eb6d7511f91b4 WHIRLPOOL 09abe6d5a9a15a186fd6385ad3bfc4a36631bcd31b1ea83eb91dd19bd6048418a890c813c723610f1723f243c1b6e6d3642733e80895dc14baa30ad5448f7673
 MISC ChangeLog 3134 SHA256 3d336401e45f2639a212bcf511685d17cec82fbc080c90b42cb657e2324e0eb9 SHA512 9c60ecffbcaa3a94fb9f5050b8541a6524bef533eeb3330e2995f2537dbd3b123524e6290cdd5035b6306977e287e67d9922ae28aa8ff37d0321ad5ad3613cd7 WHIRLPOOL 6b3121a8a2df4e4ce8203e2050c61fc5e8091ccfd3a6ae2e70c90fa45826c51191b54208898dc4c1c41e025679f89d2430cdf1ffd3df4b9d9776e8c624147953
 MISC ChangeLog-2015 1183 SHA256 e6555cbd5f46c3523264f0fe907343df515d4a34455db2c551f5a781578b6624 SHA512 0114861e04bb07b5dbff1f443be0f16a4c2d27cf29529cf055acc15097effb3f9e28db10741fc56c196daad7610e39de05d1538b0adcfe66e6798eebaba65125 WHIRLPOOL d9ac153c3d1af9b70737158727a66d5871bced6f59ffd5c6e9af2b0ee7828deac1e10eba94cc13799d2a7cf1ccd075ae5c16cb288897eb12319af69e9aeeb864
-MISC metadata.xml 428 SHA256 221095b9bcb2bfaa590bd4fb9cde883c9545c0f4b6c74d194f13a0705b9c96bd SHA512 d33fb9e1cea64687c186691486d7b3d77ddd1b39ede452a402eb4f70a09b56b07ef050fb9cc52e1c1c036e172282eefc1735ed542b99cf7ce4682f137e8a0f12 WHIRLPOOL b18d5973daf1eb1b367a3635174ab9f271489d0fb938ed3dd4170c61b7e9eb661cdfe6b51f86fdc23d72893522514801a647e2733c40a2e571e44f69fe430e32
+MISC metadata.xml 229 SHA256 b30e84bbf735660ebd8fdb8033668a171d270ef3c2d9dc132e67ce3a8554e09b SHA512 ba528d80efe3c167796011b26ed43a6bd158ba4b46a028cc09d8a182052214bb5628283f2dd23e87adb83c2733fe24267fe931aeb12c61eb58a9befd6e720ebc WHIRLPOOL 0103bc673118f2010d16438eeeb52136fc1c3da059cbd8b6cbed6c2a6d638f4e50e143df0e416621585d050aad768e2ca1a9c93b7bd2b0602e173bd3acc1b074
diff --git a/net-misc/slimrat/metadata.xml b/net-misc/slimrat/metadata.xml
index 233beb5746c2..212b389ebaac 100644
--- a/net-misc/slimrat/metadata.xml
+++ b/net-misc/slimrat/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>premek@vohnout.cz</email>
-		<name>Premysl Vohnout</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+<!-- maintainer-needed -->
 	<use>
 		<flag name="X">Install also GUI client</flag>
 	</use>
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 9b24d200fa96..0f77f3b1fd29 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,9 +1,11 @@
 DIST youtube-dl-2017.03.16.tar.gz 2631620 SHA256 55df3cbda9cf86e49baf54040340ec74c692bb3d6da3d2f5a1bc1238017dd492 SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c WHIRLPOOL 8345da00074e62ec9a9c244cb9ef64930fbd0e5e9e5bc1709bfcf56517cc6312031a09523c3016db2a1542c16a0297bea9d6883a201ae94e347e358307e92422
 DIST youtube-dl-2017.09.24.tar.gz 2810181 SHA256 7d7140ce63377e84a2072b4922809c7a2e90e3916cde2f4f1cc8860664395548 SHA512 de96406aeabb993a39941f5c67947fd1b77ec003be36b215cb3df1e5c90d63c7c570a5ca7627f5b2faae6a15ee07d45cf339cac6b511890acf49c5c38e6c5672 WHIRLPOOL e248990cce1bcbe50ae9e0ac6a95d760948809ec371b93126011d71599e721f1e9b0784690b832d3c5c04fb55c048b08c091193f821b18e1211f4c393ab2d017
 DIST youtube-dl-2017.10.01.tar.gz 2813364 SHA256 0b4f0e12b099c46ad47597764b10f45ceae3935834abf99d49ccd8cfb48dff10 SHA512 f1eafecb2418276df7e7bdb73402779521197f551be3431eda9727390884d42c50a73895d0c58fc3783ab04712e4bf5aa072dad6d3241724e19e6c4c80c0080d WHIRLPOOL 281b7cdb288c1890e785d15cf1aa7c1f8e33976c521559551924b0f18b26981fb33a0b60ff86df796613ef34d273a13b3ada3c5f3e851534dad4bf124260f509
+DIST youtube-dl-2017.10.07.tar.gz 2816312 SHA256 d9a8935087c1e2fa3307594ae15f1e9ea0f8676e825fa676a50a3a3d471bba83 SHA512 4842c8b324a10a4eff398226749ff8394ca60cf1e47873c1dfb5cf9828b77772670ea30891f32b26bab421aa0e7ca95e2815e062061a2cbaf22e6c5f76e1d87d WHIRLPOOL 525eb2eb3f18bf5ed1776f1a4d43dd010793b3b1681f27b3ed4ed4afdbd0c3dcd2c18b8e532de1fa3c318ac6a5f186c0bdf60fa4c7c69fe939335a7235679c3c
 EBUILD youtube-dl-2017.03.16.ebuild 2381 SHA256 9503230e2716a18498b74f5047095216fa36cdf4801cc6446e6f2075fa5cde50 SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862 WHIRLPOOL ded7fa74a8649db1cc5c16eb98ab557853d264bcc458429374b0bbb29773f993a8621285bcfcbe243cf3892d982f91ff5278c45cb0e50b824b156a0a57786911
 EBUILD youtube-dl-2017.09.24.ebuild 2383 SHA256 e959a1068b24172b3b4ef9a21277befd8161fe9d514ed6924e79f194e011d39b SHA512 212115024819c4ace4aa20c649202883bfa78488e1cc903b49d05e6abc704cbb6051ec12c0f7942c1e7cef8c40925a9e5c984058be9183a367b8b91d20226174 WHIRLPOOL 0313b71a631fac8a921e718d7de6d9ef8e8803e6c18c05dccd80caa22aec292e5566f98fde2a12473feaa6ac0e174bcd49cca8920f5860503d034c91b40cea76
 EBUILD youtube-dl-2017.10.01.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
+EBUILD youtube-dl-2017.10.07.ebuild 2382 SHA256 6bcc95505bb69e73c3cbf3c7824a96e42e651b0461a44a27dda5549e8bf7e625 SHA512 ab1e5bfe8a287cf5ad8f74efeaa95469b66d62f28f45e65c0aa41e352661de8e3fac99a1d60f15c33b312985794ce6b08fd8e08340f2adce1d46391065be4e20 WHIRLPOOL 41f2c088f6bf4a0692e76a67a70c01f8d07ec381690316544b2d6267a8ef6ff3480800d5ff387cad24c306413b778abba3aa43da0aa67a561de70b5b6072b280
 EBUILD youtube-dl-99999999.ebuild 2089 SHA256 a46031a2c229d820634b16d31efc904c44bafe1d04c3367b9e40e5e0c8b1c953 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11 WHIRLPOOL a358657c660c533e1b506339c615e781998aa5465408629c51722f6999fc3e5d3fd11b617b89314ada35df0d93aeaa514837ac1a2e3b7573c43657394f6ef4ae
 MISC ChangeLog 32089 SHA256 377c688fd528de367a40230423162256199da2c475ef85d3dc986b622e322fd6 SHA512 955715fa5304b1ee5ab4436e232b4ac5c882e28f4755d2edcd23cc4c760575518dc8c349c20b2e1b41145ca55bbd8df292d12a1b34768acf55ae1d6b80e2f2ca WHIRLPOOL a925103ccb1de53ada47dd94f927a42eff5f97e14b47c607ddfaeda4e719a2eb8be78be8e008e4b3036ab48acb946e283876d646388745288ad5b992e2574104
 MISC ChangeLog-2015 75434 SHA256 71ef7accb3e09eadb601b4541ead4ed3019cbd1e86b56df23130cc0e49572dd5 SHA512 3517da9014199375d7bb8d4841b52ad12eb3a25ca7a225e767dd9b60f8b81848cf7f6763066fb7c7bb7826602711e22f56d710fa319cb8172843a31eb69228e6 WHIRLPOOL 32aee6516cd3e7848eeb08ccd47cb60bc04da646b2e448970ce40fa5d0e8dc591ae5d7c8e1dfe99229b6ee70805e070d8dee2353a41515377083bd7d2f02b073
diff --git a/net-misc/youtube-dl/youtube-dl-2017.10.07.ebuild b/net-misc/youtube-dl/youtube-dl-2017.10.07.ebuild
new file mode 100644
index 000000000000..975ce26c347e
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2017.10.07.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6})
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Download videos from YouTube.com (and more sites...)"
+HOMEPAGE="https://rg3.github.com/youtube-dl/"
+SRC_URI="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE="+offensive test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	test? ( dev-python/nose[coverage(+)] )
+"
+
+S="${WORKDIR}/${PN}"
+
+python_prepare_all() {
+	if ! use offensive; then
+		sed -i -e "/..version../s|'$|+gentoo.no.offensive.sites'|g" \
+			youtube_dl/version.py || die
+		# these have single line import statements
+		local xxx=(
+			alphaporno anysex behindkink camwithher chaturbate eporner
+			eroprofile extremetube foxgay goshgay hellporno hentaistigma
+			hornbunny keezmovies lovehomeporn mofosex motherless myvidster
+			porn91 porncom pornflip pornhd pornotube pornovoisines pornoxo
+			ruleporn sexu slutload spankbang spankwire sunporno thisav tube8
+			vporn watchindianporn xbef xnxx xtube xvideos xxxymovies youjizz
+			youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			drtuber fourtube pornhub redtube tnaflix xhamster
+		)
+		# do single line imports
+		sed -i \
+			-e $( printf '/%s/d;' ${xxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		# do multiple line imports
+		sed -i \
+			-e $( printf '/%s/,/)/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/extractors.py \
+			|| die
+
+		sed -i \
+			-e $( printf '/%s/d;' ${mxxx[@]} ) \
+			youtube_dl/extractor/generic.py \
+			|| die
+
+		rm \
+			$( printf 'youtube_dl/extractor/%s.py ' ${xxx[@]} ) \
+			$( printf 'youtube_dl/extractor/%s.py ' ${mxxx[@]} ) \
+			test/test_age_restriction.py \
+			|| die
+	fi
+
+	eapply_user
+
+	distutils-r1_python_prepare_all
+}
+
+src_compile() {
+	distutils-r1_src_compile
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	dodoc README.txt
+	doman ${PN}.1
+
+	newbashcomp ${PN}.bash-completion ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins youtube-dl.zsh _youtube-dl
+
+	insinto /usr/share/fish/completions
+	doins youtube-dl.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+}
diff --git a/net-vpn/i2pd/Manifest b/net-vpn/i2pd/Manifest
index 45f03974f682..6a61a35b2396 100644
--- a/net-vpn/i2pd/Manifest
+++ b/net-vpn/i2pd/Manifest
@@ -8,7 +8,7 @@ AUX i2pd-2.6.0-r3.service 638 SHA256 4281eeb7a174798d2dc419fe52f3e0c84053802e540
 DIST i2pd-2.13.0.tar.gz 3131893 SHA256 9fbf9750503dd565ba5b31b16e1de959bda59530f088d40b14618d3ef238b065 SHA512 146e68559f44bcc8447857a0deb8be4a59d1b8032826af368355f9e9309b619a3575f99fed2b45071784c728a2265cb6446e816baf797b71aeffa09d1cbdd004 WHIRLPOOL 62b65f1b0cd8f9bf04bbaae61604e664f1b7f6f8eea30b9b41227659f6237e2739d3943ad91852462b229b0b4a718213b96aed63758680af135598224ca2d50f
 DIST i2pd-2.14.0.tar.gz 1906272 SHA256 3cb5751d9584449721e2f3ae878411b652863fa7093994f1d8cce1fd3b40bf71 SHA512 39e6cc0ed0456b93c9a7462e5630d7be87c3dda91887bef7aec50b404212f1cef02b94488ded1918eaf4264d9be5da767dab4652cf2b8470fadfa89886e42e7b WHIRLPOOL fcfb403889f33a0cce4ed9d9508b59c5deeade85230aec4929b0ee3a00ec57d9c3bf9644e13796e158bd1cd893f69b0cb9f86dba25543e0348ed743188dd3d2c
 DIST i2pd-2.15.0.tar.gz 1834673 SHA256 87649a1963b1d1b8f9424c0bccbdf6bbde0bb87db8dcf0b5c61f4c7f13181b86 SHA512 78f3b14ef7c4896528c6bd54adfcd251f3a94a0e9315924e8a9b58e3e6d0cc2c9334026d2faa9bff9da5dd3c4195e84473161ed7911c5e0155a79f456033f077 WHIRLPOOL 69c69fde4db194ee8a932a955b7e8088370a39782e96db9e730efabf4cf904b9a01ada732ce043064b8e950b1b9e995909da31889ebdb9a141d6a9e1a366d2a0
-EBUILD i2pd-2.13.0.ebuild 2712 SHA256 819410a3c4f13370a3e310b93694d89b64d8adf0964b2d9bc48108682527ef87 SHA512 527249a7351584a7c3b050a77a08f8d40f7cd48e3dd0f3cee880f5380c16d9fbe1751c7d5e84fd41ec79a3639d8d2688f63b5ce53a41d96f8a1a6eeae35366f5 WHIRLPOOL f5db35bf36d59256fac6244f58ba1a6c52b8947bc0a8220e6fa32efc714e4ebd41d03b777616a47677d8e5f4c5dd4ca033d4708a7f09020564cde0caa99bf22c
-EBUILD i2pd-2.14.0.ebuild 2713 SHA256 67b89965e81cefba6658e62cef21299c9485ad44454805bbfcf125ea9c546873 SHA512 6dab357df919d88107ebf0490e4fd7f3f0986ad6a26b452a25e4e8f7f85c5c17da8f48262a02ba6f09cc31f9fde7e09b27f01353d2de3c9093439ff2a7bbc04d WHIRLPOOL bc62172d52fd6eecd10c20f2d9b8c8c4df7653c49b7d262d30547d619c387b4cf551213eab5197a9114ffd54896672732e9f2978fcc2a01f7fd0ffd1c340c7f0
-EBUILD i2pd-2.15.0.ebuild 2787 SHA256 8cc1a39d1d88e1362f4d718b7aa8e4f439e6161107a41755b8704eb90e964a12 SHA512 f90d7fa0780b31e923e37daf0b453a80277d532c61cdeff3970be0d2c148715ddc707673ae66ef0691c6d574fb6e0d04a56a751956bbc8156f48a08aa368f8cf WHIRLPOOL 67e94951cac39a5b9ad5b5fc55f53c4f1edc46093bf73dc398c362ee534ee3db7216708be729a037eaf5233156b130cb599aaffa33a26ef79342486eb39c877f
+EBUILD i2pd-2.13.0.ebuild 2930 SHA256 9da807abfe5c4d07e10861d15ff07bad896bb0959758c9855fc699b7706e8146 SHA512 8569fd009989de3fd5f6417f6a89a1bd2a3fd24670f39912def0aba1e3c810226d9247ee8de5a0999363402b26922bdafd9467555c0666a886b762bbdf17a923 WHIRLPOOL 2919b4402c29cf1045cb3f69519f36db81bd1780388258655636e455e7e3f192d1ea7b6f1bb37b438ce3a747b815a61ddfd0066c4332107697425e23c047a0f0
+EBUILD i2pd-2.14.0.ebuild 2931 SHA256 f4d8c5656fa9427c9143d30ddb5824febff447d05cd8501f67bc50447fb43a89 SHA512 f5b09b0992cfea75109b10223968169c185e539b416c92ffdcbffdd5300703dc9f379b550652a68a3cbb2c35ce41b2efd3503d74f1f5864977f1fb80e6c95a8a WHIRLPOOL 0a106ed00ecb7ed34b1ba49f78097b56194449ddc3db142a4827363598bf4ae1dba132f118b0d4a51dc8ccd161269e69686a7abfa62680d6c892071f4b7a7d22
+EBUILD i2pd-2.15.0.ebuild 2931 SHA256 f4d8c5656fa9427c9143d30ddb5824febff447d05cd8501f67bc50447fb43a89 SHA512 f5b09b0992cfea75109b10223968169c185e539b416c92ffdcbffdd5300703dc9f379b550652a68a3cbb2c35ce41b2efd3503d74f1f5864977f1fb80e6c95a8a WHIRLPOOL 0a106ed00ecb7ed34b1ba49f78097b56194449ddc3db142a4827363598bf4ae1dba132f118b0d4a51dc8ccd161269e69686a7abfa62680d6c892071f4b7a7d22
 MISC metadata.xml 878 SHA256 bdbbcda7e96f504a10142047e6ff580a2d3a67aafac8d69a18402d0c001668dd SHA512 9aa7d6f8b88b8432c0e2b4df77292471fb6254622031fead20ea0c8eee0dfcf0bd9bda19a309d6526c30d412c45093dd2e9898c9a8270e6ada3f723dbb665c76 WHIRLPOOL e1431581efe813cf99cafe0307980da74236c39d8bfeac82f9c55dd752b9aacd2cee3db0885114d7676167f5fa36d7ba2ce4811137fd6b41a096a84eabdad3b8
diff --git a/net-vpn/i2pd/i2pd-2.13.0.ebuild b/net-vpn/i2pd/i2pd-2.13.0.ebuild
index d4c839774f70..fdde4874845b 100644
--- a/net-vpn/i2pd/i2pd-2.13.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.13.0.ebuild
@@ -10,18 +10,24 @@ SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp"
+IUSE="cpu_flags_x86_aes i2p-hardening libressl static +upnp websocket"
 
-RDEPEND="!static? ( >=dev-libs/boost-1.49[threads]
+# if using libressl, require >=boost-1.65, see #597798
+RDEPEND="!static? ( dev-libs/boost[threads]
 			!libressl? ( dev-libs/openssl:0[-bindist] )
-			libressl? ( dev-libs/libressl )
+			libressl? ( dev-libs/libressl:0
+						>=dev-libs/boost-1.65 )
+			sys-libs/zlib
 			upnp? ( net-libs/miniupnpc )
 		)"
 DEPEND="${RDEPEND}
-	static? ( >=dev-libs/boost-1.49[static-libs,threads]
+	static? ( dev-libs/boost[static-libs,threads]
 		!libressl? ( dev-libs/openssl:0[static-libs] )
-		libressl? ( dev-libs/libressl[static-libs] )
+		libressl? ( dev-libs/libressl:0[static-libs]
+					>=dev-libs/boost-1.65 )
+		sys-libs/zlib[static-libs]
 		upnp? ( net-libs/miniupnpc[static-libs] ) )
+	websocket? ( dev-cpp/websocketpp )
 	i2p-hardening? ( >=sys-devel/gcc-4.7 )
 	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )"
 
@@ -38,9 +44,10 @@ src_configure() {
 	mycmakeargs=(
 		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
 		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
-		-DWITH_PCH=$(usex pch ON OFF)
+		-DWITH_PCH=OFF
 		-DWITH_STATIC=$(usex static ON OFF)
 		-DWITH_UPNP=$(usex upnp ON OFF)
+		-DWITH_WEBSOCKETS=$(usex websocket ON OFF)
 		-DWITH_LIBRARY=ON
 		-DWITH_BINARY=ON
 	)
diff --git a/net-vpn/i2pd/i2pd-2.14.0.ebuild b/net-vpn/i2pd/i2pd-2.14.0.ebuild
index 752102811a0f..de35d0cc72b1 100644
--- a/net-vpn/i2pd/i2pd-2.14.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.14.0.ebuild
@@ -10,18 +10,24 @@ SRC_URI="https://github.com/PurpleI2P/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cpu_flags_x86_aes i2p-hardening libressl pch static +upnp"
+IUSE="cpu_flags_x86_aes i2p-hardening libressl static +upnp websocket"
 
-RDEPEND="!static? ( >=dev-libs/boost-1.49[threads]
+# if using libressl, require >=boost-1.65, see #597798
+RDEPEND="!static? ( dev-libs/boost[threads]
 			!libressl? ( dev-libs/openssl:0[-bindist] )
-			libressl? ( dev-libs/libressl )
+			libressl? ( dev-libs/libressl:0
+						>=dev-libs/boost-1.65 )
+			sys-libs/zlib
 			upnp? ( net-libs/miniupnpc )
 		)"
 DEPEND="${RDEPEND}
-	static? ( >=dev-libs/boost-1.49[static-libs,threads]
+	static? ( dev-libs/boost[static-libs,threads]
 		!libressl? ( dev-libs/openssl:0[static-libs] )
-		libressl? ( dev-libs/libressl[static-libs] )
+		libressl? ( dev-libs/libressl:0[static-libs]
+					>=dev-libs/boost-1.65 )
+		sys-libs/zlib[static-libs]
 		upnp? ( net-libs/miniupnpc[static-libs] ) )
+	websocket? ( dev-cpp/websocketpp )
 	i2p-hardening? ( >=sys-devel/gcc-4.7 )
 	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )"
 
@@ -38,9 +44,10 @@ src_configure() {
 	mycmakeargs=(
 		-DWITH_AESNI=$(usex cpu_flags_x86_aes ON OFF)
 		-DWITH_HARDENING=$(usex i2p-hardening ON OFF)
-		-DWITH_PCH=$(usex pch ON OFF)
+		-DWITH_PCH=OFF
 		-DWITH_STATIC=$(usex static ON OFF)
 		-DWITH_UPNP=$(usex upnp ON OFF)
+		-DWITH_WEBSOCKETS=$(usex websocket ON OFF)
 		-DWITH_LIBRARY=ON
 		-DWITH_BINARY=ON
 	)
diff --git a/net-vpn/i2pd/i2pd-2.15.0.ebuild b/net-vpn/i2pd/i2pd-2.15.0.ebuild
index 4dbcc37bd004..de35d0cc72b1 100644
--- a/net-vpn/i2pd/i2pd-2.15.0.ebuild
+++ b/net-vpn/i2pd/i2pd-2.15.0.ebuild
@@ -12,17 +12,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="cpu_flags_x86_aes i2p-hardening libressl static +upnp websocket"
 
-RDEPEND="!static? ( >=dev-libs/boost-1.49[threads]
+# if using libressl, require >=boost-1.65, see #597798
+RDEPEND="!static? ( dev-libs/boost[threads]
 			!libressl? ( dev-libs/openssl:0[-bindist] )
-			libressl? ( dev-libs/libressl )
+			libressl? ( dev-libs/libressl:0
+						>=dev-libs/boost-1.65 )
+			sys-libs/zlib
 			upnp? ( net-libs/miniupnpc )
-			websocket? ( dev-cpp/websocketpp )
 		)"
 DEPEND="${RDEPEND}
-	static? ( >=dev-libs/boost-1.49[static-libs,threads]
+	static? ( dev-libs/boost[static-libs,threads]
 		!libressl? ( dev-libs/openssl:0[static-libs] )
-		libressl? ( dev-libs/libressl[static-libs] )
+		libressl? ( dev-libs/libressl:0[static-libs]
+					>=dev-libs/boost-1.65 )
+		sys-libs/zlib[static-libs]
 		upnp? ( net-libs/miniupnpc[static-libs] ) )
+	websocket? ( dev-cpp/websocketpp )
 	i2p-hardening? ( >=sys-devel/gcc-4.7 )
 	|| ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.3 )"
 
diff --git a/net-vpn/wireguard/Manifest b/net-vpn/wireguard/Manifest
index 7212654a70c6..4aa9d3c76ab6 100644
--- a/net-vpn/wireguard/Manifest
+++ b/net-vpn/wireguard/Manifest
@@ -1,5 +1,5 @@
 AUX wireguard-openrc.sh 915 SHA256 f425a60ef4ec42df025df182a474e4ce7157f9fa400ac22a813b33f8421c4d23 SHA512 dd21d8558b4c5ff0fb02a35b6996f1f89ea0e59c885523b9443aafdebcfb23cab3e60f248594d416245a5829b36103566a7a59f41183a9990451c35aa6933dcb WHIRLPOOL a7889f5429a658674a28b913bd1d629024403539fa9ba7742e5c4feaccf3878aaba9f5a062281ceaace163c51abd841edacc104f080cc481b41917135df19b06
-DIST WireGuard-0.0.20171005.tar.xz 167500 SHA256 832a3b7cbb510f6986fd0c3a6b2d86bc75fc9f23b6754d8f46bc58ea8e02d608 SHA512 c131351e1a5591d3aa1c9172d9c2dbc7c8d5ee3ca11e8efecfa32b51bfdb80939efe714b7d41f0e3ce5559d0de20a55675eb6af4f06d67811196682e6e9ed87d WHIRLPOOL be05c06b0b3d07584f20291b6ad97acbe60cd045e54416851ae11db21366804dae3d340d8914098c9e3953c06ebc99fd7571a304595ad5f46e7f72528e96bbc8
-EBUILD wireguard-0.0.20171005.ebuild 4779 SHA256 09ec1cc8c1b84396038b34b81ebd935d088c2119e04f417ae4d782bc7d9b7cec SHA512 4f64c13d75ddaa611c545b1a65b1b3d5aa61298ffbf32de436287b1c898b77e807ffb4da3949d3a1a073c38d9e2609df885954f9a2d57388e86babab85c9b80f WHIRLPOOL 69fbaff57cc11b87c321f07b49a817314bb778afc6e1edfd36310d768faa8503a8c2bd1404a3b322201cf3748ac9f04a538be3021ec397e2cbd995c9717f1475
+DIST WireGuard-0.0.20171011.tar.xz 171404 SHA256 e2e44ff658743507bca0f6b443c2f85aacc48d507ba2dcd4812717145df10b96 SHA512 7ec5959becf96d214b0b6a0f2c638c986c7b330ce24c323a77f06a2ab853affb85c3cc6ab54d01ece525aef9bfd627bf4b69f21167ee86b16442659d202fcd77 WHIRLPOOL 4b0f4c49bb81f57fe583e575f744e0080662c0db81b08a9035e0ab23194dc9f12051525fa3c6466faf8d6043b35485ea5bde360b5ef551444d1e67a9aeab2a32
+EBUILD wireguard-0.0.20171011.ebuild 4779 SHA256 09ec1cc8c1b84396038b34b81ebd935d088c2119e04f417ae4d782bc7d9b7cec SHA512 4f64c13d75ddaa611c545b1a65b1b3d5aa61298ffbf32de436287b1c898b77e807ffb4da3949d3a1a073c38d9e2609df885954f9a2d57388e86babab85c9b80f WHIRLPOOL 69fbaff57cc11b87c321f07b49a817314bb778afc6e1edfd36310d768faa8503a8c2bd1404a3b322201cf3748ac9f04a538be3021ec397e2cbd995c9717f1475
 EBUILD wireguard-9999.ebuild 4779 SHA256 09ec1cc8c1b84396038b34b81ebd935d088c2119e04f417ae4d782bc7d9b7cec SHA512 4f64c13d75ddaa611c545b1a65b1b3d5aa61298ffbf32de436287b1c898b77e807ffb4da3949d3a1a073c38d9e2609df885954f9a2d57388e86babab85c9b80f WHIRLPOOL 69fbaff57cc11b87c321f07b49a817314bb778afc6e1edfd36310d768faa8503a8c2bd1404a3b322201cf3748ac9f04a538be3021ec397e2cbd995c9717f1475
 MISC metadata.xml 765 SHA256 b39a60fb08df46968b7200955f3568c1437afa566283c2962c7bb03e155392bf SHA512 794ffdecbc09f27080cade3a5753e0d1e9021edb400282ee6db7099d4583ab4d4ed28a343e2b8c2227ab39b8bc4182938d6c82ae4a4f7e9980f21348d8d8c805 WHIRLPOOL fd59215f63552e46f26cb7d7545f2ef3ee270433afe764e6408acd5dfc5f1bf88269cd02ea1fcd8bcf8b6857d83ae7558119cf6fa5c48dca00c48d11a63c78c7
diff --git a/net-vpn/wireguard/wireguard-0.0.20171011.ebuild b/net-vpn/wireguard/wireguard-0.0.20171011.ebuild
new file mode 100644
index 000000000000..fdc71975143a
--- /dev/null
+++ b/net-vpn/wireguard/wireguard-0.0.20171011.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MODULES_OPTIONAL_USE="module"
+inherit linux-mod bash-completion-r1
+
+DESCRIPTION="Simple yet fast and modern VPN that utilizes state-of-the-art cryptography."
+HOMEPAGE="https://www.wireguard.com/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.zx2c4.com/WireGuard"
+	KEYWORDS=""
+else
+	SRC_URI="https://git.zx2c4.com/WireGuard/snapshot/WireGuard-${PV}.tar.xz"
+	S="${WORKDIR}/WireGuard-${PV}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug +module +tools module-src"
+
+DEPEND="tools? ( net-libs/libmnl )"
+RDEPEND="${DEPEND}"
+
+MODULE_NAMES="wireguard(kernel/drivers/net:src)"
+BUILD_TARGETS="module"
+CONFIG_CHECK="NET INET NET_UDP_TUNNEL CRYPTO_BLKCIPHER"
+
+pkg_setup() {
+	if use module; then
+		linux-mod_pkg_setup
+		kernel_is -lt 3 10 0 && die "This version of ${PN} requires Linux >= 3.10"
+	fi
+}
+
+src_compile() {
+	BUILD_PARAMS="KERNELDIR=${KERNEL_DIR}"
+	use debug && BUILD_PARAMS="CONFIG_WIREGUARD_DEBUG=y ${BUILD_PARAMS}"
+	use module && linux-mod_src_compile
+	use tools && emake RUNSTATEDIR="${EPREFIX}/run" -C src/tools
+}
+
+src_install() {
+	use module && linux-mod_src_install
+	if use tools; then
+		dodoc README.md
+		dodoc -r contrib/examples
+		emake \
+			WITH_BASHCOMPLETION=yes \
+			WITH_SYSTEMDUNITS=yes \
+			WITH_WGQUICK=yes \
+			DESTDIR="${D}" \
+			BASHCOMPDIR="$(get_bashcompdir)" \
+			PREFIX="${EPREFIX}/usr" \
+			-C src/tools install
+		insinto /$(get_libdir)/netifrc/net
+		newins "${FILESDIR}"/wireguard-openrc.sh wireguard.sh
+	fi
+	use module-src && emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" -C src dkms-install
+}
+
+pkg_postinst() {
+	if use module-src && ! use module; then
+		einfo
+		einfo "You have enabled the module-src USE flag without the module USE"
+		einfo "flag. This means that sources are installed to"
+		einfo "${ROOT}usr/src/wireguard instead of having the"
+		einfo "kernel module compiled. You will need to compile the module"
+		einfo "yourself. Most likely, you don't want this USE flag, and should"
+		einfo "rather use USE=module"
+		einfo
+	fi
+	use module && linux-mod_pkg_postinst
+
+	einfo
+	einfo "This software is experimental and has not yet been released."
+	einfo "As such, it may contain significant issues. Please do not file"
+	einfo "bug reports with Gentoo, but rather direct them upstream to:"
+	einfo
+	einfo "    team@wireguard.com    security@wireguard.com"
+	einfo
+
+	if use tools; then
+		einfo
+		einfo "After installing WireGuard, if you'd like to try sending some packets through"
+		einfo "WireGuard, you may use, for testing purposes only, the insecure client.sh"
+		einfo "test example script:"
+		einfo
+		einfo "  \$ bzcat ${ROOT}usr/share/doc/${PF}/examples/ncat-client-server/client.sh.bz2 | sudo bash -"
+		einfo
+		einfo "This will automatically setup interface wg0, through a very insecure transport"
+		einfo "that is only suitable for demonstration purposes. You can then try loading the"
+		einfo "hidden website or sending pings:"
+		einfo
+		einfo "  \$ chromium http://192.168.4.1"
+		einfo "  \$ ping 192.168.4.1"
+		einfo
+		einfo "If you'd like to redirect your internet traffic, you can run it with the"
+		einfo "\"default-route\" argument. You may not use this server for any abusive or illegal"
+		einfo "purposes. It is for quick testing only."
+		einfo
+		einfo "More info on getting started can be found at: https://www.wireguard.com/quickstart/"
+		einfo
+	fi
+	if use module; then
+		local old new
+		if [[ $(uname -r) != "${KV_FULL}" ]]; then
+			ewarn
+			ewarn "You have just built WireGuard for kernel ${KV_FULL}, yet the currently running"
+			ewarn "kernel is $(uname -r). If you intend to use this WireGuard module on the currently"
+			ewarn "running machine, you will first need to reboot it into the kernel ${KV_FULL}, for"
+			ewarn "which this module was built."
+			ewarn
+		elif [[ -f /sys/module/wireguard/version ]] && \
+		     old="$(< /sys/module/wireguard/version)" && \
+		     new="$(modinfo -F version "${ROOT}/lib/modules/${KV_FULL}/net/wireguard.ko" 2>/dev/null)" && \
+		     [[ $old != "$new" ]]; then
+			ewarn
+			ewarn "You appear to have just upgraded WireGuard from version v$old to v$new."
+			ewarn "However, the old version is still running on your system. In order to use the"
+			ewarn "new version, you will need to remove the old module and load the new one. As"
+			ewarn "root, you can accomplish this with the following commands:"
+			ewarn
+			ewarn "    # rmmod wireguard"
+			ewarn "    # modprobe wireguard"
+			ewarn
+			ewarn "Do note that doing this will remove current WireGuard interfaces, so you may want"
+			ewarn "to gracefully remove them yourself prior."
+			ewarn
+		fi
+	fi
+}
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index ab0eae134022..029e186767ee 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Mike Gilbert <floppym@gentoo.org> (10 Oct 2017)
+# Depends on old ffmpeg-2, which no longer exists in the repo.
+<=media-tv/tvheadend-4.0.9 ffmpeg
+
 # Andreas Sturmlechner <asturm@gentoo.org> (30 Sep 2017)
 # Depends on masked net-libs/libtorrent-rasterbar-1.1
 # bugs #580760, #630364
diff --git a/profiles/package.mask b/profiles/package.mask
index 6242d00413b8..782601d66c4c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Patrice Clement <monsieurp@gentoo.org> (10 Oct 2017)
+# This plugin's functions now collide with most Vim 8.0 functions.
+# Masked for removal in 30 days. See bug 589194.
+app-vim/html5
+
 # Jonas Stein <jstein@gentoo.org> (10 Oct 2017)
 # Depends on the AIM service which will be discontinued on 2017-12-15.
 # See also bug #633914. Masked for removal on 2017-12-20
@@ -55,7 +60,7 @@ sys-kernel/tuxonice-sources
 # Depends on dead Qt4. Masked for removal in 30 days. Bug #629236
 x11-libs/compizconfig-backend-kconfig4
 
-# Patrice Clement <elvis@magic.io> (01 Oct 2017)
+# Patrice Clement <monsieurp@gentoo.org> (01 Oct 2017)
 # Mask Atom betas for testing.
 app-editors/atom:beta
 
@@ -112,10 +117,6 @@ dev-perl/rpm-build-perl
 dev-ruby/capybara:0
 dev-ruby/xpath:0
 
-# Bernard Cafarelli <voyageur@gentoo.org> (20 Sep 2017)
-# Requires qt 5.8, not yet in tree. Bug #631570
->=media-video/orion-1.6.0
-
 # Michael Palimaka <kensington@gentoo.org> (21 Sep 2017)
 # Requires dead Qt 4. Dead upstream.
 # Masked for removal in 30 days.
@@ -292,7 +293,7 @@ app-xemacs/xemacs-packages-all
 # Bernard Cafarelli <voyageur@gentoo.org> (04 Aug 2017)
 # Temporary mask as current net-ftp/filezilla does not compile
 # with it, bug #626292
-=dev-libs/libfilezilla-0.10.0
+>=dev-libs/libfilezilla-0.10.0
 
 # Alexey Shvetsov <alexxy@gentoo.org> (26 Jul 2017)
 # Its pre release so better to mask it
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 588951780f74..14f6db354f96 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -7573,6 +7573,7 @@ sys-apps/qingy:consolekit - Enable native consolekit support
 sys-apps/qingy:opensslcrypt - Encrypt communications between qingy and its GUI using dev-libs/openssl
 sys-apps/razercfg:pm-utils - Installs the pm-utils hooks for suspend/resume and requires sys-power/pm-utils
 sys-apps/razercfg:qt4 - Installs a qt UI. Requires dev-python/pyside
+sys-apps/rng-tools:nistbeacon - Enable NIST beacon entropy support
 sys-apps/roccat-tools:input_devices_roccat_ryosmkfx - Enable support for Ryos Mk FX keyboard.
 sys-apps/roccat-tools:input_devices_roccat_skeltr - Enable support for Skeltr keyboard.
 sys-apps/roccat-tools:input_devices_roccat_sova - Enable support for Sova keyboard.
@@ -7707,14 +7708,14 @@ sys-boot/lilo:pxeserial - Avoid character echo on PXE serial console
 sys-boot/plymouth:gdm - Enables smooth transition to GDM
 sys-boot/plymouth:libkms - Provides abstraction to the DRM drivers (intel, nouveau and vmwgfx at this moment)
 sys-boot/plymouth:pango - Adds support for printing text on splash screen and text prompts, e.g. for password
-sys-boot/refind:btrfs - Construire le gestionnaire EFI pour le système de fichier btrfs
-sys-boot/refind:ext2 - Construire le gestionnaire EFI pour le système de fichier ext2
-sys-boot/refind:ext4 - Construire le gestionnaire EFI pour le système de fichier ext4
-sys-boot/refind:gnuefi - Compiler en utilisant GNU-EFI au lieu de Tianocore
-sys-boot/refind:hfs - Construire le gestionnaire EFI pour le système de fichier hfs
-sys-boot/refind:iso9660 - Construire le gestionnaire EFI pour le système de fichier iso9660
-sys-boot/refind:ntfs - Construire le gestionnaire EFI pour le système de fichier ntfs
-sys-boot/refind:reiserfs - Construire le gestionnaire EFI pour le système de fichier reiserfs
+sys-boot/refind:btrfs - Builds the EFI binary btrfs filesystem driver
+sys-boot/refind:ext2 - Builds the EFI binary ext2 filesystem driver
+sys-boot/refind:ext4 - Builds the EFI binary ext4 filesystem driver
+sys-boot/refind:gnuefi - Compile using GNU-EFI instead of Tianocore
+sys-boot/refind:hfs - Builds the EFI binary hfs filesystem driver
+sys-boot/refind:iso9660 - Builds the EFI binary iso9660 filesystem driver
+sys-boot/refind:ntfs - Builds the EFI binary ntfs filesystem driver
+sys-boot/refind:reiserfs - Builds the EFI binary reiserfs filesystem driver
 sys-cluster/ceph:babeltrace - Add support for LTTng babeltrace
 sys-cluster/ceph:cephfs - Build support for cephfs, a POSIX compatible filesystem built on top of ceph
 sys-cluster/ceph:cryptopp - Use dev-libs/crypto++ for cryptography
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 91447ecdecf3..996b09ebd2c4 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -12,8 +12,8 @@ DIST coreutils-8.28-patches-1.0.tar.xz 7264 SHA256 fe9e8f347d104472d357ad8021299
 DIST coreutils-8.28.tar.xz 5252336 SHA256 1117b1a16039ddd84d51a9923948307cfa28c2cea03d1a2438742253df0a0c65 SHA512 1e592d0dd03b9227bf92af9a82bed6dc3bcbee46e984c7fb09833dea0962e86b309aa34d5e43823b73d4522c066bfa5cdc8ec694aa190910fb246ff32ceb63a1 WHIRLPOOL 58bdd9681d07794da70dc012d03de2f791bc8e40a16de85302cbb5ea247f6d81f0a92c3b90d655b9947057c5e5eb99b9347152d41150c1a613dd1f891942a73f
 EBUILD coreutils-8.25.ebuild 5839 SHA256 0d18564c2dc7106d9882bb4e7597c0fc910c7dbfb0e7a802ff23d8dc2ab57310 SHA512 86a917921cfd7c20755c2570c58438f7bfe923f8838e91508300a745a4417038cc81112a50972f288a02ff3acbb0405ac01784170fbebd62c9ac4c1e40294816 WHIRLPOOL 2e08adaa8f170ae83ab956867d576d7b105a02f109108e7af3d06fd152a553c9633e009ad699657f366ad2809743316f368d98b72f03e9a20be84b602709ac36
 EBUILD coreutils-8.26.ebuild 5863 SHA256 2593c865c6c60ad50f5f61ca3d18857ddc63784b0e9e8d9b668a620b0da9e5d0 SHA512 5583c226f1dcfe303f06301432bf00952fb7fcd5eb86959aeb1189777d64e85c2c96d331c4f833d513a86512ede04de9435c6ae2c79866dab721a5ca7faeafdb WHIRLPOOL 986f5c0bc72bf8003708ff64da97eb068c48f76a54d088ca54a8822112a2896fa9b74144479105d687c17321c92987c24efb7e5a867904cb291632c2a73b9672
-EBUILD coreutils-8.27.ebuild 5873 SHA256 9000511a122ce39be138740e207d950af3d64f61cc2e807e7cd44adedd9bd894 SHA512 d6fcaa23d648987bfbd84b8525fc7efc33029bc12db12de3af92f745b49bd8d7a5d69c513f95ce3969c30c579e86e4e434c1ede716db220d0205b794a74b27e4 WHIRLPOOL c1d921c459d346a1ee527d455fadf4f6bd4332a86e8a5cfb2098fe73e828d8ce009a8cab3c76b4402cada570cd83f5888cfcac7444cec0260614c77124db1fa0
-EBUILD coreutils-8.28.ebuild 5841 SHA256 3c5d4bef22900d4feb8501d7aa7e82a778589f29d4af31e99ecebc930e3ed1be SHA512 0f391e187178f2c49b8807450a9a3bed17c53794f221f6af35f3df20e30fab378070f82ec4dcf74f2bccbe547c5e3d9eb0e02781cf2a632327d424527edbe915 WHIRLPOOL 8110fea30800c6495d23edb0adfa2845fd107b4a9b20f84dd1c618c372282e96d87e266b91b63fb092059b2c77ae3fde0909da1fda1e9dd4c70e4916b1f2be40
+EBUILD coreutils-8.27.ebuild 5901 SHA256 e48b42c3d0eae8703c22b7b0d0d638a210e11c7caba036bfde9bce8871529f08 SHA512 a230b81b5913e0b98efe30f2876587178539c9dd462424c4eb71f5572fd496e4b0224f76cef92be973601f022f439ee36da393fabf4b70c2bfec71785321e8cd WHIRLPOOL 948e7a87be1e56fee5e879af681860dd5bcc9b02e30435d84117cc790b0ba5f368f6f49a6615246a061dc014f1a44c65ef293907358b0531957779c87c066c6a
+EBUILD coreutils-8.28.ebuild 5869 SHA256 c42674858864cb12c270e9431888f93778bc2996425f97691b952dea08fa0c61 SHA512 8c98e0e5cee83a5d3a6c138fde77888dc8b6df45e16e2cb48f93bffd91391a957be2489656b95030c1be14f04400a98b4cbde258e4a78559ac2de24cd8199d70 WHIRLPOOL 1cc452904196ade41ee491ce83e92d3263e63b3abb2ecf2b05bfa9c52460fedf0e0609ea8edefddf3ec32054febfbd0ba23954d6b236812168018dcf4c976017
 MISC ChangeLog 7611 SHA256 95cfa59136c273c96f0197f728a444d3337cf408e6d974d07553188148c77d14 SHA512 a1a429745e1d5b7efb21b321abd21e1b064bde4f271bbd600f6be3dd32dced5e04cea1fe8a2bc9abf12fdadde55ccefea1257730d5d944f5dc1b97d98d25e4ff WHIRLPOOL 93253eca9c20b770912675ad30f312e803fc1bf8cd17f59e0fd02446298d4f327e8f9c90ab4c90636fd9b4bc0dcbaf3ba477b3ba86f6820ff4040a676e057529
 MISC ChangeLog-2015 57093 SHA256 368347193225a6204bd2454ecbdf549ca614cb8fc5e183ac14c2f767288323e9 SHA512 ef4eff9a3d748641bf1b745599e951308801e1d00d67c5504d17e4d740f5cd7f0c75cd5ee34c8345e8017ee8b6397b84a41df84b4f342ff899a04fd35a0c8f28 WHIRLPOOL 43464de8d0d85fa5b35797c95049591d0a225e4e6f0ab596d8c637da0538f0605c15c35749195fea181b9d5e6a75ea7573a96dbe9da70f28e131a47c913d43b5
 MISC metadata.xml 738 SHA256 1b3907f92a4f6f20b1267d1c4a2b4d126e2a27b9820f6a3b2cb671b438edeeb6 SHA512 c074b29033dae300fa02fb35edf0b595bf00bd5616bac8af5b88525980dc8542dc336145b19942d0f849189b7abe0201f2a40d86d0ed02ddad602eb131b3a87a WHIRLPOOL 206dd26110118d307e0f1654b9e20e26805c90f968c1c00ffc71878503bd6112510ee334a44a031d05884fe8f3576a07efcab630f4823f5527c5d32adc918938
diff --git a/sys-apps/coreutils/coreutils-8.27.ebuild b/sys-apps/coreutils/coreutils-8.27.ebuild
index 396636ee5d93..f2bba2686c97 100644
--- a/sys-apps/coreutils/coreutils-8.27.ebuild
+++ b/sys-apps/coreutils/coreutils-8.27.ebuild
@@ -43,6 +43,7 @@ RDEPEND+="
 	)
 	!app-misc/realpath
 	!<sys-apps/util-linux-2.13
+	!<sys-apps/sandbox-2.10-r4
 	!sys-apps/stat
 	!net-mail/base64
 	!sys-apps/mktemp
diff --git a/sys-apps/coreutils/coreutils-8.28.ebuild b/sys-apps/coreutils/coreutils-8.28.ebuild
index a7253367560c..ffd2a59938c7 100644
--- a/sys-apps/coreutils/coreutils-8.28.ebuild
+++ b/sys-apps/coreutils/coreutils-8.28.ebuild
@@ -43,6 +43,7 @@ RDEPEND+="
 	)
 	!app-misc/realpath
 	!<sys-apps/util-linux-2.13
+	!<sys-apps/sandbox-2.10-r4
 	!sys-apps/stat
 	!net-mail/base64
 	!sys-apps/mktemp
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index def2b3d1cd2f..1211ec245b53 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -4,5 +4,5 @@ DIST fwupd-0.9.6.tar.gz 1404749 SHA256 cf406eb11b284cd89228db53bff787cb8468d4e14
 DIST fwupd-1.0.0.tar.gz 1466486 SHA256 179ee1fb5c0099ba9bfb8c07178574cc7408297d2af80ddf483e9f147b30e31a SHA512 6bf5e691b2d958b28e6002bfbc06bd19440876aea8dc55f761e10e039141e12df14a6ec8c2f2479b82770feeee4a15296229dd662653841bb0b41d4ea61fa422 WHIRLPOOL 0db3183049921b8ac30b5855c3657d6c51a948bba2728178ed4932e18401f15f6af7178ac866a56347219b334385c826ce5cec0ac72ddcba799251b3f91468b9
 EBUILD fwupd-0.9.5-r1.ebuild 2172 SHA256 99c484d513fd6bd8616dac100aa31e0e63bae5ed7a9d94fafda17a64821267f6 SHA512 d4b49cb711efd77ef2835294a92e6c61d2f0d3d833758befe4c6dc264e879c60c20d2fc4463c7600b942ed73aad2b379e691008ab94cb31e9e8530b213c77ad3 WHIRLPOOL 0ee614fe4bdf932c81df03adef3010f589d9823f54e6f7f52d924145c43dc73a10fa8d2a1ccb1e8e65e201c628bde6fd0b464c3622fb1f1aafcea0f406768284
 EBUILD fwupd-0.9.6.ebuild 2111 SHA256 6c8119cb23e4fd69168600656a1447eb4b2bd0be32de296d8c7712f71c7770b1 SHA512 8a62187f7aecdc16bda9d30751ac9f3767621ea6588f9c24e8b141f5e7a334f437a3eb473cb9f4929e9714d9bd9bd970abbbd2c224454580a3daf5570c2e46f0 WHIRLPOOL 9cabf66f41a805d3fc234c9a4dcda3b21a1f79c9d7c4acc8e30eff44dfb21976bcdefedfdd5605b4df2570f4a7d187b5d549946de2bd3a1937b8e844c9f3ea3a
-EBUILD fwupd-1.0.0.ebuild 2316 SHA256 92fad17fdad824099f950b5868ecd3d60e50760e1b6927cab43fc81d31f2deea SHA512 c0705b53af2f760cf29c72468876dcde5f48e9916701acc42b3f47b071222e4f5b48dbd36f5015761f95158f7d9ad9cad16e1b0d5e63874bcef9cc6e6027da8d WHIRLPOOL 3fa4d4fa6d208cddb4eaad69e613521ecd548165153d26a1667173bf5c26da1eaf5a8bae9b6129415e29e49436957083e99b9d45503d5644eb7ee1cec49e44f7
+EBUILD fwupd-1.0.0.ebuild 2366 SHA256 986dde4e9fdb58398b3a5660a57000fb706f5d39cc8062221defcf33792a97e3 SHA512 7a04646aefec3344873c3604ae7249538529817987361ffb47ac696c590c39a8e580414bc5a5e60f289ea8bc43a56c8f2c3a58243add2569f7fa4bd06b711b50 WHIRLPOOL 9f019eafe3c4c93373c100fec3713f92529a5aef86f80a81a03973156e15796e9e9731c68d3be0468b2b8e9c3bc7be72201041cb757139777cc5a897bb8883d7
 MISC metadata.xml 790 SHA256 9b1124ba722d81b7e43ad29aee79bcb8196e87260fdedcbbdd1044aad1ddb6c5 SHA512 5b0e4ce1e52ffc53059e995698820ad7f426a13e81bf9fb7f7e41f8c706839c5493bf72d3b75c55e8bf12be97dc6bde1a1a4eee473e8022e387b4256e6f67f49 WHIRLPOOL cd57b4e130e61ff7baa0cea4df3aa483bfe96a4e72faca7c00f2ba0444667a363101673453104ba711af04d1f279aa2d782e7b4d9f1b2912e6145cbc305c4c18
diff --git a/sys-apps/fwupd/fwupd-1.0.0.ebuild b/sys-apps/fwupd/fwupd-1.0.0.ebuild
index 41c904522da3..6d4d3f01c65e 100644
--- a/sys-apps/fwupd/fwupd-1.0.0.ebuild
+++ b/sys-apps/fwupd/fwupd-1.0.0.ebuild
@@ -16,7 +16,9 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="colorhug dell doc elf +man systemd test uefi uefi_labels"
-REQUIRED_USE="uefi_labels? ( ${PYTHON_REQUIRED_USE} )"
+REQUIRED_USE="
+	uefi_labels? ( ${PYTHON_REQUIRED_USE} )
+"
 
 RDEPEND="
 	app-crypt/gpgme
@@ -76,6 +78,7 @@ src_configure() {
 		-Denable-doc="$(usex doc true false)"
 		-Denable-man="$(usex man true false)"
 		-Denable-libelf="$(usex elf true false)"
+		-Denable-synaptics="$(usex dell true false)"
 		-Denable-systemd="$(usex systemd true false)"
 		# requires libtbtfwu which is not packaged yet
 		-Denable-thunderbolt=false
diff --git a/sys-apps/iucode_tool/Manifest b/sys-apps/iucode_tool/Manifest
index 317249542275..aa27cf2ee575 100644
--- a/sys-apps/iucode_tool/Manifest
+++ b/sys-apps/iucode_tool/Manifest
@@ -1,6 +1,8 @@
 DIST iucode-tool_2.1.1.tar.xz 143204 SHA256 8f94ec73f5d4d1a6801aaa894fa1c6544d9b27aec16e1a00e18e8241c7e0f6ba SHA512 07ebf1919a997e7270d9c53f0287f53975253eb53e678f30bfc55acefc6fba7a51c6a4edbdcdbba88a7643ecbcba6acd0c93847d6d1648659789af37c9c59cd7 WHIRLPOOL a20e659047bc8eb8fbf83b91d7014004711c0713f450a5ff41f7919b3d7f4b192a5fcaec89cdba43ea40878c0b2c63d4bc628dae001cb5bc88d571b3b328b27e
 DIST iucode-tool_2.1.2.tar.xz 143352 SHA256 01f1c02ba6935e0ac8440fb594c2ef57ce4437fcbce539e3ef329f55a6fd71ab SHA512 f1af71843160500fb9c0b56bffdb1d3db09acf42f6c0a84a5d5311eedfe809f9ac27f89bf1778cab8261d3a540cfe62f3698a45c76be76e7f40179b9c49050e0 WHIRLPOOL 3ca861e36565c9126041c3cdaf05cc27f18d64580482a2d6b3d889c44b8f08bd1a3f8ae1cd1e27dd708c0a38a75e2fb2ed292e42458065cfc029ae8dba575580
+DIST iucode-tool_2.2.tar.xz 149896 SHA256 9810daf925b8a9ca244adc4e1916bcab65601c9ebe87e91c2281f78055982971 SHA512 edb5969c1e00480e537cddc49d7cbb190ce70e6f0c44d9c40a481038bfa048fade1b454a7f4eef3048cc204ee303758fe76222f9c9fb9b407ed463ee0ccdd429 WHIRLPOOL 96c4082f44fbcee882f01e04ffa17ea35726ecfd0c15863f99607d15cddab2a4c97ef53a32da308cd2eb412bfc6a7ffdae6bad6b31add01abc66448bb0ae6924
 EBUILD iucode_tool-2.1.1.ebuild 428 SHA256 986a164b7ec60009b3136acb10001deda62b0751c685fbfa766257ca237d6116 SHA512 62d09ae12e31934b7f37181327e3da5bf9d8cf9a0296fdc25ec832fde2555e7d78f7bd409fbcef0fd69da360b4b5f14fd5f221a8a675e66c5e6a294f14bcb0bd WHIRLPOOL 775fa16576b6d8c98017a3164b380bc25bc82e7221a7dd4c77cf93418618e3d9590eadb62317ff4e870fda1f89d8947738f152df00deda0a54c01db575b7977a
 EBUILD iucode_tool-2.1.2.ebuild 430 SHA256 868c4e5909f694d5fcf372fa7a94b104ec7380e6ad1995cd5a3fc766d3a712f0 SHA512 d4a8b86cd113cce64c4a6b8d11e70aa01e638d1e5f5649c3f92073ccc9252e3abcea36cb8ba3709a92b306e783d8f081483888ae2818baf9ddce67ab488144aa WHIRLPOOL 1566aea5bec9034049fe49a6bf8795e3fe2c4321c153c39332108c625a722c47b162394e62d2cb84bd91d3a0b023e957d3795072c7bda2233f86598465815819
+EBUILD iucode_tool-2.2.ebuild 430 SHA256 868c4e5909f694d5fcf372fa7a94b104ec7380e6ad1995cd5a3fc766d3a712f0 SHA512 d4a8b86cd113cce64c4a6b8d11e70aa01e638d1e5f5649c3f92073ccc9252e3abcea36cb8ba3709a92b306e783d8f081483888ae2818baf9ddce67ab488144aa WHIRLPOOL 1566aea5bec9034049fe49a6bf8795e3fe2c4321c153c39332108c625a722c47b162394e62d2cb84bd91d3a0b023e957d3795072c7bda2233f86598465815819
 MISC ChangeLog 1935 SHA256 ccd6236f12515ac1188efd0c0f3cd9b2a3dc2d4bf9a8df241d72d19ff541075c SHA512 8b7ea3f295d52f2c4dbee4cb17f7d2f219f58be760859e1b3bf58384b3566e24e3185d60edeba4d3f75e7e41a2e93e03a744162457ef810b241f35eb75e55c47 WHIRLPOOL 808182c143ce62188d24bbd803086d9c6f6ead8edb3504b801c85c4d70e04eb29cf224e654e50f7d1e347a303d380c162d69b1e7dc78c4818132f636fd7317fc
 MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-apps/iucode_tool/iucode_tool-2.2.ebuild b/sys-apps/iucode_tool/iucode_tool-2.2.ebuild
new file mode 100644
index 000000000000..dcfaa908e494
--- /dev/null
+++ b/sys-apps/iucode_tool/iucode_tool-2.2.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="tool to manipulate Intel X86 and X86-64 processor microcode update collections"
+HOMEPAGE="https://gitlab.com/iucode-tool/"
+SRC_URI="https://gitlab.com/iucode-tool/releases/raw/master/${PN/_/-}_${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${PN/_/-}-${PV}"
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 5be57c7635e8..6ada818c7b64 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -9,6 +9,7 @@ DIST openrc-0.30.tar.gz 222383 SHA256 29b4d565bc37f51585c4a9aabedad46d7903186120
 DIST openrc-0.31.1.tar.gz 224059 SHA256 2a5cb07ce64fec2b3fd35c11be6b7dfe383fdc6a5449278c67b2f0af026650cc SHA512 98001e05896d113e20fad27ba100e2db5588262cb9c0b52c2800b38fd320b9baf4a99302044ef4045ba3a746d685d0cc27f8fdb42dccbc0574e32c6db9e6d3d2 WHIRLPOOL 00cb1d252d79700b79828fed6e319c124ae1c89bd10f506ff2f0e36961288c1d9a7366abb19e77f866aaa1695b176ecaad892ddd4b5a26713d084d4744470acd
 DIST openrc-0.31.2.tar.gz 224891 SHA256 6865733e8abeced128537937587e1cecc233227dea4b760c92f3ed6b980341f6 SHA512 c7a43eddd0652b8b9a62914d7aebcb6eab5fbd8f041a25f95c68f15c97eab3d27802a335da3703ce1e9828bd9a4fdc7e7c311075b875164af024c82a181b10df WHIRLPOOL 5e0d1d90d50915bc9a5844a3dba6362504a22612bdd12397c3f830f5407986374f27fb550dabb97b0b6aac5cc661ac40967819582216a14256276db5c9024db6
 DIST openrc-0.31.tar.gz 223966 SHA256 9d1631b647b3b8981dcbb5251f9d2444859c6cf0791c1b6b07469953e657eeee SHA512 2c28daa5b2bfd3c31a2b87b08a7b39dc078ab0224c713a2b738e991f968f07d4761770a813fb449df551d6e3db58ed997ac8bbe210d1fb17b4c88ead859eba7b WHIRLPOOL 929dbd2724b6f6aaeaae1d9bce913068ac94ec3e21aefae859d782ed7f6f2a948042a5371afc3a8f631b10552776225b4b8487a11188847366877bfd12889001
+DIST openrc-0.32.1.tar.gz 223808 SHA256 ef037a468d87009c8a21a62f04c3b5fa5eb56ce2808a2c6dbd3c73383469b638 SHA512 9cd48978fcd69a6d80b474a06b56550cc8c538d6d7a1cb6f88b90087593eebb8185ee5192ec05be2f87f61de53dbe6ded9058aee7ae8f806bb0d7d7da70f62d8 WHIRLPOOL 021f1dacf4a4a0fb7fb1577f2bfdb4db2007e7e414b17536f7709e05256489e5a692376611df674301ba90a879d14c9bd9c5684b4dc063d26e678158fa2a74f3
 DIST openrc-0.32.tar.gz 223935 SHA256 d452f5c8dd49a0819de368e7faeb56bd7460f8704cb029d9cc4e0b1dc56e791e SHA512 a355ba31d50b1c58f724d446449a8e31bb6f4c13b2da886880579e2666bcefe612a4eae64732f3ef7549fbfc84f3e088c4ca98e6be30108adfbf0a6d648d2635 WHIRLPOOL 451d9e549a175d14b5ed23c9b16e2cf7815e8cf7e616d964161b1e583e899ad0ac1f7bfe4cc4fccd4e1f5155d1c85f8d77f206d083bc02a0f2ad6a1348ac776f
 EBUILD openrc-0.27.2.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625fc6fbfbf7b2f31ce8f7c2e1 SHA512 c63261e84ac5225167034db09feb5772a244de09b2ca084078122b7a968f737dff1eb3a1b8fb76333c7c7f57299bd30ae4c5a49a0ad120459474be30aea360d6 WHIRLPOOL 45fc659935bc090b2ec8568dec93407b8c4a851e73b1138643a4584ef1b3d9e9c485ba1e10a0a303be6825f35f92ee026fc2f640158d3e7c7add3b3f1dcf5a67
 EBUILD openrc-0.28.ebuild 10123 SHA256 850255977878f273ec0fb3f0bfa117f4637dc3507f855e5d549b3eaad904f6f2 SHA512 f32502ebbd8e1a8e13044cd23d8b0e136eaf26e86001ae5f225640f085069c78921392a492614d3d1b734542bb0f99a9c781706158bdf5cd1ec91634d9f89e72 WHIRLPOOL 40fff2659443e04b037a5d722f0380423977c70001cd10076020ea5a6107ab8c7436ea0727ad00a0371a707daa90dda840bd4143ba5e2b180165dcc07fd15186
@@ -17,6 +18,7 @@ EBUILD openrc-0.30.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625
 EBUILD openrc-0.31.1.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625fc6fbfbf7b2f31ce8f7c2e1 SHA512 c63261e84ac5225167034db09feb5772a244de09b2ca084078122b7a968f737dff1eb3a1b8fb76333c7c7f57299bd30ae4c5a49a0ad120459474be30aea360d6 WHIRLPOOL 45fc659935bc090b2ec8568dec93407b8c4a851e73b1138643a4584ef1b3d9e9c485ba1e10a0a303be6825f35f92ee026fc2f640158d3e7c7add3b3f1dcf5a67
 EBUILD openrc-0.31.2.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-0.31.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625fc6fbfbf7b2f31ce8f7c2e1 SHA512 c63261e84ac5225167034db09feb5772a244de09b2ca084078122b7a968f737dff1eb3a1b8fb76333c7c7f57299bd30ae4c5a49a0ad120459474be30aea360d6 WHIRLPOOL 45fc659935bc090b2ec8568dec93407b8c4a851e73b1138643a4584ef1b3d9e9c485ba1e10a0a303be6825f35f92ee026fc2f640158d3e7c7add3b3f1dcf5a67
+EBUILD openrc-0.32.1.ebuild 10168 SHA256 194de0e29a431d4dd8ab1db172961e5a60440e9a670ae55b02a6d7e162d4b532 SHA512 fc1f3fc646a7c4b2eb03a426dd0f9b149cd2b7e2722c842835ed986fa44a5a0d4c5a462fd3d08e5f379f62f6dc5624c4f97034587ef78e714d88d9d2cb2271a0 WHIRLPOOL 1f757410e2c11a69abf44afb859a049ea5e00a54843643d6279e92e19862b6fc5e48043fc6b0f34f197c6abaf214c545a3f4c31ead434685b6e3245229b45fa5
 EBUILD openrc-0.32.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-9999.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 MISC ChangeLog 18468 SHA256 b0c4464a2179009f3683606b8c9ed6b6f1e5c543e5dee53d0b44e9cd51804d94 SHA512 f1269f5f534a2fb2c5643b8cb5735e969e4bc18f2f8474c23784cfebc92ac72a3ed77f00eafa7430ec2944b4a5476a4688172d9fc47a32eb04bbb43893a80143 WHIRLPOOL a912f296cb7272dded544d045cc9dee06c9319fc500dbdef9e000300c3fc73aaae4e72c7574428ce4dddeedcd2055e594acf315cfa53db95d48aaf20c8a8907a
diff --git a/sys-apps/openrc/openrc-0.32.1.ebuild b/sys-apps/openrc/openrc-0.32.1.ebuild
new file mode 100644
index 000000000000..e50431efc97e
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.32.1.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
+	unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	audit? ( sys-process/audit )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	!prefix? (
+		kernel_linux? (
+			>=sys-apps/sysvinit-2.86-r6[selinux?]
+			virtual/tmpfiles
+		)
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+
+	sed -i 's:0444:0644:' mk/sys.mk || die
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /$(get_libdir)/rc/init.d
+	fi
+	keepdir /$(get_libdir)/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install gentoo pam.d files
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+		add_boot_init tmpfiles.dev sysinit
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
+				"${EROOT}"etc/runlevels
+		fi
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Handle the conf.d/local.{start,stop} -> local.d transition
+	if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
+		elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
+		elog "files to ${EROOT}etc/local.d"
+		mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
+		mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
+		chmod +x "${EROOT}"etc/local.d/*{start,stop}
+	fi
+
+	if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
+		if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
+			ewarn "The dependency data could not be migrated to /run/openrc."
+			ewarn "This means you need to reboot your system."
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index e1f64bba1495..1e8c6b4305af 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -8,9 +8,11 @@ AUX rngd-initd-r1-4.1 494 SHA256 3ad9a52d86e54eb755923242b1314584d5c66ab55221f60
 AUX rngd.service 133 SHA256 a05b1075157d39302106221594e1640479fae5dee4595de09442901a3a2d1648 SHA512 51e9ea84b624cda8d3689d6a9a8d60da4a556aa9d2a1a04e698d9a1490717aa47172e152c93711f8d04be8a5b68b1dfd568a762bd8ee7219afb7cdfff15657d2 WHIRLPOOL 093b0cd19a147abd9fc10f366c2c5a167d31b839d755cf2e56f6ae35409b6eb764db0651858d20dc95b71fe1d90b4ca33bde88053c80e40665613d132357366a
 AUX test-for-argp.patch 1245 SHA256 56824e3d80c931c3f907486cd8bf7b5a3bcc20fa507f452a9c63286443c06756 SHA512 0fe4b37eb3d2e93ff9ce17aed8cfcaa29c7f04289ba692d10fd0f8ef6d9b1e5f64a5734a508aea548f13fd00217972a68bcbeaf6977e763087ad20c19d456ed6 WHIRLPOOL c515fc9a8adf6bd49a4a622c05881e9ad22b514634c25d4f894be96d46f67a886bdcc092cafa57521e17d53bba1f1a3995dc673c24292b0aca276792e575073b
 DIST rng-tools-5.tar.gz 122182 SHA256 60a102b6603bbcce2da341470cad42eeaa9564a16b4490e7867026ca11a3078e SHA512 58047c37cad4f5f1210b696e4dba122878f78e57d05d9cb822f79234240ecce31efd2d39061fea1eb5b2e81d48d8c3bf6b92d06451f1ce5d5db7117704e89c50 WHIRLPOOL 073dbeb9d27189db44658a9f25657b93a320b125fbfc8230f7ce7849b8e7c1f7802b4c3a53de3417525b02739194fab8a6e5eb03d5db317a23deb275d72fbb21
+DIST rng-tools-6.1.tar.gz 29814 SHA256 6144818cd9c93008f72f14e2d23d8f717640d3f45afcea666a32b12bedd4dc03 SHA512 388593ffeef0b5f2770532629418cdf1b6421092ae9c5fe0a68d198a5cbd4ff733fbca8091d497e09620c61a9e8b982298fb064edfd05a0fc36fa49c22eef5c9 WHIRLPOOL 08185ebcb796daa25d4db69a2a46d2336c8db109ecfdd342a016fac6601e5feda09e4365431ec46284883b82fe1bbf4789588dfb2060bb4960233ffd8c8b929e
 DIST rng-tools-6.tar.gz 26024 SHA256 6d9c3f72824d1ea15dd2a80bfcf71f6a73c8843c6344f7f774a97a4ca7641b4c SHA512 2aea947c4dba5e8c4df33396957f7224b62200be0e3d10aac08c84155fa473a67df5f49e07a07b2cbea4dfd772d90c1b194e8fce3d8eea762463a7f4a16d6ce4 WHIRLPOOL 4e53c626288219a7cb9c94cf29d22878df5ad3298ca5ebedea46978e519d9b5b0ad94f765e217563105258f4b02b72b0033e551a7d37939ced9ca5d92f0a1048
 EBUILD rng-tools-5-r2.ebuild 1098 SHA256 a6e9a693947fdcff18969be0ea392e8171cab38be6367c6c30cda84f24137613 SHA512 b4a612e14a4e556c57c182a5e709bf497eb11c2b9ca850ca1dd32f94c313157d3273b02715eef907b570d5aaaa06e9786ce33f9085f83423d61fb5af4bbe1b52 WHIRLPOOL d27df6207498055f147981ff7b0f63c30fc1e0d458c8ab550829de00396b7772a5c50fa2d7f057764a35092ec3e30c45a79d5a48dfd94568bdc8e15dfceab603
+EBUILD rng-tools-6.1.ebuild 1227 SHA256 7029dc428b47d4d5e93a7cac1ce59efb599588623d49add2535884dc0b1aa0ac SHA512 5298ade15fe3d3e04ecc68e4a2353eef2c30fa052c16bb4bdbf0156ddeb2fe3869f30ff9a3b6eacd7357824f53d3d4397cbe84f14fe0440036cbb6377671f287 WHIRLPOOL a47c9903cfaf9706d84424d76bf523aa452eebc96a139451abf870678ad1e5b67c5b9b05ea9d6e700c0dc438c9caea2511d4fd0ebae13b994895c83a1cbfa37c
 EBUILD rng-tools-6.ebuild 1114 SHA256 b783fda920969b210d53a6b8d84f519ded1bfa5be641b2390a93732a15205f91 SHA512 e218c2147b5879418647e85103d7c0bd3f5fe3fcfd42855d64441c1228eb3a2caf462b2b4e553125e88374db64c94894497645421606853968ccbb4ddb2d5f38 WHIRLPOOL fa5a977e4949cdb582902703e3212d8feea462f27c344a5782287b4da1eeda4f58bca03ecb68345da9b5b94a34c62377867a257f60c1ed504601229b453e72d0
 MISC ChangeLog 8067 SHA256 a232bfd53ae71bba942c0065e502fa2087a6af4b14bc5664cb3177c9e0f4ae40 SHA512 b9143f297136c37d810755bb899b4353008d2982eff54d29de73f62a9790506468ba0034206877f894fe681effed2921bf9e8af54e771f46ef60d288955aecc5 WHIRLPOOL 5c62a5780931f8d50387a08076410aa815d6c7637260eec4f69b17a1ea6f51278d3d15786cefda3213527f47816f9dfaa2e296ed240bb6a543dcb70c0ecd2383
 MISC ChangeLog-2015 10419 SHA256 429b14666b303f77b8081e33cb4d2bc4da29c06af72895b37cf17ae3658381ce SHA512 9ef68cdfe956b4918d101ec0cfe3a69a9cf748b52326976edf234b58a48eb8c48fdb32b011fa8fe5e3d0cde8576b212b24d5b4003f87a4e4b327dc2cc0ff59ea WHIRLPOOL 525eb6a7d62820bda06d801c2721e2c38a9ca8af5d26d961c57a9d62c26a8dfec1ab08573f4237f3e6f4ee576de03d6d63a5514424011e773541f29c2b8e3915
-MISC metadata.xml 435 SHA256 853adcedbd25773649ea54cda891d50ddb76210f8a09dccc387a7dd8f656d711 SHA512 8e6882d47d45613afd58beaa45cb41134740efab0c34381789eaabd5938441e98aa59fde0efb922766075ecf3f608b40c632bc4e4cdf786d256d954e502296b7 WHIRLPOOL 6dc3ea1f0a1273a6f33e76898b298b1b0e3cb827bf436380b9ab15f425b47f7e16ec1c2d95f2232c2012fa41da4c0992a3d7598ed844bd1e8f2611559b90d3ca
+MISC metadata.xml 576 SHA256 d9a641541810a9e63447fa616d1e4d25163ad6b8937d35f962b9fc9add16613e SHA512 306d4b47230443cf82abd2c7e934b8fab73e695305a8981d3c011cbc2bbb193a87ae7a9c265a56c0454f4c0103f136211a4aabc2e35e030107b5ab2ac457c6e3 WHIRLPOOL ed537ec604e553367ad2354a787660d30c8a7ef116e94baeffe59bdf60d07199fd93994fced93a62ab08ee817a2befcc12f84f2b00bd304f9ad586f4aa9c9369
diff --git a/sys-apps/rng-tools/metadata.xml b/sys-apps/rng-tools/metadata.xml
index 6a6818baee38..bda25e86a520 100644
--- a/sys-apps/rng-tools/metadata.xml
+++ b/sys-apps/rng-tools/metadata.xml
@@ -9,7 +9,13 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
+<use>
+	<flag name="nistbeacon">
+		Enable NIST beacon entropy support
+	</flag>
+</use>
 <upstream>
+	<remote-id type="github">nhorman/rng-tools</remote-id>
 	<remote-id type="sourceforge">gkernel</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/sys-apps/rng-tools/rng-tools-6.1.ebuild b/sys-apps/rng-tools/rng-tools-6.1.ebuild
new file mode 100644
index 000000000000..2b37de32bff9
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools systemd toolchain-funcs
+
+DESCRIPTION="Daemon to use hardware random number generators"
+HOMEPAGE="https://github.com/nhorman/rng-tools"
+SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86"
+IUSE="nistbeacon selinux"
+
+DEPEND="dev-libs/libgcrypt:0
+	dev-libs/libgpg-error
+	nistbeacon? (
+		net-misc/curl[ssl]
+		dev-libs/libxml2:2=
+		dev-libs/openssl:0=
+	)
+"
+RDEPEND="${DEPEND}
+	sys-fs/sysfsutils
+	selinux? ( sec-policy/selinux-rngd )"
+DEPEND="${DEPEND}
+	nistbeacon? (
+		virtual/pkgconfig
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/test-for-argp.patch
+	"${FILESDIR}"/${PN}-5-fix-textrels-on-PIC-x86.patch #469962
+)
+
+src_prepare() {
+	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
+	default
+
+	mv README.md README || die
+
+	eautoreconf
+
+	sed -i '/^AR /d' Makefile.in || die
+	tc-export AR
+}
+
+src_configure() {
+	econf $(use_with nistbeacon)
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/rngd-initd-r1-4.1 rngd
+	newconfd "${FILESDIR}"/rngd-confd-4.1 rngd
+	systemd_dounit "${FILESDIR}"/rngd.service
+}
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 9bac0abcfc13..9ffaaaae7f0f 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -3,9 +3,11 @@ AUX sg3_utils-1.42-sysmacros.patch 925 SHA256 d4b616076dd09b8cf66a911d8710730ee6
 DIST sg3_utils-1.40.tgz 1179730 SHA256 44a9ecfd3af018fa9f3586067a8fa5f4874451c3d773d74436d262a7e530ee83 SHA512 cf4909c46d509ea7c1c8930d81df2b20ce56c56092830f017e69fa4ce7eddb395ae1d17f51657d8dfb539fdd78229223e54e0db2d61d2612d23313cd6846043a WHIRLPOOL d092fdd6ab46da73cda9bf2b0a85dc468bb222a443ca20e8d2f55ad91ed83b8a523fbd4946cd2e40874a56673085629227996f1f5e686273c8d2d44093797687
 DIST sg3_utils-1.41.tgz 1194212 SHA256 c4e2893c36df1ee5b07840ab7c22129544f5dc8a55f7cc8815c9cd8e44ec31c0 SHA512 ceca778a2f4d16dd341dd47cc1d92df5bc85d7f75d75e6b7c1a99c31e03e98103a18abf624880172e162bd0b751f760f0e919cbbb989303a9e1fbe9ff3eb1f46 WHIRLPOOL 9476f0f180879f1386b824b367314648d616b6925ff7b735760f25de6e086e38efa0eb12dd8fb9f9305eb367f7d8c2053ceabc83fc6270492357abce25de9784
 DIST sg3_utils-1.42.tgz 1219231 SHA256 1dcb7a0309bd0ba3d4a83acb526973b80106ee26cd9f7398186cd3f0633c9ef3 SHA512 d16b65e36b2bccb4fc4c189f97e71fa38e6619f37d668a4ddd74a52c715fa62325288d9737812ed19c80547059dbd27be5a20565e27e1aabb571e8f5f8ac53ad WHIRLPOOL 7cf34461312c55031b317b18defb69b57190ca22e83a162e957e213c658f6cb990675ec60b78849da40f54679027fa27f0c809be568fb1bdd31a8498c8b8665f
+DIST sg3_utils-1.43.tar.gz 1180760 SHA256 cbb88682f11169fd234109843381785ffaeea4f94627620e57dcf26ad1361482 SHA512 5f2eea6f61300e288ce32ca613179a944de34576fd6e596c4c3aa6cc2c0ef397cf5bfd2c148b737f678aac0c574321994525486430ea14ae8e7cb1c02184636f WHIRLPOOL b6c822115b1e24810b60d1e903aa72f6e6047e0fe7b479f4730737dc72434dfc818cad666c33837b6f4d398dc9d2a34c233c2860d4210b53b71c367c5d3ee768
 EBUILD sg3_utils-1.40.ebuild 958 SHA256 97eb426b1f0c2b11e4f3c8611a7386aaa576a3369c90f397a61adeef4094ecbc SHA512 e347e8fc51a5875b71f4f6350ae03a6d03c8d77b5aab42dab36c0ec43441ebf75a8b291a906dd6a2ee0f07d053bdb453dda8476d2a569c3e16b52eb95fec1102 WHIRLPOOL 336517798552c8da669921dbfdc40625a731683ae7fef0af8d6a2799614be8e4d4ef6ca3d12c1b20592d5923606ac1e4884169d8d21b9b5e21a6216ae4be8f0f
 EBUILD sg3_utils-1.41.ebuild 969 SHA256 dac8fa6858736292fcc8242138a2851eeaeabbdd717f30955e30f4936ee6f1e3 SHA512 542582bd4130f2cc0bbacbc30a2a487ff8300845b43f0f7e4b83edfea4274d34468ddcf65ce919123afb93ecbd2d76853d80ce708456c4852390cb207f2e4055 WHIRLPOOL 187bdb017cbc7e426c2b85c632974304ed7d7e7648b2e69360c4b3eb4fc4d50617d89f08b9bf56369fe22002700038a38792b0e92a88ffe8e8d45949946768a5
 EBUILD sg3_utils-1.42.ebuild 1030 SHA256 9076086de4233b973e793526f85ebc5983a7c7bf9b1dea768d3d3f6cd209aac4 SHA512 8e8ac9d7b4293e8361e593685988fd92fb38a22e58e22b5f556216160fe494d9f2862509225ffcc75064bb18dc3eb9088a9c8595d6d6a7ed978d9189b8de2b59 WHIRLPOOL f4b0ac1e6b1a16f4c06a584e05396bf29dd25bf20b4f266327f0bf96c0d0260f6d24d13916de21f0d4c9725378538192f68865c1b642c8bec44ba28d230adb26
+EBUILD sg3_utils-1.43.ebuild 1082 SHA256 0e39492d22f464cad8dbe595f2e4ec2b62374f9ef4505cb58f153d325cea542a SHA512 ebb7d708d91268e3e23b54a07060e8a351f97a32815821212872cc6645a8da06c5f558ea37c036e70b579bfcad03e7423e283f4d6e11445e2f1b7d6cfe8a44ff WHIRLPOOL 00f9d4740052809f3c8d9257a87faf7ac04bd4ca51d60fc169a6081ea99e46bdf73f1972d80509605aa073cc16c34377cb8c10a50f3e9e45529939df5745d113
 MISC ChangeLog 4613 SHA256 565d90151dbfb94aef57806f65991ad25bd3c12e4c95ea733f0537b83ed50d0d SHA512 335fb68fed08dc59dc5d6b09a815b8de37c2d8d77267bd96a877585b07ee0fcdbdaa74ad0ceb778a3b687228ecc61ebdc61ee109992ef79e106f2f415da8dd51 WHIRLPOOL 7aabc17f5d94f7383c4fdd213b422f9dca360b36293edf53ab08a45c2891f06918d637beb2ce389fdcbb211cc631c72e47ed62ef67f86ecfb0360d7b95e04313
 MISC ChangeLog-2015 17273 SHA256 f6ce86dfa22bafb48babe7138b5db42549f37e8e3b907c08723e586c10e05715 SHA512 d2e1e48dede7dc23241b5d5672479ab91390364429c585566e9a4600b319aab5f3dae3780633590589688111c83683fd382303a839d7b8f6c864c2cc22797a5e WHIRLPOOL e899a18712bd20a4f21681b86f4e1481f3a1f1e1167d50b118566487611f472fbad87245e28aaaef75d8e1dff5f51546352a8bf43405bda574808860c62e898f
 MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-apps/sg3_utils/sg3_utils-1.43.ebuild b/sys-apps/sg3_utils/sg3_utils-1.43.ebuild
new file mode 100644
index 000000000000..78f997750df5
--- /dev/null
+++ b/sys-apps/sg3_utils/sg3_utils-1.43.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib
+
+DESCRIPTION="Apps for querying the sg SCSI interface"
+HOMEPAGE="http://sg.danny.cz/sg/"
+SRC_URI="https://github.com/hreinecke/sg3_utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="sys-devel/libtool"
+RDEPEND=""
+PDEPEND=">=sys-apps/rescan-scsi-bus-1.24"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.26-stdint.patch #580236
+	epatch "${FILESDIR}"/${PN}-1.42-sysmacros.patch #580236
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	dodoc COVERAGE doc/README examples/*.txt
+	newdoc scripts/README README.scripts
+
+	# Better fix for bug 231089; some packages look for sgutils2
+	local path lib
+	path="/usr/$(get_libdir)"
+	for lib in "${ED}"${path}/libsgutils2.*; do
+		lib=${lib##*/}
+		dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
+	done
+
+	prune_libtool_files
+}
diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 553035b9275c..c3efdd5ce679 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -1,11 +1,15 @@
 AUX mbuffer-20121111-resolv-multi-order-issue.patch 780 SHA256 3d4c2e13eb35da30714daa9032aede1d6d7a8016fe090b3a2f039883f4ccbcbf SHA512 d633b4c5185cbb5eb52cb428002e7227e07819f6d49c9ed353c541c2d9234fe9c1f0c7f40e0a1662e47cd13835927b4eff310aae41181526f68cb7b0174218a4 WHIRLPOOL 7bdb121d8c19361f9a3e998af41e64b552fe3b19e92bc34fe8d9f32cfe14a2e09460c5418592ab2b6762a95dfbfa4f3479be11054226ea3f7b6f26c78b2fbd8e
 AUX mbuffer-20170515-sysconfdir.patch 934 SHA256 6c7e59bc123a7ccb0bf882d6750247ec2b14a443bbf1f65e37d3d85ce1f8043d SHA512 ab06b8930b95692c3985af476fb825483972c14ae45f2c212833770933ce99382628b0ddb1113089a2037856122b5a948f4db582bdba7275a568f96402384f66 WHIRLPOOL 41fa1815f09c72bd22c50cdd4473471ea6bdd56b943d3a71c120acdc64b1fc8c9a9a0ed06dcfea1bb0c8c1a93c31fca3aabf5248cf02a1a0104149ddc03583e8
+AUX mbuffer-20170921-resolv-multi-order-issue.patch 762 SHA256 0a4bb31e454d00955def7d6ed357202732f6d9cdf9dc7aa37799d6a41004d811 SHA512 3edc736965e9b3559d25e118ac293ae0c2e5f48701767c06f138c5867bc41b8d7a598c6344418c9326d9b709efd9c1a68891e7a7aee1b16c430833ef09e25c81 WHIRLPOOL 6b7d9cde47f6fc2ed116c164e79316f7324440fb5ee3e08f8017c583d6cdcf9ae6d3b5096482b4c8bbe645ed66f94a14d8743d663b92d2dabf743c65cc9f41b4
+AUX mbuffer-20170921-sysconfdir.patch 924 SHA256 cba53eb389a1c70db6e13831d1992cf5b8c212199fba41475600c9cc24dcf9fa SHA512 803dcacba327386430488aeef4d9137dddb49d067332abc36f4b9502e277124ec9fdbf6f50cb0656572c5af2c9b663127c3d368ed23ad124977adccdb8e4e18f WHIRLPOOL c890aecf2b1a43a38b07b1903ab50c6e4a988b99b3998ebabc5a5985b3e0086a67ebd819fc25fde6edb0806faf3a531d6ea5385f9bb6fc8830805de300ac2c99
 DIST mbuffer-20150412.tgz 122935 SHA256 0c78dcb194d1f0316c51f277ea09ec20efd175bbd45f0a3f81bf1202c33301e4 SHA512 cef64f1229872e2207e678aa77dc95e0c24f54e4a88a57a0e797d10b07a16d1f5fa96c8cfa3876ff65dd97c114eff87b683917fa1d39cdb4f08c864325e4223c WHIRLPOOL cdd82ef4d036438b36c4ecc0058e3757116e5f01897eee89870e08e73323dc135accf4d69fc57cac87082a2a78bfb1841af62bced56f93388870bc1c3b8590cd
 DIST mbuffer-20160228.tgz 123108 SHA256 f7769f729e9b26a22a5d91922a740a0d1df6004dbe2b7a1febb0d7e4c3ef9e62 SHA512 0706b8dd137f5f5b01885bcca4bf799cbd14b25895402f0c73f874d78fc160c7fae8c5a229c40efce9ba96288972a8e5846443ef5cd4d1ff02af92f703e33a2e WHIRLPOOL d1b356e5b7a8313f9fc1ef01392ee44969fedf2f3c33c8848b763d8cf5bd92ddfde8ddc881ef33b9dad849dfee51582c89c72869eb0d603b13a7ad3719d748a3
 DIST mbuffer-20170515.tgz 125736 SHA256 154fa0836777b21032b2e4f738fb0aa4dea218551b7cade93cf1b7245aca5e4f SHA512 991cb33b09e48f1177b7a05e5ab2c189aa2cb0f03e220d7e46996b3a3e3ba1e3f3ad4a68b8750ed73dc765c5874029715bba1d2f5a80a9601cd0a39e1f9fd447 WHIRLPOOL 015bc2a57b529d54bf5e4092c30585373003a3159fc66a528ae1ad9208134d1ba9c8e3cb44afa4ef246ea4babf96e6aed8b7166a350b4a2a7f82f91b74a85e52
+DIST mbuffer-20170921.tgz 136192 SHA256 8c38ec7cb7f63e1cd4100c6f8a15a2c335ad080760157fc44e88e3465cc47027 SHA512 f4b897e7649893cb02f9b3b806e956acf60692cd549f9cfe6cf164c703f369f0af251bfdabfbcdd76dacf5a4c3871ed7b98fbd6b5fcb97d184b7c317082bfaee WHIRLPOOL b789e0f5ac522edbb373cd3de377c78952b2d9bcc1a09a6731971695694134e36c8909f0c1aeb5ffbe9d44f5a2209c2c8b21592209d0b750b97ac4546fd90bed
 EBUILD mbuffer-20150412.ebuild 795 SHA256 e8abc597fd52c0c61c53c54ebbd7cc06cda4ad28aa56d0837a09e90daec4b736 SHA512 b4b9c424ccc4da361b00a173c4d18f0bd55994242f962c35c79dcd6edaec7c4f7e3ab29a18314b2dc047ea4916171dafaca57de7bf49ad18ae18a6989a93f32b WHIRLPOOL 69972bfd3b17dfdaa5988a5c07eae93dcee05eed2c8bc31d438314ce477aa0ad1e6ab3271ce2833a4469f500a155ead469670c577f9da35266e7e253d7a5dbd6
 EBUILD mbuffer-20160228.ebuild 798 SHA256 d9a6590ab4002a1a4865a1d72c5a5e4daf9e9e06f4f1f07e17bfe62db088c8c7 SHA512 4fc706486a433884a3b51bd17caee1c5f1a60ae10bd6309be9c6f79be6dcf1af9bab82ef2daae4eeefb1534785bffd6b055a6dea13b54f40695e251e991956a2 WHIRLPOOL 512417ef29656b184147c7a8e74e92a289c39b32eeccf74ef43c9abf8f1c4f1badcfb8c9523fc80ab91c8ed099d2e5f2fa269b067394c8b3a4a818a98c8f9ead
 EBUILD mbuffer-20170515.ebuild 885 SHA256 c37222b20cf1470b82f5a999fdc3de6d08172420d9da51d43dbcc5454cc5fd55 SHA512 b95e700f76352df3f46aaf2c60d90d4f618644f842cb31202dc433f03d1d858f112eb8b370568bac1fbb1a6c1502f5d6112a7ebf6735510bd51aa9812ba69503 WHIRLPOOL 7532d4bfb451dbd4f436b5e539a1f574deb2741993ce1cae842d034672b1dd6aba73fd93b35c353cf82621b061371a4b0c920c19332d60556407317f1c07cae4
+EBUILD mbuffer-20170921.ebuild 1376 SHA256 aea37ca115b77a40c7687aebbfc03421e3f996adc981dc1c4ec73f3084eff157 SHA512 f88a722c6e0a0201d8436b7c41356d5ab748524290f221dcafc43a76ca0bff558b1d43bed43e152f681d90e11893d9b384639d6b05b1e0227206b05dd5d2c0e9 WHIRLPOOL dd548316a80c00587d46c0b3d6a9e9cc1a4f239345dbc26eb9ae65e8074e76e499e4ab3c4908c095376d2610e1c13e93337f4735c0469c69894bd1cfbf1ca34f
 MISC ChangeLog 3787 SHA256 1d67b8de5c4cb9dc795fd01ff7fa86c9f5d2b621940226cac551cf3931d48573 SHA512 0e9d232e670037875a2785fbca1a3ba3c1b900c7a7575104b37db5905cf007733ec56669b4179a168e99c38f0bf3838cb4113abcc8e13befb6df6f0c13e9789f WHIRLPOOL a3b839687095fd68bea29221056923a18bf0d7af0adcaa1a406ebe464f745fc1fbc01b119e0a254bb4340141e20ca6c6e28374e6268662009e4eff47c03376f8
 MISC ChangeLog-2015 5749 SHA256 e3aa6a14e43fb06adecb46e9fd97347f5b775d39031dc25d353f6468ce4e6d55 SHA512 e5b8f65a92ad8bad4ecb16d7d79ac4485a6eee281127de8d9bc0cabc333b722d2005ceaf401962cff1721f22b6ebb02b9ded96576bde92c0fff8e45e7a87b8bb WHIRLPOOL d66f4b404cb4b306cbbb690e41b42798d7c9678a6cb54676501cbc759c722782156d4d9ac87017e203be7241ff2f01f8ddd603fc1516b36e4c6c8559ca39f1ff
 MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-block/mbuffer/files/mbuffer-20170921-resolv-multi-order-issue.patch b/sys-block/mbuffer/files/mbuffer-20170921-resolv-multi-order-issue.patch
new file mode 100644
index 000000000000..f8771145aa6b
--- /dev/null
+++ b/sys-block/mbuffer/files/mbuffer-20170921-resolv-multi-order-issue.patch
@@ -0,0 +1,23 @@
+work around "multi off" in /etc/host.conf and "::1 localhost"
+*not* being the *first* "localhost" entry in /etc/hosts
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -86,7 +86,7 @@ test2: test.md5
+ 	./mbuffer -q -I :8000 -o $@.tar -o - | openssl md5 > $@.md5 & \
+ 		sleep 1; \
+ 		rm -f $@.tar; \
+-		./mbuffer -i test.tar -o /dev/null -O localhost:8000 -H; \
++		./mbuffer -i test.tar -o /dev/null -4 -O 127.0.0.1:8000 -H; \
+ 		wait
+ 	sync
+ 	diff $@.md5 test.md5
+@@ -101,7 +101,7 @@ test3: test.md5
+ 	./mbuffer -q -6 -I :8000 | openssl md5 > $@.md5 & \
+ 		sleep 1; \
+ 		rm -f $@.tar; \
+-		./mbuffer -i test.tar -o /dev/null -6 -O ip6-localhost:8000 -o $@.tar -H; \
++		./mbuffer -i test.tar -o /dev/null -6 -O ::1:8000 -o $@.tar -H; \
+ 		wait
+ 	sync
+ 	diff $@.md5 test.md5
diff --git a/sys-block/mbuffer/files/mbuffer-20170921-sysconfdir.patch b/sys-block/mbuffer/files/mbuffer-20170921-sysconfdir.patch
new file mode 100644
index 000000000000..1b9031aa58b4
--- /dev/null
+++ b/sys-block/mbuffer/files/mbuffer-20170921-sysconfdir.patch
@@ -0,0 +1,28 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -10,6 +10,7 @@ CP		= @CP@
+ VPATH		= @srcdir@
+ prefix		= @prefix@
+ exec_prefix     = @exec_prefix@
++sysconfdir      = @sysconfdir@
+ datarootdir	= @datarootdir@
+ bindir          = @bindir@
+ mandir		= @mandir@/man1
+@@ -40,13 +41,13 @@ distclean: clean
+ 	-$(RM) $(TARGET) config.h config.log \
+ 	config.status Makefile mbuffer.1 core
+ 
+-$(DESTDIR)$(prefix)/etc:
++$(DESTDIR)$(sysconfdir):
+ 	-$(INSTALL) -d -m 755 $@
+ 
+-$(DESTDIR)$(prefix)/etc/mbuffer.rc:
+-	$(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(etcdir)
++$(DESTDIR)$(sysconfdir)/mbuffer.rc:
++	$(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(sysconfdir)/
+ 
+-install: $(TARGET) $(DESTDIR)$(etcdir) $(DESTDIR)$(etcdir)/mbuffer.rc
++install: $(TARGET) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/mbuffer.rc
+ 	-$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
+ 	$(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(bindir)/
+ 	-$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)
diff --git a/sys-block/mbuffer/mbuffer-20170921.ebuild b/sys-block/mbuffer/mbuffer-20170921.ebuild
new file mode 100644
index 000000000000..3baf4645d8fa
--- /dev/null
+++ b/sys-block/mbuffer/mbuffer-20170921.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality"
+HOMEPAGE="http://www.maier-komor.de/mbuffer.html"
+SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug ssl"
+
+DEPEND="ssl? ( dev-libs/openssl:0= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20170921-resolv-multi-order-issue.patch"
+	"${FILESDIR}/${PN}-20170921-sysconfdir.patch"
+)
+
+src_prepare() {
+	ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
+
+	# Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
+	# using same port and src_install may have problems (with /etc folder)
+	export MAKEOPTS=-j1
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable ssl md5)
+		$(use_enable debug)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
+		ewarn "Some tests may fail with FEATURES=usersandbox or"
+		ewarn "FEATURES=network-sandbox; Skipping tests because"
+		ewarn "test suite would hang forever in such environments!"
+		return 0;
+	fi
+}
+
+pkg_postinst() {
+	if ! has_version "app-arch/mt-st"; then
+		elog ""
+		elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
+	fi
+}
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 59957d4b7545..d76a796af884 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -3,8 +3,10 @@ AUX 1.6.7-dmcrypt.rc 8815 SHA256 d04627e1a64e4d86e957b20ff6f478fb376833b7602098a
 AUX setup-1.7.0.py 788 SHA256 ef9fc9cc2b0ab065838adcb65e117e124e59686360fb033dd8c51632a8da1c69 SHA512 823fe8a90a76de9f259a5b69425601b78a0b6c1204cda613e224cc21e4eebc2b22b4be9f53efe843156c45a20a099385bc4dad6d653a26749336023d3ae5de89 WHIRLPOOL 26d4d90a00a5be81b8cfadd0682d032be955b71c3c2707532a95aada423fdc52edde351af2addf307b602fcd51130dc95372dc1f11bbd80d51208a1b56010add
 DIST cryptsetup-1.7.4.tar.xz 1232068 SHA256 7ccf893ef79a38fb92d61f03c17b964982119f5319cdaa85a1335b8558cca016 SHA512 c5f58227b38dcc2e2858c4bbcb641acead3b6bcdad0d8d76e5f46936669e4aff4dbc20a2980040341320d35d39f029725a9f20607753cad44f64ac0443b64b71 WHIRLPOOL f00d0e529a5d34460733e8110584266b42011055d81d94b0ae8d47a1f11f1639c4b658a55415241e72c431c615d896a94ae444a518a0b56f971b888a5ab7cc09
 DIST cryptsetup-1.7.5.tar.xz 1232696 SHA256 2b30cd1d0dd606a53ac77b406e1d37798d4b0762fa89de6ea546201906a251bd SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439 WHIRLPOOL cd2fe15a08f3202c89055e334a3c56fcb60a19bda8135c7d833f384e9beb7fcd6f31fbbd4ac29572f46199f05bd6055b89b3d6733828354d9c985b3e55da4e14
+DIST cryptsetup-2.0.0-rc0.tar.xz 16222712 SHA256 e0de7563b957117680b946c2f66ac1fadecb8459ce2db6b84687a1937524bd5c SHA512 82429e5672ed5a430898283b088bd94008bf075b67a312876ec841275ff3584912c8b07c857540a52c0e2f571fcf389ececa45d749fd20204f841b067078e6cd WHIRLPOOL bb87779b9835e56bbbd30f72ca5514db9a9cb2a9c35164020d64c29d4226d10a372d7560c2516886d50c485011478fbb17a55b98e37af9f21a4dc30711983d98
 EBUILD cryptsetup-1.7.4.ebuild 4025 SHA256 a396ac6b06858d53266a6f16d5797e9446fa6575b002e0c43ce53f27fc622751 SHA512 9b46af09764085af0f6de8e99629839f45b9567110dde94db040e875805ad753f111136da06ffc0a65f3ebd8fa705e0a7509961a24c08032e501967e081f8928 WHIRLPOOL 365cb1aea2098827ee6d17dea3f12a581c3e5cd6f315c86cffc5c98ecd03437500534376d5499691dfb2c1ede319ddc875655325da0feb75a480ec77eb6be2d9
 EBUILD cryptsetup-1.7.5.ebuild 4045 SHA256 931dafa300398093ecd3111750fb685080d217ea0c99af72221dbca5f5925e56 SHA512 838908ef46db7d9710e9071ec21af4c0243a5b1c5220107522b0145cdb38eb1bc0fde392d276c988cf1b3e14880d4db73b1992e849d416113f01ed05dc0581fd WHIRLPOOL 8ad914bedbce8c63063a817454b4359d4727eb39e5bbcc660cd03054034fc63a6ad0741c0f6206f19c87477204c0460a5874c6460a4b74fd329e2c7c3b1ea469
+EBUILD cryptsetup-2.0.0_rc0.ebuild 4228 SHA256 c8e26cc7d65db505e26d46931a0a341dd2741d78720a572674e88e066b3cef29 SHA512 81a092c61a73653e9f53d6ccb45d7999052fd7d79b3b51551c45141de444868bf14a78e7dbd3148ef8b837d1850523c1433755aef6906441bd422c47c730b04a WHIRLPOOL a00b0884044853597a5920447e9757bf2d10f780ccab3e0b9aaea7a164bf40009b456a925da31799c11f95a2c0e0603734a26f85926b00d4115e13afe6743a30
 MISC ChangeLog 8475 SHA256 f9a9f9529c9f1d7307451447cb403805805eb1d4255c9e4fee5c30c46dd5614f SHA512 73b80c6e0ad31d22dda7ea3802be98152bd7ec68d9277081ffd22d073cb3cf9c8bcd7ef083098423bb356c9a5035dccc26db434d5acdcf8f0753fe5d39bc8073 WHIRLPOOL 64aee26e26813436fb035326680aaca1f2d6593d5df9ac6ae3c9fec6329fcef044179d46a9a9648afaed44a420bc067b09e21150fce51b1576b157987a84e2b4
 MISC ChangeLog-2015 32120 SHA256 4f04d04798e6b09ebc80f72f45a4841673e38e05909ccebb5d40c230db0a3272 SHA512 ebf79904c294d29fbeb42d497db5bbac85afdcaaf532ecdae863778ecd9f9c882dd0c3c28994c410611e3eef30492c9bb5696db3c2e4eb49f2e932ee9696185a WHIRLPOOL 8cfe06024e910bfbd0e547fb342ce22c837c79cb29524077272f7478edc6284ed3ef504142b52d6844fa582cd4c4cfb94163c9c40ff074716bd744d2ef039aff
 MISC metadata.xml 879 SHA256 20635e38f0d217140afc4fc93b43abc856049f2c5104cf9dcb2ff2062e56f960 SHA512 1b7f57625f159b0ef144ad968eb20c6785b822e7f254c1cccd75ba8f012357cc818cb9323d64999ba1ff084d7fc89c116db071f51505a62c78f1bfc87596e86a WHIRLPOOL 6b61c3895e6f5fb4250e74e14fdf7658fb4496dbad1cc2ee76aa9d7deba6cd67530ca7d01730c397ea73c4ef398ea53ba90823c18bfab2269d84b78d4dc800c1
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.0_rc0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.0_rc0.ebuild
new file mode 100644
index 000000000000..ca384992e35e
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.0_rc0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit autotools distutils-r1 linux-info libtool ltprune versionator
+
+DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
+HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
+SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/${P/_/-}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0/12" # libcryptsetup.so version
+[[ ${PV} != *_rc* ]] && \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
+# we don't support nss since it doesn't allow cryptsetup to be built statically
+# and it's missing ripemd160 support so it can't provide full backward compatibility
+IUSE="${CRYPTO_BACKENDS} libressl nls pwquality python reencrypt static static-libs udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	static? ( !gcrypt )" #496612
+
+LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
+	dev-libs/popt[static-libs(+)]
+	sys-apps/util-linux[static-libs(+)]
+	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
+	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
+	openssl? (
+		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
+		libressl? ( dev-libs/libressl:=[static-libs(+)] )
+	)
+	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
+	sys-fs/lvm2[static-libs(+)]
+	udev? ( virtual/libudev[static-libs(+)] )"
+# We have to always depend on ${LIB_DEPEND} rather than put behind
+# !static? () because we provide a shared library which links against
+# these other packages. #414665
+RDEPEND="static-libs? ( ${LIB_DEPEND} )
+	${LIB_DEPEND//\[static-libs\(+\)\]}
+	python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+	dev-libs/json-c
+	virtual/pkgconfig
+	static? ( ${LIB_DEPEND} )"
+
+S="${WORKDIR}/${P/_/-}"
+
+#PATCHES=( )
+
+pkg_setup() {
+	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
+	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
+	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
+	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
+	check_extra_config
+}
+
+src_prepare() {
+	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
+	default
+	eautoreconf
+
+	if use python ; then
+		cd python
+		cp "${FILESDIR}"/setup-1.7.0.py setup.py || die
+		distutils-r1_src_prepare
+	fi
+}
+
+src_configure() {
+	if use kernel ; then
+		ewarn "Note that kernel backend is very slow for this type of operation"
+		ewarn "and is provided mainly for embedded systems wanting to avoid"
+		ewarn "userspace crypto libraries."
+	fi
+
+	# We disable autotool python integration so we can use eclasses
+	# for proper integration with multiple python versions.
+	local myeconfargs=(
+		--sbindir=/sbin
+		--enable-shared
+		--disable-python
+		$(use_enable static static-cryptsetup)
+		$(use_enable static-libs static)
+		$(use_enable nls)
+		$(use_enable pwquality)
+		$(use_enable reencrypt cryptsetup-reencrypt)
+		$(use_enable udev)
+		$(use_enable !urandom dev-random)
+		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
+	)
+	econf "${myeconfargs[@]}"
+
+	use python && cd python && distutils-r1_src_configure
+}
+
+src_compile() {
+	default
+	use python && cd python && distutils-r1_src_compile
+}
+
+src_test() {
+	if [[ ! -e /dev/mapper/control ]] ; then
+		ewarn "No /dev/mapper/control found -- skipping tests"
+		return 0
+	fi
+	local p
+	for p in /dev/mapper /dev/loop* ; do
+		addwrite ${p}
+	done
+	default
+}
+
+src_install() {
+	default
+	if use static ; then
+		mv "${ED}"/sbin/cryptsetup{.static,} || die
+		mv "${ED}"/sbin/veritysetup{.static,} || die
+		use reencrypt && { mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
+	fi
+	prune_libtool_files --modules
+
+	dodoc docs/v*ReleaseNotes
+
+	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
+	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
+
+	insinto /etc/tmpfiles.d
+	doins scripts/${PN}_tmpfiles.conf
+
+	use python && cd python && distutils-r1_src_install
+}
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index c634dc676c8a..1b4d9886ad2a 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -2,16 +2,19 @@ AUX multipath-tools-0.5.0-makefile.patch 6790 SHA256 e6810a05b059f542fdfeea72f0b
 AUX multipath-tools-0.5.0-systemd-pkgconfig.patch 1192 SHA256 84dfec6872fe613680bdc9207663260aa47779eb0640ed3ff264efff9e83aa7b SHA512 60b5717b0e3fd9a3d422b756359ce6bb5018346c104bd45543135257b1c4efb3c586d188e35176bbcfa2c81ed9d4824e3c96cc395e52605934e9cc4935f17fec WHIRLPOOL 710787df816072669d9e50717846da75bc5358328d25003979b98a589a9478114e2681d3da4c8866ad21af0ce09b628301314c02f2879d34f564c695fe92dc88
 AUX multipath-tools-0.6.2-ignore-modprobe-failures.patch 831 SHA256 7149b88d157d72f851ddfd6ded87f15790177717922a6f6fcd921c6d78a325a5 SHA512 62e40c6577bc7cd24f3283de94692cc7550d39a9caa255ca5d77c2d3c324a85c0364fca73b154f17197cf38b82b171eae759f9eb1ecf8ab5801afafd42b1b156 WHIRLPOOL d9ee6cdc948fcfd66445870520c1a70ebf053dfeedf6e7f48fdef9d0de90f84e5cd87122aa95e2c56b7d4cd33743f71ed8af9b0f36ec0ac372cc946d81a58f06
 AUX multipath-tools-0.6.4-sysmacros.patch 1554 SHA256 b057d356f953f9141c583f014b4a06e4567e26007a01b8d1e44b3d01484fe4b2 SHA512 1f6c862e0fc73859b670d2917b2e0d63731714edb07098929dbd46e7cc61f9d354f30558034993c8e719de103d4b37c16a34483236a040db28a983416772634e WHIRLPOOL 575ee7cc97a6c0340c0bca617d7eaee45eb5cfd1982afa4177b87da3f6e322f8221f101892763964ef48ec86bcc90194be88a97253058062af408c5a13790ba2
+AUX multipath-tools-0.7.3-fix-build-without-systemd.patch 1024 SHA256 753a7c4c09fe9c93c42beddaf25a913a92cb1bf91bddc6f5cb22c722e9d60bf7 SHA512 870fbc9ee1fff533a8f2080f941e0d299852d8d64da98e900d6d0ef23dddaeb8e05a9accbffb2cf19f4c1e76766fbf778b145f3086a0a0c809012125a14cd391 WHIRLPOOL 234d89d64fabba9cba02ec70157cde3a720404fc239877874af866ca5d339380e579cde138bca029589bf36496959d5c05dcd8a290f19e6760184e8af2305710
 AUX multipath.rc 565 SHA256 0339b4724281c53f5a49b57c8654d5845e537eee748cade467bf8b0f99cfb3a2 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe WHIRLPOOL 11855ed1afd8fb55a59fd3398357528e0ed3eb97a48907e4b14b22ec423c95796503f753c3d1b5e18673c631d3819edfadf3681b74b7fa3761f9b555210a2385
 AUX rc-multipathd 402 SHA256 0e9639186f4a44b65e1efb1428645f3042e563340fc3c3f70c3f244790a8bb8a SHA512 466296ff69c0f56c312a8b88445ca0719c8c6b794511f7e228812d63b859bd120b965301c8923e3411a3e1b196e7fb9c48dd7dbe004efe4c65ee7f9798cc3e11 WHIRLPOOL f1f90ba7cf72b3c1dccc77addf78a340c70b7d1391bbabe69e40d8653851130dde8f6e86eebe6f0d8d62728b940aabd10747ec27fe970ae70b5c262149980ef8
 DIST multipath-tools-0.5.0.tar.bz2 184024 SHA256 f13cf1eb84e94e83b2019e68f7965526903c13e94246db43965d181668a0a6f9 SHA512 dfad21c45d0f69e39041d30d203a582c8ee8329bf390c51cde10155b3de379e7ad8fead2ac4beb268a924fd7e7dc8e1cf538ea3c70d41479fd8786fa30ba22a9 WHIRLPOOL bc8a365d66d1c5f584de04304125949926d4a1576cba4a00acca0f1333eb13d83318da36d9d88c5dc92691a331d427ad6b99eb1f2983fbc387303dbfdbae11ff
 DIST multipath-tools-0.6.4.tar.gz 285448 SHA256 1e2747883320f7db854201e5bfb97216e7518468f03503985382ce2c69e5558b SHA512 ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea WHIRLPOOL 6138ba1cbb814bbf53e7a5113f50325d7a7d7088ff2b0f83f1e574f0644241e368cc6b5223eca039b414a0a459a52413d396ea214ff3eaa57f0681e8322b2d9d
 DIST multipath-tools-0.7.1.tar.gz 329008 SHA256 d788aaf3ea862b44b5aa07eaa0e5696061f972a1a46d0f469c4a4f4c477c1970 SHA512 81ceb3887250a691b94cb49b7141ace4fc1f69d7f8381e517560dfc7c51ee4c5a1f4f4e40a0b368cf5f7381697fa746b856cbade8990c1608cbcd77248946a82 WHIRLPOOL 2bcc7cc2f425ca3f3f634807cafb7817b54b83d82987a09c9dd530dca1375175a7d52f1854bdd6d5f37c3b1fcf7bc34d67fc2dcae5809dfae968b313c8c86cba
 DIST multipath-tools-0.7.2.tar.gz 335187 SHA256 e4273527b8a8e31d596221dd74fdeb9f2b7558d59e514bc7eb040d077bddf24b SHA512 9637e6c69ecfe8dbfb55794569017051961dbe39fa1019000e4be9c2c888a5b6d13ae360af8738bb1fb89a8d27ec833ff0075b1d066b8b3ca21cd9832f477046 WHIRLPOOL 051956ab5c899ce98833925f84245f7450c7c01012edafdb6fff39762cf87908f53413c42f2ccb6059fd2717d29bf55ded260ade027b37ef0227a46b8266d8c7
+DIST multipath-tools-0.7.3.tar.gz 344030 SHA256 b59712c3068b9b33c2fc769eb499c637a0ddff7b46ae9d2cc411c4d61e233ffb SHA512 fbcd5609bcb4f80a91410cec86882e9f39ee056edb314382f25db8e1e1ed5c084e14849a67502be2b11a2e980dc2cb5d34235885476ae5ce62809a175bee9ace WHIRLPOOL 03b99202d2831513ba1fcc3e504ba3554b970c5bc366288a50e62e2225028dff972c102b7ae93d026026bea6614b5305a605122c91e0b8deeb91f9c98a68119f
 EBUILD multipath-tools-0.5.0-r1.ebuild 1728 SHA256 d25b74bb8a7ea90ffd9d1b9d54354218ea4675e092cef2defda8a45bd6b0dad6 SHA512 e1de58801f4e2b71b44a4d60d385bd2067aa172841a90c078a5f6dc608999bfcd23059cbc730e18c910a7606bc44bfd9524a2e466b49ff38b90cfaac143def86 WHIRLPOOL d92239d3dce0810260250437d573d0f26ec2ba914c17403082e5cd61e4fca75f0f5c14aefa6bcff0a6cf892b5b47e6002e854406abd9fda5cae0a824f7d494a6
 EBUILD multipath-tools-0.6.4-r1.ebuild 2537 SHA256 d3189bd2734a565ae0389820fef64f733e1286bbb1d3761a87cc141ef0bf5f97 SHA512 f8e9876a166eb809c161fc94c1579a9a059b81e23b5424721b068d9cc2bc88c049707174c42113840bbee7bf6b1d4209d5b688e952d8aa34d3fc95674fa9fe0d WHIRLPOOL 3cdc02d67db7497bfc58bc31dadfb8d8d509e055f6707297e59af8f2a1f3b91a635791a2e772d40462a4d1b14cf02dd965d3deed947833364529dfb1a1613d80
 EBUILD multipath-tools-0.7.1.ebuild 2189 SHA256 aca0361797e81a206b6d047cfe733225d30fd2d011ec555e4561a3aea6e9eb9a SHA512 cc1fc9548eec536691d4357d920a2920afee52729d74b662549dc9c70569f68ff02ee8b55facab6cbec5400880d0514b0696e0eea22e6be3682baa06d09a417c WHIRLPOOL 7f2d209590f37bb099c837e609441938104e6fd9afb491d2831c24f83b9f4a3cc180a9437d0f2d4d72e8f6732a376bce616bb1ef1659a601dadf97200ab48b7a
 EBUILD multipath-tools-0.7.2.ebuild 2189 SHA256 aca0361797e81a206b6d047cfe733225d30fd2d011ec555e4561a3aea6e9eb9a SHA512 cc1fc9548eec536691d4357d920a2920afee52729d74b662549dc9c70569f68ff02ee8b55facab6cbec5400880d0514b0696e0eea22e6be3682baa06d09a417c WHIRLPOOL 7f2d209590f37bb099c837e609441938104e6fd9afb491d2831c24f83b9f4a3cc180a9437d0f2d4d72e8f6732a376bce616bb1ef1659a601dadf97200ab48b7a
+EBUILD multipath-tools-0.7.3.ebuild 2260 SHA256 c67ce364ae83c0d18b91969c32d7ba5d1116ce52e0c2426316d2fedcf0481e65 SHA512 7eeed0784be1ffa31fc153715c2137c32d2fc0d96102ae57818b926502c6978394875a0901066fc16ad7c45744eb1f4c4e837972b52f015160cd296e6d753cfc WHIRLPOOL 66c1090fd07fe33b180932f6a190d5c5debc34b5e7a2816453d13cbce0fa371548820f0f440cfdec7254135fb32b6cc837bea439f21e4c8cf54286db6a9c6b86
 MISC ChangeLog 5078 SHA256 539cfd87f64d5de2d687d73163ae333d6631a950c0bec78b39607bd2b18d08ed SHA512 47593517a8baee9753cdea2188d7a27905819c5d7c645fa7aa3396c9279bda8f02e8a56f073284aad1d2b1d78d3aa83093a92e3d833bbe2cab21fb392fb14b61 WHIRLPOOL 70e94e1df6d576f69b454f1be325c0ff6d4e4a4eb1757b2b714e40d18536f9793872be80d741a5d45641e89ba8fbb8da011f98c191fe64185c60e7d950211d32
 MISC ChangeLog-2015 12680 SHA256 cf384f2021fd11a53ad19d5df068a382d8f35f40f35cadba6d4aeff826a3945b SHA512 d8c52c8d4671ecd9ea0b4dca68328adda305711d221fa7ef52df1152a659b212229a6a52d552172e89db61002c261b3e099e173a11b9a508865540e75e4435ef WHIRLPOOL 0f9aa4d94dfe0bbc2a81575617b87a028c65b5087add91111f85640ef168fea90bd04417e6174d077fa6ae36b1e5755885105368f76adbb5833ad85b55dabb2c
 MISC metadata.xml 364 SHA256 2a207f67b14689c2642ea2737a4e5be02b87515a4de62be7b460f3610e7c8136 SHA512 91654145796f3e879d14dc7aab2261099dc0e2cb44e7563bf3c006893b81aa0f84fdd52870aaf317197b87e6c4d9e1341e456daeb2f3b40c926bdaf31c797134 WHIRLPOOL fe33ea8c44ba8c850dffdbdbe64aed1e7ef6f327157576e8929a294c47b39af58539027d9f1a82cd3063cce37eff965dd1402b8380089a67af7de7284e569d3e
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.7.3-fix-build-without-systemd.patch b/sys-fs/multipath-tools/files/multipath-tools-0.7.3-fix-build-without-systemd.patch
new file mode 100644
index 000000000000..d92e5c05c7d4
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.7.3-fix-build-without-systemd.patch
@@ -0,0 +1,39 @@
+From f0a874f9bd86504840a7bdbf0a0c07bcd0ea8c29 Mon Sep 17 00:00:00 2001
+From: Michael Lass <bevan@bi-co.net>
+Date: Wed, 20 Sep 2017 21:54:32 +0200
+Subject: [PATCH] multipathd: fix build without systemd
+
+do_sd_notify contains a call to sd_notify which is unknown if USE_SYSTEMD is
+undefined. In this case, do_sd_notify is never called anyway, so embed the
+entire function into an #ifdef USE_SYSTEMD.
+
+This fixes a regression introduced in 88ddca5.
+
+Signed-off-by: Michael Lass <bevan@bi-co.net>
+---
+ multipathd/main.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/multipathd/main.c b/multipathd/main.c
+index 8049da22..bbe14771 100644
+--- a/multipathd/main.c
++++ b/multipathd/main.c
+@@ -169,6 +169,7 @@ sd_notify_status(void)
+ 	return NULL;
+ }
+ 
++#ifdef USE_SYSTEMD
+ static void do_sd_notify(enum daemon_status old_state)
+ {
+ 	/*
+@@ -181,6 +182,7 @@ static void do_sd_notify(enum daemon_status old_state)
+ 		return;
+ 	sd_notify(0, sd_notify_status());
+ }
++#endif
+ 
+ static void config_cleanup(void *arg)
+ {
+-- 
+2.14.1
+
diff --git a/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild b/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild
new file mode 100644
index 000000000000..577cbe8db1b2
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.7.3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
+
+DESCRIPTION="Device mapper target autoconfig"
+HOMEPAGE="http://christophe.varoqui.free.fr/"
+SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="systemd rbd"
+
+RDEPEND="
+	dev-libs/json-c
+	dev-libs/libaio
+	dev-libs/userspace-rcu
+	>=sys-fs/lvm2-2.02.45
+	>=virtual/udev-171
+	sys-libs/readline:0=
+	rbd? ( sys-cluster/ceph )
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.7.3-fix-build-without-systemd.patch )
+
+get_systemd_pv() {
+	use systemd && \
+		$(tc-getPKG_CONFIG) --modversion systemd
+}
+
+pkg_pretend() {
+	linux-info_pkg_setup
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# Fix for bug #624884
+	if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then
+		sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die
+	else
+		elog "DM_TABLE_STATE sed hack is no longer necessary."
+	fi
+
+	# The upstream lacks any way to configure the build at present
+	# and ceph is a huge dependency, so we're using sed to make it
+	# optional until the upstream has a proer configure system
+	if ! use rbd ; then
+		sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile
+		sed -i -e "s/-lrados//" libmultipath/checkers/Makefile
+	fi
+}
+
+src_compile() {
+	# LIBDM_API_FLUSH involves grepping files in /usr/include,
+	# so force the test to go the way we want #411337.
+	emake \
+		CC="$(tc-getCC)" \
+		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
+}
+
+src_install() {
+	dodir /sbin /usr/share/man/man{5,8}
+	emake \
+		DESTDIR="${D}" \
+		SYSTEMD=$(get_systemd_pv) \
+		unitdir="$(systemd_get_systemunitdir)" \
+		libudevdir='${prefix}'/"$(get_udevdir)" \
+		install
+
+	newinitd "${FILESDIR}"/rc-multipathd multipathd
+	newinitd "${FILESDIR}"/multipath.rc multipath
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "If you need multipath on your system, you must"
+		elog "add 'multipath' into your boot runlevel!"
+	fi
+}
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index cdb36a2f44c6..2bd40f1ce50b 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,6 +1,6 @@
 AUX zlib-1.2.11-fix-deflateParams-usage.patch 2937 SHA256 0b8c6cbbb179fdb55fb492657a6c4514b4035ff126c353ef9fae2e5a0837c1c6 SHA512 9b949d894be2bbb60d687820e79d7a02e733e8426e6602482f3a3902fca3571bbfba38ddd84a88f5a093fdb25ac90e4076905d19b86ab70ebce6e250fd118286 WHIRLPOOL fbb8143e35a9eace23c4a3cdf80cfb66c9f09ed499abeab130445d89e61949b67bf0f1b70c11f9a65c99a722ac83a53897b5cd2b291563cc0ea32154559547ac
 DIST zlib-1.2.11.tar.gz 607698 SHA256 c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae WHIRLPOOL 4263b67dd133e9eb6a837f270a53e6083af871993c52f89a21135f188f83c58646e7aa5882d62f35370032afe7a9964dd2796c25d104b8a2a70b293a5e31f72a
-EBUILD zlib-1.2.11-r1.ebuild 3176 SHA256 c5b42704b850e4f45ffc8cc1fc15aa6a121a72e895793611f87faf1abc1af17c SHA512 4df2ffc5c7358543797fbd187c3a5107d32967577b0822daa032cf44c31beeb448db9def6324b56a6f3f66745effa58643dec36d1c90c0241d78e52de45936a1 WHIRLPOOL 6809a3f7745a9e3dedf1b385f6df5541766d6ed1566766372b2aa2e9c455eab7d18e427c2cbb495d6708b14f2ea27d3af33d5bebbde243a86ac312a3f1751343
+EBUILD zlib-1.2.11-r1.ebuild 3174 SHA256 4eb6e5d1851e625053f54c1c9da1f13b4296673f8411406640ed743cf63661e9 SHA512 9174a44d1e7c1721c891ec251061f70ecf263e82578a3552ce631cbf50105fe8a9de6f3cc3c4109f538c2b104c175c32cf61db6a031a87e5eaa7410c04df8346 WHIRLPOOL dafe34bcbfc1d761762f3149b27127e0aa29a79b5c3ff7b5d7b8d3fcc7359249d5ab14056e7c9b49846c6a5ddab69477deb4fbf9f90350e099ce91e592aa4755
 EBUILD zlib-1.2.11.ebuild 3102 SHA256 a150eed4cbe2c3f3c756dd0fcf25c1f06f0b8121d75ae0181dd3da47e631146c SHA512 d423c1019803166a5f4b14a4e6bbf2119d698eaa9977c259140e2e378e692721235e6b6a45279fca1f7928e4c3d18c3e430f73ad994e69f4b4b3213b14668ee2 WHIRLPOOL e2c601a0f5749c42dbd947108a618b59b5fcce7d9cb2615df8f1b8ff37af6ed7e435a2e088f32632c3a4c4182fc6d155540b2b3bc3aebbed70989f308e41851d
 MISC ChangeLog 4685 SHA256 3f2edb1c1b304356ed97ad121cd544c76a41d2c28eaba05a920dd501ba50b83e SHA512 5db4b21be1cc55c9735480a409273caa84f9ce8837a390499835f5899d720a4dfad99b933004ad3c0f1fe3565175462f66e6d757b1fdf1909c9f43c09c3e944a WHIRLPOOL 96346a194bca8decd2468bb54fb9883c38ae1b0ee3a9d5ba429a080bdeeaf4295df2d76693e07f17f8b6cae7090ba8cfffa12dcbaffa1f4d3e2ac21453a76f57
 MISC ChangeLog-2015 18533 SHA256 4d97faf5b6f64cd59bdf027d8150044cb9e37e48c14a2aa3d1ffadd8f6b2ba9e SHA512 8274af7f6e2931f659e8cf895b423233f8be84d18b769573374b400cffdbaf95b3ff2393e062dfbe5824b28bea687d70d0710a4a295c9f1f4da189d044526f8c WHIRLPOOL e5fc8260f89cd61ff45e45bac801e53972155c84a9f0ef3fde517d69f0aadcc3f779efa34e758123f3632f90425ab0749dbb110cd91f7af258beb81d8213cc4c
diff --git a/sys-libs/zlib/zlib-1.2.11-r1.ebuild b/sys-libs/zlib/zlib-1.2.11-r1.ebuild
index 065bb3497be1..4b0f8f005ed3 100644
--- a/sys-libs/zlib/zlib-1.2.11-r1.ebuild
+++ b/sys-libs/zlib/zlib-1.2.11-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://zlib.net/${P}.tar.gz
 
 LICENSE="ZLIB"
 SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="minizip static-libs"
 
 DEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest
index 2868b5d106f1..6368981e7a87 100644
--- a/www-client/seamonkey/Manifest
+++ b/www-client/seamonkey/Manifest
@@ -8,7 +8,6 @@ DIST enigmail-1.9.6.1.tar.gz 1745021 SHA256 3874331e981aed864443d3c965d856e003fd
 DIST enigmail-1.9.8.1.tar.gz 1776673 SHA256 4bcf2da00d96a67921b24dbec9f43930cba41112a2cd241b0952eb573c648a4d SHA512 af280040e96eb69529e723e52e65621e42743c974b0ed42598e73458004f0a59688da7257d2b556e95a56c4cad3ac48f527d4d9a7a54c9c92eaff132257e0cfd WHIRLPOOL 077c61b996c2ec45ecc3a037b61d167acda2ebdbde6536e2f2f2e180a064c9e540e09b48417454aa48f02af5f4c58c88f4ba456e6c5f113cfe474f2b82798ac0
 DIST firefox-49.0-patches-04.tar.xz 13356 SHA256 4968b4c6a0e326de587af6d389826dd29acd8b8eafc605f7636c637db0a64158 SHA512 3346cbe0146d6b480336c250c34c5be0a37cf9c7222238366794b4a03fb9c636ea22294cb517fc59826a0793a4a5723ff2f4cf85384fc405f1c1f14080458282 WHIRLPOOL b0bbf5f307f3d8467e40d76f58e28e0bbf9bed5398e3f17309b7bbdc310350d1d57b02596471b682b997d77bf89bcc3d748af5e0ff19e81a98ab33dcdf4f5210
 DIST firefox-51.0-patches-06.tar.xz 9604 SHA256 cb813576d1e784b72e973fd18d809088c6fd2a0e557c9413cfb7f0ea22b58700 SHA512 5fdc3913e6e4fb1427a051ba12c459bb5330e0712d5775b38281115a78e45e22f200e969ca3e82ac1c1fcfe5d27795d82e16ce15b8c5893bc102892876b2636b WHIRLPOOL bdea0d2f72b96f94bdf2d9487c94cfabcff49a955ca780af74aa0dfc12228d54da73028a6cf6c757133e8a28347d2108aba8cd2b11ab70419b39c067cc48d8ff
-DIST firefox-52.2-patches-02.tar.xz 12584 SHA256 3714ebf55a11cec435a42dad0e351a6648f345cda947cfdcce5d163e86af9c27 SHA512 e16d014c60f9c665e5bf1a5e9b7940b101a38f6af26970bd7c71cf0764a11d65816ad2fef2050fd6fc7b10835161d1babcb64c1b10eba1b0c7b3310fc40b57ef WHIRLPOOL 487a383e3db49c57e40c31524faf4d94fcd925b0680eb2ba5e2456a545c494625048f8894e48d4271ef7452ab538a249ac11d826fcf09b8e210fa831580a3b6b
 DIST firefox-52.2-patches-03.tar.xz 13148 SHA256 e2ab0acf173ef06874c6204a7ea77d11404dc70deca5d9edcee2e3a092ff4e60 SHA512 420dbeded3ff2f81250554416115a674ece1847db4449af9d09fa3ea5861037da9bd8525ce5bceede2abab1b58e06485e95417644c0ba8332eb076fbfed7cecd WHIRLPOOL be22652ab1fad0c55d3f3876d50f624d18b6472e7c292e96b5cb1f0e3672ef58fd41afbffd5ead912be1c15031595563eeacc2bea19673785fdde039f799e968
 DIST seamonkey-2.46-be.xpi 936650 SHA256 d97376ff92ffcdf04ec08273b60b8750d2c4f65edd71eed734313f72885f45db SHA512 a48caf48c0f705e991c31f6f0191662c99bcf022e9bec59b6caeaf03cec384f5b45c6a03af1103d0889fed2d19e57ff5c61fc67faad9cc1786993d0e9368a954 WHIRLPOOL 5cd5a26c3c7bfc02add5063a18f806ebaf58bde1d621bc3d7185edef776254674aba7c4925ab248158c21c5a90b19d156973f8b4a4ace821df60c9586617f3eb
 DIST seamonkey-2.46-ca.xpi 937577 SHA256 11adc88aab13826dbb7dd9374f877b80c87a085d75712c976173f243950292a6 SHA512 cf0d7c4829cae2baa064f8a68bfd827c6d596b9036d50e51f50a7d85faa7b1bd067c7dd84f7062affab6c1282186591c54f1cce60457e76924ae328eabca6505 WHIRLPOOL 80daf65a5d75038683f5a8c18f23c79d4f67c9daa7e7090aba8a9d7e610104dae890f45aa81a49a175542fd9c6fe08422f916e7d7d0854d12db7b346f0473be3
@@ -57,14 +56,29 @@ DIST seamonkey-2.48-sv-SE.xpi 930510 SHA256 831a4b42faa31f4006984269e2d6d3472a0f
 DIST seamonkey-2.48-zh-CN.xpi 934871 SHA256 991629043056dd722202116ef026aeb86a8615539aabf41a28b6a78da63eab7b SHA512 18485d34b90f3f619dde55c1772c5f4873a4efd5b828755eec28b20aa74d98050ccd206b19fa409ab6bea7f0053a94f2d684b54e19f763004fb752ad8e002d2c WHIRLPOOL cb8f4f34abd0eddd3f815c0b6d5efb30aa9cf7b29a2c1e948cd429befe732e6143bfb15b723cfab1c18eac7f18538ab33ee3ca4ba9c9eeae5ca8cd590cb78877
 DIST seamonkey-2.48-zh-TW.xpi 991735 SHA256 bb41ee50948baca9e78ae1ba0174046bde21d7bb823c6b365e32d7a8c6a9c50f SHA512 d14be0b9da910e3c7014c4ac9e6fc8270eb43176623280c55eec9e63c5fd0ce9b83db781cdbcd1eae67281fd09ad6dc2218df479e66076878c6bda12c2f2eeb3 WHIRLPOOL cc9bda10829ad4149e28b82f59580bc5d2a8d91c00c0e153bdb130be60e57f155df72929029f92c61ef444b5cea48bb47e10aa48615af4686e2dfc8370565c09
 DIST seamonkey-2.48.source.tar.xz 220412744 SHA256 6f9a07c86ba6474b44e5083f9d1315d01778c097937f7da4c5701debffab2631 SHA512 b1992a1dbaeb045aea10ff02aa214ec0c1725e3ad0844d2dffd1c0d0c26754fbd98b5fb5df25a2a490ebcb7a47037c61599b0a2e9240338b4e769e529faa33cf WHIRLPOOL ab0a2ee21efb8d446283ae1df6b2af8fe318fe5dbb41563c140f13f59780c8f252028019d9c181e0b0369201808dfe306058ac6fb5d7207cfbc241ba098ab7a6
-DIST seamonkey-2.49-l10n-sources-20170727.tar.xz 13871252 SHA256 73ad2bb8f1a48d9250d5825c318672e380f534672a9ae42dd7e4ea0506aff0e6 SHA512 6d5938ad16db53629a2e46a81a67827fafd33a00ff71ff6aaeb3151c2c29ae0e59b2f5e35f7d54b1a23882b7b85467202f62653510405fa1dac2ea4180130721 WHIRLPOOL 4e6960b0d065b60142baab1af37b5baed5bc3cddef79b12c689fe735bc4dea969e09756c09da22520600835a42df9f04f45fc8dfac7b92cc04251d403392b54a
-DIST thunderbird-52.2.0.source.tar.xz 228453944 SHA256 c65c66244ac113996002bcfa9e387f14291163cfb7009a9126e3a8d4a970e72d SHA512 e5c2ad5f7bbea4fb9abca94db6c149ee459c1c35b756b7840ee87b5fb631ccbcd323c743a12cddf8d504e0175bb93378beb7fe100b185ea6ab03a4968859ea89 WHIRLPOOL 54fb8bb90613a8debe3d5710e4d62acac20ed64c430de28b2910629d81dad1cfe894e6768065bf4a10e321ed2ab8d31fa7bcba775512414b2bb50c4939c304c6
-DIST thunderbird-52.3.0.source.tar.xz 228532004 SHA256 050acc320a9c50365a53e4faa6538a0ad7f9a302d5f2cfb6edf0c6fe1b573b18 SHA512 10e6495d207328aae325a797be1de5e535b5d967df929b0af9d7554d0473b5a7931c8f9cb1793e843b1913f441f790169dd4ac1ad9e0e53e66bc8e1c1dd60e66 WHIRLPOOL cd097157eb99a9b98aca63b259b77edcd1ceea5c150869fe485ab1219c1c84bcfbc7d70ecedca4b8733e8adf015ad0d5503db985b098207cd3b18497602c4223
+DIST seamonkey-2.49.4.0-cs.xpi 941974 SHA256 3da0bd7a341a90d5d10348ea53be7ffa3935202919a6d0aea59e69593499e246 SHA512 c3b061e0b735c6949a0ce7f8be22c7818e6bd039de5284015b0ff63b8456f18bd51db9f3a3d1f9a5df2a6d0610043ea9e33f16ccd3ba64e20ac53e901196afd3 WHIRLPOOL f3dcd77632898e6f35de6101705fb5122f31cd26d76f292c8a705dbb24157915587ad9604c5dacb41282449da1a1580d09085438ce4a025bd93d85c0539d1f16
+DIST seamonkey-2.49.4.0-de.xpi 949902 SHA256 c5d997ed331867310dbe3468a6ea14ed327681015b62d61c021b433376ec2ebd SHA512 fb85fa867b5b9417190aa25cc678d68e3afed04bfe052896167aaf46042397da6e1bbeb70acc321f46bd0bed4f0856152d80a348b478a336d28825c4120af1c6 WHIRLPOOL b024b448231390d983dc4ce7d2f55808703bbeedc322bc88586184e4039a0e8d154753bbaec57eaaa7481e047fcc48ca66b7744e6354a4b17d80767124d0dc77
+DIST seamonkey-2.49.4.0-en-GB.xpi 911789 SHA256 6a168ce1d5e5a6d5e4036f74dada7eac91f0feef6d53165afde30c9f39de643e SHA512 973fc7f693abe9b87bd971f79e050bd4bd9a16e4e6f6a50d9298f2c71d45aa328c4279055382b7f9bf8c807dff9c1ab8855d97dbbe3eb4d71c40ee5e3a02f3b6 WHIRLPOOL b795f6a7b16ab128bfb45661d289b7bf25b58665b94e314931c6c8d98ba3d73bb5aefa3fde46c317222fbd86a39c7a1ee0a5824a53611da9895a5e7985c463a0
+DIST seamonkey-2.49.4.0-es-AR.xpi 952759 SHA256 d34c3ab2145d0829c814ce96b51c63c30c925e5c5a84810d411777be059d2cbd SHA512 ec198ed919079e16bf638be032cc7de165d0e9d05d0742a12828b5ad510884d4dd0da57c0cbae85b3fe0089a1be26f42c9887957ab6ecac8b8ef6cf0fbbcb345 WHIRLPOOL 98ffc6a013e161315c9b4e194ec548bbeac6b9bada302308a7b95a6101336939d67f30b85d15d215411f0f12392f5279c12bb982e1befcc0b34f5ce4f779c32b
+DIST seamonkey-2.49.4.0-es-ES.xpi 897737 SHA256 7fce4de8e1160996af38838093710d9e8a6c9f16f1a05e1b76c2778586fb643f SHA512 e9fb5834f3086ee1cf99404930149f06ee7f3f0d5796550c3368b915ed9f729dbd92032682c6273b687b6f3077a4ca3a78192e101f1276d90ebf2eb71f39f22e WHIRLPOOL 4b0c55033055d3cf6e2a4898cb0bcc2b71c932a4445ae8d4b40ba157860bd2b54cddcaf73b66ce0e44cf6485c20b0951b48ad98c088b4f604f09d5c3d7097445
+DIST seamonkey-2.49.4.0-fr.xpi 969290 SHA256 5d32cebf47cea1a6c1cf20da828c4d2f944aa8f2252231d341dd292001fbdf55 SHA512 188f4a8c79b10f95c807a08837290fbc3245c983e6797b8f8a0beea4f4ffad915abeb942920f9986910a0530218f4e35ba16de60b4f21d33116ae16756eb4e8c WHIRLPOOL 7abb0149100fdd88f8d305073e09bef9b78b577f0b2927d70c44d76ea1ea63c889fa04f7a0aa5e905a533600ff123f014afe3b9ad8e5fadae8b0548a38bcf94d
+DIST seamonkey-2.49.4.0-hu.xpi 955174 SHA256 5795275d5eba01fe8c48af7f4f661ef5f3e7263f55029c2364a53f9288064401 SHA512 e28beb23242a6535230df4fd1adb82e8957487179402cb82dedc2faa6464b411d22ddb2732e0490a916597301eebf2fda727bcadb34e029bd468bd066dbc3080 WHIRLPOOL 5418407ce6d58f71fd78fcb3b22a044f1443a22aca1ab018492f5461556ddd900a4502de285ed40d9347b68a433a3443208ec332b9075c797af01bbc3e464b87
+DIST seamonkey-2.49.4.0-it.xpi 793590 SHA256 9c8726b46dc3feaaf014ae142aac7d00c3d7eb4cc11157178c1fc265cd021807 SHA512 c750a85b74bb37d966f1bbecdafcd6ad9d4532eaf0f49f9148081f821c61aec332646eb7c43f0eef4b736362a8c2ab0a1205a38537129f6fe920dc8ae0f16ca9 WHIRLPOOL f9b1c9690bc8c947f24be12d558ab3756754adbc3f5470c0d525809acb99b785aa98939b6fa083f0bf20154068a1b722fbe1b8c63eb156552d27140793321615
+DIST seamonkey-2.49.4.0-ja.xpi 1033801 SHA256 2e7279bd818493bc3ba34352458aeb8d4b27499fa776683e97d0cf3da9f2cdb2 SHA512 454756af04d5d3301c3ffe321109e1c78aa69a3b9e4a29e1b1e7226b958062e451551d73c3df87785fd80e74a4e433fc2094e3702ceb1a547abb858551878056 WHIRLPOOL d5733b3910227b21ef0d01570b9f5c9172865c8d1b8b80be4f1112bdbb7795bbb7181bdd8ac122937c159e8be2d229fab91b5ade2e2b2bc8c2609bd7494a2bbe
+DIST seamonkey-2.49.4.0-lt.xpi 956024 SHA256 f80892e20e5aad5c97b6c748d36fae3d75174d0164b3796ac45aaa1a5e3432ba SHA512 14124e0b9b60f360f6f2b77b5bafe80569894754a3ffd27b6a3aab34136d7876d785b5e9178cb1d34ec46a7b858f26327658e1a3e43ac97abe272838dde78228 WHIRLPOOL 2e96cc3fe80400e535b38a888b98479c420ebad6c5e8688a03f3cbd841ebe3c532a003c15be26649af756b9ca82da2555150fc17eb779733253aeddb30da6ef8
+DIST seamonkey-2.49.4.0-nl.xpi 957391 SHA256 6641ac30d2cfc6be47aeb92ee796924697be5a54bb384c4196d035f794d90a36 SHA512 0f3e68df37e211b73773e1b84d39d4540d1d8865cc534bad841babc30c074bb9301cc472aa0e4e61e09bc26948270e1106e1546d27705380819d830ca158215d WHIRLPOOL 370246c0219ad8366d40b9d1b73cee4053c9ddc875bfe05017c0466b38d3ae690883b45506d6e18dc60ed532978694c87fcc7841b59857ad0502390fe9cbafbc
+DIST seamonkey-2.49.4.0-pl.xpi 913004 SHA256 704d1836d6d9b39224b6beb63320b636f45919bd54833996c34ad5bb7144edc7 SHA512 532b64032b6e4cb902cd9d99ef5505f3ac57964452196f3a9f49eff1bd965c5a8a8271960951482266f12214cce4cad876268f9f38a193f5d91c2644fef0aff8 WHIRLPOOL 908368f22ddd44c7ea46724f9b7666326fb39fef368dc22c7c1fc297298157a8065eb2c11c68881a025b04710e43e24f635d438c2924208c2ea500617e288492
+DIST seamonkey-2.49.4.0-pt-PT.xpi 939012 SHA256 7d04419a91c82e3e0c5c5e054e757bf1fea6ea9cac2080c8e4c6f2a9e2f803ec SHA512 f8cac43e61de1d4dfbc0febddcadfa10cc457e7552016c79ff954cddef900470e60912c607076976b15811944a07cd785fbd2ffd85a5af3ce545ec98c12bdc05 WHIRLPOOL 779f545eb8827fbf6f53920880fee8ad5e8892554a9da4eba678494d25ca807f495c9ea5daffcd66b3e84828aa618bc9116d90637c09a7dcece5b08bd4696134
+DIST seamonkey-2.49.4.0-ru.xpi 995907 SHA256 0b125d063e304a5cab261c4a749ec6140ecb61c3c3069f1b0bbb47962b9d4a97 SHA512 846f7f361a15ea1b04539ec789dffb459e1fbd85283c720883d6545da67a979e040c80b5cb6a0938f0ca9e059e837310cf3fb2d97671e37ff256ad2ac780291c WHIRLPOOL d188e955346fdc4313f4c571f7e11874ac4b5c4cfacfce6f586ea096d43ac5bf4b07f0c50b52d7bc69c958fe1af9bd26a297dfb4252613524868cd8b90404961
+DIST seamonkey-2.49.4.0-sk.xpi 967988 SHA256 944dabb4e4b177cf43a4304e6d89a8bbf1c5b9b67edf44b20240ff3e406a3196 SHA512 8fb02cb8f95c68ce40aabaf79c57bd7c655092dd5fb939d68a62a1bec707b903fbcf16299ff8dd094e161b5f4c732a813d63e33b3ff3ac09f9e1afcf740426d9 WHIRLPOOL 6178865bddc8be8acea4b9b4b06f561cc751c9396f98e602ed048a75f209e36578580bd3f249c25a0887753b679d68460749cbee819d3955f87e30d4814f44a2
+DIST seamonkey-2.49.4.0-sv-SE.xpi 940793 SHA256 1d047f07347acd38fd3c2a726f98697b43294969772f4540d171ade622ed2d7e SHA512 0ac1b0a8e599ef0ffe49d8a7b94dd25818601fb5603273ed995b9a4bb52c5e13a360c76b9278bf8a14b8dce5609f33be319c43fa13ee7b16eda897f6c2d39ddf WHIRLPOOL a126a71d8a1922b01343f6e06b70cc5ffcd648aa5e0695e97cb521ab85c85cd9d21fb8190a1587f848e889b8056c409ccd28cfec2f864ad58f4c0748e661a2b2
+DIST seamonkey-2.49.4.0-zh-CN.xpi 946349 SHA256 b815362ac40fd7928e4f76344e9472225e556751b0fe9babbf4a7462ed8d3264 SHA512 5d3a6accc9deb69b6d52bccca0b52e12b8727d0e6a99067dba52921a147c333b7b777d7dc4935510fb981c9cfae2c4cfc30f310fad9b06e5537ef1dbb89b5e28 WHIRLPOOL c7e33e1d4080b462a6c0a3932756b93070cc603416e77f2a0fe32a1fb3b72ed9e9615d26d03bdae227008cc77a197599242d317065993699e2cdedf6213cbb2a
+DIST seamonkey-2.49.4.0-zh-TW.xpi 1002365 SHA256 c08143641eb99e20df9beff3a0a9e1645c7e67d63eb18bc0314a612866cd7d43 SHA512 a5797304f4de6edf807238a551676fe9755d9ae0dc0141ea959c6edae8bc742ad11976a2b1cf4f2a324ad6b94c1a97c77e29b8100a679af7002156d1d0150376 WHIRLPOOL 0b9bd7a7b2a51443165392ec36e8eeea5de179cb4915f131600f8256ad294a9a3e4dd97ea8cfcfa5363d78ed654e9d9db81dca7d9bc78e65c142a2519c7ae464
+DIST thunderbird-52.4.0.source.tar.xz 228561704 SHA256 7f57b5b4d4ec42b04afcff8327abc2d3c6185c0bcc1ad138825d021a2d3f578c SHA512 6ac39cecca9e53b51754d7a8bd7cae228d197eb234b03a2386c16fd665f4f7a67f10bbdf981c20b3f7a21a5ef67e2771154a3dd9f249c6a884c48a9e59bcfc78 WHIRLPOOL 54a51c417bdb7cd8fa89643741ebd1d15e589bbf1aed5a87dbe366657287f33496014e82caa220d55477dcca6c99784811b7effb1e1d4ee60b89c4485709b93f
 EBUILD seamonkey-2.46-r1.ebuild 11916 SHA256 4a5f3fe1194f18fa8d16064716f9479767953fd1399c3e268f74bde1e32c2d06 SHA512 46280b09685bcd166f53e27272d60804b68c7e347d0572d6285b6305acde294c6455e729f83a3ec9add1fffb432cc0e72f0247db42e8e435bb5531ff6ed3ae93 WHIRLPOOL 0b6f85084c8cabd7d2a7d9126fdd863b8eca01214f4cb9f8f899dea4c2bfdf366bb60e2c007c6777571bf397d6e365701dbc3de441bf7c95941424886d1a434d
 EBUILD seamonkey-2.48-r1.ebuild 13747 SHA256 e56f82de2e1fd222050d7a43c2889dc9abc28b1b6f47c4fded39f49d9a03b0de SHA512 4bd9722147e02b53b49f263b4606039e04c3a1d92f28f2b65523c314c03982e10e2102a85875a8a76c326598d69c7045d8ed4146b2f2071640dac3010699aea7 WHIRLPOOL 2c717e646b1471c63c4a76ce1b1bb04ed8d9ab93062591bfde7115456b35acfb7067606d78ac3431a8dc521401f5425ae4d5b7ebc5de95bcdd78ba0b485bbc2a
 EBUILD seamonkey-2.48.ebuild 13160 SHA256 86f97b92ed6573e8f6762db0c8fc13ae75df134548fc86b9fabddc098dbd073d SHA512 f6307112b3b19b6e3b39373f7662c4d2590f29bd04cc8f440b01f7e0f752cb279d1ee7a572e4d55afe6991548dd9ba0b34ec593d537f1672b7fe8531a91f8cdf WHIRLPOOL 03328d50142cd7e554e5ed9001fa4779b727419723696495572c5e30d199ef106adf5fb64aca8f589ffdd2528ca711cc7a9c31b465aa57d481961b55e9049973
-EBUILD seamonkey-2.49.2.0_p0.ebuild 14180 SHA256 73b281ac37a00b87ace1786ad963e7564c221a007710edd5d639ed298f925c5c SHA512 dece338c2d7133a7b8384ae27ffbc3f0e1a17dbc9794b9f1e9722a8e08dca5ead073a4bbe964e2c67f0bd3029781ef468845e500ed81f47799399ca128839613 WHIRLPOOL 31e14b0aa61a8477ed942fb497c0fd8579736a36c7498d606e218649ae084dc4d08e4dbdb9a49fe5fdab8213e102f06e8e221413967a270a441707e4ab871d78
-EBUILD seamonkey-2.49.3.0_p0.ebuild 14180 SHA256 a0838e9675a48cfe07bb4a5e5780fb59212fcaf9f97ddca897007bdf1ec3b0ee SHA512 2756514f92e2a6a2a9568b7f844734b5ad487ea6817861dae40073ac90da92692d78d59bd327b21bf50552dcd1e0c5ced4b1627cc1f4c72d24627464bb948912 WHIRLPOOL 48da0094ff27202b0e6a7c36340e248271298faf7bd5d4e789680cc2733f8c8b3994460909e1c81ea6330891de185c12e747b058db5562fc442e7be6764e8dac
+EBUILD seamonkey-2.49.4.0_p0.ebuild 14276 SHA256 7524b1846e6a46eaab0197623f8af6421efb93411372614240be763dce6be90e SHA512 38f615abfe23c81f179eeea4bfd44afb15aac42c64ec705308380d8becd949568dc92b6eef1a74b2b35f987ee879cc6bd7f93c0751330cd83418568deafe3bf9 WHIRLPOOL 8690149ca5cd54c2ff80bc6accf81f40db4153787ab8a4fc26a4689213166b89a30a67e1f1d15aa4ed00101a05851614f58a291a2c931a160f4e431997364906
 MISC ChangeLog 11213 SHA256 abe757580a51586d634fa9a611361737e808accf7d0c9c6d175f37cf4e286d58 SHA512 2f3513f706743f7747b5bab52667d5104cb15826e2a5e76bcd94ad05f2acc68d8aeefa7fa911256a50f2f2fc31a9afea9a73bccc9da631ee7cce4dfad38e94cd WHIRLPOOL f7cda18f1454a7d31545114ab6ab45a0f779df0a688b7846c47cbad77fcc00a077d43d8fed7b9846d2d42ca9e616b9fe8ebb6f96a6d20d14e77a3f3a109d1714
 MISC ChangeLog-2015 73394 SHA256 c5638cbe7c2bf361fb698cd748495737c896d196e104f5d42f793b01871e4aa7 SHA512 8720c0d267e9a96896a9cb6ba834809f8ad40bacab50c011147181b3963cf66b39496e6b68f63ccb813ee65e61250d60ce1066cb94dfdf26984ecbe029fc636e WHIRLPOOL 2c347db6fe835a40e2b8dae5154a8ae6e681b96adbe430feac53165771e276d968226c11abd353fa1e3205bb6c16437b05f2cc08b2e9d0a573a8330df1af8cd7
 MISC metadata.xml 2079 SHA256 95bd4c90e558fa9210b576af885bb7d33e81bcd3989d9973f81362ae4fb62b0b SHA512 1073fcf053c657d063f12c1683d61a936bd2edd2fcbf842d4f1b49610be1ec0cb9db521d710a4eee7d1eea951fa481a66d4421af7ad1aa38fbe27cea8ed9ed5c WHIRLPOOL 57a757c7102ddc7573b761989ca12ae23bb259197aea42b66ed3fc088653eb018ef164f3045a4287a293c1a7e5e469f84a8228d66b008ab8d58344a3e03f34b5
diff --git a/www-client/seamonkey/seamonkey-2.49.4.0_p0.ebuild b/www-client/seamonkey/seamonkey-2.49.4.0_p0.ebuild
new file mode 100644
index 000000000000..bb914f46431e
--- /dev/null
+++ b/www-client/seamonkey/seamonkey-2.49.4.0_p0.ebuild
@@ -0,0 +1,437 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WANT_AUTOCONF="2.1"
+
+# This list can be updated with scripts/get_langs.sh from the mozilla overlay
+# note - could not roll langpacks for: ca fi
+#MOZ_LANGS=(ca cs de en-GB es-AR es-ES fi fr gl hu it ja lt nb-NO nl pl pt-PT
+#	    ru sk sv-SE tr uk zh-CN zh-TW)
+MOZ_LANGS=(cs de en-GB es-AR es-ES fr hu it ja lt nl pl pt-PT
+	    ru sk sv-SE zh-CN zh-TW)
+
+MOZ_PV="${PV/_pre*}"
+MOZ_PV="${MOZ_PV/_alpha/a}"
+MOZ_PV="${MOZ_PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+MOZ_PV="${MOZ_PV/_p[0-9]}"
+MOZ_P="${P}"
+MY_MOZ_P="${PN}-${MOZ_PV}"
+
+if [[ ${PV} == *_pre* ]] ; then
+# the following are for upstream build candidates
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/candidates/${MOZ_PV}-candidates/build${PV##*_pre}"
+	MOZ_LANGPACK_PREFIX="linux-i686/xpi/"
+	SRC_URI+=" ${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz"
+	S="${WORKDIR}/${MY_MOZ_P}"
+	# And the langpack stuff stays at eclass defaults
+# the following is for self-rolled releases
+	#MOZ_HTTP_URI="https://dev.gentoo.org/~axs/distfiles"
+	#MOZ_LANGPACK_PREFIX="${MY_MOZ_P}."
+	#MOZ_LANGPACK_SUFFIX=".langpack.xpi"
+	#SRC_URI="${SRC_URI}
+	#${MOZ_HTTP_URI}/${P}.source.tar.xz
+	#"
+elif [[ ${PV} == *_p[0-9] ]]; then
+	# gentoo-unofficial release using thunderbird distfiles to build seamonkey instead
+	TB_MAJOR=52
+	SMPV="${PV%.[0-9].*}"
+	MOZ_P="${PN}-${MOZ_PV}"
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/thunderbird/releases/${MOZ_PV/${SMPV}/${TB_MAJOR}}"
+# the following is for self-rolling localizations
+	#MOZ_GENERATE_LANGPACKS=1
+	#SRC_URI="${SRC_URI}
+	#https://dev.gentoo.org/~axs/distfiles/${PN}-${SMPV}-l10n-sources-20170727.tar.xz"
+# for this one use the localizations pre-rolled upstream for 2.49.1-candidate build 2
+	MOZ_LANGPACK_PREFIX="../../../seamonkey/candidates/2.49.1-candidates/build2/linux-i686/xpi/"
+	MOZ_LANGPACK_SUFFIX=".xpi"
+	S="${WORKDIR}/thunderbird-${MOZ_PV/${SMPV}/${TB_MAJOR}}"
+	CHATZILLA_VER="SEA2_48_RELBRANCH"
+	INSPECTOR_VER="DOMI_2_0_17"
+	SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/source/thunderbird-${MOZ_PV/${SMPV}/${TB_MAJOR}}.source.tar.xz
+	https://hg.mozilla.org/chatzilla/archive/${CHATZILLA_VER}.tar.bz2 -> chatzilla-${CHATZILLA_VER}.tar.bz2
+	https://hg.mozilla.org/dom-inspector/archive/${INSPECTOR_VER}.tar.bz2 -> dom-inspector-${INSPECTOR_VER}.tar.bz2
+	"
+else
+	MOZ_HTTP_URI="https://archive.mozilla.org/pub/${PN}/releases/${MOZ_PV}"
+	MOZ_LANGPACK_PREFIX="langpack/${MY_MOZ_P}."
+	MOZ_LANGPACK_SUFFIX=".langpack.xpi"
+	S="${WORKDIR}/${PN}-${MOZ_PV}"
+	SRC_URI="${SRC_URI}
+	${MOZ_HTTP_URI}/source/${MY_MOZ_P}.source.tar.xz -> ${P}.source.tar.xz
+	"
+fi
+
+MOZCONFIG_OPTIONAL_GTK3=1
+MOZCONFIG_OPTIONAL_WIFI=1
+inherit check-reqs flag-o-matic toolchain-funcs eutils mozconfig-v6.52 pax-utils xdg-utils autotools mozextension nsplugins mozlinguas-v2
+
+PATCHFF="firefox-52.2-patches-03"
+PATCH="${PN}-2.46-patches-01"
+
+DESCRIPTION="Seamonkey Web Browser"
+HOMEPAGE="http://www.seamonkey-project.org"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+SLOT="0"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+IUSE="+calendar +chatzilla +crypt +gmp-autoupdate +ipc jack minimal pulseaudio +roaming selinux test"
+
+SRC_URI+="
+	https://dev.gentoo.org/~anarchy/mozilla/patchsets/${PATCHFF}.tar.xz
+	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCHFF}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCHFF}.tar.xz
+	https://dev.gentoo.org/~axs/mozilla/patchsets/${PATCH}.tar.xz
+	https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/${PATCH}.tar.xz
+"
+
+ASM_DEPEND=">=dev-lang/yasm-1.1"
+
+RDEPEND="
+	>=dev-libs/nss-3.28.1
+	>=dev-libs/nspr-4.13
+	crypt? ( x11-plugins/enigmail )
+	jack? ( virtual/jack )
+"
+
+DEPEND="
+	${RDEPEND}
+	!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( dev-libs/libexecinfo ) ) )
+	amd64? ( ${ASM_DEPEND}
+		virtual/opengl )
+	x86? ( ${ASM_DEPEND}
+		virtual/opengl )
+"
+
+BUILD_OBJ_DIR="${S}/seamonk"
+
+# allow GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z $GMP_PLUGIN_LIST ]] ; then
+	GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+pkg_setup() {
+	if [[ ${PV} == *_pre* ]] ; then
+		ewarn "You're using an unofficial release of ${PN}. Don't file any bug in"
+		ewarn "Gentoo's Bugtracker against this package in case it breaks for you."
+		ewarn "Those belong to upstream: https://bugzilla.mozilla.org"
+	fi
+
+	moz_pkgsetup
+}
+
+pkg_pretend() {
+	# Ensure we have enough disk space to compile
+	if use debug || use test ; then
+		CHECKREQS_DISK_BUILD="8G"
+	else
+		CHECKREQS_DISK_BUILD="4G"
+	fi
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+
+	if [[ -n $TB_MAJOR ]]; then
+		# move the irc and inspector code into the correct locations
+		# when we are building from a thunderbird tarball
+		mv "${WORKDIR}"/chatzilla-${CHATZILLA_VER} \
+			"${S}"/mozilla/extensions/irc || die
+		mv "${WORKDIR}"/dom-inspector-${INSPECTOR_VER} \
+			"${S}"/mozilla/extensions/inspector || die
+	fi
+}
+
+src_prepare() {
+	# Apply our patches
+	eapply "${WORKDIR}"/seamonkey
+
+	# browser patches go here
+	pushd "${S}"/mozilla &>/dev/null || die
+	rm -f "${WORKDIR}"/firefox/1000_gentoo_install_dir.patch
+	eapply "${WORKDIR}"/firefox
+	popd &>/dev/null || die
+
+	if grep -q '^sdkdir.*$(MOZ_APP_NAME)-devel' mozilla/config/baseconfig.mk ; then
+		sed '/^sdkdir/s@-devel@@' \
+			-i mozilla/config/baseconfig.mk || die
+	else
+		einfo "baseconfig.mk hackery no longer needed."
+	fi
+
+	# Shell scripts sometimes contain DOS line endings; bug 391889
+	grep -rlZ --include="*.sh" $'\r$' . |
+	while read -r -d $'\0' file ; do
+		einfo edos2unix "${file}"
+		edos2unix "${file}"
+	done
+
+	# force a version update that matches the minor and patch version of thunderbird
+	if [[ -n ${TB_MAJOR} ]]; then
+		echo ${MOZ_PV} >"${S}"/suite/config/version.txt
+	fi
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	local ms="${S}/mozilla"
+
+	# Enable gnomebreakpad
+	if use debug ; then
+		sed -i -e "s:GNOME_DISABLE_CRASH_DIALOG=1:GNOME_DISABLE_CRASH_DIALOG=0:g" \
+			"${ms}"/build/unix/run-mozilla.sh || die "sed failed!"
+	fi
+
+	# Ensure that are plugins dir is enabled as default
+	sed -i -e "s:/usr/lib/mozilla/plugins:/usr/lib/nsbrowser/plugins:" \
+		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 32bit!"
+	sed -i -e "s:/usr/lib64/mozilla/plugins:/usr/lib64/nsbrowser/plugins:" \
+		"${ms}"/xpcom/io/nsAppFileLocationProvider.cpp || die "sed failed to replace plugin path for 64bit!"
+
+	# Don't exit with error when some libs are missing which we have in
+	# system.
+	sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \
+		-i "${S}"/suite/installer/Makefile.in || die
+	# Don't error out when there's no files to be removed:
+	sed 's@\(xargs rm\)$@\1 -f@' \
+		-i "${ms}"/toolkit/mozapps/installer/packager.mk || die
+
+	# Don't build libs-% locale files for chatzilla if we are not building chatzilla
+	# (this is hard-coded in the build system at present rather than being based on configuration)
+	use chatzilla || sed '/extensions\/irc\/locales libs-/s@^@#@' \
+		-i "${S}"/suite/locales/Makefile.in || die
+
+	eautoreconf old-configure.in
+	cd "${S}"/mozilla || die
+	eautoconf old-configure.in
+	cd "${S}"/mozilla/js/src || die
+	eautoconf old-configure.in
+	cd "${S}"/mozilla/memory/jemalloc/src || die
+	WANT_AUTOCONF= eautoconf
+}
+
+src_configure() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	MEXTENSIONS="default"
+	# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+	# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+	# get your own set of keys.
+	_google_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc
+
+	####################################
+	#
+	# mozconfig, CFLAGS and CXXFLAGS setup
+	#
+	####################################
+
+	mozconfig_init
+	mozconfig_config
+
+	# enable JACK, bug 600002
+	mozconfig_use_enable jack
+
+	# It doesn't compile on alpha without this LDFLAGS
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	if ! use chatzilla ; then
+		MEXTENSIONS+=",-irc"
+	fi
+	if ! use roaming ; then
+		MEXTENSIONS+=",-sroaming"
+	fi
+
+	# Setup api key for location services
+	echo -n "${_google_api_key}" > "${S}"/google-api-key
+	mozconfig_annotate '' --with-google-api-keyfile="${S}/google-api-key"
+
+	mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}"
+
+	# Other sm-specific settings
+	mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+	mozconfig_annotate '' --enable-safe-browsing
+	mozconfig_use_enable calendar
+
+	mozlinguas_mozconfig
+
+	# Use an objdir to keep things organized.
+	echo "mk_add_options MOZ_OBJDIR=${BUILD_OBJ_DIR}" >> "${S}"/.mozconfig
+	echo "mk_add_options XARGS=/usr/bin/xargs" >> "${S}"/.mozconfig
+
+	# Finalize and report settings
+	mozconfig_final
+
+	# Work around breakage in makeopts with --no-print-directory
+	MAKEOPTS="${MAKEOPTS/--no-print-directory/}"
+
+	if [[ $(gcc-major-version) -lt 4 ]] ; then
+		append-cxxflags -fno-stack-protector
+	elif [[ $(gcc-major-version) -gt 4 || $(gcc-minor-version) -gt 3 ]] ; then
+		if use amd64 || use x86 ; then
+			append-flags -mno-avx
+		fi
+	fi
+
+	# workaround for funky/broken upstream configure...
+	SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake V=1 -f client.mk configure
+}
+
+src_compile() {
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL}" \
+	emake V=1 -f client.mk
+
+	mozlinguas_src_compile
+}
+
+src_install() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+	DICTPATH="\"${EPREFIX}/usr/share/myspell\""
+
+	local emid
+	cd "${BUILD_OBJ_DIR}" || die
+
+	# Pax mark xpcshell for hardened support, only used for startupcache creation.
+	pax-mark m "${BUILD_OBJ_DIR}/dist/bin/xpcshell"
+
+	# Copy our preference before omnijar is created.
+	sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo-1.js > \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	# Set default path to search for dictionaries.
+	echo "pref(\"spellchecker.dictionary_path\", ${DICTPATH});" \
+		>> "${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	echo 'pref("extensions.autoDisableScopes", 3);' >> \
+		"${BUILD_OBJ_DIR}/dist/bin/defaults/pref/all-gentoo.js" \
+		|| die
+
+	local plugin
+	if ! use gmp-autoupdate ; then
+		for plugin in "${GMP_PLUGIN_LIST[@]}" ; do
+			echo "pref(\"media.${plugin}.autoupdate\", false);" >> \
+				"${S}/${BUILD_OBJ_DIR}/dist/bin/browser/defaults/preferences/all-gentoo.js" \
+				|| dir
+		done
+	fi
+
+	MOZ_MAKE_FLAGS="${MAKEOPTS}" SHELL="${SHELL:-${EPREFIX%/}/bin/bash}" \
+	emake DESTDIR="${D}" install
+	cp "${FILESDIR}"/${PN}.desktop "${T}" || die
+
+	sed 's|^\(MimeType=.*\)$|\1text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;|' \
+		-i "${T}"/${PN}.desktop || die
+	sed 's|^\(Categories=.*\)$|\1Email;|' -i "${T}"/${PN}.desktop \
+		|| die
+
+	# Install language packs
+	mozlinguas_src_install
+
+	# Add StartupNotify=true bug 290401
+	if use startup-notification ; then
+		echo "StartupNotify=true" >> "${T}"/${PN}.desktop || die
+	fi
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/suite/branding/nightly/content/icon64.png ${PN}.png
+	domenu "${T}"/${PN}.desktop
+
+	# Required in order to use plugins and even run seamonkey on hardened.
+	pax-mark m "${ED}"${MOZILLA_FIVE_HOME}/{seamonkey,seamonkey-bin,plugin-container}
+
+	if use minimal ; then
+		rm -rf "${ED}"/usr/include "${ED}${MOZILLA_FIVE_HOME}"/{idl,include,lib,sdk}
+	fi
+
+	if use crypt ; then
+		emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' "${EROOT%/}"/usr/share/enigmail/install.rdf)
+		if [[ -n ${emid} ]]; then
+			dosym "${EPREFIX%/}"/usr/share/enigmail ${MOZILLA_FIVE_HOME}/extensions/${emid}
+		else
+			eerror "${EPREFIX%/}/usr/share/enigmail/install.rdf: No such file or directory"
+			die "<EM:ID> tag for x11-plugins/enigmail could not be found!"
+		fi
+	fi
+
+	if use chatzilla ; then
+		local emid='{59c81df5-4b7a-477b-912d-4e0fdf64e5f2}'
+
+		# remove the en_US-only xpi file so a version with all requested locales can be installed
+		if [[ -e "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi ]]; then
+			rm -f "${ED}"${MOZILLA_FIVE_HOME}/distribution/extensions/${emid}.xpi || die
+		fi
+
+		# merge the extra locales into the main extension
+		mozlinguas_xpistage_langpacks "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla
+
+		# install the merged extension
+		mkdir -p "${T}/${emid}" || die
+		cp -RLp -t "${T}/${emid}" "${BUILD_OBJ_DIR}"/dist/xpi-stage/chatzilla/* || die
+		insinto ${MOZILLA_FIVE_HOME}/distribution/extensions
+		doins -r "${T}/${emid}"
+	fi
+
+	# Handle plugins dir through nsplugins.eclass
+	share_plugins_dir
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	echo "SEARCH_DIRS_MASK=${MOZILLA_FIVE_HOME}*" >> ${T}/11${PN}
+	doins "${T}"/11${PN}
+}
+
+pkg_preinst() {
+	MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}"
+
+	if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then
+		rm ${MOZILLA_FIVE_HOME}/plugins -rf
+	fi
+
+	# Because PM's dont seem to properly merge a symlink replacing a directory
+	if use crypt ; then
+		local emid=$(sed -n '/<em:id>/!d; s/.*\({.*}\).*/\1/; p; q' "${EROOT%/}"/usr/share/enigmail/install.rdf)
+		local emidpath="${EROOT%/}"${MOZILLA_FIVE_HOME}/extensions/${emid}
+		if [[ -z ${emid} ]]; then
+			eerror "${EROOT%/}/usr/share/enigmail/install.rdf: No such file or directory"
+			die "Could not find enigmail on disk during pkg_preinst()"
+		fi
+		if [[ ! -h "${emidpath}" ]] && [[ -d "${emidpath}" ]]; then
+			if ! rm -R --interactive=never "${emidpath}" ; then
+				eerror "Could not remove enigmail directory from previous installation,"
+				eerror "You must remove this by hand and rename the symbolic link yourself:"
+				eerror
+				eerror "\t cd ${EPREFIX%/}${MOZILLA_FIVE_HOME}/extensions"
+				eerror "\t rm -Rf ${emid}"
+				eerror "\t mv ${emid}.backup* ${emid}"
+			fi
+		fi
+	fi
+}
+
+pkg_postinst() {
+	MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# Update mimedb for the new .desktop file
+	xdg_desktop_database_update
+	#gnome2_icon_cache_update
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${GMP_PLUGIN_LIST[@]}"; do elog "\t ${plugin}" ; done
+	fi
+
+	if use chatzilla ; then
+		elog "chatzilla is now an extension which can be en-/disabled and configured via"
+		elog "the Add-on manager."
+	fi
+}
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index c0188940a24c..e46ef82926fb 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -17,6 +17,7 @@ DIST nginx-1.12.1.tar.gz 981093 SHA256 8793bf426485a30f91021b6b945a9fd8a84d87d17
 DIST nginx-1.13.3.tar.gz 985931 SHA256 5b73f98004c302fb8e4a172abf046d9ce77739a82487e4873b39f9b0dcbb0d72 SHA512 4a8924b1edd0b8476437680ea548a0bc983d360e73f2d5797f60cebc3ef7d6fb64e56b6aaf5a4fc1707d24519dc70d466a7bf1d336c463651928d65c2f7b5380 WHIRLPOOL 9cb1f77a60945d9c1df6e2589116406f31939882131759d3aa95b25edfe86bc5fe712a517a3b0f77a5fca2b3706884984b90e293a4e791faa824bbf0e964518e
 DIST nginx-1.13.4.tar.gz 988415 SHA256 de21f3c49ba65c611329d8759a63d72e5fcf719bc6f2a3270e2541348ef1fbba SHA512 068f59f0dfe68a9a20a141bf5416551bc758fe50a38b2576f0e1c9df2ec674c7348b151f3ce80b614ac20610bc85374be7cef69f95b925f4fde351716c1da740 WHIRLPOOL 333cf2542fef05a0709259e6c8ea363a2eaaade00e1e1f0f50df081af023826d452b7b5fd3e826a63cad1753949f469424723b0a9731a34418c06517e14d6f3a
 DIST nginx-1.13.5.tar.gz 988821 SHA256 0e75b94429b3f745377aeba3aff97da77bf2b03fcb9ff15b3bad9b038db29f2e SHA512 ffd0406a75a35da427522f58c9b710cde86acb1ebf48f4e6b7f6a44e04ccd83950fedc6dceed9e2ab5132e06559f3bf45935d5011fc436e7c2efd46ac1e86459 WHIRLPOOL 94703bff57b0c701709974748f07ba444143707ecfb98beb9ca0d30d66913cde07725f3ae82a44d5585709c35b0ff600eccab37f0b5df904b67cee8e2085207d
+DIST nginx-1.13.6.tar.gz 989760 SHA256 8512fc6f986a20af293b61f33b0e72f64a72ea5b1acbcc790c4c4e2d6f63f8f8 SHA512 9ae218396e94f0e165d4d573a979354045ac579f0dcc702a37bde3ec5764e21161efc90fc1ff66bd402047c41a16ca0ff02423eaeb8d89b397e970df246f419e WHIRLPOOL e219846d7a15de9239d4c26eab4e8ec783bbc715e84eee0f6a8591a1d0dae0eeb828b15ccf622638c14a943758b3bb02e23355e129c16178d9aca72c4733b80f
 DIST nginx-auth-ldap-49a8b4d28fc4a518563c82e0b52821e5f37db1fc.tar.gz 17159 SHA256 3c11c32f05da04f1a4647dc4e35dd8d8aeacd5a2e763ba349feba3dba8663132 SHA512 323abd0ca8e90f5afcaf81a8ff1a8abe3dfcbff3d69f0dd4a1c005fe6436acbf3076c4c57a4df877b3d8e388cbea085d46301bb2df9c0752e2567817ff7cca92 WHIRLPOOL ad65e8182b2634db5fa06055ef7d91c7d8aabd0fa986d8402a4845977354d6edb329621b6f9f96c90ce2d158cff20e42ae50fba06a088a84de3e3f414205dbc2
 DIST nginx_http_sticky_module_ng-1.2.6-10-g08a395c66e42.tar.bz2 124047 SHA256 6f9102321d8c68df6d67e9bde145a8de3f45f99f6cb47c08735a86f003234d31 SHA512 6c1bfdcf89884b2855d51ae7da0f6e53a4ca3629e1aaf58433b70c07dcb2af797ba6e87d9b3eb4fe2fb6d4d697e862f2b4c2f8d8b3fdaea201740c97ec936529 WHIRLPOOL 38abe56e177e22dad68ac7d6570425ecd763d2e891627a75156a6f39bd7edc54f664c3d2f638e1ea57c743dadc6a8c9889be087abbdb4c98b5641c299f7fbc07
 DIST ngx_devel_kit-0.3.0-r1.tar.gz 66455 SHA256 88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619 SHA512 558764c9be913a4f61d0e277d07bf3c272e1ce086b3fadb85b693a7e92805cd9fca4da7a8d29c96e53fc0d23b331327d3b2561ff61f19d2330e7d5d35ac7d614 WHIRLPOOL 5f6ed4e6850d2ce7e8c65e0570a7e2c74a1fe360e167644ed405fff682ab178b09c722c99c1df9af552fb816219b9fc04dcdf638b3e4af68c688434cdb33aa59
@@ -36,6 +37,7 @@ DIST ngx_http_push_stream-0.5.2.tar.gz 182008 SHA256 1d07f38acdb8194bd49344b0ba2
 DIST ngx_http_slowfs_cache-1.10.tar.gz 11809 SHA256 1e81453942e5b0877de1f1f06c56ae82918ea9818255cb935bcb673c95a758a1 SHA512 fbc9609a8d6913aeefe535f206b9e53477503f131934ead2ae5a6169e395af2f5fb54778704824d5eeb22a4ef40a11ebbcde580db62a631f70edcc2cfc06b15d WHIRLPOOL a02ed77422c47d9e476f8746186d19d632ddb953635d8d9dd51ff076225a78044286ee7e114478bc02e4b2a422e4fdc207154fc287629dd2cd7c3f9a634dad18
 DIST ngx_http_upload_progress-0.9.2-r1.tar.gz 17268 SHA256 b286689355442657650421d8e8398bd4abf9dbbaade65947bb0cb74a349cc497 SHA512 c31c46344d49704389722325a041b9cd170fa290acefe92cfc572c07f711cd3039de78f28df48ca7dcb79b2e4bbe442580aaaf4d92883fd3a14bf41d66dd9d8c WHIRLPOOL e847603f1445c7e1471a5570e2774a448be880eb71eeb21e27361586bcee9aae31cb0a8a80cd5abfc8d14e2c356fabfa7293e6a4d5f6782d41521a7bdc124066
 DIST ngx_http_upstream_check-0.3.0-10-gf3bdb7b.tar.gz 129060 SHA256 9e0835e8c1550033e74c7eaeebf94d41ab1617cff152dd076da976e0eba30bfc SHA512 5b2ae6d305d24d0c64dc118fd3b0c23f5bf0e9a282e70e8d2c4eb946ed510263b5e845f64ca352784e34708cf9d98804cacf64b6c9efd712a395076dd0ba7c29 WHIRLPOOL 8dab8aa1bf3f7c9adbf2952148d76cc627682876b5e64dc789582b573a4b6fa73910043325fc664784b68966bcb1e8ba9ae6bfa457133bde0d52e39b7d3c09e0
+DIST ngx_http_upstream_check-31b1b42873fa56620d8a873ac13f5f26b52d0cd6.tar.gz 130052 SHA256 c7241b15ba20779d8d465dfe05e8e53f9e62b069b4165c9e8001eb795b870ff4 SHA512 e7ea6712c27fd2610e8681b7f687e24c94cd7558d6f19f87568d4c2169115678a61c58b1cd3686a927173b566ff1e10cb1fb767fe63db61f860a77bac9792f9b WHIRLPOOL 932a51c8911053e301a7efa3006bf994622b79f3a9f39c317f33f2243c77dde06c7b8387bf0969943512afe049f0e55c8aad5c89d4fd0f4c84939b20927c52ed
 DIST ngx_memc_module-0.18.tar.gz 37113 SHA256 4e280d1dcb8b312bc7875604c1e35b17879279126d3d5fbf482aa9cc7c11276d SHA512 8087bd361fb4e522493e66f93d59c9b13245d6eef0fe4a53f619d1826feb02af60769c0a04f87f2faf5308a44b794ef146a445bdbe7cbc7f21c0edaaba08c706 WHIRLPOOL 9570bf7fb4e925d1794f3af0914efca036fe65696e7e380969133b89878e5f46f71cd5ffb7b5ea94085aced26d289abca77d7ef805f03ff614bc12a47d7aab3f
 DIST ngx_metrics-0.1.1.tar.gz 2964 SHA256 1c62ebb31e3caafad91720962770b0e7a4287f195520cf12471c262ac19b154e SHA512 d36a8fb0104c83b6b564e03b351aa750cab08650264c74d6f786af357bfb7006b531a93270dd961896ea8dafe27e5db8548ede714c5f52c4742876bc73af4b5e WHIRLPOOL 2796f5a97e76dfcc91133240e8e90ba493f0356f781a173d8cacdd09eba64b75ef531db398c0566fda395124700de8c991b771433e376ca0d5898c2ea6f82868
 DIST ngx_mogilefs_module-1.0.4.tar.gz 11208 SHA256 7ac230d30907f013dff8d435a118619ea6168aa3714dba62c6962d350c6295ae SHA512 b8cb7eaf6274f4e2247dbcb39db05072d2b2d4361256a325fafab5533d7ce0c4ae9e2905b954dfcfa4789c9cab5cccf2ac1c3a1f02f6a327ed95b562d7773ed1 WHIRLPOOL 64c9b11ad938e6dbe5ba31298f1cd46f6e6bb4ba039c96b1e43bd85919d1606326f74b677f789ecabe0b0f4e0f08ac5aaf8148bf820de65aaa1e9966a28b9f61
@@ -44,6 +46,7 @@ EBUILD nginx-1.12.1.ebuild 37447 SHA256 2477ca64039f20ac1bca067199a20beea17ee7db
 EBUILD nginx-1.13.3.ebuild 37449 SHA256 32838376e6479d1f23bd1d0f500129df8d6c9bac8306fdf0c78bbc0829fc1ea6 SHA512 0adc9b68fb63bf90773fbc08d9a8c9f358cf447b54ff122f6069ffcf725af9dbf34deefa23fe8b4817044578cf1f47c0ca1857e4208bc30761c45a67ef964fe1 WHIRLPOOL d8548150c12049999f515657a91e645a249ad4eaca51485b8900f9e8bfbc633b08ec3d1e34855a3df2779054474782f531d7097fe78ec2617dc1ed54bf4d3b79
 EBUILD nginx-1.13.4.ebuild 36979 SHA256 3bcaaf3a338d9f835a123972ceb5c850d65f4202a344eff387e3585db8e59d6c SHA512 e37db661b34783e2888a1dbb41dc056a4dde164e98679f64d79bea49b8241186cd845429bd025b31787d81a8ba464325955607490335d125529e8c82ff84f381 WHIRLPOOL 39da88134ed266beec030be3504630b22d1d5b8291223b82821ca2dfc0599285f78b682140f003ac93755f79d386b56d8d209ff6d639942deeb07e2d8c539320
 EBUILD nginx-1.13.5.ebuild 36986 SHA256 2776b48e3377e64310dd3a27a0a7073c309ef2b6420a02ef7286f7f5dad9c676 SHA512 38717303b8e653edcabcfa080b3afa8188c5f6fed6b7c7f4ee512f05b2c572be99bf1ed91c1ee9b80958103eea1a91192faed3cd7c1d42bb80a02e8370226c4f WHIRLPOOL 339b305c223c2fd7ef7a11d614d871cecec7125c60e322dc4126c04222e7569f2434e2f8b1a0b99fcde72dc25ea623bba74ea195cb5d154270e5825ceacdb991
+EBUILD nginx-1.13.6.ebuild 37000 SHA256 ee6ff2cf5b365059c2f5fe410d33761bc96bada332a07ce9fb687a9634d4c971 SHA512 c235a260e17c68ba15596e79c1b12086aaaeb21a7f179821c20292cb29366c26fa0c31a847ac3792de07bbc60ec9810b03b205c8cd05a76a56e069e67cd1f376 WHIRLPOOL 06531ff19d00a2c8126ac391f3af8c963a725aa20f66c5abc52575178092e44b8fce64ca6e934bf805c121ed1a23b1f3ac9f8211db903f84eb744265ed5de682
 MISC ChangeLog 20921 SHA256 6daa8e175ce89e3bcc1d0ce14ca52fd82bda991200624c46830e680614e494d6 SHA512 f3f2d93714c35d1ebc04d9aa2e0b6605334bcae88cc8a58c24eed9d479292d9288801dcbf224144914f8715092be69617b6e4c5fe837eeea87e8d499c4e91366 WHIRLPOOL bbb44c9e3e3e8a7ea93b358054266b593083ce38dbdac404dc54f8fdfdf83ef5ab54b5e3978a0c1597e6ed0a0005f064a271f83c3abc27e4598066efede3c563
 MISC ChangeLog-2015 69680 SHA256 10720899590f9065076fca43d949a1fc45b04562b93ca1b47f8bce211bc26a50 SHA512 2c149e4a9a2d37127b9520aa09fe789216a1498d73351b0563c45d8838abdc7788ad3d34ccddfd8b27d7eb386a1344e1726f2ee93a29c886e018057d0ade5546 WHIRLPOOL fcb612cb6854cd2644344220c0fabd8cffeb548008327920eb535986af33c7ad3ae4c31ac57497d9f35bfeabb10cbca1e9897d42009dcfd8a8a7b1dfc0fb9d30
 MISC metadata.xml 1484 SHA256 c7ee4adf7c78b790d017b86fcac77615c3e4202e9304957da891b17e530b2f43 SHA512 5d17d3074acd6b5df642ab4f0e70a3db593e0e09198b98dba0c177951abc8e9b9bfc088a0428ad15717d77598cc54e453092f9e6485009373372535c88588aed WHIRLPOOL b27eb87db6471c5314cc9fffce167b09634084061a84e974775137f001b9ef2ad7afe5796e2ad8c87b9c13e8c1e91fb368459bee9db20f481585f09d6eaaf328
diff --git a/www-servers/nginx/nginx-1.13.6.ebuild b/www-servers/nginx/nginx-1.13.6.ebuild
new file mode 100644
index 000000000000..f2844ff8505d
--- /dev/null
+++ b/www-servers/nginx/nginx-1.13.6.ebuild
@@ -0,0 +1,1000 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# Maintainer notes:
+# - http_rewrite-independent pcre-support makes sense for matching locations without an actual rewrite
+# - any http-module activates the main http-functionality and overrides USE=-http
+# - keep the following requirements in mind before adding external modules:
+#	* alive upstream
+#	* sane packaging
+#	* builds cleanly
+#	* does not need a patch for nginx core
+# - TODO: test the google-perftools module (included in vanilla tarball)
+
+# prevent perl-module from adding automagic perl DEPENDs
+GENTOO_DEPEND_ON_PERL="no"
+
+# devel_kit (https://github.com/simpl/ngx_devel_kit, BSD license)
+DEVEL_KIT_MODULE_PV="0.3.0"
+DEVEL_KIT_MODULE_P="ngx_devel_kit-${DEVEL_KIT_MODULE_PV}-r1"
+DEVEL_KIT_MODULE_URI="https://github.com/simpl/ngx_devel_kit/archive/v${DEVEL_KIT_MODULE_PV}.tar.gz"
+DEVEL_KIT_MODULE_WD="${WORKDIR}/ngx_devel_kit-${DEVEL_KIT_MODULE_PV}"
+
+# http_uploadprogress (https://github.com/masterzen/nginx-upload-progress-module, BSD-2 license)
+HTTP_UPLOAD_PROGRESS_MODULE_PV="0.9.2"
+HTTP_UPLOAD_PROGRESS_MODULE_P="ngx_http_upload_progress-${HTTP_UPLOAD_PROGRESS_MODULE_PV}-r1"
+HTTP_UPLOAD_PROGRESS_MODULE_URI="https://github.com/masterzen/nginx-upload-progress-module/archive/v${HTTP_UPLOAD_PROGRESS_MODULE_PV}.tar.gz"
+HTTP_UPLOAD_PROGRESS_MODULE_WD="${WORKDIR}/nginx-upload-progress-module-${HTTP_UPLOAD_PROGRESS_MODULE_PV}"
+
+# http_headers_more (https://github.com/agentzh/headers-more-nginx-module, BSD license)
+HTTP_HEADERS_MORE_MODULE_PV="0.32"
+HTTP_HEADERS_MORE_MODULE_P="ngx_http_headers_more-${HTTP_HEADERS_MORE_MODULE_PV}"
+HTTP_HEADERS_MORE_MODULE_URI="https://github.com/agentzh/headers-more-nginx-module/archive/v${HTTP_HEADERS_MORE_MODULE_PV}.tar.gz"
+HTTP_HEADERS_MORE_MODULE_WD="${WORKDIR}/headers-more-nginx-module-${HTTP_HEADERS_MORE_MODULE_PV}"
+
+# http_cache_purge (http://labs.frickle.com/nginx_ngx_cache_purge/, https://github.com/FRiCKLE/ngx_cache_purge, BSD-2 license)
+HTTP_CACHE_PURGE_MODULE_PV="2.3"
+HTTP_CACHE_PURGE_MODULE_P="ngx_http_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+HTTP_CACHE_PURGE_MODULE_URI="http://labs.frickle.com/files/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}.tar.gz"
+HTTP_CACHE_PURGE_MODULE_WD="${WORKDIR}/ngx_cache_purge-${HTTP_CACHE_PURGE_MODULE_PV}"
+
+# http_slowfs_cache (http://labs.frickle.com/nginx_ngx_slowfs_cache/, BSD-2 license)
+HTTP_SLOWFS_CACHE_MODULE_PV="1.10"
+HTTP_SLOWFS_CACHE_MODULE_P="ngx_http_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+HTTP_SLOWFS_CACHE_MODULE_URI="http://labs.frickle.com/files/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}.tar.gz"
+HTTP_SLOWFS_CACHE_MODULE_WD="${WORKDIR}/ngx_slowfs_cache-${HTTP_SLOWFS_CACHE_MODULE_PV}"
+
+# http_fancyindex (https://github.com/aperezdc/ngx-fancyindex, BSD license)
+HTTP_FANCYINDEX_MODULE_PV="0.4.2"
+HTTP_FANCYINDEX_MODULE_P="ngx_http_fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+HTTP_FANCYINDEX_MODULE_URI="https://github.com/aperezdc/ngx-fancyindex/archive/v${HTTP_FANCYINDEX_MODULE_PV}.tar.gz"
+HTTP_FANCYINDEX_MODULE_WD="${WORKDIR}/ngx-fancyindex-${HTTP_FANCYINDEX_MODULE_PV}"
+
+# http_lua (https://github.com/openresty/lua-nginx-module, BSD license)
+HTTP_LUA_MODULE_PV="0.10.10"
+HTTP_LUA_MODULE_P="ngx_http_lua-${HTTP_LUA_MODULE_PV}"
+HTTP_LUA_MODULE_URI="https://github.com/openresty/lua-nginx-module/archive/v${HTTP_LUA_MODULE_PV}.tar.gz"
+HTTP_LUA_MODULE_WD="${WORKDIR}/lua-nginx-module-${HTTP_LUA_MODULE_PV}"
+
+# http_auth_pam (https://github.com/stogh/ngx_http_auth_pam_module/, http://web.iti.upv.es/~sto/nginx/, BSD-2 license)
+HTTP_AUTH_PAM_MODULE_PV="1.5.1"
+HTTP_AUTH_PAM_MODULE_P="ngx_http_auth_pam-${HTTP_AUTH_PAM_MODULE_PV}"
+HTTP_AUTH_PAM_MODULE_URI="https://github.com/stogh/ngx_http_auth_pam_module/archive/v${HTTP_AUTH_PAM_MODULE_PV}.tar.gz"
+HTTP_AUTH_PAM_MODULE_WD="${WORKDIR}/ngx_http_auth_pam_module-${HTTP_AUTH_PAM_MODULE_PV}"
+
+# http_upstream_check (https://github.com/yaoweibin/nginx_upstream_check_module, BSD license)
+HTTP_UPSTREAM_CHECK_MODULE_PV="31b1b42873fa56620d8a873ac13f5f26b52d0cd6"
+HTTP_UPSTREAM_CHECK_MODULE_P="ngx_http_upstream_check-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+HTTP_UPSTREAM_CHECK_MODULE_URI="https://github.com/yaoweibin/nginx_upstream_check_module/archive/${HTTP_UPSTREAM_CHECK_MODULE_PV}.tar.gz"
+HTTP_UPSTREAM_CHECK_MODULE_WD="${WORKDIR}/nginx_upstream_check_module-${HTTP_UPSTREAM_CHECK_MODULE_PV}"
+
+# http_metrics (https://github.com/zenops/ngx_metrics, BSD license)
+HTTP_METRICS_MODULE_PV="0.1.1"
+HTTP_METRICS_MODULE_P="ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+HTTP_METRICS_MODULE_URI="https://github.com/madvertise/ngx_metrics/archive/v${HTTP_METRICS_MODULE_PV}.tar.gz"
+HTTP_METRICS_MODULE_WD="${WORKDIR}/ngx_metrics-${HTTP_METRICS_MODULE_PV}"
+
+# naxsi-core (https://github.com/nbs-system/naxsi, GPLv2+)
+HTTP_NAXSI_MODULE_PV="0.55.3"
+HTTP_NAXSI_MODULE_P="ngx_http_naxsi-${HTTP_NAXSI_MODULE_PV}"
+HTTP_NAXSI_MODULE_URI="https://github.com/nbs-system/naxsi/archive/${HTTP_NAXSI_MODULE_PV}.tar.gz"
+HTTP_NAXSI_MODULE_WD="${WORKDIR}/naxsi-${HTTP_NAXSI_MODULE_PV}/naxsi_src"
+
+# nginx-rtmp-module (https://github.com/arut/nginx-rtmp-module, BSD license)
+RTMP_MODULE_PV="1.2.0"
+RTMP_MODULE_P="ngx_rtmp-${RTMP_MODULE_PV}"
+RTMP_MODULE_URI="https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_MODULE_PV}.tar.gz"
+RTMP_MODULE_WD="${WORKDIR}/nginx-rtmp-module-${RTMP_MODULE_PV}"
+
+# nginx-dav-ext-module (https://github.com/arut/nginx-dav-ext-module, BSD license)
+HTTP_DAV_EXT_MODULE_PV="0.1.0"
+HTTP_DAV_EXT_MODULE_P="ngx_http_dav_ext-${HTTP_DAV_EXT_MODULE_PV}"
+HTTP_DAV_EXT_MODULE_URI="https://github.com/arut/nginx-dav-ext-module/archive/v${HTTP_DAV_EXT_MODULE_PV}.tar.gz"
+HTTP_DAV_EXT_MODULE_WD="${WORKDIR}/nginx-dav-ext-module-${HTTP_DAV_EXT_MODULE_PV}"
+
+# echo-nginx-module (https://github.com/openresty/echo-nginx-module, BSD license)
+HTTP_ECHO_MODULE_PV="0.61"
+HTTP_ECHO_MODULE_P="ngx_http_echo-${HTTP_ECHO_MODULE_PV}"
+HTTP_ECHO_MODULE_URI="https://github.com/openresty/echo-nginx-module/archive/v${HTTP_ECHO_MODULE_PV}.tar.gz"
+HTTP_ECHO_MODULE_WD="${WORKDIR}/echo-nginx-module-${HTTP_ECHO_MODULE_PV}"
+
+# mod_security for nginx (https://modsecurity.org/, Apache-2.0)
+# keep the MODULE_P here consistent with upstream to avoid tarball duplication
+HTTP_SECURITY_MODULE_PV="2.9.2"
+HTTP_SECURITY_MODULE_P="modsecurity-${HTTP_SECURITY_MODULE_PV}"
+HTTP_SECURITY_MODULE_URI="https://www.modsecurity.org/tarball/${HTTP_SECURITY_MODULE_PV}/${HTTP_SECURITY_MODULE_P}.tar.gz"
+HTTP_SECURITY_MODULE_WD="${WORKDIR}/${HTTP_SECURITY_MODULE_P}"
+
+# push-stream-module (http://www.nginxpushstream.com, https://github.com/wandenberg/nginx-push-stream-module, GPL-3)
+HTTP_PUSH_STREAM_MODULE_PV="0.5.2"
+HTTP_PUSH_STREAM_MODULE_P="ngx_http_push_stream-${HTTP_PUSH_STREAM_MODULE_PV}"
+HTTP_PUSH_STREAM_MODULE_URI="https://github.com/wandenberg/nginx-push-stream-module/archive/${HTTP_PUSH_STREAM_MODULE_PV}.tar.gz"
+HTTP_PUSH_STREAM_MODULE_WD="${WORKDIR}/nginx-push-stream-module-${HTTP_PUSH_STREAM_MODULE_PV}"
+
+# sticky-module (https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng, BSD-2)
+HTTP_STICKY_MODULE_PV="1.2.6-10-g08a395c66e42"
+HTTP_STICKY_MODULE_P="nginx_http_sticky_module_ng-${HTTP_STICKY_MODULE_PV}"
+HTTP_STICKY_MODULE_URI="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng/get/${HTTP_STICKY_MODULE_PV}.tar.bz2"
+HTTP_STICKY_MODULE_WD="${WORKDIR}/nginx-goodies-nginx-sticky-module-ng-08a395c66e42"
+
+# mogilefs-module (https://github.com/vkholodkov/nginx-mogilefs-module, BSD-2)
+HTTP_MOGILEFS_MODULE_PV="1.0.4"
+HTTP_MOGILEFS_MODULE_P="ngx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+HTTP_MOGILEFS_MODULE_URI="https://github.com/vkholodkov/nginx-mogilefs-module/archive/${HTTP_MOGILEFS_MODULE_PV}.tar.gz"
+HTTP_MOGILEFS_MODULE_WD="${WORKDIR}/nginx_mogilefs_module-${HTTP_MOGILEFS_MODULE_PV}"
+
+# memc-module (https://github.com/openresty/memc-nginx-module, BSD-2)
+HTTP_MEMC_MODULE_PV="0.18"
+HTTP_MEMC_MODULE_P="ngx_memc_module-${HTTP_MEMC_MODULE_PV}"
+HTTP_MEMC_MODULE_URI="https://github.com/openresty/memc-nginx-module/archive/v${HTTP_MEMC_MODULE_PV}.tar.gz"
+HTTP_MEMC_MODULE_WD="${WORKDIR}/memc-nginx-module-${HTTP_MEMC_MODULE_PV}"
+
+# nginx-ldap-auth-module (https://github.com/kvspb/nginx-auth-ldap, BSD-2)
+HTTP_LDAP_MODULE_PV="49a8b4d28fc4a518563c82e0b52821e5f37db1fc"
+HTTP_LDAP_MODULE_P="nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+HTTP_LDAP_MODULE_URI="https://github.com/kvspb/nginx-auth-ldap/archive/${HTTP_LDAP_MODULE_PV}.tar.gz"
+HTTP_LDAP_MODULE_WD="${WORKDIR}/nginx-auth-ldap-${HTTP_LDAP_MODULE_PV}"
+
+# We handle deps below ourselves
+SSL_DEPS_SKIP=1
+AUTOTOOLS_AUTO_DEPEND="no"
+
+inherit autotools ssl-cert toolchain-funcs perl-module flag-o-matic user systemd versionator multilib
+
+DESCRIPTION="Robust, small and high performance http and reverse proxy server"
+HOMEPAGE="https://nginx.org"
+SRC_URI="https://nginx.org/download/${P}.tar.gz
+	${DEVEL_KIT_MODULE_URI} -> ${DEVEL_KIT_MODULE_P}.tar.gz
+	nginx_modules_http_upload_progress? ( ${HTTP_UPLOAD_PROGRESS_MODULE_URI} -> ${HTTP_UPLOAD_PROGRESS_MODULE_P}.tar.gz )
+	nginx_modules_http_headers_more? ( ${HTTP_HEADERS_MORE_MODULE_URI} -> ${HTTP_HEADERS_MORE_MODULE_P}.tar.gz )
+	nginx_modules_http_cache_purge? ( ${HTTP_CACHE_PURGE_MODULE_URI} -> ${HTTP_CACHE_PURGE_MODULE_P}.tar.gz )
+	nginx_modules_http_slowfs_cache? ( ${HTTP_SLOWFS_CACHE_MODULE_URI} -> ${HTTP_SLOWFS_CACHE_MODULE_P}.tar.gz )
+	nginx_modules_http_fancyindex? ( ${HTTP_FANCYINDEX_MODULE_URI} -> ${HTTP_FANCYINDEX_MODULE_P}.tar.gz )
+	nginx_modules_http_lua? ( ${HTTP_LUA_MODULE_URI} -> ${HTTP_LUA_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_pam? ( ${HTTP_AUTH_PAM_MODULE_URI} -> ${HTTP_AUTH_PAM_MODULE_P}.tar.gz )
+	nginx_modules_http_upstream_check? ( ${HTTP_UPSTREAM_CHECK_MODULE_URI} -> ${HTTP_UPSTREAM_CHECK_MODULE_P}.tar.gz )
+	nginx_modules_http_metrics? ( ${HTTP_METRICS_MODULE_URI} -> ${HTTP_METRICS_MODULE_P}.tar.gz )
+	nginx_modules_http_naxsi? ( ${HTTP_NAXSI_MODULE_URI} -> ${HTTP_NAXSI_MODULE_P}.tar.gz )
+	rtmp? ( ${RTMP_MODULE_URI} -> ${RTMP_MODULE_P}.tar.gz )
+	nginx_modules_http_dav_ext? ( ${HTTP_DAV_EXT_MODULE_URI} -> ${HTTP_DAV_EXT_MODULE_P}.tar.gz )
+	nginx_modules_http_echo? ( ${HTTP_ECHO_MODULE_URI} -> ${HTTP_ECHO_MODULE_P}.tar.gz )
+	nginx_modules_http_security? ( ${HTTP_SECURITY_MODULE_URI} -> ${HTTP_SECURITY_MODULE_P}.tar.gz )
+	nginx_modules_http_push_stream? ( ${HTTP_PUSH_STREAM_MODULE_URI} -> ${HTTP_PUSH_STREAM_MODULE_P}.tar.gz )
+	nginx_modules_http_sticky? ( ${HTTP_STICKY_MODULE_URI} -> ${HTTP_STICKY_MODULE_P}.tar.bz2 )
+	nginx_modules_http_mogilefs? ( ${HTTP_MOGILEFS_MODULE_URI} -> ${HTTP_MOGILEFS_MODULE_P}.tar.gz )
+	nginx_modules_http_memc? ( ${HTTP_MEMC_MODULE_URI} -> ${HTTP_MEMC_MODULE_P}.tar.gz )
+	nginx_modules_http_auth_ldap? ( ${HTTP_LDAP_MODULE_URI} -> ${HTTP_LDAP_MODULE_P}.tar.gz )"
+
+LICENSE="BSD-2 BSD SSLeay MIT GPL-2 GPL-2+
+	nginx_modules_http_security? ( Apache-2.0 )
+	nginx_modules_http_push_stream? ( GPL-3 )"
+
+SLOT="mainline"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# Package doesn't provide a real test suite
+RESTRICT="test"
+
+NGINX_MODULES_STD="access auth_basic autoindex browser charset empty_gif
+	fastcgi geo gzip limit_req limit_conn map memcached mirror proxy
+	referer rewrite scgi ssi split_clients upstream_hash
+	upstream_ip_hash upstream_keepalive upstream_least_conn
+	upstream_zone userid uwsgi"
+NGINX_MODULES_OPT="addition auth_request dav degradation flv geoip gunzip
+	gzip_static image_filter mp4 perl random_index realip secure_link
+	slice stub_status sub xslt"
+NGINX_MODULES_STREAM_STD="access geo limit_conn map return split_clients
+	upstream_hash upstream_least_conn upstream_zone"
+NGINX_MODULES_STREAM_OPT="geoip realip ssl_preread"
+NGINX_MODULES_MAIL="imap pop3 smtp"
+NGINX_MODULES_3RD="
+	http_upload_progress
+	http_headers_more
+	http_cache_purge
+	http_slowfs_cache
+	http_fancyindex
+	http_lua
+	http_auth_pam
+	http_upstream_check
+	http_metrics
+	http_naxsi
+	http_dav_ext
+	http_echo
+	http_security
+	http_push_stream
+	http_sticky
+	http_mogilefs
+	http_memc
+	http_auth_ldap"
+
+IUSE="aio debug +http +http2 +http-cache +ipv6 libatomic libressl luajit +pcre
+	pcre-jit rtmp selinux ssl threads userland_GNU vim-syntax"
+
+for mod in $NGINX_MODULES_STD; do
+	IUSE="${IUSE} +nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_OPT; do
+	IUSE="${IUSE} nginx_modules_http_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_STD; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_STREAM_OPT; do
+	IUSE="${IUSE} nginx_modules_stream_${mod}"
+done
+
+for mod in $NGINX_MODULES_MAIL; do
+	IUSE="${IUSE} nginx_modules_mail_${mod}"
+done
+
+for mod in $NGINX_MODULES_3RD; do
+	IUSE="${IUSE} nginx_modules_${mod}"
+done
+
+# Add so we can warn users updating about config changes
+# @TODO: jbergstroem: remove on next release series
+IUSE="${IUSE} nginx_modules_http_spdy"
+
+CDEPEND="
+	pcre? ( dev-libs/libpcre:= )
+	pcre-jit? ( dev-libs/libpcre:=[jit] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http2? (
+		!libressl? ( >=dev-libs/openssl-1.0.1c:0= )
+		libressl? ( dev-libs/libressl:= )
+	)
+	http-cache? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_geoip? ( dev-libs/geoip )
+	nginx_modules_http_gunzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip? ( sys-libs/zlib )
+	nginx_modules_http_gzip_static? ( sys-libs/zlib )
+	nginx_modules_http_image_filter? ( media-libs/gd:=[jpeg,png] )
+	nginx_modules_http_perl? ( >=dev-lang/perl-5.8:= )
+	nginx_modules_http_rewrite? ( dev-libs/libpcre:= )
+	nginx_modules_http_secure_link? (
+		userland_GNU? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+		)
+	)
+	nginx_modules_http_xslt? ( dev-libs/libxml2:= dev-libs/libxslt )
+	nginx_modules_http_lua? ( !luajit? ( dev-lang/lua:0= ) luajit? ( dev-lang/luajit:2= ) )
+	nginx_modules_http_auth_pam? ( virtual/pam )
+	nginx_modules_http_metrics? ( dev-libs/yajl:= )
+	nginx_modules_http_dav_ext? ( dev-libs/expat )
+	nginx_modules_http_security? (
+		dev-libs/apr:=
+		dev-libs/apr-util:=
+		dev-libs/libxml2:=
+		net-misc/curl
+		www-servers/apache
+	)
+	nginx_modules_http_auth_ldap? ( net-nds/openldap[ssl?] )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-nginx )
+	!www-servers/nginx:0"
+DEPEND="${CDEPEND}
+	nginx_modules_http_security? ( ${AUTOTOOLS_DEPEND} )
+	arm? ( dev-libs/libatomic_ops )
+	libatomic? ( dev-libs/libatomic_ops )"
+PDEPEND="vim-syntax? ( app-vim/nginx-syntax )"
+
+REQUIRED_USE="pcre-jit? ( pcre )
+	nginx_modules_http_lua? ( nginx_modules_http_rewrite )
+	nginx_modules_http_naxsi? ( pcre )
+	nginx_modules_http_dav_ext? ( nginx_modules_http_dav )
+	nginx_modules_http_metrics? ( nginx_modules_http_stub_status )
+	nginx_modules_http_security? ( pcre )
+	nginx_modules_http_push_stream? ( ssl )"
+
+pkg_setup() {
+	NGINX_HOME="/var/lib/nginx"
+	NGINX_HOME_TMP="${NGINX_HOME}/tmp"
+
+	ebegin "Creating nginx user and group"
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 "${NGINX_HOME}" ${PN}
+	eend $?
+
+	if use libatomic; then
+		ewarn "GCC 4.1+ features built-in atomic operations."
+		ewarn "Using libatomic_ops is only needed if using"
+		ewarn "a different compiler or a GCC prior to 4.1"
+	fi
+
+	if [[ -n $NGINX_ADD_MODULES ]]; then
+		ewarn "You are building custom modules via \$NGINX_ADD_MODULES!"
+		ewarn "This nginx installation is not supported!"
+		ewarn "Make sure you can reproduce the bug without those modules"
+		ewarn "_before_ reporting bugs."
+	fi
+
+	if use !http; then
+		ewarn "To actually disable all http-functionality you also have to disable"
+		ewarn "all nginx http modules."
+	fi
+
+	if use nginx_modules_http_mogilefs && use threads; then
+		eerror "mogilefs won't compile with threads support."
+		eerror "Please disable either flag and try again."
+		die "Can't compile mogilefs with threads support"
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.4.1-fix-perl-install-path.patch"
+	eapply "${FILESDIR}/${PN}-httpoxy-mitigation-r1.patch"
+
+	if use nginx_modules_http_upstream_check; then
+		#eapply -p0 "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/check_1.11.1+.patch
+		eapply -p0 "${FILESDIR}"/http_upstream_check-nginx-1.11.5+.patch
+	fi
+
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		eautoreconf
+
+		if use luajit ; then
+			sed -i \
+				-e 's|^\(LUA_PKGNAMES\)=.*|\1="luajit"|' \
+				configure || die
+		fi
+
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_upload_progress; then
+		cd "${HTTP_UPLOAD_PROGRESS_MODULE_WD}" || die
+		eapply "${FILESDIR}"/http_uploadprogress-issue_50-r1.patch
+		cd "${S}" || die
+	fi
+
+	find auto/ -type f -print0 | xargs -0 sed -i 's:\&\& make:\&\& \\$(MAKE):' || die
+	# We have config protection, don't rename etc files
+	sed -i 's:.default::' auto/install || die
+	# remove useless files
+	sed -i -e '/koi-/d' -e '/win-/d' auto/install || die
+
+	# don't install to /etc/nginx/ if not in use
+	local module
+	for module in fastcgi scgi uwsgi ; do
+		if ! use nginx_modules_http_${module}; then
+			sed -i -e "/${module}/d" auto/install || die
+		fi
+	done
+
+	eapply_user
+}
+
+src_configure() {
+	# mod_security needs to generate nginx/modsecurity/config before including it
+	if use nginx_modules_http_security; then
+		cd "${HTTP_SECURITY_MODULE_WD}" || die
+
+		./configure \
+			--enable-standalone-module \
+			--disable-mlogc \
+			--with-ssdeep=no \
+			$(use_enable pcre-jit) \
+			$(use_with nginx_modules_http_lua lua) || die "configure failed for mod_security"
+
+		cd "${S}" || die
+	fi
+
+	local myconf=() http_enabled= mail_enabled= stream_enabled=
+
+	use aio       && myconf+=( --with-file-aio )
+	use debug     && myconf+=( --with-debug )
+	use http2     && myconf+=( --with-http_v2_module )
+	use libatomic && myconf+=( --with-libatomic )
+	use pcre      && myconf+=( --with-pcre )
+	use pcre-jit  && myconf+=( --with-pcre-jit )
+	use threads   && myconf+=( --with-threads )
+
+	# HTTP modules
+	for mod in $NGINX_MODULES_STD; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+		else
+			myconf+=( --without-http_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_OPT; do
+		if use nginx_modules_http_${mod}; then
+			http_enabled=1
+			myconf+=( --with-http_${mod}_module )
+		fi
+	done
+
+	if use nginx_modules_http_fastcgi; then
+		myconf+=( --with-http_realip_module )
+	fi
+
+	# third-party modules
+	if use nginx_modules_http_upload_progress; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPLOAD_PROGRESS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_headers_more; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_HEADERS_MORE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_CACHE_PURGE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SLOWFS_CACHE_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_FANCYINDEX_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_lua; then
+		http_enabled=1
+		if use luajit; then
+			export LUAJIT_LIB=$(pkg-config --variable libdir luajit)
+			export LUAJIT_INC=$(pkg-config --variable includedir luajit)
+		else
+			export LUA_LIB=$(pkg-config --variable libdir lua)
+			export LUA_INC=$(pkg-config --variable includedir lua)
+		fi
+		myconf+=( --add-module=${DEVEL_KIT_MODULE_WD} )
+		myconf+=( --add-module=${HTTP_LUA_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_AUTH_PAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_UPSTREAM_CHECK_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_metrics; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_METRICS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_naxsi ; then
+		http_enabled=1
+		myconf+=(  --add-module=${HTTP_NAXSI_MODULE_WD} )
+	fi
+
+	if use rtmp ; then
+		http_enabled=1
+		myconf+=( --add-module=${RTMP_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_dav_ext ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_DAV_EXT_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_echo ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_ECHO_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_security ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_SECURITY_MODULE_WD}/nginx/modsecurity )
+	fi
+
+	if use nginx_modules_http_push_stream ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_PUSH_STREAM_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_sticky ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_STICKY_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_mogilefs ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MOGILEFS_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_memc ; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_MEMC_MODULE_WD} )
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		http_enabled=1
+		myconf+=( --add-module=${HTTP_LDAP_MODULE_WD} )
+	fi
+
+	if use http || use http-cache || use http2; then
+		http_enabled=1
+	fi
+
+	if [ $http_enabled ]; then
+		use http-cache || myconf+=( --without-http-cache )
+		use ssl && myconf+=( --with-http_ssl_module )
+	else
+		myconf+=( --without-http --without-http-cache )
+	fi
+
+	# Stream modules
+	for mod in $NGINX_MODULES_STREAM_STD; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+		else
+			myconf+=( --without-stream_${mod}_module )
+		fi
+	done
+
+	for mod in $NGINX_MODULES_STREAM_OPT; do
+		if use nginx_modules_stream_${mod}; then
+			stream_enabled=1
+			myconf+=( --with-stream_${mod}_module )
+		fi
+	done
+
+	if [ $stream_enabled ]; then
+		myconf+=( --with-stream )
+		use ssl && myconf+=( --with-stream_ssl_module )
+	fi
+
+	# MAIL modules
+	for mod in $NGINX_MODULES_MAIL; do
+		if use nginx_modules_mail_${mod}; then
+			mail_enabled=1
+		else
+			myconf+=( --without-mail_${mod}_module )
+		fi
+	done
+
+	if [ $mail_enabled ]; then
+		myconf+=( --with-mail )
+		use ssl && myconf+=( --with-mail_ssl_module )
+	fi
+
+	# custom modules
+	for mod in $NGINX_ADD_MODULES; do
+		myconf+=(  --add-module=${mod} )
+	done
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	tc-export CC
+
+	if ! use prefix; then
+		myconf+=( --user=${PN} )
+		myconf+=( --group=${PN} )
+	fi
+
+	local WITHOUT_IPV6=
+	if ! use ipv6; then
+		WITHOUT_IPV6=" -DNGX_HAVE_INET6=0"
+	fi
+
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--conf-path="${EPREFIX}"/etc/${PN}/${PN}.conf \
+		--error-log-path="${EPREFIX}"/var/log/${PN}/error_log \
+		--pid-path="${EPREFIX}"/run/${PN}.pid \
+		--lock-path="${EPREFIX}"/run/lock/${PN}.lock \
+		--with-cc-opt="-I${EROOT}usr/include${WITHOUT_IPV6}" \
+		--with-ld-opt="-L${EROOT}usr/$(get_libdir)" \
+		--http-log-path="${EPREFIX}"/var/log/${PN}/access_log \
+		--http-client-body-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/client \
+		--http-proxy-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/proxy \
+		--http-fastcgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/fastcgi \
+		--http-scgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/scgi \
+		--http-uwsgi-temp-path="${EPREFIX}${NGINX_HOME_TMP}"/uwsgi \
+		--with-compat \
+		"${myconf[@]}" || die "configure failed"
+
+	# A purely cosmetic change that makes nginx -V more readable. This can be
+	# good if people outside the gentoo community would troubleshoot and
+	# question the users setup.
+	sed -i -e "s|${WORKDIR}|external_module|g" objs/ngx_auto_config.h || die
+}
+
+src_compile() {
+	use nginx_modules_http_security && emake -C "${HTTP_SECURITY_MODULE_WD}"
+
+	# https://bugs.gentoo.org/286772
+	export LANG=C LC_ALL=C
+	emake LINK="${CC} ${LDFLAGS}" OTHERLDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake DESTDIR="${D%/}" install
+
+	cp "${FILESDIR}"/nginx.conf-r2 "${ED}"etc/nginx/nginx.conf || die
+
+	newinitd "${FILESDIR}"/nginx.initd-r4 nginx
+	newconfd "${FILESDIR}"/nginx.confd nginx
+
+	systemd_newunit "${FILESDIR}"/nginx.service-r1 nginx.service
+
+	doman man/nginx.8
+	dodoc CHANGES* README
+
+	# just keepdir. do not copy the default htdocs files (bug #449136)
+	keepdir /var/www/localhost
+	rm -rf "${D}"usr/html || die
+
+	# set up a list of directories to keep
+	local keepdir_list="${NGINX_HOME_TMP}"/client
+	local module
+	for module in proxy fastcgi scgi uwsgi; do
+		use nginx_modules_http_${module} && keepdir_list+=" ${NGINX_HOME_TMP}/${module}"
+	done
+
+	keepdir /var/log/nginx ${keepdir_list}
+
+	# this solves a problem with SELinux where nginx doesn't see the directories
+	# as root and tries to create them as nginx
+	fperms 0750 "${NGINX_HOME_TMP}"
+	fowners ${PN}:0 "${NGINX_HOME_TMP}"
+
+	fperms 0700 ${keepdir_list}
+	fowners ${PN}:${PN} ${keepdir_list}
+
+	fperms 0710 /var/log/nginx
+	fowners 0:${PN} /var/log/nginx
+
+	# logrotate
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/nginx.logrotate-r1 nginx
+
+	if use nginx_modules_http_perl; then
+		cd "${S}"/objs/src/http/modules/perl/ || die
+		emake DESTDIR="${D}" INSTALLDIRS=vendor
+		perl_delete_localpod
+		cd "${S}" || die
+	fi
+
+	if use nginx_modules_http_cache_purge; then
+		docinto ${HTTP_CACHE_PURGE_MODULE_P}
+		dodoc "${HTTP_CACHE_PURGE_MODULE_WD}"/{CHANGES,README.md,TODO.md}
+	fi
+
+	if use nginx_modules_http_slowfs_cache; then
+		docinto ${HTTP_SLOWFS_CACHE_MODULE_P}
+		dodoc "${HTTP_SLOWFS_CACHE_MODULE_WD}"/{CHANGES,README.md}
+	fi
+
+	if use nginx_modules_http_fancyindex; then
+		docinto ${HTTP_FANCYINDEX_MODULE_P}
+		dodoc "${HTTP_FANCYINDEX_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_lua; then
+		docinto ${HTTP_LUA_MODULE_P}
+		dodoc "${HTTP_LUA_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_pam; then
+		docinto ${HTTP_AUTH_PAM_MODULE_P}
+		dodoc "${HTTP_AUTH_PAM_MODULE_WD}"/{README.md,ChangeLog}
+	fi
+
+	if use nginx_modules_http_upstream_check; then
+		docinto ${HTTP_UPSTREAM_CHECK_MODULE_P}
+		dodoc "${HTTP_UPSTREAM_CHECK_MODULE_WD}"/{README,CHANGES}
+	fi
+
+	if use nginx_modules_http_naxsi; then
+		insinto /etc/nginx
+		doins "${HTTP_NAXSI_MODULE_WD}"/../naxsi_config/naxsi_core.rules
+	fi
+
+	if use rtmp; then
+		docinto ${RTMP_MODULE_P}
+		dodoc "${RTMP_MODULE_WD}"/{AUTHORS,README.md,stat.xsl}
+	fi
+
+	if use nginx_modules_http_dav_ext; then
+		docinto ${HTTP_DAV_EXT_MODULE_P}
+		dodoc "${HTTP_DAV_EXT_MODULE_WD}"/README.rst
+	fi
+
+	if use nginx_modules_http_echo; then
+		docinto ${HTTP_ECHO_MODULE_P}
+		dodoc "${HTTP_ECHO_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_security; then
+		docinto ${HTTP_SECURITY_MODULE_P}
+		dodoc "${HTTP_SECURITY_MODULE_WD}"/{CHANGES,README.TXT,authors.txt}
+	fi
+
+	if use nginx_modules_http_push_stream; then
+		docinto ${HTTP_PUSH_STREAM_MODULE_P}
+		dodoc "${HTTP_PUSH_STREAM_MODULE_WD}"/{AUTHORS,CHANGELOG.textile,README.textile}
+	fi
+
+	if use nginx_modules_http_sticky; then
+		docinto ${HTTP_STICKY_MODULE_P}
+		dodoc "${HTTP_STICKY_MODULE_WD}"/{README.md,Changelog.txt,docs/sticky.pdf}
+	fi
+
+	if use nginx_modules_http_memc; then
+		docinto ${HTTP_MEMC_MODULE_P}
+		dodoc "${HTTP_MEMC_MODULE_WD}"/README.markdown
+	fi
+
+	if use nginx_modules_http_auth_ldap; then
+		docinto ${HTTP_LDAP_MODULE_P}
+		dodoc "${HTTP_LDAP_MODULE_WD}"/example.conf
+	fi
+}
+
+pkg_postinst() {
+	if use ssl; then
+		if [[ ! -f "${EROOT}"etc/ssl/${PN}/${PN}.key ]]; then
+			install_cert /etc/ssl/${PN}/${PN}
+			use prefix || chown ${PN}:${PN} "${EROOT}"etc/ssl/${PN}/${PN}.{crt,csr,key,pem}
+		fi
+	fi
+
+	if use nginx_modules_http_spdy; then
+		ewarn ""
+		ewarn "In nginx 1.9.5 the spdy module was superseded by http2."
+		ewarn "Update your configs and package.use accordingly."
+	fi
+
+	if use nginx_modules_http_lua; then
+		ewarn ""
+		ewarn "While you can build lua 3rd party module against ${P}"
+		ewarn "the author warns that >=${PN}-1.11.11 is still not an"
+		ewarn "officially supported target yet. You are on your own."
+		ewarn "Expect runtime failures, memory leaks and other problems!"
+	fi
+
+	if use nginx_modules_http_lua && use http2; then
+		ewarn ""
+		ewarn "Lua 3rd party module author warns against using ${P} with"
+		ewarn "NGINX_MODULES_HTTP=\"lua http2\". For more info, see http://git.io/OldLsg"
+	fi
+
+	local _n_permission_layout_checks=0
+	local _has_to_adjust_permissions=0
+	local _has_to_show_permission_warning=0
+
+	# Defaults to 1 to inform people doing a fresh installation
+	# that we ship modified {scgi,uwsgi,fastcgi}_params files
+	local _has_to_show_httpoxy_mitigation_notice=1
+
+	local _replacing_version=
+	for _replacing_version in ${REPLACING_VERSIONS}; do
+		_n_permission_layout_checks=$((${_n_permission_layout_checks}+1))
+
+		if [[ ${_n_permission_layout_checks} -gt 1 ]]; then
+			# Should never happen:
+			# Package is abusing slots but doesn't allow multiple parallel installations.
+			# If we run into this situation it is unsafe to automatically adjust any
+			# permission...
+			_has_to_show_permission_warning=1
+
+			ewarn "Replacing multiple ${PN}' versions is unsupported! " \
+				"You will have to adjust permissions on your own."
+
+			break
+		fi
+
+		local _replacing_version_branch=$(get_version_component_range 1-2 "${_replacing_version}")
+		debug-print "Updating an existing installation (v${_replacing_version}; branch '${_replacing_version_branch}') ..."
+
+		# Do we need to adjust permissions to fix CVE-2013-0337 (bug #458726, #469094)?
+		# This was before we introduced multiple nginx versions so we
+		# do not need to distinguish between stable and mainline
+		local _need_to_fix_CVE2013_0337=1
+
+		if version_is_at_least "1.4.1-r2" "${_replacing_version}"; then
+			# We are updating an installation which should already be fixed
+			_need_to_fix_CVE2013_0337=0
+			debug-print "Skipping CVE-2013-0337 ... existing installation should not be affected!"
+		else
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2013-0337!"
+		fi
+
+		# Do we need to inform about HTTPoxy mitigation?
+		# In repository since commit 8be44f76d4ac02cebcd1e0e6e6284bb72d054b0f
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_show_httpoxy_mitigation_notice=1
+			debug-print "Need to inform about HTTPoxy mitigation!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.1-r2"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.3-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that the user has
+					# already seen the HTTPoxy mitigation notice because he/she is doing
+					# an update from previous version where we have already shown
+					# the warning. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation where we already informed
+				# that we are mitigating HTTPoxy per default
+				_has_to_show_httpoxy_mitigation_notice=0
+				debug-print "No need to inform about HTTPoxy mitigation ... information was already shown for existing installation!"
+			else
+				_has_to_show_httpoxy_mitigation_notice=1
+				debug-print "Need to inform about HTTPoxy mitigation!"
+			fi
+		fi
+
+		# Do we need to adjust permissions to fix CVE-2016-1247 (bug #605008)?
+		# All branches up to 1.11 are affected
+		local _need_to_fix_CVE2016_1247=1
+
+		if ! version_is_at_least "1.10" "${_replacing_version_branch}"; then
+			# Updating from <1.10
+			_has_to_adjust_permissions=1
+			debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+		else
+			# Updating from >=1.10
+			local _fixed_in_pvr=
+			case "${_replacing_version_branch}" in
+				"1.10")
+					_fixed_in_pvr="1.10.2-r3"
+					;;
+				"1.11")
+					_fixed_in_pvr="1.11.6-r1"
+					;;
+				*)
+					# This should be any future branch.
+					# If we run this code it is safe to assume that we have already
+					# adjusted permissions or were never affected because user is
+					# doing an update from previous version which was safe or did
+					# the adjustments. Otherwise, we wouldn't hit this code path ...
+					_fixed_in_pvr=
+			esac
+
+			if [[ -z "${_fixed_in_pvr}" ]] || version_is_at_least "${_fixed_in_pvr}" "${_replacing_version}"; then
+				# We are updating an installation which should already be adjusted
+				# or which was never affected
+				_need_to_fix_CVE2016_1247=0
+				debug-print "Skipping CVE-2016-1247 ... existing installation should not be affected!"
+			else
+				_has_to_adjust_permissions=1
+				debug-print "Need to adjust permissions to fix CVE-2016-1247!"
+			fi
+		fi
+	done
+
+	if [[ ${_has_to_adjust_permissions} -eq 1 ]]; then
+		# We do not DIE when chmod/chown commands are failing because
+		# package is already merged on user's system at this stage
+		# and we cannot retry without losing the information that
+		# the existing installation needs to adjust permissions.
+		# Instead we are going to a show a big warning ...
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2013_0337} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The world-readable bit (if set) has been removed from the"
+			ewarn "following directories to mitigate a security bug"
+			ewarn "(CVE-2013-0337, bug #458726):"
+			ewarn ""
+			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn "  ${EPREFIX%/}${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi}"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			ewarn "Furthermore nginx' temp directories got moved to '${EPREFIX%/}${NGINX_HOME_TMP}'"
+			chmod o-rwx \
+				"${EPREFIX%/}"/var/log/nginx \
+				"${EPREFIX%/}"${NGINX_HOME_TMP}/{,client,proxy,fastcgi,scgi,uwsgi} || \
+				_has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 0 ]] && [[ ${_need_to_fix_CVE2016_1247} -eq 1 ]]; then
+			ewarn ""
+			ewarn "The permissions on the following directory have been reset in"
+			ewarn "order to mitigate a security bug (CVE-2016-1247, bug #605008):"
+			ewarn ""
+			ewarn "  ${EPREFIX%/}/var/log/nginx"
+			ewarn ""
+			ewarn "Check if this is correct for your setup before restarting nginx!"
+			ewarn "Also ensure that no other log directory used by any of your"
+			ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+			ewarn "used by nginx can be abused to escalate privileges!"
+			ewarn "This is a one-time change and will not happen on subsequent updates."
+			chown 0:nginx "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+			chmod 710 "${EPREFIX%/}"/var/log/nginx || _has_to_show_permission_warning=1
+		fi
+
+		if [[ ${_has_to_show_permission_warning} -eq 1 ]]; then
+			# Should never happen ...
+			ewarn ""
+			ewarn "*************************************************************"
+			ewarn "***************         W A R N I N G         ***************"
+			ewarn "*************************************************************"
+			ewarn "The one-time only attempt to adjust permissions of the"
+			ewarn "existing nginx installation failed. Be aware that we will not"
+			ewarn "try to adjust the same permissions again because now you are"
+			ewarn "using a nginx version where we expect that the permissions"
+			ewarn "are already adjusted or that you know what you are doing and"
+			ewarn "want to keep custom permissions."
+			ewarn ""
+		fi
+	fi
+
+	# Sanity check for CVE-2016-1247
+	# Required to warn users who received the warning above and thought
+	# they could fix it by unmerging and re-merging the package or have
+	# unmerged a affected installation on purpose in the past leaving
+	# /var/log/nginx on their system due to keepdir/non-empty folder
+	# and are now installing the package again.
+	local _sanity_check_testfile=$(mktemp --dry-run "${EPREFIX%/}"/var/log/nginx/.CVE-2016-1247.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_sanity_check_testfile}" nginx >&/dev/null
+	if [ $? -eq 0 ] ; then
+		# Cleanup -- no reason to die here!
+		rm -f "${_sanity_check_testfile}"
+
+		ewarn ""
+		ewarn "*************************************************************"
+		ewarn "***************         W A R N I N G         ***************"
+		ewarn "*************************************************************"
+		ewarn "Looks like your installation is vulnerable to CVE-2016-1247"
+		ewarn "(bug #605008) because nginx user is able to create files in"
+		ewarn ""
+		ewarn "  ${EPREFIX%/}/var/log/nginx"
+		ewarn ""
+		ewarn "Also ensure that no other log directory used by any of your"
+		ewarn "vhost(s) is not writeable for nginx user. Any of your log files"
+		ewarn "used by nginx can be abused to escalate privileges!"
+	fi
+
+	if [[ ${_has_to_show_httpoxy_mitigation_notice} -eq 1 ]]; then
+		# HTTPoxy mitigation
+		ewarn ""
+		ewarn "This nginx installation comes with a mitigation for the HTTPoxy"
+		ewarn "vulnerability for FastCGI, SCGI and uWSGI applications by setting"
+		ewarn "the HTTP_PROXY parameter to an empty string per default when you"
+		ewarn "are sourcing one of the default"
+		ewarn ""
+		ewarn "  - 'fastcgi_params' or 'fastcgi.conf'"
+		ewarn "  - 'scgi_params'"
+		ewarn "  - 'uwsgi_params'"
+		ewarn ""
+		ewarn "files in your server block(s)."
+		ewarn ""
+		ewarn "If this is causing any problems for you make sure that you are sourcing the"
+		ewarn "default parameters _before_ you set your own values."
+		ewarn "If you are relying on user-supplied proxy values you have to remove the"
+		ewarn "correlating lines from the file(s) mentioned above."
+		ewarn ""
+	fi
+}
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 1280937c7b60..9d9dedcc8655 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -2,8 +2,10 @@ AUX tomcat-7.0.79-build.xml.patch 5271 SHA256 e680116c918918aafdec9dd7d022c9d8bf
 AUX tomcat-7.0.81-build.xml.patch 5271 SHA256 e680116c918918aafdec9dd7d022c9d8bfca63f7b0b19904c8ab2c92bc61e1b8 SHA512 160c0117e89a2ef5caae95004b426d155c64e19e6c708a9cc11a53308cba037799a60e4f901c3a5bb5af2d2ca8452246d7dd66283b91fad4a339004026148fe4 WHIRLPOOL 6a04f539b5c5798f8014b1e044eec682c61deac904fd1c9cb5d859c12c89f9191ac4a904f68644ecba1ccbd01f9c668540811f35bacf03415d81175c79109116
 AUX tomcat-8.0.45-build.xml.patch 10753 SHA256 e1d6ca8eb6cbdb172d8d99d6d4d95b2d72d5f0d7275db80589e39fbb6fb60993 SHA512 205d25cc93712f255021bed6d544a3a5a71fb7367756851b71fdb59696368eab6960085e9abe9337699359cd3ddc55c595e1242bac8675a3f6a666aaf4e7c351 WHIRLPOOL 4e658dd4bc8d5719ee5a26136055f970e74906358989619397b7cb94e34c80c800d3c357dd60a4c7be2d035b490472bfd9f426177cbefe8f57d7bd32a58a7f49
 AUX tomcat-8.0.46-build.xml.patch 10753 SHA256 e1d6ca8eb6cbdb172d8d99d6d4d95b2d72d5f0d7275db80589e39fbb6fb60993 SHA512 205d25cc93712f255021bed6d544a3a5a71fb7367756851b71fdb59696368eab6960085e9abe9337699359cd3ddc55c595e1242bac8675a3f6a666aaf4e7c351 WHIRLPOOL 4e658dd4bc8d5719ee5a26136055f970e74906358989619397b7cb94e34c80c800d3c357dd60a4c7be2d035b490472bfd9f426177cbefe8f57d7bd32a58a7f49
+AUX tomcat-8.0.47-build.xml.patch 10703 SHA256 10984417cbee6b878839a8d6a5224e27616aa90f8ec1a5a029e11239a970d937 SHA512 ffea8c47e066573571050130f1c6fd03e18af872f814d9bb23c1f0866ae8184039828500c1fd7d5c8186a47625baa3c9db3653608e31d19fc110129d32262001 WHIRLPOOL e0dc2715ee8e167115f7d3ce5574b0e15515e411c31f2965dbf5e3f4a3fd37ce1bfdb93014174dbd1d23ad9fd65b71d5b5d5728a779c44468558ec752cd58ee0
 AUX tomcat-8.5.20-build.xml.patch 10369 SHA256 73f7cbe2f8ab48308cba515b209b4f9fa29803e93e1c980e0385355736cb100c SHA512 571e53427840be6c5a20b94239f7288c3b276190f8d4cf7a33a3b67c54cf9879f0a810c7a09abc4712228c21366bf83642c984234e472fb7a6c6bcc0faba66a0 WHIRLPOOL e5dc309194fe0f5f8c60dae438a64317925195c52ac484bfad79fb7011a9e54cb65931062bdfb5a951fec4b6a8f00f40432dc9df41624d02e83bd3cef91f9e4b
-AUX tomcat-9.0.0_alpha26-build.xml.patch 10381 SHA256 edea97610d66367e66b6562b28773eda4ae45dfd3266769e3f0f1358231a87f8 SHA512 89a3413671b6b1446fd203798124395d12c50ced414fe773aa511bff4b147e3167694f11ec94da69494ad7bafcc182c7da7b38f5ed81af2477b9d3bfb7dab4b2 WHIRLPOOL fbdd8bb8ffad81849d6bba057cdd77bd4e09a22cdf12e241de26338051228df0e268509e7524f05fc3e262b0e24a484db2125b1210e59db0f68270f53acce83b
+AUX tomcat-8.5.23-build.xml.patch 10323 SHA256 58e11d7538e48507503eb7256b9e05bbb48d48740e8f9a6a05dfe8e496ef7c87 SHA512 1d322b74acb363310566d6f5c35f83326c6504a8a75721f24536db0d650104765d6402f454843c38f816eb8f290ccd0273b559116ea62df433bd59a38ec29b72 WHIRLPOOL 29f053fcf35585e7c3a90b352fb4ffc489515bfb74db5f4905de7797518f1fce2f076f26ab4fcec632fc4333f5636b3723e4afe6c3b5c64a8bff24eff0f4a5be
+AUX tomcat-9.0.1_beta-build.xml.patch 10319 SHA256 c2d296495529774fbb143fc5cef93c828ed17e45637b72905c17142eb6d37211 SHA512 cdfd3c04b1f4014d44be7d6af40bcc959120af78d4a1976ec17434da72fd514e4c4c18b9e21e1e67134db74c2465f51094cf5962da4807a6e8ac2086564fcbfb WHIRLPOOL a0d1b2317c9c44f0225e71e8a3d88a0a6b3d84c0973c0e2814ed61e18754109e903b24c538fd3ade1d34f1ea852745305918ef50ecd0b58eadc7e99ce807a817
 AUX tomcat-instance-manager-r1.bash 6451 SHA256 28990e664007e6eab91d1f90f58009457f683c4c9d37ef78f9065b4b6c87add2 SHA512 3c8f994519d1ca5ff24229798786ad3d75dd20dbf8b3b81f6c0ccd121b978d2cb12633270f463a39ed5c4097e5869b1a4bfbf867994a64c5e41916e378038570 WHIRLPOOL 3be20ac95b1b2e80d62cecbd5e47d0b7c768e78ec38c5ec5661e4d563962196eb45fae82d54349a9202323f5a464ac922930b1b01e197ed6e83f03a3d38f79af
 AUX tomcat-instance-manager-r2.bash 6999 SHA256 cdd0465eac2ba108f4b10dec6331c1660b2bdaa5d379cd2964b3c6118646fe1b SHA512 c30c156cbf2b53cf8498288bacaedd48872dce52f461ff32071310b438bdb5015c1cd1d512a2905c4db01e2b22342590e1b8aeadbd44f29062606fabbb2f2fed WHIRLPOOL 468db420f25653111bd20fa49df780187fa117661d5d884f5e1a5f010b22208bea295ec1d7b15b6d6b1cf777334a1e5ab1b6bc133e654837f4ce51266a03d0fb
 AUX tomcat-r1.init 3200 SHA256 dda32538287e0075e10857b1e60b0be5b5c8db55849fda753d39ed346c808377 SHA512 3d32e2ad998adfbaea5fe0ffcbbe6659dcb530a110faed5f2712ae2fd767353b1fc3f1ac83a24d43138c1bfc55949e645833a428ab982be14415887fc46d9fab WHIRLPOOL 4281ce1b7e05f19ebb47ae27eb4ed07fca535617122326ddbb0a8ed69121bac30c33a247681157620c7f8b536adda5cd7b611a23b98bfda326f080815cd38a27
@@ -12,14 +14,18 @@ DIST apache-tomcat-7.0.79-src.tar.gz 4682119 SHA256 b5373951afe41ffd27348bb57cff
 DIST apache-tomcat-7.0.81-src.tar.gz 4689428 SHA256 fca79afb210cfbc8f9ebcdebdd048ecb7ea370ac0f94040cbcc0287fe5d85e66 SHA512 25e237aa7189cf9a9617badf8936fd7ec64550bcac3bab2e2afe51d5e199eddfe17e0d6d27ac7ebf3543d1601467fcd8362ddf9a5b708c50b223d7c8d18bbb3b WHIRLPOOL 1016a02b4a30b7e02eb2f7fad3080153012dd3e3f84df34d006c89bc2c89b7b3d370334800170008482d3dbf339c62f249064eb48ab24ca17588026ba515d487
 DIST apache-tomcat-8.0.45-src.tar.gz 4978313 SHA256 450fd2890b12e56692cb203f95651f9a873dce056b7b4362e142bc817032b291 SHA512 80e4281f5b6e4d6bf607179840bc6cb923ea9f57ec8231a451c3b5a1f8938f72ec1097290059afba0ef7b56edeb56d63636849517b69b91c7093cb15ff0eaa04 WHIRLPOOL c893cd5c26637f8881c19353e269145e33fa11e02eb10ef93a41590ad2e1e6c6ffa1b3f6c3c7c318630765f666be07447fd3a21c70c2c381e75c458b60383ea0
 DIST apache-tomcat-8.0.46-src.tar.gz 4985079 SHA256 b5b9e560b3f75dd68b3103915c754ac47cf526f26f18cd6e9baba9580be25161 SHA512 9adbea9faf61f782ede1c657e833dea55ad1b4a874a1eb9801eab82ac9999de847e7f08ff7a49b3389b9d0683d185c6d4981f9f8d2f607f68c077a682af508d5 WHIRLPOOL eafb2768555261836b04f12f95ba2755d2a7ef98754a5a009099e377220dff1251c6ad1cbe672764787c485b3f922bf1fda8db663890db36e356e7a5139b83e9
+DIST apache-tomcat-8.0.47-src.tar.gz 4996505 SHA256 a2e34a707f1d2ab03aae194db2aed7aa525e62ee3cd648e7058bee49ac1b578c SHA512 135de73b8ca7d4003fcecc19a17a8a86ab85fc1054e89638d26e57263249438d8e8aebfca0a2791eaec2bc835baa57e6a05b60e11595aa373fdc03e278b31702 WHIRLPOOL 7add2b564ca9dfac647cd8338ef90229dd61e97d2ad7420f883c98b62760952904ad170f72029153da592a6f2c8c003d7229b4b32a1e870b6e7c2c99d34566c8
 DIST apache-tomcat-8.5.20-src.tar.gz 5063310 SHA256 6bc40ae61b77906325bf8bdb2b0767aeb96f4c5a7a9b618aa496db59387d6610 SHA512 dea3095792de76a3a56bd6fd6c9ed5702ca539856d0e07a5de2600f456e7255929d14748a2dc9b3c626b3a67aaac8795ef3f5a6a1351991a0e89443e0c9d0807 WHIRLPOOL 1924f12c5068574424587d5b8b7261efb7496dbc53915d8cb2558b4a643aedecc98823ac7dec238fe7cb1a1874734e05de2dc6b7b28e48ffdae9e8c5c586e895
-DIST apache-tomcat-9.0.0.M26-src.tar.gz 5011957 SHA256 02ba2c9a3a2d78994fc14f2b304c3b3f46615538a48a9193e475b08565cb9b7e SHA512 8c25932aa244edb46eee26aa837636e78c8104ca6617cb5ba924e0e45c2f9dbcd7d196ddf69ee2f1c1b6053dda818a3b92f8f46c156f3048c46cee919fc22c13 WHIRLPOOL 11e00a6e6a5822bd4e357e375b026dd732bf33319e30dde25f11bc1b99994617be3ce6d4976870f725e56646e5ffee92acb6fc23f46b53a46ebbf6c53707ea07
+DIST apache-tomcat-8.5.23-src.tar.gz 5086043 SHA256 eaaf35752841356dec976fa6250cd71680b8b5b9c0bdf4df9a86ac38630bcbd4 SHA512 2848331553f2c1bc51a4113960c6fe7e2beddf9146341dbfde1a27e2232802cfc364c8e8b988ae862371ca1a3be34665a56a28be9eadf80f8b317e0e2525cbef WHIRLPOOL 77b35de4ede2beecab71dcd7c5494bded1516deac4b5c2cbd2f48e1ae728cfa41f4193369bd464946869e9ba4565c0e6f1c7ad57578459d3be67159ea8cd9a64
+DIST apache-tomcat-9.0.1-src.tar.gz 5029499 SHA256 f4da8ef7a03dd7280a9a4b6c66cc9bd34dddc6429c33d9db1a8acfc1596c4e90 SHA512 6116b05f448c24e691c4b56372a41cfd8900adc5e759f2f5026c808de48d65705763236fca46f69321d351f37f5dbc7aa49db8c097b8a3155e367fe21aa0d384 WHIRLPOOL 2e0f05001b9f0d57a241db8ddf0212d3adce2c1b829a03318b5cc1b5a250ae32a50d801e23d9b6a2943c208a478dd00d1f5ae07d1c3c736fbf059554a40caf66
 EBUILD tomcat-7.0.79.ebuild 4277 SHA256 6fe27e4ad83139012dfc38a223f41fa92386d11444e2e661ca3aecc3bcbde66d SHA512 587c011ceac66d3f8cd7789ce891c9ccf9cfed8a8dcbddf8a2b62db48f5f481c6406ceb1645a1288fa07892409ddbb255b45f8c3edadb8eda55e4bce53800dfc WHIRLPOOL 5da2e08c809c4d73dedd1feab499420434db0b4493e885a662cadecaca91059d328cc59b39ef2edb867cc783f70d3c72e69790a381fc44da6f12323d99a6cc44
 EBUILD tomcat-7.0.81.ebuild 4278 SHA256 2564c796b7c24c58dcf6f76c98a4ece41668427d198303b51189cbf4afd592bb SHA512 c09066b72cefed346687999a52f7243a1fd050ecef0cbd8bd0dc6d5f5f758ff815fd4eb0009c5ea3591b792a90a20010a4b0517fbc504a320f06b97834d59404 WHIRLPOOL 428304d9afe8c9f8f781cd31f64bdb502b1f9561b06d7c0cab9671d345df57b61b5f06f6d5bebf58271031cee2314aaa3956d56ba7a8a6bcf88a314c7a50208a
 EBUILD tomcat-8.0.45.ebuild 4469 SHA256 018b246f0f044399fa8f54111f824e055110bbcbec3a2a025298c228b635836a SHA512 71536b2dc1d12ccc4c5756014ffe78b4849cf237405c21c667a2484106962a3be05a9299723b30b611f552c8f9315c1542e3ea1ea6ae9eb4f8b3b42817fe6e14 WHIRLPOOL 06876a98afabcbf64d988738eb9172d0545f97f2cca24f5f04f18c29c4d6e7dcb9057d429f6c658a5a06f6d3f6697d0447c8286e71e5cd049766f4cde1078a2c
-EBUILD tomcat-8.0.46.ebuild 4472 SHA256 1730ca77b5ada123b193b4a0cd23c409efdcfe0fcf847160ad7eb9165390870c SHA512 6eb897fb6fd1692b778bb8c80ea2e879690aee6d12af0db1b1dbd3a8fbdb01443af9e404694a35613a3be68e53ecbe5b259cc06feeee94c10d8460495d36c620 WHIRLPOOL 0feb0864162ab3a5c246a7aeb1fa313a42af3e6df7ee803f2bfd1154aa5a464f1c5d7f54d048d8346862e0e59f62ffc559b6af2901852512efa5c79959f87d93
+EBUILD tomcat-8.0.46.ebuild 4471 SHA256 82d5b04ffe2da0c759191927680cd957fc13f43f93102932fb6d47a50d0abc18 SHA512 e97bc0a73e8a1384c30915d42e1cfcfa4431ae63dccf85b997c30333a464b3042ec5aee48678c2dbcb045d30532d7aa17ec00ecff14f0d8d7caeaeff9cd3f5b2 WHIRLPOOL 030fcb6a46a5235bae11331c1df56bdfe0407c71d205023d0f2ebfb373eec76116e4bea5a6f1f539bc93657224510b6c6d94231cba0a4046b7d11df1d5407e1d
+EBUILD tomcat-8.0.47.ebuild 4472 SHA256 1730ca77b5ada123b193b4a0cd23c409efdcfe0fcf847160ad7eb9165390870c SHA512 6eb897fb6fd1692b778bb8c80ea2e879690aee6d12af0db1b1dbd3a8fbdb01443af9e404694a35613a3be68e53ecbe5b259cc06feeee94c10d8460495d36c620 WHIRLPOOL 0feb0864162ab3a5c246a7aeb1fa313a42af3e6df7ee803f2bfd1154aa5a464f1c5d7f54d048d8346862e0e59f62ffc559b6af2901852512efa5c79959f87d93
 EBUILD tomcat-8.5.20.ebuild 4493 SHA256 6676d000efae3a0cbda2cd292f39777355a50bcd17c42df67540b806cac37b69 SHA512 a66ec0c604c03d3cb4f3c411153ee828edadc74be3779a4860db47b0c51d5e20d8747846117f823f0ce1d5a97ae85e410e6d37a97a25cd0a18ac032946ece344 WHIRLPOOL 2a95579aae815556c51dd931885f113b72bf7865be5807cb976030415709f491c7bfee4a0ebde9fcb077cdfc12f48a542d1ce1302dcda78f8175c5268d7f60cf
-EBUILD tomcat-9.0.0_alpha26.ebuild 4529 SHA256 e0a0f85ec6a225faa2b340358390bf12627e729823a19f49fe9917751ca71fc5 SHA512 404e670d0387a392dc28b79efaa630f5885c16baa83225e227a29b0f0f73abb5546347d73c80f3b28a96bdea43de2e5d0c9b6cf03bf474025dbbb0a4b9f6eece WHIRLPOOL 1c23029392c630909649f6fbfadc1ee138bd915f1498bb021dce53d840ca280df2c9207272fc964db456950cdbd23eb43296c06ae074c99bdf384f3e15a52310
+EBUILD tomcat-8.5.23.ebuild 4520 SHA256 bb23067433f566b429ebd54da35f7508bed1b8a8bd3565d12166f1424a434ddb SHA512 2c50bbd367df38f7214d3bb04606e5a5f10f68a2d305a939477f2686d26ff4b9596dd4703a9979179919ad9ee9f034db2dc7dff5d0fba0c0b75b00abe6c3c918 WHIRLPOOL 6e2bb7b4b5db2089b17935f30ca6004a43c3cebf4a0ccb389f0e800f8d19210560cd9fe290441abd824ebf073c336c26e1e6e4406d5b257f7bf0b11761693872
+EBUILD tomcat-9.0.1_beta.ebuild 4526 SHA256 7889045f013d59737195eacaef638eb104389ea23f169eeedec95cfb69fe0fc7 SHA512 3e2de06a64f56d72999eb75834c7905e7b9cf80d750843a404990de21b2a3b5a19a0e9bcee261abebc5e85a777070892a4764b49ad9af12900d88ff06ddc317d WHIRLPOOL 4602822e1b25247bc613693016d405926b71fa6737024ab1e6ae509b65d45cb9072af836d50d2303f6855134a3567204a9ddf9dc7bd041a0910f376b6f038f66
 MISC ChangeLog 23709 SHA256 69787b6934873b8d5181a4adabbae3837afd2b90ba9a1d97f05f1e237b689ec1 SHA512 95ca8b3a20e2d2a4e7faafb21aa172e2a9f2440d74a8e68c155b161912ae1cd480e522cf36c58356fe81a26ca9b07078654fd41b1f69ff3020a75465e4ad7895 WHIRLPOOL db15e61ff1f3856b4ee873a0bdedb0bba4ead6bd3cdf849a6f479166ad0c361208767fdcb448791a764f87515dc3b52a92aac23c34540ab0992dd8130455e129
 MISC ChangeLog-2015 86707 SHA256 573994c7c1bfb96c06a98636b5268a15ce73043b6903916365143eedc73b712b SHA512 d9c8bb2023377860f30ff0c9dbd83393c4569729cdc75506da6c7bdb320d69bb3ed65835746429ec73de02c683cf7bb7e667883ea7c6bd9ded17eeeec80ef071 WHIRLPOOL ccf7e8088ca9502b6dab16f12b804a314e62abfa95a2a0e734df0d805fb4c5fbaff6b72c922e6c5d58b8109d85d942f05ce1c52693bbdc3fc9041c21fdbe19cb
 MISC metadata.xml 735 SHA256 92d90d5e0f4ea5092c910632a7281ac937789b7da4860aa23c1d6cde68ea270c SHA512 f1f9894fadd399aa791d4b6befa1366ef2be350ff28bdfb9e24c9ff03de4f01c016c654dbd3b5bd23d0580d8515a3866a645aff0357ff37a177abfefe27158a6 WHIRLPOOL 3ae0d573a611a706342d9473584c840aa50710f2f76bd6785884f59789883aa65884eac137294bd5e27adba27e713c11f2dc976e383605de4560fc054d63245a
diff --git a/www-servers/tomcat/files/tomcat-8.0.47-build.xml.patch b/www-servers/tomcat/files/tomcat-8.0.47-build.xml.patch
new file mode 100644
index 000000000000..b0862aef305e
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.0.47-build.xml.patch
@@ -0,0 +1,258 @@
+diff --git a/apache-tomcat-8.0.47-src/build.xml b/apache-tomcat-8.0.47-src/build.xml
+index 6b4465a..ab4008d 100644
+--- a/apache-tomcat-8.0.47-src/build.xml
++++ b/apache-tomcat-8.0.47-src/build.xml
+@@ -715,24 +715,29 @@
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+     <!-- Servlet 3.1 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license" />
+-
++-->
+     <!-- JSP 2.3 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+ 
+     <!-- EL 3.0 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+ 
+     <!-- WebSocket 1.1 API JAR File -->
+     <jarIt jarfile="${websocket-api.jar}"
+@@ -1000,14 +1005,14 @@
+ 
+   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!--
+     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+ 
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1067,7 +1072,7 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
+-    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+ 
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+@@ -1101,7 +1106,7 @@
+     </javac>
+   </target>
+ 
+-  <target name="build-tomcat-jdbc" depends="package">
++  <target name="build-tomcat-jdbc" depends="package" unless="noget">
+     <!-- build the jdbc-pool jar and source jar-->
+     <echo message="Building Tomcat JDBC pool libraries"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1116,7 +1121,7 @@
+     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+   </target>
+ 
+-  <target name="build-tomcat-jdbc-src">
++  <target name="build-tomcat-jdbc-src" unless="noget">
+     <!-- build the jdbc-pool source jar-->
+     <echo message="Building Tomcat JDBC pool src JAR"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1220,9 +1225,11 @@
+ 
+     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+       failonerror="false"/>
+     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
++-->
+     <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
+ 
+     <!-- Note the meta-inf below will work as long as there is only one JAR
+@@ -1613,7 +1620,7 @@
+ 
+   <target name="extras-commons-logging-prepare"
+           depends="extras-prepare"
+-          description="Prepare to build web services extras package">
++          description="Prepare to build web services extras package" unless="noget">
+ 
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
+@@ -1752,7 +1759,7 @@
+ 
+   <target name="extras-webservices-prepare"
+           depends="extras-prepare"
+-          description="Prepare to build web services extras package">
++          description="Prepare to build web services extras package" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1947,6 +1954,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ 
+   <target name="javadoc" depends="dist-source,extras-webservices-prepare"
+     description="Create the Tomcat javadoc" >
++<!--
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
+       sourcepath="${tomcat.dist}/src/java"
+@@ -2008,6 +2016,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++-->
+     <javadoc packagenames="javax.websocket.*"
+       sourcepath="${tomcat.dist}/src/java"
+       destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -2046,9 +2055,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path refid="tomcat.webservices.classpath"/>
+         <path location="${ant.core.lib}"/>
+       </classpath>
++<!--
+       <link href="../servletapi"/>
+       <link href="../jspapi"/>
+       <link href="../elapi"/>
++-->
+       <link href="../websocketapi"/>
+       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+       <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2781,7 +2792,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-compile"
+-          description="Download (and build) components necessary to compile" >
++          description="Download (and build) components necessary to compile" unless="noget">
+ 
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2815,7 +2826,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-test-compile"
+-          description="Download additional components for the tests" >
++          description="Download additional components for the tests" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${junit.loc}"/>
+@@ -2872,7 +2883,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-dist"
+-          description="Download additional components for a distribution" >
++          description="Download additional components for a distribution" unless="noget">
+ 
+     <antcall target="downloadzip-2">
+       <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
+@@ -2898,18 +2909,18 @@ skip.installer property in build.properties" />
+ 
+   <!-- =============== Utility Targets to support downloads ================ -->
+ 
+-  <target name="setproxy" if="${proxy.use}">
++  <target name="setproxy" if="${proxy.use}" unless="noget">
+     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+   </target>
+ 
+-  <target name="testexist">
++  <target name="testexist" unless="noget">
+     <echo message="Testing  for ${destfile}"/>
+     <available file="${destfile}" property="exist"/>
+   </target>
+ 
+-  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2921,7 +2932,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadgz-2" unless="exist" depends="testexist">
++  <target name="downloadgz-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2940,7 +2951,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2951,7 +2962,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadzip-2" unless="exist" depends="testexist">
++  <target name="downloadzip-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2969,7 +2980,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+     <!-- Download the file -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2979,7 +2990,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="downloadfile-2" unless="exist" depends="testexist">
++  <target name="downloadfile-2" unless="noget" depends="testexist">
+     <!-- Download the file from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -3002,7 +3013,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="trydownload.check" depends="setproxy">
++  <target name="trydownload.check" depends="setproxy" unless="noget">
+     <condition property="trydownload.run">
+       <and>
+         <not>
+@@ -3013,7 +3024,7 @@ skip.installer property in build.properties" />
+     </condition>
+   </target>
+ 
+-  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+     <!-- Downloads a file if not yet downloaded and the source URL is available -->
+     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+   </target>
+@@ -3024,7 +3035,7 @@ skip.installer property in build.properties" />
+ 
+   <target name="ide-eclipse"
+           depends="download-compile, extras-webservices-prepare, download-test-compile"
+-          description="Prepares the source tree to be built in Eclipse">
++          description="Prepares the source tree to be built in Eclipse" unless="noget">
+ 
+     <!-- Copy the sample project files into the root directory -->
+     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-8.5.23-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.23-build.xml.patch
new file mode 100644
index 000000000000..d83440c0c4d6
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-8.5.23-build.xml.patch
@@ -0,0 +1,249 @@
+diff --git a/apache-tomcat-8.5.23-src/build.xml b/apache-tomcat-8.5.23-src/build.xml
+index b1b2666..263800c 100644
+--- a/apache-tomcat-8.5.23-src/build.xml
++++ b/apache-tomcat-8.5.23-src/build.xml
+@@ -714,24 +714,29 @@
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+     <!-- Servlet 3.1 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license" />
+-
++-->
+     <!-- JSP 2.3 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+ 
+     <!-- EL 3.0 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+ 
+     <!-- WebSocket 1.1 API JAR File -->
+     <jarIt jarfile="${websocket-api.jar}"
+@@ -1005,14 +1010,14 @@
+ 
+   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!--
+     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+ 
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1072,7 +1077,7 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
+-    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+ 
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+@@ -1106,7 +1111,7 @@
+     </javac>
+   </target>
+ 
+-  <target name="build-tomcat-jdbc" depends="package">
++  <target name="build-tomcat-jdbc" depends="package" unless="noget">
+     <!-- build the jdbc-pool jar and source jar-->
+     <echo message="Building Tomcat JDBC pool libraries"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1121,7 +1126,7 @@
+     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+   </target>
+ 
+-  <target name="build-tomcat-jdbc-src">
++  <target name="build-tomcat-jdbc-src" unless="noget">
+     <!-- build the jdbc-pool source jar-->
+     <echo message="Building Tomcat JDBC pool src JAR"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1225,9 +1230,11 @@
+ 
+     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+       failonerror="false"/>
+     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
++-->
+     <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
+ 
+     <!-- Note the meta-inf below will work as long as there is only one JAR
+@@ -1608,7 +1615,7 @@
+ 
+   <target name="extras-webservices-prepare"
+           depends="extras-prepare"
+-          description="Prepare to build web services extras package">
++          description="Prepare to build web services extras package" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1756,6 +1763,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ 
+   <target name="javadoc" depends="dist-source,extras-webservices-prepare"
+     description="Create the Tomcat javadoc" >
++<!--
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
+       sourcepath="${tomcat.dist}/src/java"
+@@ -1820,6 +1828,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++-->
+     <javadoc packagenames="javax.websocket.*"
+       sourcepath="${tomcat.dist}/src/java"
+       destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1860,9 +1869,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path refid="tomcat.webservices.classpath"/>
+         <path location="${ant.core.lib}"/>
+       </classpath>
++<!--
+       <link href="../servletapi"/>
+       <link href="../jspapi"/>
+       <link href="../elapi"/>
++-->
+       <link href="../websocketapi"/>
+       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+       <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2607,7 +2618,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-compile"
+-          description="Download (and build) components necessary to compile" >
++          description="Download (and build) components necessary to compile" unless="noget">
+ 
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2641,7 +2652,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-test-compile"
+-          description="Download additional components for the tests" >
++          description="Download additional components for the tests" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${junit.loc}"/>
+@@ -2698,7 +2709,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-dist"
+-          description="Download additional components for a distribution" >
++          description="Download additional components for a distribution" unless="noget">
+ 
+     <antcall target="downloadzip-2">
+       <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
+@@ -2724,18 +2735,18 @@ skip.installer property in build.properties" />
+ 
+   <!-- =============== Utility Targets to support downloads ================ -->
+ 
+-  <target name="setproxy" if="${proxy.use}">
++  <target name="setproxy" if="${proxy.use}" unless="noget">
+     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+   </target>
+ 
+-  <target name="testexist">
++  <target name="testexist" unless="noget">
+     <echo message="Testing  for ${destfile}"/>
+     <available file="${destfile}" property="exist"/>
+   </target>
+ 
+-  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2747,7 +2758,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadgz-2" unless="exist" depends="testexist">
++  <target name="downloadgz-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2766,7 +2777,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2777,7 +2788,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadzip-2" unless="exist" depends="testexist">
++  <target name="downloadzip-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2795,7 +2806,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+     <!-- Download the file -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2805,7 +2816,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="downloadfile-2" unless="exist" depends="testexist">
++  <target name="downloadfile-2" unless="noget" depends="testexist">
+     <!-- Download the file from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2828,7 +2839,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="trydownload.check" depends="setproxy">
++  <target name="trydownload.check" depends="setproxy" unless="noget">
+     <condition property="trydownload.run">
+       <and>
+         <not>
+@@ -2839,7 +2850,7 @@ skip.installer property in build.properties" />
+     </condition>
+   </target>
+ 
+-  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+     <!-- Downloads a file if not yet downloaded and the source URL is available -->
+     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+   </target>
+@@ -2850,7 +2861,7 @@ skip.installer property in build.properties" />
+ 
+   <target name="ide-eclipse"
+           depends="download-compile, extras-webservices-prepare, download-test-compile"
+-          description="Prepares the source tree to be built in Eclipse">
++          description="Prepares the source tree to be built in Eclipse" unless="noget">
+ 
+     <!-- Copy the sample project files into the root directory -->
+     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/files/tomcat-9.0.1_beta-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.1_beta-build.xml.patch
new file mode 100644
index 000000000000..3f55c285e230
--- /dev/null
+++ b/www-servers/tomcat/files/tomcat-9.0.1_beta-build.xml.patch
@@ -0,0 +1,249 @@
+diff --git a/apache-tomcat-9.0.1-src/build.xml b/apache-tomcat-9.0.1-src/build.xml
+index aa29b28..a9ac6bd 100644
+--- a/apache-tomcat-9.0.1-src/build.xml
++++ b/apache-tomcat-9.0.1-src/build.xml
+@@ -715,24 +715,30 @@
+       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
+ 
+     <!-- Servlet 4.0 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${servlet-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.servlet-api"
+       manifest="${tomcat.manifests}/servlet-api.jar.manifest"
+       notice="${tomcat.manifests}/servlet-api.jar.notice"
+       license="${tomcat.manifests}/servlet-api.jar.license" />
++-->
+ 
+     <!-- JSP 2.3 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${jsp-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.jsp-api"
+       manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
++-->
+ 
+     <!-- EL 3.0 Implementation JAR File -->
++<!--
+     <jarIt jarfile="${el-api.jar}"
+       filesDir="${tomcat.classes}"
+       filesId="files.el-api"
+       manifest="${tomcat.manifests}/el-api.jar.manifest" />
++-->
+ 
+     <!-- WebSocket 1.1 API JAR File -->
+     <jarIt jarfile="${websocket-api.jar}"
+@@ -1006,14 +1012,14 @@
+ 
+   <target name="deploy" depends="package,build-docs,build-tomcat-jdbc,compile-webapp-examples"
+           description="Default. Builds a working Tomcat instance">
+-
++<!--
+     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
+             file="${tomcat-native.tar.gz}" />
+     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
+             file="${commons-daemon.native.src.tgz}" />
+ 
+     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
+-
++-->
+     <!-- Copy scripts -->
+     <copy todir="${tomcat.build}/bin">
+       <fileset dir="bin">
+@@ -1073,7 +1079,7 @@
+         <exclude name="${jdt.jar.filename}"/>
+       </fileset>
+     </delete>
+-    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
++<!--    <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/> -->
+ 
+     <!-- Add sources for examples -->
+     <antcall target="examples-sources" />
+@@ -1107,7 +1113,7 @@
+     </javac>
+   </target>
+ 
+-  <target name="build-tomcat-jdbc" depends="package">
++  <target name="build-tomcat-jdbc" depends="package" unless="noget">
+     <!-- build the jdbc-pool jar and source jar-->
+     <echo message="Building Tomcat JDBC pool libraries"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1122,7 +1128,7 @@
+     <copy file="${tomcat-jdbc.jar}" todir="${tomcat.build}/lib"/>
+   </target>
+ 
+-  <target name="build-tomcat-jdbc-src">
++  <target name="build-tomcat-jdbc-src" unless="noget">
+     <!-- build the jdbc-pool source jar-->
+     <echo message="Building Tomcat JDBC pool src JAR"/>
+     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}"
+@@ -1226,9 +1232,11 @@
+ 
+     <copy file="${basedir}/LICENSE" todir="${tomcat.embed}" />
+     <copy file="${basedir}/NOTICE" todir="${tomcat.embed}" />
++<!--
+     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.embed}"
+       failonerror="false"/>
+     <copy file="${jdt.jar}" todir="${tomcat.embed}" />
++-->
+     <copy file="${annotations-api.jar}" todir="${tomcat.embed}" />
+ 
+     <!-- Note the meta-inf below will work as long as there is only one JAR
+@@ -1609,7 +1617,7 @@
+ 
+   <target name="extras-webservices-prepare"
+           depends="extras-prepare"
+-          description="Prepare to build web services extras package">
++          description="Prepare to build web services extras package" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
+@@ -1757,6 +1765,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+ 
+   <target name="javadoc" depends="dist-source,extras-webservices-prepare"
+     description="Create the Tomcat javadoc" >
++<!--
+     <javadoc packagenames="javax.servlet.*"
+       excludepackagenames="javax.servlet.jsp.*"
+       sourcepath="${tomcat.dist}/src/java"
+@@ -1821,6 +1830,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path location="${ant.core.lib}"/>
+       </classpath>
+     </javadoc>
++-->
+     <javadoc packagenames="javax.websocket.*"
+       sourcepath="${tomcat.dist}/src/java"
+       destdir="${tomcat.dist}/webapps/docs/websocketapi"
+@@ -1861,9 +1871,11 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
+         <path refid="tomcat.webservices.classpath"/>
+         <path location="${ant.core.lib}"/>
+       </classpath>
++<!--
+       <link href="../servletapi"/>
+       <link href="../jspapi"/>
+       <link href="../elapi"/>
++-->
+       <link href="../websocketapi"/>
+       <link href="http://docs.oracle.com/javase/7/docs/api/"/>
+       <link href="http://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
+@@ -2608,7 +2620,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-compile"
+-          description="Download (and build) components necessary to compile" >
++          description="Download (and build) components necessary to compile" unless="noget">
+ 
+     <antcall target="downloadfile-2">
+       <param name="sourcefile.1" value="${tomcat-native.loc.1}"/>
+@@ -2642,7 +2654,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-test-compile"
+-          description="Download additional components for the tests" >
++          description="Download additional components for the tests" unless="noget">
+ 
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${junit.loc}"/>
+@@ -2699,7 +2711,7 @@ skip.installer property in build.properties" />
+   </target>
+ 
+   <target name="download-dist"
+-          description="Download additional components for a distribution" >
++          description="Download additional components for a distribution" unless="noget">
+ 
+     <antcall target="downloadzip-2">
+       <param name="sourcefile.1" value="${tomcat-native.win.1}"/>
+@@ -2725,18 +2737,18 @@ skip.installer property in build.properties" />
+ 
+   <!-- =============== Utility Targets to support downloads ================ -->
+ 
+-  <target name="setproxy" if="${proxy.use}">
++  <target name="setproxy" if="${proxy.use}" unless="noget">
+     <setproxy proxyhost="${proxy.host}" proxyport="${proxy.port}"
+               proxyuser="${proxy.user}" proxypassword="${proxy.password}" />
+     <echo message="Using ${proxy.host}:${proxy.port} to download ${sourcefile}"/>
+   </target>
+ 
+-  <target name="testexist">
++  <target name="testexist" unless="noget">
+     <echo message="Testing  for ${destfile}"/>
+     <available file="${destfile}" property="exist"/>
+   </target>
+ 
+-  <target name="downloadgz" unless="exist" depends="testexist,setproxy">
++  <target name="downloadgz" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2748,7 +2760,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadgz-2" unless="exist" depends="testexist">
++  <target name="downloadgz-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2767,7 +2779,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}.tar.gz"/>
+   </target>
+ 
+-  <target name="downloadzip" unless="exist" depends="testexist,setproxy">
++  <target name="downloadzip" unless="noget" depends="testexist,setproxy">
+     <!-- Download and extract the package -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2778,7 +2790,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadzip-2" unless="exist" depends="testexist">
++  <target name="downloadzip-2" unless="noget" depends="testexist">
+     <!-- Download and extract the package from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2796,7 +2808,7 @@ skip.installer property in build.properties" />
+     <delete file="${temp.file}"/>
+   </target>
+ 
+-  <target name="downloadfile" unless="exist" depends="testexist,setproxy">
++  <target name="downloadfile" unless="noget" depends="testexist,setproxy">
+     <!-- Download the file -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2806,7 +2818,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="downloadfile-2" unless="exist" depends="testexist">
++  <target name="downloadfile-2" unless="noget" depends="testexist">
+     <!-- Download the file from the two alternative locations -->
+     <local name="temp.file"/>
+     <mkdir dir="${base.path}"/>
+@@ -2829,7 +2841,7 @@ skip.installer property in build.properties" />
+     <move file="${temp.file}" tofile="${destfile}"/>
+   </target>
+ 
+-  <target name="trydownload.check" depends="setproxy">
++  <target name="trydownload.check" depends="setproxy" unless="noget">
+     <condition property="trydownload.run">
+       <and>
+         <not>
+@@ -2840,7 +2852,7 @@ skip.installer property in build.properties" />
+     </condition>
+   </target>
+ 
+-  <target name="trydownload" if="trydownload.run" depends="trydownload.check">
++  <target name="trydownload" if="trydownload.run" depends="trydownload.check" unless="noget">
+     <!-- Downloads a file if not yet downloaded and the source URL is available -->
+     <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+   </target>
+@@ -2851,7 +2863,7 @@ skip.installer property in build.properties" />
+ 
+   <target name="ide-eclipse"
+           depends="download-compile, extras-webservices-prepare, download-test-compile"
+-          description="Prepares the source tree to be built in Eclipse">
++          description="Prepares the source tree to be built in Eclipse" unless="noget">
+ 
+     <!-- Copy the sample project files into the root directory -->
+     <copy file="${tomcat.home}/res/ide-support/eclipse/eclipse.project" tofile="${tomcat.home}/.project"/>
diff --git a/www-servers/tomcat/tomcat-8.0.46.ebuild b/www-servers/tomcat/tomcat-8.0.46.ebuild
index 424ec1de47d9..0275eef00644 100644
--- a/www-servers/tomcat/tomcat-8.0.46.ebuild
+++ b/www-servers/tomcat/tomcat-8.0.46.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="8"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="extra-webapps"
 
 RESTRICT="test" # can we run them on a production system?
diff --git a/www-servers/tomcat/tomcat-8.0.47.ebuild b/www-servers/tomcat/tomcat-8.0.47.ebuild
new file mode 100644
index 000000000000..424ec1de47d9
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.0.47.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/tomcat-servlet-api:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+	!<dev-java/tomcat-native-1.1.24
+	>=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=virtual/jdk-1.7
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup tomcat 265
+	enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
+
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+#	einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
diff --git a/www-servers/tomcat/tomcat-8.5.23.ebuild b/www-servers/tomcat/tomcat-8.5.23.ebuild
new file mode 100644
index 000000000000..b00d9e34c116
--- /dev/null
+++ b/www-servers/tomcat/tomcat-8.5.23.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_P="apache-${P}-src"
+
+DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="8.5"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="3.1"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	>=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+	!<dev-java/tomcat-native-1.1.24
+	>=virtual/jre-1.7"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=virtual/jdk-1.7
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup tomcat 265
+	enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
+
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+#	einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
diff --git a/www-servers/tomcat/tomcat-9.0.1_beta.ebuild b/www-servers/tomcat/tomcat-9.0.1_beta.ebuild
new file mode 100644
index 000000000000..4fc6821dab5a
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.1_beta.ebuild
@@ -0,0 +1,158 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit eutils java-pkg-2 java-ant-2 prefix user
+
+MY_PV="${PV/_beta/}"
+MY_P="apache-${PN}-${MY_PV}-src"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container"
+HOMEPAGE="http://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${MY_PV}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.5"
+SAPI_SLOT="4.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	=dev-java/tomcat-servlet-api-${PV}:${SAPI_SLOT}"
+RDEPEND="${COMMON_DEP}
+	!<dev-java/tomcat-native-1.1.24
+	>=virtual/jre-1.8"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=virtual/jdk-1.8
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup tomcat 265
+	enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
+
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar)"
+	java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+#	einfo "Please read https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
+}
diff --git a/x11-wm/lumina/Manifest b/x11-wm/lumina/Manifest
index cf257a89517d..7add4b196255 100644
--- a/x11-wm/lumina/Manifest
+++ b/x11-wm/lumina/Manifest
@@ -6,4 +6,4 @@ EBUILD lumina-1.2.0_p1.ebuild 1597 SHA256 e585aa7a6baac5442e94023d135bec5f78eff6
 EBUILD lumina-1.3.0_p1.ebuild 1464 SHA256 6e711c284a13f5c7b9599e1a2ec03a0ed60116f5cd8e9f9e9131832f91cd5274 SHA512 41eab50e8dfcb3d0fe9b8a599f4ff108f572ea93c06e2aa92fa80bfc38e1551f3d519467fb58bcdfd4eb7d8aa7318cca72d7a39140d9f4ee86eb6007200c03c8 WHIRLPOOL 252efa9cd9140240370dd0fa2322246fab1ced0f00e1880511cc46345353e7554c6d86375cf09ae0b0af923b8f7f463e0c9a51f59fe99dda9e70c55c71c4c47a
 EBUILD lumina-9999.ebuild 1388 SHA256 27fef91f532f765d9093b4f6d9058403b753f8c175897e7f0c2a198b632629b7 SHA512 3676f6aa70c001e6a9e04f44261dd669a5b5eb5bf2c8fd8625a1226804079339ecbf75d66ed61f0315fbf3951df39d036c76556c2221994653408dcbb2f369c3 WHIRLPOOL 34a651e9bf71cbb46aecdcd871dbf7891d88ebea31495b51485530f07445d266cc5a63f4f78fd5c9e4e46457c1aa18f6ba64dbcb28f09e354cabf1d6266a9847
 MISC ChangeLog 903 SHA256 b1b26b42764af12c8710a72f38f65da5021ad128b1127b34a5201198ec0d6dcb SHA512 f9ebd062b553ae8c644b723b05ff8db8936d8cf936ccd481954729f1a49c2cf45fc2742742f9091c15b553194e851b6a6b20be3b8867bf0c2c6be6f31420b253 WHIRLPOOL 3038057f792b98aeff7664198928e9ed3126feb82fd566c3e672abbef5a41557bd9ff5b28909b034db1befc6852f40cd21d569e2ce8305ff11526e2a4df5b2cb
-MISC metadata.xml 1905 SHA256 fb3cdf65447b03919cb1cb0b660788f5aa0a119f05adb028f6c499372d1d24fd SHA512 f266380a3f9d6c9efae5439041dd1f49fea1705a35f9423a185dfd0b9c224a8ea010fca5a138c1351f211c668f02895b62439db040c56b982e4343791fe16e5f WHIRLPOOL 2f85a84c22bf4843c7f6caf2945b773de31efeef718a7a2bd06ddc75b29d96965a7ee3bd133a2a175e12185ec6bff279605d6935c053b0f6314a71332a6ba6ed
+MISC metadata.xml 1959 SHA256 45fa6bb4b8c32add820b31c87d3e72dba94a3978c94bd819ab4bd93fddaec94c SHA512 05b50342a8ccfb076cdfd9f761162853d17d444323d364613b6bbfc7b0309d3afb0e7dfd33a5350babe6526c866596e5677bda54d219e3bcf57c96736bf83093 WHIRLPOOL 17515e587293bcec4564547f4ccad33b0c22c60d4130259e9148de062e0ef2e7d0495d98661d90eeafdadc31c3d8336e4c1289d5661a6be65421d5fe12f88b1c
diff --git a/x11-wm/lumina/metadata.xml b/x11-wm/lumina/metadata.xml
index 01658337651c..174a8f3dbc82 100644
--- a/x11-wm/lumina/metadata.xml
+++ b/x11-wm/lumina/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-<!-- maintainer-needed -->	
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+  </maintainer>
 	<use>
 		<flag name="desktop-utils">Build and install lumina's desktop-utils</flag>
 	</use>