improved CXX, remove ggdb flag, drop old

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

6 files changed, 37 insertions, 24 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 670a6333a763..227f818f4de1 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.14 2011/04/13 14:56:32 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.15 2011/04/15 07:51:06 ultrabug Exp $
+
+*mongodb-1.8.1-r1 (15 Apr 2011)
+*mongodb-1.6.5-r1 (15 Apr 2011)
+
+  15 Apr 2011; Ultrabug <ultrabug@gentoo.org> -mongodb-1.6.5.ebuild,
+  +mongodb-1.6.5-r1.ebuild, files/mongodb-1.6-fix-scons.patch,
+  -mongodb-1.8.1.ebuild, +mongodb-1.8.1-r1.ebuild,
+  files/mongodb-1.8-fix-scons.patch:
+  improved CXX, remove ggdb flag, drop old
 
 *mongodb-1.8.1 (13 Apr 2011)
 *mongodb-1.6.5 (13 Apr 2011)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 7e4e86d1946f..016c3780efef 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX mongodb-1.6-fix-scons.patch 1468 RMD160 54011fed1646e1be90962a6595cbecdec1833c35 SHA1 e76feb1ba4f6973e1e382cd505d23f9c4291e9a9 SHA256 8b903e6cb95b92314a91a540b8773d5c7e85721f25ef4e176bd3eeb4673072cb
-AUX mongodb-1.8-fix-scons.patch 1649 RMD160 1e5be2fe75f25c511b1d70dd1dd7977c8f1a6db3 SHA1 1300bbc5ff4f9c4a59e89fb3e119506b3507906d SHA256 5b8db8f66adabbdd52c364a713ce38a937c4ac6282a4ac530d14930d386d582d
+AUX mongodb-1.6-fix-scons.patch 1632 RMD160 fa6a3ededbc0f78a113d66735c003860e0bcd75c SHA1 5ac604f9ef2c19c002f722d33c6e066552d28b5a SHA256 bbd2c111a3f4b44a287b3e00ced6618fb7a9d80fcf8d9fcf0ec07cca19f5c860
+AUX mongodb-1.8-fix-scons.patch 1859 RMD160 71700297d66808d2503f8a5eb56e10398e282ee7 SHA1 cba8225b2cd79477c0882a312707fbb58a59b70a SHA256 2b1a2180e73ad18c6fc884678dcdfb081c9ed6e967e137ba761683075cd59a1a
 AUX mongodb.confd 277 RMD160 a6c7f01ecc843c9138046a5b4deaaff839b7bcc4 SHA1 cb04bf6b4d3799846b9ab59dc587c88093d8e265 SHA256 b5b44beb64aae30f285c4764acbb8b2c7c60bd0cdcd47c6c11f285790c42b510
 AUX mongodb.initd 1019 RMD160 9b5b825228208a7656ccc03e248eb9e8fdcf7757 SHA1 51936bea587cc8186d57877ce8293933aec30252 SHA256 922e274456872cdf961299b35ddbfd27901694bcb6acd0df0a2e62f151c31d23
 AUX mongos.confd 261 RMD160 cd0164a9f54d53871a5a15ea15034479e9360d1d SHA1 193e29ae8a33dbd6490698955e6e36601a395c4b SHA256 56b63b536e2e0482972efb1505d3a661511dc9ed5872c12933a141470f1923a8
 AUX mongos.initd 1176 RMD160 4463298c196ddb8784115680fca6e6362d93d21e SHA1 94d7d526d1fda14888bbb8ba3e3b70df4354db70 SHA256 83f2f456b9a95454ad081efdcc18eb868b7ba1d348c1e7e753199467768049e0
 DIST mongodb-src-r1.6.5.tar.gz 1506561 RMD160 de98b9558544eafb809131347b6a339c46f09732 SHA1 4aed2da91377c2a5c8722c0c6873117014faf31a SHA256 5feac5302be91eea758851d28e4ad09ff4d11a28ffcb61e792ab7aeb5327a8a0
 DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af4365c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d
-EBUILD mongodb-1.6.5.ebuild 1915 RMD160 33ac48cb3a1bcd2b91ed5dca673f6452ff860894 SHA1 3e158fc5a22fd312c5856cfdfb18f71b025e3dd6 SHA256 f5a14f4a6bf101c0a369e0822941b75acb3817c48aa6e88e0ffd895922976ec3
-EBUILD mongodb-1.8.1.ebuild 1956 RMD160 99e439c4e805d4829f56df4f47a24951848572b6 SHA1 43efb1d4089448b885f99dae94c6eb4738b88363 SHA256 f841d6c025241880cc2e98df21a88395640b84ebc4a34b24825550194dfbc109
-MISC ChangeLog 4206 RMD160 3db4ce5c3390c05e5f3869238c1d078c2f7a50db SHA1 9ee4320739b46c3cc1eab130e8b0002877d10146 SHA256 65d01f0dd3574736dcd5bcc733d16ae8b6131a50816fc47292bed6cdfb8b6487
+EBUILD mongodb-1.6.5-r1.ebuild 1937 RMD160 eaec689df1a62d3f44ad0260cc2e02f546504a33 SHA1 f8b91f220d242903b84d7bba97ab8e3841b8f477 SHA256 939ab56b39c483c8703119f894557c4002c6b59ef11b1643712a245c918a7514
+EBUILD mongodb-1.8.1-r1.ebuild 1978 RMD160 470d3316724fc6959fcf4934c2ea1dd3c7c97976 SHA1 2301ffb0f0d9b5b40febd60dd4c206362af5721f SHA256 c5cce93f1f94b3fbfa88c50a187fa0dbbd380ae97dd523c2653d89862b22cf3b
+MISC ChangeLog 4535 RMD160 6f559c074af6e333fce8f6ab9588d5fcde0a3ee8 SHA1 3927e55f034a6cb64ba031270d91dbc36dbd8175 SHA256 4c443c0c09be371b338ff33f10da21095d38e4de663af5e275ab6cf3295a3db1
 MISC metadata.xml 884 RMD160 f0cb7b3592708ec85696616af69b9bfc0e81e9c2 SHA1 de8f61e005e2c499c24084a0e0ab493c65a50c0c SHA256 e15990a373759e839063bd6bf698f0cc835bb4ef46352dbe50020d14335b91c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2luaoACgkQKiQSS7ZY+hPGngEAhky4SFW5xSo1bbD6UWdmxnWG
-XSJCa/cMvgJEhuIbizIA/RYbSf5VQsedRekn72o1eUSvI9IenqN8qFibHHIXsNdd
-=TR+z
+iF4EAREIAAYFAk2n+PUACgkQKiQSS7ZY+hMCugD/VADatskytstq66bcW5IdzEaG
+1bLI4volfOdA4mCgqPgA/RNMPaEU2iUof/NMzXqLxsgInY0URY90A57C3QxMRIJJ
+=fDk4
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch
index 342c36f01595..64d562256272 100644
--- a/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch
+++ b/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch
@@ -1,13 +1,13 @@
-diff --git a/SConstruct b/SConstruct
-index e3046ff..529b19b 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -745,20 +745,19 @@ else:
+--- a/SConstruct	2011-04-13 19:09:56.774788380 +0200
++++ b/SConstruct	2011-04-13 19:15:50.874924566 +0200
+@@ -744,21 +744,20 @@
+     print( "No special config for [" + os.sys.platform + "] which probably means it won't work" )
  
  if nix:
-     env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
+-    env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
 -    if linux:
 -        env.Append( CPPFLAGS=" -Werror " )
++    env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
      env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
 +    env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
 +    env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
@@ -26,7 +26,7 @@ index e3046ff..529b19b 100644
  
      if debugLogging:
          env.Append( CPPFLAGS=" -D_DEBUG" );
-@@ -972,8 +971,8 @@ def doConfigure( myenv , needPcre=True , shell=False ):
+@@ -972,8 +971,8 @@
                  
          myCheckLib( J , True )
          mozHeader = "js"
diff --git a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
index 3d2996a35354..d16e233ed9c9 100644
--- a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
+++ b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
@@ -1,7 +1,11 @@
---- a/SConstruct	2011-04-06 06:40:13.000000000 +0200
-+++ b/SConstruct	2011-04-10 15:50:52.696516582 +0200
-@@ -671,9 +671,10 @@
-     env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
+--- a/SConstruct	2011-04-13 18:25:01.436551679 +0200
++++ b/SConstruct	2011-04-13 18:25:45.387832601 +0200
+@@ -668,12 +668,13 @@
+     if has_option( "distcc" ):
+         env["CXX"] = "distcc " + env["CXX"]
+         
+-    env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
++    env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
      # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
      if linux:
 -        env.Append( CPPFLAGS=" -Werror " )
diff --git a/dev-db/mongodb/mongodb-1.6.5.ebuild b/dev-db/mongodb/mongodb-1.6.5-r1.ebuild
index d85f1e61e785..cf0ecf0aa840 100644
--- a/dev-db/mongodb/mongodb-1.6.5.ebuild
+++ b/dev-db/mongodb/mongodb-1.6.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.6.5.ebuild,v 1.1 2011/04/13 14:56:32 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.6.5-r1.ebuild,v 1.1 2011/04/15 07:51:06 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -33,7 +33,7 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
 
-	scons_opts=" --sharedclient"
+	scons_opts=" --cxx=$(tc-getCXX) --sharedclient"
 	if use v8; then
 		scons_opts+=" --usev8"
 	else
diff --git a/dev-db/mongodb/mongodb-1.8.1.ebuild b/dev-db/mongodb/mongodb-1.8.1-r1.ebuild
index 5f6f777beeb2..a289f7f32b9e 100644
--- a/dev-db/mongodb/mongodb-1.8.1.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.1.ebuild,v 1.1 2011/04/13 14:56:32 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.1-r1.ebuild,v 1.1 2011/04/15 07:51:06 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -33,7 +33,7 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
 
-	scons_opts=" --sharedclient"
+	scons_opts=" --cxx=$(tc-getCXX) --sharedclient"
 	if use v8; then
 		scons_opts+=" --usev8"
 	else