Fix spidermonkey dependency wrt #376983 (thanks to Ian Stakenvicius). Version bump...

Package-Manager: portage-2.1.10.9/cvs/Linux x86_64

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index e589a634fe24bcb5d442234511c1431758a027e2..e1e7aebb1884f0fc3e293f26f1ead4c937952db6 100644 (file)
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.20 2011/07/29 15:35:14 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.21 2011/08/26 12:38:49 ultrabug Exp $
+
+*mongodb-1.8.3 (26 Aug 2011)
+
+  26 Aug 2011; Ultrabug <ultrabug@gentoo.org> -mongodb-1.6.5-r1.ebuild,
+  -files/mongodb-1.6-fix-scons.patch, -mongodb-1.8.2_rc3.ebuild,
+  -mongodb-1.8.2.ebuild, mongodb-1.8.2-r1.ebuild, +mongodb-1.8.3.ebuild,
+  files/mongodb.confd, files/mongodb.initd, files/mongos.confd,
+  files/mongos.initd, metadata.xml:
+  Fix spidermonkey dependency wrt #376983 (thanks to Ian Stakenvicius). Version
+  bump. Drop old 1.6 series. Add Johan Bergström as proxy maintainer. Init
+  scripts handle baselayout-1 and openrc correctly + better bind_ip setup.
 
 *mongodb-1.8.2-r1 (29 Jul 2011)
 

diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 70c589d8d4f6ffc0711d86cd6591d34cd3029fb6..8d0324fb7cd878a91eb293cb4194428dd14923d5 100644 (file)
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,26 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX mongodb-1.6-fix-scons.patch 1632 RMD160 fa6a3ededbc0f78a113d66735c003860e0bcd75c SHA1 5ac604f9ef2c19c002f722d33c6e066552d28b5a SHA256 bbd2c111a3f4b44a287b3e00ced6618fb7a9d80fcf8d9fcf0ec07cca19f5c860
 AUX mongodb-1.8-fix-scons.patch 1859 RMD160 71700297d66808d2503f8a5eb56e10398e282ee7 SHA1 cba8225b2cd79477c0882a312707fbb58a59b70a SHA256 2b1a2180e73ad18c6fc884678dcdfb081c9ed6e967e137ba761683075cd59a1a
 AUX mongodb-linux3.patch 1588 RMD160 879245215595e6f16ef6c04157a9b50b96638d48 SHA1 1ab387e8b6ddc46dbb3dde654e0e01a565c25222 SHA256 bc96fad782e5396cc4464e7d7bff6abb1f054c4ff034fbeebea44a1e7a41945b
-AUX mongodb.confd 277 RMD160 a6c7f01ecc843c9138046a5b4deaaff839b7bcc4 SHA1 cb04bf6b4d3799846b9ab59dc587c88093d8e265 SHA256 b5b44beb64aae30f285c4764acbb8b2c7c60bd0cdcd47c6c11f285790c42b510
-AUX mongodb.initd 1019 RMD160 9b5b825228208a7656ccc03e248eb9e8fdcf7757 SHA1 51936bea587cc8186d57877ce8293933aec30252 SHA256 922e274456872cdf961299b35ddbfd27901694bcb6acd0df0a2e62f151c31d23
-AUX mongos.confd 261 RMD160 cd0164a9f54d53871a5a15ea15034479e9360d1d SHA1 193e29ae8a33dbd6490698955e6e36601a395c4b SHA256 56b63b536e2e0482972efb1505d3a661511dc9ed5872c12933a141470f1923a8
-AUX mongos.initd 1176 RMD160 4463298c196ddb8784115680fca6e6362d93d21e SHA1 94d7d526d1fda14888bbb8ba3e3b70df4354db70 SHA256 83f2f456b9a95454ad081efdcc18eb868b7ba1d348c1e7e753199467768049e0
-DIST mongodb-src-r1.6.5.tar.gz 1506561 RMD160 de98b9558544eafb809131347b6a339c46f09732 SHA1 4aed2da91377c2a5c8722c0c6873117014faf31a SHA256 5feac5302be91eea758851d28e4ad09ff4d11a28ffcb61e792ab7aeb5327a8a0
-DIST mongodb-src-r1.8.2-rc3.tar.gz 1722716 RMD160 32c70893e1f33b07d582b91520ca3b446caf65d7 SHA1 8b63d3ce9e04df33480e0434154bfdf8c8e8c776 SHA256 72954d3ab217b2fe8a7d586f3e45e93ec3303390ea68242b0ec07057694a9dd6
+AUX mongodb.confd 361 RMD160 26e8d39513b44d989ee64c30669967237cabbaa8 SHA1 837b3603de36bf8ebab9a6f2c1652a853cdf02ef SHA256 a4ca29c577428c02cd0b0a8b46756df5f53a05519c9d13c270533cf99b9b819d
+AUX mongodb.initd 1254 RMD160 d4fb23a7533480c687e8d1bb01e08780991400ea SHA1 cefff6f1290595929feec0f996c99f9790c06536 SHA256 b39bf365963f849c5102147da324dae140be6ac17db96fe512c0220803477642
+AUX mongos.confd 345 RMD160 97a0baad48e8fb65fe413f9832d0dd9a212f015d SHA1 735e77022707e9a18dd3de30ba9ec87b747bc0bb SHA256 2afd582564623da0e928ca667d37bef467334c82d08b49301f1f6c16ba177767
+AUX mongos.initd 1407 RMD160 2b859fe4e6a7a348c06d9d149a34251d442efbf0 SHA1 57a82e46efafb822de93e0d20384187af25c0bf9 SHA256 a93069d7c7c3602437ce783c1aecd931854973230baae092ccee2cd9c078da7e
 DIST mongodb-src-r1.8.2.tar.gz 1722704 RMD160 3c1e33ed9ff3dd3c653112a46cf178d07b93e32c SHA1 d2145e5b4a6df2e94aec76bef3a9399c11e8571a SHA256 1dd376b15e2b7288a77da2e1b0c6ffa5d2c62cdaf4bccfd9aa51c075a1f1bfb8
-EBUILD mongodb-1.6.5-r1.ebuild 1937 RMD160 759eada221931d555bc967f5208bc55dabe0c94e SHA1 cfcdada929b522505a61cec51932c7247414becb SHA256 700fff85edfddfc4816e467e30339dc674985dbe42ef77abfa0af34a8d52a91e
-EBUILD mongodb-1.8.2-r1.ebuild 2019 RMD160 fa68c30f1454fdfc7cc94ba44cdc867ea07270e3 SHA1 ae4c355c996a62e40a7cf2c5830c8ebd6ddaff04 SHA256 1c0f714d21a270877d71e1682750cdc4da532d0d788de5bccd2ee48cae950c7b
-EBUILD mongodb-1.8.2.ebuild 1975 RMD160 fb8493c4b7dfb73c389dc8f1a5cbf11cf3e1e0be SHA1 7c0085fe1b1cbe5efd6804e8a146acf7a04a18db SHA256 74fe228662928a86f5eac0ba82aade647f2d9cb92d59aa1cdf7c81f28c074e67
-EBUILD mongodb-1.8.2_rc3.ebuild 1979 RMD160 12c3169acf26b6290f465fe62245edf42d07be17 SHA1 1eb91fb66d6d1efab1aa8a0a2bed3d3b617627af SHA256 5445e9ee5cd7ab2c624fcc8f100a1a1aa3fb2997fe549ac9b6eff8b4ef879ca8
-MISC ChangeLog 5407 RMD160 b13316949e1d2ce2d8d9818a126356709ab491ad SHA1 1e1953f1c078635d2f698aeb9a1a5560b994cf56 SHA256 1e63eb28e89ab534edd14b093316bbf3eb77ea6491bc5a44ae85d80851f73e12
-MISC metadata.xml 884 RMD160 f0cb7b3592708ec85696616af69b9bfc0e81e9c2 SHA1 de8f61e005e2c499c24084a0e0ab493c65a50c0c SHA256 e15990a373759e839063bd6bf698f0cc835bb4ef46352dbe50020d14335b91c7
+DIST mongodb-src-r1.8.3.tar.gz 1726144 RMD160 9662b6963e7e6a4b5adcbea3faa36dd50a794457 SHA1 3c5c9819ef20c759aec1dc6800a3c4d4f6841299 SHA256 ee121c9698a48b819f1c5b5ba10a98d565bd732d527743f1475f54f697dd63e2
+EBUILD mongodb-1.8.2-r1.ebuild 2021 RMD160 37613171ba6062bf0eeddc57e10b252e546f617e SHA1 df672de95cacc99381027e8e5e6dd2ee99d0d0c1 SHA256 30f2d8c2c317113c7a5725acf2e64bb35ccaa3de9508e88766072c35c3c282de
+EBUILD mongodb-1.8.3.ebuild 2018 RMD160 929b25e23913c14cf2e58d8c791f0fb5df43a97f SHA1 c62266fe28d6313df32b5bbd939256ab8f56dc18 SHA256 e51c7849b2bbf40095f73da124c6003a737f5c8835b1b68233364a5ff113f060
+MISC ChangeLog 5979 RMD160 0fe42fe0b968c033efef9b077296d5dc397f89f2 SHA1 04ed386517b1e72c813eabc865f9a0304d01273e SHA256 9d2f61ebe7fc22259f409e66786dc73bab0df09d254ea1961f0b6594b77ec0d3
+MISC metadata.xml 1039 RMD160 af312c60930706e3dbd6c370ec1ce22de7a7a7d4 SHA1 5092929c2c4a3e7d5315aa559cfe44b696af05a7 SHA256 9d8b84571953a77d5f0868c2d59f96c71feb9bfd7b8d599dc4f3598916c74c30
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4y00AACgkQKiQSS7ZY+hP4mgD/bLIbbWT9dzbt0ujr06nbmRTy
-qW81PP/dqs3G6glQLi4A/0ysAjidgOHWraHrP4/gzP3DCSfjIHvpsFMyEn9T4h+Q
-=RQms
+iF4EAREIAAYFAk5Xk+IACgkQKiQSS7ZY+hO31wEA37Vqw2gDLDuBPPVFxDgZbpdY
+R+KvaPnbGw2q3hCWJbcA/Rah6JfMbnm6zVk4R+jKfLflws63BGcNSM7kV1LUsX0F
+=j0J3
 -----END PGP SIGNATURE-----

diff --git a/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch b/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch
deleted file mode 100644 (file)
index 64d5622..0000000
--- a/dev-db/mongodb/files/mongodb-1.6-fix-scons.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/SConstruct       2011-04-13 19:09:56.774788380 +0200
-+++ b/SConstruct       2011-04-13 19:15:50.874924566 +0200
-@@ -744,21 +744,20 @@
-     print( "No special config for [" + os.sys.platform + "] which probably means it won't work" )
- 
- 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( CPPFLAGS="-fPIC -fno-strict-aliasing -pthread -Wall -Wsign-compare -Wno-unknown-pragmas -Winvalid-pch" )
-     env.Append( CXXFLAGS=" -Wnon-virtual-dtor " )
-+    env.Append( CXXFLAGS=os.environ['CXXFLAGS'])
-+    env.Append( LINKFLAGS=os.environ['LDFLAGS'] )
-     env.Append( LINKFLAGS=" -fPIC -pthread -rdynamic" )
-     env.Append( LIBS=[] )
- 
-     if linux and GetOption( "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" )
- 
-     if debugLogging:
-         env.Append( CPPFLAGS=" -D_DEBUG" );
-@@ -972,8 +971,8 @@
-                 
-         myCheckLib( J , True )
-         mozHeader = "js"
--        if bigLibString(myenv).find( "mozjs" ) >= 0:
--            mozHeader = "mozjs"
-+        env.Append( CPPPATH=["/usr/include/nspr"] )
-+        env.Append( CPPDEFINES=[ "XULRUNNER" ] )
- 
-         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/mongodb.confd
index 9b3a438352710ebc2f148c5e2b0973dd589550f3..4f76c5a79f9fff32cbd12c413ff2ba1e7984ab58 100644 (file)
--- a/dev-db/mongodb/files/mongodb.confd
+++ b/dev-db/mongodb/files/mongodb.confd
@@ -4,7 +4,10 @@ MONGODB_RUN="/var/run/mongodb"
 MONGODB_DATA="/var/lib/mongodb"
 MONGODB_USER="mongodb"
 
+# Listen to specified IP, comment this to listen to all
 MONGODB_IP="127.0.0.1"
+
+# Listen to specified port
 MONGODB_PORT="27017"
 
 # Set extra options here, such as disabling the admin web server

diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mongodb.initd
index ac1bc31930ca4ae35c70812292b5adc1f0366cf3..b4f05de52259c4d76d57c318a4316e5ced499a76 100644 (file)
--- a/dev-db/mongodb/files/mongodb.initd
+++ b/dev-db/mongodb/files/mongodb.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 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.3 2011/04/13 14:56:32 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongodb.initd,v 1.4 2011/08/26 12:38:49 ultrabug Exp $
 
 depend() {
        need net
@@ -11,13 +11,21 @@ start() {
        mkdir -p ${MONGODB_RUN:-/var/run/mongodb}
        chown ${MONGODB_USER:-mongodb}: ${MONGODB_RUN:-/var/run/mongodb}
 
+       # Listen to MONGODB_IP if configured
+       [ -z "${MONGODB_IP}" ] || MONGODB_OPTIONS="--bind_ip ${MONGODB_IP} ${MONGODB_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 ${MONGODB_RUN:-/var/run/mongodb}/${SVCNAME}.pid \
-               --chuid ${MONGODB_USER:-mongodb} \
+               ${USEROPT} ${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} \

diff --git a/dev-db/mongodb/files/mongos.confd b/dev-db/mongodb/files/mongos.confd
index 8ac0ebcd655b85ffd327b94dfe3ae8af73f88e84..644cd0a2522db9e2318d5131fe9857cab33575a4 100644 (file)
--- a/dev-db/mongodb/files/mongos.confd
+++ b/dev-db/mongodb/files/mongos.confd
@@ -3,7 +3,10 @@ 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)

diff --git a/dev-db/mongodb/files/mongos.initd b/dev-db/mongodb/files/mongos.initd
index 9279c4fc9993280a39a7b3dcc6702cc24656d545..8a73340909f206b8ff00651cce7faa90d356c1b4 100644 (file)
--- a/dev-db/mongodb/files/mongos.initd
+++ b/dev-db/mongodb/files/mongos.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongos.initd,v 1.1 2011/04/13 14:56:32 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongos.initd,v 1.2 2011/08/26 12:38:49 ultrabug Exp $
 
 depend() {
        need net
@@ -21,13 +21,21 @@ start() {
        mkdir -p ${MONGOS_RUN:-/var/run/mongodb}
        chown ${MONGOS_USER:-mongodb}: ${MONGOS_RUN:-/var/run/mongodb}
 
+       # 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 \
-               --chuid ${MONGOS_USER:-mongodb} \
+               ${USEROPT} ${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 \

diff --git a/dev-db/mongodb/metadata.xml b/dev-db/mongodb/metadata.xml
index 497509baa6c9c4801342ada1d45f6bf92d6bfd3f..a81de2908ef1b4477cca6e24a5cbd003d6be2e02 100644 (file)
--- a/dev-db/mongodb/metadata.xml
+++ b/dev-db/mongodb/metadata.xml
@@ -2,14 +2,19 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
        <herd>no-herd</herd>
-       <maintainer>
-               <email>ramereth@gentoo.org</email>
-               <name>Lance Albertson</name>
-       </maintainer>
        <maintainer>
                <email>ultrabug@gentoo.org</email>
                <name>Alexys Jacob</name>
        </maintainer>
+       <maintainer>
+               <email>bugs@bergstroem.nu</email>
+               <name>Johan Bergström</name>
+               <description>Proxy Maintainer. CC on bugs</description>
+       </maintainer>
+       <maintainer>
+               <email>ramereth@gentoo.org</email>
+               <name>Lance Albertson</name>
+       </maintainer>
        <longdescription lang="en">
        MongoDB (from "humongous") is a scalable, high-performance, open source,
        schema-free, document-oriented database. Written in C++, MongoDB features:

diff --git a/dev-db/mongodb/mongodb-1.6.5-r1.ebuild b/dev-db/mongodb/mongodb-1.6.5-r1.ebuild
deleted file mode 100644 (file)
index 0150f0b..0000000
--- a/dev-db/mongodb/mongodb-1.6.5-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.6.5-r1.ebuild,v 1.2 2011/06/22 05:26:54 nirbheek Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-
-inherit eutils multilib scons-utils versionator
-
-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"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs v8"
-
-RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.8 )
-       v8? ( dev-lang/v8 )
-       dev-libs/boost
-       dev-libs/libpcre[cxx]
-       net-libs/libpcap"
-DEPEND="${RDEPEND}
-       sys-libs/readline
-       sys-libs/ncurses"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-       enewgroup mongodb
-       enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-       scons_opts=" --cxx=$(tc-getCXX) --sharedclient"
-       if use v8; then
-               scons_opts+=" --usev8"
-       else
-               scons_opts+=" --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="${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='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.2-r1.ebuild b/dev-db/mongodb/mongodb-1.8.2-r1.ebuild
index 36cfe0e18817174c729b7ec0d3ad0ba72c6a9a37..52e7f3c08a9d9dc59a6b78ad0be4537d8389bd99 100644 (file)
--- a/dev-db/mongodb/mongodb-1.8.2-r1.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.2-r1.ebuild,v 1.1 2011/07/29 15:35:14 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.2-r1.ebuild,v 1.2 2011/08/26 12:38:49 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs v8"
 
-RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.8 )
+RDEPEND="!v8? ( =dev-lang/spidermonkey-1.8.2* )
        v8? ( dev-lang/v8 )
        dev-libs/boost
        dev-libs/libpcre[cxx]

diff --git a/dev-db/mongodb/mongodb-1.8.2_rc3.ebuild b/dev-db/mongodb/mongodb-1.8.2_rc3.ebuild
deleted file mode 100644 (file)
index a36a4a6..0000000
--- a/dev-db/mongodb/mongodb-1.8.2_rc3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.2_rc3.ebuild,v 1.2 2011/06/22 05:26:54 nirbheek Exp $
-
-EAPI=4
-SCONS_MIN_VERSION="1.2.0"
-
-inherit eutils multilib scons-utils versionator
-
-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"
-
-LICENSE="AGPL-3 Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs v8"
-
-RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.8 )
-       v8? ( dev-lang/v8 )
-       dev-libs/boost
-       dev-libs/libpcre[cxx]
-       net-libs/libpcap"
-DEPEND="${RDEPEND}
-       sys-libs/readline
-       sys-libs/ncurses"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-       enewgroup mongodb
-       enewuser mongodb -1 -1 /var/lib/${PN} mongodb
-
-       scons_opts=" --cxx=$(tc-getCXX) --sharedclient"
-       if use v8; then
-               scons_opts+=" --usev8"
-       else
-               scons_opts+=" --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="${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=unittest || 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"
-}

diff --git a/dev-db/mongodb/mongodb-1.8.2.ebuild b/dev-db/mongodb/mongodb-1.8.3.ebuild
similarity index 90%
rename from dev-db/mongodb/mongodb-1.8.2.ebuild
rename to dev-db/mongodb/mongodb-1.8.3.ebuild
index e9aa96a7ceef339d4adeffb72bd51adf99d54a90..fb0be9613f001dbc4c030f62fd867a5947da4043 100644 (file)
--- a/dev-db/mongodb/mongodb-1.8.2.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.2.ebuild,v 1.1 2011/06/22 17:26:09 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.3.ebuild,v 1.1 2011/08/26 12:38:49 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs v8"
 
-RDEPEND="!v8? ( >=dev-lang/spidermonkey-1.8 )
+RDEPEND="!v8? ( =dev-lang/spidermonkey-1.8.2* )
        v8? ( dev-lang/v8 )
        dev-libs/boost
        dev-libs/libpcre[cxx]
@@ -43,6 +43,7 @@ pkg_setup() {
 
 src_prepare() {
        epatch "${FILESDIR}/${PN}-1.8-fix-scons.patch"
+       epatch "${FILESDIR}/${PN}-linux3.patch"
 }
 
 src_compile() {