gentoo Easter resync : 12.04.2020

5 files changed, 174 insertions, 3 deletions

diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index b49c128f231b..78faffa244a7 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,3 +1,8 @@
+AUX engrampa-1.22.3-gcc-10-fno-common.patch 526 BLAKE2B 38fe4aa06e6a0d2a5a3a72384f94aabcffc08f8e2b62d29b70acc5ca42bb9a36b9b854445d5d51424feebe7b9d47a17f5efe7781af62d6610e12059f66fc2db0 SHA512 dc35417a64de6898705b638d19f2a73b33c32cb7e18c89c77e51a0e6bece8a971a9301b2aeac0ac8acb83d3cdba73f0ac38e1bb369669125b035fb86b9b4d0e3
 DIST engrampa-1.22.1.tar.xz 1363488 BLAKE2B 0f71e94af50443f9f562b0eed461ca1160fab0a5a3cd02c845fac09ee2466cb8634a458a6a4488ff5ac6674b0f525eccf754b8b1cc7e3f1729d4eb6ac224e025 SHA512 111eeb470555ae8edb7754159bb2e70b03cbbc7b1c9d61c253d9d67e50d84ff0e0654e16547883c39aeeb223e8ba58201d45b50819784fc6cf7a21f0cf176c70
-EBUILD engrampa-1.22.1-r1.ebuild 1680 BLAKE2B c4c11eb9ed21b405777c6957200bcf5cd9d1f6bf34f10a9c8133a4c89a7975674bd614f7d2829e180178542ed76cb0428b52907f65265919642ee3de3aa26936 SHA512 16356039e8f8b466896b418b9f804a0984d661bedc4643ab5d021c93783f4b4dca22d9571749165bece0e1a6392e763bca02f3d8d3862f7b16c60bd54cd3ff89
+DIST engrampa-1.22.3.tar.xz 1407412 BLAKE2B d6963da4c18137600c26cff01b2a42d2aaf9a8a435779593b7712e6f7ff920fd25b5fa462edd3d321d63f131b3e4a4486a6f795f2392f6679ae3ef9b343fe8e1 SHA512 fd110b2bc188207645985a6f788b8e618cb4910a275950dfb17c0bcc42eff8765a4c7a36760dec2636485685a7a2f4adefb8e2c83537d1b3a819582e3878c9db
+DIST engrampa-1.24.0.tar.xz 1678920 BLAKE2B c40ba6a77d667f25853f6ae8cef51a54b32402e9446d6712bcfe8b6cfbddcc39e076604fad6ead1717bcedc52716be028ac9bf912c5762fa204e3ee5d6be10bb SHA512 b6996e224ef52d8fd7102e4498193faa62056e8c22aa260ab5c6361533744f78755d500536ec0e03fd8b42b71da56d3f58d9d760809d20b572bee02fdee07cce
+EBUILD engrampa-1.22.1-r1.ebuild 1698 BLAKE2B 9968621d6728b1cd75b97050344b39e272801cb3cca9a89c1272d4675e7f864de2e032d80fa63b9aff50d4108a850190dbf5db356a7ef33c0873e82b3382fea9 SHA512 ae5c3d1af629c3e2bd30dbd7f8aac7dfbbd98e2c5127103f4f5a2a38eba1f76682e8dc4764e5920733e5b37d61ac8fdaa160243df8d74489aedd07940672dce2
+EBUILD engrampa-1.22.3-r1.ebuild 1711 BLAKE2B 1cf4d43d8d06755c6e4e4e518d7369833fbfd88736be60967efcda9ae4af0f7a8814a91db7d5e2b86ddce1b08ad1bbd8a1f409b3b8178024f1bc39d5d5cb62e5 SHA512 08e05a965aca5193c0973d46207f578499a19c818f7577913a2dc28f017405d0caedba8e12493176104c1147e74b5ef46eb6735020c4a8faf389ad82d4ed453d
+EBUILD engrampa-1.24.0.ebuild 1706 BLAKE2B e6504459167554f6a7b613ef48a2f5fc67962818205a8830daedf5af46b5c18666a307fedd74b490017ca61d38a990be0bb8e2d90e8978e8e6dd6913654fc08c SHA512 f4d709b14061235b1c9cf51f446ca71021849f1ca79bfd392b26419d334465c514abe618e5cc720875588c4205eb82c773116a5aba44354aaf37390d388b9c65
 MISC metadata.xml 611 BLAKE2B a8d57ae0c1657b6f17d961b3059746d47249007387dbf3d5dc555279e054e91fbff524e8abf17ffa64d788a3bc8b80f0a7e77977e3544bea849b5843e3ec860f SHA512 304268690ba4159d1bd296c24551b527b2ae9bfa9b99531f686e983d4954b9f00f540792d020d1a2fd46ec9c8a330c87e1bf7bf0073ba379ccdf8f36d49b434e
diff --git a/app-arch/engrampa/engrampa-1.22.1-r1.ebuild b/app-arch/engrampa/engrampa-1.22.1-r1.ebuild
index 3a1520eee9ed..dbd3baf302e1 100644
--- a/app-arch/engrampa/engrampa-1.22.1-r1.ebuild
+++ b/app-arch/engrampa/engrampa-1.22.1-r1.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
@@ -12,7 +12,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
 SLOT="0"
 
 IUSE="caja magic packagekit"
diff --git a/app-arch/engrampa/engrampa-1.22.3-r1.ebuild b/app-arch/engrampa/engrampa-1.22.3-r1.ebuild
new file mode 100644
index 000000000000..92299844e0fa
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.22.3-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit eutils mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Engrampa archive manager for MATE"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
+SLOT="0"
+
+IUSE="caja magic packagekit"
+
+RDEPEND="
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/json-glib-0.14
+	virtual/libintl
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3[X]
+	x11-libs/pango
+	caja? ( >=mate-base/caja-1.17.1 )
+	magic? ( sys-apps/file )
+	packagekit? ( app-admin/packagekit-base )
+	!!app-arch/mate-file-archiver"
+
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	dev-util/glib-utils
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		--disable-run-in-place \
+		$(use_enable caja caja-actions) \
+		$(use_enable magic) \
+		$(use_enable packagekit)
+}
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc-10-fno-common.patch"
+)
+
+src_install() {
+	mate_src_install
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+	optfeature "Support for 7-zip"  app-arch/p7zip
+	optfeature "Support for ace"  app-arch/unace
+	optfeature "Support for arj"  app-arch/arj
+	optfeature "Support for cpio"  app-arch/cpio
+	optfeature "Support for deb"  app-arch/dpkg
+	optfeature "Support for iso"  app-cdr/cdrtools
+	optfeature "Support for jar,zip"  app-arch/zip app-arch/unzip
+	optfeature "Support for lha"  app-arch/lha
+	optfeature "Support for lzma"  app-arch/xz-utils
+	optfeature "Support for lzop"  app-arch/lzop
+	optfeature "Support for rar"  app-arch/unrar
+	optfeature "Support for rpm"  app-arch/rpm
+	optfeature "Support for unstuff"  app-arch/stuffit
+	optfeature "Support for zoo"  app-arch/zoo
+}
diff --git a/app-arch/engrampa/engrampa-1.24.0.ebuild b/app-arch/engrampa/engrampa-1.24.0.ebuild
new file mode 100644
index 000000000000..27c5563509e5
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.24.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate readme.gentoo-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Engrampa archive manager for MATE"
+LICENSE="FDL-1.1+ GPL-2+ LGPL-2+"
+SLOT="0"
+
+IUSE="caja magic packagekit"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.50:2
+	>=dev-libs/json-glib-0.14
+	virtual/libintl
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3[X]
+	x11-libs/pango
+	caja? ( >=mate-base/caja-1.17.1 )
+	magic? ( sys-apps/file )
+	packagekit? ( app-admin/packagekit-base )
+"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+	!!app-arch/mate-file-archiver
+"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8:*
+	virtual/pkgconfig
+"
+
+src_configure() {
+	mate_src_configure \
+		--disable-run-in-place \
+		$(use_enable caja caja-actions) \
+		$(use_enable magic) \
+		$(use_enable packagekit)
+}
+
+src_install() {
+	mate_src_install
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+	optfeature "Support for 7-zip"  app-arch/p7zip
+	optfeature "Support for ace"  app-arch/unace
+	optfeature "Support for arj"  app-arch/arj
+	optfeature "Support for cpio"  app-arch/cpio
+	optfeature "Support for deb"  app-arch/dpkg
+	optfeature "Support for iso"  app-cdr/cdrtools
+	optfeature "Support for jar,zip"  app-arch/zip app-arch/unzip
+	optfeature "Support for lha"  app-arch/lha
+	optfeature "Support for lzma"  app-arch/xz-utils
+	optfeature "Support for lzop"  app-arch/lzop
+	optfeature "Support for rar"  app-arch/unrar
+	optfeature "Support for rpm"  app-arch/rpm
+	optfeature "Support for unstuff"  app-arch/stuffit
+	optfeature "Support for zoo"  app-arch/zoo
+}
diff --git a/app-arch/engrampa/files/engrampa-1.22.3-gcc-10-fno-common.patch b/app-arch/engrampa/files/engrampa-1.22.3-gcc-10-fno-common.patch
new file mode 100644
index 000000000000..61e23e087cf6
--- /dev/null
+++ b/app-arch/engrampa/files/engrampa-1.22.3-gcc-10-fno-common.patch
@@ -0,0 +1,22 @@
+From 623bd665371e3afd9dc6fa29f9e1cfe735681358 Mon Sep 17 00:00:00 2001
+From: rbuj <robert.buj@gmail.com>
+Date: Wed, 29 Jan 2020 15:52:44 +0100
+Subject: [PATCH] Fix build using gcc 10 -fno-common flag
+
+---
+ src/main.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index 56e75ea0..a9e297dc 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -33,8 +33,6 @@
+ 
+ #include "fr-init.h"
+ 
+-gint          ForceDirectoryCreation;
+-
+ static char **remaining_args;
+ static char  *add_to = NULL;
+ static int    add;