Incorporate fix to 345255 in same patch

(Portage version: 2.2.0_alpha107/cvs/Linux x86_64)

4 files changed, 47 insertions, 42 deletions

diff --git a/net-im/jabberd/ChangeLog b/net-im/jabberd/ChangeLog
index bac061b638e4..f8b6036bbf2f 100644
--- a/net-im/jabberd/ChangeLog
+++ b/net-im/jabberd/ChangeLog
@@ -1,11 +1,13 @@
 # ChangeLog for net-im/jabberd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.128 2012/05/19 14:14:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/ChangeLog,v 1.129 2012/05/19 14:43:37 ssuominen Exp $
 
   19 May 2012; Samuli Suominen <ssuominen@gentoo.org>
   jabberd-1.6.1.1-r1.ebuild, +files/jabberd-1.6.1.1-underlinking.patch:
   Link against -lgcrypt because $(top_builddir)/jabberd/gcrypt_init.c is using
-  function gcry_control() wrt #412871 by Ted Rodgers
+  function gcry_control() wrt #412871 by Ted Rodgers. Link against -lcrypt
+  because otherwise jabberd will fail to start with undefined symbol crypt()
+  wrt #345255 by Emil Wojak.
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> jabberd-1.4.4-r3.ebuild,
   jabberd-1.6.1.1-r1.ebuild:
diff --git a/net-im/jabberd/files/jabberd-1.6.1.1-gnutls2.2.patch b/net-im/jabberd/files/jabberd-1.6.1.1-gnutls2.2.patch
index ebf9eaa6a6c5..80f10f12f8df 100644
--- a/net-im/jabberd/files/jabberd-1.6.1.1-gnutls2.2.patch
+++ b/net-im/jabberd/files/jabberd-1.6.1.1-gnutls2.2.patch
@@ -1,3 +1,5 @@
+http://bugs.gentoo.org/200616
+
 --- jabberd/mio_tls.cc.orig	2008-03-06 10:21:01.669677189 +0100
 +++ jabberd/mio_tls.cc	2008-03-06 10:35:04.744064592 +0100
 @@ -612,7 +612,7 @@
diff --git a/net-im/jabberd/files/jabberd-1.6.1.1-underlinking.patch b/net-im/jabberd/files/jabberd-1.6.1.1-underlinking.patch
index 5626246d291f..dc7e7e88e764 100644
--- a/net-im/jabberd/files/jabberd-1.6.1.1-underlinking.patch
+++ b/net-im/jabberd/files/jabberd-1.6.1.1-underlinking.patch
@@ -1,5 +1,4 @@
-$(top_builddir)/jabberd/gcrypt_init.c is using function gcry_control() so we need to link against -lgcrypt
-
+http://bugs.gentoo.org/345255
 http://bugs.gentoo.org/412871
 
 --- jabberd/Makefile.am
@@ -11,3 +10,14 @@ http://bugs.gentoo.org/412871
 -libjabberd_la_LIBADD = -lexpat $(top_builddir)/jabberd/lib/libjabberdlib.la
 +libjabberd_la_LIBADD = -lexpat -lgcrypt $(top_builddir)/jabberd/lib/libjabberdlib.la
  libjabberd_la_LDFLAGS = @LDFLAGS@ @VERSION_INFO@ -export-dynamic -version-info 2:0:0
+--- jsm/Makefile.am
++++ jsm/Makefile.am
+@@ -6,7 +6,7 @@
+ noinst_HEADERS = jsm.h
+ 
+ libjabberdsm_la_SOURCES = authreg.cc deliver.cc jsm.cc modules.cc offline.cc server.cc sessions.cc serialization.cc users.cc util.cc
+-libjabberdsm_la_LIBADD = $(top_builddir)/jsm/modules/libjabberdsmmods.la $(top_builddir)/jabberd/libjabberd.la
++libjabberdsm_la_LIBADD = $(top_builddir)/jsm/modules/libjabberdsmmods.la $(top_builddir)/jabberd/libjabberd.la -lcrypt
+ libjabberdsm_la_LDFLAGS = @LDFLAGS@ @VERSION_INFO@ -module -version-info 2:0:0
+ 
+ INCLUDES = -I../jabberd -I../jabberd/lib
diff --git a/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild b/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild
index 55d2888263bd..91c4e6f35f88 100644
--- a/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild
+++ b/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild
@@ -1,31 +1,34 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild,v 1.20 2012/05/19 14:14:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd/jabberd-1.6.1.1-r1.ebuild,v 1.21 2012/05/19 14:43:37 ssuominen Exp $
 
-WANT_AUTOMAKE="1.9"
+EAPI=4
+WANT_AUTOMAKE=1.9
 inherit autotools eutils
 
 DESCRIPTION="Open-source Jabber server"
 HOMEPAGE="http://www.jabber.org"
 SRC_URI="http://download.jabberd.org/jabberd14/jabberd14-${PV}.tar.gz"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="alpha amd64 hppa ppc sparc x86 ~x86-fbsd"
 IUSE="ipv6 mysql postgres"
 
-RDEPEND=">=net-im/jabber-base-0.01
+RDEPEND="dev-libs/expat
 	dev-libs/libgcrypt
+	dev-libs/popt
 	>=dev-libs/pth-1.4.0
-	dev-libs/expat
 	net-dns/libidn
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-server )
+	>=net-im/jabber-base-0.01
 	net-libs/gnutls
-	dev-libs/popt"
+	mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql-server )"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	!net-im/jabberd2"
+	!net-im/jabberd2
+	virtual/pkgconfig"
+
+DOCS="mysql.sql pgsql_createdb.sql README* UPGRADE"
 
 S=${WORKDIR}/jabberd14-${PV}
 
@@ -37,24 +40,20 @@ pkg_setup() {
 	fi
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
-
-	#Shamelessly stolen from Freebsd
-	epatch "${FILESDIR}"/${P}-gnutls2.2.patch
-	## Gentoo bug #200616
-	epatch "${FILESDIR}"/${P}-sandbox.patch
-	epatch "${FILESDIR}"/${P}-parallel-make.patch
-	epatch "${FILESDIR}"/${P}-undefineddebug.patch
-	epatch "${FILESDIR}"/${P}-libtool2.2.patch
-	epatch "${FILESDIR}"/${P}-underlinking.patch
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-glibc-2.10.patch \
+		"${FILESDIR}"/${P}-gnutls2.2.patch \
+		"${FILESDIR}"/${P}-sandbox.patch \
+		"${FILESDIR}"/${P}-parallel-make.patch \
+		"${FILESDIR}"/${P}-undefineddebug.patch \
+		"${FILESDIR}"/${P}-libtool2.2.patch \
+		"${FILESDIR}"/${P}-underlinking.patch
 
 	eautoreconf
 }
 
-src_compile() {
+src_configure() {
 	unset LC_ALL LC_CTYPE
 
 	econf \
@@ -63,33 +62,27 @@ src_compile() {
 		$(use ipv6 && echo --enable-ipv6) \
 		$(use_with mysql) \
 		$(use_with postgres postgresql)
-
-	emake || die "emake failed"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	default
 
-	newinitd "${FILESDIR}"/${P}.init jabber || die "newinitd failed"
+	newinitd "${FILESDIR}"/${P}.init jabber
 
 	# net-im/jabber-base provides needed directories
-	rm -rf "${D}/var"
-	mv "${D}/etc/jabber/jabber.xml" "${D}/etc/jabber/jabberd.xml"
-	mv "${D}/etc/jabber/jabber.xml.dist" "${D}/etc/jabber/jabberd.xml.dist"
+	rm -rf "${ED}"/var
+	mv "${ED}"/etc/jabber/jabber.xml "${ED}"/etc/jabber/jabberd.xml
+	mv "${ED}"/etc/jabber/jabber.xml.dist "${ED}"/etc/jabber/jabberd.xml.dist
 
 	sed -i \
 		-e 's,/var/lib/spool/jabberd,/var/spool/jabber,g' \
 		-e 's,/var/lib/log/jabberd,/var/log/jabber,g' \
 		-e 's,/var/lib/run/jabberd,/var/run/jabber,g' \
 		-e 's,jabber.pid,jabberd14.pid,g' \
-		"${D}"/etc/jabber/jabberd.xml{,.dist} \
-		|| die "sed failed"
-
-	dodoc README* mysql.sql pgsql_createdb.sql UPGRADE || die "dodoc failed"
+		"${ED}"/etc/jabber/jabberd.xml{,.dist} || die
 }
 
 pkg_postinst() {
-
 	echo
 	elog 'The various IM transports for jabber are now separate packages,'
 	elog 'which you will need to install separately if you want them:'
@@ -111,6 +104,4 @@ pkg_postinst() {
 	ewarn 'If you wish to continue to use the filespool backend, read'
 	ewarn 'README.filespool.'
 	echo
-	ebeep
-
 }