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

[Pacho Ramos]

commit:     a9d5b71b68a2d8aabdee0781eea22aa2312bed42
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 19:41:54 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 20:06:23 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9d5b71b

app-arch/file-roller: Drop old

Package-Manager: portage-2.3.0_rc1

 app-arch/file-roller/Manifest                      |  1 -
 app-arch/file-roller/file-roller-3.16.4-r1.ebuild  | 94 ----------------------
 app-arch/file-roller/files/3.6.0-packages.match    | 30 -------
 .../files/file-roller-3.16.4-bug-757793.patch      | 25 ------
 4 files changed, 150 deletions(-)

diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index b5e56d7..05ace3e 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,2 +1 @@
-DIST file-roller-3.16.4.tar.xz 1412224 SHA256 5455980b2c9c7eb063d2d65560ae7ab2e7f01b208ea3947e151680231c7a4185 SHA512 76378e16cd7f37a336b3eb3c6106cf36c2ea6e9209c23175810e2b80dc13a7b62b04cfcdea0b2bf69251baf7b164e85c34d99813cdbfd07433f73aba9c7361ae WHIRLPOOL 0d8736e13b97a4a005ae53bd9885b10c8a7797e10e0d8f4548e4112490ebc3ce91b0e5349b251bdca5d0f392318be7ea4fb324e3399300e362f47b024217849d
 DIST file-roller-3.16.5.tar.xz 1415236 SHA256 09a68db98aa33febdad76e6977d7771b3b444da7f57ab6f4fe7d6a77e39d5a91 SHA512 83c8dddb547f36faa2728996648479255353706a266ce26e79f8f6141794d0281a9817f2a1dc687623ba8382cab93aef23675e2f3ef6d4abb9f8871f253d2c2d WHIRLPOOL 01d54e45d9d8b81c5f965622adbacac1400f56461e230999e97aa1cde135714e7e80317749c04eac7b4a49fea0fa66142b9dfbec0876b743b4709d3d17c72cce

diff --git a/app-arch/file-roller/file-roller-3.16.4-r1.ebuild b/app-arch/file-roller/file-roller-3.16.4-r1.ebuild
deleted file mode 100644
index 5bc4c12..0000000
--- a/app-arch/file-roller/file-roller-3.16.4-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 readme.gentoo
-
-DESCRIPTION="Archive manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-IUSE="nautilus packagekit"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~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/libnotify-0.4.3:=
-	sys-apps/file
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	nautilus? ( >=gnome-base/nautilus-3 )
-	packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${RDEPEND}
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.40.0
-	dev-util/itstool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-# eautoreconf needs:
-#	gnome-base/gnome-common
-
-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
-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
-rar     - app-arch/unrar or app-arch/unar
-rpm     - app-arch/rpm
-unstuff - app-arch/stuffit
-zoo     - app-arch/zoo"
-
-src_prepare() {
-	# File providing Gentoo package names for various archivers
-	cp -f "${FILESDIR}"/3.6.0-packages.match data/packages.match || die
-	gnome2_src_prepare
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=757793
-	epatch "${FILESDIR}"/${P}-bug-757793.patch
-}
-
-src_configure() {
-	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
-	# --disable-debug because enabling it adds -O0 to CFLAGS
-	gnome2_src_configure \
-		--disable-run-in-place \
-		--disable-static \
-		--disable-debug \
-		--enable-magic \
-		--enable-libarchive \
-		$(use_enable nautilus nautilus-actions) \
-		$(use_enable packagekit)
-}
-
-src_install() {
-	gnome2_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}

diff --git a/app-arch/file-roller/files/3.6.0-packages.match b/app-arch/file-roller/files/3.6.0-packages.match
deleted file mode 100644
index 4085b19..0000000
--- a/app-arch/file-roller/files/3.6.0-packages.match
+++ /dev/null
@@ -1,30 +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
-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
-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
-zip=app-arch/zip
-zoo=app-arch/zoo

diff --git a/app-arch/file-roller/files/file-roller-3.16.4-bug-757793.patch b/app-arch/file-roller/files/file-roller-3.16.4-bug-757793.patch
deleted file mode 100644
index 9256c1d..0000000
--- a/app-arch/file-roller/files/file-roller-3.16.4-bug-757793.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b9308bac8f93c047d0ce7a3b52e9b5f09adf2c86 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@×××××××.org>
-Date: Sun, 6 Dec 2015 15:23:31 +0100
-Subject: [PATCH] Stop mis-treating p7zip 15.09 as pre-4.55 (#757793)
-
----
- src/fr-command-7z.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c
-index fc33d4d..1befbf5 100644
---- a/src/fr-command-7z.c
-+++ b/src/fr-command-7z.c
-@@ -98,7 +98,7 @@ list__process_line (char     *line,
- 			strncpy (version, ver_start, ver_len);
- 			version[ver_len] = 0;
- 
--			if (strcmp (version, "4.55") < 0)
-+			if ((strcmp (version, "4.55") < 0) && (ver_len > 1) && (version[1] == '.'))
- 				self->old_style = TRUE;
- 			else
- 				self->old_style = FALSE;
--- 
-2.6.3
-