Version bump, fix #431508 thx to Mike Limansky. Drop old.

(Portage version: 2.1.11.10/cvs/Linux x86_64)

4 files changed, 136 insertions, 4 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index 81dcbdbf8a9b..d77b3dbd7865 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.40 2012/06/06 07:44:16 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.41 2012/08/20 08:46:47 ultrabug Exp $
+
+*mongodb-2.0.7 (20 Aug 2012)
+*mongodb-1.8.5 (20 Aug 2012)
+
+  20 Aug 2012; Ultrabug <ultrabug@gentoo.org> +mongodb-1.8.5.ebuild,
+  +files/mongodb-1.8.5-fix-smokepy.patch, -mongodb-2.0.5.ebuild,
+  +mongodb-2.0.7.ebuild:
+  Version bump, fix #431508 thx to Mike Limansky. Drop old.
 
 *mongodb-2.0.6 (06 Jun 2012)
 
diff --git a/dev-db/mongodb/files/mongodb-1.8.5-fix-smokepy.patch b/dev-db/mongodb/files/mongodb-1.8.5-fix-smokepy.patch
new file mode 100644
index 000000000000..a98a0e1f4888
--- /dev/null
+++ b/dev-db/mongodb/files/mongodb-1.8.5-fix-smokepy.patch
@@ -0,0 +1,24 @@
+--- a/SConstruct	2012-08-20 10:26:51.484835418 +0200
++++ b/SConstruct	2012-08-20 10:27:49.855374497 +0200
+@@ -765,11 +765,16 @@
+     binaries = ['python', 'python2.5', 'python2.6', 'python2.7', 'python25', 'python26', 'python27']
+     for binary in binaries:
+         try:
+-            # py-2.4 compatible replacement for shell backticks
+-            output = subprocess.Popen([binary, '--version'], stdout=subprocess.PIPE).communicate()[0]
+-            match = version.search(output)
+-            if match and float(match.group(1)) >= 2.5:
+-                return binary
++            for path in smokeEnv['ENV']['PATH'].split(':'):
++                if os.path.isfile( '%s/%s' % (path, binary) ):
++                    # py-2.4 compatible replacement for shell backticks
++                    out, err = subprocess.Popen([binary, '-V'], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
++                    for stream in (out, err):
++                        match = version.search(stream)
++                        if match:
++                            versiontuple = tuple(map(int, match.group(1).split('.')))
++                            if versiontuple >= (2, 5):
++                                return binary
+         except:
+             pass
+ 
diff --git a/dev-db/mongodb/mongodb-1.8.5.ebuild b/dev-db/mongodb/mongodb-1.8.5.ebuild
new file mode 100644
index 000000000000..13fd21119036
--- /dev/null
+++ b/dev-db/mongodb/mongodb-1.8.5.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.8.5.ebuild,v 1.1 2012/08/20 08:46:47 ultrabug Exp $
+
+EAPI=4
+SCONS_MIN_VERSION="1.2.0"
+
+inherit eutils multilib pax-utils scons-utils user 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
+	mms-agent? ( http://dev.gentoo.org/~ultrabug/20111027-10gen-mms-agent.zip )"
+
+LICENSE="AGPL-3 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mms-agent static-libs v8"
+
+PDEPEND="mms-agent? ( dev-python/pymongo )"
+RDEPEND="!v8? ( =dev-lang/spidermonkey-1.8.2* )
+	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"
+	epatch "${FILESDIR}/${PN}-linux3.patch"
+	epatch "${FILESDIR}/${PN}-1.8.5-fix-smokepy.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"
+
+	use v8 && pax-mark m "${D}"/usr/bin/{mongo,mongod}
+
+	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}
+
+	if use mms-agent; then
+		local MY_PN="mms-agent"
+		local MY_D="/opt/${MY_PN}"
+		insinto ${MY_D}
+		doins "${WORKDIR}/${MY_PN}/"*
+		fowners -R mongodb:mongodb ${MY_D}
+		newinitd "${FILESDIR}/${MY_PN}.initd" ${MY_PN}
+		newconfd "${FILESDIR}/${MY_PN}.confd" ${MY_PN}
+	fi
+}
+
+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}"
+}
diff --git a/dev-db/mongodb/mongodb-2.0.5.ebuild b/dev-db/mongodb/mongodb-2.0.7.ebuild
index f2c8c6f06ae7..f5b44c545f19 100644
--- a/dev-db/mongodb/mongodb-2.0.5.ebuild
+++ b/dev-db/mongodb/mongodb-2.0.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.0.5.ebuild,v 1.3 2012/06/04 06:34:29 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.0.7.ebuild,v 1.1 2012/08/20 08:46:47 ultrabug Exp $
 
 EAPI=4
 SCONS_MIN_VERSION="1.2.0"
@@ -25,8 +25,7 @@ RDEPEND="!v8? ( <dev-lang/spidermonkey-1.8[unicode] )
 	dev-libs/boost
 	dev-libs/libpcre[cxx]
 	net-libs/libpcap
-	app-arch/snappy
-	"
+	app-arch/snappy"
 DEPEND="${RDEPEND}
 	sys-libs/readline
 	sys-libs/ncurses"
@@ -81,6 +80,9 @@ src_install() {
 	newinitd "${FILESDIR}/${PN/db/s}.initd" ${PN/db/s}
 	newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s}
 
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
 	if use mms-agent; then
 		local MY_PN="mms-agent"
 		local MY_D="/opt/${MY_PN}"