Version bump, drop old

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

5 files changed, 31 insertions, 99 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index c9620aa91b3b..22365a072d19 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,13 @@
 # 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.26 2011/11/16 09:44:09 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.27 2011/11/18 08:32:46 ultrabug Exp $
+
+*mongodb-2.0.2_rc0 (18 Nov 2011)
+
+  18 Nov 2011; Ultrabug <ultrabug@gentoo.org> -mongodb-1.8.2-r1.ebuild,
+  -mongodb-2.0.2_pre20111116.ebuild, +mongodb-2.0.2_rc0.ebuild,
+  files/mongodb-2.0-fix-scons.patch:
+  Version bump, drop old
 
 *mongodb-2.0.2_pre20111116 (16 Nov 2011)
 
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 2750fe2ac60a..19f4545d448c 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,20 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX mms-agent.confd 205 RMD160 ee93fed685f22bf27801becfc0f7da1c2cf50d78 SHA1 d20dfbb32374a6eebf1dad430148faa352dfb0dc SHA256 29e678e722268311fb59f5af57ac3fbadb9e930cd3cb1ce9e4dc33d30e021e40
 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 1700 RMD160 502c618ab5d5320d4dff00155efcce55be6880e2 SHA1 007db6cad6dc582d7a023ecdf07cdef5aad70dee SHA256 a43c36f562bd0a709fe890adc554baa1d499e5568217e68c641f6023c02b6145
+AUX mongodb-2.0-fix-scons.patch 1674 RMD160 741264d3300a7aadca491f86c8a02d708b2a1c0e SHA1 57f6c1f0ecb7d9ca10cd85a8fe09cea779df033e SHA256 eed2195cc758676efba624cac13ad03d0ab3feb0bb12d67e192d236abf5f0594
 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 20111027-10gen-mms-agent.zip 25241 RMD160 418b238a317583bace686f1386b2a4d0c7c78a92 SHA1 37349cfa1453eaecf7354f3d4a2595efdea02a95 SHA256 e5625ce9029a376674d24b242527459403ac782d18c78d91beab93fa8f6783f1
-DIST mongodb-src-r1.8.2.tar.gz 1722704 RMD160 3c1e33ed9ff3dd3c653112a46cf178d07b93e32c SHA1 d2145e5b4a6df2e94aec76bef3a9399c11e8571a SHA256 1dd376b15e2b7288a77da2e1b0c6ffa5d2c62cdaf4bccfd9aa51c075a1f1bfb8
 DIST mongodb-src-r1.8.3.tar.gz 1726144 RMD160 9662b6963e7e6a4b5adcbea3faa36dd50a794457 SHA1 3c5c9819ef20c759aec1dc6800a3c4d4f6841299 SHA256 ee121c9698a48b819f1c5b5ba10a98d565bd732d527743f1475f54f697dd63e2
 DIST mongodb-src-r1.8.4.tar.gz 1727826 RMD160 6b561592b4f58f08ca2789e5ab92a3d31597912e SHA1 d296a6e04057e17989de5c7ded3a8c4d28285156 SHA256 c4e27bf22f2353e28ce169dbdbc24205baf863d1f61bd9a31b2230386cada4ae
-DIST mongodb-src-r2.0.2_pre20111116.tar.gz 2822830 RMD160 a5e7a564a074bd800eb5423ba0a15f9f8179434c SHA1 febe43c9fe84bfc58f9498b85cb0b34a8627d067 SHA256 a77a67e698714d121caa5ba4c398ac1bf82f37040ba06df84d52587682ceff29
-EBUILD mongodb-1.8.2-r1.ebuild 2016 RMD160 8b8f5a5d3a6d63a075778ec801f70deb8b45836a SHA1 8f94e36e099fedc6b8ee80e1dcd71e6691a8184c SHA256 7f6b7ebd5f443bac0cf4b0bd5415496f63e4ef611d04aa6dfccd22b82a67ed97
+DIST mongodb-src-r2.0.2-rc0.tar.gz 2954080 RMD160 749d127b32911ad95eb935a419910b85117855bd SHA1 164c1144c1d59905b654a0dfd80f1f72588c5240 SHA256 3dd9079f4e7acf44aa4faf857c29b48ab470b85257ec9962daea2caaa2075b38
 EBUILD mongodb-1.8.3.ebuild 2013 RMD160 d4b6aa684d5ff860fe570ed597128344ff15cb7e SHA1 ff8deee519548ef021632e671707728d5b321824 SHA256 42b7bb8edb6b19f3cb98681fc07f143722d0e61d73b8458c4479a53659154923
 EBUILD mongodb-1.8.4-r1.ebuild 2416 RMD160 3d4796a1bae38ee88f840c187210670a0587ba18 SHA1 a2eca19cc6a570c1fd3eea5ab9642511f6052056 SHA256 19fd7efd7411cba453a224ba95904c31c5d0233d46c9683ec41fb0c6c309ad83
-EBUILD mongodb-2.0.2_pre20111116.ebuild 2660 RMD160 1695bb7c896cdc000418739f1f32f08991a20fc1 SHA1 b28fe37dd946ce9498ac9f94cbffe3271ad45acc SHA256 9a227188d6d25061440b28dc56dff2ed259887e4ec9ae9ba1d3499c6b9c1e3b7
-MISC ChangeLog 6859 RMD160 37f382b7dc6bc8d51ee645a968e090e3826adfc7 SHA1 d5bbcfa4c8f17f49ba81eee2e2e05612ac5b8d13 SHA256 b2fd0ad509a34b5dc35ac101013890dcd5e217894b54b2fc0a2f304a942e8868
+EBUILD mongodb-2.0.2_rc0.ebuild 2652 RMD160 d88a355e70cdeb11b5a35b5b227bee1a815cc801 SHA1 88338d554190097935b1599257352e1541698d2e SHA256 a7c0a30783b5d6c5344d025ac1a7b012c50103b4ab552a0da479259969278861
+MISC ChangeLog 7092 RMD160 286a3a9c45ff9d0a45d887e93a8346a432bf4fd4 SHA1 01d6bb176f4a2012063083b4a367f75c7f3bffab SHA256 828878ddb8b9f92deecd8e4227aa31c01963731498dc1c15ba4e9398b55e46ba
 MISC metadata.xml 1094 RMD160 382287bd018ebf994f0997376095d1735858ca0f SHA1 4063b9bc6bb3d95e4b1a5aab9bf63ea567f92329 SHA256 8b325542cc2200f22d21915688992073cc1b0a8c5c4f08f34771df2ac6a9cfaf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iF4EAREIAAYFAk7GGDcACgkQKiQSS7ZY+hNL3QD/ZJ9vCBZGdT212MuGkZsxbGG+
+4eUJ31jYJsLO0J0wiAEBAOJa2JZBHeHPUR+F0OyewYdvZ/4hrdGhcc7YpW1P5qvD
+=Sjle
+-----END PGP SIGNATURE-----
diff --git a/dev-db/mongodb/files/mongodb-2.0-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.0-fix-scons.patch
index adadde14ef75..a52e3a30a77d 100644
--- a/dev-db/mongodb/files/mongodb-2.0-fix-scons.patch
+++ b/dev-db/mongodb/files/mongodb-2.0-fix-scons.patch
@@ -1,6 +1,6 @@
---- a/SConstruct	2011-11-14 15:05:46.000000000 +0100
-+++ b/SConstruct	2011-11-15 21:12:23.707935731 +0100
-@@ -689,15 +689,16 @@
+--- a/SConstruct	2011-11-16 22:11:39.000000000 +0100
++++ b/SConstruct	2011-11-17 16:30:16.144117550 +0100
+@@ -688,7 +688,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. 
@@ -8,8 +8,8 @@
 +    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 -pipe " )
-         if not has_option('clang'): 
+         env.Append( CPPFLAGS=" -Werror " )
+@@ -696,7 +696,9 @@
              env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's
  
      env.Append( CPPDEFINES="_FILE_OFFSET_BITS=64" )
@@ -19,7 +19,7 @@
      env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
      env.Append( LIBS=[] )
  
-@@ -707,12 +708,13 @@
+@@ -706,12 +708,13 @@
  
      if linux and has_option( "sharedclient" ):
          env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
diff --git a/dev-db/mongodb/mongodb-1.8.2-r1.ebuild b/dev-db/mongodb/mongodb-1.8.2-r1.ebuild
deleted file mode 100644
index b29948cf1938..000000000000
--- a/dev-db/mongodb/mongodb-1.8.2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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.2-r1.ebuild,v 1.3 2011/10/19 15:54:07 ultrabug Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-
-inherit eutils multilib scons-utils versionator
-
-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"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs v8"
-
-RDEPEND="!v8? ( =dev-lang/spidermonkey-1.8.2* )
-	v8? ( dev-lang/v8 )
-	dev-libs/boost
-	dev-libs/libpcre[cxx]
-	net-libs/libpcap"
-DEPEND="${RDEPEND}
-	sys-libs/readline
-	sys-libs/ncurses"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	enewgroup mongodb
-	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-	scons_opts=" --cxx=$(tc-getCXX) --sharedclient"
-	if use v8; then
-		scons_opts+=" --usev8"
-	else
-		scons_opts+=" --usesm"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.8-fix-scons.patch"
-	epatch "${FILESDIR}/${PN}-linux3.patch"
-}
-
-src_compile() {
-	escons ${scons_opts} all
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${D}"/usr
-
-	use static-libs || rm "${D}/usr/$(get_libdir)/libmongoclient.a"
-
-	for x in /var/{lib,log,run}/${PN}; do
-		keepdir "${x}"
-		fowners mongodb:mongodb "${x}"
-	done
-
-	doman debian/mongo*.1
-	dodoc README docs/building.md
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-	newinitd "${FILESDIR}/${PN/db/s}.initd" ${PN/db/s}
-	newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
-}
-
-src_test() {
-	escons ${scons_opts} test
-	"${S}"/test --dbpath=unittest || die
-}
-
-pkg_postinst() {
-	if [[ ${REPLACING_VERSIONS} < 1.8 ]]; then
-		ewarn "You just upgraded from a previous version of mongodb !"
-		ewarn "Make sure you run 'mongod --upgrade' before using this version."
-	fi
-	elog "Journaling is now enabled by default, see /etc/conf.d/${PN}"
-}
diff --git a/dev-db/mongodb/mongodb-2.0.2_pre20111116.ebuild b/dev-db/mongodb/mongodb-2.0.2_rc0.ebuild
index b4dc77fceaae..0d557f870d09 100644
--- a/dev-db/mongodb/mongodb-2.0.2_pre20111116.ebuild
+++ b/dev-db/mongodb/mongodb-2.0.2_rc0.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-2.0.2_pre20111116.ebuild,v 1.1 2011/11/16 09:44:09 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.0.2_rc0.ebuild,v 1.1 2011/11/18 08:32:46 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -11,7 +11,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="https://github.com/mongodb/mongo/tarball/0655ba4ec87e4dd91c5639707d6f6f208d719d61 -> ${MY_P}.tar.gz
+SRC_URI="https://github.com/mongodb/mongo/tarball/ada33ce4be46e634e8ac9b727167b2173f90f5c8 -> ${MY_P}.tar.gz
 	mms-agent? ( http://dev.gentoo.org/~ultrabug/20111027-10gen-mms-agent.zip )"
 
 LICENSE="AGPL-3 Apache-2.0"
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 	sys-libs/readline
 	sys-libs/ncurses"
 
-S="${WORKDIR}/mongodb-mongo-0655ba4"
+S="${WORKDIR}/mongodb-mongo-ada33ce"
 
 pkg_setup() {
 	enewgroup mongodb