RC version bump

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

4 files changed, 175 insertions, 5 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 5c0f539ea741..cf77b178df99 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.68 2013/06/05 09:59:46 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.69 2013/06/26 09:21:19 ultrabug Exp $
+
+*mongodb-2.4.5_rc0 (26 Jun 2013)
+
+  26 Jun 2013; Ultrabug <ultrabug@gentoo.org> +mongodb-2.4.5_rc0.ebuild,
+  +files/mongodb-2.4.5-fix-scons.patch:
+  RC version bump
 
 *mongodb-2.4.4 (05 Jun 2013)
 
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 42175febb874..ae80b9e5f81c 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -15,6 +15,7 @@ AUX mongodb-2.2-r1-fix-boost.patch 870 SHA256 885991e16aecc66d88b40418531a66449a
 AUX mongodb-2.2-r1-fix-scons.patch 1950 SHA256 cd136dea1ee03cfe8009cfe1e787478115f1f73209f3a770794c36813d1374df SHA512 741c4438b1f2060023ddb053317021f680a33d535299350f8775f602fd0221e7f96be0ca2694861611dfe449cb09fea4f3075018a6fc9f3c32ee978c075f3e97 WHIRLPOOL a8d592c4a6483445cb95ae7045b3b7025379b83446673af3d23f68c135ffe9fe5060d4d7a508a9ae7a5774191aa9a2df383fb77b0dbdd02b31b1cb089000395b
 AUX mongodb-2.2-r2-boost-1.50.patch 9980 SHA256 e289811f7abb9525e7ba1c2904ab8c26b687c7c45601e8b7b7f83a8a2523526b SHA512 83b181301037c35810970e1163b4d01593bc60edce77514d99f74552ea981f0455552306a1f843cb4fae72489abd2ce8a91705a878ef540811f28c53dda2a5c0 WHIRLPOOL 03e4c56f1b364fb6917be67cff641799e85790714b240030c1fdbcc066d7b127db6533e53165bd8eaf2bca6e284f3be3899fafa1f78ce0734d9da4e14f18e8e8
 AUX mongodb-2.4.4-fix-sharedclient.patch 4093 SHA256 8dbebd5cd4e9879239c3e4818002d8a3862ee99830661bdaaaac412583e67e0a SHA512 4492dc180679e287dc8b49ad42c91dba1a222fdb76e87a62308df0352daaa163aeddea126fae858135a0caedee053c7f27c4e6d7686aeec1dca92a3234d00228 WHIRLPOOL b2f40c8bd100ea48135365abf20abdf8bfaef44c9627386ee01cfb36bafb33f49a0f9ed00b6863ea773d168035ea7104acdea2ed212608bcb1cd502006786be2
+AUX mongodb-2.4.5-fix-scons.patch 1276 SHA256 b55cddc0590065f4888645c8f5738bafc8de21834dcb3b174616b58c93e9ec06 SHA512 b38f2815ca3d3b82357782044e9358f1f1b6c237ea80abdcc516135dbe84e34c89f54ad54b60cc612f229fb76919dbb8acf3249589ddd6322ec62ea373417f99 WHIRLPOOL 155e88498b34fd0f4cfe7b1eaf710cbb10f3987da985c1ebaaad754b57a5799bfb00a8654135abb0bc3507584e6b46ca76dff3abdb86f3a1d8cbde0e2a39abe5
 AUX mongodb-linux3.patch 1588 SHA256 bc96fad782e5396cc4464e7d7bff6abb1f054c4ff034fbeebea44a1e7a41945b SHA512 de37834e2b71b392eac70b7152e6b0676c5527e70ee28afa7b8e918d45b4d5fb8482c68925d778ee1b6a3eef5272bfa8babe1a7a2bc810d1b6dc075d370a681a WHIRLPOOL a98c65827098c729b86782db9ec92a8a006d79487b4ab202b4bdb370403c7f867ec011f281e2a3ed27b013aa0584a219877ebc022836700aecde424f956c7a06
 AUX mongodb.confd 361 SHA256 a4ca29c577428c02cd0b0a8b46756df5f53a05519c9d13c270533cf99b9b819d SHA512 9bcd870742c31bf25f34188ddc3c414de1103e9860dea9f54eee276b89bc2cf1226abab1749c5cda6a6fb0880e541373754e5e83d63cc7189d4b9c274fd555c3 WHIRLPOOL 35d785763d0cb1e21516a3fa15332d6c93d35e6faea02b60f81c389878dd89fe026504c6cfce5e9abfc8353f74b0e959a7501373d2a389f269c6952d33e8d2e8
 AUX mongodb.initd 1213 SHA256 ee590071ade60cffdd28ce5bd1e685bcfb49878fb88a21adea0cf30867587ade SHA512 c0634af4653a3b3ca1a72671460e8ea11cce99b84a48782c5cdcc27453d7ead1e89a61d0ce225febda68913dd04e972b4d6a911060b1e5c4ecfbfc1e991e7b12 WHIRLPOOL 033940ab5396f02663ca7eabc99f0fe64268e190e0fc63ef0acaac541bfc67c38c20ddfe8bb1f89398220326875d1986db8112127a42e441ac8448d303c8535f
@@ -30,6 +31,7 @@ DIST mongodb-src-r2.0.8.tar.gz 2983263 SHA256 882f0880609c9658793702af4da5183f49
 DIST mongodb-src-r2.2.0.tar.gz 10150762 SHA256 084626e476ac747dfae143889c24a10f739cd54480af9bf253f50999f065608b SHA512 b040efe01457703d14d63f69b3fff79a09d6068a89b17d52ad7eb430f81d3f60fdba711cee628d55456a772d7e36fde7c683d4d71fa7d95225e436e28ccac163 WHIRLPOOL 43d12039aff75bdb12c41721ccf259b379245a655aba72472f2a973dad921d9a384f79356d6bfa9795b609f2011324b1e7100ff94b8b92f2834c40a3a9bbe653
 DIST mongodb-src-r2.2.4.tar.gz 10190863 SHA256 d2bdeb5e9b93681b5a55e6b947777debd7473a80ecc230682e4b25b6e59ccb60 SHA512 93f81d6edc9900c24ef2780df2199e4445e9f23aff4c7970e05320641c9b00473a73d1b7c7424e5744c501e4b1c9e9858efe1d03caf875f2f04e5222f8ae0e2e WHIRLPOOL 1b1013b4dc1e3c219fa1e5db8cfc0e477a321988fe19a5938709e2ee4554c2e3f7e7ddf04bdea37ac72a28954773d31f5dd13ee7aa45986f06bce6c6b6b9223b
 DIST mongodb-src-r2.4.4.tar.gz 14119330 SHA256 ea3db3e730290d030853f7a22cbbc5edfbe33dd538ec67d551a7e88f6d4db240 SHA512 f72aee0a9c979756741902eb87775d154de45660596ec4507274a7719d376869510f192cf7777840821cb491cfe009beced8891e3f243c761ee758ab023a457d WHIRLPOOL 4af22d2435bddf5985f55c97cf4b17ca7056539abc51df9959a09526f8f9a37e676e108e1388e841fde8f5f6ceeb2b1a81a4ad0f2f4bb9bac57dc3d297e5d8a3
+DIST mongodb-src-r2.4.5-rc0.tar.gz 14130388 SHA256 01aa8cb0f1ae59d80b81b78d638af4d25d709548f6210ff71cf1f267de28396a SHA512 6d2f22055cfea9a9df27aade6eb51379c2a153c32ea0e5195b1d3c19023a98bc06a82a9cdfec7fae9716b269e82d0b510d38b4d69f4b1880c9b3b21fda129313 WHIRLPOOL 0b7c61c3baeaa8e749e10ff987c693e7892264aacafefb1847ca6bc10b6282a6c0fc3ddc12c0f1ebe52cd36881da7fc6d9696af190c3ba754df7548a29853c19
 EBUILD mongodb-2.0.7-r1.ebuild 2711 SHA256 5d1984f33f2b65ae656187e72e6ff1ba8efb01ff3c955d68aa415f90e7d743c0 SHA512 9da44d3e5c561bc6d1047acc27ee69aa994aeb3fdefd8950b2c7116f24aca19c9022fd2e8e20d19ae18c7315d0f54eea2dc6933f230ba7bd9acc63967d054a4e WHIRLPOOL e39cd55f6f2a207c0c4e2784e272a6b6c508931e1ec1b08893a02ef28f45a9574b12f36e3ab2c9b4ef5321397f40ee73acf884bb4b23897603d378590ce55947
 EBUILD mongodb-2.0.7-r2.ebuild 2764 SHA256 49ad98f7fe32140c1ce20efbd37cced09851c28c21f100bb744d0f160284a1d8 SHA512 07184bf67d1f6e6b6ca93e0fb9c5c93e64c08d6294e635622f0dc477fe3b93e6af7f3f8f7e9b1afe9c4c8a065d12d242e68f8d458e031bb2af0a678fa8c11771 WHIRLPOOL 92f1c2c0937277d0aab56981a1c8eefe97ba1c4f485cae47164a6dee21e9677ffdf744e2d057b15053ee895d38da2f8a5d8acd63801511c0e6e31b807721ffbb
 EBUILD mongodb-2.0.8-r1.ebuild 2711 SHA256 20c1e34c9aa9ed6f68e3254f0f3c994983c96353dd6d4a8d3c5d9f6bec43bf4e SHA512 11a6dfe0d6e79eda33c9e543c4272c24fd17459e70b4b95f123af6f6f2acffef4391d8140fca8eb4693761f68c6436dec093833f8fd4715dff7c02712d0b9707 WHIRLPOOL c030e509643fd1a4e58814b42f3439d7dbe42f91e0db1d8e67ed62be8479b36730a79835ef1709a9c0c0b5869f37f816c3239709a745db64464512e84e273336
@@ -38,12 +40,13 @@ EBUILD mongodb-2.2.0-r1.ebuild 3157 SHA256 c85f2348548fa1ebe69e9109737ac7e90ddc1
 EBUILD mongodb-2.2.0-r2.ebuild 3189 SHA256 59f1b99644fac57c495dc31dfa62d4ee6b95a1518f9498e4fec22120e3e77fe5 SHA512 0d6ce4381382aee7d0d3222076b86d8db78f3c51ac14bd9e8c90bdaba0dbca40af0e80b7b3a6c97dcf8304a718047c8f014276926c46303c96efa7e9c84e550e WHIRLPOOL 27bec29ed64b346c97846c9af2335336bedac138fc9d1a2b0ae68de05124104f271b1534f4610fd21a92f56452da83489844b5597f57ad01acededd5f2dcf761
 EBUILD mongodb-2.2.4.ebuild 3194 SHA256 8e27d23e22c0d60631bec64c368ac51dd69c4f34d7a4d388f7b7951ab2fc773c SHA512 136a9bb6064acd5d023c511c840ad413a9f1be71a0d6989fac08bcf2818594f3fca87f337c67222070b7c867d348a338c61532db39166eb4f959aca4d8f21ecb WHIRLPOOL 1454237b6963ae88f0223a7495f5a66ad170db9c670b9dbee3134afc28b3df7796c6ea40893d6a1acb0d6b97b4d66705897d26103e91b470e8465004224f7e7e
 EBUILD mongodb-2.4.4.ebuild 3352 SHA256 5682be986b379189e6c96902f5e9773d14080feff7454a386fa790d12c4e781b SHA512 e9472186d53b842ab8312c740f3ee1c4da7bfb53ad2a0ac8d520f6972f6f76e710d61cb517b0698ed42a071e86415637660ac4727effc534047613370127ba1e WHIRLPOOL 131e3d18a76449504ab7d7b9f487d9e262d6d705d4134df0fc398cba6614d741fd8f2ba32a42d56bf4c6a04ff516e368f937bb5ca529ce9e93792fd30cbfeb8c
-MISC ChangeLog 15003 SHA256 d0272f238ae0c779fbb8b1d9bce156e58b6e2235250466240a77d5d8420b4b16 SHA512 58a37a88a9b7c2cfd16b66465b464927808b7c7e3169092941806f1c7757cb30055a22ace77816caa21068c825d490f127a30810d7cf18791e84f0b4722997dc WHIRLPOOL 690367ab9aac007ecb717ac41835cc324b6fc87d0c3cc6706e210b5840161d9f127f1ceaacc2c7bf598312e2d2ea45213b8435b7adc13726501016fa7317f2f4
+EBUILD mongodb-2.4.5_rc0.ebuild 3307 SHA256 c89e415161c93ffa5ff7b4e444f1a70418e7135a85b66b7944693301a69f15af SHA512 be378756d8c9d433314558fd702f661ba0f0fe9918a386e5896ccdc899974f45742a2e93f0d7e8c3f172c9f55947accebfd3b10434c85d642c6c9b9025b6a556 WHIRLPOOL 1866a9b6d38694ab9e2971fc669bdc00be4d107c40a3706cb030fd405343a081a8fb56a850a9f92a23430225301f43759ebc4cee8d03802083ac434f4364bd24
+MISC ChangeLog 15169 SHA256 e2dd183c60abb1bbb4b5b0031da55c918ac4cb13308fcdfd60d126647d0f7dde SHA512 e40c9970ce04481f85c62454353964769cd9fb17ef317bd8bcd0f8d61062bde528a681ec4e511b3d247c951acfdbff66b8a2568b029d492c02fcac40b225fc17 WHIRLPOOL d6302530556a7e60d56a2739a856cca81b3e897e8130f977f514d5a107454d5e6add60c2f7ff3d335b231c4fb1c16e28f37669dbd53cd26c890b8388ee0dc33d
 MISC metadata.xml 1258 SHA256 ada6650297403651d7ff41f5f3aeaac01bb2fc96643e859d1c188a940486f5d7 SHA512 b732ad8d58f2cae1acecc6311cb4dbf903d2eb47416469b0fb1e1f06894e6f7f3f3b39075d3866df3311df8c012847b0e359d48113111df3ffb12edf3e9e98e6 WHIRLPOOL e5cc7638bc72864c0eda750d2ab081a3eab74ad70f1f7241e7fbf90dad51b128f94513da97fa66fbb4ee5406dfd46d5e7525960f24fab860d5cc637e87b1b464
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlGvDBcACgkQKiQSS7ZY+hNCMwD/V9Q0b5/Tjwqua9e5cX42eFB1
-JTFb6XNANcyKycPWRbkA/2LFN8rsyMbtEdN+bnW2E4FZN4r9EjJ8eKLiVk5j8Ejx
-=aA1P
+iF4EAREIAAYFAlHKspUACgkQKiQSS7ZY+hNfoAEAr7pnWWbt25HUOOtcGWpTlsX+
+nH4QYcIDXtbr+LhbLXsA/1s7mMqdTOgioy3exZeU6QX/XwHz1kOBZvfbFgoTtCpU
+=Ts4w
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mongodb/files/mongodb-2.4.5-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.4.5-fix-scons.patch
new file mode 100644
index 000000000000..4f4c13455430
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-2.4.5-fix-scons.patch
@@ -0,0 +1,28 @@
+--- a/SConstruct	2013-06-26 10:31:56.209089504 +0200
++++ b/SConstruct	2013-06-26 10:33:59.177045991 +0200
+@@ -702,7 +702,6 @@
+     # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
+     env.Append( CCFLAGS=["-fPIC",
+                          "-fno-strict-aliasing",
+-                         "-ggdb",
+                          "-pthread",
+                          "-Wall",
+                          "-Wsign-compare",
+@@ -710,14 +709,14 @@
+                          "-Winvalid-pch"] )
+     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
+     if linux:
+-        env.Append( CCFLAGS=["-Werror", "-pipe"] )
+         if not has_option('clang'):
+             env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's
+ 
+     env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
+-    env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
++    env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
++    env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
+     env.Append( LINKFLAGS=["-fPIC", "-pthread",  "-rdynamic"] )
+-    env.Append( LIBS=[] )
++    env.Append( LIBS=['pcre', 'pcrecpp', 'snappy'] )
+ 
+     #make scons colorgcc friendly
+     for key in ('HOME', 'TERM'):
diff --git a/dev-db/mongodb/mongodb-2.4.5_rc0.ebuild b/dev-db/mongodb/mongodb-2.4.5_rc0.ebuild
new file mode 100644
index 000000000000..dc53c66b2f4a
--- /dev/null
+++ b/dev-db/mongodb/mongodb-2.4.5_rc0.ebuild
@@ -0,0 +1,133 @@
+# 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.5_rc0.ebuild,v 1.1 2013/06/26 09:21:19 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/20130605-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 )"
+RDEPEND="
+	dev-lang/v8
+	>=dev-libs/boost-1.50[threads(+)]
+	dev-libs/libpcre[cxx]
+	dev-util/google-perftools
+	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 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+=" --use-system-v8"
+	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
+}
+
+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" ${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
+}
+
+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}"
+}