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

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

commit:     c3c000cd2ea38e8c691ff80e0c45d7306130312d
Author:     Ultrabug <ultrabug <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 16:44:03 2011 +0000
Commit:     Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 16:44:03 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=c3c000cd

adapt ebuild to EAPI4, thx to scarabeus

---
 dev-db/mongodb/Manifest             |    2 +-
 dev-db/mongodb/mongodb-1.8.1.ebuild |   27 +++++++++++----------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 5cf9648..f3b6b39 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -4,4 +4,4 @@ AUX mongodb.initd 921 RMD160 e26c0e82708bc05b8c5ae85212f6bba1f4799160 SHA1 c542e
 AUX mongos.confd 261 RMD160 cd0164a9f54d53871a5a15ea15034479e9360d1d SHA1 193e29ae8a33dbd6490698955e6e36601a395c4b SHA256 56b63b536e2e0482972efb1505d3a661511dc9ed5872c12933a141470f1923a8
 AUX mongos.initd 1079 RMD160 fa4b71d2c5accdb988d7b8b04e934c8b9114dd6c SHA1 d09b7834e9b59720c5fa972ad4c730693f978bdd SHA256 c80f43e0dac94524d818615425204b11b234c54a8e8017afdad9459a210216a2
 DIST mongodb-src-r1.8.1.tar.gz 1718969 RMD160 e8739fd15c40eac9934045af4365c13f204d16fe SHA1 615cfe4ace4899e73a7083059c7178d8f5c19f03 SHA256 8b268b4f8c4d055c74add1fc995f103d893657c4291964d370899ebefd0bc97d
-EBUILD mongodb-1.8.1.ebuild 2003 RMD160 b895a18de96de43c058aa36a145cb38cd3bf4bc9 SHA1 bdfdd377c9d9dc4c63e6e0831a1e3fe9bdc99c99 SHA256 1715b97976585a6b522e459285d9ed3792036a7911a302f850f8c6276526d6bd
+EBUILD mongodb-1.8.1.ebuild 1857 RMD160 7b51ba844e83325e78f923cc15fd87fe2cf29d9c SHA1 9536bd71d98b7ea62bfe79d753caa4ad3efec224 SHA256 57caf6c7853b7dff092d77636be49633d847e01d8c671a72a11b6a4c875619f7

diff --git a/dev-db/mongodb/mongodb-1.8.1.ebuild b/dev-db/mongodb/mongodb-1.8.1.ebuild
index 768dde1..adcc4da 100644
--- a/dev-db/mongodb/mongodb-1.8.1.ebuild
+++ b/dev-db/mongodb/mongodb-1.8.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 SCONS_MIN_VERSION="1.2.0"
 
 inherit eutils multilib scons-utils versionator
@@ -46,40 +46,35 @@ src_prepare() {
 }
 
 src_compile() {
-	escons ${scons_opts} all || die
-}
-
-pkg_preinst() {
-	has_version '<dev-db/mongodb-1.8'
-	PREVIOUS_LESS_THAN_1_8=$?
+	escons ${scons_opts} all
 }
 
 src_install() {
-	escons ${scons_opts} --full --nostrip install --prefix="${D}"/usr || die
+	escons ${scons_opts} --full --nostrip install --prefix="${D}"/usr
 
 	use static-libs || rm "${D}/usr/$(get_libdir)/libmongoclient.a"
 
 	for x in /var/{lib,log,run}/${PN}; do
-		keepdir "${x}" || die
+		keepdir "${x}"
 		fowners mongodb:mongodb "${x}"
 	done
 
-	doman debian/mongo*.1 || die
+	doman debian/mongo*.1
 	dodoc README docs/building.md
 
-	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
-	newconfd "${FILESDIR}/${PN}.confd" ${PN} || die
-	newinitd "${FILESDIR}/${PN/db/s}.initd" ${PN/db/s} || die
-	newconfd "${FILESDIR}/${PN/db/s}.confd" ${PN/db/s} || die
+	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}
 }
 
 src_test() {
-	escons ${scons_opts} test || die
+	escons ${scons_opts} test
 	"${S}"/test --dbpath=unittest || die
 }
 
 pkg_postinst() {
-	if [ ${PREVIOUS_LESS_THAN_1_8} -eq 0 ]; then
+	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