commit:     2e9e90ba5fec70fa35c7bc27d07396a6eb552f47
Author:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Thu Feb 26 10:01:26 2015 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Thu Feb 26 10:01:26 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=2e9e90ba

[net-im/prosody] Bump + fix erlparse install path

Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>

---
 net-im/prosody/Manifest                                       | 2 +-
 net-im/prosody/{prosody-0.9.1.ebuild => prosody-0.9.7.ebuild} | 6 ++++--
 net-im/prosody/prosody-9999.ebuild                            | 5 ++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 7cec894..2b3093b 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1 +1 @@
-DIST prosody-0.9.1.tar.gz 265755 SHA256 
6cdea6fd6027bec621f7995709ca825a29aa5e066b321bfbb7785925c9f32cd5 SHA512 
dbd0d8476f0abb4030f8c1ac68786cde2dd68bc2e6602ba8ea27b7d23f2010f963dd3ff50e0a6e7780bddfba014c7bbd1fa0c607d070d979131c15431e04c3fa
 WHIRLPOOL 
b07ff97008207a24e00ed051f6c7bab77200b8ae6c4b2cec95cdca25c1227600075e7cd240ed57f7cb07764239e72d545002e976c794f9434d13b0597d35ad61
+DIST prosody-0.9.7.tar.gz 266638 SHA256 
dd4b99b39976442055898c933c013598e558beed11d7795d76ffc0f1a87e2e00 SHA512 
fc1f0855e7af2132058af493bb9af20f9f1aa3051e6d8550ba9942264d85dc6840085b17e2a0226d4015745407f445c691455d998c4a43a3a9aa2d036a01ce9e
 WHIRLPOOL 
5de40437be364856acbcaa2553aa54119bd46ed0afda9127211ff65ad9b4acea8b7a447452c7555ecfb9a58266cca319ecc2eb2a4959cb4e2390dc99dcf20b82

diff --git a/net-im/prosody/prosody-0.9.1.ebuild 
b/net-im/prosody/prosody-0.9.7.ebuild
similarity index 95%
rename from net-im/prosody/prosody-0.9.1.ebuild
rename to net-im/prosody/prosody-0.9.7.ebuild
index 0cff454..c3e6fd9 100644
--- a/net-im/prosody/prosody-0.9.1.ebuild
+++ b/net-im/prosody/prosody-0.9.7.ebuild
@@ -9,7 +9,7 @@ inherit eutils multilib toolchain-funcs versionator
 DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP 
written in Lua."
 HOMEPAGE="http://prosody.im/";
 
-SRC_URI="https://prosody.im/downloads/source/prosody-0.9.1.tar.gz";
+SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz";
 
 LICENSE="MIT"
 SLOT="0"
@@ -92,6 +92,8 @@ src_compile() {
 }
 
 src_install() {
+       local lua=lua
+       use luajit && lua=luajit
        default
 #      DESTDIR="${D}" emake install || die "make failed"
        newinitd "${FILESDIR}/${PN}".initd "${PN}"
@@ -103,7 +105,7 @@ src_install() {
                DESTDIR="${D}" emake install || die "migrator install failed"
                cd "${S}"
                rm -rf tools/migration
-               insinto $($(tc-getPKG_CONFIG) lua --variable INSTALL_LMOD)
+               insinto $($(tc-getPKG_CONFIG) ${lua} --variable INSTALL_LMOD)
                doins tools/erlparse.lua
                rm tools/erlparse.lua
                fowners "jabber:jabber" -R "/usr/$(get_libdir)/${PN}"

diff --git a/net-im/prosody/prosody-9999.ebuild 
b/net-im/prosody/prosody-9999.ebuild
index 7143445..9671253 100644
--- a/net-im/prosody/prosody-9999.ebuild
+++ b/net-im/prosody/prosody-9999.ebuild
@@ -104,6 +104,9 @@ src_compile() {
 }
 
 src_install() {
+       local lua=lua
+       use luajit && lua=luajit
+
        default
        newinitd "${FILESDIR}/${PN}".initd "${PN}"
        insinto /etc/logrotate.d
@@ -114,7 +117,7 @@ src_install() {
                DESTDIR="${D}" emake install || die "migrator install failed"
                cd "${S}"
                rm -rf tools/migration
-               insinto $($(tc-getPKG_CONFIG) lua --variable INSTALL_LMOD)
+               insinto $($(tc-getPKG_CONFIG) ${lua} --variable INSTALL_LMOD)
                doins tools/erlparse.lua
                rm tools/erlparse.lua
                fowners "jabber:jabber" -R "/usr/$(get_libdir)/${PN}"

Reply via email to