[gentoo-commits] proj/gentoo-mate:master commit in: dev-python/python-caja/

[Adam Feldman]

commit:     4a7159048a73df90eeaa54dcaa11996c55a6e6cd
Author:     Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 05:48:27 2020 +0000
Commit:     Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 05:55:39 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=4a715904

dev-python/python-caja: Sync with ::gentoo

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>

 ...-1.22.0.ebuild => python-caja-1.24.0-r1.ebuild} | 11 ++++-
 dev-python/python-caja/python-caja-1.24.0.ebuild   | 50 ----------------------
 2 files changed, 9 insertions(+), 52 deletions(-)

diff --git a/dev-python/python-caja/python-caja-1.22.0.ebuild b/dev-python/python-caja/python-caja-1.24.0-r1.ebuild
similarity index 84%
rename from dev-python/python-caja/python-caja-1.22.0.ebuild
rename to dev-python/python-caja/python-caja-1.24.0-r1.ebuild
index 9c1e94b..de4838c 100644
--- a/dev-python/python-caja/python-caja-1.22.0.ebuild
+++ b/dev-python/python-caja/python-caja-1.24.0-r1.ebuild
@@ -4,12 +4,12 @@
 EAPI=6
 
 MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{3_6,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"
@@ -35,6 +35,13 @@ DEPEND="${COMMON_DEPEND}
 	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
 

diff --git a/dev-python/python-caja/python-caja-1.24.0.ebuild b/dev-python/python-caja/python-caja-1.24.0.ebuild
deleted file mode 100644
index 6c6833c..0000000
--- a/dev-python/python-caja/python-caja-1.24.0.ebuild
+++ /dev/null
@@ -1,50 +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{2_7,3_6,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_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
-}