gentoo resync : 31.05.2021

26 files changed, 72 insertions, 358 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 9b878a1761af..096e4d1da7d3 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/deb2targz/Manifest b/app-arch/deb2targz/Manifest
index 3a9d1231d574..e7b0a685d2e4 100644
--- a/app-arch/deb2targz/Manifest
+++ b/app-arch/deb2targz/Manifest
@@ -1,4 +1,4 @@
 AUX deb2targz-any-data.patch 602 BLAKE2B ee85b284a594cc937e73ea66c24960fdbecf547742c1db010d90e10af72aa667c267fb13f858ca221d80c16af26c09fcaa9812567f0f5b7e9b015d5a44d3cb66 SHA512 0dfc301d17b171e52867e0837701596b60c697cc7a0520f0c003be8146d1d1470305186d443c1f7a4757938b06b2261cfb66f84f5a5776998681b9300bc20903
 DIST deb2targz 1947 BLAKE2B bfbe08a5671bda8da3a5d897f58aca863988a9ec7b7cf23ee81fb45e2bf85bd8b0909457bdc2cb545d42ccb5f56fda5559bd40547231c1c52441bf0b3560173b SHA512 9b6a533fbe232721304f3bc1d9ea952f78fb108ace3bd0a0eab206be8462bc547ff49ab9310f209079b9ed6f86413c8f0819a117b95c67b6082e37d416716b1c
 EBUILD deb2targz-1-r3.ebuild 602 BLAKE2B f71fde654e68f8a71065967f0d04ae85bf963babec1c8bb03b40cf0d34fffc8701e23cb68ac773388e9c19edd9e93a062c226235b75d9c285dfc92dc188d4520 SHA512 a6355be25f5b731e56520f0bb1af4f1364a71e616b80e6cb5eb37b6bfde6dc74cede917a5afc1de50ada98053264a506bc0c3107fbdfc4325f77cf867999c03b
-MISC metadata.xml 213 BLAKE2B a6b42a8b7c6f0c5a0b853af172e748301d2f4b9f2aa0424e217029affb54c88b1061dd970241a942e59a2a5ec66521ab9b67818181c03bd1dd019965e39eab3d SHA512 bddb1ae151571d0cd8833b083fd24fb4f1372e8fef6e726833ac8837abff03fb86ef85c7d954837ac82ecb906f1be4418d32d1011a2bc4be7711f2ab69a43380
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/deb2targz/metadata.xml b/app-arch/deb2targz/metadata.xml
index c10b09fa8f36..6f49eba8f496 100644
--- a/app-arch/deb2targz/metadata.xml
+++ b/app-arch/deb2targz/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person"><email>chainsaw@gentoo.org</email></maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index c09f63a05951..2b6ada78bb7e 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -10,9 +10,9 @@ DIST dpkg_1.20.2.tar.xz 4710300 BLAKE2B 0d10ee7f5cc863a6496fd8340cf0457f9af3d7d7
 DIST dpkg_1.20.3.tar.xz 4712980 BLAKE2B 92a1ff07dbb01f8942452eee269eb45d4c164272bf3ae5d0a62a6086c4321e7fc3dd5b164089d7f2e476258f8ec8c480c1614d4f43e3a7a7f1e632bf13191d2e SHA512 5893ae34efc6f9d54e47fc403487c79233501666968681b827bbabbf39b1401cb7064f8fe8797708ed32bb37345dbb78a1daac04c6dc7064f2811265f3a4e82c
 DIST dpkg_1.20.5.tar.xz 4715684 BLAKE2B 32b88cbd1ae75685b6c0b04b7c829372df323a9508ddd088076097e8bf2ac9050f1f4ec591fb7d40c4d4ea34207cef0edd430d0326cb73e1f7c8dd560db916be SHA512 6b3789c25c81022181b87a28ca9baa4a463a68940a871568c699a2a30e3b4ce705835ed6a171ac8c5902e377200b31cc0be1e03cbd7d35c4eaf92c7300d9227f
 DIST dpkg_1.20.7.1.tar.xz 4952736 BLAKE2B 0439cd9440c34597ff5c5e04bd8e1b79d34cd7675a216cbe1e7dc4d68460847143a8a7dff14b1845374d8e504d6fba63842b1d1ac37aa01f7b2a96b78ef0278d SHA512 beec7a7ba1cfbd6954b3d583e57c811af3bfa5e4e4554e6af6673d4a4be0e79fb4aded2f6aeeda592c2ba3d91facb82138f2eb8eb2338dc4fae1832911df2fd6
-EBUILD dpkg-1.19.0.5.ebuild 1812 BLAKE2B 3a31644cf63a67d657ca7c44a64ae0553761d2561740c7d06f2ffa5d6e10b3058fa03f92a45517fe3d1bb8c246979d268a127e90a6313b093fe26f2c6d145ae6 SHA512 cd356dc118a52b4579c84e36dee342e5f15c9ee218d6ce8bc80a787a6aa2ba70597788f652fd51855beed966a09a04b0b4c56f8682acb70b643572f08e0d98c4
-EBUILD dpkg-1.19.6.ebuild 1960 BLAKE2B ef3fbf6a4a7add7936aafc4f643495ec37741ef5e6618badcdcf6253e8f4a94a10a197e428f2a1a2e665e106eec7b64585c62de0ed2ff9003226db94824faa92 SHA512 b4f21e5b0be4783a9a45d1153a7de938fa056537ef6b40f75e07a7d009fba8b5895b08d7249f1ba785e6e4e3a6324f0de953ed74b2e6315d210a9a77f04782d5
-EBUILD dpkg-1.19.7.ebuild 1960 BLAKE2B ef3fbf6a4a7add7936aafc4f643495ec37741ef5e6618badcdcf6253e8f4a94a10a197e428f2a1a2e665e106eec7b64585c62de0ed2ff9003226db94824faa92 SHA512 b4f21e5b0be4783a9a45d1153a7de938fa056537ef6b40f75e07a7d009fba8b5895b08d7249f1ba785e6e4e3a6324f0de953ed74b2e6315d210a9a77f04782d5
+EBUILD dpkg-1.19.0.5.ebuild 1825 BLAKE2B 330c350f617c7abceb91711f7c4829e621f4ddc12103cbb036c2396e6983ddcb341014614781119c25a7c771932159b02ce1fbb6052b6c3de56b5f1ba87f707b SHA512 07931dfe023c5ebea48a8e17820e40fbf9bcfb025209a258e025b1db8d2a21e96f5fbe2508aef9b3d91fd94c126641dee4b3fcba01fece28a20b623b763a1ac4
+EBUILD dpkg-1.19.6.ebuild 1973 BLAKE2B 199fc722c5e81e4df43975ae1c014c596c7dcecb95422104608577dfd48037233e8757d6a9ab5a4aea9e6c5fd07cfa49c7e721a69cb769e1d27b4bda5836aebb SHA512 64917f1600ab9b5fc2703229a5b6520d51392d86aee4993d07a83c1476f5517e8de6aa330f4e365c47c607017ed4a3241a60cc8c5d4f788c556195a80f3ebe09
+EBUILD dpkg-1.19.7.ebuild 1973 BLAKE2B 199fc722c5e81e4df43975ae1c014c596c7dcecb95422104608577dfd48037233e8757d6a9ab5a4aea9e6c5fd07cfa49c7e721a69cb769e1d27b4bda5836aebb SHA512 64917f1600ab9b5fc2703229a5b6520d51392d86aee4993d07a83c1476f5517e8de6aa330f4e365c47c607017ed4a3241a60cc8c5d4f788c556195a80f3ebe09
 EBUILD dpkg-1.20.0.ebuild 1919 BLAKE2B c7456dbda807d2195de6e0f19abab34c70eb6e768095ed7009a95e052105b0cf0cbeda02cc48f9b3b3fa6582b1f1e1bb7f32c1eec1b80f29fbe838b698c4bc5f SHA512 db416fdca740d42ebe57fec322a97c3571c6ca660eeef3f20079a3bceac9752cd13ad6247aa42b65faba2c7a33db0e3d043a494986e2bedf459734f332dd5ceb
 EBUILD dpkg-1.20.2.ebuild 1891 BLAKE2B 4b479ba923cc599f316a95c94047106b81d26c5b35fdaf18fddea3686c45111f6e128e1ff9c8b622daf326520cdc0bf3e490bb96ad07ee526605042dc4e8250c SHA512 f7f9d2cf745a1aff7ee3c42172bea29cd094f3e80ccbde8d1dcbd7519032fb59aeef98972b568c864d2287f97e0b5b9dd071c42b4ac8f5f8b1ce2f7987d10946
 EBUILD dpkg-1.20.3.ebuild 1891 BLAKE2B 4b479ba923cc599f316a95c94047106b81d26c5b35fdaf18fddea3686c45111f6e128e1ff9c8b622daf326520cdc0bf3e490bb96ad07ee526605042dc4e8250c SHA512 f7f9d2cf745a1aff7ee3c42172bea29cd094f3e80ccbde8d1dcbd7519032fb59aeef98972b568c864d2287f97e0b5b9dd071c42b4ac8f5f8b1ce2f7987d10946
diff --git a/app-arch/dpkg/dpkg-1.19.0.5.ebuild b/app-arch/dpkg/dpkg-1.19.0.5.ebuild
index e7b089e808d8..0a0f4f3be9fa 100644
--- a/app-arch/dpkg/dpkg-1.19.0.5.ebuild
+++ b/app-arch/dpkg/dpkg-1.19.0.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils multilib autotools ltprune toolchain-funcs
+inherit eutils multilib autotools toolchain-funcs
 
 DESCRIPTION="Package maintenance system for Debian"
 HOMEPAGE="https://packages.qa.debian.org/dpkg"
@@ -83,5 +83,5 @@ src_install() {
 	keepdir /usr/$(get_libdir)/db/methods/{mnt,floppy,disk}
 	keepdir /usr/$(get_libdir)/db/{alternatives,info,methods,parts,updates}
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-arch/dpkg/dpkg-1.19.6.ebuild b/app-arch/dpkg/dpkg-1.19.6.ebuild
index 8caed6c98c4f..c8e12d60fd73 100644
--- a/app-arch/dpkg/dpkg-1.19.6.ebuild
+++ b/app-arch/dpkg/dpkg-1.19.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils multilib autotools ltprune toolchain-funcs
+inherit eutils multilib autotools toolchain-funcs
 
 DESCRIPTION="Package maintenance system for Debian"
 HOMEPAGE="https://packages.qa.debian.org/dpkg"
@@ -87,5 +87,5 @@ src_install() {
 		/var/lib/dpkg/{alternatives,info,parts,updates}
 #		/usr/$(get_libdir)/db/{alternatives,info,parts,updates} \
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-arch/dpkg/dpkg-1.19.7.ebuild b/app-arch/dpkg/dpkg-1.19.7.ebuild
index 8caed6c98c4f..c8e12d60fd73 100644
--- a/app-arch/dpkg/dpkg-1.19.7.ebuild
+++ b/app-arch/dpkg/dpkg-1.19.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils multilib autotools ltprune toolchain-funcs
+inherit eutils multilib autotools toolchain-funcs
 
 DESCRIPTION="Package maintenance system for Debian"
 HOMEPAGE="https://packages.qa.debian.org/dpkg"
@@ -87,5 +87,5 @@ src_install() {
 		/var/lib/dpkg/{alternatives,info,parts,updates}
 #		/usr/$(get_libdir)/db/{alternatives,info,parts,updates} \
 
-	prune_libtool_files
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 35f57ddea0fe..f58149a1f97e 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,6 +1,4 @@
 AUX 3.36-packages.match 664 BLAKE2B dfe72c4eb0b44b8ab589fa81c0ceaa31bc3516dee78fabe2eb48f8131b25ed75a11630ae620e70646539ef42a7c4d7d283f71ffa0fa13f64ccf164d672acd95a SHA512 154438583492c571e4c8e1c926c3cb04972255cc4d1b74f186dfbe50c9756f25e11034fe64d893fdd8f2698c8eaaebba76682a818bb6523656c7c412f8e8b614
-DIST file-roller-3.38.1.tar.xz 875572 BLAKE2B 29a05d48971c2172177bd1aa52448ed5432a69733644b131517dbd7dd50cab971801d1bff5837dba74ae48ea0487614c7c7ebd4669f04f7d42e6257161fe1776 SHA512 b1936481140084c84d7bdbf361859b0ff1fed8329e26b692f0f0c8d1a3a1ec494b493aa0fb4de9f0ea5004b18e4bd69859656fe424bf413d720b04fc56e453f6
 DIST file-roller-3.40.0.tar.xz 876424 BLAKE2B fa2483677869d5a6b4ac91938eac6bf09965177ffa07bab76a77a0be58e331466f939e7e0728d5eeeb5703c6ff12f178f8080922f8ae9d726e77700bbbd518ed SHA512 224dbe4f4358aa62589d084d67244ad8d65d718f9b6adf708ba1425b38fca68e08b07a6163f66d95c6acfd164b6062939cfeb27873ea41353e0551e322b0eb26
-EBUILD file-roller-3.38.1.ebuild 2180 BLAKE2B c2c10d784a90e57eb4a3f44511689e02042db061636c3055a97f54ed7449d6b8aa4b5dde339bd445025c395046a3b1aaf207763409c735e0d15def8b706d3ef4 SHA512 7b6bac2e9da061aa93d8b5da88d44090e20ad1dc01bf1bf3b95ba2532489ae5911f4c809fab528b5101c9d22a54b5813a1a8fcd0e589245ffb09f8c0d7c35a7c
-EBUILD file-roller-3.40.0.ebuild 2195 BLAKE2B 316198d0d16c5480edb28ea6c141209e645acf760ba4223b069a02a0f6a79330122f9b18d96455f71bba8dcb5e2d8cc2a8ae6e651eb442d5d19eb70dd5b29a4d SHA512 11c0c1b25ff40ade00ab0a934616de2fbd1487d4ec25b23a7eca2b48c6e10df5814d88d0602e2a026fccbf22d1a680909bbb18031ee38f10f79f93f49756322e
+EBUILD file-roller-3.40.0.ebuild 2193 BLAKE2B 0f160c46d1c945f9e255cce4263074888bf9e79f85464abab84506e00a8a7d2b9fdcadfb67e8829b938df1c281c7ea628b3cb3439c042ff9d486b298903102ac SHA512 be4764c54141ff241d2e9b9990cbe0d4ca04d21404d66c322098e4b36d38ece713117bea5dbfb7900a932f68a71879946503273630098a6e779502db750bbd43
 MISC metadata.xml 522 BLAKE2B 555fc1eb7ab102a7bd439544e158c0a554b8dee1d3891dbc3b9441c5063ad2666795c682e9ade30a920daabe5788017a67680095832e760b9c9c666dcba94928 SHA512 6a8988a025352b00d1dff7b4ab3f75bfb4f95b890a1e1b0fcfdd840a67fe4897dfcce275f8ff439345f094924c72171b1d03e70106f84bd8e0aff8de5510d698
diff --git a/app-arch/file-roller/file-roller-3.38.1.ebuild b/app-arch/file-roller/file-roller-3.38.1.ebuild
deleted file mode 100644
index 7a57fade4cb0..000000000000
--- a/app-arch/file-roller/file-roller-3.38.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-inherit gnome.org gnome2-utils meson python-any-r1 readme.gentoo-r1 xdg
-
-DESCRIPTION="Archive manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-IUSE="libnotify nautilus"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-
-# gdk-pixbuf used extensively in the source
-# cairo used in eggtreemultidnd.c
-# pango used in fr-window
-RDEPEND="
-	>=app-arch/libarchive-3:=
-	>=dev-libs/glib-2.38:2
-	>=dev-libs/json-glib-0.14
-	>=x11-libs/gtk+-3.22.0:3
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	libnotify? ( >=x11-libs/libnotify-0.4.3:= )
-	nautilus? ( >=gnome-base/nautilus-3.28.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-${PN} is a frontend for several archiving utilities. If you want a
-particular archive format support, see ${HOMEPAGE}
-and install the relevant package. For example:
-7-zip   - app-arch/p7zip
-ace     - app-arch/unace
-arj     - app-arch/arj
-brotli  - app-arch/brotli
-cpio    - app-arch/cpio
-deb     - app-arch/dpkg
-iso     - app-cdr/cdrtools
-jar,zip - app-arch/zip and app-arch/unzip
-lha     - app-arch/lha
-lzop    - app-arch/lzop
-lz4     - app-arch/lz4
-rar     - app-arch/unrar or app-arch/unar
-rpm     - app-arch/rpm
-unstuff - app-arch/stuffit
-zstd    - app-arch/zstd
-zoo     - app-arch/zoo"
-
-src_prepare() {
-	# File providing Gentoo package names for various archivers
-	cp -v "${FILESDIR}"/3.36-packages.match data/packages.match || die
-
-	xdg_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		-Drun-in-place=false
-		$(meson_use nautilus nautilus-actions)
-		$(meson_use libnotify notification)
-		-Dpackagekit=false
-		-Dlibarchive=true
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-arch/file-roller/file-roller-3.40.0.ebuild b/app-arch/file-roller/file-roller-3.40.0.ebuild
index bcde653bb444..531bb4bf729a 100644
--- a/app-arch/file-roller/file-roller-3.40.0.ebuild
+++ b/app-arch/file-roller/file-roller-3.40.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE="libnotify nautilus"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index 44483ac28f9d..6549f3b02563 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-autoar-0.3.1.tar.xz 297904 BLAKE2B 607c9b3a26cf23eed3b9b19c32e2e0b3b9127977b5836b0b263cc3163490fd10052716e073264bbe946e351ec096021dd243560f6e7781400029263705308328 SHA512 a8ece09f66d7f1761fb4217f267b8a6dd1dee2266cc10f9944b1860c364e0d671286c6bf9477bdee5d0dd231b959ebefdd7a7003d679c38fe1553863033311dc
 DIST gnome-autoar-0.3.2.tar.xz 298656 BLAKE2B d56498f2798b838729056f5d2194dc628de8cfd3e8964a718982cfd464e3e6848152624b2cbbe5377d813183eebae1f212bc56c1a8df2ea119af264786151670 SHA512 6685e44ed61388759ff820b7cd403304f32d47fab4e2f66f5571a5cc6d01c1287bda851f230b3782bb1beff6ef784c25434930f15ef6ed32d788db4b89435968
-EBUILD gnome-autoar-0.3.1.ebuild 938 BLAKE2B 14ef901e62956cb84ccec0790971e83dc176e73b8da92d2e785bb8b0136132b5bfed43964139409f915b43babf27ab09f7ad5cb3eac9c0b4c454e6552cbb7c47 SHA512 70a9f7e15c9db87e4d56c089a407da0b97bc274bcf6a6deed93e9c16828e5f2e51ac0d8bca55b684e98784ca80fcc3af0d52ee6768b4b8b74bb522fb9096fdc5
-EBUILD gnome-autoar-0.3.2.ebuild 941 BLAKE2B 6ae751624dac772991f506fa9162141cd1a6c7467a49aa31d515a348182ac40130cfb43ea2cc0b0218bed3901ea42d2c83d30d07efefdb0459886493a4da42ce SHA512 6a9271091797f149f8f1ccf1fc86702b4ea6e439223665f25bcef43e5d23bb5d83def3643dd9a2c99a5ca1f298d8e6d0b61478b4f2b4759f3d8032ac0b4fe360
+EBUILD gnome-autoar-0.3.2.ebuild 938 BLAKE2B 14ef901e62956cb84ccec0790971e83dc176e73b8da92d2e785bb8b0136132b5bfed43964139409f915b43babf27ab09f7ad5cb3eac9c0b4c454e6552cbb7c47 SHA512 70a9f7e15c9db87e4d56c089a407da0b97bc274bcf6a6deed93e9c16828e5f2e51ac0d8bca55b684e98784ca80fcc3af0d52ee6768b4b8b74bb522fb9096fdc5
 MISC metadata.xml 464 BLAKE2B 1144e271593c56474f4d7a733d09cb3d4bf042d6db45eaf81942d66e49a8c2a722d15cf8647af88c8406a7661365cded5b3ea9a8e4530d52e0f99cc5c847a1a8 SHA512 2ed7ffd5a60c7f0481868cf0f151ed8a9a097036cab309129a45b6bc5eb5ee21fc276deb3ed262d0309ffe5fcad531f05ef9c7e085e007760a9470878b61bc3c
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.3.1.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.3.1.ebuild
deleted file mode 100644
index 407c5ae032fb..000000000000
--- a/app-arch/gnome-autoar/gnome-autoar-0.3.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala
-
-DESCRIPTION="Automatic archives creating and extracting library"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-autoar"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-IUSE="gtk +introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
-	>=app-arch/libarchive-3.4.0
-	>=dev-libs/glib-2.35.6:2
-	gtk? ( >=x11-libs/gtk+-3.2:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		$(use_enable gtk)
-}
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.3.2.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.3.2.ebuild
index 7da8c2332a5f..407c5ae032fb 100644
--- a/app-arch/gnome-autoar/gnome-autoar-0.3.2.ebuild
+++ b/app-arch/gnome-autoar/gnome-autoar-0.3.2.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 IUSE="gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=app-arch/libarchive-3.4.0
diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index af9cefff76e9..6637a791a3bd 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -1,7 +1,4 @@
 AUX gzip-1.3.8-install-symlinks.patch 284 BLAKE2B f461a822371d56505aa3e436c4d611823dfe81ab72f9e1a2bd3547b8fbbae07d2108ac255a1a9dae604f9acb77744bda3a9eec2a575580558a4ca7042164c563 SHA512 4a20d61d48c456c4f5cca31b38e6f26460f781782c66ff4cd1b193eb1a48dd9fa88967989b2698b5e45a61d64c9ce3b87fba0f6b67bf507c5bb386a847f477fd
-AUX gzip-1.9-gnulib-glibc-2.28.patch 5422 BLAKE2B 1c514d2ba6b3ff1596930b7efc32591bd7175bf5cbf07ef323f2566e0723fe8b125f746492ab25ef4cd892f75c832f79dba74d81da0814944898c83d03f54fa7 SHA512 5111b961d50906a5e27432628f5becbb63b993077861f4441cf445cbed3f4ec4e5c69aee22f209f05ccaa5514cace53b5805ef9f96886276d8f1b46620d614e3
 DIST gzip-1.10.tar.xz 775144 BLAKE2B 431dc0fd11061eabd9db86594777b86510b124b124fd74799eacd67334631af60f638be2638413bee0153a9da35528d0aecc5b5083152c395223705400c9103b SHA512 e6ba9e3906cdb6a6235b213515093d02afa1722686f73eddacbacae628542b586b449829783b6a1701e9b9e0c4d4dfa6845904d3b6b010f5cf21aec4997c9299
-DIST gzip-1.9.tar.xz 762516 BLAKE2B 4001fc7a770634916d52b026dab1b621fc96275bfb61ec2df2d0e7d7ec1c81414270d3c866034e6ef758870f38e9d4396a25832abe558915a7ded1f1511eb4b0 SHA512 c0852e7f7662141e79d14bc36e50f1940dba3e804feff3b0b8fa084ffec720ac245352282d2f1db117fadc95758424dd418d192b94621dac4367834ccf101fad
 EBUILD gzip-1.10.ebuild 1081 BLAKE2B af51b89c49e389fd2f38996790b6102730594d4bd66c7a4177de9643523c9c9142b5758f7aa610aba7150f4c03f9871c59bf32a3f125084d636de066f77fb4bd SHA512 5616d9ae48821f18464c7e9227aee73293179febfb6b76aca227efa97edf58ad5ba776c5e3b3c5852089ddc86e06a7edb99955176a5f9d3b05e10a630c1abf69
-EBUILD gzip-1.9.ebuild 1129 BLAKE2B 07a984e42413101cc2227a241c3228020d6f10295009753b508e5e665f34acbad62bc01480097714f73b6380a1e51626e354c29dd0d249eaa7af18a3cfc97c45 SHA512 41fa1e202e57c15ee2e48078ebcb60ad9c1303a9e45f4cccf74c1823a2a95fe2422142fd091f8c465da79fe88d29c0173f4d4400216b80a484584104461d72be
 MISC metadata.xml 421 BLAKE2B cd73d8b6c846ebae069903fefc36cd0c2835cee6c137e1cc642cae9628be6fd3678c9002defeb2a63ca592f96f9f8032e99535f398a60989df9fb66270d6ec4f SHA512 fef953770d98077b95afc5f2d7fc208dc74453c403dd4220c8b35b837a485dbe8d98e1f669b5661633f599246752f1ee4136ee886ca6c15c2dcc0da73d976e96
diff --git a/app-arch/gzip/files/gzip-1.9-gnulib-glibc-2.28.patch b/app-arch/gzip/files/gzip-1.9-gnulib-glibc-2.28.patch
deleted file mode 100644
index 20039b9f0d2c..000000000000
--- a/app-arch/gzip/files/gzip-1.9-gnulib-glibc-2.28.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-fix build failure against glibc-2.28
-
-https://bugs.gentoo.org/663928
-
-Adopted gnulib's upstream patch:
-
-From 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Mon, 5 Mar 2018 10:56:29 -0800
-Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Problem reported by Daniel P. Berrangé in:
-https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
-* lib/fflush.c (clear_ungetc_buffer_preserving_position)
-(disable_seek_optimization, rpl_fflush):
-* lib/fpurge.c (fpurge):
-* lib/freadahead.c (freadahead):
-* lib/freading.c (freading):
-* lib/fseeko.c (fseeko):
-* lib/fseterr.c (fseterr):
-Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
-* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
-Define if not already defined.
----
- lib/fflush.c     |  6 +++---
- lib/fpurge.c     |  2 +-
- lib/freading.c   |  2 +-
- lib/fseeko.c     |  4 ++--
- lib/fseterr.c    |  2 +-
- lib/stdio-impl.h |  6 ++++++
-
---- a/lib/fflush.c
-+++ b/lib/fflush.c
-@@ -33,7 +33,7 @@
- #undef fflush
- 
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- 
- /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).  */
- static void
-@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
- 
- #endif
- 
--#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
-+#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
- 
- # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
-@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
-   if (stream == NULL || ! freading (stream))
-     return fflush (stream);
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
- 
-   clear_ungetc_buffer_preserving_position (stream);
- 
---- a/lib/fpurge.c
-+++ b/lib/fpurge.c
-@@ -62,7 +62,7 @@ fpurge (FILE *fp)
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   fp->_IO_read_end = fp->_IO_read_ptr;
-   fp->_IO_write_ptr = fp->_IO_write_base;
-   /* Avoid memory leak when there is an active ungetc buffer.  */
---- a/lib/freading.c
-+++ b/lib/freading.c
-@@ -31,7 +31,7 @@ freading (FILE *fp)
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   return ((fp->_flags & _IO_NO_WRITES) != 0
-           || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
-               && fp->_IO_read_base != NULL));
---- a/lib/fseeko.c
-+++ b/lib/fseeko.c
-@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
- #endif
- 
-   /* These tests are based on fpurge.c.  */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   if (fp->_IO_read_end == fp->_IO_read_ptr
-       && fp->_IO_write_ptr == fp->_IO_write_base
-       && fp->_IO_save_base == NULL)
-@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
-           return -1;
-         }
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-       fp->_flags &= ~_IO_EOF_SEEN;
-       fp->_offset = pos;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
---- a/lib/fseterr.c
-+++ b/lib/fseterr.c
-@@ -29,7 +29,7 @@ fseterr (FILE *fp)
-   /* Most systems provide FILE as a struct and the necessary bitmask in
-      <stdio.h>, because they need it for implementing getc() and putc() as
-      fast macros.  */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   fp->_flags |= _IO_ERR_SEEN;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-   /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
---- a/lib/stdio-impl.h
-+++ b/lib/stdio-impl.h
-@@ -18,6 +18,12 @@
-    the same implementation of stdio extension API, except that some fields
-    have different naming conventions, or their access requires some casts.  */
- 
-+/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
-+   problem by defining it ourselves.  FIXME: Do not rely on glibc
-+   internals.  */
-+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
-+# define _IO_IN_BACKUP 0x100
-+#endif
- 
- /* BSD stdio derived implementations.  */
- 
--- 
-2.19.1
-
diff --git a/app-arch/gzip/gzip-1.9.ebuild b/app-arch/gzip/gzip-1.9.ebuild
deleted file mode 100644
index 5e55b04b2fff..000000000000
--- a/app-arch/gzip/gzip-1.9.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
-
-DESCRIPTION="Standard GNU compressor"
-HOMEPAGE="https://www.gnu.org/software/gzip/"
-SRC_URI="mirror://gnu/gzip/${P}.tar.xz
-	https://alpha.gnu.org/gnu/gzip/${P}.tar.xz
-	mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="pic static"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.3.8-install-symlinks.patch"
-	"${FILESDIR}/${PN}-1.9-gnulib-glibc-2.28.patch"
-)
-
-src_configure() {
-	use static && append-flags -static
-	# avoid text relocation in gzip
-	use pic && export DEFS="NO_ASM"
-	econf --disable-gcc-warnings #663928
-}
-
-src_install() {
-	default
-	docinto txt
-	dodoc algorithm.doc gzip.doc
-
-	# keep most things in /usr, just the fun stuff in /
-	dodir /bin
-	mv "${ED%/}"/usr/bin/{gunzip,gzip,uncompress,zcat} "${ED%/}"/bin/ || die
-	sed -e "s:${EPREFIX}/usr:${EPREFIX}:" -i "${ED%/}"/bin/gunzip || die
-}
diff --git a/app-arch/patool/Manifest b/app-arch/patool/Manifest
index d5de2a0f5c14..e7cb0a4659a8 100644
--- a/app-arch/patool/Manifest
+++ b/app-arch/patool/Manifest
@@ -1,3 +1,3 @@
 DIST patool-1.12.tar.gz 69146 BLAKE2B e97f64b4ba41860c1f7e506f63f249adeb02974b71bf83eb1673ae1fd93b8f9b698818cb57f961b3d3a5d4e445c5e7a3a349db54e1eb11a8fc165ad07722ace9 SHA512 b8c67526ce79448de703b03ca9b363c0e04cfe56bfc6168bcb96202f95022b6bbcaa92be86a85ee9608070206acd09382b0dfd08a2f805c5e8e5683c7c3f18cc
-EBUILD patool-1.12.ebuild 427 BLAKE2B 8f5dc48d91273ef3144c722a1abe53cc4132ab636a2941ccc461fe012d26ea4441402d8c3271dbc64d51200a4ecf6a22af345a7c287e44b8062600aea7c6beb6 SHA512 2d918626a5500908031299e5e08b01035ee69cdf05bb497ca01280413559d289cef6eed258f1b8966761f59c542ac3e164ba99e289368ef3f44f5efdffb39277
-MISC metadata.xml 480 BLAKE2B e10b98757d73902832642220ab34fd2ac797881ec3f3cebd59b7bc734b853109b095a6d1ea77dd94a9b02cf08a0f921af23e23c0b06ec20d06494070982f853d SHA512 75aa62942ec5fa7ce30e343034dd0e92c27a43d6e841485c04ca1448cb7e63c2a5992ea0f0bf1e50d332308708866323dcea6ec5f96c64f70ceb1937f7580579
+EBUILD patool-1.12.ebuild 356 BLAKE2B ce73a4d3c784e644d8a250af3d6ebe15144f7ebe827f07ed0ffa3cb4b6095e7b1951a6df07f1d2d18d9b3d425ee186beacd4cd1e9e1b13286cb26d4356c08edd SHA512 2f4d517ad77dc71b8f8c7b2d8ee678f8079230560b25afdfc1f452d3ad785f67903922dc0034e89cdb0ad5a1f59519d56a2e8ff9d9cb7943eab66daa214eac9d
+MISC metadata.xml 535 BLAKE2B b1d231c34f8e5345d1cc1a1bdf7ca285b241f82b6e6718f0d53793a9eecd9e2ee2ae5e6d9d5fedf95c40c26367b18fd64ad0bd3133459d68554b0a01af2ad116 SHA512 91602a7585212209f07b92de17fcba65aed6e17b66796cf1ea14619848f0e4c68893d96b5a7a5197d194f0a66490bc6df2dd1ffaa47f0f7b000e111cc56f082d
diff --git a/app-arch/patool/metadata.xml b/app-arch/patool/metadata.xml
index ef580578cfcc..79d003d8d99d 100644
--- a/app-arch/patool/metadata.xml
+++ b/app-arch/patool/metadata.xml
@@ -11,5 +11,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">patool</remote-id>
+    <remote-id type="github">wummel/patool</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/app-arch/patool/patool-1.12.ebuild b/app-arch/patool/patool-1.12.ebuild
index d30ce9ad1591..dbb945711bd2 100644
--- a/app-arch/patool/patool-1.12.ebuild
+++ b/app-arch/patool/patool-1.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -14,9 +14,3 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	"
diff --git a/app-arch/tardelta/Manifest b/app-arch/tardelta/Manifest
index 1bb7f9586ff8..25d53bcbcdf7 100644
--- a/app-arch/tardelta/Manifest
+++ b/app-arch/tardelta/Manifest
@@ -1,3 +1,3 @@
 DIST tardelta-1.0.1.tar.gz 3672 BLAKE2B de1914402bbc79865ef1b60a79493cea34972c5448583e2f7f549bf5135a7c4d4db4ee4e31efed4a2c9bf8f4036707f3db3bff44ccdaf60b6be1cd8e94f54158 SHA512 e2ef4fffd484c8e76d2c8b2c148e31e8af8dc6ff7d11625375c50353898f3051b22c4c36bd2c8eb9f3aee4fd5009d0b6a133eccf605ef3d50c27f381af17de57
-EBUILD tardelta-1.0.1.ebuild 572 BLAKE2B 988cc63072cbe8621687f9dc914984161b0bf4d61223a2a0be3e495c3b7666612ca9c9172ea1528e8ab1ff9f9312a316d5f2d1ca88223d60429a245d12359859 SHA512 0a63c971780c4add662c240a91774a6e794aa2e668abcf1fe93d266db811ce3398c43ae77c46d2593c518d6404c78c1620217cfee5ae4f39af5db7220cee100a
+EBUILD tardelta-1.0.1.ebuild 566 BLAKE2B b19dacd7d08753ca1f70808097401a72bb5adaa8050cd8b70c0f242dc717bcb213d58a67ae62d405fd03c6ddb18ea5027b59bfb19e6e0faf6e0d113dce5a1aae SHA512 294f79e17cbb578784efe63b0f690fe1b1b1f795054d99d69aff97aead332e5e2b55f6ad51f89d6d2ee01dace2c22ee9cef375fd829429beae354cd0a2d3829e
 MISC metadata.xml 299 BLAKE2B 3301852415bf0c37ed7360589798ee45e1dea1e5e8a5ed9daed76dde7b63e410de7219c0c414573919c737eef7c3b3854cd9db394cb003981a9e89851b35b224 SHA512 4842f9100c9032fd47975247671e59c2c24cf3e90ddbcab576a168776b09966ddb2c582637f3aabe5b34a35f25dd8f4f8a3f215752d9a15346ac03edd882bfd0
diff --git a/app-arch/tardelta/tardelta-1.0.1.ebuild b/app-arch/tardelta/tardelta-1.0.1.ebuild
index 1941ca56eb06..4eecae00a901 100644
--- a/app-arch/tardelta/tardelta-1.0.1.ebuild
+++ b/app-arch/tardelta/tardelta-1.0.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
@@ -13,7 +13,6 @@ SRC_URI="https://github.com/zmedico/tardelta/archive/${PV}.tar.gz -> ${P}.tar.gz
 LICENSE="Apache-2.0"
 KEYWORDS="~amd64 ~x86"
 SLOT="0"
-IUSE=""
 
 src_prepare() {
 	sed -i "s:^\(__version__ =\).*:\\1 \"${PV}\":" src/${PN}.py || die
diff --git a/app-arch/unrpa/Manifest b/app-arch/unrpa/Manifest
index de1268ae130e..663341ed6cd3 100644
--- a/app-arch/unrpa/Manifest
+++ b/app-arch/unrpa/Manifest
@@ -1,3 +1,3 @@
 DIST unrpa-2.3.0.tar.gz 23325 BLAKE2B 602b2cee0658ddc391918548fc69719db71fe219484d26c61478bb350ffca450c01ce69f61015dca062aac25fd3ff1693d74280f4c16f31986d9b4e21c9535ee SHA512 4d9bf228c22b26a49cc0eb1fa96af78e6b240626c69ed79ef8729b8a47eb425ec9f43c4a88e3d797633e79fc05df284f039c18cc5946922ce46b858ce4dfc808
-EBUILD unrpa-2.3.0.ebuild 389 BLAKE2B 7284d2ad44709b886ebd498d053fda69c7495b0f929f6ee1b1b7c6b17b54d692e7a8efaa0490917c65e9dc19ddec2b05bf75cc8d3da37a24938e89ef4eeac2ec SHA512 35c835b81813b959dd03d681a81f85d7446cdbe35a9890b880e3f7d1f43dec5ba1357d387c427d7a3360a6a7db23f072ed0ced5311df0251cf349b888532ec34
+EBUILD unrpa-2.3.0.ebuild 392 BLAKE2B 0327ca5a7492a36c903ca2341dc9a8e3bba5b336cd1e6fa31a6ff14c03e7f872a56260e1c61f4455d5652a441e77d5294262266d4934cf1030bacc0566c88702 SHA512 5b9ecac3f8c696007a8734439f565a82940c3ac0ee615b15174c3d14934a83d8f15c6e17abe67b4f10f642ba9cb184c61e66ec0e04bb8e20d0b26513aa4bde52
 MISC metadata.xml 489 BLAKE2B 38e48e25c0ca75341f8192b2511ab974f435f919c38ed09923665fdc9894aa5faaa19aa84c1421615dbf45cb61fc386e3f6663065eb0a615c01f2ea87fb3e61b SHA512 801ef857b1af21d77179f7ab9c0a00060178146509a43cd8d7e18ee89191f435bcf080e1a14367d38a08242eb387eb5cb78afedbfa46274b45bb9a88d1081c29
diff --git a/app-arch/unrpa/unrpa-2.3.0.ebuild b/app-arch/unrpa/unrpa-2.3.0.ebuild
index cc57f38ebbfe..42996c5bf01f 100644
--- a/app-arch/unrpa/unrpa-2.3.0.ebuild
+++ b/app-arch/unrpa/unrpa-2.3.0.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
-SRC_URI="https://github.com/Lattyware/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
 DESCRIPTION="Ren'Py's RPA data file extractor"
 HOMEPAGE="https://github.com/Lattyware/unrpa"
-LICENSE="GPL-3"
+SRC_URI="https://github.com/Lattyware/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
 SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
diff --git a/app-arch/upx/Manifest b/app-arch/upx/Manifest
index f6ef79daac62..ab45fe65b0c7 100644
--- a/app-arch/upx/Manifest
+++ b/app-arch/upx/Manifest
@@ -1,4 +1,5 @@
+AUX upx-3.96_CVE-2020-24119.patch 1371 BLAKE2B 54209c114c4a8cab51e7e7ec13cfee055a5f940df4dcbe40b7a35664378a20effdbedfef7b34e4a98510272f221540f87bf47bb439db96a68cc19177e6be71ff SHA512 9b887882e7344d77635091cd01d3c7aa9f45156f43896155988e3e1b7726d76642b4bc9b6c2db06af14710aaa9bfda16e97bc0d1127b77190b72e683d394beff
 AUX upx-3.96_CVE-2021-20285.patch 4481 BLAKE2B 345bce505a045c53b48dad3102f52588ceb7f2736cdbeab31ed5f65a5cf5a5344cb9ca700cfc3d7fac2569a91f454a652a676c83aafb1be884b0fae229d3afae SHA512 f596f13634eb2173f4c549d41387bdb6785501afb7d3a68d70f90dcdbadc615e95de024e1810af2b3663137692a7322d32a290357e0f7a96ca2acf51228b0abc
 DIST upx-3.96-src.tar.xz 792524 BLAKE2B 21af85dbcfdd1bf0151a653c865db13c9f30b9de0b9b4b94557ddd55736c7053dd829c5d72b9a7e5aa94a71ecc0151145dd66d7d98ded178c50ff7357d0ba442 SHA512 2d4d1be21d274d9bfdee9b9815396f5e5ff0bcdfb781b7be5fafa4d1e224028e412ec5f5ba607c482671aae27ccf9069abb2db0fb58f78f3a102a51897df2b11
-EBUILD upx-3.96-r1.ebuild 864 BLAKE2B 227dd8b0cc3d09522229cfeecf0f1c4a864d66aa558b0d7ac5589bef470cad6e0dd3db0e53006ce870bc127704f10a823af4c284943516e76173081f40ce36da SHA512 b83bba2a294a4f79d412e18319d5b3985ae1107cecf7b742a3e0a9672a8df38a53c51266c22327b01c2b205253775eab538c333b5ac057ca2c18b03e41eb02e4
+EBUILD upx-3.96-r2.ebuild 914 BLAKE2B a2a5e5979b0ee73b21b456bebee59b8fd8830d4f268d27683584bc66dfa7f4cea3ef5226e2aecd9d4b5d4492918782eba2d524f54142f86a988dac087c331de2 SHA512 6cae7c01fdd6769b099c8ee70cd29609615692be8946ccb93797f48f623e787fe7f858decb8d41ab807fb4334ad14615d2c41d319056612558dca5ad91d4b9ce
 MISC metadata.xml 478 BLAKE2B c0d96932b628c0448fbdc1756445798bb382ea120b499a2bc2c9320b392730835e5bad5785ef719f5a95d381f3768e7bf2d7f4dbce76d8993052ac9a761f422d SHA512 5bd0548fcf13bbd34c5fc97bd139a6b1398bbc99db984cd730188280fc490864cf704858c132e0154b0681eca5a26a93fa0eeb029d5760fcf17d83be2d83d51d
diff --git a/app-arch/upx/files/upx-3.96_CVE-2020-24119.patch b/app-arch/upx/files/upx-3.96_CVE-2020-24119.patch
new file mode 100644
index 000000000000..7e6de04948bd
--- /dev/null
+++ b/app-arch/upx/files/upx-3.96_CVE-2020-24119.patch
@@ -0,0 +1,34 @@
+From 87b73e5cfdc12da94c251b2cd83bb01c7d9f616c Mon Sep 17 00:00:00 2001
+From: John Reiser <jreiser@BitWagon.com>
+Date: Wed, 22 Jul 2020 19:34:27 -0700
+Subject: [PATCH] Unpack: Phdrs must be within expansion of first compressed
+ block
+
+https://github.com/upx/upx/issues/388
+	modified:   p_lx_elf.cpp
+---
+ src/p_lx_elf.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/p_lx_elf.cpp b/src/p_lx_elf.cpp
+index cd9e4ec97..453d5c457 100644
+--- a/src/p_lx_elf.cpp
++++ b/src/p_lx_elf.cpp
+@@ -4550,7 +4550,7 @@ void PackLinuxElf64::unpack(OutputFile *fo)
+     unsigned c_adler = upx_adler32(NULL, 0);
+     unsigned u_adler = upx_adler32(NULL, 0);
+ #define MAX_ELF_HDR 1024
+-    if ((MAX_ELF_HDR - sizeof(Elf64_Ehdr))/sizeof(Elf64_Phdr) < u_phnum) {
++    if ((umin64(MAX_ELF_HDR, ph.u_len) - sizeof(Elf64_Ehdr))/sizeof(Elf64_Phdr) < u_phnum) {
+         throwCantUnpack("bad compressed e_phnum");
+     }
+ #undef MAX_ELF_HDR
+@@ -5617,7 +5617,7 @@ void PackLinuxElf32::unpack(OutputFile *fo)
+     unsigned c_adler = upx_adler32(NULL, 0);
+     unsigned u_adler = upx_adler32(NULL, 0);
+ #define MAX_ELF_HDR 512
+-    if ((MAX_ELF_HDR - sizeof(Elf32_Ehdr))/sizeof(Elf32_Phdr) < u_phnum) {
++    if ((umin(MAX_ELF_HDR, ph.u_len) - sizeof(Elf32_Ehdr))/sizeof(Elf32_Phdr) < u_phnum) {
+         throwCantUnpack("bad compressed e_phnum");
+     }
+ #undef MAX_ELF_HDR
diff --git a/app-arch/upx/upx-3.96-r1.ebuild b/app-arch/upx/upx-3.96-r2.ebuild
index 26a73f6191a8..cf9f4c4f87d3 100644
--- a/app-arch/upx/upx-3.96-r1.ebuild
+++ b/app-arch/upx/upx-3.96-r2.ebuild
@@ -14,15 +14,16 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-RDEPEND=">=dev-libs/ucl-1.03
-	sys-libs/zlib
+DEPEND=">=dev-libs/ucl-1.03
+	sys-libs/zlib"
+RDEPEND="${RDEPEND}
 	!app-arch/upx-bin"
-DEPEND="${RDEPEND}
-	dev-lang/perl"
+BDEPEND="dev-lang/perl"
 
 S="${WORKDIR}/${P}-src"
 
 PATCHES=(
+	"${FILESDIR}/${P}_CVE-2020-24119.patch"
 	"${FILESDIR}/${P}_CVE-2021-20285.patch"
 )