gentoo resync : 22.01.2019

3 files changed, 10 insertions, 91 deletions

diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 71c3a5e9d1c0..a7c975fff886 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -3,12 +3,10 @@ AUX prosody-0.9.2-cfg.lua.patch 2173 BLAKE2B 7b2fbfb1fa6c57b34e96f54cc6c50449057
 AUX prosody.initd-r2 1067 BLAKE2B 64293637d5afaa5805cdfe3f2083aaa25fcd1611ce6dfeee09c939a2c9449a7f5994d984ed68ffbd015344db8f99fc9e5f5a16c4196d767c1768140d4880becc SHA512 6e16462a39fb72bbf7b312b5e02ea1ca766576b18ab0304e48fc8e123c4241fad1d784266d00b63a25ac7d36524cedbf5eb0cafe3a7e745082b50b87a2a9a9da
 AUX prosody.service 275 BLAKE2B f1d889d59f507c990f0dddd8811465e2729fd4d7acde83204a0976affe8471707a64eaaeab31f458e526cebd7860aa470738008682a8e4363f86092f96d60d74 SHA512 0e16a20363aa13eb48bac2a60be6308f56501835dad021de5492aee80ec31bdda044928b76ef50ad359bc1e0d0593f15ff47ea683a345fef4bde2602a2da0f6c
 AUX prosody.tmpfilesd 38 BLAKE2B adf773737f29277af7940129ba41bcd48481ae053858b72b9a308fcb2a29e56cfb534d3b147ce4962a5aa62a52873245be622c800f1b1a8b714890f359a625a3 SHA512 a3e067a905b3f0221077fee7d2acb709082e464892981fac316e5fde204150ab922e76ead75881c0f1aa925219d62b966756f75dc68406d8af27f7cd883dd4bc
-DIST prosody-0.10.2.tar.gz 331874 BLAKE2B 0e0af95a9168810263e6f60b825393d1088f69dba1faabf6c0c9dda3ef6b039a92f7edb9643cb9a60a3131a64038de5c3598f7076837b58ad196ac03fa98bfc4 SHA512 9fc05e34b45b0c16835ba94a73532fb3b4ee335f27d56bb9260e1b3e22614f89f44eb5d04b4e90d016db0b5bee6f5c7e7d099e1defb027e6823ee7667c1fe28f
-DIST prosody-0.11.0.tar.gz 418710 BLAKE2B 2a9af1edbd77d3ef8f629ed5855a6638929bd0476d5245c0ef3ec6e2d840fda3a8b733bcfe35b7603057caa23576e0ec344d244d0c1678e28aa41badb75b6170 SHA512 292f555a25108716cd3ceb8ab39210bcb7f2fd113bd844092a51f68127e59b64ec76045740fd93edca8be2c1711a5fbab0f51a285f3ab78d36423a897ea667bf
 DIST prosody-0.11.1.tar.gz 418780 BLAKE2B 0fa45b71bb7eeaa60385683427c9547af3e014faa97dec409cc19e48bfd1b91fec7eb001fb14a86c9f3ce2c653ece2fdb113bba860cdc500cb164dd7749af6cc SHA512 6e25d2365d40582f57799bb08bf2673ba43270e8bcca5c5b785381380db55ec3ea6ab771fb9bd228bf265a564bb017dbfeae81713abd2de35a92704f8b8004ef
+DIST prosody-0.11.2.tar.gz 420689 BLAKE2B 3abdab188f66d4eccb21d0981b57d5015605a1257074bbd67098a8624f40a11960fb65a7f56a7d1421a23bfffdb34635eeac5d013c4b7d7d957c51cdff2276c1 SHA512 22e55a551a40c92f38a1ed1de5fdcad574d699d58c2e27f93c3d465b55487b8e923c2ba088daf93c7140cbafb0d429687e0b662c8bb1c1aba4b79ac1ea271cd1
 DIST prosody-0.9.14.tar.gz 268253 BLAKE2B 0ae62ca3c8eb89feb34f1f67aa3d14aa1e6bf02cf10ff90a43fd7de8bd257d70508e36b10b3f159040c1fa5dcfb6ad8018e3411a5d6042992f71f643a13c11d4 SHA512 30116ebc20c719d88bae7f2f44c129604ec4477004581c3556ff548c75ee026a83dc519701a61a8c3f547776ba74c571e38c3e1e5240da9148dad35a5d1f67e3
-EBUILD prosody-0.10.2.ebuild 2484 BLAKE2B 39490d068e3554d75d8651258c8cee1307f419bd3b3b2f1f597bd9ef3adf0a59c879818d91e4652ce43c19a3c3e391339711409b5b58af748025004db8dfa39a SHA512 45bc465b096e0f2083c3b36faa3ddcabfa65b100014abc020efb8d81e7939be7d52c9d80defe58bcc51139021dfd8ed1205a8d0a0d82b641ed8b870ea0236505
-EBUILD prosody-0.11.0-r1.ebuild 2602 BLAKE2B 4fdc94ef19de23f6dbabde397206b45b7f62c3c75c855165aef974c2f7b3daa8f6a894b0a0a1ba899325ade47369bdf4e9c69a2139826c3774fdc09353c9d007 SHA512 d026e19e954b8d414657f50814ed636cd84b7a7bdec7e57db5a5471711ec5de327300fa3a6a9177ee3cebb3ded684e241b986b268e442f74bbe5b9724af4b97b
 EBUILD prosody-0.11.1.ebuild 2667 BLAKE2B 78fc88e3c8aa4d71c9ce9650577335fd3cea7831138b547c63b8adaf7a5e0ad5616505f6d991f8a79949fdd216c9435ec0f3abe94441adf81ab7bfd30fd162ae SHA512 cc13be36a4143006b18912adfcbeae7186df407ced530b8a0c9bee8acc515bdb3cb7bb25f9946beb15434e8313c97d8273b2cd524e24d68dfd6edbd6382f02de
+EBUILD prosody-0.11.2.ebuild 2670 BLAKE2B 942ead856c4853029d1ec1e1d16337ea309eb5027139e2ae185dbeb3c1310379b2a7e845108b745427f2b3fc0089b3c03882c8628a9f3d44544e64f268787f5c SHA512 d1fea3d2ab83f8fc9ec8ad7a71ce48c1ddf840383937b9398481c1832a194f348299c45a6124ac300372f070d8880ea24718fd6ac0f3cf88a9f901994be4348a
 EBUILD prosody-0.9.14.ebuild 2487 BLAKE2B 68ff4e360612ff9aef0cba3556b6c3fbe69d261ddad40f24ad2a88e3adb4d6d3e119e011a4186412531ba23a6f98692550e4181084e63e201cf9f753080c6427 SHA512 c28fec41e3a57e76a32c9a5c380804d904a0a9f76dd66b4bb183ba2eb6a705957c54bef760bec723277ea234c6c5f2d12b899de11126962c3c77c75f95a9f1e6
 MISC metadata.xml 624 BLAKE2B 57704d2f82f7b7daa34d7114d375591cffe12a3cfd396a95ea61c76f644750cd92567d5619133bebd56ff2f302c3f576aca22abcc954641c89757e85e35ae0b6 SHA512 0410e3372d04163cc8b5e03d95f5c0c7e7e6da4e6034adfd86700455c6662d844e8da5590dbd5a633179dd8c3da15760b49d3068787ed61833c9031cec341a24
diff --git a/net-im/prosody/prosody-0.10.2.ebuild b/net-im/prosody/prosody-0.10.2.ebuild
deleted file mode 100644
index de5ae8dcbe8e..000000000000
--- a/net-im/prosody/prosody-0.10.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic multilib systemd 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
-		dev-lua/LuaBitOp
-		!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 )
-		zlib? ( dev-lua/lua-zlib )"
-
-S=${WORKDIR}/${MY_P}
-
-JABBER_ETC="/etc/jabber"
-JABBER_SPOOL="/var/spool/jabber"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-0.10.0-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)" || 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
-}
diff --git a/net-im/prosody/prosody-0.11.0-r1.ebuild b/net-im/prosody/prosody-0.11.2.ebuild
index eccd2e1da7be..00c0da2b978a 100644
--- a/net-im/prosody/prosody-0.11.0-r1.ebuild
+++ b/net-im/prosody/prosody-0.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,15 +14,19 @@ SRC_URI="https://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"
+IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl test"
 
-DEPEND="net-im/jabber-base
+BASE_DEPEND="net-im/jabber-base
 		dev-lua/LuaBitOp
 		!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}
+
+DEPEND="${BASE_DEPEND}
+		test? ( dev-lua/busted )"
+
+RDEPEND="${BASE_DEPEND}
 		>=dev-lua/luaexpat-1.3.0
 		dev-lua/luafilesystem
 		ipv6? ( >=dev-lua/luasocket-3 )