[gentoo-commits] proj/betagarden:master commit in: dev-db/mongodb/files/, dev-db/mongodb/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/betagarden:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2011-04-08 17:34 Benedikt Boehm
  0 siblings, 0 replies; 4+ messages in thread
From: Benedikt Boehm @ 2011-04-08 17:34 UTC (permalink / raw
  To: gentoo-commits

commit:     d9be143486caa83951aae4d6c72c58fea90ed451
Author:     Benedikt Böhm <bb <AT> xnull <DOT> de>
AuthorDate: Fri Apr  8 17:27:47 2011 +0000
Commit:     Benedikt Boehm <hollow <AT> gentoo <DOT> org>
CommitDate: Fri Apr  8 17:33:26 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=d9be1434

dev-db/mongodb: version bump to 1.8.1

- #329167 - dev-db/mongodb missing dependency on net-libs/libpcap
- #334081 - dev-db/mongodb does not respect LDFLAGS
- #337593 - dev-db/mongodb should depend on libpcre being compiled with
            the cxx useflag
- #337973 - dev-db/mongodb-1.8.0 version bump
- #338039 - dev-db/mongodb starts as root
- #340032 - dev-db/mongodb: add server logging
- #356731 - dev-db/mongodb should create /var/run/mongodb

---
 dev-db/mongodb/files/mongodb-1.6.3-fix-scons.patch |   25 --------
 dev-db/mongodb/files/mongodb-1.8.1-fix-scons.patch |   37 +++++++++++
 dev-db/mongodb/files/mongodb.confd                 |   16 ++---
 dev-db/mongodb/files/mongodb.initd                 |   15 +++--
 dev-db/mongodb/mongodb-1.6.3.ebuild                |   65 --------------------
 dev-db/mongodb/mongodb-1.7.5.ebuild                |   65 --------------------
 dev-db/mongodb/mongodb-1.8.0_rc1.ebuild            |   65 --------------------
 .../{mongodb-1.8.0.ebuild => mongodb-1.8.1.ebuild} |   38 ++++++++----
 8 files changed, 76 insertions(+), 250 deletions(-)

diff --git a/dev-db/mongodb/files/mongodb-1.6.3-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.6.3-fix-scons.patch
deleted file mode 100644
index 1c26ce6..0000000
--- a/dev-db/mongodb/files/mongodb-1.6.3-fix-scons.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index b759094..5d667f4 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -745,9 +745,9 @@ else:
- 
- 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=os.environ['LDFLAGS'] )
-     env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
-     env.Append( LIBS=[] )
- 
-@@ -757,8 +757,6 @@ if nix:
-     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/files/mongodb-1.8.1-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.8.1-fix-scons.patch
new file mode 100644
index 0000000..25a6a6f
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-1.8.1-fix-scons.patch
@@ -0,0 +1,37 @@
+From 4ce35e34e646b6ccf151449bd2b47cef543152e5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Benedikt=20B=C3=B6hm?= <bb@xnull.de>
+Date: Fri, 8 Apr 2011 16:33:37 +0200
+Subject: [PATCH] fix scons
+
+---
+ SConstruct |    5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 41383b1..35c7ea6 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -671,9 +671,10 @@ if nix:
+     env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -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 " )
+         env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's
++    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=[] )
+ 
+@@ -687,8 +688,6 @@ if nix:
+     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( CPPFLAGS=" -fprofile-generate" )
+         #env.Append( LINKFLAGS=" -fprofile-generate" )
+         # then:
+-- 
+1.7.3.4
+

diff --git a/dev-db/mongodb/files/mongodb.confd b/dev-db/mongodb/files/mongodb.confd
index 41585ff..2e087ac 100644
--- a/dev-db/mongodb/files/mongodb.confd
+++ b/dev-db/mongodb/files/mongodb.confd
@@ -1,11 +1,5 @@
-# Mongodb essentials
-#MONGODB_EXEC="/usr/bin/mongod"
-#MONGODB_DATA="/var/lib/mongodb"
-#MONGODB_USER="mongodb"
-#MONGODB_PID_FILE="/var/run/mongodb/mongodb.pid"
-
-#MONGODB_IP="127.0.0.1"
-#MONGODB_PORT="27017"
-
-# Set extra options here, such as disabling the admin web server
-#MONGODB_OPTIONS=""
+MONGODB_USER="mongodb"
+MONGODB_EXEC="/usr/bin/mongod"
+MONGODB_IP="127.0.0.1"
+MONGODB_PORT="27012"
+MONGODB_OPTIONS="--rest --dbpath /var/lib/mongodb"

diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mongodb.initd
index e2614dc..2684359 100644
--- a/dev-db/mongodb/files/mongodb.initd
+++ b/dev-db/mongodb/files/mongodb.initd
@@ -8,23 +8,24 @@ depend() {
 }
 
 start() {
+	mkdir -p /var/run/mongodb
+	chown ${MONGODB_USER}: /var/run/mongodb
+
 	ebegin "Starting ${SVCNAME}"
 	start-stop-daemon --background --start --make-pidfile \
+		--pidfile /var/run/mongodb/${SVCNAME}.pid \
 		--user ${MONGODB_USER:-mongodb} \
-		--pidfile "${MONGODB_PID_FILE:-/var/run/mongodb/mongodb.pid}" \
 		--exec ${MONGODB_EXEC:-/usr/bin/mongod} \
 		-- \
-		--dbpath "${MONGODB_DATA:-/var/lib/mongodb}" \
-		--port ${MONGODB_PORT:-27017} \
 		--bind_ip ${MONGODB_IP:-127.0.0.1} \
-		--logappend --logpath ${MONGODB_LOGPATH:-/var/log/mongodb/server.log} \
-		${MONGODB_OPTIONS} \
-		run
+		--port ${MONGODB_PORT:-27017} \
+		--logappend --logpath /var/log/mongodb/${SVCNAME}.log \
+		${MONGODB_OPTIONS}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile "${MONGODB_PID_FILE:-/var/run/mongodb/mongodb.pid}"
+	start-stop-daemon --stop --pidfile /var/run/mongodb/${SVCNAME}.pid
 	eend $?
 }

diff --git a/dev-db/mongodb/mongodb-1.6.3.ebuild b/dev-db/mongodb/mongodb-1.6.3.ebuild
deleted file mode 100644
index 8640850..0000000
--- a/dev-db/mongodb/mongodb-1.6.3.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-SCONS_MIN_VERSION="1.2.0-r1"
-MY_P="${PN}-src-r${PV}"
-
-inherit eutils scons-utils versionator
-
-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=""
-
-RDEPEND="
-	dev-lang/spidermonkey[unicode]
-	dev-libs/boost
-	dev-libs/libpcre
-	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
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-fix-scons.patch"
-}
-
-src_compile() {
-	escons all || die "Compile failed"
-}
-
-src_install() {
-	escons --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() {
-	escons smoke --smokedbprefix='testdir' test || die "Tests failed"
-}

diff --git a/dev-db/mongodb/mongodb-1.7.5.ebuild b/dev-db/mongodb/mongodb-1.7.5.ebuild
deleted file mode 100644
index c25a8a4..0000000
--- a/dev-db/mongodb/mongodb-1.7.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-SCONS_MIN_VERSION="1.2.0-r1"
-MY_P="${PN}-src-r${PV}"
-
-inherit eutils scons-utils versionator
-
-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=""
-
-RDEPEND="
-	dev-lang/spidermonkey[unicode]
-	dev-libs/boost
-	dev-libs/libpcre
-	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
-}
-
-#src_prepare() {
-#	epatch "${FILESDIR}/${PN}-1.6.3-fix-scons.patch"
-#}
-
-src_compile() {
-	escons all || die "Compile failed"
-}
-
-src_install() {
-	escons --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() {
-	escons smoke --smokedbprefix='testdir' test || die "Tests failed"
-}

diff --git a/dev-db/mongodb/mongodb-1.8.0_rc1.ebuild b/dev-db/mongodb/mongodb-1.8.0_rc1.ebuild
deleted file mode 100644
index 25f1299..0000000
--- a/dev-db/mongodb/mongodb-1.8.0_rc1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-SCONS_MIN_VERSION="1.2.0-r1"
-MY_P="${PN}-src-r${PV/_rc/-rc}"
-
-inherit eutils scons-utils versionator
-
-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=""
-
-RDEPEND="
-	dev-lang/spidermonkey[unicode]
-	dev-libs/boost
-	dev-libs/libpcre
-	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
-}
-
-#src_prepare() {
-#	epatch "${FILESDIR}/${PN}-1.6.3-fix-scons.patch"
-#}
-
-src_compile() {
-	escons all || die "Compile failed"
-}
-
-src_install() {
-	escons --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() {
-	escons smoke --smokedbprefix='testdir' test || die "Tests failed"
-}

diff --git a/dev-db/mongodb/mongodb-1.8.0.ebuild b/dev-db/mongodb/mongodb-1.8.1.ebuild
similarity index 58%
rename from dev-db/mongodb/mongodb-1.8.0.ebuild
rename to dev-db/mongodb/mongodb-1.8.1.ebuild
index 3849f20..74b7af6 100644
--- a/dev-db/mongodb/mongodb-1.8.0.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.1.ebuild
@@ -16,36 +16,50 @@ SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz"
 LICENSE="AGPL-3 Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="v8"
 
-RDEPEND="
-	dev-lang/spidermonkey[unicode]
+RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.9.2.15 )
+	v8? ( dev-lang/v8 )
 	dev-libs/boost
-	dev-libs/libpcre
-	net-libs/libpcap
-"
+	dev-libs/libpcre[cxx]
+	net-libs/libpcap"
 
 DEPEND="${RDEPEND}
 	sys-libs/readline
-	sys-libs/ncurses
-"
+	sys-libs/ncurses"
 
 S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+	if use v8; then
+		scons_opts="--usev8"
+	else
+		scons_opts="--usesm"
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.8.1-fix-scons.patch"
+
+	if use v8; then
+		# Suppress known test failure with v8:
+		# http://jira.mongodb.org/browse/SERVER-1147
+		sed -e '/add< NumberLong >/d' -i dbtests/jstests.cpp || die
+	fi
 }
 
 src_compile() {
-	escons all || die "Compile failed"
+	escons ${scons_opts} all || die "Compile failed"
 }
 
 src_install() {
-	escons --full --nostrip install --prefix="${D}"/usr || die "Install failed"
+	scons ${scons_opts} --full --nostrip install --prefix="${D}"/usr || die "Install failed"
 
 	for x in /var/{lib,log,run}/${PN}; do
-		dodir "${x}" || die "Install failed"
+		dodir "${x}"
 		fowners mongodb:mongodb "${x}"
 	done
 
@@ -57,5 +71,5 @@ src_install() {
 }
 
 src_test() {
-	escons smoke --smokedbprefix='testdir' test || die "Tests failed"
+	scons ${scons_opts} smoke --smokedbprefix='testdir' test || die "Tests failed"
 }



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/betagarden:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2011-04-12  8:56 Benedikt Boehm
  0 siblings, 0 replies; 4+ messages in thread
From: Benedikt Boehm @ 2011-04-12  8:56 UTC (permalink / raw
  To: gentoo-commits

commit:     69a87cd700c5fb414e2d1928001abc9fcb1cfb98
Author:     Benedikt Böhm <bb <AT> xnull <DOT> de>
AuthorDate: Tue Apr 12 08:55:51 2011 +0000
Commit:     Benedikt Boehm <hollow <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 08:55:51 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=69a87cd7

sync with ultrabug overlay

---
 ...fix-scons.patch => mongodb-1.8-fix-scons.patch} |   40 ++++++++-------
 dev-db/mongodb/files/mongodb.confd                 |   12 +++-
 dev-db/mongodb/files/mongodb.initd                 |   12 +++--
 dev-db/mongodb/files/mongos.confd                  |   13 +++++
 dev-db/mongodb/files/mongos.initd                  |   43 ++++++++++++++++
 dev-db/mongodb/mongodb-1.8.1.ebuild                |   53 ++++++++++++-------
 6 files changed, 126 insertions(+), 47 deletions(-)

diff --git a/dev-db/mongodb/files/mongodb-1.8.1-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
similarity index 52%
rename from dev-db/mongodb/files/mongodb-1.8.1-fix-scons.patch
rename to dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
index 25a6a6f..3d2996a 100644
--- a/dev-db/mongodb/files/mongodb-1.8.1-fix-scons.patch
+++ b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
@@ -1,29 +1,23 @@
-From 4ce35e34e646b6ccf151449bd2b47cef543152e5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Benedikt=20B=C3=B6hm?= <bb@xnull.de>
-Date: Fri, 8 Apr 2011 16:33:37 +0200
-Subject: [PATCH] fix scons
-
----
- SConstruct |    5 ++---
- 1 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/SConstruct b/SConstruct
-index 41383b1..35c7ea6 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -671,9 +671,10 @@ if nix:
+--- 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" )
      # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
      if linux:
 -        env.Append( CPPFLAGS=" -Werror " )
          env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's
-+    env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
++    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=[] )
  
-@@ -687,8 +688,6 @@ if nix:
+@@ -683,12 +684,11 @@
+ 
+     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
@@ -32,6 +26,14 @@ index 41383b1..35c7ea6 100644
          #env.Append( CPPFLAGS=" -fprofile-generate" )
          #env.Append( LINKFLAGS=" -fprofile-generate" )
          # then:
--- 
-1.7.3.4
-
+@@ -911,8 +911,8 @@
+                 
+         myCheckLib( J , True )
+         mozHeader = "js"
+-        if bigLibString(myenv).find( "mozjs" ) >= 0:
+-            mozHeader = "mozjs"
++        env.Append( CPPPATH=["/usr/include/nspr"] )
++        env.Append( CPPDEFINES=[ "XULRUNNER" ] )
+ 
+         if not conf.CheckHeader( mozHeader + "/jsapi.h" ):
+             if conf.CheckHeader( "jsapi.h" ):

diff --git a/dev-db/mongodb/files/mongodb.confd b/dev-db/mongodb/files/mongodb.confd
index 2e087ac..9b3a438 100644
--- a/dev-db/mongodb/files/mongodb.confd
+++ b/dev-db/mongodb/files/mongodb.confd
@@ -1,5 +1,11 @@
-MONGODB_USER="mongodb"
+# Mongodb essentials
 MONGODB_EXEC="/usr/bin/mongod"
+MONGODB_RUN="/var/run/mongodb"
+MONGODB_DATA="/var/lib/mongodb"
+MONGODB_USER="mongodb"
+
 MONGODB_IP="127.0.0.1"
-MONGODB_PORT="27012"
-MONGODB_OPTIONS="--rest --dbpath /var/lib/mongodb"
+MONGODB_PORT="27017"
+
+# Set extra options here, such as disabling the admin web server
+MONGODB_OPTIONS="--journal"

diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mongodb.initd
index 2684359..9e105e4 100644
--- a/dev-db/mongodb/files/mongodb.initd
+++ b/dev-db/mongodb/files/mongodb.initd
@@ -8,17 +8,19 @@ depend() {
 }
 
 start() {
-	mkdir -p /var/run/mongodb
-	chown ${MONGODB_USER}: /var/run/mongodb
+	mkdir -p ${MONGODB_RUN:-/var/run/mongodb}
+	chown ${MONGODB_USER:-mongodb}: ${MONGODB_RUN:-/var/run/mongodb}
 
 	ebegin "Starting ${SVCNAME}"
 	start-stop-daemon --background --start --make-pidfile \
-		--pidfile /var/run/mongodb/${SVCNAME}.pid \
-		--user ${MONGODB_USER:-mongodb} \
+		--pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
+		--chuid ${MONGODB_USER:-mongodb} \
 		--exec ${MONGODB_EXEC:-/usr/bin/mongod} \
 		-- \
 		--bind_ip ${MONGODB_IP:-127.0.0.1} \
 		--port ${MONGODB_PORT:-27017} \
+		--dbpath ${MONGODB_DATA:-/var/lib/mongodb} \
+		--unixSocketPrefix ${MONGODB_RUN:-/var/run/mongodb} \
 		--logappend --logpath /var/log/mongodb/${SVCNAME}.log \
 		${MONGODB_OPTIONS}
 	eend $?
@@ -26,6 +28,6 @@ start() {
 
 stop() {
 	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile /var/run/mongodb/${SVCNAME}.pid
+	start-stop-daemon --stop --pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid
 	eend $?
 }

diff --git a/dev-db/mongodb/files/mongos.confd b/dev-db/mongodb/files/mongos.confd
new file mode 100644
index 0000000..44cbad8
--- /dev/null
+++ b/dev-db/mongodb/files/mongos.confd
@@ -0,0 +1,13 @@
+# Mongos essentials
+MONGOS_EXEC="/usr/bin/mongos"
+MONGOS_RUN="/var/run/mongodb"
+MONGOS_USER="mongodb"
+
+MONGOS_IP="127.0.0.1"
+MONGOS_PORT="27019"
+
+# 1 to 3 comma separated config servers (mendatory)
+MONGOS_CONFIGDB=""
+
+# Set extra options here
+MONGOS_OPTIONS=""

diff --git a/dev-db/mongodb/files/mongos.initd b/dev-db/mongodb/files/mongos.initd
new file mode 100644
index 0000000..90e2661
--- /dev/null
+++ b/dev-db/mongodb/files/mongos.initd
@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ -z "${MONGOS_CONFIGDB}" ]; then
+		eerror "MONGOS_CONFIGDB is not defined, check your configuration file !"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	checkconfig || return 1
+
+	mkdir -p ${MONGODB_RUN:-/var/run/mongodb}
+	chown ${MONGODB_USER:-mongodb}: ${MONGODB_RUN:-/var/run/mongodb}
+
+	ebegin "Starting ${SVCNAME}"
+	start-stop-daemon --background --start --make-pidfile \
+		--pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
+		--chuid ${MONGOS_USER:-mongodb} \
+		--exec ${MONGOS_EXEC:-/usr/bin/mongos} \
+		-- \
+		--bind_ip ${MONGOS_IP:-127.0.0.1} \
+		--port ${MONGOS_PORT:-27018} \
+		--unixSocketPrefix ${MONGOS_RUN:-/var/run/mongodb} \
+		--logappend --logpath /var/log/mongodb/${SVCNAME}.log \
+		--configdb ${MONGOS_CONFIGDB} \
+		${MONGOS_OPTIONS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	start-stop-daemon --stop --pidfile ${MONGOS_RUN:-/var/run/mongodb}/${SVCNAME}.pid
+	eend $?
+}
\ No newline at end of file

diff --git a/dev-db/mongodb/mongodb-1.8.1.ebuild b/dev-db/mongodb/mongodb-1.8.1.ebuild
index 74b7af6..e0b20dd 100644
--- a/dev-db/mongodb/mongodb-1.8.1.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
-
+EAPI=3
 SCONS_MIN_VERSION="1.2.0"
-MY_P="${PN}-src-r${PV/_rc/-rc}"
 
-inherit eutils scons-utils versionator
+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"
@@ -16,14 +16,13 @@ SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz"
 LICENSE="AGPL-3 Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="v8"
+IUSE="static-libs v8"
 
-RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.9.2.15 )
+RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.9 )
 	v8? ( dev-lang/v8 )
 	dev-libs/boost
 	dev-libs/libpcre[cxx]
 	net-libs/libpcap"
-
 DEPEND="${RDEPEND}
 	sys-libs/readline
 	sys-libs/ncurses"
@@ -34,32 +33,35 @@ pkg_setup() {
 	enewgroup mongodb
 	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
 
+	scons_opts=""
+	use static-libs || scons_opts+=" --sharedclient"
 	if use v8; then
-		scons_opts="--usev8"
+		scons_opts+=" --usev8"
 	else
-		scons_opts="--usesm"
+		scons_opts+=" --usesm"
 	fi
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.8.1-fix-scons.patch"
-
-	if use v8; then
-		# Suppress known test failure with v8:
-		# http://jira.mongodb.org/browse/SERVER-1147
-		sed -e '/add< NumberLong >/d' -i dbtests/jstests.cpp || die
-	fi
+	epatch "${FILESDIR}/${PN}-1.8-fix-scons.patch"
 }
 
 src_compile() {
 	escons ${scons_opts} all || die "Compile failed"
 }
 
+pkg_preinst() {
+	has_version '<dev-db/mongodb-1.8'
+	PREVIOUS_LESS_THAN_1_8=$?
+}
+
 src_install() {
-	scons ${scons_opts} --full --nostrip install --prefix="${D}"/usr || die "Install failed"
+	escons ${scons_opts} --full --nostrip install --prefix="${D}"/usr || die "Install failed"
+
+	use static-libs || rm "${D}/usr/$(get_libdir)/libmongoclient.a"
 
 	for x in /var/{lib,log,run}/${PN}; do
-		dodir "${x}"
+		keepdir "${x}" || die "Install failed"
 		fowners mongodb:mongodb "${x}"
 	done
 
@@ -68,8 +70,19 @@ src_install() {
 
 	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die "Install failed"
 	newconfd "${FILESDIR}/${PN}.confd" ${PN} || die "Install failed"
+	newinitd "${FILESDIR}/${PN/db/s}.initd" ${PN/db/s} || die "Install failed"
+	newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s} || die "Install failed"
 }
 
 src_test() {
-	scons ${scons_opts} smoke --smokedbprefix='testdir' test || die "Tests failed"
+	escons ${scons_opts} test || die "Build test failed"
+	${S}/test --dbpath=unittest || die "Tests failed"
 }
+
+pkg_postinst() {
+	if [ ${PREVIOUS_LESS_THAN_1_8} -eq 0 ]; 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}.conf"
+}
\ No newline at end of file



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/betagarden:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2011-04-13 14:57 Alexys Jacob
  0 siblings, 0 replies; 4+ messages in thread
From: Alexys Jacob @ 2011-04-13 14:57 UTC (permalink / raw
  To: gentoo-commits

commit:     d617443ea59997a9c144f3422cc7fc6420b44660
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 14:57:50 2011 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 14:57:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=d617443e

fixed in g-x86

---
 dev-db/mongodb/files/mongodb-1.8-fix-scons.patch |   39 ----------
 dev-db/mongodb/files/mongodb.confd               |   11 ---
 dev-db/mongodb/files/mongodb.initd               |   33 --------
 dev-db/mongodb/files/mongos.confd                |   13 ---
 dev-db/mongodb/files/mongos.initd                |   43 -----------
 dev-db/mongodb/mongodb-1.8.1.ebuild              |   88 ----------------------
 6 files changed, 0 insertions(+), 227 deletions(-)

diff --git a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
deleted file mode 100644
index 3d2996a..0000000
--- a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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" )
-     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
-     if linux:
--        env.Append( CPPFLAGS=" -Werror " )
-         env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's
-+    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=[] )
- 
-@@ -683,12 +684,11 @@
- 
-     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( CPPFLAGS=" -fprofile-generate" )
-         #env.Append( LINKFLAGS=" -fprofile-generate" )
-         # then:
-@@ -911,8 +911,8 @@
-                 
-         myCheckLib( J , True )
-         mozHeader = "js"
--        if bigLibString(myenv).find( "mozjs" ) >= 0:
--            mozHeader = "mozjs"
-+        env.Append( CPPPATH=["/usr/include/nspr"] )
-+        env.Append( CPPDEFINES=[ "XULRUNNER" ] )
- 
-         if not conf.CheckHeader( mozHeader + "/jsapi.h" ):
-             if conf.CheckHeader( "jsapi.h" ):

diff --git a/dev-db/mongodb/files/mongodb.confd b/dev-db/mongodb/files/mongodb.confd
deleted file mode 100644
index 9b3a438..0000000
--- a/dev-db/mongodb/files/mongodb.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# Mongodb essentials
-MONGODB_EXEC="/usr/bin/mongod"
-MONGODB_RUN="/var/run/mongodb"
-MONGODB_DATA="/var/lib/mongodb"
-MONGODB_USER="mongodb"
-
-MONGODB_IP="127.0.0.1"
-MONGODB_PORT="27017"
-
-# Set extra options here, such as disabling the admin web server
-MONGODB_OPTIONS="--journal"

diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mongodb.initd
deleted file mode 100644
index 9e105e4..0000000
--- a/dev-db/mongodb/files/mongodb.initd
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-depend() {
-	need net
-}
-
-start() {
-	mkdir -p ${MONGODB_RUN:-/var/run/mongodb}
-	chown ${MONGODB_USER:-mongodb}: ${MONGODB_RUN:-/var/run/mongodb}
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --background --start --make-pidfile \
-		--pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
-		--chuid ${MONGODB_USER:-mongodb} \
-		--exec ${MONGODB_EXEC:-/usr/bin/mongod} \
-		-- \
-		--bind_ip ${MONGODB_IP:-127.0.0.1} \
-		--port ${MONGODB_PORT:-27017} \
-		--dbpath ${MONGODB_DATA:-/var/lib/mongodb} \
-		--unixSocketPrefix ${MONGODB_RUN:-/var/run/mongodb} \
-		--logappend --logpath /var/log/mongodb/${SVCNAME}.log \
-		${MONGODB_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid
-	eend $?
-}

diff --git a/dev-db/mongodb/files/mongos.confd b/dev-db/mongodb/files/mongos.confd
deleted file mode 100644
index 44cbad8..0000000
--- a/dev-db/mongodb/files/mongos.confd
+++ /dev/null
@@ -1,13 +0,0 @@
-# Mongos essentials
-MONGOS_EXEC="/usr/bin/mongos"
-MONGOS_RUN="/var/run/mongodb"
-MONGOS_USER="mongodb"
-
-MONGOS_IP="127.0.0.1"
-MONGOS_PORT="27019"
-
-# 1 to 3 comma separated config servers (mendatory)
-MONGOS_CONFIGDB=""
-
-# Set extra options here
-MONGOS_OPTIONS=""

diff --git a/dev-db/mongodb/files/mongos.initd b/dev-db/mongodb/files/mongos.initd
deleted file mode 100644
index 90e2661..0000000
--- a/dev-db/mongodb/files/mongos.initd
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ -z "${MONGOS_CONFIGDB}" ]; then
-		eerror "MONGOS_CONFIGDB is not defined, check your configuration file !"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	mkdir -p ${MONGODB_RUN:-/var/run/mongodb}
-	chown ${MONGODB_USER:-mongodb}: ${MONGODB_RUN:-/var/run/mongodb}
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --background --start --make-pidfile \
-		--pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
-		--chuid ${MONGOS_USER:-mongodb} \
-		--exec ${MONGOS_EXEC:-/usr/bin/mongos} \
-		-- \
-		--bind_ip ${MONGOS_IP:-127.0.0.1} \
-		--port ${MONGOS_PORT:-27018} \
-		--unixSocketPrefix ${MONGOS_RUN:-/var/run/mongodb} \
-		--logappend --logpath /var/log/mongodb/${SVCNAME}.log \
-		--configdb ${MONGOS_CONFIGDB} \
-		${MONGOS_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile ${MONGOS_RUN:-/var/run/mongodb}/${SVCNAME}.pid
-	eend $?
-}
\ No newline at end of file

diff --git a/dev-db/mongodb/mongodb-1.8.1.ebuild b/dev-db/mongodb/mongodb-1.8.1.ebuild
deleted file mode 100644
index dc1987a..0000000
--- a/dev-db/mongodb/mongodb-1.8.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-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.9 )
-	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=""
-	use static-libs || scons_opts+=" --sharedclient"
-	if use v8; then
-		scons_opts+=" --usev8"
-	else
-		scons_opts+=" --usesm"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.8-fix-scons.patch"
-}
-
-src_compile() {
-	escons ${scons_opts} all || die "Compile failed"
-}
-
-pkg_preinst() {
-	has_version '<dev-db/mongodb-1.8'
-	PREVIOUS_LESS_THAN_1_8=$?
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${D}"/usr || die "Install failed"
-
-	use static-libs || rm "${D}/usr/$(get_libdir)/libmongoclient.a"
-
-	for x in /var/{lib,log,run}/${PN}; do
-		keepdir "${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"
-	newinitd "${FILESDIR}/${PN/db/s}.initd" ${PN/db/s} || die "Install failed"
-	newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s} || die "Install failed"
-}
-
-src_test() {
-	escons ${scons_opts} test || die "Build test failed"
-	${S}/test --dbpath=unittest || die "Tests failed"
-}
-
-pkg_postinst() {
-	if [ ${PREVIOUS_LESS_THAN_1_8} -eq 0 ]; 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}.conf"
-}



^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] proj/betagarden:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2011-04-14  9:19 Benedikt Boehm
  0 siblings, 0 replies; 4+ messages in thread
From: Benedikt Boehm @ 2011-04-14  9:19 UTC (permalink / raw
  To: gentoo-commits

commit:     af14dac2386bb23b1cbd84d46d05dd6f578ff8c7
Author:     Benedikt Böhm <bb <AT> xnull <DOT> de>
AuthorDate: Thu Apr 14 09:18:28 2011 +0000
Commit:     Benedikt Boehm <hollow <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 09:18:28 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=af14dac2

remove dev-db/mongodb (has been synced to the main tree)

---
 dev-db/mongodb/files/mongodb-1.8-fix-scons.patch |   39 ----------
 dev-db/mongodb/files/mongodb.confd               |   11 ---
 dev-db/mongodb/files/mongodb.initd               |   33 --------
 dev-db/mongodb/files/mongos.confd                |   13 ---
 dev-db/mongodb/files/mongos.initd                |   43 -----------
 dev-db/mongodb/mongodb-1.8.1.ebuild              |   88 ----------------------
 6 files changed, 0 insertions(+), 227 deletions(-)

diff --git a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
deleted file mode 100644
index 3d2996a..0000000
--- a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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" )
-     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
-     if linux:
--        env.Append( CPPFLAGS=" -Werror " )
-         env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's
-+    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=[] )
- 
-@@ -683,12 +684,11 @@
- 
-     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( CPPFLAGS=" -fprofile-generate" )
-         #env.Append( LINKFLAGS=" -fprofile-generate" )
-         # then:
-@@ -911,8 +911,8 @@
-                 
-         myCheckLib( J , True )
-         mozHeader = "js"
--        if bigLibString(myenv).find( "mozjs" ) >= 0:
--            mozHeader = "mozjs"
-+        env.Append( CPPPATH=["/usr/include/nspr"] )
-+        env.Append( CPPDEFINES=[ "XULRUNNER" ] )
- 
-         if not conf.CheckHeader( mozHeader + "/jsapi.h" ):
-             if conf.CheckHeader( "jsapi.h" ):

diff --git a/dev-db/mongodb/files/mongodb.confd b/dev-db/mongodb/files/mongodb.confd
deleted file mode 100644
index 9b3a438..0000000
--- a/dev-db/mongodb/files/mongodb.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# Mongodb essentials
-MONGODB_EXEC="/usr/bin/mongod"
-MONGODB_RUN="/var/run/mongodb"
-MONGODB_DATA="/var/lib/mongodb"
-MONGODB_USER="mongodb"
-
-MONGODB_IP="127.0.0.1"
-MONGODB_PORT="27017"
-
-# Set extra options here, such as disabling the admin web server
-MONGODB_OPTIONS="--journal"

diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mongodb.initd
deleted file mode 100644
index 9e105e4..0000000
--- a/dev-db/mongodb/files/mongodb.initd
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-depend() {
-	need net
-}
-
-start() {
-	mkdir -p ${MONGODB_RUN:-/var/run/mongodb}
-	chown ${MONGODB_USER:-mongodb}: ${MONGODB_RUN:-/var/run/mongodb}
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --background --start --make-pidfile \
-		--pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
-		--chuid ${MONGODB_USER:-mongodb} \
-		--exec ${MONGODB_EXEC:-/usr/bin/mongod} \
-		-- \
-		--bind_ip ${MONGODB_IP:-127.0.0.1} \
-		--port ${MONGODB_PORT:-27017} \
-		--dbpath ${MONGODB_DATA:-/var/lib/mongodb} \
-		--unixSocketPrefix ${MONGODB_RUN:-/var/run/mongodb} \
-		--logappend --logpath /var/log/mongodb/${SVCNAME}.log \
-		${MONGODB_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid
-	eend $?
-}

diff --git a/dev-db/mongodb/files/mongos.confd b/dev-db/mongodb/files/mongos.confd
deleted file mode 100644
index 44cbad8..0000000
--- a/dev-db/mongodb/files/mongos.confd
+++ /dev/null
@@ -1,13 +0,0 @@
-# Mongos essentials
-MONGOS_EXEC="/usr/bin/mongos"
-MONGOS_RUN="/var/run/mongodb"
-MONGOS_USER="mongodb"
-
-MONGOS_IP="127.0.0.1"
-MONGOS_PORT="27019"
-
-# 1 to 3 comma separated config servers (mendatory)
-MONGOS_CONFIGDB=""
-
-# Set extra options here
-MONGOS_OPTIONS=""

diff --git a/dev-db/mongodb/files/mongos.initd b/dev-db/mongodb/files/mongos.initd
deleted file mode 100644
index 90e2661..0000000
--- a/dev-db/mongodb/files/mongos.initd
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-depend() {
-	need net
-}
-
-checkconfig() {
-	if [ -z "${MONGOS_CONFIGDB}" ]; then
-		eerror "MONGOS_CONFIGDB is not defined, check your configuration file !"
-		return 1
-	fi
-	return 0
-}
-
-start() {
-	checkconfig || return 1
-
-	mkdir -p ${MONGODB_RUN:-/var/run/mongodb}
-	chown ${MONGODB_USER:-mongodb}: ${MONGODB_RUN:-/var/run/mongodb}
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --background --start --make-pidfile \
-		--pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
-		--chuid ${MONGOS_USER:-mongodb} \
-		--exec ${MONGOS_EXEC:-/usr/bin/mongos} \
-		-- \
-		--bind_ip ${MONGOS_IP:-127.0.0.1} \
-		--port ${MONGOS_PORT:-27018} \
-		--unixSocketPrefix ${MONGOS_RUN:-/var/run/mongodb} \
-		--logappend --logpath /var/log/mongodb/${SVCNAME}.log \
-		--configdb ${MONGOS_CONFIGDB} \
-		${MONGOS_OPTIONS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile ${MONGOS_RUN:-/var/run/mongodb}/${SVCNAME}.pid
-	eend $?
-}
\ No newline at end of file

diff --git a/dev-db/mongodb/mongodb-1.8.1.ebuild b/dev-db/mongodb/mongodb-1.8.1.ebuild
deleted file mode 100644
index dc1987a..0000000
--- a/dev-db/mongodb/mongodb-1.8.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-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.9 )
-	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=""
-	use static-libs || scons_opts+=" --sharedclient"
-	if use v8; then
-		scons_opts+=" --usev8"
-	else
-		scons_opts+=" --usesm"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.8-fix-scons.patch"
-}
-
-src_compile() {
-	escons ${scons_opts} all || die "Compile failed"
-}
-
-pkg_preinst() {
-	has_version '<dev-db/mongodb-1.8'
-	PREVIOUS_LESS_THAN_1_8=$?
-}
-
-src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${D}"/usr || die "Install failed"
-
-	use static-libs || rm "${D}/usr/$(get_libdir)/libmongoclient.a"
-
-	for x in /var/{lib,log,run}/${PN}; do
-		keepdir "${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"
-	newinitd "${FILESDIR}/${PN/db/s}.initd" ${PN/db/s} || die "Install failed"
-	newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s} || die "Install failed"
-}
-
-src_test() {
-	escons ${scons_opts} test || die "Build test failed"
-	${S}/test --dbpath=unittest || die "Tests failed"
-}
-
-pkg_postinst() {
-	if [ ${PREVIOUS_LESS_THAN_1_8} -eq 0 ]; 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}.conf"
-}



^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2011-04-14  9:19 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-12  8:56 [gentoo-commits] proj/betagarden:master commit in: dev-db/mongodb/files/, dev-db/mongodb/ Benedikt Boehm
  -- strict thread matches above, loose matches on Subject: below --
2011-04-14  9:19 Benedikt Boehm
2011-04-13 14:57 Alexys Jacob
2011-04-08 17:34 Benedikt Boehm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox