Fixed future build problem reproducible with -rX, where X!=0, thank Rion fo report.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index e9fe086e96d82ea1b855e6c54c35e0ba7bea464b..408b6de3244da9fa483cf022f4b27e4781d3ce07 100644 (file)
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/ejabberd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.70 2010/05/26 20:25:25 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.71 2010/05/27 07:31:43 pva Exp $
+
+  27 May 2010; Peter Volkov <pva@gentoo.org> ejabberd-2.1.3.ebuild:
+  Fixed future build problem reproducible with -rX, where X!=0, thank Rion
+  fo report.
 
 *ejabberd-2.1.3 (26 May 2010)
 

diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 11d45fb1cb5bc521b2fc9578684eac3076dbce99..cea7d27135dae57799979f509561ba286335cae6 100644 (file)
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -7,10 +7,9 @@ AUX ejabberd-wrapper-2.template 1243 RMD160 989700850578dd86fe6cefeb465a1c84ba49
 AUX ejabberdctl-wrapper-3.template 908 RMD160 c5378d8e089ae1c180b7be76639a99d5cad16f11 SHA1 4ee6996c492360c4e44a05e011fb228eecff56b9 SHA256 c3c377ae8b00143e21ab4ccff7cffe539f6a6b95336aa5636cb8d6bba49c9592
 AUX self-cert-v2.sh 1017 RMD160 3beb0f05e8cc3041abd2f689d31d410bc7d5088d SHA1 1f07299b2e49541dcbf5c2b81b26280bbf0b6aeb SHA256 34b2c9cb36c424ffd1117bd20b67d0f4a05168b0bc6237e287c2dcabd0e27972
 AUX ssl.cnf 1042 RMD160 47d2542942fb21f4be1e827d47eb4e0468e73910 SHA1 7347bae5a195ad158881fe5313f55ee41e85cb81 SHA256 ed066f7720fd9f4c2d57ffb2ebcbc4b2810d2b7ca22b67ec8c1dc1227baaa635
-DIST 2.1.1-mod_statsdx.patch.bz2 13041 RMD160 9cc6d71ff2a2d58b0e377a3facb564d22d46af25 SHA1 4ef326eff97283530ee137613c009fe132312644 SHA256 a290217d7fd2c338d9ddba73e25ee052a3735d7168aafd24750de113f43ebc5f
 DIST ejabberd-2.0.5.tar.gz 1796737 RMD160 5ec0210b3995004c708180a66a096e0b9be5f1ba SHA1 e5b8c4b742fdcc439da9458f94f530604abdfdd5 SHA256 37ef90e2afa2b73a620bf71a096df48d5fde8f1cd669fac83d8c143a1295198c
 DIST ejabberd-2.1.3.tar.gz 2243874 RMD160 c57672928e30f71ec66636dd5e76adb802f17b03 SHA1 77fdf18c0bb3b25cf9045e0c833ba4d82f180469 SHA256 602c6e4e742c4cab8594e9f049f08d0bf2125fa84af491e0ceb6d6f2f3854ef6
 EBUILD ejabberd-2.0.5-r3.ebuild 4901 RMD160 1f7a17a51e3310a0619ed37d3defb34380d637f4 SHA1 608359d5a2a4889326b9afa43883104653689134 SHA256 02bf31c731eb7f72ace9fa5092421b2dd96700ca82d7eccc034aaa256c2b04fd
-EBUILD ejabberd-2.1.3.ebuild 7928 RMD160 4bce6a02c2a21096b04c62f696b7392ace36c666 SHA1 0eb231fa97ce822d8c9900c49f910efeb01dfa53 SHA256 565edc97eb6f5e7aa1b1bbfa16d95b5a6c93d2475c9e4c616ec2465a6ee78395
-MISC ChangeLog 15474 RMD160 3ca57b8864bb1c6b00e697e285f3a8abcd3ea9a1 SHA1 e0331595d2b1164dd57d84e111f3fcd8654b0027 SHA256 56a0b4ee76c7a92cf91734d33b1026ea7630110ee42205efadfe2fd3dba00051
+EBUILD ejabberd-2.1.3.ebuild 7870 RMD160 84c8a379e307779b30f9cdd0cf0947006a7daf58 SHA1 13b871178d72c94e7e2c01602df71e3d38c8d165 SHA256 1e48e93ae1e9c22512215fec1969ff3b7962acb303e8d9fb3955a0b0d3f9abb7
+MISC ChangeLog 15631 RMD160 36679762f55cf7a473a14acb52ef8efe93ce2130 SHA1 a2c07634c09aaf16f40b599bf7d4faaf7b7bc11c SHA256 253d896987c643770500acecff85829630f8b3d96659eb38e8ef236f2deb5fd4
 MISC metadata.xml 875 RMD160 ac2ab791694cf3feae91eb66053273fce29367b1 SHA1 7e5be5bd376801e9b0fbeaa08d8ca720f44b5c5b SHA256 2d8cf45269a75ebf3b07dbd06f74caef0bd2caf33a9dcf22466db6a6960115ef

diff --git a/net-im/ejabberd/ejabberd-2.1.3.ebuild b/net-im/ejabberd/ejabberd-2.1.3.ebuild
index f8f03fc99269b028791dca14dc06359a1fd21012..bf0b1199cd8de405d9d56d78b4bfa41be2d12610 100644 (file)
--- a/net-im/ejabberd/ejabberd-2.1.3.ebuild
+++ b/net-im/ejabberd/ejabberd-2.1.3.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.1 2010/05/26 20:25:25 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.3.ebuild,v 1.2 2010/05/27 07:31:43 pva Exp $
 
 EAPI=3
 
@@ -8,8 +8,7 @@ inherit eutils multilib pam ssl-cert
 
 DESCRIPTION="The Erlang Jabber Daemon"
 HOMEPAGE="http://www.ejabberd.im/"
-SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tar.gz
-       mod_statsdx? ( mirror://gentoo/2.1.1-mod_statsdx.patch.bz2 )"
+SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -44,7 +43,7 @@ src_prepare() {
        if use mod_statsdx; then
                ewarn "mod_statsdx is not a part of upstream tarball but is a third-party module"
                ewarn "taken from here: http://www.ejabberd.im/mod_stats2file"
-               epatch "${WORKDIR}/2.1.1-mod_statsdx.patch"
+               epatch "${FILESDIR}/2.1.1-mod_statsdx.patch"
        fi
 
        # don't install release notes (we'll do this manually)
@@ -113,7 +112,7 @@ src_install() {
        # http://www.process-one.net/docs/ejabberd/guide_en.html
        if use pam; then
                pamd_mimic_system xmpp auth account || die "Cannot create pam.d file"
-               fperms 4750 "/usr/$(get_libdir)/erlang/lib/${P}/priv/bin/epam" || die "Cannot adjust epam permissions"
+               fperms 4750 "/usr/$(get_libdir)/erlang/lib/${PF}/priv/bin/epam" || die "Cannot adjust epam permissions"
        fi
 
        cd "${WORKDIR}/${P}/doc"
@@ -183,7 +182,7 @@ pkg_postinst() {
                ewarn
                ewarn "Updating ${ctlcfg} (debug: ${new_ctlcfg})"
                sed -e "/#ERLANG_NODE=/aERLANG_NODE=$EJABBERD_NODE" "${ctlcfg}" > "${new_ctlcfg}" || die
-
+               
                if [[ -e ${EROOT}/var/run/jabber/.erlang.cookie ]]; then
                        ewarn "Moving .erlang.cookie..."
                        if [[ -e ${EROOT}/var/spool/jabber/.erlang.cookie ]]; then