gentoo Easter resync : 12.04.2020

17 files changed, 319 insertions, 48 deletions

diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 3e5c87a87c00..a05be7b60971 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/jpilot/Manifest b/app-pda/jpilot/Manifest
index 8bc66cfcfe75..159d0bb834d9 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-r1.ebuild 988 BLAKE2B b08923ba29f735c0fcd47f8b0e067ab66579966968b2aed9b9a96d691db837931e39bffee393d20820cf85e9cbb2e34811dc6e23e003a546f23808f9d971f8de SHA512 7855d13002d213aed0c3addb0e7b14ec5a98a9e2bcddc6f261fd4d061c2848b6b9242da52cf11470c50f9d869f0f1ac68c798fac14b6454bf2e13d214d0fd0da
+EBUILD jpilot-1.8.2-r1.ebuild 989 BLAKE2B bb2067b305d3e756a0e35168367f5f495b97dfb1945445c77dbe690a128f697c5e1aacc810a79e9415635189791d840cd1afe076ec10a4ce1a1c7cebe27751af SHA512 0b992569f5651b9b9b52ccc333bc3171b94f694b6468a745b0af80be47af8162f46f8967aeae07c2f1ed5d6d7624533203cd3adad3174eb3d3f6adac24e0174b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/jpilot/jpilot-1.8.2-r1.ebuild b/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
index 339d5a7590f3..e7518b102d75 100644
--- a/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
+++ b/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://jpilot.org/tarballs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index 8dc9db776299..ee2d46eb3f8a 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -2,5 +2,7 @@ DIST libimobiledevice-1.2.0-git.patch 187304 BLAKE2B 7c184f823b831b913dbae16a58d
 DIST libimobiledevice-1.2.0-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch 2272 BLAKE2B 2f435af75c6f7fe319c76b52feac32d8f1389806835658bae5713d82471d0b2edd01b062871bff5e757795c220e2cd4c77d404c1df0cf9616c2fc2d77364b686 SHA512 a31741cfaae53781a1491fd53514e614e64c676573dc9252adea2fb0d64005eb5fad6483f1848b0246f0fff76c8fb4535f56a6e97c13dd7aa48a29061cabb172
 DIST libimobiledevice-1.2.0-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch 2014 BLAKE2B 8a6e51af145cf9983aa92ad7febf8d48a64b81f4f4664079ee7df3d433626141e10af6700ad38aad81bbbf3be03d6b35bae4f10a595e97f6998a06b6b2a4fbd4 SHA512 1c6002f8da5524603b989613fc1b14e526bc6fcbf515890f8c4976fe5e1b3801f04f6b210264624990ff7dd7de01063ad53dbf9ec506a0645098692a948216b9
 DIST libimobiledevice-1.2.0.tar.bz2 631495 BLAKE2B b04d87906615710e9e143013d27f4a0735e444160cb9dad464cb63d568470397f504680b3faca3995932cc8a80970a5923128d356fad9c98372af4981373ed69 SHA512 0de5f768aeb5d62445892855d84ceaff776f6667733c351ed6c34bf9d500802762d1a06e5efdf57f33cafc9ee788041cd9b6748fb9bad6c2e4ae2f9b9aa93589
-EBUILD libimobiledevice-1.2.0-r1.ebuild 3240 BLAKE2B 533148f899b290e80e1737c0417482969ed12cae6c8dacbc6e99b70ee85bcbcd0a889f9a9a0d8b2d7254f827a194a348d6c78f25b559f3cffdc194014875f175 SHA512 c68deef20f079820f1fcdcb95da037f35bf8d861948e08ab712582b317857caabea7fcc529568eca79ef361ca287598a42b2d2a47350ca359cb9097798333e21
+DIST libimobiledevice-1.2.1_pre20200220.tar.bz2 193582 BLAKE2B 7fab2101ee96a5fcc5dc68bad1a6c9fef25d87f25660cbce9aef45f8830c0162179f07e3d8a0f1d7d60bb7a219b1c4ee2513d43f98e8e4ea0d891686600c370e SHA512 f9d04941685f1cb0e982d061a6ea92d88d1d90157a789460e09e6af72954ed7a7f0448efbef3fe3cbca380195ffa658f7d8119e812f8ba8003c1e8a242976865
+EBUILD libimobiledevice-1.2.0-r1.ebuild 3251 BLAKE2B 4250165b98dadb3c8c9c40205cfdc2751faa8a6865e58be8fb933b560d1001d9e4f41a81adea9099ed38cfc58f9a1fef61c1a61a1c84389f1436c713170acc30 SHA512 742efd5fdb8bcab38ac94af62e5a6c22f18128e43345d444cd96777a1fda4d46ca5bbb87b47a3fb3bcdb6011633e75ca876e372ce16969fe14394068b4f395d3
+EBUILD libimobiledevice-1.2.1_pre20200220.ebuild 2602 BLAKE2B 09a937b6fd0af7b31fbb3a7838967c8ae8f1b5e6e4b9c6472db843efd36dd1da7144d66b2595768d5c2261972ae154ffe36d82f073e9b766327abd2e97481f71 SHA512 cdc08236c82a40edf8d3b71d3583dae6621e32b2a2d404606b14d988ad424204c27461ae02e7ac4f19bf1d90b4e5fcbfeff4d734c546e408f9aa2905cde22743
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild
index 47a554923260..6b1c60b021b4 100644
--- a/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild
+++ b/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild
@@ -71,7 +71,8 @@ src_configure() {
 
 	do_configure_python() {
 		# Bug 567916
-		PYTHON_LDFLAGS="$(python_get_LIBS)" do_configure "$@"
+		local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
+		do_configure "$@"
 	}
 
 	do_configure --without-cython
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.2.1_pre20200220.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.2.1_pre20200220.ebuild
new file mode 100644
index 000000000000..0cd85b4d870a
--- /dev/null
+++ b/app-pda/libimobiledevice/libimobiledevice-1.2.1_pre20200220.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="3d8d13f0a70cefc1b12571b7f6aa2d1d4c58cffb"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit autotools python-r1
+
+DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
+HOMEPAGE="https://www.libimobiledevice.org/"
+SRC_URI="https://cgit.libimobiledevice.org/libimobiledevice.git/snapshot/libimobiledevice-${COMMIT}.tar.bz2 -> ${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/6" # based on SONAME of libimobiledevice.so
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc gnutls libressl python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=app-pda/libplist-1.11:=
+	>=app-pda/libusbmuxd-1.1.0:=
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=dev-libs/libtasn1-1.1
+		>=net-libs/gnutls-2.2.0 )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= ) )
+	python? (
+		${PYTHON_DEPS}
+		app-pda/libplist[python(-),${PYTHON_USEDEP}] )
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+BUILD_DIR="${S}_build"
+
+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.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/libplist/Manifest b/app-pda/libplist/Manifest
index 1f4edddc48e8..6eeb702ec42a 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -1,3 +1,5 @@
 DIST libplist-2.0.0.tar.bz2 421405 BLAKE2B 2f6e22c871ad3b5ace2a2c6aab09706e8a8c1759f1656c5c07164e5b89a1b5eae24d2d7472e0dcca7eddd96b641715acfe5a0a791b0b994ec5fbcdf70627acf9 SHA512 81508bf6773483528816725c3b5b868563b84fd7810999404072e5ea9efa7fc9f11ef997f32208e4421aa26b15edd0c65f87c67c1472e8c4e356f1e9fe7740ee
-EBUILD libplist-2.0.0.ebuild 2049 BLAKE2B 9b7ce1a5188a3982c686a835ce270e3a1d65059ed33e375b7707737aa44d524ad3456ff8799b503c65e5a6576a824ade3a7bf7bed6a058b5aaca5e3928714384 SHA512 ab99c65b6fbcce81161754bbc8fad8ea42956a019785ddb0d771b98fefed5621827ef0dd0cc7cd91f5915cf93ce00eb84116f4b8c836aa5ac60bf9cca5cbb709
+DIST libplist-2.1.0.tar.bz2 120602 BLAKE2B 8abfe3c295c4ebd242f2c4d49c80d1f214097df84f1d2fcf2696519bbbca4e8a5ce13c04690ac64fd981f84d585df25fc65c268a4e4f4092319053583e67736c SHA512 23156e882835bb0b894a05b57018b5e76f9f8f8f4b1d3fdad7b1970d2ef695033c98de74a1fa81bdf0829742a058fd65075cebc1512313d2be42e2f5367274be
+EBUILD libplist-2.0.0.ebuild 2060 BLAKE2B 2c23e030b23ff17563e93df3231ca4ac7cbbd988462b3743f3e3c2bb90156bf888a17be48342eab8acabd87daa0185105acbf996a192f032bcb52ef027313ad0 SHA512 14455c770264ca2d42dbfdc588eea8c2abea209515fc9b92638dfec73e9f35dab1bc2cadd2d95aa97dc1be9e4ba42153ae1b39a27286f5c324d03f4643b53b5b
+EBUILD libplist-2.1.0.ebuild 2148 BLAKE2B af693d4f5a8460831e6f3073bbce9eef64ba538db75317b18f22e76874a1ede5d291482871f61fb4d2e7d71758b7994c94884604d3ca1988a1f5a8ec819e9417 SHA512 426589b2180cde9692224c4d7889f96c9c709671b101ea11c597ab9e4ac4901a586f330ade250988b49cbb87b2d11a742360d6698b26fe1a682b6f3a9b1ec579
 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 37e0c7cd5e80..c1aa521a377c 100644
--- a/app-pda/libplist/libplist-2.0.0.ebuild
+++ b/app-pda/libplist/libplist-2.0.0.ebuild
@@ -43,7 +43,8 @@ src_configure() {
 	}
 
 	do_configure_python() {
-		PYTHON_LDFLAGS="$(python_get_LIBS)" do_configure "$@"
+		local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
+		do_configure "$@"
 	}
 
 	do_configure --without-cython
diff --git a/app-pda/libplist/libplist-2.1.0.ebuild b/app-pda/libplist/libplist-2.1.0.ebuild
new file mode 100644
index 000000000000..7b342d04b16d
--- /dev/null
+++ b/app-pda/libplist/libplist-2.1.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+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.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="python static-libs"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( AUTHORS NEWS README.md )
+
+BUILD_DIR="${S}_build"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+	local myeconfargs=( $(use_enable static-libs static) )
+
+	do_configure() {
+		mkdir -p "${BUILD_DIR}" || die
+		pushd "${BUILD_DIR}" >/dev/null || die
+		econf "${myeconfargs[@]}" "${@}"
+		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() {
+	python_compile() {
+		emake -C "${BUILD_DIR}"/cython \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			plist_la_LIBADD="${native_builddir}/src/libplist.la"
+	}
+
+	local native_builddir=${BUILD_DIR}
+	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 "${D}" -name '*.la' -delete || die
+}
diff --git a/app-pda/libusbmuxd/Manifest b/app-pda/libusbmuxd/Manifest
index e26fd4bcca6b..9c05bb0c72f1 100644
--- a/app-pda/libusbmuxd/Manifest
+++ b/app-pda/libusbmuxd/Manifest
@@ -1,3 +1,5 @@
 DIST libusbmuxd-1.0.10.tar.bz2 292649 BLAKE2B 7ec9a576cb20f7e87cf1f31e57e66100c496e5809142d225df9b3cc295a71546bed2d90f41df3144f7316ce0aec5f08fad850c528e27f336bf96e9578bcffd04 SHA512 180cde2e9d0860d07d29813e68abf8ca807f75e98424b50acfc1ce941ba4260922959e1047a7d2bc754470c08ed55d0a15c9367487bd41c635a52b4fbf8ff535
+DIST libusbmuxd-2.0.1.tar.bz2 37373 BLAKE2B 3d7d8b4ccc5331f1f3868e67ac9726281dccb8eabc58cf78d4b8a921c403095adb18cd8ec4f156c06297abb8566daae04300709fd1afd35c57dbda155db03c0d SHA512 c2a977898ccd28d32f7754bac08829b57bc87ad958febded2c95087a06cb0b5a73daf087b3a00630701a7313fd3900f916846b77b4794321c90e6aa9f9246ed3
 EBUILD libusbmuxd-1.0.10-r1.ebuild 937 BLAKE2B a5c8eb29f27bc1a75a13c81e916eee108803a6a0827ba57edb76e2d06c89655852d021ef164efcd11e95c59ff95210b52bd417cb33404fff243d0b916553f44c SHA512 66a0254d202427c87f8188076a2602b200da3ba7e31b19e88c573269126ca075574e8d8b02da451c3f6bb348a74341365736b738271d8ab49d7d6060f8b9fc8b
+EBUILD libusbmuxd-2.0.1.ebuild 862 BLAKE2B 9e2a7f99edb4b6cf5deac172f45c13f7b013d3615096df942e8c0d743d852fd8b194b1edf84c6749f8ccba115800e7c851a16fc34dc4bbf08d12564cc4238d35 SHA512 2f8fb7cb1af7b10a67d8da4590ce8689c6485542bd1fd88d6ded4cb2a5cfc50dbead191daa8fadfdfe2007e133265755d3589aa0ea57953d02fce6274c8b7629
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/libusbmuxd/libusbmuxd-2.0.1.ebuild b/app-pda/libusbmuxd/libusbmuxd-2.0.1.ebuild
new file mode 100644
index 000000000000..8da4a31590a5
--- /dev/null
+++ b/app-pda/libusbmuxd/libusbmuxd-2.0.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
+HOMEPAGE="https://www.libimobiledevice.org/"
+SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
+LICENSE="GPL-2+ LGPL-2.1+" # tools/*.c is GPL-2+, rest is LGPL-2.1+
+SLOT="0/6" # based on SONAME of libusbmuxd.so
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+	>=app-pda/libplist-2.1.0:=
+	!<app-pda/usbmuxd-1.0.8_p1
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(usex kernel_linux '' --without-inotify)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-pda/pilot-link/Manifest b/app-pda/pilot-link/Manifest
index 8f750693e0bd..83f5ca63d49f 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 3073 BLAKE2B eecc21f19f273e68643135aa512ebb0215a93af6b196a04bd0d74ddb71a039ca90806cc50ca9a619eadaf736740cc6e8f0af65da20bc2a1e5baa3f206174817b SHA512 d06e35ed00c9c214ec86c0f7ad81e1218a19783706d4d0421db891cb63e1e28c73ef08da93f453b2bedf81b0523dd3125fa1f88d860bc6a9141945b6aef6499f
+EBUILD pilot-link-0.12.5-r2.ebuild 3074 BLAKE2B 262f8a5972dde1f3f8e3835926aad69553b8b63dd6a2a1cb352e1ac650df228044a4823e6ea0558d5527c5199c8aba2cd8e9977a04ad66001c7bc60b04fb1d12 SHA512 c408dcd0478bd70f7e5dc32f51c08699e00bf3069288ec8c70de9cef01105fbd2adc56d1e4bee75b25f41483bcf4d933db87a14b5cfed5c2dbc0c69bb57a8533
 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 279b664d4190..3bcc02fd6ec9 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 ~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="
diff --git a/app-pda/usbmuxd/Manifest b/app-pda/usbmuxd/Manifest
index 6ac05ce1abc4..7a76ae3a1b73 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 812 BLAKE2B 8372243e9047c7af5cfb1fabf5c94a7ddbe2f01f83909bed7954535e81c249fccbc76d2915ac546120a05bd8ac93b1c87aedf4dd1c4a1f919085782abc5091b9 SHA512 24bc2804424ab3ec022731966351f48f963fb0e9ff0f93b95f3aa64bb0c46e7039063857b9b59da04c91fc24a4bcaf79ef592294c0b305679836e724445fa1e0
+DIST usbmuxd-1.1.1_pre20200121.tar.bz2 51859 BLAKE2B 339d53904f7484bebb6d7524313ee065bf5a244efab16c77b30b8932071012105f21aa56083d82667b06088af83464ea8c86e3c28c5a45cb9abbe574a634533e SHA512 cc113b054e8e04d228af740ec43d2dbf29c015dc9d8e1cdd0eaf84bfcaa9838d5b1bf6db2efed30ffb84c35c88db5469983a115ffdbddbb6acd0df9fd2a5182f
+EBUILD usbmuxd-1.1.0.ebuild 854 BLAKE2B aff005e1ff9c9ea91d8965bc28662f579562b0ecbdb8bf7d4b728da685cdb1c9567ce79a060aabe202c5e3b7d272bdddbf32be00a6f2ed69e8ca10ff20c5f563 SHA512 779d1bfec159db90b531400dd6d505145673b5f6db6a0afdb00a598d66036bf240e2115155bcb0e27499625929a9a8b278b98832506dee8a9a56a239a40ee7fd
+EBUILD usbmuxd-1.1.1_pre20200121.ebuild 1001 BLAKE2B a56ea9d8d22834f535f9a80f46f5e5922ec2b60385929311d476a7edf304c9db2b913abd82fa4d96108146209902b477e5e7bc074db7aa365cf5c9553630f67d SHA512 a275bdd3541b791f93b68276df7e812daed58ff73c182f817fefecf78d36f229697803afbde36bd0cded539db55d60846b9f1a09861001963b866aa70d34b689
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/usbmuxd/usbmuxd-1.0.8_p20140530.ebuild b/app-pda/usbmuxd/usbmuxd-1.0.8_p20140530.ebuild
deleted file mode 100644
index 17dd00ce82b1..000000000000
--- a/app-pda/usbmuxd/usbmuxd-1.0.8_p20140530.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=1
-inherit autotools-utils udev user
-
-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"
-SRC_URI="https://dev.gentoo.org/~ssuominen/${P}.tar.xz"
-
-# 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"
-IUSE=""
-
-RDEPEND="
-	acct-group/plugdev
-	>=app-pda/libimobiledevice-1.1.6
-	>=app-pda/libplist-1.11
-	virtual/libusb:1"
-DEPEND="${RDEPEND}
-	virtual/os-headers
-	virtual/pkgconfig"
-
-pkg_setup() {
-	enewuser usbmux -1 -1 -1 "usb,plugdev"
-}
-
-src_install() {
-	autotools-utils_src_install udevrulesdir="$(get_udevdir)"/rules.d
-}
diff --git a/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild
index 0de7aed7b123..4220c366a73c 100644
--- a/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild
+++ b/app-pda/usbmuxd/usbmuxd-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,8 +17,9 @@ IUSE=""
 
 RDEPEND="
 	acct-group/plugdev
-	>=app-pda/libimobiledevice-1.1.6
-	>=app-pda/libplist-1.11
+	>=app-pda/libimobiledevice-1.1.6:=
+	<app-pda/libimobiledevice-1.2.1_pre0
+	>=app-pda/libplist-1.11:=
 	virtual/libusb:1"
 DEPEND="${RDEPEND}
 	virtual/os-headers
diff --git a/app-pda/usbmuxd/usbmuxd-1.1.1_pre20200121.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.1_pre20200121.ebuild
new file mode 100644
index 000000000000..371f8cb38f28
--- /dev/null
+++ b/app-pda/usbmuxd/usbmuxd-1.1.1_pre20200121.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="8a69f1a78a58476f77b66916091d2405d0cd815f"
+
+inherit autotools systemd udev
+
+DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
+HOMEPAGE="https://www.libimobiledevice.org/"
+SRC_URI="https://cgit.libimobiledevice.org/usbmuxd.git/snapshot/usbmuxd-${COMMIT}.tar.bz2 -> ${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"
+IUSE="systemd"
+
+DEPEND="
+	acct-user/usbmux
+	>=app-pda/libimobiledevice-1.2.1_pre0:=
+	>=app-pda/libplist-1.11:=
+	virtual/libusb:1"
+
+RDEPEND="
+	${DEPEND}
+	virtual/udev
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with systemd) \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		--with-udevrulesdir="$(get_udevdir)"/rules.d
+}