Prosody 0.8.0

7 files changed, 151 insertions, 11 deletions

diff --git a/dev-lua/luadbi/Manifest b/dev-lua/luadbi/Manifest
new file mode 100644
index 0000000..faf46da
--- /dev/null
+++ b/dev-lua/luadbi/Manifest
@@ -0,0 +1,3 @@
+AUX 0.5-r1-Makefile.patch 1293 RMD160 1503f79f30bb438e562e78ed11217bbfc4405638 SHA1 b92c87a66ad6bb296d2b43552b5c949c575579b4 SHA256 a9b8a3429f09855aff8b803659a72be2e80a94152f846d1c17cfedcf363ae630
+DIST luadbi.0.5.tar.gz 22454 RMD160 b653e55a47a7f65cb436b962a8035ed5ebb61074 SHA1 c8c650c168599e3ac97634a5ffb28aeaaa4fb635 SHA256 49116458dd80052536bf5d7e2b2a1f5a0fa42a671ce77f1cb7355ef7faeb331e
+EBUILD luadbi-0.5-r1.ebuild 2096 RMD160 a3090e7784b2823398fe943437d969aada06f96a SHA1 94792c1e7a4917acf46835df811f58faa382db2e SHA256 466372d9510b6432cc09d9067e207dfb3cafe613691e891b4597fa82ac57e867
diff --git a/dev-lua/luadbi/files/0.5-r1-Makefile.patch b/dev-lua/luadbi/files/0.5-r1-Makefile.patch
new file mode 100644
index 0000000..e24cb34
--- /dev/null
+++ b/dev-lua/luadbi/files/0.5-r1-Makefile.patch
@@ -0,0 +1,39 @@
+--- Makefile.old	2010-07-16 08:22:13.000000000 +0200
++++ Makefile	2011-01-08 11:35:16.000000000 +0100
+@@ -27,6 +27,14 @@
+ DB2_OBJS=$(OBJS) build/dbd_db2_main.o build/dbd_db2_connection.o build/dbd_db2_statement.o
+ ORACLE_OBJS=$(OBJS) build/dbd_oracle_main.o build/dbd_oracle_connection.o build/dbd_oracle_statement.o
+ 
++INSTALL = install
++INSTALL_PROGRAM = $(INSTALL)
++INSTALL_DATA = $(INSTALL) -m 644
++LUA_INC_DIR=/usr/include/lua5.1
++LUA_LIB_DIR=/usr/lib
++INSTALL_DIR_LUA=/usr/share/lua/5.1
++INSTALL_DIR_BIN=/usr/lib/lua/5.1
++
+ free: mysql psql sqlite3
+ 
+ all:  mysql psql sqlite3 db2 oracle
+@@ -90,3 +98,21 @@
+ build:
+ 	$(MKDIR) ${BUILDDIR}
+ 
++install_lua:
++	$(INSTALL_DATA) -D DBI.lua $(DESTDIR)$(INSTALL_DIR_LUA)/DBI.lua
++
++install_mysql: mysql install_lua
++	$(INSTALL_PROGRAM) -D $(DBDMYSQL) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDMYSQL)
++
++install_psql: psql install_lua
++	$(INSTALL_PROGRAM) -D $(DBDPSQL) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDPSQL)
++
++install_sqlite3: sqlite3 install_lua
++	$(INSTALL_PROGRAM) -D $(DBDSQLITE3) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDSQLITE3)
++
++install_db2: db2 install_lua
++	$(INSTALL_PROGRAM) -D $(DBDDB2) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDDB2)
++
++install_oracle: oracle install_lua
++	$(INSTALL_PROGRAM) -D $(DBDORACLE) $(DESTDIR)$(INSTALL_DIR_BIN)/$(DBDORACLE)
++
diff --git a/dev-lua/luadbi/luadbi-0.5-r1.ebuild b/dev-lua/luadbi/luadbi-0.5-r1.ebuild
new file mode 100644
index 0000000..8c5eb82
--- /dev/null
+++ b/dev-lua/luadbi/luadbi-0.5-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lua/luaevent-prosody/luaevent-prosody-0.1.1.ebuild,v 1.1 2010/11/05 20:03:27 rafaelmartins Exp $
+
+EAPI=2
+
+inherit multilib toolchain-funcs flag-o-matic eutils
+
+DESCRIPTION="DBI module for Lua"
+HOMEPAGE="http://code.google.com/p/luadbi/"
+SRC_URI="http://luadbi.googlecode.com/files/${PN}.${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql postgres sqlite"
+
+RDEPEND=">=dev-lang/lua-5.1
+		mysql? ( dev-db/mysql )
+		postgres? ( dev-db/postgresql-base )
+		sqlite? ( >=dev-db/sqlite-3 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PVR}-Makefile.patch"
+	sed -i -e "s#^INSTALL_DIR_LUA=.*#INSTALL_DIR_LUA=$(pkg-config --variable INSTALL_LMOD lua)#" "${S}/Makefile"
+	sed -i -e "s#^INSTALL_DIR_BIN=.*#INSTALL_DIR_BIN=$(pkg-config --variable INSTALL_CMOD lua)#" "${S}/Makefile"
+	sed -i -e "s#^LUA_INC_DIR=.*#LUA_INC_DIR=$(pkg-config --variable INSTALL_INC lua)#" "${S}/Makefile"
+	sed -i -e "s#^LUA_LIB_DIR=.*#LUA_LIB_DIR=$(pkg-config --variable INSTALL_LIB lua)#" "${S}/Makefile"
+	sed -i -e "s#^LUA_LIB =.*#LUA_LIB=lua#" "${S}/Makefile"
+}
+
+src_compile() {
+	local drivers=""
+	use mysql && drivers="${drivers} mysql"
+	use postgres && drivers="${drivers} psql"
+	use sqlite && drivers="${drivers} sqlite3"
+
+	if [ -z "${drivers// /}" ] ; then
+		eerror
+		eerror "No driver was selected, cannot build."
+		eerror "Please set USE flags to build any driver."
+		eerror "Possible USE flags: mysql postgres sqlite"
+		eerror
+		die "No driver selected"
+	fi
+
+	append-flags -fPIC -c
+	for driver in "${drivers}" ; do
+		emake ${driver} \
+			|| die "Compiling driver '${drivers// /}' failed"
+	done
+}
+
+src_install() {
+	local drivers=""
+	use mysql && drivers="${drivers} mysql"
+	use postgres && drivers="${drivers} psql"
+	use sqlite && drivers="${drivers} sqlite3"
+
+	for driver in ${drivers} ; do
+		emake DESTDIR="${D}" "install_${driver// /}" \
+			|| die "Install of driver '${drivers// /}' failed"
+	done
+}
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 23fe6f3..987e8c4 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1,7 +1,8 @@
 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
+AUX prosody-0.8.0.cfg.lua.patch 1097 RMD160 eba74dba5b9dca69f3a211d722a81ad20ecc9399 SHA1 f0a00f9f895909e4f17ce13cee64a6b5f2676c7c SHA256 944b31092a49b7d386aeedffd8b7398c9f927439e06cb2ffd8cf67fb2b914808
+AUX prosody.initd 1062 RMD160 2e9ba3ba0e759355ec07fc16782f17b74074c6d5 SHA1 a62d975b12e0bd485c80ccfcca8d6a6e6c09fc8d SHA256 6b88ffcf2fd7a38030480073b19f99e8dc078e6008e8adf8f9e00827a37b7981
 DIST prosody-0.7.0.tar.gz 177412 RMD160 2e40b4f807b6120971c611f52d4df3264a82cbb9 SHA1 3f3a6c4f262a062a9c027cc843cd6827104fb8ba SHA256 a8b826805dd55282706c5683c2028899b3721eb0f84d3e35c0509a6c1bc32390
-DIST prosody-0.8.0rc2.tar.gz 210391 RMD160 93e3925c575cabbd399b5b0460c141dd03513c45 SHA1 5442e8bb8de95c55c24324d5c57d04d51c6b14a7 SHA256 75c0124044aebfb0a5567fe7d106288f25070796b0f81c256d076db7c3a4f6d8
+DIST prosody-0.8.0.tar.gz 210945 RMD160 98817b1f40c6fd9ab402b70f73dae308e5990cdc SHA1 f20baab36bd2570825a24f49e0643cb9c2a65541 SHA256 0b9e39a6b555b4c848af288f27107e99b1480d9733556a2c9b3a9f249eba602d
 EBUILD prosody-0.7.0.ebuild 2082 RMD160 c143b7de9495f3bb068bc89e98aea552fa669846 SHA1 2f0de036674b644e6386923f679f690d9b831a99 SHA256 5d4efc6be5fda92dd4ead4d13a8ca801be47a7335d522114e589813a586e4bf2
-EBUILD prosody-0.8.0_rc2.ebuild 1949 RMD160 8ba5b685668420af29dda22949ae8b447152b6b2 SHA1 8ea50d5e055bca1f431b70c0d9254c5cb5602551 SHA256 85ad54ca9c4b9d94ed8220f7995e45c05be92384d5fae166367bcb9b6dc593ea
+EBUILD prosody-0.8.0.ebuild 2036 RMD160 64fece90eb5d15dd5a1622a248b91e2376093923 SHA1 869720f93cfa6a95490963ddeea35591e65ccf61 SHA256 005bf1e6d4e34b432eb15dd194166554e0b967ff571bceb8d2bb6dfd41af8915
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 0000000..a5cbab2
--- /dev/null
+++ b/net-im/prosody/files/prosody-0.8.0.cfg.lua.patch
@@ -0,0 +1,26 @@
+--- prosody.cfg.lua.dist.old	2011-01-13 02:29:32.000000000 +0100
++++ prosody.cfg.lua.dist	2011-01-14 17:17:28.000000000 +0100
+@@ -114,15 +114,20 @@
+ -- to update the logrotate config at /etc/logrotate.d/prosody
+ log = {
+         -- Log all error messages to prosody.err
+-	error = "/var/log/prosody/prosody.err";
++	error = "/var/log/jabber/prosody.err";
+         -- Log everything of level "info" and higher (that is, all except "debug" messages)
+         -- to prosody.log
+-        info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for more verbose logging
++        info = "/var/log/jabber/prosody.log"; -- Change 'info' to 'debug' for more verbose logging
+         --"*syslog"; -- Uncomment this for logging to syslog
+ }
+ 
+ -- Pidfile, used by prosodyctl and the init.d script
+-pidfile = "/var/run/prosody/prosody.pid";
++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.
diff --git a/net-im/prosody/files/prosody.initd b/net-im/prosody/files/prosody.initd
index 02a1fdc..9cb1340 100644
--- a/net-im/prosody/files/prosody.initd
+++ b/net-im/prosody/files/prosody.initd
@@ -1,14 +1,14 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/prosody/files/prosody.initd,v 1.1 2010/05/27 11:47:12 djc Exp $
+# $Header: $
 
 description="Prosody is a server for Jabber/XMPP written in Lua."
 description_reload="Reload configuration and reopen log files."
 extra_started_commands="reload"
 
 PIDFILE="/var/run/jabber/prosody.pid"
-USER="jabber"
+USER="jabber:jabber"
 COMMAND="/usr/bin/prosody"
 
 depend() {
diff --git a/net-im/prosody/prosody-0.8.0_rc2.ebuild b/net-im/prosody/prosody-0.8.0.ebuild
index 170dff1..75bf13b 100644
--- a/net-im/prosody/prosody-0.8.0_rc2.ebuild
+++ b/net-im/prosody/prosody-0.8.0.ebuild
@@ -9,24 +9,25 @@ 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/tmp/${MY_PV}/${PN}-${MY_PV}.tar.gz"
+SRC_URI="http://prosody.im/downloads/source/${PN}-${MY_PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="libevent ssl +zlib"
+IUSE="libevent ssl sql +zlib"
 
 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 )
-		>=net-dns/libidn-1.1
-		>=dev-libs/openssl-0.9.8"
-RDEPEND="${DEPEND}
-		 zlib? ( dev-lua/lua-zlib )"
+		zlib? ( dev-lua/lua-zlib )"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
@@ -34,6 +35,7 @@ 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