net-im/ejabberd: Version bump. Thank Rion for report.

svn path=/; revision=441

1 files changed, 22 insertions, 21 deletions

diff --git a/net-im/ejabberd/ejabberd-2.1.4.ebuild b/net-im/ejabberd/ejabberd-2.1.5.ebuild
index 9c40cd9..fd242ef 100644
--- a/net-im/ejabberd/ejabberd-2.1.4.ebuild
+++ b/net-im/ejabberd/ejabberd-2.1.5.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.3.ebuild,v 1.6 2010/06/07 10:46:06 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.4.ebuild,v 1.5 2010/07/22 15:24:24 pva Exp $
 
 EAPI=3
 
@@ -14,16 +14,16 @@ SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86"
 EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_srl mod_statsdx"
-IUSE="captcha debug ldap odbc pam ssl +web zlib ${EJABBERD_MODULES}"
+IUSE="captcha debug ldap odbc pam +web zlib ${EJABBERD_MODULES}"
 
 DEPEND=">=net-im/jabber-base-0.01
 	>=dev-libs/expat-1.95
-	>=dev-lang/erlang-12.2.5[ssl?]
+	>=dev-lang/erlang-12.2.5[ssl]
 	odbc? ( dev-db/unixODBC )
 	ldap? ( =net-nds/openldap-2* )
-	ssl? ( >=dev-libs/openssl-0.9.8e )
+	>=dev-libs/openssl-0.9.8e
 	captcha? ( media-gfx/imagemagick[truetype,png] )
 	zlib? ( sys-libs/zlib )"
 #>=sys-apps/shadow-4.1.4.2-r3 - fixes bug in su that made ejabberdctl unworkable.
@@ -48,6 +48,13 @@ src_prepare() {
 		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
+		epatch "${FILESDIR}/ejabberd-2.1.4-mod_shared_roster_ldap.patch" #328533
+	fi
+
 	# don't install release notes (we'll do this manually)
 	sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i Makefile.in || die
 	# Set correct paths
@@ -85,9 +92,6 @@ src_prepare() {
 			-i ejabberd.cfg.example || die "Failed to disable mod_irc"
 	fi
 
-	if use mod_srl; then
-		cp "${WORKDIR}"/src/mod_shared_roster_ldap{.{e,h}rl,_helpers.erl} "${S}" || die
-	fi
 }
 
 src_configure() {
@@ -99,7 +103,6 @@ src_configure() {
 		$(use_enable mod_muc) \
 		$(use_enable mod_proxy65) \
 		$(use_enable mod_pubsub) \
-		$(use_enable ssl tls) \
 		$(use_enable web) \
 		$(use_enable odbc) \
 		$(use_enable zlib ejabberd_zlib) \
@@ -202,17 +205,15 @@ pkg_postinst() {
 		ewarn "PLEASE! Run 'etc-update' now!"
 	fi
 
-	if use ssl; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Ejabberd XMPP Server}"
-		install_cert /etc/ssl/ejabberd/server
-		if [[ -e ${EROOT}/etc/jabber/ssl.pem ]]; then
-			ewarn
-			ewarn "The location of SSL certificates has changed. If you are"
-			ewarn "upgrading from ${CATEGORY}/${PN}-2.0.5* or earlier  you might"
-			ewarn "want to move your old certificates from /etc/jabber into"
-			ewarn "/etc/ssl/ejabberd/, update config files and"
-			ewarn "rm /etc/jabber/ssl.pem to avoid this message."
-			ewarn
-		fi
+	SSL_ORGANIZATION="${SSL_ORGANIZATION:-Ejabberd XMPP Server}"
+	install_cert /etc/ssl/ejabberd/server
+	if [[ -e ${EROOT}/etc/jabber/ssl.pem ]]; then
+		ewarn
+		ewarn "The location of SSL certificates has changed. If you are"
+		ewarn "upgrading from ${CATEGORY}/${PN}-2.0.5* or earlier  you might"
+		ewarn "want to move your old certificates from /etc/jabber into"
+		ewarn "/etc/ssl/ejabberd/, update config files and"
+		ewarn "rm /etc/jabber/ssl.pem to avoid this message."
+		ewarn
 	fi
 }