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

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

3 files changed, 16 insertions, 12 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/Manifest b/net-im/ejabberd/Manifest
index c19ad2fee7ca..3168264881ed 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -17,6 +17,6 @@ DIST ejabberd-mod_statsdx-1080.patch.gz 14024 RMD160 eb40aa4c3b7b4529a317c8b521a
 DIST mod_shared_roster_ldap-0.5.1.tgz 607758 RMD160 5669a3d16fbca4d399e85a7d0dfda71643e6e2c7 SHA1 a9498d26e17752b882b3341b633d1804075d74ef SHA256 60e4ba0921d1ac65f9cca04fa2a7a3bbe3a9af52a26ad1a4fca4a3c6f1f0cc19
 EBUILD ejabberd-2.1.5.ebuild 8363 RMD160 7c23c35b3d3f41bb7e8947d7b5d37ab12dc480c6 SHA1 cfa596018e4b544dfb6c52dc1d5defb834822bbe SHA256 cb106a14aab74f7009433707713c3a77b5640cbcb0abb2d2f345ce84c4666581
 EBUILD ejabberd-2.1.6.ebuild 7948 RMD160 1c205869f9ef0639f56c32f18aeb5bf271153f8c SHA1 10d11a34ff6675dc1d7761bc3b72f73479a6e6db SHA256 c2ca8d8730e3326fc7b5ab6de5ddfbf09dd87bb2dd00d49cd6bcea4e400dbfe4
-EBUILD ejabberd-2.1.8.ebuild 8104 RMD160 912038ad701a33538a8377c3a2364d8edbae5ac3 SHA1 89fe421b4a03969cded681eb4a89fd3ae67ea212 SHA256 61f7575e9e6260894d4bb351f25a074471213a91cb72c87bb28d29ddc67ba8c2
-MISC ChangeLog 19560 RMD160 f7b5b02a3c1339a0a11b3738042d74de7f3cc550 SHA1 551325ee20b3d4e3ca1fb977efec3aada77d1982 SHA256 7d0686e5c37b582841a8355efb484de3fb8cc64ebcec268f524c74d51f7a3b7e
+EBUILD ejabberd-2.1.8.ebuild 7920 RMD160 c20d7552109128b6be419e01a6c4a381685715ee SHA1 36efebb64b49a773832f187377807482b3209e4a SHA256 8ac922c77c61bd4366d95be4d70b8a6ffd95ef6c20029cb3768c0fdfc27907fd
+MISC ChangeLog 19738 RMD160 b9855d3498f0003d55aac38f3fae5b2165e3134c SHA1 d7170dc3a0110b67b8387fd59dde268114a1a9de SHA256 6f15e4b867f931e9e4eeed5ee9aa34ad386c9d3d2fa2c49276021c0f2c9c8209
 MISC metadata.xml 929 RMD160 3a456c8945da34e417ca2fb659807a280b834f85 SHA1 a7b3173f8b63655c049881629e1354c71ddd633e SHA256 4d46909fd72908dff8698bb9dfcf60132e973b28eabbfe75001397ed349ff11b
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() {