gentoo resync : 15.12.2019

8 files changed, 7 insertions, 40 deletions

diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 1f80b028eb70..c09cb991307e 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/jpilot/Manifest b/app-pda/jpilot/Manifest
index 8a6077debeef..6b5a58adeeba 100644
--- a/app-pda/jpilot/Manifest
+++ b/app-pda/jpilot/Manifest
@@ -1,5 +1,5 @@
 AUX jpilot-1.8.2-fix-paths.patch 3619 BLAKE2B 01d77eb206f2ce4c1f28b2950334f0814fb398cc61bc4164e573a7290b6ff0a1d6c710c6932ce0170b8634459beb8f2f53c296b3fcf79ea56d8ca061459babd4 SHA512 25e026aafc04e488183a7537f37566b30c1300f090cc1b4c9eca6531e30654751e10f72c8d45f0ad1bcfa441c659380831de520f41906daec61b4b069fc84f81
 AUX jpilot-1.8.2-qa-desktop-file.patch 280 BLAKE2B 8a84005ce60627cea1f6b8b9ce96e824a65b621d63706703d15a3dd1ed48945ab100927a885d8c7e40c2688194f89a151be96729b26d6cb4d081024095ed3178 SHA512 ccc59b87c5e7f9074e83e9c3a47799c6779c29583fbd9845a26ad735342b22bf390bf8bed50dc2adac097dea00823ea587c8a5abdce4c197f5160e59c4617a37
 DIST jpilot-1.8.2.tar.gz 1740735 BLAKE2B efc9fb8e88843d6e0f4f2245753d67856c9d0cd455c9a22c829bb103631fd8a8111ead3cb4bc434a6be00ad0cb35fe554a9ebbe1f2d38bfaf560e1b414c62260 SHA512 733dd51a2acc60760bb1ffaa0d7b4433584a571793d5e4f857492349bae8d032625baf9f0060e619d760628ddda3559bf4be057f45f4dc17ddf1af1ca795c024
-EBUILD jpilot-1.8.2.ebuild 894 BLAKE2B 35741144208a8384ae7e53e97209996ed09736f80e8466abbb0f7141135b6429219b7ad4fa9cb6c3c37783f318fbe1ae152a364335a1d3f2fe7b329a31e6b975 SHA512 c6af70006a1fe3a4a595e30e08c46946b632abd912355aa7fab91711cb4765cf63392edd28e941a87cf7e5354866037b73d496b545365ec7309be0f2cdcdc3b0
+EBUILD jpilot-1.8.2-r1.ebuild 987 BLAKE2B 198777beec3ac0af040e6e13b3ff120b15016b9f98bb1e81dceadd5a57a693fbf692f6a13594d8b515da70be44cc7f2719f68e2b7c19891ca3aa576de0b61855 SHA512 30d7362a50f669d6abefab3a752cd9055eca58f4f69fad8768f4eec53c4c57ff33800f391dcd88d070a6e3b8183e35e7f1d6e7d2aedef2ed9280ee4b88b01e80
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/jpilot/jpilot-1.8.2.ebuild b/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
index 7d10a5cc6419..7938cdb42bc3 100644
--- a/app-pda/jpilot/jpilot-1.8.2.ebuild
+++ b/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,6 +32,7 @@ PATCHES=(
 
 src_prepare() {
 	default
+	sed -i -e 's|_UNQUOTED(ABILIB, "lib"|_UNQUOTED(ABILIB, "'$(get_libdir)'"|' configure.in || die
 	mv configure.{in,ac} || die
 	eautoreconf
 }
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
-}
diff --git a/app-pda/usbmuxd/Manifest b/app-pda/usbmuxd/Manifest
index 9eae2a8d12fd..6ac05ce1abc4 100644
--- a/app-pda/usbmuxd/Manifest
+++ b/app-pda/usbmuxd/Manifest
@@ -1,5 +1,5 @@
 DIST usbmuxd-1.0.8_p20140530.tar.xz 46988 BLAKE2B 8efedee3231b134995316fc295fffd975271aa9d630aa6e3d96ccda472634422299aadb92acda09b6802cdcf9e99af0c165dcbed153d0a5027ffcc8f26126cdc SHA512 200c9bd208ef9e8d5e0a9b2779ff260efe6319333ce27c93a0686ba924e6cfaa1a003072c3eabbe46d495a66bc47c3cd6e82482653fde5e1a7ae0edd9b838fac
 DIST usbmuxd-1.1.0.tar.bz2 321897 BLAKE2B 3ca5d1da222e457ac01f3e87fb7573c6405e51fd5d270a2b3dab7601118f21be22232d5100b4d027273fc837e6a57f7a7d17d2c41ae59d7c5aa41f76bef5a03d SHA512 66aa0c40e912bf596b819098b87d88e9cf30b2e6352e607eeb778bd4f23bf9bb123fb6a6ecca2d4e4be3171e35d66200d632d2c9c80b1f2462bb45be8aa6912d
 EBUILD usbmuxd-1.0.8_p20140530.ebuild 869 BLAKE2B c4f285dfdb12994d9bcf488b91215b1e5f4245d9b269d3cb1164710fc8a344a2d66a24a3fdcdeb1842bbb8b64a9c47ef3f20e15548367d711fdbe9c4b0d16131 SHA512 fd1b326c16e0c74f4a2f6b3857606ffb6b7e14c40e5682c01fab1655c3df27dffd4b4ea6b15d5c3a5e5ae64f914b135ac562b6d792d6699dddbb183dae5b226e
-EBUILD usbmuxd-1.1.0.ebuild 814 BLAKE2B 42fa9330b23981debe71922ff9fd45313e0e12bfea421e93ff445feeebc7c271907654ee9c707028f4da927e74a314c3d3ae0c2912699ad0c1517cb576f0bebf SHA512 5172037fd57d9995581c3e896c8a6593a33bb18b9f548255d0193cb913ae656cf48c04ff83af5b816bfc40e65beeeae68bbc8335001496c21cd082e53f5d250a
+EBUILD usbmuxd-1.1.0.ebuild 812 BLAKE2B 8372243e9047c7af5cfb1fabf5c94a7ddbe2f01f83909bed7954535e81c249fccbc76d2915ac546120a05bd8ac93b1c87aedf4dd1c4a1f919085782abc5091b9 SHA512 24bc2804424ab3ec022731966351f48f963fb0e9ff0f93b95f3aa64bb0c46e7039063857b9b59da04c91fc24a4bcaf79ef592294c0b305679836e724445fa1e0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild
index ffe942a66858..0de7aed7b123 100644
--- a/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild
+++ b/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.libimobiledevice.org/downloads/${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 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="