| 1 |
commit: a1d26a436c130c3d8b06d86efe81de2ff3fe2b6a |
| 2 |
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 2 17:11:30 2018 +0000 |
| 4 |
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 2 17:11:30 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1d26a43 |
| 7 |
|
| 8 |
net-im/prosody: Add v0.11.1, cleanup v0.11.0-r0 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 11 |
Signed-off-by: Tobias Klausmann <klausman <AT> gentoo.org> |
| 12 |
|
| 13 |
net-im/prosody/Manifest | 1 + |
| 14 |
...prosody-0.11.0.ebuild => prosody-0.11.1.ebuild} | 25 ++++++++++------------ |
| 15 |
2 files changed, 12 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest |
| 18 |
index 21822501c77..98b2a1896d0 100644 |
| 19 |
--- a/net-im/prosody/Manifest |
| 20 |
+++ b/net-im/prosody/Manifest |
| 21 |
@@ -1,3 +1,4 @@ |
| 22 |
DIST prosody-0.10.2.tar.gz 331874 BLAKE2B 0e0af95a9168810263e6f60b825393d1088f69dba1faabf6c0c9dda3ef6b039a92f7edb9643cb9a60a3131a64038de5c3598f7076837b58ad196ac03fa98bfc4 SHA512 9fc05e34b45b0c16835ba94a73532fb3b4ee335f27d56bb9260e1b3e22614f89f44eb5d04b4e90d016db0b5bee6f5c7e7d099e1defb027e6823ee7667c1fe28f |
| 23 |
DIST prosody-0.11.0.tar.gz 418710 BLAKE2B 2a9af1edbd77d3ef8f629ed5855a6638929bd0476d5245c0ef3ec6e2d840fda3a8b733bcfe35b7603057caa23576e0ec344d244d0c1678e28aa41badb75b6170 SHA512 292f555a25108716cd3ceb8ab39210bcb7f2fd113bd844092a51f68127e59b64ec76045740fd93edca8be2c1711a5fbab0f51a285f3ab78d36423a897ea667bf |
| 24 |
+DIST prosody-0.11.1.tar.gz 418780 BLAKE2B 0fa45b71bb7eeaa60385683427c9547af3e014faa97dec409cc19e48bfd1b91fec7eb001fb14a86c9f3ce2c653ece2fdb113bba860cdc500cb164dd7749af6cc SHA512 6e25d2365d40582f57799bb08bf2673ba43270e8bcca5c5b785381380db55ec3ea6ab771fb9bd228bf265a564bb017dbfeae81713abd2de35a92704f8b8004ef |
| 25 |
DIST prosody-0.9.14.tar.gz 268253 BLAKE2B 0ae62ca3c8eb89feb34f1f67aa3d14aa1e6bf02cf10ff90a43fd7de8bd257d70508e36b10b3f159040c1fa5dcfb6ad8018e3411a5d6042992f71f643a13c11d4 SHA512 30116ebc20c719d88bae7f2f44c129604ec4477004581c3556ff548c75ee026a83dc519701a61a8c3f547776ba74c571e38c3e1e5240da9148dad35a5d1f67e3 |
| 26 |
|
| 27 |
diff --git a/net-im/prosody/prosody-0.11.0.ebuild b/net-im/prosody/prosody-0.11.1.ebuild |
| 28 |
similarity index 83% |
| 29 |
rename from net-im/prosody/prosody-0.11.0.ebuild |
| 30 |
rename to net-im/prosody/prosody-0.11.1.ebuild |
| 31 |
index 7ccfe253a71..eccd2e1da7b 100644 |
| 32 |
--- a/net-im/prosody/prosody-0.11.0.ebuild |
| 33 |
+++ b/net-im/prosody/prosody-0.11.1.ebuild |
| 34 |
@@ -8,8 +8,8 @@ inherit flag-o-matic multilib systemd |
| 35 |
MY_PV=$(ver_rs 3 '') |
| 36 |
MY_P="${PN}-${MY_PV}" |
| 37 |
DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua" |
| 38 |
-HOMEPAGE="http://prosody.im/" |
| 39 |
-SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz" |
| 40 |
+HOMEPAGE="https://prosody.im/" |
| 41 |
+SRC_URI="https://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz" |
| 42 |
|
| 43 |
LICENSE="MIT" |
| 44 |
SLOT="0" |
| 45 |
@@ -20,7 +20,7 @@ DEPEND="net-im/jabber-base |
| 46 |
dev-lua/LuaBitOp |
| 47 |
!jit? ( >=dev-lang/lua-5.1:0 ) |
| 48 |
jit? ( dev-lang/luajit:2 ) |
| 49 |
- >=net-dns/libidn-1.1 |
| 50 |
+ >=net-dns/libidn-1.1:= |
| 51 |
!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )" |
| 52 |
RDEPEND="${DEPEND} |
| 53 |
>=dev-lua/luaexpat-1.3.0 |
| 54 |
@@ -53,18 +53,15 @@ src_configure() { |
| 55 |
# the configure script is handcrafted (and yells at unknown options) |
| 56 |
# hence do not use 'econf' |
| 57 |
append-cflags -D_GNU_SOURCE |
| 58 |
- luajit="" |
| 59 |
- if use jit; then |
| 60 |
- luajit="--runwith=luajit" |
| 61 |
- fi |
| 62 |
./configure \ |
| 63 |
- --ostype=linux $luajit \ |
| 64 |
+ --ostype=linux \ |
| 65 |
--prefix="${EPREFIX}/usr" \ |
| 66 |
- --libdir="${EPREFIX}/usr/lib64" \ |
| 67 |
- --sysconfdir="${JABBER_ETC}" \ |
| 68 |
- --datadir="${JABBER_SPOOL}" \ |
| 69 |
- --with-lua-include=/usr/include \ |
| 70 |
- --with-lua-lib=/usr/$(get_libdir)/lua \ |
| 71 |
+ --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
| 72 |
+ --sysconfdir="${EPREFIX}/${JABBER_ETC}" \ |
| 73 |
+ --datadir="${EPREFIX}/${JABBER_SPOOL}" \ |
| 74 |
+ --with-lua-include="${EPREFIX}/usr/include" \ |
| 75 |
+ --with-lua-lib="${EPREFIX}/usr/$(get_libdir)/lua" \ |
| 76 |
+ --runwith=lua"$(usev jit)" \ |
| 77 |
--cflags="${CFLAGS} -Wall -fPIC" \ |
| 78 |
--ldflags="${LDFLAGS} -shared" \ |
| 79 |
--c-compiler="$(tc-getCC)" \ |
| 80 |
@@ -76,7 +73,7 @@ src_install() { |
| 81 |
systemd_dounit "${FILESDIR}/${PN}".service |
| 82 |
systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf |
| 83 |
newinitd "${FILESDIR}/${PN}".initd-r2 ${PN} |
| 84 |
- keepdir /var/spool/jabber |
| 85 |
+ keepdir "${JABBER_SPOOL}" |
| 86 |
} |
| 87 |
|
| 88 |
pkg_postinst() { |
Archives