gentoo resync : 14.05.2020

3 files changed, 2 insertions, 78 deletions

diff --git a/mate-extra/caja-extensions/Manifest b/mate-extra/caja-extensions/Manifest
index 5ef815206c9b..02ba578fcaf5 100644
--- a/mate-extra/caja-extensions/Manifest
+++ b/mate-extra/caja-extensions/Manifest
@@ -1,7 +1,5 @@
-DIST caja-extensions-1.22.0.tar.xz 444704 BLAKE2B d14f14e2ab18e9e6ea9c039d675e2948c309d470b1532e0585915f324bcf52a8e8425fdf0b6e725014e8813eefad77300172843c2118d098811b2b349d218fd1 SHA512 19fd287123b8d2ba67b636066e9f8910aadd47d375eb1d52136d9b808b48abacade81dde490ce3edb6fc4a9d2ddfd39d9abf294a58aed8bcaf620c1eff03e761
 DIST caja-extensions-1.22.1.tar.xz 439516 BLAKE2B 2135e5a30c86b6f83396b9f80ff474355fe02c652cd898728431eddef22a6804e7a4ea15579b03c0984417e81f8ba89ff856aa384e94d5168b6a883e678b683a SHA512 4c0fb47a251d4118c83a985732d8a549355907519b746a68eb8843c84328d868eec1535b68484c46e3d0bf4b42f0e0340fe178714f50b5f7cc8434c0e1883906
 DIST caja-extensions-1.24.0.tar.xz 548828 BLAKE2B 0492e1f0ca7277737102f71fd195dd585614010b80c2aafd730aacd1d817b03fe0377c430615a3e4bd4a643558c02c9c4fdb2d451079a3b213fe0e6b9d4e02de SHA512 f05a7d83f16aebacb04f75b76ca86e44c1a01d9ad6c2aefeac19398c4d9da8385e6852fa0118c763aee630e7eb6c7c81d77e0c9452200aee9cf4f058487c4dbf
-EBUILD caja-extensions-1.22.0.ebuild 1776 BLAKE2B 799b4af09abaee50c94df23bcbaf486d8d2b70c55eb3681da13793d7e4ad352d9bbad437b52939620487c653508ea4ee60512c0a088fa06725c8ea8619003686 SHA512 d8e2b70341cbf5fe5af69058b5a9c80fa8bbf52c3e4bf6e3a0fee4db2ee153b8a65d939568468c895b1f5297431a5bdd8bad33e7ba2d793706ad3332ccae63e7
-EBUILD caja-extensions-1.22.1.ebuild 1778 BLAKE2B 67512ceb74b6127362f55c9d2373d24fadaa2c3245081c3917aa9115e331b4a2c80743937bc1cd9acc0adc3f42a8ca8b32b2c2498cf12e3a1bfeefcd19459590 SHA512 7d8b67aa9f2dd5756ca38b9a1675f7418fc6be50b7283568a1d0b016c34e6ae48ca10cb288a9e2794f0cdfaee9ba2e3f452472c31565ef9c639436993dc9bbcd
+EBUILD caja-extensions-1.22.1.ebuild 1776 BLAKE2B 799b4af09abaee50c94df23bcbaf486d8d2b70c55eb3681da13793d7e4ad352d9bbad437b52939620487c653508ea4ee60512c0a088fa06725c8ea8619003686 SHA512 d8e2b70341cbf5fe5af69058b5a9c80fa8bbf52c3e4bf6e3a0fee4db2ee153b8a65d939568468c895b1f5297431a5bdd8bad33e7ba2d793706ad3332ccae63e7
 EBUILD caja-extensions-1.24.0.ebuild 1760 BLAKE2B 7df779f958bff8f27fd7f79e887ee5528ac61d3d382089a8de6449ea2aaccdd344280918c8a09980b4be7d8212c60ffff1e963bc042102dc39f0ab401100bb5c SHA512 c77e7559cde36b04a055e97a3d037269f647d12390dc629e71c567b258b0f3bd553c0eeb270afa43b64c72f795141b03444b6fd8f1b9bc8e55327e0a1511ace2
 MISC metadata.xml 1020 BLAKE2B ab083cbce50c476d3c3c7d9f9588d3b61232b12cd5ef0f6446fd64ec027592d43dd4fee92782c5da98a2117d98e599c2aa9b13e1dcabc7d6e29f84f1f245c44b SHA512 21c041ecb2889d08d521e369249c4829fda0ee0812e4e2cf86ad3447834216595376055848636aaeed87cffdb584acf24ce9fb774be036c0a5b0279d961987ed
diff --git a/mate-extra/caja-extensions/caja-extensions-1.22.0.ebuild b/mate-extra/caja-extensions/caja-extensions-1.22.0.ebuild
deleted file mode 100644
index 3f9edda48e19..000000000000
--- a/mate-extra/caja-extensions/caja-extensions-1.22.0.ebuild
+++ /dev/null
@@ -1,74 +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
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Several Caja extensions"
-LICENSE="GPL-2+"
-SLOT="0"
-
-SENDTO="cdr gajim +mail pidgin upnp"
-IUSE="image-converter +open-terminal share +wallpaper xattr ${SENDTO}"
-
-COMMON_DEPEND=">=dev-libs/glib-2.50:2
-	>=mate-base/caja-1.21.3
-	virtual/libintl
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3
-	gajim? (
-		>=dev-libs/dbus-glib-0.60
-		>=sys-apps/dbus-1
-	)
-	open-terminal? ( >=mate-base/mate-desktop-1.17.0 )
-	pidgin? ( >=dev-libs/dbus-glib-0.60 )
-	upnp? ( >=net-libs/gupnp-0.13:0/4 )
-	xattr? ( sys-apps/attr )"
-
-RDEPEND="${COMMON_DEPEND}
-	cdr? ( >=app-cdr/brasero-2.32.1:= )
-	gajim? ( net-im/gajim )
-	image-converter? (
-		|| (
-			media-gfx/imagemagick
-			media-gfx/graphicsmagick[imagemagick]
-		)
-	)
-	pidgin? ( net-im/pidgin )"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.18:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	!!mate-extra/mate-file-manager-open-terminal
-	!!mate-extra/mate-file-manager-sendto
-	!!mate-extra/mate-file-manager-image-converter
-	!!mate-extra/mate-file-manager-share"
-
-src_configure() {
-	local sendto_plugins="removable-devices"
-	use cdr && sendto_plugins+=",caja-burn"
-	use mail && sendto_plugins+=",emailclient"
-	use pidgin && sendto_plugins+=",pidgin"
-	use gajim && sendto_plugins+=",gajim"
-	use upnp && sendto_plugins+=",upnp"
-
-	mate_src_configure \
-		--enable-sendto \
-		--with-sendto-plugins=${sendto_plugins}\
-		--disable-gksu \
-		$(use_enable image-converter) \
-		$(use_enable open-terminal) \
-		$(use_enable share) \
-		$(use_enable wallpaper) \
-		$(use_enable xattr xattr-tags)
-}
diff --git a/mate-extra/caja-extensions/caja-extensions-1.22.1.ebuild b/mate-extra/caja-extensions/caja-extensions-1.22.1.ebuild
index da783c5b662a..3f9edda48e19 100644
--- a/mate-extra/caja-extensions/caja-extensions-1.22.1.ebuild
+++ b/mate-extra/caja-extensions/caja-extensions-1.22.1.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="Several Caja extensions"