gentoo resync : 15.11.2017

19 files changed, 1000 insertions, 110 deletions

diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index af4f77946b46..54eae72e4709 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -8,7 +8,7 @@ EBUILD dtc-1.4.1-r1.ebuild 1126 SHA256 1a5aae1924431adfc3cf7a081ab8aa8ae95660354
 EBUILD dtc-1.4.1.ebuild 1030 SHA256 76c4ccc00299c2d024cb3f30295d1d9633436b2cfc0a4091c19fa465625ee4d0 SHA512 763ae7ca11d522cbdeee7ea5675805ddf7d17d0cf773091bf0978b30bf7fec1ebef64904a8e0b291eb3139e4295cb1dc1d833a8afc5d6aa09760fb0ebe5fa72b WHIRLPOOL 64962ff16878b2d87345b4380f09ce8c7b38e98dafd4680a03d443cf5582e2778fdb4e81b93360ab2a014ca85182e2843b9d2200a0c0e4a6b64e1ab07ceb1323
 EBUILD dtc-1.4.2.ebuild 1055 SHA256 d3d0e0629ccf3b6672df8d38d27cc28714c34b7d30e12c5f4446ef641fd6de90 SHA512 caa47d8d9a68a473712aac7cbbd6cea0d6bbd3cce9e598236be8d13f7d64013516ed9aa1a91099117f204bd9a12e91e7d907a04fb490c0c2895ff1391b0ab9dc WHIRLPOOL 60441be91d18fb9d873867a8db128208d5641904838b69c1e9c6b506565b42d87350896d8744951dba0bfd833b77c81aa6fb53c7e0e29d092ebe160bcbe38aed
 EBUILD dtc-1.4.3.ebuild 1123 SHA256 9195730cda86521c27fcc1509e55ceb61e02f0451bb540a61b2ba3f1958e64df SHA512 a22759aaa334a1276e2f7793787f357f4b9e72e04df87ed21debb904d713415574673832e8fc87ca60d45eb7bb3e69b549463a610c63ec0a471b5010c3603930 WHIRLPOOL a9d4644e900a0fac520d9ecf1b8c3433fb09f2a35740e1d0ab030b9339792c0090aa64cf3eba16acf766d38d75d1fd14fa1bba10e71926c98c590145bbf600bc
-EBUILD dtc-1.4.4.ebuild 1123 SHA256 9195730cda86521c27fcc1509e55ceb61e02f0451bb540a61b2ba3f1958e64df SHA512 a22759aaa334a1276e2f7793787f357f4b9e72e04df87ed21debb904d713415574673832e8fc87ca60d45eb7bb3e69b549463a610c63ec0a471b5010c3603930 WHIRLPOOL a9d4644e900a0fac520d9ecf1b8c3433fb09f2a35740e1d0ab030b9339792c0090aa64cf3eba16acf766d38d75d1fd14fa1bba10e71926c98c590145bbf600bc
+EBUILD dtc-1.4.4.ebuild 1121 SHA256 9e469ad455cdf868921ba57ef86b02ad4a7370d2871918c2273edf2d29cd8452 SHA512 bea9060f27a2fbfddecf0d3b58ca26c429166e5efe71678f6f3cdf3a59b71c4e27ce6f9ef84806c6527d8804ee7a0a1ceb323c81e301c5f44f3aafef7aa5721b WHIRLPOOL 2fb5eb0cd0ab4b20504337ee5c14e75f728e3b13c4e8850b38d256bcc2f217f17cc02c4a50b1bd0261698cdfbd1b4cab77a677cf48655250479d537ee87e2c01
 EBUILD dtc-9999.ebuild 1055 SHA256 d3d0e0629ccf3b6672df8d38d27cc28714c34b7d30e12c5f4446ef641fd6de90 SHA512 caa47d8d9a68a473712aac7cbbd6cea0d6bbd3cce9e598236be8d13f7d64013516ed9aa1a91099117f204bd9a12e91e7d907a04fb490c0c2895ff1391b0ab9dc WHIRLPOOL 60441be91d18fb9d873867a8db128208d5641904838b69c1e9c6b506565b42d87350896d8744951dba0bfd833b77c81aa6fb53c7e0e29d092ebe160bcbe38aed
 MISC ChangeLog 3317 SHA256 b6271b61e3ab2252e380f48aacb7db226f455db3a875aced5800760d6427d5a6 SHA512 513e3b2997d8b251fd5261972828bb072d18bbe8b35e2424bbf0b3b47362119b8e6ab317c48d77f823d9cd0065a82b7a3cd98331b005bbcd0e14e0aa4dfc5718 WHIRLPOOL aeec21f5f7d2773474335bbbe0c93a962fa6fddb2720679be367ddd6b828e19b8ac73e274a4d5d051c0ce12082cec76d4162d67a4c4eafab59bdb202714d1558
 MISC ChangeLog-2015 3669 SHA256 63f2f5d518f84cede19667cc44f18fdd0bfd72ecb26e3e5bc223d36e3b957dc3 SHA512 d58a0f2d8f2e5ff69679244bb1856ef52ef7f2092698d5cb436af65ffbe52bd2d7e01c43e02e1d7ca98d13eb910afaedb05318fe2c69d8b34992d5ea9940b953 WHIRLPOOL 884380f8a8168521e8fc36d606f139f2df274346eecba1431e64d7fdf6fad8c39d8d3da32e8dc53fcff1e9945309e0e26d5c616cb4ac76a0f8ab668e65366dd9
diff --git a/sys-apps/dtc/dtc-1.4.4.ebuild b/sys-apps/dtc/dtc-1.4.4.ebuild
index d5288e84280a..d0a06ff6ee97 100644
--- a/sys-apps/dtc/dtc-1.4.4.ebuild
+++ b/sys-apps/dtc/dtc-1.4.4.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://kernel/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 fi
 
 DESCRIPTION="Open Firmware device tree compiler"
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index 2a203afc6a84..9b7bb49990e2 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -11,7 +11,7 @@ EBUILD fakeroot-1.19.ebuild 836 SHA256 de099168490518d2d4dbc53f4f4bd636699405073
 EBUILD fakeroot-1.20.2-r1.ebuild 1008 SHA256 d9746d683e948a4a6609b8c590763aa046ca42b14504dc36092500ab88296171 SHA512 de5fb74abfe42b1a6fe4a3aaf2c25db69c5ccb4616195f721f66bd0491e3560d50c79086f40cc12d8749632d413c75af77156010043186e99e063e726468741e WHIRLPOOL d12e98f38c7fb0a1ae0bb852dfb3a56fa1168571eebcbec9939896478f6fd25b7f787980d8dfc47a8c94c87e4e40a0b67d274b1fa879a7ac29cf937c3d2db93d
 EBUILD fakeroot-1.20.2.ebuild 921 SHA256 ef94a2c5df96ea2c0104adbd14e5c7ef97a0ab3496ca813528f0c2a8062e9d97 SHA512 72f0bd48be4ab63a2c012d01ce58a639c31ecdf2c7d5319d45d4b7554258d82b30636e66127f8e8578390b4ce54a0d9166466644570a266c173b92eaa380f21e WHIRLPOOL 5d8e07143930db5944bfb9b3be92a9b1f5c3a3a8fcc7348524084bb9bce8cb512e866b7e586188eeafcc899996d82ef74f1033eb8f24184403e5041d00799675
 EBUILD fakeroot-1.20.ebuild 917 SHA256 e5e2b3dfa8deae2dbf4316ad9edba0ba90d62fa73cefd369292d3bbf88a9c226 SHA512 178ef091b3a1ba0b314390bd5e4ca4c7da91efff9b053fc97f16e21fc2b5b634c38f4df40b2c712952f6efd6b8aa4358c3e3533a8f6523ba58b68ff88c44ae92 WHIRLPOOL df80e241fd91721dfd289fb7f769117846ff5e0c3bec2731c46018bb1be0a82c598c6418780d9fb58078e2def289e31378e55e084b15a9e23b1ce17eba6881fd
-EBUILD fakeroot-1.22.ebuild 1039 SHA256 79bbfbe5340796138bac351d09f5bce9625c539d305124eb1268bee53750ab9a SHA512 710e40e5de2c3f67c764b058b81611e70aba309403daaeb407e07873fc5e7e376caae3969202cfe0fce4e6e11d85e7b716061bf81f18834bf914275c1d79d59a WHIRLPOOL 78dda732638cc89c04b98bc51b409ec04818d110f0ed711d2fd7744b6436a24fef41a73d289d95339b9ee9cc97c8b582768d8299003286561cf959d81d2b5b85
+EBUILD fakeroot-1.22.ebuild 1038 SHA256 b5b4095af0ccd396ef703002e07fdc4abb0f3cae4b00a0cf421c76d93206a609 SHA512 50236d94bd6859ffbbcf533fdc8e5181da6d0f991a4e7882bd3c969642c6332bc66ef1db635778c8080e03e6afbac699e56ae319e94c5595d2ee57fb58eaa603 WHIRLPOOL 51f9ba628c65fdd76de4a0fd4567719d0ebd855a460fce2a1d8b8032ad47414aebdecc4ff65006116e1ceb7ca3f116ca1d076d77eb5b0bb256a5b92574b1b573
 MISC ChangeLog 3481 SHA256 2982a484d6cc7a8e4d017812e6e3ee587d5e524db9722866e41c67c412461476 SHA512 4d5f6ac2bdc0e25ad3fc879096d759b3adec7dc2fd7b9b3ff6721d4c8bc0b4ba8f2a963387ac6e7477e1e68e37be6b89c0f20b4f6e5b88171222f2d131aca709 WHIRLPOOL 14ec521b4336fc299d3eee695e10f0ce74ab676d2956e539e1196efe6ea6ae77cb0823ce28aa1972810f67e63a4470834502373f8a349b635f91d139aee67c16
 MISC ChangeLog-2015 12966 SHA256 4fc52018ed3ea26a859336695afb623625a03fc5611e7d215a343b443c5b212e SHA512 559bdb467e31c70c1ed76272a0640e910338510742584751c2b79ccb5d899899e882bced12ba0d3a1854d72d6b40993188d3ea075ef6b4b7da2b0ac812918a3c WHIRLPOOL a2a179102e270aff3af52e04716b8923fbaec0a0a4267a40f1d36213f2a818af1409f5f8b907d1a53e10301a722e34562e98135f12fe3485fcf55eed24b0b442
 MISC metadata.xml 257 SHA256 c1d4bdabe699c6d9fcdf3b7794a13b45f69e3826b814b422e4ca7e6893b99012 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1 WHIRLPOOL 4afcbc79dd61237c778735b39060b3e294fdc07da5b0da6f7b40db92649ac71febddd7a0265502e102d8eec9664fd5af2071fff9428bfcb0a6bf06cf70c68a3d
diff --git a/sys-apps/fakeroot/fakeroot-1.22.ebuild b/sys-apps/fakeroot/fakeroot-1.22.ebuild
index 379d8d74759a..f20c50a61c85 100644
--- a/sys-apps/fakeroot/fakeroot-1.22.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug static-libs test"
 
 DEPEND="
diff --git a/sys-apps/gsmartcontrol/Manifest b/sys-apps/gsmartcontrol/Manifest
index a56a0e4684c2..16f0187739a3 100644
--- a/sys-apps/gsmartcontrol/Manifest
+++ b/sys-apps/gsmartcontrol/Manifest
@@ -1,13 +1,9 @@
-DIST gsmartcontrol-0.8.7.tar.bz2 684394 SHA256 708fa803243abb852ed52050fc82cd3592a798c02743342441996e77f19ffec6 SHA512 3258ddcb448460afeef8d617ab5bb4720c9b2444452bc45d6798ec645da4862236fbb3fe0116a1cc904f5353481df87603bd2b6d808f348c250bde3624c8403a WHIRLPOOL 24fb546c7175306c8cdd8906b506471d20668de0cd078a8205ec87eff50ce0eb52dc04b3b05e771f8789ef852e5f97675c7c224ab6450d90a3e2ac3e51578d2a
-DIST gsmartcontrol-0.9.0.tar.bz2 710515 SHA256 5da6435aa0845acef134f72c2b5f6fce79f9c51bebe9d099402e0f21a3388651 SHA512 c7a6f4dbb748bdef14a3a18a98d30f8ba8595017c99d7ac6817a33d537f19ab55d2c5674fb1f44f77381e54e22b894d8cca700554186a8132b04249001fcda98 WHIRLPOOL 2b9e926e86bbd351ec3ed331abec508cbc129e1ca340106ffa2cd8aa8f9db13c721512f8afa4e70cd83ea1ae855e0fb494223264129ce6a583fb717d69d2a1ca
 DIST gsmartcontrol-1.0.2.tar.bz2 695445 SHA256 4f70451c359d95edc974498b860696b698f19b187340dc7207b4b38cbaf5e207 SHA512 a9dd037fc4223afa762408bc34325fb31947822250efe32ae97b88e836c5bb68d8354d7605925b2ab7c834764ea473a14f2cd1f234577ef76730b02ad9a8b701 WHIRLPOOL 679c6b9fa739f624a1bc523d0c17454cdf69e5899e086044c134116c609aaaf1a4dfec48813bc9b76210b1023623c626a4d9b55bbffa8c603c0340549eb5a028
-DIST gsmartcontrol-1.1.0.tar.bz2 683898 SHA256 90c9ead852255f5e1a74a3ff6c265d1cbcba19ad2fc77059c60737c13a3cd2c8 SHA512 c82a7d40a4347ec7c2c5fbd79b8f0035806a54e2dbdbb3fcb8ddba9c92b33a9b737f293b9f959436d0925172c832cca959dfd4a605e19b55aa5cc832c4cee024 WHIRLPOOL 6e22b757fce2cd07ed1133c97c22d8c5d44d0738dcbb342dfd9084b119a92381b5f9ddee2ab904fb576bca0ef5556df6641a8838d3fbc09d6490a8d6f257aeda
 DIST gsmartcontrol-1.1.1.tar.bz2 667372 SHA256 2e39ad330829ae93824732f1b663303ac9ea1223f703901fae28549a3b2d7518 SHA512 fc180b85a9db232add4260856e078a578801e11b87df417a5572fab284e992c85009ab9e7d9d6213b2842097067fc119fa0183d5b0dedf8dde71fe4e9e0b38cc WHIRLPOOL f38414b454e0a72904cb1b19a1d10ed6fc7ec3b75422427e1a9f9aaeb6d67946fe773927195af3772ea5320bd613fe984bdecd96313b09a34b0fcd35b3153324
-EBUILD gsmartcontrol-0.8.7.ebuild 985 SHA256 ed7f7e0d2b23abf6d0b565e6f81323a36dbc74fce20b7985520f26e53a509308 SHA512 7b75e313a0d31f47a7de2811bb79cdf2db4b2e8b6c7a2018067d86c94ac5bca69dc728884aab1345dbf22d0839ac4da500f5261db42657e8800e376c7cec8279 WHIRLPOOL 8c17a544bace66004775f3b043ed7d2f7069b2cd99ca154629dc44561ad6ebd9bd7d19c690fd586bb6ca1cd1e24fceb7ab4f665379337ec9bbb0c068ef423f4f
-EBUILD gsmartcontrol-0.9.0.ebuild 987 SHA256 8a58316fe685d64e8b1d6617d6a4fb4a34407eba5465ae1525133e1cb18639d0 SHA512 dffca954984e0a59e03a821b4958f8a12e3c9aab39c2bc6c134122bb7c61e4d119287923241dd4f67875506b8814529bfafd85da2fbebfa7cd8b2e8b5f4166f5 WHIRLPOOL 13034b74c2fac89b91956cd584668f8dfb55acd94ee8e8347e5dea29710eb4a6aecd9b880ee64c9b43e27162c0f9db0e32b0c8c8fd9262c0d601dec6f0ae49a9
+DIST gsmartcontrol-1.1.3.tar.bz2 677998 SHA256 b64f62cffa4430a90b6d06cd52ebadd5bcf39d548df581e67dfb275a673b12a9 SHA512 7a8bb79875a53d742923fc8ff8336d7fbbdaf2e1b1f64296840557997125d4dcfea9a93a5e8a834003d592083a180ee85ca0e29d3aecf0eb475a3d4fed460456 WHIRLPOOL c8554deb4b7525bc544d654371443c68a82b5b02eab3e002171e40c8b43a21b546f81ddeee7d2130c1d841cde1095d90a1c6a166ed79de018ca3d010f267ce13
 EBUILD gsmartcontrol-1.0.2.ebuild 985 SHA256 c7c0ef1b3c9f31c2cf3951ac885eca4842b95062dbb3df9caa8a3c7729df0711 SHA512 d94227eae7f6e3b7ddc5c728efdbf4ef1994de75dcd7596dda6a80591e8e55769aa9dbdca98003031efaab58ed7d4e4cccefa17bf1585ab2938deca86be7532b WHIRLPOOL 050e816ad044ac7d0a0a8d8101fc43de59a324c9c3a17034560b5309c9cde1a1db7b53cb2814f08c7f4c581d5e55a4f381b0829eb42755e407ef821bc28d39c9
-EBUILD gsmartcontrol-1.1.0.ebuild 987 SHA256 e11460d797005ffe97eb4c6226157c7f4d68461e61d88076a43f0a451e7400a0 SHA512 1e968ff6815c7479268435a64aa35d86bee145d71f6718e3208296f00766ce889a026f351b95af4dcd9f9ba2e67945973dc430a30e91832223ac94ab3b245ee6 WHIRLPOOL 4238fae00560a3d19c860945aaa30feaed7af0dd98e6034f6a10c15b8bd5d329ba6a9141e4aa775381d51b85d6777bb2e26013bfb8c42cbdd6b508dcc0d8df61
 EBUILD gsmartcontrol-1.1.1.ebuild 987 SHA256 e11460d797005ffe97eb4c6226157c7f4d68461e61d88076a43f0a451e7400a0 SHA512 1e968ff6815c7479268435a64aa35d86bee145d71f6718e3208296f00766ce889a026f351b95af4dcd9f9ba2e67945973dc430a30e91832223ac94ab3b245ee6 WHIRLPOOL 4238fae00560a3d19c860945aaa30feaed7af0dd98e6034f6a10c15b8bd5d329ba6a9141e4aa775381d51b85d6777bb2e26013bfb8c42cbdd6b508dcc0d8df61
+EBUILD gsmartcontrol-1.1.3.ebuild 987 SHA256 e11460d797005ffe97eb4c6226157c7f4d68461e61d88076a43f0a451e7400a0 SHA512 1e968ff6815c7479268435a64aa35d86bee145d71f6718e3208296f00766ce889a026f351b95af4dcd9f9ba2e67945973dc430a30e91832223ac94ab3b245ee6 WHIRLPOOL 4238fae00560a3d19c860945aaa30feaed7af0dd98e6034f6a10c15b8bd5d329ba6a9141e4aa775381d51b85d6777bb2e26013bfb8c42cbdd6b508dcc0d8df61
 MISC ChangeLog 3071 SHA256 890cbb0f3bb1b6e679ae0e0700cad3a2fe41aaff68e7f5d5ee066c1ef7dc9b0d SHA512 3b9ccdf4120c06af0e90c7fe8ed5a4e49795b1d8695bb2271bc477fb564f3aa103a94c46f7f3aa1fda5f0410ca7262b0baab67c3be62fa37967b1ef74e14a851 WHIRLPOOL 2e0c8d3c43c2716907dbe9d997ef7082be9bf273182b62f6d14308f6b26437d716c6a5f0cce445901194f7f80b44759d9f300197ba5a476e6c041e788c665580
 MISC ChangeLog-2015 1161 SHA256 ea76dfa40483f7abb93a0e349477539e4a51f4944813713041acd76ba5559e1b SHA512 364299b5bf15b8f619f6be80aa8724708aea40b0893a79ac4b48589d83e5749e771f5261076ec6f7fac55b5600abcdfe79e3281b9e5f5733c48db36bfaf11694 WHIRLPOOL 39c3b5a86bfa3f26f683983f94e524b4c6afd97dca1f0aa6a77d252b042b406f723f48ad184e87bd9abcb68dc2c5ff7e100a865c6526ba2ac94fc172bd6c7a8d
 MISC metadata.xml 340 SHA256 5b42c768af48ad29d48396e3791c86c64318f920373ded13dd01ca98537f92fc SHA512 f769fe192e485692a86f1ac75f8de07be0a8f5c2ddd7d3ea0a526d271881746417e01e09e765e3160f7d8b516d9240b5bb09030dc18ea9551192fbd8df5b4cc3 WHIRLPOOL fa0965920011e1602f5424e176499d2b378c9867bdf3d8d092f3e924eaf2ae6eb89df08eeb95008b87484288e093b7dc7568a1b8baa7cdf6e7d7041a259d4dda
diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-0.8.7.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-0.8.7.ebuild
deleted file mode 100644
index b166b89b92bb..000000000000
--- a/sys-apps/gsmartcontrol/gsmartcontrol-0.8.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic gnome2-utils
-
-DESCRIPTION="Hard disk drive health inspection tool"
-HOMEPAGE="https://gsmartcontrol.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-COMMON_DEPEND="
-	dev-cpp/gtkmm:2.4
-	dev-libs/libpcre:3
-	sys-apps/smartmontools
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xmessage
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	test? ( dev-util/gtk-builder-convert )
-"
-
-DOCS="TODO" # See 'dist_doc_DATA' value in Makefile.am
-
-src_prepare() {
-	default
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	econf $(use test tests)
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/usr/share/doc/${PF}/LICENSE_* || die
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-0.9.0.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-0.9.0.ebuild
deleted file mode 100644
index b05b530fcf28..000000000000
--- a/sys-apps/gsmartcontrol/gsmartcontrol-0.9.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic gnome2-utils
-
-DESCRIPTION="Hard disk drive health inspection tool"
-HOMEPAGE="https://gsmartcontrol.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 GPL-3 ) Boost-1.0 BSD Unlicense ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-COMMON_DEPEND="
-	dev-cpp/gtkmm:2.4
-	dev-libs/libpcre:3
-	sys-apps/smartmontools
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xmessage
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	test? ( dev-util/gtk-builder-convert )
-"
-
-DOCS="TODO" # See 'dist_doc_DATA' value in Makefile.am
-
-src_prepare() {
-	default
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	econf $(use test tests)
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/usr/share/doc/${PF}/LICENSE_* || die
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/sys-apps/gsmartcontrol/gsmartcontrol-1.1.0.ebuild b/sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild
index 4757ae7e2385..4757ae7e2385 100644
--- a/sys-apps/gsmartcontrol/gsmartcontrol-1.1.0.ebuild
+++ b/sys-apps/gsmartcontrol/gsmartcontrol-1.1.3.ebuild
diff --git a/sys-apps/init-system-helpers/Manifest b/sys-apps/init-system-helpers/Manifest
index 6e735d003aac..d71d5cd5ade4 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 785 SHA256 863371fc153c25e59074916f469363d50ec0a2e68e2dd1c7a5c98bd537bd7373 SHA512 c0c4b59341b8220b727a9c6df61e94b1cc46c47462864b3fee30dc32411e5a0f02d89cd97becdc09f0874d516c0371abb690e71381e88bf7cb81f303b0befd7b WHIRLPOOL 8caa6020825746dbbf53aa9aff7953cb1f54a61fc0ec69b9116649247143876c3605fd3bf0e26858dd5c65266aaf85b82a09651766efe869bc4069833c610da3
+EBUILD init-system-helpers-1.49.ebuild 783 SHA256 e0d0bf291674d8218dc848bb799d661b21a649c97610eb8e1b1d1665a6636a34 SHA512 0ca9a953ecec9d07e54d64c598ee0b5bc346a77a6a17a7a85caa65a177de77c12e9639e4adc1537dd412998152aef46116b8cbe65dbb8d35ee0adc0b474eab7f WHIRLPOOL 7cfe313eb3927fa845ccfa6fb2f63bd8e1321bc166b8904f6340eb9d2de913417a675d45d40ccb8bfc426a11eb425e8f1c9983f43aa2b53973065162f488092f
 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 06a29e97d0fa..1e20a0675067 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 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 6b406977558c..d392e3a3f755 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -7,6 +7,7 @@ DIST iproute2-4.10.0.tar.xz 626944 SHA256 22b1e1c1fc704ad35837e5a66103739727b8b4
 DIST iproute2-4.11.0.tar.xz 657100 SHA256 72671028bda696d0cb8f48ec8e702581c3a501caeed33eec3a81d7041cbc8026 SHA512 e6cc3dbe2779670a752ab346c1a432b496033448d1645aa0161b3f7b683b3f9939ab09db12199b794cc64dff257faaf0d151046feea9031a6139176e08b4f4fa WHIRLPOOL 9bf25b018d3f392a2e2f4faf4c3877f52ec4b0aebb082d9c2e2c3e80c0c8f3885c122c5d211c4c6ef014506d786213b36938728f63b581079274a3116fc85581
 DIST iproute2-4.12.0.tar.xz 662424 SHA256 2e0a4c4262d9f6c169885a6e16c4c5c5f1ef6fd57b6a0e7b41f42be5bb6ebd7d SHA512 275147f71e7c4698654f0d6d0981ab42f6f108066508c15cfcd5d9e0d3aaf8d33291968d9f06cb03f5494d801cfabf8d53308aaf56fc4fa92c52b137e970a3b0 WHIRLPOOL 590cc191e96ff0b777373603186e4416f064931d529878ec783759f31fd99e1119bb0604e8a89dc98d350f80eca2bfef05a13bca7ce24302408072002c0b17b2
 DIST iproute2-4.13.0.tar.xz 670340 SHA256 9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50 SHA512 f96d2839aec1f439bfac504c8e3881c063dacbf4c67b15f0e3da9882d2fa013cba33c23602de3eab624e0eecbb911a13967d60bddcdf097f47a580a5a77b5e3a WHIRLPOOL 757247f1356eef49b299019f6d1809e5d781471665daedce885201b7034a6138def73c84ba2f0453f2f0f5d55cc2edf778992b3d79d06e01364c511373ea4644
+DIST iproute2-4.14.0.tar.xz 636872 SHA256 fee001307b3c018462cb010e3aa19b38017de26168d5777c05ee73a21d60fcd0 SHA512 dda8b7881d82d6d38449d69df362bd3eedde6c7f4dd315d6eaf7969673805faf82675e1df04d7dc35a826b0df429a400a3f8ac0e998c1de0d6ca500e722f058e WHIRLPOOL 62ce4fa8ba1bb84678277401c07097b26490767cd55a66f2be743dc1fec4610033437517c44339dc4cc95ffe0d255d804c25cdd6e77640eb15453160abe87f78
 DIST iproute2-4.4.0.tar.xz 528552 SHA256 bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514 SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69 WHIRLPOOL 7e90c98805e12b28de284bb998e5a27cf524a78d0bd7632c0d49a7ddff8f11f5229ac6867076e9fea6f21b6b31360bddb21138673d94de766bdf7324a09bc013
 DIST iproute2-4.5.0.tar.xz 554500 SHA256 3f15292f53e465cb5bd6652961343ca64eb6936309ae75be5d5a541435bc494a SHA512 d12be24cf7a1102be8e449d1e95fa67b784d505e98fcf2f18caedf0136fb378dc439f74a75bc0d6ef5b2893e5ca1968e122054404c1f4d1a212aeb0fba1c5860 WHIRLPOOL dc660bde36fed126b27fb69a59c02405b5299b92a6b519ebdce74d817f88be82114bb10217ca34bbc26a89e664ff243e606a84bcb00db41088bce824542def40
 DIST iproute2-4.6.0.tar.xz 570960 SHA256 74fc6a8ad085be095a159f8158bbaf385b42af9e101619f233f1ae466829d406 SHA512 1e3868ced65012da6724744eb15e6bb8e2c5bf8d7a46cf2b655526de1a9e1224c7b7e9bd4a88e40516b5648955987eb9001600ca5afbd507bc664f92b51ede9f WHIRLPOOL 1b0ff7988d6d5567137aca9d41e2cc3183f3620f8b874113ff9e6ca9508349550e388e423c54b165e73ed54ccb7a366ef8d032a930f27722eccbd5ff6879032e
@@ -17,13 +18,14 @@ EBUILD iproute2-4.10.0.ebuild 3924 SHA256 3b339a51a5fd169b0c52c19420efbd94372938
 EBUILD iproute2-4.11.0.ebuild 3925 SHA256 cfb0ed2bbcc11f910d4d54e082c9f9a8b7e93d365f03ab3934b498dcfdcb3090 SHA512 73ed00526600bd301c6a1c492755f106d865b7f8e66c108ce73ba11983f6c312897e7bd838b6c97dc449a4084ff8db658d0d234e2b1b8630fef8606763145f0e WHIRLPOOL 54dc2b4bf7701cb5d68ec087ee57a99a4bb7f992429d5cf5548e30fa636a898b9ee1df256bfab20e7987b1c7825aec3f416a518b0067858a6e2e140fddbad3bd
 EBUILD iproute2-4.12.0.ebuild 4151 SHA256 8da18d0644c1884e71d832d8a025296f7dcfe64792d4b5b36b9f781bc857e807 SHA512 693dd7b0a789808df696bb6dd00a8b116fb8d316049c072c01969a50c340339fe47155c24b5024fdc84d932fa0d78572f3054f8ee3c3131e8815821b9d49e117 WHIRLPOOL 534a335da8acc819bcc35893dab908f0cd80c685d996579cd305930c62631c404f86b995e3d24ed0d154aa4f17aff45751e812aa283f269a9b05aaf56c19b97f
 EBUILD iproute2-4.13.0.ebuild 4152 SHA256 c9a12602ea8108a64f409815c33ba2079d761c81a67d344fe46ecc6223615ce3 SHA512 c5658a84ee43d217f2ecfc12d4cd49c0a786de6fcc6ae761246cb1037b871f4df78f4eb9b4b9a29833548a657199e1f7945e3ece12a3368e8dccebce8b9f1126 WHIRLPOOL 18810a01d03fa585f2073ec8b92f3fca423242bcf62fb9e11a3e46fb006f30a4cab930b5ced823e2b7825145856e672f92cfb5c40b8dc3d7d6b3b60f1d138f25
+EBUILD iproute2-4.14.0.ebuild 4089 SHA256 c9f4511f2176c67f351d568d8255b97658348d6dabcf90ce345770757255515e SHA512 e38f579fd454977b931eec41ee330f3fd68ed518b794f99f28f3b7ac29e017a7becbcb804375c283c85750d1a0627eabfa8506fd186d68681d36bfbbc25d8268 WHIRLPOOL 51750160a0032af5e40cb4ceaec5022e92db0cfcf144bf0a1bbbf106260fc9d33466754fce430cbecd7ada7d7f20abdac2ec10af1c67f975346aa309eef3c405
 EBUILD iproute2-4.4.0.ebuild 3812 SHA256 debc018e39311c813eee804dc3a4282a537b6218672aed54f9429a9ad2f3592b SHA512 d99440593d086b917f2609cc49059a4a5bc52db916cebff2a283d3e2c6123c69a95d56e4a74e5b155b238e8f0099ef500dcfbc58f4e68b6ba213fbd7a4e7ae50 WHIRLPOOL 7ca917a647f28996e56363dba5cc16bd387d1e42788a6605fff7eb81e122cd6d1fe1b232802c7e58de38dd0fc9b310054971b503d365267f332aedfc91ddb576
 EBUILD iproute2-4.5.0.ebuild 3825 SHA256 30a5b73a154073434ae226ba712b64f97aa3087fd2dc4a0bced65ea861186845 SHA512 a9b67ca2b18b209bad3bd608543bd77890a0339ac9e0cf858d8bb3c6a0dba75e574441366df9f1dfed47d2ba5c2d1f59a686771120cccad571bf30201ca5a07d WHIRLPOOL 5a754c72a08025aea2e2cbd769eb59657f0b4d951c79aa6139acb1b5954c0d4f8b3be35987595968004fd01f916b62d7d3c7248095d862def99fdf431af14478
 EBUILD iproute2-4.6.0.ebuild 3935 SHA256 4cff6652032330e999e738cf59199c89378f40fdfd604c3f2a955ab1e2060f2e SHA512 9c492347beda71bc69bfb176bc3dcb3668b7c2545d0afac3a95ba7672f0daf1c3b25607864c8f7d41cbac522f0b0a9fdf9a5795f7e05e1ea08be94253f498778 WHIRLPOOL e181a0390db67cc02190fc50ae1028fc5ec4fc656c35ad4db092b3b340cf795d96ebb4ea4865afa28c1b58f9308a758c60aade6eeddd8048164a068c23447d64
 EBUILD iproute2-4.7.0.ebuild 3936 SHA256 e77a400092f03b5e14364c6d5b8a4746cb82576b70d8a3054be3dfc632b424cd SHA512 d2deb8619c39c367f991eca5368fdfd91c33c595097bace1ad27a935e2cbe76602330cdebeb47603a5cd1db3ebead5426f115d3a621693a4ea8a48f7fe8af48f WHIRLPOOL dd240407de10f16295befb8059355d5db8fc1c071c415ba525a4c3684fab4e619150f2c4a887370cb15b5d0fb5e1d35aeef9cbd3773d7603891f83c03cf065d0
 EBUILD iproute2-4.8.0.ebuild 3936 SHA256 e77a400092f03b5e14364c6d5b8a4746cb82576b70d8a3054be3dfc632b424cd SHA512 d2deb8619c39c367f991eca5368fdfd91c33c595097bace1ad27a935e2cbe76602330cdebeb47603a5cd1db3ebead5426f115d3a621693a4ea8a48f7fe8af48f WHIRLPOOL dd240407de10f16295befb8059355d5db8fc1c071c415ba525a4c3684fab4e619150f2c4a887370cb15b5d0fb5e1d35aeef9cbd3773d7603891f83c03cf065d0
 EBUILD iproute2-4.9.0.ebuild 3924 SHA256 c2e562740d38b09f06c83d3a3955b3454a80a6b78d828c178b82f766a0b39c02 SHA512 2f3166465cee52ae3b798ddf1b08ae00305fcb5a83983fb4140114aef0a101cc05909d6b59bef089d2208f3a31200475df6e6afcb780ca07c1ac2bf80dcb2eae WHIRLPOOL c0abe028cb533f08eb25182ec23f8e646addbec67318d8854a075bcfa469fb43474b228b15e1c8f1e939091a1a37cbcfe308983e92effb7d34aec0999076828e
-EBUILD iproute2-9999.ebuild 3790 SHA256 7af583574e3f72b875440962d45518fefe7c096300b3ec3dbd5bf3146f98f3eb SHA512 f70f7887c4adc059bd439f8a780f01f6cef6ed9d4327a03b6cf4afe474d1ce98fcdfdfa48c8cd6e7d7a8b6fa9b98a1e89e89da8c81ed37d22a069fdef062ec35 WHIRLPOOL 9a1c9cd41ad96b06d74c1bda2efb69c4627eed398d8a012a8751c99f1fe421aa7c45130923305e26de2000c90258d2a55d8c47ca8c7baab5b386ef83199bba06
+EBUILD iproute2-9999.ebuild 3727 SHA256 7206f3eda25e9d88638ead7ec9b7bba0468ab443dade758fb8d9141ba8ae85e1 SHA512 aa65bb16ad69cb0f4c8309b62fcce4970a480c55f0f8750c1c59fdec9ef93707b1f088932990d888848117bc18c311ec224434912b4267a5d4e4641d756ca1b9 WHIRLPOOL fed108d5f119b682a19da635f110acddde260cad2dac7546657a61dd1680c52af00b9e57cbfe16ee7c5487ac4bcd9ab56ef48768fed4f55f60093638ed44b053
 MISC ChangeLog 12066 SHA256 f5f9540bc0cf316e7fa96d93335f89cc8f4d55b0d851258543d35aec0ed7782a SHA512 cfde56050dccbe76282284f9a814042fb5bed20fbf55609eb0d36dc133356b811453ff4e9eb3a02496f4f8586f34a1c1e81a369d5f07208db94947370298f748 WHIRLPOOL 150dbda7137b97fef8bec153867a3f1cb715aed1368b239fbf31939377530c8e14b59506d18a8f07890620fa48e55bcc45e1df2fda696c3dbe6e134d098410d0
 MISC ChangeLog-2015 44123 SHA256 02a46c92f3bc47dbd131de2afe816a0fd77c314dcc25546c5f6918bddc79803f SHA512 2dd40095e9ac5f6af5a91162ce62d71dffd3af8f47fa41d6b9c3f89a1d2fa376bd152df0f04a968d7b11acb8dbfccb6f144f5b0ecc3a2a190d33389797e69505 WHIRLPOOL a5a52e3b3bdb3a21e71cb2ec61d009dc2e664922e4017d1937ea6e858e9340fb8a99032b4c36a91fe0b26bf1a186fa5d96b96562382a578a2f731f563e0f12f2
 MISC metadata.xml 467 SHA256 54932243a153c9130ca1862f0dce70ac6fff517e9b5c22f10e6d044ac3679e86 SHA512 34c134b1a8ee152382b9fe9872df3d15d32ec3822ba215c8b21e948b8313e2e3d045468b873b7958681e92265d57ce25455e03f4d8e6be4e882943e54331cd7c WHIRLPOOL 188528c73a6a8b90a0e69bab32d24a05e41c6695f559da91ead84be331769f47864ca6e88a7f1a31619da51e53b7fdd8a23735ff576098998eac6f1a9d24feb1
diff --git a/sys-apps/iproute2/iproute2-4.14.0.ebuild b/sys-apps/iproute2/iproute2-4.14.0.ebuild
new file mode 100644
index 000000000000..1e581bc94684
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-4.14.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb +iptables ipv6 minimal selinux"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+	!net-misc/arpd
+	!minimal? ( net-libs/libmnl )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	berkdb? ( sys-libs/db:= )
+	atm? ( net-dialup/linux-atm )
+	selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support #549948 and some defines #553876
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	iptables? ( virtual/pkgconfig )
+	sys-devel/bison
+	sys-devel/flex
+	>=sys-kernel/linux-headers-3.16
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+)
+
+src_prepare() {
+	if ! use ipv6 ; then
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849
+		)
+	fi
+
+	# Local uclibc-ng compat fix until uclibc-ng upstream can sync
+	# netinet/in.h with glibc.  Resolves #626546.
+	if use elibc_uclibc ; then
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-4.12.0-uclibc-ng-add-ipproto_mh.patch
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e '/^CC :=/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^WFLAGS/s:-Werror::" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# Use /run instead of /var/run.
+	sed -i \
+		-e 's:/var/run:/run:g' \
+		include/namespace.h \
+		man/man8/ip-netns.8 || die
+
+	# build against system headers
+	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null
+	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+	echo 'int main(){return 0;}' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+	popd >/dev/null
+
+	cat <<-EOF > Config
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	TC_CONFIG_NO_XT := $(usex iptables n y)
+	# We've locked in recent enough kernel headers #549948
+	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, #144265 #293709
+	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	EOF
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX%/}"/$(get_libdir) \
+		SBINDIR="${EPREFIX%/}"/sbin \
+		CONFDIR="${EPREFIX%/}"/etc/iproute2 \
+		DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX%/}"/usr/share/man \
+		ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
+		install
+
+	dodir /bin
+	mv "${ED%/}"/{s,}bin/ip || die #330115
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+	# This local header pulls in a lot of linux headers it
+	# doesn't directly need.  Delete this header that requires
+	# linux-headers-3.8 until that goes stable.  #467716
+	sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
+
+	if use berkdb ; then
+		dodir /var/lib/arpd
+		# bug 47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
+	fi
+}
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index ba7c88b2ac9b..5cb1a3148666 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -113,8 +113,6 @@ src_install() {
 		ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
 		install
 
-	rm "${ED%/}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
-
 	dodir /bin
 	mv "${ED%/}"/{s,}bin/ip || die #330115
 
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 17c04e24eed8..2e7fc542c0d3 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -19,6 +19,7 @@ DIST openrc-0.34.3.tar.gz 226693 SHA256 8e4c1f99727b7b91766fcd65e0a303240528bf0c
 DIST openrc-0.34.4.tar.gz 227129 SHA256 b9d70a8e32a9fa4078864a9aad4e60efba3c0ccfa54ac777a538f62a2c1eebe5 SHA512 f502a8411929d153d4d2e5e4f4052691c6ff85432eb0b8a5534c7880d9b58b3ac919f04af1f1be38c76cd8dec3740bc718b486c06f06f08ba41d311d963250ec WHIRLPOOL 56e34c17ecacc9b42611815a757da33db84571bf2d7c39d8cdc252b170a8c5a5b811b50c0a7d0671dd1c71679d6625deadce10f025ec066d4a6fdf559587af59
 DIST openrc-0.34.5.tar.gz 227278 SHA256 dad1ccddd3adef9ac3039e1402ad530cc5a54b351ceddbfefc3ad1b96298f97e SHA512 2e743b7d8f287bab8c74e9cac46935a7895483fd181d969a8e3a6709ccd6d222255b509730b9165f191626774fc372e426049678796d72e4d43541b8232674c7 WHIRLPOOL 855497ba5a444afa3eb1445f92169944115385ba9637ccc05da1bb8943c49fcee2eb7378be3d33d2bff420d8b5a663e2c6176a036a71bbfb08e15213dc9dcd9d
 DIST openrc-0.34.6.tar.gz 227096 SHA256 e4e6a1cb1e764c0a81831be72e08009ce6c1381adb3b96f115a2f8d72a666e2c SHA512 2e17fbc628c0753f4459678764911d787b8d40f309f978ddbdfdc4dfc5d3033a2ac35be00fb9ad558030249d215b9494a0e5eb43e41d3123aeca032032c82541 WHIRLPOOL c41365081fdc1eecde817e23ec665f80c28065fac72a1d58edeee676b83c53db7a422524a00ded35de818a1d775f9719afb7ce608d3d974a5e3e89fc86844f3b
+DIST openrc-0.34.7.tar.gz 227270 SHA256 e45e5da57088e31c31d936c8c1f8573584787c04a72829b12924a2843439a454 SHA512 2cc8feb18a57418227aebf08224f23561b161766bdacc956c1a8e9b054272538de3ab3ec5245b7b8adba80f242019d56bcb94c390ed1a483015d7720fe3f4f73 WHIRLPOOL 349e2092b32ec41d9bdb975369aaee0be71a1833b36a83cc1a0c1d1000ffc83733e35441089c890673fcca78100afb93e14af6c56d10a5534d76a2ba96d78955
 DIST openrc-0.34.tar.gz 225678 SHA256 fa95e111d884f60f967bfa78353f683615f599bbf449b89c0663eb173769fc73 SHA512 8ff0e3234db06ddeb7c930251f13ec9e4488e4c9776dfe46bb0c1af09835cb34655084bebb6638eb07e47a7f5ef95c1aaed9d06dfa3eaef9e36e9b7a7910f820 WHIRLPOOL aacc1b4636bbbf29d091d7322154898c98cd13947450a0d81cacc080803c1241fe3cbe3e731553c94e5e5ddb2e9c626de53efa9885a4e7be23399637099f1e4d
 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
@@ -37,6 +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.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
new file mode 100644
index 000000000000..60571198d88c
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.34.7.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/portage/Manifest b/sys-apps/portage/Manifest
index bbf41cc883e4..7d8b6bd9ba71 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,13 +1,16 @@
 AUX README.RESCUE 137 SHA256 69bea0c755eab59b6b4d90838b8551744f0b0c8eeac170b1cd13a71ee83f9ac4 SHA512 dba0f0d6d4cd140e636cc70dfb7bdb298e2f2fb040bc07b0874cac994bdbabd26bfd9361d85a0f8b9a92a185281e4901606b9e4f563afdc8867341bbe6af1cb0 WHIRLPOOL 713fcc790442999d56e13efaf536fec9954dadeda680b3642d0358311332096ddedf8b55697bd1ca620d84f0dc7d025ff7931e086c74c1f5032be72dca2ff8f5
 DIST portage-2.3.12.tar.bz2 944929 SHA256 4a6b6c1d038131d141b932b1ad93768a7823acd0704093c6c1e5adb9f913ba1d SHA512 39f6d938e167a96b338dc85191bfc25d6db2328014f13386dd2552b9a3c36308b9b4d444dcd3342e7f6761e26d97fc0b3e2c8a9092ef7aa863d55c26bdccfd3a WHIRLPOOL 34cc7567dfe4913129a451a8e8597c48382c6c423ec1a008db1fc489f5da99d5cf371ffa48b8449d799aa98e3f0dba98f7c8b55a4b8744fdb857f914448b6f5c
 DIST portage-2.3.13.tar.bz2 945477 SHA256 f3ed1445cf2bbfc6c5986873aff055e4caa3b695f37e033930ad2533bdea8d24 SHA512 71d9ea6c9a889572f60e7e501e9f8739db588cffd98a431303906eb90c1f7bb85c55f6779cbfb921630149d1b3174539fe2357fbeffbbe9857998907e3215ad3 WHIRLPOOL af9140e46d7e94994b276d93389c4953de77c77e9bf132c20b85bfdd477aaaeef2bb05293e94058158cf7800711ae7d1ff694d6ec9fd5e940849fd538b86c501
+DIST portage-2.3.14.tar.bz2 948535 SHA256 98eaeef4057f4c5a2251638428865d996ae2cd9721dc5d9422c29af607c75772 SHA512 36daf3b9425e08a8e136e87dbb7be43d4688b5505203f11938a07b916da441e1f802b1cbd2e97505c0dc1c249ba5fda2a059a4ad515c2887f8199d1e130a2732 WHIRLPOOL e61168eaed5d00a37f1367d27455e111cd7c1bf071dea1ffa337747fd9c60a58e1b845e51151caf1248beb2a945b08184ce0ac402d949f29bf5a651197f95806
 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.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.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 7697 SHA256 c7d91c34e7fb25283f6ac634a00686273fd3f286ecfb9fc1ab3bc685ae8fd9c4 SHA512 6b8342034752512df0345d386f67c025b0ba15439ae5758783b16973d16b3b3b4d866abfb65bac2e26424e270294bebe26e43f12539ef141891b567dc0f000ce WHIRLPOOL 0b2b3f122d57a5c9d3dd63ea09c7a7bd05e1eaf298cd5018d400543cd825469e108fdd981c06518d24a37f7a339195fb01b04480143c0d9f93cce18093119c42
+EBUILD portage-9999.ebuild 7792 SHA256 1777d7baf2a1b271a3817e4f32729efec7af829baee1f27f6dc4bbd5b60d06fe SHA512 f755b0ff97e511564725e35162124605ca02237469ea4ff327a10a22c33facf9632d67a19ee213e7b797050fb531c7a10593846cbba6c8f450bf99f5fde11c17 WHIRLPOOL d0ad49e69eefd185e4105528cdb04d6a11812c7cdea0b9b5267ba6d044a04595e53e26749d93e5c2cb24536e070d4a3fdeb17c356a40bc4e4e4a44e78b2e312d
 MISC ChangeLog 16208 SHA256 6196c5e06a7043cd46882ba3258ead8c490a89e650695d390b58f03d68639c0d SHA512 70e1da4a0b81f7c7fe902229d85ade010dfdb5e377f68577fd1f6d7ff75c92b6cc172fd3cbb171e18f40565e2679a14aab70b756e6eebce8f7076502ff9b2465 WHIRLPOOL 4b7dcff2f27e863ef276ee14ddb30adebd175c8a8913d1618c5fec36a9590d19d712878977b7c049f67730d15594a61cfb7839bdde35b30a697c540d59346706
 MISC ChangeLog-2012 133873 SHA256 157a7eb13d4cf2e2c94bfcb7e91f218af1ea88f5ff20c24a50546950a9839c94 SHA512 1241f4ccd7b31bdd340649417257b0e95202992feb66e0cd4d41fc2d35bf0baeac19680f34a831d2fefce0c0fec03aa6e7a191f783e59cf9b93aaf266f010a3f WHIRLPOOL b027bdba0f5ccc1b3a2dc18df92d82b473af5e55536816b7177071c1ae1a89e4d50d42c2093fa1bbe28b92a42014fbefbfc9e7daa4e6426ebecbd5bffc3d479f
 MISC ChangeLog-2015 66573 SHA256 79f5ff4870713087f1a71d78a608f7c63bd2ce52e9a9642ad23d88e4ea30c807 SHA512 6df0a78314635f8fc0f721a4acda85accfaaa4eb3cefffd90e1fadeec6a3290f813780adbe572e5cd2281be4d742627f893a88ded06413d88fb8f0c41b01890b WHIRLPOOL 7b0060b46d0f5637189f7e6f915576e2a51977f11ddfdb37b0aa0cf1dac21f869ba2ec80ff0a4e633b547668261284acbaaaf52a3015f4f676e860cf8d48280e
diff --git a/sys-apps/portage/portage-2.3.13-r1.ebuild b/sys-apps/portage/portage-2.3.13-r1.ebuild
new file mode 100644
index 000000000000..6ea916e6537e
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.13-r1.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_4 python3_5 python3_6
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_4,3_5} pypy)
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_setup() {
+	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-i cnf/repos.conf || die "sed failed"
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=( install_docbook )
+	use epydoc && targets+=( install_epydoc )
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
+	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
+		has_version "<${CATEGORY}/${PN}-2.3.3"; then
+		SYNC_DEPTH_UPGRADE=true
+	else
+		SYNC_DEPTH_UPGRADE=false
+	fi
+}
+
+pkg_postinst() {
+	if ${SYNC_DEPTH_UPGRADE}; then
+		ewarn "Please note that this release no longer respects sync-depth for"
+		ewarn "git repositories.  There have been too many problems and"
+		ewarn "performance issues.  See bugs 552814, 559008"
+	fi
+	einfo ""
+	einfo "This release of portage NO LONGER contains the repoman code base."
+	einfo "Repoman has its own ebuild and release package."
+	einfo "For repoman functionality please emerge app-portage/repoman"
+	einfo "Please report any bugs you may encounter."
+	einfo ""
+}
diff --git a/sys-apps/portage/portage-2.3.14.ebuild b/sys-apps/portage/portage-2.3.14.ebuild
new file mode 100644
index 000000000000..a49d25eafb91
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.14.ebuild
@@ -0,0 +1,252 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=(
+	pypy
+	python3_4 python3_5 python3_6
+	python2_7
+)
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="build doc epydoc +ipc linguas_ru +native-extensions selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_4,3_5} pypy)
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
+			python2_7 pypy)
+	) )
+	!<app-admin/logrotate-3.8.0"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_setup() {
+	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i pym/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
+			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
+			-i pym/portage/const.py || \
+			die "Failed to patch portage.const.EPREFIX"
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f -print0)
+
+		einfo "Adjusting make.globals ..."
+		sed -e "s|\(/usr/portage\)|${EPREFIX}\\1|" \
+			-e "s|^\(PORTAGE_TMPDIR=\"\)\(/var/tmp\"\)|\\1${EPREFIX}\\2|" \
+			-i cnf/make.globals || die "sed failed"
+
+		einfo "Adjusting repos.conf ..."
+		sed -e "s|^\(location = \)\(/usr/portage\)|\\1${EPREFIX}\\2|" \
+			-i cnf/repos.conf || die "sed failed"
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use epydoc && targets+=( epydoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=( install_docbook )
+	use epydoc && targets+=( install_epydoc )
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	# comment out sanity test until it is fixed to work
+	# with the new PORTAGE_PYM_PATH
+	#if [[ $ROOT == / ]] ; then
+		## Run some minimal tests as a sanity check.
+		#local test_runner=$(find "${ED}" -name runTests)
+		#if [[ -n $test_runner && -x $test_runner ]] ; then
+			#einfo "Running preinst sanity tests..."
+			#"$test_runner" || die "preinst sanity tests failed"
+		#fi
+	#fi
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
+	if has_version ">=${CATEGORY}/${PN}-2.3.1" && \
+		has_version "<${CATEGORY}/${PN}-2.3.3"; then
+		SYNC_DEPTH_UPGRADE=true
+	else
+		SYNC_DEPTH_UPGRADE=false
+	fi
+}
+
+pkg_postinst() {
+	if ${SYNC_DEPTH_UPGRADE}; then
+		ewarn "Please note that this release no longer respects sync-depth for"
+		ewarn "git repositories.  There have been too many problems and"
+		ewarn "performance issues.  See bugs 552814, 559008"
+	fi
+	einfo ""
+	einfo "This release of portage NO LONGER contains the repoman code base."
+	einfo "Repoman has its own ebuild and release package."
+	einfo "For repoman functionality please emerge app-portage/repoman"
+	einfo "Please report any bugs you may encounter."
+	einfo ""
+}
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index f75533d5124d..c7453d27b016 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -40,6 +40,8 @@ RDEPEND="
 		>=sys-apps/sed-4.0.5
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
+		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
+			python{2_7,3_4,3_5} pypy)
 	)
 	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
 	elibc_glibc? ( >=sys-apps/sandbox-2.2 )