| 1 |
commit: 4d9f60d2fb26eb73eb2fdf22b4350cab78bed121 |
| 2 |
Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
| 3 |
AuthorDate: Wed May 22 21:56:00 2013 +0000 |
| 4 |
Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name> |
| 5 |
CommitDate: Wed May 22 21:56:00 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=4d9f60d2 |
| 7 |
|
| 8 |
[net-im/prosody] prosody ebuild fixes |
| 9 |
|
| 10 |
Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name> |
| 11 |
|
| 12 |
--- |
| 13 |
net-im/prosody/prosody-9999.ebuild | 68 +++++++++++++++++++++-------------- |
| 14 |
1 files changed, 41 insertions(+), 27 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-im/prosody/prosody-9999.ebuild b/net-im/prosody/prosody-9999.ebuild |
| 17 |
index 9e6181c..db7b560 100644 |
| 18 |
--- a/net-im/prosody/prosody-9999.ebuild |
| 19 |
+++ b/net-im/prosody/prosody-9999.ebuild |
| 20 |
@@ -6,7 +6,6 @@ EAPI="5" |
| 21 |
|
| 22 |
inherit eutils multilib toolchain-funcs versionator mercurial |
| 23 |
|
| 24 |
-MY_PV=$(replace_version_separator 3 '') |
| 25 |
DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua." |
| 26 |
HOMEPAGE="http://prosody.im/" |
| 27 |
EHG_REPO_URI="http://hg.prosody.im/trunk" |
| 28 |
@@ -14,30 +13,38 @@ EHG_REPO_URI="http://hg.prosody.im/trunk" |
| 29 |
LICENSE="MIT" |
| 30 |
SLOT="0" |
| 31 |
KEYWORDS="" |
| 32 |
-IUSE="+libevent mysql postgres sqlite +ssl +zlib +luajit ipv6 migration" |
| 33 |
- |
| 34 |
-DEPEND=" virtual/lua |
| 35 |
- net-im/jabber-base |
| 36 |
- luajit? ( dev-lang/luajit:2 ) |
| 37 |
- >=net-dns/libidn-1.1 |
| 38 |
- >=dev-libs/openssl-0.9.8" |
| 39 |
-RDEPEND="${DEPEND} |
| 40 |
- dev-lua/luasocket |
| 41 |
- ipv6? ( =dev-lua/luasocket-9999 ) |
| 42 |
- ssl? ( dev-lua/luasec ) |
| 43 |
- dev-lua/luaexpat |
| 44 |
- dev-lua/luafilesystem |
| 45 |
- mysql? ( >=dev-lua/luadbi-0.5[mysql] ) |
| 46 |
- postgres? ( >=dev-lua/luadbi-0.5[postgres] ) |
| 47 |
- sqlite? ( >=dev-lua/luadbi-0.5[sqlite] ) |
| 48 |
- libevent? ( dev-lua/luaevent ) |
| 49 |
- zlib? ( dev-lua/lua-zlib )" |
| 50 |
- |
| 51 |
-S="${WORKDIR}/${PN}-${MY_PV}" |
| 52 |
+IUSE="doc +libevent mysql postgres sqlite +ssl +zlib luajit ipv6 migration" |
| 53 |
+ |
| 54 |
+DEPEND=" |
| 55 |
+ || ( dev-lang/luajit:2 =dev-lang/lua-5.1* ) |
| 56 |
+ net-im/jabber-base |
| 57 |
+ luajit? ( dev-lang/luajit:2 ) |
| 58 |
+ >=net-dns/libidn-1.1 |
| 59 |
+ >=dev-libs/openssl-0.9.8 |
| 60 |
+" |
| 61 |
+ |
| 62 |
+RDEPEND=" |
| 63 |
+ ${DEPEND} |
| 64 |
+ dev-lua/luasocket |
| 65 |
+ ipv6? ( =dev-lua/luasocket-9999 ) |
| 66 |
+ ssl? ( =dev-lua/luasec-9999 ) |
| 67 |
+ dev-lua/luaexpat |
| 68 |
+ dev-lua/luafilesystem |
| 69 |
+ mysql? ( >=dev-lua/luadbi-0.5[mysql] ) |
| 70 |
+ postgres? ( >=dev-lua/luadbi-0.5[postgres] ) |
| 71 |
+ sqlite? ( >=dev-lua/luadbi-0.5[sqlite] ) |
| 72 |
+ libevent? ( dev-lua/luaevent ) |
| 73 |
+ zlib? ( dev-lua/lua-zlib ) |
| 74 |
+" |
| 75 |
+ |
| 76 |
+S="${WORKDIR}/${P}" |
| 77 |
|
| 78 |
JABBER_ETC="/etc/jabber" |
| 79 |
JABBER_SPOOL="/var/spool/jabber" |
| 80 |
|
| 81 |
+ |
| 82 |
+DOCS=( -r doc/ HACKERS AUTHORS ) |
| 83 |
+ |
| 84 |
src_prepare() { |
| 85 |
epatch "${FILESDIR}/${PN}-0.8.0-cfg.lua.patch" |
| 86 |
sed -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!" -i Makefile |
| 87 |
@@ -46,13 +53,16 @@ src_prepare() { |
| 88 |
sed -e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!" -i Makefile |
| 89 |
sed -e 's!\(os.execute(\)\(CFG_SOURCEDIR.."/../../bin/prosody"\)\();\)!\1"/usr/bin/prosody"\3!' -i util/prosodyctl.lua |
| 90 |
sed -e 's!\(desired_user = .* or "\)\(prosody\)\(";\)!\1jabber\3!' -i prosodyctl |
| 91 |
- use luajit && sed -e "s!\(/usr/bin/env\) lua!\1 luajit!" -i prosody -i prosodyctl |
| 92 |
} |
| 93 |
|
| 94 |
src_configure() { |
| 95 |
- use luajit && \ |
| 96 |
- myconf="--with-lua-include=$($(tc-getPKG_CONFIG) --variable includedir luajit)" || \ |
| 97 |
- myconf="--with-lua-include=$($(tc-getPKG_CONFIG) --variable includedir lua)" |
| 98 |
+ local lua=lua; |
| 99 |
+ |
| 100 |
+ use luajit && { |
| 101 |
+ myconf="--lua-suffix=jit" |
| 102 |
+ lua=luajit; |
| 103 |
+ } |
| 104 |
+ |
| 105 |
# the configure script is handcrafted (and yells at unknown options) |
| 106 |
# hence do not use 'econf' |
| 107 |
./configure --prefix="/usr" \ |
| 108 |
@@ -61,8 +71,10 @@ src_configure() { |
| 109 |
--datadir="${JABBER_SPOOL}" \ |
| 110 |
--with-lua-lib=/usr/$(get_libdir) \ |
| 111 |
--c-compiler="$(tc-getCC)" --linker="$(tc-getCC)" \ |
| 112 |
- --cflags="${CFLAGS} -Wall -fPIC" \ |
| 113 |
+ --cflags="${CFLAGS} -Wall -fPIC -D_GNU_SOURCE" \ |
| 114 |
--ldflags="${LDFLAGS} -shared" \ |
| 115 |
+ --runwith="${lua}" \ |
| 116 |
+ --with-lua-include="$($(tc-getPKG_CONFIG) --variable includedir ${lua})" \ |
| 117 |
--require-config "${myconf}" || die "configure failed" |
| 118 |
} |
| 119 |
|
| 120 |
@@ -75,10 +87,12 @@ src_compile() { |
| 121 |
} |
| 122 |
|
| 123 |
src_install() { |
| 124 |
- DESTDIR="${D}" emake install || die "make failed" |
| 125 |
+ default |
| 126 |
+# DESTDIR="${D}" emake install || die "make failed" |
| 127 |
newinitd "${FILESDIR}/${PN}".initd "${PN}" |
| 128 |
insinto /etc/logrotate.d |
| 129 |
newins "${FILESDIR}/${PN}".logrotate "${PN}" |
| 130 |
+ |
| 131 |
use migration && ( |
| 132 |
cd "${S}/tools/migration" |
| 133 |
DESTDIR="${D}" emake install || die "migrator install failed" |
Archives