3 files changed, 26 insertions, 13 deletions
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 516bdbf21d0a..47633ff0c942 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index 450ec874e108..505a64f9f0d6 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,6 +1,6 @@
 AUX toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch 746 BLAKE2B 36f533e0d6ae288f034a130c82d633d83eb881e87a724cb850dab9f0588722e509722a5f186791b542a5fb6e3a100ca60cae2e195a2adee1cf108c281e3c09ef SHA512 fa8274d334aa073919664aea8e3bdfa15e138b4acd424a8250ad9cc7652bdde2836cd108ff6a92b39570ff2405ffa27fcdcd1e04884253989acba978ddd51f14
-DIST toxic-0.11.3.tar.gz 1197252 BLAKE2B 4a7a3c4eed270330c6d79ad400778debda1b98b66beed1196cf4e36858d300141c468c4963d012b77d8232f7b3b3b419138505e46098bfac3cde48e9bc0b0e1c SHA512 2c8408004d9644b52cbe9477d7c486622fcef52f1d10a1bcdf7555656a2f2e1bd4c6f0594a7b0b3156fd6908c470c5b41c55e6e0914c3eb2067614013f0f259f
 DIST toxic-0.15.1.tar.gz 1246436 BLAKE2B 5af9d978957f0da687b53440b45cabb29da65ba894238b2b41427c3137b1cb764a9db489af9faa442c2fe057f1660e6c3a4303db434bd04b9dce87c07281b10d SHA512 8bb6eef248413b00124f39b798bdaf029f8c4a13c0faf0be8f061bd0b27369ae1b44e052efd25353e5bf59724a2b02892eb95fdad7a0f8d7540212475f8a17b6
-EBUILD toxic-0.11.3-r2.ebuild 3190 BLAKE2B 4584a866119c63edf4d80c3a0f5c56d1e65cda598eb2cbaaa4124a5189d84634d20431c2a9ef91761223a7a2367fb72c2fb6de0fde6c8b1c4d6e7c6e1430a1a9 SHA512 a7e9c0cc0bce3ca5dbb39e1d7cafffd31e3a38faaf0dfb3bdd884978569b18f9e17d17aef65a5425c9e8f0bc0105ecb2c447739f335cbbded5e0ffc02dc5fb23
+DIST toxic-0.16.0.tar.gz 1246725 BLAKE2B 47a1d22137de1db635e99dcff1618150aae5e98c1cea58ce944284c97ccd1c8c141d20be17a2f4a3691dc823a1fdb09ab312d643b224668c51c47dbf36c659cf SHA512 94e8c61bff56533f384367270b5b946727e7cb6a3f928b312c47578b104a881fd344af829bbf4712a79ef65526ba75c84c335ef31685e97b4a7b03b96bd642b2
 EBUILD toxic-0.15.1.ebuild 3224 BLAKE2B 1c1cd4e95d00ee1b10be279b1ced071588f277fdb9da675f519773022b3dfaee6d65cba2c87152832a24420ba988ebf6a67eb45a097a07e9849de1de3137933c SHA512 31c8823f8d7587882804f7095f7c3af625a6b46eff2f4d8a4329310d019f33681782e9f9411cab327fc2ab2900189938a2c2e6ea6bacfc6c2184cf9c7da28f44
+EBUILD toxic-0.16.0.ebuild 3530 BLAKE2B cfdef963681ad226040bcb141765d4ce98ce013549815ea051bf11beb167f49b755f695182f691979e98b5b9855a3fdb097ab4ad188c0ba04d2b721b32dc73ad SHA512 30cbd65d5413205e5fa6a4ac2d44640ff9a0040cc0f1ed61719292cdd2aa6d151005d3460ba9566ff7a9a08c058c09766988f845f1e04a7c99e99928a4e29519
 MISC metadata.xml 1290 BLAKE2B 1d3aaafbccc825205c93deaa5064c61228fab1240213ffd90eb8e826c743dadc5faf15d9539749491a195533cb685fdacc1165e9bd60a79efc8b4f330313a417 SHA512 9811420fd7d357787934b1a13951a67fb5e7524d50862f4b2d5379defa68c8b43adc2a8de727cf26f465265c1a668d141b57033e9269aedf9916132d59f1f782
diff --git a/net-im/toxic/toxic-0.11.3-r2.ebuild b/net-im/toxic/toxic-0.16.0.ebuild
index c5a9883cae25..a67629dbf7ae 100644
--- a/net-im/toxic/toxic-0.11.3-r2.ebuild
+++ b/net-im/toxic/toxic-0.16.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10,11,12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit python-single-r1 xdg
 
@@ -13,15 +13,15 @@ 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 games llvm notification png python qrcode +sound +video +X"
+KEYWORDS="~amd64 ~x86"
+IUSE="+audio-notify debug experimental games llvm notification png python qrcode +sound +video +X"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
 	video? ( sound X ) "
 
-BDEPEND="dev-libs/libconfig:=
-	virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 
-RDEPEND="net-libs/tox:=
+RDEPEND="dev-libs/libconfig:=
+	>=net-libs/tox-0.2.19:=
 	net-misc/curl
 	sys-kernel/linux-headers
 	sys-libs/ncurses:=
@@ -29,8 +29,9 @@ RDEPEND="net-libs/tox:=
 		media-libs/freealut
 		media-libs/openal
 	)
-	notification? ( x11-libs/libnotify )
 	debug? ( llvm? ( llvm-core/llvm:* ) )
+	experimental? ( net-libs/tox[experimental] )
+	notification? ( x11-libs/libnotify )
 	python? ( ${PYTHON_DEPS} )
 	qrcode? (
 		media-gfx/qrencode:=
@@ -40,6 +41,10 @@ RDEPEND="net-libs/tox:=
 		media-libs/openal
 		net-libs/tox:=[av]
 	)
+	video? (
+		media-libs/libvpx:=
+		net-libs/tox:=[av]
+	)
 	X? (
 		x11-base/xorg-proto
 		x11-libs/libX11
@@ -63,8 +68,6 @@ src_prepare() {
 	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() {
@@ -77,6 +80,9 @@ src_configure() {
 			export ENABLE_ASAN=1
 		fi
 	fi
+	if use experimental; then
+		export ENABLE_TOX_EXPERIMENTAL=1
+	fi
 	if ! use games; then
 		export DISABLE_GAMES=1
 	fi
@@ -102,8 +108,9 @@ src_configure() {
 		export DISABLE_X11=1
 	fi
 	#Including strings.h fixes undefined reference to strcasecmp()
+	#Including linux/limits.h fixes undefinded reference to NAME_MAX and PATH_MAX macros
 	#Defining _GNU_SOURCE fixes undefined reference to strcasestr()
-	export USER_CFLAGS="${CFLAGS} -include strings.h -D _GNU_SOURCE"
+	export USER_CFLAGS="${CFLAGS} -include strings.h -include linux/limits.h -D _GNU_SOURCE"
 	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!"
@@ -115,3 +122,9 @@ src_install() {
 		rm -r "${ED}"/usr/share/${PN}/sounds || die "Could not remove sounds directory"
 	fi
 }
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	einfo	"An example config file has been installed at /usr/share/toxic/toxic.conf.example"
+	einfo	"Feel free to copy it to ~/.config/tox/toxic.conf and modify as desired"
+}