| 1 |
pva 10/05/27 07:31:43 |
| 2 |
|
| 3 |
Modified: ChangeLog ejabberd-2.1.3.ebuild |
| 4 |
Log: |
| 5 |
Fixed future build problem reproducible with -rX, where X!=0, thank Rion fo report. |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.71 net-im/ejabberd/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/ChangeLog?rev=1.71&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/ChangeLog?rev=1.71&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/ChangeLog?r1=1.70&r2=1.71 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v |
| 18 |
retrieving revision 1.70 |
| 19 |
retrieving revision 1.71 |
| 20 |
diff -u -r1.70 -r1.71 |
| 21 |
--- ChangeLog 26 May 2010 20:25:25 -0000 1.70 |
| 22 |
+++ ChangeLog 27 May 2010 07:31:43 -0000 1.71 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for net-im/ejabberd |
| 25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.70 2010/05/26 20:25:25 pva Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.71 2010/05/27 07:31:43 pva Exp $ |
| 28 |
+ |
| 29 |
+ 27 May 2010; Peter Volkov <pva@g.o> ejabberd-2.1.3.ebuild: |
| 30 |
+ Fixed future build problem reproducible with -rX, where X!=0, thank Rion |
| 31 |
+ fo report. |
| 32 |
|
| 33 |
*ejabberd-2.1.3 (26 May 2010) |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.2 net-im/ejabberd/ejabberd-2.1.3.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/ejabberd-2.1.3.ebuild?rev=1.2&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/ejabberd-2.1.3.ebuild?rev=1.2&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/ejabberd-2.1.3.ebuild?r1=1.1&r2=1.2 |
| 43 |
|
| 44 |
Index: ejabberd-2.1.3.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.3.ebuild,v |
| 47 |
retrieving revision 1.1 |
| 48 |
retrieving revision 1.2 |
| 49 |
diff -u -r1.1 -r1.2 |
| 50 |
--- ejabberd-2.1.3.ebuild 26 May 2010 20:25:25 -0000 1.1 |
| 51 |
+++ ejabberd-2.1.3.ebuild 27 May 2010 07:31:43 -0000 1.2 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2010 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.3.ebuild,v 1.1 2010/05/26 20:25:25 pva Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.3.ebuild,v 1.2 2010/05/27 07:31:43 pva Exp $ |
| 57 |
|
| 58 |
EAPI=3 |
| 59 |
|
| 60 |
@@ -8,8 +8,7 @@ |
| 61 |
|
| 62 |
DESCRIPTION="The Erlang Jabber Daemon" |
| 63 |
HOMEPAGE="http://www.ejabberd.im/" |
| 64 |
-SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tar.gz |
| 65 |
- mod_statsdx? ( mirror://gentoo/2.1.1-mod_statsdx.patch.bz2 )" |
| 66 |
+SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tar.gz" |
| 67 |
|
| 68 |
LICENSE="GPL-2" |
| 69 |
SLOT="0" |
| 70 |
@@ -44,7 +43,7 @@ |
| 71 |
if use mod_statsdx; then |
| 72 |
ewarn "mod_statsdx is not a part of upstream tarball but is a third-party module" |
| 73 |
ewarn "taken from here: http://www.ejabberd.im/mod_stats2file" |
| 74 |
- epatch "${WORKDIR}/2.1.1-mod_statsdx.patch" |
| 75 |
+ epatch "${FILESDIR}/2.1.1-mod_statsdx.patch" |
| 76 |
fi |
| 77 |
|
| 78 |
# don't install release notes (we'll do this manually) |
| 79 |
@@ -113,7 +112,7 @@ |
| 80 |
# http://www.process-one.net/docs/ejabberd/guide_en.html |
| 81 |
if use pam; then |
| 82 |
pamd_mimic_system xmpp auth account || die "Cannot create pam.d file" |
| 83 |
- fperms 4750 "/usr/$(get_libdir)/erlang/lib/${P}/priv/bin/epam" || die "Cannot adjust epam permissions" |
| 84 |
+ fperms 4750 "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam" || die "Cannot adjust epam permissions" |
| 85 |
fi |
| 86 |
|
| 87 |
cd "${WORKDIR}/${P}/doc" |
| 88 |
@@ -183,7 +182,7 @@ |
| 89 |
ewarn |
| 90 |
ewarn "Updating ${ctlcfg} (debug: ${new_ctlcfg})" |
| 91 |
sed -e "/#ERLANG_NODE=/aERLANG_NODE=$EJABBERD_NODE" "${ctlcfg}" > "${new_ctlcfg}" || die |
| 92 |
- |
| 93 |
+ |
| 94 |
if [[ -e ${EROOT}/var/run/jabber/.erlang.cookie ]]; then |
| 95 |
ewarn "Moving .erlang.cookie..." |
| 96 |
if [[ -e ${EROOT}/var/spool/jabber/.erlang.cookie ]]; then |
Archives