gentoo auto-resync : 07:08:2024 - 12:37:20

5 files changed, 22 insertions, 67 deletions

diff --git a/net-im/toxic/Manifest b/net-im/toxic/Manifest
index 589f514012d8..122fa2d9ef71 100644
--- a/net-im/toxic/Manifest
+++ b/net-im/toxic/Manifest
@@ -1,7 +1,6 @@
-AUX toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch 1274 BLAKE2B cb5f7b6e7d73c6f42b8ef30ac09ea6e9cc33d46ed4089c9fd29176ee92c1fa763108b2dd0c0cba199000c8011bb9189ab82c5aa3345341c883b31c12862d45a5 SHA512 0acd682f2657f57975ca01f353cf172b68d34edf9f08b4489b6904f956d516966ab65b38e13af3f7df5a139d3626e6efc1769e57c353daf1c29b86a5a80d6d59
 AUX toxic-0.11.3-NAME_MAX-and-PATH_MAX.patch 746 BLAKE2B 36f533e0d6ae288f034a130c82d633d83eb881e87a724cb850dab9f0588722e509722a5f186791b542a5fb6e3a100ca60cae2e195a2adee1cf108c281e3c09ef SHA512 fa8274d334aa073919664aea8e3bdfa15e138b4acd424a8250ad9cc7652bdde2836cd108ff6a92b39570ff2405ffa27fcdcd1e04884253989acba978ddd51f14
-DIST toxic-0.11.1.tar.gz 1204163 BLAKE2B 1e388982236badf1a27cb1cfd9e84ec635be6a576a0719a7394f32ac82f23796f94236ab807180620cbfa8c0c42f43ff244d2d99d27cd5ab3258c1ce69acc545 SHA512 53fba05271020547e779d63bea777f90f56b61e3eb2775afabe92e047a8347b4a9166628bb59d2eaab2e36a1121d791206ac68ff6604cb06fac6aaddbb05e787
 DIST toxic-0.11.3.tar.gz 1197252 BLAKE2B 4a7a3c4eed270330c6d79ad400778debda1b98b66beed1196cf4e36858d300141c468c4963d012b77d8232f7b3b3b419138505e46098bfac3cde48e9bc0b0e1c SHA512 2c8408004d9644b52cbe9477d7c486622fcef52f1d10a1bcdf7555656a2f2e1bd4c6f0594a7b0b3156fd6908c470c5b41c55e6e0914c3eb2067614013f0f259f
-EBUILD toxic-0.11.1-r1.ebuild 3187 BLAKE2B ddf96a30d3c0727acfaaad2b5abfd106f3bb2fd799af09b30d5adfdde9c6a3d34820fa6614408b481e9c3865a3a0a3196c41b6cf6230c84f57e7a720ef7384f0 SHA512 5d38d31bf06340aa28d39296696a47bf7c9ab38244f2c9c3c66c15964229e24b139f552f281ccbbd971dd171f68e06de5004d53cd265186dea3e224d871036b6
-EBUILD toxic-0.11.3-r1.ebuild 3189 BLAKE2B ec74bfb620ce970130eaed19e71f49c50ada94acfd299c171dd2a6e7cea301d83cf147503d2f6c8b62c19c64497e48e3edd416f11aa8f5e0f71fb6fb74f6f86e SHA512 8e862e891c9a7604e707a8b7ed3672f19d9c05d17669e7c2dec04f8e378b2e211a125e74081fd191fa6d170e742a05ac0d02469429d8fe52da969ce0f81abad7
-MISC metadata.xml 1213 BLAKE2B 27cb3884fcbdaf0f702710b26b6a28ea42ed810a0c9eaa024d6067d4a8f20b79020f84abb4b730ef8ae01694b0dbfaa13e72f843f43efd6741b3d487894485a9 SHA512 1997d11602350b2cc9d8a684c2720876ab97319c89a055b9629540ee17fe7fad946ac28472f1ef6d3f0680fc4be4210aeec1f14775e0ad1bb6b236742369015a
+DIST toxic-0.15.1.tar.gz 1246436 BLAKE2B 5af9d978957f0da687b53440b45cabb29da65ba894238b2b41427c3137b1cb764a9db489af9faa442c2fe057f1660e6c3a4303db434bd04b9dce87c07281b10d SHA512 8bb6eef248413b00124f39b798bdaf029f8c4a13c0faf0be8f061bd0b27369ae1b44e052efd25353e5bf59724a2b02892eb95fdad7a0f8d7540212475f8a17b6
+EBUILD toxic-0.11.3-r2.ebuild 3192 BLAKE2B 353124b2042bf31f572562ddbb38f2a0383ee91e878ac18a43b9c456e33f7e5556afb6153d629fde9f9fed1945f057bdcdb67b8dfeb44ebb3d60388bf56d752a SHA512 4ddf5fc335f31a7f377b391da973087e52cba373f22680af2e5bd7730935bb3d4fbd8811f398671fd92e8467380f4b9220ec6de3266cb4b58c7c960fa73e5c41
+EBUILD toxic-0.15.1.ebuild 3226 BLAKE2B 1da4ec5a83f8fc0daea8eaa24d0cf1db1059b7eb17a26741a51db68df5428c5758df5e26028a4f91eed22db925ba309c58b46406b6270ffa81d9bc94e6f3c9ad SHA512 f3bfc393ea503e5c2c8dcefff03a178d320db286829c7351feda98f11f649975f5e6ccf389326c136ea8c73a648a4466e31000cfa1e9aee0c2cb2a12ca71473e
+MISC metadata.xml 1290 BLAKE2B 1d3aaafbccc825205c93deaa5064c61228fab1240213ffd90eb8e826c743dadc5faf15d9539749491a195533cb685fdacc1165e9bd60a79efc8b4f330313a417 SHA512 9811420fd7d357787934b1a13951a67fb5e7524d50862f4b2d5379defa68c8b43adc2a8de727cf26f465265c1a668d141b57033e9269aedf9916132d59f1f782
diff --git a/net-im/toxic/files/toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch b/net-im/toxic/files/toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch
deleted file mode 100644
index 09845d294a2e..000000000000
--- a/net-im/toxic/files/toxic-0.11.1-NAME_MAX-and-PATH_MAX.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -ruN src/autocomplete.c src/autocomplete.c
---- src/autocomplete.c	2021-08-09 18:52:27.090248882 -0400
-+++ src/autocomplete.c	2021-08-11 14:57:39.029828530 -0400
-@@ -25,10 +25,12 @@
- #include <string.h>
- 
- #ifdef __APPLE__
--#include <sys/types.h>
- #include <sys/dir.h>
-+#include <sys/types.h>
-+#include <sys/sysinfo.h>//This should contain PATH_MAX and NAME_MAX
- #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	2021-07-26 15:39:36.765990567 -0400
-+++ src/file_transfers.h	2021-08-11 14:59:41.223159195 -0400
-@@ -24,6 +24,12 @@
- #define FILE_TRANSFERS_H
- 
- #include <limits.h>
-+//This should include NAME_MAX and PATH_MAX
-+#ifdef __APPLE__
-+#include <sys/sysinfo.h>
-+#elif __linux__
-+#include <linux/limits.h>
-+#endif
- 
- #include "notify.h"
- #include "toxic.h"
-diff -ruN src/settings.h src/settings.h
---- src/settings.h	2021-08-09 18:52:27.093582216 -0400
-+++ src/settings.h	2021-08-11 15:00:46.889824433 -0400
-@@ -24,6 +24,12 @@
- #define SETTINGS_H
- 
- #include <limits.h>
-+//This should include NAME_MAX and PATH_MAX
-+#ifdef __APPLE__
-+#include <sys/sysinfo.h>
-+#elif __linux__
-+#include <linux/limits.h>
-+#endif
- 
- #include <tox/tox.h>
diff --git a/net-im/toxic/metadata.xml b/net-im/toxic/metadata.xml
index cdcd3b5220b7..bcfbe7a46e8b 100644
--- a/net-im/toxic/metadata.xml
+++ b/net-im/toxic/metadata.xml
@@ -21,6 +21,7 @@
 	</longdescription>
 	<use>
 		<flag name="audio-notify">Enables native sound notifications</flag>
+		<flag name="experimental">Use experimental features in net-libs/tox</flag>
 		<flag name="games">Enables some small mini-games</flag>
 		<flag name="llvm">Enables support for LLVM Address Sanitizer</flag>
 		<flag name="notification">Enables desktop notifications with libnotify, with sound support.</flag>
diff --git a/net-im/toxic/toxic-0.11.3-r1.ebuild b/net-im/toxic/toxic-0.11.3-r2.ebuild
index 729b32f3fcc0..b65d15bbbbc9 100644
--- a/net-im/toxic/toxic-0.11.3-r1.ebuild
+++ b/net-im/toxic/toxic-0.11.3-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{9,10,11,12} )
 
 inherit python-single-r1 xdg
 
diff --git a/net-im/toxic/toxic-0.11.1-r1.ebuild b/net-im/toxic/toxic-0.15.1.ebuild
index 1a535eb7fcaa..41f910090c7d 100644
--- a/net-im/toxic/toxic-0.11.1-r1.ebuild
+++ b/net-im/toxic/toxic-0.15.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10,11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit python-single-r1 xdg
 
@@ -13,15 +13,16 @@ 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"
 
-RDEPEND="net-libs/tox:=
+RDEPEND="
+	>=net-libs/tox-0.2.19:=[experimental?]
 	net-misc/curl
 	sys-kernel/linux-headers
 	sys-libs/ncurses:=
@@ -29,8 +30,8 @@ RDEPEND="net-libs/tox:=
 		media-libs/freealut
 		media-libs/openal
 	)
-	notification? ( x11-libs/libnotify )
 	debug? ( llvm? ( sys-devel/llvm:* ) )
+	notification? ( x11-libs/libnotify )
 	python? ( ${PYTHON_DEPS} )
 	qrcode? (
 		media-gfx/qrencode:=
@@ -63,8 +64,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 +76,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
@@ -101,9 +103,10 @@ src_configure() {
 	if ! use X; then
 		export DISABLE_X11=1
 	fi
-	#include strings.h fixes undefined reference to strcasecmp()
-	#defining _GNU_SOURCE fixes undefined reference to strcasestr()
-	export USER_CFLAGS="${CFLAGS} -include strings.h -D _GNU_SOURCE"
+	#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 -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!"