gentoo auto-resync : 22:12:2023 - 07:49:59

3 files changed, 4 insertions, 100 deletions

diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index 93299fb2116f..b441f75b987e 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -1,9 +1,7 @@
-DIST caja-1.26.0.tar.xz 5283368 BLAKE2B 8449d7d721a997458102abf0fefcb35734a1b254280a4b8baa14667913f2a3006c31583d956de54ad7fac9e1da70057e058547eb7e3652a1dca9df9e9628a3a9 SHA512 0abbaebe6dc24644d0e5057fe79e57f67a1e5208f6aa89289649e6e1940285e4c169ec42197ae933f663a9c69a7f09295003cc645492db6abbd9ebce7085c03a
 DIST caja-1.26.1.tar.xz 5263564 BLAKE2B 44cdbbc86a24d9d3d6f7830ba45dd82a69b0aadd233531a97ab1cc4dfc5f7466543d70d3f8d6cef4bc669c0ab12b77ca7f22d40f486f36e80c4103c992369002 SHA512 e5d14d1a5f0ae9f86d3250e5a2d10a4e0afdc7ba1b52fcac4c8efc0a4c555d0208be3caf3aac19cc4938fe4c20e82f1f81d259d30e5d8fffbc78708664d23d4e
 DIST caja-1.26.3.tar.xz 5276276 BLAKE2B d9347986939433bf3b28b58ab8412579caa5cafddc72880a45dcffef75a5431cc81741a4f7006f1183c2b74cbae673db69ed8191616bd85c262bd07204601efd SHA512 6f17d46de77c552f68c77e0b6a0c388a7fe353ddd5ea5376685aec209f301b5a74a76b1af4c2324f41838ff7251acffa3bd119cf2462a8b8b45ef1b88df4c83c
 DIST caja-1.27.2.tar.xz 5321212 BLAKE2B d2dca7b90afb5c81d7c25f4eb4acf79007f5134f9ad5924fcbb63490d5c3cf303892dd2e43b4a7c3a6f7181cade24cd785c8f7cae93e3fed121553e3993874f2 SHA512 ca36533e0dfb583aaf8bdc6f1d3e5235a4e0b67e6c3d6180d76cd8c52ba72b224a73ccbe4868310cc318b083fe96ac62002422d967849eba88da20e0ad3a1a4c
-EBUILD caja-1.26.0-r2.ebuild 1993 BLAKE2B ae3d6d7ff34f4820feddd1a64be8fa7f30fe6e93801c2ba354b6dff242a4439ba7d7dbb9a166a0b64de15a5ad707f7ca44f5db98296254c27ff7df229d29c701 SHA512 d384c12df4a14b4b224d0c87a56a4df21998ea975d0f577497d46486fc5bec4de74e377f6894497b61808d82b60d7b0c25f5cfc1fe0e03916759aebc528a6657
 EBUILD caja-1.26.1.ebuild 1993 BLAKE2B b509f1fcba259272a0ada0394a31630f92b9dc67896f42d206a768c6d56364d52020f8c1e536384908c89c13f6da5da5e33056bb03fc0e281732e14c70a6a823 SHA512 7ebc5d6277e17d65b6eb08e2bce1ff0097d20d4abd3828c5765ca40b11c55e75ce9c3ea2123ecd7310ed6d8e9b3c6d76c81016935eff09cfd7bfcebf8bded62d
-EBUILD caja-1.26.3.ebuild 1995 BLAKE2B 63398924518e28c1dabe6c83736d818f46948852550c2a7ce6707091c3a437531b4f6ffff9ebe1c214746a3ed10ba7fa6aac017a899aaa5834e09e30b13b5e11 SHA512 4e4cdc548917f656fab4324ddd672e8f65f4a0f7130e0f14cc559bfdd9ab6a79960f4fd7e8cfbf2d6002eb0d139d7f8009af90f79c3723286eed4544dd073796
+EBUILD caja-1.26.3.ebuild 1999 BLAKE2B 6df98d282e882889e8f781b12213884a43883ce0dc69e1351a0f864f280b02dc8620f16303e06d5f12fabbe99a0d8685c55e2991d7a2ec1e43745341ecaf08e3 SHA512 3ba8cc8432fe2400cf0623af0bbf0c6ddbeba0d350c82cb5e3c69126543e93a66ee4c94a2281e23930db102dc5e103fb367286adea43c600d4d3461a49ef64eb
 EBUILD caja-1.27.2.ebuild 2006 BLAKE2B 5abbc5c6a0e1e1ea5b906945d226d752eacc37e82bdd0e0abb798b05e1b39447b182139594cf0dd4fa33c0b56dc65616f6b64881acb3e7198873b916af21150a SHA512 5381d2a999e196de28c5d41c3af9b02e4cda3d7d5a9091ad3b0be80bc7a38871116ad05567854c38f14b2bec8a4f8dfeaa942bf2470cce1cca6861c0265b1760
 MISC metadata.xml 419 BLAKE2B 01bc50d0d730d1e27e592c548bd3ef27ef110fe9fea853381a451dbadb52ff0ed7ab1e0ccd47f8c756b4863d7eea15bb7a48f8ca791dfe42688e465b04dc29b7 SHA512 dfa452730634594627d55401f9a232a7a9c6296b21a3f76a0f146fe0116513e12580114d18b6190e41562035248a0aeea775511b75e93e8d875f7305b19ccba2
diff --git a/mate-base/caja/caja-1.26.0-r2.ebuild b/mate-base/caja/caja-1.26.0-r2.ebuild
deleted file mode 100644
index 33b2cedd1e60..000000000000
--- a/mate-base/caja/caja-1.26.0-r2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 ~loong ~riscv x86"
-fi
-
-DESCRIPTION="Caja file manager for the MATE desktop"
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-
-IUSE="+introspection +mate nls xmp"
-
-COMMON_DEPEND="
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		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
-	virtual/libintl
-	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:= )
-	xmp? ( >=media-libs/exempi-1.99.5:2= )
-"
-
-BDEPEND="${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 nls) \
-		$(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.26.3.ebuild b/mate-base/caja/caja-1.26.3.ebuild
index f7d34c25f7c5..64154a933647 100644
--- a/mate-base/caja/caja-1.26.3.ebuild
+++ b/mate-base/caja/caja-1.26.3.ebuild
@@ -7,7 +7,8 @@ MATE_LA_PUNT="yes"
 
 inherit mate
 
-if [[ ${PV} != 9999 ]]; then
+MINOR=$(($(ver_cut 2) % 2))
+if [[ ${MINOR} -eq 0 ]]; then
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~riscv ~x86"
 fi
 
@@ -18,10 +19,7 @@ SLOT="0"
 IUSE="+introspection +mate nls xmp"
 
 COMMON_DEPEND="
-	|| (
-		>=app-accessibility/at-spi2-core-2.46.0:2
-		dev-libs/atk
-	)
+	>=app-accessibility/at-spi2-core-2.46.0:2
 	>=dev-libs/glib-2.58.1:2
 	>=dev-libs/libxml2-2.4.7:2
 	gnome-base/dconf