On 08/04/2011 19:34, Benedikt Boehm wrote:
> commit: d9be143486caa83951aae4d6c72c58fea90ed451
> Author: Benedikt Böhm xnull de>
> AuthorDate: Fri Apr 8 17:27:47 2011 +
> Commit: Benedikt Boehm gentoo org>
> CommitDate: Fri Apr 8 17:33:26 2011 +
> URL:
> http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=d9be1434
>
> dev-db/mongodb: version bump to 1.8.1
>
> - #329167 - dev-db/mongodb missing dependency on net-libs/libpcap
> - #334081 - dev-db/mongodb does not respect LDFLAGS
> - #337593 - dev-db/mongodb should depend on libpcre being compiled with
> the cxx useflag
> - #337973 - dev-db/mongodb-1.8.0 version bump
> - #338039 - dev-db/mongodb starts as root
> - #340032 - dev-db/mongodb: add server logging
> - #356731 - dev-db/mongodb should create /var/run/mongodb
>
> ---
> dev-db/mongodb/files/mongodb-1.6.3-fix-scons.patch | 25
> dev-db/mongodb/files/mongodb-1.8.1-fix-scons.patch | 37 +++
> dev-db/mongodb/files/mongodb.confd | 16 ++---
> dev-db/mongodb/files/mongodb.initd | 15 +++--
> dev-db/mongodb/mongodb-1.6.3.ebuild| 65
>
> dev-db/mongodb/mongodb-1.7.5.ebuild| 65
>
> dev-db/mongodb/mongodb-1.8.0_rc1.ebuild| 65
>
> .../{mongodb-1.8.0.ebuild => mongodb-1.8.1.ebuild} | 38
> 8 files changed, 76 insertions(+), 250 deletions(-)
>
> diff --git a/dev-db/mongodb/files/mongodb-1.6.3-fix-scons.patch
> b/dev-db/mongodb/files/mongodb-1.6.3-fix-scons.patch
> deleted file mode 100644
> index 1c26ce6..000
> --- a/dev-db/mongodb/files/mongodb-1.6.3-fix-scons.patch
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -diff --git a/SConstruct b/SConstruct
> -index b759094..5d667f4 100644
> a/SConstruct
> -+++ b/SConstruct
> -@@ -745,9 +745,9 @@ else:
> -
> - if nix:
> - env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall
> -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
> --if linux:
> --env.Append( CPPFLAGS=" -Werror " )
> -+env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
> - env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
> -+env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
> - env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
> - env.Append( LIBS=[] )
> -
> -@@ -757,8 +757,6 @@ if nix:
> - if debugBuild:
> - env.Append( CPPFLAGS=" -O0 -fstack-protector " );
> - env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
> --else:
> --env.Append( CPPFLAGS=" -O3" )
> -
> - if debugLogging:
> - env.Append( CPPFLAGS=" -D_DEBUG" );
>
> diff --git a/dev-db/mongodb/files/mongodb-1.8.1-fix-scons.patch
> b/dev-db/mongodb/files/mongodb-1.8.1-fix-scons.patch
> new file mode 100644
> index 000..25a6a6f
> --- /dev/null
> +++ b/dev-db/mongodb/files/mongodb-1.8.1-fix-scons.patch
> @@ -0,0 +1,37 @@
> +From 4ce35e34e646b6ccf151449bd2b47cef543152e5 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Benedikt=20B=C3=B6hm?=
> +Date: Fri, 8 Apr 2011 16:33:37 +0200
> +Subject: [PATCH] fix scons
> +
> +---
> + SConstruct |5 ++---
> + 1 files changed, 2 insertions(+), 3 deletions(-)
> +
> +diff --git a/SConstruct b/SConstruct
> +index 41383b1..35c7ea6 100644
> +--- a/SConstruct
> b/SConstruct
> +@@ -671,9 +671,10 @@ if nix:
> + env.Append( CPPFLAGS="-fPIC -fno-strict-aliasing -ggdb -pthread -Wall
> -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
> + # env.Append( " -Wconversion" ) TODO: this doesn't really work yet
> + if linux:
> +-env.Append( CPPFLAGS=" -Werror " )
> + env.Append( CPPFLAGS=" -fno-builtin-memcmp " ) # glibc's memcmp is
> faster than gcc's
> ++env.Append( CXXFLAGS=os.environ['CXXFLAGS'] )
> + env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
> ++env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
> + env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
> + env.Append( LIBS=[] )
> +
> +@@ -687,8 +688,6 @@ if nix:
> + if debugBuild:
> + env.Append( CPPFLAGS=" -O0 -fstack-protector " );
> + env['ENV']['GLIBCXX_FORCE_NEW'] = 1; # play nice with valgrind
> +-else:
> +-env.Append( CPPFLAGS=" -O3" )
> + #env.Append( CPPFLAGS=" -fprofile-generate" )
> + #env.Append( LINKFLAGS=" -fprofile-generate" )
> + # then:
> +--
> +1.7.3.4
> +
>
> diff --git a/dev-db/mongodb/files/mongodb.confd
> b/dev-db/mongodb/files/mongodb.confd
> index 41585ff..2e087ac 100644
> --- a/dev-db/mongodb/files/mongodb.confd
> +++ b/dev-db/mongodb/files/mongodb.confd
> @@ -1,11 +1,5 @@
> -# Mongodb essentials
> -#MONGODB_EXEC="/usr/bin/mongod"
> -#MONGODB_DATA="/var/lib/mongodb"
> -#MONGODB_USER="mongodb"
> -#MONGODB_PID_FILE="/var/run/mongodb/mongodb.pid"
> -
> -#MONGODB_IP="127.0.0.1"
> -#MONGODB_PORT="27017"
> -
> -# Set extra options here, such as disabling the admin web server
> -#MONGODB_OPTIONS
