Add parallel make patch per 225565

Package-Manager: portage-2.1.5.2

4 files changed, 229 insertions, 2 deletions

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index d467f0992212..663d7ecdb22f 100644
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/ejabberd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.41 2008/07/19 12:16:12 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.42 2008/07/19 12:22:53 caleb Exp $
+
+*ejabberd-2.0.1_p2-r1 (19 Jul 2008)
+
+  19 Jul 2008; Caleb Tennis <caleb@gentoo.org>
+  +files/2.0.1-parallel-make.patch, +ejabberd-2.0.1_p2-r1.ebuild:
+  Add parallel make patch per 225565
 
   19 Jul 2008; Caleb Tennis <caleb@gentoo.org> ejabberd-2.0.1_p2.ebuild:
   amd64 stable per #231676
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 609fd56fdc1e..38b654b5814b 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -2,6 +2,7 @@ AUX 1.1.4-missing-declaration.patch 411 RMD160 f314900dd00fd23c9043cb5a60982448c
 AUX 2.0.0-ejab-542-mod_proxy65.patch 598 RMD160 bfe11518b5dbfcfb64c7bb04be965d2e383c2d90 SHA1 9161450bf883209f4c2ff2c061f94ef401e4fa51 SHA256 80ce546763de423430efcb60376ff2fda1fcd15ab7b80003ef5d7380a1a4caa3
 AUX 2.0.0-erlang12-s2s-in.patch 1164 RMD160 5bcb04354c02749cdec302dc30354a49872ef2f5 SHA1 c27402b062b58ecf74c9e8c0cf2e879dbe600656 SHA256 ebc66c2a507e39f7f794b32f91148ea5e8c34e46ad41b4b876983da4aa9c1342
 AUX 2.0.0-missing-declaration.patch 411 RMD160 f314900dd00fd23c9043cb5a60982448c39d2fa9 SHA1 687066247c9ad74c4e9ec869a9f4f0d9e80bae6d SHA256 1c32a57f4f187d55b28b240820875fcd3e731f6d91cd9429d14c318222f07e7b
+AUX 2.0.1-parallel-make.patch 1537 RMD160 07b25c053ba74d1a4b924709d0c7ccc0ecaf39e2 SHA1 c03051d8180efb91228e52b881dbf7ae2cb473f5 SHA256 6c40029f740d8ea871b8e2b7bc8de6dfbae134b3a4208bd5a678b6af03c73335
 AUX ejabberd 355 RMD160 bf400cf3a84169a79797db9228ad102d93c9147b SHA1 83bae90f0e211f6e59c96dd6ce419a4c0bcdd3d9 SHA256 1f2254ce2835a986eb75adaf5602d1cb74ced989c2360331822a2c5e11c9837b
 AUX ejabberd-1.1.1-r1.initd 1401 RMD160 7513d6b71200591a3266e9355505f0b715879ca8 SHA1 14624338a1520291cd08bf0044d3a8845fefd796 SHA256 a69e65d6ec26ed2af1e8cda83493e0a2a652b165560317bf6679fbc97d83db49
 AUX ejabberd-1.1.1.confd 772 RMD160 e250deb4895d02637043877b5f17db447488da0d SHA1 4a716be46619efb4ee40810cbcc11ab191a583de SHA256 61e329a57da720527101a0db42d0ac3ec31d908039b445a1d9e90df5b1195135
@@ -27,6 +28,7 @@ DIST ejabberd-2.0.1_2.tar.gz 1054739 RMD160 a5561a6c508bbb9846a351189ed5aad2f5fb
 EBUILD ejabberd-1.1.4-r1.ebuild 3454 RMD160 b6f24b03584ad7ef7ea4e02961acbd29d3064a97 SHA1 38254b06eeb5eb87306718b39cde50e1c7990cca SHA256 4fb8f36dbca8d5f422e7b6a8a049af86c5d1c262f753453eeccd65a178ff109b
 EBUILD ejabberd-1.1.4.ebuild 3395 RMD160 1c283f5b60c0ee8b31d279737769f2d7228469a6 SHA1 847dababa185b3fdc74035ecf24096576b71ba0a SHA256 177ecebf528b074651803eb88655123c4b33d1214179b00daba7a8245a5493a1
 EBUILD ejabberd-2.0.0-r1.ebuild 4781 RMD160 3c3621878d7f888e9eccff0ebc27d442f5aa84b0 SHA1 57dcce862e445b6a6e30c9439988de2b0123ebc5 SHA256 02844709eaeba7a30420e7874864d477b0b9b6b92034d9a1b912e84de78fce27
+EBUILD ejabberd-2.0.1_p2-r1.ebuild 4891 RMD160 8ee0b50f7977ab074580555794a53bbbe4b8b09d SHA1 3b8b5932ac4588fbac80d9929c1f60a3495d68d8 SHA256 2114356e500ac6b2cbd09426532d60af05d6fd758892aba5770082999109d277
 EBUILD ejabberd-2.0.1_p2.ebuild 4822 RMD160 c1708bca39102ce036b522e8100c521bc042ef57 SHA1 127eec8c320a936054ffd958c724d687dcf9e690 SHA256 a90289e6262c43e238896762585b45ffe65333edfdeff4207fc8a3210f9d8e33
-MISC ChangeLog 8777 RMD160 a0f2f4606a852d94318d31c6b25b4c7277923148 SHA1 11c73b55fe73c5ffe51c184e32cead0f1aca094d SHA256 509a6a3fc189d9bdce35653d0106378d00ef14229d77c73e7df61e123306fa74
+MISC ChangeLog 8965 RMD160 325a316bff3eb3d4c61170084e81dcebef9ad71c SHA1 f9b2b52117fc679eaf49884eae4cd059e40bf8f8 SHA256 016e4ed223c68bd48b80c59d0780c7b7e68753046da8dd83c59fb6eeec83683a
 MISC metadata.xml 380 RMD160 263fa813b6c2ff8d7c50f08865fe3bdabbcaf013 SHA1 a7ff13422ec7f99adbacfb3e7fc7eb3aca1288e2 SHA256 cb114a6c8c357b6b7bc48bde4c85308a330ab3323239df2bb822269182c71bcd
diff --git a/net-im/ejabberd/ejabberd-2.0.1_p2-r1.ebuild b/net-im/ejabberd/ejabberd-2.0.1_p2-r1.ebuild
new file mode 100644
index 000000000000..f439a39d0767
--- /dev/null
+++ b/net-im/ejabberd/ejabberd-2.0.1_p2-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.0.1_p2-r1.ebuild,v 1.1 2008/07/19 12:22:53 caleb Exp $
+
+inherit eutils multilib
+
+JABBER_ETC="/etc/jabber"
+JABBER_RUN="/var/run/jabber"
+JABBER_SPOOL="/var/spool/jabber"
+JABBER_LOG="/var/log/jabber"
+
+MY_PV=${PV/_p2/}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="The Erlang Jabber Daemon"
+HOMEPAGE="http://www.ejabberd.im/"
+SRC_URI="http://process-one.net/en/projects/${PN}/download/${MY_PV}/${P/p/}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug mod_irc mod_muc mod_pubsub ldap odbc pam ssl web zlib"
+
+DEPEND=">=net-im/jabber-base-0.01
+	>=dev-libs/expat-1.95
+	>=dev-lang/erlang-11.2.5
+	odbc? ( dev-db/unixODBC )
+	ldap? ( =net-nds/openldap-2* )
+	ssl? ( >=dev-libs/openssl-0.9.8e )
+	zlib? ( sys-libs/zlib )"
+
+PROVIDE="virtual/jabber-server"
+S=${WORKDIR}/${MY_P}/src
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Bug #171427
+	epatch "${FILESDIR}/2.0.0-missing-declaration.patch"
+
+	# Bug #225565
+	epatch "${FILESDIR}/2.0.1-parallel-make.patch"	
+
+	# get rid of the prefix
+	sed -i -e "s/\\@prefix\\@//" "${S}/Makefile.in" \
+		|| die "cannot sed Makefile.in"
+	# we want ejabberdctl in /usr/sbin not /sbin !!!
+	sed -i -e "s/\\/sbin/\\/usr\\/sbin/" "${S}/Makefile.in" \
+		|| die "cannot sed Makefile.in"
+}
+
+src_compile() {
+		econf --prefix=/ \
+		$(use_enable mod_irc) \
+		$(use_enable ldap eldap) \
+		$(use_enable mod_muc) \
+		$(use_enable mod_pubsub) \
+		$(use_enable ssl tls) \
+		$(use_enable web) \
+		$(use_enable odbc) \
+		$(use_enable zlib ejabberd_zlib) \
+		$(use_enable pam) \
+		|| die "econf failed"
+
+	if useq debug; then
+		emake ejabberd_debug=true || die "compiling ejabberd core failed"
+	else
+		emake || die "compiling ejabberd core failed"
+	fi
+}
+
+src_install() {
+	make \
+		DESTDIR="${D}" \
+		EJABBERDDIR="${D}/usr/$(get_libdir)/erlang/lib/${P}" \
+		ETCDIR="${D}${JABBER_ETC}" \
+		LOGDIR="${D}${JABBER_LOG}" \
+		install || die "install failed"
+
+	# remove the default ejabberdctl as we use our own
+	rm "${D}/sbin/ejabberdctl"
+
+	insinto ${JABBER_ETC}
+
+	chown -R jabber:jabber "${D}${JABBER_ETC}"
+	chown -R jabber:jabber "${D}${JABBER_LOG}"
+	chown -R jabber:jabber "${D}/usr/$(get_libdir)/erlang/lib/${P}"
+
+	if useq ssl ; then
+		doins "${FILESDIR}/ssl.cnf"
+		newins "${FILESDIR}/self-cert-v2.sh" self-cert.sh
+	fi
+
+	# Pam helper module permissions
+	# http://www.process-one.net/docs/ejabberd/guide_en.html
+	if useq pam; then
+		chown root:jabber "${D}"/usr/lib/erlang/lib/${P}/priv/bin/epam
+		chmod 4750 "${D}"/usr/lib/erlang/lib/${P}/priv/bin/epam
+	fi
+
+	cd "${WORKDIR}/${MY_P}/doc"
+	dodoc "release_notes_${PV}.txt"
+	dohtml *.{html,png}
+
+	# set up /usr/sbin/ejabberd wrapper
+	cat "${FILESDIR}/ejabberd-wrapper-${MY_PV}.template" \
+		| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \
+		> "${T}/ejabberd"
+	exeinto /usr/sbin
+	doexe "${T}/ejabberd"
+
+	# set up /usr/sbin/ejabberdctl wrapper
+	cat "${FILESDIR}/ejabberdctl-wrapper-${MY_PV}.template" \
+		| sed -e "s/\@libdir\@/$(get_libdir)/g" -e "s/\@version\@/${PV}/g" \
+		> "${T}/ejabberdctl"
+	doexe "${T}/ejabberdctl"
+
+	dodir /var/lib/ejabberd
+	newinitd "${FILESDIR}/${MY_P}.initd" ${PN}
+	newconfd "${FILESDIR}/${MY_P}.confd" ${PN}
+
+	# fix up the ssl cert paths in /etc/jabber/ejabberd.cfg to use the cert
+	# that would be generated by /etc/jabber/self-cert.sh
+	sed -i -e "s/\/path\/to\/ssl.pem/\/etc\/jabber\/ssl.pem/g" \
+		"${D}${JABBER_ETC}/ejabberd.cfg" || die "Cannot sed ejabberd.cfg"
+
+	# if mod_irc is not enabled, comment out the mod_irc in the default
+	# ejabberd.cfg
+	if ! use mod_irc; then
+		sed -i -e "s/{mod_irc,/%{mod_irc,/" \
+			"${D}${JABBER_ETC}/ejabberd.cfg" || die "Cannot sed ejabberd.cfg"
+	fi
+}
+
+pkg_postinst() {
+	elog "For configuration instructions, please see"
+	elog "/usr/share/doc/${PF}/html/guide.html, or the online version at"
+	elog "http://www.process-one.net/en/projects/ejabberd/docs/guide_en.html"
+	if useq ssl ; then
+		if [ ! -e /etc/jabber/ssl.pem ]; then
+			elog "Please edit ${JABBER_ETC}/ssl.cnf and run ${JABBER_ETC}/self-cert.sh"
+			elog "Ejabberd may refuse to start without an SSL certificate"
+		fi
+	fi
+	if ! useq web ; then
+		elog "The web USE flag is off, this has disabled the web admin interface."
+	fi
+	elog "===================================================================="
+	elog 'Quick Start Guide:'
+	elog '1) Add output of `hostname -s` to /etc/jabber/ejabberd.cfg line 89'
+	elog '   {hosts, ["localhost", "thehost"]}.'
+	elog '2) Add an admin user to /etc/jabber/ejabberd.cfg line 324'
+	elog '   {acl, admin, {user, "theadmin", "thehost"}}.'
+	elog '3) Start the server'
+	elog '   # /etc/init.d/ejabberd start'
+	elog '4) Register the admin user'
+	elog '   # /usr/sbin/ejabberdctl register theadmin thehost thepassword'
+	elog '5) Log in with your favourite jabber client or using the web admin'
+}
diff --git a/net-im/ejabberd/files/2.0.1-parallel-make.patch b/net-im/ejabberd/files/2.0.1-parallel-make.patch
new file mode 100644
index 000000000000..b6b1e7c00ea7
--- /dev/null
+++ b/net-im/ejabberd/files/2.0.1-parallel-make.patch
@@ -0,0 +1,60 @@
+--- trunk/src/Makefile.in
++++ trunk/src/Makefile.in
+@@ -50,7 +50,9 @@
+ SUBDIRS = @mod_irc@ @mod_pubsub@ @mod_muc@ @mod_proxy65@ @eldap@ @pam@ @web@ stringprep @tls@ @odbc@ @ejabberd_zlib@
+ ERLSHLIBS = expat_erl.so
+ ERLBEHAVS = cyrsasl.erl gen_mod.erl p1_fsm.erl
+-SOURCES = $(ERLBEHAVS) $(wildcard *.erl)
++SOURCES_ALL = $(wildcard *.erl)
++SOURCES = $(filter-out $(ERLBEHAVS),$(SOURCES_ALL))
++ERLBEHAVBEAMS = $(ERLBEHAVS:.erl=.beam)
+ BEAMS = $(SOURCES:.erl=.beam)
+ 
+ DESTDIR =
+@@ -74,8 +76,12 @@
+ 
+ all: $(ERLSHLIBS) compile-beam all-recursive
+ 
+-compile-beam: XmppAddr.hrl $(BEAMS)
++compile-beam: XmppAddr.hrl $(ERLBEHAVBEAMS) $(BEAMS)
+ 
++$(BEAMS): $(ERLBEHAVBEAMS)
++
++all-recursive: $(ERLBEHAVBEAMS)
++
+ %.beam:       %.erl
+ 	@ERLC@ -W $(ERLC_FLAGS) $<
+ 
+--- trunk/src/eldap/Makefile.in
++++ trunk/src/eldap/Makefile.in
+@@ -22,6 +22,8 @@
+ 
+ all:    $(BEAMS) ELDAPv3.beam
+ 
++ELDAPv3.beam: ELDAPv3.erl
++
+ ELDAPv3.erl:       ELDAPv3.asn
+ 	@ERLC@ -bber_bin -W $(EFLAGS) $<
+ 
+--- trunk/src/mod_pubsub/Makefile.in
++++ trunk/src/mod_pubsub/Makefile.in
+@@ -16,12 +16,17 @@
+ endif
+ 
+ OUTDIR = ..
+-SOURCES = $(wildcard *.erl)
++ERLBEHAVS = gen_pubsub_node.erl gen_pubsub_nodetree.erl
++SOURCES_ALL = $(wildcard *.erl)
++SOURCES = $(filter-out $(ERLBEHAVS),$(SOURCES_ALL))
++ERLBEHAVBEAMS = $(addprefix $(OUTDIR)/,$(ERLBEHAVS:.erl=.beam))
+ BEAMS = $(addprefix $(OUTDIR)/,$(SOURCES:.erl=.beam))
+ 
+ 
+-all:    $(BEAMS)
++all:    $(ERLBEHAVBEAMS) $(BEAMS)
+ 
++$(BEAMS): $(ERLBEHAVBEAMS)
++
+ $(OUTDIR)/%.beam:       %.erl
+ 	@ERLC@ -W $(EFLAGS) -o $(OUTDIR) $<
+