gentoo christmass resync : 25.12.2020

23 files changed, 328 insertions, 55 deletions

diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 53dc2966437b..16da4951f027 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 11dbcdae3275..6f93f9c099c0 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,8 +1,10 @@
-AUX 3.32-packages.match 645 BLAKE2B 7bb6ec28fb8150e1f1989a9db4514556d857b4dea8b8225b1515f3f53b70a1e81b6a0a1068a0d356a33086d0127993a394cb0500e2991384c404dce7faaf32a0 SHA512 3c837c18afa12c5e022a80f85ccc83e5f55fc8fdd5ee8f19f1b2222d08560ad1fd349ed8b1bb7255119f6d6101399fa0dcd79e6a1754c719c0409343c231f65b
-AUX 3.36-packages.match 664 BLAKE2B 5ff5f4066c1b085829321280d0f86d9a9eda071a23bfb01aba94594ad2815d6f68d67b8c0b6d053ee442a0b3e70d81c2bde3788b14c98ed3e1e37fb16b101959 SHA512 e4518a143a164b699aeeb4309bf41697f9aab12de401217126513018352163ed034f3e8ef30fb22db0cb966650f08fc9b68079d171a861bd6185c13fa6b4a4c9
+AUX 3.32-packages.match 645 BLAKE2B b3ebf8eab5fd5fd57a19af06d3728d09f77ebd1c76aebae2e2bebae13f8071a86e60f5534460239436befb3d43f59441bec42c2787d5c5ee3c4e439fac02ca32 SHA512 894aabfba489ddf5aaaccccc10d5b7198dc03577a36798e418ebc0aa2b12689e04c2ce97052e0e105eaf93799964ce8196a234ed69f50fa0cf572cc723232690
+AUX 3.36-packages.match 664 BLAKE2B dfe72c4eb0b44b8ab589fa81c0ceaa31bc3516dee78fabe2eb48f8131b25ed75a11630ae620e70646539ef42a7c4d7d283f71ffa0fa13f64ccf164d672acd95a SHA512 154438583492c571e4c8e1c926c3cb04972255cc4d1b74f186dfbe50c9756f25e11034fe64d893fdd8f2698c8eaaebba76682a818bb6523656c7c412f8e8b614
 AUX file-roller-3.32.4-fno-common.patch 693 BLAKE2B 2a2cd45f9bc5fd73d9bf1324944f70890bd52878d03c0197f0b4759f6a780fac5c964c240269bbcb89056591306fc87df4bb3403b18346079853541d9b81a644 SHA512 31c425704802c2d2095b8778177f7cfbd31fd1447a3e4b8fa3ffcc9c952231d400a11458d26a6db7e2595d6bae1ba9eec01fa6d925ed727660cba7af2589bbb5
 DIST file-roller-3.32.4.tar.xz 854444 BLAKE2B 04264e64af8ab4376fa6985683b16be7fef730a4e24044f726933b885aaaa6b630f347a256b09c2ce6183d0a0a392b33b4328715bf6d19cf7128c1980f9f4792 SHA512 16b5ddbdeacf4e9e61265ecff05e8f2e0034147c67ae7355d2442f9b26098ff253d24cb34c8e686c2ac031da6acac8e1e3c8a9f978e1eb2b446b1e045babafc7
 DIST file-roller-3.36.3.tar.xz 870608 BLAKE2B 4c57b99f2ca0eb4db3fac0216b63207d1664829ee54e21eb976a327bd65aec5abfd2a02b84bc80246fde131ede6ff63deaf8b63451db6a0fecc0121c8bce1a5b SHA512 41558ca8061276b1248fd3599e856051dcd69ca831fb4d8a33666dc373b4abed56e7ef204a6e041ceace05ea7234448d15bc7be8c48dc1809ac6d445de251370
+DIST file-roller-3.38.0.tar.xz 877960 BLAKE2B af1c4800e24adfb36a8f8f108740f9cad14bcd40f797b2430d00e428d723587de75be03848aca612536cee768b6b372534e0b6a322dc40d7ab1c41eef540916b SHA512 9c2e3c105397bceb08e30c9796b9242633fe49772aed2e7f67461c34a51be1493e922301b1fc29bdcb0fa50d220f4a7db2ee7642f629007ce2bef00334d7110e
 EBUILD file-roller-3.32.4.ebuild 2274 BLAKE2B 996cac999d6d1c1f4b4deba986f6001371d1b5f6c05c370e531679c6486a796c75a6e2679ef65c655cfed6af1dbde06840d1b6b916ec3cc5f89325cdc440d90b SHA512 a3e66c14e06a337a41591a55a1d8a6d273f57bacec3edb202bca83bbf952d980e2b4131c338a2ea71b31f76116195a772a4261a4b9caa634795de4f249ea632a
 EBUILD file-roller-3.36.3.ebuild 2176 BLAKE2B 6e5b451ec8ce8a4f43b59a5c51ddf2c7389489fe80549efede5ebb23463f699e9a27ee86932d1a43b011def4a7d0cb4327f3fd1959aca409df649fa08bd3d477 SHA512 b7de40066a28fb6761595db964f13d0b41710da2bb542a9a78740677b36ea4fcf3faff79a592090c11a1c3fb537718c667a2257b98f7109eb5b30d758da75a02
+EBUILD file-roller-3.38.0.ebuild 2119 BLAKE2B 10345b6fbc51320329ecba9c26333faab979a61e9c204a385cb0d3e209298fa93e687c52f8d11a6ca44dab19253b2b425c43d60d5596f14132015cfd32f293f1 SHA512 b93f320df766fafef3deadfffdac670ba8df2088417a5b8740578b16be2e060129872dd84824d3283689397f1aded23fa2631c27105064d0fd63cd85f3d3e50f
 MISC metadata.xml 627 BLAKE2B cc3f28d4405c3939f1a24dbc25d3ac5dfa46438b769d29f4891e860a40b67de074defa0beff9ed9f542610eb38d3593b3d9602f886c57178db4e344e996c52e4 SHA512 6becde35161e28b9b829c97c6c3a67c011b2509647f4a15672ea67560909fc05a4e1aaf43aa4f4f308ab5541316b4107dada8cbe7e73fc2c076afbaa0a807eaf
diff --git a/app-arch/file-roller/file-roller-3.38.0.ebuild b/app-arch/file-roller/file-roller-3.38.0.ebuild
new file mode 100644
index 000000000000..aee9ff433eab
--- /dev/null
+++ b/app-arch/file-roller/file-roller-3.38.0.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
+
+DESCRIPTION="Archive manager for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+SLOT="0"
+IUSE="libnotify nautilus"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# gdk-pixbuf used extensively in the source
+# cairo used in eggtreemultidnd.c
+# pango used in fr-window
+RDEPEND="
+	>=app-arch/libarchive-3:=
+	>=dev-libs/glib-2.38:2
+	>=dev-libs/json-glib-0.14
+	>=x11-libs/gtk+-3.22.0:3
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	libnotify? ( >=x11-libs/libnotify-0.4.3:= )
+	nautilus? ( >=gnome-base/nautilus-3.28.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+${PN} is a frontend for several archiving utilities. If you want a
+particular archive format support, see ${HOMEPAGE}
+and install the relevant package. For example:
+7-zip   - app-arch/p7zip
+ace     - app-arch/unace
+arj     - app-arch/arj
+brotli  - app-arch/brotli
+cpio    - app-arch/cpio
+deb     - app-arch/dpkg
+iso     - app-cdr/cdrtools
+jar,zip - app-arch/zip and app-arch/unzip
+lha     - app-arch/lha
+lzop    - app-arch/lzop
+lz4     - app-arch/lz4
+rar     - app-arch/unrar or app-arch/unar
+rpm     - app-arch/rpm
+unstuff - app-arch/stuffit
+zstd    - app-arch/zstd
+zoo     - app-arch/zoo"
+
+src_prepare() {
+	# File providing Gentoo package names for various archivers
+	cp -v "${FILESDIR}"/3.36-packages.match data/packages.match || die
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Drun-in-place=false
+		$(meson_use nautilus nautilus-actions)
+		$(meson_use libnotify notification)
+		-Dpackagekit=false
+		-Dlibarchive=true
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-arch/file-roller/files/3.32-packages.match b/app-arch/file-roller/files/3.32-packages.match
index 09f1513968e3..b8f879c2d13d 100644
--- a/app-arch/file-roller/files/3.32-packages.match
+++ b/app-arch/file-roller/files/3.32-packages.match
@@ -5,7 +5,7 @@ brotli=app-arch/brotli
 bzip2=app-arch/bzip2
 cpio=app-arch/cpio
 dpkg=app-arch/dpkg
-genisoimage=virtual/cdrtools
+genisoimage=app-cdr/cdrtools
 gzip=app-arch/gzip
 lha=app-arch/lha
 lrzip=app-arch/lrzip
diff --git a/app-arch/file-roller/files/3.36-packages.match b/app-arch/file-roller/files/3.36-packages.match
index 0a26adebb250..b494f5430a00 100644
--- a/app-arch/file-roller/files/3.36-packages.match
+++ b/app-arch/file-roller/files/3.36-packages.match
@@ -5,7 +5,7 @@ brotli=app-arch/brotli
 bzip2=app-arch/bzip2
 cpio=app-arch/cpio
 dpkg=app-arch/dpkg
-genisoimage=virtual/cdrtools
+genisoimage=app-cdr/cdrtools
 gzip=app-arch/gzip
 lha=app-arch/lha
 lrzip=app-arch/lrzip
diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest
index 09ff56736b87..0c2dc30d8967 100644
--- a/app-arch/libarchive/Manifest
+++ b/app-arch/libarchive/Manifest
@@ -1,6 +1,7 @@
 AUX libarchive-3.3.3-libressl.patch 458 BLAKE2B 883523792c0d3e964a2bf9ae40d25a0127e43a2d95e0187d566fd371aa7ecc0861d99ab21641e9f2d6800b36155e3b845c1099ec7b1d3dc0f3c0fe2b78c9e273 SHA512 0a8dfd7f30ca450cf253bd475d328a886957257e1c7c6a6c9eace4cacdefd9f1eaeb4de81ad00a2439bb75336a82b08278f98c6143803f6047159036e848aabe
+AUX libarchive-3.5.0-darwin-strnlen.patch 732 BLAKE2B d20ffd1d898acf1e69e2f275bec2beda0769569ac37e179604dc7d0a5eca8fda2a06aa5b3811e28f465fb34c2061d15aa8073110f703244aec02cfa35afd8087 SHA512 9f5b86b6dc483f17a1d909d88841e1f82f5835dbef0bdfc18ffb982cd5f649d87fdc22f490169eb827de654fbd469fda77a5ce1bc0748b48f3f46e77318e672c
 DIST libarchive-3.4.3.tar.gz 6990533 BLAKE2B 12f97e8e4032daf0fa8f9e1839f9c7ef80fda0b2a0ba703c67d860437fad6a293484a61417f72eff933179d544cfed45083e7886f462276bc6abbce1097e6256 SHA512 d00167dec6e65a0b17b46a1e3bb0242d85716dbc637afd233360cb515b2750dafe0ff0644b9e01ad23534340b405a8551f496c5e39fba9ee99355a515580d65d
 DIST libarchive-3.5.0.tar.gz 7017726 BLAKE2B 651c9e28d1a1b0a6dd2dbd2aefa0a47ba23d5fb5e96c1bc8c059152952c284f089ce16626b9fbc2cbea70dac2d16ab949235bf4c28f38235f23aeb6da3d69f0d SHA512 9a3d4ce9d4bc856c8d85b846d9d0c9f30369393aa107941c202ba0100c6bac009952c92d809e6981276b3bf91e9f37d018e7f1446b17c0c1c316fe5aafe15440
 EBUILD libarchive-3.4.3.ebuild 3761 BLAKE2B 2d9bcb9f9e0d6ead67db818a64fb611ce6158b0a7b01f20aadbfcb73624db143b399c446e6b1797d25581f7fb89ffe3b9528377f72dfc96cf2f5db7a658e4570 SHA512 346b64cc503f74f0220d319f02fe8c8265c3468c54a5c09df23fd948be20262bd849a34648522f6774854afef004bfefef7fd3f0cc0ee52b1bd18ec99e978924
-EBUILD libarchive-3.5.0.ebuild 3770 BLAKE2B 4807869b7b89b14b1c97218ce92a316de81c806580049e134ebe39688d678462f0e8a4ee790c364ff0a3ec2879840990f6c337b5541e5db3e4f06ac91a133f1b SHA512 2aaa032adff8441721e42e6fe4de0787eaa9602f71f2e60735c6a0fbd388a0137f82e8058b1b635287d790774663575c673cfa5ba2a75a3f9940e81e903c2c00
+EBUILD libarchive-3.5.0.ebuild 3842 BLAKE2B d3ab821827e0769f33ba9d2a4e1b49293f9dfe31565a59c40817e13459904bbe040959ea5179c8a8eb47df6885359bb6f1c308adbeadaeffa2ac23f405cd630e SHA512 83aca2391ae164efa577756ffcad24164bb9714f64d08208c0396a893adb4bb9298ae7126b29a3edb2ba4f8b91048dbee8667c1417d4017aac58e1f228a64117
 MISC metadata.xml 1514 BLAKE2B 377e5cfd85ad2660469744537665395cb99b12187f63d5a2202b8eee52cbe19adcc9f5289ea6665e5bc5f4e9339a5280e1e6dd297199cb009bebb37624009a5b SHA512 8dd39292864923ced4fab7f1307130082525aab611f94e5c7eee25045168e812dade090ea621ca3252eeb85ef8c7269fcaf0de1adc2979f4567f5e01581540e7
diff --git a/app-arch/libarchive/files/libarchive-3.5.0-darwin-strnlen.patch b/app-arch/libarchive/files/libarchive-3.5.0-darwin-strnlen.patch
new file mode 100644
index 000000000000..8f540e4aa07b
--- /dev/null
+++ b/app-arch/libarchive/files/libarchive-3.5.0-darwin-strnlen.patch
@@ -0,0 +1,27 @@
+https://github.com/macports/macports-ports/blob/master/archivers/libarchive/files/patch-libarchive-3.5-strnlen.diff
+
+next release should have a fix for this
+
+--- a/libarchive/archive_read_support_format_mtree.c
++++ b/libarchive/archive_read_support_format_mtree.c
+@@ -65,6 +65,20 @@ __FBSDID("$FreeBSD: head/lib/libarchive/archive_read_support_format_mtree.c 2011
+ #define O_CLOEXEC	0
+ #endif
+ 
++#ifdef __APPLE__
++#if  __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070
++static size_t strnlen(const char *s, size_t maxlen) {
++  size_t l = 0;
++  while (l < maxlen && *s) {
++    l++;
++    s++;
++  }
++  return l;
++}
++#endif
++#endif
++
++
+ #define	MTREE_HAS_DEVICE	0x0001
+ #define	MTREE_HAS_FFLAGS	0x0002
+ #define	MTREE_HAS_GID		0x0004
diff --git a/app-arch/libarchive/libarchive-3.5.0.ebuild b/app-arch/libarchive/libarchive-3.5.0.ebuild
index dde837017a82..d59eb05c046f 100644
--- a/app-arch/libarchive/libarchive-3.5.0.ebuild
+++ b/app-arch/libarchive/libarchive-3.5.0.ebuild
@@ -39,6 +39,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.3.3-libressl.patch
+	"${FILESDIR}"/${PN}-3.5.0-darwin-strnlen.patch  # drop on next release
 )
 
 src_prepare() {
diff --git a/app-arch/lz4/Manifest b/app-arch/lz4/Manifest
index e0a5f8963fc3..104a198abb4e 100644
--- a/app-arch/lz4/Manifest
+++ b/app-arch/lz4/Manifest
@@ -1,5 +1,3 @@
-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-1.9.3.ebuild 785 BLAKE2B 72da855626afc81dd8ed33256f1de0c12d728de9d7c41db771c9d0cacc8bbe08146f3e3849c0cef4cd5422df9baf94177b4e6969396c6ccc8fa657a1ea21ebaf SHA512 e8b884a1cc90a840c93b1cec2ed11593b21c9408c6a22695e7986094dc5f73f53887e7990458c0462f3177e5ff05117c61abc8671c8d75993326b371362ca7bd
-MISC metadata.xml 596 BLAKE2B f79116c2ed40f870c688d9843c6d54da4fa6d33313d2a42d2d6162e1f2b5a6e93f119354a7ad97c67d66be6ba2437ffc0e91d6a9077fbc5b02b19420155375ca SHA512 bc5a6081ed4c2c6b7c7e4de5ef0ada5a4692e1e0833a01d8e596b7891cb2f612418350643ce6b764d8170b5632afc78143dd50bb4a34565384fd4b89ee34786b
+EBUILD lz4-1.9.3.ebuild 780 BLAKE2B c63913d2cd51de168093fb639c87d044dab88e693999d1c56ae50332c840366d42e84e301ae22ca4300a6ee8cec3fa266161ff2da162d3783c9ce95bea3bb43a SHA512 b82fe30f3afad2376b43ab7a498cd57625ea448daab7cf89301ac874549f509604ea83025ecbb85703a0cbcf249db5837aef4fc12f6a4d49be7e8c124205316f
+MISC metadata.xml 591 BLAKE2B 3f9ef90c2960812f5c52a94974f4d3f754f7e74b4f208760e0ae67f4ada77610e6f193c51305929115ea72c91f8ed9bccbf507e766bd1b10b86526aba8b1b58f SHA512 a70f2c2a1671f67612f8ccc7c58fde1aa1a1488c444477b212a4d368a70b2c260d3e123b221c850516c2f837aece2f10c8dc6d15acd26279dc4aad85cf5d9890
diff --git a/app-arch/lz4/lz4-1.9.2.ebuild b/app-arch/lz4/lz4-1.9.2.ebuild
deleted file mode 100644
index 6ac3dce5c2ff..000000000000
--- a/app-arch/lz4/lz4-1.9.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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/lz4/lz4/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	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"
-fi
-
-DESCRIPTION="Extremely Fast Compression algorithm"
-HOMEPAGE="https://github.com/lz4/lz4"
-
-LICENSE="BSD-2 GPL-2"
-# https://abi-laboratory.pro/tracker/timeline/lz4/
-SLOT="0/r132"
-IUSE="static-libs"
-
-CMAKE_USE_DIR=${S}/contrib/cmake_unofficial
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_STATIC_LIBS=$(usex static-libs)
-	)
-
-	cmake_src_configure
-}
diff --git a/app-arch/lz4/lz4-1.9.3.ebuild b/app-arch/lz4/lz4-1.9.3.ebuild
index e1e14ad88fef..5435992739dc 100644
--- a/app-arch/lz4/lz4-1.9.3.ebuild
+++ b/app-arch/lz4/lz4-1.9.3.ebuild
@@ -13,7 +13,7 @@ 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"
+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}/build/cmake
diff --git a/app-arch/lz4/metadata.xml b/app-arch/lz4/metadata.xml
index 694c0de63b6c..9ea2d62a4794 100644
--- a/app-arch/lz4/metadata.xml
+++ b/app-arch/lz4/metadata.xml
@@ -14,7 +14,7 @@
 		<name>Guilherme Amadio</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">Cyan4973/lz4</remote-id>
+		<remote-id type="github">lz4/lz4</remote-id>
 		<remote-id type="cpe">cpe:/a:lz4_project:lz4</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-arch/pixz/Manifest b/app-arch/pixz/Manifest
index a6957afb298e..b84e6b7dce9f 100644
--- a/app-arch/pixz/Manifest
+++ b/app-arch/pixz/Manifest
@@ -2,6 +2,6 @@ AUX pixz-1.0.6-avoid-unaligned-accesses.patch 1253 BLAKE2B e852f1c991bc7ba282b47
 DIST pixz-1.0.6.tar.xz 119516 BLAKE2B 758a4985b946284587998ab2a653e51ded9838a7c77c7795c82c15c1693714468b07c2cbfd86a0c7ce7be34d9a5bd8fdc3285d503524ce299ba53179447e60ed SHA512 361a8d8b736c350e4e3fd19b5d36777129a087eb81439d05edc08f9378938583bef8fc70e440ffd22efb6dad1f6494c6c3e532d7dd1ab12c9350b6078aa993d7
 DIST pixz-1.0.7.tar.xz 120876 BLAKE2B 23563837169611d54dc4540715537b2e16c66bd9682097e4f37957e7422b487f221603b11aa30a39fd05c77dbeddc1697ac9ffe208d984c1da885a67f79a180f SHA512 7f343cb74958b9582b60a2e916243e72421fad1ebecc5867c9e046c881e8a318da9bb885edd71da8fe6953fd5d5c2f5119133cd0bbbf4d0f9b35f8aecd61120d
 EBUILD pixz-1.0.6-r1.ebuild 1181 BLAKE2B 46d6fdf0d1aaa4b1ed24aff66405fd92e0e40710f64a7d7afbe175e9d597ce4fbd56b63b264b5ab57f0640fb2bee0ae3ae3b33400635ddf9961c7aa33866782a SHA512 907db330a6197304585318a3dcee21e7f7a6656bffdc5cc0c6cf2824ecff29c20564bf680c77cfb196b9e3bd662b5471c2da272b57b0847da66a913c771415c5
-EBUILD pixz-1.0.7.ebuild 1161 BLAKE2B 0dfa4c22f5909ca72297c574b7418ba5e202763dfa09f4467f6ca89aed139b9765a578879cc92126922a4a230088c0f8db070b0ada0b34640293521ab1343fa9 SHA512 418e57b0aa7ce08351c0934e5d8c37cb2ce0e47077ccddcf1beca7830ca89b1cc27f2d1759d7bb0138923be789f61ac7dfb364b92383dbd2dc075f02621a5db7
+EBUILD pixz-1.0.7.ebuild 1153 BLAKE2B d66b37b1874a4687d50453c036c8089d0886d65a48603a9c3f28a5b68f1ffb93c4cb8221aa0f8fd699a9eb3c38f9e3812fe4129c32a2453c674a0c4525b6320a SHA512 305f8e96edb4b34b9c8b48f2746fff3e42605cbc111d4f5f24d9f810141b12d5224ef1c194885df9e83f25955804d3212d38fe099615cd5d1455ae3087958414
 EBUILD pixz-9999.ebuild 1161 BLAKE2B 0dfa4c22f5909ca72297c574b7418ba5e202763dfa09f4467f6ca89aed139b9765a578879cc92126922a4a230088c0f8db070b0ada0b34640293521ab1343fa9 SHA512 418e57b0aa7ce08351c0934e5d8c37cb2ce0e47077ccddcf1beca7830ca89b1cc27f2d1759d7bb0138923be789f61ac7dfb364b92383dbd2dc075f02621a5db7
 MISC metadata.xml 331 BLAKE2B 15bff5a59c7a5ff1dc23d59a9c9acda8ad40691a1b79d992ea05eaab0436e56cf0419f0e70b4e8dbeed37bee33735bb6700a85a2f26d50fd857cb38eb55f152c SHA512 54391cfef5b3719b7ad708cc7367740ba68f3223e0d92ae8ae5992ff127f41291fc1afa0d0bd7a1a02cf53b76c3817a57696a16ae535f8522e9d9249f4ddf401
diff --git a/app-arch/pixz/pixz-1.0.7.ebuild b/app-arch/pixz/pixz-1.0.7.ebuild
index c6564c5abe3d..a8ebba1a088a 100644
--- a/app-arch/pixz/pixz-1.0.7.ebuild
+++ b/app-arch/pixz/pixz-1.0.7.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/vasi/pixz/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 fi
 
 DESCRIPTION="Parallel Indexed XZ compressor"
diff --git a/app-arch/stormlib/Manifest b/app-arch/stormlib/Manifest
new file mode 100644
index 000000000000..064465930a50
--- /dev/null
+++ b/app-arch/stormlib/Manifest
@@ -0,0 +1,4 @@
+AUX stormlib-9.23-gnuinstalldirs.patch 1923 BLAKE2B ddc6edea1ba991b66a4a15625bdf08aeb0ab4ac356345551b0c35cfa69c2045ed68b3d27d0475cab728480a029df301048d2859652234602f63d32479c582daa SHA512 f266baabb6b5f92465139bfa14e9db83cf30831848f7d97e9ace96bded84768cea4bdf3dc1437b8b85fd86efaec13bc9f833a25854123310037ed80b514592fb
+DIST StormLib-9.23.tar.gz 605295 BLAKE2B 2489e309f218f3e5c5069b56856415cc5985efb2352f36a33530442d539c786262b7c55d134dd67db3098981b1ad98ce8bfa77a16f86d28f326831b09752b705 SHA512 c851159596e252b42facdbac9c52f7477c61de35b44054ab608a22b42e7dc3b4179f50ba9d8cbd30448ed7787cc74e7efd2e08faafdd91289136cd91399d4f09
+EBUILD stormlib-9.23-r1.ebuild 814 BLAKE2B 6a0e6369892809b7a0e5f50a1fdf645dd38a50d2889cefc9d37275cc6be57bad048ab75021b30857588b55a349e14af98d0956bd618cdfee6c21279eca1c67f3 SHA512 701b12cf8efb292390038ca5d80c04af5ecd8fb99b8eb462c9477a52073628313e8b570136c49b6964960d7f98b03edc00c12400f6d04422944f16874d9d297f
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-arch/stormlib/files/stormlib-9.23-gnuinstalldirs.patch b/app-arch/stormlib/files/stormlib-9.23-gnuinstalldirs.patch
new file mode 100644
index 000000000000..66b8f91183f0
--- /dev/null
+++ b/app-arch/stormlib/files/stormlib-9.23-gnuinstalldirs.patch
@@ -0,0 +1,55 @@
+From f89f1341cf59f7098af985ecd683d5e0407d2dc7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 20 Dec 2020 10:52:34 +0100
+Subject: [PATCH] cmake: Use GNUInstallDirs for configurable install
+ directories
+
+Use the standard GNUInstallDirs CMake module to provide configurable
+install directories rather than hardcoding 'bin', 'lib', etc.  Most
+importantly, this fixes install on modern amd64 systems that use 'lib64'
+rather than 'lib'.
+---
+ CMakeLists.txt | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bd8d336..2b09191 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,6 +4,7 @@ cmake_minimum_required(VERSION 2.8.12)
+ set(LIBRARY_NAME storm)
+ 
+ include(CMakeDependentOption)
++include(GNUInstallDirs)
+ 
+ option(BUILD_SHARED_LIBS "Compile shared libraries" OFF)
+ option(STORM_SKIP_INSTALL "Skip installing files" OFF)
+@@ -331,12 +332,12 @@ endif()
+ 
+ if (NOT STORM_SKIP_INSTALL)
+     install(TARGETS ${LIBRARY_NAME} 
+-	    RUNTIME DESTINATION bin 
+-	    LIBRARY DESTINATION lib 
+-	    ARCHIVE DESTINATION lib 
++	    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
++	    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++	    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ 	    FRAMEWORK DESTINATION /Library/Frameworks
+-	    PUBLIC_HEADER DESTINATION include
+-	    INCLUDES DESTINATION include)
++	    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
++	    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ 
+         #CPack configurtion
+         SET(CPACK_GENERATOR "DEB" "RPM")
+@@ -369,6 +370,6 @@ endif()
+ if(STORM_BUILD_TESTS)
+     add_executable(StormLib_test ${TEST_SRC_FILES})
+     target_link_libraries(StormLib_test ${LIBRARY_NAME})
+-    install(TARGETS StormLib_test RUNTIME DESTINATION bin)
++    install(TARGETS StormLib_test RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ 
+-- 
+2.29.2
+
diff --git a/app-arch/stormlib/metadata.xml b/app-arch/stormlib/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/app-arch/stormlib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-arch/stormlib/stormlib-9.23-r1.ebuild b/app-arch/stormlib/stormlib-9.23-r1.ebuild
new file mode 100644
index 000000000000..484b8ef3e37f
--- /dev/null
+++ b/app-arch/stormlib/stormlib-9.23-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+MY_P=StormLib-${PV}
+DESCRIPTION="Library to read and write MPQ archives (Diablo, StarCraft)"
+HOMEPAGE="
+	http://www.zezula.net/en/mpq/stormlib.html
+	https://github.com/ladislav-zezula/StormLib"
+SRC_URI="
+	https://github.com/ladislav-zezula/StormLib/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-arch/bzip2:=
+	dev-libs/libtomcrypt:=[libtommath]
+	sys-libs/zlib:="
+DEPEND=${RDEPEND}
+
+PATCHES=(
+	"${FILESDIR}"/stormlib-9.23-gnuinstalldirs.patch
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		# interactive test app
+		-DSTORM_BUILD_TESTS=OFF
+		-DWITH_LIBTOMCRYPT=ON
+	)
+
+	cmake_src_configure
+}
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index 76838ca079c6..9980440659c0 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -6,4 +6,5 @@ DIST xar-400.tar.gz 213319 BLAKE2B 55b8695313a1a5ae778b62791f716af00edba7e7b0150
 DIST xar-417.1.tar.gz 219350 BLAKE2B 2ca073e52b8d7a12c3d33fb65ccaf0984b912f42e4e9dc52bcaec7af41bafcc530cd055da16646113fb24ee046122425a66351f88279ef79a0f0b2b04ae51f9a SHA512 4c3c61f5289d0b2e380cbde772b383da369ca8ad046f5d779e02f59300288c90c5e31d105a2c01ac17dc719b8b46b55d8d36a8b3b20360f315766fce92dec762
 EBUILD xar-1.8-r2.ebuild 1458 BLAKE2B 555288ffa046e123dd907ffc82149fcb8475d8e0523832843ada29a45e0a93e54c231d1ffc0fd0f34a11ca19456c38299a92c631ca07e521146c2408a625968a SHA512 56560c834837cc754a67b75a62e6a6d55e66e01e529013b418371dd241572b0cba263ed259750c2f4864eece26bb2d2de4d4925e575bceaf859b7f06b20890f7
 EBUILD xar-1.8-r3.ebuild 2008 BLAKE2B 8c75abf68299e7f82df130cff852346dbabd599b5fe65dcec09d57902cce9ce587d98a3731ca3011ae64d78d0c77919cbaaf84a8b50cafe52728fd04596d2ba1 SHA512 95fd1cefb6f5d117ce6abb5ca6c27d55a9c61186c570e8dbb7b9efe289f1c57a12e605153a235279c700b2a9d7c53393c80be86d5d9a72f97743264aba50f4df
+EBUILD xar-1.8-r4.ebuild 2460 BLAKE2B d1a502c4d69ed2fa1a63a056fb080122deac98861067e0712daac8e55c287bd3a1701c580a5b4acd1bf4ab52721a50bbba50d9a8aaed01687899d1161634bedf SHA512 39cdca2fe8601eaddd1a10e116216cbbb0cafa197058222ffb4b8d060b6cae34432b19f9f2723e5fdd7b4d2afb90e005767e461dcaef557e07a1e9363f50517c
 MISC metadata.xml 895 BLAKE2B 7e901c1e2689bc8a94d60eb5ccb993775a7973697320dcd647bd4b3e3e13a4350cd3b1c033a176f2bec7c41bd67a5266ad87b8d3d1a9c5d1bbbceb29726c9226 SHA512 6b0ffedc678b52c23489465ab7267308210d1971ab8aca62471b3a58331bc1c7ff6f8fae9dbb27a7d597aa44b90dc4ff4eac2ef27f726a397aa1ec625d9463f1
diff --git a/app-arch/xar/xar-1.8-r4.ebuild b/app-arch/xar/xar-1.8-r4.ebuild
new file mode 100644
index 000000000000..6106c668f823
--- /dev/null
+++ b/app-arch/xar/xar-1.8-r4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic multilib-minimal multilib
+
+APPLE_PV=417.1
+DESCRIPTION="An easily extensible archive format"
+HOMEPAGE="https://opensource.apple.com/source/xar/"
+SRC_URI="https://opensource.apple.com/tarballs/xar/xar-${APPLE_PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libressl"
+
+DEPEND="
+	elibc_musl? ( sys-libs/fts-standalone )
+	kernel_linux? ( virtual/acl )
+	!libressl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )
+	libressl? ( dev-libs/libressl:0=[${MULTILIB_USEDEP}] )
+	app-arch/bzip2[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	dev-libs/libxml2[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-ext2.patch
+	"${FILESDIR}"/${PN}-1.8-safe_dirname.patch
+	"${FILESDIR}"/${PN}-1.8-arm-ppc.patch
+	"${FILESDIR}"/${PN}-1.8-openssl-1.1.patch
+)
+
+S=${WORKDIR}/${PN}-${APPLE_PV}/${PN}
+
+src_prepare() {
+	default
+
+	# make lib headers available (without installing first?)
+	cd "${S}"/include || die
+	mv ../lib/*.h . || die
+
+	# strip RPATH pointing to ED
+	cd "${S}"/src || die
+	sed -i -e 's/@RPATH@//' Makefile.inc.in || die
+
+	# avoid GNU make (bug?) behaviour of removing xar.o as intermediate
+	# file, this doesn't happen outside portage, but it does from the
+	# ebuild env, causing the install phase to re-compile xar.o and link
+	# the executable
+	echo ".PRECIOUS: @objroot@src/%.o" >> Makefile.inc.in || die
+
+	# drop Darwin specific reliance on CommonCrypto Framework, for it
+	# depends on what version of Darwin we're on, and it is much simpler
+	# to just use open/libressl instead, which we maintain and control
+	cd "${S}" || die
+	sed -i -e 's/__APPLE__/__NO_APPLE__/' \
+		include/archive.h \
+		lib/hash.c \
+		|| die
+
+	# fix branding somewhat
+	sed -i -e "/XAR_VERSION/s|%s|%s (Gentoo ${PVR})|" src/xar.c || die
+}
+
+multilib_src_configure() {
+	append-libs $(pkg-config --libs openssl)
+	use elibc_musl && append-libs $(pkg-config --libs fts-standalone)
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static
+	# botched check, fix it up
+	if use kernel_SunOS ; then
+		sed -i -e '/HAVE_SYS_ACL_H/s:^\(.*\)$:/* \1 */:' include/config.h || die
+	fi
+}
+
+multilib_src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index 9e42efa94575..609204830e21 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -3,8 +3,8 @@ AUX zstd-1.4.4-pkgconfig_libdir.patch 8322 BLAKE2B 2c7bcc57cbbf549919d0f7ce4538a
 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
-DIST zstd-1.4.7.tar.gz 1817193 BLAKE2B 8a307fa7efca8baa45c61eb0e46c5b6eedff1459a9493d81ad7033b9050ccf96e39cfc0f5b913ea20fb64d5efa26063b70e36e6cc47077b17106f3b5135fd999 SHA512 720941fc484e36e2f2bd74f120966fc598781a7abb945ed2f553d4cb035fa007117d00b72979b037817fbaff60b0d72f698fc16561ccbd46b16ae2888b044548
+DIST zstd-1.4.8.tar.gz 1816546 BLAKE2B 950d03c408e9d3fc2081969553c46247a1b8c13a22542effbf70373625bbfeb2a810e0adf0e1c6180cef590e7a28487191b1a577982fddc7a00d1507b461efd5 SHA512 61ce5d61e24770e70c32680f32d58542d6a1b5cc65737256561d8e34c77a82c1d36c769c179da5ea8ed5ecb035b4a4af292b9717c65976172e282859a332137a
 EBUILD zstd-1.4.4-r4.ebuild 1840 BLAKE2B 09aa07c4d2a068cb60e83d9796c7fe636d9e97c72e1efe731a2a2dc1f559874e9fa68dd06684135d18fe9f6dc67dcbddb69e34dd6ef0a510dc9355221acdf2a8 SHA512 7c55534e5feffae25bc9d1cfc9475404fa2387dbc44b788084df219d3cd26dfde0e47ccc015d89ab13bef1c5d261d2942d5745862221685fe5b80eb6613a73f3
-EBUILD zstd-1.4.5.ebuild 1750 BLAKE2B 3718289304a862bc8a5cd78159409ea00847af3d11e8906a45061ad76ee3cda3cdbcc072da6f2a8e20e6594aed841533bedf1195d4d01b0e43530ddb176160bf SHA512 b745133038280fcd31de024704934bf72d619087ed7d48efedf64d47758ca4987c26b0b9bd0ffbaf31b0321dd08796ec8e2d6a70c1a5a9b136ccf33f08960fd0
-EBUILD zstd-1.4.7.ebuild 1757 BLAKE2B 0e35a47390e0040e064966609d324018db0683f911dee36b357d72cd52da8c250c55fa583a5d8468ce0eeb24589b78c85b049e1c7315303112d74f60c9addc7b SHA512 4186ed99f97c69a4434ffce087327fd32f7fb9455be786e82c83417bbfec018409dd1d3da8907c0112f2de6e5c466b5f46d93a1a5c51d6ac093d3c16cbcb0e67
+EBUILD zstd-1.4.5.ebuild 1741 BLAKE2B bd54c5a6c1b98b5a1a515d8ec6f1ad8ce412c6a21b125c6c6c8b531af2e8010a6489c53a7af38b4101a784c32855cf01cfe725ac7f164be3d3daa5f923fec44d SHA512 73f5dab46b7b659843d2a19ad91070a8857ad7967fb81b30c5547bee2443d19a90b933383998dbc9edb11ce669de95357ad0b48d14519de983b5aee924970e20
+EBUILD zstd-1.4.8-r1.ebuild 1689 BLAKE2B 680856e65b1bef3e3aa162397fb604bab1a57aa0359173278698f440ea3ac31645f06cfcd9a26c8e09eaa27a9573993b058cde0a43ddf8f8e159806791f5c28b SHA512 b97f3cc098c47c7f5aec09bc5c96ef5e2a7133cd64c301827fbb0573169cb7e085010f5e9f784a44a96160409977de763a7123d1e5e535af73d5c0fb0be3818a
 MISC metadata.xml 335 BLAKE2B b5522206853292786178f23747d3f8145cd21a9e1d9d545aea8ff424910d9f9ab6d35c66c098edac809baa4e87239d36d4d987308481b265fe30460d54f415b9 SHA512 9269829ff4dcad03a604ea00c7f9a3bcd937195b711ab52f813d39b8ebb921585293cb3cb97fbea75921df9a673d49c8a8b39dc13b54f9b171c08d6ac0c31bc6
diff --git a/app-arch/zstd/zstd-1.4.5.ebuild b/app-arch/zstd/zstd-1.4.5.ebuild
index 110b0378b776..452934eff4c6 100644
--- a/app-arch/zstd/zstd-1.4.5.ebuild
+++ b/app-arch/zstd/zstd-1.4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( BSD GPL-2 )"
 SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="lz4 static-libs +threads"
 
 RDEPEND="app-arch/xz-utils
diff --git a/app-arch/zstd/zstd-1.4.7.ebuild b/app-arch/zstd/zstd-1.4.8-r1.ebuild
index 96469d5a7f84..414788bac8f4 100644
--- a/app-arch/zstd/zstd-1.4.7.ebuild
+++ b/app-arch/zstd/zstd-1.4.8-r1.ebuild
@@ -18,10 +18,6 @@ RDEPEND="app-arch/xz-utils
 	lz4? ( app-arch/lz4 )"
 DEPEND="${RDEPEND}"
 
-PATCHES=(
-	"${FILESDIR}/${PN}-1.4.5-fix-uclibc-ng.patch" #741972
-)
-
 src_prepare() {
 	default
 	multilib_copy_sources