Update dev-db/mongodb-3.2.16

6 files changed, 80 insertions, 13 deletions

diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 703dd79d..ede10e95 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -8,14 +8,18 @@ AUX mongodb-3.4.6-sysmacros-include.patch 1419 SHA256 9ef54b5e58aab228b4ff973748
 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 553 SHA256 8c13285096a8f87dcdb31e5c324143f59caeb92dac4c704d5b597bf47ed1f013 SHA512 eeaec4e10c5a461dd392254243c7bbc57367e4a9bd683e8788e0bd8cfe6ccb4df2033a359d6aaa864f893d7851eed7af44ef9c46905e480e26702f8fdb08e35b WHIRLPOOL 80827a813915a8ebc62a08211ad34d16389efe80dc959d45c6a9e627d8021eb8c10fc88a626f3ecf605c22a0ae85fb0e024d4ece77db022297dd352fd34aada2
+AUX mongodb.confd-r3 473 SHA256 39418ff743d0245fd4115a04e40d4763736364f4b9d56af3477f529e4b4d2d66 SHA512 8a90fb39ad16837458a2add25a9b9059e2b356794cfbf3cb35c9ecd6a584ee300c67b49b5261e062eaf7aac593588e2871e5cf76ab2287e58ea342436d0afe56 WHIRLPOOL 684d29290fcde65a585c85410fa9ab8835a4bfe4f4502dd4d94cb76dad94365faf8c27c1194b41ab7df0e1c5b31fb0c84cd12e942ca23c41fedb48db4876c9f3
 AUX mongodb.initd-r2 658 SHA256 7ec36571b21127240425957ba1366c2b4f2e53b9804b305467093cdfd7866d14 SHA512 16ceb373b827da64417930a3140efbf5134d841ecfef932b1d738c36be7389fb8ce6df06bef174834890bccef241aaf0f519b557813aa7ed45b361bc51ae29b6 WHIRLPOOL 919777a7b8ad68ce12bacd99e4fa8459896fd249d8be1c1093eebcc138b1c3a27dc731971bf0632e759247bedcdf818d597413e4cc93eda1b2a3d89f8b2449dd
+AUX mongodb.initd-r3 426 SHA256 2b9d6a9bdb1ba3a28e645b566d28a01e28be3cebd190d12da8b70e4fb2e0f4d8 SHA512 bfe5f01a2b437944855c2abca9f8a6edfd0550b127dcb4a87738b88433a9944bd1a90292a870f4499bca251ca4ad330f63909c2b1ea4e43182a36bb803d5b65b WHIRLPOOL f1b513927b90f61eb859f06d183578cbc863cee7f75452d7b61663cad918c5c922b6af5fed9db94d631bc48d0c34c5b04a22805505e9b3a3d83e89aadcb175ca
 AUX mongodb.logrotate 153 SHA256 9a77d08e63a882b6d7ef0b05eb6eaefb44013019a334734d34b9f26aca1851b0 SHA512 ed7db6a63ef3b405417231848eef9dafd48796460f56821877c11acf1fc25cf0b38d7d71e80e8d13c053568039d2f4680c0a61f8a8bc3bda65eeee1a45598b53 WHIRLPOOL c17fa95e706f7eafdbe1d5c9cfa8e1a8fb8b8458308119113c45c7b8c4f08d97f79c879de3ff0c5831ffa4e8fc0e6a21a8296d014d18bdcdd9a2b544550f5571
 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 550 SHA256 3e3732aeb25e4e014415d3c071cb6d47c47a59ee259ac2c0c68542672b361898 SHA512 8856eed8d3d16557906419ba75a8a21ba56fc45ccbc46a64b64d70b45c7ae45982c3d4e133b991a3e50b6efd203b35a584ceeebaca90a77e4a491cf49998a93e WHIRLPOOL 392453f29d0734aea5d0bfdf311981e2432969ec4f5386498344d17cd1eb0c4760120af8732088d71b3468454d6aa1000d98101121f0b38d74721c5eb131eae6
+AUX mongos.confd-r3 470 SHA256 71120239983469b35f77f5d72cc976aa68cb914e2bc0bdf583b52ce2060039ab SHA512 952fb9cf5d3eeea2006b101e23142e408c98d66d1f4f868f6ea5a4df6a6331ddcbcbdfb24f4b031c1a8c42652141a3684073b96dfc0b3fbd21dc6b5bcf0e36cb WHIRLPOOL 66c81df3199176218c0e4ec3a09f5bc72f1dfaedfb6c36d2286656a0e19a56a959a248c1ecccdc25f92d2ace5a054b08055b64d8b88c258b47b31608bcc103eb
 AUX mongos.initd-r2 658 SHA256 8dd76fc09b94580f15ed66edbb685f229fcb972430aee360621ba1b48b979854 SHA512 91075a1b8176ebb0e574e13bcbc469e89efa449702c7fc25c2f64bc5cedd0d4631061e464e6a3906502a0982a95354c5692d39959b5ef4f07627f03e9a9111ca WHIRLPOOL 27ca74a692aca0bb16b12d2ea7a2682020d6a725d94b3af93dfb5fdcef4c419550ea6a137b5c4768fab6fe45eb5c98a4c04ca5a0a247078b64b0747304661dff
+AUX mongos.initd-r3 426 SHA256 c8d87839a16174211519b0d52bf8a14c714294dcd8024649414109e7d252b1d9 SHA512 7a10948bd111a8c752c07411d7673d200a2417cb2abf34041c244e133fa1f4463b18d8099f7af43c4c9452cb6371f971eaaf935266aea5a689c3dadd3fe5f5fc WHIRLPOOL 2cf68b11609255ec26d67510c05b771373389f48414b38bb3e1b3b55f81b00298fe244a3c3c23e5ebd381f6480719f0343214c9515468ec40a9fcf2f2553a55b
 DIST firefox-38.8.0esr.source.tar.bz2 181198635 SHA256 9475adcee29d590383c4885bc5f958093791d1db4302d694a5d2766698f59982 SHA512 fcd2497a60176b8403a1793d1ad0a1c96a0a60217c2d4d7acd0506abf6810892bd51fd113d8f952f92b20032efc539a6b1233d8d124c2eb72d726b0935c04d65 WHIRLPOOL cbc170093bbc1403a4112e5a1a73ceeda4d0ab86dc02697b4010097a612124652e8ad27ae33bca056a5d1f8450239a98b746ff983ab4a0db010e10c815781d8d
 DIST mongodb-src-r3.0.14.tar.gz 28093922 SHA256 ebbb758ca7ee53e8d25e2410bb7ef61640829566d094cde2487b55e73d0fd880 SHA512 477fab29ca0ad2a0f24b895e30dc4770af8d6a1a57f3c10a02a989b58dd22510db554da0418129d4e81958342ad169696eed4b86bf5aa73916c7cec879db1152 WHIRLPOOL 7fc02969c52954f0fd9b90ace9efd3677a9d6b8d3618b5dedb470343a3ba71789d451cc30a95742b2b9e61b21ffe0f1a23e239e388a497a327f2cc8ed1ed6aef
 DIST mongodb-src-r3.2.16.tar.gz 29293555 SHA256 7a8b1b16f3fa545af16f48aeef1f918f57d96a80e1ceb6e669cdb81fab6511d0 SHA512 ba57aae430959f7df036b7e19e1b7d81956184bededd35631616c6e3dc9423dc79a50ab3265bc48b06d198a7043bca902aee2ea75954e38151ebead5b5ab2db2 WHIRLPOOL 0ac7b7cfae8b8b3727dc722c616eb576b3ae3aced5340b9fbd9a995d9f55552411c0507cb43a7378fa35187cf940d72d86ee20d08762f87bb4ebcd13eb697f09
 EBUILD mongodb-3.0.14.ebuild 4886 SHA256 60b7037dc3f6634e481174efc1319e5324ac9c247ddc163a8b940de0af8e7bdd SHA512 5a8f632a5c0597d10abaf4044b89db063b3d32f24d766326a096bb0a39bc0b66eabb32b78fcca2929b6f5f839843e4c0e4e6fd7d31d546c9cf94a1498c552d62 WHIRLPOOL 1cce3832ad62aad4eb0ebf76fd7f2c402d100285f0b319cb07dba9c773ad720e16fa6680f417d3eb8bd512cfe2e59a863f48f65a1412c400fb33d0d174102376
-EBUILD mongodb-3.2.16.ebuild 6192 SHA256 3d9f51b543439af6a5dba98e1ca592c06bbb6939128d5c30f96629f3f761af0f SHA512 a19ba39772f7673dfd0c0158cfa27c8406c7d314685934df93d8d1c5f74728724c5faee879252494cb2e3feeadca90a0a319b7712c926790b66570d2ee39ac5a WHIRLPOOL 911286faa2bd34876a0f7305aaf9c8b4493b7a239024cb408b51b9199025a78365a39eb653519fd255f498da51d7f29190dece4501abf70f897df222efaefbd7
+EBUILD mongodb-3.2.16.ebuild 6288 SHA256 42dc4f855122725165bce32d69140d2ba2d77c4000e28181f2aa39adfdfa065b SHA512 e4decd395b16aa68dda2fcd4f5ac3eb65cac6ebef58a971dc4e8ef1d14c29d83d9fdff64a15e10f0acf6cd0d1b26e0296b061ce02efb0935ad4d97d0bb5aeb89 WHIRLPOOL 4c2f02ebb10ee0bacd1e588afd8f80c159cd96af27a96ae573cb5d4a9889becbbdc8bc3d33855e69e7e0aa1be4ef0fb14f92a5d005c1b4cea5d1a22a92e3e493
diff --git a/dev-db/mongodb/files/mongodb.confd-r3 b/dev-db/mongodb/files/mongodb.confd-r3
new file mode 100644
index 00000000..e515d1dd
--- /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 00000000..40bf55dd
--- /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="/var/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 00000000..7f297dfd
--- /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 00000000..a0cc2f20
--- /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="/var/run/${RC_SVCNAME}.pid"
+command_user="${user}:${group}"
+required_files="${config_file}"
+
+depend() {
+	use net
+}
diff --git a/dev-db/mongodb/mongodb-3.2.16.ebuild b/dev-db/mongodb/mongodb-3.2.16.ebuild
index b0a569b9..2e0ff6db 100644
--- a/dev-db/mongodb/mongodb-3.2.16.ebuild
+++ b/dev-db/mongodb/mongodb-3.2.16.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 SCONS_MIN_VERSION="2.3.0"
 CHECKREQS_DISK_BUILD="2400M"
 CHECKREQS_DISK_USR="512M" # Less if stripped binaries are installed.
-CHECKREQS_MEMORY="640" # Default 1024M, but builds on RPi with ~700M available...
+CHECKREQS_MEMORY="640M" # Default 1024M, but builds on RPi with ~700M available...
 
 inherit eutils flag-o-matic multilib pax-utils scons-utils systemd toolchain-funcs user versionator check-reqs
 
@@ -45,6 +45,14 @@ DEPEND="${RDEPEND}
 	)"
 PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.0-fix-scons.patch"
+	"${FILESDIR}/${PN}-3.2.4-boost-1.60.patch"
+	"${FILESDIR}/${PN}-3.2.10-boost-1.62.patch"
+	"${FILESDIR}/${PN}-3.2.16-Replace-string-with-explicit-std-string.patch"
+	"${FILESDIR}/${PN}-3.4.6-sysmacros-include.patch"
+)
+
 S=${WORKDIR}/${MY_P}
 
 pkg_pretend() {
@@ -105,14 +113,11 @@ pkg_setup() {
 src_prepare() {
 	mv "${WORKDIR}"/mozilla-esr38 "${S}"/src/third_party/mozjs-38/mozilla-release || die
 
-	epatch \
-		"${FILESDIR}/${PN}-3.2.0-fix-scons.patch" \
-		"${FILESDIR}/${PN}-3.2.4-boost-1.60.patch" \
-		"${FILESDIR}/${PN}-3.2.16-Replace-string-with-explicit-std-string.patch"
 	if has_version ">=dev-libs/boost-1.62"; then
-		epatch "${FILESDIR}/${PN}-3.2.10-boost-1.62.patch"
+		PATCHES+=( "${FILESDIR}/${PN}-3.2.10-boost-1.62.patch" )
 	fi
-	epatch_user
+
+	default
 }
 
 src_compile() {
@@ -145,10 +150,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