version bump, fix #490054

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

4 files changed, 159 insertions, 8 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 49b088c6d0e4..a4f00b5048ea 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.80 2013/10/28 14:30:33 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.81 2013/11/06 14:25:37 ultrabug Exp $
+
+*mongodb-2.4.8 (06 Nov 2013)
+
+  06 Nov 2013; Ultrabug <ultrabug@gentoo.org> mongodb-2.4.7.ebuild,
+  +mongodb-2.4.8.ebuild:
+  Version bump, fix #490054 thx to jonathon eastman and Rafał Mużyło
 
   28 Oct 2013; Ultrabug <ultrabug@gentoo.org> -mongodb-2.2.6.ebuild,
   -mongodb-2.4.6.ebuild, -mongodb-2.4.6-r1.ebuild, mongodb-2.4.6-r2.ebuild,
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index b0e3b8c1f854..020f20cfa493 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -22,15 +22,17 @@ DIST 20130821-10gen-mms-agent.zip 31918 SHA256 b48f35fe2ad058dc4ebcab01dad1229c0
 DIST mongodb-src-r2.2.6.tar.gz 10190712 SHA256 e6864ac5fe7dabee055abc5c5d1074fa826f53715211227aaac64abaf55bf6ee SHA512 5d2be83dedfac4ce3c01c048480fcd4b67848b7e12b1f7854cf54477319ecbee0636e2a969e4dea33aea90514dba89ab9dda356a77426143ac9b60d1c07fb4da WHIRLPOOL a11fe32101717c6e287848c34c05a91e50d92d3e99bf9bb8f52957b3b145931fc51de34a8858b647e48841ef3b1111d3511dbf14033ae78d6a27af7f267a8ebd
 DIST mongodb-src-r2.4.6.tar.gz 14141660 SHA256 b5f397abc92d36d84a85753d15fb5d7dab6545ce9dfd9fb7685c630e6b050acb SHA512 73921d439f1bc2b6c1f358ab96f05f5f082db7b2c09f8964f2e3cc2d3cfd059e0c923d228a77fbfb8c8613eee1fbf16a35d5347b6316219aed3b0357dec97eae WHIRLPOOL 4c5c9b8b7530a58f5fab62c414054939014a38cb49429ff619059b7305b29eb41c8ec3977a3b4490391afe963384d4560097a7ef536679c42c9d0ecc1677c958
 DIST mongodb-src-r2.4.7.tar.gz 14157198 SHA256 69e3cf697225efa2e6e65f5cfdc31742f3e4b2e069c27d84fc713abe0bf67ca7 SHA512 bd682944f5388cef9115ccdf0d8488d2a7a699974f395dd9eea62562528a7a6205fceb92c148187f003362f1ef983ead672cacacc678b2f2b77cdd827812b6c9 WHIRLPOOL 6fd7e7c5170b9ecdafb03e2d14d533f245ee1afc59c99713f5bb8c443b17c52b024c7a564146e443e748193570a49728b128f0dafcb3da0bb6d8dedfe963a179
+DIST mongodb-src-r2.4.8.tar.gz 14157223 SHA256 fd703ce5e53ddfa0cca9c7fba9a0c4cea4179d38972a98c675f45d9f15b4cfdc SHA512 33202f101d00c796253c5fd333242ce2c5399352bf325e0af1df92d9c291d7a768bbed56f7b7fccfaa3cea2385cec941bd05cb27a635ca034485bd39ef4129a1 WHIRLPOOL f4c2f9ea7b313abeb8480a4d6d6d79b094c1e287228c2252717ed415ef543720fcf32314b58c72ec6efee7d1cdfdfa6a7c35c46d430f188a1253f2364fd9e315
 EBUILD mongodb-2.2.6-r1.ebuild 3070 SHA256 6500ccb07dfcc7599c9aab63abea0781fab479e2da9f12a7ac476cd10d176365 SHA512 34568abb2a4d0062b9b286ef272391aa23e4818a49fb6363c2ff7c52933cbffbe470381732921bb4686d07605e3d5cf94dbabd8006f13c4bc56cc67b328d407a WHIRLPOOL 2928b242750c2677f3d1a03dd625ede614c2b5202cddfca29be531c6a646774f8d93a6f16189798d9697973898c9b20fbb6fae776560e1dcbddcbb5da8088309
 EBUILD mongodb-2.4.6-r2.ebuild 3613 SHA256 753d2813096018ff8d52199caf81c63e78e4a4d6f66ffca597b10e0ef9c71354 SHA512 96f263309bf8005a8429f8301d75018cbda2b444cdd7fa649adb907b92852a93f5bc6c8e2881151b5549294f7cfdf61cf29eba4cba3e902f0a5392ae57f648bb WHIRLPOOL 32f9e81f8582140bfdcf615180690e647ecd53f4db6a8373afd1255fb55fa0c2cc6ff97b4efe400f33100b0b6a1c1601274c8b17af2eee6bf416848fc4f86f8d
-EBUILD mongodb-2.4.7.ebuild 3610 SHA256 88ccb5ca8d95871d6ddacdc2d256f3e2957b7fa241af88cd24993ae927c96186 SHA512 e02b0f75bb2c28fe2a167da4579b1d6299ca7775ea7520383f8ab1e14a4721f7e2ef9388da38a97352ddc331b276fe858a62ad171ecc386a44d07041c0735386 WHIRLPOOL a16e298de6293cbe8b227804a11af5765b2551bc7c4e168c2d0f0d471e1de3492a4383c9649c038038db0791b187fb040461e21188b268302f521bdf2e20a76f
-MISC ChangeLog 17763 SHA256 ed0919f797886c5637001c2f89451d098823a3ac3d129fe2307fd236ab77cc4e SHA512 16790051183cd4d70eae2234a0b14b95107b9c67c7511a5eea2584cdea484e03794c911bb2e1e327c40ea44b33bb6bb6bb3e01d0a6e2316b84f85eddbf934182 WHIRLPOOL 915a85b972d20287a170e310b14dd7f4a50ce78f2f0fc9946ff1983de0f20fbfe1e23d3d2cc271d07537058ad89c4bd53cdbb39af87535b74bbc1aa931dd6783
+EBUILD mongodb-2.4.7.ebuild 3620 SHA256 6269527d948c426bded213a1487ef3ef2af37fda68874dec89c1ea01da3b532e SHA512 de01eb511bf34dc6c831329c946eb6af946f6e7433606db47908a0a3a17c350ab47b4b61608da952c150ad4ff940371443f7a655877da64f1332198c4423747e WHIRLPOOL 449695b4dadf6eb64e0f080744cb84eb4adb87ecbb38c5d81cdb06c29e8e11ffd86e877fcb0ab9bf0f0f2cf80b155d65d03f53566fe0dff30c97bffabec65680
+EBUILD mongodb-2.4.8.ebuild 3620 SHA256 6ad33d2822731c5a6380db2aa8d8c0828185d047aa8028b4a97e3de6cb46e1c0 SHA512 1536ee9e684955ad080f32bc64ce9945e77c002f692bbe49311f6207580e6c284acf21c1b12c748e081536ac6064091eb9640c01406cb4e4c1cfa71db4c358ea WHIRLPOOL c01b1ae9eca538b71576b4c6d0f3650496b52e94fe2ddad534e4c4bd79afeb63113be585097df5c48c5b8a3a6209348089c1a0d99e846a6228799930279789e6
+MISC ChangeLog 17959 SHA256 b17a9e4dbb7e343d35d350c1ae9744109f143c40e9e5049c00d2bfca91011cf0 SHA512 8e5b43d24e09c5ddda1e74fd9f5ba5aedb2db9276f80b31a2ccd8b453d578c411085bc97f304e8a4975dbfd3d26516ea0284e10fc437faaf5f9d3d3ba98a244a WHIRLPOOL 2028bdfd09fbe420c52ef1f5e5b9f550c90c569c1dd83f0d587046f2e0377dfc6d5c8e934d7db9ab20ab4ab51179575d12dec280d629c5f36ba9ad23fd879416
 MISC metadata.xml 1090 SHA256 bb0066679f4a7ee9f21238becfdf1cb6e38489c1a9d46e0671d4098455f886ea SHA512 b4e4fec0815ac98c85b437f2155f4620b91fe24e81f559b92901038f68534e07dc91ae77ac609311e9febbe64b8ef0ad5ad164346cdb466e28bf1732ed18048a WHIRLPOOL b5305d0cbc7398d66d9e26b14adeaccfeeee8d0d24fad8bb957517273b97f94b0feb1afc1bdefaa01ea06502c570376e8e7a0ce68dca76c8ae5dbbf686d6458a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlJudQ4ACgkQKiQSS7ZY+hPbZwD/bzDy8ak58p7Q2lfUJp9wlgBp
-lcQfZeX7dW4npdz4+qkA/jld6PAsPWUV3s/WN90J0OjD62fi99KvlV+KURo8lOYf
-=1VW1
+iF4EAREIAAYFAlJ6UWcACgkQKiQSS7ZY+hMXggD/WYIOh/sPaXvXmq+I1D7iWspm
+u8QmJ9V3dbxT4/fCW8MA/1+K7cyQKWGx1uXi+Amj9mlGMuXtJCkuyZJphSj4Tbjo
+=gww/
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mongodb/mongodb-2.4.7.ebuild b/dev-db/mongodb/mongodb-2.4.7.ebuild
index fe51c0b59edf..5e5945f55f25 100644
--- a/dev-db/mongodb/mongodb-2.4.7.ebuild
+++ b/dev-db/mongodb/mongodb-2.4.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.7.ebuild,v 1.2 2013/10/28 14:30:33 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.7.ebuild,v 1.3 2013/11/06 14:25:37 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -23,7 +23,7 @@ PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
 RDEPEND="
 	>=dev-libs/boost-1.50[threads(+)]
 	dev-libs/libpcre[cxx]
-	dev-util/google-perftools
+	dev-util/google-perftools[-minimal]
 	net-libs/libpcap
 	app-arch/snappy
 	ssl? ( >=dev-libs/openssl-1.0.1c )"
diff --git a/dev-db/mongodb/mongodb-2.4.8.ebuild b/dev-db/mongodb/mongodb-2.4.8.ebuild
new file mode 100644
index 000000000000..34eb929cba70
--- /dev/null
+++ b/dev-db/mongodb/mongodb-2.4.8.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.8.ebuild,v 1.1 2013/11/06 14:25:37 ultrabug Exp $
+
+EAPI=4
+SCONS_MIN_VERSION="1.2.0"
+
+inherit eutils flag-o-matic multilib pax-utils scons-utils systemd 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/20130821-10gen-mms-agent.zip )"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kerberos mms-agent sharedclient spidermonkey ssl static-libs"
+
+PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
+RDEPEND="
+	>=dev-libs/boost-1.50[threads(+)]
+	dev-libs/libpcre[cxx]
+	dev-util/google-perftools[-minimal]
+	net-libs/libpcap
+	app-arch/snappy
+	ssl? ( >=dev-libs/openssl-1.0.1c )"
+DEPEND="${RDEPEND}
+	sys-libs/readline
+	sys-libs/ncurses
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
+
+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 prefix; then
+		scons_opts+=" --cpppath=${EPREFIX}/usr/include"
+		scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
+	fi
+
+	if use kerberos; then
+		scons_opts+=" --use-sasl-client"
+	fi
+
+	if use sharedclient; then
+		scons_opts+=" --sharedclient"
+	fi
+
+	if use spidermonkey; then
+		scons_opts+=" --usesm"
+	else
+		scons_opts+=" --usev8"
+	fi
+
+	if use ssl; then
+		scons_opts+=" --ssl"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.4.5-fix-scons.patch"
+	epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
+
+	# bug #462606
+	sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
+
+	# bug #482576
+	sed -i -e "/-Werror/d" src/third_party/v8/SConscript || die
+}
+
+src_compile() {
+	escons ${scons_opts} all
+}
+
+src_install() {
+	escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
+
+	use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
+
+	if ! use spidermonkey; then
+		pax-mark m "${ED}"/usr/bin/{mongo,mongod}
+	fi
+
+	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-r1" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+	newinitd "${FILESDIR}/${PN/db/s}.initd-r1" ${PN/db/s}
+	newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	insinto /etc
+	doins "${FILESDIR}"/${PN}.conf
+
+	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
+}
+
+pkg_preinst() {
+	# wrt bug #461466
+	if [[ "$(get_libdir)" == "lib64" ]]; then
+		rmdir "${ED}"/usr/lib/ &>/dev/null
+	fi
+}
+
+src_test() {
+	escons ${scons_opts} test
+	"${S}"/test --dbpath=unittest || die
+}
+
+pkg_postinst() {
+	if [[ ${REPLACING_VERSIONS} < 2.4 ]]; 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}"
+}