gentoo resync : 30.09.2020

3 files changed, 146 insertions, 0 deletions

diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index 5c7b9a938ba6..cbf88241f568 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -1,3 +1,5 @@
+AUX caja-1.24.0-fix-selinux-automagic-dep.patch 1553 BLAKE2B 9450ed07579baa33eccd772383c70fd30bd2e082baca0ad535c16b656401732346809f8cb5d65c75a114ce391e941aa0f89b7d503e262e0b927c0154cede3435 SHA512 e287f8a64600a4fd02011b0a9c799d6532811c53856fda5e69342518ddfcab89562b172dc268b4859274554c39675c8f5b038a402c0a80b6fe1e3357b84e1a7a
 DIST caja-1.24.0.tar.xz 5221716 BLAKE2B 66d628ac0f50e2c388935420e29dfe15a8f5f127fd7b39e92ebbd67b6c929cda1a2dec1f510fb89890602adaef6a741f0ee3e15d27ab9741c5223c7966b3b908 SHA512 a68b23876cfa1171d5b1c75e4998c6b15f0ceebdc4fcaabb8d362e32e35b915b1a91a38648532ac8acc162dac50aeb4d07eff417ce2db7a8c50d68bd38a0b548
+EBUILD caja-1.24.0-r2.ebuild 2191 BLAKE2B d60839a2bd696df69a595e286e46999d57fc58dd24934de6ba06d481143cef89c715d37512982eebf04c0f3ed05557aad360b87a06c34488563c2eea023b485f SHA512 3d37c3323d90ff5b1a5b2cbfe9674b2caea231d8cae2344750f6e4de788c0d238f145854b961bb2bb3c60eb1fc30fe31491677dee20cde66a4a9697e8dabcd65
 EBUILD caja-1.24.0.ebuild 2050 BLAKE2B 188019284e9b7a7486caadb8560c71afe08c3e02fb702abc0b0451d895ed31faa397ed3407f1e4dec5baa274730b014ffa69336a34287ca293ed968635eb02b5 SHA512 ed270d30ca7118f5acfcc6e02da175ab136d89aaee0a82c008107f062cf31dc2b894b33b337cf6d98de414e5fe2fa4c819c02c36ab856114023c7cb555044309
 MISC metadata.xml 600 BLAKE2B 51da0f96a4adaedcea06fcb9e63f58cee8cbe7d479d8195af4821f1be66d07ee62361d225126943b24da10235bf6a06946d215a4e817a38aff5e07d29d6449db SHA512 639000dfb46bb04d2d5df50a60ab60259aa59e8cc0ad9f29c62ec2cbfa06b9556b4f7cada01588179a453a69645f2e44530469953ef5e423a428a9d6a0cceb9a
diff --git a/mate-base/caja/caja-1.24.0-r2.ebuild b/mate-base/caja/caja-1.24.0-r2.ebuild
new file mode 100644
index 000000000000..e77b01f49dd3
--- /dev/null
+++ b/mate-base/caja/caja-1.24.0-r2.ebuild
@@ -0,0 +1,98 @@
+# 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 selinux 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 )
+	selinux? ( sys-libs/libselinux )
+	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"
+
+PATCHES=( "${FILESDIR}/${PN}-1.24.0-fix-selinux-automagic-dep.patch" )
+
+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 selinux) \
+		$(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/files/caja-1.24.0-fix-selinux-automagic-dep.patch b/mate-base/caja/files/caja-1.24.0-fix-selinux-automagic-dep.patch
new file mode 100644
index 000000000000..ffc0a2903d16
--- /dev/null
+++ b/mate-base/caja/files/caja-1.24.0-fix-selinux-automagic-dep.patch
@@ -0,0 +1,46 @@
+diff --git a/configure.ac b/configure.ac
+index 052b4d0..12c818d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -169,17 +169,24 @@ dnl ****************************
+ dnl *** Check for libselinux ***
+ dnl ****************************
+ 
++AC_ARG_ENABLE(selinux,
++    [AC_HELP_STRING([--enable-selinux],
++                    [build with selinux support])])
++AM_CONDITIONAL([ENABLE_SELINUX],[test "x$enable_selinux" = "xyes"])
++
+ SELINUX_LIBS=
+ msg_selinux=no
+-AC_CHECK_LIB(selinux, is_selinux_enabled,
+-   [AC_CHECK_HEADERS(selinux/selinux.h,
+-     [AC_SEARCH_LIBS(selinux_raw_to_trans_context, selinux,
+-       [AC_DEFINE(HAVE_SELINUX, 1, [Define to 1 if libselinux is available])
+-        SELINUX_LIBS="-lselinux"
+-        msg_selinux=yes])
+-     ])
+-   ])
+-AC_SUBST(SELINUX_LIBS)
++if test "x$enable_selinux" != "xno"; then
++    AC_CHECK_LIB(selinux, is_selinux_enabled,
++       [AC_CHECK_HEADERS(selinux/selinux.h,
++         [AC_SEARCH_LIBS(selinux_raw_to_trans_context, selinux,
++           [AC_DEFINE(HAVE_SELINUX, 1, [Define to 1 if libselinux is available])
++            SELINUX_LIBS="-lselinux"
++            msg_selinux=yes])
++         ])
++       ])
++    AC_SUBST(SELINUX_LIBS)
++fi
+ 
+ 
+ AC_ARG_ENABLE(empty_view,
+@@ -353,6 +360,7 @@ caja-$VERSION:
+     warning flags:                ${WARNING_CFLAGS}
+     xmp support:                  $msg_xmp
+     PackageKit support:           $msg_packagekit
++    SELinux support:              $msg_selinux
+     Self check:                   $msg_self_check
+ 
+     caja-extension documentation: ${enable_gtk_doc}