Version bump prosody to 0.8.0 (bug 352382).

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

5 files changed, 121 insertions, 6 deletions

diff --git a/net-im/prosody/ChangeLog b/net-im/prosody/ChangeLog
index 444634d35119..aa8c87f403f9 100644
--- a/net-im/prosody/ChangeLog
+++ b/net-im/prosody/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-im/prosody
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/ChangeLog,v 1.9 2011/03/22 20:59:44 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/ChangeLog,v 1.10 2011/04/08 17:41:27 djc Exp $
+
+*prosody-0.8.0 (08 Apr 2011)
+
+  08 Apr 2011; Dirkjan Ochtman <djc@gentoo.org> +prosody-0.8.0.ebuild,
+  +files/prosody-0.8.0-cfg.lua.patch, metadata.xml:
+  Version bump to 0.8.0 (bug 352382).
 
   22 Mar 2011; Ulrich Mueller <ulm@gentoo.org> prosody-0.6.2.ebuild,
   prosody-0.7.0.ebuild:
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index a808c3040017..eee5aa3fa500 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -3,17 +3,20 @@ Hash: SHA1
 
 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-0.8.0-cfg.lua.patch 1478 RMD160 afc3b4dcf038dc305d8e194d14cb3ce3e3384081 SHA1 aff62afc9ffdcc24d1319a96df59ffde3b214b4c SHA256 a09043584dbbe69812716204c83d4f901a25b5c51835b04f014386c8e8febb87
 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
+DIST prosody-0.8.0.tar.gz 210945 RMD160 98817b1f40c6fd9ab402b70f73dae308e5990cdc SHA1 f20baab36bd2570825a24f49e0643cb9c2a65541 SHA256 0b9e39a6b555b4c848af288f27107e99b1480d9733556a2c9b3a9f249eba602d
 EBUILD prosody-0.6.2.ebuild 1681 RMD160 1f38b25ed91fe663253e1c420e5739ddd04051bf SHA1 43f1cbf3ea049b9b8b58d74386d04fa94b5fa6c0 SHA256 f7038ea030b26b1c1ddb6eda02a72e46298f59de7923335a81fcc9b82f2d0f0e
 EBUILD prosody-0.7.0.ebuild 1876 RMD160 f8631649cb4227091f2841c89e1b74ca3ab4e5be SHA1 a9d0d51c9a07873d68dcfeaf7531df9589fa8830 SHA256 9de2b14209f491bb06b7bcc022b4769b1c2307fdbf4a2803e00a1293047f4282
-MISC ChangeLog 1517 RMD160 01b8c137f03ef8b47c20226929d6568df14f733b SHA1 dce4244eb733fce5d5a1f91111eac69698f1dea0 SHA256 81641dae63591f53104823798d27055dbbc925310cf7db62121f455f45105609
-MISC metadata.xml 384 RMD160 6db2e0dfab01fdac1c2356fda004f1a91fb92d34 SHA1 1500b7affc1238c517889acdd11519ca2e727a78 SHA256 8d8b51ed60eda7c515fff166d1e9252108fc6edad7b30d2d1e7b8401a043f2db
+EBUILD prosody-0.8.0.ebuild 2103 RMD160 23b7a1912460520ef6fd35bec89723d7faddb963 SHA1 faa48a9d42ea84b778c4f3c93c8c4477cd2dead9 SHA256 e3738e1bc1507af7fbd375b4c01008153c61471015fe9f51bd0b6b99c34df944
+MISC ChangeLog 1710 RMD160 bc0a262d31c227079c0e19bdbfd394c69def0722 SHA1 e67bfe66a0c61e832d0030895957cdd14b8dfd8d SHA256 2094708fe0642f1d99a08a0b693f551d2879e18cfb6c1660624c9ec2f969e922
+MISC metadata.xml 459 RMD160 22b5d27eab97180c5c5a68cf67979798a43c8d61 SHA1 2ce0f8789f38b4c075f35f7e89b6d89882fc69a9 SHA256 86ce1010600ab9a824c65c4ce39442ab59e2a39f8f2a40ce3967150b52e9d991
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2JDeEACgkQOeoy/oIi7uzHbQCdGTQ8V/OnBQLWx+dQDqSqkItl
-baMAoLc/UPbnpp2GUktbGqd29b5oT+eJ
-=DOE4
+iEYEARECAAYFAk2fSNAACgkQxeMuLWsGW/u/MQCfcPICU0HNDhwFPT72iPZtN9rt
+YlwAn0VcfInS85NH7spJ7NiRKxCqZaLK
+=Yj4j
 -----END PGP SIGNATURE-----
diff --git a/net-im/prosody/files/prosody-0.8.0-cfg.lua.patch b/net-im/prosody/files/prosody-0.8.0-cfg.lua.patch
new file mode 100644
index 000000000000..6444a6b2655a
--- /dev/null
+++ b/net-im/prosody/files/prosody-0.8.0-cfg.lua.patch
@@ -0,0 +1,36 @@
+diff --git a/prosody.cfg.lua.dist b/prosody.cfg.lua.dist
+index e513b11..08ebca6 100644
+--- a/prosody.cfg.lua.dist
++++ b/prosody.cfg.lua.dist
+@@ -105,6 +105,8 @@ ssl = {
+ -- default provider stores passwords in plaintext. If you do not trust your
+ -- server please see http://prosody.im/doc/modules/mod_auth_internal_hashed
+ -- for information about using the hashed backend.
++-- See http://prosody.im/doc/authentication for other possibilities including
++-- Cyrus SASL.
+ 
+ authentication = "internal_plain"
+ 
+@@ -123,12 +125,19 @@ authentication = "internal_plain"
+ -- Logging configuration
+ -- For advanced logging see http://prosody.im/doc/logging
+ log = {
+-	info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging
+-	error = "prosody.err";
+-	-- "*syslog"; -- Uncomment this for logging to syslog
++	info = "/var/log/jabber/prosody.log"; -- Change 'info' to 'debug' for verbose logging
++	error = "/var/log/jabber/prosody.err";
++	-- "*syslog"; -- Uncomment this for logging to syslog; needs mod_posix
+ 	-- "*console"; -- Log to the console, useful for debugging with daemonize=false
+ }
+ 
++-- Pidfile, used by prosodyctl and the init.d script
++pidfile = "/var/run/jabber/prosody.pid"
++
++-- User and group, used for daemon
++prosody_user = "jabber"
++prosody_group = "jabber"
++
+ ----------- Virtual hosts -----------
+ -- You need to add a VirtualHost entry for each domain you wish Prosody to serve.
+ -- Settings under each VirtualHost entry apply *only* to that host.
diff --git a/net-im/prosody/metadata.xml b/net-im/prosody/metadata.xml
index 9b63785cf637..9794ef0bd411 100644
--- a/net-im/prosody/metadata.xml
+++ b/net-im/prosody/metadata.xml
@@ -10,5 +10,6 @@
   </maintainer>
   <use>
     <flag name="libevent">Use libevent for event handling</flag>
+    <flag name="sql">Require dev-lua/luadbi for SQL storage plugins</flag>
   </use>
 </pkgmetadata>
diff --git a/net-im/prosody/prosody-0.8.0.ebuild b/net-im/prosody/prosody-0.8.0.ebuild
new file mode 100644
index 000000000000..cc890988ed8d
--- /dev/null
+++ b/net-im/prosody/prosody-0.8.0.ebuild
@@ -0,0 +1,69 @@
+# 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.8.0.ebuild,v 1.1 2011/04/08 17:41:27 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 sql"
+
+DEPEND="net-im/jabber-base
+		>=dev-lang/lua-5.1
+		>=net-dns/libidn-1.1
+		>=dev-libs/openssl-0.9.8"
+RDEPEND="${DEPEND}
+		dev-lua/luasocket
+		ssl? ( dev-lua/luasec )
+		dev-lua/luaexpat
+		dev-lua/luafilesystem
+		sql? ( >=dev-lua/luadbi-0.5 )
+		libevent? ( dev-lua/luaevent )"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+JABBER_ETC="/etc/jabber"
+JABBER_SPOOL="/var/spool/jabber"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-${PV}-cfg.lua.patch"
+	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() {
+	# the configure script is handcrafted (and yells at unknown options)
+	# hence do not use 'econf'
+	./configure --prefix="/usr" \
+		--sysconfdir="${JABBER_ETC}" \
+		--datadir="${JABBER_SPOOL}" \
+		--with-lua-lib=/usr/$(get_libdir)/lua \
+		--c-compiler="$(tc-getCC)" --linker="$(tc-getCC)" \
+		--cflags="${CFLAGS} -Wall -fPIC" \
+		--ldflags="${LDFLAGS} -shared" \
+		--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
+}
+
+pkg_postinst() {
+	elog "Please note that the module 'console' has been renamed to 'admin_telnet'."
+}