gentoo resync : 18.12.2020

10 files changed, 124 insertions, 14 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 141122e3c009..e60f22ded410 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
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="
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index e2473cd61172..7f3ced01c36d 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1,3 +1,3 @@
-DIST signal-desktop_1.38.2_amd64.deb 109679066 BLAKE2B ca78200c1eda68ba7749b463fd8d286d25dca5c2032e4127f57462858f5b6724d27ef2e0e5c3d116840b3afa504c087eda78cd14247042f6574187b4642fc0e0 SHA512 42bf7c954a26b47c0753411d75fb9d8aba059be57f070f7f0e8ffadd2411b513ebcf5a82dbcf9afa5ec159ab508d425c61d681e930aba0872d764ee47b5a3a7e
-EBUILD signal-desktop-bin-1.38.2.ebuild 3661 BLAKE2B 85f803142cb67f6fd72bc2d98acff194349eade2bc14edbe18eab59de139da99524b3c283f789b99818483d5af425233a5a79e3128457149d62c4cd8509cab85 SHA512 e7ebfdcc567683b70b9856161963cbc6c884407ed26239abfcacd7d85bcd90b9a63dbec9771db5c60e19ace9f758e30f88e365f15648e5fec616a991f5f95bb0
+DIST signal-desktop_1.39.2_amd64.deb 109799098 BLAKE2B 83d1b047141ae94a1b246792bf92f0e7baa92b938df9dfbf790e90e161e9cb4f9176544deceb4507a65181113c00e6cb6d367030079f9137ffcb0f177e14c95b SHA512 21208910bc48f4def5fad6262fa878b8c6f1ae7f2a2ffa3167c2992e0dc220ba67da43d23adb0b3ad1aa8660927065e97e6bcf7b289fa19010f5fc9e94c6d56e
+EBUILD signal-desktop-bin-1.39.2.ebuild 3661 BLAKE2B 85f803142cb67f6fd72bc2d98acff194349eade2bc14edbe18eab59de139da99524b3c283f789b99818483d5af425233a5a79e3128457149d62c4cd8509cab85 SHA512 e7ebfdcc567683b70b9856161963cbc6c884407ed26239abfcacd7d85bcd90b9a63dbec9771db5c60e19ace9f758e30f88e365f15648e5fec616a991f5f95bb0
 MISC metadata.xml 366 BLAKE2B ed902f5cc030be09d1d839f3192009f6ed195718c28e3e4bca1c80f157b20ff63ec9f83a9ceb187ba1e0d203785ae60ba6777278fe833644e7cb11b3fb7bc786 SHA512 776e1f9b4fee54973687d8179b554598a9cd4d983b9515a0003f641fbe8e497b9ceef54d1fd5d09a665098b0717ccd7c9687ae96e0011619959fb5ad945c302b
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-1.38.2.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-1.39.2.ebuild
index 0735309452cc..0735309452cc 100644
--- a/net-im/signal-desktop-bin/signal-desktop-bin-1.38.2.ebuild
+++ b/net-im/signal-desktop-bin/signal-desktop-bin-1.39.2.ebuild
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index 0c450e3cc16b..66a1a3083963 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,3 +1,5 @@
+DIST toxic-0.10.0.tar.gz 1160161 BLAKE2B 30089398211945f366fd7b52ab4014cd9b020f58b7d3e47ec1a12a87055f10cdb723211f38d1028a3fb149cd76aa7771591e37f7961cda37b7bcbb8e21b33181 SHA512 bfbe8e4c90b4fcbdbe7cc96cb402e4c2f1609e2970e51d6d2ad2c8596350ce96ac9f4d06fbb71350e56d8892e2ed4ee8c5adf4f66cdad6b152c959802bddc6cc
 DIST toxic-0.8.3.tar.gz 1147100 BLAKE2B d73a861112aca65e54773c98473c2858bb81e63fef11212633e34dac9e87101956e3ab0d9d56757767bc5d48d1d5a406e550f8fc55ae34860dbc4977c94ee347 SHA512 c8d746efcc055592dd990dfa57415cc1eacaaa3b66303d7583d9f9e7e98b8829c8f1ae849f36a243c8896e99787dd2e493c92367de719b20a4a160bc7daea76e
-EBUILD toxic-0.8.3-r1.ebuild 1819 BLAKE2B bcbb717c80f30e71a97698ab3cfcfd1eb74ba5405ae2c1d058025d61a4e42ab0f2fa9f0f04918a7ea76d3e9502a43bbc3e8e0737bb66cf94f4826e5bd4f79739 SHA512 0fd97f88c87bcaf7d50efbc009ba8490248d008a20082174cf1b1c2b288cd7ef5364567cc394a88ae85c34876d7a9a33119a8cd9ede9b36698bcc94a9e2bd409
-MISC metadata.xml 984 BLAKE2B e990138cd52d9a9933635ac1a093a22305dd02896082e38b5fbbe7044fc77a1cf134db1a5923985566e89b360f2e98b7cb948e273580857a10ef5856f33c48e0 SHA512 3211f2bb29f8755718fb0cd45e37c3331271500a6d6dd0c47acee7b8e6f0d550fb9e8910d5d0769cd7ea217e7abeb1998886246c4ede1fe24b23d722a0341865
+EBUILD toxic-0.10.0.ebuild 2714 BLAKE2B 0685e3ea4a07e997e0edaece1d501729e6b5115b977f3832090e3813ceb7a62681bf80d45454cb35527a442211732750120bf4e7fdc73db4b8543f846034e437 SHA512 5de95f99b126e168b918bb16df1291399497303dd82388dcbc33f9b72553f3d485b5e1f29240cb1ec0f9558a36eb8fe8e31dade347caa736a602d171ba0d56a8
+EBUILD toxic-0.8.3-r1.ebuild 1817 BLAKE2B 0c16129cba030501dc47a7cf52c2ff9c2b2830c66848928e03a7b1a26c4d4df1536f8b0b14db8def8222f2f585cc8f35724923cc7e076e2826debb64c2beb26b SHA512 146194a704913ac6e795d0eaa9b09c9bb33cda236791979a5d9c8b05d240f0112f4ecfaddbbbc55578af05a493df30fdddb84d17fa1a7b20d17d1feb18a0cf01
+MISC metadata.xml 1124 BLAKE2B 5cc7843b51d7cb901334bf831ccff7dd43bc383b54dffc5977c8dc70c39c4064f03f12c6b03a4b2936cfedfe3079e90615dc27c74ad22bce4089c49e07d0b303 SHA512 ab9281381e6364cf9a9c38bed9d78d9b6c0dc6c45c83275dba6f727a9c60d7cec35f9944ce12d4202fa75909c80da32ab0c105cf98776d0d557925f3787ef3c0
diff --git a/net-im/toxic/metadata.xml b/net-im/toxic/metadata.xml
index 02e709980dad..f101e28e63b5 100644
--- a/net-im/toxic/metadata.xml
+++ b/net-im/toxic/metadata.xml
@@ -20,6 +20,8 @@
 		An ncurses-based Tox client written in C. Supports audio and video calling, file sharing, and desktop notifications.
 	</longdescription>
 	<use>
+		<flag name="audio-notify">Enables native sound notifications</flag>
+		<flag name="llvm">Enables support for LLVM Address Sanitizer</flag>
 		<flag name="notification">Enables desktop notifications with libnotify, with sound support.</flag>
 		<flag name="qrcode">Enables QR code support</flag>
 		<flag name="sound">Enables audio calling</flag>
diff --git a/net-im/toxic/toxic-0.10.0.ebuild b/net-im/toxic/toxic-0.10.0.ebuild
new file mode 100644
index 000000000000..eec33667d60a
--- /dev/null
+++ b/net-im/toxic/toxic-0.10.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit python-single-r1 xdg
+
+DESCRIPTION="A curses-based client for Tox"
+HOMEPAGE="https://github.com/JFreegman/toxic"
+SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+audio-notify debug doc llvm notification png python qrcode +sound +video +X"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	video? ( sound X ) "
+
+BDEPEND="dev-libs/libconfig"
+
+RDEPEND="net-libs/tox
+	net-misc/curl
+	sys-libs/ncurses:*
+	audio-notify? (
+		media-libs/freealut
+		media-libs/openal
+	)
+	notification? ( x11-libs/libnotify )
+	debug? ( llvm? ( sys-devel/llvm:* ) )
+	python? ( ${PYTHON_DEPS} )
+	qrcode? (
+		media-gfx/qrencode
+		png? ( media-libs/libpng )
+	)
+	sound? (
+		media-libs/openal
+		net-libs/tox[av]
+	)
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+	)"
+
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	#prevent man files from being compressed.
+	sed -i -e "/gzip/d" cfg/targets/install.mk || die "Unable to prevent compression of man pages."
+	#Fix incorrect linkage of pthread (may be optional)
+	sed -i -e 's/pthread/lpthread/g' Makefile || die "Unable to fix linking of pthread."
+	#Makefile sets some required CFLAGS only if CFLAGS variable is undefined,
+	#This line changes the "lazy set if absent" assignment to a "lazy set" assignment.
+	#look below in src_configure to see how CFLAGS are passed to the makefile in USER_CFLAGS
+	sed -i -e 's/?=/=/g' Makefile || die "Unable to change assignment of CFLAGS and LDFLAGS"
+}
+
+src_configure() {
+	if ! use audio-notify; then
+		USER_CFLAGS+="-DDISABLE_SOUND_NOTIFY=1 "
+	fi
+	if use debug; then
+		USER_CFLAGS+="-DENABLE_RELEASE=0 "
+		if use llvm; then
+			USER_CFLAGS+="-DENABLE_ASAN=1 "
+		fi
+	fi
+	if ! use notification; then
+		USER_CFLAGS+="-DDISABLE_DESKTOP_NOTIFY=1 "
+	fi
+	if ! use png; then
+		USER_CFLAGS+="-DDISABLE_QRPNG=1 "
+	fi
+	if use python; then
+		USER_CFLAGS+="-DENABLE_PYTHON=1"
+	fi
+	if ! use qrcode; then
+		USER_CFLAGS+="-DDISABLE_QRCODE=1"
+	fi
+	if ! use sound; then
+		USER_CFLAGS+="-DDISABLE_AV=1 "
+	fi
+	if ! use video; then
+		USER_CFLAGS+="-DDISABLE_VI=1"
+	fi
+	if ! use X; then
+		USER_CFLAGS+="-DDISABLE_X11=1 "
+	fi
+	USER_CFLAGS+="${CFLAGS}"
+	export USER_CFLAGS
+	export USER_LDFLAGS="${LDFLAGS}"
+	#set install directory to /usr.
+	sed -i -e "s,/usr/local,${EPREFIX}/usr,g" cfg/global_vars.mk || die "Failed to set install directory!"
+}
+
+src_install() {
+	default
+	if ! use audio-notify; then
+		rm -r ${ED}/usr/share/${PN}/sounds || die "Could not remove sounds directory"
+	fi
+}
diff --git a/net-im/toxic/toxic-0.8.3-r1.ebuild b/net-im/toxic/toxic-0.8.3-r1.ebuild
index 30f2e2860bcb..03ec7dfb0153 100644
--- a/net-im/toxic/toxic-0.8.3-r1.ebuild
+++ b/net-im/toxic/toxic-0.8.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit python-single-r1 xdg