gentoo resync : 27.01.2018

3 files changed, 2 insertions, 91 deletions

diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index 0d882ae2071d..7812d2061e03 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,6 +1,4 @@
 AUX 3.22-packages.match 589 BLAKE2B b53cde8851c08d4f538397d72d5e904b6862a091ca1c6b82c255bd79f91917953b7a87b534ef71488f0a93e18a181f554a5477c606be7a429f7c574a62f8e198 SHA512 b96be2502b2ee56fb234af547a045cfed2c5e8bd7290876db641bb1f895ea6a796e50f2e2e066fc80b42fa58eab740a5519c0f2ad78f2787f55d1077b183ee62
-DIST file-roller-3.22.3.tar.xz 1423048 BLAKE2B 75caad8a215737256595a44d7599f581d60636c7c2eeaaa9a0c5c5ace583725ac22a9502311aed672f2f935c9372e2689ed0bcf867f6dadc538919c4d4b68f87 SHA512 f234388686cf539fc085866322083199176f94043e4c2c888d5806a2efa0dfcf5a090f64240a3d08aae39ed3d34d6b281e1a06d748c56b0f80508a01fac40b28
 DIST file-roller-3.24.1.tar.xz 1428216 BLAKE2B 7a74ac56fba36a60ba1f7cc0fb905b92336a349f786963a65ea2442fb078704c6e00b46686334f56cf270c861abe7ca252e0ee39f66349f6a4cc3b769a9e7dde SHA512 bd8750b8ffe3e7d3c74492e2ffdde519e7879d46f16c559d06042bac60c8ee63f492aeeaa66b4aff7c997150f4f2955e02a3b0565edf4bd7641a089ed052f268
-EBUILD file-roller-3.22.3.ebuild 2126 BLAKE2B 46cbdf6491e29575a790fc73a1818f327b23690ee21317d554bee67c5dc96b68e164e6f2eb634a48e32912f9305a047e47633dccaf71979f39c628ed186be174 SHA512 c223592cde7621cf2cbf619a38c3b39f2ea0447a28c8dcb5db6de560487dfe00fe9b148bb784aa423a3a54f7485474b7e12b005f91ac6d60b25bc49fb8e17fd7
-EBUILD file-roller-3.24.1.ebuild 2224 BLAKE2B 3644bb9683335e67c346027d7c3cdcf8bfa693e06b98a101ef76520d4523f86bd356371dc195e1c76f03d9774b576016bdea22feb139ad85b601c08e1eed8277 SHA512 56e89e704ab105c8dd57c1c086fb1468e6057ce30abdec50f39badea6cfb21c3174e50c1acd9a2330f344cbc9be8bbe45164892cfad840064be4a44f81bd3f1d
+EBUILD file-roller-3.24.1.ebuild 2223 BLAKE2B a1d82e9e382095697fd75e0d180c8629fd64f27b7fb18a7ddf38912018e2856f05251aee55962e9212965d4bfd9fb307627f4895350cafd67b7afe5b16e96594 SHA512 d1ffae59e371bc1f01f7e487039a13437e3afaec545e69266693c05a2b0219d5075af9c9111ace747eef1029c8d6fd3fb824f6c378a4b4678be6cad59f872b85
 MISC metadata.xml 648 BLAKE2B 8fc7347f0812f1b899096670b3ed809dd577e8173f8d7dac8175fbc6eb2939157d1a6100bcc39f15d22e8058e1daba2b4ac7b678baa83f1d24c1f14d77d2e989 SHA512 ea1b782f93ef9397e798d7f6cdd1e650ae95dcad71f439ec518a9e79ebc83a176c9876e85b9930d691e818f5b1efa636f5165d690cfd63b4c7ff9700ba2f956f
diff --git a/app-arch/file-roller/file-roller-3.22.3.ebuild b/app-arch/file-roller/file-roller-3.22.3.ebuild
deleted file mode 100644
index 277c112093cf..000000000000
--- a/app-arch/file-roller/file-roller-3.22.3.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 readme.gentoo-r1
-
-DESCRIPTION="Archive manager for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/FileRoller"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-IUSE="libnotify packagekit"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~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
-	sys-apps/file
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango
-	libnotify? ( >=x11-libs/libnotify-0.4.3:= )
-	packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.50.1
-	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
-lz4     - app-arch/lz4
-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.22-packages.match data/packages.match || die
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# --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 libnotify notification) \
-		$(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/file-roller-3.24.1.ebuild b/app-arch/file-roller/file-roller-3.24.1.ebuild
index 6882288bc377..61e1a7c6e37d 100644
--- a/app-arch/file-roller/file-roller-3.24.1.ebuild
+++ b/app-arch/file-roller/file-roller-3.24.1.ebuild
@@ -12,7 +12,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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c