Version bump, drop old

(Portage version: 2.1.10.34/cvs/Linux x86_64)

4 files changed, 17 insertions, 93 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/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