Merge updates from master

6 files changed, 263 insertions, 2 deletions

diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index e9b196bcdb74..e9f2d2ba0ae9 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -3,4 +3,5 @@ DIST mongo-tools-3.0.15.tar.gz 2413131 SHA256 9e1a936b42eff999a83afc3885faee0c64
 DIST mongo-tools-3.2.12.tar.gz 2712079 SHA256 cda5e869b9233d591e91cac0b4c709a2e71dcabd9ac6bcc8b33d906ce3b13afd SHA512 66f7beb85a83ad6a217e65bba97ace6ad0bf84688f40e598e5fb1cf4bbe481b4069e1247d6829f8d06c8230d33c3e0c8bd8465a975576cad584065c361b6fb72 WHIRLPOOL 46123dc3c97fdf20ff94ac373e774932bd30aca677047fe3366653aaab269bf6d7e59cb420cf1e5716558fa959cb3649ee359cc27932bac276e6d24d2eea43b1
 DIST mongo-tools-3.2.13.tar.gz 2712076 SHA256 a855eb0141445e34ff3b01807b016467519c390fce79f3566000b5aaecb65d72 SHA512 caa0ba0f1452a16921c187cb407258326324b7222af91b1cd1b870ee2c9e6909d4fa94087a6da148a807f75b40f0bb97808a85804134d53cdab7970d8adf59f8 WHIRLPOOL e2fb38cc8a35ab7c9461f680a2bf0647b5cb5d1225978b7321e6c4227b02ae3cae93e5f2a105f188f3329b0f0f8741e9a0c5439f37196ca875b049d3a91836d3
 DIST mongo-tools-3.2.16.tar.gz 2720003 SHA256 1cd699f0e45b0b3afb0cfc7014258fb69e93c98e254ef9ef1605cd2de0b56d4c SHA512 61c8cfd04a36e329c3573b73945d20a5623e1aa0a3430b309530e85e4289a27a46a850ec48ede7f04e66e67e23745ef26f5f4ddcf68ffeb647128e3d2526a724 WHIRLPOOL 2d2855f578f15e9afd133f6b24b23bd5d6a20516c96f665581223ca1c9a472ead6634749db46b55a1351a8b63923531046ab83a262ec54f439ccf008cb854f9e
+DIST mongo-tools-3.2.17.tar.gz 2719970 SHA256 51eb688b294ada69e8aad09c81d338705196d5e1ece7e10409e9da032d3ce3de SHA512 62c2540027e07b8276621e08d13657864d16021030e3c8f9bc0d351454319d448f889cf6a48b8467ea3270365376ed0c3beb42ceae3f28357910148c6b4054b2 WHIRLPOOL 7d8ee216aca92013b56012bab1f619408edfefe2b32c78ec21b378b07aa0c7366fe4f0150eb6116be0d8ba33ec2e60b627480d889187e927dc9e4eb37671719d
 DIST mongo-tools-3.4.10.tar.gz 4719399 SHA256 adaff068b7f340866dcd2085222ee4f879b26cd98a3010652fea4d53ffb8e0c7 SHA512 b861bb3fb1a32c3aa2efefcf6a13bb6d4783ac1a9b006c477fd04deb338cbf6b7adc3944bc6919513b92bd96b8500813ff4af49c9dec0719ebd2fdaa99bc39a5 WHIRLPOOL e484cec2036b1d9d88c3fa3b8142a681e0ba1d96f9a8d772fb7c7035033dac6d4e40fe154042dc8016b3a31ed09dce0081c7bc9b7d2c9f420cc2286eb47ccd2e
diff --git a/app-admin/mongo-tools/mongo-tools-3.2.17.ebuild b/app-admin/mongo-tools/mongo-tools-3.2.17.ebuild
new file mode 100644
index 000000000000..1da373e5820b
--- /dev/null
+++ b/app-admin/mongo-tools/mongo-tools-3.2.17.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-r${MY_PV}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.org"
+SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mongo-tools-${MY_PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="sasl ssl"
+
+RDEPEND="!<dev-db/mongodb-3.0.0"
+DEPEND="${RDEPEND}
+	dev-lang/go:=
+	net-libs/libpcap
+	sasl? ( dev-libs/cyrus-sasl )
+	ssl? ( dev-libs/openssl:0= )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# do not substitute version because it uses git
+	sed -i '/^sed/,+3d' build.sh || die
+	sed -i '/^mv/d' build.sh || die
+
+	# build pie to avoid text relocations wrt #582854
+	# skip on ppc64 wrt #610984
+	if ! use ppc64; then
+		sed -i 's/\(go build\)/\1 -buildmode=pie/g' build.sh || die
+	fi
+
+	# ensure we use bash wrt #582906
+	sed -i 's@/bin/sh@/bin/bash@g' build.sh || die
+
+	default
+}
+
+src_compile() {
+	local myconf=()
+
+	if use sasl; then
+	  myconf+=(sasl)
+	fi
+
+	if use ssl; then
+	  myconf+=(ssl)
+	fi
+
+	./build.sh ${myconf[@]} || die "build failed"
+}
+
+src_install() {
+	dobin bin/*
+}
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 4b2614ca7d54..4c63994a6911 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -5,4 +5,5 @@ DIST mongodb-src-r3.0.15.tar.gz 28096395 SHA256 09ad76e06df007085520025c94a5e584
 DIST mongodb-src-r3.2.12.tar.gz 29178424 SHA256 406ced873a9abe8a3f0f92939bf5374663bac86c72181c80bec144aedf6cd306 SHA512 0c4ddaaddf15d97957faff46dc4a3f79c545cacc8a56dbe1d063778117ba9b645323b0cb7fd054fae805d092b8372c411a82e3370244b7939bda20a65fdb951c WHIRLPOOL 67673788859ea99752f2e0d1d8c7feb40b004efc344a2a589553675be7f9020ed384cb4a9000bb7eee0059105af364a722f17890ea3f0d38508b8d045db7da75
 DIST mongodb-src-r3.2.13.tar.gz 29273616 SHA256 31492b99d12d6363a6ebcbba32269ce9e97dadedda8c470cbff8c1af227e9753 SHA512 649b599da65fc205a6e18cde82da6153fb4c03a21cf679e18fb57f705ac168690a37f9520be1242278bc0fe441fda08f1c10c9924cabc636ba153c545d32f91d WHIRLPOOL f7ac6c5a14814650c4bbb52f25d710613ae3aa4011f2600f4727c0c81d83ec33c9be9ddac594e6a2d1ad4556bc6c9de71d3a11abfb3bd2883322ab85010ae905
 DIST mongodb-src-r3.2.16.tar.gz 29293555 SHA256 7a8b1b16f3fa545af16f48aeef1f918f57d96a80e1ceb6e669cdb81fab6511d0 SHA512 ba57aae430959f7df036b7e19e1b7d81956184bededd35631616c6e3dc9423dc79a50ab3265bc48b06d198a7043bca902aee2ea75954e38151ebead5b5ab2db2 WHIRLPOOL 0ac7b7cfae8b8b3727dc722c616eb576b3ae3aced5340b9fbd9a995d9f55552411c0507cb43a7378fa35187cf940d72d86ee20d08762f87bb4ebcd13eb697f09
+DIST mongodb-src-r3.2.17.tar.gz 29295394 SHA256 f76db57edd2c73a96ab2ca9d907f0ad8c12694a91a550ed38a190bc060d0b40e SHA512 0d6a01278bc61805afd164e4a29abe150a5a96d551ed2c7c5d385b269924a7c5f065315e4f19c0ab070aa275ac03447959af45f33826457e5db0c5f98e623512 WHIRLPOOL 52853c1f3e8714ae9d43d729fe97533c7f38d046b203fa122f38c3b5cf68dbe5dc493cdae47a8846940d8aaeeb10fa20ba6aa14c0caaf8dfb355539eac1de8bf
 DIST mongodb-src-r3.4.10.tar.gz 39959937 SHA256 443800ca4f52fa613b29052f5f76abc0ccc477451b55f3665b61819f28ace2f3 SHA512 6293dde40a8433477ba3b1cf77abbdb32b28ce58279cc616b488647c8ab71b5ab3eab2146058c4a74b9e00f0938f1415020e2f26ea01f2b29dd78a1a38d58c3a WHIRLPOOL 3cd03fecfc1fa077f55d9961e939d89e347ae5f41c815d81a50b88ddef9c8900f41faec6ae71b759f9f665c8a706fdd3000e96c3047711237f0d66478edbf35e
diff --git a/dev-db/mongodb/mongodb-3.2.17.ebuild b/dev-db/mongodb/mongodb-3.2.17.ebuild
new file mode 100644
index 000000000000..979e0dfa8c93
--- /dev/null
+++ b/dev-db/mongodb/mongodb-3.2.17.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+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.2
+	>=dev-cpp/yaml-cpp-0.5.1
+	>=dev-libs/boost-1.57:=[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}
+	=dev-lang/python-2*
+	<dev-util/scons-3
+	>=sys-devel/gcc-4.8.2:*
+	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.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() {
+	if [[ ${REPLACING_VERSIONS} < 3.0 ]]; then
+		ewarn "To upgrade an existing MongoDB deployment to 3.2, you must be"
+		ewarn "running a 3.0-series release. Please update to the latest 3.0"
+		ewarn "release before continuing if wish to keep your data."
+	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}"
+		fperms 0750 "${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
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	"${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.2/"
+	ewarn "  https://docs.mongodb.org/master/release-notes/3.2-upgrade/"
+	ewarn
+	ewarn " Starting in 3.2, MongoDB uses the WiredTiger as the default storage engine."
+}
diff --git a/dev-db/mongodb/mongodb-3.4.10.ebuild b/dev-db/mongodb/mongodb-3.4.10.ebuild
index 11be62cc3f1e..16546b1e3ff0 100644
--- a/dev-db/mongodb/mongodb-3.4.10.ebuild
+++ b/dev-db/mongodb/mongodb-3.4.10.ebuild
@@ -25,11 +25,11 @@ 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/boost-1.60:=[threads(+)]
 	>=dev-libs/libpcre-8.41[cxx]
 	dev-libs/snowball-stemmer
 	net-libs/libpcap
-	>=sys-libs/zlib-1.2.8
+	>=sys-libs/zlib-1.2.8:=
 	mms-agent? ( app-admin/mms-agent )
 	ssl? (
 		!libressl? ( >=dev-libs/openssl-1.0.1g:0= )
@@ -37,6 +37,7 @@ RDEPEND=">=app-arch/snappy-1.1.3
 	)"
 DEPEND="${RDEPEND}
 	=dev-lang/python-2*
+	<dev-util/scons-3
 	>=sys-devel/gcc-5.3.0:*
 	sys-libs/ncurses
 	sys-libs/readline
diff --git a/profiles/package.mask b/profiles/package.mask
index f651bc62c0b2..e2a71315b7f9 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -55,6 +55,7 @@ dev-qt/qtwebkit:4
 # Andreas Sturmlechner <asturm@gentoo.org> (16 Nov 2017)
 # Depends on dead Qt4WebKit. Masked for removal in 30 days. Bug #620702
 <media-gfx/freecad-0.17
+=media-gfx/freecad-9999
 
 # Andreas Sturmlechner <asturm@gentoo.org> (16 Nov 2017)
 # Depends on dead Qt4WebKit. Masked for removal in 30 days. Bug #620736