| 1 |
commit: 146f1b68442e05824d26cd47a9d06de9e43b2f64 |
| 2 |
Author: Tobias Klausmann <klausman <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 1 12:37:45 2019 +0000 |
| 4 |
Commit: Tobias Klausmann <klausman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 1 14:38:30 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=146f1b68 |
| 7 |
|
| 8 |
net-im/prosody: add v0.11.3 and clean up old versions |
| 9 |
|
| 10 |
New build provided by xdch47 in GH PR 13507 |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/699070 |
| 13 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
| 14 |
Signed-off-by: Tobias Klausmann <klausman <AT> gentoo.org> |
| 15 |
|
| 16 |
net-im/prosody/Manifest | 2 +- |
| 17 |
net-im/prosody/prosody-0.11.1.ebuild | 86 ---------------------- |
| 18 |
...prosody-0.11.2.ebuild => prosody-0.11.3.ebuild} | 41 ++++------- |
| 19 |
3 files changed, 14 insertions(+), 115 deletions(-) |
| 20 |
|
| 21 |
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest |
| 22 |
index 048bc0cc99b..6e4ead82155 100644 |
| 23 |
--- a/net-im/prosody/Manifest |
| 24 |
+++ b/net-im/prosody/Manifest |
| 25 |
@@ -1,3 +1,3 @@ |
| 26 |
-DIST prosody-0.11.1.tar.gz 418780 BLAKE2B 0fa45b71bb7eeaa60385683427c9547af3e014faa97dec409cc19e48bfd1b91fec7eb001fb14a86c9f3ce2c653ece2fdb113bba860cdc500cb164dd7749af6cc SHA512 6e25d2365d40582f57799bb08bf2673ba43270e8bcca5c5b785381380db55ec3ea6ab771fb9bd228bf265a564bb017dbfeae81713abd2de35a92704f8b8004ef |
| 27 |
DIST prosody-0.11.2.tar.gz 420689 BLAKE2B 3abdab188f66d4eccb21d0981b57d5015605a1257074bbd67098a8624f40a11960fb65a7f56a7d1421a23bfffdb34635eeac5d013c4b7d7d957c51cdff2276c1 SHA512 22e55a551a40c92f38a1ed1de5fdcad574d699d58c2e27f93c3d465b55487b8e923c2ba088daf93c7140cbafb0d429687e0b662c8bb1c1aba4b79ac1ea271cd1 |
| 28 |
+DIST prosody-0.11.3.tar.gz 424098 BLAKE2B 58196234bced12ad84943763c48cdb6fa88b2bfd6390bf12d6bd0aec4f8905784ca5775d8fb55dc3ffe3bf22767742e2d62e859e3f2f9d08c65c9f8016036df0 SHA512 07239433c7c65184ca24d665c92b787ff9e4a5ee190ab90dede802ffd2cbd97855356d818858871e62284e9923f485b3468ab1baed5d3fb13aac0551a38967eb |
| 29 |
DIST prosody-0.9.14.tar.gz 268253 BLAKE2B 0ae62ca3c8eb89feb34f1f67aa3d14aa1e6bf02cf10ff90a43fd7de8bd257d70508e36b10b3f159040c1fa5dcfb6ad8018e3411a5d6042992f71f643a13c11d4 SHA512 30116ebc20c719d88bae7f2f44c129604ec4477004581c3556ff548c75ee026a83dc519701a61a8c3f547776ba74c571e38c3e1e5240da9148dad35a5d1f67e3 |
| 30 |
|
| 31 |
diff --git a/net-im/prosody/prosody-0.11.1.ebuild b/net-im/prosody/prosody-0.11.1.ebuild |
| 32 |
deleted file mode 100644 |
| 33 |
index 8049f02ed56..00000000000 |
| 34 |
--- a/net-im/prosody/prosody-0.11.1.ebuild |
| 35 |
+++ /dev/null |
| 36 |
@@ -1,86 +0,0 @@ |
| 37 |
-# Copyright 1999-2018 Gentoo Authors |
| 38 |
-# Distributed under the terms of the GNU General Public License v2 |
| 39 |
- |
| 40 |
-EAPI=7 |
| 41 |
- |
| 42 |
-inherit flag-o-matic multilib systemd |
| 43 |
- |
| 44 |
-MY_PV=$(ver_rs 3 '') |
| 45 |
-MY_P="${PN}-${MY_PV}" |
| 46 |
-DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua" |
| 47 |
-HOMEPAGE="https://prosody.im/" |
| 48 |
-SRC_URI="https://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz" |
| 49 |
- |
| 50 |
-LICENSE="MIT" |
| 51 |
-SLOT="0" |
| 52 |
-KEYWORDS="amd64 arm x86" |
| 53 |
-IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl test" |
| 54 |
- |
| 55 |
-BASE_DEPEND="net-im/jabber-base |
| 56 |
- dev-lua/LuaBitOp |
| 57 |
- !jit? ( >=dev-lang/lua-5.1:0 ) |
| 58 |
- jit? ( dev-lang/luajit:2 ) |
| 59 |
- >=net-dns/libidn-1.1:= |
| 60 |
- !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )" |
| 61 |
- |
| 62 |
-DEPEND="${BASE_DEPEND} |
| 63 |
- test? ( dev-lua/busted )" |
| 64 |
- |
| 65 |
-RDEPEND="${BASE_DEPEND} |
| 66 |
- >=dev-lua/luaexpat-1.3.0 |
| 67 |
- dev-lua/luafilesystem |
| 68 |
- ipv6? ( >=dev-lua/luasocket-3 ) |
| 69 |
- !ipv6? ( dev-lua/luasocket ) |
| 70 |
- libevent? ( >=dev-lua/luaevent-0.4.3 ) |
| 71 |
- mysql? ( dev-lua/luadbi[mysql] ) |
| 72 |
- postgres? ( dev-lua/luadbi[postgres] ) |
| 73 |
- sqlite? ( dev-lua/luadbi[sqlite] ) |
| 74 |
- ssl? ( dev-lua/luasec ) |
| 75 |
- zlib? ( dev-lua/lua-zlib )" |
| 76 |
- |
| 77 |
-S=${WORKDIR}/${MY_P} |
| 78 |
- |
| 79 |
-JABBER_ETC="/etc/jabber" |
| 80 |
-JABBER_SPOOL="/var/spool/jabber" |
| 81 |
- |
| 82 |
-src_prepare() { |
| 83 |
- default |
| 84 |
- rm makefile && mv GNUmakefile Makefile || die |
| 85 |
- sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\ |
| 86 |
- -e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\ |
| 87 |
- -e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\ |
| 88 |
- -e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\ |
| 89 |
- Makefile || die |
| 90 |
-} |
| 91 |
- |
| 92 |
-src_configure() { |
| 93 |
- # the configure script is handcrafted (and yells at unknown options) |
| 94 |
- # hence do not use 'econf' |
| 95 |
- append-cflags -D_GNU_SOURCE |
| 96 |
- ./configure \ |
| 97 |
- --ostype=linux \ |
| 98 |
- --prefix="${EPREFIX}/usr" \ |
| 99 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" \ |
| 100 |
- --sysconfdir="${EPREFIX}/${JABBER_ETC}" \ |
| 101 |
- --datadir="${EPREFIX}/${JABBER_SPOOL}" \ |
| 102 |
- --with-lua-include="${EPREFIX}/usr/include" \ |
| 103 |
- --with-lua-lib="${EPREFIX}/usr/$(get_libdir)/lua" \ |
| 104 |
- --runwith=lua"$(usev jit)" \ |
| 105 |
- --cflags="${CFLAGS} -Wall -fPIC" \ |
| 106 |
- --ldflags="${LDFLAGS} -shared" \ |
| 107 |
- --c-compiler="$(tc-getCC)" \ |
| 108 |
- --linker="$(tc-getCC)" || die "configure failed" |
| 109 |
-} |
| 110 |
- |
| 111 |
-src_install() { |
| 112 |
- emake DESTDIR="${D}" install |
| 113 |
- systemd_dounit "${FILESDIR}/${PN}".service |
| 114 |
- systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf |
| 115 |
- newinitd "${FILESDIR}/${PN}".initd-r2 ${PN} |
| 116 |
- keepdir "${JABBER_SPOOL}" |
| 117 |
-} |
| 118 |
- |
| 119 |
-pkg_postinst() { |
| 120 |
- elog "If you are using the MySQL backend, you need to update its schema:" |
| 121 |
- elog "https://prosody.im/doc/release/0.11.0#upgrade_notes" |
| 122 |
-} |
| 123 |
|
| 124 |
diff --git a/net-im/prosody/prosody-0.11.2.ebuild b/net-im/prosody/prosody-0.11.3.ebuild |
| 125 |
similarity index 60% |
| 126 |
rename from net-im/prosody/prosody-0.11.2.ebuild |
| 127 |
rename to net-im/prosody/prosody-0.11.3.ebuild |
| 128 |
index d1be6afa1c0..253c10d7bfb 100644 |
| 129 |
--- a/net-im/prosody/prosody-0.11.2.ebuild |
| 130 |
+++ b/net-im/prosody/prosody-0.11.3.ebuild |
| 131 |
@@ -3,25 +3,24 @@ |
| 132 |
|
| 133 |
EAPI=7 |
| 134 |
|
| 135 |
-inherit flag-o-matic multilib systemd |
| 136 |
+inherit multilib systemd |
| 137 |
|
| 138 |
-MY_PV=$(ver_rs 3 '') |
| 139 |
-MY_P="${PN}-${MY_PV}" |
| 140 |
DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua" |
| 141 |
HOMEPAGE="https://prosody.im/" |
| 142 |
-SRC_URI="https://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz" |
| 143 |
+SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz" |
| 144 |
|
| 145 |
LICENSE="MIT" |
| 146 |
SLOT="0" |
| 147 |
-KEYWORDS="amd64 ~arm x86" |
| 148 |
-IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl test" |
| 149 |
+KEYWORDS="~amd64 ~arm ~x86" |
| 150 |
+IUSE="ipv6 jit libevent libressl mysql postgres sqlite ssl test zlib" |
| 151 |
|
| 152 |
BASE_DEPEND="net-im/jabber-base |
| 153 |
dev-lua/LuaBitOp |
| 154 |
!jit? ( >=dev-lang/lua-5.1:0 ) |
| 155 |
jit? ( dev-lang/luajit:2 ) |
| 156 |
- >=net-dns/libidn-1.1:= |
| 157 |
- !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )" |
| 158 |
+ !libressl? ( dev-libs/openssl:0 ) |
| 159 |
+ libressl? ( dev-libs/libressl:= ) |
| 160 |
+ >=net-dns/libidn-1.1:=" |
| 161 |
|
| 162 |
DEPEND="${BASE_DEPEND} |
| 163 |
test? ( dev-lua/busted )" |
| 164 |
@@ -29,8 +28,8 @@ DEPEND="${BASE_DEPEND} |
| 165 |
RDEPEND="${BASE_DEPEND} |
| 166 |
>=dev-lua/luaexpat-1.3.0 |
| 167 |
dev-lua/luafilesystem |
| 168 |
- ipv6? ( >=dev-lua/luasocket-3 ) |
| 169 |
!ipv6? ( dev-lua/luasocket ) |
| 170 |
+ ipv6? ( >=dev-lua/luasocket-3 ) |
| 171 |
libevent? ( >=dev-lua/luaevent-0.4.3 ) |
| 172 |
mysql? ( dev-lua/luadbi[mysql] ) |
| 173 |
postgres? ( dev-lua/luadbi[postgres] ) |
| 174 |
@@ -38,31 +37,20 @@ RDEPEND="${BASE_DEPEND} |
| 175 |
ssl? ( dev-lua/luasec ) |
| 176 |
zlib? ( dev-lua/lua-zlib )" |
| 177 |
|
| 178 |
-S=${WORKDIR}/${MY_P} |
| 179 |
+PATCHES=("${FILESDIR}/prosody_cfg-0.11.2-r1.patch") |
| 180 |
|
| 181 |
JABBER_ETC="/etc/jabber" |
| 182 |
JABBER_SPOOL="/var/spool/jabber" |
| 183 |
|
| 184 |
-src_prepare() { |
| 185 |
- default |
| 186 |
- rm makefile && mv GNUmakefile Makefile || die |
| 187 |
- sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\ |
| 188 |
- -e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\ |
| 189 |
- -e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\ |
| 190 |
- -e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\ |
| 191 |
- Makefile || die |
| 192 |
-} |
| 193 |
- |
| 194 |
src_configure() { |
| 195 |
# the configure script is handcrafted (and yells at unknown options) |
| 196 |
# hence do not use 'econf' |
| 197 |
- append-cflags -D_GNU_SOURCE |
| 198 |
./configure \ |
| 199 |
--ostype=linux \ |
| 200 |
--prefix="${EPREFIX}/usr" \ |
| 201 |
--libdir="${EPREFIX}/usr/$(get_libdir)" \ |
| 202 |
- --sysconfdir="${EPREFIX}/${JABBER_ETC}" \ |
| 203 |
- --datadir="${EPREFIX}/${JABBER_SPOOL}" \ |
| 204 |
+ --sysconfdir="${EPREFIX}${JABBER_ETC}" \ |
| 205 |
+ --datadir="${EPREFIX}${JABBER_SPOOL}" \ |
| 206 |
--with-lua-include="${EPREFIX}/usr/include" \ |
| 207 |
--with-lua-lib="${EPREFIX}/usr/$(get_libdir)/lua" \ |
| 208 |
--runwith=lua"$(usev jit)" \ |
| 209 |
@@ -70,6 +58,8 @@ src_configure() { |
| 210 |
--ldflags="${LDFLAGS} -shared" \ |
| 211 |
--c-compiler="$(tc-getCC)" \ |
| 212 |
--linker="$(tc-getCC)" || die "configure failed" |
| 213 |
+ |
| 214 |
+ rm makefile && mv GNUmakefile Makefile || die |
| 215 |
} |
| 216 |
|
| 217 |
src_install() { |
| 218 |
@@ -79,8 +69,3 @@ src_install() { |
| 219 |
newinitd "${FILESDIR}/${PN}".initd-r2 ${PN} |
| 220 |
keepdir "${JABBER_SPOOL}" |
| 221 |
} |
| 222 |
- |
| 223 |
-pkg_postinst() { |
| 224 |
- elog "If you are using the MySQL backend, you need to update its schema:" |
| 225 |
- elog "https://prosody.im/doc/release/0.11.0#upgrade_notes" |
| 226 |
-} |
Archives