Version bump. Install the MMS agent via IUSE. Thanks to Julien Thebault for testing.

Package-Manager: portage-2.1.10.29/cvs/Linux x86_64

5 files changed, 140 insertions, 6 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index b617d71f1689..4da2a2959f4d 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.22 2011/10/19 15:54:07 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.23 2011/10/27 07:56:16 ultrabug Exp $
+
+*mongodb-1.8.4 (26 Oct 2011)
+
+  26 Oct 2011; Ultrabug <ultrabug@gentoo.org> +mongodb-1.8.4.ebuild,
+  +files/mms-agent.initd, metadata.xml:
+  Version bump. Install the MMS agent via IUSE. Thanks to Julien Thebault for
+  testing.
 
   19 Oct 2011; Ultrabug <ultrabug@gentoo.org> mongodb-1.8.2-r1.ebuild,
   mongodb-1.8.3.ebuild:
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 1a1b7cbed4e0..05a206e25994 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,22 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX mms-agent.initd 748 RMD160 3f3eade21ef1615956624b7f51a28f84cd3b64a3 SHA1 7049a0a32bdcb6105e4bf2b6b2f4fd916211c979 SHA256 124d47a90ec5a0141cd36c4fabf6eb5b01602ae1dcdcd1b1b363ac49da59b14a
 AUX mongodb-1.8-fix-scons.patch 1859 RMD160 71700297d66808d2503f8a5eb56e10398e282ee7 SHA1 cba8225b2cd79477c0882a312707fbb58a59b70a SHA256 2b1a2180e73ad18c6fc884678dcdfb081c9ed6e967e137ba761683075cd59a1a
 AUX mongodb-linux3.patch 1588 RMD160 879245215595e6f16ef6c04157a9b50b96638d48 SHA1 1ab387e8b6ddc46dbb3dde654e0e01a565c25222 SHA256 bc96fad782e5396cc4464e7d7bff6abb1f054c4ff034fbeebea44a1e7a41945b
 AUX mongodb.confd 361 RMD160 26e8d39513b44d989ee64c30669967237cabbaa8 SHA1 837b3603de36bf8ebab9a6f2c1652a853cdf02ef SHA256 a4ca29c577428c02cd0b0a8b46756df5f53a05519c9d13c270533cf99b9b819d
 AUX mongodb.initd 1254 RMD160 d4fb23a7533480c687e8d1bb01e08780991400ea SHA1 cefff6f1290595929feec0f996c99f9790c06536 SHA256 b39bf365963f849c5102147da324dae140be6ac17db96fe512c0220803477642
 AUX mongos.confd 345 RMD160 97a0baad48e8fb65fe413f9832d0dd9a212f015d SHA1 735e77022707e9a18dd3de30ba9ec87b747bc0bb SHA256 2afd582564623da0e928ca667d37bef467334c82d08b49301f1f6c16ba177767
 AUX mongos.initd 1407 RMD160 2b859fe4e6a7a348c06d9d149a34251d442efbf0 SHA1 57a82e46efafb822de93e0d20384187af25c0bf9 SHA256 a93069d7c7c3602437ce783c1aecd931854973230baae092ccee2cd9c078da7e
+DIST 10gen-mms-agent.zip 25241 RMD160 54f5f3075c2e6f0d28d013352c538dc8a5dca4d2 SHA1 236505c5832b502774cf006249e05815ca7fbcb6 SHA256 2ab95771df102b0686cf9b090b96182b3a702c038b88074bcff54a17e4080abb
 DIST mongodb-src-r1.8.2.tar.gz 1722704 RMD160 3c1e33ed9ff3dd3c653112a46cf178d07b93e32c SHA1 d2145e5b4a6df2e94aec76bef3a9399c11e8571a SHA256 1dd376b15e2b7288a77da2e1b0c6ffa5d2c62cdaf4bccfd9aa51c075a1f1bfb8
 DIST mongodb-src-r1.8.3.tar.gz 1726144 RMD160 9662b6963e7e6a4b5adcbea3faa36dd50a794457 SHA1 3c5c9819ef20c759aec1dc6800a3c4d4f6841299 SHA256 ee121c9698a48b819f1c5b5ba10a98d565bd732d527743f1475f54f697dd63e2
+DIST mongodb-src-r1.8.4.tar.gz 1727826 RMD160 6b561592b4f58f08ca2789e5ab92a3d31597912e SHA1 d296a6e04057e17989de5c7ded3a8c4d28285156 SHA256 c4e27bf22f2353e28ce169dbdbc24205baf863d1f61bd9a31b2230386cada4ae
 EBUILD mongodb-1.8.2-r1.ebuild 2016 RMD160 8b8f5a5d3a6d63a075778ec801f70deb8b45836a SHA1 8f94e36e099fedc6b8ee80e1dcd71e6691a8184c SHA256 7f6b7ebd5f443bac0cf4b0bd5415496f63e4ef611d04aa6dfccd22b82a67ed97
 EBUILD mongodb-1.8.3.ebuild 2013 RMD160 d4b6aa684d5ff860fe570ed597128344ff15cb7e SHA1 ff8deee519548ef021632e671707728d5b321824 SHA256 42b7bb8edb6b19f3cb98681fc07f143722d0e61d73b8458c4479a53659154923
-MISC ChangeLog 6097 RMD160 2d6001c1313944b20eec39a2fcae9e8ea99e5ee0 SHA1 644fa5f36f72eb871922e622cd231be8709fde6a SHA256 bb5a84892c2b83a9374139887e14329234e8e2020045b563a8858e5d89454224
-MISC metadata.xml 1017 RMD160 6b762fb44b48ca422f6319fd63e8b5aabd2422b3 SHA1 326662801e7e137d2973d472b47e40484eb302e4 SHA256 62f2f5f1831b3a66ecbe9b5f3fa2eea1ba7f4f3f8935dd080ef01ae78d0a843a
+EBUILD mongodb-1.8.4.ebuild 2354 RMD160 10f4331ee229bbd699c09ca50dd7229a0fa04819 SHA1 1a68ec132688da486066eb98fc5dac960133ebcd SHA256 112822086e8dec08158cb6fe621e0722f441dd943c15910cd9a782314db249c5
+MISC ChangeLog 6326 RMD160 ff2d81ffe8289f7a6b542e98dfe88754082f6d76 SHA1 2d00ceb48e38b155e15b5ac6a52c151442ea1888 SHA256 e9ed220d06b9df76a554250d06bfaa69a8ad8f15179309195683a25708c2f9b3
+MISC metadata.xml 1094 RMD160 382287bd018ebf994f0997376095d1735858ca0f SHA1 4063b9bc6bb3d95e4b1a5aab9bf63ea567f92329 SHA256 8b325542cc2200f22d21915688992073cc1b0a8c5c4f08f34771df2ac6a9cfaf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6e8qoACgkQKiQSS7ZY+hOf3QD/a5X1pxq+dxfGzu4VFRMyMzqU
-uVRcqQBZha1Uemn60JoA/3NfGFYzIHTvs2yO5AHL6uzg4Cnqqg87Sev/fHu6BrWN
-=cj+S
+iF0EAREIAAYFAk6pDqwACgkQKiQSS7ZY+hODxAD3cgF7vng07lyfZzJMrQRoMLfF
+4hnrBhAwGi/OZ1IHdgEAvZb1ssQMs9jgYwA3wJuXMzjmplcO0IF9w6jMCwDldNA=
+=ptAJ
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mongodb/files/mms-agent.initd b/dev-db/mongodb/files/mms-agent.initd
new file mode 100644
index 000000000000..684037aa08b0
--- /dev/null
+++ b/dev-db/mongodb/files/mms-agent.initd
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mms-agent.initd,v 1.1 2011/10/27 07:56:16 ultrabug Exp $
+
+ROOTDIR=/opt/mms-agent
+PIDFILE=/var/run/mm-agent.pid
+EXEC="/usr/bin/env python agent.py"
+LOGFILE=/var/log/mongodb/mms-agent.log
+
+depend() {
+	need net
+	use syslog
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --start --chdir ${ROOTDIR} --exec ${EXEC} \
+		--pidfile "${PIDFILE}" --make-pidfile --background \
+		--user mongodb:mongodb --stdout ${LOGFILE} --stderr ${LOGFILE}
+	eend $?
+}
+
+stop() {
+	ebegin "Requesting ${SVCNAME} to stop"
+	start-stop-daemon --stop --pidfile "${PIDFILE}"
+	eend $?
+}
diff --git a/dev-db/mongodb/metadata.xml b/dev-db/mongodb/metadata.xml
index 2647b92d65cc..d6548cd8a4cd 100644
--- a/dev-db/mongodb/metadata.xml
+++ b/dev-db/mongodb/metadata.xml
@@ -26,6 +26,7 @@
 		<flag name="v8">Use V8 JavaScript engine
 			(<pkg>dev-lang/v8</pkg>) instead of SpiderMonkey
 			(<pkg>dev-lang/spidermonkey</pkg>)</flag>
+		<flag name="mms-agent">Install the MongoDB Monitoring Service agent</flag>
 	</use>
 </pkgmetadata>
 
diff --git a/dev-db/mongodb/mongodb-1.8.4.ebuild b/dev-db/mongodb/mongodb-1.8.4.ebuild
new file mode 100644
index 000000000000..7bb5ecee003f
--- /dev/null
+++ b/dev-db/mongodb/mongodb-1.8.4.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.4.ebuild,v 1.1 2011/10/27 07:56:16 ultrabug Exp $
+
+EAPI=4
+SCONS_MIN_VERSION="1.2.0"
+
+inherit eutils multilib scons-utils versionator
+
+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="http://downloads.mongodb.org/src/${MY_P}.tar.gz
+	mms-agent? ( https://mms.10gen.com/settings/10gen-mms-agent.zip )"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mms-agent static-libs v8"
+
+PDEPEND="mms-agent? ( dev-python/pymongo )"
+RDEPEND="!v8? ( =dev-lang/spidermonkey-1.8.2* )
+	v8? ( dev-lang/v8 )
+	dev-libs/boost
+	dev-libs/libpcre[cxx]
+	net-libs/libpcap"
+DEPEND="${RDEPEND}
+	sys-libs/readline
+	sys-libs/ncurses"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	scons_opts=" --cxx=$(tc-getCXX) --sharedclient"
+	if use v8; then
+		scons_opts+=" --usev8"
+	else
+		scons_opts+=" --usesm"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.8-fix-scons.patch"
+	epatch "${FILESDIR}/${PN}-linux3.patch"
+}
+
+src_compile() {
+	escons ${scons_opts} all
+}
+
+src_install() {
+	escons ${scons_opts} --full --nostrip install --prefix="${D}"/usr
+
+	use static-libs || rm "${D}/usr/$(get_libdir)/libmongoclient.a"
+
+	for x in /var/{lib,log,run}/${PN}; do
+		keepdir "${x}"
+		fowners mongodb:mongodb "${x}"
+	done
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN/db/s}.initd" ${PN/db/s}
+	newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
+
+	if use mms-agent; then
+		local MY_PN="mms-agent"
+		local MY_D="/opt/${MY_PN}"
+		insinto ${MY_D}
+		doins "${WORKDIR}/${MY_PN}/"*
+		fowners -R mongodb:mongodb ${MY_D}
+		newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
+	fi
+}
+
+src_test() {
+	escons ${scons_opts} test
+	"${S}"/test --dbpath=unittest || die
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} < 1.8 ]]; then
+		ewarn "You just upgraded from a previous version of mongodb !"
+		ewarn "Make sure you run 'mongod --upgrade' before using this version."
+	fi
+	elog "Journaling is now enabled by default, see /etc/conf.d/${PN}"
+}