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 1QA1X3-0006rp-J5 for garchives@archives.gentoo.org; Wed, 13 Apr 2011 14:59:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B22B1C006; Wed, 13 Apr 2011 14:58:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DCEC81C006 for ; Wed, 13 Apr 2011 14:58:53 +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 5875D1B4048 for ; Wed, 13 Apr 2011 14:58:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7A28A80065 for ; Wed, 13 Apr 2011 14:58:52 +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: <076fbc754c4bde60ef75d05c361b7296b03ffe20.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/Manifest dev-db/mongodb/files/mongodb-1.6-fix-scons.patch 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/files/mongos.confd dev-db/mongodb/files/mongos.initd dev-db/mongodb/mongodb-1.6.5.ebuild 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: 076fbc754c4bde60ef75d05c361b7296b03ffe20 Date: Wed, 13 Apr 2011 14:58:52 +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: 826466061517ad1308a8c79dd6482790 commit: 076fbc754c4bde60ef75d05c361b7296b03ffe20 Author: Ultrabug gentoo org> AuthorDate: Wed Apr 13 14:58:44 2011 +0000 Commit: Alexys Jacob gentoo org> CommitDate: Wed Apr 13 14:58:44 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/ultrabug.git;a= =3Dcommit;h=3D076fbc75 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 54011fed1646e1be90962a6595cb= ecdec1833c35 SHA1 e76feb1ba4f6973e1e382cd505d23f9c4291e9a9 SHA256 8b903e6= cb95b92314a91a540b8773d5c7e85721f25ef4e176bd3eeb4673072cb -AUX mongodb-1.8-fix-scons.patch 1649 RMD160 1e5be2fe75f25c511b1d70dd1dd7= 977c8f1a6db3 SHA1 1300bbc5ff4f9c4a59e89fb3e119506b3507906d SHA256 5b8db8f= 66adabbdd52c364a713ce38a937c4ac6282a4ac530d14930d386d582d -AUX mongodb.confd 277 RMD160 a6c7f01ecc843c9138046a5b4deaaff839b7bcc4 SH= A1 cb04bf6b4d3799846b9ab59dc587c88093d8e265 SHA256 b5b44beb64aae30f285c47= 64acbb8b2c7c60bd0cdcd47c6c11f285790c42b510 -AUX mongodb.initd 921 RMD160 e26c0e82708bc05b8c5ae85212f6bba1f4799160 SH= A1 c542e418870d03ff5a2ff147094bd6c33ec5234e SHA256 c0765809103ab2a5ad806a= dfa8a850c05396c7b5db8af5ee379eb2ea043b654d -AUX mongos.confd 261 RMD160 cd0164a9f54d53871a5a15ea15034479e9360d1d SHA= 1 193e29ae8a33dbd6490698955e6e36601a395c4b SHA256 56b63b536e2e0482972efb1= 505d3a661511dc9ed5872c12933a141470f1923a8 -AUX mongos.initd 1079 RMD160 fa4b71d2c5accdb988d7b8b04e934c8b9114dd6c SH= A1 d09b7834e9b59720c5fa972ad4c730693f978bdd SHA256 c80f43e0dac94524d81861= 5425204b11b234c54a8e8017afdad9459a210216a2 -DIST mongodb-src-r1.6.5.tar.gz 1506561 RMD160 de98b9558544eafb809131347b= 6a339c46f09732 SHA1 4aed2da91377c2a5c8722c0c6873117014faf31a SHA256 5feac= 5302be91eea758851d28e4ad09ff4d11a28ffcb61e792ab7aeb5327a8a0 -DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af43= 65c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268= b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d -EBUILD mongodb-1.6.5.ebuild 1816 RMD160 b6ca2690716e473b60f51dbd30a10f54= fdaa2c80 SHA1 acc6814fff309609341d93307c73d18e25e1d764 SHA256 7b187365b29= 3219e7a8734473ba4a17f3c30a659e17434317161d0fb770b5e57 -EBUILD mongodb-1.8.1.ebuild 1857 RMD160 7b51ba844e83325e78f923cc15fd87fe= 2cf29d9c SHA1 9536bd71d98b7ea62bfe79d753caa4ad3efec224 SHA256 57caf6c7853= b7dff092d77636be49633d847e01d8c671a72a11b6a4c875619f7 diff --git a/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch b/dev-db/mo= ngodb/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: -=20 - if nix: - env.Append( CPPFLAGS=3D"-fPIC -fno-strict-aliasing -ggdb -pthread -= Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" ) -- if linux: -- env.Append( CPPFLAGS=3D" -Werror " ) - env.Append( CXXFLAGS=3D" -Wnon-virtual-dtor " ) -+ env.Append( CXXFLAGS=3Dos.environ['CXXFLAGS']) -+ env.Append( LINKFLAGS=3Dos.environ['LDFLAGS'] ) - env.Append( LINKFLAGS=3D" -fPIC -pthread -rdynamic" ) - env.Append( LIBS=3D[] ) -=20 - if linux and GetOption( "sharedclient" ): - env.Append( LINKFLAGS=3D" -Wl,--as-needed -Wl,-zdefs " ) -+ env.Append( SHLINKFLAGS=3D" -Wl,-soname=3Dlibmongoclient.so " ) -=20 - if debugBuild: - env.Append( CPPFLAGS=3D" -O0 -fstack-protector " ); - env['ENV']['GLIBCXX_FORCE_NEW'] =3D 1; # play nice with valgrin= d -- else: -- env.Append( CPPFLAGS=3D" -O3" ) -=20 - if debugLogging: - env.Append( CPPFLAGS=3D" -D_DEBUG" ); -@@ -972,8 +971,8 @@ def doConfigure( myenv , needPcre=3DTrue , shell=3DF= alse ): - =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 - 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/mo= ngodb/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=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: -- env.Append( CPPFLAGS=3D" -Werror " ) - 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=3Dos.environ['LDFLAGS'] ) - env.Append( LINKFLAGS=3D" -fPIC -pthread -rdynamic" ) - env.Append( LIBS=3D[] ) -=20 -@@ -683,12 +684,11 @@ -=20 - if linux and has_option( "sharedclient" ): - env.Append( LINKFLAGS=3D" -Wl,--as-needed -Wl,-zdefs " ) -+ env.Append( SHLINKFLAGS=3D" -Wl,-soname=3Dlibmongoclient.so " ) -=20 - if debugBuild: - env.Append( CPPFLAGS=3D" -O0 -fstack-protector " ); - 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: -@@ -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 - 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/mo= ngodb.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=3D"/usr/bin/mongod" -MONGODB_RUN=3D"/var/run/mongodb" -MONGODB_DATA=3D"/var/lib/mongodb" -MONGODB_USER=3D"mongodb" - -MONGODB_IP=3D"127.0.0.1" -MONGODB_PORT=3D"27017" - -# Set extra options here, such as disabling the admin web server -MONGODB_OPTIONS=3D"--journal" diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mo= ngodb.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}/${S= VCNAME}.pid - eend $? -} diff --git a/dev-db/mongodb/files/mongos.confd b/dev-db/mongodb/files/mon= gos.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=3D"/usr/bin/mongos" -MONGOS_RUN=3D"/var/run/mongodb" -MONGOS_USER=3D"mongodb" - -MONGOS_IP=3D"127.0.0.1" -MONGOS_PORT=3D"27018" - -# 1 to 3 comma separated config servers (mandatory) -MONGOS_CONFIGDB=3D"" - -# Set extra options here -MONGOS_OPTIONS=3D"" diff --git a/dev-db/mongodb/files/mongos.initd b/dev-db/mongodb/files/mon= gos.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}/${SV= CNAME}.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=3D4 -SCONS_MIN_VERSION=3D"1.2.0" - -inherit eutils multilib scons-utils versionator - -MY_P=3D${PN}-src-r${PV/_rc/-rc} - -DESCRIPTION=3D"A high-performance, open source, schema-free document-ori= ented database" -HOMEPAGE=3D"http://www.mongodb.org" -SRC_URI=3D"http://downloads.mongodb.org/src/${MY_P}.tar.gz" - -LICENSE=3D"AGPL-3 Apache-2.0" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"static-libs v8" - -RDEPEND=3D"!v8? ( >=3Ddev-lang/spidermonkey-1.9 ) - v8? ( dev-lang/v8 ) - dev-libs/boost - dev-libs/libpcre[cxx] - net-libs/libpcap" -DEPEND=3D"${RDEPEND} - sys-libs/readline - sys-libs/ncurses" - -S=3D${WORKDIR}/${MY_P} - -pkg_setup() { - enewgroup mongodb - enewuser mongodb -1 -1 /var/lib/${PN} mongodb - - scons_opts=3D" --sharedclient" - if use v8; then - scons_opts+=3D" --usev8" - else - scons_opts+=3D" --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=3D"${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=3D'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=3D4 -SCONS_MIN_VERSION=3D"1.2.0" - -inherit eutils multilib scons-utils versionator - -MY_P=3D${PN}-src-r${PV/_rc/-rc} - -DESCRIPTION=3D"A high-performance, open source, schema-free document-ori= ented database" -HOMEPAGE=3D"http://www.mongodb.org" -SRC_URI=3D"http://downloads.mongodb.org/src/${MY_P}.tar.gz" - -LICENSE=3D"AGPL-3 Apache-2.0" -SLOT=3D"0" -KEYWORDS=3D"~amd64 ~x86" -IUSE=3D"static-libs v8" - -RDEPEND=3D"!v8? ( >=3Ddev-lang/spidermonkey-1.9 ) - v8? ( dev-lang/v8 ) - dev-libs/boost - dev-libs/libpcre[cxx] - net-libs/libpcap" -DEPEND=3D"${RDEPEND} - sys-libs/readline - sys-libs/ncurses" - -S=3D${WORKDIR}/${MY_P} - -pkg_setup() { - enewgroup mongodb - enewuser mongodb -1 -1 /var/lib/${PN} mongodb - - scons_opts=3D" --sharedclient" - if use v8; then - scons_opts+=3D" --usev8" - else - scons_opts+=3D" --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=3D"${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=3Dunittest || 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" -}