gentoo resync : 13.10.2017

18 files changed, 487 insertions, 21 deletions

diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 108fec47311a..11ac150e35c6 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -17,12 +17,16 @@ AUX mongodb.conf 246 SHA256 8010ce728d657524cd76b5afda7ffbc1cc389642336b12b89cec
 AUX mongodb.conf-r2 698 SHA256 780fa095f5eacee59f3f683f225fe545c8ec93a27157894885d5f4656a6ae15a SHA512 15480651b5e7b1927b95d633193aee08def71e2f9ef6438f93972e359b2605e51ce6f071f5fd64b73b2bf4db58710a04634a36144db2c2e585588098d69b66fb WHIRLPOOL 2d2d2bf793ae5b1c7c27be227001c3eeb1a76cd620ce8e3882e7d43f10625df8c21d8452dabeef4b8cb750246436d57ad900f915aadd74dcc02c9341ab5d343b
 AUX mongodb.conf-r3 722 SHA256 b4009296b3e794fa1686aec0502b01431e94fc4754cb66d1f00bad64dcb24e72 SHA512 ef193bfed673477aa0e868114bd52be6675492c164f218c71ccd02c4a620b5c4799ea1d18df0c3f2b364027b9f25e60ac4475bb216b25e1dc10bfd00a9f5d45d WHIRLPOOL f536abc8102f20c94bf19c9691345a31eaed84768a413d508437b0aab5100e36cb29f193e0d90e1b76d13892789bd9a9bd815d0f76491df0db375315df7a135e
 AUX mongodb.confd-r2 549 SHA256 6275df7b1bbee218545331d68da3814d0e0fa89d3b30e21370bbeb776dd19e0a SHA512 75f11e8350e98b90eccafd577d794e4b05f36ede8d95e7839e9fa1eb77ea7bd9cdd2fdd07719abb78a714cd7d72109c177d265d6417ef198a4217453c0a4db68 WHIRLPOOL 974eeb5dd58d52670121b2e8e687250cae4d5c49ec020dc30746bf39356762d63f41371526744f2b9fdd657134e7570d7501a3ce5995e830e039cc9eeb8a427e
+AUX mongodb.confd-r3 473 SHA256 39418ff743d0245fd4115a04e40d4763736364f4b9d56af3477f529e4b4d2d66 SHA512 8a90fb39ad16837458a2add25a9b9059e2b356794cfbf3cb35c9ecd6a584ee300c67b49b5261e062eaf7aac593588e2871e5cf76ab2287e58ea342436d0afe56 WHIRLPOOL 684d29290fcde65a585c85410fa9ab8835a4bfe4f4502dd4d94cb76dad94365faf8c27c1194b41ab7df0e1c5b31fb0c84cd12e942ca23c41fedb48db4876c9f3
 AUX mongodb.initd-r2 654 SHA256 aef830c770a9f58ae55fa73caea31eb9d1a2d18c6e2ffba186848aa3f67e860f SHA512 566d47356ef956ee44b170b4498a6361583efea5a01cc3a7e0936c0abdff3100b535eb1259434bd7a68de354b75d165e543362bb93f1fb527b1605de23557398 WHIRLPOOL bffff8adb48c16522adc0226262e4015e74d72367148302f7c6c1897f229eb2210b102d731db257224d142b0cbd3c8f4ad0d99ab1a58e79ce1f943fee3618a5a
+AUX mongodb.initd-r3 422 SHA256 9639948cfa2d6ea1d143c50521bf31d924519956dee0bc46a7c9d814fb59c24f SHA512 ebeefa1abefddd8d90fd09da035215c65d4f4fa374ec72db487fb7f457ff5a92c5b806743e58b1f6e97854d362b3b3699dba260bd3f8d0614b4cfc5de550f45b WHIRLPOOL 46c04e1c23953cfbfeca81a15385def055fe06a44b050bc2bf5cca87aa7314b6d898ef26d457bbadcc42a85a94c38802278f05eca034b76600e5cfe8e35bf60d
 AUX mongodb.logrotate 205 SHA256 76994c32d999def5c925bd7be3f96687b3406f1d67b89aa6a4df8053025b1e01 SHA512 8c089b1a11f494e4148fb4646265964c925bf937633a65e395ee1361d42facf837871dd493a9a2e0f480ae0e0829dbd3ed60794c5334e2716332e131fc5c2c51 WHIRLPOOL c1d94339a6e58363ba37bfd0f878ea6db403eaee02aa030891bfd54af1a61e34622286e560ba5217201435a745217b2da55d857fece83d5a94b12d915ad2940c
 AUX mongodb.service 220 SHA256 19f55ab28652b3817e98fc3f15cc2f6f3255a5e1dfd7b0d5a27c9ba22fd2703e SHA512 177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9 WHIRLPOOL 0f6e032acbc7f625b03dcec990126cef064925a341e38c27cddbed5a951c8cfeded00ee3b8b0d9044245c833e86748262434665342e6baa98500fb02c07f4281
 AUX mongos.conf-r2 648 SHA256 d1bf479cee999b4e59e5100c134cd3e7af4bb126342418100cf8f9a08a26f6a7 SHA512 5aa8ced8d83572358e008c0df45dbe72a2e9c0003c9f49514d6b91bf9b75d4fb48b189ffe00d14e5675679943a05215a9873c5c9bde9ab1be4ed4813e75714e3 WHIRLPOOL f1036ea1bd7efa54d28d131dd1bfd1e06c1c3ffbf247ee68a33eee0383d87bf3bfa6639040e6b68a0a14cce0bd77bd5b91a8e245f615007fccccb0cbe2becd84
 AUX mongos.confd-r2 546 SHA256 1378a880ffde0efae213ac6d6d4bbe2181c92fbb06535a58c2dab06ef88ee8e3 SHA512 30e208690b5f28bd0442b7ed302d9be991aedd27203f24e5849201d33291ad7f0f9153ae3a00b55697d79a45c40d7b3792ff45f0c24ef2cf4e88222f88ea1400 WHIRLPOOL 68b8eed779e19261c4d13ebd6be8c11b6df94e748bb8f03d632ecbfc5fcd151a693e51c5a4ad4f0af9439d07dedafc29bd9b86b5a532bad48d570fca73002987
+AUX mongos.confd-r3 470 SHA256 71120239983469b35f77f5d72cc976aa68cb914e2bc0bdf583b52ce2060039ab SHA512 952fb9cf5d3eeea2006b101e23142e408c98d66d1f4f868f6ea5a4df6a6331ddcbcbdfb24f4b031c1a8c42652141a3684073b96dfc0b3fbd21dc6b5bcf0e36cb WHIRLPOOL 66c81df3199176218c0e4ec3a09f5bc72f1dfaedfb6c36d2286656a0e19a56a959a248c1ecccdc25f92d2ace5a054b08055b64d8b88c258b47b31608bcc103eb
 AUX mongos.initd-r2 654 SHA256 02afad9fb6cbea2a04560549931a300faad8afe7a26eb0725f53bdc731a8e62d SHA512 751ddcfa406d6683e33b484ae441f7c8502698b651a1ace9b77bc13be48cee1c1ad657c474764f06bd8ef4bff51cdb235929c8d41b669a326a6ab7d24647a2c5 WHIRLPOOL 8d4ca5e052528e4f8bdf6899e3d87cc87e6f543a5df5568eb824f01217b9906ef288fdb560899f94af04366992777cec0c79bd34be2e5b1081aac2a50d9504e4
+AUX mongos.initd-r3 422 SHA256 86d72892a94b8d227859a8a9a1378049f50f768e55c2f1e98f1bbdc7ea6d509a SHA512 bf5897614d59c6b4e72529b126408a62ea37d9e9368e5ff69c8fcf2bad3ec09065cff09467f82117a892c51090018706d2f38c03cb9a974a61a49bd9efa0f144 WHIRLPOOL cbef5833006b2d7c50d80ba5eba33d4b8fb3065591ecc5f62eef891d7e8fe01bd4dc7c437bc8905c63a8a254c70fa277708cb120634f138f7b4f2c4334c35f4e
 DIST 20140409-mms-monitoring-agent.zip 40122 SHA256 9c4f89cfba10b4604512ab21eb082248104aeabe7e813b852db2b86f47d7ecb2 SHA512 5290a813c407251b5e4def813ce6fe7e09d6c3a1907fd409e326b15b07aed39f7db3a28710ecdaffe2771136c9433253c5d1857c823844a4b75dd38f1d15eefd WHIRLPOOL ce80870e2618f3d9ed80af41b1069ed5bd97af475089564eed1bc111e820c048bc5cbaa03f859349e772fe232f876127e0627c75c135a9b2e196ab13258ed9f1
 DIST mongodb-src-r2.6.12.tar.gz 16462842 SHA256 2dd51eabcfcd133573be74c0131c85b67764042833e7d94077e86adc0b9406dc SHA512 ceed10f2da50ca390f56cc79d39ea4db7a1ef6764e37dae61c3f3f664708be72de09443bbf94f8e58479e4f2923ff2ab9eee45652e82271b3bad591e03ef7657 WHIRLPOOL 1587ef45ee17f9e3357a92b480ea739192076ead280c44c801650d01d2ae29a627a96db611eac6c9b6b47e5e619e2362df94e1792348709b3ea5a4970a8751a0
 DIST mongodb-src-r3.0.14.tar.gz 28093922 SHA256 ebbb758ca7ee53e8d25e2410bb7ef61640829566d094cde2487b55e73d0fd880 SHA512 477fab29ca0ad2a0f24b895e30dc4770af8d6a1a57f3c10a02a989b58dd22510db554da0418129d4e81958342ad169696eed4b86bf5aa73916c7cec879db1152 WHIRLPOOL 7fc02969c52954f0fd9b90ace9efd3677a9d6b8d3618b5dedb470343a3ba71789d451cc30a95742b2b9e61b21ffe0f1a23e239e388a497a327f2cc8ed1ed6aef
@@ -34,16 +38,18 @@ DIST mongodb-src-r3.4.3.tar.gz 39832718 SHA256 889d49312ed072130936cfa3281123a0e
 DIST mongodb-src-r3.4.4.tar.gz 39867133 SHA256 09e962bf3428474b9790bbd464cb6176817f9da6121c30e096240dbb4d51c9f6 SHA512 dbae89b49c363e7258021cd31385e4449bfdfdfd5adfcb1683e4431372731e58ec33bf8f7576d2d52659a52461bd6a32fbc67d5c6e36d52184ec1aabb345d940 WHIRLPOOL 5ad9f80c7f0f597982a32f95365df961fcd80ffa7c04183f9cb4952a52262a27ab09fee4d0115405c5197b6d3848ede56c9a4e5012ec1c358ea8c752164405c2
 DIST mongodb-src-r3.4.6.tar.gz 39922209 SHA256 8170360f6dfede9c19c131f3d76831e952b3f1494925aa7e2a3a2f95b58ad901 SHA512 68da2f385a5e1d636f1699b13818e125af2b7f13c6ff74d5f6dc8f9e04025f9baaa23acfd386118d90ac0eb8b9b7dfbf5b00f1db580a1ea1fe2309361f46eae4 WHIRLPOOL 71b9f42a192b41c797763a02eb8b318488edbd7ffaa149497d3dea5c446c43ff078d24e48971ce4644d54767bcb848e1acaca3e17be9e8c50bbdd349e0d05fab
 DIST mongodb-src-r3.4.7.tar.gz 39936247 SHA256 9272e7663c7915e09ad2609e28c58437d760d54a9552c711ea735cd8e1784ec0 SHA512 30f4d0dbd487d148531d7073881cd55db3fef3dcfd199e260e1a51858c5a2c28dfe904d1273b89b27b2fbcde23c3a301a3fa24766489ad6eb2daa25da31d3182 WHIRLPOOL 0ecaa271f9fbe634404aca2d13b0bb0ef47847656fc2825f5ff220655bc213df96170ec6009efc033c5e0a50baf7afd400c240dcaecdaf03fc356138121dd928
+DIST mongodb-src-r3.4.9.tar.gz 39943857 SHA256 2fd0f47a5f9175e71d3d381e81a1b6a2500c9c414dd6ae0940ad6194a0e85549 SHA512 b6803c91e9cda8e6963359386d2014d03f68151f64d580d5baacc3c66b2adabc62ee5c2cf203b9aee7d11942934afc6f9e17364d2f3aafd238ba88d13c77f26d WHIRLPOOL 4360610c2223b7feef748f982ef3eed352ade080b48a935747056489e127759fe953dc6f1067d369b43e536fa1448c8d034f03eb1ad4dcd9ec064fd1f9491dba
 EBUILD mongodb-2.6.12.ebuild 4683 SHA256 b9e07ceec39c1a0e792d1825c25c1c2172de3d875a133dba0587911d4e77e2ea SHA512 e7a8aa76abf8c50c588411a0fc75b9723d1261784d30aa6a0908ffdb6addfa212a9008da68adecd8d49372c7be29050cfad3c06b219f9696ce4e0eb0ba56e5c2 WHIRLPOOL f98d328336e27679f1c3ce383f05234b55bfc840be3917d3c3b07aba437a4890250b2d4f2693cf37306e6ed91ad01cce054f4b0789ff5d8a159c40dec9790a06
 EBUILD mongodb-3.0.14.ebuild 4559 SHA256 50dea173c26b90ecf2e6eaa263ff8fb6ab57a0ca5f103caa97bb54b3f0c54960 SHA512 747424cae955229f6affd867961171d9ad3fe9c34553ddb94e034db76d4e389ba0c6dc47db23c291212b893b7377d1bfac52e79ae4ab1b9dfd8f4c89743e1a19 WHIRLPOOL 13bb75aa3cd7e6a19f9deacbd78679001f622776586b7e65543fd34a325b6c086d6837df191891daa932fcb4acc48d755d278a41e5dfc2a8e36af54f155c9177
-EBUILD mongodb-3.0.15.ebuild 4561 SHA256 89cf9eabd07b61fccc1648ada55f076664f1624fea849f1b6321cb0bbc8119cb SHA512 9385be15a82a988a0f829ffc8e10cd6a093d92f866f57a1b9ebaf87d8e66f90bdbbfb122b8f68575c3fa7ff4667df5f1d2b70c97653caa688012e74ba595033d WHIRLPOOL 22881f43fa9a2813d8fdf1d24f7876a870428094bfb3c4856bc73ed438635474d808a1ae912132042fea8d125b811d25aa231c318d137aab61ff386d274181b2
-EBUILD mongodb-3.2.12.ebuild 5160 SHA256 5e85021266af5ccb8ee6631be7f8f7263bfe26c1062caa769696d247bba7d53a SHA512 79fe16c3ce86b92ba74f353d90eb37d3033c04a8bd7d30b680bed206aa8af3052d8fdec99dc59e7078a7d5ce9d609a886cb6ee89176e8ee0f7b81e42f9820dd9 WHIRLPOOL a282c5bdf69ae2d0b968a06604970614d4d5928dfe50994bc66125b1af3f84674116711b46d222468f19472f724d120aa3182bc3b818c3c7a8f85016c9241f67
-EBUILD mongodb-3.2.13.ebuild 5160 SHA256 5e85021266af5ccb8ee6631be7f8f7263bfe26c1062caa769696d247bba7d53a SHA512 79fe16c3ce86b92ba74f353d90eb37d3033c04a8bd7d30b680bed206aa8af3052d8fdec99dc59e7078a7d5ce9d609a886cb6ee89176e8ee0f7b81e42f9820dd9 WHIRLPOOL a282c5bdf69ae2d0b968a06604970614d4d5928dfe50994bc66125b1af3f84674116711b46d222468f19472f724d120aa3182bc3b818c3c7a8f85016c9241f67
-EBUILD mongodb-3.2.16.ebuild 5180 SHA256 11f821c2c99c402582736bd486e673bea008bcdfc4a090c10c4ff406af13592a SHA512 181671beb49d13d96797b08e4fe24d2603da3b1e5c07ef3f51d59a1fa4f28182f27a504a8b17d2cf0f47a2235af86ee4a397472b706884afb0e57ef8ff3cffd4 WHIRLPOOL 3a19a70268cd4aafc785ec051d1bc39f038f01335f971c3951483dfae785279f9e77ebd9bc9a181ff41d27f520050fed7445225eb2e1864bc16b3c6024618711
+EBUILD mongodb-3.0.15.ebuild 4561 SHA256 10995ff3333c0040c34e174c0d475f959febbda659093bcc473c7ad992fecfe1 SHA512 d5b77ede0ab5d9fa814542e831ec93d5854f0aaa55930c5e445410d347787be96294a741f30089764ea23cdab52413d1d82c6796b3d7133796d28de95726e294 WHIRLPOOL 9fc43fc82839755af40079f1d0cfaa799d176dc91c9217deb4baefecf84c287a9b5535534e71867df847b52e602e30e70b2ed01840770b1e8f75a9c9f78b6b7c
+EBUILD mongodb-3.2.12.ebuild 5129 SHA256 07c1cd0748989e7b1cdd97942fea3e954f606b21627aacbc02e036c725d35f1f SHA512 28de831886c3531c441658cdc7a29cea3b20f6aa9208c5658d4ad71269b6ff359954118810a9e845d567f54a54449ebc20a446f46da3d4694b5395fdf9f822dd WHIRLPOOL 1a483c0e2ea73a66b62b2c5e77c5708115edca5d77d6e0a177a6394e30fce4bd0e40279fe0b78bb0271da39ddcb6c508285bcdd9180416e78c1cbbaf354c0eee
+EBUILD mongodb-3.2.13.ebuild 5129 SHA256 07c1cd0748989e7b1cdd97942fea3e954f606b21627aacbc02e036c725d35f1f SHA512 28de831886c3531c441658cdc7a29cea3b20f6aa9208c5658d4ad71269b6ff359954118810a9e845d567f54a54449ebc20a446f46da3d4694b5395fdf9f822dd WHIRLPOOL 1a483c0e2ea73a66b62b2c5e77c5708115edca5d77d6e0a177a6394e30fce4bd0e40279fe0b78bb0271da39ddcb6c508285bcdd9180416e78c1cbbaf354c0eee
+EBUILD mongodb-3.2.16.ebuild 5180 SHA256 4c9f395f80fa287cf5b08285dadee4585a4d0806e682d66c810f0dd5a39254c4 SHA512 9d0a8bac5e2aed1803df8d23ccf126a56194d03f715e86adb4fda36a82fd176617c5c599c1ac7fbfdbdfb8d6c7c63496e34400a9dc5ed75cd6d84ca023d58ee1 WHIRLPOOL bafab26b47d1da61ef0b56a61fc685e5980dc8f255a63c80a53c9ed6f824bd191bc74cb183e26a79e35abd425a95cea1fb89307446841f5d660a229981b6396c
 EBUILD mongodb-3.4.3.ebuild 4991 SHA256 d80acf1c9e41145289f7a6b9a726065c7e04df18df365d229bffcba80dc22175 SHA512 3338544cf467e182d87bafdf765dcaf11fac907a9ac40731e27b9bfb0562c3e84334ec3d9d3f165ffac5fc933c1e6ebab356e4bddad5bb6127b6a9d44b4227d5 WHIRLPOOL 1d88dd17d216a7534e575ef3b36552e91312be488581e4569518994bbd743c5f5345c1ea3576f943c75e6a0fdbeeb28cff6e052458301827888b96d1ddc06fef
 EBUILD mongodb-3.4.4.ebuild 5067 SHA256 f57f1806f233174b6053f2b5537c738b840d5b7ccf93498ba3a180600e0d46b3 SHA512 d254fcfd2be4462ba36fd51ff55649eca890a83087b8514584d286564816dd2c9e32f96231746d30c38188f94757b01237e18899bae46ecca9ac60aa7db26f38 WHIRLPOOL f95712fe42a22c9a6e4a70568db5d569b1d52d23d5f7210ec2bd24477a5202b05d55cd097195b45584adf27dbfd7506943f3183927f7a0fb194388b0e64f3d79
 EBUILD mongodb-3.4.6.ebuild 5111 SHA256 82daf6f9d8c5e2e6e9adedc3f87e7d6fd4bced645b5c5779fb920d7a63c7c252 SHA512 3f7a4fb7fcfa55f24e2ce4a22bc227b5b69ec21243569c9e4ee272e385b56dbe6986387d09f2b5d90a742e4302f88f3740f8c5e5b2c269b06b4c409b3c339a76 WHIRLPOOL 3eca6a59b8d8adf761f321765d848b80cfd030752a36e52a66da463e6866fefd3270039ed1863cc7d2bcdeb3b3f9818d5ed35a21639a2a55449f4ca70e8f2d0c
 EBUILD mongodb-3.4.7.ebuild 5091 SHA256 5ea93a46e08872457d83fdceaa57fa4ef16389a20d3a6c3c5d7d8d14c2cb7b4f SHA512 0e2d5151ee5326ec606b170a902b2672d456de911170001bb4bb49394636b8ca4994dec251636c54c3cead203b04c516dffeb21e698f502d54760c6b6bdd3c7f WHIRLPOOL effb9368d2e7b2d768b0674b4b612a72aecf5a18dc620561bf4adbff3ed9076c0ca39260102318321805032ee68f0b970003a7bbc38dcefd796b70be687c2a70
+EBUILD mongodb-3.4.9.ebuild 5209 SHA256 df3f451c206634450f6d72518da4425e29b555804d64512b73a665d16f99de3e SHA512 1fc77d6294411d303b7c648c90c33fca6527fafa17baa61054d8169aab40e3f0aba6e4ae2284bbb075b9712d5de2e0011ddd316e34aa5871f6d748cdbc1148ac WHIRLPOOL de03d4f95a009b1f669eec316b6f5d3b74154cd573cb9e02da37aa68a4456d0d368f1bd01d826d634f96e7d045456702144c29274c57f9b821feb6a51e02d95e
 MISC ChangeLog 11694 SHA256 2a53f4136a8358cc02fbdc1c6c0dea500c5cf58d01a5879fdc45f01c3c10891d SHA512 88c23a8f81788cbf66e952edfaeb92c9d81754a86539f808d467abf2dfa9c3e5f0d64679692cf3d28c75cae377478fd7c9471965c76607c0f5c43fb723add98d WHIRLPOOL bec26640ffacf717f31061f615f9092ed2af63e16c3f1e86907b1eca189b19e43bfca52e71a4ba4aee5a0b3574a900ee4e55c5d54967489ba6ce7c788117133c
 MISC ChangeLog-2015 25355 SHA256 a3aed548a6ffb7287da4945eb5bd03d1fa13d900600ba8b9349065276684e916 SHA512 efaeaa046614ab70a6e790cd9af861ec98a6472f62f3362cc1a935e12eceae8e00bbe210abec070eae6bba6cf791b69b937744acf2053ef2eda7458eb6b62efd WHIRLPOOL 22ad53f03a3f038d53fc8143b2a8a729c0157efe458a7aabd48ea753bc37b90c7424dc5103dafac750db40a47296a8624e566789fa49c71f54d479af860550f5
 MISC metadata.xml 1112 SHA256 1e6f3abb5e292c4df14b673502b88e0636043fb4f3445ea9c050753cf04dbab7 SHA512 39b9bd8afc1c79382130c691154eac4338810fb4069406482648d32fd2aefd5d3697c272321d300154be2e4d37ac10f1372c62687d9c41ca0d3682b0152a53c4 WHIRLPOOL 54e2e1f9465ffa8497a5637d8fae65e34b0c62b8c569344cd02fe48fd51b4c8bdfead6e396b3515b5653459e3cd31f55b1d15af143b2cf8f343af2e72fd83dcf
diff --git a/dev-db/mongodb/files/mongodb.confd-r3 b/dev-db/mongodb/files/mongodb.confd-r3
new file mode 100644
index 000000000000..e515d1ddc730
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.confd-r3
@@ -0,0 +1,11 @@
+# !! IMPORTANT !!
+#
+# This file is ONLY used to override some of the init script configuration.
+#
+# You should NOT use this file to configure your mongodb instance,
+# see the /etc/mongodb.conf file instead.
+#
+# Available init script modifiers :
+# - config_file : the configuration file to use (default : /etc/mongodb.conf)
+# - user : the user used to run your mongodb instance (default : mongodb)
+# - group : the group used to run your mongodb instance (default : mongodb)
diff --git a/dev-db/mongodb/files/mongodb.initd-r3 b/dev-db/mongodb/files/mongodb.initd-r3
new file mode 100644
index 000000000000..778ef7482406
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.initd-r3
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${config_file:="/etc/${RC_SVCNAME}.conf"}
+: ${user:=mongodb}
+: ${group:=mongodb}
+
+command="/usr/bin/mongod"
+command_args="--config ${config_file}"
+command_background="true"
+pidfile="/run/${RC_SVCNAME}.pid"
+command_user="${user}:${group}"
+required_files="${config_file}"
+
+depend() {
+	use net
+}
diff --git a/dev-db/mongodb/files/mongos.confd-r3 b/dev-db/mongodb/files/mongos.confd-r3
new file mode 100644
index 000000000000..7f297dfd3e43
--- /dev/null
+++ b/dev-db/mongodb/files/mongos.confd-r3
@@ -0,0 +1,11 @@
+# !! IMPORTANT !!
+#
+# This file is ONLY used to override some of the init script configuration.
+#
+# You should NOT use this file to configure your mongos instance,
+# see the /etc/mongos.conf file instead.
+#
+# Available init script modifiers :
+# - config_file : the configuration file to use (default : /etc/mongos.conf)
+# - user : the user used to run your mongodb instance (default : mongodb)
+# - group : the group used to run your mongodb instance (default : mongodb)
diff --git a/dev-db/mongodb/files/mongos.initd-r3 b/dev-db/mongodb/files/mongos.initd-r3
new file mode 100644
index 000000000000..cf5844ae30a9
--- /dev/null
+++ b/dev-db/mongodb/files/mongos.initd-r3
@@ -0,0 +1,18 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+: ${config_file:="/etc/${RC_SVCNAME}.conf"}
+: ${user:=mongodb}
+: ${group:=mongodb}
+
+command="/usr/bin/mongos"
+command_args="--config ${config_file}"
+command_background="true"
+pidfile="/run/${RC_SVCNAME}.pid"
+command_user="${user}:${group}"
+required_files="${config_file}"
+
+depend() {
+	use net
+}
diff --git a/dev-db/mongodb/mongodb-3.0.15.ebuild b/dev-db/mongodb/mongodb-3.0.15.ebuild
index 848080d07995..08741ca2af67 100644
--- a/dev-db/mongodb/mongodb-3.0.15.ebuild
+++ b/dev-db/mongodb/mongodb-3.0.15.ebuild
@@ -111,10 +111,10 @@ src_install() {
 	doman debian/mongo*.1
 	dodoc README docs/building.md
 
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r2" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd-r2" ${PN/db/s}
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
+	newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
 
 	insinto /etc
 	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
diff --git a/dev-db/mongodb/mongodb-3.2.12.ebuild b/dev-db/mongodb/mongodb-3.2.12.ebuild
index 52572e121314..e6fac48d7a72 100644
--- a/dev-db/mongodb/mongodb-3.2.12.ebuild
+++ b/dev-db/mongodb/mongodb-3.2.12.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug kerberos libressl mms-agent ssl test +tools"
 
 RDEPEND=">=app-arch/snappy-1.1.2
-	|| ( =dev-cpp/yaml-cpp-0.5.1 >dev-cpp/yaml-cpp-0.5.2 )
+	>dev-cpp/yaml-cpp-0.5.2
 	>=dev-libs/boost-1.57[threads(+)]
 	>=dev-libs/libpcre-8.39[cxx]
 	dev-libs/snowball-stemmer
diff --git a/dev-db/mongodb/mongodb-3.2.13.ebuild b/dev-db/mongodb/mongodb-3.2.13.ebuild
index 52572e121314..e6fac48d7a72 100644
--- a/dev-db/mongodb/mongodb-3.2.13.ebuild
+++ b/dev-db/mongodb/mongodb-3.2.13.ebuild
@@ -21,7 +21,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="debug kerberos libressl mms-agent ssl test +tools"
 
 RDEPEND=">=app-arch/snappy-1.1.2
-	|| ( =dev-cpp/yaml-cpp-0.5.1 >dev-cpp/yaml-cpp-0.5.2 )
+	>dev-cpp/yaml-cpp-0.5.2
 	>=dev-libs/boost-1.57[threads(+)]
 	>=dev-libs/libpcre-8.39[cxx]
 	dev-libs/snowball-stemmer
diff --git a/dev-db/mongodb/mongodb-3.2.16.ebuild b/dev-db/mongodb/mongodb-3.2.16.ebuild
index f18602bddd95..762934559887 100644
--- a/dev-db/mongodb/mongodb-3.2.16.ebuild
+++ b/dev-db/mongodb/mongodb-3.2.16.ebuild
@@ -129,10 +129,10 @@ src_install() {
 	doman debian/mongo*.1
 	dodoc README docs/building.md
 
-	newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd-r2" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd-r2" ${PN/db/s}
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
+	newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
 
 	insinto /etc
 	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
diff --git a/dev-db/mongodb/mongodb-3.4.9.ebuild b/dev-db/mongodb/mongodb-3.4.9.ebuild
new file mode 100644
index 000000000000..1e193228dcc2
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.4.9.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+SCONS_MIN_VERSION="2.3.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit eutils flag-o-matic multilib multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs user versionator check-reqs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="http://www.mongodb.org"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug kerberos libressl mms-agent ssl test +tools"
+
+RDEPEND=">=app-arch/snappy-1.1.3
+	>=dev-cpp/yaml-cpp-0.5.3
+	>=dev-libs/boost-1.60[threads(+)]
+	>=dev-libs/libpcre-8.39[cxx]
+	dev-libs/snowball-stemmer
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.8
+	mms-agent? ( app-admin/mms-agent )
+	ssl? (
+		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+DEPEND="${RDEPEND}
+	>=sys-devel/gcc-5.3.0:*
+	sys-libs/ncurses
+	sys-libs/readline
+	debug? ( dev-util/valgrind )
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	test? (
+		dev-python/pymongo
+		dev-python/pyyaml
+	)"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.10-boost-1.62.patch"
+	"${FILESDIR}/${PN}-3.4.0-fix-scons.patch"
+	"${FILESDIR}/${PN}-3.4.4-Replace-string-with-explicit-std-string.patch"
+	"${FILESDIR}/${PN}-3.4.6-sysmacros-include.patch"
+	"${FILESDIR}/${PN}-3.4.7-no-boost-check.patch"
+)
+
+S=${WORKDIR}/${MY_P}
+
+pkg_pretend() {
+	if [[ ${REPLACING_VERSIONS} < 3.0 ]]; then
+		ewarn "To upgrade from a version earlier than the 3.0-series, you must"
+		ewarn "successively upgrade major releases until you have upgraded"
+		ewarn "to 3.2-series. Then upgrade to 3.4 series."
+	fi
+}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	# Maintainer notes
+	#
+	# --use-system-tcmalloc is strongly NOT recommended:
+	# https://www.mongodb.org/about/contributors/tutorial/build-mongodb-from-source/
+
+	scons_opts=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+	)
+
+	# wiredtiger not supported on 32bit platforms #572166
+	use x86 && scons_opts+=( --wiredtiger=off )
+
+	if use debug; then
+		scons_opts+=( --dbg=on )
+	fi
+
+	if use prefix; then
+		scons_opts+=(
+			--cpppath="${EPREFIX}/usr/include"
+			--libpath="${EPREFIX}/usr/$(get_libdir)"
+		)
+	fi
+
+	if use kerberos; then
+		scons_opts+=( --use-sasl-client )
+	fi
+
+	if use ssl; then
+		scons_opts+=( --ssl )
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+src_compile() {
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+	escons "${scons_opts[@]}" core tools
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		keepdir "${x}"
+		fowners mongodb:mongodb "${x}"
+	done
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/${PN/db/s}.initd-r3" ${PN/db/s}
+	newconfd "${FILESDIR}/${PN/db/s}.confd-r3" ${PN/db/s}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+
+	systemd_dounit "${FILESDIR}/${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+}
+
+pkg_preinst() {
+	# wrt bug #461466
+	if [[ "$(get_libdir)" == "lib64" ]]; then
+		rmdir "${ED}"/usr/lib/ &>/dev/null
+	fi
+}
+
+src_test() {
+	# this one test fails
+	rm jstests/core/jsHeapLimit.js || die
+
+	"${EPYTHON}" ./buildscripts/resmoke.py --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed"
+}
+
+pkg_postinst() {
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 3.0 ${v}; then
+			ewarn "!! IMPORTANT !!"
+			ewarn " "
+			ewarn "${PN} configuration files have changed !"
+			ewarn " "
+			ewarn "Make sure you migrate from /etc/conf.d/${PN} to the new YAML standard in /etc/${PN}.conf"
+			ewarn "  http://docs.mongodb.org/manual/reference/configuration-options/"
+			ewarn " "
+			ewarn "Make sure you also follow the upgrading process :"
+			ewarn "  http://docs.mongodb.org/master/release-notes/3.0-upgrade/"
+			ewarn " "
+			ewarn "MongoDB 3.0 introduces the WiredTiger storage engine."
+			ewarn "WiredTiger is incompatible with MMAPv1 and you need to dump/reload your data if you want to use it."
+			ewarn "Once you have your data dumped, you need to set storage.engine: wiredTiger in /etc/${PN}.conf"
+			ewarn "  http://docs.mongodb.org/master/release-notes/3.0-upgrade/#change-storage-engine-to-wiredtiger"
+			break
+		fi
+	done
+
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.org/manual/release-notes/3.4/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/3.4/#upgrade-procedures"
+}
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 020cb70b610b..281f1134390c 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -13,7 +13,7 @@ AUX redis-4.0.1-sharedlua.patch 2568 SHA256 76a14354c456cdcb50507392d34a6b126706
 AUX redis.confd 450 SHA256 8c68e29dc88c8ad99b9212a448d313d1406ef02c7638398b2e48ea1ca8aa937b SHA512 c6347cc6e17e9ce93fd081608b19c4977c3e1ffd58d2a417804ca3e647967800ac11859bd05d5437c36310dcd7552c11f35965e4521c5266c3414387d4796a6b WHIRLPOOL 72fb07431293f0e382af98c5a0b7eeca146cab84153befdd808328aa27404cd74d55d524b5442ad10de5989917351299bc7610e0be75d11d2e31fb5353beb45a
 AUX redis.confd-r1 511 SHA256 d995e4b96a4e11e8012edd470288f9b48b87b5a144a357bbaedd411c9bb1329d SHA512 f041e6b1da2c579a7dcf40e411ff47bc4675e5931e04f4353888ed5864b7e0c94d53fc98faee982c65a69d0154ee1f624fbadbbcc3a324aec583eefee6fb7133 WHIRLPOOL e819dddfbfe2730a30e1d85b85a68908abe573788b2ef13fb73d2e0e561c22845e2e564643ee93a76df2f22508280de753fc8f4708b23436d3599dd70d478635
 AUX redis.initd-4 780 SHA256 94257e625ee8c0212dd8afdaa9871796f9944a3ee68641cbde902a1a8a9c6fa9 SHA512 779a35db0f603956c9ab7827f1d0a0b20d5dcab041aafca2055dfd413056de5e572c9996929ef9bf3c54b5f56e4a3a20f2eaaec306b5790252b46ebae30e74b6 WHIRLPOOL 22af0f74c4b1c1120288264d3c1261e38d51b30b0e01e0fd1693e2f4568e1252662ec31e26591142c9e32ffdaa0d0ab89b66bcdf2fbb2f67932735b1a5dc87e5
-AUX redis.initd-5 590 SHA256 b7d0b0fe1467507ba15be1aa009a355279bd8318880d37289f6534bd753bcf30 SHA512 1f9b065c7facece193556d923016a977da811deb1bb19d1607a3f6ac257b78de5d91b829a66d799e54c40e93d00bf3eb43a97476c79b6b46c38c3fd25dd7a702 WHIRLPOOL cc010188604f33fa7994738fe881d0cfed46fabd4afb849c983dcaa93362588c73c6704fba2afec5964abf4e60edeb33b22261186bb7cfeb517b2181adf83709
+AUX redis.initd-5 696 SHA256 b38e33e455719aa89bf19cda5cbcf093987a8dca82221e257cf642bcbb388ec0 SHA512 cd5ae1cb0beded7c70fc7ab0bcbfe378dbac5bf78235877fedb4599c01bfcffc36909e638b032b29c79c5a5c55da11795c58a845b6eadf4cc41174903070183d WHIRLPOOL 84de2edb4f4d46ae770c4f2f8fe61a5467d556322cafa3da35e113c6a4b67263e5e2d7117f2a36cf26a881cd08020e2cf42318f23683ff52cb25ac6e5fa06e90
 AUX redis.service-2 253 SHA256 e65ec7fdac98f30fb72ab73656e4467e74c8900d2664cba64d9baf9e16eaee1b SHA512 b42b73bb54ccc0d16adafb91aabe010092f548ec7979d8a0ed1c4563d9fca378eeb74c0c556f7565a32199ed30ca8a13d6b610d9cda39fd23da1428a410f62cc WHIRLPOOL e2b041b37bf95cbe4ed6684238034497c971352db602a86adbb5ef0626967b4ab20dd9ae412c0cae009a8470e502426b0135e4c676858c11d6e10c97a677baee
 AUX redis.tmpfiles 61 SHA256 68e4c7e3159068400cbc7d07e84b5618f9d829dc7a4f18253783c6256a53031a SHA512 741ff5a4df5b04e7af4e81357812bf5b6cf992bc18b6052074aef134401d0a92703a2e41f52966012c05ea80fac5636435c8d3e6ed55e62a5711526ba67ee738 WHIRLPOOL 2c6f4d9e5382c43e935db16bf120b24cd8de517bc067dcab91b3230a8ddced7ecc5ed37626464d3f1a7880d2d41efdf3cecfd1029a38aaa2edf3d20de74489b4
 DIST redis-3.0.7.tar.gz 1375200 SHA256 b2a791c4ea3bb7268795c45c6321ea5abcc24457178373e6a6e3be6372737f23 SHA512 6c8f4c88d911e1433fd28efff2f6d62763e08be89814ebf4aa4e68e2c8bd605eba24ca3410548b2f480ae094437ce96c0bafa7a5762b3b405d5d850886297ba3 WHIRLPOOL 53c2c967b999bbcb5b45117bbad74b46457158ad94e8c43566311dd3d58c63c2d0cc2dac5dc9e8806821c2532ee4beded17e039da4ddeae958e5a0092429ee3a
@@ -25,10 +25,10 @@ EBUILD redis-3.0.7-r1.ebuild 3312 SHA256 178857c68ff546fe0e5a5bd968afc0979e17e60
 EBUILD redis-3.0.7.ebuild 3312 SHA256 178857c68ff546fe0e5a5bd968afc0979e17e60ab41ed3539655d836c1f036d6 SHA512 de42869cd28e6b9f7ce63ef0baaa64acc0b5465d2bb2a0c23013a42c0a00059a18620ab428eae88b33f4d6a3b37b2e6cc0dc71135af807dbd9d524908d1d80fb WHIRLPOOL 26d3325a56be5d02fa6571d3bfca3a399c765f7ba2e7d6577b13f0117ea5d4b97c7449d1dd2c3eb942f8711bf5c22ec38dd2db42af455b3e2c1d93be40b54e37
 EBUILD redis-3.2.5.ebuild 3578 SHA256 1c935a9f011cf9ceba6a75fb2b0d204817b4aa70cb7bd7e003aa94f98473e627 SHA512 72d8563a1eee0e62d34a3c04583c210a95c0fdd306512f63714324ac6e1302f5a06debb56bae083f9102eef9cade1674f6d5dd746ca7ab796e70592aef659021 WHIRLPOOL ef8f61ee53edbd01e55119105a961bddd4188b92dc55ae54a1ff9a4fe02f0b9139c06abf54864180529a569442785e84592f952e8df0d694f28606835f6d9e07
 EBUILD redis-3.2.8-r2.ebuild 3579 SHA256 7e4ea5f0a2396bd4c0a5e0da06c42422ff58b3fc8d165f00f52012f38749045d SHA512 3acf577e2509cf29ae5274117ec5c512fe390167d88c38b6fd375a5d145e4b94704990b23e3a18d6e8ab6c91e5d5bebb5d6c9330a9975b7ef9aa2d14c0914282 WHIRLPOOL 227ca8851ce549c4947c9a258071b44a1f4c5c3a779946a1d998fbe468741e9be73a275ce01337ab9a02840e5f7452268abd92d396fe3179746a8f767fda7382
-EBUILD redis-3.2.8-r4.ebuild 3891 SHA256 3a9ceddc4b209bf1952223300badbf5ab81d72533485d4248422594d828f5d05 SHA512 00d62cc9e030912c942030466b397accc11100e64175df3031b9e9e67c11d4ac62b0fea66fea903264c3e0eedd883c4c188d563e24a74e9ec1af3cc54ade0bda WHIRLPOOL 8a887d676f07f8116f00c05ef220e22be0b81a17abce12e0e89f3cf112e226cb083c347ee41a5d4b6a8b3eec48b6f5b743d1eba375cfa091157eac876592a915
+EBUILD redis-3.2.8-r5.ebuild 3891 SHA256 3a9ceddc4b209bf1952223300badbf5ab81d72533485d4248422594d828f5d05 SHA512 00d62cc9e030912c942030466b397accc11100e64175df3031b9e9e67c11d4ac62b0fea66fea903264c3e0eedd883c4c188d563e24a74e9ec1af3cc54ade0bda WHIRLPOOL 8a887d676f07f8116f00c05ef220e22be0b81a17abce12e0e89f3cf112e226cb083c347ee41a5d4b6a8b3eec48b6f5b743d1eba375cfa091157eac876592a915
 EBUILD redis-4.0.1-r1.ebuild 3722 SHA256 4305a38f60f529600e36ced799a5c780c32a152e5d4e2efcdbf200bb92b8ab0a SHA512 d928b9714a9c028fbe14286c975a5ba385384c4ff32311e060252ccf9802e2f58d945d261a9fd5cd512d7142cb82fdb41a44955c046c253ee399e09578b42a0d WHIRLPOOL cf4a5bd6128143c87808282e24a439d527c6f3efde4308231d8fafd393a41b3869fdebf61c0791ad350ff2665651b4816e46377f8e62820da819d51647cba068
 EBUILD redis-4.0.1.ebuild 3507 SHA256 8e8281d3c068e21e6e925ff905603dc645262577eaa898a4c7032ab479ad7dfb SHA512 e0a258e5e2333d9c88d5ebba37f52cb772bb17d77b719edc0ce443a3a2ac09cd064766fcf7541503fe656ca2f77d890ae911f518b2552e2673f650cc8bd4d13d WHIRLPOOL 62f2267dceddce78da7b81aa49d40087afb39981743ec02a3337c11202e880fbc9126b49a88dc38cfec8d6bc4391565b1573fcbcab420019cb674271e8b40e4b
-EBUILD redis-4.0.2.ebuild 3814 SHA256 949258b27da78e4663f65e1eea15882543cb8978c0dd90e83334026c17cc461e SHA512 3e053a76b16dd7a73cadd890bd5d3afc9a4652f4b5503d0a0c9f135e0c4711e085533cdf3422cdca571ea49ee7769b62145421423a0d619e3941620ab173bd52 WHIRLPOOL 916a0944ff241821cebf34b748c6ef30d80a6cd90fab53e0ba0eb2a15ada43a1a00035b145cab77bbb88727ba674f7edd40c8b4d2d0bc723ddfc4bf58d98caba
+EBUILD redis-4.0.2-r1.ebuild 3814 SHA256 949258b27da78e4663f65e1eea15882543cb8978c0dd90e83334026c17cc461e SHA512 3e053a76b16dd7a73cadd890bd5d3afc9a4652f4b5503d0a0c9f135e0c4711e085533cdf3422cdca571ea49ee7769b62145421423a0d619e3941620ab173bd52 WHIRLPOOL 916a0944ff241821cebf34b748c6ef30d80a6cd90fab53e0ba0eb2a15ada43a1a00035b145cab77bbb88727ba674f7edd40c8b4d2d0bc723ddfc4bf58d98caba
 MISC ChangeLog 9085 SHA256 ed9cb241c3bfe71d3211e01c2a198c4d8e42fbfd42633487141ec65e7c3bd7e4 SHA512 ebcb05824a18732c1daf72785a6ef59305378ea215f3910487fec354771f7a9137d27f0c4bf50a935829f2bd3bce5dbe2bb1a7faf478fc1c8dc01398e435f8b2 WHIRLPOOL e9bce2718149978854fc4adbc99db7daadd1687bf67e68b075ccea02659c71dad7c620a39740d1ac70e0f6a855cc5638b4a3237b85b4719a0ea8100d7524d959
 MISC ChangeLog-2015 14790 SHA256 2b26170b052d7ee86954593cf4c8ac44c071e702b546cfb10b5821371efa5bea SHA512 80ece5f6c84ad894aad3290665c6d2099f7c57eee8682fe85d2ab59969099d5f7e229a81968c02f63601b7e40123073394ffeccb58edfa8c374b6148213956f5 WHIRLPOOL c8828bedd95dc6814790355ad42ed2d378831f821c5185a1db2a45c89ebb770a5fbc3453b4893e7d9831ac98a5384fcaecc920cbda97ba5d7c4a98a4121f33b3
 MISC metadata.xml 632 SHA256 623fd6b8e252684955a557e3bd26a6fa237dce08702e8373a9eb65207a609a14 SHA512 a032eb7204137f8c5e7b75f8b214b0b6fd7f2a119b261a3da2e0cf8979fda5a5f25643870515a8e8d821ff63df3d17808a6e3189cc16a0f87c88f479571e8ef5 WHIRLPOOL 652c5fcb32bf4a79400534743cb5b4803d813daf9ec363ca38c5c1c2c7f3292b16a50e99845274486fbe5c8dda2abe1ce98da28350f18c06a5d508146a7bd172
diff --git a/dev-db/redis/files/redis.initd-5 b/dev-db/redis/files/redis.initd-5
index a567b1e210d8..bfeeb6925ec0 100644
--- a/dev-db/redis/files/redis.initd-5
+++ b/dev-db/redis/files/redis.initd-5
@@ -9,8 +9,10 @@
 : ${REDIS_GROUP:=redis}
 : ${REDIS_TIMEOUT:=30}
 
+# https://bugs.gentoo.org/631002#c10
+# Force '--daemonize no' to override the config file 
 command="/usr/sbin/redis-server"
-command_args="${REDIS_OPTS}"
+command_args="${REDIS_OPTS} --daemonize no"
 command_background="true"
 command_user="${REDIS_USER}:${REDIS_GROUP}"
 pidfile="/run/${RC_SVCNAME}.pid"
diff --git a/dev-db/redis/redis-3.2.8-r4.ebuild b/dev-db/redis/redis-3.2.8-r5.ebuild
index cb1541102b7c..cb1541102b7c 100644
--- a/dev-db/redis/redis-3.2.8-r4.ebuild
+++ b/dev-db/redis/redis-3.2.8-r5.ebuild
diff --git a/dev-db/redis/redis-4.0.2.ebuild b/dev-db/redis/redis-4.0.2-r1.ebuild
index 1449a3567826..1449a3567826 100644
--- a/dev-db/redis/redis-4.0.2.ebuild
+++ b/dev-db/redis/redis-4.0.2-r1.ebuild
diff --git a/dev-db/rethinkdb/Manifest b/dev-db/rethinkdb/Manifest
index af1c839b4e5f..7b76bb0f8433 100644
--- a/dev-db/rethinkdb/Manifest
+++ b/dev-db/rethinkdb/Manifest
@@ -1,8 +1,10 @@
+AUX rethinkdb-2.3.5-gcc6.patch 1588 SHA256 2f9f6249c87ec2fc70c7cf94527e694c71c18a03131461eea96d0d35f64a1cc2 SHA512 ac902b1eea3dd5d5c2c76bf9aa1b513553624cccfbda282e9be50589f9f74f01cf4b9968f08b22c139af80e92f4e5a4930364c4af2977359ee95b7587c8f292c WHIRLPOOL 1365b9b21a5114ea0927f28f9ff04169d9400204a027b2d3f1be202f2ac5c10448386294fcec1d8e9ce98dfb8aa60e032fce988201396ae8bf7d5ffeadbf52cf
+AUX rethinkdb-2.3.5-libressl.patch 4365 SHA256 24653857682178becdfbd34d40a57af03a12db33896065a1a46843a80ae1ece5 SHA512 ec18f3916def1f76ef58fcb1f077c8f405e86b3bc0ab660d547d5c4b4e7132495d35b4003d21ff019d660d03a14b205b74d1defb7e69f359903b4a9004f558f8 WHIRLPOOL 1f8cd026132e378fddfb333a3c388d2e19029f3a9c1598f139d12690f3a8a09b86f6a641ecd7e7d0066559cda23704fb660a5db3356fc81cbeb2efa63038d574
 AUX rethinkdb.confd 606 SHA256 5d659a409a7b1a502a6362b818b01c1eb5f12e1bed273e9e876cc43758464659 SHA512 3a07f9c78ef96b2ca37fca508ee14a644d3c08612f662ba5260182fbfcceba064d20253f1261f56dc0a2c28d1a4d5e2320872c3c4e7595cb7ab4e202eb28ad42 WHIRLPOOL 2598d32113314f60b9e64048ba148c6fb3653ab92f833da13cc58b080996b988a20a61b8821634889c735628421609cee36c88dede66d89d5de071011a7afc57
 AUX rethinkdb.initd 1645 SHA256 fea58f7423e160abd7470abcea821b5d502dff0314e94e81c5cbd0acbbbfc3d3 SHA512 4449b8a4d25232a1d8f375f161d3801d67d93756bd9b3e2f33b58a87e8a257e2e94e47f8aa4a74b69df3da528ffc349f15198a939552c3b5b9ffaacc18a096a9 WHIRLPOOL 6d1c2744ea27f9351e0165f711148581dadf472a7f88e65f08b23040f0e82c1c920e46506981550f3de0370017f96ae32dbac2ebbe12cc0f67ad3654586b564b
 AUX rethinkdb.service 261 SHA256 c831f179b0973ea5abb205a5aae3f4597d09bc7575f3a75fa6db5c32fce5f5ee SHA512 70389797ae79481b7d47b45f1676bd0531bc830a2f2daf7baec87533a7a6a0e67177572bab7d42324fe719f8a056899babc5ab2358a679c6a59899ed1272374b WHIRLPOOL 7e0259a1678a216a44ee1b64df65ad8c3d653887a392ed371b027f17fa91cc9cb1f315fdce4071e8c1403e9af7891d772089f85fb9291981fdbca08ed3e46b6a
 AUX rethinkdb.tmpfilesd 43 SHA256 656d3a42e75d087e723f71aa320fdd91cbbb82071ef72eb11fd3e4a619b429a4 SHA512 5996f72b8e08aac80285373e8e1b5a664177e9d0e8d13e5638c6b821fe5b7a0368001fbfa9ef3f6709dabf0616abcabea40adc4808d176572f8f99b7a3255bae WHIRLPOOL 84ff192ff84922155cfacb26e8f9255d506c0733472d5b674ea61e1c2f805a0293da0f69622d52bd21b2822dcaaf3a641c2ec39321283af0b3f00b0fb37ba2c9
-DIST rethinkdb-2.3.5.tgz 76829628 SHA256 dd8aeee169b177179bfe080725f0560443e0f26dae875b32ae25d90cf2f8ee10 SHA512 ac71656fd2451fd36432fa0f7d2c16c2be53888f748d88f0bfc2fb9ad7cd3c704b56551bc35eda72eb08fffdd799727a3cbe83830337cf71e17c159588d33c94 WHIRLPOOL 533a0a4db02672c4310ebd99a18517ff8a6e571e1c9a1c6b8f8ddc40e8b76c0506a56986857469a15ff74b6f80d2e5c830c0d606f67e4bf70eac4d59c7356652
-EBUILD rethinkdb-2.3.5.ebuild 3796 SHA256 2a2e3cd89d5323bd8f52fd899b82bf8e0328263b6806c4281102b0524ef97745 SHA512 95a8f533a12a939e03d5bab2076574bdd0c1c5f5cf1c5e45722c1bfd580f79a36c56fb903f063a057b0d3381317ff12577d4b1c5ae75fc4969d0d4d714513897 WHIRLPOOL bc29c69d86071912e33fa4ac6ebed4d5918bc345fdcb66d045be2d02e3b43934a628f0629c2a7cbb8d2f517d0c196b6205cdbb5678b94f05fda1e1c2c04a858f
+DIST rethinkdb-2.3.6.tgz 76787356 SHA256 c42159666910ad01be295a57caf8839ec3a89227d8919be5418e3aa1f0a3dc28 SHA512 653177750f7439fa1d61a121e488d578be1eab90f87c7d17ad52b9793d8543f22bbe98f8d501c2ab2d7048c65118096430fe7bde945d87c7a3228905af801af2 WHIRLPOOL c8a65bc5861bf066c8d1b926e72a1c2029ba84b4d72f512d4b405cb8dfe0b9a183d72898d7b310a3507a0e30d6479ef7088516adffaed94b33e5837804d0f7d4
+EBUILD rethinkdb-2.3.6.ebuild 3885 SHA256 4528bf380fe71976bff596aff00a7913b0f3c856f0f09e2eb3c78508424f369f SHA512 4c070927a79bb4fb86871113e47eb5b07706f89578242de799fe2c9f18ebfcd40830fb9f2413f4742c96874b9c014d375373f23049cb18619ad392cd72427e33 WHIRLPOOL da794b0a69ababee51a2851c08f702a663e8a882ec8b319ac7a40c90daefa02c128422216217ec00d20f04725bbd28ff429176bd394ba9bcfd3c9a5de6d8034e
 MISC ChangeLog 811 SHA256 e88527a22732eb4670de3a12c546448deb0e77e1af8f70faa797b66cf850e09e SHA512 620ee0dbb9ecfc0c9244ab9caadd4f03948dfe9edb08596289ec5ac5166f8ceca1410752d272cb45398654b6299a8c78032bb91ac0ef7a8f1cf469a398942ccb WHIRLPOOL c811b8598672e07f87103fdce8883a9a5872d50bd59b78bfb0e961aa598c6567e46eb74f2149d26760340d620c958d19f93dc62ede049edada26fb86b39ce999
 MISC metadata.xml 584 SHA256 78e93ccdd027b576957d5e3cd8fcc3ca75150d2591d70a4fd60f35c8c170293f SHA512 50641820a4f298ad66ceedafcb388b8f99d2732e0e7de9c0aa412d75482488a9d382845802ea55a451c39890ff5167715f47e3346aad29992fd3bc069d097dae WHIRLPOOL faf720da7b8edb0781aa3985e448c049fe8027bfec7771a2f6319b3a60f4aaf94b0218230760ec0c4000a9eab6557fc2ae1dcaefb4ccc3b80b3657366912fabc
diff --git a/dev-db/rethinkdb/files/rethinkdb-2.3.5-gcc6.patch b/dev-db/rethinkdb/files/rethinkdb-2.3.5-gcc6.patch
new file mode 100644
index 000000000000..e3d5eac88a45
--- /dev/null
+++ b/dev-db/rethinkdb/files/rethinkdb-2.3.5-gcc6.patch
@@ -0,0 +1,37 @@
+Bug: https://bugs.gentoo.org/594220
+Commit: https://github.com/rethinkdb/rethinkdb/commit/871bd3705a1f29c4ab07a096d562a4b06231a97c
+
+From 871bd3705a1f29c4ab07a096d562a4b06231a97c Mon Sep 17 00:00:00 2001
+From: Etienne Laurin <etienne@atnnn.com>
+Date: Wed, 16 Nov 2016 04:17:41 +0000
+Subject: [PATCH] Workaround for building V8 with GCC 6.2
+
+---
+ mk/support/pkg/v8.sh | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/mk/support/pkg/v8.sh b/mk/support/pkg/v8.sh
+index dc339ad0715..97f4d336c03 100644
+--- a/mk/support/pkg/v8.sh
++++ b/mk/support/pkg/v8.sh
+@@ -44,8 +44,10 @@ pkg_install () {
+         arm*)   arch=arm; arch_gypflags=$raspberry_pi_gypflags ;;
+         *)      arch=native ;;
+     esac
++
+     mode=release
+-    pkg_make $arch.$mode CXX=$CXX LINK=$CXX LINK.target=$CXX GYPFLAGS="-Dwerror= $arch_gypflags" V=1
++    pkg_make $arch.$mode CXX=$CXX LINK=$CXX LINK.target=$CXX GYPFLAGS="-Dwerror= -Dv8_use_snapshot=false $arch_gypflags" V=1 
++
+     for lib in `find "$build_dir/out/$arch.$mode" -maxdepth 1 -name \*.a` `find "$build_dir/out/$arch.$mode/obj.target" -name \*.a`; do
+         name=`basename $lib`
+         cp $lib "$install_dir/lib/${name/.$arch/}"
+@@ -56,7 +58,7 @@ pkg_install () {
+ pkg_link-flags () {
+     # These are the necessary libraries recommended by the docs:
+     # https://developers.google.com/v8/get_started#hello
+-    for lib in libv8_{base,libbase,snapshot,libplatform}; do
++    for lib in libv8_{base,nosnapshot,libbase,libplatform}; do
+         echo "$install_dir/lib/$lib.a"
+     done
+     for lib in libicu{i18n,uc,data}; do
diff --git a/dev-db/rethinkdb/files/rethinkdb-2.3.5-libressl.patch b/dev-db/rethinkdb/files/rethinkdb-2.3.5-libressl.patch
new file mode 100644
index 000000000000..b79850b0b6b3
--- /dev/null
+++ b/dev-db/rethinkdb/files/rethinkdb-2.3.5-libressl.patch
@@ -0,0 +1,162 @@
+Bug: https://bugs.gentoo.org/594998
+Issue: https://github.com/rethinkdb/rethinkdb/issues/6336
+Patch: https://git.alpinelinux.org/cgit/aports/tree/community/rethinkdb/libressl.patch?id=146fb0d67a1b861d5c776d97f533efe0bb26af7a
+
+From d52a694a806c1a8b6dd4d7d17d0671a96240449a Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 4 Jan 2017 15:31:40 +0100
+Subject: [PATCH] Improve OpenSSL compatibility
+
+Refactor the conditionals for openssl 1.1 support so we avoid multiple
+if/else and add a check for LibreSSL as well.
+---
+ src/crypto/hash.cc                 | 13 +++++--------
+ src/crypto/hmac.cc                 | 34 ++++++++++++++++++----------------
+ src/crypto/initialization_guard.cc | 15 ++++++---------
+ 3 files changed, 29 insertions(+), 33 deletions(-)
+
+diff --git a/src/crypto/hash.cc b/src/crypto/hash.cc
+index 4427dfddeb..e035f695fc 100644
+--- a/src/crypto/hash.cc
++++ b/src/crypto/hash.cc
+@@ -8,27 +8,24 @@
+ 
+ #include "crypto/error.hpp"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#define EVP_MD_CTX_new     EVP_MD_CTX_create
++#define EVP_MD_CTX_free    EVP_MD_CTX_destroy
++#endif
++
+ namespace crypto {
+ 
+ class evp_md_ctx_wrapper_t {
+ public:
+     evp_md_ctx_wrapper_t() {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+-        m_evp_md_ctx = EVP_MD_CTX_create();
+-#else
+         m_evp_md_ctx = EVP_MD_CTX_new();
+-#endif
+         if (m_evp_md_ctx == nullptr) {
+             throw openssl_error_t(ERR_get_error());
+         }
+     }
+ 
+     ~evp_md_ctx_wrapper_t() {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+-        EVP_MD_CTX_destroy(m_evp_md_ctx);
+-#else
+         EVP_MD_CTX_free(m_evp_md_ctx);
+-#endif
+     }
+ 
+     EVP_MD_CTX *get() {
+diff --git a/src/crypto/hmac.cc b/src/crypto/hmac.cc
+index 2ac4314e24..0e3f91a0c1 100644
+--- a/src/crypto/hmac.cc
++++ b/src/crypto/hmac.cc
+@@ -7,43 +7,45 @@
+ 
+ #include "crypto/error.hpp"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++
++inline HMAC_CTX *HMAC_CTX_new() {
++    HMAC_CTX *tmp = (HMAC_CTX *)OPENSSL_malloc(sizeof(HMAC_CTX));
++    if (tmp)
++        HMAC_CTX_init(tmp);
++    return tmp;
++}
++
++inline void HMAC_CTX_free(HMAC_CTX *ctx) {
++    if (ctx) {
++        HMAC_CTX_cleanup(ctx);
++        OPENSSL_free(ctx);
++    }
++}
++
++#endif
++
+ namespace crypto {
+ 
+ class hmac_ctx_wrapper_t {
+ public:
+     hmac_ctx_wrapper_t() {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+-        HMAC_CTX_init(&m_hmac_ctx);
+-#else
+         m_hmac_ctx = HMAC_CTX_new();
+         if (m_hmac_ctx == nullptr) {
+             throw openssl_error_t(ERR_get_error());
+         }
+-#endif
+     }
+ 
+     ~hmac_ctx_wrapper_t() {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+-        HMAC_CTX_cleanup(&m_hmac_ctx);
+-#else
+         HMAC_CTX_free(m_hmac_ctx);
+-#endif
+     }
+ 
+     HMAC_CTX *get() {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+-        return &m_hmac_ctx;
+-#else
+         return m_hmac_ctx;
+-#endif
+     }
+ 
+ private:
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+-    HMAC_CTX m_hmac_ctx;
+-#else
+     HMAC_CTX *m_hmac_ctx;
+-#endif
+ };
+ 
+ std::array<unsigned char, SHA256_DIGEST_LENGTH> detail::hmac_sha256(
+diff --git a/src/crypto/initialization_guard.cc b/src/crypto/initialization_guard.cc
+index ba0503efc6..f76ffd96da 100644
+--- a/src/crypto/initialization_guard.cc
++++ b/src/crypto/initialization_guard.cc
+@@ -14,16 +14,17 @@
+ #include "arch/io/concurrency.hpp"
+ #include "arch/runtime/runtime.hpp"
+ 
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#define OPENSSL_init_ssl(x, y)     SSL_library_init()
++#define OPENSSL_init_crypto(x, y)  SSL_load_error_strings()
++#define OPENSSL_cleanup            ERR_free_strings
++#endif
++
+ namespace crypto {
+ 
+ initialization_guard_t::initialization_guard_t() {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+-    SSL_library_init();
+-    SSL_load_error_strings();
+-#else
+     OPENSSL_init_ssl(0, nullptr);
+     OPENSSL_init_crypto(0, nullptr);
+-#endif
+ 
+     // Make OpenSSL thread-safe by registering the required callbacks
+     CRYPTO_THREADID_set_callback([](CRYPTO_THREADID *thread_out) {
+@@ -49,11 +50,7 @@ initialization_guard_t::initialization_guard_t() {
+ }
+ 
+ initialization_guard_t::~initialization_guard_t() {
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L
+-    ERR_free_strings();
+-#else
+     OPENSSL_cleanup();
+-#endif
+ }
+ 
+ }  // namespace crypto
+-- 
+2.11.0
+
diff --git a/dev-db/rethinkdb/rethinkdb-2.3.5.ebuild b/dev-db/rethinkdb/rethinkdb-2.3.6.ebuild
index 7dafd2bc1039..75c166abc66c 100644
--- a/dev-db/rethinkdb/rethinkdb-2.3.5.ebuild
+++ b/dev-db/rethinkdb/rethinkdb-2.3.6.ebuild
@@ -32,8 +32,13 @@ pkg_setup() {
 	enewuser rethinkdb -1 -1 /var/lib/${PN} rethinkdb
 }
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.5-gcc6.patch
+	"${FILESDIR}"/${PN}-2.3.5-libressl.patch
+)
+
 src_prepare() {
-	eapply_user
+	default
 
 	# don't use predefined configuration
 	rm configure.default