Version bump prosody to 0.7.0 (bug 323999).

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

5 files changed, 118 insertions, 4 deletions

diff --git a/net-im/prosody/ChangeLog b/net-im/prosody/ChangeLog
index c5a0e6bc787c..18f8065e3eee 100644
--- a/net-im/prosody/ChangeLog
+++ b/net-im/prosody/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/prosody
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/ChangeLog,v 1.7 2010/11/05 23:15:54 rafaelmartins Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/ChangeLog,v 1.8 2011/03/16 09:14:41 djc Exp $
+
+*prosody-0.7.0 (16 Mar 2011)
+
+  16 Mar 2011; Dirkjan Ochtman <djc@gentoo.org> +prosody-0.7.0.ebuild,
+  +files/prosody-0.7.0-cfg.lua.patch, metadata.xml:
+  Version bump to 0.7.0 (bug 323999).
 
   05 Nov 2010; Rafael G. Martins <rafaelmartins@gentoo.org>
   prosody-0.6.2.ebuild:
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 73e12bee241a..fa70981aad90 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1,6 +1,9 @@
 AUX prosody-0.6.2-cfg.lua.patch 637 RMD160 b3bdeaffbb8318debd9e99d006451ae9fb3cb514 SHA1 355faa0dfee2616c4a30a2393f5879c70666d572 SHA256 06057f56a0858b2d4596de874b8ea3465a984fe3dbebab0d58a10359c74dd94d
+AUX prosody-0.7.0-cfg.lua.patch 1517 RMD160 ea1e8459c61d93e1b196177a42f089e153c79f8e SHA1 635bdc90428249d5846eabaf7cb8bac975dee3c5 SHA256 5bc54faaf365be5a3568f201fa53f0ff094bb51bb4d8300cdca60ec8aaffb4e8
 AUX prosody.initd 1148 RMD160 54de6d4b97600024cfd8624fa10240a1e0a430e8 SHA1 c75e361c36e27adc880517d02a0e3089f200fd97 SHA256 e520a55d4a10fc7fce24ce7b57e722846d2814e6726407acba606af519de19e8
 DIST prosody-0.6.2.tar.gz 151945 RMD160 ea9d1a6ccb8c6940fe0ae38d1ee84add73b42374 SHA1 9172227865b1e2bc7aa695852c40effb696fc3a0 SHA256 c43ddcc91a6f5c0417e5b05d56b39c3d68e74be9e28bfbb8c2a76238767d6703
+DIST prosody-0.7.0.tar.gz 177412 RMD160 2e40b4f807b6120971c611f52d4df3264a82cbb9 SHA1 3f3a6c4f262a062a9c027cc843cd6827104fb8ba SHA256 a8b826805dd55282706c5683c2028899b3721eb0f84d3e35c0509a6c1bc32390
 EBUILD prosody-0.6.2.ebuild 1724 RMD160 f171fc4976f6a3945deb25acb1868acb2419d74a SHA1 a63f91ac329fbd8b89ba061077e8d4a35a730b57 SHA256 362688d8edc0e58a57d97962a03ab6a5829b1f8b66f40264469043203b3566d3
-MISC ChangeLog 1191 RMD160 70acdd1e7057e888a707124272b161fa3fa24f11 SHA1 cb603a6a393237593fd8106ee727151e12bb4dcb SHA256 58d5ae8126ee94716ff8f144fbf059e460eab30b5d8c5e1b087e4e0c865763bf
-MISC metadata.xml 302 RMD160 b73de347a51dfb6d0fb5d5704c7e4df9332c345e SHA1 8f2d8060b7ca04ed3a1ed94c26df8ae50ab68b8c SHA256 88698b3e3055b21eaa7e5585c10cc087fb3c0c49994c433f1a765a672e89e25d
+EBUILD prosody-0.7.0.ebuild 1909 RMD160 08226f09774a01711162205f4c3cb067d6569998 SHA1 324c32ba6a05655d872f5b8e641d4c9b5da8cbe5 SHA256 db033940c88c312745c82301c12819f1fa92a2f601d8881b7f409e1449c5ae29
+MISC ChangeLog 1373 RMD160 0accfc04788ef7137cf26f56f4ddfc309f425de0 SHA1 b5f1b360f040276ab4c2d1768aa68df9961f0ca8 SHA256 e8e686d7560c7741214e561188288cfc9ea7fd82397b5dfa035932a76b9d4c5a
+MISC metadata.xml 384 RMD160 6db2e0dfab01fdac1c2356fda004f1a91fb92d34 SHA1 1500b7affc1238c517889acdd11519ca2e727a78 SHA256 8d8b51ed60eda7c515fff166d1e9252108fc6edad7b30d2d1e7b8401a043f2db
diff --git a/net-im/prosody/files/prosody-0.7.0-cfg.lua.patch b/net-im/prosody/files/prosody-0.7.0-cfg.lua.patch
new file mode 100644
index 000000000000..68423f413f48
--- /dev/null
+++ b/net-im/prosody/files/prosody-0.7.0-cfg.lua.patch
@@ -0,0 +1,39 @@
+--- prosody.cfg.lua.old	2010-06-13 02:23:02.000000000 +0200
++++ prosody.cfg.lua.dist	2010-06-18 10:45:40.165045845 +0200
+@@ -16,6 +16,10 @@
+ -- Settings in this section apply to the whole server and are the default settings
+ -- for any virtual hosts
+ 
++prosody_user = "jabber"
++prosody_group = "jabber"
++pidfile = "/var/run/jabber/prosody.pid"
++
+ -- This is a (by default, empty) list of accounts that are admins
+ -- for the server. Note that you must create the accounts separately
+ -- (see http://prosody.im/doc/creating_accounts for info)
+@@ -26,6 +30,14 @@
+ -- For more information see: http://prosody.im/doc/libevent
+ --use_libevent = true;
+ 
++-- Enable the Cyrus SASL backend for authentication against different backends,
++-- such as PAM, LDAP, SQL  and more.
++-- It also allows the use of GSSAPI for single-sign-on services. 
++-- For more information see: http://prosody.im/doc/cyrus_sasl
++--sasl_backend = "cyrus"
++-- Optional, defaults to "xmpp"
++--cyrus_service_name = "xmpp"
++
+ -- This is the list of modules Prosody will load on startup.
+ -- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
+ -- Documentation on modules can be found at: http://prosody.im/doc/modules
+@@ -90,7 +102,9 @@
+ 
+ -- Logging configuration
+ -- For advanced logging see http://prosody.im/doc/logging
+-log = "prosody.log";
++log = "/var/log/jabber/prosody.log"
++-- Requires mod_posix to be loaded
++-- log = "*syslog"
+ debug = false; -- Log debug messages?
+ 
+ ----------- Virtual hosts -----------
diff --git a/net-im/prosody/metadata.xml b/net-im/prosody/metadata.xml
index be02d466dcff..9b63785cf637 100644
--- a/net-im/prosody/metadata.xml
+++ b/net-im/prosody/metadata.xml
@@ -8,4 +8,7 @@
   <maintainer>
     <email>rafaelmartins@gentoo.org</email>
   </maintainer>
+  <use>
+    <flag name="libevent">Use libevent for event handling</flag>
+  </use>
 </pkgmetadata>
diff --git a/net-im/prosody/prosody-0.7.0.ebuild b/net-im/prosody/prosody-0.7.0.ebuild
new file mode 100644
index 000000000000..96eb3edfb5f0
--- /dev/null
+++ b/net-im/prosody/prosody-0.7.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/prosody-0.7.0.ebuild,v 1.1 2011/03/16 09:14:40 djc Exp $
+
+EAPI="2"
+
+inherit eutils multilib toolchain-funcs versionator
+
+MY_PV=$(replace_version_separator 3 '')
+DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua."
+HOMEPAGE="http://prosody.im/"
+SRC_URI="http://prosody.im/downloads/source/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libevent ssl"
+
+DEPEND="net-im/jabber-base
+		>=dev-lang/lua-5.1
+		dev-lua/luasocket
+		ssl? ( dev-lua/luasec )
+		dev-lua/luaexpat
+		dev-lua/luafilesystem
+		libevent? ( dev-lua/luaevent )
+		>=net-dns/libidn-1.1
+		>=dev-libs/openssl-0.9.8"
+RDEPEND="${DEPEND}"
+
+PROVIDE="virtual/jabber-server"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+JABBER_ETC="/etc/jabber"
+JABBER_SPOOL="/var/spool/jabber"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-cfg.lua.patch"
+	useq libevent && sed -i "s!--use_libevent.*!use_libevent = true!" prosody.cfg.lua.dist
+	sed -i "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!" Makefile
+	sed -i "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!" Makefile
+	sed -i "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!" Makefile
+	sed -i "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!" Makefile
+}
+
+src_configure() {
+	./configure --prefix="/usr" \
+		--sysconfdir="${JABBER_ETC}" \
+		--datadir="${JABBER_SPOOL}" \
+		--with-lua-lib=/usr/$(get_libdir)/lua \
+		--c-compiler="$(tc-getCC)" --linker="$(tc-getLD)" \
+		--require-config || die "configure failed"
+}
+
+src_install() {
+	DESTDIR="${D}" emake install || die "make failed"
+	newinitd "${FILESDIR}/${PN}".initd ${PN}
+}
+
+src_test() {
+	cd tests
+	./run_tests.sh
+}