Fix build issue with mod_stasdx, thank andreas schürch for rerport in bug #370201. Use EAPI=4 features.

(Portage version: 2.1.10.3/cvs/Linux x86_64)

2 files changed, 14 insertions, 10 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index d27ff42185ac..6305d1ac4505 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/ejabberd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.94 2011/06/14 11:42:16 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.95 2011/06/16 05:02:12 pva Exp $
+
+  16 Jun 2011; Peter Volkov <pva@gentoo.org> ejabberd-2.1.8.ebuild:
+  Fix build issue with mod_stasdx, thank andreas schürch for rerport in bug
+  #370201. Use EAPI=4 features.
 
 *ejabberd-2.1.8 (14 Jun 2011)
 
diff --git a/net-im/ejabberd/ejabberd-2.1.8.ebuild b/net-im/ejabberd/ejabberd-2.1.8.ebuild
index 5258d77b1145..f585f6adc79f 100644
--- a/net-im/ejabberd/ejabberd-2.1.8.ebuild
+++ b/net-im/ejabberd/ejabberd-2.1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.8.ebuild,v 1.1 2011/06/14 11:42:16 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.8.ebuild,v 1.2 2011/06/16 05:02:12 pva Exp $
 
 EAPI=4
 
@@ -43,7 +43,7 @@ src_prepare() {
 	if use mod_statsdx; then
 		ewarn "mod_statsdx is not a part of upstream tarball but is a third-party module"
 		ewarn "taken from here: http://www.ejabberd.im/mod_stats2file"
-		epatch "${WORKDIR}/2.1.1-mod_statsdx.patch"
+		epatch "${WORKDIR}/ejabberd-mod_statsdx-1080.patch"
 	fi
 
 	# don't install release notes (we'll do this manually)
@@ -102,26 +102,26 @@ src_configure() {
 }
 
 src_compile() {
-	emake $(use debug && echo debug=true ejabberd_debug=true) || die "compiling ejabberd core failed"
+	emake $(use debug && echo debug=true ejabberd_debug=true)
 }
 
 src_install() {
-	emake DESTDIR="${ED}" install || die "install failed"
+	emake DESTDIR="${ED}" install
 
 	# Pam helper module permissions
 	# http://www.process-one.net/docs/ejabberd/guide_en.html
 	if use pam; then
 		pamd_mimic_system xmpp auth account || die "Cannot create pam.d file"
-		fowners root:jabber "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam" || die
-		fperms 4750 "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam" || die "Cannot adjust epam permissions"
+		fowners root:jabber "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam"
+		fperms 4750 "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam"
 	fi
 
 	cd "${WORKDIR}/${P}/doc"
-	dodoc "release_notes_${PV%%_rc*}.txt" || die
+	dodoc "release_notes_${PV%%_rc*}.txt"
 
 	#dodir /var/lib/ejabberd
-	newinitd "${FILESDIR}/${PN}-3.initd" ${PN} || die "Cannot install init.d script"
-	newconfd "${FILESDIR}/${PN}-3.confd" ${PN} || die "Cannot install conf.d file"
+	newinitd "${FILESDIR}/${PN}-3.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}-3.confd" ${PN}
 }
 
 pkg_postinst() {