ejabberd: more patch for new release

3 files changed, 34 insertions, 16 deletions

diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 775f201a..917c7870 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -14,13 +14,13 @@ EBUILD ejabberd-1.1.1-r1.ebuild 3886 RMD160 688617ec68dd542758b695d18d57c6d123c5
 MD5 151e7780af1a89705e11cdae74358821 ejabberd-1.1.1-r1.ebuild 3886
 RMD160 688617ec68dd542758b695d18d57c6d123c5e2f7 ejabberd-1.1.1-r1.ebuild 3886
 SHA256 04236fb5a30476d6b05bbfc8be4e0eb4abad407194204fa8729f3481c0e4bd53 ejabberd-1.1.1-r1.ebuild 3886
-EBUILD ejabberd-1.1.2.ebuild 3530 RMD160 fb69bcbe66a3865e20f28e0300b9c58b6cf16a7d SHA1 f40af4462e3dd89739b040b2531836071db0b618 SHA256 1fd15fedb7568f728ef05d680ce44cc0312eaccc6239a08e3dde9248bf7b7260
-MD5 a7f6a322b75ed777a19f04b42943379b ejabberd-1.1.2.ebuild 3530
-RMD160 fb69bcbe66a3865e20f28e0300b9c58b6cf16a7d ejabberd-1.1.2.ebuild 3530
-SHA256 1fd15fedb7568f728ef05d680ce44cc0312eaccc6239a08e3dde9248bf7b7260 ejabberd-1.1.2.ebuild 3530
+EBUILD ejabberd-1.1.2.ebuild 3886 RMD160 688617ec68dd542758b695d18d57c6d123c5e2f7 SHA1 42051242370093ccff3ecd35fcfa4bda4140ddd3 SHA256 04236fb5a30476d6b05bbfc8be4e0eb4abad407194204fa8729f3481c0e4bd53
+MD5 151e7780af1a89705e11cdae74358821 ejabberd-1.1.2.ebuild 3886
+RMD160 688617ec68dd542758b695d18d57c6d123c5e2f7 ejabberd-1.1.2.ebuild 3886
+SHA256 04236fb5a30476d6b05bbfc8be4e0eb4abad407194204fa8729f3481c0e4bd53 ejabberd-1.1.2.ebuild 3886
 MD5 6bf0894f239498e7a5bdbaac771cdc75 files/digest-ejabberd-1.1.1-r1 723
 RMD160 d2d272d4488b3eec4fc58eeb9449396f29d783c0 files/digest-ejabberd-1.1.1-r1 723
 SHA256 f57333e151bec1d584876aade6dc4fec76e8deffdd240d7aa2d2ec947d6dbba8 files/digest-ejabberd-1.1.1-r1 723
-MD5 a38033cd51c7bb84bc09310952063222 files/digest-ejabberd-1.1.2 244
-RMD160 d8117ebc19953eb40137b4ebca37d7577ff9e5b6 files/digest-ejabberd-1.1.2 244
-SHA256 e1ff34ed81425e1b009e60d29d7f6b9bdeff7cdba4407372cfdb8e40ca00efcb files/digest-ejabberd-1.1.2 244
+MD5 f10adb4f04e5543f5410c8a2e1081c96 files/digest-ejabberd-1.1.2 723
+RMD160 7eeb128a9c425adfe020101bef8a0278e1bd0211 files/digest-ejabberd-1.1.2 723
+SHA256 811fc4d85d4bcd926bdce37a5ecade163afb5b14663d747842375c8ffdc5100d files/digest-ejabberd-1.1.2 723
diff --git a/net-im/ejabberd/ejabberd-1.1.2.ebuild b/net-im/ejabberd/ejabberd-1.1.2.ebuild
index d7ec432f..586f4fce 100644
--- a/net-im/ejabberd/ejabberd-1.1.2.ebuild
+++ b/net-im/ejabberd/ejabberd-1.1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.1.ebuild,v 1.2 2006/08/01 04:26:09 tsunam Exp $
 
-inherit eutils multilib ssl-cert versionator
+inherit eutils multilib ssl-cert versionator autotools
 
 JABBER_ETC="/etc/jabber"
 JABBER_RUN="/var/run/jabber"
@@ -11,34 +11,45 @@ JABBER_LOG="/var/log/jabber"
 
 DESCRIPTION="The Erlang Jabber Daemon"
 HOMEPAGE="http://ejabberd.jabber.ru/"
-SRC_URI="http://process-one.net/en/projects/${PN}/download/${PV}/${P}.tar.gz"
+SRC_URI="http://process-one.net/en/projects/${PN}/download/${PV}/${P}.tar.gz
+	pam? ( http://beber.meleeweb.net/jabber/check_pam.diff.gz )
+	mod_presence? ( http://www.goryachev.org/jabber/mod_presence-0.0.3.tar.gz )"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~amd64"
-IUSE="mod_irc mod_muc mod_pubsub mod_presence ldap odbc web"
+IUSE="mod_archive mod_irc mod_muc mod_pubsub mod_presence ldap odbc pam web"
 
 DEPEND=">=net-im/jabber-base-0.01
 	>=dev-libs/expat-1.95
 	>=dev-lang/erlang-10.2.0
 	odbc? ( dev-db/unixODBC )
-	ldap? ( =net-nds/openldap-2* )"
+	ldap? ( =net-nds/openldap-2* )
+	pam? ( sys-libs/pam)"
+RESTRICT="nomirror"
 
 PROVIDE="virtual/jabber-server"
 S=${WORKDIR}/${P}/src
 
-RESTRICT="nomirror"
-
 src_unpack() {
 	unpack ${A}
+	cd ${S}
 
 	if use mod_presence; then
-		cd ${S}/..
-		gunzip ${FILESDIR}/mod_presence.diff.gz -c > mod_presence.diff
-		epatch mod_presence.diff
+		epatch ${WORKDIR}/mod_presence/mod_presence.diff
+		cp -r ${WORKDIR}/mod_presence/pixmaps .
+	fi
+
+	if use pam; then
+		patch -p0 < ${WORKDIR}/check_pam.diff
+	fi
+
+	if use mod_archive; then
+		cp ${FILESDIR}/mod_archive.erl .
 	fi
 }
 
 src_compile() {
+	eautoconf
 	econf ${myconf}                              \
 		$(use_enable mod_irc)                \
 		$(use_enable ldap eldap)             \
@@ -47,6 +58,7 @@ src_compile() {
 		$(use_enable ssl tls)                \
 		$(use_enable web)                    \
 		$(use_enable odbc)                   \
+		$(use_enable mod_presence)			 \
 		|| die "econf failed"
 
 	emake || die "compiling ejabberd core failed"
diff --git a/net-im/ejabberd/files/digest-ejabberd-1.1.2 b/net-im/ejabberd/files/digest-ejabberd-1.1.2
index b8c170f8..2e59e9e3 100644
--- a/net-im/ejabberd/files/digest-ejabberd-1.1.2
+++ b/net-im/ejabberd/files/digest-ejabberd-1.1.2
@@ -1,3 +1,9 @@
+MD5 6b78cb824b35a7f651ab33790cf841c7 check_pam.diff.gz 3865
+RMD160 86d6ff263d216c63662ef1078f947f9f7a6c1fce check_pam.diff.gz 3865
+SHA256 c474adefeefd6e2d18fff531dc4c2f3c149ba003dbd606655656a95ca72ee62a check_pam.diff.gz 3865
 MD5 5b947e19e18a6b554bf31d1c95176eb6 ejabberd-1.1.2.tar.gz 836240
 RMD160 e763752e6c5fb46c51b71e265ab2ceda6d043a0d ejabberd-1.1.2.tar.gz 836240
 SHA256 029129a6bcb5d15dbccc5aa756f61c52692eb6882ec7aad0193aa940b6a20bb6 ejabberd-1.1.2.tar.gz 836240
+MD5 fa9a979f5e3530a2b3143416934d989b mod_presence-0.0.3.tar.gz 51392
+RMD160 adb6444dcef2fead52c1510fc247f7af20aa62c7 mod_presence-0.0.3.tar.gz 51392
+SHA256 5fc2a97576f33965d07bb1f803a8fe48647479da37cd58333aea6a7e48ebc4a1 mod_presence-0.0.3.tar.gz 51392