diff options
author | Michael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com> | 2016-07-19 19:29:57 +0200 |
---|---|---|
committer | Patrice Clement <monsieurp@gentoo.org> | 2016-07-30 08:46:41 +0200 |
commit | 3e85c8c4859384b2e7860512dee265c8d18ec370 (patch) | |
tree | 7651bef4ad238b7146bfcac02f06ae99e39c6046 /dev-db/mongodb/files | |
parent | x11-terms/xfce4-terminal: Bump to 0.6.90, early GTK+3 release (diff) | |
download | gentoo-3e85c8c4859384b2e7860512dee265c8d18ec370.tar.gz gentoo-3e85c8c4859384b2e7860512dee265c8d18ec370.tar.bz2 gentoo-3e85c8c4859384b2e7860512dee265c8d18ec370.zip |
dev-db/*: remove unused patches.
Squash all commit messages into a single one.
Closes: https://github.com/gentoo/gentoo/pull/1936
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'dev-db/mongodb/files')
-rw-r--r-- | dev-db/mongodb/files/mms-agent.confd | 9 | ||||
-rw-r--r-- | dev-db/mongodb/files/mms-agent.initd | 41 | ||||
-rw-r--r-- | dev-db/mongodb/files/mms-agent.initd-r1 | 31 | ||||
-rw-r--r-- | dev-db/mongodb/files/mms-agent.initd-r2 | 25 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-2.0-fix-scons.patch | 36 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-2.0-r1-boost-1.50.patch | 245 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-2.4.5-fix-scons.patch | 28 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongodb-2.6.1-fix-scons.patch | 35 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongos.confd | 16 | ||||
-rw-r--r-- | dev-db/mongodb/files/mongos.initd-r1 | 50 |
10 files changed, 0 insertions, 516 deletions
diff --git a/dev-db/mongodb/files/mms-agent.confd b/dev-db/mongodb/files/mms-agent.confd deleted file mode 100644 index d19b21e2d32b..000000000000 --- a/dev-db/mongodb/files/mms-agent.confd +++ /dev/null @@ -1,9 +0,0 @@ -# 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 deleted file mode 100644 index a937fbfe9bb7..000000000000 --- a/dev-db/mongodb/files/mms-agent.initd +++ /dev/null @@ -1,41 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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/mms-agent.initd-r1 b/dev-db/mongodb/files/mms-agent.initd-r1 deleted file mode 100644 index 91002b578d94..000000000000 --- a/dev-db/mongodb/files/mms-agent.initd-r1 +++ /dev/null @@ -1,31 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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/ - - 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/mms-agent.initd-r2 b/dev-db/mongodb/files/mms-agent.initd-r2 deleted file mode 100644 index 592dd9cbeaa0..000000000000 --- a/dev-db/mongodb/files/mms-agent.initd-r2 +++ /dev/null @@ -1,25 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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} -start_stop_daemon_args="--user ${user} --group ${group}" - -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.0-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.0-fix-scons.patch deleted file mode 100644 index a52e3a30a77d..000000000000 --- a/dev-db/mongodb/files/mongodb-2.0-fix-scons.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/SConstruct 2011-11-16 22:11:39.000000000 +0100 -+++ b/SConstruct 2011-11-17 16:30:16.144117550 +0100 -@@ -688,7 +688,7 @@ - env["CXX"] = "distcc " + env["CXX"] - - # -Winvalid-pch Warn if a precompiled header (see Precompiled Headers) is found in the search path but can't be used. -- env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" ) -+ env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" ) - # env.Append( " -Wconversion" ) TODO: this doesn't really work yet - if linux: - env.Append( CPPFLAGS=" -Werror " ) -@@ -696,7 +696,9 @@ - env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is faster than gcc's - - env.Append( CPPDEFINES="_FILE_OFFSET_BITS=64" ) -+ 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=[] ) - -@@ -706,12 +708,13 @@ - - 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( CXXFLAGS=" -O3 " ) - #env.Append( CPPFLAGS=" -fprofile-generate" ) - #env.Append( LINKFLAGS=" -fprofile-generate" ) - # then: diff --git a/dev-db/mongodb/files/mongodb-2.0-r1-boost-1.50.patch b/dev-db/mongodb/files/mongodb-2.0-r1-boost-1.50.patch deleted file mode 100644 index 4ccb898ec6fd..000000000000 --- a/dev-db/mongodb/files/mongodb-2.0-r1-boost-1.50.patch +++ /dev/null @@ -1,245 +0,0 @@ -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/db.cpp mongodb-src-r2.0.6-patched/db/db.cpp ---- mongodb-src-r2.0.6/db/db.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/db/db.cpp 2012-07-10 22:27:16.496886220 +0200 -@@ -326,7 +326,7 @@ - boost::filesystem::path path( dbpath ); - for ( boost::filesystem::directory_iterator i( path ); - i != boost::filesystem::directory_iterator(); ++i ) { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if ( boost::filesystem::is_directory( *i ) && - fileName.length() && fileName[ 0 ] == '$' ) - boost::filesystem::remove_all( *i ); -@@ -655,11 +655,6 @@ - dbExecCommand = argv[0]; - - srand(curTimeMicros()); --#if( BOOST_VERSION >= 104500 ) -- boost::filesystem::path::default_name_check( boost::filesystem2::no_check ); --#else -- boost::filesystem::path::default_name_check( boost::filesystem::no_check ); --#endif - - { - unsigned x = 0x12345678; -@@ -976,7 +971,7 @@ - if (params.count("shutdown")){ - bool failed = false; - -- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string(); -+ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string(); - if ( !boost::filesystem::exists( name ) || boost::filesystem::file_size( name ) == 0 ) - failed = true; - -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur.cpp mongodb-src-r2.0.6-patched/db/dur.cpp ---- mongodb-src-r2.0.6/db/dur.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/db/dur.cpp 2012-07-10 21:56:28.866778732 +0200 -@@ -692,7 +692,7 @@ - - bool samePartition = true; - try { -- const string dbpathDir = boost::filesystem::path(dbpath).native_directory_string(); -+ const string dbpathDir = boost::filesystem::path(dbpath).string(); - samePartition = onSamePartition(getJournalDir().string(), dbpathDir); - } - catch(...) { -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur_journal.cpp mongodb-src-r2.0.6-patched/db/dur_journal.cpp ---- mongodb-src-r2.0.6/db/dur_journal.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/db/dur_journal.cpp 2012-07-10 22:04:18.583472723 +0200 -@@ -169,7 +169,7 @@ - for ( boost::filesystem::directory_iterator i( getJournalDir() ); - i != boost::filesystem::directory_iterator(); - ++i ) { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if( str::startsWith(fileName, "j._") ) - return true; - } -@@ -185,7 +185,7 @@ - for ( boost::filesystem::directory_iterator i( getJournalDir() ); - i != boost::filesystem::directory_iterator(); - ++i ) { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if( str::startsWith(fileName, "j._") ) { - try { - removeOldJournalFile(*i); -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/dur_recover.cpp mongodb-src-r2.0.6-patched/db/dur_recover.cpp ---- mongodb-src-r2.0.6/db/dur_recover.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/db/dur_recover.cpp 2012-07-10 22:02:18.226799055 +0200 -@@ -71,7 +71,7 @@ - i != filesystem::directory_iterator(); - ++i ) { - filesystem::path filepath = *i; -- string fileName = filesystem::path(*i).leaf(); -+ string fileName = filesystem::path(*i).leaf().string(); - if( str::startsWith(fileName, "j._") ) { - unsigned u = str::toUnsigned( str::after(fileName, '_') ); - if( m.count(u) ) { -@@ -84,7 +84,7 @@ - if( i != m.begin() && m.count(i->first - 1) == 0 ) { - uasserted(13532, - str::stream() << "unexpected file in journal directory " << dir.string() -- << " : " << filesystem::path(i->second).leaf() << " : can't find its preceeding file"); -+ << " : " << filesystem::path(i->second).leaf().string() << " : can't find its preceeding file"); - } - files.push_back(i->second); - } -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/instance.cpp mongodb-src-r2.0.6-patched/db/instance.cpp ---- mongodb-src-r2.0.6/db/instance.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/db/instance.cpp 2012-07-10 22:08:55.213488817 +0200 -@@ -645,13 +645,13 @@ - i != boost::filesystem::directory_iterator(); ++i ) { - if ( directoryperdb ) { - boost::filesystem::path p = *i; -- string dbName = p.leaf(); -+ string dbName = p.leaf().string(); - p /= ( dbName + ".ns" ); - if ( MMF::exists( p ) ) - names.push_back( dbName ); - } - else { -- string fileName = boost::filesystem::path(*i).leaf(); -+ string fileName = boost::filesystem::path(*i).leaf().string(); - if ( fileName.length() > 3 && fileName.substr( fileName.length() - 3, 3 ) == ".ns" ) - names.push_back( fileName.substr( 0, fileName.length() - 3 ) ); - } -@@ -893,7 +893,7 @@ - } - - void acquirePathLock(bool doingRepair) { -- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string(); -+ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string(); - - bool oldFile = false; - -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/db/pdfile.cpp mongodb-src-r2.0.6-patched/db/pdfile.cpp ---- mongodb-src-r2.0.6/db/pdfile.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/db/pdfile.cpp 2012-07-10 22:11:44.103498643 +0200 -@@ -1987,7 +1987,7 @@ - virtual bool apply( const Path &p ) { - if ( !boost::filesystem::exists( p ) ) - return false; -- boostRenameWrapper( p, newPath_ / ( p.leaf() + ".bak" ) ); -+ boostRenameWrapper( p, newPath_ / ( p.leaf().string() + ".bak" ) ); - return true; - } - virtual const char * op() const { -@@ -2093,7 +2093,7 @@ - uniqueReservedPath( ( preserveClonedFilesOnFailure || backupOriginalFiles ) ? - "backup" : "$tmp" ); - BOOST_CHECK_EXCEPTION( boost::filesystem::create_directory( reservedPath ) ); -- string reservedPathString = reservedPath.native_directory_string(); -+ string reservedPathString = reservedPath.string(); - - bool res; - { -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/dbtests/framework.cpp mongodb-src-r2.0.6-patched/dbtests/framework.cpp ---- mongodb-src-r2.0.6/dbtests/framework.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/dbtests/framework.cpp 2012-07-10 22:29:20.610226773 +0200 -@@ -281,7 +281,7 @@ - boost::filesystem::create_directory(p); - } - -- string dbpathString = p.native_directory_string(); -+ string dbpathString = p.string(); - dbpath = dbpathString.c_str(); - - cmdLine.prealloc = false; -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/pch.h mongodb-src-r2.0.6-patched/pch.h ---- mongodb-src-r2.0.6/pch.h 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/pch.h 2012-07-10 21:35:57.133373738 +0200 -@@ -79,7 +79,7 @@ - //#include <boost/any.hpp> - #include "boost/thread/once.hpp" - //#include <boost/archive/iterators/transform_width.hpp> --#define BOOST_FILESYSTEM_VERSION 2 -+#define BOOST_FILESYSTEM_VERSION 3 - #include <boost/filesystem/convenience.hpp> - #include <boost/filesystem/exception.hpp> - #include <boost/filesystem/operations.hpp> -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/shell/shell_utils.cpp mongodb-src-r2.0.6-patched/shell/shell_utils.cpp ---- mongodb-src-r2.0.6/shell/shell_utils.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/shell/shell_utils.cpp 2012-07-10 22:38:58.443593723 +0200 -@@ -388,7 +388,7 @@ - #endif - } - -- argv_.push_back( programPath.native_file_string() ); -+ argv_.push_back( programPath.string() ); - - port_ = -1; - -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/tools/restore.cpp mongodb-src-r2.0.6-patched/tools/restore.cpp ---- mongodb-src-r2.0.6/tools/restore.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/tools/restore.cpp 2012-07-10 22:45:00.046948094 +0200 -@@ -131,7 +131,7 @@ - log(2) << "drillDown: " << root.string() << endl; - - // skip hidden files and directories -- if (root.leaf()[0] == '.' && root.leaf() != ".") -+ if (root.leaf().string()[0] == '.' && root.leaf().string() != ".") - return; - - if ( is_directory( root ) ) { -@@ -210,7 +210,7 @@ - ns += "." + _coll; - } - else { -- string l = root.leaf(); -+ string l = root.leaf().string(); - l = l.substr( 0 , l.find_last_of( "." ) ); - ns += "." + l; - } -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/tools/tool.cpp mongodb-src-r2.0.6-patched/tools/tool.cpp ---- mongodb-src-r2.0.6/tools/tool.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/tools/tool.cpp 2012-07-10 22:23:53.356874403 +0200 -@@ -113,12 +113,6 @@ - // we want durability to be disabled. - cmdLine.dur = false; - --#if( BOOST_VERSION >= 104500 ) -- boost::filesystem::path::default_name_check( boost::filesystem2::no_check ); --#else -- boost::filesystem::path::default_name_check( boost::filesystem::no_check ); --#endif -- - _name = argv[0]; - - /* using the same style as db.cpp */ -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/background.cpp mongodb-src-r2.0.6-patched/util/background.cpp ---- mongodb-src-r2.0.6/util/background.cpp 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/util/background.cpp 2012-07-10 21:47:40.420081320 +0200 -@@ -89,7 +89,7 @@ - if ( msTimeOut ) { - // add msTimeOut millisecond to current time - boost::xtime xt; -- boost::xtime_get( &xt, boost::TIME_UTC ); -+ boost::xtime_get( &xt, boost::TIME_UTC_ ); - - unsigned long long ns = msTimeOut * 1000000ULL; // milli to nano - if ( xt.nsec + ns < 1000000000 ) { -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/concurrency/mutex.h mongodb-src-r2.0.6-patched/util/concurrency/mutex.h ---- mongodb-src-r2.0.6/util/concurrency/mutex.h 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/util/concurrency/mutex.h 2012-07-10 21:45:51.333408307 +0200 -@@ -29,7 +29,7 @@ - - inline boost::xtime incxtimemillis( long long s ) { - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += (int)( s / 1000 ); - xt.nsec += (int)(( s % 1000 ) * 1000000); - if ( xt.nsec >= 1000000000 ) { -diff -ru '--exclude=mongo_vstudio.cpp' mongodb-src-r2.0.6/util/queue.h mongodb-src-r2.0.6-patched/util/queue.h ---- mongodb-src-r2.0.6/util/queue.h 2012-06-04 15:42:54.000000000 +0200 -+++ mongodb-src-r2.0.6-patched/util/queue.h 2012-07-10 22:14:00.243506560 +0200 -@@ -82,7 +82,7 @@ - Timer timer; - - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += maxSecondsToWait; - - scoped_lock l( _lock ); diff --git a/dev-db/mongodb/files/mongodb-2.4.5-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.4.5-fix-scons.patch deleted file mode 100644 index 4f4c13455430..000000000000 --- a/dev-db/mongodb/files/mongodb-2.4.5-fix-scons.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/SConstruct 2013-06-26 10:31:56.209089504 +0200 -+++ b/SConstruct 2013-06-26 10:33:59.177045991 +0200 -@@ -702,7 +702,6 @@ - # -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", -@@ -710,14 +709,14 @@ - "-Winvalid-pch"] ) - # env.Append( " -Wconversion" ) TODO: this doesn't really work yet - if linux: -- env.Append( CCFLAGS=["-Werror", "-pipe"] ) - if not has_option('clang'): - env.Append( CCFLAGS=["-fno-builtin-memcmp"] ) # glibc's memcmp is faster than gcc's - - 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", "-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-2.6.1-fix-scons.patch b/dev-db/mongodb/files/mongodb-2.6.1-fix-scons.patch deleted file mode 100644 index 031d84373b71..000000000000 --- 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/mongos.confd b/dev-db/mongodb/files/mongos.confd deleted file mode 100644 index 644cd0a2522d..000000000000 --- a/dev-db/mongodb/files/mongos.confd +++ /dev/null @@ -1,16 +0,0 @@ -# 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 deleted file mode 100644 index 1df48d642ac2..000000000000 --- a/dev-db/mongodb/files/mongos.initd-r1 +++ /dev/null @@ -1,50 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 $? -} |