gentoo auto-resync : 16:07:2024 - 12:27:58

4 files changed, 124 insertions, 1 deletions

diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index 3a22d08b4138..8b508ebba3b4 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,6 +1,8 @@
+AUX spectrum2-2.2.1-boost-1.85.patch 5027 BLAKE2B 3721be895ede0d52005acc4e9cab8eaca137f22ed7314874a8e5a8363760f077993353dfa7c76ad69110e880b053590a719a17644563fd6c5a700488950e1fc0 SHA512 f5e86cc91247509a85f5052eb766706ac9b58ecca9a830acbca33a766895645f9b4ea1ee24316d43588158b7a2cac867308cd835b31539226855f9c985832631
+AUX spectrum2-2.2.1-use-c++14.patch 212 BLAKE2B 5b525badc5bda979d0fc27d1538911c4c0432f22be2597101bd0cf7f927e43fc00a81b6e479b6dd8d9fb4c5eb85bf5d8a659f54f0775a615566b70219a883cd2 SHA512 cef37a4f3fe110ff08ebf8af55c60e53877c4eff31103524ffffe848353b5d7ffb501fe9e9f44a6a4e622a6d2d1be4e8207843218f39796d99a31674f7f7a4d4
 AUX spectrum2.initd 1333 BLAKE2B ee4530c47e12d29a16d6b17a126878870c9332e2b6b9941e783d3236e9bd7f18616fa39a88af87670da2380ecea1d73be17fde978ef94aa76dfcc1ce9602c7d6 SHA512 b90592bbf4f415ec81db041b0b16e9603f5ac2c2867eeb3939b1f897a818f6197155dd2ec0769447697b690e2c938c24f202acc3596a43fd545b558167d762f9
 AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
 AUX spectrum2.tmpfiles-r1 44 BLAKE2B 262e14134a78bc5955fc8ec750ceec94b6fd99fbb65365e28c6dab6f80b0941197899bec6a99d2c5ae21ecaf750013c5c909791c86a609893a4b431597323a59 SHA512 151c93d490f58309fe25bc3ee13ec9987e024c3aec4e58fe399016307f8b78aa7721f3b86bc51373aee7cebe9ab75273f0c48c7c840562ecd2e69d2ce44eba53
 DIST spectrum2-2.2.1.tar.gz 666509 BLAKE2B c946cea46d99bd8126ad8270a8a01140d75ff989cf0cc0e2ff19ac830c01df4ad02a296959077f5a56707d509bafe937515f78adf7361a2e261497f5299dfe7d SHA512 c752f043f337157125da800ec5e5ed41b0f0f2bf8ee91c682a228779754557389469eb58610bef7793a0d68a303260f80a38a1519f61b62ba23e9a2222c6f399
-EBUILD spectrum2-2.2.1.ebuild 2774 BLAKE2B 170ca5889ead1309a5aa513664d4d4cf35a37f3c358ba2e10424375d58d27b793440754f5aaba568fe2bc2b273c2364fb9ebbfd4dedacb5d6d94f246848ad35a SHA512 7724e5965b49344c43d27578687ba25aca078ae5787be18a55b97bf5872ea35c221cb75ae2acc5d1b1f090a7e9ff9c8e70e87e14d3debf67477f2dbe34485825
+EBUILD spectrum2-2.2.1.ebuild 2874 BLAKE2B 4133583e6fefc61e0a63b594140e5bfe101e770f1b644af64dc6b712d887527f8c2f1a388501803c7224561292dcd437191f901fa3f167838d9cdb17f535e971 SHA512 b7d69936942513b27a7181d90344271647e91e9c1d9d757457f676f13cc6db30d309e1cea49ceb2d1168aa6869e52c9f72318a9db507a43a4a1bf7d70d12265c
 MISC metadata.xml 1114 BLAKE2B 35d457612fa10fe7e6e2007734c54e491b581e86e0376416b3e2177d6c22b478c7b2bb98cb7bf4d7c80d3ab36f2674c18642f2725cc5c8e230df174bf80d1776 SHA512 13de6689c9838edaccc98b038a86d64dd4bc9639c41b383f8cd0d7e081f6a6bd23c597901165e39867dbed6d957a71f71a9011f6c73050d098ee984fb59f994e
diff --git a/net-im/spectrum2/files/spectrum2-2.2.1-boost-1.85.patch b/net-im/spectrum2/files/spectrum2-2.2.1-boost-1.85.patch
new file mode 100644
index 000000000000..30e6a4cdeb81
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.2.1-boost-1.85.patch
@@ -0,0 +1,103 @@
+Bug: https://bugs.gentoo.org/933691
+
+From: Bill Prendergast <dek.devel@baisenvar.info>
+
+Fix build with boost-1.85 (filesystem api v4 removed Deprecated Features)
+see https://www.boost.org/doc/libs/1_85_0/libs/filesystem/doc/deprecated.html
+
+--- a/plugin/cpp/Util.cpp
++++ b/plugin/cpp/Util.cpp
+@@ -53,7 +53,7 @@ void createDirectories(Transport::Config *config, const boost::filesystem::path&
+ 	}
+ 
+ 	// First create branch, by calling ourself recursively
+-	createDirectories(config, ph.branch_path());
++	createDirectories(config, ph.parent_path());
+ 	
+ 	// Now that parent's path exists, create the directory
+ 	create_directory(ph);
+@@ -89,7 +89,7 @@ void removeEverythingOlderThan(const std::vector<std::string> &dirs, time_t t) {
+ 			for (directory_iterator itr(p); itr != end_itr; ++itr) {
+ 				if (last_write_time(itr->path()) < t) {
+ 					try {
+-						if (is_regular(itr->path())) {
++						if (is_regular_file(itr->path())) {
+ 							remove(itr->path());
+ 						}
+ 						else if (is_directory(itr->path())) {
+--- a/spectrum/src/main.cpp
++++ b/spectrum/src/main.cpp
+@@ -147,7 +147,7 @@ static void _createDirectories(Transport::Config *config, boost::filesystem::pat
+ 	}
+ 
+ 	// First create branch, by calling ourself recursively
+-	_createDirectories(config, ph.branch_path());
++	_createDirectories(config, ph.parent_path());
+ 
+ 	// Now that parent's path exists, create the directory
+ 	boost::filesystem::create_directory(ph);
+--- a/spectrum_manager/src/methods.cpp
++++ b/spectrum_manager/src/methods.cpp
+@@ -168,7 +168,7 @@ int start_instances(ManagerConfig *config, const std::string &_jid) {
+ 
+ 		directory_iterator end_itr;
+ 		for (directory_iterator itr(p); itr != end_itr; ++itr) {
+-			if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") {
++			if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") {
+ 				Config cfg;
+ 				if (cfg.load(itr->path().string()) == false) {
+ 					std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
+@@ -232,7 +232,7 @@ void stop_instances(ManagerConfig *config, const std::string &_jid) {
+ 
+ 		directory_iterator end_itr;
+ 		for (directory_iterator itr(p); itr != end_itr; ++itr) {
+-			if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") {
++			if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") {
+ 				Config cfg;
+ 				if (cfg.load(itr->path().string()) == false) {
+ 					std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
+@@ -315,7 +315,7 @@ int restart_instances(ManagerConfig *config, const std::string &_jid) {
+ 
+ 		directory_iterator end_itr;
+ 		for (directory_iterator itr(p); itr != end_itr; ++itr) {
+-			if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") {
++			if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") {
+ 				Config cfg;
+ 				if (cfg.load(itr->path().string()) == false) {
+ 					std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
+@@ -401,7 +401,7 @@ int show_status(ManagerConfig *config) {
+ 
+ 		directory_iterator end_itr;
+ 		for (directory_iterator itr(p); itr != end_itr; ++itr) {
+-			if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") {
++			if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") {
+ 				Config cfg;
+ 				if (cfg.load(itr->path().string()) == false) {
+ 					std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
+@@ -531,7 +531,7 @@ std::string get_config(ManagerConfig *config, const std::string &jid, const std:
+ 
+ 		directory_iterator end_itr;
+ 		for (directory_iterator itr(p); itr != end_itr; ++itr) {
+-			if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") {
++			if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") {
+ 				Config cfg;
+ 				if (cfg.load(itr->path().string()) == false) {
+ 					std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
+@@ -572,7 +572,7 @@ void ask_local_server(ManagerConfig *config, Swift::BoostNetworkFactories &netwo
+ 		bool found = false;
+ 		directory_iterator end_itr;
+ 		for (directory_iterator itr(p); itr != end_itr; ++itr) {
+-			if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") {
++			if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") {
+ 				Config cfg;
+ 				if (cfg.load(itr->path().string()) == false) {
+ 					std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
+@@ -619,7 +619,7 @@ std::vector<std::string> show_list(ManagerConfig *config, bool show) {
+ 
+ 		directory_iterator end_itr;
+ 		for (directory_iterator itr(p); itr != end_itr; ++itr) {
+-			if (is_regular(itr->path()) && extension(itr->path()) == ".cfg") {
++			if (is_regular_file(itr->path()) && itr->path().extension().string() == ".cfg") {
+ 				Config cfg;
+ 				if (cfg.load(itr->path().string()) == false) {
+ 					std::cerr << "Can't load config file " << itr->path().string() << ". Skipping...\n";
diff --git a/net-im/spectrum2/files/spectrum2-2.2.1-use-c++14.patch b/net-im/spectrum2/files/spectrum2-2.2.1-use-c++14.patch
new file mode 100644
index 000000000000..009f7cb4a3a8
--- /dev/null
+++ b/net-im/spectrum2/files/spectrum2-2.2.1-use-c++14.patch
@@ -0,0 +1,13 @@
+Don't focre c11
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,7 +4,7 @@
+ 
+ project(libtransport)
+ 
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 14)
+ if(WIN32)
+ 	set(CMAKE_CXX_STANDARD 17)
+ endif(WIN32)
diff --git a/net-im/spectrum2/spectrum2-2.2.1.ebuild b/net-im/spectrum2/spectrum2-2.2.1.ebuild
index 659d8085be5d..bfeccf1de360 100644
--- a/net-im/spectrum2/spectrum2-2.2.1.ebuild
+++ b/net-im/spectrum2/spectrum2-2.2.1.ebuild
@@ -58,6 +58,11 @@ DEPEND="
 	test? ( dev-util/cppunit )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.1-boost-1.85.patch
+	"${FILESDIR}"/${PN}-2.2.1-use-c++14.patch
+)
+
 src_prepare() {
 	# Respect users LDFLAGS
 	sed -i -e "s/-Wl,-export-dynamic/& ${LDFLAGS}/" spectrum/src/CMakeLists.txt || die