remove restriction on lower erlang versions, see bug 184419; added some quotes around variables

Package-Manager: portage-2.1.2.12

3 files changed, 35 insertions, 30 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/Manifest b/net-im/ejabberd/Manifest
index 54bf1dd2bbc7..bdb119011201 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -78,18 +78,18 @@ EBUILD ejabberd-1.1.3-r1.ebuild 3945 RMD160 7a513028284e746b61599132a696bef3cdb9
 MD5 91a5381f3488c3247505631875be4731 ejabberd-1.1.3-r1.ebuild 3945
 RMD160 7a513028284e746b61599132a696bef3cdb9f5cb ejabberd-1.1.3-r1.ebuild 3945
 SHA256 21d6c50e18f8251e21714e3f67e6819f33b2c28fa862434332123978baef50c3 ejabberd-1.1.3-r1.ebuild 3945
-EBUILD ejabberd-1.1.3-r2.ebuild 3439 RMD160 3f02d2d42a647b8c05d1167012123f66808bbb89 SHA1 06683cebcfac75db97b8c9a5d67805187079001a SHA256 c5fed7cd9dffae2abf2e63b00fb570f890c82499587eca2d5c8753355dc3d610
-MD5 9df0451594402bd21ac7132fe7b07205 ejabberd-1.1.3-r2.ebuild 3439
-RMD160 3f02d2d42a647b8c05d1167012123f66808bbb89 ejabberd-1.1.3-r2.ebuild 3439
-SHA256 c5fed7cd9dffae2abf2e63b00fb570f890c82499587eca2d5c8753355dc3d610 ejabberd-1.1.3-r2.ebuild 3439
+EBUILD ejabberd-1.1.3-r2.ebuild 3466 RMD160 17cf6d2099692fba7f940ce20b3aceb5e79b443f SHA1 884338a192df7875571ed42d730ebb3b66903673 SHA256 1eac4d2364be12bf31a2075470f767f5b67617b2d68e3c9a17f6fa548dd6bce9
+MD5 ae1a53212a4f4f4ff749e7a0de823217 ejabberd-1.1.3-r2.ebuild 3466
+RMD160 17cf6d2099692fba7f940ce20b3aceb5e79b443f ejabberd-1.1.3-r2.ebuild 3466
+SHA256 1eac4d2364be12bf31a2075470f767f5b67617b2d68e3c9a17f6fa548dd6bce9 ejabberd-1.1.3-r2.ebuild 3466
 EBUILD ejabberd-1.1.3.ebuild 3367 RMD160 153663a118ebf45fce1cd68e9b3e7497bd7d5960 SHA1 065ff0d1095e5b53f4c7b93e0fca58583249e05c SHA256 cac88de8d3e24bf40c8729a226ff56807a7b8c4b6519761381f0883221b9255e
 MD5 9a0a9f44b9a2b5f6df72c179ee70feff ejabberd-1.1.3.ebuild 3367
 RMD160 153663a118ebf45fce1cd68e9b3e7497bd7d5960 ejabberd-1.1.3.ebuild 3367
 SHA256 cac88de8d3e24bf40c8729a226ff56807a7b8c4b6519761381f0883221b9255e ejabberd-1.1.3.ebuild 3367
-MISC ChangeLog 4604 RMD160 2726ba9126cf2eaf7b48a24a6de76e23596f2d46 SHA1 2fa3384fac9eb93b27a28c3ec653c4a125de1e30 SHA256 df1aa181044f8a4f8117215d0b997bbaf5bd74a8fd6d10e5a124f9bbec5bc369
-MD5 d6dbb854db7d638c37da07a5adbe69e4 ChangeLog 4604
-RMD160 2726ba9126cf2eaf7b48a24a6de76e23596f2d46 ChangeLog 4604
-SHA256 df1aa181044f8a4f8117215d0b997bbaf5bd74a8fd6d10e5a124f9bbec5bc369 ChangeLog 4604
+MISC ChangeLog 4785 RMD160 f937f9eceda5f7a54281ffdbe7ea897854d3beba SHA1 4787536dcc61612eb2109c382e38b04b18db9150 SHA256 3974cf83f7f19e6c03fa04082a4715132e587e5f294dce1a006fd40595a2aa18
+MD5 64652e2984ca9e345013f43aa27ff38e ChangeLog 4785
+RMD160 f937f9eceda5f7a54281ffdbe7ea897854d3beba ChangeLog 4785
+SHA256 3974cf83f7f19e6c03fa04082a4715132e587e5f294dce1a006fd40595a2aa18 ChangeLog 4785
 MISC metadata.xml 383 RMD160 dcf83a193e8c65bca36c368d8b4b70759bf1a7ee SHA1 2e1a9e8406a47ceb62f0d9edcabd27668b412634 SHA256 c1afbca95c1be1d2095a4dcd6ba39c8d1dd1974993b0f800264add3c18428a55
 MD5 2a43b0fd5e7b6404b98548ac55046b3f metadata.xml 383
 RMD160 dcf83a193e8c65bca36c368d8b4b70759bf1a7ee metadata.xml 383
@@ -116,9 +116,9 @@ MD5 9b247a2a345b5d2c9cdf1a1678f4edf9 files/digest-ejabberd-1.1.3-r2 244
 RMD160 59a1985b119be6cf343af1ea13929c233e59f0b4 files/digest-ejabberd-1.1.3-r2 244
 SHA256 5dad3cfcf7b609862a65b6d09c18ed318563573f866e6c19010c7b9ee7836998 files/digest-ejabberd-1.1.3-r2 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFGl4yup5vW4rUFj5oRAjuoAKCzCWVi7ZVGAp69iG+/5XnhITmHmwCdFWbi
-QLxc3HivhyZpPGV/KW+BOUg=
-=IQvl
+iD8DBQFG1Z1FNQqtfCuFneMRAhocAJ9KV4H/h5zYQD1N0jcvDmehWG29kgCfUvIo
+fbS52HNYKETeEMtiOMChYjw=
+=bSz8
 -----END PGP SIGNATURE-----
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
 }