gentoo resync : 14.05.2020

3 files changed, 2 insertions, 94 deletions

diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index 47a340342595..0235a4e5d14a 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -1,8 +1,6 @@
 AUX caja-1.22.3-gcc-10-fno-common.patch 3373 BLAKE2B 7e1b665c6f2a7816fe2f13fbe0dfc0670e9e5f1c695c8602f7c594a0174ca5f000dec088800992514ef8be1042c12b83011b54fbcb4a772c400047263c356cd8 SHA512 3522d44fd7a98c9a258fe32d06eb9ba7406e1a1e3e6528519b36c7761e980c2eb3782f2cb0d38eb722a75f75fa18c8c9e33e3e76d339124b598fbe544936cb55
-DIST caja-1.22.1.tar.xz 3462248 BLAKE2B d9c7c643778678e9562e0a2b79d04ea13eddd58dce00820d78452d670438aaef2ac86cc7ce341437c1496094ee625f462d0654c53a26705e835a6c612549792f SHA512 dea2e9cac7802df5335a716a1a7df149b637014525202600f4bf3eab293eff29bf2df66df22203aa036898149cb26ba1d05491234dc75203480925cce0333a17
 DIST caja-1.22.3.tar.xz 3493232 BLAKE2B a47e94380e882b8fab16ef615dd8938063c77f7f5edfcae816fb4c3d9b84e261902dbb07a8d3ba40d32487df61050dfacc464e2b5510785748d0199a13c082f8 SHA512 9063bd0a9b6fd815f76cfefd9e87eed88588821376d0c46df9cd3ea1cada828bcee4f5f2ddb42be0178ab09a4519b34bded62cebf201dbde5dda1cf3bad95c22
 DIST caja-1.24.0.tar.xz 5221716 BLAKE2B 66d628ac0f50e2c388935420e29dfe15a8f5f127fd7b39e92ebbd67b6c929cda1a2dec1f510fb89890602adaef6a741f0ee3e15d27ab9741c5223c7966b3b908 SHA512 a68b23876cfa1171d5b1c75e4998c6b15f0ceebdc4fcaabb8d362e32e35b915b1a91a38648532ac8acc162dac50aeb4d07eff417ce2db7a8c50d68bd38a0b548
-EBUILD caja-1.22.1.ebuild 2014 BLAKE2B a027af499242963207478098091b4f8c0042828508175da62a5f7bfc0d4c3848efa99383f6f035218ba0e63d6490d81fbaf8a6b7ce22926f7c570fd1b9a1a144 SHA512 5a3fcf4bb8f1d38eb9960371244a5d55f88b6fd6b0b17e090ad830e097b46cf18315ca67c584cbd7adc3f41f166f3ac8bef159f01d9b1fa94b180df08d00dec7
-EBUILD caja-1.22.3-r1.ebuild 2073 BLAKE2B 9b801fe8ca56b5e032372cb6f06319e57258004a44abec8eeff219cfb9b401b4dd85035df73a479670ae714bf4e685f98e30364a637c2896eecd9e332da136d6 SHA512 d7063545ba95af905bf9a82855671f8654ce7918a49ff91be6fc656bcb9fdcf6befbc176db39de699f13fb1215932925552b8570d5cf5ddb6d437dc101b1b116
+EBUILD caja-1.22.3-r1.ebuild 2071 BLAKE2B f77aa8022ad6c6d099cce58bcf6190d600c4b5a33c79c7c878fc69ca8f4c4dbaccda9132661037de8d6a09d2b0fa9c29259b85d486f043b919b08b99ca4da97f SHA512 00763f5562080b1c450d4c1fdd373c9d201e157b48ce012f8a02ed2edc31b1d7087fe057d70006fe6881e7c9d504b1f0d8122d4fd9b53d14e4466fcd63ec26d2
 EBUILD caja-1.24.0.ebuild 2052 BLAKE2B d3f84d9d29b973043f6e3eca2e6ce62aea6cc925e3522bd2211f5fdee9880e4758c3f932dc46478ec5486595491296cfb7ed7a0d89dc41c16277bc7389640176 SHA512 40e7c5c53859127332c928cdc21ed6d87f822e9bffc211366b8cbe657f36965e1ea99d30a548942219a7905cdfd03229b29314077749f08c23b3837e3bda1532
 MISC metadata.xml 600 BLAKE2B 51da0f96a4adaedcea06fcb9e63f58cee8cbe7d479d8195af4821f1be66d07ee62361d225126943b24da10235bf6a06946d215a4e817a38aff5e07d29d6449db SHA512 639000dfb46bb04d2d5df50a60ab60259aa59e8cc0ad9f29c62ec2cbfa06b9556b4f7cada01588179a453a69645f2e44530469953ef5e423a428a9d6a0cceb9a
diff --git a/mate-base/caja/caja-1.22.1.ebuild b/mate-base/caja/caja-1.22.1.ebuild
deleted file mode 100644
index 008adb1b2ed2..000000000000
--- a/mate-base/caja/caja-1.22.1.ebuild
+++ /dev/null
@@ -1,90 +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 virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-DESCRIPTION="Caja file manager for the MATE desktop"
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-
-IUSE="+introspection +mate packagekit xmp"
-
-RDEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libxml2-2.4.7:2
-	gnome-base/dconf
-	>=gnome-base/gvfs-1.10.1:0[udisks]
-	>=mate-base/mate-desktop-1.17.3:0
-	>=media-libs/libexif-0.6.14:0
-	virtual/libintl
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	>=x11-libs/libnotify-0.7.0:0
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXft
-	x11-libs/libXrender
-	>=x11-libs/pango-1.1.2
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	packagekit? ( app-admin/packagekit-base )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!mate-base/mate-file-manager"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5:=
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
-
-# TODO: Test fails because Caja is not merged yet:
-# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
-RESTRICT="test"
-
-src_prepare() {
-	# Remove unnecessary CFLAGS.
-	sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
-		configure.ac eel/Makefile.am || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog "Caja can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview."
-}
diff --git a/mate-base/caja/caja-1.22.3-r1.ebuild b/mate-base/caja/caja-1.22.3-r1.ebuild
index 1167ca298cd1..bee9e5f807fa 100644
--- a/mate-base/caja/caja-1.22.3-r1.ebuild
+++ b/mate-base/caja/caja-1.22.3-r1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate virtualx
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Caja file manager for the MATE desktop"