From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-334171-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1Q86dA-0007Oo-CX
for garchives@archives.gentoo.org; Fri, 08 Apr 2011 08:01:24 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C2271E0458;
Fri, 8 Apr 2011 08:01:14 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 767A8E0458
for <gentoo-commits@lists.gentoo.org>; Fri, 8 Apr 2011 08:01:14 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id DB9871B412B
for <gentoo-commits@lists.gentoo.org>; Fri, 8 Apr 2011 08:01:13 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 063F780065
for <gentoo-commits@lists.gentoo.org>; Fri, 8 Apr 2011 08:01:13 +0000 (UTC)
From: "Alexys Jacob" <ultrabug@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Alexys Jacob" <ultrabug@gentoo.org>
Message-ID: <8bb04ac18dca40c7b8fcef21c6cfce0a9e090de5.ultrabug@gentoo>
Subject: [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
X-VCS-Repository: dev/ultrabug
X-VCS-Files: dev-db/mongodb/Manifest dev-db/mongodb/files/mongodb-1.6.0-fix-scons.patch dev-db/mongodb/files/mongodb-1.8-fix-scons.patch dev-db/mongodb/mongodb-1.8.0.ebuild dev-db/mongodb/mongodb-1.8.1.ebuild
X-VCS-Directories: dev-db/mongodb/files/ dev-db/mongodb/
X-VCS-Committer: ultrabug
X-VCS-Committer-Name: Alexys Jacob
X-VCS-Revision: 8bb04ac18dca40c7b8fcef21c6cfce0a9e090de5
Date: Fri, 8 Apr 2011 08:01:13 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 919824f7aa2490946bc902a754dbd19a
commit: 8bb04ac18dca40c7b8fcef21c6cfce0a9e090de5
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 8 08:01:05 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Apr 8 08:01:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/ultrabug.git;a=
=3Dcommit;h=3D8bb04ac1
mongodb work in progress
---
dev-db/mongodb/Manifest | 7 ++---
dev-db/mongodb/files/mongodb-1.6.0-fix-scons.patch | 22 --------------=
------
dev-db/mongodb/files/mongodb-1.8-fix-scons.patch | 14 +++++++++++-
.../{mongodb-1.8.0.ebuild =3D> mongodb-1.8.1.ebuild} | 2 +-
4 files changed, 17 insertions(+), 28 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 458514c..b41026e 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,6 +1,5 @@
-AUX mongodb-1.6.0-fix-scons.patch 913 RMD160 54b30020c2d1a0313e796f132d5=
89969d84f245d SHA1 c5473464452417be6a2bb2433b40bba336910fc1 SHA256 de2688=
2ff9adcf46eb2227e185f7d880549333f0e87703cdf984cd1c4612ffd9
-AUX mongodb-1.8-fix-scons.patch 1202 RMD160 e8901377280b9872e40237a1a795=
6c6044d86eaa SHA1 b82302776e9b5c4fa44c30eb88cd98b8120dcbaf SHA256 5f5f7c0=
75cdaaedaa549cdb26473273f88aef1c8fb8381d75a935a7d27431cb9
+AUX mongodb-1.8-fix-scons.patch 1599 RMD160 de9ced190d9e1581dd06a5f120a8=
05e894075b83 SHA1 2bc5ffd701503cf1abaf007085f536d1c9d83185 SHA256 731f634=
84aa5e81e70faf4cd2b3bcacf67ddaf65c05e3e0584809b075999d82b
AUX mongodb.confd 285 RMD160 cc5e3ab24a9880a19392a7416d23d1ae7a328e11 SH=
A1 7c4b720ea5b0afd2fa88a6adc2d8a2e356691413 SHA256 8dfedbb433e11f8ed6ec81=
59ed5c02f94c22f86006cda21f0b2bb59ebe50b2ad
AUX mongodb.initd 1129 RMD160 92a89d9d71ffcdaba8f86f1a2902abddc9866147 S=
HA1 2c83bfe4c5728ffc8b3dc37fd8d345d09c13f6b0 SHA256 c318a8ca1fe83c59df759=
b2c70e0e0c22fe38cae49de6dbd1afa8399ef626e6a
-DIST mongodb-src-r1.8.0.tar.gz 1718213 RMD160 e80638eacc816869a1284ee135=
b1c9e9885c1684 SHA1 1f8d596da667af10721c6602071e824bc4b8a0f3 SHA256 4c299=
2e49586d4b4a513937286fd8813f4cef44686e67275c4e96489e4456a96
-EBUILD mongodb-1.8.0.ebuild 1812 RMD160 80b475453be9a13413f4a2da8081adef=
7ed8fc0a SHA1 7124877abafc70eb7659a913508727a3713b9990 SHA256 97ebc14d66b=
1d3d41bebe35f3baa4e97aa61c25527a4cc8276636dd550d9c6c7
+DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af43=
65c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268=
b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d
+EBUILD mongodb-1.8.1.ebuild 1817 RMD160 495c26c1f08aa4f9c26ee8df0ae9916f=
8e239d0a SHA1 f34d75492a65ae95d1b01ac48bf489fffa73695c SHA256 a15555c4c76=
729aeea8af0dfc2a77a7c4c5668a0ef61f6e995909fcb6e07ede8
diff --git a/dev-db/mongodb/files/mongodb-1.6.0-fix-scons.patch b/dev-db/=
mongodb/files/mongodb-1.6.0-fix-scons.patch
deleted file mode 100644
index 7122df8..0000000
--- a/dev-db/mongodb/files/mongodb-1.6.0-fix-scons.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN mongodb-src-r1.6.0.orig/SConstruct mongodb-src-r1.6.0/SConstru=
ct
---- mongodb-src-r1.6.0.orig/SConstruct 2010-08-05 15:32:06.000000000 +02=
00
-+++ mongodb-src-r1.6.0/SConstruct 2010-08-16 16:12:52.000000000 +0200
-@@ -745,8 +745,7 @@
-=20
- if nix:
- env.Append( CPPFLAGS=3D"-fPIC -fno-strict-aliasing -ggdb -pthread -=
Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
-- if linux:
-- env.Append( CPPFLAGS=3D" -Werror " )
-+ env.Append( CXXFLAGS=3Dos.environ['CXXFLAGS'])
- env.Append( CXXFLAGS=3D" -Wnon-virtual-dtor " )
- env.Append( LINKFLAGS=3D" -fPIC -pthread -rdynamic" )
- env.Append( LIBS=3D[] )
-@@ -757,8 +756,6 @@
- if debugBuild:
- env.Append( CPPFLAGS=3D" -O0 -fstack-protector " );
- env['ENV']['GLIBCXX_FORCE_NEW'] =3D 1; # play nice with valgrin=
d
-- else:
-- env.Append( CPPFLAGS=3D" -O3" )
-=20
- if debugLogging:
- env.Append( CPPFLAGS=3D" -D_DEBUG" );
diff --git a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch b/dev-db/mo=
ngodb/files/mongodb-1.8-fix-scons.patch
index d9c5b23..305d113 100644
--- a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
+++ b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
@@ -1,5 +1,5 @@
--- a/SConstruct 2011-04-05 09:24:54.828004785 +0200
-+++ b/SConstruct 2011-04-05 09:26:56.651400663 +0200
++++ b/SConstruct 2011-04-08 09:56:19.401717001 +0200
@@ -670,9 +670,7 @@
=20
env.Append( CPPFLAGS=3D"-fPIC -fno-strict-aliasing -ggdb -pthread -=
Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
@@ -25,3 +25,15 @@
=20
if debugLogging:
env.Append( CPPFLAGS=3D" -D_DEBUG" );
+@@ -911,8 +902,9 @@
+ =20
+ myCheckLib( J , True )
+ mozHeader =3D "js"
+- if bigLibString(myenv).find( "mozjs" ) >=3D 0:
+- mozHeader =3D "mozjs"
++
++ env.Append( CPPPATH=3D["/usr/include/nspr"] )
++ env.Append( CPPDEFINES=3D[ "XULRUNNER" ] )
+=20
+ if not conf.CheckHeader( mozHeader + "/jsapi.h" ):
+ if conf.CheckHeader( "jsapi.h" ):
diff --git a/dev-db/mongodb/mongodb-1.8.0.ebuild b/dev-db/mongodb/mongodb=
-1.8.1.ebuild
similarity index 97%
rename from dev-db/mongodb/mongodb-1.8.0.ebuild
rename to dev-db/mongodb/mongodb-1.8.1.ebuild
index 483edf4..40f9aea 100644
--- a/dev-db/mongodb/mongodb-1.8.0.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.1.ebuild
@@ -18,7 +18,7 @@ SLOT=3D"0"
KEYWORDS=3D"~amd64 ~x86"
IUSE=3D"v8"
=20
-RDEPEND=3D"!v8? ( dev-lang/spidermonkey )
+RDEPEND=3D"!v8? ( =3Ddev-lang/spidermonkey-1.7 )
v8? ( dev-lang/v8 )
dev-libs/boost
dev-libs/libpcre"