gentoo resync : 14.12.2020

3 files changed, 133 insertions, 23 deletions

diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index cabbbe079bdc..d1cfdd343457 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -9,6 +9,7 @@ AUX prosody.tmpfilesd 38 BLAKE2B adf773737f29277af7940129ba41bcd48481ae053858b72
 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 2085 BLAKE2B 635d42bd9df55770be24797e63666c07e6c16f240be5a641164f29de52bbb3dd8e070f9cf708a947482267d592c27adc92f2dc64903d8cdbff7fc90be504420b SHA512 6b0fdfc3901f2227007408108e7f647218dbe5ea06aae3ffeb197b92837cdded1841f39a1bb990235149c7c7ae9784002e60b5fca1bc540f8ce27886a4514761
+EBUILD prosody-0.11.5-r1.ebuild 2077 BLAKE2B 9a9d47dfac9398016f1dc4eeb2ff6b2d7add27b473780ea24c5a0b2f16b8fd7dbcbdce2c99080a0b4ffed755851963aa83d4f4dd3dc63e39fc94e8d53ccf9274 SHA512 17fc6249e43a5ea35e3819a40e6816fb1677efc5b2a6818a12ae04f7686a8583bb11338e0bb584a97a3ace1340186e2fa79ff6e5d416b989ed810e617f40250b
+EBUILD prosody-0.11.7-r100.ebuild 2860 BLAKE2B 9000df4388e0e7808c667e55e81998389ecbe1f73bba3b312adb2ae74b141c90baf673ccd835e713cd4c08e2d5f94832f7dc042b01b75c573cb9f94931e393b7 SHA512 0534f78ec2f784732463446d339e3d66ca3290927cd5b0bebdbc168496524015aff2e4e981344535d1042d7841faab07209960ee1ad1e913e77444c02849dd16
 EBUILD prosody-0.11.7-r2.ebuild 2253 BLAKE2B db53ec761881b88b2ae04fbefcc9c926ed0618a9bfa92c84e17009e3cb2a0eb973da2b33a18346de57097950a951206ebde49e9dd4f99148e165415a055a5a86 SHA512 7bbfdf089dc78e1a16e94e1a3c0e4705ddbc0570e969a362ca338741c17ad14484857bc6bb01d6877bee7aeeab79172972bb855b09270094f9d0e03c77722186
 MISC metadata.xml 729 BLAKE2B e5e7c82e24858e3eb11b087a17c3e5d7ceebb7fbbdfa9d69346f26f341e422e0a109416ac062eeed750b0c29f93fd60608cdf41283cd7a1a90519217e9230bf3 SHA512 ecfdb898917fcc56b041ce93331e96708129172c7ff447cb7ead1636f83c4abee655fb8a166a81c9e97cc189363e1cea5e1ba08bf54a491f5e5c5a60c5b3cbe4
diff --git a/net-im/prosody/prosody-0.11.5-r1.ebuild b/net-im/prosody/prosody-0.11.5-r1.ebuild
index 6ffc3bd7b489..2e89c9c96e9e 100644
--- a/net-im/prosody/prosody-0.11.5-r1.ebuild
+++ b/net-im/prosody/prosody-0.11.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit multilib systemd toolchain-funcs
+inherit multilib systemd tmpfiles toolchain-funcs
 
 DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
 HOMEPAGE="https://prosody.im/"
@@ -15,28 +15,34 @@ 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:="
+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 )"
+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 )"
+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" )
 
@@ -66,7 +72,7 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 	systemd_dounit "${FILESDIR}/${PN}".service
-	systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
+	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-r100.ebuild b/net-im/prosody/prosody-0.11.7-r100.ebuild
new file mode 100644
index 000000000000..6c88fc7967ee
--- /dev/null
+++ b/net-im/prosody/prosody-0.11.7-r100.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..3} )
+LUA_REQ_USE="deprecated"
+
+inherit lua-single 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="icu +idn +libevent libressl mysql postgres +sqlite +ssl test +zlib"
+REQUIRED_USE="
+	^^ ( icu idn )
+	${LUA_REQUIRED_USE}
+"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(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}]')
+	net-im/jabber-base
+	icu? ( dev-libs/icu:= )
+	idn? ( net-dns/libidn:= )
+	libevent? ( $(lua_gen_cond_dep 'dev-lua/luaevent[${LUA_USEDEP}]') )
+	libressl? ( dev-libs/libressl:= )
+	!libressl? ( dev-libs/openssl:0= )
+	lua_single_target_lua5-1? ( $(lua_gen_cond_dep 'dev-lua/lua-bit32[lua_targets_lua5-1(-)]') )
+	mysql? ( $(lua_gen_cond_dep 'dev-lua/luadbi[mysql,${LUA_USEDEP}]') )
+	postgres? ( $(lua_gen_cond_dep 'dev-lua/luadbi[postgres,${LUA_USEDEP}]') )
+	sqlite? ( $(lua_gen_cond_dep 'dev-lua/luadbi[sqlite,${LUA_USEDEP}]') )
+	ssl? ( $(lua_gen_cond_dep 'dev-lua/luasec[${LUA_USEDEP}]') )
+	zlib? ( $(lua_gen_cond_dep 'dev-lua/lua-zlib[${LUA_USEDEP}]') )
+	${LUA_DEPS}
+"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? ( $(lua_gen_cond_dep 'dev-lua/busted[${LUA_USEDEP}]') )
+"
+
+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=(
+		--add-cflags="${CFLAGS}"
+		--add-ldflags="${LDFLAGS}"
+		--c-compiler="$(tc-getCC)"
+		--datadir="${EPREFIX}/var/spool/jabber"
+		--idn-library="$(usex idn 'idn' 'icu')"
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--linker="$(tc-getCC)"
+		--lua-version="$(ver_cut 1-2 $(lua_get_version))"
+		--no-example-certs
+		--ostype="linux"
+		--prefix="${EPREFIX}/usr"
+		--runwith="${ELUA}"
+		--sysconfdir="${EPREFIX}/etc/jabber"
+		--with-lua-include="${EPREFIX}/$(lua_get_include_dir)"
+		--with-lua-lib="${EPREFIX}/$(lua_get_cmod_dir)"
+	)
+
+	# Since the configure script is handcrafted,
+	# and yells at unknown options, do not use 'econf'.
+	./configure "${myeconfargs[@]}" || die
+
+	rm makefile || die
+	mv GNUmakefile Makefile || die
+}
+
+src_install() {
+	default
+
+	keepdir /var/spool/jabber
+
+	newinitd "${FILESDIR}"/prosody.initd-r4 prosody
+	systemd_newunit "${FILESDIR}"/prosody.service-r2 prosody.service
+
+	newtmpfiles "${FILESDIR}"/prosody.tmpfilesd-r1 prosody.conf
+}
+
+pkg_postinst() {
+	tmpfiles_process prosody.conf
+}