diff options
| author |   Christian Faulhammer <opfer@gentoo.org> | 2007-08-29 16:22:20 +0000 |
|---|---|---|
| committer | Christian Faulhammer <opfer@gentoo.org> | 2007-08-29 16:22:20 +0000 |
| commit | 9223408e37f44c3a3d4f8fdda6c050d9550ccdfc (patch) | |
| tree | 0b6f718957357315dfdfdeea916e5b2da638c06e /net-im | |
| parent | Fixing up the metadata.xml. <herd></herd> ain't a proper herd. (diff) | |
| download | gentoo-2-9223408e37f44c3a3d4f8fdda6c050d9550ccdfc.tar.gz gentoo-2-9223408e37f44c3a3d4f8fdda6c050d9550ccdfc.tar.bz2 gentoo-2-9223408e37f44c3a3d4f8fdda6c050d9550ccdfc.zip | |
remove restriction on lower erlang versions, see bug 184419; added some quotes around variables
(Portage version: 2.1.2.12)
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/ejabberd/ChangeLog | 7 | ||||
| -rw-r--r-- | net-im/ejabberd/ejabberd-1.1.3-r2.ebuild | 34 |
2 files changed, 23 insertions, 18 deletions
diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog index 72083bffdf2e..cb17948c1c11 100644 --- a/net-im/ejabberd/ChangeLog +++ b/net-im/ejabberd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-im/ejabberd # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.21 2007/07/13 14:32:01 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.22 2007/08/29 16:22:20 opfer Exp $ + + 29 Aug 2007; Christian Faulhammer <opfer@gentoo.org> + ejabberd-1.1.3-r2.ebuild: + remove restriction on lower erlang versions, see bug 184419; added some + quotes around variables *ejabberd-1.1.3-r2 (13 Jul 2007) diff --git a/net-im/ejabberd/ejabberd-1.1.3-r2.ebuild b/net-im/ejabberd/ejabberd-1.1.3-r2.ebuild index 522b8b4cefec..67051813aa9f 100644 --- a/net-im/ejabberd/ejabberd-1.1.3-r2.ebuild +++ b/net-im/ejabberd/ejabberd-1.1.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.3-r2.ebuild,v 1.1 2007/07/13 14:32:01 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-1.1.3-r2.ebuild,v 1.2 2007/08/29 16:22:20 opfer Exp $ inherit eutils multilib versionator @@ -19,7 +19,7 @@ IUSE="debug mod_irc mod_muc mod_pubsub ldap odbc ssl web" DEPEND=">=net-im/jabber-base-0.01 >=dev-libs/expat-1.95 - <dev-lang/erlang-11.2.5 + >=dev-lang/erlang-10.2.0 odbc? ( dev-db/unixODBC ) ldap? ( =net-nds/openldap-2* ) ssl? ( >=dev-libs/openssl-0.9.8e )" @@ -29,10 +29,10 @@ S=${WORKDIR}/${P}/src src_unpack() { unpack ${A} - cd ${S} + cd "${S}" # Bug #171427 - epatch ${FILESDIR}/${PV}-missing-declaration.patch + epatch "${FILESDIR}/${PV}-missing-declaration.patch" } src_compile() { @@ -55,10 +55,10 @@ src_compile() { src_install() { make \ - DESTDIR=${D} \ - EJABBERDDIR=${D}/usr/$(get_libdir)/erlang/lib/${P} \ - ETCDIR=${D}${JABBER_ETC} \ - LOGDIR=${D}${JABBER_LOG} \ + DESTDIR="${D}" \ + EJABBERDDIR="${D}/usr/$(get_libdir)/erlang/lib/${P}" \ + ETCDIR="${D}${JABBER_ETC}" \ + LOGDIR="${D}${JABBER_LOG}" \ install \ || die "install failed" @@ -72,7 +72,7 @@ src_install() { # # Create /usr/bin/ejabberd # - cat <<EOF > ${T}/ejabberd + cat <<EOF > "${T}/ejabberd" #!/bin/bash erl -pa /usr/$(get_libdir)/erlang/lib/${P}/ebin \\ @@ -90,7 +90,7 @@ EOF # # Create /usr/bin/ejabberdctl # - cat <<EOF > ${T}/ejabberdctl + cat <<EOF > "${T}/ejabberdctl" #!/bin/sh exec env HOME=${JABBER_RUN} \\ @@ -102,17 +102,17 @@ exec env HOME=${JABBER_RUN} \\ -extra \$@ EOF - dobin ${T}/ejabberdctl - dobin ${T}/ejabberd + dobin "${T}/ejabberdctl" + dobin "${T}/ejabberd" - newinitd ${FILESDIR}/ejabberd-1.1.1-r1.initd ${PN} - newconfd ${FILESDIR}/${P}.confd ${PN} + newinitd"${FILESDIR}/ejabberd-1.1.1-r1.initd" ${PN} + newconfd "${FILESDIR}/${P}.confd" ${PN} insinto ${JABBER_ETC} - doins ${FILESDIR}/inetrc + doins "${FILESDIR}/inetrc" if useq ssl ; then - doins ${FILESDIR}/ssl.cnf - newins ${FILESDIR}/self-cert-v2.sh self-cert.sh + doins "${FILESDIR}/ssl.cnf" + newins "${FILESDIR}/self-cert-v2.sh" self-cert.sh fi } |