gentoo resync : 25.08.2020

20 files changed, 734 insertions, 2 deletions

diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index d7bd3bb21d78..2917d9dd9c42 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/gtkpod/Manifest b/app-pda/gtkpod/Manifest
index ab7aa9dc72d0..1c85dc738b64 100644
--- a/app-pda/gtkpod/Manifest
+++ b/app-pda/gtkpod/Manifest
@@ -1,5 +1,6 @@
 AUX gtkpod-2.1.3-gold.patch 451 BLAKE2B 2f0202782394abc636265fbf9d13dade3d28608bec3bc8298ae1ea592a4f34688ba4be227aead6c4cfa8a946dbe872dbb5d596fd728e18e27166a01b524e6c00 SHA512 b6fb32ce37087beed99c475f747a6c79541821d836892ab4b8673ec49ca0a72ca6d55aaeaf8cf25895cc8e4f54341673e0f5616c5fa5ebc610250c641f4a2b13
 AUX gtkpod-2.1.5-m4a.patch 405 BLAKE2B 0102cecc598c7594dc545f9142fb152e601db8a793b80acb4ce92a7594bb6902cfb19f90612a169585c42daa6827046f257cab76db7be69534b0e7c79f14d75a SHA512 d7774f82d5a30c393354da9302f4cd62eb2c9c0588bb6afcc1429850730f727db91bd200c78934e9a3a64a112a11a51d62d7bfb3a17f74c77e259ebb126037a4
 DIST gtkpod-2.1.5.tar.gz 3780232 BLAKE2B 8de431ed04b1f9d85322d7d1c823f7ace08511616f81a3030dbebe455f71e7f130944173c1fde6e27aceec2cd71a7f731fa00ea574ef201bf48ef6100f3bf82c SHA512 428b9ce75d2c7c208a847bee6f10f6ed0c9f896efbedd86ed41ecce64fdbf1b937968042ad9945aec33a714fc3031427a54f924619db99cc111945355978f24c
+EBUILD gtkpod-2.1.5-r1.ebuild 2798 BLAKE2B a642130505b4fa7b3c2d98ec3afc695e824106cde777b3120afc57ef679f4563d2850111b7c7eb7fec40e3586b127332ae22932d7e94909dfc66a4c9bca327f9 SHA512 f8516c42146735c682d6e21eaa92fb6eda70690f4430c27625a17ec4b7f2822a530f2a576172d1ec7cd07faf7f2a92c6745ec26b7c77ccb80bd3d87ed0d7d735
 EBUILD gtkpod-2.1.5.ebuild 2240 BLAKE2B 52ac88288ad8a45d366a1ca305691405155aa3670a6458d63d88ac461dc9d46965959bf317ea863b723f4bcaaedafde143b0fb9e18e88f45e582650d8aa081d7 SHA512 5619e8def4900659558842cecbd8017cbf21d1c0d402ce116e5350915fcd17f189cc4aefa7e80df0185998138cd21eb230746d37cf25ff2fa7ba09782e5f3eca
 MISC metadata.xml 335 BLAKE2B eb5370d6ed11cddddb74642e42a2bbb70d74d7e45b1dc228be2febc3cd3a1e6d0344e96bc94a3417b0c6c6cd67e5658fc8b06a53106ad746db92f48f70d47d31 SHA512 97aa0c82eebf5b63b8f3de0ea32f3f51eed2ebb2ba37a90a60759ffd7caf20ce90235851cdbf05fb5d45e3a0d35e1c062fb92e10cf10285c42e5ff20657ff061
diff --git a/app-pda/gtkpod/gtkpod-2.1.5-r1.ebuild b/app-pda/gtkpod/gtkpod-2.1.5-r1.ebuild
new file mode 100644
index 000000000000..31996cc73828
--- /dev/null
+++ b/app-pda/gtkpod/gtkpod-2.1.5-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Not all modules needed by py script are packaged in Gentoo
+#PYTHON_COMPAT=( python3_{6..9} )
+
+inherit autotools flag-o-matic gnome2-utils xdg #python-single-r1
+
+DESCRIPTION="A graphical user interface to the Apple productline"
+HOMEPAGE="http://www.gtkpod.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="aac clutter curl cdr flac gstreamer mp3 vorbis"
+REQUIRED_USE="cdr? ( gstreamer )"
+
+# ${PYTHON_DEPS}
+COMMON_DEPEND="
+	>=dev-libs/gdl-3.6:3
+	>=dev-libs/glib-2.31:2
+	>=dev-libs/libxml2-2.7.7:2
+	>=dev-util/anjuta-3.6
+	>=media-libs/libgpod-0.8.2:=
+	>=media-libs/libid3tag-0.15
+	>=x11-libs/gtk+-3.0.8:3
+	aac? ( media-libs/faad2 )
+	clutter? ( >=media-libs/clutter-gtk-1.2:1.0 )
+	curl? ( >=net-misc/curl-7.10 )
+	flac? ( media-libs/flac )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		cdr? (
+			>=app-cdr/brasero-3
+			>=media-libs/libdiscid-0.2.2
+			media-libs/musicbrainz:5
+			)
+		)
+	mp3? ( media-sound/lame )
+	vorbis? (
+		media-libs/libvorbis
+		media-sound/vorbis-tools
+		)
+"
+
+# to pull in at least -flac and -vorbis plugins , but others at the same time
+RDEPEND="${COMMON_DEPEND}
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0 )
+"
+# media-libs/gstreamer:1.0 needed at build time as we need m4 file for
+# eautoreconf, bug #659748
+DEPEND="${COMMON_DEPEND}
+	media-libs/gstreamer:1.0
+	dev-util/intltool
+	sys-devel/flex
+	sys-devel/gettext
+	virtual/os-headers
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	xdg_src_prepare
+
+	eapply "${FILESDIR}"/${PN}-2.1.3-gold.patch
+	eapply "${FILESDIR}"/${PN}-2.1.5-m4a.patch
+
+#	python_fix_shebang scripts/
+#	2to3 --no-diffs -w scripts/sync-palm-jppy.py || die
+
+	gnome2_disable_deprecation_warning
+
+	eautoreconf
+}
+
+src_configure() {
+	# Prevent sandbox violations, bug #420279
+	addpredict /dev
+
+	append-flags -fcommon #722504
+
+	econf \
+		--enable-deprecations \
+		--disable-static \
+		--disable-plugin-coverweb \
+		$(use_enable clutter plugin-clarity) \
+		$(use_enable gstreamer plugin-media-player) \
+		$(use_enable cdr plugin-sjcd) \
+		$(use_with curl) \
+		$(use_with vorbis ogg) \
+		$(use_with flac) \
+		$(use_with aac mp4)
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir=/usr/share/doc/${PF}/html \
+		figuresdir=/usr/share/doc/${PF}/html/figures \
+		install
+
+	dodoc AUTHORS ChangeLog NEWS README TODO TROUBLESHOOTING
+	rm -f "${ED}"/usr/share/gtkpod/data/{AUTHORS,COPYING} || die
+
+	# Needs unpackaged python modules
+	rm -f "${ED}"/usr/share/gtkpod/scripts/sync-palm-jppy.py || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+	xdg_pkg_postrm
+}
diff --git a/app-pda/ifuse/Manifest b/app-pda/ifuse/Manifest
index ef3df5c5db70..7c631f34ca51 100644
--- a/app-pda/ifuse/Manifest
+++ b/app-pda/ifuse/Manifest
@@ -1,3 +1,3 @@
 DIST ifuse-1.1.3.tar.bz2 90803 BLAKE2B fd47f2e73d11e8f7c26f5684f4287ba51a8c65b0d6e0ff058bdd0290810ab9de671a2a61a089713e7560506f607d47692d882c7e49d8d3d154f9cf7940e5e153 SHA512 bacf0b00ebc7681022f6e85daa005ee19c99f3222e5db5c4ea6630c2c46111dd3ccd7efcfdbcfabf06cc18ceb58b054c1adb2d106d9b3b7d60a12f3b79c64a3c
-EBUILD ifuse-1.1.3.ebuild 904 BLAKE2B 9d491fc0aac6d50d38070ea9c2855eb4a286f7f4cd49fbe9b5aca33d28f2d1efa3ccd56e238535b58ded755593d994e4b59c360a05844710836465ef1fc8985a SHA512 fe230a0102002efbc9ce3a0821d8630c3719bd0071fdf32fffdea16f5f7f3fb4bda79e83faaf2c29a9a689a619043492eba4b7c417099077dc8234731a7c4dd0
+EBUILD ifuse-1.1.3-r1.ebuild 897 BLAKE2B 693743dfd75ebfd9eddb7033756350bec5c738eddf064e21eb54a1f39dc6fd8ceaf083c6c0c41491d71698cde7a84267fd8338684692d48a0077112c1048bc2a SHA512 350a834b2ff7840bfe727ac2b6ade49fe3127d2bf90ecafc50d1e37350bcc4f446e7d19bfaf80ad54357b1a87f2ef6f6ca015cb71381c53616930b364b9d6010
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/ifuse/ifuse-1.1.3.ebuild b/app-pda/ifuse/ifuse-1.1.3-r1.ebuild
index 9d0c2f66960c..9f08c8c83f43 100644
--- a/app-pda/ifuse/ifuse-1.1.3.ebuild
+++ b/app-pda/ifuse/ifuse-1.1.3-r1.ebuild
@@ -16,7 +16,7 @@ IUSE=""
 
 RDEPEND=">=app-pda/libimobiledevice-1.1.4:=
 	>=app-pda/libplist-1.8:=
-	>=sys-fs/fuse-2.7.0:="
+	sys-fs/fuse:0="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index 0b783a58b8a1..bc3a2c90fd4c 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -1,8 +1,11 @@
+AUX libimobiledevice-1.3.0-libressl.patch 862 BLAKE2B 48f05bd6fd4d460ee6d8f5174ce47dfd01b8cc2856b21893122be2d23676569de05712905d32e29783dc9b63b3fb047670e871fdb5c9b95cd2f33320d64ffbd1 SHA512 a583d0eb3be5a9b18abd3e3a810244345004bc0cd4c398b79311493b8da4f844691740c4d05f6377f122a74d928f8c723edf8ec14c932c5091ff765b5a4db108
 DIST libimobiledevice-1.2.0-git.patch 187304 BLAKE2B 7c184f823b831b913dbae16a58db1e4b7682fb42e573b1bab3983eb8150feb696795fd59c81ca7582fd56cd953e32489a8ddc502c4cb39a6ac88ff3d018ceace SHA512 cfc433a8eada9357ee5119ccfeb1e7444f10132637a43954174721905207b0e168f49a1728ee16ed6b0a9fd8b9617e8e35b04cf34f775abd1d12b8ecb7dbdbd2
 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
 DIST libimobiledevice-1.2.1_pre20200220.tar.bz2 193582 BLAKE2B 7fab2101ee96a5fcc5dc68bad1a6c9fef25d87f25660cbce9aef45f8830c0162179f07e3d8a0f1d7d60bb7a219b1c4ee2513d43f98e8e4ea0d891686600c370e SHA512 f9d04941685f1cb0e982d061a6ea92d88d1d90157a789460e09e6af72954ed7a7f0448efbef3fe3cbca380195ffa658f7d8119e812f8ba8003c1e8a242976865
+DIST libimobiledevice-1.3.0.tar.bz2 733949 BLAKE2B 40717280bb3424c7431aa93d06d10de817e6761acf2b19948d80b691cfb4dd4ef0e31b81c8458eed29a43c8c8aa256da7baa3648fb785cfbdb7316daaba119a3 SHA512 7b22040552a6561729c79c0846f571b0e608abb7c297567d2ecfdd1718ce86df08a5e34ba51f209bdee96a1917da15e7ba3aaef1d289a951d1d3470b1f89e6a8
 EBUILD libimobiledevice-1.2.0-r1.ebuild 3251 BLAKE2B 4250165b98dadb3c8c9c40205cfdc2751faa8a6865e58be8fb933b560d1001d9e4f41a81adea9099ed38cfc58f9a1fef61c1a61a1c84389f1436c713170acc30 SHA512 742efd5fdb8bcab38ac94af62e5a6c22f18128e43345d444cd96777a1fda4d46ca5bbb87b47a3fb3bcdb6011633e75ca876e372ce16969fe14394068b4f395d3
 EBUILD libimobiledevice-1.2.1_pre20200220.ebuild 2599 BLAKE2B 7378479cb0050d0c9ce2fbbe07b1aba1976e6c1d275753bf33d644230c49834865f721ad86aa84b86ce7247c8766363d2f03bd5aed1ecb5816d1d6431938bbde SHA512 ea49d0257645a50966102b5cd72950db1c84daf3a82327e3e2d2de3e9540a655999541dc628c59b4ebb7461dab593e2e3b3409a3120202453626d308006ba190
+EBUILD libimobiledevice-1.3.0-r1.ebuild 2553 BLAKE2B bc3a7541538cca50ded42582e606e6a39523a08e15b50756fd61ad5f00749671dff7ef5b113a2f812b91e8511d930857531abc90c3626cb3ecfc3ee2f32b9e7d SHA512 2e55d1a7ae682ea87cf1f6e38d839a921d31c5c5b585c4df4d33d0906717fcdcb02adf995cd8f720b76635814010e52f12698d096e3b2d9fa31fe061622c3420
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-libressl.patch b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-libressl.patch
new file mode 100644
index 000000000000..0957c9132cbf
--- /dev/null
+++ b/app-pda/libimobiledevice/files/libimobiledevice-1.3.0-libressl.patch
@@ -0,0 +1,25 @@
+From 170e1c445e8c930f4ee9dddfb9f1bcf24c089962 Mon Sep 17 00:00:00 2001
+From: Nikias Bassen <nikias@gmx.li>
+Date: Thu, 6 Aug 2020 20:43:08 +0200
+Subject: [PATCH] idevice: Fix build with LibreSSL
+
+Upstream-Status: Accepted
+[https://github.com/libimobiledevice/libimobiledevice/commit/170e1c445e8c930f4ee9dddfb9f1bcf24c089962]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/idevice.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/idevice.c b/src/idevice.c
+index fea1e03f..47c9ab4d 100644
+--- a/src/idevice.c
++++ b/src/idevice.c
+@@ -1015,7 +1015,7 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connection_enable_ssl(idevice_conne
+ 		return ret;
+ 	}
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 	SSL_CTX_set_security_level(ssl_ctx, 0);
+ #endif
+ 
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..8ff61a7c4d2e
--- /dev/null
+++ b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{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://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 ~ppc ~ppc64 ~x86"
+IUSE="doc gnutls libressl python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=app-pda/libplist-2.2.0:=
+	>=app-pda/libusbmuxd-2.0.2:=
+	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}] )
+"
+
+BUILD_DIR="${S}_build"
+
+PATCHES=( "${FILESDIR}"/${P}-libressl.patch )
+
+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/libplist/Manifest b/app-pda/libplist/Manifest
index 84bd77f0ac20..b04546d6b87a 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -1,3 +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
 DIST libplist-2.1.0.tar.bz2 120602 BLAKE2B 8abfe3c295c4ebd242f2c4d49c80d1f214097df84f1d2fcf2696519bbbca4e8a5ce13c04690ac64fd981f84d585df25fc65c268a4e4f4092319053583e67736c SHA512 23156e882835bb0b894a05b57018b5e76f9f8f8f4b1d3fdad7b1970d2ef695033c98de74a1fa81bdf0829742a058fd65075cebc1512313d2be42e2f5367274be
+DIST libplist-2.2.0.tar.bz2 126808 BLAKE2B 7c3ec04aaa52eca33ae28851a6524c9ea531df939feef0f10827c8c2de78a6ccd856ea4d8a568b146ccb5de96f70dd5accec34aa2fdd61f9e6eba01256c0b518 SHA512 641bfd3ec0565f104d3a2d1ebdf6137bc9252b67ce90550e24ab0deeee4e820e119ba4f8f1ba04a0358d995d196fa61e35f2f0ee8ba37fc0270752ae842ab1f5
 EBUILD libplist-2.1.0.ebuild 2145 BLAKE2B 666212cfa479b9855390170df691006230daeebad437fa6599427fea3f7b6f25db4079cbd47d87453ad23eacfa8103f45e834d8c472db3b4cc6ce4a37c0fa9ed SHA512 f73c7808e738a970fd5edd8ef657558dcf97ac73cda3b2470ba3856edb0aa831e9338d349ce35330caa1c56a3713fd1d3d5046c965ecc8715f837479596a5a47
+EBUILD libplist-2.2.0-r1.ebuild 2150 BLAKE2B f4019c675f045e06bf35f4badf4738708b3afaf229087b7f0c3d8ef62a4051c7d9d6d40a44eb2a3b828c3fdabab40920af75890f08e6385a01ef561d6ecc3ef7 SHA512 8776a7558f87372514d6bdf21bbc4ef73f0c9dbac29c1bbd2b9b54f2fa66e9b40b91d309dc2cb8209c794696b2ea70972327abee5978dbf78848e54f55704c93
+EBUILD libplist-2.2.0-r2.ebuild 2715 BLAKE2B 4b4fb6aeaab88462ace8ed04e3b8b49b5934a1173d8c4c0e889bd3bec5c2ed5cf18c14d4789360ca63b1fc99a157ec0c227f4c820547b08eb75737695969b6fc SHA512 2ad8f9f92458cfe1be5d9927a5753bddb511e6da84c1ad3f6b717ac6837e957e09902c51b56f1e0f5a192f6266ec5da65010f720e41abf8d8c79c2adbc372ad0
 MISC metadata.xml 329 BLAKE2B accbb4a0f223b37358e54635e61f1488abf2148d89e166e4a68e8ddfc90e0d4c3438c52d75c24aeced91c2246e537cb0b1d64e6e9c63425c6392148cbc3bcd58 SHA512 69d57118df488610f977fe8722d463bb858e8329855cf439ae3c1c7c52260dec96505535e9424041d71d000951db199312e382d24f66296c9c408113ead5219d
diff --git a/app-pda/libplist/files/libplist-2.2.0-fmin.patch b/app-pda/libplist/files/libplist-2.2.0-fmin.patch
new file mode 100644
index 000000000000..7b9bdc353268
--- /dev/null
+++ b/app-pda/libplist/files/libplist-2.2.0-fmin.patch
@@ -0,0 +1,34 @@
+--- 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-pkgconfig-lib.patch b/app-pda/libplist/files/libplist-2.2.0-pkgconfig-lib.patch
new file mode 100644
index 000000000000..2a57d06074a3
--- /dev/null
+++ b/app-pda/libplist/files/libplist-2.2.0-pkgconfig-lib.patch
@@ -0,0 +1,9 @@
+--- a/src/libplist-2.0.pc.in
++++ b/src/libplist-2.0.pc.in
+@@ -6,5 +6,5 @@
+ Name: @PACKAGE_NAME@
+ Description: A library to handle Apple Property Lists whereas they are binary or XML
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lplist-2.0
++Libs: -L${libdir} -lplist-2.0 -lplist
+ Cflags: -I${includedir}
diff --git a/app-pda/libplist/libplist-2.2.0-r1.ebuild b/app-pda/libplist/libplist-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..c5c2f5167b89
--- /dev/null
+++ b/app-pda/libplist/libplist-2.2.0-r1.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_{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/2.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/libplist/libplist-2.2.0-r2.ebuild b/app-pda/libplist/libplist-2.2.0-r2.ebuild
new file mode 100644
index 000000000000..31d8621f1cee
--- /dev/null
+++ b/app-pda/libplist/libplist-2.2.0-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{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/2.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 )
+
+PATCHES=(
+	"${FILESDIR}"/libplist-2.2.0-fmin.patch
+	"${FILESDIR}"/libplist-2.2.0-pkgconfig-lib.patch
+)
+
+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() {
+	#
+	ln -s "${native_builddir}/src/libplist-2.0.la" "${native_builddir}/src/libplist.la"
+	python_compile() {
+		emake -C "${BUILD_DIR}"/cython \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			plist_la_LIBADD="${native_builddir}/src/libplist-2.0.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
+
+	# temporary fix for 2.2.0 release: 
+	# b.g.o 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/libusbmuxd/Manifest b/app-pda/libusbmuxd/Manifest
index 4f6e6c83ef48..3525e39ec29d 100644
--- a/app-pda/libusbmuxd/Manifest
+++ b/app-pda/libusbmuxd/Manifest
@@ -1,5 +1,7 @@
 DIST libusbmuxd-1.0.10.tar.bz2 292649 BLAKE2B 7ec9a576cb20f7e87cf1f31e57e66100c496e5809142d225df9b3cc295a71546bed2d90f41df3144f7316ce0aec5f08fad850c528e27f336bf96e9578bcffd04 SHA512 180cde2e9d0860d07d29813e68abf8ca807f75e98424b50acfc1ce941ba4260922959e1047a7d2bc754470c08ed55d0a15c9367487bd41c635a52b4fbf8ff535
 DIST libusbmuxd-2.0.1.tar.bz2 37373 BLAKE2B 3d7d8b4ccc5331f1f3868e67ac9726281dccb8eabc58cf78d4b8a921c403095adb18cd8ec4f156c06297abb8566daae04300709fd1afd35c57dbda155db03c0d SHA512 c2a977898ccd28d32f7754bac08829b57bc87ad958febded2c95087a06cb0b5a73daf087b3a00630701a7313fd3900f916846b77b4794321c90e6aa9f9246ed3
+DIST libusbmuxd-2.0.2.tar.bz2 43162 BLAKE2B e3559583e691a5f87a61ffece0ebf944d4aed48d37f83a504ee4d7a245e05511c6620c4a82d29bea2a10686910a14f7a730afec0f2cfc9435f748499e35df433 SHA512 3086ce1a05026afeabcdb5364ec30f4a6a5c84fe6f09e15ef6ff438bd3dfdb262ebdff94e5e0d0828b6d946bc8bdf01760271ba0d1fbf98d743dce149764a519
 EBUILD libusbmuxd-1.0.10-r1.ebuild 937 BLAKE2B a5c8eb29f27bc1a75a13c81e916eee108803a6a0827ba57edb76e2d06c89655852d021ef164efcd11e95c59ff95210b52bd417cb33404fff243d0b916553f44c SHA512 66a0254d202427c87f8188076a2602b200da3ba7e31b19e88c573269126ca075574e8d8b02da451c3f6bb348a74341365736b738271d8ab49d7d6060f8b9fc8b
 EBUILD libusbmuxd-2.0.1.ebuild 859 BLAKE2B fa38081bd37fe5f5f5d674623dd549e5456db0cd5586e29d2e1422e4b0e7d1507e6ea8cb6f87147204a44d6dcc097c0f536fa6304e01f05a64fbc67746ff24db SHA512 1ababb683971d59ddddc67fa34e3adf37af52a8ba805337e74f262175c7451307517a774911fb7f7a6cc4bfcb6d8008ba659e4ac209a23a64a0d6df4ee664746
+EBUILD libusbmuxd-2.0.2-r1.ebuild 842 BLAKE2B 3a113abda2ce14644a5790be3e00a2e9b59adc35d40d2025b5b189bbb57c7dc7ab569b9cfb2bbb15c2801faa4c5fd4fbe25d93b47ab57bf85657968ad58be88e SHA512 b5ad699909491ffdffe14b296a820c54159a509428fd6720e1b044512fd2c7561d0f30c628fe416363b3028dcfb0ee10788561d7311bee79449accfdc2d0fe30
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild b/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..7692c22ec8a0
--- /dev/null
+++ b/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild
@@ -0,0 +1,38 @@
+# 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/2.0-6" # based on SONAME of libusbmuxd-2.0.so
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+	>=app-pda/libplist-2.2.0:=
+"
+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 83f5ca63d49f..b427e1cfac93 100644
--- a/app-pda/pilot-link/Manifest
+++ b/app-pda/pilot-link/Manifest
@@ -1,4 +1,6 @@
+AUX pilot-link-0.12.5-Werror-args.patch 851 BLAKE2B 4f011a10975b9ba1a2fe29e282ae88fc964df50dd6c2f982545a30f785ef6e3170fdd19efb174e8fb47777bb56debac7aae911c89ea9afc8317529f4c015a72f SHA512 8caf0fc9c95f2332d60753269de919f9775be0a471e13f8c27f7ecd47346850696ab9a79b7e1b82ab8235367c35eecfbe3cc8bb7b04da5fea8d41e7786b2b7c7
 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 3074 BLAKE2B 262f8a5972dde1f3f8e3835926aad69553b8b63dd6a2a1cb352e1ac650df228044a4823e6ea0558d5527c5199c8aba2cd8e9977a04ad66001c7bc60b04fb1d12 SHA512 c408dcd0478bd70f7e5dc32f51c08699e00bf3069288ec8c70de9cef01105fbd2adc56d1e4bee75b25f41483bcf4d933db87a14b5cfed5c2dbc0c69bb57a8533
+EBUILD pilot-link-0.12.5-r3.ebuild 2994 BLAKE2B df8c33e816eeac059be78d2fecb0ef6aa87880712886fc191e7029058ba37f7e250a92d35e22637558bbfa868dc2b1400246e05cdd34b70ea037e2d95e30a348 SHA512 4820827674f08866552569016016bc67d0bd1adbf111842e54a140edab357bda323ecf0f44048abea0ebf01cb552f59ffa81b5819badd8b0c689c43d0f91946d
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/pilot-link/files/pilot-link-0.12.5-Werror-args.patch b/app-pda/pilot-link/files/pilot-link-0.12.5-Werror-args.patch
new file mode 100644
index 000000000000..5e6b939d0100
--- /dev/null
+++ b/app-pda/pilot-link/files/pilot-link-0.12.5-Werror-args.patch
@@ -0,0 +1,18 @@
+-Werror can have args now, but didn't when this code was originally written.
+
+Closes: https://bugs.gentoo.org/show_bug.cgi?id=714828
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+--- pilot-link-0.12.5.orig/configure.ac	2020-08-02 21:58:12.481559328 -0700
++++ pilot-link-0.12.5/configure.ac	2020-08-02 22:02:49.641291824 -0700
+@@ -63,8 +63,8 @@
+ dnl Eat -Werror so configure will run properly, if the user provided it
+ enable_werror=no
+ save_CFLAGS="$CFLAGS"
+-CFLAGS=`echo $save_CFLAGS | sed -e s/-Werror//g`
+-CXXFLAGS=`echo $save_CXXFLAGS | sed -e s/-Werror//g`
++CFLAGS=`echo $save_CFLAGS | sed -r -e 's/-Werror(=[^[:space:]]+)?//g'`
++CXXFLAGS=`echo $save_CXXFLAGS | sed -r -e 's/-Werror(=[^[:space:]]+)?//g'`
+ if test "x$CFLAGS" != "x$save_CFLAGS"; then
+ 	dnl -Werror was set; treat it as implicit --enable-werror below
+ 	enable_werror="yes"
diff --git a/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild
new file mode 100644
index 000000000000..f28d43f7d288
--- /dev/null
+++ b/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools perl-module
+
+DESCRIPTION="Suite of tools for moving data between a Palm device and a desktop"
+# this is a new mirror; the distfile has the same content inside the tarball,
+# but the tarball itself doesn't match due to recompression and Git
+# indirection.
+HOMEPAGE="https://github.com/jichu4n/pilot-link"
+SRC_URI="mirror://gentoo/${P}.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
+
+LICENSE="|| ( GPL-2 LGPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="bluetooth debug perl png static-libs threads usb"
+
+COMMON_DEPEND="
+	dev-libs/popt
+	>=sys-libs/ncurses-5.7-r7:0=
+	>=sys-libs/readline-6:0=
+	virtual/libiconv
+	bluetooth? ( net-wireless/bluez )
+	perl? ( >=dev-lang/perl-5.12 )
+	png? ( media-libs/libpng:0= )
+	usb? ( virtual/libusb:0 )
+"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+RESTRICT="test" #672872
+
+src_prepare() {
+	default
+
+	eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-java-install.patch
+	eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-respect-javacflags.patch
+	eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-werror_194921.patch
+	eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.2-threads.patch
+	eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-libpng14.patch
+	eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-png.patch
+	eapply -p0 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-distutils.patch
+	eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.3-libusb-compat-usb_open.patch
+	eapply -p1 "${WORKDIR}/${P}-gentoo-patchset"/${PN}-0.12.5-perl514.patch
+	eapply -p1 "${FILESDIR}"/${PN}-0.12.5-Werror-args.patch
+
+	sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467600
+
+	AT_M4DIR="m4" eautoreconf
+
+}
+
+src_configure() {
+	# tcl/tk support is disabled as per upstream request.
+	# readline is not really optional, bug #626504
+	# Does not build with Java 8
+	# Does not build with Python 3, bug 735238
+	econf \
+		--includedir="${EPREFIX}"/usr/include/libpisock \
+		$(use_enable static-libs static) \
+		--enable-conduits \
+		--with-readline \
+		$(use_enable threads) \
+		$(use_enable usb libusb) \
+		$(use_enable debug) \
+		$(use_with png libpng) \
+		$(use_with bluetooth bluez) \
+		$(use_with perl) \
+		--without-java \
+		--without-tcl \
+		--without-python
+}
+
+src_compile() {
+	emake
+
+	if use perl; then
+		cd "${S}"/bindings/Perl
+		perl-module_src_configure
+		local mymake=( OTHERLDFLAGS="${LDFLAGS} -L../../libpisock/.libs -lpisock" ) #308629
+		perl-module_src_compile
+	fi
+
+	# Python 2.0 only; not enabled anymore
+	# bug 735238
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc ChangeLog NEWS README doc/{README*,TODO}
+
+	if use perl; then
+		cd "${S}"/bindings/Perl
+		perl-module_src_install
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_preinst() {
+	perl_set_version
+}
diff --git a/app-pda/usbmuxd/Manifest b/app-pda/usbmuxd/Manifest
index edd4cdf7ea6d..8cbc1a31b018 100644
--- a/app-pda/usbmuxd/Manifest
+++ b/app-pda/usbmuxd/Manifest
@@ -1,5 +1,7 @@
 DIST usbmuxd-1.1.0.tar.bz2 321897 BLAKE2B 3ca5d1da222e457ac01f3e87fb7573c6405e51fd5d270a2b3dab7601118f21be22232d5100b4d027273fc837e6a57f7a7d17d2c41ae59d7c5aa41f76bef5a03d SHA512 66aa0c40e912bf596b819098b87d88e9cf30b2e6352e607eeb778bd4f23bf9bb123fb6a6ecca2d4e4be3171e35d66200d632d2c9c80b1f2462bb45be8aa6912d
+DIST usbmuxd-1.1.1.tar.bz2 345290 BLAKE2B 580dd4e2fb05d6c4803d774f7d43c8399219d8f0ce4191428cb4fccffcc941894d0381d5f0746997570dd24e395af3dda340b1910827f9c5ace7e2d9cc176c6a SHA512 0e8829c93aac147a6b949fe95592d6ad9ea36e1c04676cb85accb4670a65b31065706fc438556def17b55850081d6c07deb325ca02b9853335b6e0b1049ba1da
 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.ebuild 894 BLAKE2B a5b8146af410fa067ec7bf4e285c1dd89c4a774d3c0dc925ca889fef9cb8ac08065be760566f704bf49c1be92caeb31eb548f50f55fc91704f9fe4a18ecb6cbc SHA512 41756f1a50f53ff306ed91834e22823d3604d70d3ac3035e64613456553dcc53f566b28fb6a48dab51c4d6a7b24e541f543cc44b1754b72b03c48f6e91d6de66
 EBUILD usbmuxd-1.1.1_pre20200121.ebuild 999 BLAKE2B 2ee05606bfec58b686d5c9391b0374e2a525614bb94ba239b04517032da709c58f3eb51b5fd906db68d059c56f6604d8a91fed43aeda88984ff5d754ca2c7848 SHA512 d7149fa395b79a097eaeb8db5cd68cdbbb42a792b6be2e1ec513232aee7be2eac1ac426b9db10eaed66b6a7360c27c04f52e8d370474eb3279d8cc7c95f9c18f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/usbmuxd/usbmuxd-1.1.1.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.1.ebuild
new file mode 100644
index 000000000000..bd3f64d7f7e2
--- /dev/null
+++ b/app-pda/usbmuxd/usbmuxd-1.1.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd udev
+
+DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
+HOMEPAGE="https://www.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 ~ppc ~ppc64 ~x86"
+IUSE="systemd"
+
+DEPEND="
+	acct-user/usbmux
+	>=app-pda/libimobiledevice-1.0:=
+	>=app-pda/libplist-2.0:=
+	virtual/libusb:1"
+
+RDEPEND="
+	${DEPEND}
+	virtual/udev
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with systemd) \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		--with-udevrulesdir="$(get_udevdir)"/rules.d
+}