Version bump, drop old

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

4 files changed, 52 insertions, 8 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 5cca68c0af6b..998e4c64c343 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,12 @@
 # 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.33 2012/03/19 14:51:15 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.34 2012/03/21 09:05:48 ultrabug Exp $
+
+*mongodb-2.0.4 (21 Mar 2012)
+
+  21 Mar 2012; Ultrabug <ultrabug@gentoo.org> -mongodb-2.0.2.ebuild,
+  +mongodb-2.0.4.ebuild, +files/mongodb-2.0.4-fix-utils.patch:
+  Version bump, drop old
 
   19 Mar 2012; Ultrabug <ultrabug@gentoo.org> mongodb-1.8.4-r1.ebuild,
   mongodb-2.0.2.ebuild, mongodb-2.0.3.ebuild:
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index a40a691a799f..462bcf5b8552 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -6,6 +6,7 @@ AUX mms-agent.initd 1231 RMD160 dda8b391c205069241ac8b26054f0b1c13b8592a SHA1 79
 AUX mongodb-1.8-fix-scons.patch 1859 RMD160 71700297d66808d2503f8a5eb56e10398e282ee7 SHA1 cba8225b2cd79477c0882a312707fbb58a59b70a SHA256 2b1a2180e73ad18c6fc884678dcdfb081c9ed6e967e137ba761683075cd59a1a
 AUX mongodb-2.0-fix-scons.patch 1674 RMD160 741264d3300a7aadca491f86c8a02d708b2a1c0e SHA1 57f6c1f0ecb7d9ca10cd85a8fe09cea779df033e SHA256 eed2195cc758676efba624cac13ad03d0ab3feb0bb12d67e192d236abf5f0594
 AUX mongodb-2.0.3-fix-scons.patch 3041 RMD160 4fa5379d2f5b91e67af9c875b91365670c3868cf SHA1 845da440e1e5569710c2d782b4bc768a3d9bb48b SHA256 0e5c7b5210028b180ff2c335a92ff767cc0b70c637009fab53f132a78e846bb2
+AUX mongodb-2.0.4-fix-utils.patch 1254 RMD160 2794797fe3bf0d24d96c2ab73829a9e332e10de2 SHA1 b227866189dc4e89f3acc5c7841ef8bfb25c0082 SHA256 4a23d6691fcc6c3607e7a0068c457067985fee49a3056beddc56b29b594ed9c4
 AUX mongodb-linux3.patch 1588 RMD160 879245215595e6f16ef6c04157a9b50b96638d48 SHA1 1ab387e8b6ddc46dbb3dde654e0e01a565c25222 SHA256 bc96fad782e5396cc4464e7d7bff6abb1f054c4ff034fbeebea44a1e7a41945b
 AUX mongodb.confd 361 RMD160 26e8d39513b44d989ee64c30669967237cabbaa8 SHA1 837b3603de36bf8ebab9a6f2c1652a853cdf02ef SHA256 a4ca29c577428c02cd0b0a8b46756df5f53a05519c9d13c270533cf99b9b819d
 AUX mongodb.initd 1254 RMD160 d4fb23a7533480c687e8d1bb01e08780991400ea SHA1 cefff6f1290595929feec0f996c99f9790c06536 SHA256 b39bf365963f849c5102147da324dae140be6ac17db96fe512c0220803477642
@@ -13,17 +14,17 @@ AUX mongos.confd 345 RMD160 97a0baad48e8fb65fe413f9832d0dd9a212f015d SHA1 735e77
 AUX mongos.initd 1407 RMD160 2b859fe4e6a7a348c06d9d149a34251d442efbf0 SHA1 57a82e46efafb822de93e0d20384187af25c0bf9 SHA256 a93069d7c7c3602437ce783c1aecd931854973230baae092ccee2cd9c078da7e
 DIST 20111027-10gen-mms-agent.zip 25241 RMD160 418b238a317583bace686f1386b2a4d0c7c78a92 SHA1 37349cfa1453eaecf7354f3d4a2595efdea02a95 SHA256 e5625ce9029a376674d24b242527459403ac782d18c78d91beab93fa8f6783f1
 DIST mongodb-src-r1.8.4.tar.gz 1727826 RMD160 6b561592b4f58f08ca2789e5ab92a3d31597912e SHA1 d296a6e04057e17989de5c7ded3a8c4d28285156 SHA256 c4e27bf22f2353e28ce169dbdbc24205baf863d1f61bd9a31b2230386cada4ae
-DIST mongodb-src-r2.0.2.tar.gz 2956087 RMD160 29a7052638236bffec5dff1d53bd5b870b8df3ef SHA1 f1d260a6845f761a1abfa27053bf7c1efdae353f SHA256 e4a498c435532470e8aa7ea1d0119558e0f061c7574659e0ebc0e29cbee2ac8f
 DIST mongodb-src-r2.0.3.tar.gz 2964557 RMD160 4b421b0fd7d01ba561e21566c8fc38941bde1a52 SHA1 b6821a8436ce1867b49cad86a855df81499a831c SHA256 f5f365adc6597d5c3c086da27f0ca179313da03fb547a2202badd23f95360699
+DIST mongodb-src-r2.0.4.tar.gz 2966431 RMD160 13cc2f7b83333dae8c5511190e5f44e8875b673f SHA1 174297b77368058d3e1eed8c98079222507f827b SHA256 65296df2777778f49a72513483d048f271339683c89d676b80e76687496a38f9
 EBUILD mongodb-1.8.4-r1.ebuild 2479 RMD160 2be7d66bea0df017010f3d1f44aa39ca467322ca SHA1 7c597c7142352aafd75b2562a2633df93cf693b6 SHA256 00467ac50a6e281ba9d9c984b94579fa58f1bf77a976e64bf5b2c006d6f18b49
-EBUILD mongodb-2.0.2.ebuild 2711 RMD160 fa4903179a2957ec0fe5fd5b84005c14137b87a9 SHA1 bf12cd5117915d9f70c7f2736ae044a56f4a4b43 SHA256 c001e9e9d61cd1c854265c1a08347fd4843ce067c1fd05c9c2ccbefb66dcdc35
 EBUILD mongodb-2.0.3.ebuild 2713 RMD160 d0648aefe1cf568e085346f0a2e96511d9f31c36 SHA1 47c6cac7e5eb42de1b0e2636910e55279ee64e62 SHA256 c7c5c7acf38c3bd9544555071a60b80bb1ff3401204a3449687959983e7ac6af
-MISC ChangeLog 8071 RMD160 9d9f8ee66de73f56ec2a7f99d83aac21c0803bea SHA1 58c363d496b3085da099c604a59c0c9ca04cb238 SHA256 537fbb490cc374712b9e81e79f5516b5dd8c8bbff18b258255fb60d1caba55dd
+EBUILD mongodb-2.0.4.ebuild 2769 RMD160 30f08de1c3feedf0df3682b92c423af716c95425 SHA1 9c2cfa99466aa48ea4e3ff0360e9571c152d938a SHA256 dfd27997992dedbb7518ab1c15947637998839bd20b721e5fc62536a087927c4
+MISC ChangeLog 8259 RMD160 3d400594654e78fc8b9d5351f738b673e6ff4b54 SHA1 3a987c528a42d7b6c8b085d3f96b3d76336c72aa SHA256 b49df7b3235b5cde77982a13cd6efb3a221632e6a2de7173e4739b4f30085d25
 MISC metadata.xml 1094 RMD160 382287bd018ebf994f0997376095d1735858ca0f SHA1 4063b9bc6bb3d95e4b1a5aab9bf63ea567f92329 SHA256 8b325542cc2200f22d21915688992073cc1b0a8c5c4f08f34771df2ac6a9cfaf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk9nR+wACgkQKiQSS7ZY+hM+0gD/cqEOCsEosaS0dN1kwr0Ul9It
-9hArnV9vTgSW/B17AuIA/Rffw0UHQzu1LpwUNJQgqgmp3p0QUxr4lvIDsOSAnR8i
-=XSPR
+iF4EAREIAAYFAk9pmfYACgkQKiQSS7ZY+hPAFAD+MqXfIU8t3E/yUffepNf0xTiB
+3VNG1KrcrjuWrwP0t9kBAJDW1kNjbY/VZzUplicMVyJvdsplyBNVCizsu4bbeZyv
+=QXsM
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mongodb/files/mongodb-2.0.4-fix-utils.patch b/dev-db/mongodb/files/mongodb-2.0.4-fix-utils.patch
new file mode 100644
index 000000000000..988814989297
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-2.0.4-fix-utils.patch
@@ -0,0 +1,35 @@
+--- a/buildscripts/utils.py
++++ b/buildscripts/utils.py
+@@ -3,6 +3,8 @@ import re
+ import socket
+ import time
+ import os
++import sys
++
+ # various utilities that are handy
+
+ def getAllSourceFiles( arr=None , prefix="." ):
+@@ -139,6 +141,14 @@ def smoke_python_name():
+     # then we assume that "python" points to a 2.5 or
+     # greater python VM. otherwise, explicitly use 2.5
+     # which we assume to be installed.
++    min_version_tuple = (2, 5)
++    try:
++        if sys.version_info >= min_version_tuple:
++            return sys.executable
++    except AttributeError:
++        # In case the version of Python is somehow missing sys.version_info or sys.executable.
++        pass
++
+     import subprocess
+     version = re.compile(r'[Pp]ython ([\d\.]+)', re.MULTILINE)
+     binaries = ['python2.5', 'python2.6', 'python2.7', 'python25', 'python26', 'python27', 'python']
+@@ -150,7 +160,7 @@ def smoke_python_name():
+                 match = version.search(stream)
+                 if match:
+                     versiontuple = tuple(map(int, match.group(1).split('.')))
+-                    if versiontuple >= (2, 5):
++                    if versiontuple >= min_version_tuple:
+                         return binary
+         except:
+             pass
\ No newline at end of file
diff --git a/dev-db/mongodb/mongodb-2.0.2.ebuild b/dev-db/mongodb/mongodb-2.0.4.ebuild
index 98ad12c5b4ef..fc5fe6a393c6 100644
--- a/dev-db/mongodb/mongodb-2.0.2.ebuild
+++ b/dev-db/mongodb/mongodb-2.0.4.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.2.ebuild,v 1.4 2012/03/19 14:51:15 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.0.4.ebuild,v 1.1 2012/03/21 09:05:48 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -47,6 +47,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.0-fix-scons.patch"
+	epatch "${FILESDIR}/${P}-fix-utils.patch"
 
 	# drop -Werror
 	sed -i -e '/Werror/d' SConstruct || die
@@ -58,6 +59,7 @@ src_prepare() {
 }
 
 src_compile() {
+	echo $LDFLAGS
 	escons ${scons_opts} all
 }