fix stable version build with newer boost

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

4 files changed, 12 insertions, 188 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 98356e509a94..bcef0a3a09f8 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.124 2015/08/05 09:53:48 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.125 2015/08/07 14:07:27 ultrabug Exp $
+
+  07 Aug 2015; Ultrabug <ultrabug@gentoo.org> mongodb-2.6.8.ebuild,
+  -mongodb-2.6.9.ebuild:
+  fix stable version build with newer boost
 
   05 Aug 2015; Ultrabug <ultrabug@gentoo.org> mongodb-3.0.5.ebuild:
   ebuild cleanup and boost version dep fix
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 09d6ad45e882..35a5a9734b53 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -35,22 +35,20 @@ DIST mongodb-src-r2.4.13.tar.gz 14183056 SHA256 9ad8a3b58457c35b6dd020ca2364ee60
 DIST mongodb-src-r2.4.14.tar.gz 15120808 SHA256 f5ed949cf7c9669267e6f426f3dc30bf6c0e2d68ba7df9e29f16799e8212e7ce SHA512 6811f27a57a2df07f59215f544948708cd5846237c24df6eb14bf09384db4136d964587d82008ff2b0a4dea94d6869fc1dcf2ccd07e5f285da5012a0a091a74f WHIRLPOOL c89b2f4f1a77523f895b3fa21ec82813a4859391c82e3934952b25ab8602c30ac13b9e6b2a00082bbe7bace32edacdb3270e46ac0f3a8c0ab10ea48b5911e019
 DIST mongodb-src-r2.6.10.tar.gz 16456717 SHA256 74228a22aaf99570e706ecde20658165e3983ee8a9f327e80974f82a4e819476 SHA512 acce5faf1986e9650469359fac48a5e83475c1e1e34d3bdeaaaf12da08f7f01eb68f4885ee9877b012f0d705b4f814be2832b3de446cab72ba254afba1e33c7f WHIRLPOOL b39766df876d9e225683bf806f0b05b70d3140900c04c9de3d3640bd933d0c942fbbe74968dcd9d6523750df076ad99e31b59ef09f7d1b2a620e7d2848c0e1ce
 DIST mongodb-src-r2.6.8.tar.gz 14545274 SHA256 1997f60d9de17320f22c604d8aa1cbe5f38d877142cd0e9130fe3dae7b311a06 SHA512 6fa69750debb40d0be4d5d057125320d97e882e30c43c664fcb6ec6a9e6a8bff5e63637fc8952a6d898556b2c2ce84254d135387dc0879bf65dbd5e91b8732ef WHIRLPOOL ba87ca07258ad4df90c92bc300da6cc661117a98f254a8ba62ac362a857ecc2462eb9ddf1d929a6e2187853233053e975aa02139f880d736e47e542a9504bd28
-DIST mongodb-src-r2.6.9.tar.gz 15491620 SHA256 aa3d92defa6938f115700d7d158f34b979cdb1f5870dcacd4feeb1ee4aefec6a SHA512 e03f58b9b7185dbb82e3c93f724b628050d506e564ba09a76684bd6bf3e7cca876c22b04979d93c4cf592213ad70830ee63e22c60e63f8e62fdb3f77524ea3c3 WHIRLPOOL ce6eabcb24388020506b3e2f31c4cd85039cbb2d5cf3881f0284d3bb93cbcefebae7c8da19b2551daaa6c63f13b392b5043ef47b2af2f64063c7c868e758e8e0
 DIST mongodb-src-r3.0.4.tar.gz 26615962 SHA256 6de7aa8b12ad892ee3852ac949069fda8cb87b3ee606a88226817505e2864360 SHA512 bd35a252cd351a2d755edf5e20c69c904de326d7e47aebc055cd0160476ecf966cf53f3263410c32f70e108ff2a019f86a21e1a71917246c2f13db9251082bc3 WHIRLPOOL 224ca39c0411b1608f75191eb14d86256434d3e5ce293a9ac5d1febc3d0285bf79db0875e97fd5559f47734c7f97fedc1bcff3a28aec0a39924da1a4cc24744d
 DIST mongodb-src-r3.0.5.tar.gz 26332788 SHA256 05b16a7991aa65b1d396a3dc622107fba3216fffa8b9ed0817e76ae95f5f7fdb SHA512 17c66f9501e6517feba069f85bb468a421c45300306977ebfed71e6ce120e2bed64f14698e470c644360e23f40132171d64ac85f0962aa3ba824a48cf228775a WHIRLPOOL 7ed1f2b0daf7cb9ff081e69823e79504b8c99a221c74c2a541d673febacad9e555ef34eb4f2e97effe7e6fddafb81b903ab5a4ac8c4e8951640a0f2c6828ba14
 EBUILD mongodb-2.4.13.ebuild 3918 SHA256 bcb513ea98c5df8a6bead80aec926365b93f200567d147dcb27bbd2062896556 SHA512 22e249560cc03efd9442f9309844f379e6fb64afd6fcae1c00102eb29c3f7379dc10455554d448d8d386a9e4da5b02e3e4e47fa7781fd5d5f2d9a10f8afc5fd7 WHIRLPOOL 61938d4838aac8c8c8a431c5609b6a966b91ea391e65aaea6751f56af6299dfe76bc09fd808737f1830d2371e084a1182c0928d58185022ceb5c729d23007ea2
 EBUILD mongodb-2.4.14.ebuild 3925 SHA256 5938aae0ea6b9adcabec51f7a4c24e812978fad374c7c60f35671c0fc62b4d50 SHA512 ea3e1bcaf45ecff0008d480372293102c07fa9f3732f822f1f717c1ebe4de43e0c9065547fc1cbe43a5fb2e1263d5e20e4701cd60757d0f31e4c274f12b94477 WHIRLPOOL 3cc8405936e35c833231a0c5464eb0f51696b19493fdfdb465d1924508c67f097c69f2d413f69343dab9e41322bb078ff0b46b9bddf8f1e6575df364f0b0b85c
 EBUILD mongodb-2.6.10.ebuild 4719 SHA256 60d10364233860aacfcaa86f5acdbf47e676e230391fed27ddb2a447c310e516 SHA512 1f2811b56210dde2ee5daaa96005cd5b3f3927b3b0d9ef91c2f968b88034ef67da87bed2ae252431f40369be58bb44073c89e3fc7887e53d0d28dd0630ecc180 WHIRLPOOL 9d248d0df87a81e8f0e33a63db6d9826b79fbd7c68439bd27fd1be5123061fc72f23b3389a36c8071eb6561b957c6294484611c800e0acd25631c9ad9c44d1e4
-EBUILD mongodb-2.6.8.ebuild 4655 SHA256 947b63f077194215c5bfc8c576d64b6b24a4721aa8e488060006e321063627aa SHA512 5da89a57ea840e8574aa3d9c5ec0c72ff032e191b35af8f1957c41e7f606ad5136b1b43bfe2ed82bdfa7f8fecf95865489abff5a071ef91fe8a09f7e88636dc1 WHIRLPOOL 5dfc561671482d29b106ccd375fa03c8daa22c0deb5a1f16155234ad3c3fbc242be86b99f2c8e531e5494d2944c50ef2bca35b3550ada77a72c476f7d989a943
-EBUILD mongodb-2.6.9.ebuild 4662 SHA256 80305ccf9b2839f98d4235db07977e1af532b4138810fbc7e85249a77e44741a SHA512 b58b4bef06c3b90e4dd61a73b3c15d439becddca4086d219665a5dc06e3fc2d20c02ab7e010d723ecd2964695bb3a1702e58e5a54a5b10fbd2e576a089a9c93c WHIRLPOOL f9d5c53209a86555c8123ec02d16f4bd1919b69663c18304ddf19009eae8e9a6b3bcdf3a842b7fd32cd5aa40cd6b490ea34d9380612bb10230a797fb61be03de
+EBUILD mongodb-2.6.8.ebuild 4716 SHA256 e7b189ebf9b9e53ed063143eaecc4dbc1d2623632afa90c362252ec7ed73f015 SHA512 e8042c865ade5e0d4cc377a1395961acf826cd436903b0d3ed184357edd55f7a20bf74585cc7cc97351d034b055c044d5795dea2f97a263b2ab8a597a5d7e072 WHIRLPOOL 8bc93bc93a4b85754ac813817569e06b7493b4d53430c7f9293e8f8cc1c8f7e80145afae96c1d3d036fa76c2e958c8117304bda6f8c740f03394d97ec8aa8cc7
 EBUILD mongodb-3.0.4.ebuild 4161 SHA256 46a367b9c6915fd4666f6ebe6346c5d127b4d2838e3e6fac89f7ca8cbc0a883e SHA512 35175abbb1fb47f6e0da59ead971754465b4b1d2dc0e96e9b2e9580e26214e2790493fe77a27a6205c9f6e2e4ec7ad92a293a1b9c6c8fd3716642f44891bf873 WHIRLPOOL a85278cd086c4fcb6aee58f27d5140bb7fb1edac3dfe76aa1ded50af9cdaca51785881dbe66602c01b1a1ebfd93784247bd4ccb1727a4979ceb83f0a01977bc5
 EBUILD mongodb-3.0.5.ebuild 4364 SHA256 7d494f28819110e24410e535a6fcaabfbb6944de443b2a9994729f0e3fbd4993 SHA512 3ecc816a70ca4d244549ca5dc679e90864fd717a671ff0de8eb9d5a6e706e0622edcc3cda97518d3ede6c1a0f1b9c5bc4e2ca19eaf9050ba5432bc884e93e040 WHIRLPOOL 79c26983b160acbff340506e1fcd403479a4d5553923fd4f50151d2bbe868d68912bce42126a42756ca707d09ea1da85cb0ed0c52494cba33004525146cb6cf2
-MISC ChangeLog 25217 SHA256 e289a28eccc4d8038a8fc618e48d809d5564eb2f2bdf7918068482e85ff2d78e SHA512 7c1a319798da55b18b115aa010a61bd4a420109701a471a136e8adf09f7e1d58cdaaf9e34f24f34601f2b16e66f116477482161d83ee66f7b7baf75ed2653370 WHIRLPOOL 951fbac14a4ba80defabe8b8759ee3b1e012ac08c9ec6fffaf860daeed20291dda6dd5b42a358bb20de4b15302f86d31a5c47e9c446ede6563e1c314c8cc64e9
+MISC ChangeLog 25355 SHA256 a3aed548a6ffb7287da4945eb5bd03d1fa13d900600ba8b9349065276684e916 SHA512 efaeaa046614ab70a6e790cd9af861ec98a6472f62f3362cc1a935e12eceae8e00bbe210abec070eae6bba6cf791b69b937744acf2053ef2eda7458eb6b62efd WHIRLPOOL 22ad53f03a3f038d53fc8143b2a8a729c0157efe458a7aabd48ea753bc37b90c7424dc5103dafac750db40a47296a8624e566789fa49c71f54d479af860550f5
 MISC metadata.xml 1213 SHA256 e075011c04c3f1e03af1cf4c671cb77b8133cfbdb611e69a00535c81b97009cd SHA512 3b73629af9bacdc1164530b7fb6f2df09b22d3f653cbfbc1bcc2c10affb24128ca972619fa2164e3c3af728c4aac1ae2b150e7e2918f264aaa0cdbe1c60f44ca WHIRLPOOL 35c5870bc4cc70e7103cbaf0a358f25ef307bc52284d51d31436bb6c7ebd0fbdac62f7963f9d38b8065fea18b8c6c46dafa067726166cea14641449da16b3923
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlXB3S4ACgkQKiQSS7ZY+hO3owD/W4QNw2SFkB0quhiI2lWAIuhQ
-JZENUvt3BO23Y9o+7TkA/R26sQI0DtCgeyd2vtjeLBDVMY5U1daDWv3KnvgbwYIe
-=hM0v
+iF4EAREIAAYFAlXEu6EACgkQKiQSS7ZY+hOnEgEA3WPRVzmxLDh2jLwvtgJN2uUP
+IcL1wORjRk0rBASeLiEA/1+CEjPMCOMPPyQjCuddNJyPXmqdOLx01NGCmB4zfvEZ
+=V/Vl
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mongodb/mongodb-2.6.8.ebuild b/dev-db/mongodb/mongodb-2.6.8.ebuild
index e65e2b0838ce..ab4dfecdaa19 100644
--- a/dev-db/mongodb/mongodb-2.6.8.ebuild
+++ b/dev-db/mongodb/mongodb-2.6.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.6.8.ebuild,v 1.4 2015/03/29 12:07:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.6.8.ebuild,v 1.5 2015/08/07 14:07:27 ultrabug Exp $
 
 EAPI=5
 SCONS_MIN_VERSION="1.2.0"
@@ -74,6 +74,7 @@ pkg_setup() {
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.6.2-fix-scons.patch"
 	epatch "${FILESDIR}/${PN}-2.4-fix-v8-pythonpath.patch"
+	epatch "${FILESDIR}/${PN}-2.6.10-fix-boost-1.57.patch"
 
 	# fix yaml-cpp detection
 	sed -i -e "s/\[\"yaml\"\]/\[\"yaml-cpp\"\]/" SConstruct || die
diff --git a/dev-db/mongodb/mongodb-2.6.9.ebuild b/dev-db/mongodb/mongodb-2.6.9.ebuild
deleted file mode 100644
index 955a3ec581ec..000000000000
--- a/dev-db/mongodb/mongodb-2.6.9.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.6.9.ebuild,v 1.1 2015/03/24 17:58:57 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 pax-utils 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="debug 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 debug; then
-		scons_opts+=" --dbg=on"
-	fi
-
-	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_configure() {
-	# filter some problematic flags
-	filter-flags "-march=*"
-	filter-flags -O?
-}
-
-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}
-
-	# see bug #526114
-	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
-
-	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
-}