| 1 |
commit: 662442766088cf5b1e0445a69c730b031ebec333 |
| 2 |
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
| 3 |
AuthorDate: Thu Oct 30 13:32:46 2014 +0000 |
| 4 |
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
| 5 |
CommitDate: Thu Oct 30 13:32:46 2014 +0000 |
| 6 |
URL: http://sources.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=66244276 |
| 7 |
|
| 8 |
[net-im/prosody,{,-modules}] bump |
| 9 |
|
| 10 |
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name> |
| 11 |
|
| 12 |
--- |
| 13 |
net-im/prosody-modules/prosody-modules-9999.ebuild | 7 ------- |
| 14 |
net-im/prosody/prosody-9999.ebuild | 22 +++++++++++++++++----- |
| 15 |
2 files changed, 17 insertions(+), 12 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-im/prosody-modules/prosody-modules-9999.ebuild b/net-im/prosody-modules/prosody-modules-9999.ebuild |
| 18 |
index ad3397e..e085c17 100644 |
| 19 |
--- a/net-im/prosody-modules/prosody-modules-9999.ebuild |
| 20 |
+++ b/net-im/prosody-modules/prosody-modules-9999.ebuild |
| 21 |
@@ -123,13 +123,6 @@ RDEPEND=" |
| 22 |
) |
| 23 |
dev-lua/yubikey-lua |
| 24 |
) |
| 25 |
- prosody_modules_websocket? ( |
| 26 |
- || ( |
| 27 |
- >=dev-lang/lua-5.2 |
| 28 |
- dev-lang/luajit:2 |
| 29 |
- dev-lua/LuaBitOp |
| 30 |
- ) |
| 31 |
- ) |
| 32 |
prosody_modules_auth_dovecot? ( |
| 33 |
dev-lua/luasocket |
| 34 |
) |
| 35 |
|
| 36 |
diff --git a/net-im/prosody/prosody-9999.ebuild b/net-im/prosody/prosody-9999.ebuild |
| 37 |
index a6201a3..7143445 100644 |
| 38 |
--- a/net-im/prosody/prosody-9999.ebuild |
| 39 |
+++ b/net-im/prosody/prosody-9999.ebuild |
| 40 |
@@ -13,14 +13,27 @@ EHG_REPO_URI="http://hg.prosody.im/trunk" |
| 41 |
LICENSE="MIT" |
| 42 |
SLOT="0" |
| 43 |
KEYWORDS="" |
| 44 |
-IUSE="doc +libevent mysql postgres sqlite +ssl +zlib luajit ipv6 migration" |
| 45 |
+IUSE="doc +libevent mysql postgres sqlite +ssl +zlib luajit ipv6 migration -lua52" |
| 46 |
|
| 47 |
DEPEND=" |
| 48 |
- || ( dev-lang/luajit:2 =dev-lang/lua-5.1* ) |
| 49 |
+ luajit? ( |
| 50 |
+ dev-lang/luajit:2 |
| 51 |
+ ) |
| 52 |
+ !luajit? ( |
| 53 |
+ lua52? ( |
| 54 |
+ =dev-lang/lua-5.2* |
| 55 |
+ ) |
| 56 |
+ !lua52? ( |
| 57 |
+ =dev-lang/lua-5.1* |
| 58 |
+ dev-lua/LuaBitOp |
| 59 |
+ ) |
| 60 |
+ ) |
| 61 |
net-im/jabber-base |
| 62 |
- luajit? ( dev-lang/luajit:2 ) |
| 63 |
>=net-dns/libidn-1.1 |
| 64 |
- >=dev-libs/openssl-0.9.8 |
| 65 |
+ || ( |
| 66 |
+ >=dev-libs/openssl-0.9.8z |
| 67 |
+ >=dev-libs/openssl-1.0.1j |
| 68 |
+ ) |
| 69 |
" |
| 70 |
|
| 71 |
RDEPEND=" |
| 72 |
@@ -92,7 +105,6 @@ src_compile() { |
| 73 |
|
| 74 |
src_install() { |
| 75 |
default |
| 76 |
-# DESTDIR="${D}" emake install || die "make failed" |
| 77 |
newinitd "${FILESDIR}/${PN}".initd "${PN}" |
| 78 |
insinto /etc/logrotate.d |
| 79 |
newins "${FILESDIR}/${PN}".logrotate "${PN}" |
Archives