7 files changed, 23 insertions, 16 deletions
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index e320889c34c3..1f80b028eb70 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index 26068f0f43b4..d09db226d8a5 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -1,3 +1,3 @@
 DIST libplist-2.0.0.tar.bz2 421405 BLAKE2B 2f6e22c871ad3b5ace2a2c6aab09706e8a8c1759f1656c5c07164e5b89a1b5eae24d2d7472e0dcca7eddd96b641715acfe5a0a791b0b994ec5fbcdf70627acf9 SHA512 81508bf6773483528816725c3b5b868563b84fd7810999404072e5ea9efa7fc9f11ef997f32208e4421aa26b15edd0c65f87c67c1472e8c4e356f1e9fe7740ee
-EBUILD libplist-2.0.0.ebuild 2053 BLAKE2B 53990fa0e362d36d671474f3b2a03182136b050e1cba17fcd16fd660caaa2e237fac4b4ccb11845591587f1554bbba99171605375ea3603b20f34372224f1db0 SHA512 725e2c502c06a57d3a5d501962a7ff9e5b342b1b653770aab1193c5ab2e14780feb458f925721620c4c17599f8dda713aa4af07289697498bfb9845d37501831
+EBUILD libplist-2.0.0.ebuild 2041 BLAKE2B 08bae1fe4e27613b3bcab1dbb90fe5925ff280ce1c0db9b1cdd427081d3e64cf515daab8eee33e82ef932a890c8cd223af364ff422f5a357fd5f5310e9494400 SHA512 cb5c4eee6784cd2b91d2730b8b0af5c012d1189a95fa945ca182c9c82ac1a0794a53484db2b799f4443f69c66eeb31389ba67f19115d43d6ff8a67a15dbc6bf9
 MISC metadata.xml 329 BLAKE2B accbb4a0f223b37358e54635e61f1488abf2148d89e166e4a68e8ddfc90e0d4c3438c52d75c24aeced91c2246e537cb0b1d64e6e9c63425c6392148cbc3bcd58 SHA512 69d57118df488610f977fe8722d463bb858e8329855cf439ae3c1c7c52260dec96505535e9424041d71d000951db199312e382d24f66296c9c408113ead5219d
diff --git a/app-pda/libplist/libplist-2.0.0.ebuild b/app-pda/libplist/libplist-2.0.0.ebuild
index 12b97e894e04..ccd7c69178f1 100644
--- a/app-pda/libplist/libplist-2.0.0.ebuild
+++ b/app-pda/libplist/libplist-2.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/3.1.0" # based on SONAME of libplist.so
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-fbsd"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="python static-libs"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/app-pda/libusbmuxd/Manifest b/app-pda/libusbmuxd/Manifest
index 373ff0793213..bf02a42e08ab 100644
--- a/app-pda/libusbmuxd/Manifest
+++ b/app-pda/libusbmuxd/Manifest
@@ -1,5 +1,5 @@
 DIST libusbmuxd-1.0.10.tar.bz2 292649 BLAKE2B 7ec9a576cb20f7e87cf1f31e57e66100c496e5809142d225df9b3cc295a71546bed2d90f41df3144f7316ce0aec5f08fad850c528e27f336bf96e9578bcffd04 SHA512 180cde2e9d0860d07d29813e68abf8ca807f75e98424b50acfc1ce941ba4260922959e1047a7d2bc754470c08ed55d0a15c9367487bd41c635a52b4fbf8ff535
 DIST libusbmuxd-1.0.9.tar.bz2 265940 BLAKE2B fbdb5ac441a3bcda41b752737f6a5fa9975948d67abf5b1edd9b3e3f749ea65486892af3c679cfcfa5f8d9052f8d35c6a5b0a3a95d07c65385ca28ff7a2b8633 SHA512 f50ee580ac9b4c5e55ab596aabb0bdc09f710cc58edba98699499998c44f2b2cf064792390f235b2221af494ce3233acda699652066b9297cc3cb4e9f8a1cfa4
-EBUILD libusbmuxd-1.0.10.ebuild 893 BLAKE2B fd43a769ff5bf86329c5126f53c7638af6944db969358db39fd7e762e473456430e728717639d81a1c4136d981b8b38344502f1143fdc28726d2ae5e1b6fdd6c SHA512 d5a483351f9cfd33f3f6ae71611abb758295f16cb444a43851d15772defcf5ada8a3465ff592ffeb5e7efeb71f65a148353b6a2f7b6f73549f512018bc27218e
+EBUILD libusbmuxd-1.0.10-r1.ebuild 940 BLAKE2B 989b29bfb4f6ed829bda9662669755786358f541a1ebda3da0050d61a05fc276192407aacf1c9d09afa61b08d18c2e3dcb41cd8b6e308a77abfbc202c1ca713a SHA512 df70f0ac08eae7d7b01448d701e4548bdb64cccffe60e15eb53491e4848f630d9a321a18689a5c10558b3980f6fb8353230d0797c5d730f3641dd9687dfcbbee
 EBUILD libusbmuxd-1.0.9.ebuild 890 BLAKE2B 3d70e7e00f9105e29a40fb35d884fb52e2f8076e1af1180c4f7439d427ec664be3b20b2c20cbdfab20b24457ab34dcbee1bc9867ee463d9d855609c863603a83 SHA512 023fbbf726b9726455564f9cfbcf63dd619dbd724ed77a0a8bb5ad6b2a960de3650305b2e4d4d8f3bd33ee587f81c2b91c55a01a0636163f52e405269141dba6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/libusbmuxd/libusbmuxd-1.0.10.ebuild b/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild
index bb3f82b66de7..dc0119d7a157 100644
--- a/app-pda/libusbmuxd/libusbmuxd-1.0.10.ebuild
+++ b/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools-utils
+EAPI=7
 
 DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
 HOMEPAGE="http://www.libimobiledevice.org/"
@@ -10,23 +9,31 @@ SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2"
 
 # tools/iproxy.c is GPL-2+, everything else is LGPL-2.1+
 LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0/2" # based on SONAME of libusbmuxd.so
+SLOT="0/4" # based on SONAME of libusbmuxd.so
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="kernel_linux static-libs"
 
-RDEPEND=">=app-pda/libplist-1.11:=
+RDEPEND="
+	>=app-pda/libplist-1.11:=
 	virtual/libusb:1
-	!=app-pda/usbmuxd-1.0.9
-	!<app-pda/usbmuxd-1.0.8_p1"
-DEPEND="${RDEPEND}
+	!<app-pda/usbmuxd-1.0.8_p1
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/os-headers
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README )
+	virtual/pkgconfig
+"
 
 src_configure() {
 	local myeconfargs=( $(use_enable static-libs static) )
 	use kernel_linux || myeconfargs+=( --without-inotify )
 
-	autotools-utils_src_configure
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	if ! use static-libs; then
+		find "${D}" -name '*.la' -type f -delete || die
+	fi
 }
diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest
index 92ea55d14222..01ba967dd81b 100644
--- a/app-pda/pilot-link/Manifest
+++ b/app-pda/pilot-link/Manifest
@@ -1,4 +1,4 @@
 DIST pilot-link-0.12.5-gentoo-patchset.tar.bz2 8182 BLAKE2B db6e053bebc2876308d5bf5c29b86b9f22aecd0e75ed6d16e9214d63d73cb5e2dc7080bcd03a9d4dc21d4f2ef84d9632bac6cd36673d93915db9fd095ae12dfd SHA512 141900ef42d8a6716d7e0a219e1b75609f392c393376fb60f645561cfe1cf67ad9cec03321a31dcf1e8a70c75591df6eac4f727c957487496ab46ae6aa2dc90d
 DIST pilot-link-0.12.5.tar.bz2 1578735 BLAKE2B acc8748448d90928ac393e3d716f9d12c7962e18564a738b5f01e19bb225d610e179bb0694aded57979c7240df2652cac72845e5b8cdcddf6a4a800bbac4424b SHA512 a12972fb7a43f2dfccb82a046ca372c9fce5333f632a77880439c4f4705af6a7f16b76f04c9f3ed0d6a12aad55a3a55f8781a4e92931bc6907cd1ec4f1209868
-EBUILD pilot-link-0.12.5-r2.ebuild 3082 BLAKE2B 678a7153dd68bcea522c74c67e3777c864a2215c01784f35afa1b51751de2c6849ac392ef8473f23a47e822b41f3dd7dfa74a90a161103ea060d255811c41109 SHA512 9e77ebb80dc3220be11d6fd8ac8e4818ff26818182f0a184d7e1e9ad4ef9da6dc74e1d8223d8d90396357140f2b26a3d8fb80f4ade8b1e52e4bb62736b8b6edb
+EBUILD pilot-link-0.12.5-r2.ebuild 3072 BLAKE2B 4e3200bdda2530bea5eaee4619137afb57a63674274c842d4c97e068dd3f03814fb062716ea2908500b69e0c426e56db5d50a5d8c9dc373b4773359b9bb344bc SHA512 8491d70c4d6cd79f384f6e4c4e0577a8313e2d33503bc2b0631b262beb6f421120b130e01e902b1044cd14570b5498dfe748a1d4fde31df75aef73301fe1dd36
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild
index d00cf62605ff..dede9e9534e7 100644
--- a/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 
 LICENSE="|| ( GPL-2 LGPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bluetooth debug java perl png python static-libs threads usb"
 
 COMMON_DEPEND="