gentoo auto-resync : 07:03:2023 - 11:57:00

11 files changed, 59 insertions, 582 deletions

diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 23bcc9942830..685276c8a9db 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index b8d69e6da568..21e01bcd5a7a 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,12 +1,13 @@
 AUX bird-2.0.7-gcc10.patch 460 BLAKE2B fda9c1ce155d1d4842fec83ede52847fe895ea406cf3d6b715ea2bea01843604cfd6c2957f6d64847d8d73f21a9d952f8af07d78e7261c585643b7c33727f107 SHA512 84a187e4dc0c48efb9b8e0248dae90669c93abbc2d26b58a1f197420100a69806f80650ac90e064947984d7b1a2f9c5598ffd021a97bee10420b4c61d9cf75c0
+AUX bird-2.0.9-musl-tests.patch 1451 BLAKE2B a2ce47b4931e922237a51e72db693d99065a6651c4685d2bdd9d231a8c38839e5f671be3809df9593747843e46514822ab680796448bc859e76c0265335a6979 SHA512 7c6bd469190afaace6f6776ce2f589f33ec82bda2a88677159d1813b042f2bfa79be3672720ea9439e60a0b6b81e511a7448f04f791c10f71ae3a013da19f245
 AUX confd-bird-2 231 BLAKE2B 9be6c9b94ede8233e6b249d6543b236f3bba2f065bd3bd811c4db37d1bbe66b4d196a11d5c85742d45cb800c895d9517c10b33217811b9499c191a4a03aa2359 SHA512 5531e581f1535d8e0db316c1f151282ca7dcab68cf49c91264105a9f1751e7bfbe5eef6c52c6a3a76c74cf5810e2ecd912cb2845f55b7dd960823b05f086def8
 AUX initd-bird-2 1433 BLAKE2B d89a6d48e36736f8dc8d21df7213f5edc0702f2a4e64f5321a8a4b0b3e1501755553f35e4f6270be707a50538defb806658dee00453835bcac86a633c60fb8c7 SHA512 bd3eec06701c86eaa7c89e75a963656be6081415f93f7844bba272e3f1feccbd90081ea0b711ac51c6d7c1e337e8325a27879b336f20204ad225d0c7dafa3b68
 DIST bird-2.0.10.tar.gz 1276546 BLAKE2B 21e1dde7d38d836c761eb13067b6aacdfc66211ca75f4ae72948f2c3a9519ac45af410f764c638e9a7314c51873675621feabc730e0604a42c00f054b0db1017 SHA512 607f9c96bbf55b7622a8c49126ad568ce9a220520801a13e89be63eee65a76c575a8095485e5bbd867d1306fed87c8394a82fe88d76307eaa40ee5902842d158
 DIST bird-2.0.7.tar.gz 1993395 BLAKE2B ceb88d811d254e57e089ef4b4e1e4f34fd96d4622d9f5563cc8694323c060e99d6cdfccfeb5d8c885b9431dc71e96d5cc04e4344901a7c7d899f4249e7503720 SHA512 48ca63be923285dd282e80d7e2b240256953fd7ad4f6eaa5dcba2648f3f148be20198bc8c6e7e888aac1588ecb005a4f4c03e979853e76ea6f8680643a874b35
 DIST bird-2.0.8.tar.gz 1135228 BLAKE2B 4b36688ac85967ad8c39d9c37dc717d77b1cb5c3ec44a0cf4e84ff38b8d1710d10653a1333b50cd2ede79fd7f012ec86de0baefc9ac18435693ec5b3e43b8a3a SHA512 5f8ad63b1dcdcfdfd4c98f55601dda3a07dea3099fc51b52a340650ca475bd943ee6aac31a1e7735b7596b279e338697c65728754b97108ae687a05f566c94e2
 DIST bird-2.0.9.tar.gz 1282045 BLAKE2B a9f60ac7a768793e985ff8edc4c42af4b5e0eb9028af575d12e2fbe9ea67092cdc908289be848ef71403e6fafdcf46a8b78e90a5880951f9cb09854a3a3f0c73 SHA512 14c1f5c792de58e1b89ce16ea942244ad998833cf159a3cde78fd0c7d81238b1ad18fd76f6a0e7e11210447c73a6c74cfef4c6a70989891fa78ba5df0ae71d90
-EBUILD bird-2.0.10.ebuild 1303 BLAKE2B 51426d940364b4632d07ed4139d5478c3bbd6a3de5dcdceeefa6423084b0c62fb8ff94f8a5ca536691239d3dc1e08e58453f2901bcdc8ab6e9a883bb2895d6e7 SHA512 4a36d14c8d0b91dec9d02738eada07c8a2c404e0ba5ed4be3242080059a5a7f0b2580f0b1fd4bd82e4d13f92305261b42226193d25362ef37f6041717f3f81ae
+EBUILD bird-2.0.10.ebuild 1360 BLAKE2B b84cfa7708e24f0d1d2d2b383714df5093aae20cf23aeb4a0524a49be34f2883ec1f47013aded7968a39e419faffe6286fb85dde37a441323f0f75e0047f5d93 SHA512 722738cd2bca7f54ca449516bb0a8d5950fd9ed55ad2d2b2b37ce7fa0307826c4a5bca670fd91e14eb1322067ab71f78cdd7af726b384e1b56dc05ce930cc402
 EBUILD bird-2.0.7.ebuild 808 BLAKE2B 7ce2db0fee210a80a196f111b8690e0b347cf9224255b41479b2a831058cc0fb931b7c1ef13f7e347f654b5222d73faafec8d0126c4b02a396866406d0752751 SHA512 f9b5fc2788d6b53ac9f317bf6ae91a864dbea79e42338d87c1c8bde4558109ab948f3ef9e37d92d663e3740db3e39b96102b418f63bd32fdbfd2569127f8780f
 EBUILD bird-2.0.8.ebuild 1257 BLAKE2B 3b9fe5cd1fbdd48497fbd5df6660a8fd212e5e3f7ab2ed54b20a4b564a879e63c2eae6a52bfe59c1d6e710d49c801af7a5184b4dd64b316b8f54e52c4beb8def SHA512 2988f25efd01b765bb9b4c12527da4b6e8c182499cd5ccdd562c481d73e3ed280e3365eac1c73aae652e5f3908508585d8659ca8a099759d4b59657834ae0891
-EBUILD bird-2.0.9.ebuild 1321 BLAKE2B 99b68f344d695e6bafc20d877215a23516f3449ffb5646363ba1e7389b70f130a8bbead65be0f56d49905070bc247cb44ec7c122b7b74f23b768bcab6b19c409 SHA512 5ff43de5db2780a1afe32cbeff8e8409e52140465a6bae9f41e7d6c076a334db22582db35701be5cd24fab44f3a3cc8e316ee350b861b022e6a0b838e896f239
+EBUILD bird-2.0.9.ebuild 1371 BLAKE2B f9e82020e20bdb3de6ccb32749acad40209d2c1d464f4d95db9a7e1144f080c1c541b7b3db65beef1e3e77d9db661f7f0d146de2e26970de3f25edde87d757b4 SHA512 c098794e3491f2dca7295ac83f543f33adabb8cefda9071654ed5a9d8808f1c4c8c2a5cd3e8e6daed7db8e596a9dc7f49396becc664f65fa5686d4ca898f394f
 MISC metadata.xml 582 BLAKE2B f2fca917d013e377c042ad09e99a53bda1bd27673e27dc17ed683aec7b691e40e405fef758a3243f6d53804f23ab495ccc7692712d9d941d2517d141b33c0a50 SHA512 0d03e6149698726621a62436740e83b6fcd6c6951d201eead7453ea0b565dcd72d6d54f961e40b1598a1d0b499a5166d84c4208de5c0a6b4134e3d32f84d9eae
diff --git a/net-misc/bird/bird-2.0.10.ebuild b/net-misc/bird/bird-2.0.10.ebuild
index 7301cfefc2dd..05e00dc95fd6 100644
--- a/net-misc/bird/bird-2.0.10.ebuild
+++ b/net-misc/bird/bird-2.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,6 +36,10 @@ FILECAPS=(
 	CAP_NET_RAW				usr/sbin/bird
 )
 
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.9-musl-tests.patch"
+)
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/net-misc/bird/bird-2.0.9.ebuild b/net-misc/bird/bird-2.0.9.ebuild
index d04ea9812f50..31d6bb48520a 100644
--- a/net-misc/bird/bird-2.0.9.ebuild
+++ b/net-misc/bird/bird-2.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -37,6 +37,10 @@ FILECAPS=(
 	CAP_NET_RAW				usr/sbin/bird
 )
 
+PATCHES=(
+	"${FILESDIR}/${P}-musl-tests.patch"
+)
+
 src_prepare() {
 	default
 
diff --git a/net-misc/bird/files/bird-2.0.9-musl-tests.patch b/net-misc/bird/files/bird-2.0.9-musl-tests.patch
new file mode 100644
index 000000000000..df6e00e04dfe
--- /dev/null
+++ b/net-misc/bird/files/bird-2.0.9-musl-tests.patch
@@ -0,0 +1,43 @@
+https://bird.network.cz/pipermail/bird-users/2023-March/016743.html
+https://gitlab.nic.cz/labs/bird/-/commit/0f679438f36d8c2a31dfe490007e983b085caef6
+
+From 0f679438f36d8c2a31dfe490007e983b085caef6 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
+Date: Mon, 6 Mar 2023 11:19:30 +0100
+Subject: [PATCH] Printf test suite fails on systems with musl libc because
+ tests for "%m" and "%M" formats expect "Input/output error" message but musl
+ returns "I/O error". Proposed change compares the printf output with string
+ returned from strerror function for EIO constant.
+
+See-also: https://bugs.gentoo.org/836713
+
+Minor change from committer.
+---
+ lib/printf_test.c | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/lib/printf_test.c b/lib/printf_test.c
+index 47ea905d..88ecf05e 100644
+--- a/lib/printf_test.c
++++ b/lib/printf_test.c
+@@ -32,11 +32,14 @@ t_simple(void)
+   BSPRINTF(1, "@", buf, "@", 64);
+   BSPRINTF(1, "\xff", buf, "%c", 0xff);
+ 
+-  errno = 5;
+-  BSPRINTF(18, "Input/output error", buf, "%m");
++  const char *io_error_str = lp_strdup(tmp_linpool, strerror(EIO));
++  const int io_error_len = strlen(io_error_str);
++
++  errno = EIO;
++  BSPRINTF(io_error_len, io_error_str, buf, "%m");
+   errno = 0;
+ 
+-  BSPRINTF(18, "Input/output error", buf, "%M", 5);
++  BSPRINTF(io_error_len, io_error_str, buf, "%M", EIO);
+ 
+   BSPRINTF(11, "TeSt%StRiNg", buf, "%s", "TeSt%StRiNg");
+ 
+-- 
+GitLab
+
diff --git a/net-misc/dropbear/Manifest b/net-misc/dropbear/Manifest
index c45e29523488..fd2a0f3978ab 100644
--- a/net-misc/dropbear/Manifest
+++ b/net-misc/dropbear/Manifest
@@ -1,6 +1,5 @@
 AUX dropbear-0.46-dbscp.patch 432 BLAKE2B 93f27fb4f5806d7a5e637ccc3ed14b6929d25b395d4731807895761a3cec76de8fcc154db85bb4913214ecac4f65a85489e0091d36c213be38b7b1f7719d5694 SHA512 071a346dbd98490a1ad967b582bb54ef07c45bb25e3b130eb7f22405dd361d6a54061a800e687385f37b2efd4057efcac8e4d07506b9100e51a334c0be12e2d6
 AUX dropbear-2022.82-tests.patch 820 BLAKE2B 8b8d7bbc80962fd4be56078d54c12097bd6cedf8cf11ca1b07a3fb39ebd795e3be9f2183482e7e3b06d1be644a2b9afcde372362c6cd4a2baf8f3254cc63b00a SHA512 4ddc65f2e1e86f50fff732d3141b18a3a5260755715e46bcfb5c5e4a261f9c22dff48c19797de972f61b9bb526d0b93f067832c38229c2c1a7e630d30dfcba01
-AUX dropbear-2022.82-x11.patch 636 BLAKE2B 89e95851d9f184d215f1e6ffd972f9519be8ef0c153d49306c3fe09b97c8e3ae4b8c1705c0f1532681c4d5e49f17f6f85f8c75667f2340d3cdd1a1e52a9795cf SHA512 ceacd4776d3c7b4c830bdded66e61b77c8e267fdcc0f0b42fd0ad4981610bdcfca98e2dc14c48eac5681035f2e7f0644553dfb419424d1536bf4f7b81e577f6c
 AUX dropbear.conf.d 190 BLAKE2B b89e59ae84f23f00162d78cb900e4fef05fe01123a6ee7533ed3d39625f43580012591b2cf8dcc9ea5f093a64d3ed81fa590c44389bacb369b9123929ca2bb69 SHA512 83f2c1eaf7687917a4b2bae7d599d4378c4bd64f9126ba42fc5d235f2b3c9a474d1b3168d70ed64bb4101cc251d30bc9ae20604da9b5d819fcd635ee4d0ebb0f
 AUX dropbear.init.d 731 BLAKE2B d858b35872eb72dacb85baed47882a9909a2530e3a9537a10adaeaf3d77da49808fdb8490124d29379c7b61272ea7d1867477046c1700d3cf216b4fc4f8c8f25 SHA512 5087cdb36194d55bf6d5ce27852b17f1ebe06840bbed37789cf162a618fb3c56c9dffce01a8a75f8574f8d9800a12fc2e1b725ca35352a836324579c8b704fd8
 DIST dropbear-2022.83.tar.bz2 2322904 BLAKE2B 4e26667458fb068a8c997b44dfd3c4f15146f051713a3ea90980db04c6345174d34214269665d74c863c1c1947d6837034aa4c264101b11971c8a3e97f491393 SHA512 c63afa615d64b0c8c5e739c758eb8ae277ecc36a4223b766bf562702de69910904cbc3ea98d22989df478ae419e1f81057fe1ee09616c80cb859f58f44175422
diff --git a/net-misc/dropbear/files/dropbear-2022.82-x11.patch b/net-misc/dropbear/files/dropbear-2022.82-x11.patch
deleted file mode 100644
index 82cb9c812ebe..000000000000
--- a/net-misc/dropbear/files/dropbear-2022.82-x11.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 0292aacdf0aa57d03f2a3ab7e53cf650e6f29389 Mon Sep 17 00:00:00 2001
-From: Matt Johnston <matt@ucc.asn.au>
-Date: Sat, 23 Apr 2022 22:33:31 +0800
-Subject: [PATCH] Fix X11 build failure, use DROPBEAR_PRIO_LOWDELAY
-
----
- svr-x11fwd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/svr-x11fwd.c b/svr-x11fwd.c
-index 353cb12e..5d9e6a96 100644
---- a/svr-x11fwd.c
-+++ b/svr-x11fwd.c
-@@ -206,7 +206,7 @@ void x11cleanup(struct ChanSess *chansess) {
- }
- 
- static int x11_inithandler(struct Channel *channel) {
--	channel->prio = DROPBEAR_CHANNEL_PRIO_INTERACTIVE;
-+	channel->prio = DROPBEAR_PRIO_LOWDELAY;
- 	return 0;
- }
- 
diff --git a/net-misc/icaclient/Manifest b/net-misc/icaclient/Manifest
index a4e3ec7a59fe..da10ee4bc168 100644
--- a/net-misc/icaclient/Manifest
+++ b/net-misc/icaclient/Manifest
@@ -5,13 +5,7 @@ AUX ctxwebhelper.desktop 320 BLAKE2B 877ade9bf35ca53ca81315e7ab6e9854e35d2392ad3
 AUX new_store.desktop 235 BLAKE2B 43bbf97a6982485e8b21f30c15889d64063ef0ce294b0695b368c08600af8a5a7764ee09ae7fe5d7f9c105d1217cae37fc2211542535ce31cea5d2b9f36d996f SHA512 a2857ecadeceb1252039f02e779a3d366cb863758802fc2927b9edd44a6580ba175db8ce332e3cbdd4ab0354fc0144432934abf8fed9f68c3e1a639775613258
 AUX selfservice.desktop 183 BLAKE2B 45d0830601ceac5159e239ec149cf3cdeabd43beb2ad6964935129fad6cd2c2e7c36cfc473e89b5db3b3b6cce2df909dd6013c3463631a7d868b470a49494285 SHA512 c4a2bdd83a29171c331b8adc98b33b8150fef5616d1fde8a0c9ccf1972b8ecc222dc1c0bc4e7779d93b851f44e79f5166138af7b7d36de964932ff3b63a4801b
 AUX wfica.desktop 242 BLAKE2B 6e90bb02824a6319035814050919c55907b2104c65e2abcc7379a4c694a585945c2e10ada114c4dfb906ee3b1fa90a0251dcb1ec3aac1fb6015a2d2ecbef4452 SHA512 a233bbdfadaee080d8dda67ed81a60ef74902c1f2100cb08bc402186be23f1bbb82f84abb93da88d610d187a267f7db28e6bfebe689839c921ae5a94a4bdf1d7
-DIST linuxx64-22.12.0.12.tar.gz 165269811 BLAKE2B 7735357f38d9438137792fc1d1febfdda6ca464fc43f573dffb4a33fffca052a78b8b61277cffd9287efcbc3823529e707140e7c9c1f9502c768528d2018b71d SHA512 bbe002d32e6d3819ab76ecef7fe7b62fff14da409d1b13c6edfc947cd46b0919d0f1972e7c1581d871bbe341ea50d3cf0da797f53f97b8e370610b37048f9a31
-DIST linuxx64-22.5.0.16.tar.gz 162733197 BLAKE2B 32b4fd64d6bccf8a3be92e8f8ee59059839f31f4f771a6344fea320d2b635174c31c9e8d572a700568bab6032352fe72657dce1ee752327ed856370fa86acf9a SHA512 796ecbccc60995baae2082b5b275d7bf1482b19aed198de6d9f4083b2a3a68ff2fe73dfd1d3d33f0f885a157a77f20de008635eade36d5f9adff6b662aaefc1b
 DIST linuxx64-23.2.0.10.tar.gz 165430863 BLAKE2B 92e3eb397691c938768c4893ebbbef48cccbaf120de40956f3883fff76ac770fe55f3e99b397634776626d76962a18a8ce0a4814f5b8a52f39a3910e4cc764ae SHA512 9eaff591e14df82a05d5c8aa4b1ec763495671a5b46476b0d722ec0893939be99d99cf820432f27293b5d8c482544397562f8ab5be210b648d278a73cc65fb0a
-DIST linuxx86-22.12.0.12.tar.gz 147837116 BLAKE2B d5f1c53d1f2d2ecb95e67df256a667df733251a99dd4a5e9584554521c4f1b1fbd065dfd8b1c4ba344a543c5cd7dde4a939e3d4d82f658e7dae42c07527b645e SHA512 8e9c4262dcd7731b88ae43a663d5901a21a9ede2feed163b538f5fb475f0eba8768a08715db5e9c8fa809442140d1ef03d4d4e509cb83142bea806855615a6b3
-DIST linuxx86-22.5.0.16.tar.gz 144032901 BLAKE2B 0f58adf7645eaba6ad75e126381ecfecf7434130b0e69bed75a0499386c5301475a48e414ce57aebdfeaea0cb6615ae93b48ecfdd0149851a56459d687d75bb7 SHA512 b94a3de41118d08f3ff549de33e80a85198a3db1349177cc5c921cdd45f1d5bb7e1ee338067602725a9bed16619216f552f98314d539915a251f020094ae3121
 DIST linuxx86-23.2.0.10.tar.gz 147975174 BLAKE2B 20ef9c6059b39c79deb5098c4f8ba02bb82fee9c4eb06eab8fb5f49c450a87a1374febc044b8130a8cd5112b4bbdaa45dabb8e14fe009be4016cdbf5864b2803 SHA512 f2cebaeaadd53e0431de0455b24a0dc6063eea3586cf1b696c33849ee51623a11add431c11b9bf91b8228ecf4c49d157781643debd1248cf6cd88b974844201a
-EBUILD icaclient-22.12.0.12-r1.ebuild 6243 BLAKE2B d2e67395e6b06d1b6fecfe520fbed706f3c756196589b9718099f22ac548e58fc22aa143123290472e32595808e0a123faba15f105efd06086230e2a70e35a9f SHA512 101f52262ff7bb543f49c5996ca1ae79febc41eb0df78bf1720fa3cfe9ee53aa37e38af172e83a388297b32438132dd640d1a99ed123cf110a22c42eeb31a080
-EBUILD icaclient-22.5.0.16-r1.ebuild 5600 BLAKE2B 4b79fe220715ff4464987a286e20cf7f22c69738a3e53e70deb92d77311181737e0767dbe6f3afe1c01ca33c8cd9ef0c47cc94cc5863d6f2611a49232d53871a SHA512 7148dce99640ca9fb715b5d7663af594502f29e16fd509f778b0460ff2f4e53673524b19642858923f3e079b7fbc76b4d71c176e77f1f1a824f0b920306a05e8
-EBUILD icaclient-23.2.0.10.ebuild 6245 BLAKE2B 5b1bfa3a82fc51fd076d8eb4eb55a5f2033c1bf219cefbbcc2121d050c27318e6b00aca682ae0b284b0d1ce2de212c58be9c1cde7d9f65477b691d163d5781c6 SHA512 c96700c3b0efbc1d1db62d2891ae31cea36765b61bf8dafc3e5263686cf2cf39b6633a3753e382b832a00e7255f3b1cafe9c6de3b110662571db30ba448931a6
+EBUILD icaclient-23.2.0.10-r1.ebuild 6210 BLAKE2B 34ee22be79050c40c9bd00c85ba06dd9f7a13c6a03ed597f164fa0be42496ce74be4cb7e45282ccaabe64febae7d21d95855330f93142a3a501ee04c51f1bdeb SHA512 3ab0182bce2ce8a2e54c6501096d14cb210c05d4d3b1b3f576fa6b5824c895fb756b9acc585f11710a40aca101f791bfc80e0c4db9434b4b9b9d97d06da4d116
 MISC metadata.xml 489 BLAKE2B 5277ab65457a889a26aa1c77279d68eef6fd4bd8d602e0ca1a06fac51b5576ce4b7d976bbbaeea555fc6ba2be42d686cfb425b03088bd5dff789edafbf11bb5c SHA512 4c69d7956c48402fa1fac2c5adede5079f8daf7c07a04f4d05af185dfa0d13417d54ce0ec063c77f966814e057f732c995e9e26e896e3c55a20d7c71db62f82f
diff --git a/net-misc/icaclient/icaclient-22.12.0.12-r1.ebuild b/net-misc/icaclient/icaclient-22.12.0.12-r1.ebuild
deleted file mode 100644
index 46dfd10187a4..000000000000
--- a/net-misc/icaclient/icaclient-22.12.0.12-r1.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop wrapper xdg-utils
-
-DESCRIPTION="ICA Client for Citrix Presentation servers"
-HOMEPAGE="https://www.citrix.com/"
-SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
-	x86? ( linuxx86-${PV}.tar.gz )"
-
-LICENSE="icaclient"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN hdx"
-RESTRICT="mirror strip fetch"
-
-ICAROOT="/opt/Citrix/ICAClient"
-
-QA_PREBUILT="${ICAROOT#/}/*"
-
-# we have binaries for two conflicting kerberos implementations
-# https://bugs.gentoo.org/792090
-# https://bugs.gentoo.org/775995
-REQUIRES_EXCLUDE="
-	libgssapi.so.3
-	libgssapi_krb5.so.2 libkrb5.so.3
-"
-# when using media-plugins/hdx-realtime-media-engine we better not ignore that
-REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE}
-	!hdx? ( libunwind.so.1 )
-"
-# we have binaries which wouls still support gstreamer:0.10
-REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE}
-	libgstapp-0.10.so.0
-	libgstbase-0.10.so.0
-	libgstinterfaces-0.10.so.0
-	libgstpbutils-0.10.so.0
-	libgstreamer-0.10.so.0
-"
-
-BDEPEND="
-	hdx? ( >=media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1 )
-"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-fonts/font-adobe-100dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	media-fonts/font-xfree86-type1
-	media-fonts/font-misc-ethiopic
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/gst-plugins-base:1.0
-	media-libs/gstreamer:1.0
-	media-libs/libogg
-	media-libs/libpulse
-	media-libs/libvorbis
-	media-libs/mesa
-	media-libs/speex
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:4
-	sys-apps/util-linux
-	sys-libs/libcxx
-	sys-libs/libcxxabi
-	sys-libs/zlib
-	virtual/krb5
-	virtual/libudev
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXinerama
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/pango
-	${BDEPEND}
-	!hdx? ( !<media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1 )
-"
-DEPENDS=""
-
-pkg_nofetch() {
-	elog "Download the client file ${A} from
-	https://www.citrix.com/downloads/workspace-app/"
-	elog "and place it into your DISTDIR directory."
-}
-
-pkg_setup() {
-	case ${ARCH} in
-		amd64)
-			ICAARCH=linuxx64
-		;;
-		x86)
-			ICAARCH=linuxx86
-		;;
-		*)
-			eerror "Given architecture is not supported by Citrix."
-		;;
-	esac
-}
-
-src_unpack() {
-	default
-	mv "${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" "${S}" || die
-}
-
-src_prepare() {
-	default
-	rm lib/UIDialogLibWebKit.so || die
-
-	cp nls/en/module.ini . || die
-	if use hdx; then
-		"${BROOT}${ICAROOT}"/rtme/RTMEconfig -install -ignoremm || die
-		mv new_module.ini module.ini || die
-	fi
-	mv module.ini config/ || die
-}
-
-src_install() {
-	local bin tmpl dest
-
-	dodir "${ICAROOT}"
-
-	exeinto "${ICAROOT}"
-	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
-
-	exeinto "${ICAROOT}"/lib
-	doexe lib/*.so
-
-	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
-		insinto "${dest}"
-		doins nls/en.UTF-8/eula.txt
-	done
-
-	insinto "${ICAROOT}"
-	doins -r usb
-
-	insinto "${ICAROOT}"/config
-	doins config/*
-	for tmpl in {appsrv,wfclient}.template ; do
-		newins nls/en/${tmpl} ${tmpl/template/ini}
-	done
-	touch "${ED}/${ICAROOT}"/config/.server || die
-
-	insinto "${ICAROOT}"/gtk
-	doins gtk/*
-
-	insinto "${ICAROOT}"/gtk/glade
-	doins gtk/glade/*
-
-	insinto "${ICAROOT}"/site
-	doins -r site/*
-
-	dodir "${ICAROOT}"/help
-
-	insinto "${ICAROOT}"/config/usertemplate
-	doins config/usertemplate/*
-
-	local lang LANGCODES=( en )
-	use l10n_de && LANGCODES+=( de )
-	use l10n_es && LANGCODES+=( es )
-	use l10n_fr && LANGCODES+=( fr )
-	use l10n_ja && LANGCODES+=( ja )
-	use l10n_zh-CN && LANGCODES+=( zh_CN )
-
-	for lang in ${LANGCODES[@]} ; do
-		insinto "${ICAROOT}"/nls/${lang}
-		doins nls/${lang}/*
-
-		insinto "${ICAROOT}"/nls/$lang/UTF-8
-		doins nls/${lang}.UTF-8/*
-
-		insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
-		doins nls/${lang}/LC_MESSAGES/*
-
-		insinto "${ICAROOT}"/nls/${lang}
-		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
-
-		for tmpl in {appsrv,wfclient}.template ; do
-			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
-				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
-				|| die
-		done
-	done
-
-	insinto "${ICAROOT}"/nls
-	dosym en /opt/Citrix/ICAClient/nls/C
-
-	insinto "${ICAROOT}"/icons
-	doins icons/*
-
-	insinto "${ICAROOT}"/keyboard
-	doins keyboard/*
-
-	cp -a util "${ED}/${ICAROOT}" || die
-	test -f util/HdxRtcEngine && fperms 0755 "${ICAROOT}"/util/HdxRtcEngine
-
-	rm -r "${S}"/keystore/cacerts || die
-	dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts
-
-	local other_files=(
-		icasessionmgr
-		NativeMessagingHost
-		UtilDaemon
-	)
-
-	exeinto "${ICAROOT}"
-	for bin in ${other_files[@]} ; do
-		doexe ${bin}
-	done
-
-	# https://bugs.gentoo.org/655922
-	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
-	dosym gst_read1.0 "${ICAROOT}"/util/gst_read
-	dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
-
-	doenvd "${FILESDIR}"/10ICAClient
-
-	for bin in configmgr conncenter new_store ; do
-		make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util
-	done
-
-	for bin in selfservice wfica ; do
-		make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}"
-	done
-
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
-		> "${ED}"/etc/revdep-rebuild/70icaclient
-
-	insinto "${ICAROOT}"/pkginf
-	newins "${WORKDIR}"/PkgId Ver.core."${ICAARCH}"
-
-	# 651926
-	domenu "${FILESDIR}"/*.desktop
-
-	insinto /usr/share/mime/packages
-	doins desktop/Citrix-mime_types.xml
-}
-
-pkg_preinst() {
-	# previous versions of the ebuild created that and left it around
-	# we own it now and avoid conflict warnings with this
-	rm -f "${ROOT}${ICAROOT}/config/module.ini"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	if ! use hdx; then
-		if [ -x "${ROOT}${ICAROOT}"/rtme/RTMEconfig ]; then
-			ewarn "Starting from 22.12.0.12 you have to set USE=hdx if you want"
-			ewarn "to use media-plugins/hdx-realtime-media-engine. Which does"
-			ewarn "not need to be explicitly installed anymore."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-misc/icaclient/icaclient-22.5.0.16-r1.ebuild b/net-misc/icaclient/icaclient-22.5.0.16-r1.ebuild
deleted file mode 100644
index 6c251c96ef19..000000000000
--- a/net-misc/icaclient/icaclient-22.5.0.16-r1.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop wrapper xdg-utils
-
-DESCRIPTION="ICA Client for Citrix Presentation servers"
-HOMEPAGE="https://www.citrix.com/"
-SRC_URI="amd64? ( linuxx64-${PV}.tar.gz )
-	x86? ( linuxx86-${PV}.tar.gz )"
-
-LICENSE="icaclient"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE="l10n_de l10n_es l10n_fr l10n_ja l10n_zh-CN"
-RESTRICT="mirror strip fetch"
-
-ICAROOT="/opt/Citrix/ICAClient"
-
-QA_PREBUILT="${ICAROOT#/}/*"
-
-RDEPEND="
-	app-crypt/libsecret
-	dev-libs/atk
-	dev-libs/glib:2
-	dev-libs/libxml2
-	media-fonts/font-adobe-100dpi
-	media-fonts/font-misc-misc
-	media-fonts/font-cursor-misc
-	media-fonts/font-xfree86-type1
-	media-fonts/font-misc-ethiopic
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/gst-plugins-base:1.0
-	media-libs/gstreamer:1.0
-	media-libs/libogg
-	media-libs/libvorbis
-	media-libs/speex
-	net-libs/libsoup:2.4
-	net-libs/webkit-gtk:4
-	sys-apps/util-linux
-	sys-libs/libcxx
-	sys-libs/libcxxabi
-	sys-libs/zlib
-	virtual/krb5
-	virtual/jpeg:0
-	virtual/libudev
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXinerama
-	x11-libs/libXmu
-	x11-libs/libXrender
-	x11-libs/libXt
-	x11-libs/pango
-"
-DEPEND=""
-
-pkg_nofetch() {
-	elog "Download the client file ${A} from
-	https://www.citrix.com/downloads/workspace-app/"
-	elog "and place it into your DISTDIR directory."
-}
-
-pkg_setup() {
-	case ${ARCH} in
-		amd64)
-			ICAARCH=linuxx64
-		;;
-		x86)
-			ICAARCH=linuxx86
-		;;
-		*)
-			eerror "Given architecture is not supported by Citrix."
-		;;
-	esac
-}
-
-src_unpack() {
-	default
-	mv "${WORKDIR}/${ICAARCH}/${ICAARCH}.cor" "${S}" || die
-}
-
-src_prepare() {
-	default
-	rm lib/UIDialogLibWebKit.so || die
-
-	# We need to avoid module.ini file getting added to the package's
-	# content because media-plugins/hdx-realtime-media-engine modifies
-	# this file on installation. See pkg_postinst()
-	mv nls/en/module.ini "${T}" || die
-}
-
-src_install() {
-	local bin tmpl dest
-
-	dodir "${ICAROOT}"
-
-	exeinto "${ICAROOT}"
-	doexe *.DLL libproxy.so wfica AuthManagerDaemon PrimaryAuthManager selfservice ServiceRecord
-
-	exeinto "${ICAROOT}"/lib
-	if use amd64 ; then
-		rm lib/ctxjpeg_fb_8.so || die
-	fi
-	doexe lib/*.so
-
-	for dest in "${ICAROOT}"{,/nls/en{,.UTF-8}} ; do
-		insinto "${dest}"
-		doins nls/en.UTF-8/eula.txt
-	done
-
-	insinto "${ICAROOT}"
-	doins -r usb
-
-	insinto "${ICAROOT}"/config
-	# nls/en/*.ini is being handled by pkg_postinst()
-	doins config/*
-	for tmpl in {appsrv,wfclient}.template ; do
-		newins nls/en/${tmpl} ${tmpl/template/ini}
-	done
-	touch "${ED}/${ICAROOT}"/config/.server || die
-
-	insinto "${ICAROOT}"/gtk
-	doins gtk/*
-
-	insinto "${ICAROOT}"/gtk/glade
-	doins gtk/glade/*
-
-	insinto "${ICAROOT}"/site
-	doins -r site/*
-
-	dodir "${ICAROOT}"/help
-
-	insinto "${ICAROOT}"/config/usertemplate
-	doins config/usertemplate/*
-
-	local lang LANGCODES=( en )
-	use l10n_de && LANGCODES+=( de )
-	use l10n_es && LANGCODES+=( es )
-	use l10n_fr && LANGCODES+=( fr )
-	use l10n_ja && LANGCODES+=( ja )
-	use l10n_zh-CN && LANGCODES+=( zh_CN )
-
-	for lang in ${LANGCODES[@]} ; do
-		insinto "${ICAROOT}"/nls/${lang}
-		doins nls/${lang}/*
-
-		insinto "${ICAROOT}"/nls/$lang/UTF-8
-		doins nls/${lang}.UTF-8/*
-
-		insinto "${ICAROOT}"/nls/${lang}/LC_MESSAGES
-		doins nls/${lang}/LC_MESSAGES/*
-
-		insinto "${ICAROOT}"/nls/${lang}
-		dosym UTF-8 "${ICAROOT}"/nls/${lang}/utf8
-
-		for tmpl in {appsrv,wfclient}.template ; do
-			cp "${ED}/${ICAROOT}"/nls/${lang}/${tmpl} \
-				"${ED}/${ICAROOT}"/nls/${lang}/${tmpl/template/ini} \
-				|| die
-		done
-	done
-
-	insinto "${ICAROOT}"/nls
-	dosym en /opt/Citrix/ICAClient/nls/C
-
-	insinto "${ICAROOT}"/icons
-	doins icons/*
-
-	insinto "${ICAROOT}"/keyboard
-	doins keyboard/*
-
-	rm -r "${S}"/keystore/cacerts || die
-	dosym ../../../../etc/ssl/certs "${ICAROOT}"/keystore/cacerts
-
-	local util_files=(
-		HdxRtcEngine
-		configmgr
-		conncenter
-		ctx_app_bind
-		ctx_rehash
-		ctxlogd
-		ctxwebhelper
-		echo_cmd
-		gst_play1.0
-		gst_read1.0
-		hdxcheck.sh
-		icalicense.sh
-		libgstflatstm1.0.so
-		lurdump
-		new_store
-		nslaunch
-		setlog
-		storebrowse
-		sunraymac.sh
-		webcontainer
-		what
-		xcapture
-	)
-
-	exeinto "${ICAROOT}"/util
-	for bin in ${util_files[@]} ; do
-		doexe util/${bin}
-	done
-
-	local other_files=(
-		icasessionmgr
-		NativeMessagingHost
-		UtilDaemon
-	)
-
-	exeinto "${ICAROOT}"
-	for bin in ${other_files[@]} ; do
-		doexe ${bin}
-	done
-
-	# https://bugs.gentoo.org/655922
-	dosym gst_play1.0 "${ICAROOT}"/util/gst_play
-	dosym gst_read1.0 "${ICAROOT}"/util/gst_read
-	dosym libgstflatstm1.0.so "${ICAROOT}"/util/libgstflatstm.so
-
-	doenvd "${FILESDIR}"/10ICAClient
-
-	for bin in configmgr conncenter new_store ; do
-		make_wrapper ${bin} "${ICAROOT}"/util/${bin} . "${ICAROOT}"/util
-	done
-
-	for bin in selfservice wfica ; do
-		make_wrapper ${bin} "${ICAROOT}"/${bin} . "${ICAROOT}"
-	done
-
-	dodir /etc/revdep-rebuild/
-	echo "SEARCH_DIRS_MASK=\"${ICAROOT}\"" \
-		> "${ED}"/etc/revdep-rebuild/70icaclient
-
-	insinto "${ICAROOT}"/pkginf
-	newins "${WORKDIR}"/PkgId Ver.core."${ICAARCH}"
-
-	# 651926
-	domenu "${FILESDIR}"/*.desktop
-
-	insinto /usr/share/mime/packages
-	doins desktop/Citrix-mime_types.xml
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-
-	local inidest="${ROOT}${ICAROOT}/config"
-	if [[ ! -e "${inidest}"/module.ini ]] ; then
-		mv "${T}"/module.ini "${inidest}/" \
-			|| ewarn 'Failed to install plugin.ini file'
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-misc/icaclient/icaclient-23.2.0.10.ebuild b/net-misc/icaclient/icaclient-23.2.0.10-r1.ebuild
index 5fe81dd431fe..760b4ca1580f 100644
--- a/net-misc/icaclient/icaclient-23.2.0.10.ebuild
+++ b/net-misc/icaclient/icaclient-23.2.0.10-r1.ebuild
@@ -41,7 +41,7 @@ REQUIRES_EXCLUDE="${REQUIRES_EXCLUDE}
 "
 
 BDEPEND="
-	hdx? ( >=media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1 )
+	hdx? ( media-plugins/hdx-realtime-media-engine )
 "
 
 RDEPEND="
@@ -88,7 +88,7 @@ RDEPEND="
 	x11-libs/libXt
 	x11-libs/pango
 	${BDEPEND}
-	!hdx? ( !<media-plugins/hdx-realtime-media-engine-2.9.500.2802-r1 )
+	!hdx? ( !media-plugins/hdx-realtime-media-engine )
 "
 DEPENDS=""