New version, thanks to Christian van der Leeden <leeden@logicunited.com> for the initial ebuild in bug #331469

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 94 insertions, 1 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 5db5a86aa83c..37f33cb7e403 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.8 2010/07/18 12:58:58 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.9 2010/08/16 15:37:22 lu_zero Exp $
+
+*mongodb-1.6.0 (16 Aug 2010)
+
+  16 Aug 2010; Luca Barbato <lu_zero@gentoo.org>
+  +files/mongodb-1.6.0-fix-scons.patch, +mongodb-1.6.0.ebuild:
+  New version, thanks to Christian van der Leeden <leeden@logicunited.com>
+  for the initial ebuild in bug #331469
 
 *mongodb-1.5.5 (18 Jul 2010)
 *mongodb-1.4.4 (18 Jul 2010)
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
new file mode 100644
index 000000000000..7122df8ec7b7
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-1.6.0-fix-scons.patch
@@ -0,0 +1,22 @@
+diff -urN mongodb-src-r1.6.0.orig/SConstruct mongodb-src-r1.6.0/SConstruct
+--- mongodb-src-r1.6.0.orig/SConstruct	2010-08-05 15:32:06.000000000 +0200
++++ mongodb-src-r1.6.0/SConstruct	2010-08-16 16:12:52.000000000 +0200
+@@ -745,8 +745,7 @@
+ 
+ if nix:
+     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( CXXFLAGS=os.environ['CXXFLAGS'])
+     env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
+     env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
+     env.Append( LIBS=[] )
+@@ -757,8 +756,6 @@
+     if debugBuild:
+         env.Append( CPPFLAGS=" -O0 -fstack-protector " );
+         env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
+-    else:
+-        env.Append( CPPFLAGS=" -O3" )
+ 
+     if debugLogging:
+         env.Append( CPPFLAGS=" -D_DEBUG" );
diff --git a/dev-db/mongodb/mongodb-1.6.0.ebuild b/dev-db/mongodb/mongodb-1.6.0.ebuild
new file mode 100644
index 000000000000..c638f2759b99
--- /dev/null
+++ b/dev-db/mongodb/mongodb-1.6.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.6.0.ebuild,v 1.1 2010/08/16 15:37:22 lu_zero Exp $
+
+EAPI="2"
+
+inherit eutils versionator
+
+MY_PATCHVER=$(get_version_component_range 1-2)
+MY_P="${PN}-src-r${PV}"
+
+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"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/spidermonkey[unicode]
+	dev-libs/boost
+	dev-libs/libpcre"
+
+DEPEND="${RDEPEND}
+	>=dev-util/scons-1.2.0-r1
+	sys-libs/readline
+	sys-libs/ncurses"
+
+# Must change this on every upgrade
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-fix-scons.patch"
+#}	epatch "${FILESDIR}"/"${PN}"-"${MY_PATCHVER}"-modify-*.patch
+}
+
+src_compile() {
+	scons ${MAKEOPTS} all || die "Compile failed"
+}
+
+src_install() {
+	scons ${MAKEOPTS} --full --nostrip install --prefix="${D}"/usr || die "Install failed"
+
+	for x in /var/{lib,log,run}/${PN}; do
+		dodir "${x}" || die "Install failed"
+		fowners mongodb:mongodb "${x}"
+	done
+
+	doman debian/mongo*.1 || die "Install failed"
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die "Install failed"
+	newconfd "${FILESDIR}/${PN}.confd" ${PN} || die "Install failed"
+}
+
+src_test() {
+	scons ${MAKEOPTS} smoke --smokedbprefix='testdir' test || die "Tests failed"
+}