From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 68A381393E9 for ; Wed, 14 May 2014 09:19:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BCA51E0B16; Wed, 14 May 2014 09:19:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2FF73E0B16 for ; Wed, 14 May 2014 09:19:47 +0000 (UTC) Received: from spoonbill.gentoo.org (unknown [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C9D1F33FF3F for ; Wed, 14 May 2014 09:19:45 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 6504C180A9 for ; Wed, 14 May 2014 09:19:44 +0000 (UTC) From: "Alexys Jacob" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexys Jacob" Message-ID: <1400059166.72ba8b0ff7167ad2ee4b79bc73d65823063717e3.ultrabug@gentoo> Subject: [gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/ X-VCS-Repository: dev/ultrabug X-VCS-Files: dev-db/mongodb/files/mms-agent.initd-r2 dev-db/mongodb/files/mongodb-2.6.1-fix-scons.patch dev-db/mongodb/files/mongodb.conf-r2 dev-db/mongodb/files/mongodb.confd-r2 dev-db/mongodb/files/mongodb.initd-r2 dev-db/mongodb/files/mongos.conf-r2 dev-db/mongodb/files/mongos.confd-r2 dev-db/mongodb/files/mongos.initd-r2 dev-db/mongodb/mongodb-2.6.1.ebuild X-VCS-Directories: dev-db/mongodb/files/ dev-db/mongodb/ X-VCS-Committer: ultrabug X-VCS-Committer-Name: Alexys Jacob X-VCS-Revision: 72ba8b0ff7167ad2ee4b79bc73d65823063717e3 X-VCS-Branch: master Date: Wed, 14 May 2014 09:19:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 9000d1cd-a4ba-4dd3-b7fc-32b880a3ab1f X-Archives-Hash: 65d2fa9c790b09c037a9611944e623de commit: 72ba8b0ff7167ad2ee4b79bc73d65823063717e3 Author: Ultrabug gentoo org> AuthorDate: Wed May 14 09:19:26 2014 +0000 Commit: Alexys Jacob gentoo 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 -}