2 files changed, 5 insertions, 31 deletions
diff --git a/app-arch/file-roller/files/3.32-packages.match b/app-arch/file-roller/files/3.36-packages.match
index 09f1513968e3..c84d4517a59b 100644
--- a/app-arch/file-roller/files/3.32-packages.match
+++ b/app-arch/file-roller/files/3.36-packages.match
@@ -3,9 +3,9 @@ arj=app-arch/arj
 binutils=sys-devel/binutils
 brotli=app-arch/brotli
 bzip2=app-arch/bzip2
-cpio=app-arch/cpio
+cpio=app-alternatives/cpio
 dpkg=app-arch/dpkg
-genisoimage=virtual/cdrtools
+genisoimage=app-cdr/cdrtools
 gzip=app-arch/gzip
 lha=app-arch/lha
 lrzip=app-arch/lrzip
@@ -20,8 +20,6 @@ p7zip-rar=
 rar=app-arch/rar
 rpm=app-arch/rpm
 rzip=app-arch/rzip
-zip=app-arch/zip
-zoo=app-arch/zoo
 tar=app-arch/tar
 unace=app-arch/unace
 unalz=
@@ -31,4 +29,7 @@ unsquashfs=sys-fs/squashfs-tools
 unstaff=
 unzip=app-arch/unzip
 xz=app-arch/xz-utils
+zip=app-arch/zip
+zoo=app-arch/zoo
+zstd=app-arch/zstd
 
diff --git a/app-arch/file-roller/files/file-roller-3.32.4-fno-common.patch b/app-arch/file-roller/files/file-roller-3.32.4-fno-common.patch
deleted file mode 100644
index 9239810c901d..000000000000
--- a/app-arch/file-roller/files/file-roller-3.32.4-fno-common.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 55fa0fb287e7fb7cee336cac0a6c1a94e505dc84 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Wed, 19 Feb 2020 13:18:18 +0100
-Subject: [PATCH] Fix compiling with GCC 10
-
-* GCC 10 defaults to `-fno-common`.
-
-Bug: https://bugs.gentoo.org/706728
----
- src/fr-application.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/fr-application.c b/src/fr-application.c
-index c148c4f9..00ebe552 100644
---- a/src/fr-application.c
-+++ b/src/fr-application.c
-@@ -42,7 +42,6 @@
- #define SERVICE_TIMEOUT 10
- 
- 
--gint                ForceDirectoryCreation;
- static char       **remaining_args;
- static char        *arg_add_to = NULL;
- static int          arg_add = FALSE;
--- 
-2.25.1
-