version bump

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

3 files changed, 178 insertions, 5 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 7314aceedd9f..d4aac1e0a86d 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.96 2014/07/23 15:42:49 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.97 2014/08/12 05:54:08 ultrabug Exp $
+
+*mongodb-2.6.4 (12 Aug 2014)
+
+  12 Aug 2014; Ultrabug <ultrabug@gentoo.org> +mongodb-2.6.4.ebuild:
+  version bump
 
   23 Jul 2014; Ultrabug <ultrabug@gentoo.org> -mongodb-2.2.7.ebuild,
   -files/mongodb-2.2-fix-sharedclient.patch,
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index da11eae81c43..ff9a9d0aa110 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -30,15 +30,17 @@ DIST 20140409-mms-monitoring-agent.zip 40122 SHA256 9c4f89cfba10b4604512ab21eb08
 DIST mongodb-src-r2.4.10.tar.gz 14166404 SHA256 8ac8d0537e5316e842e3713870b76ea3cc18ec1234307e850046449f48a87402 SHA512 970364dda2dba18bf979a0fc8291d9656b3cc3ba0aec1ca26d81f14f833e355c023d19b3cfaa81704013bf2c0e732d72de08b0f8236dafe85a3ac4d51b87edc6 WHIRLPOOL d2503300499c213c76ad1185fceec5a495c79ec6774af11ebfc372f1c56515b5727a0538c7d26f310b100582c675ff3b70334030d784a87af3ff372bff16507c
 DIST mongodb-src-r2.4.6.tar.gz 14141660 SHA256 b5f397abc92d36d84a85753d15fb5d7dab6545ce9dfd9fb7685c630e6b050acb SHA512 73921d439f1bc2b6c1f358ab96f05f5f082db7b2c09f8964f2e3cc2d3cfd059e0c923d228a77fbfb8c8613eee1fbf16a35d5347b6316219aed3b0357dec97eae WHIRLPOOL 4c5c9b8b7530a58f5fab62c414054939014a38cb49429ff619059b7305b29eb41c8ec3977a3b4490391afe963384d4560097a7ef536679c42c9d0ecc1677c958
 DIST mongodb-src-r2.6.3.tar.gz 14472012 SHA256 77bd9ec1b3aba25494633b40c21e9e8623d7b7d2b3be5ab0b2315b627a238301 SHA512 c73ff95c949380c9b8a8e2c851d53731b08dcd6b93088c0d67fce1580a898d6742bebab3a142d5316353f00fbe12ea32c4651f04b66b85b205589414b7f6811a WHIRLPOOL f96fa94069fcde8bb2f1c4eb70397330f75ab78cf7b7e4f8e5238ea25cb6634a1ec0d7a0283df034f12f3e9ae69edb78ee24922223a9bd22c3cf9435391e4c5a
+DIST mongodb-src-r2.6.4.tar.gz 14491215 SHA256 075411a560f5db7407032b962ebb5da16a0cca936ea82a7d264394b4d8cb99c0 SHA512 1f2be43380948897d0f1861797d5b5ef5c5d7d0252f622382221710ed6c91e34ab89825a8e98ff77218854d52e6094534e0a6a336d1c5e8ca1668f0f62c00fad WHIRLPOOL 96d56c1fbe6d7e4ed5d46fed5afe25fe302db4cf152f8affb7be8ef9271d249563a9c789927d227f5f23690a181d99695a4c702545cd704279399292d28247e6
 EBUILD mongodb-2.4.10-r1.ebuild 3851 SHA256 914e787dff401132c20dd3f9e229e529f9f0fffabf3fcae5dc767557e054bbc6 SHA512 e787b7dab731397b52e7683679ed2c7efbf2ee92f4b94c4bc7be03d2051116b126c80180552b069a2dcbb45e73538342eda8205173b3418e104c4f043fa90b18 WHIRLPOOL c80fb21e4911efe7e62c0004a1c50fb0388d20cf8755c39efbb4e6caebede8dbf889001648bd0be005212fccd97c00af21c16f46d0d5bc24991a42f47f995d19
 EBUILD mongodb-2.4.6-r2.ebuild 3733 SHA256 b7cdc682f6ae451dc252827a05a8b0a69ae1c78b48520512d698a61faf034c59 SHA512 07c32f6dfef084956ba6592555b13e53188718eecf55ba929e0ec5d4fd36e5d844e6cea30e1467b58d5318f668d86128a2e06019032e4f767b4cab7d535fe98c WHIRLPOOL 1a15f756fbb9a4d76e3d88e5f3a54876f93d8a963fcea4413adc25f1ff795e8c27892ee68865bdb9b747f91354a926cc609088630ab0a71c6ef67b600f0b4f14
 EBUILD mongodb-2.6.3.ebuild 4426 SHA256 eb2da6f5d7dbf0d1bcb3d6136d32908652a8d96132081a75eb2affb6b91b41c5 SHA512 f22caab8883dcdb81e24ca68edd044cb81c2995b502d1e7b663e29bb0e7887df097fdfff7445c5bca28f2d25b75e56c12b1f9d5d4457861596c228483daf3dab WHIRLPOOL 6be80615cafc62945b115682bcd0d23c2db3bbd64bbfa9f878302c6885cf488c6c9a1048debc9c3941aa1b3c6ee9e28d2794a6f01af0e8f1d70fbbf4166a51d2
-MISC ChangeLog 21098 SHA256 2aea317bab816b0bfd9a17aa2174026834ceb98a8b5ac7250ec2532a5b620498 SHA512 87483a3c9d74f4f9f289dde59683db29bc012890b2de6480052f55639f2ae53e6aaf2bbe6c98e4bf30a7b2b2c91cb8fe357917741477bef5020548eeb6074f14 WHIRLPOOL 13e2451033a4e625bcf3e51a769d2611fff203bf56ee439ab194e99c1d6a74eaff9ab0dfe3cdb9dc34e1195a29652c87d4b5095a9e96344fa69bbbf61b404a65
+EBUILD mongodb-2.6.4.ebuild 4426 SHA256 dcc6d8735f4b60815d0de427ff214d4622bbd029aca4cc28f676861de9a7371d SHA512 a8ceadc5d7c62193f66dc6c9ec1e4294c55f37049003537a29fea41211566de052586204e5e54608c91d5533280f5a291d667f10bc7f10db70fa45fddec564a4 WHIRLPOOL 6fa6f2a0216a06851d7500f883f937d65ecdefb944201a820244691c762621023a4811dab5ce53094ac48c0ac66285e7eac7bd3bf02ce220111a0e1201223871
+MISC ChangeLog 21213 SHA256 5482d31534b9bc8574630b335cb1494e1fb44c1483d1885ffec5334df2f7dcbc SHA512 43d47c888a9fca3447207505fcc6880998fcd1342b4cb8ac45df023decc1cbb25a7652d4b67f3fb94e7d9f0ae190b4fac7f19cf260d52748051cd9d2d5e63b65 WHIRLPOOL a0dadd0e1556d0c007b1431310991eefb594f4e3586ce9946dd301bd4e99f0f6f673d97bc1321ade25e1b7fd4d310cf2e40ec255ea20915ec49e4cff7fa0baa6
 MISC metadata.xml 1090 SHA256 bb0066679f4a7ee9f21238becfdf1cb6e38489c1a9d46e0671d4098455f886ea SHA512 b4e4fec0815ac98c85b437f2155f4620b91fe24e81f559b92901038f68534e07dc91ae77ac609311e9febbe64b8ef0ad5ad164346cdb466e28bf1732ed18048a WHIRLPOOL b5305d0cbc7398d66d9e26b14adeaccfeeee8d0d24fad8bb957517273b97f94b0feb1afc1bdefaa01ea06502c570376e8e7a0ce68dca76c8ae5dbbf686d6458a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlPP2AAACgkQKiQSS7ZY+hPr+AEAmJ3Hfx2sWS3UlwbYFiosZClj
-CxUKdnmG9LLw+2G/bTkBALC0SkstUGrZQSzw9RwHF7GSxP17SgMyprfDmBtMglOT
-=qP8q
+iF4EAREIAAYFAlPprAYACgkQKiQSS7ZY+hMQAgD/WAH8M1zKcOIof87/m0FLH1vL
+uHn9hIPxaeRZf/mWf8IA/2I+fBejIhcB901ST0GahSJEktCb0fnpyY6wTUarVPd9
+=7itE
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mongodb/mongodb-2.6.4.ebuild b/dev-db/mongodb/mongodb-2.6.4.ebuild
new file mode 100644
index 000000000000..920f5b04d5ff
--- /dev/null
+++ b/dev-db/mongodb/mongodb-2.6.4.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.6.4.ebuild,v 1.1 2014/08/12 05:54:08 ultrabug Exp $
+
+EAPI=5
+SCONS_MIN_VERSION="1.2.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit eutils flag-o-matic multilib scons-utils systemd 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="http://downloads.mongodb.org/src/${MY_P}.tar.gz
+	mms-agent? ( http://dev.gentoo.org/~ultrabug/20140409-mms-monitoring-agent.zip )"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kerberos mms-agent ssl static-libs"
+
+PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
+RDEPEND="
+	app-arch/snappy
+	>=dev-cpp/yaml-cpp-0.5.1
+	>=dev-libs/boost-1.50[threads(+)]
+	>=dev-libs/libpcre-8.30[cxx]
+	dev-libs/snowball-stemmer
+	dev-util/google-perftools[-minimal]
+	net-libs/libpcap
+	ssl? ( >=dev-libs/openssl-1.0.1g )"
+DEPEND="${RDEPEND}
+	sys-libs/ncurses
+	sys-libs/readline
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+	scons_opts+=" --disable-warnings-as-errors"
+	scons_opts+=" --use-system-boost"
+	scons_opts+=" --use-system-pcre"
+	scons_opts+=" --use-system-snappy"
+	scons_opts+=" --use-system-stemmer"
+	scons_opts+=" --use-system-tcmalloc"
+	scons_opts+=" --use-system-yaml"
+	scons_opts+=" --usev8"
+
+	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 ssl; then
+		scons_opts+=" --ssl"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.6.2-fix-scons.patch"
+	epatch "${FILESDIR}/${PN}-2.4-fix-v8-pythonpath.patch"
+
+	# fix yaml-cpp detection
+	sed -i -e "s/\[\"yaml\"\]/\[\"yaml-cpp\"\]/" SConstruct || die
+
+	# 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
+
+	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-r2" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
+	newinitd "${FILESDIR}/${PN/db/s}.initd-r2" ${PN/db/s}
+	newconfd "${FILESDIR}/${PN/db/s}.confd-r2" ${PN/db/s}
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r2" ${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}
+
+	if use mms-agent; then
+		local MY_PN="mms-agent"
+		local MY_D="/opt/${MY_PN}"
+
+		insinto /etc
+		newins "${WORKDIR}/${MY_PN}/settings.py" mms-agent.conf
+		rm "${WORKDIR}/${MY_PN}/settings.py"
+
+		insinto ${MY_D}
+		doins "${WORKDIR}/${MY_PN}/"*
+		dosym /etc/mms-agent.conf ${MY_D}/settings.py
+
+		fowners -R mongodb:mongodb ${MY_D}
+		newinitd "${FILESDIR}/${MY_PN}.initd-r2" ${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.6 ]]; 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/2.6-upgrade/"
+		ewarn " "
+		if use mms-agent; then
+			ewarn "MMS Agent configuration file has been moved to :"
+			ewarn "  /etc/mms-agent.conf"
+		fi
+	else
+		if use mms-agent; then
+			elog "Edit your MMS Agent configuration file :"
+			elog "  /etc/mms-agent.conf"
+		fi
+	fi
+}