Updating liguros repo21.1.2

15 files changed, 11 insertions, 521 deletions

diff --git a/app-pda/ifuse/ifuse-1.1.3-r1.ebuild b/app-pda/ifuse/ifuse-1.1.3-r1.ebuild
index 4042a604771c..8fbc35f619f1 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 1d40da80c875..1a1995a017ee 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -1,6 +1 @@
-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
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 2f9b9412b55e..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,7,8,9,10} )
-
-inherit autotools python-r1
-
-DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
-HOMEPAGE="https://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 b18d85b610e6..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,9,10} )
-
-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 79f3a7f73c13..a1159e1d070b 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 f7eb711f962c..7a8c3d90462f 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -1,2 +1 @@
-DIST libplist-2.1.0.tar.bz2 120602 BLAKE2B 8abfe3c295c4ebd242f2c4d49c80d1f214097df84f1d2fcf2696519bbbca4e8a5ce13c04690ac64fd981f84d585df25fc65c268a4e4f4092319053583e67736c SHA512 23156e882835bb0b894a05b57018b5e76f9f8f8f4b1d3fdad7b1970d2ef695033c98de74a1fa81bdf0829742a058fd65075cebc1512313d2be42e2f5367274be
 DIST libplist-2.2.0.tar.bz2 126808 BLAKE2B 7c3ec04aaa52eca33ae28851a6524c9ea531df939feef0f10827c8c2de78a6ccd856ea4d8a568b146ccb5de96f70dd5accec34aa2fdd61f9e6eba01256c0b518 SHA512 641bfd3ec0565f104d3a2d1ebdf6137bc9252b67ce90550e24ab0deeee4e820e119ba4f8f1ba04a0358d995d196fa61e35f2f0ee8ba37fc0270752ae842ab1f5
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 119ae426c6b4..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,9,10} )
-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 40b884df20b8..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_{6,7,8,9,10} )
-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 5910cfe23e39..c1de0bf011b9 100644
--- a/app-pda/libplist/libplist-2.2.0-r2.ebuild
+++ b/app-pda/libplist/libplist-2.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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} )"
@@ -39,7 +39,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local ECONF_SOURCE=${S}
+	local ECONF_SOURCE="${S}"
 	local myeconfargs=( $(use_enable static-libs static) )
 
 	do_configure() {
@@ -101,10 +101,10 @@ src_install() {
 		doins cython/plist.pxd
 	fi
 
-	find "${D}" -name '*.la' -delete || die
+	find "${ED}" -name '*.la' -delete || die
 
-	# temporary fix for 2.2.0 release: 
-	# b.g.o 733082, 
+	# temporary fix for 2.2.0 release:
+	# bug #733082,
 	# https://github.com/libimobiledevice/libplist/issues/163
 	# upstream commit 137716df3f197a7184c1fba88fcb30480dafd6e0
 	dosym ./libplist-2.0.pc /usr/$(get_libdir)/pkgconfig/libplist.pc
diff --git a/app-pda/libusbmuxd/Manifest b/app-pda/libusbmuxd/Manifest
index 972b301fc5f4..a4f0c952f6dd 100644
--- a/app-pda/libusbmuxd/Manifest
+++ b/app-pda/libusbmuxd/Manifest
@@ -1,3 +1 @@
-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
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 840fc971c767..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="https://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 7692c22ec8a0..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/pilot-link/pilot-link-0.12.5-r3.ebuild b/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild
index 9bd001479e31..61b734b732d0 100644
--- a/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild
+++ b/app-pda/pilot-link/pilot-link-0.12.5-r3.ebuild
@@ -15,7 +15,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 perl png static-libs threads usb"
 
 COMMON_DEPEND="
diff --git a/app-pda/usbmuxd/usbmuxd-1.1.1.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.1.ebuild
index bd3f64d7f7e2..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="