gentoo resync : 03.07.2021

3 files changed, 2 insertions, 60 deletions

diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
index 073d98f468ad..415f9d6c6760 100644
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@@ -1,4 +1,3 @@
 DIST python-caja-1.24.0.tar.xz 312340 BLAKE2B a860cb1cc983221710d93943ac39b9b77761997fa6a52b32dceeeec381ee86d976c56266013d0370a28e7cb26de3601fec42234b4f91c78e5ac54992035e17ee SHA512 9febf7cae1736e30c80218dcfd3cc05b948823b99945ed67c1839ab5149aa3fe05b090d46c598810f0cde8ba66b83426c4642f6ebdbef6067f6b2fbc0798e816
-EBUILD python-caja-1.24.0-r1.ebuild 1234 BLAKE2B 16afd714bc8a136bee0655b784aacafb6959ffaf5c55a1d60b9f0102122276a9a0dcc93ccb0a2559b75f00d3a33f45e478c450899555f832959e1e36973515c3 SHA512 685d54d332b909b6004d90c43091b74cd380ff46aeae12d4a06a4b6e47ceba48188e31dc273575d77b9bab0ed5c54ddede4fbd0c49174a7bdf9aefe86873ec54
-EBUILD python-caja-1.24.0-r2.ebuild 1232 BLAKE2B 00c68495e3ada0832407a877b5f1b5700510ab8d30f3273b2e3bfdc32c24c3cb6f87e9ae641267c3bbbc2b22bae3ee701be7585ab2b9434910370ba89e5cf8f0 SHA512 a8b180cbedf8835b1752274b64c851748af75f10f4f17abee0f016f5a0bb6ebc4a9f9992f0f0357f817925601815deb0e6114eb1045af5d72358541bc0b84735
+EBUILD python-caja-1.24.0-r2.ebuild 1230 BLAKE2B 66e1184bcdf2b626ab35b4c763b6d970f0bc779a72effa037aae1d42bb7fd4462f789e7dcb5358c3189af022a9a190d2019da9a4116ab2460bdcafa561e5bc60 SHA512 8b4f01abd21bbc1cc5fa41b67368fd74f9909430bdc796470984a6291502240775b1d02a276d1d0f94a0dc5f6f7ab63c434cc824f59af5a6656750b32f8144d1
 MISC metadata.xml 340 BLAKE2B 38e2ec7c21175122fe4d2439ef5b70277caef629d7275055ae44146db7d9def0c2af3f4d190a7a4ac426ff6fe19f9cf5a707abf71dd1fab85ec79e5d81e1f075 SHA512 5892ee1cdadbfd6a93d5bea5a6232ce8351373df7a6037ed605a8d66c3367fb7afb39e1b4b31052a599cb1e7ea155ae818e9f8225c7992a21443131e98621b33
diff --git a/dev-python/python-caja/python-caja-1.24.0-r1.ebuild b/dev-python/python-caja/python-caja-1.24.0-r1.ebuild
deleted file mode 100644
index e4b4809caeb2..000000000000
--- a/dev-python/python-caja/python-caja-1.24.0-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_7,3_8} )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
-fi
-
-DESCRIPTION="Python bindings for the Caja file manager"
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="doc"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2
-	$( python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' )
-	>=mate-base/caja-1.17.1[introspection]
-	>=x11-libs/gtk+-3.22:3
-"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.8:*
-	virtual/pkgconfig:*
-	doc? ( app-text/docbook-xml-dtd:4.1.2 )
-"
-
-src_prepare() {
-	MATE_FORCE_AUTORECONF="true"
-
-	sed -i "s/\$(PACKAGE)/${PF}/g" examples/Makefile.am || die
-	mate_src_prepare
-}
-
-src_install() {
-	mate_src_install
-
-	# Keep the directory for systemwide extensions.
-	keepdir /usr/share/caja-python/extensions/
-
-	# The HTML documentation generation is broken and commented out by upstream.
-	#
-	#if use doc ; then
-	#	insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
-	#	doins -r docs/html/*
-	#fi
-}
diff --git a/dev-python/python-caja/python-caja-1.24.0-r2.ebuild b/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
index eadd87cb2e69..4e4c9419cc77 100644
--- a/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
+++ b/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{3_7,3_8} )
 inherit mate python-single-r1
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="Python bindings for the Caja file manager"