From ab3da91fb6c91a9df52fff8f991570f456fd3c7a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 18 Dec 2020 11:06:49 +0000 Subject: gentoo resync : 18.12.2020 --- net-im/prosody/Manifest | 4 ++-- net-im/prosody/prosody-0.11.7-r100.ebuild | 5 +++-- net-im/prosody/prosody-0.11.7-r2.ebuild | 8 +++----- 3 files changed, 8 insertions(+), 9 deletions(-) (limited to 'net-im/prosody') diff --git a/net-im/prosody/Manifest b/net-im/prosody/Manifest index d1cfdd343457..51197747e424 100644 --- a/net-im/prosody/Manifest +++ b/net-im/prosody/Manifest @@ -10,6 +10,6 @@ AUX prosody.tmpfilesd-r1 36 BLAKE2B dfb5025508cc62b4cd53de35b83f47bfee61821fbfe3 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 2860 BLAKE2B 9000df4388e0e7808c667e55e81998389ecbe1f73bba3b312adb2ae74b141c90baf673ccd835e713cd4c08e2d5f94832f7dc042b01b75c573cb9f94931e393b7 SHA512 0534f78ec2f784732463446d339e3d66ca3290927cd5b0bebdbc168496524015aff2e4e981344535d1042d7841faab07209960ee1ad1e913e77444c02849dd16 -EBUILD prosody-0.11.7-r2.ebuild 2253 BLAKE2B db53ec761881b88b2ae04fbefcc9c926ed0618a9bfa92c84e17009e3cb2a0eb973da2b33a18346de57097950a951206ebde49e9dd4f99148e165415a055a5a86 SHA512 7bbfdf089dc78e1a16e94e1a3c0e4705ddbc0570e969a362ca338741c17ad14484857bc6bb01d6877bee7aeeab79172972bb855b09270094f9d0e03c77722186 +EBUILD prosody-0.11.7-r100.ebuild 2961 BLAKE2B 05c2b8d6ccc33c81be35dfd7468b0797419d2d1ded35de5c8e92965011a9dd70b35c1f4f998362151bc482dea04ae263bf0197a8334a1d7e48a47b9116881099 SHA512 1007f0a5fce4690965309ba36adec6b4cf1dc332fcba41f11855e9ddaa93ec734c0a72137ce11bc0310644194e9274c5f8cdd96a615cad258f5db0d728bb0144 +EBUILD prosody-0.11.7-r2.ebuild 2270 BLAKE2B 4436848267a4244a1b596d25381974510d654e06e9c011ddd12ccacf801ee1746165f30835e0edfe80c20a2df8ae76dc0daa0d443c0ae92c0ec6a88a78bbbeda SHA512 688bb5480ce3ecbc23e41bce8242fb713ac9ebe924a6d51fa16f40cc7be88088b9e653581b45653a3ac072ad23167eec895a9e8be944c1c21876ee1f498b115d MISC metadata.xml 729 BLAKE2B e5e7c82e24858e3eb11b087a17c3e5d7ceebb7fbbdfa9d69346f26f341e422e0a109416ac062eeed750b0c29f93fd60608cdf41283cd7a1a90519217e9230bf3 SHA512 ecfdb898917fcc56b041ce93331e96708129172c7ff447cb7ead1636f83c4abee655fb8a166a81c9e97cc189363e1cea5e1ba08bf54a491f5e5c5a60c5b3cbe4 diff --git a/net-im/prosody/prosody-0.11.7-r100.ebuild b/net-im/prosody/prosody-0.11.7-r100.ebuild index 6c88fc7967ee..1afc7fa76fc2 100644 --- a/net-im/prosody/prosody-0.11.7-r100.ebuild +++ b/net-im/prosody/prosody-0.11.7-r100.ebuild @@ -3,8 +3,8 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..3} ) -LUA_REQ_USE="deprecated" +LUA_COMPAT=( lua5-{1..3} luajit ) +LUA_REQ_USE="deprecated(+)" inherit lua-single systemd tmpfiles toolchain-funcs @@ -69,6 +69,7 @@ src_configure() { --idn-library="$(usex idn 'idn' 'icu')" --libdir="${EPREFIX}/usr/$(get_libdir)" --linker="$(tc-getCC)" + --lua-version="$(usex lua_single_target_luajit '5.1' $(ver_cut 1-2 $(lua_get_version)))" --lua-version="$(ver_cut 1-2 $(lua_get_version))" --no-example-certs --ostype="linux" diff --git a/net-im/prosody/prosody-0.11.7-r2.ebuild b/net-im/prosody/prosody-0.11.7-r2.ebuild index fc250a5ce95b..1cd89e0f987e 100644 --- a/net-im/prosody/prosody-0.11.7-r2.ebuild +++ b/net-im/prosody/prosody-0.11.7-r2.ebuild @@ -15,17 +15,15 @@ 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-lang/lua-5.2:* - dev-lua/lua-bit32 - ) + 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 ) + !luajit? ( dev-lang/lua:0= ) " DEPEND=" -- cgit v1.2.3