Version bump, drop old

(Portage version: 2.1.10.49/cvs/Linux x86_64)

3 files changed, 45 insertions, 2 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/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
 }