gentoo resync : 28.04.2019

3 files changed, 8 insertions, 100 deletions

diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index 69af8022deb5..42cdc1cca3f3 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -1,5 +1,3 @@
-DIST caja-1.18.5.tar.xz 3528228 BLAKE2B c39d7ef97de44c3f57fe622f71291e607cb17b10bebb20e19885413d67d0fccc6e5733739c836b0babbf45c51a0026f1559e7c1ed9656be0ee6b960363474773 SHA512 44bc85e33937f1816cddd78bf72db38b4b43e549cb2680b5d73d252699e9b5d1aace27271729ae310cb9d4f892474164140782713a6fa9f408c78c1b4f0edd73
 DIST caja-1.22.0.tar.xz 3562792 BLAKE2B 2f2a1d909e5e5a333228326b34daf8b5f461c836d2b132a78d53f93b14ab9ade5f39159adcb2ddb729838eca3eecdac1c0d3b98a875769bce942cd38cf88b664 SHA512 ca97a1e81cc7b061bb331d7a4574c76831dbff50bdc9ba0a162675def7278cf5dadb37aacb0e1e37a0ac2cf60df73f98353aaa36fa0e69a0097017eed5d325b6
-EBUILD caja-1.18.5.ebuild 2070 BLAKE2B 0a53984070a8d2f3f67b695301cc71689966bb8d0f0a5d4e31f07d48a6fbdad47b73077adfb8fef3678a06c3b27d41e5e1db0ee68bf8e9127a480564fa84b057 SHA512 587350b7071d903e33e4d23989d48c0c870b103b9d30ef4f13335c83eac9960978470aee18cc2b2b3ab2fa651fd1d232458335a5faa3b89524eedd6aa3e834d8
-EBUILD caja-1.22.0.ebuild 2043 BLAKE2B 552fe02db24fc8299e542e7c302b4fc717d82a15377169e8b9df62a9b4fa3f7350bf716f8e2aa64957a2549d0025caaae014f6184e8815416f7b70667e52f8f3 SHA512 98c523c449caf0901e7b9b5d4b851531fc420943eec4352b42925cc0ba9634a722a6e30250bdfd11f1c7abde63fd25f2c6e33e7fbafb96d373e37fbf1f86d772
+EBUILD caja-1.22.0.ebuild 2020 BLAKE2B 9be3ce9b680dee4987806c2fbc739f7d4eb3f96c08c136553f144ed34a672a86344698fc55fc3f2cbc55b740fc84e1c6efbe6c432e9bfec6f5f22a183c3a1503 SHA512 f4e6ee1163f4de21623fc8de82d26a6ba19bda87ed5e93034358833f6812928c09db671dc8c8d0f2c400145cd08725bae4e705708ecc75e135b61c17aa362086
 MISC metadata.xml 621 BLAKE2B a717b23dad86bcba48b97bec310d1dfb161a3c9ab051e84408f08409c45b1fad5fed38af6af2f75a54e3c29cf635ce5843d54af60a3ad22ed74fbafa0d8fab59 SHA512 95daee371a545e58bcf73daad3261589442121c6f6216d45fcb03e02e8e0d979d45527aa23d4252a60c25b6e9ff2b21d17f504724aaeae3ff97e745e23d963ca
diff --git a/mate-base/caja/caja-1.18.5.ebuild b/mate-base/caja/caja-1.18.5.ebuild
deleted file mode 100644
index 0bef8b734e92..000000000000
--- a/mate-base/caja/caja-1.18.5.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 FDL-1.1"
-SLOT="0"
-
-IUSE="+introspection +mate packagekit xmp"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.4.7:2
-	gnome-base/dconf:0
-	>=gnome-base/gvfs-1.10.1:0[udisks]
-	>=mate-base/mate-desktop-1.17.0:0
-	>=media-libs/libexif-0.6.14:0
-	virtual/libintl:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0:3[introspection?]
-	>=x11-libs/libnotify-0.7.0:0
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXft:0
-	x11-libs/libXrender:0
-	>=x11-libs/pango-1.1.2:0
-	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"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5:0=
-	dev-util/gdbus-codegen:0
-	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.0.ebuild b/mate-base/caja/caja-1.22.0.ebuild
index e6f942738401..606cd126e0bb 100644
--- a/mate-base/caja/caja-1.22.0.ebuild
+++ b/mate-base/caja/caja-1.22.0.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"
@@ -17,7 +17,8 @@ SLOT="0"
 
 IUSE="+introspection +mate packagekit xmp"
 
-COMMON_DEPEND="dev-libs/atk
+RDEPEND="
+	dev-libs/atk
 	>=dev-libs/glib-2.50:2
 	>=dev-libs/libxml2-2.4.7:2
 	gnome-base/dconf
@@ -41,16 +42,15 @@ COMMON_DEPEND="dev-libs/atk
 	xmp? ( >=media-libs/exempi-1.99.5:2 )
 	!!mate-base/mate-file-manager"
 
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
+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:*"
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"