gentoo resync : 07.01.2022

4 files changed, 97 insertions, 77 deletions

diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index 16007ed11d12..0ae13818614d 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,10 +1,10 @@
 AUX toxic-0.10.1-NAME_MAX-and-PATH_MAX.patch 1221 BLAKE2B 2410d954710fd59ae26a308490aca577680f1db283cbf4e6b1c403e778492bd9b889c2d7f32674a844a36b8ee4f396129fa6a3ee4a65c3c13f0b130efdb860d4 SHA512 21c493de57a1d0bc72ddccf6c1b42348ae4aae48ff009e1bc006dd22d7bfc5bfd70b76a40db1b63a03156514306fb240965053844b841988adcab15d666effbc
 AUX toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch 1274 BLAKE2B cb5f7b6e7d73c6f42b8ef30ac09ea6e9cc33d46ed4089c9fd29176ee92c1fa763108b2dd0c0cba199000c8011bb9189ab82c5aa3345341c883b31c12862d45a5 SHA512 0acd682f2657f57975ca01f353cf172b68d34edf9f08b4489b6904f956d516966ab65b38e13af3f7df5a139d3626e6efc1769e57c353daf1c29b86a5a80d6d59
-AUX toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch 1236 BLAKE2B ecbb048e6e34792c958a25fea05922ec5b82e24792566d8599b8fc355b7c8d5327735dc07b7fd707687647e19f79f1f5580643866eeaa3fb2cda17770086a383 SHA512 2c029f4e62a94a42649933658de7a85c220357a3c02035a2628202298341a729b7a26e81bbf3bc648ef1cd43d2eb52061185218af14bb63954771280a19daf42
+AUX toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch 746 BLAKE2B 36f533e0d6ae288f034a130c82d633d83eb881e87a724cb850dab9f0588722e509722a5f186791b542a5fb6e3a100ca60cae2e195a2adee1cf108c281e3c09ef SHA512 fa8274d334aa073919664aea8e3bdfa15e138b4acd424a8250ad9cc7652bdde2836cd108ff6a92b39570ff2405ffa27fcdcd1e04884253989acba978ddd51f14
 DIST toxic-0.10.1.tar.gz 1165118 BLAKE2B d367039bef9c97c23c8e5453b607cf72f70776e8c86c41da0480eb04725a901bf33bb89727aee3010ad97d33ef2aa653ff09ea49b597cdf2008ff976c395065c SHA512 aec2e6612d639e0210ae68db3368b656647575e3d927444d0726422ff2cf9718dd5a8b3f37a8253cdc3714f09f9f96828dfccf7a7ae12f8a41ce3207f92a684d
 DIST toxic-0.11.1.tar.gz 1204163 BLAKE2B 1e388982236badf1a27cb1cfd9e84ec635be6a576a0719a7394f32ac82f23796f94236ab807180620cbfa8c0c42f43ff244d2d99d27cd5ab3258c1ce69acc545 SHA512 53fba05271020547e779d63bea777f90f56b61e3eb2775afabe92e047a8347b4a9166628bb59d2eaab2e36a1121d791206ac68ff6604cb06fac6aaddbb05e787
-DIST toxic-0.8.3.tar.gz 1147100 BLAKE2B d73a861112aca65e54773c98473c2858bb81e63fef11212633e34dac9e87101956e3ab0d9d56757767bc5d48d1d5a406e550f8fc55ae34860dbc4977c94ee347 SHA512 c8d746efcc055592dd990dfa57415cc1eacaaa3b66303d7583d9f9e7e98b8829c8f1ae849f36a243c8896e99787dd2e493c92367de719b20a4a160bc7daea76e
+DIST toxic-0.11.3.tar.gz 1197252 BLAKE2B 4a7a3c4eed270330c6d79ad400778debda1b98b66beed1196cf4e36858d300141c468c4963d012b77d8232f7b3b3b419138505e46098bfac3cde48e9bc0b0e1c SHA512 2c8408004d9644b52cbe9477d7c486622fcef52f1d10a1bcdf7555656a2f2e1bd4c6f0594a7b0b3156fd6908c470c5b41c55e6e0914c3eb2067614013f0f259f
 EBUILD toxic-0.10.1-r1.ebuild 3051 BLAKE2B 44a340be721ec9ae43739225f3ed695ca98f3561deece983f1e9b196d7b530b568dab07dc9118536b28cc620ebe0e064128ca3c29a459ccc3c4ca86735b330c4 SHA512 670856e91e0074648fc9decbfec57dd3a4d707dae7a680f6c83e729829065157ae79efd48798f1dddadcb6c8193f7a91688683735230ae871edfffc93cf4a835
 EBUILD toxic-0.11.1.ebuild 3025 BLAKE2B b081ad285865a067de261e4a3ea49f65c4a1777f5c7bac07978a2ab5c9a2b0b38fa32fa1b037916a7dc3defdc6860ef3549b9454b6fc36ca7e5e7ebc93832213 SHA512 e2d54f02e91f4de80a3f6d50701b4adacc785b411e6e5feee1303dc70634e16b7449d079b8427fa9b2140d1b8d1383e81613d3892d24f2611c98bcd7892a4983
-EBUILD toxic-0.8.3-r3.ebuild 2009 BLAKE2B 2d2888afcd59c4b087071182e3e7b612e608a0b733a064eb69f5e5317cd2146937e27bd1c757dff1ceecbbf9155c9b302135258f3beedf3f41babecfb4a66249 SHA512 63ae73ffea094e32a11f1a9d8bb1ab28f49e0eeafc7ce1c1b3cc6941fdbc109c447fc454d98148d2fa1320be77e4d5bccac8091b22390a3512d234215947c837
+EBUILD toxic-0.11.3.ebuild 3027 BLAKE2B cf907853a96a89ed1c5a59e2cdb328c796821bcb730da1670cd7d82d4933aef902deea0243b60476aedcc1a5e44ce503290807481cc3ed0c6229c835bff9b7e5 SHA512 fd34ee65ca8d421fbcacbb72b2bfce86236f878db42b250adb36b9107c9f96c67e1e8b541812220d796b70266a3710fd57ea56f6df08a29c64879c4ad1f1d91e
 MISC metadata.xml 1213 BLAKE2B 27cb3884fcbdaf0f702710b26b6a28ea42ed810a0c9eaa024d6067d4a8f20b79020f84abb4b730ef8ae01694b0dbfaa13e72f843f43efd6741b3d487894485a9 SHA512 1997d11602350b2cc9d8a684c2720876ab97319c89a055b9629540ee17fe7fad946ac28472f1ef6d3f0680fc4be4210aeec1f14775e0ad1bb6b236742369015a
diff --git a/net-im/toxic/files/toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch
new file mode 100644
index 000000000000..2101b64e3d9f
--- /dev/null
+++ b/net-im/toxic/files/toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch
@@ -0,0 +1,39 @@
+diff -ruN src/autocomplete.c src/autocomplete.c
+--- src/autocomplete.c
++++ src/autocomplete.c
+@@ -29,6 +29,7 @@
+ #include <sys/dir.h>
+ #else
+ #include <dirent.h>
++#include <linux/limits.h>
+ #endif /* __APPLE__ */
+ 
+ #include "configdir.h"
+diff -ruN src/file_transfers.h src/file_transfers.h
+--- src/file_transfers.h
++++ src/file_transfers.h
+@@ -25,6 +25,10 @@
+ 
+ #include <limits.h>
+ 
++#ifdef __linux__
++#include <linux/limits.h>
++#endif
++
+ #include "notify.h"
+ #include "toxic.h"
+ #include "windows.h"
+diff -ruN src/settings.h src/settings.h
+--- src/settings.h
++++ src/settings.h
+@@ -25,6 +25,10 @@
+ 
+ #include <limits.h>
+ 
++#ifdef __linux__
++#include <linux/limits.h>
++#endif
++
+ #include <tox/tox.h>
+ 
+ /* Represents line_* hints max strlen */
diff --git a/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch
deleted file mode 100644
index 11dc43c6b778..000000000000
--- a/net-im/toxic/files/toxic-0.8.3-NAME_MAX-and-PATH_MAX.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -ruN src/autocomplete.c src/autocomplete.c
---- src/autocomplete.c	2021-07-26 10:43:37.453154392 -0400
-+++ src/autocomplete.c	2021-07-26 10:59:29.856460938 -0400
-@@ -27,8 +27,11 @@
- #ifdef __APPLE__
- #include <sys/types.h>
- #include <sys/dir.h>
--#else
-+//This include NAME_MAX
-+#include <sys/sysinfo.h>
-+#elif __linux__
- #include <dirent.h>
-+#include <linux/limits.h>//This includes NAME_MAX
- #endif /* __APPLE__ */
- 
- #include "windows.h"
-diff -ruN src/file_transfers.h src/file_transfers.h
---- src/file_transfers.h	2021-07-26 10:43:37.456487724 -0400
-+++ src/file_transfers.h	2021-07-26 11:41:30.513057111 -0400
-@@ -24,6 +24,12 @@
- #define FILE_TRANSFERS_H
- 
- #include <limits.h>
-+//This includes PATH_MAX
-+#ifdef __APPLE__
-+#include <sys/sysinfo.h>
-+#elif __linux__
-+#include <linux/limits.h>
-+#endif
- 
- #include "toxic.h"
- #include "windows.h"
-diff -ruN src/settings.h src/settings.h
---- src/settings.h	2021-07-26 10:43:37.459821058 -0400
-+++ src/settings.h	2021-07-26 11:45:46.709716594 -0400
-@@ -25,6 +25,13 @@
- 
- #include <limits.h>
- 
-+//This includes PATH_MAX
-+#ifdef __APPLE__
-+#include <sys/sysinfo.h>
-+#elif __linux__
-+#include <linux/limits.h>
-+#endif
-+
- #include <tox/tox.h>
- 
- /* Represents line_* hints max strlen */
diff --git a/net-im/toxic/toxic-0.8.3-r3.ebuild b/net-im/toxic/toxic-0.11.3.ebuild
index 97ed2aa0ae38..540224d42d30 100644
--- a/net-im/toxic/toxic-0.8.3-r3.ebuild
+++ b/net-im/toxic/toxic-0.11.3.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9,10} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit python-single-r1 xdg
 
@@ -13,28 +13,37 @@ SRC_URI="https://github.com/JFreegman/toxic/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="notification python qrcode +sound +video +X"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+audio-notify debug games llvm notification png python qrcode +sound +video +X"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	video? ( sound X ) "
 
-BDEPEND="dev-libs/libconfig"
+BDEPEND="dev-libs/libconfig:=
+	virtual/pkgconfig"
 
 RDEPEND="net-libs/tox:=
 	net-misc/curl
-	sys-libs/ncurses:=
 	sys-kernel/linux-headers
+	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:= )
+	qrcode? (
+		media-gfx/qrencode:=
+		png? ( media-libs/libpng )
+	)
 	sound? (
-		media-libs/freealut
 		media-libs/openal
 		net-libs/tox:=[av]
 	)
-	video? (
-		media-libs/libvpx:=
-		net-libs/tox:=[av]
-		x11-libs/libX11 )"
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libX11
+	)"
 
 DEPEND="${RDEPEND}"
 
@@ -46,40 +55,61 @@ 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 include declarations for NAME_MAX and PATH_MAX.
+	#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"
+	#Fix incomplete invocation of python-config
+	sed -i -e "s/--ldflags/--ldflags --embed/" cfg/checks/python.mk || die "Unable to fix python linking"
+	#This is to fix incorrect include statements of NAME_MAX and PATH_MAX macros
 	eapply -p0 "${FILESDIR}/${P}-NAME_MAX-and-PATH_MAX.patch" || die "Unable to fix include statements"
 }
 
 src_configure() {
-	export USER_CFLAGS="${CFLAGS}"
-	export USER_LDFLAGS="${LDFLAGS}"
-	if ! use sound; then
-		export DISABLE_AV=1
+	if ! use audio-notify; then
 		export DISABLE_SOUND_NOTIFY=1
 	fi
-	if ! use video; then
-		export DISABLE_VI=1
+	if use debug; then
+		export ENABLE_RELEASE=0
+		if use llvm; then
+			export ENABLE_ASAN=1
+		fi
 	fi
-	if ! use X; then
-		export DISABLE_X11=1
+	if ! use games; then
+		export DISABLE_GAMES=1
 	fi
 	if ! use notification; then
 		export DISABLE_DESKTOP_NOTIFY=1
 	fi
-	if ! use qrcode; then
-		export DISABLE_QRCODE=1
+	if ! use png; then
 		export DISABLE_QRPNG=1
 	fi
 	if use python; then
 		export ENABLE_PYTHON=1
 	fi
+	if ! use qrcode; then
+		export DISABLE_QRCODE=1
+	fi
+	if ! use sound; then
+		export DISABLE_AV=1
+	fi
+	if ! use video; then
+		export DISABLE_VI=1
+	fi
+	if ! use X; then
+		export DISABLE_X11=1
+	fi
+	export USER_CFLAGS="${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 sound; then
+	if ! use audio-notify; then
 		rm -r "${ED}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
 	fi
 }