Version bump, fix #431508 thx to Mike Limansky. Drop old.

Package-Manager: portage-2.1.11.10/cvs/Linux x86_64

5 files changed, 152 insertions, 7 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 81dcbdbf8a9b..d77b3dbd7865 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,14 @@
 # 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.40 2012/06/06 07:44:16 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.41 2012/08/20 08:46:47 ultrabug Exp $
+
+*mongodb-2.0.7 (20 Aug 2012)
+*mongodb-1.8.5 (20 Aug 2012)
+
+  20 Aug 2012; Ultrabug <ultrabug@gentoo.org> +mongodb-1.8.5.ebuild,
+  +files/mongodb-1.8.5-fix-smokepy.patch, -mongodb-2.0.5.ebuild,
+  +mongodb-2.0.7.ebuild:
+  Version bump, fix #431508 thx to Mike Limansky. Drop old.
 
 *mongodb-2.0.6 (06 Jun 2012)
 
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 2d6c66bfbf99..e53d2944f853 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mms-agent.confd 205 SHA256 29e678e722268311fb59f5af57ac3fbadb9e930cd3cb1ce9e4dc33d30e021e40 SHA512 e81e68ebad2d409a9e631de0aaf264eab99b3faa5c313a7c96a6672a6c51d3243100f5ef599bf2a347b4f9e1b1a6ebf95fa890cb614d9745c58430fadd8ee13a WHIRLPOOL 24d98082e138dbcee0a276c4874d88a23f7f53d1bf0f6a7f2e979c005413f14809269622ecd013913221a267eb1fc806130d69915ce5cd38a646b498912ca729
 AUX mms-agent.initd 1231 SHA256 0691afaed977e2a3b6764002300ebfbb66ccc78f08629d06579a09aa0c48ec05 SHA512 be341f87633122961e59fddc19f141a303eff2c5cce692a0cf6109977c11ca032c394e6d71a06b2c55c9f06483e5276f7029a1991d161e832ef6cd6b6ddce989 WHIRLPOOL 9b148fc423a7c00f6f7ccc8de32749bd01573a1d358b08f40b354b9244011b390ab32960df11bf399eddb53811c10e6080ab330da5aedf20eb7314ed90e292fa
 AUX mongodb-1.8-fix-scons.patch 1859 SHA256 2b1a2180e73ad18c6fc884678dcdfb081c9ed6e967e137ba761683075cd59a1a SHA512 a1a6d8bebabb91bbd6ef78d09d49cc6fad3e8f2ca392182feec68ad03709620a2f0de390981bdbd27d1782626368d34ed7e79932e41a37aa55584e580cf719d9 WHIRLPOOL 55a707d3bcfe8d31396fd58d093f9e62bbe51a521f76005426dbebf3eff7da63ba575861a9c6749693273b00070fe4cbbac93cc8a52eb3e84caa746f8bb1ba07
+AUX mongodb-1.8.5-fix-smokepy.patch 1262 SHA256 68f44868b107aebb0c2cdea8aa33cc785ef9f700f9cb66b10a9db60947bab22e SHA512 f88e79d511c02cd8a512233cb390943827b6a12e863f65bef53e78e501186616b470a0e3e5646d860e6055add462b5dbf8b4a207b5fdc5f4857ab1e838f668e9 WHIRLPOOL 6702cd53e1e116783bb2acd0f795b4e49c88ddada67f86e2bc96673713be37f40e8b22fe94eda66716520a0a96509ad0603add58f8dd2be26cd66302b0b69388
 AUX mongodb-2.0-fix-scons.patch 1674 SHA256 eed2195cc758676efba624cac13ad03d0ab3feb0bb12d67e192d236abf5f0594 SHA512 42510c21c2cd9c3de066b565e556998bbe61469a53cc1871a6a498cc32702f47818ccaf08a2183ff7719ceb4566c4144de610952ca093646bfe74c70c58247ad WHIRLPOOL a27f5dc7210294300cb24a871c68b335efbe708555a61ed00c651f1f0f5d26ee474aa90c8cd87d1a610d1628bcb8fd9917e1c0ee2060be7588443c07de628d45
 AUX mongodb-linux3.patch 1588 SHA256 bc96fad782e5396cc4464e7d7bff6abb1f054c4ff034fbeebea44a1e7a41945b SHA512 de37834e2b71b392eac70b7152e6b0676c5527e70ee28afa7b8e918d45b4d5fb8482c68925d778ee1b6a3eef5272bfa8babe1a7a2bc810d1b6dc075d370a681a WHIRLPOOL a98c65827098c729b86782db9ec92a8a006d79487b4ab202b4bdb370403c7f867ec011f281e2a3ed27b013aa0584a219877ebc022836700aecde424f956c7a06
 AUX mongodb.confd 361 SHA256 a4ca29c577428c02cd0b0a8b46756df5f53a05519c9d13c270533cf99b9b819d SHA512 9bcd870742c31bf25f34188ddc3c414de1103e9860dea9f54eee276b89bc2cf1226abab1749c5cda6a6fb0880e541373754e5e83d63cc7189d4b9c274fd555c3 WHIRLPOOL 35d785763d0cb1e21516a3fa15332d6c93d35e6faea02b60f81c389878dd89fe026504c6cfce5e9abfc8353f74b0e959a7501373d2a389f269c6952d33e8d2e8
@@ -11,10 +15,19 @@ 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 mongodb-src-r1.8.4.tar.gz 1727826 SHA256 c4e27bf22f2353e28ce169dbdbc24205baf863d1f61bd9a31b2230386cada4ae SHA512 3f0f96f772f3d01fbd2fae7887eb3d0cad711af074ce4234a7bc3212dbbd09e4cacbb5d268b3f89d515d110a5a042f7846d9df222e65ea040f1401981abe4acd WHIRLPOOL b178e012672f7f09270b9c94d267e860a77d5911809aa2f4b6aafd8d7cb79dfb9340a2b1428487253567c2af87952b4a58b9ca021655fb47f2523c92f39da257
-DIST mongodb-src-r2.0.5.tar.gz 2971476 SHA256 5bdd2ccdeb89e1955313f7aabc6afd448cd25bcc1b85e976960f476025bcdc6e SHA512 b547305a2d962218856b82a340c7e07f172e824d1cdf1d15bbec8721f62fd9f8b1aeaca102d3a4f7461fe35bf82bbca6d4c7996a1592c9df11b836b38035d6cd WHIRLPOOL ad09bf3d7aa89f1320a2a6806127f94cd2b1c26def2e25f210c582e1dedc81555ae25ff61f2667bc42c83d8576bfa3d103311c2ff268dd1ede6fa470c005fbfe
+DIST mongodb-src-r1.8.5.tar.gz 1729485 SHA256 3e4ef7a9b326c6516c66e3ad0dc093711a3a8b62019d22131a4786119644cf7a SHA512 503d825625f320686d3428afe9d1f31b458c332d04e0e334c75d460152431aa00f9d199ba76c7766c1f7e8932198a9e6492a5893c49ec428251a22968e598e62 WHIRLPOOL f1fa164c728cafc051ced303e4b5d4fc820a2ca4cc7f075c4260523816aed9ce0c3f57779acc33a5206010549f2de4e149e6d9caa0e3094aca27f983ad4352ec
 DIST mongodb-src-r2.0.6.tar.gz 2973489 SHA256 a972725a7dc3d079f8070d3631956141a7fe2f422d350e6cd3288c9e19fa314e SHA512 e19165e3f721c5bcac9a82b3965dceeebec9f1cefbbb6ef4f87c6f523179e8501d5e9bc5da569627a3e5e7eba7065be36cdbddf2acfa13e9e7ea85c56465971d WHIRLPOOL 11e2ca8de849f89f71e6cf27973ce498c50a8354e4c9ce8a02c0190c9a64d9656a7d60902c4b077df1bbf89a187e64ca3df774de70697cb0bfaf1bcb492d478d
+DIST mongodb-src-r2.0.7.tar.gz 2982999 SHA256 b204d94bc912692bdc154402fbfc2e5c4bd60b09dcbe244f3b2b7657f0a82736 SHA512 4c92d99433388f6829e990f3a065b7d897c0ef83a8b41e99613b1b7fbccd8d1797a048c4340d6dafed956dcb06785ac9784a4b68990020c5052b11368ec98806 WHIRLPOOL 159952c811eae62cdb6b4ad577351a8f6537b8fae1b2d2ad5e4dbdf07e14944aebff765ee896f48ce53cbd7d53b6bb0fc2da470226488f2957b5c6e6df07f3e4
 EBUILD mongodb-1.8.4-r1.ebuild 2483 SHA256 c7cb43fbbe1984c82248b8bf71bca49747bf71ac16208877d0a1a81b82a466f4 SHA512 494c074fb84f6f8687f015d404505741201d0926fe5cb87a58b4301bcc81fd4e53b1974734b724e8054894895e6f6a0713c4098d8219608c646ffd01d9a969cb WHIRLPOOL 0b48930a2f5baa413038229364059ef71219b87b3fe7c5c7f869484a9adaec913040587cef8edb88f4344c74132844f076c752fa9ac605ca828e9283b3050a1a
-EBUILD mongodb-2.0.5.ebuild 2719 SHA256 35aea011d6ac3fac96f3f07d410871af8f3287381db9bccf84642b3cee0c2dc7 SHA512 1e49d89f7698094ca1272a5cb6463f20ba63d635ffa0fae78464cd74b4e3e559f32c077c49afd9e31593252c969d3e8bd0c86c2d716d19f972a471536d8774b6 WHIRLPOOL 75f8ff317a0aad104bf68a6f7b29f82ae68a86a70ac63816856d56bbe262a8d833cb82b0ff5ea85af5209340ae510414793ce55b1237674a878873275b660398
+EBUILD mongodb-1.8.5.ebuild 2533 SHA256 98c542e4b5c4234d23d8419f3baf32b228cd83d58ef924d359a876ea83576770 SHA512 3afceeb057a613cb90c05f10c5639c109698ea45ba81ea16e783eef98654d62818ec34d9ed4e3d94d95e53a460541cf9941bbb0977c512c89c2363fe90635714 WHIRLPOOL aaba10b2c4d96b8e120ae7d895b9dac3eb16ff0d321df38b3c58f0eaa5053dfa0a843c39a93560674996403385251fe4a98dc356fabd468aef419d82cc4b80b9
 EBUILD mongodb-2.0.6.ebuild 2790 SHA256 f0c36ef7da1216be15ff0e9db18fa0896d446326c4f8668652f16e990a93ce65 SHA512 85ac291bff74a8d01ce9e725c03418f08aa26c1bd08b3278933dd94d29b195f254c4a249fc643b4b5e24e69c7058eab9e47fb8b06130b2f06990a26c12d303cc WHIRLPOOL 73448f60dd9ccc5778db164167a54a7bfb1c77b1ff351ad37f08d7aea50eb88cecd36c8f27ec5633f4bbdf8babe61c69d0c76e2dddfb6717c5f395442d953a95
-MISC ChangeLog 9148 SHA256 a7c1943e6f17474498a0eb00d4bc75dccd7919e3ad27e768b6cacd46c88ebb10 SHA512 6d8f0138541a6153eea075e8c0665fe390f6f37d44cba57ddc311333947192791866ca00b49a03e1b53b616832f22c0551a9992551fcd953ed394efd65a515da WHIRLPOOL a0474e2dadef522fca224d918ac34583b79ce67eef55083c908d429d9724eb0f287a42a5fddbee62220ec8f3059b4d2077a267daa4d1798bb754ac08a185e3b0
+EBUILD mongodb-2.0.7.ebuild 2790 SHA256 5f10bf9022a6a971bc995684fa5e7d967f9f1d2670cb010e8f3eb67312df5abf SHA512 f1bb5dee03a9ce98d9317fa28988020bd06829b555a1ee1f461dfdc24a14d5a279c5bfbc14e283086e3561521b7d192994d0eb3a7c8343a7a2664d0939044028 WHIRLPOOL 7faf7fd087349a41e1273c7afedcd7b8e7aec4ab7e9252bb6aa51443b59072dd1a44b04ffd0c9d34dd2308a1ca573cad4e1065d45d0ae7e11df810f230062df8
+MISC ChangeLog 9427 SHA256 8c7282b8fb6a455004f89a2e80ff5517bf5a3f6f49707a5d43796a3590fba384 SHA512 58427bc448508a815381d18202180408b4148afc858631d4fd27641eb0b8f25014085a18d796acf1db07b86849e069797602817f6ddef089668222802d9101e1 WHIRLPOOL 8496b5dd88de4e98893ae5ba070eda737bb20f2110c8241bfc6d41312705008cd35f9744d66c59c1320a8fa52919448af40e949b2e5a7de9bf8a4af9c191f611
 MISC metadata.xml 997 SHA256 5393635a3190ef1304fc71686a7ee121d5175c5cf2e484b6be61a799a167e7d7 SHA512 b595fc3acff1f39a346a12cbe4ece1cb63b2e2e4b8dde93821d58ff01baa192ad115dff3edc2d34d15636fbcde3f5af29c57cd61d6338e8f7e60dcc70b2511da WHIRLPOOL 2fb6476062286ecaea8482593cee51491eb1ea5acf1f0527012bcfb296ff05d2d5cc42a5bfcdb0b31bfea2382f6e096dfa08ae03b834eb00b59eb8fcad02af29
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlAx+YEACgkQKiQSS7ZY+hOcKwEAtvqrJtmbpJUSfxdtAmysXrbh
+dzGNb3j3Bcg1dI/ZVJ0A/2vrHcp+ZYlRbiJMqxPR9Td3/Nte/wx3OgU9LeIzbGML
+=mP4W
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mongodb/files/mongodb-1.8.5-fix-smokepy.patch b/dev-db/mongodb/files/mongodb-1.8.5-fix-smokepy.patch
new file mode 100644
index 000000000000..a98a0e1f4888
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-1.8.5-fix-smokepy.patch
@@ -0,0 +1,24 @@
+--- a/SConstruct	2012-08-20 10:26:51.484835418 +0200
++++ b/SConstruct	2012-08-20 10:27:49.855374497 +0200
+@@ -765,11 +765,16 @@
+     binaries = ['python', 'python2.5', 'python2.6', 'python2.7', 'python25', 'python26', 'python27']
+     for binary in binaries:
+         try:
+-            # py-2.4 compatible replacement for shell backticks
+-            output = subprocess.Popen([binary, '--version'], stdout=subprocess.PIPE).communicate()[0]
+-            match = version.search(output)
+-            if match and float(match.group(1)) >= 2.5:
+-                return binary
++            for path in smokeEnv['ENV']['PATH'].split(':'):
++                if os.path.isfile( '%s/%s' % (path, binary) ):
++                    # py-2.4 compatible replacement for shell backticks
++                    out, err = subprocess.Popen([binary, '-V'], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
++                    for stream in (out, err):
++                        match = version.search(stream)
++                        if match:
++                            versiontuple = tuple(map(int, match.group(1).split('.')))
++                            if versiontuple >= (2, 5):
++                                return binary
+         except:
+             pass
+ 
diff --git a/dev-db/mongodb/mongodb-1.8.5.ebuild b/dev-db/mongodb/mongodb-1.8.5.ebuild
new file mode 100644
index 000000000000..13fd21119036
--- /dev/null
+++ b/dev-db/mongodb/mongodb-1.8.5.ebuild
@@ -0,0 +1,98 @@
+# 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-1.8.5.ebuild,v 1.1 2012/08/20 08:46:47 ultrabug Exp $
+
+EAPI=4
+SCONS_MIN_VERSION="1.2.0"
+
+inherit eutils 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/20111027-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/spidermonkey-1.8.2* )
+	v8? ( dev-lang/v8 )
+	dev-libs/boost
+	dev-libs/libpcre[cxx]
+	net-libs/libpcap"
+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=" --cxx=$(tc-getCXX) --sharedclient"
+	if use v8; then
+		scons_opts+=" --usev8"
+	else
+		scons_opts+=" --usesm"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.8-fix-scons.patch"
+	epatch "${FILESDIR}/${PN}-linux3.patch"
+	epatch "${FILESDIR}/${PN}-1.8.5-fix-smokepy.patch"
+}
+
+src_compile() {
+	escons ${scons_opts} all
+}
+
+src_install() {
+	escons ${scons_opts} --full --nostrip install --prefix="${D}"/usr
+
+	use static-libs || rm "${D}/usr/$(get_libdir)/libmongoclient.a"
+
+	use v8 && pax-mark m "${D}"/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}
+
+	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}"
+}
diff --git a/dev-db/mongodb/mongodb-2.0.5.ebuild b/dev-db/mongodb/mongodb-2.0.7.ebuild
index f2c8c6f06ae7..f5b44c545f19 100644
--- a/dev-db/mongodb/mongodb-2.0.5.ebuild
+++ b/dev-db/mongodb/mongodb-2.0.7.ebuild
@@ -1,6 +1,6 @@
 # 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.0.5.ebuild,v 1.3 2012/06/04 06:34:29 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.0.7.ebuild,v 1.1 2012/08/20 08:46:47 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -25,8 +25,7 @@ RDEPEND="!v8? ( <dev-lang/spidermonkey-1.8[unicode] )
 	dev-libs/boost
 	dev-libs/libpcre[cxx]
 	net-libs/libpcap
-	app-arch/snappy
-	"
+	app-arch/snappy"
 DEPEND="${RDEPEND}
 	sys-libs/readline
 	sys-libs/ncurses"
@@ -81,6 +80,9 @@ src_install() {
 	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}"