17 files changed, 457 insertions, 20 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index b3aa39a8f191..0c8d642f201f 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 0cc60e0d3619..7f70442c057e 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -3,5 +3,5 @@ AUX accountsservice-0.6.43-elogind.patch 3677 BLAKE2B 39a2bc501103815bfd3b9e81f3
 DIST accountsservice-0.6.43.tar.xz 381008 BLAKE2B 62b29bbb04eef0503c29cb9d81056776f7cb3840145231f049f8b335dfc11bfd60f2ec717e3543b0af73c597da2e4c2d4139c0c535b1716923695355f06e7e4e SHA512 0673430b7e5fd726397a9358d60d5c34542afaa786b795d3c8b544dc2bdab151c74f9a3daa4bcd94dc7669400a78cd4cddc453cad78ee8e431bf7c1f417138e2
 DIST accountsservice-0.6.45.tar.xz 382740 BLAKE2B ce88e53c7d0187f53ed0a2758f81c8e2d1083ab1c95ec6cddebb2167b36706b1537ecf74b7904a9002c6179cfdf811a3268451af9443727ba9793a9af06cf8aa SHA512 09975f9fa03a3177d923de6d6f6e6acfffeb2ff4924c45eaac78c994c16974427c8e936a87034747ba494d2bb3df6e8a92ff44db387761b06e06e311d7cf105a
 EBUILD accountsservice-0.6.43-r1.ebuild 1536 BLAKE2B bb93638f7cb78c118339b04c322fc36e743cd0efa553d9588c3b360807c2c5bdc68fc611b15b3c4117fa82e189e61861a0de83117dd2ae4a1493e28e0044830e SHA512 3150d720a6452bc8edbbb79fa7cc9d4aed6fe28f1e80aca1eaedf6d699c16226cc72ad6ffa2e75793356dad667d70dc7213808d95c1c01b36c889dd317cdad71
-EBUILD accountsservice-0.6.45.ebuild 1546 BLAKE2B ce96e859093da1f9076e60caf01356022e260aeb1a19151d054d0cc175aedd6a4e9a68ce681a0598df0ffe604a36ba45fe7cfa00ca2adfc117940b6841c5c764 SHA512 3323433d134cbbd9d6e654f755fa9432aaf1b27b376b192658eb41a50c7e5c9695ac509c3847fe5574815f6af90f108b098fd16dd69b6f636f85aeaef8938f65
+EBUILD accountsservice-0.6.45.ebuild 1545 BLAKE2B 97539009b24c07b6b3e781ac4cc55b0092a8b62cbbd833dbc1f364a17c1dcf458326c7381ed71f0e7e27579745970fe683b8a37b8edcb928882ebd40f6b33799 SHA512 0a4c75b07624dcba1432dfbcd959772e00d59045323d098ae821f159d992650e378350b38e75b2d8fa1754986598d6588b6d19607fe8f796729db65aa3c9a029
 MISC metadata.xml 524 BLAKE2B a48a629a81d6502b8c54c466c6d901fe02e0fbe14ddbfd3294501560a19e33c3915c1305ea981fe41c572689def2d0a8f00de4b3131a19297f4ef3db9d6b5b06 SHA512 a0c662b3c0c45df43780f160b6db6db67561a1b2c84ce60929707d94cd9f1bf76588420189b91e0eafe58001a61d8a313f2a4b421b980a7c7f988c95e782ee07
diff --git a/sys-apps/accountsservice/accountsservice-0.6.45.ebuild b/sys-apps/accountsservice/accountsservice-0.6.45.ebuild
index 441edab3483b..480c9c202e40 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.45.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.45.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc ~x86"
 
 IUSE="doc elogind +introspection selinux systemd"
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index d82de1f23e0b..db812c09b745 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -6,5 +6,5 @@ AUX etckeeper-1.18.6-gentoo.patch 2812 BLAKE2B 4df25391aad119d6c01cb4e35cf83a110
 DIST etckeeper-1.18.1.tar.gz 56366 BLAKE2B ac3cff677139b09eb400acc757852b7650c68a1c50bc0fd6a13bc170215d7abf32cbaadda44fa6ce55245d1c225b0ea0890465b353c31fa31724dea92d7f06c9 SHA512 5b5019d3f8c22ee0486c9102d7dbdc7e86921d432df49c15733e5ed23651c2be87b52e295208be691ef1e44a515d960fcf4f812eaca17f2806e2f5055222ca35
 DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c
 EBUILD etckeeper-1.18.1.ebuild 1784 BLAKE2B f971fef60cc90e4030a1b4a46a3d48d2d74c8adf40d7efd73830150391b7fc279cbd87f65b270e4214c4477013f3ae1c3c1eda0e2446b68262ba288c6f037c7e SHA512 b391cdd6aee3426361274efe675398d02ef0918ec12d3c69bb91f9c9852b15227bc93cfa706073d5a622035cd37cc1b11ca8a736ebe77a3194e7cda1da991d85
-EBUILD etckeeper-1.18.6.ebuild 1713 BLAKE2B c0d5fe50b5a19d998ef8fb2c206da0e2ec5c06e8d5363f5d510bbef1705e8ff59d3f7f91219f8e1b7cf561f35d62cec0802a89f41c1e34d2e5452425c0424fb6 SHA512 faa248a5bf4546bf8202ad9f9f70efe90b4ce83b2240f8dab4dbd2a53f9de2bfd2fbb5e6885a7c2be0f8098c10796f5a0ff1e12f1bf39d11f4bf4a0a0fc40ea8
+EBUILD etckeeper-1.18.6.ebuild 1712 BLAKE2B 6bd4133b41384aea4f957ffcca21e1e1e59c4e75d1261bce749c217ccc9c5c558c85c83592d8d527326f2e165ef508eab2046b134c380c0c395d34ca5ba4693e SHA512 91026959871b2613d84c0ee1eff23acc25e7d7157d3b9cc5753373fcde090b8b6f548238ebec31901ebbcbbc199eba7dc762cb4fe99bc5b7399f29cb323f0572
 MISC metadata.xml 780 BLAKE2B 82a4dde4c7c0f01d2bc47b85c0135d305f70515136415ad3484136e87b10ddd67e5317fd711fc758aee6a6d192e218e9b0259819708742de1842cb80437f46b5 SHA512 7977587ec28b947dca79efd21c0f5ec9244b52cb29d663e33952bfc9c64730eaa6b3a5e6c97387028bf2434da5f7cd4ff92c22f1d6bd5ff13071aa988e991bda
diff --git a/sys-apps/etckeeper/etckeeper-1.18.6.ebuild b/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
index 24ebe2733980..959d3a284f74 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://etckeeper.branchable.com/"
 SRC_URI="https://github.com/joeyh/etckeeper/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 SLOT="0"
 IUSE="bazaar cron"
 REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 324846255b57..48f90f68bc1a 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -10,5 +10,5 @@ EBUILD firejail-0.9.44.10.ebuild 1073 BLAKE2B c23401fc4ec21fb065ec425cbfb0884ecb
 EBUILD firejail-0.9.44.8.ebuild 1072 BLAKE2B 645fa0f1fc4663dcedc59a8751e78a136a8e2a95c069f9842fec18feef4a39dc3db3c2a9b899bb59ff9c601d6be7f65574d137d59d5998164987c5fe0e4ed694 SHA512 37ebb09a4198526c968e569aab7c0b9ed8b55ca60c5b0e48a14d9deceb458a8ad63513a3867f2c28da0ede185e656cc32309873303eae498ebcd691662480e97
 EBUILD firejail-0.9.46.ebuild 1172 BLAKE2B 9135994888bbaa4993a28a82b21f1e15b5fb8aa61916f3f40b8ef2f11eab2dbddda43585b0bc0d60d5065fcf0dc8f6f1e565b713d65f7857ea07cc17ab031fda SHA512 425127acc54623c7a4715a1170a620720030a126937bcadcd8322736751178d75501c4cd8ec88a22ee036e137b405cad88885f1b331eb8856ce510c21e57538b
 EBUILD firejail-0.9.48.ebuild 1172 BLAKE2B 9135994888bbaa4993a28a82b21f1e15b5fb8aa61916f3f40b8ef2f11eab2dbddda43585b0bc0d60d5065fcf0dc8f6f1e565b713d65f7857ea07cc17ab031fda SHA512 425127acc54623c7a4715a1170a620720030a126937bcadcd8322736751178d75501c4cd8ec88a22ee036e137b405cad88885f1b331eb8856ce510c21e57538b
-EBUILD firejail-0.9.50.ebuild 1172 BLAKE2B 9135994888bbaa4993a28a82b21f1e15b5fb8aa61916f3f40b8ef2f11eab2dbddda43585b0bc0d60d5065fcf0dc8f6f1e565b713d65f7857ea07cc17ab031fda SHA512 425127acc54623c7a4715a1170a620720030a126937bcadcd8322736751178d75501c4cd8ec88a22ee036e137b405cad88885f1b331eb8856ce510c21e57538b
+EBUILD firejail-0.9.50.ebuild 1171 BLAKE2B 5b36b05b69a2936a8a94e56950fed464abc9719960305adbab0a228baedd930492ffca5cba4097db8ca68ca4371db74eaebbf702dd136876941c9a4556cbf0fc SHA512 639bebf94119505b10629c481c5db8df7eff476d84afe9795f4b9b9d56bb720c9e2a2507e9c50fa8156156badbe5ccfddc1d5f6f15b6b16591a594a4eea4b0df
 MISC metadata.xml 1627 BLAKE2B 1029e5cce7af2355b66b4c600e96273669a0876ebc1c85dd1c169eaf6419e48d4173db1a99851963ace27f90b7965d7032a00309f124ffe3545d3325b450fcbf SHA512 081d4f02dafd4c82aca839117c52b744ba50d3816b2ee01916c8f5fe60ae914717c7d3a36cdd0d064f3bc2ae1d4a7fa75e946536fce509c6aac37c84832ef946
diff --git a/sys-apps/firejail/firejail-0.9.50.ebuild b/sys-apps/firejail/firejail-0.9.50.ebuild
index b53f0cfbfdc2..85b81b1bd4d5 100644
--- a/sys-apps/firejail/firejail-0.9.50.ebuild
+++ b/sys-apps/firejail/firejail-0.9.50.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="apparmor +bind +chroot contrib +file-transfer +network
 	network-restricted +seccomp +userns x11"
 
diff --git a/sys-apps/miscfiles/Manifest b/sys-apps/miscfiles/Manifest
index f7fb0201bc67..66fc2eb581e7 100644
--- a/sys-apps/miscfiles/Manifest
+++ b/sys-apps/miscfiles/Manifest
@@ -3,5 +3,5 @@ DIST UnicodeData-6.1.0.txt.xz 129972 BLAKE2B 52836b9db627cbc8608a148eb179f982679
 DIST miscfiles-1.5.tar.gz 1585293 BLAKE2B 816197e72192e8b41839eb29d501a148f95496a7f3e7be469184e9396cc34fc95c161207edb60a5b7f8d43fe50c58202f0b16b2e4b1ce188527718e4f85e24bb SHA512 d7ab23a709539278cce59e0c32bfcb3a0f11dc52ef537e3823e72382962af7f4fedb8b957f39ff1da51a93a00e3c4f6ec29f7332d7879c77fd7f4ec0ee4f82aa
 EBUILD miscfiles-1.5-r1.ebuild 1683 BLAKE2B 72bbc5e04b22a712ad54a9d8015ea679d805924684250ad253b7a5e457599afe9804b1e963ea50e70336eda9ef7c035afdc7c538f6b2f896656e579c37cdb24f SHA512 f3d4498d846974f4a7afb0fc09ac4755ccaa0c4dcba7f5ff7184942ebd0b45c786a58525e12d0c8d3b38890c263511432f78f699ac7768a398abfa8eb6e6bf95
 EBUILD miscfiles-1.5-r2.ebuild 1847 BLAKE2B f6671e00682d3d4f37d95e14805df13f0bdba76ae062c3aa8bc9c44c1095cd08c1b7605396820d778750b8a109e9fc26f2d843e988abac0a0615af546b649e2a SHA512 a5bd1e9d5df82ad02d567a2b73e8ba71bffc73c8ab1406222f19ecdc09bb81c9aadf906fae02af4b749a095dc62e1fa515d8754873c6fe03bd46f8057794324b
-EBUILD miscfiles-1.5-r3.ebuild 1863 BLAKE2B 02baa39aad2faecbcac8a5678a33352ecb9321edf94fceecae9334cc25f5620579b3be0b7fd0c3d64423eb82384181a64139fd6d0d40159f67db1fd378a2f2b5 SHA512 add1b4858344f1453496c2546a9f59bfce6c245cc595ca8fd4523afde1d7419ef76bcc83031b568a6ed6925596ba37305935d8ae960437bda198018dc95a8cc3
+EBUILD miscfiles-1.5-r3.ebuild 1861 BLAKE2B 8671a43f6d278f3f3ba6ed446e56ae83389c2f7c60e26128bb2e963223efa87ea022ce09522dd846effaec4db2ccf232ab2a37a75d1e95cdd132039b97fc35c0 SHA512 052278a5b93315551a817bba21523a254c927a461894a033101651e0ad0123a2132de38691d7b3824786c58c05a6804082c5ca0f41651b0fd67e69f3af11d766
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
index 009120ebde14..8df83cfef304 100644
--- a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz
 
 LICENSE="GPL-2 unicode"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="minimal"
 
 # Collides with older versions/revisions
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 3a6888ecc7f7..e6abb839bdf0 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -3,5 +3,5 @@ DIST osinfo-db-20170423.tar.xz 63508 BLAKE2B 9ca14c6d23194f30b467ce9f5525e69aa72
 DIST osinfo-db-20170813.tar.xz 64424 BLAKE2B b4d46f82197bb5f1b956fe72e87ef365b139c6a1ab90906ac30dd3191fb6c3f5ef3978ceaf56d029a3766e8354558aa00554a767c637eef49b861b6a775fc614 SHA512 0ae4906b5c3eb400ca397f0c3baf5146b8197ee2dc712b1b89dd2f443f9505aee208327f008118628407b54ce52390a8b6138425f3f6f974b94f4a8d79955653
 EBUILD osinfo-db-20170326.ebuild 664 BLAKE2B 25c02a4f93886619810ab5eac0d4925db02695356b379e5bb447bc0dd3a33c58ad44dfff80c4ca8b918517e92f5cf20b415ea655e15de85ef26d6defe551dffc SHA512 6a2cb98de0fc6d4c9af1cfd084cf56d614c9b480aff815bb74edaf8c391179c0e01d476d847e0e10425f8c9080a7223c6e8798cfcc79215c84310ca7278b7c18
 EBUILD osinfo-db-20170423.ebuild 673 BLAKE2B ec5c90de394f6a8e1d3488119746c0bb869a862617677b88e8f68e5303d78a6e24eda6377fac3409e4327ca60dc6e45445e75a6d745d7333ac5bd24f083fccc3 SHA512 269fa69e7055e1c83f98052ad4cbf7dcfe86819e1cf0e759e6fb693c1ef576ef9c1244c71e23955d2acbae915a657f2cc1dbca601cb5d7301631a91a93844431
-EBUILD osinfo-db-20170813.ebuild 673 BLAKE2B ec5c90de394f6a8e1d3488119746c0bb869a862617677b88e8f68e5303d78a6e24eda6377fac3409e4327ca60dc6e45445e75a6d745d7333ac5bd24f083fccc3 SHA512 269fa69e7055e1c83f98052ad4cbf7dcfe86819e1cf0e759e6fb693c1ef576ef9c1244c71e23955d2acbae915a657f2cc1dbca601cb5d7301631a91a93844431
+EBUILD osinfo-db-20170813.ebuild 672 BLAKE2B 90101b7594280428ade5e5f95966533e0d5414d20ac52a819cc7030ebab52908077f483700330f084240533615798bf6b1f3772f93b33bf24ffb6e866aa7e217 SHA512 b399ea72997808e671cbcc2f6f14050bfe5a3f440d5b0edeae8ee0ca7d29551ea960a6f92840c5a27127ba50fba549cd73a8a631c0d3e9765578630648c9f17b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20170813.ebuild b/sys-apps/osinfo-db/osinfo-db-20170813.ebuild
index c9a011444bf3..d7acabf27719 100644
--- a/sys-apps/osinfo-db/osinfo-db-20170813.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20170813.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 1d2ff9293668..159ad990104e 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -2,14 +2,14 @@ AUX README.RESCUE 137 BLAKE2B af986752f516bf1925852271f2cea558fe02990c1180ac696c
 DIST portage-2.3.13.tar.bz2 945477 BLAKE2B 0ad44859f04db529713cc80a51e6dadc767ed6b6d0aef1d070650d82133c05e161eaa9fd1e208b3078c513ccf6f73136b8bf865542f0dc9396de9142bad1d32c SHA512 71d9ea6c9a889572f60e7e501e9f8739db588cffd98a431303906eb90c1f7bb85c55f6779cbfb921630149d1b3174539fe2357fbeffbbe9857998907e3215ad3
 DIST portage-2.3.14.tar.bz2 948535 BLAKE2B 765c9eabb64c3b095993bb244481df2d243f57ad97029d7bb3d9ac89fd0ee939fb3a2aaa624a0f40959820903d70e6c209518d97df6b82501325963c963db9df SHA512 36daf3b9425e08a8e136e87dbb7be43d4688b5505203f11938a07b916da441e1f802b1cbd2e97505c0dc1c249ba5fda2a059a4ad515c2887f8199d1e130a2732
 DIST portage-2.3.16.tar.bz2 949134 BLAKE2B f8e7b6f13dfbf9aecdec444705042c6584c324522c0d131bf3c10f8fbfd5f6eeb97134afa42ed23da37f36ad4e2a0fc27129aebeb100aed2e3fd650c360ed060 SHA512 5847904b3262adcef04c7d6781cf2d03130480a49c5343a3a2d5cc36ddc7245ac30b1ba152329f96e2e4ca8d62ef387554cb228798db60f6f8141830d147dfaf
-DIST portage-2.3.18.tar.bz2 954588 BLAKE2B 9ab3b0d3fab188c5fd301fb1023d5be47cf585ac9816836e9f5edb76aceaf2b45e9e67f3bb50dbdfe24cd58a9dcaad3009096563d91ee35fec631a4691371b52 SHA512 b27f05239014f6172a85e162186d73ae60195f2ae5d71a5d5b14f26c7c14f547081e732fcd0978ca0a0026a0c40a4926737680f32540d4c6e20b9b0d16b16118
+DIST portage-2.3.19.tar.bz2 954921 BLAKE2B e1bb3606ff2c5ba7b2123c61469b99f4d5d89f534a9af26065ac03bb2accd00cd363e4027e33546fc9b6d01b2fb65ca0d4311c6e2e8cc518c09030c979a69240 SHA512 94899bdfa4d22c846234bd28d4744613202cf67d3f32c242cb7fb60b17419419a2a29912e584ade7df52fba4c6a58774c5859148352221c978f34b4e7680981d
 DIST portage-2.3.6.tar.bz2 943085 BLAKE2B 5c649ec5f5a82b5f55c71425d13ee3335a773c7f78500d6ec963594c95eba5d9fc49c37ab5ca1bde7621398443d526a8a1485b67748f859726f7f581e2d88091 SHA512 5bcfb678c1ea0cd97a983ee7520c9ecabd07d5bb0fd01c70b74fd7b6ce478f4a109aac84d40b82426719ca7c9ee6aed3affb3b9754045e62b4c664ae113cf055
 DIST portage-2.3.8.tar.bz2 938062 BLAKE2B 3f7bedf6268131a3b3539d53c8a7bb069b533b3a78e5eec521b6201439c8ee5e66996e798fe295561d0a94bfcd32adf414d4f8b5e7a93035cea09749406e64a3 SHA512 4b4b2de20323799b9b0f7a8812f939aa9a96d2744a0f65ad5287ba49744c491b55169cdb21f2885317a6a7c960d2070775ffd798f247b44eebc677c33c271eb8
 EBUILD portage-2.3.13-r1.ebuild 8518 BLAKE2B ab9fbf21b666eb2c8fb4e2e0e9defc9f4ec19c339d7587fed01ed94421609e7b75648fc59e037ecca933468023ae33c16d05f2c3d100b28bc47ea55e7d88c00d SHA512 44faaa868a4c4832ed596d9601e958f0af21a60a8be1e5a59e1d4b15fbeb6c3d39e1943f0c01f9c99960c00c9ad34a3ac5b91ff8b6824ad9eca821168ba97bb5
 EBUILD portage-2.3.13.ebuild 8220 BLAKE2B 1c71ce90b2d0d0ff9ecdbc842e9178cc5ba3e3016c3d00243f6dfa43772ce8fe6719965bc7f6f968a24ebd267442f3697b698dc5e8e947aca85f611cba33a12f SHA512 01c64f9252eddec365801614582182d509f969fd83889d003a3081df96f92dc2f3b707231ef74357fdd049eedef726e95304d3ceec0c334504ca186ee5cd0f01
 EBUILD portage-2.3.14.ebuild 8523 BLAKE2B eed0ce93cc3d1401817cbcc14c12bf76157dda41294958ab2d72ae72187f62d220e3cdde93b40d3f6c7b80e65f564bfb062b2a37230c8200d855b4e585165b80 SHA512 439a5e2521e74d4a5b73e91f9e3f0ae29b3eaa01c6bb3e2f3420f2ee838b6fbb60438e785c30e9806fb7cd65d7dbcf6062d1b3f61a4792c01326ab874dbacdfe
 EBUILD portage-2.3.16.ebuild 8364 BLAKE2B 5e3d2e58275986ef97177fd66411005c425c351e2af3d58d9f23bf78eb8a324c3e5eed8ee9940a69becd2598999a0e180e28bfb2f1a2a835f92297d822efbf9b SHA512 f1ae940de4e730190162b6ed7a9e7de1ff59c7b36fe32e85bfd3439c196472446a674056e11a1958bde1f7efb0c45f7cbef0a3bf369552c70810001adb630c65
-EBUILD portage-2.3.18.ebuild 8364 BLAKE2B 5e3d2e58275986ef97177fd66411005c425c351e2af3d58d9f23bf78eb8a324c3e5eed8ee9940a69becd2598999a0e180e28bfb2f1a2a835f92297d822efbf9b SHA512 f1ae940de4e730190162b6ed7a9e7de1ff59c7b36fe32e85bfd3439c196472446a674056e11a1958bde1f7efb0c45f7cbef0a3bf369552c70810001adb630c65
+EBUILD portage-2.3.19.ebuild 8364 BLAKE2B 5e3d2e58275986ef97177fd66411005c425c351e2af3d58d9f23bf78eb8a324c3e5eed8ee9940a69becd2598999a0e180e28bfb2f1a2a835f92297d822efbf9b SHA512 f1ae940de4e730190162b6ed7a9e7de1ff59c7b36fe32e85bfd3439c196472446a674056e11a1958bde1f7efb0c45f7cbef0a3bf369552c70810001adb630c65
 EBUILD portage-2.3.6.ebuild 8661 BLAKE2B 79789262c8d2cfea53c24291ee9b1d638bee592c2eb6435b22f6996be43bd5e0bf76df39df74163b98297d6ecd11c24fe4b8ee0cbd84b7a62196c0b9de4ef8d6 SHA512 53301757289cc37690020ac7b5379d026ff1e87f9d558c913eae213d0f33b75261045616c9259fe28684aa1031c27d4f58a52438e67eb91a97d186a80ad298a4
 EBUILD portage-2.3.8.ebuild 8211 BLAKE2B d615c9a0ae6df8f649f6ccdaecd6a404f9196cc62008b3bc38801c8e355b82b0288c00e4c52e481961fa6f568c0cfd4425a4ec7e313d08f9be143623ea2cfbaf SHA512 d803ac927d8a6f7fb00f629bca8a1bf94200d4ecbc83740afb32041b865dcfd13ca4329eda9693ceab20d2bcec30b132e23fd0b62cef262f246297f0d6ff748a
 EBUILD portage-9999.ebuild 7898 BLAKE2B 3eb2b5417170a7309bb0a56085ab1caf807a7245d02cd3f1f2f1e8dc2a75dee0204538daac9b364d1604da89abef5e55093af6759ef62136f2829a928fec180e SHA512 07c97f2f8b2fdbc4e1494fa517c88eb9fbdfd3429b3e21e4087be9ae4e6cf3ce401cd7def881d32cb9f5e9f8e25515e776c866f050c0181f9ef7e2cbf4affeef
diff --git a/sys-apps/portage/portage-2.3.18.ebuild b/sys-apps/portage/portage-2.3.19.ebuild
index b4f03d91d2de..b4f03d91d2de 100644
--- a/sys-apps/portage/portage-2.3.18.ebuild
+++ b/sys-apps/portage/portage-2.3.19.ebuild
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 113b2717ca1b..0a5cb69c6f58 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -17,9 +17,11 @@ AUX nsswitch.conf 698 BLAKE2B ad209377afa4bea6383dba80b045c3905e6e0c0cd091c6710f
 DIST systemd-233-man.tar.gz 31386 BLAKE2B e4947e658db3efeec6b5a6adf340d2cc8e8aff2a14db4932720f90c3dc898b1e78595db983948373a2e28191fb3b0aad234f80feb91ee8ae4b607a44038a9cae SHA512 cc5215d3590ffc3c9203a64c14d6adeb0148c421c1396b8c1e43dcb58763b687ce99bdee327dd8a00abab7198171e73b22109a3f2032e4cec6adf2dcc85acf40
 DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
 DIST systemd-235.tar.gz 6586406 BLAKE2B f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993
+DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
 EBUILD systemd-233-r4.ebuild 13626 BLAKE2B 42f723d97bd8cdb8bbbfd579026d486f8902e90ec4e6631ed458371bd840f2ed75fa6ea75ecfa7e3aaafea00cab37c59fb9f7474175b6ad31c683b22ef3484f8 SHA512 3527bc62210aba9c50f663d8023440b73ae6185f1a90e6e31a48b6dcc13ac2dc0b312c433cbe74e942cb50ad894d4dd4212d81caf50d17971c9f965cae9535a0
 EBUILD systemd-233-r5.ebuild 13669 BLAKE2B e97ff5d66a6c93ba08b8c728d4675454f853b1571ae7b71d297e98c214361533be02c1c190f3ce71cdcac1ab65e7f11162bc2d891f151871baa7380c782f0f6a SHA512 722307b55c7621f119dee2e483bb7271d5a460945bd938adee6e679345a3549eaf060c96493b54e7a5bcb94a2821ce31949cfaeb5b1a43aeef36b673ecc39d7c
 EBUILD systemd-233-r6.ebuild 13699 BLAKE2B 3ed3402fc222d6ab58406f4c0f92b28864dfaa8af57855148bed7894807ee8598599dcc0a1a13b5eca0776f28e007483c1d45231e629ed950193a5d3b739656e SHA512 8d6f8d99211dbcaa6040657bb7065c2c15b3600f0d5c9e421e7ea3dcd642589679763155dfc80c7cd8ea89ef4afdde3871a2fe70641e49ddf55a7d3908b36751
 EBUILD systemd-235-r1.ebuild 13481 BLAKE2B be0a0674aa5a9c151e03311a5e0ea50f6c879cf3ae9bbbbf49eb6a2f9ad8bea5fe65c113583006d69c60b703311881d5038ff79ede1bf91dff3fbd4c856714a3 SHA512 11245b058f3dea86cef8cd852b5cc59ede421c552e4a7e0d22a2666e87bc33e14df68e0029d169dc3f4189d3d25d8e0147eec20d48d9a2f3cc0b9c3c96ab8e99
-EBUILD systemd-9999.ebuild 12674 BLAKE2B 8b18c153ee288ed6f5f8dfc15fa7058977cbff8a7229480cbad9f2bb621f17e54b6f8d52842e3b4bc56deb279fdcc67bcedb3a72541a227b9610356d6d9662a8 SHA512 e3c40c99bc7fdcc3e81f8525ce67c886fc5fd0bc46958784ef44c72fbf0ceb8ed03fb65f0a62e2997585880837a9bd607c7e520633401ca66d685ce32f2815d5
-MISC metadata.xml 2291 BLAKE2B fcb14f27e34bffef70cf44452e9c2a0c303916e7b57a97a9676749e90b0531699864f0a0692a8d67df82dc4a789350aed723e7dce498b5673f421e93c1401b11 SHA512 fc9e28cea024d753d1928e9587b548eee693d3a3ba049e9212c5236d61b3fd9fc1643084bb0c62dbe09f1dbbc5eca38ab127a85540ca886d50072f1bc36a6f01
+EBUILD systemd-236.ebuild 12740 BLAKE2B d4572ae69d701e36447210aae5dc45e838c43aa39d244dd86fba884dab4a5b93a0716a0b123048cd1f4a369222d6ddcfb4621c17f170541cff928471ce0a4db0 SHA512 bb377eec41c240832afc0a40f23ce9ab8d7dd0442f8539672447f3445c988b232ade71fe4949234be8a5e28a89cc956c7a9c59ba932c2641716213380435ab30
+EBUILD systemd-9999.ebuild 12740 BLAKE2B d4572ae69d701e36447210aae5dc45e838c43aa39d244dd86fba884dab4a5b93a0716a0b123048cd1f4a369222d6ddcfb4621c17f170541cff928471ce0a4db0 SHA512 bb377eec41c240832afc0a40f23ce9ab8d7dd0442f8539672447f3445c988b232ade71fe4949234be8a5e28a89cc956c7a9c59ba932c2641716213380435ab30
+MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index 85e4b806ba6c..c0dbc0de0126 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -11,14 +11,12 @@
 	<use>
 		<flag name="apparmor">Enable AppArmor support</flag>
 		<flag name="audit">Enable support for <pkg>sys-process/audit</pkg></flag>
-		<!-- TODO: drop reference to systemd-import once the oldest release in tree is >218 -->
-		<flag name="curl">Enable support for uploading journals; required to build systemd-import/systemd-pull</flag>
+		<flag name="curl">Enable support for uploading journals</flag>
 		<flag name="cryptsetup">Enable cryptsetup tools (includes unit generator for crypttab)</flag>
 		<flag name="doc">Generate systemd.index.7 and systemd.directives.7</flag>
 		<flag name="gnuefi">Enable EFI boot manager and stub loader (built using <pkg>sys-boot/gnu-efi</pkg>)</flag>
 		<flag name="elfutils">Enable coredump stacktraces in the journal</flag>
-		<!-- TODO: drop reference to systemd-import once the oldest release in tree is >218 -->
-		<flag name="gcrypt">Enable sealing of journal files using gcrypt; required to build systemd-import/systemd-pull</flag>
+		<flag name="gcrypt">Enable sealing of journal files using gcrypt</flag>
 		<flag name="http">Enable embedded HTTP server in journald</flag>
 		<flag name="importd">Enable import daemon</flag>
 		<flag name="kmod">Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag>
@@ -27,7 +25,7 @@
 		<flag name="nat">Enable support for network address translation in networkd</flag>
 		<flag name="qrcode">Enable qrcode output support in journal</flag>
 		<flag name="sysv-utils">Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown</flag>
-		<flag name="usrmerge">Enable /usr merge</flag>
+		<flag name="usrmerge">Enable /usr merge (experimental)</flag>
 		<flag name="vanilla">Disable Gentoo-specific behavior and compatibility quirks</flag>
 		<flag name="xkb">Depend on <pkg>x11-libs/libxkbcommon</pkg> to allow logind to control the X11 keymap</flag>
 	</use>
diff --git a/sys-apps/systemd/systemd-236.ebuild b/sys-apps/systemd/systemd-236.ebuild
new file mode 100644
index 000000000000..e0653a7a84ab
--- /dev/null
+++ b/sys-apps/systemd/systemd-236.ebuild
@@ -0,0 +1,434 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
+
+DESCRIPTION="System and service manager for Linux"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
+SLOT="0/2"
+IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam policykit qrcode +seccomp selinux ssl sysv-utils test usrmerge vanilla xkb"
+
+REQUIRED_USE="importd? ( curl gcrypt lzma )"
+RESTRICT="!test? ( test )"
+
+MINKV="3.11"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
+	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
+	!<sys-libs/glibc-2.16
+	acl? ( sys-apps/acl:0= )
+	apparmor? ( sys-libs/libapparmor:0= )
+	audit? ( >=sys-process/audit-2:0= )
+	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
+	curl? ( net-misc/curl:0= )
+	elfutils? ( >=dev-libs/elfutils-0.158:0= )
+	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	http? (
+		>=net-libs/libmicrohttpd-0.9.33:0=
+		ssl? ( >=net-libs/gnutls-3.1.4:0= )
+	)
+	idn? (
+		libidn2? ( net-dns/libidn2 )
+		!libidn2? ( net-dns/libidn )
+	)
+	importd? (
+		app-arch/bzip2:0=
+		sys-libs/zlib:0=
+	)
+	kmod? ( >=sys-apps/kmod-15:0= )
+	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
+	nat? ( net-firewall/iptables:0= )
+	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	sysv-utils? (
+		!sys-apps/systemd-sysv-utils
+		!sys-apps/sysvinit )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	!build? ( || (
+		sys-apps/util-linux[kill(-)]
+		sys-process/procps[kill(+)]
+		sys-apps/coreutils[kill(-)]
+	) )
+	!sys-auth/nss-myhostname
+	!<sys-kernel/dracut-044
+	!sys-fs/eudev
+	!sys-fs/udev"
+
+# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
+PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
+	>=sys-apps/hwids-20150417[udev]
+	>=sys-fs/udev-init-scripts-25
+	policykit? ( sys-auth/polkit )
+	!vanilla? ( sys-apps/gentoo-systemd-integration )"
+
+# Newer linux-headers needed by ia64, bug #480218
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils:0
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=sys-apps/coreutils-8.16
+	>=sys-kernel/linux-headers-${MINKV}
+	virtual/pkgconfig
+	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
+	test? ( sys-apps/dbus )
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt:0
+	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
+			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
+			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
+			~TIMERFD ~TMPFS_XATTR ~UNIX
+			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
+			~!FW_LOADER_USER_HELPER ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
+			~!SYSFS_DEPRECATED_V2"
+
+		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
+		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
+		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
+		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
+		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
+
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+			if linux_chkconfig_present X86; then
+				CONFIG_CHECK+=" ~DMIID"
+			fi
+		fi
+
+		if kernel_is -lt ${MINKV//./ }; then
+			ewarn "Kernel version at least ${MINKV} required"
+		fi
+
+		check_extra_config
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	default
+	[[ ${PV} != 9999 ]] || git-r3_src_unpack
+}
+
+src_prepare() {
+	local PATCHES=(
+	)
+
+	if ! use vanilla; then
+		PATCHES+=(
+			"${FILESDIR}/218-Dont-enable-audit-by-default.patch"
+			"${FILESDIR}/228-noclean-tmp.patch"
+			"${FILESDIR}/233-systemd-user-pam.patch"
+			"${FILESDIR}/236-uucp-group.patch"
+			"${FILESDIR}/generator-path.patch"
+		)
+	fi
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
+
+	default
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+
+	python_setup
+
+	multilib-minimal_src_configure
+}
+
+meson_use() {
+	usex "$1" true false
+}
+
+meson_multilib() {
+	if multilib_is_native_abi; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--localstatedir="${EPREFIX}/var"
+		-Dpamlibdir="$(getpam_mod_dir)"
+		# avoid bash-completion dep
+		-Dbashcompletiondir="$(get_bashcompdir)"
+		# make sure we get /bin:/sbin in PATH
+		-Dsplit-usr=$(usex usrmerge false true)
+		-Dsysvinit-path=
+		-Dsysvrcnd-path=
+		# no deps
+		-Defi=$(meson_multilib)
+		-Dima=true
+		# Optional components/dependencies
+		-Dacl=$(meson_multilib_native_use acl)
+		-Dapparmor=$(meson_multilib_native_use apparmor)
+		-Daudit=$(meson_multilib_native_use audit)
+		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
+		-Dlibcurl=$(meson_multilib_native_use curl)
+		-Delfutils=$(meson_multilib_native_use elfutils)
+		-Dgcrypt=$(meson_use gcrypt)
+		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-libdir="/usr/$(get_libdir)"
+		-Dmicrohttpd=$(meson_multilib_native_use http)
+		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
+		-Dimportd=$(meson_multilib_native_use importd)
+		-Dbzip2=$(meson_multilib_native_use importd)
+		-Dzlib=$(meson_multilib_native_use importd)
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dlz4=$(meson_use lz4)
+		-Dxz=$(meson_use lzma)
+		-Dlibiptc=$(meson_multilib_native_use nat)
+		-Dpam=$(meson_use pam)
+		-Dpolkit=$(meson_multilib_native_use policykit)
+		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Dseccomp=$(meson_multilib_native_use seccomp)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		#-Dtests=$(meson_multilib_native_use test)
+		-Ddbus=$(meson_multilib_native_use test)
+		-Dxkbcommon=$(meson_multilib_native_use xkb)
+		# hardcode a few paths to spare some deps
+		-Dpath-kill=/bin/kill
+		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
+		# Breaks screen, tmux, etc.
+		-Ddefault-kill-user-processes=false
+
+		# multilib options
+		-Dbacklight=$(meson_multilib)
+		-Dbinfmt=$(meson_multilib)
+		-Dcoredump=$(meson_multilib)
+		-Denvironment-d=$(meson_multilib)
+		-Dfirstboot=$(meson_multilib)
+		-Dhibernate=$(meson_multilib)
+		-Dhostnamed=$(meson_multilib)
+		-Dhwdb=$(meson_multilib)
+		-Dldconfig=$(meson_multilib)
+		-Dlocaled=$(meson_multilib)
+		-Dman=$(meson_multilib)
+		-Dnetworkd=$(meson_multilib)
+		-Dquotacheck=$(meson_multilib)
+		-Drandomseed=$(meson_multilib)
+		-Drfkill=$(meson_multilib)
+		-Dsysusers=$(meson_multilib)
+		-Dtimedated=$(meson_multilib)
+		-Dtimesyncd=$(meson_multilib)
+		-Dtmpfiles=$(meson_multilib)
+		-Dvconsole=$(meson_multilib)
+	)
+
+	if multilib_is_native_abi && use idn; then
+		myconf+=(
+			-Dlibidn2=$(usex libidn2 true false)
+			-Dlibidn=$(usex libidn2 false true)
+		)
+	else
+		myconf+=(
+			-Dlibidn2=false
+			-Dlibidn=false
+		)
+	fi
+
+	meson_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	eninja test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	# meson doesn't know about docdir
+	mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if use sysv-utils; then
+		local app
+		for app in halt poweroff reboot runlevel shutdown telinit; do
+			dosym ../bin/systemctl /sbin/${app}
+		done
+		dosym ../lib/systemd/systemd /sbin/init
+	else
+		# we just keep sysvinit tools, so no need for the mans
+		rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+			|| die
+		rm "${ED%/}"/usr/share/man/man1/init.1 || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
+		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
+		/var/log/journal/remote
+
+	# Symlink /etc/sysctl.conf for easy migration.
+	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
+
+	# If we install these symlinks, there is no way for the sysadmin to remove them
+	# permanently.
+	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
+	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
+	rm -f "${ED%/}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
+	rm -f "${ED%/}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
+	rm -fr "${ED%/}"/etc/systemd/system/network-online.target.wants || die
+	rm -fr "${ED%/}"/etc/systemd/system/sockets.target.wants || die
+	rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die
+
+	local udevdir=/lib/udev
+	use usrmerge && udevdir=/usr/lib/udev
+
+	rm -r "${ED%/}${udevdir}/hwdb.d" || die
+
+	if ! use usrmerge; then
+		# Avoid breaking boot/reboot
+		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
+		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
+	fi
+}
+
+migrate_locale() {
+	local envd_locale_def="${EROOT%/}/etc/env.d/02locale"
+	local envd_locale=( "${EROOT%/}"/etc/env.d/??locale )
+	local locale_conf="${EROOT%/}/etc/locale.conf"
+
+	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
+		# If locale.conf does not exist...
+		if [[ -e ${envd_locale} ]]; then
+			# ...either copy env.d/??locale if there's one
+			ebegin "Moving ${envd_locale} to ${locale_conf}"
+			mv "${envd_locale}" "${locale_conf}"
+			eend ${?} || FAIL=1
+		else
+			# ...or create a dummy default
+			ebegin "Creating ${locale_conf}"
+			cat > "${locale_conf}" <<-EOF
+				# This file has been created by the sys-apps/systemd ebuild.
+				# See locale.conf(5) and localectl(1).
+
+				# LANG=${LANG}
+			EOF
+			eend ${?} || FAIL=1
+		fi
+	fi
+
+	if [[ ! -L ${envd_locale} ]]; then
+		# now, if env.d/??locale is not a symlink (to locale.conf)...
+		if [[ -e ${envd_locale} ]]; then
+			# ...warn the user that he has duplicate locale settings
+			ewarn
+			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
+			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
+			ewarn "and create the symlink with the following command:"
+			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
+			ewarn
+		else
+			# ...or just create the symlink if there's nothing here
+			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
+			ln -n -s ../locale.conf "${envd_locale_def}"
+			eend ${?} || FAIL=1
+		fi
+	fi
+}
+
+pkg_postinst() {
+	newusergroup() {
+		enewgroup "$1"
+		enewuser "$1" -1 -1 -1 "$1"
+	}
+
+	enewgroup input
+	enewgroup kvm 78
+	enewgroup systemd-journal
+	newusergroup systemd-bus-proxy
+	newusergroup systemd-coredump
+	newusergroup systemd-journal-gateway
+	newusergroup systemd-journal-remote
+	newusergroup systemd-journal-upload
+	newusergroup systemd-network
+	newusergroup systemd-resolve
+	newusergroup systemd-timesync
+
+	systemd_update_catalog
+
+	# Keep this here in case the database format changes so it gets updated
+	# when required. Despite that this file is owned by sys-apps/hwids.
+	if has_version "sys-apps/hwids[udev]"; then
+		udevadm hwdb --update --root="${EROOT%/}"
+	fi
+
+	udev_reload || FAIL=1
+
+	# Bug 465468, make sure locales are respect, and ensure consistency
+	# between OpenRC & systemd
+	migrate_locale
+
+	systemd_reenable systemd-networkd.service systemd-resolved.service
+
+	if [[ ${FAIL} ]]; then
+		eerror "One of the postinst commands failed. Please check the postinst output"
+		eerror "for errors. You may need to clean up your system and/or try installing"
+		eerror "systemd again."
+		eerror
+	fi
+}
+
+pkg_prerm() {
+	# If removing systemd completely, remove the catalog database.
+	if [[ ! ${REPLACED_BY_VERSION} ]]; then
+		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
+	fi
+}
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index e32db7f21900..e0653a7a84ab 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -328,7 +328,10 @@ multilib_src_install_all() {
 	rm -fr "${ED%/}"/etc/systemd/system/sockets.target.wants || die
 	rm -fr "${ED%/}"/etc/systemd/system/sysinit.target.wants || die
 
-	rm -r "${ED%/}"/lib/udev/hwdb.d || die
+	local udevdir=/lib/udev
+	use usrmerge && udevdir=/usr/lib/udev
+
+	rm -r "${ED%/}${udevdir}/hwdb.d" || die
 
 	if ! use usrmerge; then
 		# Avoid breaking boot/reboot