gentoo resync : 11.07.2019

3 files changed, 2 insertions, 50 deletions

diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
index 9a46b049b258..ea27f8168b26 100644
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@@ -1,4 +1,3 @@
 DIST python-caja-1.22.0.tar.xz 288324 BLAKE2B 11649dc0d201e9bc0063ad8845ccf0ac7b474e87edce1938311723687253c73058f2411170897acf80e4166169ad2675afff171c31808b22269dcdf857954fa1 SHA512 36ac6feec8dbff345d5657d0bc9eceed7a58648c104ce309f20aaff18cedd8822fb8bc0c13662796d15391af72285fa3ae4185043cce9e471f22a2868f37cc2c
-EBUILD python-caja-1.22.0-r1.ebuild 1001 BLAKE2B a0a77984d74af9c1ad0f80c95b98d474c0305ef0dd5a520029ca4e2e5b09685fe0cbe20846a1dae01c0ab5c826ce4b4ab23cb0936b4199e1974c1daa43fde789 SHA512 84fd9fed1a8eea5913a78d586f3f815c00bde5b2bb671fa86a2b443b4993092288af72a82f7af22549a230b44028ab132f67f0be08ebee996b90796c08015629
-EBUILD python-caja-1.22.0.ebuild 999 BLAKE2B 3cc2daeef5a15ba4ff482fa0fa5de50aaf797687bfb49efcdbbc15d46031f085b2c0efb726f2a6e6489fcce2a3547eb76885ef0baad40f223fec72cf0d66b90e SHA512 cc97e381f50de131641571bd7d21deee8ebf6422fc659c5b271fbf3c6ec3723d976cb0c10745fa86d21272bec1f0a7476274add04276d875eb0f8ff63a107514
+EBUILD python-caja-1.22.0-r1.ebuild 999 BLAKE2B caa4ee4dd9219f17c0d0f3436d78ed62cdf0e077a991e9121b2fb3b184f47a6f4030d92cb94bf283901f8554d9e301858952724fb4b0cc1a0d4f47bde84d0e30 SHA512 be23cd7bf71fd21e8003fdeb27d12b39677032bbd858619b8aac8a1a2227b022c6f1577f007733058f3cbcfad1e456133e925fd4151e379dba9e47499a3cd91b
 MISC metadata.xml 340 BLAKE2B 38e2ec7c21175122fe4d2439ef5b70277caef629d7275055ae44146db7d9def0c2af3f4d190a7a4ac426ff6fe19f9cf5a707abf71dd1fab85ec79e5d81e1f075 SHA512 5892ee1cdadbfd6a93d5bea5a6232ce8351373df7a6037ed605a8d66c3367fb7afb39e1b4b31052a599cb1e7ea155ae818e9f8225c7992a21443131e98621b33
diff --git a/dev-python/python-caja/python-caja-1.22.0-r1.ebuild b/dev-python/python-caja/python-caja-1.22.0-r1.ebuild
index 2b856fe5ad92..079f91676488 100644
--- a/dev-python/python-caja/python-caja-1.22.0-r1.ebuild
+++ b/dev-python/python-caja/python-caja-1.22.0-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python2_7 )
 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"
diff --git a/dev-python/python-caja/python-caja-1.22.0.ebuild b/dev-python/python-caja/python-caja-1.22.0.ebuild
deleted file mode 100644
index 957b39792592..000000000000
--- a/dev-python/python-caja/python-caja-1.22.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-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"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2
-	dev-python/pygobject:3[${PYTHON_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
-	virtual/pkgconfig:*
-	doc? ( app-text/docbook-xml-dtd:4.1.2 )"
-
-src_install() {
-	mate_src_install
-
-	# Keep the directory for systemwide extensions.
-	keepdir /usr/share/python-caja/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
-}