[gentoo-commits] proj/gentoo-mate:master commit in: app-arch/engrampa/, app-arch/engrampa/files/

[Adam Feldman]

commit:     31c66391acc43e27c3ab34beb8ed0b268ffd5d78
Author:     Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 05:18:12 2020 +0000
Commit:     Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 05:55:36 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=31c66391

app-arch/engrampa: Sync with ::gentoo

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>

 app-arch/engrampa/Manifest                         |  1 -
 ...-1.22.1-r1.ebuild => engrampa-1.22.3-r1.ebuild} | 45 ++++++-------
 app-arch/engrampa/engrampa-1.22.3.ebuild           | 75 ----------------------
 ...mpa-1.24.0.ebuild => engrampa-1.24.0-r1.ebuild} | 39 +++++------
 .../files/engrampa-1.22.3-gcc-10-fno-common.patch  | 22 +++++++
 app-arch/engrampa/metadata.xml                     |  2 +-
 6 files changed, 60 insertions(+), 124 deletions(-)

diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index 2d82dcf..d0956f3 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,3 +1,2 @@
-DIST engrampa-1.22.1.tar.xz 1363488 BLAKE2B 0f71e94af50443f9f562b0eed461ca1160fab0a5a3cd02c845fac09ee2466cb8634a458a6a4488ff5ac6674b0f525eccf754b8b1cc7e3f1729d4eb6ac224e025 SHA512 111eeb470555ae8edb7754159bb2e70b03cbbc7b1c9d61c253d9d67e50d84ff0e0654e16547883c39aeeb223e8ba58201d45b50819784fc6cf7a21f0cf176c70
 DIST engrampa-1.22.3.tar.xz 1407412 BLAKE2B d6963da4c18137600c26cff01b2a42d2aaf9a8a435779593b7712e6f7ff920fd25b5fa462edd3d321d63f131b3e4a4486a6f795f2392f6679ae3ef9b343fe8e1 SHA512 fd110b2bc188207645985a6f788b8e618cb4910a275950dfb17c0bcc42eff8765a4c7a36760dec2636485685a7a2f4adefb8e2c83537d1b3a819582e3878c9db
 DIST engrampa-1.24.0.tar.xz 1678920 BLAKE2B c40ba6a77d667f25853f6ae8cef51a54b32402e9446d6712bcfe8b6cfbddcc39e076604fad6ead1717bcedc52716be028ac9bf912c5762fa204e3ee5d6be10bb SHA512 b6996e224ef52d8fd7102e4498193faa62056e8c22aa260ab5c6361533744f78755d500536ec0e03fd8b42b71da56d3f58d9d760809d20b572bee02fdee07cce

diff --git a/app-arch/engrampa/engrampa-1.22.1-r1.ebuild b/app-arch/engrampa/engrampa-1.22.3-r1.ebuild
similarity index 55%
rename from app-arch/engrampa/engrampa-1.22.1-r1.ebuild
rename to app-arch/engrampa/engrampa-1.22.3-r1.ebuild
index dbd3baf..c611a99 100644
--- a/app-arch/engrampa/engrampa-1.22.1-r1.ebuild
+++ b/app-arch/engrampa/engrampa-1.22.3-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 MATE_LA_PUNT="yes"
 
-inherit mate readme.gentoo-r1
+inherit eutils mate
 
 if [[ ${PV} != 9999 ]]; then
 	KEYWORDS="amd64 ~arm ~arm64 x86"
@@ -34,27 +34,8 @@ DEPEND="${RDEPEND}
 	dev-util/glib-utils
 	>=dev-util/intltool-0.50.1
 	sys-devel/gettext
-	virtual/pkgconfig"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-${PN} is a frontend for several archiving utilities. If you want
-support for a particular archive format,install the relevant package:
-
-7-zip   : emerge app-arch/p7zip
-ace     : emerge app-arch/unace
-arj     : emerge app-arch/arj
-cpio    : emerge app-arch/cpio
-deb     : emerge app-arch/dpkg
-iso     : emerge app-cdr/cdrtools
-jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip
-lha     : emerge app-arch/lha
-lzma    : emerge app-arch/xz-utils
-lzop    : emerge app-arch/lzop
-rar     : emerge app-arch/unrar
-rpm     : emerge app-arch/rpm
-unstuff : emerge app-arch/stuffit
-zoo     : emerge app-arch/zoo"
+	virtual/pkgconfig
+"
 
 src_configure() {
 	mate_src_configure \
@@ -64,12 +45,28 @@ src_configure() {
 		$(use_enable packagekit)
 }
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc-10-fno-common.patch"
+)
+
 src_install() {
 	mate_src_install
-	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	mate_pkg_postinst
-	readme.gentoo_print_elog
+	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.22.3.ebuild b/app-arch/engrampa/engrampa-1.22.3.ebuild
deleted file mode 100644
index 7237e76..0000000
--- a/app-arch/engrampa/engrampa-1.22.3.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# 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"
-
-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"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-${PN} is a frontend for several archiving utilities. If you want
-support for a particular archive format,install the relevant package:
-
-7-zip   : emerge app-arch/p7zip
-ace     : emerge app-arch/unace
-arj     : emerge app-arch/arj
-cpio    : emerge app-arch/cpio
-deb     : emerge app-arch/dpkg
-iso     : emerge app-cdr/cdrtools
-jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip
-lha     : emerge app-arch/lha
-lzma    : emerge app-arch/xz-utils
-lzop    : emerge app-arch/lzop
-rar     : emerge app-arch/unrar
-rpm     : emerge app-arch/rpm
-unstuff : emerge app-arch/stuffit
-zoo     : emerge app-arch/zoo"
-
-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
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-	readme.gentoo_print_elog
-}

diff --git a/app-arch/engrampa/engrampa-1.24.0.ebuild b/app-arch/engrampa/engrampa-1.24.0-r1.ebuild
similarity index 57%
rename from app-arch/engrampa/engrampa-1.24.0.ebuild
rename to app-arch/engrampa/engrampa-1.24.0-r1.ebuild
index 2c67968..ba457c1 100644
--- a/app-arch/engrampa/engrampa-1.24.0.ebuild
+++ b/app-arch/engrampa/engrampa-1.24.0-r1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate readme.gentoo-r1
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Engrampa archive manager for MATE"
@@ -23,6 +23,7 @@ COMMON_DEPEND="
 	virtual/libintl
 	x11-libs/gdk-pixbuf:2
 	>=x11-libs/gtk+-3.22:3[X]
+	x11-libs/libSM
 	x11-libs/pango
 	caja? ( >=mate-base/caja-1.17.1 )
 	magic? ( sys-apps/file )
@@ -41,26 +42,6 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 "
 
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-${PN} is a frontend for several archiving utilities. If you want
-support for a particular archive format,install the relevant package:
-
-7-zip   : emerge app-arch/p7zip
-ace     : emerge app-arch/unace
-arj     : emerge app-arch/arj
-cpio    : emerge app-arch/cpio
-deb     : emerge app-arch/dpkg
-iso     : emerge app-cdr/cdrtools
-jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip
-lha     : emerge app-arch/lha
-lzma    : emerge app-arch/xz-utils
-lzop    : emerge app-arch/lzop
-rar     : emerge app-arch/unrar
-rpm     : emerge app-arch/rpm
-unstuff : emerge app-arch/stuffit
-zoo     : emerge app-arch/zoo"
-
 src_configure() {
 	mate_src_configure \
 		--disable-run-in-place \
@@ -71,10 +52,22 @@ src_configure() {
 
 src_install() {
 	mate_src_install
-	readme.gentoo_create_doc
 }
 
 pkg_postinst() {
 	mate_pkg_postinst
-	readme.gentoo_print_elog
+	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 0000000..61e23e0
--- /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@×××××.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;

diff --git a/app-arch/engrampa/metadata.xml b/app-arch/engrampa/metadata.xml
index 599ee32..5ba07f7 100644
--- a/app-arch/engrampa/metadata.xml
+++ b/app-arch/engrampa/metadata.xml
@@ -9,7 +9,7 @@
 		<flag name="caja">Enable engrampa to integrate with
 			<pkg>mate-base/caja</pkg> by providing entries in its context 
 			menu</flag>
-		<flag name="packagekit">Enable support for installing via <pkg>app-admin/packagekit</pkg>
+		<flag name="packagekit">Enable support for installing via Packagekit
 			based on archive type</flag>
 	</use>
 	<upstream>