gentoo resync : 25.04.2020

3 files changed, 74 insertions, 85 deletions

diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 8468ccacdb54..f26273c98675 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -5,8 +5,8 @@ AUX prosody.tmpfilesd 38 BLAKE2B adf773737f29277af7940129ba41bcd48481ae053858b72
 AUX prosody_cfg-0.11.2-r1.patch 726 BLAKE2B dd9c68bcb49184d01d24530cb6f239b21bb3fe16c8bac4bc18a56e095750911e96257966f74eb07d21327f9a5799dbd7360b9ca54c9b27ed6a0e64d3b575fdf3 SHA512 87ccbe199b72ca8d3d8bb3d60dfc8dab7502cd98fa56fb7cbdbc760a4cd46e9e3ddce8612dbf9927230f1595ca63e31b84f6e3fe185fe2537d42d99c38672dff
 DIST prosody-0.11.2.tar.gz 420689 BLAKE2B 3abdab188f66d4eccb21d0981b57d5015605a1257074bbd67098a8624f40a11960fb65a7f56a7d1421a23bfffdb34635eeac5d013c4b7d7d957c51cdff2276c1 SHA512 22e55a551a40c92f38a1ed1de5fdcad574d699d58c2e27f93c3d465b55487b8e923c2ba088daf93c7140cbafb0d429687e0b662c8bb1c1aba4b79ac1ea271cd1
 DIST prosody-0.11.3.tar.gz 424098 BLAKE2B 58196234bced12ad84943763c48cdb6fa88b2bfd6390bf12d6bd0aec4f8905784ca5775d8fb55dc3ffe3bf22767742e2d62e859e3f2f9d08c65c9f8016036df0 SHA512 07239433c7c65184ca24d665c92b787ff9e4a5ee190ab90dede802ffd2cbd97855356d818858871e62284e9923f485b3468ab1baed5d3fb13aac0551a38967eb
-DIST prosody-0.9.14.tar.gz 268253 BLAKE2B 0ae62ca3c8eb89feb34f1f67aa3d14aa1e6bf02cf10ff90a43fd7de8bd257d70508e36b10b3f159040c1fa5dcfb6ad8018e3411a5d6042992f71f643a13c11d4 SHA512 30116ebc20c719d88bae7f2f44c129604ec4477004581c3556ff548c75ee026a83dc519701a61a8c3f547776ba74c571e38c3e1e5240da9148dad35a5d1f67e3
+DIST prosody-0.11.5.tar.gz 425122 BLAKE2B d65720a0c9d533a4be70847b690ecf037ae4b2fcbd090c81e2346d515599f3f148061103df2ffe46122a55694a3d35d53ab2b379fb5fb317e3b84a0ff5e82c29 SHA512 43a9facee8d61b69e277e7e8a9091fbfa60be71d6141195dff991f6020c8afadacce26f356b869cb2d7edd9be285e9ce1bcd822f9628cc845d91757e818a0dff
 EBUILD prosody-0.11.2-r1.ebuild 2760 BLAKE2B 04f7dd33b93b8d479b21b702a778c16fa102699de8fb76251be77d389b0ae9a0f6fb8c50b459394da3f468a44e011aa026f750de0ca92bbfcf29881271854ab8 SHA512 56e6080f603f3202055c64600f7cb431dc41e5d842a2688fb8cb368b180f68750a9c7462f46a7185958c4afd1195a02f81e007e853eb9c1223ab4d7c054f4416
 EBUILD prosody-0.11.3.ebuild 2086 BLAKE2B de56eb47db2d18939cff9dec07807b6cd8fad209d8f6e5f120092d2da0b779ba671555f778d459b563834f062ddb51ca03c9169b66da4e8269446a5bb2bb4428 SHA512 b0d9ce060c061cf8a5f08b37c9fc5d37a88ab6637f6c8fdecebb566206f471b4635d9ff5addc72e91f2116a609f835ec0ca03e8caf139c447813f62b0c9d5c1d
-EBUILD prosody-0.9.14.ebuild 2500 BLAKE2B a85ca7b8b7b23a9cbd5be474cefbd37a633fea25ca5998071a4351c130457e54784dd711f84799fbf65fd9a07a34dc279e1cb112864e2ffadf0f8462225e74c9 SHA512 cec746dc01d58dd74e6a223cdfddf4ab5f50234f5f3262919caafa145264b0b2f1d309f78ebbe504e7dc560185c7ee2f8ad5faa1b4ec3b3a463ac6ca80bf6741
+EBUILD prosody-0.11.5.ebuild 2086 BLAKE2B de56eb47db2d18939cff9dec07807b6cd8fad209d8f6e5f120092d2da0b779ba671555f778d459b563834f062ddb51ca03c9169b66da4e8269446a5bb2bb4428 SHA512 b0d9ce060c061cf8a5f08b37c9fc5d37a88ab6637f6c8fdecebb566206f471b4635d9ff5addc72e91f2116a609f835ec0ca03e8caf139c447813f62b0c9d5c1d
 MISC metadata.xml 454 BLAKE2B af4163bc7e18ffbab51ee4373985dea8db37408f8ef0982e7bef772ee4317d64018a1f2342adadf77005e120f17d4a706c7920763a8541dd983335f5d1379bd1 SHA512 8830635b65f87575b79745a8116b069e88f9b4a0de359199d6599acf369a60890b6e8cbf67703046ab751164e0b66a25d6f187aee8d9f75943c416c40dce3c24
diff --git a/net-im/prosody/prosody-0.11.5.ebuild b/net-im/prosody/prosody-0.11.5.ebuild
new file mode 100644
index 000000000000..44d19c37079e
--- /dev/null
+++ b/net-im/prosody/prosody-0.11.5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib systemd toolchain-funcs
+
+DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
+HOMEPAGE="https://prosody.im/"
+SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ipv6 jit libevent libressl mysql postgres sqlite ssl test zlib"
+RESTRICT="!test? ( test )"
+
+BASE_DEPEND="net-im/jabber-base
+		dev-lua/LuaBitOp
+		!jit? ( >=dev-lang/lua-5.1:0 )
+		jit? ( dev-lang/luajit:2 )
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl:= )
+		>=net-dns/libidn-1.1:="
+
+DEPEND="${BASE_DEPEND}
+		test? ( dev-lua/busted )"
+
+RDEPEND="${BASE_DEPEND}
+		>=dev-lua/luaexpat-1.3.0
+		dev-lua/luafilesystem
+		!ipv6? ( dev-lua/luasocket )
+		ipv6? ( >=dev-lua/luasocket-3 )
+		libevent? ( >=dev-lua/luaevent-0.4.3 )
+		mysql? ( dev-lua/luadbi[mysql] )
+		postgres? ( dev-lua/luadbi[postgres] )
+		sqlite? ( dev-lua/luadbi[sqlite] )
+		ssl? ( dev-lua/luasec )
+		zlib? ( dev-lua/lua-zlib )"
+
+PATCHES=("${FILESDIR}/prosody_cfg-0.11.2-r1.patch")
+
+JABBER_ETC="/etc/jabber"
+JABBER_SPOOL="/var/spool/jabber"
+
+src_configure() {
+	# the configure script is handcrafted (and yells at unknown options)
+	# hence do not use 'econf'
+	./configure \
+		--ostype=linux \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--sysconfdir="${EPREFIX}${JABBER_ETC}" \
+		--datadir="${EPREFIX}${JABBER_SPOOL}" \
+		--with-lua-include="${EPREFIX}/usr/include" \
+		--with-lua-lib="${EPREFIX}/usr/$(get_libdir)/lua" \
+		--runwith=lua"$(usev jit)" \
+		--cflags="${CFLAGS} -Wall -fPIC" \
+		--ldflags="${LDFLAGS} -shared" \
+		--c-compiler="$(tc-getCC)" \
+		--linker="$(tc-getCC)" || die "configure failed"
+
+	rm makefile && mv GNUmakefile Makefile || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	systemd_dounit "${FILESDIR}/${PN}".service
+	systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
+	newinitd "${FILESDIR}/${PN}".initd-r2 ${PN}
+	keepdir "${JABBER_SPOOL}"
+}
diff --git a/net-im/prosody/prosody-0.9.14.ebuild b/net-im/prosody/prosody-0.9.14.ebuild
deleted file mode 100644
index 11df67e8bf87..000000000000
--- a/net-im/prosody/prosody-0.9.14.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic multilib systemd toolchain-funcs versionator
-
-MY_PV=$(replace_version_separator 3 '')
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
-HOMEPAGE="http://prosody.im/"
-SRC_URI="http://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl"
-
-DEPEND="net-im/jabber-base
-		!jit? ( >=dev-lang/lua-5.1:0 )
-		jit? ( dev-lang/luajit:2 )
-		>=net-dns/libidn-1.1
-		!libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl:= )"
-RDEPEND="${DEPEND}
-		>=dev-lua/luaexpat-1.3.0
-		dev-lua/luafilesystem
-		ipv6? ( >=dev-lua/luasocket-3 )
-		!ipv6? ( dev-lua/luasocket )
-		libevent? ( >=dev-lua/luaevent-0.4.3 )
-		mysql? ( dev-lua/luadbi[mysql] )
-		postgres? ( dev-lua/luadbi[postgres] )
-		sqlite? ( dev-lua/luadbi[sqlite] )
-		ssl? ( <dev-lua/luasec-0.6 )
-		zlib? ( dev-lua/lua-zlib )"
-
-S=${WORKDIR}/${MY_P}
-
-JABBER_ETC="/etc/jabber"
-JABBER_SPOOL="/var/spool/jabber"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.9.2-cfg.lua.patch"
-	sed -i -e "s!MODULES = \$(DESTDIR)\$(PREFIX)/lib/!MODULES = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
-		-e "s!SOURCE = \$(DESTDIR)\$(PREFIX)/lib/!SOURCE = \$(DESTDIR)\$(PREFIX)/$(get_libdir)/!"\
-		-e "s!INSTALLEDSOURCE = \$(PREFIX)/lib/!INSTALLEDSOURCE = \$(PREFIX)/$(get_libdir)/!"\
-		-e "s!INSTALLEDMODULES = \$(PREFIX)/lib/!INSTALLEDMODULES = \$(PREFIX)/$(get_libdir)/!"\
-		 Makefile || die
-}
-
-src_configure() {
-	# the configure script is handcrafted (and yells at unknown options)
-	# hence do not use 'econf'
-	append-cflags -D_GNU_SOURCE
-	luajit=""
-	if use jit; then
-		luajit="--runwith=luajit"
-	fi
-	./configure \
-		--ostype=linux $luajit \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/lib64" \
-		--sysconfdir="${JABBER_ETC}" \
-		--datadir="${JABBER_SPOOL}" \
-		--with-lua-include=/usr/include \
-		--with-lua-lib=/usr/$(get_libdir)/lua \
-		--cflags="${CFLAGS} -Wall -fPIC" \
-		--ldflags="${LDFLAGS} -shared" \
-		--c-compiler="$(tc-getCC)" \
-		--linker="$(tc-getCC)" \
-		--require-config || die "configure failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	systemd_dounit "${FILESDIR}/${PN}".service
-	systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
-	newinitd "${FILESDIR}/${PN}".initd-r2 ${PN}
-}
-
-src_test() {
-	cd tests || die
-	./run_tests.sh || die
-}