[gentoo-commits] dev/ultrabug:master commit in: dev-db/mongodb/files/, dev-db/mongodb/

["Alexys Jacob" <ultrabug@gentoo.org>]

commit:     d7e66fc7e95962d29b39836af13a04ecf177269f
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 12:36:48 2011 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 12:36:48 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=d7e66fc7

fix init.d and test phase

---
 dev-db/mongodb/Manifest             |    4 ++--
 dev-db/mongodb/files/mongodb.initd  |    2 +-
 dev-db/mongodb/mongodb-1.8.1.ebuild |   15 +++++++--------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 15f2f0a..3734021 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -1,5 +1,5 @@
 AUX mongodb-1.8-fix-scons.patch 1649 RMD160 1e5be2fe75f25c511b1d70dd1dd7977c8f1a6db3 SHA1 1300bbc5ff4f9c4a59e89fb3e119506b3507906d SHA256 5b8db8f66adabbdd52c364a713ce38a937c4ac6282a4ac530d14930d386d582d
 AUX mongodb.confd 246 RMD160 fee0f87d5f6715b237d7195ea6dfd24a50868102 SHA1 dd786ce383ea3a112352f5b48e4948dd3377b009 SHA256 5dd09535664bd7bc9d0e927896f8e768f225c43c1d84bde9812cb36866f1f587
-AUX mongodb.initd 754 RMD160 c63b5ff46124c0fbddcfdf82d9a83cb7a8f529af SHA1 30b33e0ea5affda165eb17f0b4abdd518838f2a5 SHA256 56028d6e9c71781c9e27a0d1240c8c895341fa7893bec745b806c6092a86cd19
+AUX mongodb.initd 738 RMD160 ba740896d73b19544a73d0ffbab3c3849d822692 SHA1 cc5fbd32849cab99e2bb5395ad1229e6087a7a88 SHA256 9247f210bd43f4efd7a8c9b046d6e5f4eeed3acbc736c351f57557277cf71d06
 DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af4365c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d
-EBUILD mongodb-1.8.1.ebuild 2212 RMD160 2aea5d023d13c15ec14835d6371f813ff4e88097 SHA1 54ebbd00e2b5f1bdb5de76c7a71221056079db09 SHA256 9ada9b1b751d53ec8524689a367b193714643adad3a92891581cc8b0d23c8667
+EBUILD mongodb-1.8.1.ebuild 2040 RMD160 2b98f57a23aedfab3f73bb4428d5c238ac5fb77e SHA1 a8560252110fc80122044fe9b009e4425d37b561 SHA256 8908e7fbd1c1855e9f536775baf09ca6ddacbe74ff9c43162958f16444e00b99

diff --git a/dev-db/mongodb/files/mongodb.initd b/dev-db/mongodb/files/mongodb.initd
index f023058..189cfae 100644
--- a/dev-db/mongodb/files/mongodb.initd
+++ b/dev-db/mongodb/files/mongodb.initd
@@ -17,7 +17,7 @@ start() {
 		--bind_ip ${MONGODB_IP:-127.0.0.1} \
 		--port ${MONGODB_PORT:-27017} \
 		--dbpath ${MONGODB_DATA:-/var/lib/mongodb} \
-		--unixSocketPrefix /var/run/${SVCNAME}.sock \
+		--unixSocketPrefix /var/run \
 		--logappend --logpath /var/log/mongodb/${SVCNAME}.log \
 		${MONGODB_OPTIONS}
 	eend $?

diff --git a/dev-db/mongodb/mongodb-1.8.1.ebuild b/dev-db/mongodb/mongodb-1.8.1.ebuild
index 9cdc7c1..228c419 100644
--- a/dev-db/mongodb/mongodb-1.8.1.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.1.ebuild
@@ -1,13 +1,12 @@
 # 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.0.ebuild,v 1.2 2011/02/02 18:14:42 phajdan.jr Exp $
+# $Header: $
 
 EAPI=3
 
 inherit eutils multilib versionator
 
-MY_PATCHVER=$(get_version_component_range 1-2)
-MY_P="${PN}-src-r${PV}"
+MY_P="${PN}-src-r${PV/_rc/-rc}"
 
 DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
 HOMEPAGE="http://www.mongodb.org"
@@ -73,15 +72,15 @@ src_install() {
 	newconfd "${FILESDIR}/${PN}.confd" ${PN} || die "Install failed"
 }
 
-# FIXME: test phase depends on pymongo which is not in tree
-# src_test() {
-	#scons ${scons_opts} smoke --smokedbprefix='testdir' test || die "Tests failed"
-# }
+src_test() {
+	scons ${scons_opts} test || die "Build test failed"
+	${S}/test --dbpath=unittest || die "Tests failed"
+}
 
 pkg_postinst() {
 	if [ ${PREVIOUS_LESS_THAN_1_8} -eq 0 ]; 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 set as default, see ${CONFDIR}/${PN}."
+	elog "Journaling is now enabled by default, see /etc/conf.d/${PN}.conf"
 }
\ No newline at end of file