gentoo resync : 16.11.2017

19 files changed, 258 insertions, 13 deletions

diff --git a/sys-apps/init-system-helpers/Manifest b/sys-apps/init-system-helpers/Manifest
index d71d5cd5ade4..9894ecce0f69 100644
--- a/sys-apps/init-system-helpers/Manifest
+++ b/sys-apps/init-system-helpers/Manifest
@@ -1,3 +1,3 @@
 DIST init-system-helpers_1.49.tar.xz 42660 SHA256 845ed218f1cb54d5b10ea850620e5b6b3905fb248163f97ad4670a55100cedae SHA512 bd612207e51e18a44f9c90e1e5b069ab39e06c776b8a0d6c9ecb367890d4a44ff02b3028418ac10a688782745331f39bb9299ba836f333b712e6fdd7ddc8da16 WHIRLPOOL edacb283ccbc33ead7dda578138831f3631c6bfdf4498a97c76a8929b61cb3ab48404effd36614fcdc36cccaa22dfed4ce1d7242289bdeff446d6e2dfbc1476a
-EBUILD init-system-helpers-1.49.ebuild 783 SHA256 e0d0bf291674d8218dc848bb799d661b21a649c97610eb8e1b1d1665a6636a34 SHA512 0ca9a953ecec9d07e54d64c598ee0b5bc346a77a6a17a7a85caa65a177de77c12e9639e4adc1537dd412998152aef46116b8cbe65dbb8d35ee0adc0b474eab7f WHIRLPOOL 7cfe313eb3927fa845ccfa6fb2f63bd8e1321bc166b8904f6340eb9d2de913417a675d45d40ccb8bfc426a11eb425e8f1c9983f43aa2b53973065162f488092f
+EBUILD init-system-helpers-1.49.ebuild 798 SHA256 58ea08972abdb05299e1d297a17296b1bf6fd589a0f005eea911c2f1d0f2aceb SHA512 f2a1b4d5214a2722ad3b48d36f546d394bac4b784b689c79289fed31f3e24cd63cb3597b27b014f127eb9ace2373e435d4d586962862757bba4ad904e9ad21e0 WHIRLPOOL 85c125166799b975255ecec8972946436ca5df5b80e9e59e5ca7c333ab33f0f02820d5bb916b392ddcbd4ef59eb000da1cf53302210dd524c3ddbc916a302241
 MISC metadata.xml 251 SHA256 19c92189b52ab81b016ed5b235b2ab63d5679ba744a12e638a8df967b6ba373f SHA512 307528de6c03f6a97b95e189cb88eab281d278ad8b09833cf8c6924fc88fc38b17179a47fc463dd809e5f077b3b2bc74640e28816e50ab712b1989364b9d3bf0 WHIRLPOOL 5a109cd25597841c90ef88052fd9e76ce0ff1b18abd9a24c1a44647f6af43a4863b6b00187b4b9b9ed47fde68b026235fc386e64b06f08f8615c98f47106f022
diff --git a/sys-apps/init-system-helpers/init-system-helpers-1.49.ebuild b/sys-apps/init-system-helpers/init-system-helpers-1.49.ebuild
index 1e20a0675067..540a0b31b766 100644
--- a/sys-apps/init-system-helpers/init-system-helpers-1.49.ebuild
+++ b/sys-apps/init-system-helpers/init-system-helpers-1.49.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/i/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ia64 ppc ppc64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index d4673e9c5597..8569acd935d8 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -2,11 +2,11 @@ AUX README.Gentoo 823 SHA256 3985fd1810f660ea1c1f2732f719b069b6934d62d8d9e8a0928
 AUX less.envd 47 SHA256 961d6e87eeb2b41d163def66718ee78d4b7c778dbe91b24c6764635b0ae1cdd7 SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674 WHIRLPOOL dbb1fbec8c6370a5feec2eecdb3e109e035f2f40c2a1d00672d7660d2058aaf0a104487e1ae8c06ecfb32161d4aa2aceed6194e60cacde3590974bbcb00511ba
 AUX lesspipe.sh 7797 SHA256 576331d742e19a8cec0adeba185bacb7b4b67f7fb93be9c52fa4701d3c5a0a94 SHA512 d7bbae07e8ddcae2981549f958daffc3750f3a343da37cd5e43df86b4dcab35c3121d7fa7b76d61dd457c972a888bcce1c85d01fa1e685aadf169d5541bb0d8b WHIRLPOOL 63a57b5dacf480680377ff67a285a893b3a3eeb7071159c2139c75af02aeb2a4c419ecf515d4ab16a2c0ac18612039c4dfb2225ac3540663eec7367e302ae6a0
 DIST less-487.tar.gz 318488 SHA256 f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706 SHA512 d31274fdada570fbc6706d7c52637d1accbd18ce947ec062e10b1624c251a8533c6638bc3a1d89d3c70a0c7b9c6d45740598bec9003f281d64c587b1f829125a WHIRLPOOL e1a6c5dc2ea17e57226083f022d3c39b8a9d17428b7aa15385138680e78fa1ee22800e216a40fe5aa0ca38ca4c0025792a2839031faabdf8f9384dec3c750f74
-DIST less-497.tar.gz 321341 SHA256 3a8260a485f85a8aada748559cc42d6e8261325fbcb7d32fff6e60ac837b3ff2 SHA512 8c0efb6e7f775cb0fde69f418b7a9218330b4f8dd1ab630dc75f833ab1658a1580cfd2f5a471b8cf9fb3a0c44d0b3052b09d95b4b166afef0500192cb028dde2 WHIRLPOOL 48c19985baf80c2c75a12a5348d8e3a701be84d816370db1993aeb39fc32ffcb6c8656863cd277f55d0e7596a4173a3d2aefad7d5150af5311ccaaba70895413
 DIST less-520.tar.gz 337959 SHA256 7b89ea8e605c242f792594ca81dc89979f3537d8cce578f628329c748004908b SHA512 67b51f4734a3b5a7871509110f87bbd6d1fa3068ad2d524adaa07b8917ff18a962b706cf5d55cf9800a39f9e583f21d0249837841d3c999babaaf5aa2bc4ff9d WHIRLPOOL 39e78c7a34b229978935c2e9b9013214caa7323a624fce83294c47ebff614e284a7c45072ab88bbf8ab69ee4dd2e87e59e4053687ae137c8a8a480027f72b0c3
+DIST less-529.tar.gz 339651 SHA256 dba42cd4c38174b7bd0d426d8a39df2be6bcc1ec18946a4642713290f6bf9a0b SHA512 902e3ed86161c5a9eb3c08567b6b702371b5c88a85ef0b21beada223eaa47e0abf4d4d166a4a7a195caef67509fa683d07d0b6a40b529d703ee26aa8910c360a WHIRLPOOL 9912cb93c37f3c32f0e6e8cba0d7ce24ecc7678c4e421b201db13159cc67bce38edc9e85dca3a2d5c967315deb6dcc7619f1629257cc104304ea6fda0d53a62a
 EBUILD less-487.ebuild 1440 SHA256 387fd47561a791fda5a06b659155abc842eecc64978cc53444d2576fbca67c35 SHA512 b7a1ee3d58a3ad29c3ef7d50f5f37c9fea7bbd0bf15a157f323ced895daf6a1aa31544374428df2ebd4e3385897e6721cf530b0c21de688e3cd0dee9c7e2939c WHIRLPOOL db87dbeb58f0cf81532abbc87a803083223776ab4200553163c361acdc20cf34bc4d8760e2f0db336eccd0ffc52e4900b096e8e48f1c9ed4c6d561a0a13e2260
-EBUILD less-497.ebuild 1406 SHA256 b3ba60da13b478f0bb1fcdeef6888fde140bce4e62ce798efcef1ec98c719635 SHA512 0d5ba92f026a3b2c11ad49ccf9ef2179416bd87cd9799ee803718d50a7178ed0c0272aeda72b079b79121d3b1562535c041b0332f4114f6bf22e8cf394602041 WHIRLPOOL 2320e79fbbd843578dbb63618a99ebd6c6075a8dc8a79c27580ecf32daec42f1d0aa13aff782be59670851ea60bc6ea8b9f837afcea323efae338a297af97e21
 EBUILD less-520.ebuild 1404 SHA256 9ae048b7097eecfdc5174498599006b8acc6778e44a43d939432a2a15df219e0 SHA512 10b5c220228b1adf41271de6d7ffc3b222ad2b417194b4f47f0d96f682b73dc0644c1a6ca6d8d8ca2e0712c05cf66d0fa19d0aa612e568d04c95cda763288ac5 WHIRLPOOL 12d6b206e9f8dc3035f62750aaeaf160701c16a64a7f5de70720d528bc63411124caebf754c01fb7d715ccde01a892f29b63252414a3f93041bf671d0a48b33e
+EBUILD less-529.ebuild 1404 SHA256 9ae048b7097eecfdc5174498599006b8acc6778e44a43d939432a2a15df219e0 SHA512 10b5c220228b1adf41271de6d7ffc3b222ad2b417194b4f47f0d96f682b73dc0644c1a6ca6d8d8ca2e0712c05cf66d0fa19d0aa612e568d04c95cda763288ac5 WHIRLPOOL 12d6b206e9f8dc3035f62750aaeaf160701c16a64a7f5de70720d528bc63411124caebf754c01fb7d715ccde01a892f29b63252414a3f93041bf671d0a48b33e
 MISC ChangeLog 6770 SHA256 231ea462342a5410001f601c3b5be0b8aecddd4bda45ced16d823e54588943ff SHA512 1eeea73307e6c68f8c4026bc22d42fed0b4b3fc6eadf00967cd7f525b3c5843353c2be38591892e6444d2f3d6a374e58a960a0e969c4d9153a373a286c2590ee WHIRLPOOL 15496a1ff7dad80804d3bb76da1508d45e3bccb22bb8452cf6d63438c1d30913dc3da6159e0d426ebac27d1d68e3dcbde154f6c8e7fcc0198225bb4f1469f466
 MISC ChangeLog-2015 23847 SHA256 825f54e1e57d50358f5dc9a197553cb4e9472a7aea705968075815cfd5f90527 SHA512 99e9ed06109e4967a2cdba06c9116fbd1ae7a33489a758ae001c809e3bba6dfa107b3d67dfa69ccdb0ebeaae51c24cb144b13f8c1f46d0e26a274cb1b2e1ece8 WHIRLPOOL a27d97c7da86ff507da122e0e54eb5729e55c2eed535cc86a9d3775f59a2b70c35e70fc6220728c36d893aff0ff546cb8ecccc86a3e61c284966f50dc21ef7fb
 MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-apps/less/less-497.ebuild b/sys-apps/less/less-529.ebuild
index 73de792d3bd9..643a59bc2b71 100644
--- a/sys-apps/less/less-497.ebuild
+++ b/sys-apps/less/less-529.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/less/"
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index c91533e59e98..1c4c04263e79 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -2,7 +2,7 @@ AUX net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch 968
 DIST net-tools-1.60_p20160215155418.tar.xz 227284 SHA256 9c9aee20e3b09213ab0b27c62329fafcb25e156143fc3999c16e8dcee72304b2 SHA512 3fac6e00f061daf5c9ed1c8038d14635333a6149b09ad1493db35e4f931095915ad47468c42cc10299a4df1b5c946d6609a92a00c326a50a4da166670f6608e4 WHIRLPOOL b04de5acd5cb17177d105168d8dd5d4e1cbb108d946bd656b162b11081098b9254993883088df851c3f2fc4eab2dbc18892cff96f20f1e2748663ab6f17ffac0
 DIST net-tools-1.60_p20161110235919.tar.xz 227552 SHA256 d9b52abb6bbf3305fde1fe414059602371a7819b214206312f6b16a2fde46fcd SHA512 06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01 WHIRLPOOL 413553072466cee79c1f231742d6256f97d9a9e84647ee27aed97cf01eee16fd621c67fa67523174bcc0dd0c5f6181d2f6fcc698e3268fc9996eb2cbc7db1070
 EBUILD net-tools-1.60_p20160215155418.ebuild 2479 SHA256 869b801a0a8ad090c2db68edca53ad5f0e320e26f4b8daddff3e25a1edbcff27 SHA512 da7768af74f99fa957bc459151ebedb4afa51e81ccfd15973b2e6c15d01a084c4bb079537b191fb394526ff9b550d1acb32093b5ed551055525efa0f7b23696a WHIRLPOOL e3b1849fe0ea1ba420f1f640e027bd378d3b3e048ea2d1c28dc09f505ce8e3ac7986bd5ab7103ef70fdee92d26d72899dad74cf3148b6b8af09ee283767665ec
-EBUILD net-tools-1.60_p20161110235919.ebuild 2568 SHA256 6542d4e7c4a656f7deb7ba8cef9ec7f93d2506a512cb99d41e88a58e9900bfda SHA512 55bad71499c240de6f4b5871a3a00328efbb0edec323c53d1371551541988eecff033ae86a74ba33bc96700d5936a00d692fbd28181e6832c79bf96d2142ff5a WHIRLPOOL 00b7f82195448ceb06a88f04dc58932cf2883c8af57bfd797f1c50eaa2995d98c19db74cb7b987505562237835ba8dfffe6410caf8b4511176e761d56a9de966
+EBUILD net-tools-1.60_p20161110235919.ebuild 2567 SHA256 72dcd6369052984cd02f9b6b94da075e008a2e1e5bb84173fc8648aa760c15ab SHA512 ceb279c3213efc602285788b5a8481cc9f506c1d27c61b0fc7867e3555a6aa179bf13bbffeeedda6c5cff6cb3aecc72bbeccc4d8968e4a78e247641b4eeee380 WHIRLPOOL e5354b1662aff0fc40c9eaaaa0a676dc198abf92c51f7ec6095f32588ada276babe8eb0f0ad5ad2d8733fc84465390c9a566a6602a35ce4cc2d9005f1d91e737
 EBUILD net-tools-9999.ebuild 2492 SHA256 4fb8579e614ec23b72f43b2a79268c232121e09edfb3ddf6e8a2f7e174c34c39 SHA512 b45c414ea855d08d24bd0d0fa7ff565017e6d1581962429cb69317ccd20bd9bf821fee6ffd917c5702d5f32299e5bc86b06acacf143971b662ef84936eabe616 WHIRLPOOL 9e542ff19e5c5a23748cf892d15765b4623bd01e34e5e637df793cba4a84688dbe8b5b84f7749102aa8a9d2dbe0f2d70e7a2595a152606ab18ff4b2603ca4f5c
 MISC ChangeLog 9045 SHA256 3e2624c5a46782340f42e17453079c31876fdd4c526fb144c481d436ebbf77f7 SHA512 5f01d14852c3e87fc070d4a3601f17bd773edbfc163d5f93faf4859184f16772cb4fe8b7b64565c3c20b2719367b334ddbd3b05d0e5d87c969d847aa4d7c0516 WHIRLPOOL a28ec18d7c4b913fa43eb0e067c37c35a89115c40752d21ee5e28468a2a7a213c25ae68af134253f608af7131c81691563164294abe63be00d4c4837aac7d9a9
 MISC ChangeLog-2015 25006 SHA256 48a7f6ba1885082cc136ec093bb0fa60fdd15f750568b431008592701dd89b9e SHA512 9b862acae7f12b8197477fdfd5f18d18791a2d625f2bc9efacacd3d1dc50ce2818f4515af83f5f2a760c2829eaacf17449d8a56a5b5e85ee1a96242234d9e235 WHIRLPOOL 9a4dd77390d2dd49a004299dce7ce424cd94d6e98e7413ab4a2acec5afe9dd17ea8de02833326ec843de99f8425e5e56c26516dda7eb6438624eef9aacbfafa5
diff --git a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
index d73f899b1372..581862c88d45 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standard Linux networking tools"
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 2e7fc542c0d3..372d4deda485 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -38,7 +38,7 @@ EBUILD openrc-0.34.3.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7
 EBUILD openrc-0.34.4.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-0.34.5.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-0.34.6.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
-EBUILD openrc-0.34.7.ebuild 10168 SHA256 1b1a3ea1452bbf38b1cead308f367e697e7ae5b51f891aebd885ea4c440d7274 SHA512 1110bc34510602228e6118cfe3e6b0827161ff2b709dfba6987a30e2c89ea2c7e4c659492492bca306bced6f459e81b1059aa6b01ddcc30e95de47b982953e8f WHIRLPOOL 3d684c6002e070eb632e16c5de5bdac3fa38e6ef697beb8b6735570ce9b6f3798af7d4c6b16d004eaec7dd4d31ab20ca59373833b2f18407551180cf14589c5e
+EBUILD openrc-0.34.7.ebuild 10165 SHA256 db6ca6c9a8f2b42c5848682ce4fd1fed7ffdad5a917dfc851095a32638972b4b SHA512 7d226e47fe7a1a6a8b92da7d47f695baff0722db5c3b49651dd7dfbfc49f98755296683f0de69d90069ad064b37dbdd474a3ca98fdaddac79642634c02f9b3cb WHIRLPOOL f23f75cb621701eb3d4fb7c47a080caae5f921f6964fdc6f20ed89e5aac4e159812f127fa4eccbd2414542251e134f891a7d3ef58e21a66f8aa82fe820ea7026
 EBUILD openrc-0.34.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.34.7.ebuild b/sys-apps/openrc/openrc-0.34.7.ebuild
index 60571198d88c..3a1ab1f50a87 100644
--- a/sys-apps/openrc/openrc-0.34.7.ebuild
+++ b/sys-apps/openrc/openrc-0.34.7.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	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"
+	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"
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 7d8b6bd9ba71..f23f90c04c9b 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -5,9 +5,9 @@ DIST portage-2.3.14.tar.bz2 948535 SHA256 98eaeef4057f4c5a2251638428865d996ae2cd
 DIST portage-2.3.6.tar.bz2 943085 SHA256 2f57545fcb142a4b23c2052c523d3d858754b232be21455ee6c6cd3ff0903cc2 SHA512 5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055 WHIRLPOOL d0258c579597690e8bf2cc2a3ecc36d543e67a728c302a9b16ae361086023a7e059ac1a9e2e64f026b7d975d6b619d3b981062227042098ed3afc1b86658b636
 DIST portage-2.3.8.tar.bz2 938062 SHA256 19b73658dca848d215c5527d1d020c8106352007a84d7675e5efd0a7b9b48a8a SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8 WHIRLPOOL 0c576bbd8aaf8b27fa1746c863ac02b2a5f361d9011d17250ffbe4b830a8a6bf10a0aee48b5181a8aa6c55d8ad81ad411195da2a6253e9b324d3c7397053fe29
 EBUILD portage-2.3.12.ebuild 8220 SHA256 08733d496146447491d9dc76828ecca92f9bc2db6f1c0600735369276c24a28b SHA512 01c64f9252eddec365801614582182d509f969fd83889d003a3081df96f92dc2f3b707231ef74357fdd049eedef726e95304d3ceec0c334504ca186ee5cd0f01 WHIRLPOOL 71f49ac7ab731414fa5b2d149cf754ebeabf851bed1fc4ee0826cdd6aa5f582b717e87863c0ee5871d541108e208758394c8d7cea5affc0e4a045059a8d232cc
-EBUILD portage-2.3.13-r1.ebuild 8241 SHA256 381d33b509ed9389b7883a9aca635eb40fd4ba807f8835fa8791f416d10e2cf6 SHA512 1155ca94fbe0e305f4cf05f8456e0f44146b2146ffc2dbe5fe88e26a949274a13223ccf8e2a0065a2b1f5ac7eb590293e54885965a4fa6969e69d771b104cc5e WHIRLPOOL 1d724be145687d7591ec28882471be18a1b05a4573624460e3bc8e404b7681bff5efa47dcd0f4618f54e17a19b6e720ffa31452a91ef33f99af77ff586932480
+EBUILD portage-2.3.13-r1.ebuild 8248 SHA256 bb513bb8e88bcbaa11a9946d4bb1985e55d9c729e534093cf2355abceedc0700 SHA512 44b673644b49393bcc612edcc52cb08c07763438a72ede800a0fa34b57bacbf7a2c2a48130545d442f49e1e54e57ba1e91fc79fccb2071367cfaff6f126ee7d3 WHIRLPOOL 09d757bf43828e7c306e728dbe9be7c031d9c3a5dde839ebefa3cf21cc00a71a10b1208366fda572eb953bb698c7d0b7c932cb9d9812e6a562a3880e1f4f3986
 EBUILD portage-2.3.13.ebuild 8220 SHA256 08733d496146447491d9dc76828ecca92f9bc2db6f1c0600735369276c24a28b SHA512 01c64f9252eddec365801614582182d509f969fd83889d003a3081df96f92dc2f3b707231ef74357fdd049eedef726e95304d3ceec0c334504ca186ee5cd0f01 WHIRLPOOL 71f49ac7ab731414fa5b2d149cf754ebeabf851bed1fc4ee0826cdd6aa5f582b717e87863c0ee5871d541108e208758394c8d7cea5affc0e4a045059a8d232cc
-EBUILD portage-2.3.14.ebuild 8246 SHA256 f42a3894d2ff131025958664f169ff3170f93b098a05be22eb184cf35fc2556a SHA512 c043384e501bcf9c941fa6a0eb2bc524dd607ee9cd88dd98d07f4022a52f857ea9ffe114340d45eff3ab0fb816b93c569b1dcd8afa2dc77d6cd62a1f418a14ee WHIRLPOOL 5b3faca774610a8d226603b8f8783b66cac80d88f1b767ab342359a923b86390ebc01579bef7f09d2cc27f124132bd610bf2bd10f10c6a5f5b515c6d2e8d9d0f
+EBUILD portage-2.3.14.ebuild 8253 SHA256 8fd47563b3ac22f300deb0278b61ba058802f4cb666f2eb8a27f97379756d670 SHA512 2c0d114a1d7fa7341414729a9eec7013fa66055cd57bdb9bf3bbf395a11107bff6cd782b41983704710074c6a69aefb621aefe8d53f081a241081c183683a2e5 WHIRLPOOL 190364431a933b80787f69a0b0feae74b32672c401d2113faa99dbae375441649368ac4df648ed173d2caacef3dd2f68518e75d64004cad50e066cf4bc111d30
 EBUILD portage-2.3.6.ebuild 8661 SHA256 9590a689915eea31ffc5dd347154719d70cfb4b000a60e0f6e6294fe0c3e1df7 SHA512 53301757289cc37690020ac7b5379d026ff1e87f9d558c913eae213d0f33b75261045616c9259fe28684aa1031c27d4f58a52438e67eb91a97d186a80ad298a4 WHIRLPOOL c70770b2e9ac8b9af931d9f9918af82ac20eda198a33d9cc19c5d457701fe09c3cd5d45fb756457b05209cc0594c2b0b4efe3d544e1966d759c6a27fcf5b0743
 EBUILD portage-2.3.8.ebuild 8211 SHA256 39b5c3e56de53bb619091fe7a9a56e48ccc564fa281ba1e0d249532c96c2cfc5 SHA512 d803ac927d8a6f7fb00f629bca8a1bf94200d4ecbc83740afb32041b865dcfd13ca4329eda9693ceab20d2bcec30b132e23fd0b62cef262f246297f0d6ff748a WHIRLPOOL 22b8e205b1cd3683178eafc8359b3e8447279963cea00cb0276ff7a3e38eb3d438b992f48d8ad496288e3c8ebeaa95526711fa6651a8dbadc6cfe65fa344199a
 EBUILD portage-9999.ebuild 7792 SHA256 1777d7baf2a1b271a3817e4f32729efec7af829baee1f27f6dc4bbd5b60d06fe SHA512 f755b0ff97e511564725e35162124605ca02237469ea4ff327a10a22c33facf9632d67a19ee213e7b797050fb531c7a10593846cbba6c8f450bf99f5fde11c17 WHIRLPOOL d0ad49e69eefd185e4105528cdb04d6a11812c7cdea0b9b5267ba6d044a04595e53e26749d93e5c2cb24536e070d4a3fdeb17c356a40bc4e4e4a44e78b2e312d
diff --git a/sys-apps/portage/portage-2.3.13-r1.ebuild b/sys-apps/portage/portage-2.3.13-r1.ebuild
index 6ea916e6537e..b4ff41814d5f 100644
--- a/sys-apps/portage/portage-2.3.13-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.13-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr"
 
diff --git a/sys-apps/portage/portage-2.3.14.ebuild b/sys-apps/portage/portage-2.3.14.ebuild
index a49d25eafb91..7ee7d2c75f30 100644
--- a/sys-apps/portage/portage-2.3.14.ebuild
+++ b/sys-apps/portage/portage-2.3.14.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr"
 
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 450509b3e0e3..725f0c00fc82 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -3,10 +3,12 @@ DIST s6-linux-init-0.1.0.0.tar.gz 22242 SHA256 4db16d235dc052f6376f4e88e5e4c0dd1
 DIST s6-linux-init-0.2.0.0.tar.gz 24482 SHA256 131484e61eff0e671e112f0436b13e8e7d08752f810d8bec4924a68383eee2b9 SHA512 16c8c97b65ad533b70ed9dd189827778797dc8d0a70af0880655b5f89a1524cd9d3675cb681b99f4704d43c810a4211c9926bfeb743247d7c29559ec2f77606e WHIRLPOOL 45aad2584c8036f8fe9d9c72a7da3fb29e91f36a38d6b63297dbd1c201601971b6b11304290d16df09190f0706825c3e0cbd8c7f48657be17ece3ef27dffbd95
 DIST s6-linux-init-0.3.0.0.tar.gz 24692 SHA256 9376f76ae3ab24cb18a35a6956d0fa5fe88cc4c1dfd19bbafc47dcd4f91c2535 SHA512 9aa775fb2bb86680ba438a4a03b543fda696434eaf7ddea5009ec3adaebb899a2ed039a4727eb7d5427088ed3ff08a9eeaa853769f089789a7327a538f798c67 WHIRLPOOL b43e92c48fdc808100276c6b46382c8e1f938ead96e8e5e799cf6a7e17af1f9261e7d0e1ec9b169d9b8a38a2682086ccc5a01cfee5b135c0edc1b3eb20819dfb
 DIST s6-linux-init-0.3.1.0.tar.gz 25920 SHA256 d8854a01f41db88250b73bdff3a636ed31810b1c309acb2d724380c8b69aedd6 SHA512 f9c9b35daf8c7322c2146fb14f4df61131fafb6144a71666cfb77f5684e0669abee9689b238d1d1adfea04795a8cd1e88e61920b6c42432cb8a53c0861b776d8 WHIRLPOOL a17d643d17d14d23bbbd2aa995842b1a2b3195d328a5d23a1236591b8eeafe4e5e5d07968c1ab2852e4f1eb60d494a4246116e0fe7cd7fb8480c2c3e8e35ca8c
+DIST s6-linux-init-0.3.1.1.tar.gz 25955 SHA256 9ee2e8a5abc250bcb2be7d07566592ba5cbe3abce858f60853d3ac45b1ccdd79 SHA512 b8a44e09fc6770e91f1ffeed3267bf5fb83cf857653727d52773674db5942fbbc010355bdf24e456d2b2df5a1ac72888b78b2ec502c0d42770af58aaaec00648 WHIRLPOOL 728ba81fa833872a2cfea7d9723f526c98921a05e490df3dad16bc306fb0136c479f1b5d3f62423ff86f7e42cd526712420558eff49ea1509f7f5cd4514d0bc5
 EBUILD s6-linux-init-0.0.1.4.ebuild 1240 SHA256 9e3c9033436b84e9fd38daf829e1108c3e3932cfa97206dfad13b869aaa3aed4 SHA512 1fc85d43eb2767601b08957e0ea03ee7aa0393eddce7772997ace94ee78a3b1bc2518df338b0275b00f661081cfff8f0a75d83516df13de07bf77a0dbfb07b05 WHIRLPOOL 36cc18c0a6c684027f54f8fbe68c16e82da75536b44dd056dff54af8920c294ce896e07aaaf4ed0d3ae783f490d16b7301ea0b14e90be6bdd82c3c99617c841d
 EBUILD s6-linux-init-0.1.0.0.ebuild 1243 SHA256 74663ff81ff1df28c2d52a421cc44a45bbc6fc523aeb91fe9daa320291b5bfae SHA512 a41ca8126bbdd6b374315039fe58c25efea30f304873b3fc916d11ca9e06848ae011fc3e07333339f068517362c96b94548927eb9052edaa7693f4e9253750be WHIRLPOOL 79f12f8d9b372876ac03faf03c0ada2adf35c81ab7e50483ae7e703d0156fedd889411d3125124dc2ba8dfb05a73dd12aef2e8dc336a11b529c89e6fb7acd88f
 EBUILD s6-linux-init-0.2.0.0.ebuild 1241 SHA256 f331aada0361b2d0c498698a236ba9d085a5d871f1d0a2febbd1e199242de265 SHA512 642f101392debe4604565c5ff35ba6bea7b403a28351b5f1ad157e7189feef6710886f81e4d349b84379b3888c3c0318e801f5339e86e7e0c81782200c44c215 WHIRLPOOL 07cfe94dc061816e698b38745f368b5a519e379c74742b59f9ecf7eeee07213f0082b338798023df49a689cb295251ffffc535d43d579629cc860dc4f5fb92f2
 EBUILD s6-linux-init-0.3.0.0.ebuild 1333 SHA256 8ff5299494fb70e6b8faaceb4849cee293919b37b1d22e5a24d4a037cba0047d SHA512 c2d814c76f6edc99ae64c37743018179529b41ba41c4d87adec1e3f6d0f4570f78ad350d7983d2a7238628847f4901c2fa6b74ec939523dd76302878dac1ac88 WHIRLPOOL a7d5210dc8a985b2027aeb400f17c21d166798f8582775afd1fe49501229174cbf75b1aefaae69ed0eaca62477f83be20012dcad6ad753cd8a5faa9c89fc99a3
 EBUILD s6-linux-init-0.3.1.0.ebuild 1472 SHA256 16511fba169b2985f0e0a9e66364c748c47443daf75b29ad4a263c4b066fed8d SHA512 57607c57abc5adb22a22c1aa3d24545d591d83c9a7bfb87931a394229fd4ace887b5a5e859983c5b30fb6d08d151bc76f6cc88b69d31154d218b258221aebb89 WHIRLPOOL 1656f686f6687f5216faad585c42e5b1a18c196f4a8bda1dda5a40e5134a7dd3f4db97b1e66bfa5bf755abab034ccfdf1bd54cdb1ce9b6ba5739980f7a0c6e6b
+EBUILD s6-linux-init-0.3.1.1.ebuild 1472 SHA256 16511fba169b2985f0e0a9e66364c748c47443daf75b29ad4a263c4b066fed8d SHA512 57607c57abc5adb22a22c1aa3d24545d591d83c9a7bfb87931a394229fd4ace887b5a5e859983c5b30fb6d08d151bc76f6cc88b69d31154d218b258221aebb89 WHIRLPOOL 1656f686f6687f5216faad585c42e5b1a18c196f4a8bda1dda5a40e5134a7dd3f4db97b1e66bfa5bf755abab034ccfdf1bd54cdb1ce9b6ba5739980f7a0c6e6b
 MISC ChangeLog 578 SHA256 9d6b549d019cc9eddfd42db57fbec5d0e60f5bf1c8de5a87b8aed6b2058b9ef0 SHA512 f7f7f2235e6bbeb0e448551265fcc2db166505c8a1b824d2b84a6c4a61c3c155f5449e45ddaaa7bd3daafe802692b2247b2196dc14ad6dadf0474b713b97125d WHIRLPOOL fd6a39132052f486377cfc7f2a7c827910a92e1929bb67c78a5ba901827b92adafeff5f5d5b0333bfdb36b6051a123d187923a1b2d6d11444d375679324ef900
 MISC metadata.xml 538 SHA256 661cba228986e0ca89a6d369c7f2aaa37bb606bfa574b3eaba919677ebd5d2e3 SHA512 a2d8e7031c5aa7cd310ad049b796c36498d1cf530c03f3d35d8f795530f49b2a8b59683c9ddc01910375a5883673072d8dab28b15ddd4c53e298e15b400cabeb WHIRLPOOL e6548172067128f98edc201ea193a261c780381edf79ef830db3cdc71309942564cbceb71a3ac76e7f81e3c7fda0599fc135f4ed72f7910c9c9abd2adf569648
diff --git a/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild
new file mode 100644
index 000000000000..d94588ab510a
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-0.3.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-libs/skalibs-2.6.0.0[static-libs]
+	)
+	!static? (
+		>=dev-libs/skalibs-2.6.0.0
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.2
+	>=sys-apps/s6-2.6.1.0
+	>=sys-apps/s6-linux-utils-2.4.0.0
+	>=sys-apps/s6-portable-utils-2.2.1.1
+	!static? (
+		>=dev-libs/skalibs-2.6.0.0:=
+	)
+"
+
+DOCS="INSTALL examples"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS_AUTO -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc)
+}
+
+pkg_postinst()
+{
+	einfo "The generated init script requires additional packages."
+	einfo "Read ${ROOT}usr/share/doc/${PF}/INSTALL for details."
+}
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 05a9ea1fbca4..55b1bfcad6f1 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -4,11 +4,13 @@ DIST s6-linux-utils-2.2.0.0.tar.gz 40863 SHA256 587745abfbf2cc631bb54dd2b3fd29f3
 DIST s6-linux-utils-2.3.0.0.tar.gz 40377 SHA256 6189d77bf4111d5cb80f7fd60525b2eeca5d2b3a9b16ccadacc7333da7b40c84 SHA512 09e5744f6ac35d33c9c61ffc0ae6c8697e5d1816e5bd83e2dd4385d54a8f6da9c43fe2b1cb1cacba6f30a53cd7d9487a12b44028b20b110c74d6c3016d0511a1 WHIRLPOOL 9747bd1f3b8b95381a5ce8787efa82dd5b64375050e67dd4b05c66b8afa18fbc90960e8831441de14d0396600795dcb6ac80eb54d03e2b92f0690e82a408480f
 DIST s6-linux-utils-2.4.0.0.tar.gz 44050 SHA256 3afb7b972a9d54042ac0aabde5489be90039374b6a90ef45f7f32ce2e83d1e63 SHA512 68f3dbd230d99afeeb47310ec544b7d9fa4658b580567f81100f988fd90d4db239938eae9b999d7be9ee384d9ac51ac61ff5d2d620a1b9711ff5663ff2aa6021 WHIRLPOOL 1ef2d55ef3f90c321c738a75135fe18a2e6fc1b92054db5574f0a84d2f87a60ab1dda7924c8bab7db7d16cb60971678b55290f5391532e109f5ed04e990b58cd
 DIST s6-linux-utils-2.4.0.1.tar.gz 44248 SHA256 9562ef293c916c4448d16fcbbc065eb28fd995ac34cd3538179cbc3ee056ab93 SHA512 91c1ed1ea329394158e859e8fd5741a2589ba8d0f8c2d0a0d14b989bd99dce3666d3de78f6be676b672824d21f0e40bf03ede198ec59e391791c092a65f835d5 WHIRLPOOL facb83f1749c4ee5f47c82e907c0ccc506dd69a0ce84a00568da4b39d60be66a30d6277c134fc1639b6a48c7e92b5a231364de1342eabd7c3becdfb58a49454d
+DIST s6-linux-utils-2.4.0.2.tar.gz 40832 SHA256 37e2ad9ae370af39d1a2ae4bbf26a778539e6fb4c09d47a276de3b7e66cd8508 SHA512 4b0c8f1b65b8eb47f3aa7aa365d20dcd46fc144e166f78825ee53aeb789e009b2716a826efa1e92e86e8fe86421efc6ae07970ce421c6913f0b1db679eb6117e WHIRLPOOL 42b00a180413c3dd587248a6450cad55d7404ebcb4d013210c9c7a5453dce76d50c35d4b397c88514f2735213d17853f579ce6671366fd198ae90027e0b8e9a2
 EBUILD s6-linux-utils-2.0.2.3.ebuild 1064 SHA256 135e0eda65ec125459cf444108788d967d601848bc722f07a649d22c08966eb5 SHA512 635bfc068b86ed52094aac3a64b8437d1f44b6239bca890f89be06c21b2d682fdc8fc027487855cd522b46f2c511ed9e067ef92cfb4b7ad38ff4f6a04b40721c WHIRLPOOL 90f5fa82bc73333a262bc4e4de5eb5e0991f1d7d259b8cdad14009ad25667d990135b86d68cbb7a0ea326e140cceb7f79e0340eb1b55c4f9f1fdfb7311593015
 EBUILD s6-linux-utils-2.1.0.0.ebuild 1049 SHA256 d65744eb5d2d76882df664dda8c6dfb13f6149ecca4c6cb51e8fd923e22fb2d6 SHA512 a08169031add46d92eef870cd4b374605471db8b603a5ff914b57aa1ec6396d590c2f7b0560bbe2f882c93737801aafda36e3a60233d0029d17c17096be479bd WHIRLPOOL 9572c029de0eefb528d3454dd991068c9572e5a4f3ec51a3e0a7de2d782bc1268e5d5f863722c31b83e2fead9f2d4247596ade96a727d798d911de0c5d0fb937
 EBUILD s6-linux-utils-2.2.0.0.ebuild 1013 SHA256 52af5aed450c98d1f6a74f8e915cab10909f47c2fb8c9c2befb54f917612a1ba SHA512 d9b18ff313baf6514f917a86554ea280a53ee4cb2350da90724047712118bb0aa7ef346c2a5b3938ddd7cff218e344129593046e74c88760fc7629b6d7f5fdb1 WHIRLPOOL d8af9045d09047a5a9bec79e2fbd153aabc64965fccbcc32b430a5d48bb99fb95b48df9fd32d2b800aff2712de411c843ad31b6c01bc503db11940651081967f
 EBUILD s6-linux-utils-2.3.0.0.ebuild 1015 SHA256 fa2c7b2226bed1408f8b0b67cf6abbe5639deceeeaab353da31757b1adda9568 SHA512 7f75497a328c2947d24320ddbbeb267f4bed39eec996d6eb9259cc7d9965982a4cd5db26e96a56b65290fc486697ff45ef14f0ff3990e7feabcef13abdde06d9 WHIRLPOOL 3bafc4c26071e1142bfa4a63a26eb6691c5f2c91bd0c8a5088b1454d3208dbd936cabd8fb40cbb66140969df160d9244bdd61c8c0e4c8e48c1de80cc4f13d879
 EBUILD s6-linux-utils-2.4.0.0.ebuild 1154 SHA256 2356b9ed3ff2c5e45aa588dffab612bb87ea7948c058f22027214b95ef599ac1 SHA512 5580711a1f971441d5a8f926fb049223a3d7817eaf366af0c6d6bede1119770f19b8eb72561ef0696983324a4ab3f406e2aa5585b623a3dd10c47eae982f3fca WHIRLPOOL 1efa1e17cf07e9a7a283b0ba93e61e774a6621eb76af10e9b173df20f7b765d9cd1fde662f209d177e8d5841850fbe93a78a951e56d7e696e12912afda8d4f90
 EBUILD s6-linux-utils-2.4.0.1.ebuild 1154 SHA256 2f94880c658b0226c779e179d22f06978907b5d51005a49e87345fad873cd1f7 SHA512 553c03ebb0b7d403cb47000f81943993e8005cba717b2c4c27cd7415817f226e5e26a4f750cc55ed35fafaaf03f6b09623595f68942741231a42d62084125983 WHIRLPOOL 6cc8bc3dba9d4a1f3d9203302dcba60d82de4ed4c01ab938bd4823d6e65fd963591af323bec5f4e26a9c796399a59b8d1352d38c2d069f107a471120d3a494ff
+EBUILD s6-linux-utils-2.4.0.2.ebuild 1149 SHA256 c44dd8c35cbc4c2c694352107dd52407aa2684b93d2eeb6c404a01b68d85cb07 SHA512 bfd9bba07e7071baa00df31f5980952f6312b370d4f9762650afb1dfce909f8d6d50029bd7d7d78f2cafafc8ac7e3162bdc31c68b13d610394730be35ebc429a WHIRLPOOL 7283c1b847c294656b36e9e5805efc2bf657a7b7c1f73497fed119dc28126297da05b19666a146292af007ec2edc093de5e03607150733c34f5310a523b1a712
 MISC ChangeLog 626 SHA256 065e32ca3d6a056d7b9712d7c334bb4707e67a4c3b689600f933a956ffba222a SHA512 b5d5657212ee1d5857038c071ef63d80ec2f526c641e8a36f5a9a3c95b05944dbc62160aba4fdb8e887640e061622955637085c9d55ace602881766bd99239e1 WHIRLPOOL 5348e193e1252c67781775edf8981d607bb67abcc59d0a20a092bb5836af46f9e310b3f7130a025c8173e20ebe35e39957ca7104e786fb99ea62c1f0dff62ada
 MISC metadata.xml 538 SHA256 661cba228986e0ca89a6d369c7f2aaa37bb606bfa574b3eaba919677ebd5d2e3 SHA512 a2d8e7031c5aa7cd310ad049b796c36498d1cf530c03f3d35d8f795530f49b2a8b59683c9ddc01910375a5883673072d8dab28b15ddd4c53e298e15b400cabeb WHIRLPOOL e6548172067128f98edc201ea193a261c780381edf79ef830db3cdc71309942564cbceb71a3ac76e7f81e3c7fda0599fc135f4ed72f7910c9c9abd2adf569648
diff --git a/sys-apps/s6-linux-utils/s6-linux-utils-2.4.0.2.ebuild b/sys-apps/s6-linux-utils/s6-linux-utils-2.4.0.2.ebuild
new file mode 100644
index 000000000000..8715c0b70db4
--- /dev/null
+++ b/sys-apps/s6-linux-utils/s6-linux-utils-2.4.0.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="set of tiny linux utilities"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-utils/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-libs/skalibs-2.6.0.2[static-libs]
+	)
+	!static? (
+		>=dev-libs/skalibs-2.6.0.2
+	)
+"
+RDEPEND="
+	!static? (
+		>=dev-libs/skalibs-2.6.0.2:=
+	)
+"
+
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc)
+}
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 1d9f6103294c..36b5566a074d 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -4,11 +4,13 @@ DIST s6-rc-0.1.0.0.tar.gz 88520 SHA256 d04a8a765740ed55e38a33da3639197f51f83b3e4
 DIST s6-rc-0.2.0.0.tar.gz 90133 SHA256 b83a4f15ba0e13f935c7e4db8ef17229388e1fb4ca4e553b817ad039427404a5 SHA512 981d504382c9801ef53fb2a4a4f7410cf6165f1f49670cb5d42545c3e1bef6c0a50e6176b149fd61ec45ebe701411d12b5e7012cfb897d3472e52a1b8f76f636 WHIRLPOOL 297b7cfb73f480ee5e419197a13a7462849ee948f5445c29b1c0da31ad1d3eb2206afc1cccafb8a489f472ed8853298ff89662dedc57f69e4a95a6e2beaacaab
 DIST s6-rc-0.2.0.1.tar.gz 90345 SHA256 8b01d5b4c2380c6b30d320118b9a9b9ca174a25ed3c75afe8f59a4e840847a76 SHA512 d067f1b409146923531f5191e8c9d17c8e846cf4815fac11f08089fe983a55a1d11bba942a036d2d8f48d26390e1350f273bcd8705abcfbff33b9da2984cb8ef WHIRLPOOL dbfa8c726db19a87b1271c311a514ac71803ac4c66e5d1947785177d0825214630e4a149f21679c6126bcec966dcc3390688ee2b654003e34d29a11c06edb7da
 DIST s6-rc-0.2.1.2.tar.gz 90978 SHA256 4fa35cf8af41498c9fa0c21220dcdc7595a18ebc2975a254d719f7e1c864b1f0 SHA512 33951996cf1fc1e497c26a90254a916e992c69128134cbc64ed41c76e74c04e55c91036e2c7e836f3eda650fbcd670c52722b5b2d12ec4a3887101eb20c3347f WHIRLPOOL 89aa08ffd5f8073f506d7fb302f1e2363501f35248531cafb389aef092a3b3e6a1da202a320cecd927e0da9dc85e35c1def6dfd8505742fc428ebaed2257e916
+DIST s6-rc-0.3.0.0.tar.gz 93183 SHA256 78266a397330d35d5eac9e99d1436feba58e36f41bfe1db0fd16c4b6cc73c999 SHA512 d29755f84975b6b2811f55a88cd2b9f1f8383c80ec8aa19e778f74eedf0ae6cb17e55ad96c46bfea7dc3c586a6f10c783db80e8742d2a2e36d3d0062c0f10c06 WHIRLPOOL 0ecb9e8edbf9e0b6fbef963b0a07ef7f2229540d7ec63b99dad5d50f52aaff75c93d695e2d34ede26412d7f1bed6a375f203158d51e82a332cb207f5de7e2b50
 EBUILD s6-rc-0.0.2.1.ebuild 1296 SHA256 afd2c052d47ef4c06877aec9fabb76324a973fee43b1ae369721c0e93b82c238 SHA512 3f5c56e6c861a36ae0afead1b982b3596adb7929e8a26e66df33087ca89cf2950b8667303e640f164fc38298de6afc3e6f3d754d683209be618c93032c36d0f0 WHIRLPOOL 77ae06f77263fac1d6fd21d80e4ed53839dc59fdcd800141b52afc434aa6f3d84deb953fd795b75648c83d2576069f01536afac249bc01d75b72b8e431214ff7
 EBUILD s6-rc-0.0.3.0.ebuild 1299 SHA256 88c22aeff4e92a5e376e149e2b284bff89bfdd6775d06feb07be08ceacc90eab SHA512 1332f82db79db0a80d8e07904fa34c6465fabad96837efdd44ec81e5f4f63d2b8fc97fe3d58066be589ce760f780026211e7040f970cbe8a06a96c71c6bc0960 WHIRLPOOL bdc0fd8b8ce2c836f25cb924c0196bc5ff22237ef687680561a805b7e4781793c0eaacaa434687338b05424954bceb9c7c267a2312b9bf98f0f31730a5ebcb35
 EBUILD s6-rc-0.1.0.0.ebuild 1483 SHA256 c17e7b6ffbc3a619cd6af0b12b93279e00c2690a7326fa382e79526ed4b0c95b SHA512 e4e60d92632789123df84e325888dddf9d13297c90ae55ce9f8f9ec7425320d0ad3c0e0c24b816ea472c87d71908de091e72946b7b8722cc6551dd243eb4820c WHIRLPOOL d731a6f799dc7b923f04acf07a9a0134935340a7bbd220629af0e82acc2ae1268e3947cfafc161368609aa8376903e1d277e1d76978b0400daee59a09bf8a4a0
 EBUILD s6-rc-0.2.0.0.ebuild 1485 SHA256 19ae142ecdb00fd1dca0c4427907e4702188ed43753bb7526fe689c074cf6869 SHA512 6e2518ccb38a40d4520a464f7f124fdf03be30d9445cb6661a603c770a2db472cd9cd9b2e676b9deb278ba559aed6f12505205dbf3707af68cdb79aedf686ece WHIRLPOOL ea42b986daa6e6584cbaf4b38f79d118adb549f12208aaa006c7b3f0739c7d3f73f71f6254fadc3cc6f115ecd2e9f6f84263804327d34293593c173bd1941bd3
 EBUILD s6-rc-0.2.0.1.ebuild 1624 SHA256 be18b061f2ab78978dfe740ab18f69c0fa346f0f954e21532a4a39feea7c2255 SHA512 0737f02730bd5af03134199843fe2c0103c6ecd76342b8e0aada063777260158542ac25ff081eff10c4db0cfeed958f3e2b0a9ecada65da98877f8b985bd30a7 WHIRLPOOL bac5b78ebeff1cd6821928b6b5172713309c2c289112cb8f39beb146f3e3fd48b6ff49d0b0abb4f5e4a0623c6938a4ce05714a9aefb200edb85acfeaa6e2786e
 EBUILD s6-rc-0.2.1.2.ebuild 1624 SHA256 2a70327428ba8aed2c59946e5593b9b03d0a1873fe3b25a380e6ece1f05511cc SHA512 1461f37172187ecf8457db8ccd1f34e8197c554aca47d88b2f867ba7e5509f84984373da8cad06380d3ee1ccfb3b07ea0efa03ad2ad61bd5d5b7d3607c56068f WHIRLPOOL e697638a0d6fe716697888f471a4a662d4b9fa76aefcdb20c1ae5538d6bc5667f3c05c689ee0a37585b6f78d48d22720242daec74091ed67b3651947868c6aa1
+EBUILD s6-rc-0.3.0.0.ebuild 1619 SHA256 2251ae22256b333b1f08daa8c81381a2931a9b0b960da9050fe8350d5a8aa3bb SHA512 30767d3accaed63968c91dba9d4d4eef80eef838cb2505a84cbc75ce8e966a0f5fa60a24942921a3bdec524f49e22148fd012c1212f206010dd8ef7061956f3c WHIRLPOOL d057ddd01f908be57ab1c9e9bc306bac8d180124b7c24453277faf3b1d2437e13c36f00e6800481f86fd48967fac81514b9ab611c11b06c5c91e452b839f1455
 MISC ChangeLog 507 SHA256 9b892d7b9da785b1df61684c571f57bc7b7d04e12c0cbaf97ba18ff63568e8a6 SHA512 c5ad12d9c9322e182ce42971945948ff37afacd4cc93bfdf1ff0f534a36ee7be92e16892854f868cea62ceea2ca63d5186f10ba146bc4fd012b4ac1867d8b04e WHIRLPOOL 98405834d761128ab639a739fbd4ea41eacd2afec21f86e82ad6ed2df5bfb446b78d9543c01b573377bcc54a2b2b195961fbe2b06127f86b809a90b08f73ccdb
 MISC metadata.xml 538 SHA256 661cba228986e0ca89a6d369c7f2aaa37bb606bfa574b3eaba919677ebd5d2e3 SHA512 a2d8e7031c5aa7cd310ad049b796c36498d1cf530c03f3d35d8f795530f49b2a8b59683c9ddc01910375a5883673072d8dab28b15ddd4c53e298e15b400cabeb WHIRLPOOL e6548172067128f98edc201ea193a261c780381edf79ef830db3cdc71309942564cbceb71a3ac76e7f81e3c7fda0599fc135f4ed72f7910c9c9abd2adf569648
diff --git a/sys-apps/s6-rc/s6-rc-0.3.0.0.ebuild b/sys-apps/s6-rc/s6-rc-0.3.0.0.ebuild
new file mode 100644
index 000000000000..9d30ce768b86
--- /dev/null
+++ b/sys-apps/s6-rc/s6-rc-0.3.0.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator
+
+DESCRIPTION="service manager for the s6 supervision suite"
+HOMEPAGE="https://www.skarnet.org/software/s6-rc/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-lang/execline-2.3.0.3[static-libs]
+		>=dev-libs/skalibs-2.6.0.1[static-libs]
+		>=sys-apps/s6-2.6.1.1[static-libs]
+	)
+	!static? (
+		>=dev-lang/execline-2.3.0.3[static=]
+		>=dev-libs/skalibs-2.6.0.1
+		>=sys-apps/s6-2.6.1.1[static=]
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.3:=[!static?]
+	>=sys-apps/s6-2.6.1.1:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.6.0.1:=
+	)
+"
+
+DOCS="examples"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/s6 \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index 228ae335dfa4..7c9d65415b04 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -5,6 +5,7 @@ DIST s6-2.4.0.0.tar.gz 193534 SHA256 5e788d5935dbcce76ac9a99cfcf6ee46a2ffb84220c
 DIST s6-2.5.0.0.tar.gz 190980 SHA256 11413aea4add3aea2d0f3f7515d274ac58d4adfb03661a1f6ce7fa2abd24dab1 SHA512 ffda119167fa334e2d87de1a453ddefafa541be0a71ced95f7eb2001dcc76a01db4a8bda04746c49d2cd26495453f0b39d3dbf57e2a76435c8537218b745da94 WHIRLPOOL 66a98dc92d0b83b3c67c6857d2d4ed2ba9e7abe0af77065430689a276b51088d6287b95fb381a77ee115288fe9ce48a4756aefd5221ccdce3b884fae0a6f4726
 DIST s6-2.5.1.0.tar.gz 191814 SHA256 73cd4c1975905db92122a7c7eebd0c480d046624426800b3bcc5a432e6af27cd SHA512 b8d40b541d6c9b4b78f2aea229eea3188f867dda4ed15626e590b549c0e6bd5114d015ad749faa520e69385272c0960cf6d635a4e51d4e14821e61cab7469fd0 WHIRLPOOL ad9e35e7c6097e07386846daf6a546cf16f0ea83c9ab646d6445fdec52f253aa4bdc64dc20a181125ecdbd28d33011cc0ea3376534852bc5968a3017a9cfb9b5
 DIST s6-2.6.1.0.tar.gz 195903 SHA256 f0de303791134302f2630b9fe76a936b064e1e3aa772c8ae1b891155a6ea2c79 SHA512 e29855cd3c0037d83270318569d2a79a8f616c681cb9c218cfc8c207d9c267cedbb6adc4a6379dbdd29323aef5549810363af08a9fdcc9308d8f6924c12399e6 WHIRLPOOL cf5d29fe60c9c857e8896ece9523c0401e236846bf27b4e6b35f107b5eb3058a2c95dd65673e18c631d1b74d5bf572af4996103ae23a5ac6ee3235d7c6861cd8
+DIST s6-2.6.1.1.tar.gz 196083 SHA256 0172b7293d4d5607ca3ca77382fee9b87c10bd58680720b29625cf35afc75c5c SHA512 08f1af0f2e66b3f60f4a6b1489ae91fc59dd5aec97789cc655ae2ba7841327293e3a3027155d02502b34bcdad40778dfaeb441f100e8598aecf081d9d739c99d WHIRLPOOL f6be53e83dd9d2448ce0291088814b81df4bdf892d661c16f658921c57e4e3d9940dfcddc42b4dea2d23ac4b69b4b8c3e9f360e5e5f057562ebe41be3a61f607
 EBUILD s6-2.1.3.0.ebuild 1284 SHA256 56df00eee98c4d6a44c651c690db712792b8d141765f8a8431c6bb0ca78fe690 SHA512 f5f2e6a032852380cd2991cd09c09f4c55d498c42b33af819893f3f81335db221827e5400633d99f18502d0fb9e8965728d7ce32129f1736aee049c498bcf193 WHIRLPOOL 6fc5fdde3b4cc2180206e7bbf1819a8bbe84e1083de3ffc4baf4f24abba268d87264418d8ff6552d249921410be09b9e7f12e8c6659e37c473f4e9d6e62a14d1
 EBUILD s6-2.2.4.3.ebuild 1252 SHA256 1007c149bba35aa6cd3bc193dbdb6fee0e2f79f8abb1a0b15f06737fbaddc4c5 SHA512 c7a6e48be8d4a208a0d1221bd86fb1da12ce3c9aecfc6f67f690084f4eef2f1afd7c785d8562c97190c27d394d36b6b2156c69c876647cff1509bb9b1e15674c WHIRLPOOL f403e6291e0329469f8d70cc8f58a2e99c618685aafbe0663ae99256b89620064b149c09c7a4affb0ad87f02970ede9748ba5b8c73fda95fadb7e780b2ec3ff9
 EBUILD s6-2.3.0.0.ebuild 1255 SHA256 9a2acfa325e465b5f61b74d0b04b2e3860008d94daa81a658adcdfed1ff90b77 SHA512 a18aa2c7103cd31793fd93cca6e0a6d96ee73351f9242c7818a67411bd4c2ea417c966c624c17c160315e9c222ab407d40a7bfb2bbfc61f88e470055efa4e57f WHIRLPOOL ef21745076cb89cb2989231540629a6eee5468e88ad663023130a8f47567febb01d3b062e121a9247ff2e153d2c9defa318bcc729349a7493c7e54b80ac40f3e
@@ -12,6 +13,7 @@ EBUILD s6-2.4.0.0.ebuild 1367 SHA256 711fda90e1336cb0ff7e0df8f1a4df10cc2d956e6d0
 EBUILD s6-2.5.0.0.ebuild 1374 SHA256 784e583ebd0aa04a0f6ab3eba54c1a20d295dffd270c7b6dc2bcdfde1d9de09c SHA512 ef0e67375e3257ffe9cbd40aac8156d78ac5867e944e51ad8785634ba85162100dcad96382407edb41d075a1c39b5ea0d64f7429e3a4560c10271fefc5256af6 WHIRLPOOL 9e335bd67bbbb8434015fff38164a87578d5195a2b52e4b1e3576c2687af4e6d5bb017df1368b91111ffe8600c185b19b4e5a8ba6ab7b53565ff2b85d366fcba
 EBUILD s6-2.5.1.0.ebuild 1513 SHA256 364c545135e2b2c226013d2f248ce405af49f596ae641b35e0b0cbb0a3d32237 SHA512 4b63aa06da36d262803900b63fa5e4e5f392b4921e8dac29fe412ccf1f89f13a83e50f8647a98d2925d816f0168b93d80322739c3be4cc691408d7a6973c3bec WHIRLPOOL 7fc06479e67b17c9aab9e4b0172629c8c5e928f8cf508656d5dc2cee549f1c6b048acb3d82fa8b125b7dec73590d388ebd19d6b0040deac2134c676a0b08b1a9
 EBUILD s6-2.6.1.0.ebuild 1513 SHA256 891c750cf9c5ed92e8b00c702d26e08d82f99d6b920b964f84d613703ed61303 SHA512 7eac0267f0b72fea14074951d324e8c538a553fadcb14cb41b1d88fdaa79da74bc8ed57975123d06b131d08d21cb16520d85264fb3dfcab36aecff51a9051bc7 WHIRLPOOL fa9ab1c3c2a2ae7046840cbdfbf837abe646e61fbd2a8076fb6c73665245d4358ec0ab58ded7adb358efcf61685f26d0f6f38052621bf09be4b958246c959fc8
+EBUILD s6-2.6.1.1.ebuild 1508 SHA256 c05842734c165762b9f2983963e74547d964c3566ca30c7631cc3ac2785a04f4 SHA512 194af6e8227a1f63e5285af765dcb43ae3c06e07daa33c83718e73077d3a3848e1edddef3acd49e48618e2ac10c240bb60313338248a1fc6395b326064cf6a6b WHIRLPOOL 5ca9fdc1c16e6102c19e9fbe811bc74d4d60a2da86a86270915ae3c2e47fc792e955132b2dbba24bada9e13cde5eedd8e22494f2d73b766ff185c295bae6663f
 MISC ChangeLog 2913 SHA256 eb8570413326ee9192d4f6dd0bffc429511824473e7ede4cb9de4fc43c8f40f5 SHA512 e7930577096d6773591ab4585b9f64d30a356f5eb9d1d4a59e5af588ca61aa112c3101a2b477e4328ace19af796a0c3e1c811c91606bde221c7a9fff71c64abd WHIRLPOOL d8c0c8d2eb58819509cf3adc71182a14aaa68b6c473de11f4d706930e9f23703e5d228c005ca953263a47f7d6dbcf78badc7fcd22c24528310c42bbfbc1b0cf3
 MISC ChangeLog-2015 1054 SHA256 049479a173db2aeba829767d2afb7c5b6256adccee8c600fc706a715559c912c SHA512 6f958a41c4c2ae028090a21240b9edfd64d91b0edee96387d5d5248a7aaf70f3f2de435ae71f4594bcc0eb94240ebdc95eeeec28ebcc0e494135b90714e6f583 WHIRLPOOL b364e1b6c15e266cd99ea47a4b895431bc1045e87c6a7d72408470ec1f6b918cb266791c5838083e82c12b645343735430c9b397b3bd33a9709751ce885a96ed
 MISC metadata.xml 413 SHA256 29dcb799242dd647f72a11287b178986e326f5877c55bf41dce6fbf9985cc8e2 SHA512 000e085535127bf6a340451b6cbd51549dd2f1f9cba1bcf76dde590f628f780fc756f344844982f1d3a6ef69299b6db4fb71ddd92f72650e38f7a24aa541257c WHIRLPOOL cdcc97a9f10edac6ca43cdd8eb0c1d4607199e7cda447a6ee4edb6f3d9147869fece74a74f2e9fe1fb218fbc2a7a7f3c11189d2c135e8d80e9914476e4404646
diff --git a/sys-apps/s6/s6-2.6.1.1.ebuild b/sys-apps/s6/s6-2.6.1.1.ebuild
new file mode 100644
index 000000000000..c638efeca0aa
--- /dev/null
+++ b/sys-apps/s6/s6-2.6.1.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 versionator
+
+DESCRIPTION="skarnet.org's small and secure supervision software suite"
+HOMEPAGE="https://www.skarnet.org/software/s6/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(get_version_component_range 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs"
+
+DEPEND=">=sys-devel/make-3.81
+	static? (
+		>=dev-lang/execline-2.3.0.3[static-libs]
+		>=dev-libs/skalibs-2.6.0.1[static-libs]
+	)
+	!static? (
+		>=dev-lang/execline-2.3.0.3[static=]
+		>=dev-libs/skalibs-2.6.0.1
+	)
+"
+RDEPEND="
+	>=dev-lang/execline-2.3.0.3:=[!static?]
+	!static? (
+		>=dev-libs/skalibs-2.6.0.1:=
+	)
+"
+
+DOCS="AUTHORS examples README*"
+HTML_DOCS="doc/*"
+
+src_prepare() {
+	default
+
+	# Remove QA warning about LDFLAGS addition
+	sed -i "s/tryldflag LDFLAGS_AUTO -Wl,--hash-style=both/:/" "${S}/configure" || die
+
+	# configure overrides gentoo's -fstack-protector default
+	sed -i "/^tryflag CFLAGS -fno-stack-protector$/d" "${S}/configure" || die
+}
+
+src_configure() {
+	econf \
+		--bindir=/bin \
+		--dynlibdir=/$(get_libdir) \
+		--libdir=/usr/$(get_libdir)/${PN} \
+		--with-dynlib=/$(get_libdir) \
+		--with-lib=/usr/$(get_libdir)/execline \
+		--with-lib=/usr/$(get_libdir)/skalibs \
+		--with-sysdeps=/usr/$(get_libdir)/skalibs \
+		$(use_enable !static shared) \
+		$(use_enable static allstatic) \
+		$(use_enable static static-libc) \
+		$(use_enable static-libs static)
+}