Version bump and fix see #317531, #318009

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

4 files changed, 77 insertions, 15 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/Manifest b/dev-db/mongodb/Manifest
index cd05b03b29ab..57924ec1716d 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,24 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX mongodb-1.2-modify-post-strip.patch 456 RMD160 dae0e77c3e6e0bb867b972586a907b438b2f9de8 SHA1 5021957e1165b897e3ec74d1d8b2d4d81f66809e SHA256 85f6c2eacdacc316c7ebb5ce373da7593daf32b097435c1deb2516a600f69ca3
 AUX mongodb-1.2-modify-testing.patch 1480 RMD160 3a9f0814141d55fccf41d45d9d376fefad273322 SHA1 18fb11b60afdbc489788ff9cb315700067a99807 SHA256 40646380a5ef57a3d92a7db9b606932f681432beb3054d885e7c5778f533470d
 AUX mongodb-1.4-modify-post-strip.patch 600 RMD160 bf952ef7d985d31a769d121257ba5f62411e2548 SHA1 a11eb89aaa9e63a0ed1cca1b00dc1525ccc3fafc SHA256 cac8a7f7fc5ffad038e63e9333bffe7eba63f84774aae6c286ffa7084cb5c584
 AUX mongodb-1.4-modify-testing.patch 1740 RMD160 d088dd48d5e50c497ff0e46bd7175d53e7466e75 SHA1 7226248469498a9c3589b66fd7ef5b224a8e4a47 SHA256 e1f72cd97f69ec9241e38b4efd3380e068ee081e3e45116163cbbe6f55b89798
 AUX mongodb.confd 285 RMD160 cc5e3ab24a9880a19392a7416d23d1ae7a328e11 SHA1 7c4b720ea5b0afd2fa88a6adc2d8a2e356691413 SHA256 8dfedbb433e11f8ed6ec8159ed5c02f94c22f86006cda21f0b2bb59ebe50b2ad
-AUX mongodb.initd 1122 RMD160 126440360297ead030587bd328f040f0bb22e89c SHA1 0e94859933e60a9e75d11abee3d74ea191eeef94 SHA256 aa729ef902bd174039a168b7617046ce9db601917f0d606e1fe41e8cc0fefe12
+AUX mongodb.initd 1129 RMD160 92a89d9d71ffcdaba8f86f1a2902abddc9866147 SHA1 2c83bfe4c5728ffc8b3dc37fd8d345d09c13f6b0 SHA256 c318a8ca1fe83c59df759b2c70e0e0c22fe38cae49de6dbd1afa8399ef626e6a
 DIST mongodb-1.2.2.tar.gz 3876370 RMD160 f78d9145e9fa4aff69af872f89548baebc364d3c SHA1 a95c2c419a314c603a189cb7fab393d1c46357b3 SHA256 2c25c3db9bce1d78c36bbba0dde05a0dceb0133eda6036131bf3e8dec59c2148
 DIST mongodb-src-r1.2.4.tar.gz 3879698 RMD160 1d2e9f629cb2af620f0543138773d744817657b2 SHA1 a3d09fea3ac5bde7955520d99fe546e102ac6474 SHA256 8ebeca780d461c9a525230f4ef7321f07753cfebc21f0051be2d430cc99a605d
 DIST mongodb-src-r1.4.0.tar.gz 1184638 RMD160 33e6ef5b7c301bcabdfc4cce325c50f51a324ccd SHA1 c89ad3b5074b8f739ffaf42ae0f26bc56e482449 SHA256 2a3a9e9a7267aadcc730a6b1010894df9397fb5d19c29010fdc2de95ef5b31cb
+DIST mongodb-src-r1.4.2.tar.gz 1186185 RMD160 55ad90bb622899555bbecfc41e5e483be354c635 SHA1 cf293d084b89bf93ef3b44b528adb2b4f55ed4d1 SHA256 cb75d668e36e51904aec4f1d65d835ffb78a54a8d929376c5bdebbefddf87fc0
 EBUILD mongodb-1.2.2.ebuild 1920 RMD160 32da0cf9cb8ac043d2320f8b533de81cab78721e SHA1 d11e28e89bf3f31bb3d0a17c2fe04dae33d4bf8b SHA256 3c61dfe675fe488a68b2cc7a0adf14353284d555884d533d29d22186c07ce599
 EBUILD mongodb-1.2.4.ebuild 1468 RMD160 8b4c0cea708bd4b92182aafda62f5c7d4440f0a2 SHA1 a5ae5c825acf2bf1aaba014c7685a283ebde7630 SHA256 10d1fd69543f14b20f68edad91c7e9444cca20b5b394487fe5fbb4f7e8df4c47
 EBUILD mongodb-1.4.0.ebuild 1468 RMD160 f2ffb7aaa117688d23a8a69e9e3817fa514f1334 SHA1 33ba6b0da2f34f5c99c9a50de1eb7e6658dd83d9 SHA256 4640a9c36827c51458695a7341d24516c543e6e6c40d885c9940f1799868c451
-MISC ChangeLog 1408 RMD160 386297e78e3f355e39716a76f13bed721d00f139 SHA1 410cd2735db6420998744ff15f787971ebf573f3 SHA256 7a9dc84ab493da443e732637811935149bb2952293352ad236565aae3ff7c4be
+EBUILD mongodb-1.4.2.ebuild 1467 RMD160 a13017bcb8a08ab86605bc88c8f2090f67cf7416 SHA1 177a96ade2d9dbcd9708ece11c16c425c41ea81d SHA256 24bef7f4fafd6547efa59f0f227b8017d028e2e81392a1ebc706a2454544eb17
+MISC ChangeLog 1768 RMD160 a8ac29fa56c14df9e115e26bec13fea58fa3ccc9 SHA1 a331e0fc4886d918f05c2c84315cda3285bf41aa SHA256 28f8f6d1c8033e76f8449ec98cc24dbeabceb53f6bb0ea235fb866c5321aee47
 MISC metadata.xml 635 RMD160 bb97e8619fb57142f8db034825c42e8823ee6fe8 SHA1 25225f273ee43265bd0f197d312124aa5ccd367d SHA256 a2325296197e68e77ef96c3754baaebc24b40d2d7f90093cdd0e625e503447f4
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iD8DBQFLq9XTQW+hXSf0t0IRAhkOAKCd5uRLC7riTMEkn+ewPuu29K7MIQCg5NOw
-qD+XejeSEvfZ3ACr2LB1Ke8=
-=hKdt
------END PGP SIGNATURE-----
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"
+}