gentoo resync : 15.12.2019

4 files changed, 10 insertions, 42 deletions

diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 91800ebb7efa..2a1a10106dd1 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,7 +1,6 @@
-AUX 3.22-packages.match 589 BLAKE2B b53cde8851c08d4f538397d72d5e904b6862a091ca1c6b82c255bd79f91917953b7a87b534ef71488f0a93e18a181f554a5477c606be7a429f7c574a62f8e198 SHA512 b96be2502b2ee56fb234af547a045cfed2c5e8bd7290876db641bb1f895ea6a796e50f2e2e066fc80b42fa58eab740a5519c0f2ad78f2787f55d1077b183ee62
 AUX 3.32-packages.match 645 BLAKE2B 7bb6ec28fb8150e1f1989a9db4514556d857b4dea8b8225b1515f3f53b70a1e81b6a0a1068a0d356a33086d0127993a394cb0500e2991384c404dce7faaf32a0 SHA512 3c837c18afa12c5e022a80f85ccc83e5f55fc8fdd5ee8f19f1b2222d08560ad1fd349ed8b1bb7255119f6d6101399fa0dcd79e6a1754c719c0409343c231f65b
-DIST file-roller-3.30.1.tar.xz 1443340 BLAKE2B 352b094b51d342ac71f2174b59dff262ba46b4697c21164ba18bf825d70cb609d59a35ce0efe1013e217e86754822accc11c59eb9bba7185a9f7efe5dded4def SHA512 8f3f55cd7d6769fbf8f72118bb8982775c3f83534266db1f2cc9bbfd9e8dd68545ab49baaa4e468ce22e616346dec9c99c11a0c5b4208dca2e648fac8756cea7
 DIST file-roller-3.32.2.tar.xz 850256 BLAKE2B 5e7f8fed74ff3ff87079753d3fb227cbb77c0a10b75995b84a6019e13434dd4bff16946d38c2b340c85f5dd7879692cc5edd4aa9471f30ea92d2a7fff5176296 SHA512 d1c1e08f12ce343c23c43816305f75c0f3a3f3df32316805864d7c39b5e85b5a00e04a355a0dd8001db8e01ae089daf3b72c3f38fda582795944a6be09451b2a
-EBUILD file-roller-3.30.1.ebuild 2116 BLAKE2B e74170fd5a3a89c792ea698daf5b64d189d03dbf5b63731e1c308a033ddbac6dcb0ca67429aeeefff694e01090346cc4338b06f0d6f3f4d62b38adf73e39c785 SHA512 b507d420a53a1b718fb3c967b5856590dfa46ba4ac9b58f0c3f6942cb83edbe0f66f2e72c44c38ea4d8fe89ba5f4d3169c6ec1b8251425b70b7aa5f8d958d0cd
-EBUILD file-roller-3.32.2-r1.ebuild 2154 BLAKE2B f6ae6e9e9aab743769db1d3eba4aa35b0a6c6942858276b10cd11f592e5d1027b80b9307c3c9fd3737b72cd7f21c04681a45804bd8255c2e2648c05a39b3b6d3 SHA512 158bed36cb48286a5d65ba2b6edb4e112ea45c5d1621972a4b2d6150d1abbc8bcca6b900231e4c84e80e9ec51f842716c1b793d3cdded64ba8d7070d7c5637d0
+DIST file-roller-3.32.3.tar.xz 852808 BLAKE2B 939b931d7b179cc45ca3766dd122e2242e4de22b8c15f0942c31b5f9b5e8eed9d636122445d265539f9368f86d2efc10af161aaa046b3de6be05072d2b53004b SHA512 8256995f776524772936c6d60777c6c2668a610a672788a51ed83de1ae1c131b12373d2a918658f64f004757bb8c71b03edbf0c89776fcad6d64b4fc7fdb8e49
+EBUILD file-roller-3.32.2-r1.ebuild 2152 BLAKE2B 5e2ef2ad707c1e287b5d22f24631382ad5d9eb70fbbfebc9e08cf98c0ea2fdda16985c39606115209f6e02dd077b822490b00b56dbcd5b452064e6b3f6459ba1 SHA512 8bbf1dd616fb50468752db1ded2364322ec65fd41e66aab2de48693aae10ae6b5efecc3cdec3a0a840c95492aa5287bcc07df5237dc00b1b12a93eab6b42b326
+EBUILD file-roller-3.32.3.ebuild 2154 BLAKE2B f6ae6e9e9aab743769db1d3eba4aa35b0a6c6942858276b10cd11f592e5d1027b80b9307c3c9fd3737b72cd7f21c04681a45804bd8255c2e2648c05a39b3b6d3 SHA512 158bed36cb48286a5d65ba2b6edb4e112ea45c5d1621972a4b2d6150d1abbc8bcca6b900231e4c84e80e9ec51f842716c1b793d3cdded64ba8d7070d7c5637d0
 MISC metadata.xml 648 BLAKE2B 8fc7347f0812f1b899096670b3ed809dd577e8173f8d7dac8175fbc6eb2939157d1a6100bcc39f15d22e8058e1daba2b4ac7b678baa83f1d24c1f14d77d2e989 SHA512 ea1b782f93ef9397e798d7f6cdd1e650ae95dcad71f439ec518a9e79ebc83a176c9876e85b9930d691e818f5b1efa636f5165d690cfd63b4c7ff9700ba2f956f
diff --git a/app-arch/file-roller/file-roller-3.32.2-r1.ebuild b/app-arch/file-roller/file-roller-3.32.2-r1.ebuild
index cc5f90b30467..6b9ff1f80b9f 100644
--- a/app-arch/file-roller/file-roller-3.32.2-r1.ebuild
+++ b/app-arch/file-roller/file-roller-3.32.2-r1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE="libnotify nautilus packagekit"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+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
diff --git a/app-arch/file-roller/file-roller-3.30.1.ebuild b/app-arch/file-roller/file-roller-3.32.3.ebuild
index 0f65e25672a1..cc5f90b30467 100644
--- a/app-arch/file-roller/file-roller-3.30.1.ebuild
+++ b/app-arch/file-roller/file-roller-3.32.3.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 inherit gnome.org gnome2-utils meson readme.gentoo-r1 xdg
 
 DESCRIPTION="Archive manager for GNOME"
@@ -11,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0"
 IUSE="libnotify nautilus packagekit"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+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
@@ -28,7 +27,8 @@ RDEPEND="
 	nautilus? ( >=gnome-base/nautilus-2.22.2 )
 	packagekit? ( app-admin/packagekit-base )
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	dev-util/itstool
 	>=sys-devel/gettext-0.19.8
@@ -43,6 +43,7 @@ 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
@@ -57,7 +58,7 @@ zoo     - app-arch/zoo"
 
 src_prepare() {
 	# File providing Gentoo package names for various archivers
-	cp -v "${FILESDIR}"/3.22-packages.match data/packages.match || die
+	cp -v "${FILESDIR}"/3.32-packages.match data/packages.match || die
 
 	xdg_src_prepare
 }
diff --git a/app-arch/file-roller/files/3.22-packages.match b/app-arch/file-roller/files/3.22-packages.match
deleted file mode 100644
index 68f6e30a17cf..000000000000
--- a/app-arch/file-roller/files/3.22-packages.match
+++ /dev/null
@@ -1,32 +0,0 @@
-[Package Matches]
-arj=app-arch/arj
-binutils=sys-devel/binutils
-bzip2=app-arch/bzip2
-cpio=app-arch/cpio
-dpkg=app-arch/dpkg
-genisoimage=virtual/cdrtools
-gzip=app-arch/gzip
-lha=app-arch/lha
-lrzip=app-arch/lrzip
-lz4=app-arch/lz4
-lzip=app-arch/lzip
-lzma=app-arch/xz-utils
-lzop=app-arch/lzop
-ncompress=app-arch/ncompress
-p7zip=app-arch/p7zip
-p7zip-full=
-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=
-unarchiver=app-arch/unar
-unrar=app-arch/unrar
-unstaff=
-unzip=app-arch/unzip
-xz=app-arch/xz-utils
-