[gentoo-commits] repo/gentoo:master commit in: app-arch/file-roller/, app-arch/file-roller/files/

[Sam James]

commit:     ea99ecf0a3496a2c469e9a9b049c9b6aedd724c4
Author:     John Helmert III <jchelmert3 <AT> posteo <DOT> net>
AuthorDate: Sun Dec 27 09:45:02 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 01:59:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea99ecf0

app-arch/file-roller: security cleanup (drop <3.36.3)

Bug: https://bugs.gentoo.org/717362
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: John Helmert III <jchelmert3 <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/18831
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-arch/file-roller/Manifest                      |  1 -
 app-arch/file-roller/file-roller-3.32.4.ebuild     | 96 ----------------------
 app-arch/file-roller/files/3.32-packages.match     | 34 --------
 .../files/file-roller-3.32.4-fno-common.patch      | 27 ------
 4 files changed, 158 deletions(-)

diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index fb149bdb62d..7280c869d29 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,3 +1,2 @@
-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

diff --git a/app-arch/file-roller/file-roller-3.32.4.ebuild b/app-arch/file-roller/file-roller-3.32.4.ebuild
deleted file mode 100644
index ddcfe39897c..00000000000
--- a/app-arch/file-roller/file-roller-3.32.4.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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 packagekit"
-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.36:2
-	>=dev-libs/json-glib-0.14
-	>=x11-libs/gtk+-3.13.2:3
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	libnotify? ( >=x11-libs/libnotify-0.4.3:= )
-	nautilus? ( >=gnome-base/nautilus-2.22.2 )
-	packagekit? ( app-admin/packagekit-base )
-"
-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
-zoo     - app-arch/zoo"
-
-PATCHES=(
-	# https://gitlab.gnome.org/GNOME/file-roller/merge_requests/31
-	"${FILESDIR}"/${PN}-3.32.4-fno-common.patch
-)
-
-src_prepare() {
-	# File providing Gentoo package names for various archivers
-	cp -v "${FILESDIR}"/3.32-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)
-		$(meson_use packagekit)
-		-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
deleted file mode 100644
index b8f879c2d13..00000000000
--- a/app-arch/file-roller/files/3.32-packages.match
+++ /dev/null
@@ -1,34 +0,0 @@
-[Package Matches]
-arj=app-arch/arj
-binutils=sys-devel/binutils
-brotli=app-arch/brotli
-bzip2=app-arch/bzip2
-cpio=app-arch/cpio
-dpkg=app-arch/dpkg
-genisoimage=app-cdr/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
-unsquashfs=sys-fs/squashfs-tools
-unstaff=
-unzip=app-arch/unzip
-xz=app-arch/xz-utils
-

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 9239810c901..00000000000
--- 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@g.o>
-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
-