gentoo christmass resync : 25.12.2020

17 files changed, 10 insertions, 526 deletions

diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index 64404a069812..89fb25c67c4a 100644
--- a/app-pda/Manifest.gz
+++ b/app-pda/Manifest.gz
diff --git a/app-pda/ifuse/Manifest b/app-pda/ifuse/Manifest
index 7c631f34ca51..3abbcd536969 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-r1.ebuild 897 BLAKE2B 693743dfd75ebfd9eddb7033756350bec5c738eddf064e21eb54a1f39dc6fd8ceaf083c6c0c41491d71698cde7a84267fd8338684692d48a0077112c1048bc2a SHA512 350a834b2ff7840bfe727ac2b6ade49fe3127d2bf90ecafc50d1e37350bcc4f446e7d19bfaf80ad54357b1a87f2ef6f6ca015cb71381c53616930b364b9d6010
+EBUILD ifuse-1.1.3-r1.ebuild 894 BLAKE2B a6633a4d83b6f856940252ff65352d134f68a8f44c6b2a3d4d22b77e74261a9fbae9c9532f68d52310952fde2d7032add3b9004a06d3ce2cc16116a47c0a9285 SHA512 e41469aeaae2509e224c28e47d81a6810398561454834eb9c94c88114d72a9459d5af0c2d5463f80d852fd8504d8f33fed8f20352321b3654d2fbf6ca5e686a8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/ifuse/ifuse-1.1.3-r1.ebuild b/app-pda/ifuse/ifuse-1.1.3-r1.ebuild
index 9f08c8c83f43..39a2c3689e14 100644
--- a/app-pda/ifuse/ifuse-1.1.3-r1.ebuild
+++ b/app-pda/ifuse/ifuse-1.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index 8dff3c074245..39bb9f8b722e 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -1,11 +1,4 @@
 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 2551 BLAKE2B 45bcb4df69d85f6c378066011251d68b9e4122323ae8b321aa34872fee1e8bcf384d68436c47e0e68bc6b12db1d390681a084402a8074b1a4fe2cb8b43ece890 SHA512 c0c632e7ac24c800d6eb405a4d25583dab02cbc37f57eb79c5cd3648e38c5cdc153d4938564458b0a39ae2e68d87b5c6168cd9be3fa4cf0fb9b9dbff8336b869
+EBUILD libimobiledevice-1.3.0-r1.ebuild 2550 BLAKE2B 4c2bac64acd54e21ddcb03f38a53f7a31396d8fb110cb369ad7f61585d9f09301271d6b10e741122a97891b02182ddb99fa734ac13a6ead8b81c1cd50085be63 SHA512 d74b7c3c83bd0a3438095a0b44e07cd40557218d4bb4e95838de52b58a28d6f40e7ed540e4960af4da72ad39e16dee8db04a4e5023a72f5d75bbea8ce913dc32
 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
deleted file mode 100644
index 6b1c60b021b4..000000000000
--- a/app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit autotools python-r1
-
-DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
-HOMEPAGE="http://www.libimobiledevice.org/"
-
-# Get patches from Fedora
-SRC_URI="http://www.libimobiledevice.org/downloads/${P}.tar.bz2
-	https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0001-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch -> ${P}-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch
-	https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/0002-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch -> ${P}-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch
-	https://src.fedoraproject.org/rpms/libimobiledevice/raw/master/f/344409e1d1ad917d377b256214c5411dda82e6b0...5a85432719fb3d18027d528f87d2a44b76fd3e12.patch -> ${P}-git.patch"
-
-# 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="gnutls libressl python static-libs"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	>=app-pda/libplist-1.11:=
-	>=app-pda/libusbmuxd-1.0.9:=
-	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}
-	virtual/pkgconfig
-	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
-"
-
-BUILD_DIR="${S}_build"
-
-PATCHES=(
-	"${DISTDIR}"/${P}-git.patch
-	"${DISTDIR}"/${P}-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch
-	"${DISTDIR}"/${P}-userpref-GnuTLS-Use-valid-serial-for-3.6.0.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 -j1 \
-			VPATH="${S}/cython:${native_builddir}/cython" \
-			imobiledevice_la_LIBADD="${native_builddir}/src/libimobiledevice.la"
-	}
-
-	local native_builddir=${BUILD_DIR}
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake -j1
-	use python && python_foreach_impl python_compile
-	popd >/dev/null || die
-}
-
-src_install() {
-	python_install() {
-		emake -C "${BUILD_DIR}/cython" -j1 \
-			VPATH="${S}/cython:${native_builddir}/cython" \
-			DESTDIR="${D}" install
-	}
-
-	local native_builddir=${BUILD_DIR}
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake -j1 DESTDIR="${D}" install
-	use python && python_foreach_impl python_install
-	popd >/dev/null || die
-
-	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/libimobiledevice/libimobiledevice-1.2.1_pre20200220.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.2.1_pre20200220.ebuild
deleted file mode 100644
index 04ee38620ee7..000000000000
--- a/app-pda/libimobiledevice/libimobiledevice-1.2.1_pre20200220.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
index 9a8f598ddc00..7caaf0293e9a 100644
--- a/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
+++ b/app-pda/libimobiledevice/libimobiledevice-1.3.0-r1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="doc gnutls libressl python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index 93f597c98b54..c34923bdf1e2 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -1,8 +1,5 @@
 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 2713 BLAKE2B 93992011922de0a85274e93fe606eabd9e305340d8b2fadef724ff1f50a7290d6f5ccabb58ed19a676e1fb45c56d90740539bf7a83917bfb19953c222ab60787 SHA512 c940311a1af04035b8866954c7491157249b06d2180c4b36ce540a081d2c4012c201bc881c823cad4ac26eee89831355c649939121a2a496c234c19aee81c4eb
+EBUILD libplist-2.2.0-r2.ebuild 2712 BLAKE2B 8c06df42da66a930ff993ba8473dba9bd8e223ac0baddcd5f858e2eb17cefff84701804d5e8e5b796a46aaf5e258fab8b75da0d3a5e5b79276d535a1d2b7cbc8 SHA512 dca25126a8909615d21f16138c830fb6d9df94ce7cfde3b9e5fc0cfc2b6b59d3b51e7fc7d70f5892a0bf0a77b5a2c43bb18fbd41374d4588cbd34c35c6862e13
 MISC metadata.xml 329 BLAKE2B accbb4a0f223b37358e54635e61f1488abf2148d89e166e4a68e8ddfc90e0d4c3438c52d75c24aeced91c2246e537cb0b1d64e6e9c63425c6392148cbc3bcd58 SHA512 69d57118df488610f977fe8722d463bb858e8329855cf439ae3c1c7c52260dec96505535e9424041d71d000951db199312e382d24f66296c9c408113ead5219d
diff --git a/app-pda/libplist/libplist-2.1.0.ebuild b/app-pda/libplist/libplist-2.1.0.ebuild
deleted file mode 100644
index d4dfa2e6a791..000000000000
--- a/app-pda/libplist/libplist-2.1.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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/libplist/libplist-2.2.0-r1.ebuild b/app-pda/libplist/libplist-2.2.0-r1.ebuild
deleted file mode 100644
index c5c2f5167b89..000000000000
--- a/app-pda/libplist/libplist-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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
index 3956dce388f5..059c8ae313f3 100644
--- a/app-pda/libplist/libplist-2.2.0-r2.ebuild
+++ b/app-pda/libplist/libplist-2.2.0-r2.ebuild
@@ -12,7 +12,7 @@ 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"
+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 95a2ea74c000..80f293f6b344 100644
--- a/app-pda/libusbmuxd/Manifest
+++ b/app-pda/libusbmuxd/Manifest
@@ -1,7 +1,3 @@
-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 840 BLAKE2B 5c8d95a21c51cc71b8a7029846f6aff86c4095439b5f0cb97f1eefed60361614a32e07e6100f3793b3695c3562b1ce571185f262de364ca6da83a3a64b2c4988 SHA512 0e345cc5353516f54b62e55bc8b924f51f89cab7b01991635f47874abdb290606fef58ee078293bbcdd56c16513d07c5cdcaea65130c760ad47f94458a7fc795
+EBUILD libusbmuxd-2.0.2-r1.ebuild 839 BLAKE2B c4d4bcea555332a7eb5c75204e7c30c22b6144fa8fa078fd2d7cd6789dde8e3cb595c56330aad82a241ecc606f2867a5dcddcd7174d85f334c73ab10fea13b9c SHA512 2c14a6036ca23f45ce2734e9938b5ff2623bf04bf75b1876560f1117a9a6fbf0af07f194b8f08b1723e566235839a2a4105b8841ca174aa01a68b24d5d5b36bc
 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
deleted file mode 100644
index 484a681d6a9f..000000000000
--- a/app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/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:=
-	virtual/libusb:1
-	!<app-pda/usbmuxd-1.0.8_p1
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/os-headers
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myeconfargs=( $(use_enable static-libs static) )
-	use kernel_linux || myeconfargs+=( --without-inotify )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	if ! use static-libs; then
-		find "${D}" -name '*.la' -type f -delete || die
-	fi
-}
diff --git a/app-pda/libusbmuxd/libusbmuxd-2.0.1.ebuild b/app-pda/libusbmuxd/libusbmuxd-2.0.1.ebuild
deleted file mode 100644
index 5464424c6842..000000000000
--- a/app-pda/libusbmuxd/libusbmuxd-2.0.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild b/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild
index e06910e1402d..66992dce2f80 100644
--- a/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild
+++ b/app-pda/libusbmuxd/libusbmuxd-2.0.2-r1.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-pda/usbmuxd/Manifest b/app-pda/usbmuxd/Manifest
index b3c683c54906..3f9feee41e0d 100644
--- a/app-pda/usbmuxd/Manifest
+++ b/app-pda/usbmuxd/Manifest
@@ -1,5 +1,5 @@
 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.1.ebuild 893 BLAKE2B a9627bf8375b8017df7f70a99afb2d2cec8a5c1c5c2c64a46b78e5baa1559f27ce2cde88f5c873cb1d1ebcb59cb09b73f568cbfe5d38ff5872498e1b18283bfa SHA512 e29661b9abf03b94099246c841023e46fd349832ac5a0f58fd06c9322cf66201f76ce07232ffcdf2436b53e2b02f49f05abdf16a31bf85043028302dc9f1a725
+EBUILD usbmuxd-1.1.1.ebuild 892 BLAKE2B 97674b0eead116f41b38997b09da6786ad04f70287ceeee24d9b3c4330f44c8cd522da56b5647194fba7077de952184b501dfcbab3873f20a1f15a9761362c15 SHA512 a18e3c77ecc6a580984160b8c668cfc1d876c6a6cfdbb5bc32bfb705858eb3405327a420eecaddc878776b8b0118b4403c8e1419a66644e485553ab1844ddaef
 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
index b5000fe98b41..cde7b567939d 100644
--- a/app-pda/usbmuxd/usbmuxd-1.1.1.ebuild
+++ b/app-pda/usbmuxd/usbmuxd-1.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libimobiledevice/usbmuxd/releases/download/${PV}/${P
 # 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="systemd"
 
 DEPEND="