Gentoo Archives: gentoo-commits

From: "Vadim A. Misbakh-Soloviov" <mva@×××.name>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/lua:master commit in: net-im/prosody/
Date: Thu, 26 Feb 2015 10:42:34
Message-Id: 1424944886.2e9e90ba5fec70fa35c7bc27d07396a6eb552f47.mva@gentoo
1 commit: 2e9e90ba5fec70fa35c7bc27d07396a6eb552f47
2 Author: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
3 AuthorDate: Thu Feb 26 10:01:26 2015 +0000
4 Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
5 CommitDate: Thu Feb 26 10:01:26 2015 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/lua.git;a=commit;h=2e9e90ba
7
8 [net-im/prosody] Bump + fix erlparse install path
9
10 Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>
11
12 ---
13 net-im/prosody/Manifest | 2 +-
14 net-im/prosody/{prosody-0.9.1.ebuild => prosody-0.9.7.ebuild} | 6 ++++--
15 net-im/prosody/prosody-9999.ebuild | 5 ++++-
16 3 files changed, 9 insertions(+), 4 deletions(-)
17
18 diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
19 index 7cec894..2b3093b 100644
20 --- a/net-im/prosody/Manifest
21 +++ b/net-im/prosody/Manifest
22 @@ -1 +1 @@
23 -DIST prosody-0.9.1.tar.gz 265755 SHA256 6cdea6fd6027bec621f7995709ca825a29aa5e066b321bfbb7785925c9f32cd5 SHA512 dbd0d8476f0abb4030f8c1ac68786cde2dd68bc2e6602ba8ea27b7d23f2010f963dd3ff50e0a6e7780bddfba014c7bbd1fa0c607d070d979131c15431e04c3fa WHIRLPOOL b07ff97008207a24e00ed051f6c7bab77200b8ae6c4b2cec95cdca25c1227600075e7cd240ed57f7cb07764239e72d545002e976c794f9434d13b0597d35ad61
24 +DIST prosody-0.9.7.tar.gz 266638 SHA256 dd4b99b39976442055898c933c013598e558beed11d7795d76ffc0f1a87e2e00 SHA512 fc1f0855e7af2132058af493bb9af20f9f1aa3051e6d8550ba9942264d85dc6840085b17e2a0226d4015745407f445c691455d998c4a43a3a9aa2d036a01ce9e WHIRLPOOL 5de40437be364856acbcaa2553aa54119bd46ed0afda9127211ff65ad9b4acea8b7a447452c7555ecfb9a58266cca319ecc2eb2a4959cb4e2390dc99dcf20b82
25
26 diff --git a/net-im/prosody/prosody-0.9.1.ebuild b/net-im/prosody/prosody-0.9.7.ebuild
27 similarity index 95%
28 rename from net-im/prosody/prosody-0.9.1.ebuild
29 rename to net-im/prosody/prosody-0.9.7.ebuild
30 index 0cff454..c3e6fd9 100644
31 --- a/net-im/prosody/prosody-0.9.1.ebuild
32 +++ b/net-im/prosody/prosody-0.9.7.ebuild
33 @@ -9,7 +9,7 @@ inherit eutils multilib toolchain-funcs versionator
34 DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua."
35 HOMEPAGE="http://prosody.im/"
36
37 -SRC_URI="https://prosody.im/downloads/source/prosody-0.9.1.tar.gz"
38 +SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
39
40 LICENSE="MIT"
41 SLOT="0"
42 @@ -92,6 +92,8 @@ src_compile() {
43 }
44
45 src_install() {
46 + local lua=lua
47 + use luajit && lua=luajit
48 default
49 # DESTDIR="${D}" emake install || die "make failed"
50 newinitd "${FILESDIR}/${PN}".initd "${PN}"
51 @@ -103,7 +105,7 @@ src_install() {
52 DESTDIR="${D}" emake install || die "migrator install failed"
53 cd "${S}"
54 rm -rf tools/migration
55 - insinto $($(tc-getPKG_CONFIG) lua --variable INSTALL_LMOD)
56 + insinto $($(tc-getPKG_CONFIG) ${lua} --variable INSTALL_LMOD)
57 doins tools/erlparse.lua
58 rm tools/erlparse.lua
59 fowners "jabber:jabber" -R "/usr/$(get_libdir)/${PN}"
60
61 diff --git a/net-im/prosody/prosody-9999.ebuild b/net-im/prosody/prosody-9999.ebuild
62 index 7143445..9671253 100644
63 --- a/net-im/prosody/prosody-9999.ebuild
64 +++ b/net-im/prosody/prosody-9999.ebuild
65 @@ -104,6 +104,9 @@ src_compile() {
66 }
67
68 src_install() {
69 + local lua=lua
70 + use luajit && lua=luajit
71 +
72 default
73 newinitd "${FILESDIR}/${PN}".initd "${PN}"
74 insinto /etc/logrotate.d
75 @@ -114,7 +117,7 @@ src_install() {
76 DESTDIR="${D}" emake install || die "migrator install failed"
77 cd "${S}"
78 rm -rf tools/migration
79 - insinto $($(tc-getPKG_CONFIG) lua --variable INSTALL_LMOD)
80 + insinto $($(tc-getPKG_CONFIG) ${lua} --variable INSTALL_LMOD)
81 doins tools/erlparse.lua
82 rm tools/erlparse.lua
83 fowners "jabber:jabber" -R "/usr/$(get_libdir)/${PN}"