gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /app-arch
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
58 files changed, 627 insertions, 758 deletions
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index cf925f76e271..d3b3f5dab6cd 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index cbf994dba5ee..5373a91dad31 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1,9 +1,5 @@
 AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649de9bfe9cbf445216d4e9d6a6e34dc065008d0129892240c98bcb6e7beb5443d4c459a1bb77eff664f7245 SHA512 04d5505074e042eca46a8dfd9d9a3a2c9af901d9bf7d98c219e8e1f8c9b9071bccbddfa3e17e86800de2606a10b26dc05d69948cd84ddd3075d6c1c51991bcc2
-DIST brotli-1.0.6.tar.gz 23827656 BLAKE2B 8d31eb1c4119de44702f2239fba9db72f1ae81801d06e51716432ff2f8aa78259c52cbd57b8fcd005c1bc14ada81b6e47a35c5d3864bb10bb02d113e30bd321b SHA512 b9847375471de3ae815ef4bb45a29653c343fad0a891a79d5132fcdee34c85caafd82289c8b413c3ef609049f2e8c4af9f9abd1736a2408ba44544c5fefc0010
-DIST brotli-1.0.7.tar.gz 23827908 BLAKE2B b9fc554cd23c8387b648638b6f9bb2d29fa87035856d03cf284662f9281984f3bf8e40109e61155ece18673f4391bc0fff704f8ab800a2041d3ce1824478d2ae SHA512 a82362aa36d2f2094bca0b2808d9de0d57291fb3a4c29d7c0ca0a37e73087ec5ac4df299c8c363e61106fccf2fe7f58b5cf76eb97729e2696058ef43b1d3930a
 DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
-EBUILD brotli-1.0.6-r1.ebuild 1688 BLAKE2B a5ba00d724c413a364167e80954354396c82697704bb7515af35ce1d0f39a06e19a676009483dcef65a6065eeb44bc681aaebaabdf808e07c40d780ac654dcca SHA512 4888fa16c494b1b27698268fd6c01a0736c1feb9b374fe5ab8f12321881205b5e3d78a2e8c24e9f438b9a51d5eadc1126720f79e7114785465f39cbd5f777b85
-EBUILD brotli-1.0.7.ebuild 1650 BLAKE2B 5b7f5b52c2d3e44d794de6f4861ed4c590b3be805b46dfbdcd5bd9e617810afbe54996382d2ff79080f7d2d190a0e490597d3c4ada382be831f2fbd24cbcafa3 SHA512 12cc523630b741a34ad72b7f4c5a3c5a04de84055e73252cd5129a3b9f1ec77f7bfea9a6610464c3c80b18587f1bc131d6b1c4272753015be992c52ae351aef1
-EBUILD brotli-1.0.9-r1.ebuild 1705 BLAKE2B 8b0ba70498301bb0147f4b23587ebe6e404a7c853f32a95eae2eb04296f679a4049dcc463a7f58e718bca2e0beafb46fb815f53b4412fef9f1359be56e477835 SHA512 796e677e6bedeb757ddf9254926b7137bac6ffa24553d7c34f69343cd16eebe7caaee3ba45fdfab0a930e677704d4c3442d1503bf99785692f907fa0ea13b5fe
+EBUILD brotli-1.0.9-r1.ebuild 1764 BLAKE2B 4d10d4e1b1fb06fa9d6c5ae7dc2d7ba3c608514babf7ea0e723d044dce08acc85bbadb333e6302dcba4244650cf672d818ff11a2a4ff55392d3166b338029578 SHA512 c14b4bd8c30f3b1a1650be6be973be5badafd1335b9f034a88ef3b16f83e9d78e20f63e90280714168a98a20cf7b2e209ec379937af2078b9813ed9bfa9997d3
 EBUILD brotli-9999.ebuild 1656 BLAKE2B f9f9e46750995bc450b3be52e71571bc76d4d5b02157f1cc50f028c8c68659583cd84e0cdaeef395a9d84e0cd1e474e728ccab522a6a196b3d4cc98ab59c39e0 SHA512 0f54e7839f789f8b89a6fc66a1fe8e4dd845b2e8393ed8990a79d3fd67281ef121fbece382d8f21d4a629404625741763c9cfcb008f55b5a3eccb1bf0914e7cd
 MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
diff --git a/app-arch/brotli/brotli-1.0.6-r1.ebuild b/app-arch/brotli/brotli-1.0.6-r1.ebuild
deleted file mode 100644
index 012faf0a92fb..000000000000
--- a/app-arch/brotli/brotli-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_OPTIONAL="1"
-DISTUTILS_IN_SOURCE_BUILD="1"
-
-inherit cmake-multilib distutils-r1 eapi7-ver
-
-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 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	use python && distutils-r1_src_prepare
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-		-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.7.ebuild b/app-arch/brotli/brotli-1.0.7.ebuild
deleted file mode 100644
index 4d8bb62d40e4..000000000000
--- a/app-arch/brotli/brotli-1.0.7.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-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 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-RESTRICT="!test? ( test )"
-
-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-r1.ebuild b/app-arch/brotli/brotli-1.0.9-r1.ebuild
index 41f9c0f5016a..eeeb0e284d4c 100644
--- a/app-arch/brotli/brotli-1.0.9-r1.ebuild
+++ b/app-arch/brotli/brotli-1.0.9-r1.ebuild
@@ -29,11 +29,12 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/google/${PN}.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 	SRC_URI="https://github.com/google/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
-RESTRICT="!test? ( test )"
+# tests are currently broken, see https://github.com/google/brotli/issues/850
+RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}/${PV}-linker.patch"
diff --git a/app-arch/dpkg/Manifest b/app-arch/dpkg/Manifest
index c328fab70539..495c5aaf6939 100644
--- a/app-arch/dpkg/Manifest
+++ b/app-arch/dpkg/Manifest
@@ -16,4 +16,4 @@ EBUILD dpkg-1.20.0.ebuild 1919 BLAKE2B c7456dbda807d2195de6e0f19abab34c70eb6e768
 EBUILD dpkg-1.20.2.ebuild 1891 BLAKE2B 4b479ba923cc599f316a95c94047106b81d26c5b35fdaf18fddea3686c45111f6e128e1ff9c8b622daf326520cdc0bf3e490bb96ad07ee526605042dc4e8250c SHA512 f7f9d2cf745a1aff7ee3c42172bea29cd094f3e80ccbde8d1dcbd7519032fb59aeef98972b568c864d2287f97e0b5b9dd071c42b4ac8f5f8b1ce2f7987d10946
 EBUILD dpkg-1.20.3.ebuild 1891 BLAKE2B 4b479ba923cc599f316a95c94047106b81d26c5b35fdaf18fddea3686c45111f6e128e1ff9c8b622daf326520cdc0bf3e490bb96ad07ee526605042dc4e8250c SHA512 f7f9d2cf745a1aff7ee3c42172bea29cd094f3e80ccbde8d1dcbd7519032fb59aeef98972b568c864d2287f97e0b5b9dd071c42b4ac8f5f8b1ce2f7987d10946
 EBUILD dpkg-1.20.5.ebuild 2008 BLAKE2B 8303d63470637dc1df9a1db1c1f4499e8e4168d20ee17432b6d9b35fc5bd2b4a5dd25d4940543d0d382166258fe62219e6a307a33e1a10a6819df89cebcb4cf3 SHA512 1ca45b81c325f4963d61e4077404b1fb3016e66b1d23de000635fcd96e5dd691ac8ce4ad38e893bb32f0554807e8b04ac47b3ff65b0517694d3bc574392980a7
-MISC metadata.xml 433 BLAKE2B bfddf84314750bbaf97250dc51916485e8226379d3d3aa925f7879ca456c3052e062b1516592c49b4b048a0fe76a55c6302b719747ba43a7a8d6fbd65c9eb8ec SHA512 da157c95d0dcf2086b37482bad4bd1c52da16c015e71411653f12e3f5e0f25d710e1819675a0d5b8e92a9e185dc61f602007e3a8875aa1b05b78f128de1b0ca1
+MISC metadata.xml 432 BLAKE2B 553e9f62e3a549d43f4e336d8ed7a73a3f87eb6cb7bd80bfd6f577acbb5ebaf78f58118540438feee04c58cdfde28ecb97e06b14db1ed6329c93bf84749bdd9c SHA512 7ff95b06796b982454546880b8761cbc9a618cbfff07694a4753f3f3e45f9ece8831908777fbda09896e9accc75bc6ebffe522e719eed4b484d3b301fd3f7932
diff --git a/app-arch/dpkg/metadata.xml b/app-arch/dpkg/metadata.xml
index f7244bcd0e2b..bfb9769e554a 100644
--- a/app-arch/dpkg/metadata.xml
+++ b/app-arch/dpkg/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>deb-tools@gentoo.org</email>
-<name>Gentoo Debian Tools Project</name>
-</maintainer>
-<use>
-<flag name="libmd">Use <pkg>app-crypt/libmd</pkg> library for message digest functions</flag>
-<flag name="update-alternatives">Install update-alternatives</flag>
-</use>
+	<maintainer type="person">
+		<email>gyakovlev@gentoo.org</email>
+		<name>Georgy Yakovlev</name>
+	</maintainer>
+	<use>
+		<flag name="libmd">Use <pkg>app-crypt/libmd</pkg> library for message digest functions</flag>
+		<flag name="update-alternatives">Install update-alternatives</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-arch/duff/Manifest b/app-arch/duff/Manifest
index dfab3013737a..08c1b32e079f 100644
--- a/app-arch/duff/Manifest
+++ b/app-arch/duff/Manifest
@@ -1,3 +1,3 @@
 DIST duff-0.5.2.tar.bz2 174545 BLAKE2B 1e2b75a4999333f062a8b25c750f35e785038a5d3ec0264112352fae20af25b8990727287f446d7523c699701b963fdca658241288bd0e79b27751e3be3c4ea3 SHA512 5f64c28ab86523dd4dffaf26dac67d10bea71bd5cf7b4eaa3dfa27309cf8e7cf37a74ee62b5f3df3cb0114a847711b3147a083cbdd72ab8e4b5f9a45c908f333
-EBUILD duff-0.5.2.ebuild 471 BLAKE2B 8db09774fbddc8f075e59de29e6413b7db9f0a931d2cc5d3fbc34a3f6cccd0e83cb526803638daa9441796db949b95b4751d2d02c3df9476c210773d1836f6d3 SHA512 7203ff06088031130c2dc5cfb5b92f3dbc490ccc5a9b272c4f23a7f4de6c1a975e9c761146f2ea87620aef220db21fa28d0b0774db67671fbdcdc1578815837e
+EBUILD duff-0.5.2.ebuild 384 BLAKE2B 10dba0a20ffb32c205595199cb1591e521d1bd8a89f193a7c919ecac8decf155fede373894991f52e69ba0db2af635ba5afab3ccd759a21224b717eeee6603bf SHA512 39772247315f10224feaa7c908151d4c6ac0cc8ecddc589c70c9d423b7af7ea3d73cc9a799ccff61959a44e7d6c119bbc226e0a7898fb59745f1ee28336717f7
 MISC metadata.xml 300 BLAKE2B d478e17714747688bca890580e4b0332e301bde95ffd03939e979a3e5a80b6f721b175686b69f6e9add4105ca3953f2905085a62dc0b7be1dfbedcb9f4c537cf SHA512 ef8d27bfa12bb1eb3a821a400c6fc897b5e387d0b99b4c4d5d03d472ca9ad3ed02a13657a9cd627cdd87a01fb7b709640238c223fb7123d5781dae7e48e9fa2e
diff --git a/app-arch/duff/duff-0.5.2.ebuild b/app-arch/duff/duff-0.5.2.ebuild
index 94522ba771dd..f41ed1e86ad0 100644
--- a/app-arch/duff/duff-0.5.2.ebuild
+++ b/app-arch/duff/duff-0.5.2.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
 DESCRIPTION="Command-line utility for quickly finding duplicates in a given set of files"
 HOMEPAGE="http://duff.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND=""
-RDEPEND=""
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog HACKING NEWS README* TODO
+	default
+	dodoc HACKING
 }
diff --git a/app-arch/fastjar/Manifest b/app-arch/fastjar/Manifest
index 494abfab5c28..b2ab8033ab16 100644
--- a/app-arch/fastjar/Manifest
+++ b/app-arch/fastjar/Manifest
@@ -1,4 +1,4 @@
 AUX 0.98-traversal.patch 3010 BLAKE2B 76450d561450aa9c7d5386f53328c0037d6ce9df2d6aac79deb1e47cee7651723cf2863a0d27cb6431a58525a9d0d3c554820b4f22a3099d1fe43b2ea7bec0d1 SHA512 7bfcfebd681f9556e8231786da3326d12ee7ab071e2cadf9a4c17ba4e4e750aeb7e3d7cd78634c36e05179df4a369aae2e04a22533d1954668ada95f1d53d311
 DIST fastjar-0.98.tar.gz 717984 BLAKE2B 1715f1917076799fc58c6c6cea8fb53fc3261a694fa2392c0dc6e30101a7d42de0c5c55cd593627b4d2d0ffa45e3d44ef220c9579caec669721c6b1b9996e43c SHA512 c0f9fca7b58d6acd00b90a5184dbde9ba3ffc5bf4d69512743e450649a272baf1f6af98b15d79d2b53990eaf84ef402c986035e6b615a19e35ed424348143903
-EBUILD fastjar-0.98-r3.ebuild 522 BLAKE2B abb6f9204ae4b36d6017182f1b5b0a972a90ca4892d3e319b28e08ffe1f9c9e019fb4088ff9af2ca7648b38805b22713c363ce52893dc0433f310691f76e45a9 SHA512 3e92039ed773aa5e2c329081c9492867a34ae45e16b2d7704e5ceb4a42e1a77a87985c2ccd8c4dd5c27d3651f46d07dc1a433ee238b08a3d5754da7a4ee987ef
+EBUILD fastjar-0.98-r3.ebuild 518 BLAKE2B 1e0db5ecf3885ea76456988f257560e0e1282dae478be3b7386449ecc1478e11511f6d22e36629e275ce0e7977316d3e986868c3691344729c62cb56261aea73 SHA512 3493b116c00b7bf28c16621927dc18049ebf4fa0071519b10311dcb5b365b238abb02e8d83a222df943f77835da218d4936c6ccecd41d1b63860f6cacb753413
 MISC metadata.xml 478 BLAKE2B 91d7ee00197567dc201739072627c34a8a7073a28b89c5761793ce628d1f62432d91b36b13a65fb95f821101249697a041af339823bb26fe132873c4a20a7b54 SHA512 3b1f8a2998d8496947b8e6c60698db4311ca1afe7ddcd0fe9d4f7ae762acf4204a87f8ebcb9e0b0677727eb82fdda22a299cf3cafcdf83bd348d98ba16ff4214
diff --git a/app-arch/fastjar/fastjar-0.98-r3.ebuild b/app-arch/fastjar/fastjar-0.98-r3.ebuild
index c33c9d06c5b7..791e30817363 100644
--- a/app-arch/fastjar/fastjar-0.98-r3.ebuild
+++ b/app-arch/fastjar/fastjar-0.98-r3.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="A jar program written in C"
 HOMEPAGE="https://savannah.nongnu.org/projects/fastjar"
@@ -13,12 +11,12 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 
-IUSE=""
-
-# bug #188542
-RDEPEND="!<=dev-java/kaffe-1.1.7-r5"
+DEPEND="sys-libs/zlib"
+RDEPEND="
+	${DEPEND}
+	!<=dev-java/kaffe-1.1.7-r5" # bug 188542
 
-src_prepare() {
-	# bug #325557
-	epatch "${FILESDIR}/0.98-traversal.patch"
-}
+PATCHES=(
+	# bug 325557
+	"${FILESDIR}"/0.98-traversal.patch
+)
diff --git a/app-arch/gtk-splitter/Manifest b/app-arch/gtk-splitter/Manifest
index 8217c2d11850..4104cdac2fde 100644
--- a/app-arch/gtk-splitter/Manifest
+++ b/app-arch/gtk-splitter/Manifest
@@ -1,4 +1,4 @@
 AUX gtk-splitter-2.2.1-r1-desktop-QA-fixes.patch 325 BLAKE2B e5b7e8f53f7c774631b9d776afa0f74f6e36cbdd6775fee064c50a71b918e780de03360f9bcadf333adb89a9724ea4667726c16807dffdb730c03f44e69303c6 SHA512 19beddfab6ec199f013f4f3d12a5921df49267ea3ee851e2bfb4ec043f899015ffde7bd45308aca8734d735b203a822dede78c785212e45c49351ae7f501c49b
 DIST gtk-splitter-2.2.1.tar.gz 93515 BLAKE2B 32ab62076028efb69584c05f21c28744b1261e03640391787c9fb70a547eb7d184be2ce1f945c3bd659ebdf4b3b9b998331e3e5dbc3c5ee9d5beb72149893e16 SHA512 c84e43dddb5f1eef5a4fed7db7541012374d7e6bed760835adae20fa35a4685cb7a1a866ad02cbaf36ff3ee4d5bd3872a154e46ce9692603a3273859d2eb36dc
-EBUILD gtk-splitter-2.2.1-r1.ebuild 813 BLAKE2B 42c8254e77bfd3167302613b1dac012eeb6a859b719570403a6f28e7c2d9a58ed4f3ff9b2fb60a01dd45ad83820699278a4ac7400c3ee2290ff99a811cc78175 SHA512 3128262c80ef2fb38a9858439e481f341427979d6ad4b372fe1f6a1df174ff387690765df439cf4a4cabae9a604bd675e7dcb24a1439a7f16a3774c2cf6c0d96
+EBUILD gtk-splitter-2.2.1-r2.ebuild 798 BLAKE2B 4f80b9db373035b2382a76ce1541571a2ad6f358b7583dc92c84f8e03756be3dea9c9765953f2c2db61d372f305958ee62dc74cdb00401e01ea5aed1ef25b9e2 SHA512 db4f38313dbaf853ee7607c2428884f9a9fc9037f50c8f68884177275cc3fb8d01001f4ee694f63bee3c9a3bdebdb27647ad0fe63031fd66035f97f1c000eed1
 MISC metadata.xml 249 BLAKE2B 58ba2f73d5e08fb2c2e4f818eb1cbf5521a0505631ae5f1294e26ae94d49d6cd500b62123a14eb29728153a0a2f44107079b647bc06a5f290a7197980979561a SHA512 c8fc6ae730050d8fa5b3395f954362303338f4123d3a4aff506b9f7c528739923b0ab5a22300bccf8512ac9910efa3d72d1e525301374b6fdf84b10e6693ef6a
diff --git a/app-arch/gtk-splitter/gtk-splitter-2.2.1-r1.ebuild b/app-arch/gtk-splitter/gtk-splitter-2.2.1-r2.ebuild
index 0ccad4c508c7..288cc392ddae 100644
--- a/app-arch/gtk-splitter/gtk-splitter-2.2.1-r1.ebuild
+++ b/app-arch/gtk-splitter/gtk-splitter-2.2.1-r2.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Split files into smaller pieces and combine them back together"
 HOMEPAGE="http://gtk-splitter.sourceforge.net"
@@ -14,18 +12,16 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 IUSE="crypt"
 
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+	x11-libs/gtk+:2
 	virtual/libintl:0
 	crypt? ( >=app-crypt/mhash-0.8:0 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DEPEND="${RDEPEND}
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	epatch "${FILESDIR}/"${P}-r1-desktop-QA-fixes.patch
-}
+PATCHES=( "${FILESDIR}"/${P}-r1-desktop-QA-fixes.patch )
 
-src_compile() {
+src_configure() {
 	default
 
 	if ! use crypt ; then
@@ -35,5 +31,5 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install
+	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install
 }
diff --git a/app-arch/innoextract/Manifest b/app-arch/innoextract/Manifest
index ae67fade65cf..9d04d453e838 100644
--- a/app-arch/innoextract/Manifest
+++ b/app-arch/innoextract/Manifest
@@ -1,5 +1,4 @@
-DIST innoextract-1.7.tar.gz 195123 BLAKE2B 5dffb49da7ec3f8e48a70d0809e059179e84610dd50397b8ca472b9f5a96a5edd0cf36898f0e513b3f70685829e2b8edbd7d7932c9f1b47706c2929f596867e5 SHA512 5e92625a411a4351dd4639d4b63e8664519c6697122a0679c010412e94a1e5da95324c33be16211f91c2b25b8cea40fe4ba4da5e19c12d0c27a4916159465ca4
-DIST innoextract-1.8.tar.gz 205553 BLAKE2B 223f0997ae00f2a854912befca25595b275ece8e0fe4f4451d6aa3db14ad1ed98474a19c919c56d958e99c0175be647d3eb3c14d7869504405a7bf6db3a35957 SHA512 2c68009333f02a8a677c084e9c95c835d84a73e60c9b0c70fee5f23fd9a7a640cf2aa7e0476c55579774ac7079498fa24668f9388493bbc13415ff5a5b06ac9c
-EBUILD innoextract-1.7.ebuild 731 BLAKE2B 2372ce7018c12a5317232d6ac6294297e017034059afbe49b934c017367cef9ff343b7d74f754b5409e212a907ea933d6e381c60a808534a7a667ae3f9cd1c72 SHA512 4f9f49dc8b2c5679bca97058401b5b071d879e192de1b6b2eeb5e43d0a2d41702fb100e7c45a22d3eca8020785e41c992e62e346432332ba684cf03e5dd3eded
-EBUILD innoextract-1.8.ebuild 697 BLAKE2B 3cf1864fba834a0038fcd39931a0749df4789192b0a9e12623e12dec256daa51d681f4c99ba1e313ac41567e6eedbf03543c86239f476890bba12acd630facdc SHA512 ce1ae8711b92e47bfaea06d3c87db6c35d4b8039afb8975d5699297c8d9bf07f104163f9d3fbf4983c956b8e8621b7eb4ab7efe6dc6fcb1befdbce1da5bfbe86
+AUX innoextract-1.9-fix-linkage.patch 311 BLAKE2B 777d3592d3b0c5ced8a36473b9b481395e2ae4b33dedf1d8a7393b150a2c048c764b1f4902fdaa23ff68749d04f393668ae8b4ba7fd8bdb82f7cbfb4142391c2 SHA512 df4f251c36ed2e01314f12cecc44082c4ecbbe8bbef9825bce98cfc880a7e92047da17051879b4f2d972dadf6fc41f07338fa958d773847394be4441c5db0dea
+DIST innoextract-1.9.tar.gz 206931 BLAKE2B 1d5f0d13a7cd52262b277263f061ecab85a3419197bceb22938a0d10000578603cc2c2b972a45474027cfea8e43b8bf89d680035034785210842477b147811fa SHA512 2b18f7bb7f50744bcb1bdcd25e57e0760193b179c77b55e0f63c537e55afc98de3b0380da3cae470ce97660ed41a7ffbb48c8c25329c9ce9b3811d9aec74bcde
+EBUILD innoextract-1.9.ebuild 763 BLAKE2B 00483d46965f4c8a9948b1b90ed2dd2611284c1390d8756d6cf39943f530dabed4205bc09156a54c7eafeaa5c2077f737c28eee995ca6fbf7e1c93d6da5c4056 SHA512 534ea71db7bc4105ead308ff6c9714b6ebe6668bfd01ca82bc40b5bb89c72209fd0c39b9268b066939a381f60e6b99ee959609c01fa8266521eab7b5a8d352fe
 MISC metadata.xml 928 BLAKE2B 032de64587c2ab814a132d09f624a86f6b87a5fb1c49a1385969fcce89a7f75975480c8b3b70889621a97bb26e1d37240d51ef5a9da868983ee2467fc5c18f92 SHA512 0fb9ebc491eec20dbeee81d92ae7616464717c88684170ea064726b42120d65ac74edfac474e2605c191d91901e952859199c17bc84af3657812671cb3fb9260
diff --git a/app-arch/innoextract/files/innoextract-1.9-fix-linkage.patch b/app-arch/innoextract/files/innoextract-1.9-fix-linkage.patch
new file mode 100644
index 000000000000..79ecd805f49d
--- /dev/null
+++ b/app-arch/innoextract/files/innoextract-1.9-fix-linkage.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index be9f08f..f7ce42a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -316,12 +316,6 @@ if(NOT MSVC)
+ 	
+ endif()
+ 
+-if($ENV{PORTAGE_REPO_NAME} MATCHES "gentoo")
+-	# Meh
+-	unset(LIBRARIES)
+-endif()
+-
+-
+ # All sources:
+ 
+ set(DOCUMENTATION 0) # never build these
diff --git a/app-arch/innoextract/innoextract-1.7.ebuild b/app-arch/innoextract/innoextract-1.7.ebuild
deleted file mode 100644
index de8c21556274..000000000000
--- a/app-arch/innoextract/innoextract-1.7.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="A tool to unpack installers created by Inno Setup"
-HOMEPAGE="http://constexpr.org/innoextract/"
-SRC_URI="http://constexpr.org/innoextract/files/${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug +iconv +lzma"
-
-RDEPEND="
-	dev-libs/boost:=
-	iconv? ( virtual/libiconv )
-	lzma? ( app-arch/xz-utils )"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md CHANGELOG )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDEBUG=$(usex debug)
-		-DSET_OPTIMIZATION_FLAGS=OFF
-		-DSTRICT_USE=ON
-		-DUSE_LZMA=$(usex lzma)
-		-DWITH_CONV=$(usex iconv iconv builtin)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/app-arch/innoextract/innoextract-1.8.ebuild b/app-arch/innoextract/innoextract-1.9.ebuild
index 5cf62179ba29..31ff8072913f 100644
--- a/app-arch/innoextract/innoextract-1.8.ebuild
+++ b/app-arch/innoextract/innoextract-1.9.ebuild
@@ -11,15 +11,19 @@ SRC_URI="https://constexpr.org/innoextract/files/${P}.tar.gz"
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="debug +iconv +lzma"
 
 RDEPEND="
-	dev-libs/boost:=
+	dev-libs/boost:=[bzip2,zlib]
 	iconv? ( virtual/libiconv )
 	lzma? ( app-arch/xz-utils )"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.9-fix-linkage.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DDEBUG=$(usex debug)
diff --git a/app-arch/libpar2/Manifest b/app-arch/libpar2/Manifest
index 697036c207c9..dcc6697f542d 100644
--- a/app-arch/libpar2/Manifest
+++ b/app-arch/libpar2/Manifest
@@ -1,3 +1,3 @@
 DIST libpar2-0.4.tar.gz 516613 BLAKE2B d5102ca9b9a25c77bc63524c04b0cb25ad3dd44e63dc0fd92ac7744d00b0044b79df4737428350ff2ea4f65acb212bac8f983d299bb5a934fc7f916994b61a98 SHA512 36d6f91bb3ea94dca1c4c45be41d37662a928bed39edace1a38ae0ad167804308d252a9fe49c2babb194b297fa4671654532add3758b7d7d528161cdceb278e6
-EBUILD libpar2-0.4.ebuild 673 BLAKE2B 2c57135fe1ccb2d1668b4c502c853c01f07cecd7821b11df2839eabe652ae1235306d711f03c52aa4491e7ad94afa6aade5e0ab22334ab154a479b478214e52a SHA512 756949f83e667ca42be78185128ceb7183c9dd1010f1efc37d7faccdfac9872acfbcff1bf606e0aa80d319a66dc725734dfbe78371e515f1117fe89455fd741b
+EBUILD libpar2-0.4.ebuild 557 BLAKE2B b14fe376c82f383e830ca19747806c5e605ae05fba0434bd9f0de5fcf260d0a0030e6847b618d9eef4706cce2a18de3f26eaf95ddd0442dd8190bc84220464c7 SHA512 753403b1666f7347b9e86e80fa5792adcb65b0ca3f5e77f9d74a3fea6213839021896841aef679b96327bd0e3af76e84917826282af143f840b84ae7e52557f2
 MISC metadata.xml 247 BLAKE2B f36ba7172ecfbb46f1f1a1f6c6015e300c067f625c1b0592ccc92d7337d8d4776448ae2cb804d418d1b06386ac73783ec50ef3270073515183404d3da22112c7 SHA512 e2f319264d0fe33bad3c55c2acb1173279825f3f03bb37b605fba2aed087fe288edce6f6eff7562349123a9a4c6d319961c702c708f2f35a1f3f0342301d6cae
diff --git a/app-arch/libpar2/libpar2-0.4.ebuild b/app-arch/libpar2/libpar2-0.4.ebuild
index 6408f5475665..31de2a7569ff 100644
--- a/app-arch/libpar2/libpar2-0.4.ebuild
+++ b/app-arch/libpar2/libpar2-0.4.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit autotools-utils flag-o-matic
+EAPI=7
 
 DESCRIPTION="A library for par2, extracted from par2cmdline"
 HOMEPAGE="https://launchpad.net/libpar2/"
@@ -12,18 +10,18 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="static-libs"
 
 RDEPEND="dev-libs/libsigc++:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-DOCS=( AUTHORS ChangeLog README )
+src_configure() {
+	econf --disable-static
+}
 
-# Needed to install all headers properly (bug #391815)
-AUTOTOOLS_IN_SOURCE_BUILD=1
+src_install() {
+	default
 
-src_prepare() {
-	autotools-utils_src_prepare
-	append-cxxflags -std=c++11 #567498
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-arch/lxqt-archiver/Manifest b/app-arch/lxqt-archiver/Manifest
index 40f6c86a2b90..bf055c25fb48 100644
--- a/app-arch/lxqt-archiver/Manifest
+++ b/app-arch/lxqt-archiver/Manifest
@@ -1,3 +1,5 @@
 DIST lxqt-archiver-0.2.0.tar.xz 155912 BLAKE2B e5c92d5939d3e6d42a79804596e9acc67b007126b630cd9317df7d0d07bb8f3e27cf9ecf6e16eef3289d31ef3627b4fa870cdb5eb52a36489df1080b03509acd SHA512 478a04d0e6e4601dc342ae260c5db4178b01191cae263154dbe400b394e5cd4cb9cd8a6bab7e7c59af57d6bf20c47a5ad2663a85d0eab5f71fbaf584f7588fd7
+DIST lxqt-archiver-0.3.0.tar.xz 157492 BLAKE2B 05d9862c75cacf3b73670333a5b2dafb6abfcfd7433a1ebc3d27948122db875f892eb58a05221c880d1ac23530362ae4d9e7c6ebe0f06552b10bb903d51a6868 SHA512 840fae890611b081a1355ceb58ca65276784e6825822859ff2d6506190212268f1c67733dc94c65c9c5758f8d6a25c286c2b339356a50f29474b0c7ce2569d2c
 EBUILD lxqt-archiver-0.2.0.ebuild 1173 BLAKE2B 6bdf4813f23abb209d0f53b4c612444827c55853e806072d0621b52d50cc073ceaa86dd93ad48b36bd45b877bc73f35805f5cffceb101492e2795642512c3b6e SHA512 74e054b528428fac654be8a64410fa16edc559d0da9f79ef0e029c7273eb2f296ca060032a68d4f89ba08d394c2ba53946ff52ea8cada203e547a2a60d21886f
+EBUILD lxqt-archiver-0.3.0.ebuild 1175 BLAKE2B 87a1fe92dccb7143e0bc5a9014133f26b02e03a24cd6929e17b337e8711bac19063dc74f96a6b339cc1aae9f87ac92ee583f298d3eecb566481cc09a2e5c20ce SHA512 271e2d7b9526ff9f34d5e0d3761c28883a4139b55d3854a82018d14c870dba5dcf93d646f9e80406902d3c9c79b5a4dc0cd5a1a19183d199e4081155567ff78a
 MISC metadata.xml 329 BLAKE2B a6082a9d0185aaa5f233d41d9de505901392c80159cbf4cf769e1a38008aaa06793e2283c974df743f2141488bdb2cc087e7990953b16b752092f31de7840c83 SHA512 42d4c3e67fbc3a84a79ed73710e8322f4a30ae6565e1aa2cbf122661e6864a8e102e67ab973942953fb2358754303b3f2d2963f3ebf15188bc23fd8ca31f5e60
diff --git a/app-arch/lxqt-archiver/lxqt-archiver-0.3.0.ebuild b/app-arch/lxqt-archiver/lxqt-archiver-0.3.0.ebuild
new file mode 100644
index 000000000000..1eec73377476
--- /dev/null
+++ b/app-arch/lxqt-archiver/lxqt-archiver-0.3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Qt GUI File Archiver"
+HOMEPAGE="https://lxqt.github.io/"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2 GPL-2+"
+SLOT="0"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	>=dev-util/lxqt-build-tools-0.8.0
+"
+DEPEND="
+	dev-libs/json-glib
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	>=x11-libs/libfm-qt-0.16.0
+"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	elog "Please note that this is only a graphical front-end, and additional"
+	elog "packages are needed to have support for specific file formats."
+	elog "For example, to be able to work with the 7-Zip format, the"
+	elog "'app-arch/p7zip' package may be used."
+	elog "For the full list of supported formats, see the 'README.md' file:"
+	elog "https://github.com/lxqt/lxqt-archiver/blob/master/README.md"
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index 602cc4a1eca6..39feef084099 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,4 +1,5 @@
 DIST lz4-1.9.2.tar.gz 305796 BLAKE2B 0021487bee8657bc825fdd2b98a6dc8a6d10be3240fe0bebf6563e9c855a15bf5440a02d5cd6ee1f1e8502743348bcec1e866d3287b07e623887e9eb9da35eee SHA512 ae714c61ec8e33ed91359b63f2896cfa102d66b730dce112b74696ec5850e59d88bd5527173e01e354a70fbe8f036557a47c767ee0766bc5f9c257978116c3c1
+DIST lz4-1.9.3.tar.gz 320958 BLAKE2B 9a194bd18ff52f780aa03a8a53fe7fab7b58117d768f4ba8e5005830c935d16328d0f7cc54f9413b58faf245017c0ac85fb4e709a9db150cb150a0a2a3c21645 SHA512 c246b0bda881ee9399fa1be490fa39f43b291bb1d9db72dba8a85db1a50aad416a97e9b300eee3d2a4203c2bd88bda2762e81bc229c3aa409ad217eb306a454c
 EBUILD lz4-1.9.2.ebuild 914 BLAKE2B eaf423bafb37abee6dc5424d551449c359ca6e70790bfe35c5b28975c66064e84981b8d238492ffa080a2674b2937aebe9bb5d87b020e40bf048b9ee4cf36beb SHA512 76279d4ea35b063ea239f0124d60a0abd94e818ddf7aedbb2f44b80e504fb502cb8dddfa49e35ac9058bc377f5d2aaa9fa4bd322f22ffaa269f940edb78602dd
-EBUILD lz4-9999.ebuild 921 BLAKE2B 4d6a935bb206d63cf7577218f6ac7bf984039ec629a6f555640c826a232d607af30014999f9168ddbb7bb35ccb6ea4f2484259fabdae11ff5df78d655ddffbb8 SHA512 4db0e63458fc7eb5ed1da80e1fa4bde4f874980e974eeca82653d5a2c4b6323db9ea665ec41854d8b8c62534d5f2f2f7ef774d2b9e4c4d8633f09831953832e6
+EBUILD lz4-1.9.3.ebuild 789 BLAKE2B 1ed48b7ae722b9b52aa7aa2af699b5b5a2243006d1ebe6cfd0c0b77491abe9ce8aa33b467cbb7d92aed8cd371b0d033fb05dafb35477c9bd78ed209738cd2fb7 SHA512 a09fc7d38763dea2abc58797aefbf1e217b66d48cf85340100ead835128bc2803d5c72f3fb45dd51ca2b2e84214cdaac607fc00e3cefd5a8da8d7968d10726b0
 MISC metadata.xml 596 BLAKE2B f79116c2ed40f870c688d9843c6d54da4fa6d33313d2a42d2d6162e1f2b5a6e93f119354a7ad97c67d66be6ba2437ffc0e91d6a9077fbc5b02b19420155375ca SHA512 bc5a6081ed4c2c6b7c7e4de5ef0ada5a4692e1e0833a01d8e596b7891cb2f612418350643ce6b764d8170b5632afc78143dd50bb4a34565384fd4b89ee34786b
diff --git a/app-arch/lz4/lz4-9999.ebuild b/app-arch/lz4/lz4-1.9.3.ebuild
index 944d7e883618..dbf92b78579c 100644
--- a/app-arch/lz4/lz4-9999.ebuild
+++ b/app-arch/lz4/lz4-1.9.3.ebuild
@@ -6,24 +6,17 @@ EAPI=7
 CMAKE_ECLASS=cmake
 inherit cmake-multilib
 
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lz4/lz4.git"
-	EGIT_BRANCH=dev
-else
-	SRC_URI="https://github.com/Cyan4973/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
 DESCRIPTION="Extremely Fast Compression algorithm"
 HOMEPAGE="https://github.com/lz4/lz4"
+SRC_URI="https://github.com/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-2"
 # https://abi-laboratory.pro/tracker/timeline/lz4/
 SLOT="0/r132"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
-CMAKE_USE_DIR=${S}/contrib/cmake_unofficial
+CMAKE_USE_DIR=${S}/build/cmake
 
 multilib_src_configure() {
 	local mycmakeargs=(
diff --git a/app-arch/mscompress/Manifest b/app-arch/mscompress/Manifest
index 556646667db7..b22dae68621a 100644
--- a/app-arch/mscompress/Manifest
+++ b/app-arch/mscompress/Manifest
@@ -1,5 +1,5 @@
-AUX mscompress-0.3-amd64.patch 613 BLAKE2B 310ad5f0b5f068dfaefe3916d44560a7b29a3ba41a81a87b0db65cf3210a55ec4b7ca4ff1d9c15c282e6d60fa7d5101d65489865276e4e81e784dbb68cfa23d5 SHA512 94d17fa87a0ba7029569da65e8f22af834b557db1c0a4715afe3afcfc6cee63e7bb604bc37f700729c2efe08b38b46a940b4ee8fd426e293747fb4003d7f53db
+AUX mscompress-0.3-amd64.patch 541 BLAKE2B 44c2d4da298bf95aa2d7bf93dab257b9ad194df8e3ae7057c1e5065fdde02f7368b12ca97e6a9d0772366f0c98f799a5295a0bd092efb0526e4d74194378711e SHA512 ade981933d3cfeeea5dde44473aa0a108e9151877b6d825f36ed2d164d4ad9680677c9b0327ffb882959268ab880c246e188afc478f6f07ac6481a314591e134
 AUX mscompress-0.3-makefile.patch 467 BLAKE2B bb5c6f88194ab577e167b0c0ab4f0e8174674d82bd3337e8c618532084811bc0ac8521b2a3950d5cb73d164c620a6ea3a5c22d93682cf75298934be8864495ed SHA512 d633867a102ba099576c6671967c802bca293a81896ba6ecd5486ad025dfa66220dec9ecc4615c97db22deea914183d8dbedf5ab75221abeb5a65e0c7e949669
 DIST mscompress-0.3.tar.bz2 40989 BLAKE2B b8aeca23fb62a6b4b779da4d4155ba835085e79fea0d69d4da2e65ececb856531d43ee45b44c24415d5827c749c3dc7ceff9de3043fc6174244939a3f75b4c68 SHA512 e69a95e9c12979e852227553028b578f324ec38472ead11f9c0cce85b77bc817ea39d5ecf74599c7935c692eaac537456ebefe110400514a3c834b12597dde14
-EBUILD mscompress-0.3-r1.ebuild 782 BLAKE2B 00827b7416c90a23d21f40b4f3138d17f254ece62b1b7d5117941690b28424b4d11f4b091d8c283c502eb8c800b8fbf41871d864d7d5f730671af8ec064c63a8 SHA512 cb8e5f33bc1ccb79e60ad4558d9da2ad342fb084e95dfb6942a44577cbe283ae6219f96c827e891a738c51a196664d14528fef77498307e3491415aa983640a7
+EBUILD mscompress-0.3-r1.ebuild 734 BLAKE2B 6f78fa7ba9d91ef3b785c086f517111579a407810fbcbbd8b190c8ced140afd9269ecb33c409f651c3635f5a95c7d9e04856472efbb8c7409e2f7348d7e47fb8 SHA512 ed7254e0da765a59de21825cdacea9d9576f382cc30dee838174271f5399446b7f469535cf8bb2fbcd1180e7e75e7a222f24381a9cfd3a9c77d5a4d4358967fe
 MISC metadata.xml 245 BLAKE2B 6979761502adbfee033d45b63d2d47bf55a4cdb16acfd46bf85f5010c8b5daab257d57cbee66bf79135ec276a8a5cad3dea126eff6840e90b02bc045c4e081e4 SHA512 6623d61f7eb4a232480f4d29ac2bef906d50adf8b6aabf080f33f37a316e34835e809557de1c830b1d6433ae9ad7360dd9db49e4498487b982f2b4e2a9480c1f
diff --git a/app-arch/mscompress/files/mscompress-0.3-amd64.patch b/app-arch/mscompress/files/mscompress-0.3-amd64.patch
index 95e4e617aefc..305b809d2b60 100644
--- a/app-arch/mscompress/files/mscompress-0.3-amd64.patch
+++ b/app-arch/mscompress/files/mscompress-0.3-amd64.patch
@@ -1,5 +1,5 @@
---- mscompress.c.old	2006-11-27 23:58:51.000000000 +0100
-+++ mscompress.c	2006-11-27 23:59:50.000000000 +0100
+--- a/mscompress.c
++++ b/mscompress.c
 @@ -25,6 +25,7 @@
  #include <unistd.h>
  #include <fcntl.h>
diff --git a/app-arch/mscompress/mscompress-0.3-r1.ebuild b/app-arch/mscompress/mscompress-0.3-r1.ebuild
index 23ab7db21192..7cb1bda438f0 100644
--- a/app-arch/mscompress/mscompress-0.3-r1.ebuild
+++ b/app-arch/mscompress/mscompress-0.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Microsoft compress.exe/expand.exe compatible (de)compressor"
 HOMEPAGE="http://gnuwin32.sourceforge.net/packages/mscompress.htm"
@@ -12,13 +12,11 @@ SRC_URI="ftp://ftp.penguin.cz/pub/users/mhi/mscompress/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm hppa ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${P}-amd64.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-amd64.patch
+)
 
 src_configure() {
 	tc-export CC
@@ -29,5 +27,5 @@ src_configure() {
 src_install() {
 	dobin mscompress msexpand
 	doman mscompress.1 msexpand.1
-	dodoc README ChangeLog
+	einstalldocs
 }
diff --git a/app-arch/mt-st/Manifest b/app-arch/mt-st/Manifest
index 055394ad540b..de14c0e980aa 100644
--- a/app-arch/mt-st/Manifest
+++ b/app-arch/mt-st/Manifest
@@ -3,4 +3,4 @@ DIST mt-st-1.4.tar.gz 37864 BLAKE2B 25ae656b6442e53570366405ba76da9150cf1d4fe33c
 EBUILD mt-st-1.3.ebuild 572 BLAKE2B 0ba3850e06c4c09f843fdc7dc6642c1661ccd5e60270f7c38976e98269537db3bad4ccf5c0aef986319f4534668a928e0b9b377dee5eade3115663ce82f78c4e SHA512 50d98822137156b4f507e8f91a960264564101f3a7cc2d40a31ca564f541202309a86170a5f4de199c66cd95f1b32ede6d65f7801c604fcd36faca608505f15c
 EBUILD mt-st-1.4.ebuild 532 BLAKE2B 4e902de4d3aee2c5b94066c8fba3753c8386dc8b2205dc8d39ca9a41a80a3d9f7011faabcda3d6694fecf71b998f85cfb64fdb4d7660758ec90a3d3e7952da08 SHA512 f0d074fdb440a7a5308006b8f20f74bf6d92b5ec1f2a5c9ac52785679b9c5e9fda61f8f342bf5b19a3824d884ab207c1ae891bf856f92cde38bd981314a1cc8c
 EBUILD mt-st-9999.ebuild 453 BLAKE2B 92c6e6718a621bdec7e78722c742ad1deb91da0192f20115b0d941194c4f7bb5ef0f95cb22484815999eb1d44b658498b6584cd0d71c412ffccf404b21910720 SHA512 a1241b5d9bebc4b7bd4e10d939f2f6305b1d166a4d12270484b5533c28894dd361e347b74cbc477b50e00e154c3ddee060a9b46bcef5a4d6bfcaca080d4aa416
-MISC metadata.xml 321 BLAKE2B 3f2c57ecada60ab514926a4ddfe2fc0bdc11148a50bdeed1d336f13863e735f83056d4e647e80995c90fba92466252c2ec202e2fa9e3c667ba5a8ae6acbcece1 SHA512 79dc941553281909153cdda8422d4ac5da172a6d782936986b581a1300dcf4b4781704bb7c730f48905f0dc487f5ce781bd96abde16691d67bf5da220eb94471
+MISC metadata.xml 244 BLAKE2B e551dd172f35c5abea703cec8f7c899f1fec22dff135d50208419088aaeb0b2464e3ab44fe7c759147d43e9d0897a3fc8c8087089b4dfdff158907e835d5626b SHA512 904a7d356000f52257174f15912a3b79fe0b6bee390128a2f9821e749b393964c626f9afd751d88414086d7e28eab2183ad41dbaab911aad6ac5480e3b265922
diff --git a/app-arch/mt-st/metadata.xml b/app-arch/mt-st/metadata.xml
index 5fa14a0aa1e3..ebdcf9258f07 100644
--- a/app-arch/mt-st/metadata.xml
+++ b/app-arch/mt-st/metadata.xml
@@ -1,10 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">iustin/mt-st</remote-id>
 	</upstream>
diff --git a/app-arch/pbzip2/Manifest b/app-arch/pbzip2/Manifest
index 58b4c2a44411..01d5334b0191 100644
--- a/app-arch/pbzip2/Manifest
+++ b/app-arch/pbzip2/Manifest
@@ -1,5 +1,4 @@
 AUX pbzip2-1.1.10-makefile.patch 263 BLAKE2B 32043c1a47504a2e901d9c4cb4360f295d39ae70fa7733d687fda7f620c0f5a0d5a4fbfbf65b82c841f21c31d761ff8840f77fa3a624e7c9456dd45299a9b7bb SHA512 f20db966b7da75ccb29578d54dac6d7445165bb5e6d6d29756ca43e0e32ed6abd67384330b652c61f7fdf904393e93d807ad0af5e2657ebb54d625d1fa5659df
-AUX pbzip2-1.1.12-data_truncation_fix.patch 3348 BLAKE2B 848afb0cb6311a28ba958346fdda210aa7bb325c8e3a174c7359e574322f8eb41a04d8e785aa70332de953db170706e9c1fefef6d7274ebfbc211769f4dc88dd SHA512 c6bac8fe33f9d123358c1a01cdb94a8dd6be4c63553f62568311f06b25cf371ab7d881797ebb0d66d9f772c5644fe1f38a70fdbd64b99adaaed82f1e96dcc966
 DIST pbzip2-1.1.12.tar.gz 47826 BLAKE2B 62b1e47b7b67f2a27f31032654506552c33e68121dd50d3496dc746a405cf783807c4966058feb1aebda2080ae1d1d22e944d057ea3a0dba2f9247ea46b23eb0 SHA512 bb68e87867295b89ee6fb76a8b72834daebf0ca6c16b2f10bce67fe7386716a728acd28bf46a9732087202ca0cc774f02c741b0b58801184bb7550f6fd119cd6
 DIST pbzip2-1.1.13.tar.gz 48015 BLAKE2B 1bb410acadc728963c3a04d2665fb1b1f0c206a893ed90352a9c16512e9bd5f82c3f5f3b383b382134bbe904735a1c8a81615a8bc54de8c6bc91633d9ce72c57 SHA512 a150e476a85b2ae71c244561380f8f113072ef712173afaa0bdace5845d5f81a15b135258cb01376156b69a5085b02b7ab866cfab5713aa773b251b203c087b8
 EBUILD pbzip2-1.1.12.ebuild 1063 BLAKE2B c3c26ee7b9a2793bed7b3f1beafbabe30a73b61bd5fcddf604668c4a88cf46fca08774fed7b0e3c592b4f72f9d9fc20b7b25d00614cb725cab7aea51a3ed3c79 SHA512 455ea431161a116e62f3ebb1cdd6547e418cd43d60588c47f0dfca520fd6ea0bb884103a3f5d314a2556d8a7d92d2e659cde734fac478a545c7aeace83e21c32
diff --git a/app-arch/pbzip2/files/pbzip2-1.1.12-data_truncation_fix.patch b/app-arch/pbzip2/files/pbzip2-1.1.12-data_truncation_fix.patch
deleted file mode 100644
index 0ce62e7a77fe..000000000000
--- a/app-arch/pbzip2/files/pbzip2-1.1.12-data_truncation_fix.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-https://bugs.launchpad.net/pbzip2/+bug/1524909
-https://bugs.gentoo.org/567952
-
-
-=== modified file 'pbzip2.cpp'
---- pbzip2.cpp	2014-12-21 10:20:27 +0000
-+++ pbzip2.cpp	2015-12-11 00:14:31 +0000
-@@ -2083,6 +2083,17 @@
- 	return 0;
- }
- 
-+void close_streams(FILE *stream, FILE *zStream)
-+{
-+	if (stream != NULL)
-+		fflush(stream);
-+
-+	if (zStream != NULL && zStream != stdin)
-+		fclose(zStream);
-+	if (stream != NULL && stream != stdout)
-+		fclose(stream);
-+}
-+
- /*
-  *********************************************************
-  */
-@@ -2125,9 +2136,7 @@
- 	// check file stream for errors
- 	if (ferror(zStream))
- 	{
--		if (zStream != stdin)
--			fclose(zStream);
--
-+		close_streams(stream, zStream);
- 		handle_error(EF_EXIT, -1,
- 				"pbzip2: *ERROR: Problem with input stream of file [%s]!  Aborting...\n", InFilename);
- 		return -1;
-@@ -2155,9 +2164,7 @@
- 	// check file stream for errors
- 	if (ferror(stream))
- 	{
--		if (stream != stdout)
--			fclose(stream);
--		
-+		close_streams(stream, zStream);
- 		handle_error(EF_EXIT, -1,
- 				"pbzip2: *ERROR: Problem with output stream of file [%s]!  Aborting...\n", InFilename);
- 		return -1;
-@@ -2169,10 +2176,7 @@
- 		if (syncGetTerminateFlag() != 0)
- 		{
- 			fprintf (stderr, "directdecompress: terminating1 - terminateFlag set\n");
--			if (zStream != stdin)
--				fclose(zStream);
--			if (stream != stdout)
--				fclose(stream);
-+			close_streams(stream, zStream);
- 			return -1;
- 		}
- 
-@@ -2180,11 +2184,8 @@
- 		if (bzf == NULL || bzerr != BZ_OK)
- 		{
- 			ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
--			if (zStream != stdin)
--				fclose(zStream);
--			if (stream != stdout)
--				fclose(stream);
--			
-+			close_streams(stream, zStream);
-+	
- 			if (ret != 0)
- 			{
- 				syncSetTerminateFlag(1);
-@@ -2200,10 +2201,7 @@
- 			if (syncGetTerminateFlag() != 0)
- 			{
- 				fprintf (stderr, "directdecompress: terminating2 - terminateFlag set\n");
--				if (zStream != stdin)
--					fclose(zStream);
--				if (stream != stdout)
--					fclose(stream);
-+				close_streams(stream, zStream);
- 				return -1;
- 			}
- 
-@@ -2225,11 +2223,8 @@
- 						if (ferror(zStream))
- 						{
- 							ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
--							if (zStream != stdin)
--								fclose(zStream);
--							if (stream != stdout)
--								fclose(stream);
--							
-+							close_streams(stream, zStream);
-+
- 							if (ret != 0)
- 							{
- 								syncSetTerminateFlag(1);
-@@ -2242,11 +2237,8 @@
- 						if (ferror(stream))
- 						{
- 							ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
--							if (zStream != stdin)
--								fclose(zStream);
--							if (stream != stdout)
--								fclose(stream);
--							
-+							close_streams(stream, zStream);
-+
- 							if (ret != 0)
- 							{
- 								syncSetTerminateFlag(1);
-@@ -2263,11 +2255,8 @@
- 			if (ferror(stream))
- 			{
- 				ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
--				if (zStream != stdin)
--					fclose(zStream);
--				if (stream != stdout)
--					fclose(stream);
--				
-+				close_streams(stream, zStream);
-+
- 				if (ret != 0)
- 				{
- 					syncSetTerminateFlag(1);
-@@ -2278,11 +2267,8 @@
- 		if (bzerr != BZ_STREAM_END)
- 		{
- 			ret = testBZ2ErrorHandling(bzerr, bzf, streamNo);
--			if (zStream != stdin)
--				fclose(zStream);
--			if (stream != stdout)
--				fclose(stream);
--			
-+			close_streams(stream, zStream);
-+
- 			if (ret != 0)
- 			{
- 				syncSetTerminateFlag(1);
-
diff --git a/app-arch/rar/Manifest b/app-arch/rar/Manifest
index e05f0223f8df..bbecfb76cfa5 100644
--- a/app-arch/rar/Manifest
+++ b/app-arch/rar/Manifest
@@ -1,5 +1,13 @@
 DIST rarlinux-5.9.1_p20200625.tar.gz 606675 BLAKE2B fe8f26d422bc816fbba27405f9d2e4063e9af6e136ca4c270bb5274a67e99d9a7c97250b05e6041f3ed27517398b0500aad765a1f599474ff08ebb6bacf5b0a3 SHA512 3ed37adda5f5b2f5502ab2e549614dad2848157321a31174d7259aaf77cc773c6398eb0e19ee6597536c58a938289a587e7db9681e6c47c906a5307c2d362147
+DIST rarlinux-6.0_beta1_p20201022.tar.gz 609438 BLAKE2B ab4793431f5d1d1570e1046868004722a39614ca4c3174d8f0cb2c67db0d138565e524deace2319dbbb853e3d4b33f35ae583596c6f77f52724e48484787c776 SHA512 668d0a4fa610aa71d5b69cace186c8d33683337bb88aa5e7f5ffeb5a314b666277205f0d6962cf6203dc3bfe0c2ec4fe2b38ede90754709f89479168bdd050d8
+DIST rarlinux-6.0_beta2_p20201112.tar.gz 609761 BLAKE2B 77acd1811cdafd85f317f7e96cfe5d69113ff25cbd9409bbb8d653bdc28f51a349f1df91c729543498d19704e253b2f58bee86ab1046e4ff51872fcf827c14f9 SHA512 510df1dece1154e1a0d951866965cc002a5044adf86a2e01b50a65a6a05e762bcb611d25ee051a4fcb1f8721d1b43bfb1bf69bccffc8c407b93a5de2d06a0d3d
 DIST rarlinux-x64-5.9.1_p20200625.tar.gz 595595 BLAKE2B 68eb24da7ecb2fe8a2be68bc3c3397df85490f4cd5517a2dc5390ad0dafbdd0a04d15968276657d600cf6c127cd8f52b74e920f7ee9b86b7083b9edbf0a57141 SHA512 6e0aec1642118331bfe79a35fa654f7d5143e61c0315375fa21d862a3941b672c58eaed4da69b8ea23a024aaafcfd02a277251391e59220b845847d4b3b82562
+DIST rarlinux-x64-6.0_beta1_p20201022.tar.gz 598338 BLAKE2B a0af6342f71a6ae448ce8b3fdc49dfd022337d74364d17f8135eb3c32d3d778857e9a4ef7e819d336581f477713a647be22377ced2d50faba4ab4a0c6e14f49c SHA512 312c1a59236cb32df69462bead45df5fa4f8180a8c075c964d508326027f2182cc8a1e31347fcb7570ff18d105a8df7abb5adf463a34f41c8f3e091cfba7f0fc
+DIST rarlinux-x64-6.0_beta2_p20201112.tar.gz 598386 BLAKE2B 49202329698dd8c26fecd74e48cad2583507a727049281e36130cb7408f64e0530245fab8aba4a8ad6ca6a48af6bd35beefec777d185b578a02a81e1bf00cc10 SHA512 6b61b2ce0efb8c44db5217ccb8e52d5e7e1efd95a9daeb3be6af30eed08993269389ab16faf5d9cfc0f562a0e9fb26ec4f8c73b72e4e0edefdc936e7f3821f66
 DIST winrar-x64-5.9.1_p20200625.exe 3246712 BLAKE2B c0616e600b11aaa524154b9b0108ab1a62e09cdd27a968b5bf9fa6d742800c9006ee7655df39511f31b24506dd03eb431c3e016ea63a5fe8fff702ccd8d3b358 SHA512 da7a85d56f1ed4dd6204e51297175c90349a26896b223bf210055a0c38f315c59f9d9b8368d5c279049443467d962c72bad48a3c62c1d80f2260f8ecd4d17db6
+DIST winrar-x64-6.0_beta1_p20201022.exe 3334400 BLAKE2B 61615920c38671649fe44b3c50f0427c82ba36cc5d610eeeeda5ec8acbc465b2e2a9573875a3efc5082bef24b3e1f1490e47eaf47d0a326aaade8ed3c3231cad SHA512 26bcfef84aa20eaed415b088e5a69fd2833baf3f660c38e58f26a04e6754335603f0d5e89e802b02acbef43ecbe43b45f810f5682c5857fbad1689c44c80bc9a
+DIST winrar-x64-6.0_beta2_p20201112.exe 3335984 BLAKE2B 2c9a3a44887990bb3ca36ca6797cf968bb65f082abaf4a843b5b69c1d562d331ec0622e79d631255519d769252e6c29e2a44db1a7555a05a290401c8eff30533 SHA512 b90290214254322acad10e6e56f904b3719d46c1c16bf384801050f8fc5a826a22de6e8d031fca2c67ab9da74916f3f6294152a43ab640d027ae2fa375a30ac9
 EBUILD rar-5.9.1_p20200625.ebuild 2232 BLAKE2B 35d9813aff0214bedd8580d884df51a57d6fa13a85bd1dff818c76a59a399c12da4fb61910508a351ed3519ea52d99719c09435d5d04192ba1c5c0463e71bab4 SHA512 09c59590aa819cf74013ef125710d5e86c67f036a9ea9ceecc47fb97acd600ae1bf6cd031de5c37d85407d2743f9da40c0a2bca31c2a62848a8e1c509a78081c
+EBUILD rar-6.0_beta1_p20201022.ebuild 2234 BLAKE2B 41a95f0e2089dd58c07be9195f123584c7566cb848e93eb01e49e1a403c635fd45fe0d01f57153a58863b32cf783261f6e9bce6c7902b21249d49034673595d7 SHA512 1697cc58d6d0fccd92b65ed6b175c3092f7ea47c3a9b48e994f2991d4449c9b787b5f028c2dc13f320c1129845e5d57f38ecc5a47856aa21d2161d548f965d87
+EBUILD rar-6.0_beta2_p20201112.ebuild 2234 BLAKE2B 41a95f0e2089dd58c07be9195f123584c7566cb848e93eb01e49e1a403c635fd45fe0d01f57153a58863b32cf783261f6e9bce6c7902b21249d49034673595d7 SHA512 1697cc58d6d0fccd92b65ed6b175c3092f7ea47c3a9b48e994f2991d4449c9b787b5f028c2dc13f320c1129845e5d57f38ecc5a47856aa21d2161d548f965d87
 MISC metadata.xml 436 BLAKE2B 772b97d33730af0ec24c126f46634735b661470d99fe1c2fc90d36653d0143014cf45f84686f3621b3b276c70b859f6551ffe764089d0fb646f99cd04b7d0def SHA512 9748890b95ef59d0fc815cc71757c10e77914ea73d254770a8669d8b766d95c65a90eb941a360b361d4e0c28f1abde6ba15a84a77609820aea7eaa25d2e913a1
diff --git a/app-arch/rar/rar-6.0_beta1_p20201022.ebuild b/app-arch/rar/rar-6.0_beta1_p20201022.ebuild
new file mode 100644
index 000000000000..7623c5c7ee5d
--- /dev/null
+++ b/app-arch/rar/rar-6.0_beta1_p20201022.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="RAR compressor/uncompressor"
+HOMEPAGE="https://rarlab.com/"
+URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
+URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
+URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
+SRC_URI="x86? ( ${URI_x86} )
+	amd64? ( ${URI_amd64} )
+	all_sfx? (
+		${URI_x86}
+		${URI_amd64}
+		${URI_w64}
+	)"
+
+LICENSE="RAR BSD BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="all_sfx"
+RESTRICT="mirror bindist"
+
+DEPEND="all_sfx? ( app-arch/unrar )"
+RDEPEND="sys-libs/glibc"
+
+S="${WORKDIR}/${PN}"
+
+QA_FLAGS_IGNORED="opt/rar/default.sfx
+	opt/rar/default-elf32.sfx
+	opt/rar/default-elf64.sfx
+	opt/rar/default-win32.sfx
+	opt/rar/default-win64.sfx
+	opt/rar/WinCon.SFX
+	opt/rar/WinCon64.SFX
+	opt/rar/Zip.SFX
+	opt/rar/Zip64.SFX
+	opt/rar/unrar
+	opt/rar/rar"
+QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
+
+src_unpack() {
+	local _file
+
+	for _file in ${A}; do
+		if [[ "${_file}" == rarli* ]]; then
+			if [[ "${_file}" =~ x64 ]]; then
+				if ! use amd64; then
+					continue
+				fi
+
+				unpack "${_file}"
+			elif [[ ! "${_file}" =~ x64 ]]; then
+				if ! use x86; then
+					continue
+				fi
+
+				unpack "${_file}"
+			else
+				die "Unknown SRC file '${_file}'!"
+			fi
+		fi
+	done
+
+	rm -f "${S}"/license.txt
+
+	if use all_sfx ; then
+		mkdir sfx
+		cd sfx
+		for _file in ${A}; do
+			if [[ "${_file}" == rarli* ]]; then
+				unpack "${_file}"
+				if [[ "${_file}" =~ x64 ]]; then
+					mv rar/default.sfx default-elf64.sfx || die
+				else
+					mv rar/default.sfx default-elf32.sfx || die
+				fi
+			elif [[ "${_file}" == winrar* ]]; then
+				ln -s "${DISTDIR}"/${_file} w64.rar || die
+				unpack ./w64.rar
+				mv Default.SFX default-win32.sfx || die
+				mv Default64.SFX default-win64.sfx || die
+			else
+				die "Unknown SFX file '${_file}'!"
+			fi
+		done
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	exeinto /opt/rar
+	doexe rar unrar
+
+	dodir /opt/bin
+	dosym ../rar/rar /opt/bin/rar
+	dosym ../rar/unrar /opt/bin/unrar
+
+	insinto /opt/rar
+	if use all_sfx ; then
+		doins "${WORKDIR}"/sfx/*.{sfx,SFX}
+	else
+		doins default.sfx
+	fi
+	doins rarfiles.lst
+	dodoc *.txt
+}
diff --git a/app-arch/rar/rar-6.0_beta2_p20201112.ebuild b/app-arch/rar/rar-6.0_beta2_p20201112.ebuild
new file mode 100644
index 000000000000..7623c5c7ee5d
--- /dev/null
+++ b/app-arch/rar/rar-6.0_beta2_p20201112.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="RAR compressor/uncompressor"
+HOMEPAGE="https://rarlab.com/"
+URI_x86="https://mirror.whissi.de/distfiles/rar/rarlinux-${PV}.tar.gz"
+URI_amd64="https://mirror.whissi.de/distfiles/rar/rarlinux-x64-${PV}.tar.gz"
+URI_w64="https://mirror.whissi.de/distfiles/rar/winrar-x64-${PV}.exe"
+SRC_URI="x86? ( ${URI_x86} )
+	amd64? ( ${URI_amd64} )
+	all_sfx? (
+		${URI_x86}
+		${URI_amd64}
+		${URI_w64}
+	)"
+
+LICENSE="RAR BSD BSD-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="all_sfx"
+RESTRICT="mirror bindist"
+
+DEPEND="all_sfx? ( app-arch/unrar )"
+RDEPEND="sys-libs/glibc"
+
+S="${WORKDIR}/${PN}"
+
+QA_FLAGS_IGNORED="opt/rar/default.sfx
+	opt/rar/default-elf32.sfx
+	opt/rar/default-elf64.sfx
+	opt/rar/default-win32.sfx
+	opt/rar/default-win64.sfx
+	opt/rar/WinCon.SFX
+	opt/rar/WinCon64.SFX
+	opt/rar/Zip.SFX
+	opt/rar/Zip64.SFX
+	opt/rar/unrar
+	opt/rar/rar"
+QA_PRESTRIPPED=${QA_FLAGS_IGNORED}
+
+src_unpack() {
+	local _file
+
+	for _file in ${A}; do
+		if [[ "${_file}" == rarli* ]]; then
+			if [[ "${_file}" =~ x64 ]]; then
+				if ! use amd64; then
+					continue
+				fi
+
+				unpack "${_file}"
+			elif [[ ! "${_file}" =~ x64 ]]; then
+				if ! use x86; then
+					continue
+				fi
+
+				unpack "${_file}"
+			else
+				die "Unknown SRC file '${_file}'!"
+			fi
+		fi
+	done
+
+	rm -f "${S}"/license.txt
+
+	if use all_sfx ; then
+		mkdir sfx
+		cd sfx
+		for _file in ${A}; do
+			if [[ "${_file}" == rarli* ]]; then
+				unpack "${_file}"
+				if [[ "${_file}" =~ x64 ]]; then
+					mv rar/default.sfx default-elf64.sfx || die
+				else
+					mv rar/default.sfx default-elf32.sfx || die
+				fi
+			elif [[ "${_file}" == winrar* ]]; then
+				ln -s "${DISTDIR}"/${_file} w64.rar || die
+				unpack ./w64.rar
+				mv Default.SFX default-win32.sfx || die
+				mv Default64.SFX default-win64.sfx || die
+			else
+				die "Unknown SFX file '${_file}'!"
+			fi
+		done
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	exeinto /opt/rar
+	doexe rar unrar
+
+	dodir /opt/bin
+	dosym ../rar/rar /opt/bin/rar
+	dosym ../rar/unrar /opt/bin/unrar
+
+	insinto /opt/rar
+	if use all_sfx ; then
+		doins "${WORKDIR}"/sfx/*.{sfx,SFX}
+	else
+		doins default.sfx
+	fi
+	doins rarfiles.lst
+	dodoc *.txt
+}
diff --git a/app-arch/tarsync/Manifest b/app-arch/tarsync/Manifest
index 0cbd6bd3674d..92c268f0c9fe 100644
--- a/app-arch/tarsync/Manifest
+++ b/app-arch/tarsync/Manifest
@@ -1,5 +1,5 @@
 AUX tarsync-0.2.1-gcc5.patch 2069 BLAKE2B eaa4c529c95caa2d70eda5c9a6901cc92ca3e885a0fd2ef3c4df1a6e53d6b1febe8aba4a043844dd31334aea0d58df964152c1245cccdc112658d2bdc229cf1e SHA512 f62fa7f65e506d34d6f9a90579cda2e0568da55cd11c0926dc8f39b5f3d0f4952e6984bd4b6913f3bff938271d37e689e2b8168f393382a04ae269aafbebcd8c
-AUX tarsync-0.2.1-make.patch 269 BLAKE2B 07b9391018c76b5e34c4cea40bf458bc7681aac0c0e16ae23071c0ff603d156051e321007401cced3d0e1208927f5352e4773c0d275314443bd9be2a48fb18dd SHA512 011c028ffad1575f0b7c1eca10d9744d1466fa74efd9414af54d8b0ef336ef1f7d340ff486a915a946ed2720141016597d3831f452c560bc6fda9569de90643f
+AUX tarsync-0.2.1-make.patch 295 BLAKE2B e8356136db5fa470d65691703c57a3fe86fc04857407cb99effe7a0aecfd0822dfbfcf37d6a6413c59d1aaef83df14b02e2d9342618cf849b90baddedaddab09 SHA512 ce1449e91dabb54f82535669010662237878c1e843c4f4505333cfdc4accd3c3923887f564c63ad3e5a91474878d05176103a83f65d9d82fde42ed3edf965bad
 DIST tarsync-0.2.1.tar.bz2 13593 BLAKE2B 4841d501587c8d4932031fe939fce9f41019622af2a4253bfe12c01160956e7eaeebf5ff00174332dce6b17ae150ead42b7c1a57483f948ba191b5c3943f6596 SHA512 bebf8e495ad196c002414c41f9fe9737b5300de18b7c3b16576a7d3bfd94608f36f1b86cb6ed4879c600b71c7706255d9b2d4140b73c5743a473fa2500dbca2d
-EBUILD tarsync-0.2.1-r1.ebuild 662 BLAKE2B 1bb5ce8d30d45e4d00c8c3a670a7e9e692921243988c1ccc45b27f8f108187657cd51d2819ad6f773e62432446a3ac6c9d5b53e640c9e44929e469978d9c71f1 SHA512 d511e4cafdfa0bc266b3dce3d4de5d96c688b89fd39990dd1f60e144fc5420d5a9053762eb2d8abe2e26279212e34dfd9e37acfbdcedce8ba940c5a1696701b1
+EBUILD tarsync-0.2.1-r1.ebuild 644 BLAKE2B 9acccec023866ba2fc292a39b3188223ad9da173551518a1b816805f9eff837154f978b4af2e4fe6469c5a3ee96cdd9d6b349ce600f1f78171ab56e090292e6c SHA512 7eca8c473f3f1e6970c954eea0fbccbb42859f60f3cd57a3f8ad650a5c301106e8a98b75fda2e6a64351eab39bfd23159a26d380e7ad453f37c7c1a9e44f7b7b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-arch/tarsync/files/tarsync-0.2.1-make.patch b/app-arch/tarsync/files/tarsync-0.2.1-make.patch
index 72591115a45a..4f3d062f3619 100644
--- a/app-arch/tarsync/files/tarsync-0.2.1-make.patch
+++ b/app-arch/tarsync/files/tarsync-0.2.1-make.patch
@@ -1,13 +1,13 @@
-Respect CC and LDFLAGS.
+Respect CC, CPPFLAGS and LDFLAGS.
 
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -2,7 +2,7 @@
  	CC=gcc
  endif
  tarsync:	main.o names.o tar.o string-misc.o fs.o options.o excludes.o
 -	gcc $(CFLAGS) $^ -o tarsync -lcfile
-+	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o tarsync -lcfile
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $^ -o tarsync -lcfile
  all:		tarsync
  
  clean:	
diff --git a/app-arch/tarsync/tarsync-0.2.1-r1.ebuild b/app-arch/tarsync/tarsync-0.2.1-r1.ebuild
index c9db986bc6c6..f2048606800d 100644
--- a/app-arch/tarsync/tarsync-0.2.1-r1.ebuild
+++ b/app-arch/tarsync/tarsync-0.2.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Delta compression suite for using/generating binary patches"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
@@ -12,22 +12,22 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux"
-IUSE=""
 
 DEPEND=">=dev-util/diffball-0.7"
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}/${PN}"
 
-pkg_setup() {
-	tc-export CC
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-make.patch
+	"${FILESDIR}"/${P}-gcc5.patch
+)
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-make.patch
-	epatch "${FILESDIR}"/${P}-gcc5.patch
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	dobin "${PN}" #make install doesn't support prefix
+	dobin tarsync #make install doesn't support prefix
+	einstalldocs
 }
diff --git a/app-arch/torrentzip/Manifest b/app-arch/torrentzip/Manifest
index 3f1ac1812459..9169b9a33a65 100644
--- a/app-arch/torrentzip/Manifest
+++ b/app-arch/torrentzip/Manifest
@@ -1,3 +1,5 @@
+AUX torrentzip-0.9-autoconf-quote.patch 337 BLAKE2B 6d1f630d365eaa9aff9d2c910ad30ad79694906cbb3ec7fccf665a468458d8103a0ebbc4e0d3fed1969e18b92780217fa47ed9a6260c42888f8bc022db15b3a6 SHA512 6ec05d00be36479084005c0938fb3df58b960914496ed149cb7eea9a6b4cb6067f9caa3ae7c835cf3bd79f357e17e18b8fcf80994dc1d550247c32416d71596d
 DIST torrentzip-0.9.tar.gz 59007 BLAKE2B eb5d7d8d9026115367afd88ef0cf33d2eed600e6eaa773f039a713c76a48a39e12cb5a8ac6faf2937d3563c9270029543bdb6361d2f22a39e2341953872f589c SHA512 691cd25f501de3de16b5b15b2afadfc34b833c3e93208c2c3497674936580ad2c3532a02e02531b89974302eee7b36f7579a412718914b1b38044b78a39a4d4d
+EBUILD torrentzip-0.9-r1.ebuild 566 BLAKE2B b5d754d804cac2edf328429321fa02bed15fd400c6b56a74106026f6245a55dbb65df0187292dff9715967454580b079d2c4e5a24972a71f240f08fe8ee750c4 SHA512 39469d9ee90af1bab0ea8f97f56907953a46cac3c706ed8080169c03816826c1c3015fd098ca0406d3318b2e207d2d4b02a301a3825701c62c38d6f1d978c8c7
 EBUILD torrentzip-0.9.ebuild 545 BLAKE2B d611213e01e6fa3257de87fba67f97d8c58a00e5b465f4068c92dcaced997147995d5cb0829b051ce5d109e76f0f8091fa86868e31863afb03aa51bf47755e76 SHA512 e8529a17ef17a9907b32c91fa31bb743a2773ed4bff637fd0cce9f88e510e50e814fb779f96e93567b32485fa7cf2130bd32daac22219e4ffec61e83e89ee5bd
 MISC metadata.xml 721 BLAKE2B 3a3fff9bfc6d5ab338abecf42f6a742f6e46e00907bb4858c6c41144d46dc40612346a7421274d62b33d4e66f284049da348c5389627492550c2c853aa0e2c34 SHA512 3e9c20623abceddb37559d631e498012bdd080a9b63f29aed8503553e6db7dfc2bff44226f3615c56a9bcc4ddb1c15b2f322d9f77fc1dc1788e62b4b2ea4c2ae
diff --git a/app-arch/torrentzip/files/torrentzip-0.9-autoconf-quote.patch b/app-arch/torrentzip/files/torrentzip-0.9-autoconf-quote.patch
new file mode 100644
index 000000000000..f1f15ced173e
--- /dev/null
+++ b/app-arch/torrentzip/files/torrentzip-0.9-autoconf-quote.patch
@@ -0,0 +1,8 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,4 +1,4 @@
+-AC_INIT([TorrentZip], [0.0], [StatMan, shindakun, Ultrasubmarine, r3nh03k <http://trrntzip.sf.net>], [trrntzip])
++AC_INIT([TorrentZip], [0.9], [[StatMan, shindakun, Ultrasubmarine, r3nh03k <http://trrntzip.sf.net>]], [trrntzip])
+ 
+ AM_INIT_AUTOMAKE
+ AM_CONFIG_HEADER(config.h)
diff --git a/app-arch/torrentzip/torrentzip-0.9-r1.ebuild b/app-arch/torrentzip/torrentzip-0.9-r1.ebuild
new file mode 100644
index 000000000000..522a52f4749c
--- /dev/null
+++ b/app-arch/torrentzip/torrentzip-0.9-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Create identical zip archives over multiple systems"
+HOMEPAGE="https://sourceforge.net/projects/trrntzip"
+SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+DOCS=(README AUTHORS)
+
+PATCHES=("${FILESDIR}/${P}-autoconf-quote.patch")
+
+src_prepare() {
+	default
+	export CPPFLAGS+=" -DOF\\(args\\)=args"
+	eautoreconf
+}
diff --git a/app-arch/unarj/Manifest b/app-arch/unarj/Manifest
deleted file mode 100644
index a80cb3e8b232..000000000000
--- a/app-arch/unarj/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX unarj-2.65-CAN-2004-0947.patch 1523 BLAKE2B f746d4a06119c6c8b926e208d122dc54338706f13534badbdf66edae0bbe6551afdca0de235553812fb258db4f55029ad54832f5625cd1e5e8c1595e2af06e88 SHA512 714580c0602b12013ca39fc3850298c1fe11d48ac156a5883a3d7b0c5a8adabd96d85963e5e4500df82ebc9300366d437be0f67bf6577739da9ce880eaa44b85
-AUX unarj-2.65-Wformat-security.patch 1303 BLAKE2B c13a77846264f9e5e8ab552179d005ead44e5c4418a58206cea3d00a2f3470b5176c82558a0ad2e1765c9a3d14760e941324af3057de9cf21f6d2c6191442600 SHA512 498386e182976b97f46614b73d345836b60440236b71d41bedd9b7671331d98dd485554eb93353055ae5d93619a8eeed0dc84a558cafb1c84188cb5fc865415e
-AUX unarj-2.65-gentoo-fbsd.patch 171 BLAKE2B 4e75118e8fe067d45d3d5944b242f783c67c38d81ee61bee6733c8a944e5085902319f8cbc96729df13297c74efc9c322541d19f711dbd1d4a66738d090d90c1 SHA512 7ed8623444b8c5546feed0388b2377278c7205be816d08126108ee423395f6da3d9976e0f98af57b74d9c2a8ff2d99014991a1b9f31cf87407a665887b3340cb
-AUX unarj-2.65-sanitation.patch 2710 BLAKE2B 814acc285392cdc44d2f4151e2aa10b9664f3dfec0968028e6f6c20207586034182cbeab9dee8e8340fe52f1a2bd7bb4d1793714d2f6806889128d2bb200d0c6 SHA512 86c30be41bbce6a330ea95d0aff52abadd20d01a2a0a2d63d5c53006b27b23d9c37a800b44a93508e6954da8d2595e650893a1f80fe55fc92681a82af823c755
-DIST unarj-2.65.tgz 21568 BLAKE2B 9b4d15782ebbac841937fc30c049e300d4c4324cb0cd7a585a228454ee35e7177e73cb6523e6cd03a509f9ad20103790ce3eac77552956557290414d57af2bdd SHA512 1b152063017042a343f49e487e5284c3d4c548222baa52e2066cefe6d2add60213ffd2653f42e38582681a1fd89efb8f1d3a6ef6389fc33e5397760ad9e72386
-EBUILD unarj-2.65.ebuild 687 BLAKE2B 4cfa1532f79418be46fbd7ec67b6c08e90d079ed784cd5b413151d211386c7b638bfd616c9e29fcc3f68082f6485bfe0cfcb8734d9b8a52469109155ac4c8176 SHA512 e042fff2d5392daa16cba8d9f10f1c73418162227460404ec40cca2d50237243355d39b99f42fb6827a687ba1487ef688148bf529e3a07be2d0360feb74fb96b
-MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/app-arch/unarj/files/unarj-2.65-CAN-2004-0947.patch b/app-arch/unarj/files/unarj-2.65-CAN-2004-0947.patch
deleted file mode 100644
index f52af83ac2ca..000000000000
--- a/app-arch/unarj/files/unarj-2.65-CAN-2004-0947.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: unarj-2.65/unarj.c
-===================================================================
---- unarj-2.65.orig/unarj.c
-+++ unarj-2.65/unarj.c
-@@ -217,7 +217,7 @@ static uchar  arj_flags;
- static short  method;
- static uint   file_mode;
- static ulong  time_stamp;
--static short  entry_pos;
-+static ushort entry_pos;
- static ushort host_data;
- static uchar  *get_ptr;
- static UCRC   file_crc;
-@@ -608,6 +608,7 @@ char *name;
-         error(M_BADHEADR, "");
- 
-     crc = CRC_MASK;
-+    memset(header, 0, sizeof(header));
-     fread_crc(header, (int) headersize, fd);
-     header_crc = fget_crc(fd);
-     if ((crc ^ CRC_MASK) != header_crc)
-@@ -632,9 +633,13 @@ char *name;
- 
-     if (origsize < 0 || compsize < 0)
-         error(M_HEADRCRC, "");
-+    if(first_hdr_size > headersize-2) /* need two \0 for file and comment */
-+        error(M_BADHEADR, "");
- 
-     hdr_filename = (char *)&header[first_hdr_size];
-     strncopy(filename, hdr_filename, sizeof(filename));
-+    if(entry_pos >= strlen(filename))
-+        error(M_BADHEADR, "");
-     if (host_os != OS)
-         strparity((uchar *)filename);
-     if ((arj_flags & PATHSYM_FLAG) != 0)
-@@ -733,11 +738,11 @@ extract()
- 
-     no_output = 0;
-     if (command == 'E')
--        strcpy(name, &filename[entry_pos]);
-+        strncopy(name, &filename[entry_pos], sizeof(name));
-     else
-     {
-         strcpy(name, DEFAULT_DIR);
--        strcat(name, filename);
-+        strncopy(name+strlen(name), filename, sizeof(name)-strlen(name));
-     }
- 
-     if (host_os != OS)
diff --git a/app-arch/unarj/files/unarj-2.65-Wformat-security.patch b/app-arch/unarj/files/unarj-2.65-Wformat-security.patch
deleted file mode 100644
index a076dd91f13d..000000000000
--- a/app-arch/unarj/files/unarj-2.65-Wformat-security.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Bug: https://bugs.gentoo.org/520478
-
---- a/unarj.c
-+++ b/unarj.c
-@@ -699,7 +699,7 @@
-     }
-     if ((arj_flags & GARBLE_FLAG) != 0)
-     {
--        printf(M_ENCRYPT);
-+        puts(M_ENCRYPT);
-         printf(M_SKIPPED, filename);
-         skip();
-         return -1;
-@@ -763,7 +763,7 @@
-     }
-     printf(M_EXTRACT, name);
-     if (host_os != OS && file_type == BINARY_TYPE)
--        printf(M_DIFFHOST);
-+        puts(M_DIFFHOST);
-     printf("  ");
- 
-     crc = CRC_MASK;
-@@ -779,10 +779,10 @@
-     set_ftime_mode(name, time_stamp, file_mode, (uint) host_os);
- 
-     if ((crc ^ CRC_MASK) == file_crc)
--        printf(M_CRCOK);
-+        puts(M_CRCOK);
-     else
-     {
--        printf(M_CRCERROR);
-+        puts(M_CRCERROR);
-         error_count++;
-     }
-     return 1;
-@@ -808,10 +808,10 @@
-         decode_f();
- 
-     if ((crc ^ CRC_MASK) == file_crc)
--        printf(M_CRCOK);
-+        puts(M_CRCOK);
-     else
-     {
--        printf(M_CRCERROR);
-+        puts(M_CRCERROR);
-         error_count++;
-     }
-     return 1;
-@@ -958,7 +958,7 @@
-     int i;
- 
-     for (i = 0; M_USAGE[i] != NULL; i++)
--        printf(M_USAGE[i]);
-+        puts(M_USAGE[i]);
- }
- 
- int
-@@ -973,7 +973,7 @@
-     argc = ccommand(&argv);
- #endif
- 
--    printf(M_VERSION);
-+    puts(M_VERSION);
- 
-     if (argc == 1)
-     {
diff --git a/app-arch/unarj/files/unarj-2.65-gentoo-fbsd.patch b/app-arch/unarj/files/unarj-2.65-gentoo-fbsd.patch
deleted file mode 100644
index 171b9959f433..000000000000
--- a/app-arch/unarj/files/unarj-2.65-gentoo-fbsd.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/environ.c
-+++ b/environ.c
-@@ -437,7 +437,6 @@
- #endif
- 
- extern struct tm *localtime();
--extern time_t time();
- extern char   *strcpy();
- extern voidp  *malloc();
- 
diff --git a/app-arch/unarj/files/unarj-2.65-sanitation.patch b/app-arch/unarj/files/unarj-2.65-sanitation.patch
deleted file mode 100644
index f37784ed2491..000000000000
--- a/app-arch/unarj/files/unarj-2.65-sanitation.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Index: unarj-2.65/sanitize.c
-===================================================================
---- /dev/null
-+++ unarj-2.65/sanitize.c
-@@ -0,0 +1,81 @@
-+/*
-+ * Path sanitation code by Ludwig Nussel <ludwig.nussel@suse.de>. Public Domain.
-+ */
-+
-+#include "unarj.h"
-+
-+#include <string.h>
-+#include <limits.h>
-+#include <stdio.h>
-+
-+#ifndef PATH_CHAR
-+#define PATH_CHAR '/'
-+#endif
-+#ifndef MIN
-+#define MIN(x,y) ((x)<(y)?(x):(y))
-+#endif
-+
-+/* copy src into dest converting the path to a relative one inside the current
-+ * directory. dest must hold at least len bytes */
-+void copy_path_relative(char *dest, char *src, size_t len)
-+{
-+    char* o = dest;
-+    char* p = src;
-+
-+    *o = '\0';
-+
-+    while(*p && *p == PATH_CHAR) ++p;
-+    for(; len && *p;)
-+    {
-+	src = p;
-+	p = strchr(src, PATH_CHAR);
-+	if(!p) p = src+strlen(src);
-+
-+	/* . => skip */
-+	if(p-src == 1 && *src == '.' )
-+	{
-+	    if(*p) src = ++p;
-+	}
-+	/* .. => pop one */
-+	else if(p-src == 2 && *src == '.' && src[1] == '.')
-+	{
-+	    if(o != dest)
-+	    {
-+		char* tmp;
-+		*o = '\0';
-+		tmp = strrchr(dest, PATH_CHAR);
-+		if(!tmp)
-+		{
-+		    len += o-dest;
-+		    o = dest;
-+		    if(*p) ++p;
-+		}
-+		else
-+		{
-+		    len += o-tmp;
-+		    o = tmp;
-+		    if(*p) ++p;
-+		}
-+	    }
-+	    else /* nothing to pop */
-+		if(*p) ++p;
-+	}
-+	else
-+	{
-+	    size_t copy;
-+	    if(o != dest)
-+	    {
-+		--len;
-+		*o++ = PATH_CHAR;
-+	    }
-+	    copy = MIN(p-src,len);
-+	    memcpy(o, src, copy);
-+	    len -= copy;
-+	    src += copy;
-+	    o += copy;
-+	    if(*p) ++p;
-+	}
-+	while(*p && *p == PATH_CHAR) ++p;
-+    }
-+    o[len?0:-1] = '\0';
-+}
-Index: unarj-2.65/unarj.c
-===================================================================
---- unarj-2.65.orig/unarj.c
-+++ unarj-2.65/unarj.c
-@@ -235,6 +235,8 @@ static UCRC   crctable[UCHAR_MAX + 1];
- 
- /* Functions */
- 
-+void copy_path_relative(char *dest, char *src, size_t len);
-+
- static void
- make_crctable()
- {
-@@ -738,11 +740,11 @@ extract()
- 
-     no_output = 0;
-     if (command == 'E')
--        strncopy(name, &filename[entry_pos], sizeof(name));
-+        copy_path_relative(name, &filename[entry_pos], sizeof(name));
-     else
-     {
-         strcpy(name, DEFAULT_DIR);
--        strncopy(name+strlen(name), filename, sizeof(name)-strlen(name));
-+        copy_path_relative(name+strlen(name), filename, sizeof(name)-strlen(name));
-     }
- 
-     if (host_os != OS)
---- unarj-2.65.orig/Makefile	Mon Nov 29 16:47:24 2004
-+++ unarj-2.65/Makefile	Mon Nov 29 22:46:56 2004
-@@ -9,7 +9,9 @@
- 
- decode.o:   decode.c  unarj.h
- 
--OBJS = unarj.o decode.o environ.o
-+sanitize.o: sanitize.c unarj.h
-+
-+OBJS = unarj.o decode.o environ.o sanitize.o
- 
- unarj: $(OBJS)
- 	$(CC) $(LDFLAGS) $(OBJS) -o unarj
diff --git a/app-arch/unarj/metadata.xml b/app-arch/unarj/metadata.xml
deleted file mode 100644
index 1b2becffa26c..000000000000
--- a/app-arch/unarj/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-arch/unarj/unarj-2.65.ebuild b/app-arch/unarj/unarj-2.65.ebuild
deleted file mode 100644
index ccd1ce99ae14..000000000000
--- a/app-arch/unarj/unarj-2.65.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Utility for opening arj archives"
-HOMEPAGE="http://www.arjsoftware.com/"
-SRC_URI="mirror://gentoo/${P}.tgz"
-
-LICENSE="arj"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-PATCHES=(
-	"${FILESDIR}"/${P}-CAN-2004-0947.patch
-	"${FILESDIR}"/${P}-sanitation.patch
-	"${FILESDIR}"/${P}-gentoo-fbsd.patch
-	"${FILESDIR}"/${PN}-2.65-Wformat-security.patch
-)
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	dobin unarj
-	dodoc unarj.txt technote.txt
-}
diff --git a/app-arch/unp/Manifest b/app-arch/unp/Manifest
index 5c6c3b86b878..1483486f8824 100644
--- a/app-arch/unp/Manifest
+++ b/app-arch/unp/Manifest
@@ -4,5 +4,5 @@ DIST unp_2.0~pre8.tar.xz 16336 BLAKE2B 6c6ffd75acda980e6c572c48944b238788a64d2bf
 DIST unp_2.0~pre9.tar.xz 16424 BLAKE2B 9042f48be0f80d5e40a08161a35c282ba458dc98cf13992835bdeecebd5fbadd33b3af9165738332cb9f508550a234a48d314332f00ecdacc808a8051eb0740b SHA512 74c9a6e143c9023bdd456dacff5c3a6e30722e259f324c066fe3eed9e4a09c38b399b381719c8677c2fa84434c1e7720384d782d97c098fa6fbcbdbf4030986e
 EBUILD unp-2.0_pre7_p1-r1.ebuild 1186 BLAKE2B b848b83c759df2f5b75266e0cd364c19b348d19343df3876f35cac50e0ffcda4b9594afc783049facb662b5922f01f61712e4ce09098d9a9cd9e4873c95fa6c0 SHA512 24a67fab5f587b547d9e44331fbafb9c80824cf3610b8f62c84c9c3974a29aa908810e7d3640dad955c682ae1db13cfbc996bdfd7377613e9dd8890d0c1d75c2
 EBUILD unp-2.0_pre8.ebuild 1105 BLAKE2B 0f1b06eefbfb7832fd722abc2d959cc7c854e5c88d221fc6d4a64b164b8335c065bdccd1a5c980eb20ee0a92648dc5ddafbb7d02ff8cb1efba2356a7935c1488 SHA512 c6fc4276c9134872156c60f12760ec4d8b83798ec88a1b21b3954df461e0bedfedfe984ea0def8eede6b8a45a124b045732e90200351d81f76753147e91c844f
-EBUILD unp-2.0_pre9.ebuild 1105 BLAKE2B 0f1b06eefbfb7832fd722abc2d959cc7c854e5c88d221fc6d4a64b164b8335c065bdccd1a5c980eb20ee0a92648dc5ddafbb7d02ff8cb1efba2356a7935c1488 SHA512 c6fc4276c9134872156c60f12760ec4d8b83798ec88a1b21b3954df461e0bedfedfe984ea0def8eede6b8a45a124b045732e90200351d81f76753147e91c844f
+EBUILD unp-2.0_pre9.ebuild 1103 BLAKE2B 789dcaa92043be75fc377e05c5e48638826fc51f482330415ce5db22293d54c26ecc92c97200bd0a81cc32e41bb2ec1ef00ba3843d334a4b2cf9a59d9e6b3827 SHA512 51d161a7a542e9a5543397f6b83c47721961915d2810e653904ce33e33d17ba5f73e1e64c6771710fc23e7db8a6b8a634c6d9ef22efa51368f4fed527d4c8c01
 MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/app-arch/unp/unp-2.0_pre9.ebuild b/app-arch/unp/unp-2.0_pre9.ebuild
index 8116fc04c3ae..2a7a56a048e5 100644
--- a/app-arch/unp/unp-2.0_pre9.ebuild
+++ b/app-arch/unp/unp-2.0_pre9.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/app-arch/unrar/Manifest b/app-arch/unrar/Manifest
index 07f4a0db76ce..d116ea3d668e 100644
--- a/app-arch/unrar/Manifest
+++ b/app-arch/unrar/Manifest
@@ -1,5 +1,9 @@
 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-5.9.4.tar.gz 229921 BLAKE2B d87189a6b6b3566a0efac7f72e40732ff673cdcac6f4fdaa96b5a771025f02779d74e2822053681477b3490f45817196673aa5707846767c4061ca95718557a1 SHA512 4c026bc12c38314c7df6e1b2f296be681fffa4ba525e378809063519cb5d51889fe8d3cbce16e802023354f02b45b1bcc672b79a6fa81b4baa13a374ce22c8f1
+DIST unrar-6.0.1.tar.gz 232142 BLAKE2B 0f048f67769b31c67988131b5d8cca33dc9fa2abc6b39e5be63aa8f6061cbf93fa7d7e2055641f286f6be4de2733d2a123441d26381335e2779b3c7d7004ad11 SHA512 2c88dd05252237d7d62ad34332673ac9e457bb43b0ed980be977d557d0deb3d5bd19372d41ac2e254d94e20ecb1ca62b1c15781320cf231f2a7bfa12fe176d8a
+DIST unrar-6.0.2.tar.gz 232306 BLAKE2B d0f410364d2be74dbcc061b8f54b79eb37f7d66e1910e3c6a80c59cf3d4e14a39cf0fb2f465f94757a2c30b886dff0b970fc44dbc166c50f5357e56148f82367 SHA512 fd5598499863f734563213acb67cee41c997eac69c5814d275468c9eb627286c016de23ddbf9c96ef9ba0b985ac57476b26382c8263d8f81c55b8bca1c013671
 EBUILD unrar-5.9.4.ebuild 1885 BLAKE2B a3d674f2b906716a0b94cefddbf230b1cc8af84f61eeec97db50c38a04d046cd2366ecb4f23150049a0f3205b1e74419694f11c747c2f44ecea3e0f66eadeef2 SHA512 e84d1a513b32c739767a0d445c3c7a156b1e381fa0f0b191d606385bb416e3e243e0bb0ba1d9616c68dc3490097338c31e8b4b318df52f5b011abb1d56aa6348
+EBUILD unrar-6.0.1.ebuild 1893 BLAKE2B 944cf1df78f3f3f2e6db04b5a50f0d5727d81a959cb4d85c2ef6a0532ab1660ce70b7f4b04cb91f488c7149fda139b2d3d2c968092b7120c66c021b8c93a73bf SHA512 fba8c1d0cb692af1f73f2bec15270be668cbcb46df5609794b587ada792e18e1b77dc2f301ea0e2ef67df88b697260a57088e2f5ae4500b56e427af1c6167b68
+EBUILD unrar-6.0.2.ebuild 1893 BLAKE2B 944cf1df78f3f3f2e6db04b5a50f0d5727d81a959cb4d85c2ef6a0532ab1660ce70b7f4b04cb91f488c7149fda139b2d3d2c968092b7120c66c021b8c93a73bf SHA512 fba8c1d0cb692af1f73f2bec15270be668cbcb46df5609794b587ada792e18e1b77dc2f301ea0e2ef67df88b697260a57088e2f5ae4500b56e427af1c6167b68
 MISC metadata.xml 512 BLAKE2B 260947f2fad1c57508f689b2db22fff72276f40fb91789cfd0b0a2ae63d6710ed186d6350e4a23d19566e3469a097294f95074810652d61cb752a54dfe92ac80 SHA512 4a8c151dbda173dada5635cbd844459a1d999c6c41a2e140a09ba31536e1856d896141471c65b5cb52c9c92229f55c211e01ba23b975f4d25442ffc55ae6a13d
diff --git a/app-arch/unrar/unrar-6.0.1.ebuild b/app-arch/unrar/unrar-6.0.1.ebuild
new file mode 100644
index 000000000000..bd059f18fdd7
--- /dev/null
+++ b/app-arch/unrar/unrar-6.0.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic 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 ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+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}
+	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.2.ebuild b/app-arch/unrar/unrar-6.0.2.ebuild
new file mode 100644
index 000000000000..bd059f18fdd7
--- /dev/null
+++ b/app-arch/unrar/unrar-6.0.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic 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 ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+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}
+	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/wimlib/Manifest b/app-arch/wimlib/Manifest
index b4a6c4317108..ad86435f1467 100644
--- a/app-arch/wimlib/Manifest
+++ b/app-arch/wimlib/Manifest
@@ -1,6 +1,6 @@
 AUX syslinux-path.patch 713 BLAKE2B 94a9a0ef73b40ad9dc0febf732e5facc24fde0a3138a0298a72f7e2cde6d5fe34560d739432bcd12f172b48763f8deab2288eb14f99470d0a1340d0103941ab2 SHA512 dd0658529fb3b35690d34bb03ae8624314c0b379765566753b1ea0804ef8f1b94f300734b35ce0815e5352b02d09c86c91e371e0c442fcc3dca7ad89ceee4cbe
 DIST wimlib-1.12.0.tar.gz 1014508 BLAKE2B d12f4e0b458fe756b74c67f2f643256c44021e0f0c3e2a3a70eb87647c3c6cabd93413917bf8a8c6ab6820860c407f4454454719227f5cbf1a9a81a7bedc1a6e SHA512 0343b37550366f07fd6a6689f4445f390187beddde677f4d6d831c07936d03b613ae95f612ec7a75e978a5e678f33ab766d0f3b3d942886df56e4ef77d4b07b9
 DIST wimlib-1.13.0.tar.gz 1035146 BLAKE2B 305d4bd4a0299c99b537c2bc59c674740239d3fe7c240038f4846849f36046ef587b04643d5a482c876668bf8f9a94a7b45a5e4f12c6d235a579a08c3879acff SHA512 a7ec729dda07b3884a851533a3c9e9db3061d9f6273ec318e40ece3687f4671f66989c07c080fa9cdcf5f01318c5eba7256b58f15f711b3ff14f4eb61c2114cb
-EBUILD wimlib-1.12.0.ebuild 1431 BLAKE2B 90f047761bbdd8c4de42637580932681f6a47f2ac1db41f254e4b1322ad6ff092553c8132205d542aa37b841a601a6e41026863fbc329d7ff121d6132d64c0d2 SHA512 f6f1a36527280a6d251782a2e864e522fe050dbf3ce43e69dec56dbed39d9399d050b8f280ca131f364fecb9e8725a400a61f75fdb52ac52d8c20a1f7d6fd98f
-EBUILD wimlib-1.13.0.ebuild 1431 BLAKE2B 90f047761bbdd8c4de42637580932681f6a47f2ac1db41f254e4b1322ad6ff092553c8132205d542aa37b841a601a6e41026863fbc329d7ff121d6132d64c0d2 SHA512 f6f1a36527280a6d251782a2e864e522fe050dbf3ce43e69dec56dbed39d9399d050b8f280ca131f364fecb9e8725a400a61f75fdb52ac52d8c20a1f7d6fd98f
+EBUILD wimlib-1.12.0.ebuild 1520 BLAKE2B 2d1eef2fcf1a7c311213a8baf454d0fdbda3dd36805c5b0a20dd0436a872407116bbf2766f426034e0e75d10b4dab36701be2c5d22364b5e5b8bf9daa8f85e63 SHA512 4f3cb589e575403f0a207b1769445137eff7375371f526146be272f28783233245e97f491e4c307de03c1233f31f26d24d4d8e4e90ffa3ca3ea79081e286882a
+EBUILD wimlib-1.13.0.ebuild 1520 BLAKE2B 2d1eef2fcf1a7c311213a8baf454d0fdbda3dd36805c5b0a20dd0436a872407116bbf2766f426034e0e75d10b4dab36701be2c5d22364b5e5b8bf9daa8f85e63 SHA512 4f3cb589e575403f0a207b1769445137eff7375371f526146be272f28783233245e97f491e4c307de03c1233f31f26d24d4d8e4e90ffa3ca3ea79081e286882a
 MISC metadata.xml 633 BLAKE2B 441e45675abb3671408e44a13ea6ae1738276a598e9e30522e4f58116936ae85a1971f92b2d2c791395abaed09640d2224ccd1ad889a845839212b29222d5cce SHA512 1f7e158976543a9e195330a8cdd5b0f87bae9154d9d01b30bb0e93f900af5410cf35a61e8ea5230b2cf5601717d0a46381febb1375e540da510f95d770e82281
diff --git a/app-arch/wimlib/wimlib-1.12.0.ebuild b/app-arch/wimlib/wimlib-1.12.0.ebuild
index c8a393c40055..3fb8e91ab6c9 100644
--- a/app-arch/wimlib/wimlib-1.12.0.ebuild
+++ b/app-arch/wimlib/wimlib-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,6 +55,7 @@ src_configure() {
 		$(use_enable cpu_flags_x86_ssse3 ssse3-sha1)
 		$(use_with openssl libcrypto)
 		$(use_enable threads multithreaded-compression)
+		--disable-static
 	)
 	has test ${FEATURES} && myeconfargs+=( --enable-test-support )
 	ac_cv_prog_NASM="$(usex yasm yasm nasm)" \
@@ -65,3 +66,8 @@ src_compile() {
 	emake
 	pax-mark m "${S}"/.libs/wimlib-imagex
 }
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-arch/wimlib/wimlib-1.13.0.ebuild b/app-arch/wimlib/wimlib-1.13.0.ebuild
index c8a393c40055..3fb8e91ab6c9 100644
--- a/app-arch/wimlib/wimlib-1.13.0.ebuild
+++ b/app-arch/wimlib/wimlib-1.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -55,6 +55,7 @@ src_configure() {
 		$(use_enable cpu_flags_x86_ssse3 ssse3-sha1)
 		$(use_with openssl libcrypto)
 		$(use_enable threads multithreaded-compression)
+		--disable-static
 	)
 	has test ${FEATURES} && myeconfargs+=( --enable-test-support )
 	ac_cv_prog_NASM="$(usex yasm yasm nasm)" \
@@ -65,3 +66,8 @@ src_compile() {
 	emake
 	pax-mark m "${S}"/.libs/wimlib-imagex
 }
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 9f112026485d..ae6bbaa13455 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,7 +1,8 @@
 AUX zstd-1.4.4-make43.patch 3577 BLAKE2B 55e6e743b44f8ad9048d4ab94c7058b82fc3fdbcf7863dbd7fe1933c62f736bbfed1d57a1fbd26f24159bae96094b393e1067b0bf467aeb40a464c7b34e741c5 SHA512 800c6dd70c09705ad7eb3e031c451d6e9cf0a06b1a42f0fbb0e474e0873596641bb5e4c03681955ec883d34ffaa4aa8ae207f399c4753c0f6f05afe70f56254f
 AUX zstd-1.4.4-pkgconfig_libdir.patch 8322 BLAKE2B 2c7bcc57cbbf549919d0f7ce4538afd5ef8face1624b4bb348d77725aa22349e306614a8bd75666fae0308f05fc64645211dbc2f3fe4efaddf7027c845fd5d0d SHA512 e748145592281a218495076c44d081c994923605fff2f9561a04ad3a00ba38847e4855549610da4d91d50c4bd5198270482ae59277571e9723a46b967a088632
+AUX zstd-1.4.5-fix-uclibc-ng.patch 762 BLAKE2B 3ead6b2ca56a6109b984a7e4b73d80b8a92e10f8ff20547e27fe897d70dac7bff15f1acedf6cca3ab0ea9ded07c2cdb8ac2ee5665eeb7a095c742c5614c73604 SHA512 e4de6367b47b016d9a0179b57cc06c9e232d0a736e20ff0cf8132d36512a5a232d8583d91b1453f7a122d63b85df96688053f02552b2717ff2f22bf30a0c0002
 DIST zstd-1.4.4.tar.gz 1962617 BLAKE2B e21841a53b6c60703e5500cfc2a02923c4c3e57975aa57e1060310171e0d83d7c8eda1bd0510d5736db5c310d76847d2105ac5f614867fc3a9dc3086a035dfd7 SHA512 8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf
 DIST zstd-1.4.5.tar.gz 1987927 BLAKE2B 1497d4e87040e5c71466468ebf1a57f4073666f2b005229925bc1d95a4b4fcb2a51d88bb79be20f21860e5750da42f8aac21d2997421d07ba37bd6bb12a28b55 SHA512 b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387
-EBUILD zstd-1.4.4-r4.ebuild 1785 BLAKE2B 3ecdc81d9ca6905ab87308aba86488f03b723d98062120bc8049a2a4cc16958dfda368a57f15c93e16d720816b3dde9c11e6662eb5131c828eeb87591d901141 SHA512 d80f766db89d7ad70847557e49d13c597170207045a76506212b78fccf5a8e205477db57c7f5c8eb28f10b25fd5b0a36745a889ee467af50d633e003a21c7bb1
-EBUILD zstd-1.4.5.ebuild 1689 BLAKE2B 680856e65b1bef3e3aa162397fb604bab1a57aa0359173278698f440ea3ac31645f06cfcd9a26c8e09eaa27a9573993b058cde0a43ddf8f8e159806791f5c28b SHA512 b97f3cc098c47c7f5aec09bc5c96ef5e2a7133cd64c301827fbb0573169cb7e085010f5e9f784a44a96160409977de763a7123d1e5e535af73d5c0fb0be3818a
+EBUILD zstd-1.4.4-r4.ebuild 1840 BLAKE2B 09aa07c4d2a068cb60e83d9796c7fe636d9e97c72e1efe731a2a2dc1f559874e9fa68dd06684135d18fe9f6dc67dcbddb69e34dd6ef0a510dc9355221acdf2a8 SHA512 7c55534e5feffae25bc9d1cfc9475404fa2387dbc44b788084df219d3cd26dfde0e47ccc015d89ab13bef1c5d261d2942d5745862221685fe5b80eb6613a73f3
+EBUILD zstd-1.4.5.ebuild 1750 BLAKE2B 3718289304a862bc8a5cd78159409ea00847af3d11e8906a45061ad76ee3cda3cdbcc072da6f2a8e20e6594aed841533bedf1195d4d01b0e43530ddb176160bf SHA512 b745133038280fcd31de024704934bf72d619087ed7d48efedf64d47758ca4987c26b0b9bd0ffbaf31b0321dd08796ec8e2d6a70c1a5a9b136ccf33f08960fd0
 MISC metadata.xml 335 BLAKE2B b5522206853292786178f23747d3f8145cd21a9e1d9d545aea8ff424910d9f9ab6d35c66c098edac809baa4e87239d36d4d987308481b265fe30460d54f415b9 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6
diff --git a/app-arch/zstd/files/zstd-1.4.5-fix-uclibc-ng.patch b/app-arch/zstd/files/zstd-1.4.5-fix-uclibc-ng.patch
new file mode 100644
index 000000000000..e4c2335d199f
--- /dev/null
+++ b/app-arch/zstd/files/zstd-1.4.5-fix-uclibc-ng.patch
@@ -0,0 +1,28 @@
+From 1dcc4787965aa8f4af48ed5a2154185750bbaff5 Mon Sep 17 00:00:00 2001
+From: Yann Collet <cyan@fb.com>
+Date: Mon, 13 Jul 2020 14:16:33 -0700
+Subject: [PATCH] fix uclibc's st_mtim
+
+reported and suggested by @ewildgoose (#1872)
+---
+ programs/platform.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/programs/platform.h b/programs/platform.h
+index 2b4b9f2d8..68be70bb3 100644
+--- a/programs/platform.h
++++ b/programs/platform.h
+@@ -102,6 +102,12 @@ extern "C" {
+ #      define PLATFORM_POSIX_VERSION 1
+ #    endif
+ 
++#    ifdef __UCLIBC__
++#     ifndef __USE_MISC
++#      define __USE_MISC /* enable st_mtim on uclibc */
++#     endif
++#    endif
++
+ #  else  /* non-unix target platform (like Windows) */
+ #    define PLATFORM_POSIX_VERSION 0
+ #  endif
+
diff --git a/app-arch/zstd/zstd-1.4.4-r4.ebuild b/app-arch/zstd/zstd-1.4.4-r4.ebuild
index 8c6ab8a0fd56..ebb7e04a9cc1 100644
--- a/app-arch/zstd/zstd-1.4.4-r4.ebuild
+++ b/app-arch/zstd/zstd-1.4.4-r4.ebuild
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}/${P}-pkgconfig_libdir.patch" #700780
 	"${FILESDIR}/${P}-make43.patch" #708110
+	"${FILESDIR}/${PN}-1.4.5-fix-uclibc-ng.patch" #741972
 )
 
 src_prepare() {
diff --git a/app-arch/zstd/zstd-1.4.5.ebuild b/app-arch/zstd/zstd-1.4.5.ebuild
index 414788bac8f4..110b0378b776 100644
--- a/app-arch/zstd/zstd-1.4.5.ebuild
+++ b/app-arch/zstd/zstd-1.4.5.ebuild
@@ -18,6 +18,10 @@ RDEPEND="app-arch/xz-utils
 	lz4? ( app-arch/lz4 )"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-uclibc-ng.patch" #741972
+)
+
 src_prepare() {
 	default
 	multilib_copy_sources
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /app-arch
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)