gentoo resync : 08.10.2021

18 files changed, 186 insertions, 336 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index d906075f17f8..f94bfffc8ffe 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index bd28d9a036d0..9b499910c9d4 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1,7 +1,5 @@
 AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649de9bfe9cbf445216d4e9d6a6e34dc065008d0129892240c98bcb6e7beb5443d4c459a1bb77eff664f7245 SHA512 04d5505074e042eca46a8dfd9d9a3a2c9af901d9bf7d98c219e8e1f8c9b9071bccbddfa3e17e86800de2606a10b26dc05d69948cd84ddd3075d6c1c51991bcc2
 DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
-EBUILD brotli-1.0.9-r1.ebuild 1770 BLAKE2B 3e1589455d366aacf95ac7cf48c7fb76c844460b726ec041102335205b25097284b4ce4c204aefdaaadeaef57bb6e9fe6063338e31a5dbaedb13273a40e13ea1 SHA512 cd9d7cb565277e28c162856eeed8a2ab014cb195843e4ae29ceec8831a13fab8648f7042343bca9a5373677ebe81596243688da56464981e1a68c78be964bd08
-EBUILD brotli-1.0.9-r2.ebuild 1856 BLAKE2B 56f37ad8638ef04d7f2bd28cc757801a534eafa2bcf4aa5d8b5ac54767c302d1455871c1348899fa81108ab61cb2ae39155f08a948d63c9dadfabb67fa182238 SHA512 72ecc2a919d1b7f2ceb4be62981b8a0df5acc9a90b5e43b7e0b309f48ade958059ae110d4bdff94dbf07751e46aa3bae2e6e6f8fad9fccc4a3b7ef93339bcdfb
-EBUILD brotli-1.0.9-r3.ebuild 1781 BLAKE2B a87c935f8845fc9718c1add34902ba3bc3b2aaf9b7ea42a92265c602110156c305fa78a3bdcc706bbde61cafb32e603665c63b960f36e2fdf5f25738ade8985f SHA512 e10224e5e7504a92f7b7f86ef7ebcd48b99174c95bbc9cd1720709dbee74dbb0ae13603fbc718725402e3e600d80e028d2bb95e9b09c4f5a88fc0e920d28bac3
+EBUILD brotli-1.0.9-r3.ebuild 1773 BLAKE2B 868b591fe739315e4335470d237596ae81f759db9e903334a22897366c1bceaa56878e30a2493b2f23c8ab7c756a0ef9190a057d7f98545875ce70f803a75cc4 SHA512 0eec5e45e5834416121302611cf603b55db9e989b92b1445e9eeaad7555dfc6904c74c6e9e99857492a89e701b999db7e969a229556f63bc900b3d823ba4a6f1
 EBUILD brotli-9999.ebuild 1668 BLAKE2B 8488813fa150cf4b671b3f28417f557dfdf1c76bd5f903d50b01efa00f3b847032ba306626943b275420e4ec8e097a09f27a2c99fde9c1f2f1a78f4f98b95bb9 SHA512 e51d138cde35e1170376687bcde5334ab9aa5305c91119cbcacf140c84c1afaedae829b13503c7b184c80b2fa5cbb593cd42172d1ef52541b804a5b4812e25f8
 MISC metadata.xml 687 BLAKE2B 938125e16f4cd24075ce4c1bd57205def9244b21e1a07c90401af301bd00b4468190060acddccd02367dfb2e70f9ee9a1503794704172d6851554b550febb9c1 SHA512 930cacd9d5ea0665cfe93948a1b651a3974938c1513acb76fd0c4bd651c4aa26b1157ffae7257499235c4f4ef835ba5118f3986423b5c7905d3c32886ec31540
diff --git a/app-arch/brotli/brotli-1.0.9-r1.ebuild b/app-arch/brotli/brotli-1.0.9-r1.ebuild
deleted file mode 100644
index d03b1d78ade1..000000000000
--- a/app-arch/brotli/brotli-1.0.9-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_OPTIONAL="1"
-DISTUTILS_IN_SOURCE_BUILD="1"
-
-inherit cmake-multilib distutils-r1
-
-DESCRIPTION="Generic-purpose lossless compression algorithm"
-HOMEPAGE="https://github.com/google/brotli"
-
-SLOT="0/$(ver_cut 1)"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-
-IUSE="python test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-LICENSE="MIT python? ( Apache-2.0 )"
-
-DOCS=( README.md CONTRIBUTING.md )
-
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/google/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-# tests are currently broken, see https://github.com/google/brotli/issues/850
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-linker.patch"
-)
-
-src_prepare() {
-	use python && distutils-r1_src_prepare
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake-utils_src_configure
-}
-src_configure() {
-	cmake-multilib_src_configure
-	use python && distutils-r1_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-}
-src_compile() {
-	cmake-multilib_src_compile
-	use python && distutils-r1_src_compile
-}
-
-python_test() {
-	esetup.py test || die
-}
-
-multilib_src_test() {
-	cmake-utils_src_test
-}
-src_test() {
-	cmake-multilib_src_test
-	use python && distutils-r1_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-multilib_src_install_all() {
-	use python && distutils-r1_src_install
-}
diff --git a/app-arch/brotli/brotli-1.0.9-r2.ebuild b/app-arch/brotli/brotli-1.0.9-r2.ebuild
deleted file mode 100644
index 73fbca2867f7..000000000000
--- a/app-arch/brotli/brotli-1.0.9-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-DISTUTILS_OPTIONAL="1"
-DISTUTILS_IN_SOURCE_BUILD="1"
-
-inherit cmake-multilib distutils-r1
-
-DESCRIPTION="Generic-purpose lossless compression algorithm"
-HOMEPAGE="https://github.com/google/brotli"
-
-SLOT="0/$(ver_cut 1)"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-
-IUSE="python static-libs test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-LICENSE="MIT python? ( Apache-2.0 )"
-
-DOCS=( README.md CONTRIBUTING.md )
-
-if [[ ${PV} == "9999" ]] ; then
-	SRC_URI=""
-	EGIT_REPO_URI="https://github.com/google/${PN}.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-# tests are currently broken, see https://github.com/google/brotli/issues/850
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PV}-linker.patch"
-)
-
-src_prepare() {
-	use python && distutils-r1_src_prepare
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING="$(usex test)"
-	)
-	cmake-utils_src_configure
-}
-src_configure() {
-	cmake-multilib_src_configure
-	use python && distutils-r1_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-}
-src_compile() {
-	cmake-multilib_src_compile
-	use python && distutils-r1_src_compile
-}
-
-python_test() {
-	esetup.py test || die
-}
-
-multilib_src_test() {
-	cmake-utils_src_test
-}
-src_test() {
-	cmake-multilib_src_test
-	use python && distutils-r1_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	use static-libs || rm "${ED}"/usr/$(get_libdir)/*.a || die
-}
-multilib_src_install_all() {
-	use python && distutils-r1_src_install
-}
diff --git a/app-arch/brotli/brotli-1.0.9-r3.ebuild b/app-arch/brotli/brotli-1.0.9-r3.ebuild
index 2b3a1620cf76..71cd23501c5a 100644
--- a/app-arch/brotli/brotli-1.0.9-r3.ebuild
+++ b/app-arch/brotli/brotli-1.0.9-r3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/app-arch/gnome-autoar/Manifest b/app-arch/gnome-autoar/Manifest
index 277904d728bb..a7ecec0ae324 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 1118 BLAKE2B 0c56bfc85c93c78715cd5e5b61539fa7f7fc85ea68f96824a86a16b4144416ddf7d8a7d08ceddea8b530b27a0ea170a4996fb9bf2b649dbef4e635bb59a12477 SHA512 f932b2a68b3f969eb83a36e2371f5877903a1c66d2ebe5b47b714164ff7e47d1662336a4ea77ea245c83e58a8d990f1afb3af77a55cd5171a0db7548df304cfb
+EBUILD gnome-autoar-0.4.0.ebuild 1116 BLAKE2B fbc98dd520c19bdd6c1d2286864ecd3c9965dbcadd1426e6b130a8f7338682cb8e7ea341329b508d7a0559c0dfc93ce42af350398b29c27d4d884e6434112458 SHA512 8963d363b36c87ce58771b5331884a84716c2b016dcc029758172f8e806112faf786c74553979df4cb8f39396f8cb160d5240df6a9bb981f01b7ba32db85a859
 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 d076830bfd4d..1023525fb55c 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/rpm/Manifest b/app-arch/rpm/Manifest
index 5e1c1cf984fc..6a94f155436b 100644
--- a/app-arch/rpm/Manifest
+++ b/app-arch/rpm/Manifest
@@ -3,4 +3,4 @@ AUX rpm-4.16.1.3-libdir.patch 1152 BLAKE2B b54191dbe36af115b828fc111cea0348ed7ed
 AUX rpm-4.8.1-db-path.patch 628 BLAKE2B 69ac0d4541c4d6e74fd716529c4cfd482432d400f84f39775bd585931e786acf45ab7a1da617f0214dcba90c78511ca22fc556896ae1963ec9160787fdaab902 SHA512 12539bbeda99d261890d50304945c7f022681ca0a283c70f17a6b1f188e9e24e9ce05b71d541ed6d951f94576b5183c49c4db784d5016d075a859c1e4dcb9005
 DIST rpm-4.16.1.3.tar.bz2 4354652 BLAKE2B 10013014bdeaf908b64c90f8e76f1d4b0cd0e8cb926f0cd979d7b1e1963b9a25c5b98531deea7e74e00168e2e6349f443fa4578c69c717ca1ab5e6b79d801f3a SHA512 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e
 EBUILD rpm-4.16.1.3.ebuild 3642 BLAKE2B 20e3eebb5667d0367ae7d40892a0898c093e81a5d06a7e663b662bdbe93a9b1f8e5c9c48295ad5ca0aa49d2ff14974c79453d9625fc1ab607f818a02ccdd976a SHA512 092048f92e01f0c8aa7f42ee16a416fd3119b9571bf59f8c27a89e4bf328ac1ee56e2200d3ba227c2caaeafe86c3bc21817a34b603d0a3e0e56b1266a8008604
-MISC metadata.xml 338 BLAKE2B fb644a577f6635c7d7693a23ac0a9454aa11d00ebef65ad8fd873b79be49eace9a0736b3bc0352063fe197a0da22746a696dd235d871bc49f775df0db6ff6681 SHA512 d6f07385a4a0016a5c69986eba5492e603cc9484b3d356dc88650b00ea94c30523f3acaa37ba1c22f24a8a1a8363c93d0da3e12adb1ac365541ba1692aa42525
+MISC metadata.xml 260 BLAKE2B 00f83151d62c157bea18101b36007f01e6da9d16d438671c37b929b1e19cfc202f379816a1b0d9e3faea99c44a43f97a5d43100266c683487dabba09f1378eea SHA512 d6fc386bd5be91d5dff3d7aa514f4d72e7301a47f888db95573d72505ee86987ae6412fdd8aec82842c006abe831d99f6178b1ac78a04a7dbf9e5bce1d249cb7
diff --git a/app-arch/rpm/metadata.xml b/app-arch/rpm/metadata.xml
index 7ec0027c0aa8..43a5b10a145b 100644
--- a/app-arch/rpm/metadata.xml
+++ b/app-arch/rpm/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>chainsaw@gentoo.org</email>
-		<name>Tony Vroon</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">rpm-software-management/rpm</remote-id>
 	</upstream>
diff --git a/app-arch/tarsync/Manifest b/app-arch/tarsync/Manifest
index 788bf7152f10..05829ff60179 100644
--- a/app-arch/tarsync/Manifest
+++ b/app-arch/tarsync/Manifest
@@ -1,5 +1,7 @@
 AUX tarsync-0.2.1-gcc5.patch 2069 BLAKE2B eaa4c529c95caa2d70eda5c9a6901cc92ca3e885a0fd2ef3c4df1a6e53d6b1febe8aba4a043844dd31334aea0d58df964152c1245cccdc112658d2bdc229cf1e SHA512 f62fa7f65e506d34d6f9a90579cda2e0568da55cd11c0926dc8f39b5f3d0f4952e6984bd4b6913f3bff938271d37e689e2b8168f393382a04ae269aafbebcd8c
 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
 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
diff --git a/app-arch/tarsync/files/tarsync-0.2.1-symlink.patch b/app-arch/tarsync/files/tarsync-0.2.1-symlink.patch
new file mode 100644
index 000000000000..cb0efd01b1ba
--- /dev/null
+++ b/app-arch/tarsync/files/tarsync-0.2.1-symlink.patch
@@ -0,0 +1,139 @@
+From 6654d41a14da2fc521e889f01669f0dbb89aef15 Mon Sep 17 00:00:00 2001
+From: Zac Medico <zmedico@gentoo.org>
+Date: Tue, 5 Oct 2021 23:21:53 -0700
+Subject: [PATCH] Symlink support
+
+Bug: https://bugs.gentoo.org/815823
+Signed-off-by: Zac Medico <zmedico@gentoo.org>
+---
+ main.c | 37 +++++++++++++++++++++++++++++++++++--
+ tar.c  | 16 ++++++++++++++--
+ tar.h  |  2 ++
+ 3 files changed, 51 insertions(+), 4 deletions(-)
+
+diff --git a/main.c b/main.c
+index 2c2da3e..448a9d0 100644
+--- a/main.c
++++ b/main.c
+@@ -257,7 +257,14 @@ main(int argc, char **argv)
+ 	// no need to seek.  cfile handles resetting streams as needed
+ 	
+ 	for(x=0; x < missing_count; x++) {
+-		if(copy_whole_file(&tar_cfh, missing[x]) != 0) {
++		if (missing[x]->type == SYMTYPE) {
++			if(copy_symlink(&tar_cfh, missing[x]) != 0) {
++				v0printf("failed transfering symlink %s\n", missing[x]->fullname);
++				exit(9);
++			}
++			continue;
++		}
++		else if(copy_whole_file(&tar_cfh, missing[x]) != 0) {
+ 			v0printf("failed transfering file %s\n", missing[x]->fullname);
+ 			exit(9);
+ 		}
+@@ -673,6 +680,8 @@ int
+ check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st)
+ {
+ 	int type;
++	unsigned char linkname[TAR_LINKNAME_LEN];
++	ssize_t linkname_len;
+ 	type = convert_lstat_type_tar_type(de->d_name, st);
+ 	if(type < 0)
+ 		return -1;
+@@ -682,6 +691,15 @@ check_existing_node(const struct dirent *de, const tar_entry *t, struct stat *st
+ 		return 2;
+ 	if(REGTYPE == type && (st->st_size != t->size || (check_mtime && t->mtime != st->st_mtime)))
+ 		return 3;
++	if (SYMTYPE == type) {
++		if ((linkname_len = readlink(de->d_name, linkname, TAR_LINKNAME_LEN)) == -1) {
++			return -1;
++		}
++		if(strncmp((const char *)linkname, (const char *)t->linkname, linkname_len) != 0) {
++			remove_node(de->d_name, st);
++			return 3;
++		}
++	}
+ 	return 0;
+ }
+ 
+@@ -703,7 +721,22 @@ enforce_owner(const char *path, const tar_entry *t, struct stat *st)
+ 	}
+ 	return 0;
+ }
+-	
++
++int
++copy_symlink(cfile *tar_cfh, const tar_entry *ttent)
++{
++	v1printf("creating %s\n", ttent->fullname);
++
++	if (symlink(ttent->linkname, ttent->fullname) != 0) {
++		v0printf("failed creating symlink %s -> %s\n", ttent->fullname, ttent->linkname);
++		return -1;
++	}
++	if(lchown(ttent->fullname, ttent->uid, ttent->gid) != 0) {
++		v0printf("failed chown'ing %s\n", ttent->fullname);
++		return -1;
++	}
++	return 0;
++}
+ 
+ int
+ copy_whole_file(cfile *tar_cfh, const tar_entry *ttent) 
+diff --git a/tar.c b/tar.c
+index 42dc8e7..514e5fb 100644
+--- a/tar.c
++++ b/tar.c
+@@ -214,8 +214,7 @@ read_entry(cfile *src_cfh, off_u64 start, tar_entry *entry)
+ 		case AREGTYPE:
+ 			entry->type = REGTYPE;	break;
+ 		case SYMTYPE:
+-			v0printf("symlinks not supported\n");
+-			entry->type = TTAR_UNSUPPORTED_TYPE; break;
++			entry->type = SYMTYPE; break;
+ 		case LNKTYPE:
+ 			v0printf("hardlinks not supported!\n");
+ 			entry->type = TTAR_UNSUPPORTED_TYPE; break;
+@@ -242,6 +241,17 @@ read_entry(cfile *src_cfh, off_u64 start, tar_entry *entry)
+ 	if(get_uid(block + TAR_UNAME_LOC, &entry->uid))
+ 		entry->uid = octal_str2long(block + TAR_UID_LOC, TAR_UID_LOC);
+ 
++	if (entry->type == SYMTYPE) {
++		name_len = strnlen((char *)block + TAR_LINKNAME_LOC, TAR_LINKNAME_LEN);
++		if((entry->linkname = (char *)malloc(name_len + 1)) == NULL){
++			v0printf("unable to allocate needed memory, bailing\n");
++			return MEM_ERROR;
++		}
++		memcpy(entry->linkname, block + TAR_LINKNAME_LOC, name_len);
++		entry->linkname[name_len] = '\0';
++		entry->linkname_len = name_len;
++	}
++
+ //	if(entry->end % 512)
+ //		entry->end += 512 - (entry->end % 512);
+ 	return 0;
+@@ -256,6 +266,8 @@ convert_lstat_type_tar_type(const char *path, struct stat *st)
+ 	if(S_ISREG(st->st_mode)) {
+ 		if(st->st_nlink == 1)
+ 			return REGTYPE;
++	} else if(S_ISLNK(st->st_mode)) {
++			return SYMTYPE;
+ 	} else if(S_ISDIR(st->st_mode))
+ 			return DIRTYPE;
+ 
+diff --git a/tar.h b/tar.h
+index e9d9ee9..95f957c 100644
+--- a/tar.h
++++ b/tar.h
+@@ -78,6 +78,8 @@ typedef struct {
+ 	off_u64			size;
+ 	unsigned int	fullname_len;
+ 	char			*fullname;
++	unsigned int	linkname_len;
++	char			*linkname;
+ 	time_t			mtime;
+ 	uid_t			uid;
+ 	gid_t			gid;
+-- 
+2.32.0
+
diff --git a/app-arch/tarsync/tarsync-0.2.1-r2.ebuild b/app-arch/tarsync/tarsync-0.2.1-r2.ebuild
new file mode 100644
index 000000000000..295c7e7cbef1
--- /dev/null
+++ b/app-arch/tarsync/tarsync-0.2.1-r2.ebuild
@@ -0,0 +1,34 @@
+# 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://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux"
+
+DEPEND=">=dev-util/diffball-0.7"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-make.patch
+	"${FILESDIR}"/${P}-gcc5.patch
+	"${FILESDIR}"/${P}-symlink.patch
+)
+
+src_configure() {
+	tc-export CC
+}
+
+src_install() {
+	dobin tarsync #make install doesn't support prefix
+	einstalldocs
+}
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 37683eb189a1..cfa11cec02a5 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,9 +1,5 @@
 AUX unrar-5.5.5-honor-flags.patch 1211 BLAKE2B 8104ac7bf12579218e71147865823da40c3c534a1a13a26f1e59712bfea10c6664a0efce1aff95bd28f35dfb8a50561ff32785416c40c155f047a2368dd76f2d SHA512 a91bc7f4af17fa3a72e6dbd6276afae181554184e8b9ba34c52235d69890ac1e68350d9c14ba7cd207c71220963a26cf1169b965258992cf3b79ec71537c2569
 AUX unrar-5.9.3-build.patch 943 BLAKE2B 1f482772b491269413e11e600e049ed608ccb4b0b0271d43d3df43849cbcfe60a4fd4546fb5e69dbe95d6729b344f705b97483a5bc0c1d11edc21ce8e08bca6b SHA512 b6d3e5c6bf0e3605c3390b97bdd1f0747fff32eb7780a7ec967421841203a6cacb42ce16041bec84f88fa1eb2fd15b9235da1f37d517c9e7d876034a5bd79466
-DIST unrar-6.0.4.tar.gz 232379 BLAKE2B 39382eeb71cafdeaa608ef497c44cd88d950d761e5c8395a224b2bdd530328a0060dec658aec943f9af8e135ce29cf86c3522ed17799f869cd0d84cbd7acc74a SHA512 9d2beb39fa0e3c60298b482967f1ae51d8a6531c88f5b8b053cc8905c033c0235cabb776d8449f9d96da6b81946167b84d19acdf93dda7ada14cc3c53bb7df19
-DIST unrar-6.0.5.tar.gz 232702 BLAKE2B 8e33d116ae9de06818379f4303241dd7f44ba319619829d0eb2c9257b3fd27e473b636d40edd6049a1ff096ea722fee0a71bf145456923b2664087dbf7d4554d SHA512 cd6d9b316a2daf2f3f81b28b4d6054cbe7ca9a7e39087a5dc7e4c554e5d5590b395243f03f019bf358e127be48dd219e827fdb6af7543305a52c3f87f6e32dd7
 DIST unrar-6.0.7.tar.gz 232903 BLAKE2B eba5179f622726046fabedac03e8c05f7dd2f64782dc0be18010deb22c1036b895cbb9429f44239e63d9c04f3e031b4f9787462f4f643f8bca11b135de08f547 SHA512 2c50d1f58f5189e59dad36eb25aa50a34572f583242e624846c9791c5609e83d4ee76314d785771fe514ec3378749dcb86e4c97a8d2a3ab7b469df49a5c5f412
-EBUILD unrar-6.0.4.ebuild 1862 BLAKE2B 785443182da522d483e6efbcf32999755ff897d36bb1f59c8b77d57a7060348759cccaf653af7a017149a927215cecbe78179c85389e2b9e1df1a18e1b83a805 SHA512 4c887ff1f51183c96b76cbdd62774bf74fd98e53f48bee5a948fa84e91fb87d4f1724efabdeab40b2f7d4cb1b59c97774aabebe4899a146067f485b842d1b6d4
-EBUILD unrar-6.0.5.ebuild 1863 BLAKE2B a151fcc7bcc6e015450a00216793be440c50241726aa0c238c246e8708afb3976dbb548d7de9eaf5f8842a46ad283aaf41593211bb57a60169b08d974d6f7ef2 SHA512 27de8a6deac82faab6419b01651c7f24d69a3c430614b75c304fee9477d4cece38d5791a0afa9326a70dc1f8cc8682f61daf858e7458d62772da71948285c9ff
-EBUILD unrar-6.0.7.ebuild 1869 BLAKE2B ad08b4b9b3daa9ba6cdbf1521062ededebcdf40810a09df5544ed10bbaaf2d4a4fb15edaf76251620e6ceff9e54f08fd4c1613562b3a26a677b098b8b3523ae7 SHA512 02bf1ae593aba1be9fc0910ee6076878639b133527180decb4889fd8defd93e5faef42869f2bb5d5fb2e143e340e807a74d28892f8acc164daee4217183596f2
+EBUILD unrar-6.0.7.ebuild 1819 BLAKE2B 09a83ed35afafe32d2558bf4a86a08f8158f869f56a8f7db2f8687e777edf24ff9a325c2a493ac34048ac590d8bf67fd9b675a0c07caed9e3284f6f8802194ba SHA512 47304020560aaad41a062245c4a181eaf48de5f21cb90927915b2d001f96586309b585d7a862dba6d7b497d813418a0277f4b5ee355a388ea518fda7779defc6
 MISC metadata.xml 521 BLAKE2B bf6d200d054dac732bfbb968ccb376a62230e0d2948a42c6c94ecb6823407877edbf3ec98f33ea21c22ea52b13b32dec508576dccfa34d4948de79741f863882 SHA512 2a4bac4e32c01b93d51cee66abd62f227f1f4b3c57a1d4e3e325724d349508107bf1a078282bcdc5fb5481058cf657040c697a3ff939fb8146f24fce7938eb4d
diff --git a/app-arch/unrar/unrar-6.0.4.ebuild b/app-arch/unrar/unrar-6.0.4.ebuild
deleted file mode 100644
index adc92be38a0c..000000000000
--- a/app-arch/unrar/unrar-6.0.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-MY_PN="${PN}src"
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="https://www.rarlab.com/rar_add.htm"
-SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="unRAR"
-# subslot = soname version
-SLOT="0/6"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S="${WORKDIR}/unrar"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.9.3-build.patch
-	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
-)
-
-src_prepare() {
-	default
-
-	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
-	else
-		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
-	fi
-	sed -i "${sed_args[@]}" makefile || die
-}
-
-src_configure() {
-	mkdir -p build-{lib,bin} || die
-	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
-	cp build-{lib,bin}/Makefile || die
-}
-
-src_compile() {
-	unrar_make() {
-		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
-	}
-
-	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
-
-	unrar_make -C build-bin
-}
-
-src_install() {
-	dobin build-bin/unrar
-	dodoc readme.txt
-
-	dolib.so build-lib/libunrar*
-
-	insinto /usr/include/libunrar${PV%.*.*}
-	doins *.hpp
-	dosym libunrar${PV%.*.*} /usr/include/libunrar
-
-	find "${ED}" -type f -name "*.a" -delete || die
-}
diff --git a/app-arch/unrar/unrar-6.0.5.ebuild b/app-arch/unrar/unrar-6.0.5.ebuild
deleted file mode 100644
index e7805e6a50aa..000000000000
--- a/app-arch/unrar/unrar-6.0.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib toolchain-funcs
-
-MY_PN="${PN}src"
-
-DESCRIPTION="Uncompress rar files"
-HOMEPAGE="https://www.rarlab.com/rar_add.htm"
-SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="unRAR"
-# subslot = soname version
-SLOT="0/6"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S="${WORKDIR}/unrar"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.9.3-build.patch
-	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
-)
-
-src_prepare() {
-	default
-
-	local sed_args=( -e "/libunrar/s:.so:$(get_libname ${PV%.*.*}):" )
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed_args+=( -e "s:-shared:-dynamiclib -install_name ${EPREFIX}/usr/$(get_libdir)/libunrar$(get_libname ${PV%.*.*}):" )
-	else
-		sed_args+=( -e "s:-shared:& -Wl,-soname -Wl,libunrar$(get_libname ${PV%.*.*}):" )
-	fi
-	sed -i "${sed_args[@]}" makefile || die
-}
-
-src_configure() {
-	mkdir -p build-{lib,bin} || die
-	printf 'VPATH = ..\ninclude ../makefile' > build-lib/Makefile || die
-	cp build-{lib,bin}/Makefile || die
-}
-
-src_compile() {
-	unrar_make() {
-		emake AR="$(tc-getAR)" CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" STRIP=true "$@"
-	}
-
-	unrar_make CXXFLAGS+=" -fPIC" -C build-lib lib
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname) || die
-	ln -s libunrar$(get_libname ${PV%.*.*}) build-lib/libunrar$(get_libname ${PV}) || die
-
-	unrar_make -C build-bin
-}
-
-src_install() {
-	dobin build-bin/unrar
-	dodoc readme.txt
-
-	dolib.so build-lib/libunrar*
-
-	insinto /usr/include/libunrar${PV%.*.*}
-	doins *.hpp
-	dosym libunrar${PV%.*.*} /usr/include/libunrar
-
-	find "${ED}" -type f -name "*.a" -delete || die
-}
diff --git a/app-arch/unrar/unrar-6.0.7.ebuild b/app-arch/unrar/unrar-6.0.7.ebuild
index 4aaef633085b..a91ac4b72b8c 100644
--- a/app-arch/unrar/unrar-6.0.7.ebuild
+++ b/app-arch/unrar/unrar-6.0.7.ebuild
@@ -10,16 +10,12 @@ MY_PN="${PN}src"
 DESCRIPTION="Uncompress rar files"
 HOMEPAGE="https://www.rarlab.com/rar_add.htm"
 SRC_URI="https://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/unrar"
 
 LICENSE="unRAR"
-# subslot = soname version
-SLOT="0/6"
+SLOT="0/6" # subslot = soname version
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 
-RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417"
-
-S="${WORKDIR}/unrar"
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.9.3-build.patch
 	"${FILESDIR}"/${PN}-5.5.5-honor-flags.patch
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 4c7ca0757f25..0862a78693a0 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,5 +1,5 @@
 DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133
 DIST zstd-1.5.0.tar.gz 1867111 BLAKE2B e503d17478b94128eb3ec578178f9d7023e941434dcc07790e12fd6c9933518f34fba5d7795ab7b145e4e499597644a6edd2830106649c5a749c962d5afe2f31 SHA512 25b657529a698eec891f92ff4a085d1fd95d2ff938ce52c8a4ff6163eb0b668ec642dd09e0db190652638cd92371006afa01d8e437437762c4097ad301675c33
 EBUILD zstd-1.4.9.ebuild 1676 BLAKE2B 31a1c1f3b06f03aee1f79be98fd352ebc850cf763a5fca287810fae13042587d434e28f1826e0e86194bffeadb60704d9b36f0b0036aa72a51fa7be11257e814 SHA512 b878ad96130da9450c92597354335b294b24341c6ac0b8f236f9bcd55efda8c46f700f0571ac80822da34a5b854d463d02cf8707ea1e7b3b2b713a6f6924025c
-EBUILD zstd-1.5.0.ebuild 1670 BLAKE2B 4ecc7d03f5dd84ea8d21325d79e605e0240a97b437aa89f086b29f70236c91122021e793e02c96481e6ff44b2aedca24d56fbc5bcac016f54016e3a65afa1c3f SHA512 f5556bfc7c0118b6a757b464d905e59cdbbf8de0739f1816b17fcff7c12eee6576c834f78408a3c9253615bcf5e967f8a9d4bf6183399a9d24549df64bfc6f96
+EBUILD zstd-1.5.0.ebuild 1441 BLAKE2B 3492aa70c3b9084c52c638053629bba1684ffa32418f5d692662f4458a84734920c0c0685513bf37dcd215231b4ba7ab851a71b9c25404f2c609a9aa64a3f6b0 SHA512 90850faeef55f62dcab40e44c4364caca16232affbe7b3a2214eda840ccd243b7d44ed630d7a7b71285638e07517f1ec4cb2b0ba25247bc4b4cc057bb2566844
 MISC metadata.xml 410 BLAKE2B c8c6cf3dc2e96b8d70bc199c8691f57fe43c561c3bdbeb71e49fc13f205bdf673e96e58d530b2e18c8ad2b99cd047ba5934437fda7828fe6ba177f5badc72a93 SHA512 3973ebd433d598c05023af411bbbb26b0f097d66e34c22fdcd31479ccc68c5a7bb318c29067a94de07ead566c5eec397d12b70a15d99e53ba08e6e9c999b61cf
diff --git a/app-arch/zstd/zstd-1.5.0.ebuild b/app-arch/zstd/zstd-1.5.0.ebuild
index da3fe8961c8c..f46edb314bdb 100644
--- a/app-arch/zstd/zstd-1.5.0.ebuild
+++ b/app-arch/zstd/zstd-1.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib-minimal toolchain-funcs
+inherit multilib-minimal toolchain-funcs
 
 DESCRIPTION="zstd fast compression library"
 HOMEPAGE="https://facebook.github.io/zstd/"
@@ -21,11 +21,6 @@ DEPEND="${RDEPEND}"
 src_prepare() {
 	default
 	multilib_copy_sources
-
-	# Workaround #713940 / https://github.com/facebook/zstd/issues/2045
-	# where upstream build system does not add -pthread for Makefile-based
-	# build system.
-	use threads && append-flags $(test-flags-CCLD -pthread)
 }
 
 mymake() {