gentoo auto-resync : 29:08:2023 - 10:04:54

5 files changed, 4 insertions, 65 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 9ee437b1bd92..8de3c10710a7 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/ricochet/Manifest b/net-im/ricochet/Manifest
index 403ef84484ea..9b2c49695dec 100644
--- a/net-im/ricochet/Manifest
+++ b/net-im/ricochet/Manifest
@@ -1,4 +1,4 @@
 DIST ricochet-1.1.4.tar.gz 1292671 BLAKE2B 15a71496b01992060fbdbedb0c73365aa250d9e6c4b5bb6223cbcd727a1cf062b1b9cd094d17ae33471e6095a071b1ea6d553a1bb2168974d45486995e204e9b SHA512 9f20fe8e34ea1d8d5b252eee1e164f0a97bf5b3818e864270ea79c0f018b229ec04b1b27acf44415bb646d48b9d1a0ada455a4f77fafdb6e4d21e62292b778a1
 EBUILD ricochet-1.1.4.ebuild 1187 BLAKE2B 7508b27bf257a4ac1028559dd636155a72aec1fa4ce1d6ace1bc62e80ef053e366408d9399367ab572b8e3e997c0512a0483e48796fe7b7d815bf0a145e9aae3 SHA512 888e9d1379c3ac0c60210b714a24e2a94ae1944658e8b134a153ba89f9da4c02e9aff474c3db4d907803f4949ec4afb0b7426b5578a5a2838b5a03613287d78f
 EBUILD ricochet-9999.ebuild 1386 BLAKE2B de9f48d1c8f32a1e6da667c1c6ec1ec8d8de17358fa0b8f808bdf6d6c9983e9c2ad17bd3ab2f512c242bad1d415ffb125702455f4336f3b6bb99f852df5a9165 SHA512 07d4cb78a76185e183f0aab83f39d01f0bab8b47f3845816c3ba31ce6cfa5f0c876da95386a9d98f9e42808ed58be8d1a34f965221aff14852a9c9feb2e5d553
-MISC metadata.xml 395 BLAKE2B 33f528b302e014c10806a2aaedcf1ce7a512d85e7b69fec656ee4fbdc2b1f55c6d033d543be518f6d3eb14e6782a93faa2166fdab959798b10e9ff3a6fdafd9d SHA512 37b5a72e8b04358fbb44e822cc740f738333039a94c772c94a99c5f90deb059c465684c7dd78be5564eb7dee039ec2d03369f57bd13a5947ff65416fd57299a7
+MISC metadata.xml 480 BLAKE2B a33870bdf6a6ba41cc2f8d39ba043581766882f17d448529ee430657f57cc6b7257aadc9ffc4667365ac3219bf8815d089c5b04c7d1cfee6198590a59940210d SHA512 17c9683ea0bbcd4820924b6627852f4cb2fbf5e71ab601256c23a632310cd5aa93d44926326b266f19fad22478c11d373e41326bf09095d097cc60547f062f22
diff --git a/net-im/ricochet/metadata.xml b/net-im/ricochet/metadata.xml
index 3c27f902e41b..c4af8f701ab9 100644
--- a/net-im/ricochet/metadata.xml
+++ b/net-im/ricochet/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">ricochet-im/ricochet</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/net-im/spectrum2/Manifest b/net-im/spectrum2/Manifest
index ab1f13ac95d6..a8be0e9b343f 100644
--- a/net-im/spectrum2/Manifest
+++ b/net-im/spectrum2/Manifest
@@ -1,4 +1,3 @@
-AUX spectrum2-2.1.3-log4cxx-1.0.0.patch 2375 BLAKE2B e2ef1dafeb4d79a4d8cbc5f545e119dfc6d10b48c26e5e552a7aab911ea2d45aab95edf12ef761bea35ae1a3ceaabe6e5682bf5cd8a1d5fa5bbd9a5f5834e98b SHA512 28891262ae6ef40f2fa04ed6a9ba9ec4b18bbaa88cd5745ab09800dd71cb52340ce40b45451cd709bc9230d29798d93dbc9d4cd0043b97afeee857f6cac52362
 AUX spectrum2.initd 1332 BLAKE2B ee4a9f62ccb909bb824df485dc56c59fe935e77dcfc0354b94749a577b9121352bd56e5d0adbae161da1afc7c451d18b36689844429b46fe39b2e364ffd8c363 SHA512 d780066a00144f3ec20311b462fd29986a486af7ce5ae88e788113397d6cb6ab0800119a5d71077216ee1637ff49cd2307e9265545357b4de50bf907c80feb9c
 AUX spectrum2.service 222 BLAKE2B 58227bb8d49dac2a43d41d9a1e16b9ad804fb540a1e37fc0ec58e23e7412c5a9e0a931fe41d37430be5b77d0bc33fc17870b885995185e29a7ccd2da73022dc8 SHA512 c50d83e6afadc798b90f4df5b2f473031dadb8e32dff0c1120dc2345a3fe37a86566d6d975d22d310e0dd6d2c602d674f6a17f4df2e730e71aaf484a30aa97c2
 AUX spectrum2.tmpfiles-r1 44 BLAKE2B 262e14134a78bc5955fc8ec750ceec94b6fd99fbb65365e28c6dab6f80b0941197899bec6a99d2c5ae21ecaf750013c5c909791c86a609893a4b431597323a59 SHA512 151c93d490f58309fe25bc3ee13ec9987e024c3aec4e58fe399016307f8b78aa7721f3b86bc51373aee7cebe9ab75273f0c48c7c840562ecd2e69d2ce44eba53
diff --git a/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch b/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch
deleted file mode 100644
index 852f4ad78027..000000000000
--- a/net-im/spectrum2/files/spectrum2-2.1.3-log4cxx-1.0.0.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Description: (newer) Debian log4cxx needs C++17 and used smart pointers.
-  This patch just enables C++17 for the build and using smart pointers
-  where needed.
-Author: Tobias Frost <tobi@debian.org>
-Forwarded: not yet. log4cxx 0.14 will come with some preprocessor macros that will enable properly gating the new code.
-Last-Update: 2022-11-21 <YYYY-MM-DD, last update of the meta-information, optional>
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,7 +2,7 @@
- 
- project(libtransport)
- 
--set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD 17)
- if(WIN32)
- 	set(CMAKE_CXX_STANDARD 17)
- endif(WIN32)
---- a/plugin/cpp/Logging.cpp
-+++ b/plugin/cpp/Logging.cpp
-@@ -26,6 +26,7 @@
- #include <iterator>
- #include <algorithm>
- 
-+#include <memory>
- 
- #include <boost/filesystem.hpp>
- #include <boost/algorithm/string.hpp>
-@@ -100,15 +101,17 @@
- #ifdef _MSC_VER
- 		root->addAppender(new ConsoleAppender(new PatternLayout(L"%d %-5p %c: %m%n")));
- #else
--		root->addAppender(new ConsoleAppender(new PatternLayout("%d %-5p %c: %m%n")));
-+		auto patternlayout = std::make_shared<PatternLayout>("%d %-5p %c: %m%n");
-+		auto consoleappender = std::make_shared<ConsoleAppender>(patternlayout);
-+		root->addAppender(consoleappender);
- #endif
- 	}
- 	else {
- 		log4cxx::helpers::Properties p;
- 
--		log4cxx::helpers::FileInputStream *istream = NULL;
-+		log4cxx::helpers::InputStreamPtr istream;
- 		try {
--			istream = new log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key));
-+			istream.reset(new log4cxx::helpers::FileInputStream(CONFIG_STRING(config, key)));
- 		}
- 		catch(log4cxx::helpers::IOException &ex) {
- 			std::cerr << "Can't create FileInputStream logger instance: " << ex.what() << "\n";
---- a/tests/libtransport/main.cpp
-+++ b/tests/libtransport/main.cpp
-@@ -23,7 +23,9 @@
- #ifdef WITH_LOG4CXX
- 	LoggerPtr root = Logger::getRootLogger();
- #ifndef _MSC_VER
--	root->addAppender(new FileAppender(new PatternLayout("%d %-5p %c: %m%n"), "libtransport_test.log", false));
-+	auto patternlayout = std::make_shared<PatternLayout>("%d %-5p %c: %m%n");
-+	auto fileappender = std::make_shared<FileAppender>(patternlayout, "libtransport_test.log", false);
-+	root->addAppender(fileappender);
- #else
- 	root->addAppender(new FileAppender(new PatternLayout(L"%d %-5p %c: %m%n"), L"libtransport_test.log", false));
- #endif