diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
deleted file mode 100644
index 4f1ee85d03a49..0000000000000
--- a/mate-base/caja/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST caja-1.24.0.tar.xz 5221716 BLAKE2B 66d628ac0f50e2c388935420e29dfe15a8f5f127fd7b39e92ebbd67b6c929cda1a2dec1f510fb89890602adaef6a741f0ee3e15d27ab9741c5223c7966b3b908 SHA512 a68b23876cfa1171d5b1c75e4998c6b15f0ceebdc4fcaabb8d362e32e35b915b1a91a38648532ac8acc162dac50aeb4d07eff417ce2db7a8c50d68bd38a0b548
diff --git a/mate-base/caja/caja-1.24.0-r2.ebuild b/mate-base/caja/caja-1.24.0-r2.ebuild
index adb9c4ce93dfa..795d1f2bc01fc 100644
--- a/mate-base/caja/caja-1.24.0-r2.ebuild
+++ b/mate-base/caja/caja-1.24.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ DESCRIPTION="Caja file manager for the MATE desktop"
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
 
-IUSE="+introspection +mate packagekit selinux xmp"
+IUSE="+introspection +mate packagekit xmp"
 
 COMMON_DEPEND="
 	dev-libs/atk
@@ -38,7 +38,6 @@ COMMON_DEPEND="
 	>=x11-libs/pango-1.1.2
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
 	packagekit? ( app-admin/packagekit-base )
-	selinux? ( sys-libs/libselinux )
 	xmp? ( >=media-libs/exempi-1.99.5:2 )
 "
 
@@ -63,8 +62,6 @@ PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
 # GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
 RESTRICT="test"
 
-PATCHES=( "${FILESDIR}/${PN}-1.24.0-fix-selinux-automagic-dep.patch" )
-
 src_prepare() {
 	# Remove unnecessary CFLAGS.
 	sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
@@ -78,7 +75,6 @@ src_configure() {
 		--disable-update-mimedb \
 		$(use_enable introspection) \
 		$(use_enable packagekit) \
-		$(use_enable selinux) \
 		$(use_enable xmp)
 }
 
@@ -86,7 +82,7 @@ src_test() {
 	unset SESSION_MANAGER
 	unset DBUS_SESSION_BUS_ADDRESS
 
-	virtx emake check || die "Test phase failed"
+	Xemake check || die "Test phase failed"
 }
 
 pkg_postinst() {
diff --git a/mate-base/caja/caja-1.24.0.ebuild b/mate-base/caja/caja-1.24.0.ebuild
deleted file mode 100644
index 9cda8a973cf3c..0000000000000
--- a/mate-base/caja/caja-1.24.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 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
-
-	virtx emake 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."
-}