gentoo resync : 28.04.2019

3 files changed, 9 insertions, 82 deletions

diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index d1d13d6ff4a6..c6d5894fdf9f 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -1,5 +1,3 @@
-DIST engrampa-1.18.3.tar.xz 1427036 BLAKE2B 816155b7e2a0583263959d77bb5079a3d69ade087cac39e8e9c2c77901d0bfcbdb63a87ec9ed7cf92d2e580ae810d3e46641d690d87c1af7db6f6dca6627dfbc SHA512 6a3872ed9ec1e9d2779842d30c352c5068608913f9261a875b707951a45ff3122df2f4a4ed4da10c4f8a4617cc1d7aae4635b3f1234052793c4a6baa765d80f8
 DIST engrampa-1.22.0.tar.xz 1358552 BLAKE2B 542bb963d232dd75eba6102926e2cf31b52cab16eb890039609cf6ec44e86a7d6bf49ee04da316bb46e49d9c012c1f100e4acb20541cb8f46e245946f83cbac8 SHA512 7b4c3b85184c1530ec72eba174ee571cc14490c88f5fef1232acd4197f1020107f5172d6d4271753f9f6fcfadcf049273095b3dfbcef6fdd25a51ad8d2e17382
-EBUILD engrampa-1.18.3.ebuild 1753 BLAKE2B 11e3876e0ea2061f7a4608ffe8795264594d4c2bafb14c430dc404cade3a15fa2c7f839be2acccfc8bd41f3325111b6bb6241570222c0a3048b6ea674c9f66ad SHA512 6ac876b38c305d108ac369231ae0cf1eed5e9d05e188a9be566fa014596b865781fd3953aac4ca3dd05adb4a552a5d9810a180ef073851990b437852e7ba1b1e
-EBUILD engrampa-1.22.0.ebuild 1742 BLAKE2B 1e63c49922fbb82c9dd17b05de723b5a10b8c8b18feb580e199942199f5350a4d0bd13e398df3f2c9315c41fea9a284fa2c55914bedec7a427e189077ad43c9c SHA512 87546873b40cb9f64eecb75e530c3342105ab61792bb35761ee28ac5c6d55949edb8e7fc2dfaa8f3e3d738af98881be653f3bb56183294e995a8b85b5446c5c2
+EBUILD engrampa-1.22.0.ebuild 1717 BLAKE2B 1b19d5b2a8a35909db0e38b59be3f5dd4afc87ac77800b946f1a91080f37c12e49f8843ec786f92e630adf727e7dbc6a68184f748f131eb9aefeae76efd0352a SHA512 640f9adac5ff1e040cb1e5bacb6ff9408bb8d5ab4b9db91c341090987ecb3bd6f19613314fb3bac69c113ef47f18b162401e26e8a1cd6ce69f5e8cf9be985caf
 MISC metadata.xml 702 BLAKE2B de15449aa20cc44e6068bd8047630353f3389845a3332b57631bacdc9b9c4b188f8152678240e0142142db322af7058b09060f74413ff55fd1980fe697f32d0d SHA512 b465ea239cabf4ad1cd6b1f5ba7f87151e637595191c1a88cf17059f96ca1b03ce57d4200fc793d56be2b6ddb2ded20be460a4e1ac1727180e9662f9baba4522
diff --git a/app-arch/engrampa/engrampa-1.18.3.ebuild b/app-arch/engrampa/engrampa-1.18.3.ebuild
deleted file mode 100644
index 46a8bb99de0c..000000000000
--- a/app-arch/engrampa/engrampa-1.18.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja magic packagekit"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/json-glib-0.14:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango:0
-	virtual/libintl:0
-	caja? ( >=mate-base/caja-1.17.1 )
-	>=x11-libs/gtk+-3.14:3[X]
-	magic? ( sys-apps/file )
-	packagekit? ( app-admin/packagekit-base )
-	!!app-arch/mate-file-archiver"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=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)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog ""
-	elog "${PN} is a frontend for several archiving utilities. If you want a"
-	elog "particular achive format supported install the relevant package."
-	elog
-	elog "For example:"
-	elog "  7-zip   : emerge app-arch/p7zip"
-	elog "  ace     : emerge app-arch/unace"
-	elog "  arj     : emerge app-arch/arj"
-	elog "  cpio    : emerge app-arch/cpio"
-	elog "  deb     : emerge app-arch/dpkg"
-	elog "  iso     : emerge app-cdr/cdrtools"
-	elog "  jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip"
-	elog "  lha     : emerge app-arch/lha"
-	elog "  lzma    : emerge app-arch/xz-utils"
-	elog "  lzop    : emerge app-arch/lzop"
-	elog "  rar     : emerge app-arch/unrar"
-	elog "  rpm     : emerge app-arch/rpm"
-	elog "  unstuff : emerge app-arch/stuffit"
-	elog "  zoo     : emerge app-arch/zoo"
-}
diff --git a/app-arch/engrampa/engrampa-1.22.0.ebuild b/app-arch/engrampa/engrampa-1.22.0.ebuild
index 3bf24e0d5df6..cfd188048c75 100644
--- a/app-arch/engrampa/engrampa-1.22.0.ebuild
+++ b/app-arch/engrampa/engrampa-1.22.0.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Engrampa archive manager for MATE"
@@ -17,25 +17,24 @@ SLOT="0"
 
 IUSE="caja magic packagekit"
 
-COMMON_DEPEND="
+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
-	virtual/libintl
 	caja? ( >=mate-base/caja-1.17.1 )
-	>=x11-libs/gtk+-3.22:3[X]
 	magic? ( sys-apps/file )
 	packagekit? ( app-admin/packagekit-base )
 	!!app-arch/mate-file-archiver"
 
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	app-text/yelp-tools
+	dev-util/glib-utils
 	>=dev-util/intltool-0.50.1
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 src_configure() {
 	mate_src_configure \