gentoo auto-resync : 22:04:2023 - 12:04:32

6 files changed, 54 insertions, 4 deletions

diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 1866e8343a4b..a4ab7e626d78 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/neochat/Manifest b/net-im/neochat/Manifest
index e0d75dc2eb42..90ae536ab127 100644
--- a/net-im/neochat/Manifest
+++ b/net-im/neochat/Manifest
@@ -1,7 +1,7 @@
 AUX neochat-22.11-fix-crash-notification-settings.patch 2971 BLAKE2B 641da45f1ce637ef0dd57a0bda3cd0b9b979c603799435c177e30f7f12fdcd90fc380450fa693f784e911f20a00c72bbda759148ba9dfe35a24b8f8c860d5f9a SHA512 a25490fd20b96d4c4857885f152a7f109a9d78fef06504eb61d777479d2e137323a26d68e2306fc08b792d033bd9aac0579e7ea9eca61c48ef40329b8f1b675f
 AUX neochat-22.11-hide-dev-settings-loading.patch 1633 BLAKE2B 493e404e21b4275cd1babf950fe1f1d2d54dd0cb4a54d2cb39b313b8fdec422e3f4a9969e75f3f3c214100ad96e50ff4fc726f0454576034b165b27d983a7cb3 SHA512 cc8446c1cb7c0dc60be0950c682ecaecb3954e6a792ebf9ef2da39480dd6b4754bcef99d19a53b6de9bb203fe0ac32ce1a540e8758dc6cb2b1fe131b58520748
 DIST neochat-22.11.tar.xz 465660 BLAKE2B bbd391a97cf4ea886042f3983798b766b4bd4fcf75513e4adf808227cc03ae6b533426b0f3ab000dc22593ce0be1ea7d284fac654db5bf66844633001300babd SHA512 7e10d2512dd60b76340a84b2daab1e020d75c0ec9d79c87d5f96ce2c394bf93e557b9c96606abe643a787db1136861c25826f9dc7680d3a43d218654ef864519
-DIST neochat-23.03.90.tar.xz 565068 BLAKE2B 18f21f5ce09719bddfae18ed2e376dcd2cf6c9b07dc889eaca03ea2ddc5e8f70bc28ce306500d062ea0bed52df9ae50ac995c3d1c1e849b57c82590dc07f3a78 SHA512 b08fdb6c4e3c266d47f399204927fe4b6e99c6947014447512e0a0ed6e1741a20d954046d6b9f1d5d3dba6b6ff6d7ace913d989a0e11a3f3e92be96866042f22
+DIST neochat-23.04.0.tar.xz 565520 BLAKE2B 3ad908f916c5db5326486e2267b26a99dee58348be7f247a27590e8d20cbe3ef3c93c9506416c182215ba0e13ea29d50afe1a445f3fc31def5ad136c250eeae0 SHA512 a4098ef9cdf1a59ab8ee6abfeaf3d5533cdf668a43c081d3cd228249530bcdd77a386c2215106c5e3a8efbbd68b7ec3e8b04f34219d6511a9d654ef0c1bb0be4
 EBUILD neochat-22.11-r2.ebuild 1701 BLAKE2B 460361cf26ca3e257021e39243efd5d0426a94976c6bdab145dfd2340636849958011872223e003646f2193c81d3e87257ffa506c0545415c48a8d188ed72214 SHA512 038090e5ef417d7fcb20b0c36f1a8360678f84b7240647bdbbcc8b422a4c83c9b73e87b8ece5c280666248c9d2b1e253076ed569148e6a79c1a404b6e12011a6
-EBUILD neochat-23.03.90.ebuild 1472 BLAKE2B 2fa4683150045d980c813d68cb02fa84650921140e52c52de4df0d145987df7c6a259ac84caa31ca236f240ff8adfa61176ae3df86f896d9a9ecf9485bf001a8 SHA512 02f2d75053cb99f99cf123caf4821da27eda0c29db114b381a9000e42afbcc8a93cae1b3a4574d4334d42fd729f470dbd83160eedfc00f0946bc8ca509d6cc90
+EBUILD neochat-23.04.0.ebuild 1472 BLAKE2B 2fa4683150045d980c813d68cb02fa84650921140e52c52de4df0d145987df7c6a259ac84caa31ca236f240ff8adfa61176ae3df86f896d9a9ecf9485bf001a8 SHA512 02f2d75053cb99f99cf123caf4821da27eda0c29db114b381a9000e42afbcc8a93cae1b3a4574d4334d42fd729f470dbd83160eedfc00f0946bc8ca509d6cc90
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/net-im/neochat/neochat-23.03.90.ebuild b/net-im/neochat/neochat-23.04.0.ebuild
index da33b95301d5..da33b95301d5 100644
--- a/net-im/neochat/neochat-23.03.90.ebuild
+++ b/net-im/neochat/neochat-23.04.0.ebuild
diff --git a/net-im/tokodon/Manifest b/net-im/tokodon/Manifest
index 7796e56d77e3..4fbe0554ca62 100644
--- a/net-im/tokodon/Manifest
+++ b/net-im/tokodon/Manifest
@@ -1,3 +1,4 @@
-DIST tokodon-23.03.90.tar.xz 226728 BLAKE2B a30323b4239c6a3f61a99d25482fb6171ddd065ba69a15d100a4b02f29b526be94f8dc73c8137f48d976646c602f1ae7e57acc0784d854a47f9dabf937a70589 SHA512 237531eb46668905cc0cb797c312379cd10fc513403f028f00b1230fe4761e173f67c736a6bb4c8811925480adc0105a6fca1be61a1240b37dae655bb63fa1d8
-EBUILD tokodon-23.03.90.ebuild 1345 BLAKE2B 84c89ca008485f76cb067bbb1c45c63a5a7c0953b27d408ff9b8b8b38d6af7e82905c13040df0306b9b025a71922cd6c8785581c783870bbb0bf02af2e808dae SHA512 8ac7e8e39b66154de46fb8396c8ebb50115b35845c507d7637603f1fb1dcc103b4e14add1bf7d4490607e2bde0c436fc04ae9d5fafc16ee4a2290e44c451f131
+AUX tokodon-23.04.0-tokodon-not-neochat.patch 1679 BLAKE2B 6a77997b7dbeeba7d7f126655fa6dde19e67bb9838544a24f504b0bdd5d46e035e5cafe174383de1c71d554e7da3649304f3c4101e3aae63f53d9a7fe6145b9e SHA512 64840ded6a91f1cf75cd2df11f3c72eacca509a171fbd3aa4184511aad71d12b0e4a2e8a373573e4835422e5681f9d75063792fb7e1ec759750eb55fe2260c2a
+DIST tokodon-23.04.0.tar.xz 229524 BLAKE2B a2b17f8c93f323fd17d6b54a742a6e73fb9b87b56e952852e98438bbc30ba771b4f2c1cb771137073596e5eb8efab076fd0924fdd46f1cb095b8e75a785cdbd1 SHA512 230432ee9761ce2655313a6e4de9719c6973de5309575b0fec365d0f6e013835cdf78782566a2c61e7972f3d6c71b8f65cd06c723367cc9681103b5d69f626f5
+EBUILD tokodon-23.04.0.ebuild 1416 BLAKE2B eb0fc19f43cb3ce26bd8962a7d1a5c960f1cf46b72f0d8a02aa60f78bc744adb7d036e8d13d76f5fd7daedc4e5245119c714b0f71a15ddb9ec75d5a919575e84 SHA512 9d5b5fa93f38617a98fb0771762d060d894894d2a122a9d191447c6b915a08ab76defd2f46cf58f159c4a13cf38be3b5c3a9e5d90615240ec85696134bcc099b
 MISC metadata.xml 377 BLAKE2B e70a23a324a1d14fbba036ceeeb7e5a974eca12759fee38b1869fd486f2386f4552c5a0172b4c13b937da414b6cf3bb762cea06a553447868d21911c9946b06c SHA512 914e345e6869d9d18210855bb27cc02206e62fcc4917be7968411f9b82d640ac71d40d07f3494a756971cc1412de529cf4b12a9ae47852208dfbe2920d56c3b3
diff --git a/net-im/tokodon/files/tokodon-23.04.0-tokodon-not-neochat.patch b/net-im/tokodon/files/tokodon-23.04.0-tokodon-not-neochat.patch
new file mode 100644
index 000000000000..e9ec12d64a99
--- /dev/null
+++ b/net-im/tokodon/files/tokodon-23.04.0-tokodon-not-neochat.patch
@@ -0,0 +1,47 @@
+From bc361013894ebd1a56f3d9b64da2da730e9487ca Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 20 Apr 2023 20:08:45 +0200
+Subject: [PATCH] Fix obvious copy/paste mistakes
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/abstractaccount.cpp   | 4 ++--
+ src/networkcontroller.cpp | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/abstractaccount.cpp b/src/abstractaccount.cpp
+index b3f75444..5fb4d458 100644
+--- a/src/abstractaccount.cpp
++++ b/src/abstractaccount.cpp
+@@ -175,7 +175,7 @@ void AbstractAccount::setInstanceUri(const QString &instance_uri)
+     instance_url.setScheme("https"); // getting token from http is not supported
+ 
+     m_instance_uri = instance_url.toString();
+-    registerApplication("Tokodon", "https://app.kde.org/neochat");
++    registerApplication("Tokodon", "https://apps.kde.org/tokodon");
+ }
+ 
+ QString AbstractAccount::instanceUri() const
+@@ -488,4 +488,4 @@ bool AbstractAccount::isRegistered() const
+ QString AbstractAccount::settingsGroupName() const
+ {
+     return m_name + QLatin1Char('@') + QUrl(m_instance_uri).host();
+-}
+\ No newline at end of file
++}
+diff --git a/src/networkcontroller.cpp b/src/networkcontroller.cpp
+index 677e45c1..58a43cbb 100644
+--- a/src/networkcontroller.cpp
++++ b/src/networkcontroller.cpp
+@@ -33,7 +33,7 @@ void NetworkController::setApplicationProxy()
+     Config *cfg = Config::self();
+     QNetworkProxy proxy;
+ 
+-    // type match to ProxyType from neochatconfig.kcfg
++    // type match to ProxyType from config.kcfg
+     switch (cfg->proxyType()) {
+     case 1: // HTTP
+         proxy.setType(QNetworkProxy::HttpProxy);
+-- 
+GitLab
+
diff --git a/net-im/tokodon/tokodon-23.03.90.ebuild b/net-im/tokodon/tokodon-23.04.0.ebuild
index eb67ca3394b5..9dcc662206ec 100644
--- a/net-im/tokodon/tokodon-23.03.90.ebuild
+++ b/net-im/tokodon/tokodon-23.04.0.ebuild
@@ -42,6 +42,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-tokodon-not-neochat.patch" ) # git master
+
 src_test() {
 	local -x QT_QPA_PLATFORM=offscreen
 	ecm_src_test