gentoo resync : 29.01.2021

12 files changed, 47 insertions, 364 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 7e467d94a415..825b04cbbc7a 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/gitter-bin/Manifest b/net-im/gitter-bin/Manifest
index 2aef8df8cd6f..b75878b11a6f 100644
--- a/net-im/gitter-bin/Manifest
+++ b/net-im/gitter-bin/Manifest
@@ -1,5 +1,7 @@
 DIST gitter_4.1.0_amd64.deb 98314502 BLAKE2B 3f14e044865c9af89dc6ac62dbe8f8221824c6f529418a31fd5236ecec45ddfd6013d734100a414a2bbca0db9e8c40cb7046868391d507ba5c9de9da0c66225d SHA512 2ea0ebbc05cbdc40e4e8cb07a68b3948477a61a81e550b8f131af46315c6fc7547c0954aa101260f93b63c557f3e00b1e23006a236b77be01ea4a82edd170f70
 DIST gitter_4.1.0_i386.deb 101820112 BLAKE2B 3d1ab270389da9c82440dc7a204d1973402de1648e0387a026601d34bd1f2b26469b0fab9be4ff4b596cbe257047e88446b5c36d08deeeae1aaea4f387c45ac3 SHA512 c76da19e6eaf79894319848b6121660dab0bd8f2d8cdfaf413a68bee0f4c62fdca25c19c24eeb226164b643582db9ed686c68a5f72701618d41b423df9c9cee8
+DIST gitter_5.0.1_amd64.deb 136453344 BLAKE2B 6e057fb04872f89961a8970d079b14fbaf416db126ac0596485936a069a85fb5e783b052e20af7fbce40bc4805313ad793873c6ad3cadf87fc2662fef39604f1 SHA512 9bca96a2e312e7893ea7e5faca4a6a3e343d0d3bf96b86e0353437517fc006eb917787cb872f305d1c843978cfd80f729474bd485070ec26d99d67d24ffbf4d1
+DIST gitter_5.0.1_i386.deb 141585750 BLAKE2B 464e3416085717702df605fefade3a5aabafbdbfa9274eb9da03832b9a5e442d0a92eacd5c4d757e64709b3ba39bfdc5a87d689bb24db1ede3aca43b187550ce SHA512 b340b161728530e6c397ad6d5fbd591393a893c73b29056094514514d3e0f3a30ebdab94bb19f6c78cf1c73a30c6cd145476e34db5eaea06ba061f8a410579f7
 EBUILD gitter-bin-4.1.0-r1.ebuild 2981 BLAKE2B 23fe433dfe977f02e6c8045242fb222e3506a6ad88616370bf6ec04de7488c5ee0ad8ab6f200d0ef2fa983656787fce2743313b0e50808b457a30f4c4e936120 SHA512 5689cf43a4486f5cc174e31116790b8249fe46629646bc1cebbcd41035b7ed45cbbb7356c6747dcb529fe328d408011abce63e831161c6bc21c9fb112162d663
-EBUILD gitter-bin-4.1.0.ebuild 2981 BLAKE2B aaefc6bb75db49afe0ac427f6a6a9ba6e5d2ea5b39b9e414bb07e5b07446ca67872d61776f25169bf0a3a0b0da128d6192358595cd55ab622f597ef06240dc93 SHA512 166da8759debf400970fb563730aa609505ec9fccd9360b222e5b6fb9188efffeb84626668fcaf8a59d186873c97587f2d93120980cb423130543fc84bb043c3
-MISC metadata.xml 710 BLAKE2B 3807b9843d68e224ccdae9ae618672f42243064cdef8aa4c7cd66eb5dd4e99575cb05ac8ee700b754e5eff28864e9641284363be4f92ba4a420f3dfc0740abd9 SHA512 b3b02d786643953704e204546384c0c48062eddae58c5314d8aa460e846753a6df796fece8f66abbf538f755fa767f021654346772a07a5cabbdd342991d892c
+EBUILD gitter-bin-5.0.1.ebuild 3149 BLAKE2B 8627a0810af923aa7247461ccec0487104dbff37a83d872a42d7c28953d8c1320fb2a9fc9fe7ced56bac856bd5241ea17b6c85451de16884c042a3e5148e7b39 SHA512 938cf82609ef0bac5b9d54f42073ecda56b530efbb2cd28334872421d704f66ab90c15f55f7c520b8541b0325c9b89c28e85277af39a62be14a0aa4d6b6bdccf
+MISC metadata.xml 626 BLAKE2B b50b6161a9e83a6ada4548c23a898b069ffc09c8818e9abb4040e6df0cb436e586074a9225b1160df55b8358dd9b28422e2c774ab3ddc3dc7fae2ce930a3a4e8 SHA512 5cf4563c5dc36d509ae10a1824bebbd1f559bb57ff642e0f11f55676c894e2fae49060f7e4c1fb5fec9c1bed4814eacb1ecab2bca31eca5de72cb670840e08eb
diff --git a/net-im/gitter-bin/gitter-bin-4.1.0.ebuild b/net-im/gitter-bin/gitter-bin-5.0.1.ebuild
index b0d7e485b685..df5c40ef1ebb 100644
--- a/net-im/gitter-bin/gitter-bin-4.1.0.ebuild
+++ b/net-im/gitter-bin/gitter-bin-5.0.1.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 MY_PN="${PN/-bin/}"
 
-inherit desktop gnome2-utils multilib-build pax-utils unpacker
+inherit desktop multilib-build pax-utils unpacker xdg
 
-QA_PREBUILT="opt/gitter/pnacl/pnacl_public_x86_64_libcrt_platform_a
-	opt/gitter/pnacl/pnacl_public_x86_64_pnacl_llc_nexe
+QA_PREBUILT="opt/gitter/pnacl/pnacl_public_x86_64_pnacl_llc_nexe
 	opt/gitter/pnacl/pnacl_public_x86_64_ld_nexe
 	opt/gitter/pnacl/pnacl_public_x86_64_pnacl_sz_nexe
 	opt/gitter/payload
@@ -23,9 +22,14 @@ QA_PREBUILT="opt/gitter/pnacl/pnacl_public_x86_64_libcrt_platform_a
 	opt/gitter/nwjc
 	opt/gitter/nacl_irt_x86_64.nexe
 	opt/gitter/Gitter"
+QA_FLAGS_IGNORED="opt/gitter/minidump_stackwalk
+	opt/gitter/nacl_helper_bootstrap
+	opt/gitter/crashpad_handler
+	opt/gitter/lib/libEGL.so
+	opt/gitter/lib/libGLESv2.so"
 
 DESCRIPTION="Chat and network platform"
-HOMEPAGE="http://www.gitter.im/"
+HOMEPAGE="https://www.gitter.im"
 SRC_URI="
 	amd64? ( https://update.gitter.im/linux64/${MY_PN}_${PV}_amd64.deb )
 	x86? ( https://update.gitter.im/linux32/${MY_PN}_${PV}_i386.deb )"
@@ -33,19 +37,22 @@ SRC_URI="
 LICENSE="all-rights-reserved"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE="pax_kernel"
+IUSE=""
 RESTRICT="bindist mirror"
 
-RDEPEND="dev-libs/atk:0[${MULTILIB_USEDEP}]
+RDEPEND="app-accessibility/at-spi2-core:2[${MULTILIB_USEDEP}]
+	dev-libs/atk:0[${MULTILIB_USEDEP}]
 	dev-libs/expat:0[${MULTILIB_USEDEP}]
 	dev-libs/glib:2[${MULTILIB_USEDEP}]
 	dev-libs/nspr:0[${MULTILIB_USEDEP}]
 	dev-libs/nss:0[${MULTILIB_USEDEP}]
 	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
+	net-print/cups:0[${MULTILIB_USEDEP}]
 	sys-apps/dbus:0[${MULTILIB_USEDEP}]
 	x11-libs/cairo:0[${MULTILIB_USEDEP}]
 	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
 	x11-libs/gtk+:3[${MULTILIB_USEDEP}]
+	x11-libs/libdrm:0[${MULTILIB_USEDEP}]
 	x11-libs/libX11:0[${MULTILIB_USEDEP}]
 	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
 	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
@@ -56,9 +63,9 @@ RDEPEND="dev-libs/atk:0[${MULTILIB_USEDEP}]
 	x11-libs/libXi:0[${MULTILIB_USEDEP}]
 	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
 	x11-libs/libXrender:0[${MULTILIB_USEDEP}]
+	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
 	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
 	x11-libs/pango:0[${MULTILIB_USEDEP}]"
-DEPEND="sys-apps/fix-gnustack"
 
 S="${WORKDIR}"
 
@@ -68,10 +75,10 @@ src_prepare() {
 	local arch
 	arch="$(usex amd64 "64" "32")"
 
-	# Modify desktop file to use common paths
+	# Remove hardcoded paths
 	sed -i \
-		-e '/Exec/s/=.*/=\/usr\/bin\/gitter/' \
-		-e '/Icon/s/=.*/=\/usr\/share\/pixmaps\/gitter.png/' \
+		-e '/Exec/s/=.*/=gitter/' \
+		-e '/Icon/s/=.*/=gitter/' \
 		opt/Gitter/linux"${arch}"/gitter.desktop || die "sed failed"
 }
 
@@ -79,29 +86,18 @@ src_install() {
 	local arch
 	arch="$(usex amd64 "64" "32")"
 
-	fix-gnustack -f opt/Gitter/linux"${arch}"/nacl_irt_x86_64.nexe > /dev/null \
-		|| die "removing execstack flag failed"
-
 	newicon opt/Gitter/linux"${arch}"/logo.png gitter.png
 	newicon -s 256 opt/Gitter/linux"${arch}"/logo.png gitter.png
 	domenu opt/Gitter/linux"${arch}"/gitter.desktop
 
 	insinto /opt/gitter
 	doins -r opt/Gitter/linux"${arch}"/.
-	fperms +x /opt/gitter/Gitter
-	dosym ../../opt/gitter/Gitter /usr/bin/gitter
-
-	use pax_kernel && pax-mark -m "${ED%/}"/opt/gitter/Gitter
-}
+	fperms -R +x /opt/gitter/lib/ /opt/gitter/swiftshader/ \
+		/opt/gitter/pnacl/pnacl_public_x86_64_{ld_nexe,pnacl_llc_nexe,pnacl_sz_nexe} \
+		/opt/gitter/{Gitter,chromedriver,crashpad_handler,minidump_stackwalk,nwjc,payload} \
+		/opt/gitter/nacl_{helper,helper_bootstrap,irt_x86_64.nexe}
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
+	dosym ../../opt/gitter/Gitter /usr/bin/gitter
 
-pkg_postrm() {
-	gnome2_icon_cache_update
+	pax-mark -m "${ED}"/opt/gitter/Gitter
 }
diff --git a/net-im/gitter-bin/metadata.xml b/net-im/gitter-bin/metadata.xml
index 88b44ca0dc0c..2aa6d30c64dc 100644
--- a/net-im/gitter-bin/metadata.xml
+++ b/net-im/gitter-bin/metadata.xml
@@ -14,9 +14,6 @@
 	grow and connect communities through messaging, content
 	and discovery.
 	</longdescription>
-	<use>
-		<flag name="pax_kernel">Triggers a paxmarking of the binary</flag>
-	</use>
 	<upstream>
 		<doc>https://gitter.zendesk.com/hc/en-us</doc>
 	</upstream>
diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index ea972a6b0c45..e204f5f6081a 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -1,9 +1,8 @@
 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-r4 955 BLAKE2B 4d9a7e9cda70a901478734a7ba81480374e9a4db069a91920f03fa2de35b85f3d6f62c7e85ee622646d77c660f039370217e968e5a3d6d88c6e9ab20e6362ea3 SHA512 a0e92aaba052c50748911caf0005b154eb14c6af142a36492c938da04633c5ac397f1baebe133f366b7fc9547e360265ade75ab58bcaf7bffeca7c84f98547b6
+AUX prosody.initd-r5 987 BLAKE2B 3e381f48cbc9c5361bdc6cb9ab4a13daf055cd35389036b4ed2efb6df4c5ea5bb4ff43947bdb29d09b263a7eb0ed7ffeda8425723f4e0a76387245ae02a2661f SHA512 56e8e5524c6b383355bb1106ffaac614196dd48a8d9fd1f62ece87fbe6278f7d2ea7a683027dd6dcfeb2bc7331d84e95868f8c0501dfc7e11ef77aa08ebdde17
 AUX prosody.service-r2 228 BLAKE2B 61741cb7ecf64777b516a1fcb4e8e8c5c7b9c5d92dafbf7f691c36910f41d0b81d701bf8f287aea89fa368071c0c94a38f56ff3134055eb01842b578d8b57991 SHA512 0499588d1fd6e970575785b4bdaf631428601bec8a57051558c1d4c82bc74462f17d7568b8d433b14f15c51c94b181f4240d9f4574d51dcfeda291f0a68eb6f1
 AUX prosody.tmpfilesd-r1 36 BLAKE2B dfb5025508cc62b4cd53de35b83f47bfee61821fbfe3301c1b67a4324ab753067cd3ecd84f56ae9a0241395a50d90ce2ec49c9333dc3378798a290e638a56cf9 SHA512 13a99fb925f7c3584dbfcbc98b3b929b67e165f70d700a25a861e512becd8a21ca48ee385da67ead23beeb68a43aaa10a2cfd342d1b3184883fede5d985cb599
 DIST prosody-0.11.7.tar.gz 429369 BLAKE2B 8ef7377810702d5e1f480d84c09d6e3cc6aab674cca56fc1ce5e211d32df63ffeb57869c9d98429a81ea715ee19fca2ac015daa6b88b8c140efbeccb906defa6 SHA512 923aa92598ef851ed8408931942859f78f1e3d700fee251f4f5ca67abdcdae43448318ed90a9a1cdc7824d5f4dc5a4732fad4b9ed36d97455fa9b3bff0881a20
-EBUILD prosody-0.11.7-r100.ebuild 2909 BLAKE2B 4184d057091d5700914ea7a62d8261e763c35bf52dbc5b6e7cd76f5ab86c7de9826a191c3517e6625dc4558deff2612c2cf5ffa032adc4041b39714584fcd2cc SHA512 8f21e646a7e8d09bdef52363f08ad8fbcac10575cb67eab4bf90c0b2455e25af87414bee88bab025102099edcbefb3489720020a91dc26b94aef29e968b7feb7
-EBUILD prosody-0.11.7-r2.ebuild 2269 BLAKE2B 343142e98d2ff712ba2f4a7c531551f3f9ba5372a099a97701bfb8b532931a9eea0037ce449f5f125c6bab118c59cdb605c20becc3ebb122a2ec4ab15b4752c5 SHA512 b1b62067d1b546bd7657c0432e84628e229acb4527abb520971aa7d686b731468764ef333bdf34755f20edb470c09c3f86b94abb0d7550d476e68a0c6f484e7a
+EBUILD prosody-0.11.7-r101.ebuild 2955 BLAKE2B 79b0e89ed3b712a499b5bdb7524e0a4c50bfa3999175687a7bc9b54930889a23ed2c2dba904551559077bf81f9e9237adc1a46f08114b08270657fcf4fe16be3 SHA512 1b583aa0b5dc0b46416777f7a5a1fed9ec15b442bc719b37a095323f8a310deece2133b8ea2fe3387a867e356b7bcb6b08de9232701721c098a399eceec8809b
 MISC metadata.xml 669 BLAKE2B e8f1d6b1df790563b92637351fe3f824f48c34b95234ad950b2376fcd010195d1d25d0023d468ab6ca98fc068df3e83db88513eb6c1a12a7b93426302516e71b SHA512 6336b469b3fee51cc6b2b7e23398430294ed7ce0b53525515d22dc1dd5f70b97a0388d654378d34fc809164aa5c9bdcd4a3d2078df75c2bac8a954f0fe549710
diff --git a/net-im/prosody/files/prosody.initd-r4 b/net-im/prosody/files/prosody.initd-r5
index 1282e9dc4561..54e37be5bd8c 100644
--- a/net-im/prosody/files/prosody.initd-r4
+++ b/net-im/prosody/files/prosody.initd-r5
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 name="Prosody XMPP server"
@@ -10,6 +10,7 @@ pidfile="${jabber_pid}/prosody.pid"
 prosody_config="/etc/jabber/prosody.cfg.lua"
 
 command="/usr/bin/prosody"
+commandctl="/usr/bin/prosodyctl"
 command_group="jabber"
 command_user="jabber"
 
@@ -19,7 +20,7 @@ checkconfig() {
 		return 1
 	fi
 
-	luac -p "${prosody_config}"
+	${commandctl} check config
 	return $?
 }
 
diff --git a/net-im/prosody/prosody-0.11.7-r100.ebuild b/net-im/prosody/prosody-0.11.7-r101.ebuild
index 293afb94e60b..aee5c34cf355 100644
--- a/net-im/prosody/prosody-0.11.7-r100.ebuild
+++ b/net-im/prosody/prosody-0.11.7-r101.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
@@ -14,15 +14,15 @@ SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="icu +idn +libevent libressl mysql postgres +sqlite +ssl test +zlib"
+KEYWORDS="amd64 arm arm64 x86"
+IUSE="icu +idn +libevent libressl mysql postgres selinux +sqlite +ssl test +zlib"
 REQUIRED_USE="
 	^^ ( icu idn )
 	${LUA_REQUIRED_USE}
 "
 RESTRICT="!test? ( test )"
 
-RDEPEND="
+DEPEND="
 	$(lua_gen_cond_dep 'dev-lua/luaexpat[${LUA_USEDEP}]')
 	$(lua_gen_cond_dep 'dev-lua/luafilesystem[${LUA_USEDEP}]')
 	$(lua_gen_cond_dep 'dev-lua/luasocket[${LUA_USEDEP}]')
@@ -41,7 +41,10 @@ RDEPEND="
 	${LUA_DEPS}
 "
 
-DEPEND="${RDEPEND}"
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-jabber )
+"
 
 BDEPEND="
 	virtual/pkgconfig
@@ -92,7 +95,7 @@ src_install() {
 
 	keepdir /var/spool/jabber
 
-	newinitd "${FILESDIR}"/prosody.initd-r4 prosody
+	newinitd "${FILESDIR}"/prosody.initd-r5 prosody
 	systemd_newunit "${FILESDIR}"/prosody.service-r2 prosody.service
 
 	newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r1 prosody.conf
diff --git a/net-im/prosody/prosody-0.11.7-r2.ebuild b/net-im/prosody/prosody-0.11.7-r2.ebuild
deleted file mode 100644
index e39395687019..000000000000
--- a/net-im/prosody/prosody-0.11.7-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="Prosody is a modern XMPP communication server"
-HOMEPAGE="https://prosody.im/"
-SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="+libevent libressl luajit mysql postgres +sqlite +ssl test +zlib"
-RESTRICT="!test? ( test )"
-
-# dev-lang/lua:0 is 5.1 so lua-bit32 is required
-COMMON_DEPEND="
-	dev-lua/lua-bit32
-	net-dns/libidn
-	net-im/jabber-base
-	libressl? ( dev-libs/libressl:= )
-	!libressl? ( dev-libs/openssl:0= )
-	luajit? ( dev-lang/luajit:2 )
-	!luajit? ( dev-lang/lua:0= )
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	test? ( dev-lua/busted )
-"
-
-RDEPEND="
-	${COMMON_DEPEND}
-	dev-lua/luaexpat
-	dev-lua/luafilesystem
-	dev-lua/luasocket
-	libevent? ( dev-lua/luaevent )
-	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.7-bit32.patch"
-	"${FILESDIR}/${PN}-0.11.7-gentoo.patch"
-)
-
-src_prepare() {
-	default
-
-	# Set correct plugin path for optional net-im/prosody-modules package
-	sed -e "s/GENTOO_LIBDIR/$(get_libdir)/g" -i prosody.cfg.lua.dist || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--c-compiler="$(tc-getCC)"
-		--datadir="${EPREFIX}/var/spool/jabber"
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--linker="$(tc-getCC)"
-		--ostype="linux"
-		--prefix="${EPREFIX}/usr"
-		--runwith="$(usex luajit luajit lua)"
-		--sysconfdir="${EPREFIX}/etc/jabber"
-		--with-lua-include="${EPREFIX}/usr/include"
-		--with-lua-lib="${EPREFIX}/usr/$(get_libdir)/lua"
-	)
-
-	# Since the configure script is handcrafted,
-	# and yells at unknown options, do not use 'econf'.
-	./configure ${myeconfargs[@]} --cflags="${CFLAGS} -Wall -fPIC" --ldflags="${LDFLAGS} -shared" || die
-
-	rm makefile || die
-	mv GNUmakefile Makefile || die
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/prosody.initd-r4 prosody
-	systemd_newunit "${FILESDIR}"/prosody.service-r2 prosody.service
-
-	newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r1 prosody.conf
-
-	keepdir /var/spool/jabber
-}
-
-pkg_postinst() {
-	tmpfiles_process prosody.conf
-}
diff --git a/net-im/swift/Manifest b/net-im/swift/Manifest
index 89d2aa966275..6f626a0da558 100644
--- a/net-im/swift/Manifest
+++ b/net-im/swift/Manifest
@@ -3,6 +3,5 @@ AUX swift-4.0.2-qt-5.11-compatibility.patch 931 BLAKE2B 9c19851501a5b7bd92cb0cd8
 AUX swift-4.0.2-qt-5.15-compatibility.patch 245 BLAKE2B 77facc560f6cea3dedd7c3095b6e5d7a91ff956b80022dc8a27c93edac72884bfd7f484fc84052a47bccb184f4225eb90fcc3d30f925ee15e18d5c97037a0b16 SHA512 9e8adaec0e7b1e727a2f91a675eaea4f62b7f8a53fdbaaf2adf9e13d57a1df15e921f1aa1b876561c7eecd1a4602763a52b3e875cecebe139d6e338df1001b12
 DIST swift-4.0.2-python3-compatibility.patch.gz 14959 BLAKE2B 17b75950bba9252bb76e30eb9fadb9eaaaad6d693a09f6fa357fe174ade1bd283d00838e87b55059e0601edc5d72c02c952f53ca16dd597010c9f0ffe955662a SHA512 fac9cf0a85b55b1b9bba786cc6456ceaa6257d5f2cdd4d41c4fdee526c301de94bb6f7c71bc00aaec992d0aaf3787e2db3e9c7eed6ec88facea776db66941dba
 DIST swift-4.0.2.tar.gz 19083393 BLAKE2B de4ad1c3d68dfc4d693cdebdf4e18809210aa4e83af31b77bf730c7018507877852b5ea634623c037250de4005606108bd0372d39177093769c5dc5f72bd4812 SHA512 b7d4b90f387d5ea4ac3ca31794eabd1f12a64274628d75c7570f40269777b9003182884730a6340c5e0b5b7928a68bda5e49be623b47da9fa64fe4c3f25be167
-EBUILD swift-4.0.2-r102.ebuild 4218 BLAKE2B 83383c34373c3639b5fcb25abf72454de80fd0cfc7ffe651f53ac9989a6c3638ee8304cc858cee1904ef09380b059031cce4c91791bcd51a7c874a2ccc587fce SHA512 8342c45619e529c60b8c5dc54d262123162bd968f46380fe8170db955c4ed8a584b86504ce9736044ffc8c324c6fee9cb55c9c6470344c7dbe55a345a303a4f1
-EBUILD swift-4.0.2-r4.ebuild 4658 BLAKE2B 468c37828f1d27097846b64fe22107b77e9f90ce169fc6faf6ece26d66c6792a84b264e086f4f9730e7f39a4e14438f37a295e1a42803507200e809251976370 SHA512 681f9e8d9dcff75952128dd7eca37a15b6936f2c2b0961a465134a0e0a62fe0e8c9a1feac205c9d044ea60bc6177c3cb49870be6f6f3dc4017b4d95d8965704d
-MISC metadata.xml 851 BLAKE2B 014ba09099a0971ceb413f590ba7f8e16f661380f15e12a319077886847c14695ab52f10afd7ce165b07cd9852e00397720ccf4465f475effec1cee65ad5b752 SHA512 1dbe2f86f1a0826b3ad0c629493fb0b9f9b1a1e2435e761a4e55afe85c52a7eef1269f25bfa94c4c8fbd5a8c5604d6c0bff6d0cb9d011245c1273df2a162bea7
+EBUILD swift-4.0.2-r102.ebuild 4217 BLAKE2B f5ba2a95946c288699f2728632d1f109e508cca37a2f57cd8d13ec628d4b8755eef05a0cec2b4c33d2f7de352ef31a99df4a8509b620719ebfe813e208282bdf SHA512 bd7db3bd38d52706acf6b8a036ab060f71e49f9710d1f02c2ad0554f17860e632e743eafe49ab3f13968561300e13d48c611fc40a02095057930d7e81a0f8b78
+MISC metadata.xml 683 BLAKE2B b78b308c6d573452923df936cf3a6dc4a83a35969638709eb3a4e5d9808cb2f10fa832d759f641a29fdc13c99f048d532ed59a4beb02cf60b2768afdb700a347 SHA512 df7cca1c6156bbbf766d021f718d09e2e18f27bae0acce5bb30bcd0f3ab00e2dfa62cc8c9ae7054b15d76f94d43e890391e4ba45851c8eb5e83af3e289b6a8fd
diff --git a/net-im/swift/metadata.xml b/net-im/swift/metadata.xml
index 8c02d4f0e0a5..0047368b4bc6 100644
--- a/net-im/swift/metadata.xml
+++ b/net-im/swift/metadata.xml
@@ -16,8 +16,4 @@
 		cross-platform, and performant C++ library for
 		implementing XMPP applications.
 	</longdescription>
-	<use>
-		<flag name="client">Build the full graphical XMPP client.</flag>
-		<flag name="gconf">Enable configuration through <pkg>gnome-base/gconf</pkg>.</flag>
-	</use>
 </pkgmetadata>
diff --git a/net-im/swift/swift-4.0.2-r102.ebuild b/net-im/swift/swift-4.0.2-r102.ebuild
index 00166ea98235..8b4eb91b1560 100644
--- a/net-im/swift/swift-4.0.2-r102.ebuild
+++ b/net-im/swift/swift-4.0.2-r102.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
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
 SLOT="4/0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="expat +icu +idn lua test zeroconf"
 REQUIRED_USE="
 	|| ( icu idn )
diff --git a/net-im/swift/swift-4.0.2-r4.ebuild b/net-im/swift/swift-4.0.2-r4.ebuild
deleted file mode 100644
index 19967be43386..000000000000
--- a/net-im/swift/swift-4.0.2-r4.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit python-any-r1 scons-utils toolchain-funcs xdg-utils
-
-DESCRIPTION="An elegant, secure, adaptable and intuitive XMPP Client"
-HOMEPAGE="https://www.swift.im/"
-SRC_URI="
-	https://swift.im/downloads/releases/${P}/${P}.tar.gz
-	https://dev.gentoo.org/~conikost/distfiles/patches/swift-4.0.2-python3-compatibility.patch.gz"
-
-LICENSE="BSD BSD-1 CC-BY-3.0 GPL-3 OFL-1.1"
-SLOT="4/0"
-KEYWORDS="amd64"
-IUSE="+client expat gconf +icu +idn lua spell test zeroconf"
-REQUIRED_USE="
-	|| ( icu idn )
-	gconf? ( client )
-	spell? ( client )
-"
-
-RDEPEND="
-	dev-db/sqlite:3
-	dev-libs/boost:=
-	dev-libs/openssl:0=
-	net-libs/libnatpmp
-	net-libs/miniupnpc:=
-	sys-libs/zlib
-	client? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtx11extras:5
-		net-dns/avahi
-	)
-	expat? ( dev-libs/expat )
-	!expat? ( dev-libs/libxml2:2 )
-	gconf? ( gnome-base/gconf:2 )
-	icu? ( dev-libs/icu:= )
-	idn? ( net-dns/libidn:= )
-	lua? ( dev-lang/lua:0= )
-	spell? ( app-text/hunspell:= )
-"
-
-DEPEND="
-	${RDEPEND}
-	>=dev-util/scons-3.0.1-r3
-	client? ( dev-qt/linguist-tools:5 )
-	test? ( net-dns/avahi )
-"
-
-# Tests don't run, as they fail with "[QA/UnitTest/**dummy**] Error -6".
-RESTRICT="test"
-
-DOCS=(
-	"DEVELOPMENT.md"
-	"README.md"
-	"Swiften/ChangeLog.md"
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-boost-1.69-compatibility.patch
-	"${WORKDIR}"/${P}-python3-compatibility.patch
-	"${FILESDIR}"/${P}-qt-5.11-compatibility.patch
-	"${FILESDIR}"/${P}-qt-5.15-compatibility.patch
-)
-
-src_prepare() {
-	default
-
-	# Don't include '/usr/lib*' in the link command line for `swiften-config`
-	sed -e '/_LIBDIRFLAGS/d' -i Swiften/Config/SConscript || die
-
-	# Hack for finding Qt system libs
-	mkdir "${T}"/qt || die
-	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5/bin "${T}"/qt/bin || die
-	ln -s "${EPREFIX}"/usr/$(get_libdir)/qt5 "${T}"/qt/lib || die
-	ln -s "${EPREFIX}"/usr/include/qt5 "${T}"/qt/include || die
-
-	# Remove parts of Swift, which a user don't want to compile
-	if ! use client; then rm -fr Swift Slimber || die; fi
-	if ! use lua; then rm -fr Sluift || die; fi
-	if ! use zeroconf; then
-		rm -fr Limber || die
-		if use client; then rm -fr Slimber || die; fi
-	fi
-
-	# Remove '3rdParty', as the system libs should be used
-	# `CppUnit`, `GoogleTest` and `HippoMocks` are needed for tests
-	local my3rdparty=(
-		Boost
-		Breakpad
-		DocBook
-		Expat
-		LCov
-		Ldns
-		LibIDN
-		LibMiniUPnPc
-		LibNATPMP
-		Lua
-		OpenSSL
-		SCons
-		SQLite
-		Unbound
-		ZLib
-	)
-
-	if use test; then
-		cd 3rdParty && rm -fr "${my3rdparty[@]}" || die
-	else
-		rm -fr 3rdParty || die
-	fi
-}
-
-src_configure() {
-	MYSCONS=(
-		ar="$(tc-getAR)"
-		allow_warnings="yes"
-		assertions="no"
-		build_examples="yes"
-		boost_bundled_enable="false"
-		boost_force_bundled="false"
-		cc="$(tc-getCC)"
-		ccache="no"
-		ccflags="${CFLAGS}"
-		coverage="no"
-		cxx="$(tc-getCXX)"
-		cxxflags="${CXXFLAGS}"
-		debug="no"
-		distcc="no"
-		experimental="no"
-		experimental_ft="yes"
-		hunspell_enable="$(usex spell)"
-		icu="$(usex icu)"
-		install_git_hooks="no"
-		libidn_bundled_enable="false"
-		libminiupnpc_force_bundled="false"
-		libnatpmp_force_bundled="false"
-		link="$(tc-getCXX)"
-		linkflags="${LDFLAGS}"
-		max_jobs="no"
-		optimize="no"
-		qt="${T}/qt"
-		qt5="$(usex client)"
-		swiften_dll="true"
-		swift_mobile="no"
-		target="native"
-		test="none"
-		try_avahi="$(usex client)"
-		try_expat="$(usex expat)"
-		try_gconf="$(usex gconf)"
-		try_libidn="$(usex idn)"
-		try_libxml="$(usex !expat)"
-		tls_backend="openssl"
-		unbound="no"
-		V="1"
-		valgrind="no"
-		zlib_bundled_enable="false"
-	)
-}
-
-src_compile() {
-	local myesconsinstall=(
-		Swiften
-		$(usex client Swift '')
-		$(usex lua Sluift '')
-		$(usex zeroconf Limber '')
-		$(usex zeroconf "$(usex client Slimber '')" '')
-	)
-
-	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-}
-
-src_test() {
-	MYSCONS=(
-		V="1"
-	)
-
-	escons "${MYSCONS[@]}" test=unit QA
-}
-
-src_install() {
-	local myesconsinstall=(
-		SWIFTEN_INSTALLDIR="${ED}/usr"
-		SWIFTEN_LIBDIR="${ED}/usr/$(get_libdir)"
-		$(usex client "SWIFT_INSTALLDIR=${ED}/usr" '')
-		$(usex lua "SLUIFT_DIR=${ED}/usr" '')
-		$(usex lua "SLUIFT_INSTALLDIR=${ED}/usr" '')
-		"${ED}"
-	)
-
-	escons "${MYSCONS[@]}" "${myesconsinstall[@]}"
-
-	use zeroconf && dobin Limber/limber
-	use zeroconf && use client && newbin Slimber/CLI/slimber slimber-cli
-	use zeroconf && use client && newbin Slimber/Qt/slimber slimber-qt
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	use client && xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	use client && xdg_icon_cache_update
-}