gentoo resync : 29.01.2021

4 files changed, 14 insertions, 105 deletions

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
-}