version bump

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

3 files changed, 129 insertions, 9 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index eb21852e84a6..3f22b5dfe884 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.52 2012/11/22 03:45:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.53 2012/11/28 10:00:23 ultrabug Exp $
+
+*mongodb-2.2.2 (28 Nov 2012)
+
+  28 Nov 2012; Ultrabug <ultrabug@gentoo.org> +mongodb-2.2.2.ebuild:
+  Version bump
 
   22 Nov 2012; Diego E. Pettenò <flameeyes@gentoo.org> mongodb-2.0.7-r1.ebuild,
   mongodb-2.0.7-r2.ebuild, mongodb-2.2.0-r1.ebuild, mongodb-2.2.0-r2.ebuild:
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index cfa9c2efda62..607ff5c2142e 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -22,26 +22,25 @@ AUX mongos.initd 1407 SHA256 a93069d7c7c3602437ce783c1aecd931854973230baae092cce
 DIST 20111027-10gen-mms-agent.zip 25241 SHA256 e5625ce9029a376674d24b242527459403ac782d18c78d91beab93fa8f6783f1 SHA512 4064134ec33af7e9bc95a68082b08eb6ea203d94be807a49db86630383db3f5c73f45caee9c08de86afc48ee62e5f96de95bf44837fb395d048d3cde7bb55d15 WHIRLPOOL 44d58f24afa121eda7adc90bfc7740efa3492028928fb9d43111d02fedbd0431bcbced9cafc5430c07bdf6707f3f8f5ebc466f8f8d9bdd26e30e88a056ac2cc6
 DIST 20120514-10gen-mms-agent.zip 30130 SHA256 a305434e79ba97f1bac6a8942ee5fccb8fde11dedc9ae4bd8eb5f6ad2beaef88 SHA512 8faab37d31fa681d6abe0f969996426041fe7dfd3a5991f46b3a48fe2b000fe073eec17ea7fdc8aab6d55df9b9f2486c10c80675ec1090a59c1b9c5e94b605e3 WHIRLPOOL 53cb78049aab3f6f1866840aaf2eba84d772d75a13183767db62efefedf86d37b944944fee7a7cc897b753c1211df89c20614b2aba3beb07b4705dedf159628f
 DIST 20120830-10gen-mms-agent.zip 30259 SHA256 9232813052f05376670724ae3da7ccff2a0515e8342d07c520cf6b9ae3e781d6 SHA512 84a7c07ffb18a34c5fc21e73b99f0b42a7b28a8aa33d56156c93a34c5cc9fba545788903117f3bfbe35d7b3a0f50e01c4ff8c9053cbf23317c84d739440878c8 WHIRLPOOL 61e89b7608f90b1994471f856aeae34e8cc1ec6d8168e804f5b3c2207702ac2334dc9ee18cf4e31facb212380a4956b008a3b296424d13e15178c65e868073ce
+DIST 20121128-10gen-mms-agent.zip 31408 SHA256 be5314dcf2dbfe22b6acd6901fa7d436c336884738cf59f8a4aacf2ccf331052 SHA512 7077c8212089b335710319ba83255c676cbafa415b5adbfdd323f46c66129efd8b561fcdc2cbf892a9d43cb22b1ae7685bb2c427b3b0c001ffe910874fa9d817 WHIRLPOOL 90cc005441acff46a83a899c7e33852799b45a31d790c25642636fdd8ddda50e1e8e58835d4cb1eca89244a9f2622cff10a1d0e20d1f4d5c3509b0de6baf276b
 DIST mongodb-src-r1.8.5.tar.gz 1729485 SHA256 3e4ef7a9b326c6516c66e3ad0dc093711a3a8b62019d22131a4786119644cf7a SHA512 503d825625f320686d3428afe9d1f31b458c332d04e0e334c75d460152431aa00f9d199ba76c7766c1f7e8932198a9e6492a5893c49ec428251a22968e598e62 WHIRLPOOL f1fa164c728cafc051ced303e4b5d4fc820a2ca4cc7f075c4260523816aed9ce0c3f57779acc33a5206010549f2de4e149e6d9caa0e3094aca27f983ad4352ec
 DIST mongodb-src-r2.0.7.tar.gz 2982999 SHA256 b204d94bc912692bdc154402fbfc2e5c4bd60b09dcbe244f3b2b7657f0a82736 SHA512 4c92d99433388f6829e990f3a065b7d897c0ef83a8b41e99613b1b7fbccd8d1797a048c4340d6dafed956dcb06785ac9784a4b68990020c5052b11368ec98806 WHIRLPOOL 159952c811eae62cdb6b4ad577351a8f6537b8fae1b2d2ad5e4dbdf07e14944aebff765ee896f48ce53cbd7d53b6bb0fc2da470226488f2957b5c6e6df07f3e4
 DIST mongodb-src-r2.2.0.tar.gz 10150762 SHA256 084626e476ac747dfae143889c24a10f739cd54480af9bf253f50999f065608b SHA512 b040efe01457703d14d63f69b3fff79a09d6068a89b17d52ad7eb430f81d3f60fdba711cee628d55456a772d7e36fde7c683d4d71fa7d95225e436e28ccac163 WHIRLPOOL 43d12039aff75bdb12c41721ccf259b379245a655aba72472f2a973dad921d9a384f79356d6bfa9795b609f2011324b1e7100ff94b8b92f2834c40a3a9bbe653
 DIST mongodb-src-r2.2.1.tar.gz 10163588 SHA256 6ddc92c859c8d018bbdf5191c15e621dfe1505f71ddd039c26b20070f634a567 SHA512 d34182d397a34baeed02e8d50c46866bec7a70b1eedb7027c03eeb56f568dfe7fe0494aa83317acda305e8aed2dc118ff2c36dafcb8814bc4566ecafa83005e2 WHIRLPOOL ca22ad970114dce259ce95bfbb12a44244a1021888a43a142a4c94dd1fd8f2d64963845ff95eb1f45bb41fc3e75d25248133b47bcf1a0c241d2010eded0b6328
+DIST mongodb-src-r2.2.2.tar.gz 10171793 SHA256 e646abd0a9839dec11fa4f35089aad8e9aeef628bce7832ab40a3138c7462127 SHA512 004c321dc046ee59a3bdb2e672d6720d627b6a0d482afacf89b557846bc0600ac06623c94076fd41f62fc6d59660a8a80c5333d128e7482a9835e260f7238142 WHIRLPOOL 52f310acb1cbed1d296fbe3719c71c74cf3bf89ea1ad89bc8dbc6aafeafae3e719fdce479fcf5a9d95b29eaab2e6099111687ed748309a125c18dfb10782f20a
 EBUILD mongodb-1.8.5.ebuild 2533 SHA256 98c542e4b5c4234d23d8419f3baf32b228cd83d58ef924d359a876ea83576770 SHA512 3afceeb057a613cb90c05f10c5639c109698ea45ba81ea16e783eef98654d62818ec34d9ed4e3d94d95e53a460541cf9941bbb0977c512c89c2363fe90635714 WHIRLPOOL aaba10b2c4d96b8e120ae7d895b9dac3eb16ff0d321df38b3c58f0eaa5053dfa0a843c39a93560674996403385251fe4a98dc356fabd468aef419d82cc4b80b9
 EBUILD mongodb-2.0.7-r1.ebuild 2697 SHA256 f0d0a33f8402c1d9590b78619c99cc34ee28f6331cc42be85ed1c35cf2b623a6 SHA512 ce40e655615964bbfc6e09a5d11fe0b125871f1c4c253e7436660c540fdb51ecb946d6771c2c105b1f1732c9a661e85c59dc56a326a9bf05a0233f8196f8cc81 WHIRLPOOL 91e132fd484b1b0190ddf508903c16a1e87d3fb2ed34958beaf8d3115d33e49a0dae351753ed18d7b7282f37bf3b7fa98a0edacd95c727db1abd5e7bd314dc5f
 EBUILD mongodb-2.0.7-r2.ebuild 2750 SHA256 83412b9cd73c04f7bed2d1588e61b6ae21a7624f42254adc2b10358e2130c739 SHA512 69d5e7588fc1d4fde4cd05652c737dcc35e5006f22ffb256c00b3a703a29dab601bb757f20d6a5745ff92dba31581cf8a440ef3650c1a973210234f1cd43827a WHIRLPOOL 3b1ebeb11d222180b5b9663f1af1e32162c6bd5841b5f98f00c6b2a6ce9f9d696cf4abbf8156377c0e59ab2ca20ecb5c89e33a6fda6b64ec6be08bf666f0a6ff
 EBUILD mongodb-2.2.0-r1.ebuild 3088 SHA256 c3c69f2872d3d78468f4460a4a806c23e7bb8ad8d65a29b2271a0900b2f8a64b SHA512 fae6cf094e00ec4f5b7d32c29bd342393799dd4a92befd267e5b8d0d15b31e151aea01e3d0745de7b76604ae183a8fe5026162e3b7ebf8f870914411e021ff8d WHIRLPOOL 198cfb3bf9b46efff5ef4e232efd74acaeaa641b8004a9e15094a330f2f14d5f558c9c3d01371065e2cc723f8a3bd12268de078a19291eba34cbabdddbb9e97b
 EBUILD mongodb-2.2.0-r2.ebuild 3120 SHA256 39bf4f355364b890eb7b81f791b30d46ace933963bf5241ff447d5559b2526b9 SHA512 bd08f9e6777dbfb13678fe2cdc7d652535dfc34bd3d86ce68e2194d6e984745c93e521c01b2ab02df84039bd06374357c86f2b1a3be2e303b05e4663c3297f12 WHIRLPOOL eb863ea79c1f12ad055d5366aabdc92dd52839c05ea85f006c14e78bac33e9f1d9b6f3b27820ecf97d3ae7e2dc8fb721522102bfdb3faada6387500be9a7ae80
 EBUILD mongodb-2.2.1.ebuild 3129 SHA256 ced24f577d2f53bcb517cf660856b375ca984de407f96b09fe70433b2ded5947 SHA512 4908377b86c66c7660ba4d8607206911443744a8f3da727f36e6c69c599d99371defc1ceeedf8be7377b993ac7cd781dd55bd9e5b1963a709a0b3922a45bcf9c WHIRLPOOL e1cc648878293256202bbab2c003612a01ef634aacc47a01b590c3b82ba973821ed1b5778f91123df865f2329c8393d03a2ccbe4df450327f82d8a379c522507
-MISC ChangeLog 11872 SHA256 12406bc06375846c7f689ab373b5807c066ed181413c3836c2b0dc99f0b1292f SHA512 ca63de30e708773941c0353dacf4bfb95cf8ca401f9fcfa629a74acb4f646fe19c6ec07c5e6170f5f832e1f0eeb42854880694334b936fe84258d067cfe885cd WHIRLPOOL 213193ccc38511a65cd464ffc2f4406de9c89d740926393f02d4aa037ea01aabb2eea928cf790e0cd9d04488549345b60152e2f4681f00d6fa74da4a3c7f3952
+EBUILD mongodb-2.2.2.ebuild 3128 SHA256 4c30594e49d63e1378f791e335f47b2aa98e8ab26acd666bcfd663606248cf7b SHA512 9299f6a89147a44ad036680b50a55bd645eda5b099c669a71386e2d7d59293e6bf537727b4ec07b998d0ab15f7b3d03f808091bcec55b74419975d613c5a543b WHIRLPOOL 3cb9e202bdb97f12805396154650e150abaadb7f8da1e3466c0a3cbd311023bdd446f7817e4cf18e4c50c602e8479b95da83a591113b16e15426662ece0627b1
+MISC ChangeLog 11986 SHA256 ff6c26f0605666c0f9558d6aefb5cff89ce9dfe5fba5b7c890a21fec042471e0 SHA512 8d95669d13e544a2c673b9fd207ac06dfbe0433f64e406e80c19a9f7f2364c5a4fbc172b1c9e52fa4a4e4897f8857e623efc28d340aa87dbe6128ebd2fec073c WHIRLPOOL d62583edf63675cd7215cbc4f4ba6264d5293a8fbd2f106408ebc4e0c12419fb816cacbccb499442f25a283d9ddeed04b041f94f4608f44c4a0af3e4e0566a17
 MISC metadata.xml 997 SHA256 5393635a3190ef1304fc71686a7ee121d5175c5cf2e484b6be61a799a167e7d7 SHA512 b595fc3acff1f39a346a12cbe4ece1cb63b2e2e4b8dde93821d58ff01baa192ad115dff3edc2d34d15636fbcde3f5af29c57cd61d6338e8f7e60dcc70b2511da WHIRLPOOL 2fb6476062286ecaea8482593cee51491eb1ea5acf1f0527012bcfb296ff05d2d5cc42a5bfcdb0b31bfea2382f6e096dfa08ae03b834eb00b59eb8fcad02af29
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQrZ/QAAoJEBzRPIrUMBNCQ9oH/RAx/hwRqCogg0kryeHYJQH2
-Y5REPD5GzQw7PeljvvxLRmdZHiciSLCASALju/P3NvirwWLhMH2LXhwkhYEVHbZ0
-p4OG5BdH0EEm2uIPdsNwJGvNw/d9OnA8SpDWGB430fwA0ZK9IgzXwk72VXhU1mkp
-o7Oe5hNuHWSYiVnMPHQ/LwTqgTqunSmYRmRtNDTVX9v9t073kgtgewqL7ce/sUuI
-2Gezf4YBTkdrElipvvlDTWrKNOoMuzZsJIW5RrnujFCic5F1b/gEgEIa/gAX8lAs
-j7zq7uXJkwXreI7wBoLtKyprl3tWcovkQSTUKcVYcxhrhKjKHNr94WfezUB2W0g=
-=UMGc
+iF4EAREIAAYFAlC14L0ACgkQKiQSS7ZY+hPj/gD9HneeA5LXnJM50wfrNpBEKwxB
+4qbRH/iVpo7Rh29mL34BAKL+dAwjcda4Egk7aaViW2XuxbItNqM8hHm8aHa077D3
+=21lA
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mongodb/mongodb-2.2.2.ebuild b/dev-db/mongodb/mongodb-2.2.2.ebuild
new file mode 100644
index 000000000000..86bacb9ca8ef
--- /dev/null
+++ b/dev-db/mongodb/mongodb-2.2.2.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.2.2.ebuild,v 1.1 2012/11/28 10:00:23 ultrabug Exp $
+
+EAPI=4
+SCONS_MIN_VERSION="1.2.0"
+
+inherit eutils flag-o-matic multilib pax-utils scons-utils user 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? ( http://dev.gentoo.org/~ultrabug/20121128-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/v8 )
+	>=dev-libs/boost-1.50[threads(+)]
+	dev-libs/libpcre[cxx]
+	dev-util/google-perftools
+	net-libs/libpcap
+	app-arch/snappy"
+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="  --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+	scons_opts+=" --use-system-tcmalloc"
+	scons_opts+=" --use-system-pcre"
+	scons_opts+=" --use-system-snappy"
+	scons_opts+=" --use-system-boost"
+
+	if use v8; then
+		scons_opts+=" --usev8"
+	else
+		scons_opts+=" --usesm"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.2-r1-fix-scons.patch"
+	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
+	epatch "${FILESDIR}/${PN}-2.2-r2-boost-1.50.patch"
+
+	# FIXME: apply only this fix [1] on x86 boxes as it breaks /usr/lib symlink
+	# on amd64 machines [2].
+	# [1] https://jira.mongodb.org/browse/SERVER-5575
+	# [2] https://bugs.gentoo.org/show_bug.cgi?id=434664
+	if use !prefix && [[ "$(get_libdir)" == "lib" ]]; then
+		epatch "${FILESDIR}/${PN}-2.2-fix-x86client.patch"
+	fi
+}
+
+src_compile() {
+	escons ${scons_opts} all
+}
+
+src_install() {
+	escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
+
+	use static-libs || rm "${ED}/usr/$(get_libdir)/libmongoclient.a"
+
+	use v8 && pax-mark m "${ED}"/usr/bin/{mongo,mongod}
+
+	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}
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	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}
+		newconfd "${FILESDIR}/${MY_PN}.confd" ${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}"
+}