gentoo resync : 03.11.2019

3 files changed, 15 insertions, 117 deletions

diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest
index 8e3ba98ffa85..e748d7b34f28 100644
--- a/net-im/prosody/Manifest
+++ b/net-im/prosody/Manifest
@@ -3,11 +3,10 @@ AUX prosody.initd-r2 1067 BLAKE2B 64293637d5afaa5805cdfe3f2083aaa25fcd1611ce6dfe
 AUX prosody.service 275 BLAKE2B f1d889d59f507c990f0dddd8811465e2729fd4d7acde83204a0976affe8471707a64eaaeab31f458e526cebd7860aa470738008682a8e4363f86092f96d60d74 SHA512 0e16a20363aa13eb48bac2a60be6308f56501835dad021de5492aee80ec31bdda044928b76ef50ad359bc1e0d0593f15ff47ea683a345fef4bde2602a2da0f6c
 AUX prosody.tmpfilesd 38 BLAKE2B adf773737f29277af7940129ba41bcd48481ae053858b72b9a308fcb2a29e56cfb534d3b147ce4962a5aa62a52873245be622c800f1b1a8b714890f359a625a3 SHA512 a3e067a905b3f0221077fee7d2acb709082e464892981fac316e5fde204150ab922e76ead75881c0f1aa925219d62b966756f75dc68406d8af27f7cd883dd4bc
 AUX prosody_cfg-0.11.2-r1.patch 726 BLAKE2B dd9c68bcb49184d01d24530cb6f239b21bb3fe16c8bac4bc18a56e095750911e96257966f74eb07d21327f9a5799dbd7360b9ca54c9b27ed6a0e64d3b575fdf3 SHA512 87ccbe199b72ca8d3d8bb3d60dfc8dab7502cd98fa56fb7cbdbc760a4cd46e9e3ddce8612dbf9927230f1595ca63e31b84f6e3fe185fe2537d42d99c38672dff
-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.11.3.tar.gz 424098 BLAKE2B 58196234bced12ad84943763c48cdb6fa88b2bfd6390bf12d6bd0aec4f8905784ca5775d8fb55dc3ffe3bf22767742e2d62e859e3f2f9d08c65c9f8016036df0 SHA512 07239433c7c65184ca24d665c92b787ff9e4a5ee190ab90dede802ffd2cbd97855356d818858871e62284e9923f485b3468ab1baed5d3fb13aac0551a38967eb
 DIST prosody-0.9.14.tar.gz 268253 BLAKE2B 0ae62ca3c8eb89feb34f1f67aa3d14aa1e6bf02cf10ff90a43fd7de8bd257d70508e36b10b3f159040c1fa5dcfb6ad8018e3411a5d6042992f71f643a13c11d4 SHA512 30116ebc20c719d88bae7f2f44c129604ec4477004581c3556ff548c75ee026a83dc519701a61a8c3f547776ba74c571e38c3e1e5240da9148dad35a5d1f67e3
-EBUILD prosody-0.11.1.ebuild 2667 BLAKE2B 78fc88e3c8aa4d71c9ce9650577335fd3cea7831138b547c63b8adaf7a5e0ad5616505f6d991f8a79949fdd216c9435ec0f3abe94441adf81ab7bfd30fd162ae SHA512 cc13be36a4143006b18912adfcbeae7186df407ced530b8a0c9bee8acc515bdb3cb7bb25f9946beb15434e8313c97d8273b2cd524e24d68dfd6edbd6382f02de
 EBUILD prosody-0.11.2-r1.ebuild 2717 BLAKE2B 6d53b2c448fa8540ab45a4d205eea13789b12af80c2bafd1bb9aa1defb61e9747ffd174b5cdc45e73740b6237b2066e362398c20bbdcc64240d7f7703f818489 SHA512 f7747607cd590bd51d78f9385bf66d4cfa24e7e773c7b6634cfc69e248692ebea009fef18cc738f71d92de8fc75074468b8c4c46698f197667cb2410029a1f8b
-EBUILD prosody-0.11.2.ebuild 2668 BLAKE2B fa5b4375160532e7d5f52cfd7c851327e8a3e61b79bc19d88c3fdab2811198c664c0e6ac92dd0441d5a83c6b434a47030dc8d7905f18ab1fce3269c80d7441c0 SHA512 7cafa1f4133a532aae6efd36534de5430da1c41b3fc7a0eac11e4dcb48e4b1fc4a51d82ff5928eca57f84afc6b2da87d75f8e385dbb2b0cc3eba622099f5f5fa
+EBUILD prosody-0.11.3.ebuild 2043 BLAKE2B 9d3e4a60b30af067aab820fdebe739e291ffb8da06f48b56dbd93eee748d12e2bda1f6858f1272701fbce98b65267966099a9c99a23c51e421049e4b4291dd3d SHA512 e4a099c7e04cc4af2d331b347953cbdad7fb782acee3074b7bbe7c2da1f1d7ad314c8854767e3d9c4afa4cb50e845c51b2101afd5bbf0cd2c24ca31b37714d2f
 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.11.1.ebuild b/net-im/prosody/prosody-0.11.1.ebuild
deleted file mode 100644
index 8049f02ed567..000000000000
--- a/net-im/prosody/prosody-0.11.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib systemd
-
-MY_PV=$(ver_rs 3 '')
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
-HOMEPAGE="https://prosody.im/"
-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 test"
-
-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:= )"
-
-DEPEND="${BASE_DEPEND}
-		test? ( dev-lua/busted )"
-
-RDEPEND="${BASE_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() {
-	default
-	rm makefile && mv GNUmakefile Makefile || die
-	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
-	./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"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	systemd_dounit "${FILESDIR}/${PN}".service
-	systemd_newtmpfilesd "${FILESDIR}/${PN}".tmpfilesd "${PN}".conf
-	newinitd "${FILESDIR}/${PN}".initd-r2 ${PN}
-	keepdir "${JABBER_SPOOL}"
-}
-
-pkg_postinst() {
-	elog "If you are using the MySQL backend, you need to update its schema:"
-	elog "https://prosody.im/doc/release/0.11.0#upgrade_notes"
-}
diff --git a/net-im/prosody/prosody-0.11.2.ebuild b/net-im/prosody/prosody-0.11.3.ebuild
index d1be6afa1c0d..253c10d7bfbf 100644
--- a/net-im/prosody/prosody-0.11.2.ebuild
+++ b/net-im/prosody/prosody-0.11.3.ebuild
@@ -3,25 +3,24 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib systemd
+inherit multilib systemd
 
-MY_PV=$(ver_rs 3 '')
-MY_P="${PN}-${MY_PV}"
 DESCRIPTION="Prosody is a flexible communications server for Jabber/XMPP written in Lua"
 HOMEPAGE="https://prosody.im/"
-SRC_URI="https://prosody.im/tmp/${MY_PV}/${MY_P}.tar.gz"
+SRC_URI="https://prosody.im/downloads/source/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="ipv6 libevent mysql postgres sqlite ssl zlib jit libressl test"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ipv6 jit libevent libressl mysql postgres sqlite ssl test zlib"
 
 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:= )"
+		!libressl? ( dev-libs/openssl:0 )
+		libressl? ( dev-libs/libressl:= )
+		>=net-dns/libidn-1.1:="
 
 DEPEND="${BASE_DEPEND}
 		test? ( dev-lua/busted )"
@@ -29,8 +28,8 @@ DEPEND="${BASE_DEPEND}
 RDEPEND="${BASE_DEPEND}
 		>=dev-lua/luaexpat-1.3.0
 		dev-lua/luafilesystem
-		ipv6? ( >=dev-lua/luasocket-3 )
 		!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] )
@@ -38,31 +37,20 @@ RDEPEND="${BASE_DEPEND}
 		ssl? ( dev-lua/luasec )
 		zlib? ( dev-lua/lua-zlib )"
 
-S=${WORKDIR}/${MY_P}
+PATCHES=("${FILESDIR}/prosody_cfg-0.11.2-r1.patch")
 
 JABBER_ETC="/etc/jabber"
 JABBER_SPOOL="/var/spool/jabber"
 
-src_prepare() {
-	default
-	rm makefile && mv GNUmakefile Makefile || die
-	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
 	./configure \
 		--ostype=linux \
 		--prefix="${EPREFIX}/usr" \
 		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--sysconfdir="${EPREFIX}/${JABBER_ETC}" \
-		--datadir="${EPREFIX}/${JABBER_SPOOL}" \
+		--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)" \
@@ -70,6 +58,8 @@ src_configure() {
 		--ldflags="${LDFLAGS} -shared" \
 		--c-compiler="$(tc-getCC)" \
 		--linker="$(tc-getCC)" || die "configure failed"
+
+	rm makefile && mv GNUmakefile Makefile || die
 }
 
 src_install() {
@@ -79,8 +69,3 @@ src_install() {
 	newinitd "${FILESDIR}/${PN}".initd-r2 ${PN}
 	keepdir "${JABBER_SPOOL}"
 }
-
-pkg_postinst() {
-	elog "If you are using the MySQL backend, you need to update its schema:"
-	elog "https://prosody.im/doc/release/0.11.0#upgrade_notes"
-}