From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q8vVg-0006td-7t for garchives@archives.gentoo.org; Sun, 10 Apr 2011 14:21:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30B3AE0444; Sun, 10 Apr 2011 14:20:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D422FE0444 for ; Sun, 10 Apr 2011 14:20:56 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5147C1B407B for ; Sun, 10 Apr 2011 14:20:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 59EB280065 for ; Sun, 10 Apr 2011 14:20:55 +0000 (UTC) From: "Alexys Jacob" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexys Jacob" Message-ID: 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/Manifest dev-db/mongodb/files/mongodb-1.8-fix-scons.patch dev-db/mongodb/files/mongodb.confd dev-db/mongodb/files/mongodb.initd dev-db/mongodb/mongodb-1.8.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: eed9ea43633b2826fa31775edaa9c8c89548e2d0 Date: Sun, 10 Apr 2011 14:20:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 7c4b80651385926576a011c9d35f1009 commit: eed9ea43633b2826fa31775edaa9c8c89548e2d0 Author: Ultrabug gentoo org> AuthorDate: Sun Apr 10 14:20:49 2011 +0000 Commit: Alexys Jacob gentoo org> CommitDate: Sun Apr 10 14:20:49 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/ultrabug.git;a= =3Dcommit;h=3Deed9ea43 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 0728a6d2e50b3756f7d0c4c75cdd= 256467d20a34 SHA1 087ff1065360a63ee21ed52d1b8f78b88c8fb359 SHA256 bb7d569= d43bc2aee1f51bd0082e5ff68e6da89debf0ffd8c15d992094fb6320b -AUX mongodb-1.8-fix-scons.patch.ultrabug 1599 RMD160 de9ced190d9e1581dd0= 6a5f120a805e894075b83 SHA1 2bc5ffd701503cf1abaf007085f536d1c9d83185 SHA25= 6 731f63484aa5e81e70faf4cd2b3bcacf67ddaf65c05e3e0584809b075999d82b -AUX mongodb.confd 285 RMD160 cc5e3ab24a9880a19392a7416d23d1ae7a328e11 SH= A1 7c4b720ea5b0afd2fa88a6adc2d8a2e356691413 SHA256 8dfedbb433e11f8ed6ec81= 59ed5c02f94c22f86006cda21f0b2bb59ebe50b2ad -AUX mongodb.initd 1129 RMD160 92a89d9d71ffcdaba8f86f1a2902abddc9866147 S= HA1 2c83bfe4c5728ffc8b3dc37fd8d345d09c13f6b0 SHA256 c318a8ca1fe83c59df759= b2c70e0e0c22fe38cae49de6dbd1afa8399ef626e6a +AUX mongodb-1.8-fix-scons.patch 1649 RMD160 1e5be2fe75f25c511b1d70dd1dd7= 977c8f1a6db3 SHA1 1300bbc5ff4f9c4a59e89fb3e119506b3507906d SHA256 5b8db8f= 66adabbdd52c364a713ce38a937c4ac6282a4ac530d14930d386d582d +AUX mongodb.confd 246 RMD160 fee0f87d5f6715b237d7195ea6dfd24a50868102 SH= A1 dd786ce383ea3a112352f5b48e4948dd3377b009 SHA256 5dd09535664bd7bc9d0e92= 7896f8e768f225c43c1d84bde9812cb36866f1f587 +AUX mongodb.initd 706 RMD160 7eafe2f49701dcbee548c32e1340d21e3cb0c482 SH= A1 6a492588c90c592782eab4b3682735ba32cbd75d SHA256 15e549835897d44ded2e4b= e37448c08fd2b084bc1609cf747bdb3e5674ab9e00 DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af43= 65c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268= b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d -EBUILD mongodb-1.8.1.ebuild 2082 RMD160 1ce22cdfb7c236ff356d302d6b3e4e8d= 336d43a8 SHA1 5b8cb8c80833b710626fd0ae41c04265066faefb SHA256 1465baaef0f= 28b23a8acccee79247f51333f6f9fa7174d9f7b0396c83640f980 -MISC johan-fixes.patch 5859 RMD160 1abbc357419b44d6dec3dab6165aa96d9c425= 081 SHA1 bac0e8da059f93ebcbeef7a3c109d61eb1f8375a SHA256 7e051265cf978eaf= c76359d9ad6cbb3e5c4998b16383936971a9d8425c0f38fa -MISC johan-fixes.patch.orig 5898 RMD160 6499a6181059d619e2f2e5c1cb5969bc= 7cd21cda SHA1 32984512cd6a1c5f2b630051dc83b6727caae2a1 SHA256 13a9525c9e1= 3fd6405d6bc86605ad9a48ca8e983da9ef3c94917108125e3c810 -MISC johan-fixes.patch.rej 1599 RMD160 de9ced190d9e1581dd06a5f120a805e89= 4075b83 SHA1 2bc5ffd701503cf1abaf007085f536d1c9d83185 SHA256 731f63484aa5= e81e70faf4cd2b3bcacf67ddaf65c05e3e0584809b075999d82b +EBUILD mongodb-1.8.1.ebuild 2254 RMD160 b267fc26bb0ea50a7b3008115679da9e= cbf06e2a SHA1 45169685deb4d2bb302737194b1cf9b3959ee53e SHA256 778b878bc36= 8f7988bc7f2a98849814c49dec54ddb0209579709f312735ab001 diff --git a/dev-db/mongodb/files/mongodb-1.8-fix-scons.patch b/dev-db/mo= ngodb/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: - =20 +--- 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=3D"-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=3D" -Werror " ) -- env.Append( CPPFLAGS=3D" -fno-builtin-memcmp " ) # glibc's memc= mp is faster than gcc's + env.Append( CPPFLAGS=3D" -fno-builtin-memcmp " ) # glibc's memc= mp is faster than gcc's + env.Append( CXXFLAGS=3Dos.environ['CXXFLAGS']) env.Append( CXXFLAGS=3D" -Wnon-virtual-dtor " ) -- env.Append( LINKFLAGS=3D" -fPIC -pthread -rdynamic" ) -+ env.Append( LINKFLAGS=3D" -fPIC -pthread -rdynamic " ) + env.Append( LINKFLAGS=3Dos.environ['LDFLAGS'] ) + env.Append( LINKFLAGS=3D" -fPIC -pthread -rdynamic" ) env.Append( LIBS=3D[] ) =20 - #make scons colorgcc friendly -@@ -683,17 +682,11 @@ if nix: +@@ -683,12 +684,11 @@ =20 if linux and has_option( "sharedclient" ): env.Append( LINKFLAGS=3D" -Wl,--as-needed -Wl,-zdefs " ) @@ -28,21 +23,15 @@ index 41383b1..3752c4a 100644 env['ENV']['GLIBCXX_FORCE_NEW'] =3D 1; # play nice with valgrin= d - else: - env.Append( CPPFLAGS=3D" -O3" ) -- #env.Append( CPPFLAGS=3D" -fprofile-generate" ) -- #env.Append( LINKFLAGS=3D" -fprofile-generate" ) -- # then: -- #env.Append( CPPFLAGS=3D" -fprofile-use" ) -- #env.Append( LINKFLAGS=3D" -fprofile-use" ) =20 -=20 - if debugLogging: - env.Append( CPPFLAGS=3D" -D_DEBUG" ); -@@ -911,8 +904,9 @@ def doConfigure( myenv , needPcre=3DTrue , shell=3DF= alse ): + #env.Append( CPPFLAGS=3D" -fprofile-generate" ) + #env.Append( LINKFLAGS=3D" -fprofile-generate" ) + # then: +@@ -911,8 +911,8 @@ =20 myCheckLib( J , True ) mozHeader =3D "js" - if bigLibString(myenv).find( "mozjs" ) >=3D 0: - mozHeader =3D "mozjs" -+ + env.Append( CPPPATH=3D["/usr/include/nspr"] ) + env.Append( CPPDEFINES=3D[ "XULRUNNER" ] ) =20 diff --git a/dev-db/mongodb/files/mongodb.confd b/dev-db/mongodb/files/mo= ngodb.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=3D"/usr/bin/mongod" MONGODB_DATA=3D"/var/lib/mongodb" MONGODB_USER=3D"mongodb" -MONGODB_PID_FILE=3D"/var/run/mongodb/mongodb.pid" =20 MONGODB_IP=3D"127.0.0.1" MONGODB_PORT=3D"27017" =20 # Set extra options here, such as disabling the admin web server -MONGODB_OPTIONS=3D"" +MONGODB_OPTIONS=3D"--journal" diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mo= ngodb.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: $ =20 depend() { need net @@ -9,37 +9,21 @@ depend() { =20 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=3D"" - if [ -n "$MONGODB_DATA" ] ; then - args=3D"$args --dbpath $MONGODB_DATA" - fi - if [ -n "$MONGODB_PORT" ] ; then - args=3D"$args --port $MONGODB_PORT" - fi - if [ -n "$MONGODB_IP" ] ; then - args=3D"$args --bind_ip $MONGODB_IP" - fi - if [ -n "$MONGODB_OPTIONS" ] ; then - args=3D"$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 $? } =20 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=3D"http://downloads.mongodb.org/src/${MY_P}.t= ar.gz" LICENSE=3D"AGPL-3 Apache-2.0" SLOT=3D"0" KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"pcap static-libs v8" +IUSE=3D"static-libs v8" =20 -RDEPEND=3D"pcap? ( net-libs/libpcap ) - !v8? ( dev-lang/spidermonkey ) +RDEPEND=3D"!v8? ( dev-lang/spidermonkey ) v8? ( dev-lang/v8 ) dev-libs/boost - dev-libs/libpcre" + dev-libs/libpcre[cxx] + net-libs/libpcap" DEPEND=3D"${RDEPEND} - >=3Ddev-util/scons-1.2.0-r1 + dev-util/scons sys-libs/readline sys-libs/ncurses" =20 @@ -45,12 +45,12 @@ pkg_setup() { =20 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 } =20 src_compile() { @@ -60,12 +60,10 @@ src_compile() { src_install() { scons ${scons_opts} --full --nostrip install --prefix=3D"${D}"/usr || d= ie "Install failed" =20 - # 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" =20 - # 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 =20 @@ -79,3 +77,11 @@ src_install() { src_test() { scons ${scons_opts} smoke --smokedbprefix=3D'testdir' test || die "Test= s failed" } + +pkg_postinst() { + if has_version '