gentoo resync : 13.11.2021

16 files changed, 70 insertions, 138 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index c43b0b83985e..179c051d0940 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index d60fc18693b8..478b8fe14fbf 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -4,5 +4,5 @@ AUX dpkg-1.20.5-dpkg_buildpackage-test.patch 209 BLAKE2B d15000423abe8259e7bdd92
 DIST dpkg_1.20.7.1.tar.xz 4952736 BLAKE2B 0439cd9440c34597ff5c5e04bd8e1b79d34cd7675a216cbe1e7dc4d68460847143a8a7dff14b1845374d8e504d6fba63842b1d1ac37aa01f7b2a96b78ef0278d SHA512 beec7a7ba1cfbd6954b3d583e57c811af3bfa5e4e4554e6af6673d4a4be0e79fb4aded2f6aeeda592c2ba3d91facb82138f2eb8eb2338dc4fae1832911df2fd6
 DIST dpkg_1.20.9.tar.xz 4954428 BLAKE2B 4e04f7a90c8696971895081e18b220d9dee4bc5930428f131556ae71c673e61e18c363e279b566c2218da60a5aca421807c14cf518952502e707c7397769097b SHA512 904a4742f5f340dc65b2137364dce102a0b2eb42ccedb2a73f79c207362c699fbffaaf1379f1f6c8b8b0e490321af1d03c34b50ebe0c703f5ce8a7f75f17a839
 EBUILD dpkg-1.20.7.1.ebuild 2001 BLAKE2B e236a5cd683fed0131efe0ba775f33372ab0ad2ea7b12eed1107dcdcbf164b9d4ba7f8be97f183f18fed82861e50552fbfc3cdacca98fbf84285c400239702c3 SHA512 2567e608fcecbcfc2c066f7861cf9f038d3f51d3c49efb1f2255cad6f44233e5eafb3bd6cb81ef65bb9215b678217b3d4ae6208b53f4477a8d406075d0088630
-EBUILD dpkg-1.20.9.ebuild 2014 BLAKE2B 43766e4bb3fc0f2865a84a45980f017c9b5537af787c906e5f44d90f83f75c38b28863fbda9ecd80c15a5d1bf424d32c599d6b85110428fb174f7cfc8e37de2d SHA512 f65531314573012592f00e5d5dce75acb061b26818004a58dd978aad68900b1ae675caac469323183b9125d0a5ceab1a721e506ca7164da309490af50b167825
+EBUILD dpkg-1.20.9.ebuild 2009 BLAKE2B c68cf0ae4de2d86c675da894ceea766a38e863672f94e957fd51b29bb65f1376595cf6e512bfc61bf6d942fe2666361b3e5e9eaca825b1ab899ba6e888efd9c4 SHA512 328e70263886657d5dff406a41b8f953e072462b16467e648239bd808ef6530e70e0aebd7d79f505d56c9c14849b2cb60730912eb0453979dc6dca8eb661cf26
 MISC metadata.xml 433 BLAKE2B fe1e0ca0c96628891b711ca120d5c119f8effe66ce43198ebb2a16fce1cea23b7ab6ab88d807a71645298e2311bc3044dca4989fe83cf99e54a9e97f66835c69 SHA512 2882194685980d67acc10913c8863b55dc0a9215558db2e3cf33f0489d91e5477bf2ac0c0fc5b4a134f45593f6f5d3fde5e09493d20ca45224645b8c1c597fef
diff --git a/app-arch/dpkg/dpkg-1.20.9.ebuild b/app-arch/dpkg/dpkg-1.20.9.ebuild
index 744a4b7566c4..dcd19d9ad46d 100644
--- a/app-arch/dpkg/dpkg-1.20.9.ebuild
+++ b/app-arch/dpkg/dpkg-1.20.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="+bzip2 libmd +lzma nls selinux static-libs test unicode +update-alternatives +zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index a7ecec0ae324..07f3b21449a8 100644
--- a/app-arch/gnome-autoar/Manifest
+++ b/app-arch/gnome-autoar/Manifest
@@ -1,5 +1,5 @@
-DIST gnome-autoar-0.3.3.tar.xz 298536 BLAKE2B effbd3c15ab851c97f3c69f96bbf806f3639ce4865161df99b7f84ec2c4c8a3df9381517227d9a475b1006d88ac21eb02b4b474fd8bd27524959b56cf486e888 SHA512 41cda2670506e9b3f79c4995d2fdfbd5024777d8f8b3f85a2010af4e5f4303743d26ad9cad787c995362f83b65617ed5773d972c8aa2c7bdcd358d873cb86ec4
 DIST gnome-autoar-0.4.0.tar.xz 50176 BLAKE2B 6dce638d180ae8566f45757870cdf0de70a944cbdfde940f13bd139f3ee6fb1c18ff91ca0b1cc9b99dbeb4b5c67314c81448e1876a328e928b2d9787492988ec SHA512 ab4ef47ef65e4fa0dc652b19a9eb94cc307013e4c7ced6980cedc7ced20fb77d53e1807c20b14a69c1ddc536c4ed0007062481e258d36c07e3be837537916b7f
-EBUILD gnome-autoar-0.3.3.ebuild 938 BLAKE2B 14ef901e62956cb84ccec0790971e83dc176e73b8da92d2e785bb8b0136132b5bfed43964139409f915b43babf27ab09f7ad5cb3eac9c0b4c454e6552cbb7c47 SHA512 70a9f7e15c9db87e4d56c089a407da0b97bc274bcf6a6deed93e9c16828e5f2e51ac0d8bca55b684e98784ca80fcc3af0d52ee6768b4b8b74bb522fb9096fdc5
-EBUILD gnome-autoar-0.4.0.ebuild 1116 BLAKE2B fbc98dd520c19bdd6c1d2286864ecd3c9965dbcadd1426e6b130a8f7338682cb8e7ea341329b508d7a0559c0dfc93ce42af350398b29c27d4d884e6434112458 SHA512 8963d363b36c87ce58771b5331884a84716c2b016dcc029758172f8e806112faf786c74553979df4cb8f39396f8cb160d5240df6a9bb981f01b7ba32db85a859
+DIST gnome-autoar-0.4.1.tar.xz 50152 BLAKE2B d54677ccd50898d9764e385dfbf27dc5c145aa2cc7b824594e69481f20de1ce34986855c1aba2efd86b4ad56b4261564895b217c58b661d2c20d50b4341fefa4 SHA512 5c082c42342256c3af9dfa49435c1ab884c051a9c47a0313a343a747c2f30de2662505f4d77db20dffbdd39a5d0447d2dfb4ccf3da96a198ea987bc5c0c0dddf
+EBUILD gnome-autoar-0.4.0.ebuild 1115 BLAKE2B a5fe8db17f66aa0846fb2b892062281285b2c4d63fc7a7f16550496ed80e2437e12c5409d4628ce6167ae43d3eab70489c22e451b7574c3801747eafb351ac65 SHA512 befc72f71575680a3b88085982901b8e6a5da3dfbcd528333417ef965ab63effc23299b27ed17ba49ca6ffaf791c0f74d3a9e087f5d55e29c6a0cefb0ec37114
+EBUILD gnome-autoar-0.4.1.ebuild 1095 BLAKE2B 79114c84364bba0d09a1ad9a113cfd2857c392bd0875efe9b72542aa706a87edd604062399af67d11b4b7ca454520425edcbc6cc7888a8bc8564d1ffddfcede0 SHA512 b20d6862d9c1eb3cbe1e47a859779b5c26df6d960051b115fdb6fe155f766db3f968c6055d7ff18f2914b17a0b5b121f2909a6b905c1ed4ef4f744086eb4ad68
 MISC metadata.xml 465 BLAKE2B 11413058ead980c52d3389e3aeb7daf756c4a39e3caddee888e4da23e32490e912debf6448ff4a7d0222132545ec9bea295018d9c438475cb920e24cada3d81c SHA512 082d48f638537b52bce8cd7dcf3ac68cbd01cc5f4ab2a6a4dacf25e28c062bcd6cf7f20cebb9f1ad23ed4ce33ee9dfd1e5bac59965ea200ed28c1bc095a3510d
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.4.0.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.4.0.ebuild
index 1023525fb55c..6d2b2020643a 100644
--- a/app-arch/gnome-autoar/gnome-autoar-0.4.0.ebuild
+++ b/app-arch/gnome-autoar/gnome-autoar-0.4.0.ebuild
@@ -15,7 +15,7 @@ IUSE="gtk gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection ) gtk-doc? ( gtk )"
 RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=app-arch/libarchive-3.4.0
diff --git a/app-arch/gnome-autoar/gnome-autoar-0.3.3.ebuild b/app-arch/gnome-autoar/gnome-autoar-0.4.1.ebuild
index 407c5ae032fb..6669c363ccf4 100644
--- a/app-arch/gnome-autoar/gnome-autoar-0.3.3.ebuild
+++ b/app-arch/gnome-autoar/gnome-autoar-0.4.1.ebuild
@@ -4,17 +4,18 @@
 EAPI=7
 VALA_USE_DEPEND="vapigen"
 
-inherit gnome2 vala
+inherit gnome.org meson 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 )"
+IUSE="gtk gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection ) gtk-doc? ( gtk )"
+RESTRICT="!test? ( test )"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=app-arch/libarchive-3.4.0
@@ -24,20 +25,24 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
-	>=dev-util/gtk-doc-am-1.14
 	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
 	vala? ( $(vala_depend) )
 "
 
 src_prepare() {
 	use vala && vala_src_prepare
-	gnome2_src_prepare
+	default
 }
 
 src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		$(use_enable introspection) \
-		$(use_enable vala) \
-		$(use_enable gtk)
+	local emesonargs=(
+		$(meson_use gtk)
+		$(meson_feature introspection)
+		$(meson_use vala vapi)
+		$(meson_use test tests)
+		$(meson_use gtk-doc gtk_doc)
+	)
+	meson_src_configure
 }
diff --git a/app-arch/tarsync/Manifest b/app-arch/tarsync/Manifest
index 05829ff60179..dfd9b37ef93d 100644
--- a/app-arch/tarsync/Manifest
+++ b/app-arch/tarsync/Manifest
@@ -2,6 +2,8 @@ AUX tarsync-0.2.1-gcc5.patch 2069 BLAKE2B eaa4c529c95caa2d70eda5c9a6901cc92ca3e8
 AUX tarsync-0.2.1-make.patch 295 BLAKE2B e8356136db5fa470d65691703c57a3fe86fc04857407cb99effe7a0aecfd0822dfbfcf37d6a6413c59d1aaef83df14b02e2d9342618cf849b90baddedaddab09 SHA512 ce1449e91dabb54f82535669010662237878c1e843c4f4505333cfdc4accd3c3923887f564c63ad3e5a91474878d05176103a83f65d9d82fde42ed3edf965bad
 AUX tarsync-0.2.1-symlink.patch 4136 BLAKE2B f62da5293228efe173631e14c4edccb61d3ad4ad922e293ee0af77ccc60258509ee22720045d8fd2cfbb58e781ab215c834bc6904ca8864d5a8134271c57a754 SHA512 b52f24b4d3c17178a25e2d1b9299bed06e398512d0d05f866828c207bbd578b344ff071acdd09e159812cc962ac7a1931462dc67c9347e4e286164115ccf29f4
 DIST tarsync-0.2.1.tar.bz2 13593 BLAKE2B 4841d501587c8d4932031fe939fce9f41019622af2a4253bfe12c01160956e7eaeebf5ff00174332dce6b17ae150ead42b7c1a57483f948ba191b5c3943f6596 SHA512 bebf8e495ad196c002414c41f9fe9737b5300de18b7c3b16576a7d3bfd94608f36f1b86cb6ed4879c600b71c7706255d9b2d4140b73c5743a473fa2500dbca2d
+DIST tarsync-0.2.2.tar.gz 21028 BLAKE2B 33aae739c990a85d8ce9458545b829743a3babd30890988f83d9ad6eebe96ffb48f872b5afb947fe58eb9156000513d65e299cdcc57ffc7e9cb12ee4d986b784 SHA512 88d7ca773538f7d2d612068ce9b6b4389d63e627a12f6377a7e7f397700d92eb29c6f4facc6b698454710e63808a3b4d6acc7901c6999dcca2de93c5d58a2622
 EBUILD tarsync-0.2.1-r1.ebuild 644 BLAKE2B 9acccec023866ba2fc292a39b3188223ad9da173551518a1b816805f9eff837154f978b4af2e4fe6469c5a3ee96cdd9d6b349ce600f1f78171ab56e090292e6c SHA512 7eca8c473f3f1e6970c954eea0fbccbb42859f60f3cd57a3f8ad650a5c301106e8a98b75fda2e6a64351eab39bfd23159a26d380e7ad453f37c7c1a9e44f7b7b
-EBUILD tarsync-0.2.1-r2.ebuild 681 BLAKE2B 1531a46317024f461dba4eac46e9eb6cf9b2041905acc9837f65970be01152baa90ad2d69df12e7f67c635f2ec8988e9ff693fbf62c1fcc65ba57493fd056cbd SHA512 9b47422ffeda01db5daa775c61870be96670fb0e1f59af1bd5c147527ba5dd65e6921820f1406c5ac6c6c3d4a0fcd6703dcac5acf9eb04d9162358b9981cd461
-MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
+EBUILD tarsync-0.2.1-r2.ebuild 678 BLAKE2B c709cba47641688a9aab6f63fd0478e52e68d04caa1d3e22000007d9a9204ce2c268968f0f33ce5d157c984de1d1f7380daa06b1fd3737301cdca875b599f83c SHA512 4534f46f4b398a68527258fcc217017a00d69e54bcc1ea7d8ee7dfe44021b4779d84fd1582924fa6c4cc3cea45d373510cdc486b51991ebaa4852cb97397f4d4
+EBUILD tarsync-0.2.2.ebuild 597 BLAKE2B 117855b4bda0bdc72235daf7e9cfd78a026bc9ce9cb30710ae1edbf8343bd950535174d40396fbd1223272bcfe24488641a6d9e82fb507494d36801580e80dff SHA512 f31dc11e5d9805635428d59b88dbb0a8fee054d6831477f947ea69ca9cee1b8b141cce306ee2f405566d318fea32258331852784eef32fe68bbda9a77cb194a7
+MISC metadata.xml 325 BLAKE2B 84d779f955a5e9df931a64e90d4928f1220a56ebdd2724d0b3c9d497027422b79981889b60eafeb1c1c477bb1dd307b3e7d05d8e3421e759ae608455e50fb8d1 SHA512 52f5e30499361af47838aa905320eb4f1c115d168c317961346589f846485f46b4dfebf2f64f97b25fcce156c795b3172012d6888a6f491059bc385fb3f14ba5
diff --git a/app-arch/tarsync/metadata.xml b/app-arch/tarsync/metadata.xml
index 85e4ed814fa2..96e679fe0172 100644
--- a/app-arch/tarsync/metadata.xml
+++ b/app-arch/tarsync/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">zmedico/tarsync</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-arch/tarsync/tarsync-0.2.1-r2.ebuild b/app-arch/tarsync/tarsync-0.2.1-r2.ebuild
index 295c7e7cbef1..03f32dcfee79 100644
--- a/app-arch/tarsync/tarsync-0.2.1-r2.ebuild
+++ b/app-arch/tarsync/tarsync-0.2.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux"
 
 DEPEND=">=dev-util/diffball-0.7"
 RDEPEND="${DEPEND}"
diff --git a/app-arch/tarsync/tarsync-0.2.2.ebuild b/app-arch/tarsync/tarsync-0.2.2.ebuild
new file mode 100644
index 000000000000..869ab23ff2c4
--- /dev/null
+++ b/app-arch/tarsync/tarsync-0.2.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Delta compression suite for using/generating binary patches"
+HOMEPAGE="https://github.com/zmedico/tarsync"
+SRC_URI="https://github.com/zmedico/tarsync/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux"
+
+DEPEND=">=dev-util/diffball-0.7"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin tarsync #make install doesn't support prefix
+	einstalldocs
+}
diff --git a/app-arch/unp/Manifest b/app-arch/unp/Manifest
index 272e730a1c02..bfdde100273c 100644
--- a/app-arch/unp/Manifest
+++ b/app-arch/unp/Manifest
@@ -1,8 +1,3 @@
-AUX unp-2.0_pre7_p1-remove-deprecated-have.diff 339 BLAKE2B 9d060bc629bfbd669f0effde2d31d7571ad71041a49a66da003c49a383fc119013a3aeac5c39c1ebfce0e9c0642d5c394d823cf9837b31c1d4172818ff403111 SHA512 c5e683398572889e4c09d3dfccf8847566421be5e3a56d086217ebbb70c17c4ca23c124cfe5d146e7e5b71e0ecce914575c1c50bdbc8438d3f00a6282790edca
-DIST unp_2.0~pre7+nmu1.tar.bz2 17537 BLAKE2B 7ef6cfcc524daf95c7cd9dc41ba690cb8db1b1983cd45709c8764591af36d6d00631975bfef0359ac633aae1c11b73efe827e367931f73fe7c5fcc8832b0fe84 SHA512 1b30f14c8d17e0a6b149ca4795f2219e9180f814347410e7ff7fa2b9720a9d308190f2ded8fcfd11bac9b5bb7a64ffd93f140bdaffcba1127f0e15e3d2737362
-DIST unp_2.0~pre8.tar.xz 16336 BLAKE2B 6c6ffd75acda980e6c572c48944b238788a64d2bf1f854b45a3bc468da19fc6e593a8b604d99dac51b5b645ec88b27300be6af4d988a56470812a7ae92f19336 SHA512 58d2a6a9f7fe868773273532b46249109e1e757517dd46e485f2b3a77fea404aeea34edf4460e76376806ae0d28baefa55f1063919bdf1493617f1b361fe6039
 DIST unp_2.0~pre9.tar.xz 16424 BLAKE2B 9042f48be0f80d5e40a08161a35c282ba458dc98cf13992835bdeecebd5fbadd33b3af9165738332cb9f508550a234a48d314332f00ecdacc808a8051eb0740b SHA512 74c9a6e143c9023bdd456dacff5c3a6e30722e259f324c066fe3eed9e4a09c38b399b381719c8677c2fa84434c1e7720384d782d97c098fa6fbcbdbf4030986e
-EBUILD unp-2.0_pre7_p1-r1.ebuild 1172 BLAKE2B cddeb95735206ca57233eaa8ffffc1515dddad87f69e793fc574ea0d27aa87074e54c6b6eb697017af8f00825345d396656fe722aecbfa16d9b5110d03075986 SHA512 683c391301bf4a30fb0889b17ff1b88c099c8755af8af1b198df162d7f22dda35479954f567f21dba797e4257982913b0b53d8600d0a5d42c3404c294e0bd411
-EBUILD unp-2.0_pre8.ebuild 1094 BLAKE2B b4edad448e7103c8aac65b3e0beb0ce5cfb3c5917fa9deff14e659023c781bdc4e9f0650ce796dd4a4b1e4a5c12de6df7bbfe930b109d7ae4de3ab7e428edffb SHA512 6c96e28e3a90eca55e8212b9f22528eded36d62362d3ff1280e3f161513cda44b42421b99c2697212850785450b9ee3dfcade15fadedb6d5cd9dfdcce02937c8
 EBUILD unp-2.0_pre9.ebuild 1092 BLAKE2B b34b85080761aa4bbb57c457578d3f230a97dfdcf3985b26515e913a99356537e77726f3f4f7e69305d5632ca214474f428c285b90301f741d73a584249ce4aa SHA512 61368e6fd722af9f2ab09f33eb7381f177afbc78948d8c45ec0f0424230ca3f5776bd7fd6bd5b4b590641ec33451720a674b016ce7420d02701caa09a161470a
 MISC metadata.xml 211 BLAKE2B 8a357a845c5cd7c1afeda19eefd020f5cab0b573e5a6914aa4a06c2b48261c7b86a5d72b96731cd78140f992d895cbb1d54ba70a1bb1485ae5a75bd7062e13c4 SHA512 9a2eeafd67a65fd9a667e31692033480c29f9250bfe5b54166130e805e3621c22d9eb9d0515b2622c220dc78255cb42c2ae6b6379070591164b1295441a4c12d
diff --git a/app-arch/unp/files/unp-2.0_pre7_p1-remove-deprecated-have.diff b/app-arch/unp/files/unp-2.0_pre7_p1-remove-deprecated-have.diff
deleted file mode 100644
index a0838a82559f..000000000000
--- a/app-arch/unp/files/unp-2.0_pre7_p1-remove-deprecated-have.diff
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -Naur unp-2.0~pre7+nmu1/bash_completion.d/unp unp-2.0~pre7+nmu1-1/bash_completion.d/unp
---- unp-2.0~pre7+nmu1/bash_completion.d/unp	2012-05-16 22:05:13.000000000 +0200
-+++ unp-2.0~pre7+nmu1-1/bash_completion.d/unp	2014-10-22 10:34:20.343233166 +0200
-@@ -1,6 +1,5 @@
- # bash completion for unp
- 
--have unp &&
- _unp()
- {
-     local cur
diff --git a/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild b/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild
deleted file mode 100644
index 8f553c28d614..000000000000
--- a/app-arch/unp/unp-2.0_pre7_p1-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="Script for unpacking various file formats"
-HOMEPAGE="https://packages.qa.debian.org/u/unp.html"
-TEMP_PV="${PV/_pre/$'\x7e'pre}"
-MY_PV="${TEMP_PV/_p/+nmu}"
-SRC_URI="mirror://debian/pool/main/u/unp/${PN}_${MY_PV}.tar.bz2"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-PATCHES=( "${FILESDIR}/${P}-remove-deprecated-have.diff" )
-
-src_compile() {
-	if use nls; then
-		strip-linguas -i .
-		if [ -n "$LINGUAS" ]; then
-			emake -C po MOFILES="${LINGUAS// /.po }.po"
-		else
-			emake -C po
-		fi
-	fi
-}
-
-src_install() {
-	dobin unp
-	dosym unp /usr/bin/ucat
-	doman debian/unp.1
-	dodoc debian/changelog debian/README.Debian
-	dobashcomp bash_completion.d/unp
-
-	if use nls; then
-		if [ -n "$LINGUAS" ]; then
-			emake -C po MOFILES="${LINGUAS// /.mo }.mo" DESTDIR="${D}" install
-		else
-			emake -C po DESTDIR="${D}" install
-		fi
-	fi
-}
diff --git a/app-arch/unp/unp-2.0_pre8.ebuild b/app-arch/unp/unp-2.0_pre8.ebuild
deleted file mode 100644
index 7a5455c5e2fe..000000000000
--- a/app-arch/unp/unp-2.0_pre8.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="Script for unpacking various file formats"
-HOMEPAGE="https://packages.qa.debian.org/u/unp.html"
-MY_PV="${PV/_pre/$'\x7e'pre}"
-SRC_URI="mirror://debian/pool/main/u/unp/${PN}_${MY_PV}.tar.xz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="nls"
-
-DEPEND="nls? ( sys-devel/gettext )"
-
-RDEPEND="${DEPEND}
-	dev-lang/perl"
-
-src_compile() {
-	if use nls; then
-		strip-linguas -i .
-		if [ -n "$LINGUAS" ]; then
-			emake -C po MOFILES="${LINGUAS// /.po }.po"
-		else
-			emake -C po
-		fi
-	fi
-}
-
-src_install() {
-	dobin unp
-	dosym unp /usr/bin/ucat
-	doman debian/unp.1
-	dodoc debian/changelog debian/README.Debian
-	newbashcomp debian/unp.bash-completion unp
-
-	if use nls; then
-		if [ -n "$LINGUAS" ]; then
-			emake -C po MOFILES="${LINGUAS// /.mo }.mo" DESTDIR="${D}" install
-		else
-			emake -C po DESTDIR="${D}" install
-		fi
-	fi
-}
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index 87037612800e..6c0e21760084 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -2,7 +2,7 @@ AUX xar-1.6.1-ext2.patch 693 BLAKE2B c73338104f93aef90474f1d3489cb8655be2c8c19a9
 AUX xar-1.8-arm-ppc.patch 589 BLAKE2B 0ff44d40149dd5ef974e38d1720793ddea30ff1047257755dd0fab0e1459f7cfff79f7eaa16668a67e99f52d56dc1637dba7ea29991bd29c4bf11f0ef4727768 SHA512 01de32828d30d9d99f338bb34747a5f978982dbcc2aefac9c5718b5283185fa5857cdd031c799e57607da5bff7dc3190bb4a93c737f2520c1034e959ee819377
 AUX xar-1.8-openssl-1.1.patch 1358 BLAKE2B 4e448107ce6aabb821e95e65863aa538cf8b2b63bf1f4d7b841a7ffc78712f307ddb2f8c78ecd573e5e7b3169d70ccae209acca9513d8446b2f785af368b6955 SHA512 2fb90f5f6e412ed31b8cf9aa23aa9b844baf683d357e647d33c2c6318656dd6e6f3027a1715ed916815e3fd75d51d2f178845c2c6b247797d37cc4f539116f85
 AUX xar-1.8-safe_dirname.patch 392 BLAKE2B 8bf3e2104fb4249ca9ba313f7ae1d6fc03a6d29ec1bccaf78b48696f44c7d88d3186c7c2078eb7b18b3fe1756949d527ce9a39b6dccd34e9e26fa11f72dcb4c5 SHA512 129412c27717bbb7ae3620c9ba221c7beae78e611e88ec6da1c572cdbc7905d60062710bbd37270fb78735248f6debf9a6b00ff0f9cc14470ac53717f00e463c
-AUX xar-1.8.0.0.452-linux.patch 2612 BLAKE2B 6503ff16de09dadb75ab3e06a7909729f590e31dca2e2aa831f404cee8961f21d9d1d2194c42fd831201ddb8a3054703b409f980b333baf879abd2ec1c14db09 SHA512 db7bb0c8b3c9bc2481b85e3cba5308216d370ce692746c1d9e5430c08481710c061eb4dc25625612c414087d1e9e18f0628bd5ffe272d16f561e8506376322a4
+AUX xar-1.8.0.0.452-linux.patch 2763 BLAKE2B 1d8d5739c16a7693771303bf4e5f04c1f2a676e38b95cdff7c4c338a776acdba7da9199a2a7021df783ef5cb1a746758aa2c7b10ee6f0f616526c9c15e3209d3 SHA512 1296805ba982d44f6654966ebb69a64e82e6085523c76244a94b025530456db22b9b163814b4202ff21e16aadd68a5817b52771133b41ab985a23e8872c25b4e
 DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b01500eac4b951e04cf7b18e84e0d508ac5471996796e5ab59e4628a4f85a63a5929b372555e28b222c77ab1 SHA512 c54850d5443c776f18d788bf7d026b3b08274ee71321d1615238c9fa2d20cc0b21f3f298364b0d0eecd98ce2a6efc8d5039cabd5a21c2419c430d90db004d159
 DIST xar-417.1.tar.gz 219350 BLAKE2B 2ca073e52b8d7a12c3d33fb65ccaf0984b912f42e4e9dc52bcaec7af41bafcc530cd055da16646113fb24ee046122425a66351f88279ef79a0f0b2b04ae51f9a SHA512 4c3c61f5289d0b2e380cbde772b383da369ca8ad046f5d779e02f59300288c90c5e31d105a2c01ac17dc719b8b46b55d8d36a8b3b20360f315766fce92dec762
 DIST xar-452.tar.gz 220690 BLAKE2B 9728c73734a4bcb31e6e72d3d1a6735d5c78e384e15415641c4f40068f2da9498e9808cc36df6eaf7d3addf8be6d9eb90bdfa2900321e4dbe482156075bcdcd7 SHA512 d6ae9e5687020d20ec12579178f84c852fd485c52cff0ad23b7b31d2eabbde8c7fc85ab33e82eb81a5ddb59df4c26b756894be85061195cd191ab32be1f56b10
diff --git a/app-arch/xar/files/xar-1.8.0.0.452-linux.patch b/app-arch/xar/files/xar-1.8.0.0.452-linux.patch
index a9e9575c400e..ccfc68369a43 100644
--- a/app-arch/xar/files/xar-1.8.0.0.452-linux.patch
+++ b/app-arch/xar/files/xar-1.8.0.0.452-linux.patch
@@ -35,6 +35,15 @@
  
 --- a/lib/util.c
 +++ b/lib/util.c
+@@ -35,6 +35,8 @@
+  * Christopher Ryan <ryanc@apple.com>
+ */
+ 
++#include "config.h"
++
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <sys/types.h>
 @@ -40,6 +40,9 @@
  #include <sys/types.h>
  #include <sys/mount.h>