gentoo resync : 16.01.2021

3 files changed, 3 insertions, 99 deletions

diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index 7265961e3d1b..5e4a1d5e8754 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -1,5 +1,3 @@
-DIST caja-1.24.0.tar.xz 5221716 BLAKE2B 66d628ac0f50e2c388935420e29dfe15a8f5f127fd7b39e92ebbd67b6c929cda1a2dec1f510fb89890602adaef6a741f0ee3e15d27ab9741c5223c7966b3b908 SHA512 a68b23876cfa1171d5b1c75e4998c6b15f0ceebdc4fcaabb8d362e32e35b915b1a91a38648532ac8acc162dac50aeb4d07eff417ce2db7a8c50d68bd38a0b548
 DIST caja-1.24.1.tar.xz 5308268 BLAKE2B 82d2ff39152bd6d961d233d3712237b8192cf680d419f44cb8a2857228f4648d7667213740a1b2fdf024ac5958586f9b0b8f99e3770710a5ec5c6651a85dadf1 SHA512 34ba1e384e3de4ee3e6dddafa4ef4ccd5f626352cf5b42d6178e96395762653478cbdabb109cd0f2418ed463fd4743ef8a34be0a6b4294ad5355fea6dbfd53cc
-EBUILD caja-1.24.0-r2.ebuild 2049 BLAKE2B 3691152cec5304c427eb6eef54b55ce933cfc296cfbec05eafa3b4a495b57fafc983d6df9d81cf9e6446913c287daf4fd982a30311b7fe07613a08e3c5cb67d0 SHA512 ee9e362971f0ff2adbd7e31a84d99a6e7c6a706092c44a14f22b4caa437c4d7cb387181b08183ade3224e3cdb042a7d42736a93819a471b9f96b26b970a1a2a9
-EBUILD caja-1.24.1.ebuild 2058 BLAKE2B 65150fe010a9a7358bad7acb260265a9a9b2c3a6864b3dbe12413392d13a774c35ca9897507b84112ee0861494e7b60eb46a1ef6312a21671ad800693d1341b9 SHA512 575a4cf4d3242b62eaecf484c24c2434d5419c0133d764cba6233eccc4341bbcbb7cbf4c9cea87fdb87bc9af30f5f31222b89fbfea2cd2be44d99eba2d5be0f7
+EBUILD caja-1.24.1.ebuild 2056 BLAKE2B e5ed83db8942c7710eb2b16d7f6c305ce46a7b8996b9d8cccff07edf2c6cce923ccb115ccae11d0035d5dcff5324d734a0db782b6f078061959371a786f87e50 SHA512 973ed8ce102489afbb1892213118435eca7ed78759e57c5dc6269891aa493a5bb85935755768a0d0685c9e4822118d19f0f92de0a38b245b1f0dfb7c7b0716ea
 MISC metadata.xml 601 BLAKE2B bb9a8f59c1243acda47db97d00e22947bdfbe8276b325479242f71d2e6e707fa651df35d71fcaf205ecafac02546a520a3f4f7e153ca69ad5c7a82727febdaf1 SHA512 710863ca54c383474ac09ea6c61ff08cd9b5f76301978b1c4aa19e91cc7af1619e3d6c2228d9403741e36d902076bf2bfc40d8b7ea8344d1bc461c2a64677e10
diff --git a/mate-base/caja/caja-1.24.0-r2.ebuild b/mate-base/caja/caja-1.24.0-r2.ebuild
deleted file mode 100644
index 795d1f2bc01f..000000000000
--- a/mate-base/caja/caja-1.24.0-r2.ebuild
+++ /dev/null
@@ -1,94 +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"
-
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.58.1: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
-	x11-libs/cairo
-	>=x11-libs/gdk-pixbuf-2.36.5: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 )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	virtual/libintl
-	!!mate-base/mate-file-manager
-"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5:=
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.8
-	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.24.1.ebuild b/mate-base/caja/caja-1.24.1.ebuild
index efd5fdf8a251..c1fb7b8ef456 100644
--- a/mate-base/caja/caja-1.24.1.ebuild
+++ b/mate-base/caja/caja-1.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate virtualx
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 fi
 
 DESCRIPTION="Caja file manager for the MATE desktop"