gentoo resync : 18.12.2020

4 files changed, 114 insertions, 3 deletions

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