gentoo resync : 15.12.2019

3 files changed, 2 insertions, 36 deletions

diff --git a/app-pda/libusbmuxd/Manifest b/app-pda/libusbmuxd/Manifest
index bf02a42e08ab..e26fd4bcca6b 100644
--- a/app-pda/libusbmuxd/Manifest
+++ b/app-pda/libusbmuxd/Manifest
@@ -1,5 +1,3 @@
 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-r1.ebuild 940 BLAKE2B 989b29bfb4f6ed829bda9662669755786358f541a1ebda3da0050d61a05fc276192407aacf1c9d09afa61b08d18c2e3dcb41cd8b6e308a77abfbc202c1ca713a SHA512 df70f0ac08eae7d7b01448d701e4548bdb64cccffe60e15eb53491e4848f630d9a321a18689a5c10558b3980f6fb8353230d0797c5d730f3641dd9687dfcbbee
-EBUILD libusbmuxd-1.0.9.ebuild 890 BLAKE2B 3d70e7e00f9105e29a40fb35d884fb52e2f8076e1af1180c4f7439d427ec664be3b20b2c20cbdfab20b24457ab34dcbee1bc9867ee463d9d855609c863603a83 SHA512 023fbbf726b9726455564f9cfbcf63dd619dbd724ed77a0a8bb5ad6b2a960de3650305b2e4d4d8f3bd33ee587f81c2b91c55a01a0636163f52e405269141dba6
+EBUILD libusbmuxd-1.0.10-r1.ebuild 937 BLAKE2B a5c8eb29f27bc1a75a13c81e916eee108803a6a0827ba57edb76e2d06c89655852d021ef164efcd11e95c59ff95210b52bd417cb33404fff243d0b916553f44c SHA512 66a0254d202427c87f8188076a2602b200da3ba7e31b19e88c573269126ca075574e8d8b02da451c3f6bb348a74341365736b738271d8ab49d7d6060f8b9fc8b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild b/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild
index dc0119d7a157..484a681d6a9f 100644
--- a/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild
+++ b/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild
@@ -10,7 +10,7 @@ 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/4" # based on SONAME of libusbmuxd.so
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="kernel_linux static-libs"
 
 RDEPEND="
diff --git a/app-pda/libusbmuxd/libusbmuxd-1.0.9.ebuild b/app-pda/libusbmuxd/libusbmuxd-1.0.9.ebuild
deleted file mode 100644
index 53333b33da7c..000000000000
--- a/app-pda/libusbmuxd/libusbmuxd-1.0.9.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-utils
-
-DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
-HOMEPAGE="http://www.libimobiledevice.org/"
-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
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
-IUSE="kernel_linux static-libs"
-
-RDEPEND=">=app-pda/libplist-1.11:=
-	virtual/libusb:1
-	!=app-pda/usbmuxd-1.0.9
-	!<app-pda/usbmuxd-1.0.8_p1"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README )
-
-src_configure() {
-	local myeconfargs=( $(use_enable static-libs static) )
-	use kernel_linux || myeconfargs+=( --without-inotify )
-
-	autotools-utils_src_configure
-}