summaryrefslogtreecommitdiff
path: root/dev-db
diff options
context:
space:
mode:
authorAlexys Jacob <ultrabug@gentoo.org>2013-03-25 12:00:42 +0000
committerAlexys Jacob <ultrabug@gentoo.org>2013-03-25 12:00:42 +0000
commit77341fc254393a594151ab3d42d96bbecca0c16e (patch)
tree649c0d82b5472dea2205ee26cce2ea3d385aaf16 /dev-db
parentUpdate deps (diff)
downloadgentoo-2-77341fc254393a594151ab3d42d96bbecca0c16e.tar.gz
gentoo-2-77341fc254393a594151ab3d42d96bbecca0c16e.tar.bz2
gentoo-2-77341fc254393a594151ab3d42d96bbecca0c16e.zip
Version bump, drop bugged version, add kerberos support, fix #462606
(Portage version: 2.1.11.58/cvs/Linux x86_64, signed Manifest commit with key B658FA13)
Diffstat (limited to 'dev-db')
-rw-r--r--dev-db/mongodb/ChangeLog8
-rw-r--r--dev-db/mongodb/mongodb-2.4.1.ebuild (renamed from dev-db/mongodb/mongodb-2.4.0.ebuild)24
2 files changed, 24 insertions, 8 deletions
diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index f1ba7e87c1b8..d869d9822b45 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-db/mongodb
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.61 2013/03/21 09:02:33 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.62 2013/03/25 12:00:42 ultrabug Exp $
+
+*mongodb-2.4.1 (25 Mar 2013)
+
+ 25 Mar 2013; Ultrabug <ultrabug@gentoo.org> -mongodb-2.4.0.ebuild,
+ +mongodb-2.4.1.ebuild:
+ Version bump, drop bugged version, add kerberos support, fix #462606
21 Mar 2013; Ultrabug <ultrabug@gentoo.org> mongodb-2.4.0.ebuild:
add missing dep for ssl USE flag
diff --git a/dev-db/mongodb/mongodb-2.4.0.ebuild b/dev-db/mongodb/mongodb-2.4.1.ebuild
index 108a93feb55b..acb4e3c4f09b 100644
--- a/dev-db/mongodb/mongodb-2.4.0.ebuild
+++ b/dev-db/mongodb/mongodb-2.4.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.0.ebuild,v 1.2 2013/03/21 09:02:33 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.4.1.ebuild,v 1.1 2013/03/25 12:00:42 ultrabug Exp $
EAPI=4
SCONS_MIN_VERSION="1.2.0"
@@ -17,7 +17,7 @@ SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz
LICENSE="AGPL-3 Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="mms-agent sharedclient spidermonkey ssl static-libs"
+IUSE="kerberos mms-agent sharedclient spidermonkey ssl static-libs"
PDEPEND="mms-agent? ( dev-python/pymongo )"
RDEPEND="
@@ -30,7 +30,8 @@ RDEPEND="
ssl? ( dev-libs/openssl )"
DEPEND="${RDEPEND}
sys-libs/readline
- sys-libs/ncurses"
+ sys-libs/ncurses
+ kerberos? ( net-libs/libgsasl )"
S=${WORKDIR}/${MY_P}
@@ -44,16 +45,20 @@ pkg_setup() {
scons_opts+=" --use-system-snappy"
scons_opts+=" --use-system-boost"
- if use spidermonkey; then
- scons_opts+=" --usesm"
- else
- scons_opts+=" --use-system-v8"
+ if use kerberos; then
+ scons_opts+=" --use-sasl-client"
fi
if use sharedclient; then
scons_opts+=" --sharedclient"
fi
+ if use spidermonkey; then
+ scons_opts+=" --usesm"
+ else
+ scons_opts+=" --use-system-v8"
+ fi
+
if use ssl; then
scons_opts+=" --ssl"
fi
@@ -67,6 +72,11 @@ src_prepare() {
sed -i -e '/env.Append( LINKFLAGS=" -Wl,--as-needed -Wl,-zdefs " )/d' SConstruct || die
sed -i -e 's/#env.SharedLibrary/env.SharedLibrary/g' src/SConscript.client || die
fi
+
+ # bug #462606
+ if use !prefix && [[ "$(get_libdir)" == "lib" ]]; then
+ sed -i -e 's/^env.Install(prefix/env.InstallAs(prefix/g' src/SConscript.client || die
+ fi
}
src_compile() {