From d473a706836012853193afc7000922601e4ada61 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Thu, 19 Oct 2017 17:57:29 +0100
Subject: gentoo resync : 19.10.2017

---
 sys-apps/help2man/Manifest                         |   2 +-
 sys-apps/help2man/help2man-1.47.4.ebuild           |   2 +-
 sys-apps/kexec-tools/Manifest                      |   2 +-
 sys-apps/kexec-tools/kexec-tools-9999.ebuild       |  11 +-
 sys-apps/nix/Manifest                              |   3 -
 sys-apps/nix/files/60nix-remote-daemon             |   1 -
 sys-apps/nix/files/nix-1.11.12-etc-fixes.patch     |  24 --
 sys-apps/nix/files/nix-1.11.14-etc-fixes.patch     |   8 -
 sys-apps/nvme-cli/Manifest                         |   2 +
 sys-apps/nvme-cli/nvme-cli-1.4.ebuild              |  26 ++
 sys-apps/openrc/Manifest                           |   2 +
 sys-apps/openrc/openrc-0.33.1.ebuild               | 329 +++++++++++++++++++++
 sys-apps/systemd/Manifest                          |   2 +-
 ...n-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch |  53 ++--
 14 files changed, 398 insertions(+), 69 deletions(-)
 delete mode 100644 sys-apps/nix/files/60nix-remote-daemon
 delete mode 100644 sys-apps/nix/files/nix-1.11.12-etc-fixes.patch
 delete mode 100644 sys-apps/nix/files/nix-1.11.14-etc-fixes.patch
 create mode 100644 sys-apps/nvme-cli/nvme-cli-1.4.ebuild
 create mode 100644 sys-apps/openrc/openrc-0.33.1.ebuild

(limited to 'sys-apps')

diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index ea4574a4b8f2..2a7ff64f1790 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -3,7 +3,7 @@ DIST help2man-1.46.6.tar.xz 171044 SHA256 615ff5ac38369ddb3707c5fd71672ab122639f
 DIST help2man-1.47.4.tar.xz 189456 SHA256 d4ecf697d13f14dd1a78c5995f06459bff706fd1ce593d1c02d81667c0207753 SHA512 3320890c4068086bff7a858653fb67ac80363f26772fb0bb702233052e2bcbe647e7b20b1a2246b1a0e026ba2aa8679e6baafe302d78c747da04e29c59b9bafd WHIRLPOOL 6e7bf1f1dcf3552bd97c3975e6bd2dd404f5e3bcc62f00c04225e3085f0705882a16fe54ce45e0558ef6e592f54183b89794abd7135eb4b683408108189ee0a6
 DIST help2man-1.47.5.tar.xz 186044 SHA256 7ca60b2519fdbe97f463fe2df66a6188d18b514bfd44127d985f0234ee2461b1 SHA512 c94f94bbdfb9e288edff2b3181e0f2e858d309aa4fe77cae141571a06b9b5bc2a5c5a4d25ffc1f9108222d56c9040989d63770f5d804323a52d3978059d1eca7 WHIRLPOOL d31885c3a8f5602e0d38a3676e17ee76139a0ab26fc1da61a57609eacad465ae973c8bf8930c22fe7922f2f07882721a0a8d52592d918c81b450f9c6265f7be5
 EBUILD help2man-1.46.6.ebuild 961 SHA256 3c331f54724e6908285c53de6f997b7dd1f55ac2aeea72122c211b88513f81ed SHA512 73e75acc9f8980950a9257e4e08c11f17cd67bf9965d9917e46c43ffe6ccc66aac1c0ae14df72f6b3f9e1fa4c7ca85d96ce260f76a6648f8fdc7907b70185881 WHIRLPOOL 0fe1068673e1db82dad12e3c4fff3e6e2d30e4c860a4b4a95dcb11a3bf8542e5bc45436a81eb184f1b95a5335c75fad49d5e4c22af7f7adae5614c4c2301567a
-EBUILD help2man-1.47.4.ebuild 1099 SHA256 4f555387d0c5923ff39088688ece592964421991183bcf9ad2b1fe4136ba2b38 SHA512 8a27329f3d9d869c4e6e772aa629bb7344fb00bbc33a45568ef09a1f2d4b6a4dbbfe7fb5ac87d4ed019d6e1940e6d9335770614b68db40459465953d19ac79b6 WHIRLPOOL 3c3b217fa3f735baaa652242698210e63a3d8bc0fd2172543b75790ed09a2cd22d6cff24b41cea3f82e402f5eb3aa4e893f157bbfff3cb552f593b71874165fc
+EBUILD help2man-1.47.4.ebuild 1098 SHA256 6c5ffd85598bf25e0b237b9a0b9df26866d4b4732e838e8506021785ef075d66 SHA512 ed0f7c6414ea6f0d90db8797c67774a6adcb8b92e638640a92b6bc08e0d568a57c369b656d2e19d63017ce24f16ffc223934b08ab8386fbced68698e030f3de4 WHIRLPOOL 2ac924b65f4c8f49ffd9c1647d7454fff9c3ced266db236b9406da1bf589434980b075fa79ab6adac0da02b7e5490953fa7a488a9c6f1438a099f3e6863b1b4d
 EBUILD help2man-1.47.5.ebuild 1077 SHA256 7bf7f5ba74027acb8fec7b61c4932c2eea2f65b7c3c3d5c3bff610554918bfae SHA512 8dc708b304aae08f8fad597a1e0537e3f709deda7ba7568c1acdfb3d37fe1c338376310160c16cb2a1e02661687f52ebb68fcc0987a418c57121e78376d2bcb0 WHIRLPOOL 827a15c654d03d1056c8d805d72b4ae7dfeef13d78e0db31352931eeb84e97fc513480155668489653221ed998068ff05f719bcf60ab34d3153927f3905ab1bc
 MISC ChangeLog 4770 SHA256 da7132e6698cc6baa760860068a789ce487700e3febb29bd95e380c1243097d1 SHA512 f616a3716e5cb1d2d8ab75b8ab9f5d4950f0e66d68787e7c7b85e95585cc473e528476e94e3301c8a3c0034d37a74a0e8ebb985dbc10ba1aa7b9d3a2ab917919 WHIRLPOOL e1164de772bc476b1651a79b2f2264a0a161593936e44998508b0138598f9a84c8655b7ae993e1d2e54a5d9c54e02f79396432f4bbdaa97a7f092ddef642cd23
 MISC ChangeLog-2015 17647 SHA256 e33c324b885960677a805d9be1545e0dcf8b2d6cc42c6bab19f45a989a30854a SHA512 36341130eb3b9ada5f5b67e03137983b150b5e41c165d4cc3e08651e6120dc0a298957b1e47e0ce9649a62c8fbeaf48095e255815d6adfd4becac0882a0cae5c WHIRLPOOL a7698bca661c97ffb4c1ac4163015a03f3a9ac65a57017d4129aa8fc9c233d392292e628f29bd30688005d36f5eb13d0f005d559d1118815f55fdc3991673c80
diff --git a/sys-apps/help2man/help2man-1.47.4.ebuild b/sys-apps/help2man/help2man-1.47.4.ebuild
index 3f1e9219ee38..bc50c66549d6 100644
--- a/sys-apps/help2man/help2man-1.47.4.ebuild
+++ b/sys-apps/help2man/help2man-1.47.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 7423272ab5e8..025b661df644 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -16,7 +16,7 @@ DIST kexec-tools-2.0.4.tar.xz 271604 SHA256 e5f5ab00d746eb15b4714eca6a8ec5a1a86a
 EBUILD kexec-tools-2.0.14.ebuild 1700 SHA256 80d8edc17a3ec421e15309db52fcde87c6ebd528fac4fcdbb2527d19ae83296f SHA512 3fbfc404e7e83a7a74efa5d1ffdf18239ba0e342a0a8a53d1e18b5cc97dd3258d78448b1c5ba20c22559ad18a4488917f3a9feeb711a98fb5720b65cbf47053a WHIRLPOOL b5759527e92e5fdc426f76dfed99b276d3b23e210b11c70fd3dab5c53c4264c004aeeb25ce784be78b69d5225bfb3646d0e2d7a4f4bbef7c4eddd470ad138523
 EBUILD kexec-tools-2.0.15.ebuild 1709 SHA256 2f7dc6d787e62850c84f6757fe9383f810c175aa8a728df50fc444108b867665 SHA512 2a55d5f45633ef05a2fd7bafe0da9052e7f994f698705eb1e3707ae0a0b916c16354e0ea4fd0a8b575217c773f1b7e79b3eedf5f2d5a475829afb49267621ef7 WHIRLPOOL ca8777dac0a982ff64149e8563d4a8343ab221e81fd6fe1e02d4db84518eb2bd9a55085a5768b635298e3fb479c8948178175181f43bea755b8f92507b46c966
 EBUILD kexec-tools-2.0.4-r2.ebuild 1639 SHA256 0cfc223b659de530ff90a67748cfe3f7cec6d2e69f52397847bbd93f95c774ad SHA512 0b1fdd825a235646f6589e1043a7edb190d3aeab6ec4dc153235140995d5ee6b09c226eb159182a3cebfcd9ff9251e241ef12fc0313a6f092a8187e197a3ce82 WHIRLPOOL 9289cf6095624cf4d93aa90883dc6f50751b4fafbadf4c03b8eed3dc1cf5fba4ff8c1b7f94cf8eebce8402fb5200388672f7e0a18eb26f116d69169ad7db896e
-EBUILD kexec-tools-9999.ebuild 1709 SHA256 2f7dc6d787e62850c84f6757fe9383f810c175aa8a728df50fc444108b867665 SHA512 2a55d5f45633ef05a2fd7bafe0da9052e7f994f698705eb1e3707ae0a0b916c16354e0ea4fd0a8b575217c773f1b7e79b3eedf5f2d5a475829afb49267621ef7 WHIRLPOOL ca8777dac0a982ff64149e8563d4a8343ab221e81fd6fe1e02d4db84518eb2bd9a55085a5768b635298e3fb479c8948178175181f43bea755b8f92507b46c966
+EBUILD kexec-tools-9999.ebuild 1752 SHA256 af5471979c27d09371bd350a4e69f03066016fb2edeed89408492fe8f2d521ac SHA512 5ce109028b7a097a4039e8ad516deef61e2dfbf012164396d29f28ab013efc8e18c7bd8d90bc71eb18ddc95203ac4b1d8769a52d497d70db46681f05433ccce0 WHIRLPOOL ca127433780fcd4cd6c1c371bfb467af18f9190511309433b59fa1381f5eb0042d5a58440af822190eb2ea5993da626e92ff2d6c79324bf922459d9b17a72627
 MISC ChangeLog 4635 SHA256 5d4db73b0ad8fe0a7658756629595187cd9d7f57bc49b7a1c967efadd2344131 SHA512 3d323bb7cb4391d70c455ed3f658010afe0241c07f8d0f670776c997088d21e79f9cb248273999da26acc5a5ca2bd884f947adf97841cef07e72684239538b4f WHIRLPOOL 8003c708454d492bfa20d7ebff1b80f91dcfc1c6cb290e6c197ba3b9330304c6d0f12e9584d8304b4cbc60902e9cd0007290e720bb8b147338db994492849f8f
 MISC ChangeLog-2015 13851 SHA256 a3bcc65aaef51bd56f433ca33a52ae000bdae38cdeee6160309893bdbf924a2e SHA512 056e5ffc5523bb1c2e9791dc4faa1715202cbe11b3300589f9cef62dcbfac78b41e99237c4044c1b8622f781f2a0a0343ec16dfdee795e2fa0ad11bafe94d0e5 WHIRLPOOL 2b93fa80c4499a1602a345d1546e795a745cc4d2aa0c874f9269ea1f7b9bd0b0931163027376ffb161d5622684b8612eba3acff81d7aecee3147486b40bb1002
 MISC metadata.xml 490 SHA256 7c27519c83a0610e3e576265116392d298620be323c61a45a7634f29714cf265 SHA512 6f4b25178cc6b8ff3fea664f2717eb7268d9e71c4ca46c170887eb836f9d78dff7e64067968175d018dc22bbcc2bb8cd6fd5f44edba0966fa568f9fd827a1cff WHIRLPOOL 45f2c1810f7717b0845b2003fea19be5cf9df3f3f2de22a686be9b961a6ebdcdad45cf12097b26b569dadf9a0e7300dcc735b9a4b0b64458f915a88fa8344c58
diff --git a/sys-apps/kexec-tools/kexec-tools-9999.ebuild b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
index f3f01574c051..784f7a48e98b 100644
--- a/sys-apps/kexec-tools/kexec-tools-9999.ebuild
+++ b/sys-apps/kexec-tools/kexec-tools-9999.ebuild
@@ -4,9 +4,8 @@
 EAPI=6
 
 if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
-	AUTOTOOLS_AUTORECONF=true
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
 else
 	SRC_URI="mirror://kernel/linux/utils/kernel/kexec/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
@@ -42,7 +41,11 @@ pkg_setup() {
 
 src_prepare() {
 	default
-	elibtoolize
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
 }
 
 src_configure() {
diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 3aba3714d34b..49a0d1aea0f3 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,6 +1,3 @@
-AUX 60nix-remote-daemon 20 SHA256 0afe41dcbcc67939de658dedac9c305fe4e74978fc804c9ef9dd299d72e6861a SHA512 af3e8a4c0171fb52572d73b7111a07255c7768c765878cfc20e80a481a5a6f5d6c58643b3fdf8d9582bb0b903dee0e228b8e18f3e73d9479879f8f6862142363 WHIRLPOOL 406752b5c25e28c38a32ca5edcb99c8a1f2e3b16ccba2ad4121eb9b1af6844ac186cb0df52b6ffce69c379c6cf53e4680c06bef309d6fca66fe73707f0052c7e
-AUX nix-1.11.12-etc-fixes.patch 1275 SHA256 ecc10dd1291712224560f2424b70120e08d8314541dcbd713b128512a49aa185 SHA512 f449877a92473a0b07f20131195d7cab23341068c370e18b618d7870223bf65d47bf9f96cfdfdb41fe0be2e4390a341bebb2bf5a565ba589d6ba6babbf076a2c WHIRLPOOL d2319df6c0540bb3a2ee060d68c4c022ec417b829c00ec88f1162fba9c3b26e465f1b0d9284819eff59958142589b27706c065694c3b2d5452dbb0a59fc97a30
-AUX nix-1.11.14-etc-fixes.patch 350 SHA256 c2a510768ba263abf2b6a1e48ba1d402d967a5fbb5227906ee4deaeb7995e8e3 SHA512 ec742ca9fedbdbbfbac152303e62ef34457c7e70dcc69954a38d63581c6513670eb66cd4f01048fa848469aa2d6c55dc2109e59fafecae85269a2f13ee2970e1 WHIRLPOOL bf182c28194ac7014bb2bea9523657a1a27097d5e20e28c624a863619060558b524a14b7258ae845598e918ef0d5d83db5753b3a150fd9b117e9aef4980612a2
 AUX nix-1.11.14-glibc-2.26.patch 730 SHA256 464d76a9f76beef25bd972e53a5cb14a2e0f4d86be2cd9bb3ea4b289312a64a5 SHA512 2caae0b32f4be3a8b535e784628d4fc878645198adaa0d5440d768dc01cd3a7e43b11323eb75244d719b2eba0256c80415dcf081cbb05dcbb8250021106e95db WHIRLPOOL 443ae1942ec4f4f24dc53e016a6e0c5c90d78ecb301ae11b1bc6908a194fd9dd51d229e642d02102bafcbb92a76f84eafb1421c7dd3596986e50f4c0c74c36bb
 AUX nix-1.11.6-per-user.patch 554 SHA256 607d846262466e2f1ec4167e1396eab39309bf2c13dea0caeb9b7715d8778722 SHA512 ffc6b03ba9fa8a56cdb40caa271582b8648f9539d8abc69251d16356efa64c93902648bae29d06af938383dbf3be110fdaebbbd4af4635c112bb34d1077cb56a WHIRLPOOL 56540c433cdb420f6f366eb1151f1847593e99aa5771e976695e9f27a530350ac3db8b97176bef62af31505f8c21497cc6e29af34d2b324251230cd79b5d0f61
 AUX nix-1.11.6-respect-CXXFLAGS.patch 164 SHA256 3723f9749504ad5eca69fc7f4864a89c4f0766d20cd13b89a38f638bcc5c8e87 SHA512 2508d26888050bb4099f1654cee91d44405b00ca4dfdd6c1b1cf0f24e004333b106cc461b306404b1d56f41bb928ed1069536c09f9390b5ba287ca70b9bcb0c6 WHIRLPOOL cb03fe5dd3e5b4f5e512652254f4d981f8be4b7c395a1081f26618be02be805cbb331deebd36f88b8c52cfcec48774013120e12fd4021c19e6af67c329fd75ba
diff --git a/sys-apps/nix/files/60nix-remote-daemon b/sys-apps/nix/files/60nix-remote-daemon
deleted file mode 100644
index 626058a94d15..000000000000
--- a/sys-apps/nix/files/60nix-remote-daemon
+++ /dev/null
@@ -1 +0,0 @@
-NIX_REMOTE="daemon"
diff --git a/sys-apps/nix/files/nix-1.11.12-etc-fixes.patch b/sys-apps/nix/files/nix-1.11.12-etc-fixes.patch
deleted file mode 100644
index 1973133e22bd..000000000000
--- a/sys-apps/nix/files/nix-1.11.12-etc-fixes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-GNU coreutils has '-c' option for formatted output, not -f.
-Don't spam stderr when directory gets created.
-diff --git a/scripts/nix-profile-daemon.sh.in b/scripts/nix-profile-daemon.sh.in
-index 7f46cc6..386f607 100644
---- a/scripts/nix-profile-daemon.sh.in
-+++ b/scripts/nix-profile-daemon.sh.in
-@@ -15,3 +15,3 @@ export NIX_PROFILES="@localstatedir@/nix/profiles/default $HOME/.nix-profile"
- mkdir -m 0755 -p $NIX_USER_PROFILE_DIR
--if test "$(stat -f '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then
-+if test "$(stat -c '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then
-     echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2
-@@ -37,3 +37,3 @@ if test -w $HOME; then
-   mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR
--  if test "$(stat -f '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then
-+  if test "$(stat -c '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then
-       echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2
-diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
-index 4f09b55..e93ef42 100644
---- a/scripts/nix-profile.sh.in
-+++ b/scripts/nix-profile.sh.in
-@@ -5,3 +5,2 @@ if [ -n "$HOME" ]; then
-     if ! [ -L "$NIX_LINK" ]; then
--        echo "creating $NIX_LINK" >&2
-         _NIX_DEF_LINK=@localstatedir@/nix/profiles/per-user/$USER/profile
diff --git a/sys-apps/nix/files/nix-1.11.14-etc-fixes.patch b/sys-apps/nix/files/nix-1.11.14-etc-fixes.patch
deleted file mode 100644
index 07962838a224..000000000000
--- a/sys-apps/nix/files/nix-1.11.14-etc-fixes.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
-index 4f09b55..e93ef42 100644
---- a/scripts/nix-profile.sh.in
-+++ b/scripts/nix-profile.sh.in
-@@ -5,3 +5,2 @@ if [ -n "$HOME" ]; then
-     if ! [ -L "$NIX_LINK" ]; then
--        echo "creating $NIX_LINK" >&2
-         _NIX_DEF_LINK=@localstatedir@/nix/profiles/per-user/$USER/profile
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index e3396ca24e4b..b53bc4a0b6b7 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1,8 +1,10 @@
 DIST nvme-cli-1.1.tar.gz 207679 SHA256 22883719cbab86d52e8d4755e86ebd70476416e87442385a79b31c981bd60de1 SHA512 339da4385c5e8659a8f3c2e11afadf437d9cdf02c294674e5cc569cd817174c8ccbd4fc8858ce6f5b8f63ccba68790b2140fc87fdf33b7d394b67999ac4afad0 WHIRLPOOL ae1225f7fad83cf2a8a00365cefdcccb251ad4779dd1194accfa4b0e38c4d2460723e4f7843a7cfe04fd2978f9ec507d14cdff8448f3860349eab578fb5d4b82
 DIST nvme-cli-1.2.tar.gz 228964 SHA256 f7ecd8138caba3a6d3a95d871a1ffcef64d77a015d3611e5cf962787bc354221 SHA512 42e31f9c7e5a4e3d5c500844e7a1f599bf52b3d4ea8312b518232ea94940487aa6f191b6711266b6595c8b3bca61f2f269168ca61201fe12e6d47c3a53629b00 WHIRLPOOL aebdefe1406b5b0139d822bc2b597520745cd3b2b779c98186928640e708873db00ef1a5e3a5d4b6820aaf30a968948050c8271094e4ddd872595a6dc9f92d79
 DIST nvme-cli-1.3.tar.gz 236788 SHA256 52eb45c9ef5a529580a3f6f9e02c067695675ac01b8ab8b8e0398c62e8a8646d SHA512 0794e72124e73af619a71dd01879d178ad48d30155326e854fb5447e0bb5b879049a7a0a2e3b5301a0de1207034fbbdca07ecf647ff7d4085d56dc793271b576 WHIRLPOOL 5fd3fabd30f6513bf155385fc7b512c748b6645fda0eb06d3075724929065c93dea43c78b06ac6b8515fb4bca351fb68affe576e1b05fdd3308016330787fa53
+DIST nvme-cli-1.4.tar.gz 260269 SHA256 e4c469d408d8f645073a7fac76dcc805e5833ab0fad99f64e8e10c7660dc848e SHA512 8d7e2f0717562bfe2306306830983644e4b118bd6705a0386fcae02f6d171faa76a6d594f01fc8ee57dcbf1a41ea0a84cd4527f7a729fddc3431975cf6914955 WHIRLPOOL 1c784ae28bd03817b0aca4052daa0b1b85b7a564d6f8a5318a7c05c8f36aa09f0a2087feb2b1c36d58992d183f27139142d498e5b7240b1c38dcd76d194afd3c
 EBUILD nvme-cli-1.1.ebuild 579 SHA256 234e2166b933469b282b9430696eb78bcdd78fa96003c26e927d49d7ca472103 SHA512 cfc6f7bd2f6dbc070c604c4e72ca406e29e2e2d240b14559836054039ae71f5f0eda82e808558115e97e4ac19d29d178c9fa584045ecf60458f1dcb743a62358 WHIRLPOOL 66ecc2952cbcabd6e2128afacff19ff80fd232f7d6cabb88e7412445e05effbe3660413ffc1fc6b1ef3a2425203298af2c510f1be21f2d1e08f8d5f747e9da69
 EBUILD nvme-cli-1.2.ebuild 595 SHA256 9524bb085cae10cbd4f52809ad0197b35c3191c677309db250663f5e35345102 SHA512 5cdc918133b831a3c5c8cb78af07107770e60c2aef399834b3c6c17ba0628986d902d90b22149ab8bc23be341653788e708d1a6dd4f8543001ee569262beacbe WHIRLPOOL 2ec88cdb8e5054e7567378b8362c3a31ebc9da6f70998aafb3b6d5778c15466b0d08863ab7a37782004108c8babd3b47ce4ff812a7289253c1260ab2462c3306
 EBUILD nvme-cli-1.3.ebuild 568 SHA256 2d164c2357c9de25393e3f6805fdd8950fd2310ae0765642108f094a77d2d710 SHA512 db12e2ecfcccab7cadaa134695e5235c98baffe34d76b889e12119a73b49c630fa5a82d6894caacb17dbaadaac4f4536031ef3b4dfeedc01a067999e897c999f WHIRLPOOL 3767862a9f997ddfdaf22e66e7d0a02b404822e906355aa04c1cbac36b36ff0399e5f7d7ece4220d547723e29705dc6e682091df45fddb969e7156186c918d38
+EBUILD nvme-cli-1.4.ebuild 566 SHA256 a67185100db6cf91bac55b39ce5b4adce8b1a12eb8a535c7b3c36d3a2ad0b4be SHA512 1bd5660ea24b05ad923106b860c11b1934f78da54c87c9ae5dd2cdfaa4f7a44bb0af9c5170da3a231ea915e6697c5f8e47e67c01d02403885007f726bc64fec3 WHIRLPOOL 076cd8f07622547a009413e4839a7a1d9f3c126fd2fcd6b6e02627fede3a38886e970fd56c99a1e6ca8991b282489d1423f7760ce937f7240935d3253984f9f4
 MISC ChangeLog 2331 SHA256 4c7f8e43874a05aef1f6924b03567be28384ed6dc5db8bdf34edf828eaf8aa45 SHA512 298e143843dead41c9494bae946b10f4f20f6eff92792832e22c759869be4ac830a0f18a6b299b7fd98d0e9cb8f2a81d70e76a2f8e7d3ec12ee5ea3d178e33d1 WHIRLPOOL 505d854292de48d4b20de7d7b291c94bd8e353eb136238f9fd4c6b02d5444eb0f4f3170389bf926f405e982c501e7a8b61bbac26fc4133e0cd25fe6c9ed55dbc
 MISC metadata.xml 310 SHA256 0777b5fc46da6e0ae285ebd0038be86e581a7e2dd69db709587c1233c0964ba5 SHA512 f32474bd2f6daa3306a5bcea0ad742c51142823dd6a14a6bd18c8201016c0182d2e87762c66b95882a42d5ff9083813ff995b0774d615745c2a6666c444bf616 WHIRLPOOL 09d1850437b36400efe105068ad2493f5c56aa6aa728e9c0ef5cd137749592b4f628346b4faf6de5d13b4ea0bc68ec87c9a2380b7f9c33665e4563e2ddcc0ac0
diff --git a/sys-apps/nvme-cli/nvme-cli-1.4.ebuild b/sys-apps/nvme-cli/nvme-cli-1.4.ebuild
new file mode 100644
index 000000000000..4c30abf00a62
--- /dev/null
+++ b/sys-apps/nvme-cli/nvme-cli-1.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="NVM-Express user space tooling for Linux"
+HOMEPAGE="https://github.com/linux-nvme/nvme-cli"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="udev"
+
+RDEPEND="sys-libs/libcap:=
+	udev? ( virtual/libudev:= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	tc-export CC
+	export PREFIX="${EPREFIX}/usr"
+	MAKEOPTS+=" LIBUDEV=$(usex udev 0 1)"
+}
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index ad7f54207b65..38ac74a4fc19 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -11,6 +11,7 @@ DIST openrc-0.31.2.tar.gz 224891 SHA256 6865733e8abeced128537937587e1cecc233227d
 DIST openrc-0.31.tar.gz 223966 SHA256 9d1631b647b3b8981dcbb5251f9d2444859c6cf0791c1b6b07469953e657eeee SHA512 2c28daa5b2bfd3c31a2b87b08a7b39dc078ab0224c713a2b738e991f968f07d4761770a813fb449df551d6e3db58ed997ac8bbe210d1fb17b4c88ead859eba7b WHIRLPOOL 929dbd2724b6f6aaeaae1d9bce913068ac94ec3e21aefae859d782ed7f6f2a948042a5371afc3a8f631b10552776225b4b8487a11188847366877bfd12889001
 DIST openrc-0.32.1.tar.gz 223808 SHA256 ef037a468d87009c8a21a62f04c3b5fa5eb56ce2808a2c6dbd3c73383469b638 SHA512 9cd48978fcd69a6d80b474a06b56550cc8c538d6d7a1cb6f88b90087593eebb8185ee5192ec05be2f87f61de53dbe6ded9058aee7ae8f806bb0d7d7da70f62d8 WHIRLPOOL 021f1dacf4a4a0fb7fb1577f2bfdb4db2007e7e414b17536f7709e05256489e5a692376611df674301ba90a879d14c9bd9c5684b4dc063d26e678158fa2a74f3
 DIST openrc-0.32.tar.gz 223935 SHA256 d452f5c8dd49a0819de368e7faeb56bd7460f8704cb029d9cc4e0b1dc56e791e SHA512 a355ba31d50b1c58f724d446449a8e31bb6f4c13b2da886880579e2666bcefe612a4eae64732f3ef7549fbfc84f3e088c4ca98e6be30108adfbf0a6d648d2635 WHIRLPOOL 451d9e549a175d14b5ed23c9b16e2cf7815e8cf7e616d964161b1e583e899ad0ac1f7bfe4cc4fccd4e1f5155d1c85f8d77f206d083bc02a0f2ad6a1348ac776f
+DIST openrc-0.33.1.tar.gz 224256 SHA256 915865565be249a88895a7bdc7a23d917a7b2adfaea7a5fcbc32f8b517b22664 SHA512 87388e96e2e4a1100699ed816a4bd71307d237b9e8013d48ecaaf453170cdb27bf642a6a227a3f934580e1f1f5985337fab50164b69b28489ee7f2813802f883 WHIRLPOOL e86f0140e3de1a9b4ca8636bcaf312d08ce3feb5d02beb4ec76afec3ce530a73b3000a83077c443f7e9376e97e5c6c2d0b4b9630a734e06ba1f63f1ff46fdd31
 DIST openrc-0.33.tar.gz 224148 SHA256 4e136fe328a5f8b1225ec5c5c34a42e472ff5676c95b334b5be9b064adaeaf2a SHA512 6c4b27f3c433f418ae205074214697697b8e124110db2985200a698b4123bac468aa962026ca638c2c1b71e5b3121bfe5280a34d7a954a0aa1ede0b79dfab18e WHIRLPOOL 1345b51597cd1424c800957c0d79ca60cad8cd68a964544a9fc1d14bde0518523763b3c53867948d1f0c5b0c40867ed2c66c84a782d40f2e900a0eab7252e5b9
 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
@@ -21,6 +22,7 @@ EBUILD openrc-0.31.2.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7
 EBUILD openrc-0.31.ebuild 10132 SHA256 a57f316547b3127cf92a991542579ff962a288625fc6fbfbf7b2f31ce8f7c2e1 SHA512 c63261e84ac5225167034db09feb5772a244de09b2ca084078122b7a968f737dff1eb3a1b8fb76333c7c7f57299bd30ae4c5a49a0ad120459474be30aea360d6 WHIRLPOOL 45fc659935bc090b2ec8568dec93407b8c4a851e73b1138643a4584ef1b3d9e9c485ba1e10a0a303be6825f35f92ee026fc2f640158d3e7c7add3b3f1dcf5a67
 EBUILD openrc-0.32.1.ebuild 10163 SHA256 5d6e26e91a49195bcd9b8d03a91dc36a3e5dba51ae1b7a7a8cef996beaa01d7f SHA512 397f27315e03e61ad462cc985faca1a1074f40015f2c4fd99837b9b953dbb84c2260496c2b31e87924aed0dc20bf0b6f90f776aa6fc0e4275eb0450909a5ff8b WHIRLPOOL ba108da257792cf69d3028067c4b3523e015fa39e04d58d9ab980f3bc445db141473de75792e4e3c0c1fd9a2600beba7275c4a9b9a11ad0b276a13e47cffbc8a
 EBUILD openrc-0.32.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
+EBUILD openrc-0.33.1.ebuild 10170 SHA256 3ec2bd57a2c6846d5ae1ad1e32994f7dc8af2b7f7c66b274b8c3edf1d9e6687f SHA512 f3f73a4c8b85902145a350cf83fd80d19c4b8a5ff72d0f67ccdc5132ab7746a70bb7cb6873bf3c0f0f5475effd1204ec55c551a0921e32972bea4f08253aec4e WHIRLPOOL bee86e71f6c2401b1138cfc36efd0d9ca7ba7449471936250ac9ad9d422be08a2e485b527f47ca13717a0cbe767a5a04ed8071cb9c2d41f1c51b5a2c6039f80a
 EBUILD openrc-0.33.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.33.1.ebuild b/sys-apps/openrc/openrc-0.33.1.ebuild
new file mode 100644
index 000000000000..15376774cd7c
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.33.1.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
+	unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	audit? ( sys-process/audit )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	!prefix? (
+		kernel_linux? (
+			>=sys-apps/sysvinit-2.86-r6[selinux?]
+			virtual/tmpfiles
+		)
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	default
+
+	sed -i 's:0444:0644:' mk/sys.mk || die
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /$(get_libdir)/rc/init.d
+	fi
+	keepdir /$(get_libdir)/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install gentoo pam.d files
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+		add_boot_init tmpfiles.dev sysinit
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
+				"${EROOT}"etc/runlevels
+		fi
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Handle the conf.d/local.{start,stop} -> local.d transition
+	if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
+		elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
+		elog "files to ${EROOT}etc/local.d"
+		mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
+		mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
+		chmod +x "${EROOT}"etc/local.d/*{start,stop}
+	fi
+
+	if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
+		if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
+			ewarn "The dependency data could not be migrated to /run/openrc."
+			ewarn "This means you need to reboot your system."
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index c3c80ee04b3b..53172a8a8606 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -11,7 +11,7 @@ AUX 234-0003-resolved-make-sure-idn2-conversions-are-roundtrippab.patch 4075 SHA
 AUX 234-0004-logind-make-sure-we-don-t-process-the-same-method-ca.patch 821 SHA256 7cc3e4098242d9c3bf8db61dc206b38fc54a1128b6870fe2ea213271cd89a472 SHA512 b791f49036981cb6e91d8597e7c0433549208afb661fdbc9631dd66a868cdb0741847bf7188c514179c3a920721568e65f09a38ca9e133ca7226bfad6f4aa1c2 WHIRLPOOL d8837d19fe2b3da2c0149cfc3d958afa05207549056344346520d2fd2fba8c80d2f05a2e883ef45caa26d6ea6c43a433df5222722cd6a9a1967447b8ef08896b
 AUX 234-uucp-group.patch 536 SHA256 b3ef6c7d40d86dfc801ff7839876dcffb299d0b6d5b11fbf081adfe51ee0d8e6 SHA512 6ffaa3b50f36598682019c1c6b171ad121d57ba9cfd379be5f46f64621dc026a82069922b78a62a5c477bb117e700a31e0315872d78378755cd4150abd22a912 WHIRLPOOL dc9bbd2879af33a8ff27e7a13052c51b4ddc1b336bbd58ed0b5e28bb63229acbb355b6316cc58555b12eee8ed2d73ba25ee21286e8e0f429d6760e70dc6de5a4
 AUX 235-0001-test-skip-hwdb-and-sysv-generator-if-the-features-ar.patch 1280 SHA256 a448c39a3d172c03edf4ac303b02251d3c09a9d21c2512ae475c1a92905b97af SHA512 70dd0b3ed7926fc2406aae8fc592ba7bbbf9bdd94151d3045d94683921f2921dbe8184f7184e4e5a9cd4bf1556ddb93f20f741df3bead3c664f4c71757e75376 WHIRLPOOL bd3aeda654fffd90e2b49757f5bdc483284d034a78f134f3c2b1870f11f35d9604d6105b159ff9cd879bb82c57536e363d8bf8cbba1878514cfc894ca009a47f
-AUX 235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch 2414 SHA256 b67d5a0efd02e98d1524355ca16e7c0f39260f8c1907106ae75f11a19498abc9 SHA512 ddd39f42a809250428cef15507c2c5ae9233b28a217effed5cf078851d4358323c20f7b057b26d0872a0e0f93b16841d39745ce3e0ae2ff91f48153ce5457113 WHIRLPOOL 450c518fea75de1cf9f9e23419d32f66061dd47796e07b8298326c65c445358b160ace2fe9d8156bf4c0f1f0a8ebd3cf9f123aefd23d3f2bcc9032d114dbc962
+AUX 235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch 2620 SHA256 0211aba9502c23e51e154fccdad7712d729caea3869f969313b9dbf08474641a SHA512 52bf63183930872c44c0dc53a616c75a4ae37ffedfcf34b2b5e400994b334d311b2afcadd75e91dd6c37a88cab71e30d2d6690261a980ea5dfc056b67d7e2e78 WHIRLPOOL 1f3c1fcc5a161644785aae482d97e2007150d47beae4372fdb30805f291b33e21d2e8e16ea6bc4cc9cf8c0fbd3d8ddfff2504af1e568c519b2398411eca9458e
 AUX generator-path.patch 1046 SHA256 aeb236e19bedc17737ada8953fed61272423b36fd186ffeaff0f14addc488549 SHA512 e9999afbf4d2d8a9e828d81dd0b54e2c2ba556e9778a4954dac3da885a15bc6dcc718f7e119c352eb2efd090e410735395ec20ce2eb3c84a481570bc8b5f66b3 WHIRLPOOL cbc5eb71fe2f61c95adefca78f29f1acd7ccb7bf9ccb7872326b2c7ed2704f4c856dd7456759c3320496995bef4f94d390b0d5f6d9b2585cb99c4a27faabdf2a
 AUX nsswitch.conf 698 SHA256 56aada9338fad1b105bc5755a85761cab57dc9aba180545be2df0b993b581eb3 SHA512 486581b096db702941589bbd3211df58df4979d17856dc935f6e22f7a268c5b6b1c4dfa643d38e21bc01eb258b0b97318d4e97ebab0e87abd718af1e391fde1a WHIRLPOOL 160d83a8a136c44d8d4d1fa9c8c321ff792746b6482c29662c93bcab720540591ea95c4c6a68252f024b449360fcdcebf4c78ee0e33be268e8801bede1286200
 DIST systemd-233-man.tar.gz 31386 SHA256 825e62eb82c4e23997061fc8f56f7ec9bb1e6ac1111d279c76c926cc2bfbf1dc SHA512 cc5215d3590ffc3c9203a64c14d6adeb0148c421c1396b8c1e43dcb58763b687ce99bdee327dd8a00abab7198171e73b22109a3f2032e4cec6adf2dcc85acf40 WHIRLPOOL ff1f36beff377f675047271df38503e8b71d615ea73c5fdfebf465edaf1fe29b4f89e3194d65cdf84eec9b7c3156de597627fdaffa4b86018520aaa127a7a159
diff --git a/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch b/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch
index 99e7342ffb23..9c11106f6058 100644
--- a/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch
+++ b/sys-apps/systemd/files/235-0002-networkd-Don-t-stop-networkd-if-CONFIG_FIB_RULES-n-i.patch
@@ -1,14 +1,14 @@
-From 3bd3ac67477ea319cc169dbd1c377912cf8ff198 Mon Sep 17 00:00:00 2001
-From: Susant Sahani <susant@redhat.com>
-Date: Sun, 8 Oct 2017 21:51:35 +0530
-Subject: [PATCH] networkd: Don't stop networkd if CONFIG_FIB_RULES=n in
- kernel.
+From 6acbbdd4da2d072112042abbce8c0a9523beed4e Mon Sep 17 00:00:00 2001
+From: Susant Sahani <145210+ssahani@users.noreply.github.com>
+Date: Wed, 18 Oct 2017 11:55:57 +0530
+Subject: [PATCH] networkd: Don't stop networkd if CONFIG_FIB_RULES=n in kernel
+ (#7030)
 
-if FIB Rules in not supported by the kernel then networkd fails to
+If FIB Rules are not supported by the kernel then networkd fails to
 start as it retuns error=-EOPNOTSUPP.
 In this case just ignore and let start networkd.
 
-````
+```
 sendto(5, {{len=28, type=RTM_GETRULE, flags=NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP, seq=8, pid=0}, {family=AF_UNSPEC, dst_len=0, src_len=0, tos=0, table=RT_TABLE_UNSPEC, action=FR_ACT_TO_TBL, flags=0}}, 28, 0, {sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, 16) = 28
 recvmsg(5, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, msg_namelen=128->12, msg_iov=[{iov_base=NULL, iov_len=0}], msg_iovlen=1, msg_control=[{cmsg_len=20, cmsg_level=SOL_NETLINK, cmsg_type=0x3}], msg_controllen=24, msg_flags=MSG_TRUNC}, MSG_PEEK|MSG_TRUNC) = 48
 recvmsg(5, {msg_name={sa_family=AF_NETLINK, nl_pid=0, nl_groups=00000000}, msg_namelen=128->12, msg_iov=[{iov_base={{len=48, type=NLMSG_ERROR, flags=0, seq=8, pid=8856}, {error=-EOPNOTSUPP, msg={{len=28, type=RTM_GETRULE, flags=NLM_F_REQUEST|NLM_F_ACK|NLM_F_DUMP, seq=8, pid=0}, {family=AF_UNSPEC, dst_len=0, src_len=0, tos=0, table=RT_TABLE_UNSPEC, action=FR_ACT_TO_TBL, flags=0}}}}, iov_len=7416}], msg_iovlen=1, msg_control=[{cmsg_len=20, cmsg_level=SOL_NETLINK, cmsg_type=0x3}], msg_controllen=24, msg_flags=0}, MSG_TRUNC) = 48
@@ -22,26 +22,29 @@ Oct 08 10:22:24 naomi systemd[1]: systemd-networkd.service: Main process exited,
 
 Fixes #7027
 ---
- src/network/networkd.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
+ src/network/networkd-manager.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
 
-diff --git a/src/network/networkd.c b/src/network/networkd.c
-index d5ba6893e..7f7223c0c 100644
---- a/src/network/networkd.c
-+++ b/src/network/networkd.c
-@@ -133,10 +133,8 @@ int main(int argc, char *argv[]) {
-         }
+diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
+index 71445d5dd..200d0f622 100644
+--- a/src/network/networkd-manager.c
++++ b/src/network/networkd-manager.c
+@@ -1454,8 +1454,14 @@ int manager_rtnl_enumerate_rules(Manager *m) {
+                 return r;
  
-         r = manager_rtnl_enumerate_rules(m);
--        if (r < 0) {
--                log_error_errno(r, "Could not enumerate rules: %m");
--                goto out;
--        }
-+        if (r < 0)
-+                log_warning_errno(r, "Could not enumerate rules: %m");
+         r = sd_netlink_call(m->rtnl, req, 0, &reply);
+-        if (r < 0)
++        if (r < 0) {
++                if (r == -EOPNOTSUPP) {
++                        log_debug("FIB Rules are not supported by the kernel. Ignoring.");
++                        return 0;
++                }
++
+                 return r;
++        }
  
-         r = manager_start(m);
-         if (r < 0) {
+         for (rule = reply; rule; rule = sd_netlink_message_next(rule)) {
+                 int k;
 -- 
-2.14.2
+2.15.0.rc1
 
-- 
cgit v1.2.3