8 files changed, 4 insertions, 165 deletions
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 7868c05f46a9..ea972a6b0c45 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1,15 +1,9 @@
-AUX prosody-0.11.2-r1-gentoo.patch 726 BLAKE2B dd9c68bcb49184d01d24530cb6f239b21bb3fe16c8bac4bc18a56e095750911e96257966f74eb07d21327f9a5799dbd7360b9ca54c9b27ed6a0e64d3b575fdf3 SHA512 87ccbe199b72ca8d3d8bb3d60dfc8dab7502cd98fa56fb7cbdbc760a4cd46e9e3ddce8612dbf9927230f1595ca63e31b84f6e3fe185fe2537d42d99c38672dff
 AUX prosody-0.11.7-bit32.patch 599 BLAKE2B 880d11d8730f77322372efbfdb80c64a523844a47aae60a0f04b831262dc2e61c141247902b0872ff73fa02497dbfc75e3fc0cdbf9396c124c6c080bbbe181cd SHA512 e1783fceaca93acde37a3fffc5052eb9799faff59ce13e394358a21f24513e193ffa498218766b87718bac55f6425694106494abf05080203c5af01a52c03edb
 AUX prosody-0.11.7-gentoo.patch 1419 BLAKE2B 30a1ef43f6d3b00a07f621dc701e97ba45fb8b6d6ed67f95e5feff7bad32a4d037f0d00301c60bb05e1d5cb85bc1b78451ca0a989d7fda893f8b433ee50cc2f5 SHA512 9f5490ce156ef7d69f8daee7f274edc4d56da93dcbcfaf1a28f33ee8a0b5c6cb6a8f4f6f50cfd0cd3defad1ae90603803e6328ca3e160c4b3fa6aeadbd7104f3
-AUX prosody.initd-r2 1067 BLAKE2B 64293637d5afaa5805cdfe3f2083aaa25fcd1611ce6dfeee09c939a2c9449a7f5994d984ed68ffbd015344db8f99fc9e5f5a16c4196d767c1768140d4880becc SHA512 6e16462a39fb72bbf7b312b5e02ea1ca766576b18ab0304e48fc8e123c4241fad1d784266d00b63a25ac7d36524cedbf5eb0cafe3a7e745082b50b87a2a9a9da
 AUX prosody.initd-r4 955 BLAKE2B 4d9a7e9cda70a901478734a7ba81480374e9a4db069a91920f03fa2de35b85f3d6f62c7e85ee622646d77c660f039370217e968e5a3d6d88c6e9ab20e6362ea3 SHA512 a0e92aaba052c50748911caf0005b154eb14c6af142a36492c938da04633c5ac397f1baebe133f366b7fc9547e360265ade75ab58bcaf7bffeca7c84f98547b6
-AUX prosody.service 275 BLAKE2B f1d889d59f507c990f0dddd8811465e2729fd4d7acde83204a0976affe8471707a64eaaeab31f458e526cebd7860aa470738008682a8e4363f86092f96d60d74 SHA512 0e16a20363aa13eb48bac2a60be6308f56501835dad021de5492aee80ec31bdda044928b76ef50ad359bc1e0d0593f15ff47ea683a345fef4bde2602a2da0f6c
 AUX prosody.service-r2 228 BLAKE2B 61741cb7ecf64777b516a1fcb4e8e8c5c7b9c5d92dafbf7f691c36910f41d0b81d701bf8f287aea89fa368071c0c94a38f56ff3134055eb01842b578d8b57991 SHA512 0499588d1fd6e970575785b4bdaf631428601bec8a57051558c1d4c82bc74462f17d7568b8d433b14f15c51c94b181f4240d9f4574d51dcfeda291f0a68eb6f1
-AUX prosody.tmpfilesd 38 BLAKE2B adf773737f29277af7940129ba41bcd48481ae053858b72b9a308fcb2a29e56cfb534d3b147ce4962a5aa62a52873245be622c800f1b1a8b714890f359a625a3 SHA512 a3e067a905b3f0221077fee7d2acb709082e464892981fac316e5fde204150ab922e76ead75881c0f1aa925219d62b966756f75dc68406d8af27f7cd883dd4bc
 AUX prosody.tmpfilesd-r1 36 BLAKE2B dfb5025508cc62b4cd53de35b83f47bfee61821fbfe3301c1b67a4324ab753067cd3ecd84f56ae9a0241395a50d90ce2ec49c9333dc3378798a290e638a56cf9 SHA512 13a99fb925f7c3584dbfcbc98b3b929b67e165f70d700a25a861e512becd8a21ca48ee385da67ead23beeb68a43aaa10a2cfd342d1b3184883fede5d985cb599
-DIST prosody-0.11.5.tar.gz 425122 BLAKE2B d65720a0c9d533a4be70847b690ecf037ae4b2fcbd090c81e2346d515599f3f148061103df2ffe46122a55694a3d35d53ab2b379fb5fb317e3b84a0ff5e82c29 SHA512 43a9facee8d61b69e277e7e8a9091fbfa60be71d6141195dff991f6020c8afadacce26f356b869cb2d7edd9be285e9ce1bcd822f9628cc845d91757e818a0dff
 DIST prosody-0.11.7.tar.gz 429369 BLAKE2B 8ef7377810702d5e1f480d84c09d6e3cc6aab674cca56fc1ce5e211d32df63ffeb57869c9d98429a81ea715ee19fca2ac015daa6b88b8c140efbeccb906defa6 SHA512 923aa92598ef851ed8408931942859f78f1e3d700fee251f4f5ca67abdcdae43448318ed90a9a1cdc7824d5f4dc5a4732fad4b9ed36d97455fa9b3bff0881a20
-EBUILD prosody-0.11.5-r1.ebuild 2077 BLAKE2B 9a9d47dfac9398016f1dc4eeb2ff6b2d7add27b473780ea24c5a0b2f16b8fd7dbcbdce2c99080a0b4ffed755851963aa83d4f4dd3dc63e39fc94e8d53ccf9274 SHA512 17fc6249e43a5ea35e3819a40e6816fb1677efc5b2a6818a12ae04f7686a8583bb11338e0bb584a97a3ace1340186e2fa79ff6e5d416b989ed810e617f40250b
 EBUILD prosody-0.11.7-r100.ebuild 2909 BLAKE2B 4184d057091d5700914ea7a62d8261e763c35bf52dbc5b6e7cd76f5ab86c7de9826a191c3517e6625dc4558deff2612c2cf5ffa032adc4041b39714584fcd2cc SHA512 8f21e646a7e8d09bdef52363f08ad8fbcac10575cb67eab4bf90c0b2455e25af87414bee88bab025102099edcbefb3489720020a91dc26b94aef29e968b7feb7
-EBUILD prosody-0.11.7-r2.ebuild 2270 BLAKE2B 4436848267a4244a1b596d25381974510d654e06e9c011ddd12ccacf801ee1746165f30835e0edfe80c20a2df8ae76dc0daa0d443c0ae92c0ec6a88a78bbbeda SHA512 688bb5480ce3ecbc23e41bce8242fb713ac9ebe924a6d51fa16f40cc7be88088b9e653581b45653a3ac072ad23167eec895a9e8be944c1c21876ee1f498b115d
-MISC metadata.xml 729 BLAKE2B e5e7c82e24858e3eb11b087a17c3e5d7ceebb7fbbdfa9d69346f26f341e422e0a109416ac062eeed750b0c29f93fd60608cdf41283cd7a1a90519217e9230bf3 SHA512 ecfdb898917fcc56b041ce93331e96708129172c7ff447cb7ead1636f83c4abee655fb8a166a81c9e97cc189363e1cea5e1ba08bf54a491f5e5c5a60c5b3cbe4
+EBUILD prosody-0.11.7-r2.ebuild 2269 BLAKE2B 343142e98d2ff712ba2f4a7c531551f3f9ba5372a099a97701bfb8b532931a9eea0037ce449f5f125c6bab118c59cdb605c20becc3ebb122a2ec4ab15b4752c5 SHA512 b1b62067d1b546bd7657c0432e84628e229acb4527abb520971aa7d686b731468764ef333bdf34755f20edb470c09c3f86b94abb0d7550d476e68a0c6f484e7a
+MISC metadata.xml 669 BLAKE2B e8f1d6b1df790563b92637351fe3f824f48c34b95234ad950b2376fcd010195d1d25d0023d468ab6ca98fc068df3e83db88513eb6c1a12a7b93426302516e71b SHA512 6336b469b3fee51cc6b2b7e23398430294ed7ce0b53525515d22dc1dd5f70b97a0388d654378d34fc809164aa5c9bdcd4a3d2078df75c2bac8a954f0fe549710
diff --git a/net-im/prosody/files/prosody-0.11.2-r1-gentoo.patch b/net-im/prosody/files/prosody-0.11.2-r1-gentoo.patch
deleted file mode 100644
index 94423a834ae1..000000000000
--- a/net-im/prosody/files/prosody-0.11.2-r1-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/prosody.cfg.lua.dist	2019-03-19 15:11:16.355743969 +0100
-+++ b/prosody.cfg.lua.dist	2019-03-19 15:14:42.810995725 +0100
-@@ -32,6 +32,13 @@
- -- will look for modules first. For community modules, see https://modules.prosody.im/
- --plugin_paths = {}
- 
-+-- Gentoo uses the jabber:jabber uid/gid for all Jabber-related services
-+prosody_user = "jabber"
-+prosody_group = "jabber"
-+
-+-- Make sure prosodyctl checks in the right spot for the PID file
-+pidfile = "/run/jabber/prosody.pid"
-+
- -- This is the list of modules Prosody will load on startup.
- -- It looks for mod_modulename.lua in the plugins folder, so make sure that exists too.
- -- Documentation for bundled modules can be found at: https://prosody.im/doc/modules
diff --git a/net-im/prosody/files/prosody.initd-r2 b/net-im/prosody/files/prosody.initd-r2
deleted file mode 100644
index a6b623dd6225..000000000000
--- a/net-im/prosody/files/prosody.initd-r2
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Prosody is a server for Jabber/XMPP written in Lua."
-description_reload="Reload configuration and reopen log files."
-extra_started_commands="reload"
-pidfile="/var/run/jabber/prosody.pid"
-
-depend() {
-	use dns
-	need net
-	provide jabber-server
-}
-
-checkconfig() {
-	if [ ! -e /etc/jabber/prosody.cfg.lua ] ; then
-		eerror "You need a /etc/jabber/prosody.cfg.lua file to run prosody"
-		return 1
-	fi
-	luac -p /etc/jabber/prosody.cfg.lua
-	return $?
-}
-
-start() {
-	checkconfig || return 1
-	checkpath -q -d -m 0770 -o jabber:jabber "$(dirname ${pidfile})"
-	checkpath -q -f -m 0770 -o jabber:jabber "${pidfile}"
-	checkpath -q -d -m 0750 -o jabber:jabber /var/log/jabber
-	ebegin "Starting Prosody XMPP Server"
-	prosodyctl start
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Prosody XMPP Server"
-	prosodyctl stop
-	eend $?
-}
-
-reload() {
-	checkconfig || return 1
-	ebegin "Reloading configuration of Prosody XMPP Server"
-	prosodyctl reload
-	eend $?
-}
diff --git a/net-im/prosody/files/prosody.service b/net-im/prosody/files/prosody.service
deleted file mode 100644
index 5c5ea87bd542..000000000000
--- a/net-im/prosody/files/prosody.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Prosody XMPP (Jabber) server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/var/run/jabber/prosody.pid
-ExecStart=/usr/bin/prosodyctl start
-ExecReload=/usr/bin/prosodyctl reload
-ExecStop=/usr/bin/prosodyctl stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-im/prosody/files/prosody.tmpfilesd b/net-im/prosody/files/prosody.tmpfilesd
deleted file mode 100644
index 924ba434659c..000000000000
--- a/net-im/prosody/files/prosody.tmpfilesd
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/jabber   710 jabber jabber
diff --git a/net-im/prosody/metadata.xml b/net-im/prosody/metadata.xml
index d73f165dd534..c67f0b41b88d 100644
--- a/net-im/prosody/metadata.xml
+++ b/net-im/prosody/metadata.xml
@@ -14,7 +14,6 @@
 		added functionality, or prototype new protocols.
 	</longdescription>
 	<use>
-		<flag name="jit">Use LuaJIT instead of vanilla Lua</flag>
 		<flag name="libevent">Use libevent for event handling</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-im/prosody/prosody-0.11.5-r1.ebuild b/net-im/prosody/prosody-0.11.5-r1.ebuild
deleted file mode 100644
index 2e89c9c96e9e..000000000000
--- a/net-im/prosody/prosody-0.11.5-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib systemd tmpfiles 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}/${PN}-0.11.2-r1-gentoo.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
-	newtmpfiles "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
-	newinitd "${FILESDIR}/${PN}".initd-r2 ${PN}
-	keepdir "${JABBER_SPOOL}"
-}
diff --git a/net-im/prosody/prosody-0.11.7-r2.ebuild b/net-im/prosody/prosody-0.11.7-r2.ebuild
index 1cd89e0f987e..e39395687019 100644
--- a/net-im/prosody/prosody-0.11.7-r2.ebuild
+++ b/net-im/prosody/prosody-0.11.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="+libevent libressl luajit mysql postgres +sqlite +ssl test +zlib"
 RESTRICT="!test? ( test )"