* [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2011-04-11 12:36 Alexys Jacob
0 siblings, 0 replies; 16+ messages in thread
From: Alexys Jacob @ 2011-04-11 12:36 UTC (permalink / raw
To: gentoo-commits
commit: d7e66fc7e95962d29b39836af13a04ecf177269f
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 12:36:48 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 12:36:48 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=d7e66fc7
fix init.d and test phase
---
dev-db/mongodb/Manifest | 4 ++--
dev-db/mongodb/files/mongodb.initd | 2 +-
dev-db/mongodb/mongodb-1.8.1.ebuild | 15 +++++++--------
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 15f2f0a..3734021 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,5 +1,5 @@
AUX mongodb-1.8-fix-scons.patch 1649 RMD160 1e5be2fe75f25c511b1d70dd1dd7977c8f1a6db3 SHA1 1300bbc5ff4f9c4a59e89fb3e119506b3507906d SHA256 5b8db8f66adabbdd52c364a713ce38a937c4ac6282a4ac530d14930d386d582d
AUX mongodb.confd 246 RMD160 fee0f87d5f6715b237d7195ea6dfd24a50868102 SHA1 dd786ce383ea3a112352f5b48e4948dd3377b009 SHA256 5dd09535664bd7bc9d0e927896f8e768f225c43c1d84bde9812cb36866f1f587
-AUX mongodb.initd 754 RMD160 c63b5ff46124c0fbddcfdf82d9a83cb7a8f529af SHA1 30b33e0ea5affda165eb17f0b4abdd518838f2a5 SHA256 56028d6e9c71781c9e27a0d1240c8c895341fa7893bec745b806c6092a86cd19
+AUX mongodb.initd 738 RMD160 ba740896d73b19544a73d0ffbab3c3849d822692 SHA1 cc5fbd32849cab99e2bb5395ad1229e6087a7a88 SHA256 9247f210bd43f4efd7a8c9b046d6e5f4eeed3acbc736c351f57557277cf71d06
DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af4365c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d
-EBUILD mongodb-1.8.1.ebuild 2212 RMD160 2aea5d023d13c15ec14835d6371f813ff4e88097 SHA1 54ebbd00e2b5f1bdb5de76c7a71221056079db09 SHA256 9ada9b1b751d53ec8524689a367b193714643adad3a92891581cc8b0d23c8667
+EBUILD mongodb-1.8.1.ebuild 2040 RMD160 2b98f57a23aedfab3f73bb4428d5c238ac5fb77e SHA1 a8560252110fc80122044fe9b009e4425d37b561 SHA256 8908e7fbd1c1855e9f536775baf09ca6ddacbe74ff9c43162958f16444e00b99
diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mongodb.initd
index f023058..189cfae 100644
--- a/dev-db/mongodb/files/mongodb.initd
+++ b/dev-db/mongodb/files/mongodb.initd
@@ -17,7 +17,7 @@ start() {
--bind_ip ${MONGODB_IP:-127.0.0.1} \
--port ${MONGODB_PORT:-27017} \
--dbpath ${MONGODB_DATA:-/var/lib/mongodb} \
- --unixSocketPrefix /var/run/${SVCNAME}.sock \
+ --unixSocketPrefix /var/run \
--logappend --logpath /var/log/mongodb/${SVCNAME}.log \
${MONGODB_OPTIONS}
eend $?
diff --git a/dev-db/mongodb/mongodb-1.8.1.ebuild b/dev-db/mongodb/mongodb-1.8.1.ebuild
index 9cdc7c1..228c419 100644
--- a/dev-db/mongodb/mongodb-1.8.1.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.1.ebuild
@@ -1,13 +1,12 @@
# 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.6.0.ebuild,v 1.2 2011/02/02 18:14:42 phajdan.jr Exp $
+# $Header: $
EAPI=3
inherit eutils multilib versionator
-MY_PATCHVER=$(get_version_component_range 1-2)
-MY_P="${PN}-src-r${PV}"
+MY_P="${PN}-src-r${PV/_rc/-rc}"
DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
HOMEPAGE="http://www.mongodb.org"
@@ -73,15 +72,15 @@ src_install() {
newconfd "${FILESDIR}/${PN}.confd" ${PN} || die "Install failed"
}
-# FIXME: test phase depends on pymongo which is not in tree
-# src_test() {
- #scons ${scons_opts} smoke --smokedbprefix='testdir' test || die "Tests failed"
-# }
+src_test() {
+ scons ${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 set as default, see ${CONFDIR}/${PN}."
+ 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] 16+ messages in thread* [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2014-05-14 9:19 Alexys Jacob
0 siblings, 0 replies; 16+ messages in thread
From: Alexys Jacob @ 2014-05-14 9:19 UTC (permalink / raw
To: gentoo-commits
commit: 72ba8b0ff7167ad2ee4b79bc73d65823063717e3
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Wed May 14 09:19:26 2014 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Wed May 14 09:19:26 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=72ba8b0f
moved to g-x86
---
dev-db/mongodb/files/mms-agent.initd-r2 | 24 ---
dev-db/mongodb/files/mongodb-2.6.1-fix-scons.patch | 35 -----
dev-db/mongodb/files/mongodb.conf-r2 | 33 -----
dev-db/mongodb/files/mongodb.confd-r2 | 12 --
dev-db/mongodb/files/mongodb.initd-r2 | 26 ----
dev-db/mongodb/files/mongos.conf-r2 | 30 ----
dev-db/mongodb/files/mongos.confd-r2 | 12 --
dev-db/mongodb/files/mongos.initd-r2 | 26 ----
dev-db/mongodb/mongodb-2.6.1.ebuild | 164 ---------------------
9 files changed, 362 deletions(-)
diff --git a/dev-db/mongodb/files/mms-agent.initd-r2 b/dev-db/mongodb/files/mms-agent.initd-r2
deleted file mode 100644
index ca645b0..0000000
--- a/dev-db/mongodb/files/mms-agent.initd-r2
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mms-agent.initd-r1,v 1.1 2014/04/09 15:40:20 ultrabug Exp $
-
-logfile=/var/log/mongodb/mms-agent.log
-run_dir=${run_dir:-/run/mongodb}
-
-command="/usr/bin/python2 agent.py &>${logfile}"
-command_background="true"
-
-pidfile=${run_dir}/${SVCNAME}.pid
-user=${user:-mongodb}
-group=${group:-mongodb}
-
-depend() {
- need net
- use syslog
-}
-
-start_pre() {
- checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
- cd /opt/mms-agent
-}
diff --git a/dev-db/mongodb/files/mongodb-2.6.1-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.6.1-fix-scons.patch
deleted file mode 100644
index 031d843..0000000
--- a/dev-db/mongodb/files/mongodb-2.6.1-fix-scons.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git SConstruct SConstruct
-index 3886d1b..81c59a9 100644
---- SConstruct
-+++ SConstruct
-@@ -811,19 +811,17 @@ if nix:
- # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
- env.Append( CCFLAGS=["-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 or darwin:
-- env.Append( CCFLAGS=["-Werror", "-pipe"] )
-
- env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
-- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
- env.Append( LINKFLAGS=["-fPIC", "-pthread"] )
-+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
-+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
-
- # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
- # startup.
-@@ -840,7 +838,7 @@ if nix:
- if not darwin:
- env.Append( LINKFLAGS=["-rdynamic"] )
-
-- env.Append( LIBS=[] )
-+ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
-
- #make scons colorgcc friendly
- for key in ('HOME', 'TERM'):
diff --git a/dev-db/mongodb/files/mongodb.conf-r2 b/dev-db/mongodb/files/mongodb.conf-r2
deleted file mode 100644
index 337e6b6..0000000
--- a/dev-db/mongodb/files/mongodb.conf-r2
+++ /dev/null
@@ -1,33 +0,0 @@
-# !! IMPORTANT !!
-#
-# This file uses the YAML format as described in the documentation:
-# http://docs.mongodb.org/manual/reference/configuration-options/
-
-storage:
- dbPath: "/var/lib/mongodb"
-
-systemLog:
- destination: file
- path: "/var/log/mongodb/mongodb.log"
- quiet: true
- logAppend: true
-
-net:
- port: 27017
- bindIp: 127.0.0.1
- ssl:
- mode: disabled
-
-#security:
- #keyFile:
- #clusterAuthMode:
-
-#replication:
- #replSetName:
-
-# Specifies one of the MongoDB parameters described here:
-# http://docs.mongodb.org/manual/reference/parameters/
-#
-# You can specify multiple setParameter fields such as:
-# setParameter: {enableTestCommands: 1}
-#setParameter:
diff --git a/dev-db/mongodb/files/mongodb.confd-r2 b/dev-db/mongodb/files/mongodb.confd-r2
deleted file mode 100644
index dddb67e..0000000
--- a/dev-db/mongodb/files/mongodb.confd-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-# !! IMPORTANT !!
-#
-# This file is ONLY used to override some of the init script configuration.
-#
-# You should NOT use this file to configure your mongodb instance,
-# see the /etc/mongodb.conf file instead.
-#
-# Available init script modifiers :
-# - config_file : the configuration file to use (default : /etc/mongodb.conf)
-# - user : the user used to run your mongodb instance (default : mongodb)
-# - group : the group used to run your mongodb instance (default : mongodb)
-# - run_dir : the run directory for your PID files (default : /run/mongodb)
diff --git a/dev-db/mongodb/files/mongodb.initd-r2 b/dev-db/mongodb/files/mongodb.initd-r2
deleted file mode 100644
index 68dafb9..0000000
--- a/dev-db/mongodb/files/mongodb.initd-r2
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongodb.initd-r1,v 1.1 2013/08/16 12:54:44 ultrabug Exp $
-
-config_file=${config_file:-/etc/${SVCNAME}.conf}
-run_dir=${run_dir:-/run/mongodb}
-
-command="/usr/bin/mongod"
-command_args="--config ${config_file}"
-command_background="true"
-pidfile=${run_dir}/${SVCNAME}.pid
-user=${user:-mongodb}
-group=${group:-mongodb}
-
-depend() {
- use net
-}
-
-start_pre() {
- checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
- if [ ! -f ${config_file} ]; then
- eerror "Missing configuration file ${config_file}"
- return 1
- fi
-}
diff --git a/dev-db/mongodb/files/mongos.conf-r2 b/dev-db/mongodb/files/mongos.conf-r2
deleted file mode 100644
index fc00689..0000000
--- a/dev-db/mongodb/files/mongos.conf-r2
+++ /dev/null
@@ -1,30 +0,0 @@
-# !! IMPORTANT !!
-#
-# This file uses the YAML format as described in the documentation:
-# http://docs.mongodb.org/manual/reference/configuration-options/
-
-systemLog:
- destination: file
- path: "/var/log/mongodb/mongos.log"
- quiet: true
- logAppend: true
-
-net:
- port: 27017
- bindIp: 127.0.0.1
- ssl:
- mode: disabled
-
-#security:
- #keyFile:
- #clusterAuthMode:
-
-#sharding:
- #configDB:
-
-# Specifies one of the MongoDB parameters described here:
-# http://docs.mongodb.org/manual/reference/parameters/
-#
-# You can specify multiple setParameter fields such as:
-# setParameter: {enableTestCommands: 1}
-#setParameter:
diff --git a/dev-db/mongodb/files/mongos.confd-r2 b/dev-db/mongodb/files/mongos.confd-r2
deleted file mode 100644
index 0dc2a18..0000000
--- a/dev-db/mongodb/files/mongos.confd-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-# !! IMPORTANT !!
-#
-# This file is ONLY used to override some of the init script configuration.
-#
-# You should NOT use this file to configure your mongos instance,
-# see the /etc/mongos.conf file instead.
-#
-# Available init script modifiers :
-# - config_file : the configuration file to use (default : /etc/mongos.conf)
-# - user : the user used to run your mongodb instance (default : mongodb)
-# - group : the group used to run your mongodb instance (default : mongodb)
-# - run_dir : the run directory for your PID files (default : /run/mongodb)
diff --git a/dev-db/mongodb/files/mongos.initd-r2 b/dev-db/mongodb/files/mongos.initd-r2
deleted file mode 100644
index 44d39b0..0000000
--- a/dev-db/mongodb/files/mongos.initd-r2
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongodb.initd-r1,v 1.1 2013/08/16 12:54:44 ultrabug Exp $
-
-config_file=${config_file:-/etc/${SVCNAME}.conf}
-run_dir=${run_dir:-/run/mongodb}
-
-command="/usr/bin/mongos"
-command_args="--config ${config_file}"
-command_background="true"
-pidfile=${run_dir}/${SVCNAME}.pid
-user=${user:-mongodb}
-group=${group:-mongodb}
-
-depend() {
- use net
-}
-
-start_pre() {
- checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
- if [ ! -f ${config_file} ]; then
- eerror "Missing configuration file ${config_file}"
- return 1
- fi
-}
diff --git a/dev-db/mongodb/mongodb-2.6.1.ebuild b/dev-db/mongodb/mongodb-2.6.1.ebuild
deleted file mode 100644
index 35f0769..0000000
--- a/dev-db/mongodb/mongodb-2.6.1.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.10-r1.ebuild,v 1.2 2014/04/09 15:42:11 ultrabug Exp $
-
-EAPI=5
-SCONS_MIN_VERSION="1.2.0"
-CHECKREQS_DISK_BUILD="2400M"
-CHECKREQS_DISK_USR="512M"
-CHECKREQS_MEMORY="1024M"
-
-inherit eutils flag-o-matic multilib scons-utils systemd user versionator check-reqs
-
-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/20140409-mms-monitoring-agent.zip )"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="kerberos mms-agent ssl static-libs"
-
-PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
-RDEPEND="
- app-arch/snappy
- >=dev-cpp/yaml-cpp-0.5.1
- >=dev-libs/boost-1.50[threads(+)]
- >=dev-libs/libpcre-8.30[cxx]
- dev-libs/snowball-stemmer
- dev-util/google-perftools[-minimal]
- net-libs/libpcap
- ssl? ( >=dev-libs/openssl-1.0.1g )"
-DEPEND="${RDEPEND}
- sys-libs/ncurses
- sys-libs/readline
- kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- enewgroup mongodb
- enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
- scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
- scons_opts+=" --use-system-boost"
- scons_opts+=" --use-system-pcre"
- scons_opts+=" --use-system-snappy"
- scons_opts+=" --use-system-stemmer"
- scons_opts+=" --use-system-tcmalloc"
- scons_opts+=" --use-system-yaml"
- scons_opts+=" --usev8"
-
- if use prefix; then
- scons_opts+=" --cpppath=${EPREFIX}/usr/include"
- scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
- fi
-
- if use kerberos; then
- scons_opts+=" --use-sasl-client"
- fi
-
- if use ssl; then
- scons_opts+=" --ssl"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.6.1-fix-scons.patch"
-
- # fix yaml-cpp detection
- sed -i -e "s/\[\"yaml\"\]/\[\"yaml-cpp\"\]/" SConstruct || die
-
- # bug #462606
- sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
-
- # bug #482576
- sed -i -e "/-Werror/d" src/third_party/v8/SConscript || die
-}
-
-src_compile() {
- escons ${scons_opts} all
-}
-
-src_install() {
- escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
-
- use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
-
- for x in /var/{lib,log}/${PN}; do
- keepdir "${x}"
- fowners mongodb:mongodb "${x}"
- done
-
- doman debian/mongo*.1
- dodoc README docs/building.md
-
- newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
- newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
- newinitd "${FILESDIR}/${PN/db/s}.initd-r2" ${PN/db/s}
- newconfd "${FILESDIR}/${PN/db/s}.confd-r2" ${PN/db/s}
-
- insinto /etc
- newins "${FILESDIR}/${PN}.conf-r2" ${PN}.conf
- newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}/${PN}.logrotate" ${PN}
-
- if use mms-agent; then
- local MY_PN="mms-agent"
- local MY_D="/opt/${MY_PN}"
-
- insinto /etc
- newins "${WORKDIR}/${MY_PN}/settings.py" mms-agent.conf
- rm "${WORKDIR}/${MY_PN}/settings.py"
-
- insinto ${MY_D}
- doins "${WORKDIR}/${MY_PN}/"*
- dosym /etc/mms-agent.conf ${MY_D}/settings.py
-
- fowners -R mongodb:mongodb ${MY_D}
- newinitd "${FILESDIR}/${MY_PN}.initd-r2" ${MY_PN}
- fi
-}
-
-pkg_preinst() {
- # wrt bug #461466
- if [[ "$(get_libdir)" == "lib64" ]]; then
- rmdir "${ED}"/usr/lib/ &>/dev/null
- fi
-}
-
-src_test() {
- escons ${scons_opts} test
- "${S}"/test --dbpath=unittest || die
-}
-
-pkg_postinst() {
- if [[ ${REPLACING_VERSIONS} < 3.6 ]]; then
- ewarn "!! IMPORTANT !!"
- ewarn " "
- ewarn "${PN} configuration files have changed !"
- ewarn " "
- ewarn "Make sure you migrate from /etc/conf.d/${PN} to the new YAML standard in /etc/${PN}"
- ewarn " http://docs.mongodb.org/manual/reference/configuration-options/"
- ewarn " "
- ewarn "Make sure you also follow the upgrading process :"
- ewarn " http://docs.mongodb.org/master/release-notes/2.6-upgrade/"
- ewarn " "
- if use mms-agent; then
- ewarn "MMS Agent configuration file has been moved to :"
- ewarn " /etc/mms-agent.conf"
- fi
- else
- if use mms-agent; then
- elog "Edit your MMS Agent configuration file :"
- elog " /etc/mms-agent.conf"
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2014-05-12 15:11 Alexys Jacob
0 siblings, 0 replies; 16+ messages in thread
From: Alexys Jacob @ 2014-05-12 15:11 UTC (permalink / raw
To: gentoo-commits
commit: 635fd3c9ba53e5e2550200b8d924e82368d4f65b
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Mon May 12 15:11:13 2014 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon May 12 15:11:13 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=635fd3c9
work on bug #508190
---
dev-db/mongodb/Manifest | 11 ++
dev-db/mongodb/files/mms-agent.initd-r2 | 24 +++
dev-db/mongodb/files/mongodb-2.6.1-fix-scons.patch | 35 +++++
dev-db/mongodb/files/mongodb.conf-r2 | 33 +++++
dev-db/mongodb/files/mongodb.confd-r2 | 12 ++
dev-db/mongodb/files/mongodb.initd-r2 | 26 ++++
dev-db/mongodb/files/mongos.conf-r2 | 30 ++++
dev-db/mongodb/files/mongos.confd-r2 | 12 ++
dev-db/mongodb/files/mongos.initd-r2 | 26 ++++
dev-db/mongodb/mongodb-2.6.1.ebuild | 164 +++++++++++++++++++++
10 files changed, 373 insertions(+)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index c5a53ce..f6f2ac8 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,16 +1,27 @@
AUX mms-agent.confd 205 SHA256 29e678e722268311fb59f5af57ac3fbadb9e930cd3cb1ce9e4dc33d30e021e40 SHA512 e81e68ebad2d409a9e631de0aaf264eab99b3faa5c313a7c96a6672a6c51d3243100f5ef599bf2a347b4f9e1b1a6ebf95fa890cb614d9745c58430fadd8ee13a WHIRLPOOL 24d98082e138dbcee0a276c4874d88a23f7f53d1bf0f6a7f2e979c005413f14809269622ecd013913221a267eb1fc806130d69915ce5cd38a646b498912ca729
AUX mms-agent.initd 1277 SHA256 fda9a9eb7e2abceef572ffbad0987b74670b6b5e0c50d93f58ef8141825a2cea SHA512 32bdcadf7395f371809b253934f8c3dd0074e6aafccfab091f8bf699524eb32ffdc787b479e08056e2fac933f1627a5f1cc03842a2f8b939f8b68bb2e6da71c2 WHIRLPOOL a9f78afe5286e2762c27ab0a272e4e5719e070cbd9ab5f551ef322346bb3ff46d0b49c76906fe63f8c78c9bf6a11d720d2908044d5666e5dd98afdef55fca76e
+AUX mms-agent.initd-r2 608 SHA256 6c44dcd08fbf15a84673f6475ee0996d9cf0afea3a5ff9c3f82dee1e7990b11f SHA512 e0e780c4ad8097f912cc88d645af8fab08b9cd6562963c42dfddaa99dc4956959ae249dcc79c2f9998d180523c058de4fe8ced62f1b9d25bcab96d81cdda898a WHIRLPOOL 5a36fec62ea36bc16114f093a047a7225df7e53b47ba830b0944473981d9b12f6c847ec9826b1598ced3d963ffa9685852d9e6aece14e753021fd60b67cd21c1
AUX mongodb-2.2-r1-fix-boost.patch 870 SHA256 885991e16aecc66d88b40418531a66449ab8e434ca677acc7814e7485231e841 SHA512 902c11e15e26be6c64053b4f3c0d0fda1670373fa3a5805063b49957843173b3663f6271ae541bb07aedf884a9861099bb1f452761f7baeaa819f14eb0755336 WHIRLPOOL b5df66a5e90202db903989c66b7423103ca1a666a477175c1746c94d5cf250ac4ceb2d237737ee2bfc158a8f9c611916e91d5133ba94e544abbaaec8b0d0361a
AUX mongodb-2.4.8-fix-grsec.patch 824 SHA256 65a50faa697f4e76eaf87b459121b8ba7c04d028a5524939296db2ca701cf2fb SHA512 7dac727a63dab7713a85f7d483f68a6fe9ed7c5ef06324a899a558d118857e9937c5e48e1fe2ae2063d1442c17b68b60b6c14934184a2badf4ecc9b3f68731bd WHIRLPOOL feef78707135bd128c21a5c344bbf25eef1ef796b236461656baa6299a0335759fff42103c36aebca1afcb23697f4ff42df382ceb2d05d0f90e913cfdac0e597
AUX mongodb-2.5.4-fix-scons.patch 1355 SHA256 02b90cf2a6f35df5021d8985b1bddd8c0f65d4764f59469c3c51e46864bac02f SHA512 f2f0e1439bab449951696f6d49f32e89dba0f848391475354d0b4d34e325a88604c8e87d2fe85701b5dcb7958a22714df283e79ba61bbd0b93f5b20d0914923c WHIRLPOOL 7fb2929f03744819395c00ef2eefc3fcb91fa00dc436348a69dbca55d2ac1c18c9d76c7d29dfb47aff751088d9798061f588bb4b22a94353229d39d65f6090af
+AUX mongodb-2.6.1-fix-scons.patch 1386 SHA256 18c454168e6c4feac4b67a3ff18e811d486284cb014ba0ededc039433c1caf28 SHA512 a67a1b2f75783ac3520f3ea5765e7a57669c23969a8242f481594e3a28e400a3656068e65ebaac0765b66433eb56c30280762fe3f6fe49b9b255c3b80dd24a29 WHIRLPOOL 7828f0314e6fa8e44cdfdbe90255e94158aa3136e71a3afff001c2308b4ef31bc8f0001083d68f00a767baff69c8bb0034f65a50e970deda45acd540fe5de772
AUX mongodb.conf 246 SHA256 8010ce728d657524cd76b5afda7ffbc1cc389642336b12b89cec5df2b09fc0e4 SHA512 05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c WHIRLPOOL 17a27daaa7892140d741256cf9acaf2f2909a545f350c936183aeb7b6671c25a3dc11f191b01ed008195965b8cc39b49f1a3a8c69cfd90c4ca57b9fa2732beff
+AUX mongodb.conf-r2 696 SHA256 8c1ecfd94e0a6f3acebd5d3ac7a75a19818772b86dcd4c066c33d9d790c420b9 SHA512 973b0ad866498c2696ee63080b61aeca2a917065a2b3bd0f470b2a70dee4630c8a80fe8d99a4bcc166f14d944c7de1debec24df8c97fb7f9b5fb0d781985ca58 WHIRLPOOL 290631e082228076a366356c142efb91d7d1e1c5ae7ef937cac3d9c20930fdabfc3b1bb42a2e0e80f2b85daac6c399a6f7d0a0a1eafe45c54795bb2bfb22291f
AUX mongodb.confd 361 SHA256 a4ca29c577428c02cd0b0a8b46756df5f53a05519c9d13c270533cf99b9b819d SHA512 9bcd870742c31bf25f34188ddc3c414de1103e9860dea9f54eee276b89bc2cf1226abab1749c5cda6a6fb0880e541373754e5e83d63cc7189d4b9c274fd555c3 WHIRLPOOL 35d785763d0cb1e21516a3fa15332d6c93d35e6faea02b60f81c389878dd89fe026504c6cfce5e9abfc8353f74b0e959a7501373d2a389f269c6952d33e8d2e8
+AUX mongodb.confd-r2 549 SHA256 6275df7b1bbee218545331d68da3814d0e0fa89d3b30e21370bbeb776dd19e0a SHA512 75f11e8350e98b90eccafd577d794e4b05f36ede8d95e7839e9fa1eb77ea7bd9cdd2fdd07719abb78a714cd7d72109c177d265d6417ef198a4217453c0a4db68 WHIRLPOOL 974eeb5dd58d52670121b2e8e687250cae4d5c49ec020dc30746bf39356762d63f41371526744f2b9fdd657134e7570d7501a3ce5995e830e039cc9eeb8a427e
AUX mongodb.initd-r1 1215 SHA256 d56c5e301a7c35bcc60fa60859eee56342be7e4911edd19e519804bcf08a5ef0 SHA512 d09b6786f986edafceba4042dbfd29f336996af93f11cd92c3dcc267d7cb522946e6800cb75fae9d02ee1490856b218be96012b132766deb0240fdaf4a65e6b7 WHIRLPOOL 416fdef48831961d410fb85f18148f70455bfc005e1f788c0f3fa035e8a4fc0c1001b1a1b37878018bdd3ba927843d7b0a0ca4c2850c9d57e21c74388cb1e077
+AUX mongodb.initd-r2 710 SHA256 d971ad9c61bb4d0c52bcd6992cbfb036ac0c701df8dc9036b5f006239967d7a1 SHA512 8c5d92d6332c01c7f627292bffe08e493027f2ffe7e34434fa025c0da87d559ea9f3497f12b3310372908e86930aab19fb8969a890aa4c30dfb1f444cd57a304 WHIRLPOOL 548902e26ef87731209eb29c6d8c077ace5aeb328adc1958d75aa3cd60ba0310ca4e631509a4b54780c828ebfa129a6297352b101306a6d7424867bc45ee18aa
AUX mongodb.logrotate 205 SHA256 76994c32d999def5c925bd7be3f96687b3406f1d67b89aa6a4df8053025b1e01 SHA512 8c089b1a11f494e4148fb4646265964c925bf937633a65e395ee1361d42facf837871dd493a9a2e0f480ae0e0829dbd3ed60794c5334e2716332e131fc5c2c51 WHIRLPOOL c1d94339a6e58363ba37bfd0f878ea6db403eaee02aa030891bfd54af1a61e34622286e560ba5217201435a745217b2da55d857fece83d5a94b12d915ad2940c
AUX mongodb.service 220 SHA256 19f55ab28652b3817e98fc3f15cc2f6f3255a5e1dfd7b0d5a27c9ba22fd2703e SHA512 177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9 WHIRLPOOL 0f6e032acbc7f625b03dcec990126cef064925a341e38c27cddbed5a951c8cfeded00ee3b8b0d9044245c833e86748262434665342e6baa98500fb02c07f4281
+AUX mongos.conf-r2 648 SHA256 d1bf479cee999b4e59e5100c134cd3e7af4bb126342418100cf8f9a08a26f6a7 SHA512 5aa8ced8d83572358e008c0df45dbe72a2e9c0003c9f49514d6b91bf9b75d4fb48b189ffe00d14e5675679943a05215a9873c5c9bde9ab1be4ed4813e75714e3 WHIRLPOOL f1036ea1bd7efa54d28d131dd1bfd1e06c1c3ffbf247ee68a33eee0383d87bf3bfa6639040e6b68a0a14cce0bd77bd5b91a8e245f615007fccccb0cbe2becd84
AUX mongos.confd 345 SHA256 2afd582564623da0e928ca667d37bef467334c82d08b49301f1f6c16ba177767 SHA512 61d8734cef644187eeadc821c89e63a3fbf61860fe2db6e74557b1c6760fe83ba7549cb04f9e3aacea4d8e7e4d81a3b1bc0d5e29715eca33c4761adb17ea9ab7 WHIRLPOOL 39c338211f2dcc4dacc4e6463657339287a5da6f20b02c68f1bb5b084d5db14eed4da435b3ed2319d3bf9c415dd6a9d4a6a84c105872fd5513c6146c2b5afc1b
+AUX mongos.confd-r2 546 SHA256 1378a880ffde0efae213ac6d6d4bbe2181c92fbb06535a58c2dab06ef88ee8e3 SHA512 30e208690b5f28bd0442b7ed302d9be991aedd27203f24e5849201d33291ad7f0f9153ae3a00b55697d79a45c40d7b3792ff45f0c24ef2cf4e88222f88ea1400 WHIRLPOOL 68b8eed779e19261c4d13ebd6be8c11b6df94e748bb8f03d632ecbfc5fcd151a693e51c5a4ad4f0af9439d07dedafc29bd9b86b5a532bad48d570fca73002987
AUX mongos.initd-r1 1370 SHA256 d4c9f32f0f001ae7cfe2b35034fd8e5a24a83fd1bc89941550c68fd98a3c9454 SHA512 28aea696b53bb557d41c5cb501ae30a72470750eb49e59442df67e98b087008fdc75e41d516443b7cc5cb5eb9aa710b98455d7955a4c1b76869ef841e67417b4 WHIRLPOOL db36b6250ef6fdbd4aec5bd249593ba81a2af44aefc26ad3ab2b04af5a4b6e84e416e0b90c4f3bb98dcaf182aeb1eab93bb8bebcdbe539881ca2c595e3e5d137
+AUX mongos.initd-r2 710 SHA256 8ac97c52b389e47d2d6d57aa76f80e78abc5ca6bc5891186caabfa02b811edf9 SHA512 9bfbaec60edd16642fa11a194685aa9f142a6a2412cbecc84916b7a0f72736f78c4700e6e7e1935a4d4f535c4a237c8dd206f7f302c6f8fc8b0463587d2053f9 WHIRLPOOL 7ed82226c189c26128b481502efc4ec356ae1849426fe088a3e7ff00c3664ce2191c7b88206df4e3f394f8ac60015ac32cddcfb5523f55ecb3d97d41d2b4a7cc
DIST 20130821-10gen-mms-agent.zip 31918 SHA256 b48f35fe2ad058dc4ebcab01dad1229c0597e78a9011b57cd1030a05cdd16e7c SHA512 9467d229829076733a023d81e377479e1e4c71c4d2c1d163928abf7215bc87809a304768f83b531b6f585d19b18585f9d0d35fd74762cf180586be11536eb1a8 WHIRLPOOL d632c1761d1f47f2139a046d58af09641a0c8d9f3168d7ebc99dac5c6a3b5b0846cba8eac581b67d35c5e7580c6910759503b85e7ca74e5930c0e0dac3d77c97
+DIST 20140409-mms-monitoring-agent.zip 40122 SHA256 9c4f89cfba10b4604512ab21eb082248104aeabe7e813b852db2b86f47d7ecb2 SHA512 5290a813c407251b5e4def813ce6fe7e09d6c3a1907fd409e326b15b07aed39f7db3a28710ecdaffe2771136c9433253c5d1857c823844a4b75dd38f1d15eefd WHIRLPOOL ce80870e2618f3d9ed80af41b1069ed5bd97af475089564eed1bc111e820c048bc5cbaa03f859349e772fe232f876127e0627c75c135a9b2e196ab13258ed9f1
DIST mongodb-src-r2.5.4.tar.gz 14198740 SHA256 18a83049fabb3bbc6e9519c3e20b6c4e412ae1f0f8e4c7684994e3ed919f969c SHA512 23bda909d4c74aef080e0a3c1ead92cb2a96a68f85e6835da1b2a2edfb88271cd5ca6379a4bfcba1902dd9c7c192efc6bd22795efd8c9be6290c7575b80b098a WHIRLPOOL 8932c85cd759fb67db1655e24278c90beb27d01696959e2e9c07848a51442d23197dc7bb94e59231c722a8754c551fc77b3b231a968578298c30b7e5f5b0b03c
+DIST mongodb-src-r2.6.1.tar.gz 14425586 SHA256 a3199666acff3d8e236a93118de497a20b47309cf91495099f9a22b9787d262b SHA512 a07168a8fa609d2a22b04db6b761e486e58fb63c66ea4974e5cc53a1255d514cd065a84b4dc62efbb27c39a6e3881d98a3f7025c2391a78d91d5cd515b8a2e56 WHIRLPOOL d6a0aea1724b02a2444e2ce58f2971bb01bb571f13342f8b11a2f0f4ded69143eaa3eb11d0d0778f89fb627cb057b40f0321e1765c0e883d2d1be76cf48b5f13
EBUILD mongodb-2.5.4.ebuild 3676 SHA256 4e79b23d37a5a168d26dc9d01b86eb836dc992efca0a8dab1a4b6e789a68bd99 SHA512 83e3fa6f61d97d23c16c167b7d5011338eac82d4d1188ec3f7e981aefbc1eb5ce17419c2a123bb2af973ce754edf1c686759f74933b9d42f04e53db4245b7e3e WHIRLPOOL d77ade6020bafe46d9ef4a88745ed15a88bcf6c3ad199354e60563ab3588dcf7ff72589ec38d1a49b8736ac4a03e50f3008db5ce06050c743fd8fbd693cbfbdc
+EBUILD mongodb-2.6.1.ebuild 4324 SHA256 b3367182bb43ce837e47f3b8313997cfceba5ca1f984b81afdbcb754d77aa72e SHA512 414d627e84ed8abd737969e255f563f5ac74db876053320a80e4cc0854d6ab7f14da43b24ae2e2f6998aef998b578dc8cb1ad3b18fa7b82f36162171f8945663 WHIRLPOOL bd2ada65012357831e34e6455734a5e74a42f80f2d6858ca587ec4e8bf76d886098a91ca5793a666c3f44cca3e35c7e02e0686ac3cb6efae178f277425337987
MISC metadata.xml 1090 SHA256 bb0066679f4a7ee9f21238becfdf1cb6e38489c1a9d46e0671d4098455f886ea SHA512 b4e4fec0815ac98c85b437f2155f4620b91fe24e81f559b92901038f68534e07dc91ae77ac609311e9febbe64b8ef0ad5ad164346cdb466e28bf1732ed18048a WHIRLPOOL b5305d0cbc7398d66d9e26b14adeaccfeeee8d0d24fad8bb957517273b97f94b0feb1afc1bdefaa01ea06502c570376e8e7a0ce68dca76c8ae5dbbf686d6458a
diff --git a/dev-db/mongodb/files/mms-agent.initd-r2 b/dev-db/mongodb/files/mms-agent.initd-r2
new file mode 100644
index 0000000..ca645b0
--- /dev/null
+++ b/dev-db/mongodb/files/mms-agent.initd-r2
@@ -0,0 +1,24 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mms-agent.initd-r1,v 1.1 2014/04/09 15:40:20 ultrabug Exp $
+
+logfile=/var/log/mongodb/mms-agent.log
+run_dir=${run_dir:-/run/mongodb}
+
+command="/usr/bin/python2 agent.py &>${logfile}"
+command_background="true"
+
+pidfile=${run_dir}/${SVCNAME}.pid
+user=${user:-mongodb}
+group=${group:-mongodb}
+
+depend() {
+ need net
+ use syslog
+}
+
+start_pre() {
+ checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
+ cd /opt/mms-agent
+}
diff --git a/dev-db/mongodb/files/mongodb-2.6.1-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.6.1-fix-scons.patch
new file mode 100644
index 0000000..031d843
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-2.6.1-fix-scons.patch
@@ -0,0 +1,35 @@
+diff --git SConstruct SConstruct
+index 3886d1b..81c59a9 100644
+--- SConstruct
++++ SConstruct
+@@ -811,19 +811,17 @@ if nix:
+ # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
+ env.Append( CCFLAGS=["-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 or darwin:
+- env.Append( CCFLAGS=["-Werror", "-pipe"] )
+
+ env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
+- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
+ env.Append( LINKFLAGS=["-fPIC", "-pthread"] )
++ env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
++ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
+
+ # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
+ # startup.
+@@ -840,7 +838,7 @@ if nix:
+ if not darwin:
+ env.Append( LINKFLAGS=["-rdynamic"] )
+
+- env.Append( LIBS=[] )
++ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy', 'yaml-cpp'] )
+
+ #make scons colorgcc friendly
+ for key in ('HOME', 'TERM'):
diff --git a/dev-db/mongodb/files/mongodb.conf-r2 b/dev-db/mongodb/files/mongodb.conf-r2
new file mode 100644
index 0000000..337e6b6
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.conf-r2
@@ -0,0 +1,33 @@
+# !! IMPORTANT !!
+#
+# This file uses the YAML format as described in the documentation:
+# http://docs.mongodb.org/manual/reference/configuration-options/
+
+storage:
+ dbPath: "/var/lib/mongodb"
+
+systemLog:
+ destination: file
+ path: "/var/log/mongodb/mongodb.log"
+ quiet: true
+ logAppend: true
+
+net:
+ port: 27017
+ bindIp: 127.0.0.1
+ ssl:
+ mode: disabled
+
+#security:
+ #keyFile:
+ #clusterAuthMode:
+
+#replication:
+ #replSetName:
+
+# Specifies one of the MongoDB parameters described here:
+# http://docs.mongodb.org/manual/reference/parameters/
+#
+# You can specify multiple setParameter fields such as:
+# setParameter: {enableTestCommands: 1}
+#setParameter:
diff --git a/dev-db/mongodb/files/mongodb.confd-r2 b/dev-db/mongodb/files/mongodb.confd-r2
new file mode 100644
index 0000000..dddb67e
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.confd-r2
@@ -0,0 +1,12 @@
+# !! IMPORTANT !!
+#
+# This file is ONLY used to override some of the init script configuration.
+#
+# You should NOT use this file to configure your mongodb instance,
+# see the /etc/mongodb.conf file instead.
+#
+# Available init script modifiers :
+# - config_file : the configuration file to use (default : /etc/mongodb.conf)
+# - user : the user used to run your mongodb instance (default : mongodb)
+# - group : the group used to run your mongodb instance (default : mongodb)
+# - run_dir : the run directory for your PID files (default : /run/mongodb)
diff --git a/dev-db/mongodb/files/mongodb.initd-r2 b/dev-db/mongodb/files/mongodb.initd-r2
new file mode 100644
index 0000000..68dafb9
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.initd-r2
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongodb.initd-r1,v 1.1 2013/08/16 12:54:44 ultrabug Exp $
+
+config_file=${config_file:-/etc/${SVCNAME}.conf}
+run_dir=${run_dir:-/run/mongodb}
+
+command="/usr/bin/mongod"
+command_args="--config ${config_file}"
+command_background="true"
+pidfile=${run_dir}/${SVCNAME}.pid
+user=${user:-mongodb}
+group=${group:-mongodb}
+
+depend() {
+ use net
+}
+
+start_pre() {
+ checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
+ if [ ! -f ${config_file} ]; then
+ eerror "Missing configuration file ${config_file}"
+ return 1
+ fi
+}
diff --git a/dev-db/mongodb/files/mongos.conf-r2 b/dev-db/mongodb/files/mongos.conf-r2
new file mode 100644
index 0000000..fc00689
--- /dev/null
+++ b/dev-db/mongodb/files/mongos.conf-r2
@@ -0,0 +1,30 @@
+# !! IMPORTANT !!
+#
+# This file uses the YAML format as described in the documentation:
+# http://docs.mongodb.org/manual/reference/configuration-options/
+
+systemLog:
+ destination: file
+ path: "/var/log/mongodb/mongos.log"
+ quiet: true
+ logAppend: true
+
+net:
+ port: 27017
+ bindIp: 127.0.0.1
+ ssl:
+ mode: disabled
+
+#security:
+ #keyFile:
+ #clusterAuthMode:
+
+#sharding:
+ #configDB:
+
+# Specifies one of the MongoDB parameters described here:
+# http://docs.mongodb.org/manual/reference/parameters/
+#
+# You can specify multiple setParameter fields such as:
+# setParameter: {enableTestCommands: 1}
+#setParameter:
diff --git a/dev-db/mongodb/files/mongos.confd-r2 b/dev-db/mongodb/files/mongos.confd-r2
new file mode 100644
index 0000000..0dc2a18
--- /dev/null
+++ b/dev-db/mongodb/files/mongos.confd-r2
@@ -0,0 +1,12 @@
+# !! IMPORTANT !!
+#
+# This file is ONLY used to override some of the init script configuration.
+#
+# You should NOT use this file to configure your mongos instance,
+# see the /etc/mongos.conf file instead.
+#
+# Available init script modifiers :
+# - config_file : the configuration file to use (default : /etc/mongos.conf)
+# - user : the user used to run your mongodb instance (default : mongodb)
+# - group : the group used to run your mongodb instance (default : mongodb)
+# - run_dir : the run directory for your PID files (default : /run/mongodb)
diff --git a/dev-db/mongodb/files/mongos.initd-r2 b/dev-db/mongodb/files/mongos.initd-r2
new file mode 100644
index 0000000..44d39b0
--- /dev/null
+++ b/dev-db/mongodb/files/mongos.initd-r2
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongodb.initd-r1,v 1.1 2013/08/16 12:54:44 ultrabug Exp $
+
+config_file=${config_file:-/etc/${SVCNAME}.conf}
+run_dir=${run_dir:-/run/mongodb}
+
+command="/usr/bin/mongos"
+command_args="--config ${config_file}"
+command_background="true"
+pidfile=${run_dir}/${SVCNAME}.pid
+user=${user:-mongodb}
+group=${group:-mongodb}
+
+depend() {
+ use net
+}
+
+start_pre() {
+ checkpath -d -m 0750 -o "${user}":"${group}" "${run_dir}"
+ if [ ! -f ${config_file} ]; then
+ eerror "Missing configuration file ${config_file}"
+ return 1
+ fi
+}
diff --git a/dev-db/mongodb/mongodb-2.6.1.ebuild b/dev-db/mongodb/mongodb-2.6.1.ebuild
new file mode 100644
index 0000000..35f0769
--- /dev/null
+++ b/dev-db/mongodb/mongodb-2.6.1.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.10-r1.ebuild,v 1.2 2014/04/09 15:42:11 ultrabug Exp $
+
+EAPI=5
+SCONS_MIN_VERSION="1.2.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit eutils flag-o-matic multilib scons-utils systemd user versionator check-reqs
+
+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/20140409-mms-monitoring-agent.zip )"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kerberos mms-agent ssl static-libs"
+
+PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
+RDEPEND="
+ app-arch/snappy
+ >=dev-cpp/yaml-cpp-0.5.1
+ >=dev-libs/boost-1.50[threads(+)]
+ >=dev-libs/libpcre-8.30[cxx]
+ dev-libs/snowball-stemmer
+ dev-util/google-perftools[-minimal]
+ net-libs/libpcap
+ ssl? ( >=dev-libs/openssl-1.0.1g )"
+DEPEND="${RDEPEND}
+ sys-libs/ncurses
+ sys-libs/readline
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ enewgroup mongodb
+ enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+ scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+ scons_opts+=" --use-system-boost"
+ scons_opts+=" --use-system-pcre"
+ scons_opts+=" --use-system-snappy"
+ scons_opts+=" --use-system-stemmer"
+ scons_opts+=" --use-system-tcmalloc"
+ scons_opts+=" --use-system-yaml"
+ scons_opts+=" --usev8"
+
+ if use prefix; then
+ scons_opts+=" --cpppath=${EPREFIX}/usr/include"
+ scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
+ fi
+
+ if use kerberos; then
+ scons_opts+=" --use-sasl-client"
+ fi
+
+ if use ssl; then
+ scons_opts+=" --ssl"
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.6.1-fix-scons.patch"
+
+ # fix yaml-cpp detection
+ sed -i -e "s/\[\"yaml\"\]/\[\"yaml-cpp\"\]/" SConstruct || die
+
+ # bug #462606
+ sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
+
+ # bug #482576
+ sed -i -e "/-Werror/d" src/third_party/v8/SConscript || die
+}
+
+src_compile() {
+ escons ${scons_opts} all
+}
+
+src_install() {
+ escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
+
+ use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
+
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}"
+ fowners mongodb:mongodb "${x}"
+ done
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
+ newinitd "${FILESDIR}/${PN/db/s}.initd-r2" ${PN/db/s}
+ newconfd "${FILESDIR}/${PN/db/s}.confd-r2" ${PN/db/s}
+
+ insinto /etc
+ newins "${FILESDIR}/${PN}.conf-r2" ${PN}.conf
+ newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ if use mms-agent; then
+ local MY_PN="mms-agent"
+ local MY_D="/opt/${MY_PN}"
+
+ insinto /etc
+ newins "${WORKDIR}/${MY_PN}/settings.py" mms-agent.conf
+ rm "${WORKDIR}/${MY_PN}/settings.py"
+
+ insinto ${MY_D}
+ doins "${WORKDIR}/${MY_PN}/"*
+ dosym /etc/mms-agent.conf ${MY_D}/settings.py
+
+ fowners -R mongodb:mongodb ${MY_D}
+ newinitd "${FILESDIR}/${MY_PN}.initd-r2" ${MY_PN}
+ fi
+}
+
+pkg_preinst() {
+ # wrt bug #461466
+ if [[ "$(get_libdir)" == "lib64" ]]; then
+ rmdir "${ED}"/usr/lib/ &>/dev/null
+ fi
+}
+
+src_test() {
+ escons ${scons_opts} test
+ "${S}"/test --dbpath=unittest || die
+}
+
+pkg_postinst() {
+ if [[ ${REPLACING_VERSIONS} < 3.6 ]]; then
+ ewarn "!! IMPORTANT !!"
+ ewarn " "
+ ewarn "${PN} configuration files have changed !"
+ ewarn " "
+ ewarn "Make sure you migrate from /etc/conf.d/${PN} to the new YAML standard in /etc/${PN}"
+ ewarn " http://docs.mongodb.org/manual/reference/configuration-options/"
+ ewarn " "
+ ewarn "Make sure you also follow the upgrading process :"
+ ewarn " http://docs.mongodb.org/master/release-notes/2.6-upgrade/"
+ ewarn " "
+ if use mms-agent; then
+ ewarn "MMS Agent configuration file has been moved to :"
+ ewarn " /etc/mms-agent.conf"
+ fi
+ else
+ if use mms-agent; then
+ elog "Edit your MMS Agent configuration file :"
+ elog " /etc/mms-agent.conf"
+ fi
+ fi
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2014-01-20 11:17 Alexys Jacob
0 siblings, 0 replies; 16+ messages in thread
From: Alexys Jacob @ 2014-01-20 11:17 UTC (permalink / raw
To: gentoo-commits
commit: 69d84cbc4cc1b505d5730b2f3e3124fa92025d5d
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 20 11:16:48 2014 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon Jan 20 11:16:48 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=69d84cbc
add dev branch of mongodb wrt bug #496196
---
dev-db/mongodb/Manifest | 16 +++
dev-db/mongodb/files/mms-agent.confd | 9 ++
dev-db/mongodb/files/mms-agent.initd | 41 ++++++
.../mongodb/files/mongodb-2.2-r1-fix-boost.patch | 13 ++
dev-db/mongodb/files/mongodb-2.4.8-fix-grsec.patch | 24 ++++
dev-db/mongodb/files/mongodb-2.5.4-fix-scons.patch | 32 +++++
dev-db/mongodb/files/mongodb.conf | 8 ++
dev-db/mongodb/files/mongodb.confd | 14 ++
dev-db/mongodb/files/mongodb.initd-r1 | 40 ++++++
dev-db/mongodb/files/mongodb.logrotate | 13 ++
dev-db/mongodb/files/mongodb.service | 10 ++
dev-db/mongodb/files/mongos.confd | 16 +++
dev-db/mongodb/files/mongos.initd-r1 | 50 +++++++
dev-db/mongodb/metadata.xml | 29 +++++
dev-db/mongodb/mongodb-2.5.4.ebuild | 145 +++++++++++++++++++++
15 files changed, 460 insertions(+)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
new file mode 100644
index 0000000..54859ab
--- /dev/null
+++ b/dev-db/mongodb/Manifest
@@ -0,0 +1,16 @@
+AUX mms-agent.confd 205 SHA256 29e678e722268311fb59f5af57ac3fbadb9e930cd3cb1ce9e4dc33d30e021e40 SHA512 e81e68ebad2d409a9e631de0aaf264eab99b3faa5c313a7c96a6672a6c51d3243100f5ef599bf2a347b4f9e1b1a6ebf95fa890cb614d9745c58430fadd8ee13a WHIRLPOOL 24d98082e138dbcee0a276c4874d88a23f7f53d1bf0f6a7f2e979c005413f14809269622ecd013913221a267eb1fc806130d69915ce5cd38a646b498912ca729
+AUX mms-agent.initd 1277 SHA256 fda9a9eb7e2abceef572ffbad0987b74670b6b5e0c50d93f58ef8141825a2cea SHA512 32bdcadf7395f371809b253934f8c3dd0074e6aafccfab091f8bf699524eb32ffdc787b479e08056e2fac933f1627a5f1cc03842a2f8b939f8b68bb2e6da71c2 WHIRLPOOL a9f78afe5286e2762c27ab0a272e4e5719e070cbd9ab5f551ef322346bb3ff46d0b49c76906fe63f8c78c9bf6a11d720d2908044d5666e5dd98afdef55fca76e
+AUX mongodb-2.2-r1-fix-boost.patch 870 SHA256 885991e16aecc66d88b40418531a66449ab8e434ca677acc7814e7485231e841 SHA512 902c11e15e26be6c64053b4f3c0d0fda1670373fa3a5805063b49957843173b3663f6271ae541bb07aedf884a9861099bb1f452761f7baeaa819f14eb0755336 WHIRLPOOL b5df66a5e90202db903989c66b7423103ca1a666a477175c1746c94d5cf250ac4ceb2d237737ee2bfc158a8f9c611916e91d5133ba94e544abbaaec8b0d0361a
+AUX mongodb-2.4.8-fix-grsec.patch 824 SHA256 65a50faa697f4e76eaf87b459121b8ba7c04d028a5524939296db2ca701cf2fb SHA512 7dac727a63dab7713a85f7d483f68a6fe9ed7c5ef06324a899a558d118857e9937c5e48e1fe2ae2063d1442c17b68b60b6c14934184a2badf4ecc9b3f68731bd WHIRLPOOL feef78707135bd128c21a5c344bbf25eef1ef796b236461656baa6299a0335759fff42103c36aebca1afcb23697f4ff42df382ceb2d05d0f90e913cfdac0e597
+AUX mongodb-2.5.4-fix-scons.patch 1355 SHA256 02b90cf2a6f35df5021d8985b1bddd8c0f65d4764f59469c3c51e46864bac02f SHA512 f2f0e1439bab449951696f6d49f32e89dba0f848391475354d0b4d34e325a88604c8e87d2fe85701b5dcb7958a22714df283e79ba61bbd0b93f5b20d0914923c WHIRLPOOL 7fb2929f03744819395c00ef2eefc3fcb91fa00dc436348a69dbca55d2ac1c18c9d76c7d29dfb47aff751088d9798061f588bb4b22a94353229d39d65f6090af
+AUX mongodb.conf 246 SHA256 8010ce728d657524cd76b5afda7ffbc1cc389642336b12b89cec5df2b09fc0e4 SHA512 05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c WHIRLPOOL 17a27daaa7892140d741256cf9acaf2f2909a545f350c936183aeb7b6671c25a3dc11f191b01ed008195965b8cc39b49f1a3a8c69cfd90c4ca57b9fa2732beff
+AUX mongodb.confd 361 SHA256 a4ca29c577428c02cd0b0a8b46756df5f53a05519c9d13c270533cf99b9b819d SHA512 9bcd870742c31bf25f34188ddc3c414de1103e9860dea9f54eee276b89bc2cf1226abab1749c5cda6a6fb0880e541373754e5e83d63cc7189d4b9c274fd555c3 WHIRLPOOL 35d785763d0cb1e21516a3fa15332d6c93d35e6faea02b60f81c389878dd89fe026504c6cfce5e9abfc8353f74b0e959a7501373d2a389f269c6952d33e8d2e8
+AUX mongodb.initd-r1 1215 SHA256 d56c5e301a7c35bcc60fa60859eee56342be7e4911edd19e519804bcf08a5ef0 SHA512 d09b6786f986edafceba4042dbfd29f336996af93f11cd92c3dcc267d7cb522946e6800cb75fae9d02ee1490856b218be96012b132766deb0240fdaf4a65e6b7 WHIRLPOOL 416fdef48831961d410fb85f18148f70455bfc005e1f788c0f3fa035e8a4fc0c1001b1a1b37878018bdd3ba927843d7b0a0ca4c2850c9d57e21c74388cb1e077
+AUX mongodb.logrotate 205 SHA256 76994c32d999def5c925bd7be3f96687b3406f1d67b89aa6a4df8053025b1e01 SHA512 8c089b1a11f494e4148fb4646265964c925bf937633a65e395ee1361d42facf837871dd493a9a2e0f480ae0e0829dbd3ed60794c5334e2716332e131fc5c2c51 WHIRLPOOL c1d94339a6e58363ba37bfd0f878ea6db403eaee02aa030891bfd54af1a61e34622286e560ba5217201435a745217b2da55d857fece83d5a94b12d915ad2940c
+AUX mongodb.service 220 SHA256 19f55ab28652b3817e98fc3f15cc2f6f3255a5e1dfd7b0d5a27c9ba22fd2703e SHA512 177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9 WHIRLPOOL 0f6e032acbc7f625b03dcec990126cef064925a341e38c27cddbed5a951c8cfeded00ee3b8b0d9044245c833e86748262434665342e6baa98500fb02c07f4281
+AUX mongos.confd 345 SHA256 2afd582564623da0e928ca667d37bef467334c82d08b49301f1f6c16ba177767 SHA512 61d8734cef644187eeadc821c89e63a3fbf61860fe2db6e74557b1c6760fe83ba7549cb04f9e3aacea4d8e7e4d81a3b1bc0d5e29715eca33c4761adb17ea9ab7 WHIRLPOOL 39c338211f2dcc4dacc4e6463657339287a5da6f20b02c68f1bb5b084d5db14eed4da435b3ed2319d3bf9c415dd6a9d4a6a84c105872fd5513c6146c2b5afc1b
+AUX mongos.initd-r1 1370 SHA256 d4c9f32f0f001ae7cfe2b35034fd8e5a24a83fd1bc89941550c68fd98a3c9454 SHA512 28aea696b53bb557d41c5cb501ae30a72470750eb49e59442df67e98b087008fdc75e41d516443b7cc5cb5eb9aa710b98455d7955a4c1b76869ef841e67417b4 WHIRLPOOL db36b6250ef6fdbd4aec5bd249593ba81a2af44aefc26ad3ab2b04af5a4b6e84e416e0b90c4f3bb98dcaf182aeb1eab93bb8bebcdbe539881ca2c595e3e5d137
+DIST 20130821-10gen-mms-agent.zip 31918 SHA256 b48f35fe2ad058dc4ebcab01dad1229c0597e78a9011b57cd1030a05cdd16e7c SHA512 9467d229829076733a023d81e377479e1e4c71c4d2c1d163928abf7215bc87809a304768f83b531b6f585d19b18585f9d0d35fd74762cf180586be11536eb1a8 WHIRLPOOL d632c1761d1f47f2139a046d58af09641a0c8d9f3168d7ebc99dac5c6a3b5b0846cba8eac581b67d35c5e7580c6910759503b85e7ca74e5930c0e0dac3d77c97
+DIST mongodb-src-r2.5.4.tar.gz 14198740 SHA256 18a83049fabb3bbc6e9519c3e20b6c4e412ae1f0f8e4c7684994e3ed919f969c SHA512 23bda909d4c74aef080e0a3c1ead92cb2a96a68f85e6835da1b2a2edfb88271cd5ca6379a4bfcba1902dd9c7c192efc6bd22795efd8c9be6290c7575b80b098a WHIRLPOOL 8932c85cd759fb67db1655e24278c90beb27d01696959e2e9c07848a51442d23197dc7bb94e59231c722a8754c551fc77b3b231a968578298c30b7e5f5b0b03c
+EBUILD mongodb-2.5.4.ebuild 3687 SHA256 cd2dc9330ba2d2ff562516612f2a7ecefdcd9209968944e88d4b7eff69f3c123 SHA512 76a545a34a309b2b384882d9c8b84e680dcc685a31fdfb292546b8133d2225a3b84fda7187f12489b94e761b7e8356cb5ce43c075a840916791b499fb1a4fede WHIRLPOOL 65d5ddc20d5c16985c6dad1facb76094acf497ee582c3cfebb756376771e1bf9560b156156e466c478cd40f4a6c7d0cbf026478a44a0af485540de79aadd5d1a
+MISC metadata.xml 1090 SHA256 bb0066679f4a7ee9f21238becfdf1cb6e38489c1a9d46e0671d4098455f886ea SHA512 b4e4fec0815ac98c85b437f2155f4620b91fe24e81f559b92901038f68534e07dc91ae77ac609311e9febbe64b8ef0ad5ad164346cdb466e28bf1732ed18048a WHIRLPOOL b5305d0cbc7398d66d9e26b14adeaccfeeee8d0d24fad8bb957517273b97f94b0feb1afc1bdefaa01ea06502c570376e8e7a0ce68dca76c8ae5dbbf686d6458a
diff --git a/dev-db/mongodb/files/mms-agent.confd b/dev-db/mongodb/files/mms-agent.confd
new file mode 100644
index 0000000..d19b21e
--- /dev/null
+++ b/dev-db/mongodb/files/mms-agent.confd
@@ -0,0 +1,9 @@
+# Your API key - See: http://mms.10gen.com/settings
+API_KEY=""
+SECRET_KEY=""
+
+# Seconds between Mongo status checks
+#COLLECTION_INTERVAL=56
+
+# Seconds between cloud configuration checks
+#CONF_INTERVAL=120
\ No newline at end of file
diff --git a/dev-db/mongodb/files/mms-agent.initd b/dev-db/mongodb/files/mms-agent.initd
new file mode 100644
index 0000000..b296be7
--- /dev/null
+++ b/dev-db/mongodb/files/mms-agent.initd
@@ -0,0 +1,41 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mms-agent.initd,v 1.3 2013/01/18 11:19:27 ultrabug Exp $
+
+ROOTDIR=/opt/mms-agent
+PIDFILE=/var/run/mm-agent.pid
+EXEC="/usr/bin/env python agent.py"
+LOGFILE=/var/log/mongodb/mms-agent.log
+
+depend() {
+ need net
+ use syslog
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+
+ checkpath -d -m 0755 -o root:root /var/run/
+
+ # Setup API/SECRETY KEYS
+ sed -i -e "s/^mms_key.*/mms_key = '${API_KEY}'/g" \
+ -e "s/^secret_key.*/secret_key = '${SECRET_KEY}'/g" ${ROOTDIR}/settings.py &>/dev/null
+
+ # Tune the agent
+ [ -z "${COLLECTION_INTERVAL}" ] || sed -i \
+ -e "s/^collection_interval.*/collection_interval = ${COLLECTION_INTERVAL}/g" ${ROOTDIR}/settings.py &>/dev/null
+ [ -z "${CONF_INTERVAL}" ] || sed -i \
+ -e "s/^conf_interval.*/conf_interval = ${CONF_INTERVAL}/g" ${ROOTDIR}/settings.py &>/dev/null
+
+ start-stop-daemon --start --chdir ${ROOTDIR} --exec ${EXEC} \
+ --pidfile "${PIDFILE}" --make-pidfile --background \
+ --user mongodb:mongodb --stdout ${LOGFILE} --stderr ${LOGFILE}
+ eend $?
+}
+
+stop() {
+ ebegin "Requesting ${SVCNAME} to stop"
+ start-stop-daemon --stop --pidfile "${PIDFILE}"
+ eend $?
+}
diff --git a/dev-db/mongodb/files/mongodb-2.2-r1-fix-boost.patch b/dev-db/mongodb/files/mongodb-2.2-r1-fix-boost.patch
new file mode 100644
index 0000000..b6c9a1e
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-2.2-r1-fix-boost.patch
@@ -0,0 +1,13 @@
+--- mongodb-src-r2.2.0/SConstruct.old 2012-10-09 12:41:25.000000000 -0400
++++ mongodb-src-r2.2.0/SConstruct 2012-10-09 12:41:41.000000000 -0400
+@@ -171,8 +171,8 @@
+ add_option( "extrapathdyn", "comma separated list of add'l paths (--extrapath /opt/foo/,/foo) dynamic linking" , 1 , True )
+ add_option( "extralib", "comma separated list of libraries (--extralib js_static,readline" , 1 , True )
+
+-add_option( "boost-compiler", "compiler used for boost (gcc41)" , 1 , True , "boostCompiler" )
+-add_option( "boost-version", "boost version for linking(1_38)" , 1 , True , "boostVersion" )
++add_option( "boost-compiler", "compiler used for boost (gcc41)" , 1 , False , "boostCompiler" )
++add_option( "boost-version", "boost version for linking(1_38)" , 1 , False , "boostVersion" )
+
+ add_option( "no-glibc-check" , "don't check for new versions of glibc" , 0 , False )
+
diff --git a/dev-db/mongodb/files/mongodb-2.4.8-fix-grsec.patch b/dev-db/mongodb/files/mongodb-2.4.8-fix-grsec.patch
new file mode 100644
index 0000000..cff7d0f
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-2.4.8-fix-grsec.patch
@@ -0,0 +1,24 @@
+--- a/src/mongo/db/db.cpp 2013-12-31 10:47:50.125065072 +0100
++++ b/src/mongo/db/db.cpp 2013-12-31 10:50:49.252477950 +0100
+@@ -528,6 +528,7 @@
+ /// warn if readahead > 256KB (gridfs chunk size)
+ static void checkReadAhead(const string& dir) {
+ #ifdef __linux__
++ try {
+ const dev_t dev = getPartition(dir);
+
+ // This path handles the case where the filesystem uses the whole device (including LVM)
+@@ -561,6 +562,13 @@
+ }
+ }
+ }
++ }
++ catch (const std::exception& e) {
++ log() << "unable to validate readahead settings due to error: " << e.what()
++ << startupWarningsLog;
++ log() << "for more information, see http://dochub.mongodb.org/core/readahead"
++ << startupWarningsLog;
++ }
+ #endif // __linux__
+ }
+
diff --git a/dev-db/mongodb/files/mongodb-2.5.4-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.5.4-fix-scons.patch
new file mode 100644
index 0000000..79076a0
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-2.5.4-fix-scons.patch
@@ -0,0 +1,32 @@
+--- a/SConstruct 2014-01-13 11:53:09.523206053 +0100
++++ b/SConstruct 2014-01-13 11:55:03.561532653 +0100
+@@ -837,18 +837,16 @@
+ # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used.
+ env.Append( CCFLAGS=["-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 or darwin:
+- env.Append( CCFLAGS=["-Werror", "-pipe"] )
+
+ env.Append( CPPDEFINES=["_FILE_OFFSET_BITS=64"] )
+- env.Append( CXXFLAGS=["-Wnon-virtual-dtor", "-Woverloaded-virtual"] )
++ env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
++ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
+ env.Append( LINKFLAGS=["-fPIC", "-pthread"] )
+
+ # SERVER-9761: Ensure early detection of missing symbols in dependent libraries at program
+@@ -866,7 +864,7 @@
+ if not darwin:
+ env.Append( LINKFLAGS=["-rdynamic"] )
+
+- env.Append( LIBS=[] )
++ env.Append( LIBS=['pcre', 'pcrecpp', 'snappy'] )
+
+ #make scons colorgcc friendly
+ for key in ('HOME', 'TERM'):
diff --git a/dev-db/mongodb/files/mongodb.conf b/dev-db/mongodb/files/mongodb.conf
new file mode 100644
index 0000000..c5272b7
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.conf
@@ -0,0 +1,8 @@
+# See http://www.mongodb.org/display/DOCS/File+Based+Configuration for format details
+# Run mongod --help to see a list of options
+
+bind_ip = 127.0.0.1
+quiet = true
+dbpath = /var/lib/mongodb
+logpath = /var/log/mongodb/mongod.log
+logappend = true
diff --git a/dev-db/mongodb/files/mongodb.confd b/dev-db/mongodb/files/mongodb.confd
new file mode 100644
index 0000000..4f76c5a
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.confd
@@ -0,0 +1,14 @@
+# Mongodb essentials
+MONGODB_EXEC="/usr/bin/mongod"
+MONGODB_RUN="/var/run/mongodb"
+MONGODB_DATA="/var/lib/mongodb"
+MONGODB_USER="mongodb"
+
+# Listen to specified IP, comment this to listen to all
+MONGODB_IP="127.0.0.1"
+
+# Listen to specified port
+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-r1 b/dev-db/mongodb/files/mongodb.initd-r1
new file mode 100644
index 0000000..2e4c01a
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.initd-r1
@@ -0,0 +1,40 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongodb.initd-r1,v 1.1 2013/08/16 12:54:44 ultrabug Exp $
+
+depend() {
+ use net
+}
+
+start() {
+ checkpath -d -m 0750 -o "${MONGODB_USER}":mongodb "${MONGODB_RUN}"
+
+ # Listen to MONGODB_IP if configured
+ [ -z "${MONGODB_IP}" ] || MONGODB_OPTIONS="--bind_ip ${MONGODB_IP} ${MONGODB_OPTIONS}"
+
+ # Baselayout-1 user should use --chuid instead of --user
+ local USEROPT="--user"
+ if [ ! -f /etc/init.d/sysfs ]; then
+ USEROPT="--chuid"
+ fi
+
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --background --start --make-pidfile \
+ --pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
+ ${USEROPT} ${MONGODB_USER:-mongodb} \
+ --exec ${MONGODB_EXEC:-/usr/bin/mongod} \
+ -- \
+ --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/mongodb.logrotate b/dev-db/mongodb/files/mongodb.logrotate
new file mode 100644
index 0000000..f95a438
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.logrotate
@@ -0,0 +1,13 @@
+# Default log rotation / compression keeps 1 year of logs.
+/var/log/mongodb/*.log {
+ daily
+ rotate 365
+ dateext
+ copytruncate
+ delaycompress
+ compress
+ notifempty
+ extension gz
+ sharedscripts
+ missingok
+}
diff --git a/dev-db/mongodb/files/mongodb.service b/dev-db/mongodb/files/mongodb.service
new file mode 100644
index 0000000..78d5511
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=High-performance, schema-free document-oriented database
+After=network.target
+
+[Service]
+User=mongodb
+ExecStart=/usr/bin/mongod --quiet --config /etc/mongodb.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dev-db/mongodb/files/mongos.confd b/dev-db/mongodb/files/mongos.confd
new file mode 100644
index 0000000..644cd0a
--- /dev/null
+++ b/dev-db/mongodb/files/mongos.confd
@@ -0,0 +1,16 @@
+# Mongos essentials
+MONGOS_EXEC="/usr/bin/mongos"
+MONGOS_RUN="/var/run/mongodb"
+MONGOS_USER="mongodb"
+
+# Listen to specified IP, comment this to listen to all
+MONGOS_IP="127.0.0.1"
+
+# Listen to specified port
+MONGOS_PORT="27018"
+
+# 1 to 3 comma separated config servers (mandatory)
+MONGOS_CONFIGDB=""
+
+# Set extra options here
+MONGOS_OPTIONS=""
diff --git a/dev-db/mongodb/files/mongos.initd-r1 b/dev-db/mongodb/files/mongos.initd-r1
new file mode 100644
index 0000000..fe08878
--- /dev/null
+++ b/dev-db/mongodb/files/mongos.initd-r1
@@ -0,0 +1,50 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongos.initd-r1,v 1.1 2013/08/16 12:54:44 ultrabug Exp $
+
+depend() {
+ use 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
+
+ checkpath -d -m 0750 -o "${MONGOS_USER}":mongodb "${MONGOS_RUN}"
+
+ # Listen to MONGOS_IP if configured
+ [ -z "${MONGOS_IP}" ] || MONGOS_OPTIONS="--bind_ip ${MONGOS_IP} ${MONGOS_OPTIONS}"
+
+ # Baselayout-1 user should use --chuid instead of --user
+ local USEROPT="--user"
+ if [ ! -f /etc/init.d/sysfs ]; then
+ USEROPT="--chuid"
+ fi
+
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --background --start --make-pidfile \
+ --pidfile ${MONGOS_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
+ ${USEROPT} ${MONGOS_USER:-mongodb} \
+ --exec ${MONGOS_EXEC:-/usr/bin/mongos} \
+ -- \
+ --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 $?
+}
diff --git a/dev-db/mongodb/metadata.xml b/dev-db/mongodb/metadata.xml
new file mode 100644
index 0000000..87c16b5
--- /dev/null
+++ b/dev-db/mongodb/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>ultrabug@gentoo.org</email>
+ <name>Alexys Jacob</name>
+ </maintainer>
+ <maintainer>
+ <email>bugs@bergstroem.nu</email>
+ <name>Johan Bergström</name>
+ <description>Proxy Maintainer. CC on bugs</description>
+ </maintainer>
+ <longdescription lang="en">
+ MongoDB (from "humongous") is a scalable, high-performance, open source,
+ schema-free, document-oriented database. Written in C++, MongoDB features:
+
+ MongoDB bridges the gap between key-value stores (which are fast and highly
+ scalable) and traditional RDBMS systems (which provide structured schemas
+ and powerful queries).
+ </longdescription>
+ <use>
+ <flag name="spidermonkey">Use embedded SpiderMonkey engine
+ (<pkg>dev-lang/spidermonkey</pkg>) instead of v8</flag>
+ <flag name="mms-agent">Install the MongoDB Monitoring Service agent</flag>
+ <flag name="sharedclient">build client shared library libmongoclient.so</flag>
+ </use>
+</pkgmetadata>
+
diff --git a/dev-db/mongodb/mongodb-2.5.4.ebuild b/dev-db/mongodb/mongodb-2.5.4.ebuild
new file mode 100644
index 0000000..e06d76c
--- /dev/null
+++ b/dev-db/mongodb/mongodb-2.5.4.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.8.ebuild,v 1.3 2013/12/26 11:27:44 ultrabug Exp $
+
+EAPI=4
+SCONS_MIN_VERSION="1.2.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="2400M"
+
+inherit eutils flag-o-matic multilib pax-utils scons-utils systemd user versionator check-reqs
+
+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/20130821-10gen-mms-agent.zip )"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="kerberos mms-agent sharedclient spidermonkey ssl static-libs"
+
+PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
+RDEPEND="
+ >=dev-libs/boost-1.50[threads(+)]
+ dev-libs/libpcre[cxx]
+ dev-util/google-perftools[-minimal]
+ net-libs/libpcap
+ app-arch/snappy
+ ssl? ( >=dev-libs/openssl-1.0.1c )"
+DEPEND="${RDEPEND}
+ sys-libs/readline
+ sys-libs/ncurses
+ kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ enewgroup mongodb
+ enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+ scons_opts=" --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
+ scons_opts+=" --use-system-tcmalloc"
+ scons_opts+=" --use-system-pcre"
+ scons_opts+=" --use-system-snappy"
+ scons_opts+=" --use-system-boost"
+
+ if use prefix; then
+ scons_opts+=" --cpppath=${EPREFIX}/usr/include"
+ scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
+ fi
+
+ if use kerberos; then
+ scons_opts+=" --use-sasl-client"
+ fi
+
+ if use sharedclient; then
+ scons_opts+=" --sharedclient"
+ fi
+
+ if use spidermonkey; then
+ scons_opts+=" --usesm"
+ else
+ scons_opts+=" --usev8"
+ fi
+
+ if use ssl; then
+ scons_opts+=" --ssl"
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.5.4-fix-scons.patch"
+ epatch "${FILESDIR}/${PN}-2.2-r1-fix-boost.patch"
+
+ # bug #462606
+ sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
+
+ # bug #482576
+ sed -i -e "/-Werror/d" src/third_party/v8/SConscript || die
+}
+
+src_compile() {
+ escons ${scons_opts} all
+}
+
+src_install() {
+ escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
+
+ use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
+
+ if ! use spidermonkey; then
+ pax-mark m "${ED}"/usr/bin/{mongo,mongod}
+ fi
+
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}"
+ fowners mongodb:mongodb "${x}"
+ done
+
+ doman debian/mongo*.1
+ dodoc README docs/building.md
+
+ newinitd "${FILESDIR}/${PN}.initd-r1" ${PN}
+ newconfd "${FILESDIR}/${PN}.confd" ${PN}
+ newinitd "${FILESDIR}/${PN/db/s}.initd-r1" ${PN/db/s}
+ newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
+ systemd_dounit "${FILESDIR}"/${PN}.service
+ insinto /etc
+ doins "${FILESDIR}"/${PN}.conf
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+ if use mms-agent; then
+ local MY_PN="mms-agent"
+ local MY_D="/opt/${MY_PN}"
+ insinto ${MY_D}
+ doins "${WORKDIR}/${MY_PN}/"*
+ fowners -R mongodb:mongodb ${MY_D}
+ newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
+ newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
+ fi
+}
+
+pkg_preinst() {
+ # wrt bug #461466
+ if [[ "$(get_libdir)" == "lib64" ]]; then
+ rmdir "${ED}"/usr/lib/ &>/dev/null
+ fi
+}
+
+src_test() {
+ escons ${scons_opts} test
+ "${S}"/test --dbpath=unittest || die
+}
+
+pkg_postinst() {
+ if [[ ${REPLACING_VERSIONS} < 2.4 ]]; 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}"
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2011-04-13 14:58 Alexys Jacob
0 siblings, 0 replies; 16+ messages in thread
From: Alexys Jacob @ 2011-04-13 14:58 UTC (permalink / raw
To: gentoo-commits
commit: 076fbc754c4bde60ef75d05c361b7296b03ffe20
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 14:58:44 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 14:58:44 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=076fbc75
fixed to g-x86
---
dev-db/mongodb/Manifest | 10 ---
dev-db/mongodb/files/mongodb-1.6-fix-scons.patch | 39 ----------
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.6.5.ebuild | 82 ----------------------
dev-db/mongodb/mongodb-1.8.1.ebuild | 82 ----------------------
9 files changed, 0 insertions(+), 352 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
deleted file mode 100644
index fdbaa71..0000000
--- a/dev-db/mongodb/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX mongodb-1.6-fix-scons.patch 1468 RMD160 54011fed1646e1be90962a6595cbecdec1833c35 SHA1 e76feb1ba4f6973e1e382cd505d23f9c4291e9a9 SHA256 8b903e6cb95b92314a91a540b8773d5c7e85721f25ef4e176bd3eeb4673072cb
-AUX mongodb-1.8-fix-scons.patch 1649 RMD160 1e5be2fe75f25c511b1d70dd1dd7977c8f1a6db3 SHA1 1300bbc5ff4f9c4a59e89fb3e119506b3507906d SHA256 5b8db8f66adabbdd52c364a713ce38a937c4ac6282a4ac530d14930d386d582d
-AUX mongodb.confd 277 RMD160 a6c7f01ecc843c9138046a5b4deaaff839b7bcc4 SHA1 cb04bf6b4d3799846b9ab59dc587c88093d8e265 SHA256 b5b44beb64aae30f285c4764acbb8b2c7c60bd0cdcd47c6c11f285790c42b510
-AUX mongodb.initd 921 RMD160 e26c0e82708bc05b8c5ae85212f6bba1f4799160 SHA1 c542e418870d03ff5a2ff147094bd6c33ec5234e SHA256 c0765809103ab2a5ad806adfa8a850c05396c7b5db8af5ee379eb2ea043b654d
-AUX mongos.confd 261 RMD160 cd0164a9f54d53871a5a15ea15034479e9360d1d SHA1 193e29ae8a33dbd6490698955e6e36601a395c4b SHA256 56b63b536e2e0482972efb1505d3a661511dc9ed5872c12933a141470f1923a8
-AUX mongos.initd 1079 RMD160 fa4b71d2c5accdb988d7b8b04e934c8b9114dd6c SHA1 d09b7834e9b59720c5fa972ad4c730693f978bdd SHA256 c80f43e0dac94524d818615425204b11b234c54a8e8017afdad9459a210216a2
-DIST mongodb-src-r1.6.5.tar.gz 1506561 RMD160 de98b9558544eafb809131347b6a339c46f09732 SHA1 4aed2da91377c2a5c8722c0c6873117014faf31a SHA256 5feac5302be91eea758851d28e4ad09ff4d11a28ffcb61e792ab7aeb5327a8a0
-DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af4365c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d
-EBUILD mongodb-1.6.5.ebuild 1816 RMD160 b6ca2690716e473b60f51dbd30a10f54fdaa2c80 SHA1 acc6814fff309609341d93307c73d18e25e1d764 SHA256 7b187365b293219e7a8734473ba4a17f3c30a659e17434317161d0fb770b5e57
-EBUILD mongodb-1.8.1.ebuild 1857 RMD160 7b51ba844e83325e78f923cc15fd87fe2cf29d9c SHA1 9536bd71d98b7ea62bfe79d753caa4ad3efec224 SHA256 57caf6c7853b7dff092d77636be49633d847e01d8c671a72a11b6a4c875619f7
diff --git a/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch
deleted file mode 100644
index 342c36f..0000000
--- a/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/SConstruct b/SConstruct
-index e3046ff..529b19b 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -745,20 +745,19 @@ 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=" -Wnon-virtual-dtor " )
-+ env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
-+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
- env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
- env.Append( LIBS=[] )
-
- if linux and GetOption( "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" )
-
- if debugLogging:
- env.Append( CPPFLAGS=" -D_DEBUG" );
-@@ -972,8 +971,8 @@ def doConfigure( myenv , needPcre=True , shell=False ):
-
- 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-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 8ac0ebc..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="27018"
-
-# 1 to 3 comma separated config servers (mandatory)
-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 8e67fd9..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 ${MONGOS_RUN:-/var/run/mongodb}
- chown ${MONGOS_USER:-mongodb}: ${MONGOS_RUN:-/var/run/mongodb}
-
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --background --start --make-pidfile \
- --pidfile ${MONGOS_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.6.5.ebuild b/dev-db/mongodb/mongodb-1.6.5.ebuild
deleted file mode 100644
index c8caeef..0000000
--- a/dev-db/mongodb/mongodb-1.6.5.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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.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=" --sharedclient"
- if use v8; then
- scons_opts+=" --usev8"
- else
- scons_opts+=" --usesm"
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-1.6-fix-scons.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}
-
- # Remove unsupported options
- sed -i -e '/--unixSocketPrefix/d' "${D}/etc/init.d/${PN}"
- sed -i -e 's/--journal//g' "${D}/etc/conf.d/${PN}"
-}
-
-src_test() {
- escons ${scons_opts} smoke --smokedbprefix='testdir' test
-}
-
-pkg_postinst() {
- if [[ ${REPLACING_VERSIONS} < 1.6 ]]; then
- ewarn "You just upgraded from a previous version of mongodb !"
- ewarn "Make sure you run 'mongod --upgrade' before using this version."
- fi
-}
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 adcc4da..0000000
--- a/dev-db/mongodb/mongodb-1.8.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-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.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=" --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
-}
-
-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}.conf"
-}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2011-04-13 10:30 Alexys Jacob
0 siblings, 0 replies; 16+ messages in thread
From: Alexys Jacob @ 2011-04-13 10:30 UTC (permalink / raw
To: gentoo-commits
commit: 4ac34d0735a531b8d89baa9e6f2c4abd94c182a1
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 13 10:30:34 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Wed Apr 13 10:30:34 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=4ac34d07
add mongodb-1.6.5 ebuild thanks to jbergstroem
---
dev-db/mongodb/Manifest | 3 +
dev-db/mongodb/files/mongodb-1.6-fix-scons.patch | 39 ++++++++++
dev-db/mongodb/mongodb-1.6.5.ebuild | 82 ++++++++++++++++++++++
3 files changed, 124 insertions(+), 0 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index f3b6b39..fdbaa71 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,7 +1,10 @@
+AUX mongodb-1.6-fix-scons.patch 1468 RMD160 54011fed1646e1be90962a6595cbecdec1833c35 SHA1 e76feb1ba4f6973e1e382cd505d23f9c4291e9a9 SHA256 8b903e6cb95b92314a91a540b8773d5c7e85721f25ef4e176bd3eeb4673072cb
AUX mongodb-1.8-fix-scons.patch 1649 RMD160 1e5be2fe75f25c511b1d70dd1dd7977c8f1a6db3 SHA1 1300bbc5ff4f9c4a59e89fb3e119506b3507906d SHA256 5b8db8f66adabbdd52c364a713ce38a937c4ac6282a4ac530d14930d386d582d
AUX mongodb.confd 277 RMD160 a6c7f01ecc843c9138046a5b4deaaff839b7bcc4 SHA1 cb04bf6b4d3799846b9ab59dc587c88093d8e265 SHA256 b5b44beb64aae30f285c4764acbb8b2c7c60bd0cdcd47c6c11f285790c42b510
AUX mongodb.initd 921 RMD160 e26c0e82708bc05b8c5ae85212f6bba1f4799160 SHA1 c542e418870d03ff5a2ff147094bd6c33ec5234e SHA256 c0765809103ab2a5ad806adfa8a850c05396c7b5db8af5ee379eb2ea043b654d
AUX mongos.confd 261 RMD160 cd0164a9f54d53871a5a15ea15034479e9360d1d SHA1 193e29ae8a33dbd6490698955e6e36601a395c4b SHA256 56b63b536e2e0482972efb1505d3a661511dc9ed5872c12933a141470f1923a8
AUX mongos.initd 1079 RMD160 fa4b71d2c5accdb988d7b8b04e934c8b9114dd6c SHA1 d09b7834e9b59720c5fa972ad4c730693f978bdd SHA256 c80f43e0dac94524d818615425204b11b234c54a8e8017afdad9459a210216a2
+DIST mongodb-src-r1.6.5.tar.gz 1506561 RMD160 de98b9558544eafb809131347b6a339c46f09732 SHA1 4aed2da91377c2a5c8722c0c6873117014faf31a SHA256 5feac5302be91eea758851d28e4ad09ff4d11a28ffcb61e792ab7aeb5327a8a0
DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af4365c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d
+EBUILD mongodb-1.6.5.ebuild 1816 RMD160 b6ca2690716e473b60f51dbd30a10f54fdaa2c80 SHA1 acc6814fff309609341d93307c73d18e25e1d764 SHA256 7b187365b293219e7a8734473ba4a17f3c30a659e17434317161d0fb770b5e57
EBUILD mongodb-1.8.1.ebuild 1857 RMD160 7b51ba844e83325e78f923cc15fd87fe2cf29d9c SHA1 9536bd71d98b7ea62bfe79d753caa4ad3efec224 SHA256 57caf6c7853b7dff092d77636be49633d847e01d8c671a72a11b6a4c875619f7
diff --git a/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch
new file mode 100644
index 0000000..342c36f
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch
@@ -0,0 +1,39 @@
+diff --git a/SConstruct b/SConstruct
+index e3046ff..529b19b 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -745,20 +745,19 @@ 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=" -Wnon-virtual-dtor " )
++ env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
++ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
+ env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
+ env.Append( LIBS=[] )
+
+ if linux and GetOption( "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" )
+
+ if debugLogging:
+ env.Append( CPPFLAGS=" -D_DEBUG" );
+@@ -972,8 +971,8 @@ def doConfigure( myenv , needPcre=True , shell=False ):
+
+ 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/mongodb-1.6.5.ebuild b/dev-db/mongodb/mongodb-1.6.5.ebuild
new file mode 100644
index 0000000..c8caeef
--- /dev/null
+++ b/dev-db/mongodb/mongodb-1.6.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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.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=" --sharedclient"
+ if use v8; then
+ scons_opts+=" --usev8"
+ else
+ scons_opts+=" --usesm"
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-1.6-fix-scons.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}
+
+ # Remove unsupported options
+ sed -i -e '/--unixSocketPrefix/d' "${D}/etc/init.d/${PN}"
+ sed -i -e 's/--journal//g' "${D}/etc/conf.d/${PN}"
+}
+
+src_test() {
+ escons ${scons_opts} smoke --smokedbprefix='testdir' test
+}
+
+pkg_postinst() {
+ if [[ ${REPLACING_VERSIONS} < 1.6 ]]; then
+ ewarn "You just upgraded from a previous version of mongodb !"
+ ewarn "Make sure you run 'mongod --upgrade' before using this version."
+ fi
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2011-04-12 8:10 Alexys Jacob
0 siblings, 0 replies; 16+ messages in thread
From: Alexys Jacob @ 2011-04-12 8:10 UTC (permalink / raw
To: gentoo-commits
commit: 5ce46637c81f30b089e8b24bc73e55b08fc2fac7
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 08:10:19 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 08:10:19 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=5ce46637
mongs initd typo
---
dev-db/mongodb/Manifest | 2 +-
dev-db/mongodb/files/mongos.confd | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 8da322b..01fe19a 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,7 +1,7 @@
AUX mongodb-1.8-fix-scons.patch 1649 RMD160 1e5be2fe75f25c511b1d70dd1dd7977c8f1a6db3 SHA1 1300bbc5ff4f9c4a59e89fb3e119506b3507906d SHA256 5b8db8f66adabbdd52c364a713ce38a937c4ac6282a4ac530d14930d386d582d
AUX mongodb.confd 277 RMD160 a6c7f01ecc843c9138046a5b4deaaff839b7bcc4 SHA1 cb04bf6b4d3799846b9ab59dc587c88093d8e265 SHA256 b5b44beb64aae30f285c4764acbb8b2c7c60bd0cdcd47c6c11f285790c42b510
AUX mongodb.initd 921 RMD160 e26c0e82708bc05b8c5ae85212f6bba1f4799160 SHA1 c542e418870d03ff5a2ff147094bd6c33ec5234e SHA256 c0765809103ab2a5ad806adfa8a850c05396c7b5db8af5ee379eb2ea043b654d
-AUX mongos.confd 261 RMD160 f3144173958cd4859d90ddfa0290ef43e92e377c SHA1 a050f61a4cc8921544d2c4ebe110de74e9654bb0 SHA256 c6227600e468a34658eeabda0ea6ae71ec4e6d8fb8cb5d7682a692b162b08856
+AUX mongos.confd 261 RMD160 cd0164a9f54d53871a5a15ea15034479e9360d1d SHA1 193e29ae8a33dbd6490698955e6e36601a395c4b SHA256 56b63b536e2e0482972efb1505d3a661511dc9ed5872c12933a141470f1923a8
AUX mongos.initd 1079 RMD160 fa4b71d2c5accdb988d7b8b04e934c8b9114dd6c SHA1 d09b7834e9b59720c5fa972ad4c730693f978bdd SHA256 c80f43e0dac94524d818615425204b11b234c54a8e8017afdad9459a210216a2
DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af4365c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d
EBUILD mongodb-1.8.1.ebuild 2259 RMD160 936cec51720a5566356312261a276b1fe96bd949 SHA1 f2f3f26e64655733fe19226a324bd714957df1f0 SHA256 3efad2dc038a72f403d07c9901f229dc578d9b5861be808053e06ccaa2bdaf65
diff --git a/dev-db/mongodb/files/mongos.confd b/dev-db/mongodb/files/mongos.confd
index 921491c..8ac0ebc 100644
--- a/dev-db/mongodb/files/mongos.confd
+++ b/dev-db/mongodb/files/mongos.confd
@@ -6,7 +6,7 @@ MONGOS_USER="mongodb"
MONGOS_IP="127.0.0.1"
MONGOS_PORT="27018"
-# 1 to 3 comma separated config servers (mendatory)
+# 1 to 3 comma separated config servers (mandatory)
MONGOS_CONFIGDB=""
# Set extra options here
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2011-04-12 8:08 Alexys Jacob
0 siblings, 0 replies; 16+ messages in thread
From: Alexys Jacob @ 2011-04-12 8:08 UTC (permalink / raw
To: gentoo-commits
commit: 8c82e9f27da6da1b62c1eb9eb8f197649c9ec471
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 08:08:15 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 08:08:15 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=8c82e9f2
prefer static-libs, mongos initd typos
---
dev-db/mongodb/Manifest | 6 +++---
dev-db/mongodb/files/mongos.confd | 2 +-
dev-db/mongodb/files/mongos.initd | 6 +++---
dev-db/mongodb/mongodb-1.8.1.ebuild | 3 ++-
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index afe5c13..8da322b 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,7 +1,7 @@
AUX mongodb-1.8-fix-scons.patch 1649 RMD160 1e5be2fe75f25c511b1d70dd1dd7977c8f1a6db3 SHA1 1300bbc5ff4f9c4a59e89fb3e119506b3507906d SHA256 5b8db8f66adabbdd52c364a713ce38a937c4ac6282a4ac530d14930d386d582d
AUX mongodb.confd 277 RMD160 a6c7f01ecc843c9138046a5b4deaaff839b7bcc4 SHA1 cb04bf6b4d3799846b9ab59dc587c88093d8e265 SHA256 b5b44beb64aae30f285c4764acbb8b2c7c60bd0cdcd47c6c11f285790c42b510
AUX mongodb.initd 921 RMD160 e26c0e82708bc05b8c5ae85212f6bba1f4799160 SHA1 c542e418870d03ff5a2ff147094bd6c33ec5234e SHA256 c0765809103ab2a5ad806adfa8a850c05396c7b5db8af5ee379eb2ea043b654d
-AUX mongos.confd 261 RMD160 19839469426d2dc56987ccc442b02dac3646c909 SHA1 9412c5b9916618120c7cb62e113ed8a613b93217 SHA256 ee25bbdaf9c80dd33d7ce662a932d4b08798a802820b9fa552379821a5c40d95
-AUX mongos.initd 1083 RMD160 7376258d119fad385dcbbc9361634eedaf5dcca4 SHA1 ae29179137d61ee260d37e47e2004eb7c348ee23 SHA256 1a9154a2a91d35d3304cebbb627627f1c2977002a2a9e199c836d6cb5730bb55
+AUX mongos.confd 261 RMD160 f3144173958cd4859d90ddfa0290ef43e92e377c SHA1 a050f61a4cc8921544d2c4ebe110de74e9654bb0 SHA256 c6227600e468a34658eeabda0ea6ae71ec4e6d8fb8cb5d7682a692b162b08856
+AUX mongos.initd 1079 RMD160 fa4b71d2c5accdb988d7b8b04e934c8b9114dd6c SHA1 d09b7834e9b59720c5fa972ad4c730693f978bdd SHA256 c80f43e0dac94524d818615425204b11b234c54a8e8017afdad9459a210216a2
DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af4365c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d
-EBUILD mongodb-1.8.1.ebuild 2210 RMD160 96b48216b7e491260e984d47dfa54cb61043ffba SHA1 16251ae0166743ea10fd9e162ca9e666c5d9bf72 SHA256 ea0e5e227f4cb76cfefeaa25797e9efa258caded3d2137b4b2deab4ca6e6442b
+EBUILD mongodb-1.8.1.ebuild 2259 RMD160 936cec51720a5566356312261a276b1fe96bd949 SHA1 f2f3f26e64655733fe19226a324bd714957df1f0 SHA256 3efad2dc038a72f403d07c9901f229dc578d9b5861be808053e06ccaa2bdaf65
diff --git a/dev-db/mongodb/files/mongos.confd b/dev-db/mongodb/files/mongos.confd
index 44cbad8..921491c 100644
--- a/dev-db/mongodb/files/mongos.confd
+++ b/dev-db/mongodb/files/mongos.confd
@@ -4,7 +4,7 @@ MONGOS_RUN="/var/run/mongodb"
MONGOS_USER="mongodb"
MONGOS_IP="127.0.0.1"
-MONGOS_PORT="27019"
+MONGOS_PORT="27018"
# 1 to 3 comma separated config servers (mendatory)
MONGOS_CONFIGDB=""
diff --git a/dev-db/mongodb/files/mongos.initd b/dev-db/mongodb/files/mongos.initd
index 90e2661..8e67fd9 100644
--- a/dev-db/mongodb/files/mongos.initd
+++ b/dev-db/mongodb/files/mongos.initd
@@ -18,12 +18,12 @@ checkconfig() {
start() {
checkconfig || return 1
- mkdir -p ${MONGODB_RUN:-/var/run/mongodb}
- chown ${MONGODB_USER:-mongodb}: ${MONGODB_RUN:-/var/run/mongodb}
+ mkdir -p ${MONGOS_RUN:-/var/run/mongodb}
+ chown ${MONGOS_USER:-mongodb}: ${MONGOS_RUN:-/var/run/mongodb}
ebegin "Starting ${SVCNAME}"
start-stop-daemon --background --start --make-pidfile \
- --pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
+ --pidfile ${MONGOS_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
--chuid ${MONGOS_USER:-mongodb} \
--exec ${MONGOS_EXEC:-/usr/bin/mongos} \
-- \
diff --git a/dev-db/mongodb/mongodb-1.8.1.ebuild b/dev-db/mongodb/mongodb-1.8.1.ebuild
index e0b20dd..9822fa7 100644
--- a/dev-db/mongodb/mongodb-1.8.1.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.1.ebuild
@@ -16,8 +16,9 @@ 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"
+# Prefer static-libs as recommended by upstream
+IUSE="+static-libs v8"
RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.9 )
v8? ( dev-lang/v8 )
dev-libs/boost
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2011-04-11 16:34 Alexys Jacob
0 siblings, 0 replies; 16+ messages in thread
From: Alexys Jacob @ 2011-04-11 16:34 UTC (permalink / raw
To: gentoo-commits
commit: 4e88c716a4b57f9ed0993a3de40c21793c902ad6
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 16:34:32 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 16:34:32 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=4e88c716
better mongos init script
---
dev-db/mongodb/Manifest | 4 ++--
dev-db/mongodb/files/mongos.confd | 5 ++++-
dev-db/mongodb/files/mongos.initd | 18 ++++++++++++++++--
3 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index a1b18a2..afe5c13 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,7 +1,7 @@
AUX mongodb-1.8-fix-scons.patch 1649 RMD160 1e5be2fe75f25c511b1d70dd1dd7977c8f1a6db3 SHA1 1300bbc5ff4f9c4a59e89fb3e119506b3507906d SHA256 5b8db8f66adabbdd52c364a713ce38a937c4ac6282a4ac530d14930d386d582d
AUX mongodb.confd 277 RMD160 a6c7f01ecc843c9138046a5b4deaaff839b7bcc4 SHA1 cb04bf6b4d3799846b9ab59dc587c88093d8e265 SHA256 b5b44beb64aae30f285c4764acbb8b2c7c60bd0cdcd47c6c11f285790c42b510
AUX mongodb.initd 921 RMD160 e26c0e82708bc05b8c5ae85212f6bba1f4799160 SHA1 c542e418870d03ff5a2ff147094bd6c33ec5234e SHA256 c0765809103ab2a5ad806adfa8a850c05396c7b5db8af5ee379eb2ea043b654d
-AUX mongos.confd 189 RMD160 56c0fb6d545da7ff5689c517b6b71f898e27c5a2 SHA1 1b3f6b072ac94a7ab29410096a7cab15a208171a SHA256 78e4ef078adf6a8add95546f501d070019717c0bc4833672fbb2ad834d16b16c
-AUX mongos.initd 758 RMD160 6e7691205f36b48a2e90ddbfc0697b654c33f74c SHA1 b69352503eb65a1900e93e45eb329958301d22f1 SHA256 ac6c6d0f65c7e65ee5d9d2a57e999346b6f5ed9e5e7e5440b40288d1807ac4d0
+AUX mongos.confd 261 RMD160 19839469426d2dc56987ccc442b02dac3646c909 SHA1 9412c5b9916618120c7cb62e113ed8a613b93217 SHA256 ee25bbdaf9c80dd33d7ce662a932d4b08798a802820b9fa552379821a5c40d95
+AUX mongos.initd 1083 RMD160 7376258d119fad385dcbbc9361634eedaf5dcca4 SHA1 ae29179137d61ee260d37e47e2004eb7c348ee23 SHA256 1a9154a2a91d35d3304cebbb627627f1c2977002a2a9e199c836d6cb5730bb55
DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af4365c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d
EBUILD mongodb-1.8.1.ebuild 2210 RMD160 96b48216b7e491260e984d47dfa54cb61043ffba SHA1 16251ae0166743ea10fd9e162ca9e666c5d9bf72 SHA256 ea0e5e227f4cb76cfefeaa25797e9efa258caded3d2137b4b2deab4ca6e6442b
diff --git a/dev-db/mongodb/files/mongos.confd b/dev-db/mongodb/files/mongos.confd
index 8a2bf88..44cbad8 100644
--- a/dev-db/mongodb/files/mongos.confd
+++ b/dev-db/mongodb/files/mongos.confd
@@ -4,7 +4,10 @@ MONGOS_RUN="/var/run/mongodb"
MONGOS_USER="mongodb"
MONGOS_IP="127.0.0.1"
-MONGOS_PORT="27018"
+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
index 978f5f8..90e2661 100644
--- a/dev-db/mongodb/files/mongos.initd
+++ b/dev-db/mongodb/files/mongos.initd
@@ -7,7 +7,20 @@ 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 \
@@ -18,12 +31,13 @@ start() {
--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 ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid
+ start-stop-daemon --stop --pidfile ${MONGOS_RUN:-/var/run/mongodb}/${SVCNAME}.pid
eend $?
-}
+}
\ No newline at end of file
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2011-04-11 15:45 Alexys Jacob
0 siblings, 0 replies; 16+ messages in thread
From: Alexys Jacob @ 2011-04-11 15:45 UTC (permalink / raw
To: gentoo-commits
commit: 7ba2b9a99062dbe3b759773f4864b9cb778ea979
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 15:45:52 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 15:45:52 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=7ba2b9a9
fix initds and escons use
---
dev-db/mongodb/Manifest | 6 +++---
dev-db/mongodb/files/mongodb.initd | 2 +-
dev-db/mongodb/files/mongos.initd | 4 ++--
dev-db/mongodb/mongodb-1.8.1.ebuild | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 872414f..a1b18a2 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,7 +1,7 @@
AUX mongodb-1.8-fix-scons.patch 1649 RMD160 1e5be2fe75f25c511b1d70dd1dd7977c8f1a6db3 SHA1 1300bbc5ff4f9c4a59e89fb3e119506b3507906d SHA256 5b8db8f66adabbdd52c364a713ce38a937c4ac6282a4ac530d14930d386d582d
AUX mongodb.confd 277 RMD160 a6c7f01ecc843c9138046a5b4deaaff839b7bcc4 SHA1 cb04bf6b4d3799846b9ab59dc587c88093d8e265 SHA256 b5b44beb64aae30f285c4764acbb8b2c7c60bd0cdcd47c6c11f285790c42b510
-AUX mongodb.initd 897 RMD160 e33b2d27c4b21d36531726857722c20044743388 SHA1 f36023f9a78676da5e117b9d4968ec99fc5df85d SHA256 3b0b7df3172799261653c2a2679d7fbaf0e045b8c447064b82d825ca71865ab5
+AUX mongodb.initd 921 RMD160 e26c0e82708bc05b8c5ae85212f6bba1f4799160 SHA1 c542e418870d03ff5a2ff147094bd6c33ec5234e SHA256 c0765809103ab2a5ad806adfa8a850c05396c7b5db8af5ee379eb2ea043b654d
AUX mongos.confd 189 RMD160 56c0fb6d545da7ff5689c517b6b71f898e27c5a2 SHA1 1b3f6b072ac94a7ab29410096a7cab15a208171a SHA256 78e4ef078adf6a8add95546f501d070019717c0bc4833672fbb2ad834d16b16c
-AUX mongos.initd 710 RMD160 1f59b815bc7b67d4a1bb3134f6b891e361bedd3f SHA1 c1d6598e988be9b61b00f59baaea2c9dc675d756 SHA256 96f6d27404d52e0fc0ab637457aa025c25f7fe1fe13dfa9fa873593b412406d7
+AUX mongos.initd 758 RMD160 6e7691205f36b48a2e90ddbfc0697b654c33f74c SHA1 b69352503eb65a1900e93e45eb329958301d22f1 SHA256 ac6c6d0f65c7e65ee5d9d2a57e999346b6f5ed9e5e7e5440b40288d1807ac4d0
DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af4365c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d
-EBUILD mongodb-1.8.1.ebuild 2209 RMD160 6f4dc9bed4e7e5f4261a0fdf21979fff3a6a42a1 SHA1 a3173a7b10a45e09abf2278a0577cad45e841b59 SHA256 43f1fea64354757ba14d864e367e413f1f8321f5fcc29a6fb0a29623a314776f
+EBUILD mongodb-1.8.1.ebuild 2210 RMD160 96b48216b7e491260e984d47dfa54cb61043ffba SHA1 16251ae0166743ea10fd9e162ca9e666c5d9bf72 SHA256 ea0e5e227f4cb76cfefeaa25797e9efa258caded3d2137b4b2deab4ca6e6442b
diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mongodb.initd
index e1dfa71..9e105e4 100644
--- a/dev-db/mongodb/files/mongodb.initd
+++ b/dev-db/mongodb/files/mongodb.initd
@@ -28,6 +28,6 @@ start() {
stop() {
ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --pidfile /var/run/${SVCNAME}.pid
+ start-stop-daemon --stop --pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid
eend $?
}
diff --git a/dev-db/mongodb/files/mongos.initd b/dev-db/mongodb/files/mongos.initd
index 501c0f5..978f5f8 100644
--- a/dev-db/mongodb/files/mongos.initd
+++ b/dev-db/mongodb/files/mongos.initd
@@ -10,7 +10,7 @@ depend() {
start() {
ebegin "Starting ${SVCNAME}"
start-stop-daemon --background --start --make-pidfile \
- --pidfile /var/run/${SVCNAME}.pid \
+ --pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
--chuid ${MONGOS_USER:-mongodb} \
--exec ${MONGOS_EXEC:-/usr/bin/mongos} \
-- \
@@ -24,6 +24,6 @@ start() {
stop() {
ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --pidfile /var/run/${SVCNAME}.pid
+ start-stop-daemon --stop --pidfile ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid
eend $?
}
diff --git a/dev-db/mongodb/mongodb-1.8.1.ebuild b/dev-db/mongodb/mongodb-1.8.1.ebuild
index ae62d77..e0b20dd 100644
--- a/dev-db/mongodb/mongodb-1.8.1.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.1.ebuild
@@ -75,7 +75,7 @@ src_install() {
}
src_test() {
- scons ${scons_opts} test || die "Build test failed"
+ escons ${scons_opts} test || die "Build test failed"
${S}/test --dbpath=unittest || die "Tests failed"
}
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2011-04-11 14:13 Alexys Jacob
0 siblings, 0 replies; 16+ messages in thread
From: Alexys Jacob @ 2011-04-11 14:13 UTC (permalink / raw
To: gentoo-commits
commit: 02f6d7328378f27453411696aed3cdc324f7e033
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 14:13:25 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 14:13:25 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=02f6d732
add mongos init.d and fix root privileges
---
dev-db/mongodb/Manifest | 8 +++++---
dev-db/mongodb/files/mongodb.confd | 1 +
dev-db/mongodb/files/mongodb.initd | 9 ++++++---
dev-db/mongodb/files/mongos.confd | 10 ++++++++++
.../mongodb/files/{mongodb.initd => mongos.initd} | 13 ++++++-------
dev-db/mongodb/mongodb-1.8.1.ebuild | 12 +++++++-----
6 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 3734021..9277b32 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,5 +1,7 @@
AUX mongodb-1.8-fix-scons.patch 1649 RMD160 1e5be2fe75f25c511b1d70dd1dd7977c8f1a6db3 SHA1 1300bbc5ff4f9c4a59e89fb3e119506b3507906d SHA256 5b8db8f66adabbdd52c364a713ce38a937c4ac6282a4ac530d14930d386d582d
-AUX mongodb.confd 246 RMD160 fee0f87d5f6715b237d7195ea6dfd24a50868102 SHA1 dd786ce383ea3a112352f5b48e4948dd3377b009 SHA256 5dd09535664bd7bc9d0e927896f8e768f225c43c1d84bde9812cb36866f1f587
-AUX mongodb.initd 738 RMD160 ba740896d73b19544a73d0ffbab3c3849d822692 SHA1 cc5fbd32849cab99e2bb5395ad1229e6087a7a88 SHA256 9247f210bd43f4efd7a8c9b046d6e5f4eeed3acbc736c351f57557277cf71d06
+AUX mongodb.confd 277 RMD160 a6c7f01ecc843c9138046a5b4deaaff839b7bcc4 SHA1 cb04bf6b4d3799846b9ab59dc587c88093d8e265 SHA256 b5b44beb64aae30f285c4764acbb8b2c7c60bd0cdcd47c6c11f285790c42b510
+AUX mongodb.initd 897 RMD160 e33b2d27c4b21d36531726857722c20044743388 SHA1 f36023f9a78676da5e117b9d4968ec99fc5df85d SHA256 3b0b7df3172799261653c2a2679d7fbaf0e045b8c447064b82d825ca71865ab5
+AUX mongos.confd 189 RMD160 56c0fb6d545da7ff5689c517b6b71f898e27c5a2 SHA1 1b3f6b072ac94a7ab29410096a7cab15a208171a SHA256 78e4ef078adf6a8add95546f501d070019717c0bc4833672fbb2ad834d16b16c
+AUX mongos.initd 710 RMD160 1f59b815bc7b67d4a1bb3134f6b891e361bedd3f SHA1 c1d6598e988be9b61b00f59baaea2c9dc675d756 SHA256 96f6d27404d52e0fc0ab637457aa025c25f7fe1fe13dfa9fa873593b412406d7
DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af4365c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d
-EBUILD mongodb-1.8.1.ebuild 2040 RMD160 2b98f57a23aedfab3f73bb4428d5c238ac5fb77e SHA1 a8560252110fc80122044fe9b009e4425d37b561 SHA256 8908e7fbd1c1855e9f536775baf09ca6ddacbe74ff9c43162958f16444e00b99
+EBUILD mongodb-1.8.1.ebuild 2220 RMD160 c56d9e79bfb4401d6a39ecce9a0a46db6cb8a175 SHA1 64dee98f2bfd5513668aab39910a91d66c774047 SHA256 7f2048c74e096901156221ceec06788d236711e1ba69f715d49708d7b841e191
diff --git a/dev-db/mongodb/files/mongodb.confd b/dev-db/mongodb/files/mongodb.confd
index 3643f9e..9b3a438 100644
--- a/dev-db/mongodb/files/mongodb.confd
+++ b/dev-db/mongodb/files/mongodb.confd
@@ -1,5 +1,6 @@
# Mongodb essentials
MONGODB_EXEC="/usr/bin/mongod"
+MONGODB_RUN="/var/run/mongodb"
MONGODB_DATA="/var/lib/mongodb"
MONGODB_USER="mongodb"
diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mongodb.initd
index 189cfae..e1dfa71 100644
--- a/dev-db/mongodb/files/mongodb.initd
+++ b/dev-db/mongodb/files/mongodb.initd
@@ -8,16 +8,19 @@ depend() {
}
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 /var/run/${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 /var/run \
+ --unixSocketPrefix ${MONGODB_RUN:-/var/run/mongodb} \
--logappend --logpath /var/log/mongodb/${SVCNAME}.log \
${MONGODB_OPTIONS}
eend $?
diff --git a/dev-db/mongodb/files/mongos.confd b/dev-db/mongodb/files/mongos.confd
new file mode 100644
index 0000000..8a2bf88
--- /dev/null
+++ b/dev-db/mongodb/files/mongos.confd
@@ -0,0 +1,10 @@
+# Mongos essentials
+MONGOS_EXEC="/usr/bin/mongos"
+MONGOS_RUN="/var/run/mongodb"
+MONGOS_USER="mongodb"
+
+MONGOS_IP="127.0.0.1"
+MONGOS_PORT="27018"
+
+# Set extra options here
+MONGOS_OPTIONS=""
diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mongos.initd
similarity index 65%
copy from dev-db/mongodb/files/mongodb.initd
copy to dev-db/mongodb/files/mongos.initd
index 189cfae..501c0f5 100644
--- a/dev-db/mongodb/files/mongodb.initd
+++ b/dev-db/mongodb/files/mongos.initd
@@ -11,15 +11,14 @@ start() {
ebegin "Starting ${SVCNAME}"
start-stop-daemon --background --start --make-pidfile \
--pidfile /var/run/${SVCNAME}.pid \
- --user ${MONGODB_USER:-mongodb} \
- --exec ${MONGODB_EXEC:-/usr/bin/mongod} \
+ --chuid ${MONGOS_USER:-mongodb} \
+ --exec ${MONGOS_EXEC:-/usr/bin/mongos} \
-- \
- --bind_ip ${MONGODB_IP:-127.0.0.1} \
- --port ${MONGODB_PORT:-27017} \
- --dbpath ${MONGODB_DATA:-/var/lib/mongodb} \
- --unixSocketPrefix /var/run \
+ --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 \
- ${MONGODB_OPTIONS}
+ ${MONGOS_OPTIONS}
eend $?
}
diff --git a/dev-db/mongodb/mongodb-1.8.1.ebuild b/dev-db/mongodb/mongodb-1.8.1.ebuild
index 228c419..8280234 100644
--- a/dev-db/mongodb/mongodb-1.8.1.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.1.ebuild
@@ -3,8 +3,9 @@
# $Header: $
EAPI=3
+SCONS_MIN_VERSION="1.2.0"
-inherit eutils multilib versionator
+inherit eutils multilib scons-utils versionator
MY_P="${PN}-src-r${PV/_rc/-rc}"
@@ -23,7 +24,6 @@ RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.9 )
dev-libs/libpcre[cxx]
net-libs/libpcap"
DEPEND="${RDEPEND}
- dev-util/scons
sys-libs/readline
sys-libs/ncurses"
@@ -47,7 +47,7 @@ src_prepare() {
}
src_compile() {
- scons ${scons_opts} all || die "Compile failed"
+ escons ${scons_opts} all || die "Compile failed"
}
pkg_preinst() {
@@ -56,11 +56,11 @@ pkg_preinst() {
}
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}/${PN}; do
+ for x in /var/{lib,log,run}/${PN}; do
keepdir "${x}" || die "Install failed"
fowners mongodb:mongodb "${x}"
done
@@ -70,6 +70,8 @@ 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() {
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2011-04-10 17:55 Alexys Jacob
0 siblings, 0 replies; 16+ messages in thread
From: Alexys Jacob @ 2011-04-10 17:55 UTC (permalink / raw
To: gentoo-commits
commit: 662d127f0479d00a60881cf4586e7f6beed8a524
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 17:54:55 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 17:54:55 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=662d127f
mongodb work
---
dev-db/mongodb/Manifest | 4 ++--
dev-db/mongodb/files/mongodb.initd | 1 +
dev-db/mongodb/mongodb-1.8.1.ebuild | 17 ++++++-----------
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 6c355af..c9ca59c 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,5 +1,5 @@
AUX mongodb-1.8-fix-scons.patch 1649 RMD160 1e5be2fe75f25c511b1d70dd1dd7977c8f1a6db3 SHA1 1300bbc5ff4f9c4a59e89fb3e119506b3507906d SHA256 5b8db8f66adabbdd52c364a713ce38a937c4ac6282a4ac530d14930d386d582d
AUX mongodb.confd 246 RMD160 fee0f87d5f6715b237d7195ea6dfd24a50868102 SHA1 dd786ce383ea3a112352f5b48e4948dd3377b009 SHA256 5dd09535664bd7bc9d0e927896f8e768f225c43c1d84bde9812cb36866f1f587
-AUX mongodb.initd 706 RMD160 7eafe2f49701dcbee548c32e1340d21e3cb0c482 SHA1 6a492588c90c592782eab4b3682735ba32cbd75d SHA256 15e549835897d44ded2e4be37448c08fd2b084bc1609cf747bdb3e5674ab9e00
+AUX mongodb.initd 754 RMD160 c63b5ff46124c0fbddcfdf82d9a83cb7a8f529af SHA1 30b33e0ea5affda165eb17f0b4abdd518838f2a5 SHA256 56028d6e9c71781c9e27a0d1240c8c895341fa7893bec745b806c6092a86cd19
DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af4365c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d
-EBUILD mongodb-1.8.1.ebuild 2254 RMD160 b267fc26bb0ea50a7b3008115679da9ecbf06e2a SHA1 45169685deb4d2bb302737194b1cf9b3959ee53e SHA256 778b878bc368f7988bc7f2a98849814c49dec54ddb0209579709f312735ab001
+EBUILD mongodb-1.8.1.ebuild 2130 RMD160 ff2c2ca25274092ce2d4b3fc223c147b8254cab2 SHA1 e3cbc510e73e2576d43930d4112a72cc39758900 SHA256 29e0e7611b1abed30b19135de756fddd90191941470f4e3ee1c640fe968ed7d9
diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mongodb.initd
index 32c6968..f023058 100644
--- a/dev-db/mongodb/files/mongodb.initd
+++ b/dev-db/mongodb/files/mongodb.initd
@@ -17,6 +17,7 @@ start() {
--bind_ip ${MONGODB_IP:-127.0.0.1} \
--port ${MONGODB_PORT:-27017} \
--dbpath ${MONGODB_DATA:-/var/lib/mongodb} \
+ --unixSocketPrefix /var/run/${SVCNAME}.sock \
--logappend --logpath /var/log/mongodb/${SVCNAME}.log \
${MONGODB_OPTIONS}
eend $?
diff --git a/dev-db/mongodb/mongodb-1.8.1.ebuild b/dev-db/mongodb/mongodb-1.8.1.ebuild
index 478f13c..20a62c4 100644
--- a/dev-db/mongodb/mongodb-1.8.1.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.1.ebuild
@@ -4,7 +4,7 @@
EAPI=3
-inherit eutils versionator
+inherit eutils multilib versionator
MY_PATCHVER=$(get_version_component_range 1-2)
MY_P="${PN}-src-r${PV}"
@@ -18,7 +18,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="static-libs v8"
-RDEPEND="!v8? ( dev-lang/spidermonkey )
+RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.9 )
v8? ( dev-lang/v8 )
dev-libs/boost
dev-libs/libpcre[cxx]
@@ -45,12 +45,6 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/${PN}-1.8-fix-scons.patch"
- # TODO: is this still true ?
- #if use v8; then
- # Suppress known test failure with v8:
- # http://jira.mongodb.org/browse/SERVER-1147
- #sed -i -e '/add< NumberLong >/d' dbtests/jstests.cpp || die
- #fi
}
src_compile() {
@@ -74,9 +68,10 @@ src_install() {
newconfd "${FILESDIR}/${PN}.confd" ${PN} || die "Install failed"
}
-src_test() {
- scons ${scons_opts} smoke --smokedbprefix='testdir' test || die "Tests failed"
-}
+# FIXME: test phase depends on pymongo which is not in tree
+# src_test() {
+ #scons ${scons_opts} smoke --smokedbprefix='testdir' test || die "Tests failed"
+# }
pkg_postinst() {
if has_version '<dev-db/mongodb-1.8'; then
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2011-04-10 14:20 Alexys Jacob
0 siblings, 0 replies; 16+ messages in thread
From: Alexys Jacob @ 2011-04-10 14:20 UTC (permalink / raw
To: gentoo-commits
commit: eed9ea43633b2826fa31775edaa9c8c89548e2d0
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 14:20:49 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Sun Apr 10 14:20:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=eed9ea43
mongodb work in progress
---
dev-db/mongodb/Manifest | 12 ++----
dev-db/mongodb/files/mongodb-1.8-fix-scons.patch | 33 +++++-----------
dev-db/mongodb/files/mongodb.confd | 3 +-
dev-db/mongodb/files/mongodb.initd | 44 +++++++---------------
dev-db/mongodb/mongodb-1.8.1.ebuild | 34 ++++++++++-------
5 files changed, 50 insertions(+), 76 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 8d0d3b2..6c355af 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,9 +1,5 @@
-AUX mongodb-1.8-fix-scons.patch 2000 RMD160 0728a6d2e50b3756f7d0c4c75cdd256467d20a34 SHA1 087ff1065360a63ee21ed52d1b8f78b88c8fb359 SHA256 bb7d569d43bc2aee1f51bd0082e5ff68e6da89debf0ffd8c15d992094fb6320b
-AUX mongodb-1.8-fix-scons.patch.ultrabug 1599 RMD160 de9ced190d9e1581dd06a5f120a805e894075b83 SHA1 2bc5ffd701503cf1abaf007085f536d1c9d83185 SHA256 731f63484aa5e81e70faf4cd2b3bcacf67ddaf65c05e3e0584809b075999d82b
-AUX mongodb.confd 285 RMD160 cc5e3ab24a9880a19392a7416d23d1ae7a328e11 SHA1 7c4b720ea5b0afd2fa88a6adc2d8a2e356691413 SHA256 8dfedbb433e11f8ed6ec8159ed5c02f94c22f86006cda21f0b2bb59ebe50b2ad
-AUX mongodb.initd 1129 RMD160 92a89d9d71ffcdaba8f86f1a2902abddc9866147 SHA1 2c83bfe4c5728ffc8b3dc37fd8d345d09c13f6b0 SHA256 c318a8ca1fe83c59df759b2c70e0e0c22fe38cae49de6dbd1afa8399ef626e6a
+AUX mongodb-1.8-fix-scons.patch 1649 RMD160 1e5be2fe75f25c511b1d70dd1dd7977c8f1a6db3 SHA1 1300bbc5ff4f9c4a59e89fb3e119506b3507906d SHA256 5b8db8f66adabbdd52c364a713ce38a937c4ac6282a4ac530d14930d386d582d
+AUX mongodb.confd 246 RMD160 fee0f87d5f6715b237d7195ea6dfd24a50868102 SHA1 dd786ce383ea3a112352f5b48e4948dd3377b009 SHA256 5dd09535664bd7bc9d0e927896f8e768f225c43c1d84bde9812cb36866f1f587
+AUX mongodb.initd 706 RMD160 7eafe2f49701dcbee548c32e1340d21e3cb0c482 SHA1 6a492588c90c592782eab4b3682735ba32cbd75d SHA256 15e549835897d44ded2e4be37448c08fd2b084bc1609cf747bdb3e5674ab9e00
DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af4365c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d
-EBUILD mongodb-1.8.1.ebuild 2082 RMD160 1ce22cdfb7c236ff356d302d6b3e4e8d336d43a8 SHA1 5b8cb8c80833b710626fd0ae41c04265066faefb SHA256 1465baaef0f28b23a8acccee79247f51333f6f9fa7174d9f7b0396c83640f980
-MISC johan-fixes.patch 5859 RMD160 1abbc357419b44d6dec3dab6165aa96d9c425081 SHA1 bac0e8da059f93ebcbeef7a3c109d61eb1f8375a SHA256 7e051265cf978eafc76359d9ad6cbb3e5c4998b16383936971a9d8425c0f38fa
-MISC johan-fixes.patch.orig 5898 RMD160 6499a6181059d619e2f2e5c1cb5969bc7cd21cda SHA1 32984512cd6a1c5f2b630051dc83b6727caae2a1 SHA256 13a9525c9e13fd6405d6bc86605ad9a48ca8e983da9ef3c94917108125e3c810
-MISC johan-fixes.patch.rej 1599 RMD160 de9ced190d9e1581dd06a5f120a805e894075b83 SHA1 2bc5ffd701503cf1abaf007085f536d1c9d83185 SHA256 731f63484aa5e81e70faf4cd2b3bcacf67ddaf65c05e3e0584809b075999d82b
+EBUILD mongodb-1.8.1.ebuild 2254 RMD160 b267fc26bb0ea50a7b3008115679da9ecbf06e2a SHA1 45169685deb4d2bb302737194b1cf9b3959ee53e SHA256 778b878bc368f7988bc7f2a98849814c49dec54ddb0209579709f312735ab001
diff --git a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
index 7652f56..3d2996a 100644
--- a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
+++ b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
@@ -1,23 +1,18 @@
-diff --git a/SConstruct b/SConstruct
-index 41383b1..3752c4a 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -670,11 +670,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:
+ if linux:
- env.Append( CPPFLAGS=" -Werror " )
-- env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's
+ 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=" -fPIC -pthread -rdynamic" )
-+ env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic " )
+ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
+ env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
env.Append( LIBS=[] )
- #make scons colorgcc friendly
-@@ -683,17 +682,11 @@ if nix:
+@@ -683,12 +684,11 @@
if linux and has_option( "sharedclient" ):
env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )
@@ -28,21 +23,15 @@ index 41383b1..3752c4a 100644
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:
-- #env.Append( CPPFLAGS=" -fprofile-use" )
-- #env.Append( LINKFLAGS=" -fprofile-use" )
-
- if debugLogging:
- env.Append( CPPFLAGS=" -D_DEBUG" );
-@@ -911,8 +904,9 @@ def doConfigure( myenv , needPcre=True , shell=False ):
+ #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" ] )
diff --git a/dev-db/mongodb/files/mongodb.confd b/dev-db/mongodb/files/mongodb.confd
index bc16601..3643f9e 100644
--- a/dev-db/mongodb/files/mongodb.confd
+++ b/dev-db/mongodb/files/mongodb.confd
@@ -2,10 +2,9 @@
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_OPTIONS="--journal"
diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mongodb.initd
index 482e311..32c6968 100644
--- a/dev-db/mongodb/files/mongodb.initd
+++ b/dev-db/mongodb/files/mongodb.initd
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongodb.initd,v 1.2 2010/05/21 06:39:57 lu_zero Exp $
+# $Header: $
depend() {
need net
@@ -9,37 +9,21 @@ depend() {
start() {
ebegin "Starting ${SVCNAME}"
- if [ -z "$MONGODB_PID_FILE" ] ; then
- ewarn "MONGODB_PID_FILE must be set"
- return -1
- fi
- if [ -z "$MONGODB_USER" ] ; then
- ewarn "ERROR: MONGODB_USER must be set"
- return -1
- fi
-
- args=""
- if [ -n "$MONGODB_DATA" ] ; then
- args="$args --dbpath $MONGODB_DATA"
- fi
- if [ -n "$MONGODB_PORT" ] ; then
- args="$args --port $MONGODB_PORT"
- fi
- if [ -n "$MONGODB_IP" ] ; then
- args="$args --bind_ip $MONGODB_IP"
- fi
- if [ -n "$MONGODB_OPTIONS" ] ; then
- args="$args $MONGODB_OPTIONS"
- fi
-
- start-stop-daemon --background --start --user ${MONGODB_USER} --pidfile \
- "${MONGODB_PID_FILE}" --make-pidfile --exec ${MONGODB_EXEC} \
- -- ${args} run
+ start-stop-daemon --background --start --make-pidfile \
+ --pidfile /var/run/${SVCNAME}.pid \
+ --user ${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} \
+ --logappend --logpath /var/log/mongodb/${SVCNAME}.log \
+ ${MONGODB_OPTIONS}
eend $?
}
stop() {
ebegin "Stopping ${SVCNAME}"
- start-stop-daemon --stop --exec ${MONGODB_EXEC} --pidfile ${MONGODB_PID_FILE}
- eend $? "Failed to stop ${SVCNAME}"
+ start-stop-daemon --stop --pidfile /var/run/${SVCNAME}.pid
+ eend $?
}
diff --git a/dev-db/mongodb/mongodb-1.8.1.ebuild b/dev-db/mongodb/mongodb-1.8.1.ebuild
index 0af2443..478f13c 100644
--- a/dev-db/mongodb/mongodb-1.8.1.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.1.ebuild
@@ -16,15 +16,15 @@ SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz"
LICENSE="AGPL-3 Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="pcap static-libs v8"
+IUSE="static-libs v8"
-RDEPEND="pcap? ( net-libs/libpcap )
- !v8? ( dev-lang/spidermonkey )
+RDEPEND="!v8? ( dev-lang/spidermonkey )
v8? ( dev-lang/v8 )
dev-libs/boost
- dev-libs/libpcre"
+ dev-libs/libpcre[cxx]
+ net-libs/libpcap"
DEPEND="${RDEPEND}
- >=dev-util/scons-1.2.0-r1
+ dev-util/scons
sys-libs/readline
sys-libs/ncurses"
@@ -45,12 +45,12 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/${PN}-1.8-fix-scons.patch"
- if use v8; then
- # TODO: is this still true ?
+ # TODO: is this still true ?
+ #if use v8; then
# Suppress known test failure with v8:
# http://jira.mongodb.org/browse/SERVER-1147
- sed -i -e '/add< NumberLong >/d' dbtests/jstests.cpp || die
- fi
+ #sed -i -e '/add< NumberLong >/d' dbtests/jstests.cpp || die
+ #fi
}
src_compile() {
@@ -60,12 +60,10 @@ src_compile() {
src_install() {
scons ${scons_opts} --full --nostrip install --prefix="${D}"/usr || die "Install failed"
- # TODO: check for other possible .a files ?
- use static-libs || rm ${D}/usr/*/libmongoclient.a
+ use static-libs || rm "${D}/usr/$(get_libdir)/libmongoclient.a"
- # TODO: wouldn't we prefer keepdir for this ?
- for x in /var/{lib,log,run}/${PN}; do
- dodir "${x}" || die "Install failed"
+ for x in /var/{lib,log}/${PN}; do
+ keepdir "${x}" || die "Install failed"
fowners mongodb:mongodb "${x}"
done
@@ -79,3 +77,11 @@ src_install() {
src_test() {
scons ${scons_opts} smoke --smokedbprefix='testdir' test || die "Tests failed"
}
+
+pkg_postinst() {
+ if has_version '<dev-db/mongodb-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 "Journalling is now set as default, see ${CONFDIR}/${PN}."
+}
\ No newline at end of file
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2011-04-08 17:39 Alexys Jacob
0 siblings, 0 replies; 16+ messages in thread
From: Alexys Jacob @ 2011-04-08 17:39 UTC (permalink / raw
To: gentoo-commits
commit: 04b5936cf10223a7e7add4a97423ec0d37abfd8e
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 8 17:39:22 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Apr 8 17:39:22 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=04b5936c
mongodb work in progress
---
dev-db/mongodb/Manifest | 8 +++++-
dev-db/mongodb/files/mongodb-1.8-fix-scons.patch | 23 ++++++++++++++++-----
dev-db/mongodb/mongodb-1.8.1.ebuild | 11 ++++++++-
3 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index c40ae28..8d0d3b2 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,5 +1,9 @@
-AUX mongodb-1.8-fix-scons.patch 1599 RMD160 de9ced190d9e1581dd06a5f120a805e894075b83 SHA1 2bc5ffd701503cf1abaf007085f536d1c9d83185 SHA256 731f63484aa5e81e70faf4cd2b3bcacf67ddaf65c05e3e0584809b075999d82b
+AUX mongodb-1.8-fix-scons.patch 2000 RMD160 0728a6d2e50b3756f7d0c4c75cdd256467d20a34 SHA1 087ff1065360a63ee21ed52d1b8f78b88c8fb359 SHA256 bb7d569d43bc2aee1f51bd0082e5ff68e6da89debf0ffd8c15d992094fb6320b
+AUX mongodb-1.8-fix-scons.patch.ultrabug 1599 RMD160 de9ced190d9e1581dd06a5f120a805e894075b83 SHA1 2bc5ffd701503cf1abaf007085f536d1c9d83185 SHA256 731f63484aa5e81e70faf4cd2b3bcacf67ddaf65c05e3e0584809b075999d82b
AUX mongodb.confd 285 RMD160 cc5e3ab24a9880a19392a7416d23d1ae7a328e11 SHA1 7c4b720ea5b0afd2fa88a6adc2d8a2e356691413 SHA256 8dfedbb433e11f8ed6ec8159ed5c02f94c22f86006cda21f0b2bb59ebe50b2ad
AUX mongodb.initd 1129 RMD160 92a89d9d71ffcdaba8f86f1a2902abddc9866147 SHA1 2c83bfe4c5728ffc8b3dc37fd8d345d09c13f6b0 SHA256 c318a8ca1fe83c59df759b2c70e0e0c22fe38cae49de6dbd1afa8399ef626e6a
DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af4365c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d
-EBUILD mongodb-1.8.1.ebuild 1812 RMD160 80b475453be9a13413f4a2da8081adef7ed8fc0a SHA1 7124877abafc70eb7659a913508727a3713b9990 SHA256 97ebc14d66b1d3d41bebe35f3baa4e97aa61c25527a4cc8276636dd550d9c6c7
+EBUILD mongodb-1.8.1.ebuild 2082 RMD160 1ce22cdfb7c236ff356d302d6b3e4e8d336d43a8 SHA1 5b8cb8c80833b710626fd0ae41c04265066faefb SHA256 1465baaef0f28b23a8acccee79247f51333f6f9fa7174d9f7b0396c83640f980
+MISC johan-fixes.patch 5859 RMD160 1abbc357419b44d6dec3dab6165aa96d9c425081 SHA1 bac0e8da059f93ebcbeef7a3c109d61eb1f8375a SHA256 7e051265cf978eafc76359d9ad6cbb3e5c4998b16383936971a9d8425c0f38fa
+MISC johan-fixes.patch.orig 5898 RMD160 6499a6181059d619e2f2e5c1cb5969bc7cd21cda SHA1 32984512cd6a1c5f2b630051dc83b6727caae2a1 SHA256 13a9525c9e13fd6405d6bc86605ad9a48ca8e983da9ef3c94917108125e3c810
+MISC johan-fixes.patch.rej 1599 RMD160 de9ced190d9e1581dd06a5f120a805e894075b83 SHA1 2bc5ffd701503cf1abaf007085f536d1c9d83185 SHA256 731f63484aa5e81e70faf4cd2b3bcacf67ddaf65c05e3e0584809b075999d82b
diff --git a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
index 305d113..7652f56 100644
--- a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
+++ b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
@@ -1,6 +1,8 @@
---- a/SConstruct 2011-04-05 09:24:54.828004785 +0200
-+++ b/SConstruct 2011-04-08 09:56:19.401717001 +0200
-@@ -670,9 +670,7 @@
+diff --git a/SConstruct b/SConstruct
+index 41383b1..3752c4a 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -670,11 +670,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
@@ -9,9 +11,18 @@
- 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=" -fPIC -pthread -rdynamic" )
+- env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
++ env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic " )
++ env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
env.Append( LIBS=[] )
-@@ -687,13 +685,6 @@
+
+ #make scons colorgcc friendly
+@@ -683,17 +682,11 @@ if nix:
+
+ 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
@@ -25,7 +36,7 @@
if debugLogging:
env.Append( CPPFLAGS=" -D_DEBUG" );
-@@ -911,8 +902,9 @@
+@@ -911,8 +904,9 @@ def doConfigure( myenv , needPcre=True , shell=False ):
myCheckLib( J , True )
mozHeader = "js"
diff --git a/dev-db/mongodb/mongodb-1.8.1.ebuild b/dev-db/mongodb/mongodb-1.8.1.ebuild
index 483edf4..0af2443 100644
--- a/dev-db/mongodb/mongodb-1.8.1.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.1.ebuild
@@ -16,9 +16,10 @@ 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="pcap static-libs v8"
-RDEPEND="!v8? ( dev-lang/spidermonkey )
+RDEPEND="pcap? ( net-libs/libpcap )
+ !v8? ( dev-lang/spidermonkey )
v8? ( dev-lang/v8 )
dev-libs/boost
dev-libs/libpcre"
@@ -34,6 +35,7 @@ pkg_setup() {
enewuser mongodb -1 -1 /var/lib/${PN} mongodb
scons_opts="${MAKEOPTS}"
+ use static-libs || scons_opts+=" --sharedclient"
if use v8; then
scons_opts+=" --usev8"
else
@@ -44,6 +46,7 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}/${PN}-1.8-fix-scons.patch"
if use v8; then
+ # TODO: is this still true ?
# Suppress known test failure with v8:
# http://jira.mongodb.org/browse/SERVER-1147
sed -i -e '/add< NumberLong >/d' dbtests/jstests.cpp || die
@@ -57,6 +60,10 @@ src_compile() {
src_install() {
scons ${scons_opts} --full --nostrip install --prefix="${D}"/usr || die "Install failed"
+ # TODO: check for other possible .a files ?
+ use static-libs || rm ${D}/usr/*/libmongoclient.a
+
+ # TODO: wouldn't we prefer keepdir for this ?
for x in /var/{lib,log,run}/${PN}; do
dodir "${x}" || die "Install failed"
fowners mongodb:mongodb "${x}"
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2011-04-08 8:01 Alexys Jacob
0 siblings, 0 replies; 16+ messages in thread
From: Alexys Jacob @ 2011-04-08 8:01 UTC (permalink / raw
To: gentoo-commits
commit: 8bb04ac18dca40c7b8fcef21c6cfce0a9e090de5
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 8 08:01:05 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Fri Apr 8 08:01:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=8bb04ac1
mongodb work in progress
---
dev-db/mongodb/Manifest | 7 ++---
dev-db/mongodb/files/mongodb-1.6.0-fix-scons.patch | 22 --------------------
dev-db/mongodb/files/mongodb-1.8-fix-scons.patch | 14 +++++++++++-
.../{mongodb-1.8.0.ebuild => mongodb-1.8.1.ebuild} | 2 +-
4 files changed, 17 insertions(+), 28 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 458514c..b41026e 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,6 +1,5 @@
-AUX mongodb-1.6.0-fix-scons.patch 913 RMD160 54b30020c2d1a0313e796f132d589969d84f245d SHA1 c5473464452417be6a2bb2433b40bba336910fc1 SHA256 de26882ff9adcf46eb2227e185f7d880549333f0e87703cdf984cd1c4612ffd9
-AUX mongodb-1.8-fix-scons.patch 1202 RMD160 e8901377280b9872e40237a1a7956c6044d86eaa SHA1 b82302776e9b5c4fa44c30eb88cd98b8120dcbaf SHA256 5f5f7c075cdaaedaa549cdb26473273f88aef1c8fb8381d75a935a7d27431cb9
+AUX mongodb-1.8-fix-scons.patch 1599 RMD160 de9ced190d9e1581dd06a5f120a805e894075b83 SHA1 2bc5ffd701503cf1abaf007085f536d1c9d83185 SHA256 731f63484aa5e81e70faf4cd2b3bcacf67ddaf65c05e3e0584809b075999d82b
AUX mongodb.confd 285 RMD160 cc5e3ab24a9880a19392a7416d23d1ae7a328e11 SHA1 7c4b720ea5b0afd2fa88a6adc2d8a2e356691413 SHA256 8dfedbb433e11f8ed6ec8159ed5c02f94c22f86006cda21f0b2bb59ebe50b2ad
AUX mongodb.initd 1129 RMD160 92a89d9d71ffcdaba8f86f1a2902abddc9866147 SHA1 2c83bfe4c5728ffc8b3dc37fd8d345d09c13f6b0 SHA256 c318a8ca1fe83c59df759b2c70e0e0c22fe38cae49de6dbd1afa8399ef626e6a
-DIST mongodb-src-r1.8.0.tar.gz 1718213 RMD160 e80638eacc816869a1284ee135b1c9e9885c1684 SHA1 1f8d596da667af10721c6602071e824bc4b8a0f3 SHA256 4c2992e49586d4b4a513937286fd8813f4cef44686e67275c4e96489e4456a96
-EBUILD mongodb-1.8.0.ebuild 1812 RMD160 80b475453be9a13413f4a2da8081adef7ed8fc0a SHA1 7124877abafc70eb7659a913508727a3713b9990 SHA256 97ebc14d66b1d3d41bebe35f3baa4e97aa61c25527a4cc8276636dd550d9c6c7
+DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af4365c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d
+EBUILD mongodb-1.8.1.ebuild 1817 RMD160 495c26c1f08aa4f9c26ee8df0ae9916f8e239d0a SHA1 f34d75492a65ae95d1b01ac48bf489fffa73695c SHA256 a15555c4c76729aeea8af0dfc2a77a7c4c5668a0ef61f6e995909fcb6e07ede8
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
deleted file mode 100644
index 7122df8..0000000
--- a/dev-db/mongodb/files/mongodb-1.6.0-fix-scons.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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/files/mongodb-1.8-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
index d9c5b23..305d113 100644
--- a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
+++ b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
@@ -1,5 +1,5 @@
--- a/SConstruct 2011-04-05 09:24:54.828004785 +0200
-+++ b/SConstruct 2011-04-05 09:26:56.651400663 +0200
++++ b/SConstruct 2011-04-08 09:56:19.401717001 +0200
@@ -670,9 +670,7 @@
env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
@@ -25,3 +25,15 @@
if debugLogging:
env.Append( CPPFLAGS=" -D_DEBUG" );
+@@ -911,8 +902,9 @@
+
+ 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/mongodb-1.8.0.ebuild b/dev-db/mongodb/mongodb-1.8.1.ebuild
similarity index 97%
rename from dev-db/mongodb/mongodb-1.8.0.ebuild
rename to dev-db/mongodb/mongodb-1.8.1.ebuild
index 483edf4..40f9aea 100644
--- a/dev-db/mongodb/mongodb-1.8.0.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.1.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="v8"
-RDEPEND="!v8? ( dev-lang/spidermonkey )
+RDEPEND="!v8? ( =dev-lang/spidermonkey-1.7 )
v8? ( dev-lang/v8 )
dev-libs/boost
dev-libs/libpcre"
^ permalink raw reply related [flat|nested] 16+ messages in thread* [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/
@ 2011-04-07 7:58 Alexys Jacob
0 siblings, 0 replies; 16+ messages in thread
From: Alexys Jacob @ 2011-04-07 7:58 UTC (permalink / raw
To: gentoo-commits
commit: 7925c1631690a0d5eb74ab0c4d7ae32220efad6d
Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 7 07:58:36 2011 +0000
Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Thu Apr 7 07:58:36 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=7925c163
add dev-db/mongodb
---
dev-db/mongodb/Manifest | 6 ++
dev-db/mongodb/files/mongodb-1.6.0-fix-scons.patch | 22 ++++++
dev-db/mongodb/files/mongodb-1.8-fix-scons.patch | 27 +++++++
dev-db/mongodb/files/mongodb.confd | 11 +++
dev-db/mongodb/files/mongodb.initd | 45 ++++++++++++
dev-db/mongodb/mongodb-1.8.0.ebuild | 74 ++++++++++++++++++++
6 files changed, 185 insertions(+), 0 deletions(-)
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
new file mode 100644
index 0000000..458514c
--- /dev/null
+++ b/dev-db/mongodb/Manifest
@@ -0,0 +1,6 @@
+AUX mongodb-1.6.0-fix-scons.patch 913 RMD160 54b30020c2d1a0313e796f132d589969d84f245d SHA1 c5473464452417be6a2bb2433b40bba336910fc1 SHA256 de26882ff9adcf46eb2227e185f7d880549333f0e87703cdf984cd1c4612ffd9
+AUX mongodb-1.8-fix-scons.patch 1202 RMD160 e8901377280b9872e40237a1a7956c6044d86eaa SHA1 b82302776e9b5c4fa44c30eb88cd98b8120dcbaf SHA256 5f5f7c075cdaaedaa549cdb26473273f88aef1c8fb8381d75a935a7d27431cb9
+AUX mongodb.confd 285 RMD160 cc5e3ab24a9880a19392a7416d23d1ae7a328e11 SHA1 7c4b720ea5b0afd2fa88a6adc2d8a2e356691413 SHA256 8dfedbb433e11f8ed6ec8159ed5c02f94c22f86006cda21f0b2bb59ebe50b2ad
+AUX mongodb.initd 1129 RMD160 92a89d9d71ffcdaba8f86f1a2902abddc9866147 SHA1 2c83bfe4c5728ffc8b3dc37fd8d345d09c13f6b0 SHA256 c318a8ca1fe83c59df759b2c70e0e0c22fe38cae49de6dbd1afa8399ef626e6a
+DIST mongodb-src-r1.8.0.tar.gz 1718213 RMD160 e80638eacc816869a1284ee135b1c9e9885c1684 SHA1 1f8d596da667af10721c6602071e824bc4b8a0f3 SHA256 4c2992e49586d4b4a513937286fd8813f4cef44686e67275c4e96489e4456a96
+EBUILD mongodb-1.8.0.ebuild 1812 RMD160 80b475453be9a13413f4a2da8081adef7ed8fc0a SHA1 7124877abafc70eb7659a913508727a3713b9990 SHA256 97ebc14d66b1d3d41bebe35f3baa4e97aa61c25527a4cc8276636dd550d9c6c7
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 0000000..7122df8
--- /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/files/mongodb-1.8-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
new file mode 100644
index 0000000..d9c5b23
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch
@@ -0,0 +1,27 @@
+--- a/SConstruct 2011-04-05 09:24:54.828004785 +0200
++++ b/SConstruct 2011-04-05 09:26:56.651400663 +0200
+@@ -670,9 +670,7 @@
+
+ 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=" -fPIC -pthread -rdynamic" )
+ env.Append( LIBS=[] )
+@@ -687,13 +685,6 @@
+ 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:
+- #env.Append( CPPFLAGS=" -fprofile-use" )
+- #env.Append( LINKFLAGS=" -fprofile-use" )
+
+ if debugLogging:
+ env.Append( CPPFLAGS=" -D_DEBUG" );
diff --git a/dev-db/mongodb/files/mongodb.confd b/dev-db/mongodb/files/mongodb.confd
new file mode 100644
index 0000000..bc16601
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.confd
@@ -0,0 +1,11 @@
+# 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=""
diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mongodb.initd
new file mode 100644
index 0000000..482e311
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb.initd
@@ -0,0 +1,45 @@
+#!/sbin/runscript
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongodb.initd,v 1.2 2010/05/21 06:39:57 lu_zero Exp $
+
+depend() {
+ need net
+}
+
+start() {
+ ebegin "Starting ${SVCNAME}"
+ if [ -z "$MONGODB_PID_FILE" ] ; then
+ ewarn "MONGODB_PID_FILE must be set"
+ return -1
+ fi
+ if [ -z "$MONGODB_USER" ] ; then
+ ewarn "ERROR: MONGODB_USER must be set"
+ return -1
+ fi
+
+ args=""
+ if [ -n "$MONGODB_DATA" ] ; then
+ args="$args --dbpath $MONGODB_DATA"
+ fi
+ if [ -n "$MONGODB_PORT" ] ; then
+ args="$args --port $MONGODB_PORT"
+ fi
+ if [ -n "$MONGODB_IP" ] ; then
+ args="$args --bind_ip $MONGODB_IP"
+ fi
+ if [ -n "$MONGODB_OPTIONS" ] ; then
+ args="$args $MONGODB_OPTIONS"
+ fi
+
+ start-stop-daemon --background --start --user ${MONGODB_USER} --pidfile \
+ "${MONGODB_PID_FILE}" --make-pidfile --exec ${MONGODB_EXEC} \
+ -- ${args} run
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ start-stop-daemon --stop --exec ${MONGODB_EXEC} --pidfile ${MONGODB_PID_FILE}
+ eend $? "Failed to stop ${SVCNAME}"
+}
diff --git a/dev-db/mongodb/mongodb-1.8.0.ebuild b/dev-db/mongodb/mongodb-1.8.0.ebuild
new file mode 100644
index 0000000..483edf4
--- /dev/null
+++ b/dev-db/mongodb/mongodb-1.8.0.ebuild
@@ -0,0 +1,74 @@
+# 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.6.0.ebuild,v 1.2 2011/02/02 18:14:42 phajdan.jr Exp $
+
+EAPI=3
+
+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 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="v8"
+
+RDEPEND="!v8? ( dev-lang/spidermonkey )
+ v8? ( dev-lang/v8 )
+ dev-libs/boost
+ dev-libs/libpcre"
+DEPEND="${RDEPEND}
+ >=dev-util/scons-1.2.0-r1
+ sys-libs/readline
+ sys-libs/ncurses"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ enewgroup mongodb
+ enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+
+ scons_opts="${MAKEOPTS}"
+ if use v8; then
+ scons_opts+=" --usev8"
+ else
+ scons_opts+=" --usesm"
+ fi
+}
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-1.8-fix-scons.patch"
+ if use v8; then
+ # Suppress known test failure with v8:
+ # http://jira.mongodb.org/browse/SERVER-1147
+ sed -i -e '/add< NumberLong >/d' dbtests/jstests.cpp || die
+ fi
+}
+
+src_compile() {
+ scons ${scons_opts} all || die "Compile failed"
+}
+
+src_install() {
+ 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"
+ 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 ${scons_opts} smoke --smokedbprefix='testdir' test || die "Tests failed"
+}
^ permalink raw reply related [flat|nested] 16+ messages in thread
end of thread, other threads:[~2014-05-14 9:19 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-11 12:36 [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/ Alexys Jacob
-- strict thread matches above, loose matches on Subject: below --
2014-05-14 9:19 Alexys Jacob
2014-05-12 15:11 Alexys Jacob
2014-01-20 11:17 Alexys Jacob
2011-04-13 14:58 Alexys Jacob
2011-04-13 10:30 Alexys Jacob
2011-04-12 8:10 Alexys Jacob
2011-04-12 8:08 Alexys Jacob
2011-04-11 16:34 Alexys Jacob
2011-04-11 15:45 Alexys Jacob
2011-04-11 14:13 Alexys Jacob
2011-04-10 17:55 Alexys Jacob
2011-04-10 14:20 Alexys Jacob
2011-04-08 17:39 Alexys Jacob
2011-04-08 8:01 Alexys Jacob
2011-04-07 7:58 Alexys Jacob
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox