gentoo resync : 28.04.2019

4 files changed, 7 insertions, 116 deletions

diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
index c99ae634275d..90cac3715ca2 100644
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@@ -1,6 +1,3 @@
-AUX caja-dropbox-1.8.0-system-rst2man.patch 463 BLAKE2B 1a182d2374ecdff9b1e720071f4da9b37bc6a082aff3f7282c24dcfc5c04d66f338671d8da784ed34ca885070a09afcfdea94937aa69106e4291e15c3a3e889e SHA512 c3fcfd5b87f7801c77e8935f20d26c2a32ad60a03f068eb891e4bc491296ee1b19763634a02e387d7cf8b4192c30931a6dd9d9bf44f7ce3f8965db62a184c806
-DIST caja-dropbox-1.18.0.tar.xz 323116 BLAKE2B 1aafb5c15fea5935c7e89964ad4237fc2095a2c81921c14058d3472e4b51a4053327e175b144c17f2bdd0a3c106b32c436593b354db375689259501ec18b679b SHA512 0e240f8f6ef17ad3b6bbe21bede6d911b0ef89d8fd5a9faba6b96bc74f06472dcedf68caa94c6fbfb2c05c10c82e1f025b4022657cacc5b80d55ee41999be560
 DIST caja-dropbox-1.22.0.tar.xz 313492 BLAKE2B ce14fc1f466e8da9e5d13b576602a9815bdf32c88b5e55a03f0fe20d17845030b383151194340d20c658e99dda0eff1b51c633e6adf2a1c60f3fcaa69f9e54d9 SHA512 d21f44c0e0f7f28a963fb8611e6992b3ea58ba2ad5910e440d286ab447f2f91e4776496569eb271ed25cb2628e35d2bd80d12bf832bc76011241f6b09903a8b2
-EBUILD caja-dropbox-1.18.0.ebuild 2032 BLAKE2B c2909097067e16d044248a3ba916fe637ac37a7bd61db241ace065c71618af2aef6183c0cc2649d506cc826f8cb77e6dbde9f5da201320e83a8787cf74cdb291 SHA512 993142b1d96008ab8953b6245c5940e4acbc15375125a437467c7e45e4d13dae17107fb6ccbd5e67f9ab15d1bfb3154902b03d260ecf141290dcc23618917e17
-EBUILD caja-dropbox-1.22.0.ebuild 1997 BLAKE2B 3b8498690ac62f7ace41a51eacd146720b73164d8b22f4935839cf3482e271a4135d48515bc11af6a1e8392a9d21544c57cec80123498200a6638591b59c9c74 SHA512 ec6c18110d27844921d485669fc62927e74b47c752d2730a6e53e2b0ad6fbdfe56df1f942092077b7d435b5190c0a355d9ca1cbb97f0d7230d9f74c35650f498
+EBUILD caja-dropbox-1.22.0-r1.ebuild 1979 BLAKE2B f24e1780de82e2b460fb975e64d44e57d5ec991ea52ad9e89c4f41acc23fb28bfd337c83d7b68b4532dccc76accb45b41552783acc465128b6d33a3674bab220 SHA512 504927581945733b0f7940480a21596e5befe85ff720d5555b5cc41df7f419c010683b2ca9e45880b8300da067d197ee19ed7a4dcbc89e8f8619da5a67950c29
 MISC metadata.xml 341 BLAKE2B b530aa03ccd9e514d43bd1014500548a5931fcd30e288bdc9b6c56e9b4fa8dc42dd4a31074efe3b8ecb5f2f55aab3da8e7edd30fa5f3c1645cc088e594da7761 SHA512 3ef87b907e90f2093cece194a580099964f434ec7a1d43e961f0c00adeaeca085fc6e141f25f4ef7da0399e71093b4e2c12f52d0c29cd2aa3768354380ec1c37
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.18.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.18.0.ebuild
deleted file mode 100644
index 279018b76ca4..000000000000
--- a/mate-extra/caja-dropbox/caja-dropbox-1.18.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-MATE_LA_PUNT="yes"
-
-inherit mate python-single-r1 linux-info user
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Store, Sync and Share Files Online"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="debug"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.17.1
-	media-libs/fontconfig:1.0
-	media-libs/freetype:2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libXinerama:0
-	x11-libs/pango:0"
-
-RDEPEND="${COMMON_DEPEND}
-	net-misc/dropbox:0"
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/docutils:0
-	virtual/pkgconfig:*"
-
-CONFIG_CHECK="~INOTIFY_USER"
-
-pkg_setup () {
-	python-single-r1_pkg_setup
-	check_extra_config
-	enewgroup dropbox
-}
-
-MATE_FORCE_AUTORECONF=true
-
-src_prepare() {
-	# Use system dropbox.
-	sed -e "s|~/[.]dropbox-dist|/opt/dropbox|" \
-		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
-			-i caja-dropbox.in || die
-
-	# Use system rst2man.
-	epatch "${FILESDIR}"/${PN}-1.8.0-system-rst2man.patch
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-static \
-		$(use_enable debug)
-}
-
-src_install () {
-	python_fix_shebang caja-dropbox.in
-
-	mate_src_install
-
-	local extensiondir="$(pkg-config --variable=extensiondir libcaja-extension)"
-	[ -z ${extensiondir} ] && die "pkg-config unable to get caja extensions dir"
-
-	# Strip $EPREFIX from $extensiondir as fowners/fperms act on $ED not $D.
-	extensiondir="${extensiondir#${EPREFIX}}"
-	use prefix || fowners root:dropbox "${extensiondir}"/libcaja-dropbox.so
-	fperms o-rwx "${extensiondir}"/libcaja-dropbox.so
-}
-
-pkg_postinst () {
-	mate_pkg_postinst
-
-	elog
-	elog "Add any users who wish to have access to the dropbox caja"
-	elog "plugin to the group 'dropbox'. You need to setup a drobox account"
-	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
-	elog
-}
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.22.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.22.0-r1.ebuild
index 7538fd886c35..2cfc55e854c4 100644
--- a/mate-extra/caja-dropbox/caja-dropbox-1.22.0.ebuild
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.22.0-r1.ebuild
@@ -3,13 +3,13 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{5,6,7} )
 MATE_LA_PUNT="yes"
 
 inherit mate python-single-r1 linux-info user
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 DESCRIPTION="Store, Sync and Share Files Online"
@@ -21,9 +21,8 @@ IUSE="debug"
 COMMON_DEPEND="
 	dev-libs/atk
 	>=dev-libs/glib-2.50:2
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	>=mate-base/caja-1.17.1
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=mate-base/caja-1.19.1
 	media-libs/fontconfig:1.0
 	media-libs/freetype:2
 	x11-libs/cairo
@@ -55,7 +54,7 @@ src_prepare() {
 		-e 's|\(DROPBOXD_PATH = \).*|\1"/opt/dropbox/dropboxd"|' \
 			-i caja-dropbox.in || die
 
-	sed  's|\(rst2man\)|\1.py|' configure.ac || die
+	sed -e 's|\[rst2man\]|\[rst2man\.py\]|' -i configure.ac || die
 
 	mate_src_prepare
 }
@@ -85,7 +84,7 @@ pkg_postinst () {
 
 	elog
 	elog "Add any users who wish to have access to the dropbox caja"
-	elog "plugin to the group 'dropbox'. You need to setup a drobox account"
+	elog "plugin to the group 'dropbox'. You need to setup a Dropbox account"
 	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
 	elog
 }
diff --git a/mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch b/mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch
deleted file mode 100644
index 740418249d8d..000000000000
--- a/mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: nautilus-dropbox-0.7.0/configure.ac
-===================================================================
---- nautilus-dropbox-0.7.0.orig/configure.ac
-+++ nautilus-dropbox-0.7.0/configure.ac
-@@ -31,7 +31,7 @@ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLI
- 
- AC_PATH_PROG([PYTHON], [python])
- 
--AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
-+AC_PATH_PROG([RST2MAN], [rst2man.py], [python rst2man.py])
- AC_SUBST(RST2MAN)
- 
- # define module checking macro