Version bump and fix see #317531, #318009

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 73 insertions, 3 deletions

diff --git a/dev-db/mongodb/ChangeLog b/dev-db/mongodb/ChangeLog
index a3362c29521f..f205a96cbc92 100644
--- a/dev-db/mongodb/ChangeLog
+++ b/dev-db/mongodb/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-db/mongodb
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.4 2010/03/25 21:32:43 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/ChangeLog,v 1.5 2010/05/21 06:39:57 lu_zero Exp $
+
+*mongodb-1.4.2 (21 May 2010)
+
+  21 May 2010; Luca Barbato <lu_zero@gentoo.org> files/mongodb.initd,
+  +mongodb-1.4.2.ebuild:
+  New version and fix init.d, thanks to Priit Laes <plaes@plaes.org> and
+  Johan Bergström <bugs@bergstroem.nu> for testing in bug #317531 and
+  TANABE Ken-ichi <nabeken@tknetworks.org> for reporting the init.d issue in
+  bug #318009
 
 *mongodb-1.4.0 (25 Mar 2010)
 
diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mongodb.initd
index 9ddd60564688..482e311fcd6b 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
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongodb.initd,v 1.1 2010/03/07 23:39:39 ramereth Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/files/mongodb.initd,v 1.2 2010/05/21 06:39:57 lu_zero Exp $
 
 depend() {
 	need net
@@ -40,6 +40,6 @@ start() {
 
 stop() {
 	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec ${EXEC} --pidfile ${MONGODB_PID_FILE}
+	start-stop-daemon --stop --exec ${MONGODB_EXEC} --pidfile ${MONGODB_PID_FILE}
 	eend $? "Failed to stop ${SVCNAME}"
 }
diff --git a/dev-db/mongodb/mongodb-1.4.2.ebuild b/dev-db/mongodb/mongodb-1.4.2.ebuild
new file mode 100644
index 000000000000..aacb8dd141d2
--- /dev/null
+++ b/dev-db/mongodb/mongodb-1.4.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-1.4.2.ebuild,v 1.1 2010/05/21 06:39:57 lu_zero Exp $
+
+EAPI="2"
+
+inherit eutils versionator
+
+MY_PATCHVER=$(get_version_component_range 1-2)
+MY_P="${PN}-src-r${PV}"
+
+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"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/spidermonkey[unicode]
+	dev-libs/boost
+	dev-libs/libpcre"
+
+DEPEND="${RDEPEND}
+	>=dev-util/scons-1.2.0-r1"
+
+# Must change this on every upgrade
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup mongodb
+	enewuser mongodb -1 -1 /var/lib/${PN} mongodb
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/"${PN}"-"${MY_PATCHVER}"-modify-*.patch
+}
+
+src_compile() {
+	scons ${MAKEOPTS} all || die "Compile failed"
+}
+
+src_install() {
+	scons ${MAKEOPTS} install --prefix="${D}"/usr || die "Install failed"
+
+	for x in /var/{lib,log,run}/${PN}; do
+		dodir "${x}" || die "Install failed"
+		fowners mongodb:mongodb "${x}"
+	done
+
+	doman debian/mongo*.1 || die "Install failed"
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die "Install failed"
+	newconfd "${FILESDIR}/${PN}.confd" ${PN} || die "Install failed"
+}
+
+src_test() {
+	scons ${MAKEOPTS} smoke test || die "Tests failed"
+}