gentoo auto-resync : 09:09:2024 - 12:30:03

15 files changed, 45 insertions, 765 deletions

diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index cf46bcec2fda..b7ba2b546d4a 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index 761b750ca3af..2ed424dd3405 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -1,10 +1,4 @@
-AUX libimobiledevice-1.3.0-cython3.patch 2349 BLAKE2B a7949577819e7e3431a97db508bd8e5dfa445393ae62ae8e85c652e655aaad3625af14d948b5dd3977cf682caaf9e21ec38273198b7037af5e5c75cf7125ddcc SHA512 d67f1c3941d9057fc1c5a71d5108ac2fad0680c2527b647e5e0016fcc61b338dfe69abac0f3aa84d2432039a32a987c58ea0a0da309b36cfb408e0bb886006a2
-AUX libimobiledevice-1.3.0-missing_libflags.patch 796 BLAKE2B 2887ea67b4eaaca48d4fb63e8a7e46d7f66a8a255256a702b186426dc522ad4fc2727810cec9712b36ab78fd12dd4995110d945b0ff4f21ade0cc38a6211fc64 SHA512 25a0257260d85bb0722185251a430a5cc75fb7fd3b3eeeac8e2378fde0a223836c0d827473208663ee2cad9dbe8eabd7f15eb542509e3a2dba30067f21d52dd4
-AUX libimobiledevice-1.3.0-python.patch 9419 BLAKE2B 63cde286cc51ef7448084abc0efab98a593caf6e039aff5bf97b3ff5def8c8904e935dc27cb552c7b7e601db3b29136341ec3a37978a66906d0e122c3ffe2c36 SHA512 ed6f18d41a55c616f0ed1625753ffc717facc970d4dfa0f8912559f1b8b7e22e09e0972a32ab1632fe948d370c56e77b6a125db3e241dfed679b89e57121d589
-AUX libimobiledevice-1.3.0-slibtool.patch 5477 BLAKE2B 963072a0e577c52a2434d011bf684c5955a473154ad9726e77ba6e818071c9955bdc72e510721b6161031e96db49069e84948dff8458fc510526b9f21f8d78e1 SHA512 5064091b7bf858f78df9aec94f39fad98ac4969aa5c8889891840d07b8a404a0ba46949a22688805610cfcf287695c08dc11912494d7fbb9de75e6867d8a1b4f
 AUX libimobiledevice-1.3.0_p20240201_time_h.patch 185 BLAKE2B 85e97bcc9ee9af7d57d10fc22755921000d9a75085300b5f5d26fc04928762e2466886d8450e90b0fc619ec9257ec7d900407d5ff04bd1c5a38bfaa16f9eb641 SHA512 53380db4614bbb4624f3428aa3d4a7e483c14858b24e4399524d197657f4751361e812afe0cde7195b23be3b3bcfbf832b51818a28c61e23699a2384be6af3b1
-DIST libimobiledevice-1.3.0.tar.bz2 733949 BLAKE2B 40717280bb3424c7431aa93d06d10de817e6761acf2b19948d80b691cfb4dd4ef0e31b81c8458eed29a43c8c8aa256da7baa3648fb785cfbdb7316daaba119a3 SHA512 7b22040552a6561729c79c0846f571b0e608abb7c297567d2ecfdd1718ce86df08a5e34ba51f209bdee96a1917da15e7ba3aaef1d289a951d1d3470b1f89e6a8
 DIST libimobiledevice-1.3.0_p20240201.tar.gz 405723 BLAKE2B 5f3672e6b3c180440c215d9411eb2f21fe9451d822707e5b11ffff6693dccabfb5d184ef35f36bce2af508cbdebb656923927558ef39669825679a8ebf3cc8ee SHA512 d3746b7e0803840489593c9a3d8c8b16f6d4be5e2cd5c947d05be31e49c095c6503ef9150c886a87c68f4694bc6c1bfba96c4578789adc8f165a6391d0e4918f
-EBUILD libimobiledevice-1.3.0-r4.ebuild 2654 BLAKE2B 1cb920dd3f01bc4ce45e290b0b10b33c3ca78d1c22923512d083e06f57aaddba0f4b76e7763af6c34cb3e2f3f9a1ba7ac526dab21506fef6985dd672d20fc342 SHA512 3e8ac2adfb510bdd09a3376b9ec2a699329bd1c7b1d4a5e24a16ec9e4158ecc1d3aad957aa5747ffdd3a5551809f2fd31bc6e67fad3d877052bea7198575bb50
-EBUILD libimobiledevice-1.3.0_p20240201.ebuild 1710 BLAKE2B eb49f82a9ff953f410ab11ddb8a365f633ad31ff62c7f2f20dc3ae2c8f7041c625623d5f8e7cc2a1e5f6f100fdb5f5d726b0b74cd368d6fffc308330359b2184 SHA512 1cdea104d03d04f53f95289e29b999d6bc47753f2505604dc59787d5df233a7f3a844f17f8729e7fdbd4fc96a40616e43b83bfde60d7b737a1ed70c0d9e4c5a6
+EBUILD libimobiledevice-1.3.0_p20240201.ebuild 1706 BLAKE2B 644891979ab7c29cf193cbf4be2263a37f262bb87d00b58651f9f61702fc646d263cd1ec2739ba85ae117578f1f5c23b4c23af113cec90dbb396955e0f75db77 SHA512 4fac710b4ba6d9ee83152aba2f368a717e4b88189656f6096194d3e614021a95e3d371599eb2ba4e249ce1e56b09d15143944865828b0857e0ab577d2a13fddd
 MISC metadata.xml 266 BLAKE2B c0a2176972c27fee48305964db00b0f789d97b63499f083101c00393cf99c0bb82852cfcb8d56e9547ca339473e8e3781765e0a5b90e3ff04ca03d6ca5801856 SHA512 2c2149f3c3567288b4a2f16a2ab4aa2edf5fcd31287a657a4b3b27fbc7aed70a5bc40f1ee576abfd6e473e806dda42e512e860b12100dee994fbfb4221bad712
diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-cython3.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-cython3.patch
deleted file mode 100644
index c7b8cf0dcc2f..000000000000
--- a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-cython3.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://bugs.gentoo.org/898666
-https://github.com/libimobiledevice/libimobiledevice/pull/1521
-
---- a/cython/installation_proxy.pxi
-+++ b/cython/installation_proxy.pxi
-@@ -27,7 +27,7 @@ cdef extern from "libimobiledevice/installation_proxy.h":
-     instproxy_error_t instproxy_restore(instproxy_client_t client, char *appid, plist.plist_t client_options, instproxy_status_cb_t status_cb, void *user_data)
-     instproxy_error_t instproxy_remove_archive(instproxy_client_t client, char *appid, plist.plist_t client_options, instproxy_status_cb_t status_cb, void *user_data)
- 
--cdef void instproxy_notify_cb(plist.plist_t command, plist.plist_t status, void *py_callback) with gil:
-+cdef void instproxy_notify_cb(plist.plist_t command, plist.plist_t status, void *py_callback) noexcept:
-     (<object>py_callback)(plist.plist_t_to_node(command, False), plist.plist_t_to_node(status, False))
- 
- cdef class InstallationProxyError(BaseError):
-
-From deba42ba94c13517ebdbe7a4d8177ab47a9589a5 Mon Sep 17 00:00:00 2001
-From: IridiumXOR <oliveriandrea@gmail.com>
-Date: Thu, 11 Jan 2024 22:00:39 +0100
-Subject: [PATCH 2/3] Fix np_notify_cb for Cython 3 noexcept error
-
---- a/cython/notification_proxy.pxi
-+++ b/cython/notification_proxy.pxi
-@@ -70,7 +70,7 @@ NP_ITDBPREP_DID_END = C_NP_ITDBPREP_DID_END
- NP_LANGUAGE_CHANGED = C_NP_LANGUAGE_CHANGED
- NP_ADDRESS_BOOK_PREF_CHANGED = C_NP_ADDRESS_BOOK_PREF_CHANGED
- 
--cdef void np_notify_cb(const_char_ptr notification, void *py_callback):
-+cdef void np_notify_cb(const_char_ptr notification, void *py_callback) noexcept:
-     (<object>py_callback)(notification)
- 
- cdef class NotificationProxyError(BaseError):
-
-From 7739a4bf61a0fa549646d6062978f126a1ff06fa Mon Sep 17 00:00:00 2001
-From: IridiumXOR <oliveriandrea@gmail.com>
-Date: Thu, 11 Jan 2024 22:03:07 +0100
-Subject: [PATCH 3/3] Fix idevice_event_cb for Cython 3 noexcept error
-
---- a/cython/imobiledevice.pyx
-+++ b/cython/imobiledevice.pyx
-@@ -94,7 +94,7 @@ cdef class iDeviceEvent:
-         def __get__(self):
-             return self._c_event.conn_type
- 
--cdef void idevice_event_cb(const_idevice_event_t c_event, void *user_data) with gil:
-+cdef void idevice_event_cb(const_idevice_event_t c_event, void *user_data) noexcept:
-     cdef iDeviceEvent event = iDeviceEvent.__new__(iDeviceEvent)
-     event._c_event = c_event
-     (<object>user_data)(event)
diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-missing_libflags.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-missing_libflags.patch
deleted file mode 100644
index b52bf89355d9..000000000000
--- a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-missing_libflags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4b2f17e8cce8fa078aa55f5da5f726c20eac3e2e Mon Sep 17 00:00:00 2001
-From: Nikias Bassen <nikias@gmx.li>
-Date: Tue, 13 Apr 2021 05:36:03 +0200
-Subject: [PATCH] common: Add missing *_LIBS and *_CFLAGS to fix build
-
----
- common/Makefile.am | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/common/Makefile.am b/common/Makefile.am
-index 4e3facba..ab01b834 100644
---- a/common/Makefile.am
-+++ b/common/Makefile.am
-@@ -8,12 +8,17 @@ AM_CFLAGS = \
- 	$(libplist_CFLAGS) \
- 	$(libgnutls_CFLAGS) \
- 	$(libtasn1_CFLAGS) \
-+	$(libgcrypt_CFLAGS) \
- 	$(openssl_CFLAGS) \
- 	$(LFS_CFLAGS)
- 
- AM_LDFLAGS = \
- 	$(libusbmuxd_LIBS) \
- 	$(libplist_LIBS) \
-+	$(libgnutls_LIBS) \
-+	$(libtasn1_LIBS) \
-+	$(libgcrypt_LIBS) \
-+	$(openssl_LIBS) \
- 	${libpthread_LIBS}
- 
- noinst_LTLIBRARIES = libinternalcommon.la
diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-python.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-python.patch
deleted file mode 100644
index 28ca6da51ebd..000000000000
--- a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-python.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-https://github.com/libimobiledevice/libimobiledevice/pull/685
-
-From fb337f26c8e58ed0ce0750f7899ccbd5da203dee Mon Sep 17 00:00:00 2001
-From: wendyisgr33n <wendyisgr33n@gmail.com>
-Date: Mon, 30 Jul 2018 10:43:57 -0700
-Subject: [PATCH 1/5] Fixed AFC afc.pxi definitions for Python2/3
- compatibility. Added missing public method 'remove_path_and_contents'
-
---- a/cython/afc.pxi
-+++ b/cython/afc.pxi
-@@ -52,6 +52,7 @@ cdef extern from "libimobiledevice/afc.h":
-     afc_error_t afc_read_directory(afc_client_t client, char *dir, char ***list)
-     afc_error_t afc_get_file_info(afc_client_t client, char *filename, char ***infolist)
-     afc_error_t afc_remove_path(afc_client_t client, char *path)
-+    afc_error_t afc_remove_path_and_contents(afc_client_t client, char *path)
-     afc_error_t afc_rename_path(afc_client_t client, char *f, char *to)
-     afc_error_t afc_make_directory(afc_client_t client, char *dir)
-     afc_error_t afc_truncate(afc_client_t client, char *path, uint64_t newsize)
-@@ -235,17 +236,17 @@ cdef class AfcClient(BaseService):
-             afc_file_mode_t c_mode
-             uint64_t handle
-             AfcFile f
--        if mode == <bytes>'r':
-+        if mode == b'r':
-             c_mode = AFC_FOPEN_RDONLY
--        elif mode == <bytes>'r+':
-+        elif mode == b'r+':
-             c_mode = AFC_FOPEN_RW
--        elif mode == <bytes>'w':
-+        elif mode == b'w':
-             c_mode = AFC_FOPEN_WRONLY
--        elif mode == <bytes>'w+':
-+        elif mode == b'w+':
-             c_mode = AFC_FOPEN_WR
--        elif mode == <bytes>'a':
-+        elif mode == b'a':
-             c_mode = AFC_FOPEN_APPEND
--        elif mode == <bytes>'a+':
-+        elif mode == b'a+':
-             c_mode = AFC_FOPEN_RDAPPEND
-         else:
-             raise ValueError("mode string must be 'r', 'r+', 'w', 'w+', 'a', or 'a+'")
-@@ -282,6 +283,9 @@ cdef class AfcClient(BaseService):
-     cpdef remove_path(self, bytes path):
-         self.handle_error(afc_remove_path(self._c_client, path))
- 
-+    cpdef remove_path_and_contents(self, bytes path):
-+        self.handle_error(afc_remove_path_and_contents(self._c_client, path))
-+
-     cpdef rename_path(self, bytes f, bytes t):
-         self.handle_error(afc_rename_path(self._c_client, f, t))
- 
-@@ -308,17 +312,17 @@ cdef class Afc2Client(AfcClient):
-             afc_file_mode_t c_mode
-             uint64_t handle
-             AfcFile f
--        if mode == <bytes>'r':
-+        if mode == b'r':
-             c_mode = AFC_FOPEN_RDONLY
--        elif mode == <bytes>'r+':
-+        elif mode == b'r+':
-             c_mode = AFC_FOPEN_RW
--        elif mode == <bytes>'w':
-+        elif mode == b'w':
-             c_mode = AFC_FOPEN_WRONLY
--        elif mode == <bytes>'w+':
-+        elif mode == b'w+':
-             c_mode = AFC_FOPEN_WR
--        elif mode == <bytes>'a':
-+        elif mode == b'a':
-             c_mode = AFC_FOPEN_APPEND
--        elif mode == <bytes>'a+':
-+        elif mode == b'a+':
-             c_mode = AFC_FOPEN_RDAPPEND
-         else:
-             raise ValueError("mode string must be 'r', 'r+', 'w', 'w+', 'a', or 'a+'")
-
-From b71e8935949a1d6f419a3f783d804809fb4c309b Mon Sep 17 00:00:00 2001
-From: wendyisgr33n <wendyisgr33n@gmail.com>
-Date: Mon, 30 Jul 2018 10:44:40 -0700
-Subject: [PATCH 2/5] Fixed debugserver.pxi PyString_AsString compatibility
- with Python3
-
---- a/cython/debugserver.pxi
-+++ b/cython/debugserver.pxi
-@@ -44,7 +44,12 @@ cdef class DebugServerError(BaseError):
- 
- 
- # from http://stackoverflow.com/a/17511714
--from cpython.string cimport PyString_AsString
-+# https://github.com/libimobiledevice/libimobiledevice/pull/198
-+from cpython cimport PY_MAJOR_VERSION
-+if PY_MAJOR_VERSION <= 2:
-+    from cpython.string cimport PyString_AsString
-+else:
-+    from cpython.bytes cimport PyBytes_AsString as PyString_AsString
- cdef char ** to_cstring_array(list_str):
-     if not list_str:
-         return NULL
-
-From 44f54cdc0ebb052e4a642023bbf96504e6139ec9 Mon Sep 17 00:00:00 2001
-From: wendyisgr33n <wendyisgr33n@gmail.com>
-Date: Mon, 30 Jul 2018 10:45:22 -0700
-Subject: [PATCH 3/5] Fixed bytes/strings check in imobiledevice.pyx for
- compatibility with Python2/3
-
---- a/cython/imobiledevice.pyx
-+++ b/cython/imobiledevice.pyx
-@@ -171,7 +171,7 @@ from libc.stdlib cimport *
- cdef class iDevice(Base):
-     def __cinit__(self, object udid=None, *args, **kwargs):
-         cdef char* c_udid = NULL
--        if isinstance(udid, basestring):
-+        if isinstance(udid, (str, bytes)):
-             c_udid = <bytes>udid
-         elif udid is not None:
-             raise TypeError("iDevice's constructor takes a string or None as the udid argument")
-
-From 8908619973e751b778d3fb73dc309cd5cb7f4122 Mon Sep 17 00:00:00 2001
-From: wendyisgr33n <wendyisgr33n@gmail.com>
-Date: Mon, 30 Jul 2018 10:45:55 -0700
-Subject: [PATCH 4/5] Fixed bytes/strings checks in lockdown.pxi for
- compatibility with Python2/3
-
---- a/cython/lockdown.pxi
-+++ b/cython/lockdown.pxi
-@@ -230,9 +230,9 @@ cdef class LockdownClient(PropertyListService):
- 
-         if issubclass(service, BaseService) and \
-             service.__service_name__ is not None \
--            and isinstance(service.__service_name__, basestring):
-+            and isinstance(service.__service_name__, (str, bytes)):
-             c_service_name = <bytes>service.__service_name__
--        elif isinstance(service, basestring):
-+        elif isinstance(service, (str, bytes)):
-             c_service_name = <bytes>service
-         else:
-             raise TypeError("LockdownClient.start_service() takes a BaseService or string as its first argument")
-@@ -253,7 +253,7 @@ cdef class LockdownClient(PropertyListService):
- 
-         if not hasattr(service_class, '__service_name__') and \
-             not service_class.__service_name__ is not None \
--            and not isinstance(service_class.__service_name__, basestring):
-+            and not isinstance(service_class.__service_name__, (str, bytes)):
-             raise TypeError("LockdownClient.get_service_client() takes a BaseService as its first argument")
- 
-         descriptor = self.start_service(service_class)
-
-From e59cbdbf4e7dba98ef57a54e314a89edfea0a3dc Mon Sep 17 00:00:00 2001
-From: wendyisgr33n <wendyisgr33n@gmail.com>
-Date: Mon, 30 Jul 2018 10:47:48 -0700
-Subject: [PATCH 5/5] Fixed method visibility in mobilebackup2.pxi API
-
---- a/cython/mobilebackup2.pxi
-+++ b/cython/mobilebackup2.pxi
-@@ -54,10 +54,10 @@ cdef class MobileBackup2Client(PropertyListService):
-     cdef inline BaseError _error(self, int16_t ret):
-         return MobileBackup2Error(ret)
- 
--    cdef send_message(self, bytes message, plist.Node options):
-+    cpdef send_message(self, bytes message, plist.Node options):
-         self.handle_error(mobilebackup2_send_message(self._c_client, message, options._c_node))
- 
--    cdef tuple receive_message(self):
-+    cpdef tuple receive_message(self):
-         cdef:
-             char* dlmessage = NULL
-             plist.plist_t c_node = NULL
-@@ -73,29 +73,34 @@ cdef class MobileBackup2Client(PropertyListService):
-                 free(dlmessage)
-             raise
- 
--    cdef int send_raw(self, bytes data, int length):
-+    cpdef int send_raw(self, bytes data, int length):
-         cdef:
--            uint32_t bytes = 0
-+            uint32_t bytes_recvd = 0
-             mobilebackup2_error_t err
--        err = mobilebackup2_send_raw(self._c_client, data, length, &bytes)
-+        err = mobilebackup2_send_raw(self._c_client, data, length, &bytes_recvd)
-         try:
-             self.handle_error(err)
--            return <bint>bytes
-+            return <bint>bytes_recvd
-         except BaseError, e:
-             raise
- 
--    cdef int receive_raw(self, bytes data, int length):
-+    cpdef int receive_raw(self, bytearray data, int length):
-         cdef:
--            uint32_t bytes = 0
-+            uint32_t bytes_recvd = 0
-             mobilebackup2_error_t err
--        err = mobilebackup2_receive_raw(self._c_client, data, length, &bytes)
-+        err = mobilebackup2_receive_raw(self._c_client, data, length, &bytes_recvd)
-+
-+        # Throwing an exception when we test if theres more data to read is excessive
-+        if err == -1 and bytes_recvd == 0:
-+            return 0
-+
-         try:
-             self.handle_error(err)
--            return <bint>bytes
-+            return <bint>bytes_recvd
-         except BaseError, e:
-             raise
- 
--    cdef float version_exchange(self, double[::1] local_versions):
-+    cpdef float version_exchange(self, double[::1] local_versions):
-         cdef:
-             double[::1] temp = None
-             double remote_version = 0.0
-@@ -107,8 +112,8 @@ cdef class MobileBackup2Client(PropertyListService):
-         except BaseError, e:
-             raise
- 
--    cdef send_request(self, bytes request, bytes target_identifier, bytes source_identifier, plist.Node options):
-+    cpdef send_request(self, bytes request, bytes target_identifier, bytes source_identifier, plist.Node options):
-         self.handle_error(mobilebackup2_send_request(self._c_client, request, target_identifier, source_identifier, options._c_node))
- 
--    cdef send_status_response(self, int status_code, bytes status1, plist.Node status2):
-+    cpdef send_status_response(self, int status_code, bytes status1, plist.Node status2):
-         self.handle_error(mobilebackup2_send_status_response(self._c_client, status_code, status1, status2._c_node))
diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-slibtool.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-slibtool.patch
deleted file mode 100644
index 1e9fa6caf585..000000000000
--- a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-slibtool.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 735ac51e0eeaa3419e85dbad9579401ae828f631 Mon Sep 17 00:00:00 2001
-From: orbea <orbea@riseup.net>
-Date: Tue, 6 Apr 2021 13:06:35 -0700
-Subject: [PATCH] tools: Fix usage of LDFLAGS and LDADD.
-
-Signed-off-by: orbea <orbea@riseup.net>
----
- tools/Makefile.am | 40 ++++++++++++++++++++--------------------
- 1 file changed, 20 insertions(+), 20 deletions(-)
-
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 8ed8ad91..04a5faa7 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -40,8 +40,8 @@ bin_PROGRAMS = \
- 
- ideviceinfo_SOURCES = ideviceinfo.c
- ideviceinfo_CFLAGS = $(AM_CFLAGS)
--ideviceinfo_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
--ideviceinfo_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+ideviceinfo_LDFLAGS = $(AM_LDFLAGS)
-+ideviceinfo_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
- 
- idevicename_SOURCES = idevicename.c
- idevicename_CFLAGS = $(AM_CFLAGS)
-@@ -50,8 +50,8 @@ idevicename_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
- 
- idevicepair_SOURCES = idevicepair.c
- idevicepair_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS)
--idevicepair_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS) $(libusbmuxd_LIBS)
--idevicepair_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+idevicepair_LDFLAGS = $(AM_LDFLAGS) $(libusbmuxd_LIBS)
-+idevicepair_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
- 
- idevicesyslog_SOURCES = idevicesyslog.c
- idevicesyslog_CFLAGS = $(AM_CFLAGS)
-@@ -65,18 +65,18 @@ idevice_id_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
- 
- idevicebackup_SOURCES = idevicebackup.c
- idevicebackup_CFLAGS = $(AM_CFLAGS)
--idevicebackup_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
--idevicebackup_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+idevicebackup_LDFLAGS = $(AM_LDFLAGS)
-+idevicebackup_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
- 
- idevicebackup2_SOURCES = idevicebackup2.c
- idevicebackup2_CFLAGS = $(AM_CFLAGS)
--idevicebackup2_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
--idevicebackup2_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+idevicebackup2_LDFLAGS = $(AM_LDFLAGS)
-+idevicebackup2_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
- 
- ideviceimagemounter_SOURCES = ideviceimagemounter.c
- ideviceimagemounter_CFLAGS = $(AM_CFLAGS)
--ideviceimagemounter_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
--ideviceimagemounter_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+ideviceimagemounter_LDFLAGS = $(AM_LDFLAGS)
-+ideviceimagemounter_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
- 
- idevicescreenshot_SOURCES = idevicescreenshot.c
- idevicescreenshot_CFLAGS = $(AM_CFLAGS)
-@@ -95,13 +95,13 @@ idevicedate_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
- 
- ideviceprovision_SOURCES = ideviceprovision.c
- ideviceprovision_CFLAGS = $(AM_CFLAGS)
--ideviceprovision_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
--ideviceprovision_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+ideviceprovision_LDFLAGS = $(AM_LDFLAGS)
-+ideviceprovision_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
- 
- idevicedebugserverproxy_SOURCES = idevicedebugserverproxy.c
- idevicedebugserverproxy_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS)
--idevicedebugserverproxy_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
--idevicedebugserverproxy_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+idevicedebugserverproxy_LDFLAGS = $(AM_LDFLAGS)
-+idevicedebugserverproxy_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
- 
- idevicediagnostics_SOURCES = idevicediagnostics.c
- idevicediagnostics_CFLAGS = $(AM_CFLAGS)
-@@ -110,8 +110,8 @@ idevicediagnostics_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
- 
- idevicedebug_SOURCES = idevicedebug.c
- idevicedebug_CFLAGS = $(AM_CFLAGS)
--idevicedebug_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
--idevicedebug_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+idevicedebug_LDFLAGS = $(AM_LDFLAGS)
-+idevicedebug_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
- 
- idevicenotificationproxy_SOURCES = idevicenotificationproxy.c
- idevicenotificationproxy_CFLAGS = $(AM_CFLAGS)
-@@ -120,10 +120,10 @@ idevicenotificationproxy_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
- 
- idevicecrashreport_SOURCES = idevicecrashreport.c
- idevicecrashreport_CFLAGS = -I$(top_srcdir) $(AM_CFLAGS)
--idevicecrashreport_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
--idevicecrashreport_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+idevicecrashreport_LDFLAGS = $(AM_LDFLAGS)
-+idevicecrashreport_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
- 
- idevicesetlocation_SOURCES = idevicesetlocation.c
- idevicesetlocation_CFLAGS = $(AM_CFLAGS)
--idevicesetlocation_LDFLAGS = $(top_builddir)/common/libinternalcommon.la $(AM_LDFLAGS)
--idevicesetlocation_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la
-+idevicesetlocation_LDFLAGS = $(AM_LDFLAGS)
-+idevicesetlocation_LDADD = $(top_builddir)/src/libimobiledevice-1.0.la $(top_builddir)/common/libinternalcommon.la
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r4.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r4.ebuild
deleted file mode 100644
index c7233fe43fc1..000000000000
--- a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit autotools python-r1
-
-DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
-HOMEPAGE="https://www.libimobiledevice.org/"
-SRC_URI="https://github.com/libimobiledevice/libimobiledevice/releases/download/${PV}/${P}.tar.bz2"
-
-# While COPYING* doesn't mention 'or any later version', all the headers do, hence use +
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/1.0-6" # based on SONAME of libimobiledevice-1.0.so
-KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~ppc64 ~riscv x86"
-IUSE="doc gnutls python static-libs"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=app-pda/libplist-2.2.0:= <app-pda/libplist-2.3
-	>=app-pda/libusbmuxd-2.0.2:=
-	gnutls? (
-		dev-libs/libgcrypt:0
-		>=dev-libs/libtasn1-1.1
-		>=net-libs/gnutls-2.2.0
-	)
-	!gnutls? (
-		dev-libs/openssl:0=
-	)
-	python? (
-		${PYTHON_DEPS}
-		app-pda/libplist[python(-),${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-	python? ( dev-python/cython[${PYTHON_USEDEP}] )
-"
-
-BUILD_DIR="${S}_build"
-
-PATCHES=(
-	"${FILESDIR}/${P}-slibtool.patch"
-	"${FILESDIR}/${P}-missing_libflags.patch" #787962
-	"${FILESDIR}/${P}-python.patch"
-	"${FILESDIR}"/${P}-cython3.patch # Bug #898666
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local ECONF_SOURCE=${S}
-
-	local myeconfargs=( $(use_enable static-libs static) )
-	use gnutls && myeconfargs+=( --disable-openssl )
-
-	do_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		pushd "${BUILD_DIR}" >/dev/null || die
-		econf "${myeconfargs[@]}" "${@}"
-		popd >/dev/null || die
-	}
-
-	do_configure_python() {
-		# Bug 567916
-		local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
-		do_configure "$@"
-	}
-
-	do_configure --without-cython
-	use python && python_foreach_impl do_configure_python
-}
-
-src_compile() {
-	python_compile() {
-		emake -C "${BUILD_DIR}"/cython \
-			VPATH="${S}/cython:$1/cython" \
-			imobiledevice_la_LIBADD="$1/src/libimobiledevice-1.0.la"
-	}
-
-	emake -C "${BUILD_DIR}"
-	use python && python_foreach_impl python_compile "${BUILD_DIR}"
-
-	if use doc; then
-		doxygen "${BUILD_DIR}"/doxygen.cfg || die
-	fi
-}
-
-src_install() {
-	python_install() {
-		emake -C "${BUILD_DIR}/cython" install \
-			DESTDIR="${D}" \
-			VPATH="${S}/cython:$1/cython"
-	}
-
-	emake -C "${BUILD_DIR}" install DESTDIR="${D}"
-	use python && python_foreach_impl python_install "${BUILD_DIR}"
-	use doc && dodoc docs/html/*
-
-	if use python; then
-		insinto /usr/include/${PN}/cython
-		doins cython/imobiledevice.pxd
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.3.0_p20240201.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.3.0_p20240201.ebuild
index 407e3ee47d02..3d123b13e748 100644
--- a/app-pda/libimobiledevice/libimobiledevice-1.3.0_p20240201.ebuild
+++ b/app-pda/libimobiledevice/libimobiledevice-1.3.0_p20240201.ebuild
@@ -8,7 +8,7 @@ inherit autotools
 MY_COMMIT=73b6fd183872096f20e6d1007429546a317a7cb1
 
 DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
-HOMEPAGE="https://www.libimobiledevice.org/"
+HOMEPAGE="https://libimobiledevice.org/"
 SRC_URI="https://github.com/libimobiledevice/libimobiledevice/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
 S="${WORKDIR}"/${PN}-${MY_COMMIT}
 
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index bdb4126dc4d5..f9baca58088f 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -1,10 +1,8 @@
-AUX libplist-2.2.0-fmin.patch 1102 BLAKE2B ce8c76a369ae1ddc54016bbc941efeafa96d093bce14c0cdaf1da17fe7d201673bd0565669dc12209ee1230b66f56750ba64e8431d72f0d118ea5880b0764a0e SHA512 683203116ffdae053c4da35704aaf2b707b804a19316286f890df4bb6a9ae8dd6b6a4ee0f6db6164f124887e8a602db709d985496b0734899826f04e19846d78
 AUX libplist-2.2.0-pkgconfig-lib.patch 305 BLAKE2B 67da57f080454e8b01408872ab76b66703e0339052f64c3738964b02e6a389b03aac65d7d6ca30bfd78b1366c4a7fec843b039b32269db0a4e7e95850638e34d SHA512 1c2c628f178ed64a8f7e1dd84657d7d365e980a2b2d8af9dd6bbe55d245997cf51974d9ed451eafb715299097029886f7ec0a863f199a72bf15f50281c9bfab7
-AUX libplist-2.2.0-strict-aliasing.patch 1128 BLAKE2B d38552a76f0e098c6df6eb8a4d71c7bf0fe4a41aeff87730d691497203c7057ffd84356ec671041dc02ef3762bbe2cd0cfa27d465a5be0a15ebf86e3ca91d789 SHA512 e00ab3cf2f0d0829c16e1d4b1fd4bce1265a740d872aee4d0112fb45c2919413c493ad70753a7186b27fbfe154f9826ac2024e142e9410c51a69d7e1ea782245
 AUX libplist-2.3.0-configure-c99.patch 795 BLAKE2B 4a9e9572036ae9a650db5bdbb9dafe4d7868ae34d4faf91aca30ba9df6491c79c60567500625ba70c3131af545a111f946f4f8f3b315a0927cf449fd55760480 SHA512 0e5cdeefa32f708bf9b87c7dfc71d9814a2330f95d9847b6313d879f85b26b2f88e29c68ddd682f82ee0d5f204bd9ff2538e26287e4322a16ca770e19acc87ce
 AUX libplist-2.3.0-test-rename.patch 16569 BLAKE2B 04675bba9ae4d1690ecc539a136cb4959ea4a86b5a7cb8e6e4d78682d63df06375eaa0e5d4849037e3227a65e9d04f2a4ba1cfc73d7f4b6e94e4998712263eec SHA512 a0c80980ccb8b40569dd9e74682e33736876750fd236c23162877c7cb06f8f2238739489ddcaacb0456aa7696f810d62dc82a0fcc3ac0f16d022c12b8fd5ba3d
-DIST libplist-2.2.0.tar.xz 102932 BLAKE2B cca3099d5a2230feb67fd4d54777f2c3d0a083b811d2b7e3365399d2c2d2fff922a3c9f4924400810b71d92668779ede663c9ed2cebc8acd6f3b2c6e09285d90 SHA512 913a8d05239496d8e8e458e1cb974813d8b5ca013df9e0fddb97b1da6006c300f6ba2be2f3826fd157c0ae4ff2d003ecfdc55e2401884be26360ffe0ebdabd79
 DIST libplist-2.3.0.tar.xz 123876 BLAKE2B 2e5555eeeed5a7572fcdb98e537af842af1d056bb5fe42ae83b7e71e1a57535ee388fc263c9b7a495feccbe5d2d7c53c89987fb0a81573fe3f5ac9f884144cf7 SHA512 ce86f066ea03d86b3a6dcca5905044e93af46164ab55be167f7804926b7e28c3383a024903986fb273b8c40b07b749f5431048ce76e550674f83388d6cff7542
-EBUILD libplist-2.2.0-r4.ebuild 2722 BLAKE2B fc4e67a5f3a54675c50fa7b90a5450d0fc2bc5bf272eb6fb739b88b0bac81c2b7995334b23c412e181be9de60713a38385c35d4d25f940f6ac709da954e018ba SHA512 0bbeb418023272cab9cae09db9d1a1d98005623aa3f6ca1f93d043b838fe8872171b1171b5143489a29f6aedbff2a4a5e9b40edd8e90801806751a39cd3f6f79
+DIST libplist-2.6.0.tar.bz2 493169 BLAKE2B d022b64a02e30fe7d5f2937e8b6743b0af8f30cf2012e2c19da9f10366200d25968b11a401a62697ce46eb71d08111104115a993e2f578c36e19ccd42d9eb627 SHA512 67b9ef7c1cf1edd9e0a13462cc21a42dba6bb1ff4465edd56c5d4251e4063e71eb8839ed9952ffb8cdab9cd69ebb4ef46e5f804d3a2b4e44b4e04f6c571398a4
 EBUILD libplist-2.3.0-r2.ebuild 1237 BLAKE2B 7c7ee7d78f6e3f39cb2b4dfbc5e01ee60ea32f279f4bc83cf3f5245a4f9a608bbf5c2b0c4f974013a8aae1fc84a81b793899c91c47fdf0801f1777d5628403cb SHA512 991d7f9e7d8b6b2ee34aea06b2d6382d6ee7a58299a108e294dfb151cfcfdd35503641558cc4a0f8aa9d6b966647287f92a71925fb757f374255d338f741c799
+EBUILD libplist-2.6.0.ebuild 1092 BLAKE2B 410abf05ae33c1a7e8c6700decce65974a013f752193f55f588e74ff00275cc584434b1e9f6414e6348237c20d737d6fec6ad67cedf3e9832ef8f49d8ce93767 SHA512 6aec1c66a15efb18a2ce5f8d51002ecd99b4302bdbde1b022f40e365af9ec1d236ec272fb221f9bc1db897cfc81181542f030fdd88a71dceaaf052116b28086b
 MISC metadata.xml 331 BLAKE2B 3ffbe374a022fa67caed25a7e853ac350fd2b5731c3bef87e2d4106a62bf7aa635e88950a93c4dc6bbe40d99010cec797da7c2b49d202f03d031d7a885f75b99 SHA512 edd0edd7d7b1f6aae1a7e7c380f86d1435ec7b3d0f556a759bb1e5d0b8ab2dac02c0849ce4f9872af75060a853558d74fb5b4a228161287044328e6d9dc7362f
diff --git a/app-pda/libplist/files/libplist-2.2.0-fmin.patch b/app-pda/libplist/files/libplist-2.2.0-fmin.patch
deleted file mode 100644
index 7b9bdc353268..000000000000
--- a/app-pda/libplist/files/libplist-2.2.0-fmin.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -79,19 +79,7 @@
- esac
- AM_CONDITIONAL(WIN32, test x$win32 = xtrue)
- 
--# Check if we need libm for fmin
--CACHED_CFLAGS="$CFLAGS"
--CFLAGS="-O0"
--AC_CACHE_CHECK(if fmin is a builtin function, ac_cv_fmin_builtin,
--	AC_TRY_LINK([
--		#include <math.h>
--		#include <float.h>
--	], [
--		double val = 3.1415f * 0.55555f;
--		double diff = fmin(val, DBL_MAX);
--		if (diff > 0) return 1;
--	], ac_cv_fmin_builtin=yes, ac_cv_fmin_builtin=no))
--CFLAGS="$CACHED_CFLAGS"
-+AC_SEARCH_LIBS([fmin],[m])
- 
- # Check if struct tm has a tm_gmtoff member
- AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
-@@ -153,10 +141,6 @@
- AS_COMPILER_FLAGS(GLOBAL_CFLAGS, "-Wall -Wextra -Wredundant-decls -Wshadow -Wpointer-arith  -Wwrite-strings -Wswitch-default -Wno-unused-parameter -Wno-strict-aliasing -fvisibility=hidden $PTHREAD_CFLAGS")
- GLOBAL_LDFLAGS="$PTHREAD_LIBS"
- 
--if test "x$ac_cv_fmin_builtin" != "xyes"; then
--	GLOBAL_LDFLAGS+=" -lm"
--fi
--
- AC_ARG_ENABLE(debug,
- AS_HELP_STRING([--enable-debug],
-                [build debug message output code (default is no)]),
diff --git a/app-pda/libplist/files/libplist-2.2.0-strict-aliasing.patch b/app-pda/libplist/files/libplist-2.2.0-strict-aliasing.patch
deleted file mode 100644
index 2771a9f08a69..000000000000
--- a/app-pda/libplist/files/libplist-2.2.0-strict-aliasing.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/854837
-https://github.com/libimobiledevice/libplist/pull/212
---- a/src/bplist.c
-+++ b/src/bplist.c
-@@ -998,18 +998,24 @@ static void write_real(bytearray_t * bplist, double val)
-     buff[7] = BPLIST_REAL | Log2(size);
-     if (size == sizeof(float)) {
-         float floatval = (float)val;
--        *(uint32_t*)(buff+8) = float_bswap32(*(uint32_t*)&floatval);
-+        uint32_t intval;
-+        memcpy(&intval, &floatval, sizeof(float));
-+        *(uint32_t*)(buff+8) = float_bswap32(intval);
-     } else {
--        *(uint64_t*)(buff+8) = float_bswap64(*(uint64_t*)&val);
-+        uint64_t intval;
-+        memcpy(&intval, &val, sizeof(double));
-+        *(uint64_t*)(buff+8) = float_bswap64(intval);
-     }
-     byte_array_append(bplist, buff+7, size+1);
- }
- 
- static void write_date(bytearray_t * bplist, double val)
- {
-+    uint64_t intval;
-+    memcpy(&intval, &val, sizeof(double));
-     uint8_t buff[16];
-     buff[7] = BPLIST_DATE | 3;
--    *(uint64_t*)(buff+8) = float_bswap64(*(uint64_t*)&val);
-+    *(uint64_t*)(buff+8) = float_bswap64(intval);
-     byte_array_append(bplist, buff+7, 9);
- }
- 
diff --git a/app-pda/libplist/libplist-2.2.0-r4.ebuild b/app-pda/libplist/libplist-2.2.0-r4.ebuild
deleted file mode 100644
index d1180010c230..000000000000
--- a/app-pda/libplist/libplist-2.2.0-r4.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit autotools python-r1 toolchain-funcs
-
-DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
-HOMEPAGE="https://www.libimobiledevice.org/"
-SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.xz"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/2.0-3"
-KEYWORDS="amd64 ~arm arm64 ~loong ppc ~ppc64 ~riscv x86"
-IUSE="python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.0-fmin.patch
-	"${FILESDIR}"/${PN}-2.2.0-pkgconfig-lib.patch
-	"${FILESDIR}"/${PN}-2.2.0-strict-aliasing.patch # bug 854837
-)
-
-BUILD_DIR="${S}_build"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local ECONF_SOURCE="${S}"
-
-	do_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		pushd "${BUILD_DIR}" >/dev/null || die
-		econf --disable-static "${@}"
-		popd >/dev/null || die
-	}
-
-	do_configure_python() {
-		local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
-		do_configure "$@"
-	}
-
-	# Don't prefer clang.
-	tc-export CC CXX
-
-	do_configure --without-cython
-	use python && python_foreach_impl do_configure_python
-}
-
-src_compile() {
-	local native_builddir=${BUILD_DIR}
-	ln -s "${native_builddir}/src/libplist-2.0.la" \
-		"${native_builddir}/src/libplist.la" || die
-
-	python_compile() {
-		emake -C "${BUILD_DIR}"/cython \
-			VPATH="${S}/cython:${native_builddir}/cython" \
-			plist_la_LIBADD="${native_builddir}/src/libplist-2.0.la"
-	}
-
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake
-	use python && python_foreach_impl python_compile
-	popd >/dev/null || die
-}
-
-src_test() {
-	emake -C "${BUILD_DIR}" check
-}
-
-src_install() {
-	python_install() {
-		emake -C "${BUILD_DIR}/cython" \
-			VPATH="${S}/cython:${native_builddir}/cython" \
-			DESTDIR="${D}" install
-	}
-
-	local native_builddir=${BUILD_DIR}
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake DESTDIR="${D}" install
-	use python && python_foreach_impl python_install
-	popd >/dev/null || die
-
-	einstalldocs
-
-	if use python ; then
-		insinto /usr/include/plist/cython
-		doins cython/plist.pxd
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	# temporary fix for 2.2.0 release:
-	# bug #733082,
-	# https://github.com/libimobiledevice/libplist/issues/163
-	# upstream commit 137716df3f197a7184c1fba88fcb30480dafd6e0
-	dosym ./libplist-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist.pc
-	dosym ./libplist++-2.0.so.3.3.0 /usr/$(get_libdir)/libplist++.so
-	dosym ./libplist-2.0.so.3.3.0 /usr/$(get_libdir)/libplist.so
-}
diff --git a/app-pda/libplist/libplist-2.6.0.ebuild b/app-pda/libplist/libplist-2.6.0.ebuild
new file mode 100644
index 000000000000..b4811e935f01
--- /dev/null
+++ b/app-pda/libplist/libplist-2.6.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
+HOMEPAGE="https://libimobiledevice.org/"
+SRC_URI="https://github.com/libimobiledevice/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0/4"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.2.0-pkgconfig-lib.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		--disable-static
+		--without-cython
+		$(use_with test tests)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+
+	# bugs #733082, #915375
+	dosym ./libplist-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist.pc
+	dosym ./libplist++-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist++.pc
+	dosym ./libplist++-2.0.so.4.6.0 /usr/$(get_libdir)/libplist++.so
+	dosym ./libplist-2.0.so.4.6.0 /usr/$(get_libdir)/libplist.so
+}
diff --git a/app-pda/usbmuxd/Manifest b/app-pda/usbmuxd/Manifest
index c9dd02e0ce21..570d98e8b586 100644
--- a/app-pda/usbmuxd/Manifest
+++ b/app-pda/usbmuxd/Manifest
@@ -1,5 +1,3 @@
-DIST usbmuxd-1.1.1.tar.bz2 345290 BLAKE2B 580dd4e2fb05d6c4803d774f7d43c8399219d8f0ce4191428cb4fccffcc941894d0381d5f0746997570dd24e395af3dda340b1910827f9c5ace7e2d9cc176c6a SHA512 0e8829c93aac147a6b949fe95592d6ad9ea36e1c04676cb85accb4670a65b31065706fc438556def17b55850081d6c07deb325ca02b9853335b6e0b1049ba1da
 DIST usbmuxd-1.1.1_p20231011.tar.gz 65638 BLAKE2B 68bfdcdf907241fbf3b8b41133e11f3b08c5007417a1ea86f5428a5c11f480f9e6a6a9073080976d84ed14b456f61e19ef2b2f161d5b1ec19367fe01eb89b435 SHA512 dfe2e39496aa6841aaa7c02dc5ad5425f4199d5e5ccf560438e5f07fff9050124918ce99a1b2e22fc5b8718e091aff81ff209467de16701a14279e994c5ceefe
-EBUILD usbmuxd-1.1.1-r2.ebuild 1023 BLAKE2B 42f26117cb899eecc6e39ae3e1f0be4aa562f5e8b456e8d0ae3d15467f5d5293d3dd47016f681a91a6431ab52a706f1cba380023d1165675775fdf3e0810be89 SHA512 3800baa29fa37858d1a498c1e6bceeb8cbb666acd737364cc84a1adb3c92e2116b88fbf10b6f55b71bfebe8723735acb11417f09c9087d79294a411a80e4e02d
 EBUILD usbmuxd-1.1.1_p20231011.ebuild 1210 BLAKE2B d8d08481546c4ec8ab36dd416cab01e1b21a7720e19469ba67b5d0b9634c8b694f0dd4f0ebf9313377098ef0e10dbcfe1005a9c1328bf778dce36b1d5ad56d27 SHA512 0713e5bfb6511b2e14a31f52b73bf417d6b403cfa6d9f7f018044d018d4c194b573f307375a8a81c140a7538b414c1cc2f8d6d375c2ab68b420baf02a52f5a15
 MISC metadata.xml 489 BLAKE2B 59caec3b41e2864b320df6b86cb3169a03867f390f689d938512d28e99404c0d57d070ace55c3d04e83dd5d254222cc1e7affa334a684ac34f7a9900e8437f8b SHA512 4ffbbfc34b81774984931106df1ec706ee5bc5b635ef58f78daf3b54d9952d0e5799f69bf9cc7178e0849ed426ad31bc2e71aff4af33ff7dfca6bc9a0c605eac
diff --git a/app-pda/usbmuxd/usbmuxd-1.1.1-r2.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.1-r2.ebuild
deleted file mode 100644
index 59ac7d442a59..000000000000
--- a/app-pda/usbmuxd/usbmuxd-1.1.1-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd udev
-
-DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
-HOMEPAGE="https://libimobiledevice.org/"
-SRC_URI="https://github.com/libimobiledevice/usbmuxd/releases/download/${PV}/${P}.tar.bz2"
-
-# src/utils.h is LGPL-2.1+, rest is found in COPYING*
-LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-IUSE="selinux systemd"
-
-DEPEND="
-	acct-user/usbmux
-	>=app-pda/libimobiledevice-1.3.0:=
-	>=app-pda/libplist-2.2:= <app-pda/libplist-2.3
-	virtual/libusb:1=
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/udev
-	selinux? ( sec-policy/selinux-usbmuxd )
-	systemd? ( sys-apps/systemd )
-"
-
-BDEPEND="
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		"$(use_with systemd)" \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		--with-udevrulesdir="$(get_udevdir)"/rules.d
-}
-
-pkg_postrm() {
-	udev_reload
-}
-
-pkg_postinst() {
-	udev_reload
-}