Version bump, generic mms-agent URL, drop old.

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

4 files changed, 20 insertions, 75 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 632f16ca2a7f..c062776ec8f4 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.35 2012/04/03 08:48:00 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.36 2012/05/11 08:13:57 ultrabug Exp $
+
+*mongodb-2.0.5 (11 May 2012)
+
+  11 May 2012; Ultrabug <ultrabug@gentoo.org> -mongodb-2.0.3.ebuild,
+  -files/mongodb-2.0.3-fix-scons.patch, +mongodb-2.0.5.ebuild:
+  Version bump, generic mms-agent URL, drop old.
 
   03 Apr 2012; Ultrabug <ultrabug@gentoo.org> mongodb-2.0.4.ebuild:
   ebuild cleanup
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 084bc2cfb03e..c7a5e90c8acc 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -5,26 +5,26 @@ AUX mms-agent.confd 205 RMD160 ee93fed685f22bf27801becfc0f7da1c2cf50d78 SHA1 d20
 AUX mms-agent.initd 1231 RMD160 dda8b391c205069241ac8b26054f0b1c13b8592a SHA1 79c4a9df6d2c96cd2ec48a187b816c88953b25e6 SHA256 0691afaed977e2a3b6764002300ebfbb66ccc78f08629d06579a09aa0c48ec05
 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
 AUX mongos.confd 345 RMD160 97a0baad48e8fb65fe413f9832d0dd9a212f015d SHA1 735e77022707e9a18dd3de30ba9ec87b747bc0bb SHA256 2afd582564623da0e928ca667d37bef467334c82d08b49301f1f6c16ba177767
 AUX mongos.initd 1407 RMD160 2b859fe4e6a7a348c06d9d149a34251d442efbf0 SHA1 57a82e46efafb822de93e0d20384187af25c0bf9 SHA256 a93069d7c7c3602437ce783c1aecd931854973230baae092ccee2cd9c078da7e
+DIST 10gen-mms-agent.zip 30129 RMD160 3d5990281baaa062fadee2f8d121c88901f04a77 SHA1 cb79e490987d4198aa7d7aaa83bdaa18b8aac311 SHA256 f354e04bafb721980b4d45917dce6c37d8f2295170199f1645b1363e92cc0ed2
 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.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
+DIST mongodb-src-r2.0.5.tar.gz 2971476 RMD160 ca4a9ad2955f94cdd6d2e55ffa45f9d5a20dd8de SHA1 5ee058e7d800568bc53d544a809c7b50cea0013e SHA256 5bdd2ccdeb89e1955313f7aabc6afd448cd25bcc1b85e976960f476025bcdc6e
 EBUILD mongodb-1.8.4-r1.ebuild 2479 RMD160 2be7d66bea0df017010f3d1f44aa39ca467322ca SHA1 7c597c7142352aafd75b2562a2633df93cf693b6 SHA256 00467ac50a6e281ba9d9c984b94579fa58f1bf77a976e64bf5b2c006d6f18b49
-EBUILD mongodb-2.0.3.ebuild 2713 RMD160 d0648aefe1cf568e085346f0a2e96511d9f31c36 SHA1 47c6cac7e5eb42de1b0e2636910e55279ee64e62 SHA256 c7c5c7acf38c3bd9544555071a60b80bb1ff3401204a3449687959983e7ac6af
 EBUILD mongodb-2.0.4.ebuild 2758 RMD160 fb0ad3d2dd009f60c0eeef9c906c4d49067b2e46 SHA1 d87e07783719ceb26487a8583a52a69c66f92e11 SHA256 ab067c343e46cbd89666cf2131dc54394d4236e9d5d4adb17632675353780b46
-MISC ChangeLog 8345 RMD160 146542e50b61ca49170050df228fea7084145dd9 SHA1 12280f2196b7a46adc0e0547b5d55c66a6dd1d27 SHA256 2b8c251b80ca4e68ea6c7402ea9ea0416d7923381fc7a355ad90bf72bcd4ff26
+EBUILD mongodb-2.0.5.ebuild 2705 RMD160 acc6fae6c4805e30dcddea4bd190ddd43838fdb9 SHA1 8f2c4b96ccd23484e2144ba17042e33abb3a276c SHA256 1368760d76c57b5859a47954e3d101b23d1b212a198972e23c13bd065a7f72ce
+MISC ChangeLog 8557 RMD160 19ce4667e3196452624e0df36bef643a68e831de SHA1 0d533dc052b7095b244b9eb1ed6034727e880b40 SHA256 ac81dae04b6563c701a649e6e0866066eaee70d08cd97690b5bb27f51dbf8710
 MISC metadata.xml 1094 RMD160 382287bd018ebf994f0997376095d1735858ca0f SHA1 4063b9bc6bb3d95e4b1a5aab9bf63ea567f92329 SHA256 8b325542cc2200f22d21915688992073cc1b0a8c5c4f08f34771df2ac6a9cfaf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk96uUoACgkQKiQSS7ZY+hMnxgEA03oFulK2TKvfFzyzhPseo9GE
-qluatSbtW4CZwcksUAEA/RkAt0WACBjm5q3ER7ZM7WJ0jaoUyrC9HHA5VCwFETUu
-=sd/W
+iF4EAREIAAYFAk+syk4ACgkQKiQSS7ZY+hP98gEAwTjzTbUcE78le+mx0QXvUMJN
+IKbDJEnNbYrg3dA7HrkBAMbpiY6ewXuCYt8B8MamZ5Ne7d/NdEraIFvMbWQFRo9x
+=ET3K
 -----END PGP SIGNATURE-----
diff --git a/dev-db/mongodb/files/mongodb-2.0.3-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.0.3-fix-scons.patch
deleted file mode 100644
index 3ff88773b628..000000000000
--- a/dev-db/mongodb/files/mongodb-2.0.3-fix-scons.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/SConstruct	2012-02-27 01:44:09.000000000 +0100
-+++ b/SConstruct	2012-02-29 12:19:27.806016101 +0100
-@@ -700,7 +700,7 @@
-         env["CXX"] = "distcc " + env["CXX"]
-         
-     # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used. 
--    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 " )
-@@ -708,7 +708,9 @@
-             env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's
- 
-     env.Append( CPPDEFINES="_FILE_OFFSET_BITS=64" )
-+    env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
-     env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
-+    env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
-     env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
-     env.Append( LIBS=[] )
- 
-@@ -718,12 +720,13 @@
- 
-     if linux and has_option( "sharedclient" ):
-         env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
-+        env.Append( SHLINKFLAGS=" -Wl,-soname=libmongoclient.so " )
- 
-     if debugBuild:
-         env.Append( CPPFLAGS=" -O0 -fstack-protector " );
-         env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
-     else:
--        env.Append( CPPFLAGS=" -O3 " )
-+        env.Append( CXXFLAGS=" -O3 " )
-         #env.Append( CPPFLAGS=" -fprofile-generate" )
-         #env.Append( LINKFLAGS=" -fprofile-generate" )
-         # then:
-@@ -827,14 +830,16 @@
-     binaries = ['python2.5', 'python2.6', 'python2.7', 'python25', 'python26', 'python27', 'python']
-     for binary in binaries:
-         try:
--            # 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
-+            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
-     # if that all fails, fall back to "python"
diff --git a/dev-db/mongodb/mongodb-2.0.3.ebuild b/dev-db/mongodb/mongodb-2.0.5.ebuild
index 77d5bf370477..feda288dd8fd 100644
--- a/dev-db/mongodb/mongodb-2.0.3.ebuild
+++ b/dev-db/mongodb/mongodb-2.0.5.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.3.ebuild,v 1.2 2012/03/19 14:51:15 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.0.5.ebuild,v 1.1 2012/05/11 08:13:57 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -12,7 +12,7 @@ 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 )"
+	mms-agent? ( https://mms.10gen.com/settings/10gen-mms-agent.zip )"
 
 LICENSE="AGPL-3 Apache-2.0"
 SLOT="0"
@@ -46,15 +46,15 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0.3-fix-scons.patch"
+	epatch "${FILESDIR}/${PN}-2.0-fix-scons.patch"
 
 	# drop -Werror
 	sed -i -e '/Werror/d' SConstruct || die
 
 	sed -i -e "s@jsapi.h@js/jsapi.h@g" \
-			-e "s@jsobj.h@js/jsobj.h@g" \
-			-e "s@jsdate.h@js/jsdate.h@g" \
-			-e "s@jsregexp.h@js/jsregexp.h@g" scripting/engine_spidermonkey.h
+		-e "s@jsobj.h@js/jsobj.h@g" \
+		-e "s@jsdate.h@js/jsdate.h@g" \
+		-e "s@jsregexp.h@js/jsregexp.h@g" scripting/engine_spidermonkey.h || die
 }
 
 src_compile() {