Version bump, thank krigstask for report. Note, shared roster ldap module (USE=mod_srl) is now included upstream. Drop unused.

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

3 files changed, 15 insertions, 14 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index ed8888350bef..b3c7e739dea9 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-im/ejabberd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.88 2010/11/18 13:26:40 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.89 2010/12/20 13:52:23 pva Exp $
+
+*ejabberd-2.1.6 (20 Dec 2010)
+
+  20 Dec 2010; Peter Volkov <pva@gentoo.org> -ejabberd-2.1.5-r2.ebuild,
+  +ejabberd-2.1.6.ebuild:
+  Version bump, thank krigstask for report. Note, shared roster ldap module
+  (USE=mod_srl) is now included upstream. Drop unused.
 
 *ejabberd-2.1.5-r3 (18 Nov 2010)
 
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index b6b278aa45b9..8c6493a6ac66 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -11,10 +11,11 @@ AUX self-cert-v2.sh 1017 RMD160 3beb0f05e8cc3041abd2f689d31d410bc7d5088d SHA1 1f
 AUX ssl.cnf 1042 RMD160 47d2542942fb21f4be1e827d47eb4e0468e73910 SHA1 7347bae5a195ad158881fe5313f55ee41e85cb81 SHA256 ed066f7720fd9f4c2d57ffb2ebcbc4b2810d2b7ca22b67ec8c1dc1227baaa635
 DIST 2.1.1-mod_statsdx.patch.bz2 13041 RMD160 9cc6d71ff2a2d58b0e377a3facb564d22d46af25 SHA1 4ef326eff97283530ee137613c009fe132312644 SHA256 a290217d7fd2c338d9ddba73e25ee052a3735d7168aafd24750de113f43ebc5f
 DIST ejabberd-2.1.5.tar.gz 2278008 RMD160 7abd6bc4a03f68d03e13ee8c1ff3a5fee6098dc6 SHA1 8966d6752219c9386f48a5b8e1f2f8fb0e7477ae SHA256 31a46228c6933d7c24435753300a4d2ae2e84568a6097175dc5d4e553299dd9d
+DIST ejabberd-2.1.6.tar.gz 2874967 RMD160 9b6ed4986ffcd1ea90d23770e54cb002bc52304c SHA1 a1afbfc270f8e4c945bd91f64b7073781590535b SHA256 b54886b119a0ae9f19c8dd91a18e85e518fbd979d47812bee582e872cfbc3544
 DIST mod_shared_roster_ldap-0.5.1.tgz 607758 RMD160 5669a3d16fbca4d399e85a7d0dfda71643e6e2c7 SHA1 a9498d26e17752b882b3341b633d1804075d74ef SHA256 60e4ba0921d1ac65f9cca04fa2a7a3bbe3a9af52a26ad1a4fca4a3c6f1f0cc19
 DIST mod_shared_roster_ldap-0.5.3.tgz 663731 RMD160 c8905ccffe4bd99f77fe91d583502d0912b9a005 SHA1 5bb1991868341c7cfc995348747c43833820af2b SHA256 9e295065b60e5e37e839f7793503e9ae5e367c0a749e870cbbeeef3ce5609954
-EBUILD ejabberd-2.1.5-r2.ebuild 8304 RMD160 f7cc7d92284137062a7c723fd1b20866c0ec6fb7 SHA1 05025f9f61f58715b39f54e3864bdb144d74f5ee SHA256 97e3c2e59467b7855d89dbbab4234f2b967ce8a12b213332834a764d7e254a5a
 EBUILD ejabberd-2.1.5-r3.ebuild 8385 RMD160 8a69ad070aa0fe0f8fd39ad407a2547f6431af04 SHA1 65caac092cd1d3b2e9077729d79860a4c6d9d94a SHA256 896175067d95c70e5ca4b123ba836bfd0611d28b415a6ca4eecb956364c4f824
 EBUILD ejabberd-2.1.5.ebuild 8374 RMD160 ec4746817be901804b5603cb388ef7ce9cc706ed SHA1 f735ea63d287b35306878db8092b5d2c6aa2349f SHA256 f0a2fd0e5da4306a8be7f8254f5d77dfadc872cb818d8c0202366fbd16ce188f
-MISC ChangeLog 18426 RMD160 fdb8f9a52e3b8ffae315998fd2a0d37ba0650518 SHA1 1ada99f26494a11074761e8710b050c6b45c38e8 SHA256 70ab25e64af1fa7a8286195895a930936d820742a5625219c124523f7b82f7af
+EBUILD ejabberd-2.1.6.ebuild 7959 RMD160 60ee8c906ff0d76385132fe05beb93e6ad05a470 SHA1 db9c8b98f22ac6f13c079c36dab8b7058f8a88f3 SHA256 860d83e4274d42d8d2e5a7ce41f5adc7a43211e12fee0ab48d31a7ac791b9fca
+MISC ChangeLog 18687 RMD160 ac931202c6e6ec900b1d29a0acf2b54486e0c8e7 SHA1 4233f5fab9b3dcd03e059859f9d490512b88732d SHA256 d95c735d225f2fd664f3d3fb3b3a3ddcd637be3bb298971d3db66803b8fca3a0
 MISC metadata.xml 929 RMD160 3a456c8945da34e417ca2fb659807a280b834f85 SHA1 a7b3173f8b63655c049881629e1354c71ddd633e SHA256 4d46909fd72908dff8698bb9dfcf60132e973b28eabbfe75001397ed349ff11b
diff --git a/net-im/ejabberd/ejabberd-2.1.5-r2.ebuild b/net-im/ejabberd/ejabberd-2.1.6.ebuild
index 1ca982cc25af..d8877bcb240e 100644
--- a/net-im/ejabberd/ejabberd-2.1.5-r2.ebuild
+++ b/net-im/ejabberd/ejabberd-2.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.5-r2.ebuild,v 1.1 2010/10/15 17:34:36 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.6.ebuild,v 1.1 2010/12/20 13:52:23 pva Exp $
 
 EAPI=3
 
@@ -9,13 +9,12 @@ inherit eutils multilib pam ssl-cert
 DESCRIPTION="The Erlang Jabber Daemon"
 HOMEPAGE="http://www.ejabberd.im/"
 SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tar.gz
-	mod_statsdx? ( mirror://gentoo/2.1.1-mod_statsdx.patch.bz2 )
-	mod_srl? ( https://alioth.debian.org/frs/download.php/3354/mod_shared_roster_ldap-0.5.3.tgz )"
+	mod_statsdx? ( mirror://gentoo/2.1.1-mod_statsdx.patch.bz2 )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_srl mod_statsdx"
+EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_statsdx"
 IUSE="captcha debug ldap odbc pam +web zlib ${EJABBERD_MODULES}"
 
 DEPEND=">=net-im/jabber-base-0.01
@@ -42,19 +41,12 @@ JABBER_LOG="${EPREFIX}/var/log/jabber"
 JABBER_DOC="${EPREFIX}/usr/share/doc/${PF}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-md2-optional.patch" #331299
 	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"
 	fi
 
-	if use mod_srl; then
-		ewarn "mod_srl is not a part of upstream tarball but is a third-party module"
-		ewarn "taken from here: https://alioth.debian.org/projects/ejabberd-msrl/"
-		cp "${WORKDIR}"/src/mod_shared_roster_ldap{.{e,h}rl,_helpers.erl} "${S}" || die
-	fi
-
 	# don't install release notes (we'll do this manually)
 	sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i Makefile.in || die
 	# Set correct paths
@@ -121,6 +113,7 @@ src_install() {
 	# 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"
 	fi