dev-python/python-caja: Drop old, sync with Gentoo

Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman <NP-Hardass@gentoo.org>

7 files changed, 48 insertions, 92 deletions

diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
index b504ae7..14a9a0b 100644
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@@ -1,4 +1,2 @@
-DIST python-caja-1.12.0.tar.xz 265720 BLAKE2B 6d1d1e9609b24ee0632eda68730aa2ae2aacffb3e4762a9b5269cd76fefde40dfa3cfc20857567a2d2470372695b0356e4329a11ffd159e349231f109d5077e0 SHA512 fbec1a7f5e560cda2b3bba41dcd93c0484f2b7b7527577a2b2114c84019203df92c136fecbbe6c889785c610035a582f1912ad7da9bb1258ada661b56edf4be7
-DIST python-caja-1.14.0.tar.xz 279432 BLAKE2B 15bbf397373125fba85c5ec0ee694be500cab1b4252a73666259bde7984318baa1cc5f760a492f4b930305c99c040f5e3c12b7dc77d82889f5dcea0d4bea3d07 SHA512 835d9c1df112746fb3ecfe2e661e0c36814f3e2b21c763450354ce9bc0119d055b6773efa64d252ea8a618ec6c36e2d9cbfca698ffa6652cad0b94a499167497
-DIST python-caja-1.16.0.tar.xz 280956 BLAKE2B 0850c7aaa4e61a620340bb6f2d8518c423341d2918491519cd7105097c8a226750db6a499eb601b972972e1d0122158a011ee1efb9128f8a75d8efcd31ba9d6f SHA512 ce82fbd6d1127df33153920fbf703f77be2e1dabeb6ba33275fb1b1ba5d8aabc96222cf42280844237f0e182b0eccf764fd8ea33a8de96e844eeb0d5ef0cd5de
-DIST python-caja-1.18.1.tar.xz 284020 BLAKE2B 9513c89450c07330471b2ee9a9d9644eef33858060e66054ab00fb16d3d63292e14704c9f80d7cd5928fcf108bb1cf8c5afd7eb8713814554574cda39b0a8960 SHA512 5907f0769e43b592228aa66f9b51e227a414051975066c16734397afa05c1235d442c625bb00a51e9356768fc3b9f46cfca51e9563e4368b39a8e58a9e514e7d
+DIST python-caja-1.22.0.tar.xz 288324 BLAKE2B 11649dc0d201e9bc0063ad8845ccf0ac7b474e87edce1938311723687253c73058f2411170897acf80e4166169ad2675afff171c31808b22269dcdf857954fa1 SHA512 36ac6feec8dbff345d5657d0bc9eceed7a58648c104ce309f20aaff18cedd8822fb8bc0c13662796d15391af72285fa3ae4185043cce9e471f22a2868f37cc2c
+DIST python-caja-1.24.0.tar.xz 312340 BLAKE2B a860cb1cc983221710d93943ac39b9b77761997fa6a52b32dceeeec381ee86d976c56266013d0370a28e7cb26de3601fec42234b4f91c78e5ac54992035e17ee SHA512 9febf7cae1736e30c80218dcfd3cc05b948823b99945ed67c1839ab5149aa3fe05b090d46c598810f0cde8ba66b83426c4642f6ebdbef6067f6b2fbc0798e816
diff --git a/dev-python/python-caja/metadata.xml b/dev-python/python-caja/metadata.xml
index 9870e15..2d0b288 100644
--- a/dev-python/python-caja/metadata.xml
+++ b/dev-python/python-caja/metadata.xml
@@ -5,9 +5,6 @@
 		<email>mate@gentoo.org</email>
 		<name>Gentoo MATE Desktop</name>
 	</maintainer>
-	<use>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">mate-desktop/python-caja</remote-id>
 	</upstream>
diff --git a/dev-python/python-caja/python-caja-1.12.0-r1.ebuild b/dev-python/python-caja/python-caja-1.12.0-r1.ebuild
deleted file mode 100644
index 283d30e..0000000
--- a/dev-python/python-caja/python-caja-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# 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 gtk3"
-
-RDEPEND="dev-libs/glib:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.8[gtk3(-)=,introspection]
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )
-	${PYTHON_DEPS}"
-
-DEPEND="${RDEPEND}
-	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
-}
diff --git a/dev-python/python-caja/python-caja-1.18.1.ebuild b/dev-python/python-caja/python-caja-1.22.0-r1.ebuild
index 3926c9e..595d798 100644
--- a/dev-python/python-caja/python-caja-1.18.1.ebuild
+++ b/dev-python/python-caja/python-caja-1.22.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,20 +9,20 @@ 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"
 LICENSE="GPL-2"
 SLOT="0"
-
 IUSE="doc"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/glib:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=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"
+	>=x11-libs/gtk+-3.22:3"
 
 RDEPEND="${COMMON_DEPEND}"
 
@@ -36,7 +36,7 @@ src_install() {
 	mate_src_install
 
 	# Keep the directory for systemwide extensions.
-	keepdir /usr/share/python-caja/extensions/
+	keepdir /usr/share/caja-python/extensions/
 
 	# The HTML documentation generation is broken and commented out by upstream.
 	#
diff --git a/dev-python/python-caja/python-caja-1.14.0.ebuild b/dev-python/python-caja/python-caja-1.22.0.ebuild
index b544804..9c1e94b 100644
--- a/dev-python/python-caja/python-caja-1.14.0.ebuild
+++ b/dev-python/python-caja/python-caja-1.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,31 +13,33 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Python bindings for the Caja file manager"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-
-IUSE="doc gtk3"
+IUSE="doc"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/glib:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.8[gtk3(-)=,introspection]
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )"
+	>=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 )"
+	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/
+	keepdir /usr/share/caja-python/extensions/
 
 	# The HTML documentation generation is broken and commented out by upstream.
 	#
diff --git a/dev-python/python-caja/python-caja-1.16.0.ebuild b/dev-python/python-caja/python-caja-1.24.0.ebuild
index b544804..6c6833c 100644
--- a/dev-python/python-caja/python-caja-1.16.0.ebuild
+++ b/dev-python/python-caja/python-caja-1.24.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
 
 inherit mate python-single-r1
 
@@ -13,31 +13,33 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Python bindings for the Caja file manager"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-
-IUSE="doc gtk3"
+IUSE="doc"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/glib:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.8[gtk3(-)=,introspection]
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3 )"
+	>=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 )"
+	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/
+	keepdir /usr/share/caja-python/extensions/
 
 	# The HTML documentation generation is broken and commented out by upstream.
 	#
diff --git a/dev-python/python-caja/python-caja-9999.ebuild b/dev-python/python-caja/python-caja-9999.ebuild
index f30cc7c..39ee025 100644
--- a/dev-python/python-caja/python-caja-9999.ebuild
+++ b/dev-python/python-caja/python-caja-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit mate python-single-r1
 
@@ -13,30 +13,33 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Python bindings for the Caja file manager"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-
 IUSE="doc"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 COMMON_DEPEND="${PYTHON_DEPS}
-	dev-libs/glib:2
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=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"
+	>=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 )"
+	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/
+	keepdir /usr/share/caja-python/extensions/
 
 	# The HTML documentation generation is broken and commented out by upstream.
 	#