gentoo resync : 28.04.2019

3 files changed, 2 insertions, 78 deletions

diff --git a/mate-extra/caja-extensions/Manifest b/mate-extra/caja-extensions/Manifest
index f4465aab3125..f0049ed15bcb 100644
--- a/mate-extra/caja-extensions/Manifest
+++ b/mate-extra/caja-extensions/Manifest
@@ -1,5 +1,3 @@
-DIST caja-extensions-1.18.2.tar.xz 410704 BLAKE2B e13dde75bf616463f34d41df0b3be28d283383bd3ef56e24ce6cc0f319f0a7fea1b8dd75076582a78157c076de26f72235fe7b6f445f150547944a072b62038e SHA512 cbc3e6c02cdf93aa98e17232b9cdc9579355e2a31ea9421e6829eb2ba6fe50c7d6ba33b737f1286c9b0730a8781e8c060140ea47b216ef60b0bbaafabc9d836d
 DIST caja-extensions-1.22.0.tar.xz 444704 BLAKE2B d14f14e2ab18e9e6ea9c039d675e2948c309d470b1532e0585915f324bcf52a8e8425fdf0b6e725014e8813eefad77300172843c2118d098811b2b349d218fd1 SHA512 19fd287123b8d2ba67b636066e9f8910aadd47d375eb1d52136d9b808b48abacade81dde490ce3edb6fc4a9d2ddfd39d9abf294a58aed8bcaf620c1eff03e761
-EBUILD caja-extensions-1.18.2.ebuild 1785 BLAKE2B 8686ddc1483e1a1e4940552016046bc0d58f4649425e12ee700c04ed190921b26417cbeceb2e2e1b577157ceebae17db6f49347c73239966a587d66eeccf6a12 SHA512 5e5e9fcaae9e6b85f9eaad9f92abb6b00f160347a35ffa0c5967fcf50c6ef4b41e9631bc68f9de7cb4b90df572664a14db9f0c57535e73fae1e1def33e9abca1
-EBUILD caja-extensions-1.22.0.ebuild 1775 BLAKE2B 27a0cb508c48cb6d50484ca0f709b814de01500176081067a75ebbd8a87a0583dcf10a4c70539c63db23624f5b7acd81997c5282da63cc03082ba3493b253a11 SHA512 c8ec4f214f928e418ee0416ca39af1b5ee10349966f8259ddbf3a26027dc0789eae771107740568cbf3c232bc2d5b70923a3d7d60b901faf6c7e72197c8bb961
+EBUILD caja-extensions-1.22.0.ebuild 1773 BLAKE2B b4b020492afe71ca87446c069858d8389365753f662095597871770d4b1fb33b2984bd6a8f4374f36babfdbbcffe087f3aab083f0ce543bdd1f4899df239a0a2 SHA512 3363aea9b4547444e81b43f2d4dbe11978649905325e4e90d15234871ee141ced4e50db904d8c6b7bb79e90db0f4779aeb42cb8767d87506f05441b155125c48
 MISC metadata.xml 1020 BLAKE2B ab083cbce50c476d3c3c7d9f9588d3b61232b12cd5ef0f6446fd64ec027592d43dd4fee92782c5da98a2117d98e599c2aa9b13e1dcabc7d6e29f84f1f245c44b SHA512 21c041ecb2889d08d521e369249c4829fda0ee0812e4e2cf86ad3447834216595376055848636aaeed87cffdb584acf24ce9fb774be036c0a5b0279d961987ed
diff --git a/mate-extra/caja-extensions/caja-extensions-1.18.2.ebuild b/mate-extra/caja-extensions/caja-extensions-1.18.2.ebuild
deleted file mode 100644
index 5b174d4edf6e..000000000000
--- a/mate-extra/caja-extensions/caja-extensions-1.18.2.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 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.36:2
-	>=mate-base/caja-1.17.1
-	virtual/libintl:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3
-	gajim? (
-		>=dev-libs/dbus-glib-0.60:0
-		>=sys-apps/dbus-1:0
-	)
-	open-terminal? ( >=mate-base/mate-desktop-1.17.0 )
-	pidgin? ( >=dev-libs/dbus-glib-0.60:0 )
-	upnp? ( >=net-libs/gupnp-0.13:0= )
-	xattr? ( sys-apps/attr )"
-
-RDEPEND="${COMMON_DEPEND}
-	cdr? ( >=app-cdr/brasero-2.32.1:0= )
-	gajim? ( net-im/gajim:0 )
-	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.0.ebuild b/mate-extra/caja-extensions/caja-extensions-1.22.0.ebuild
index 88f85a98d2ed..bc91725a62bf 100644
--- a/mate-extra/caja-extensions/caja-extensions-1.22.0.ebuild
+++ b/mate-extra/caja-extensions/caja-extensions-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="Several Caja extensions"