commit: 662442766088cf5b1e0445a69c730b031ebec333
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Thu Oct 30 13:32:46 2014 +0000
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Thu Oct 30 13:32:46 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=66244276
[net-im/prosody,{,-modules}] bump
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>
---
net-im/prosody-modules/prosody-modules-9999.ebuild | 7 -------
net-im/prosody/prosody-9999.ebuild | 22 +++++++++++++++++-----
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/net-im/prosody-modules/prosody-modules-9999.ebuild
b/net-im/prosody-modules/prosody-modules-9999.ebuild
index ad3397e..e085c17 100644
--- a/net-im/prosody-modules/prosody-modules-9999.ebuild
+++ b/net-im/prosody-modules/prosody-modules-9999.ebuild
@@ -123,13 +123,6 @@ RDEPEND="
)
dev-lua/yubikey-lua
)
- prosody_modules_websocket? (
- || (
- >=dev-lang/lua-5.2
- dev-lang/luajit:2
- dev-lua/LuaBitOp
- )
- )
prosody_modules_auth_dovecot? (
dev-lua/luasocket
)
diff --git a/net-im/prosody/prosody-9999.ebuild
b/net-im/prosody/prosody-9999.ebuild
index a6201a3..7143445 100644
--- a/net-im/prosody/prosody-9999.ebuild
+++ b/net-im/prosody/prosody-9999.ebuild
@@ -13,14 +13,27 @@ EHG_REPO_URI="http://hg.prosody.im/trunk";
LICENSE="MIT"
SLOT="0"
KEYWORDS=""
-IUSE="doc +libevent mysql postgres sqlite +ssl +zlib luajit ipv6 migration"
+IUSE="doc +libevent mysql postgres sqlite +ssl +zlib luajit ipv6 migration
-lua52"
DEPEND="
- || ( dev-lang/luajit:2 =dev-lang/lua-5.1* )
+ luajit? (
+ dev-lang/luajit:2
+ )
+ !luajit? (
+ lua52? (
+ =dev-lang/lua-5.2*
+ )
+ !lua52? (
+ =dev-lang/lua-5.1*
+ dev-lua/LuaBitOp
+ )
+ )
net-im/jabber-base
- luajit? ( dev-lang/luajit:2 )
>=net-dns/libidn-1.1
- >=dev-libs/openssl-0.9.8
+ || (
+ >=dev-libs/openssl-0.9.8z
+ >=dev-libs/openssl-1.0.1j
+ )
"
RDEPEND="
@@ -92,7 +105,6 @@ src_compile() {
src_install() {
default
-# DESTDIR="${D}" emake install || die "make failed"
newinitd "${FILESDIR}/${PN}".initd "${PN}"
insinto /etc/logrotate.d
newins "${FILESDIR}/${PN}".logrotate "${PN}"
