gentoo Easter resync : 12.04.2020

3 files changed, 101 insertions, 2 deletions

diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
index 8a6fda011e46..d74c972cf03d 100644
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@@ -1,3 +1,5 @@
 DIST caja-dropbox-1.22.1.tar.xz 309600 BLAKE2B a54778bae439a52babd4b9c88ed77ef9cebf01cb5e396e9e2dae0e74b1d55bb6b575d301133593b130af86ecb06f35fd2d11c3b7e3d67a7e741798ad701d788d SHA512 e7e9107c7654fac910762727782f35e3039b45e737341937d225126b2f63f8911f99281097b2488d3b79c0ed09fff4270b4c557166b94a722a2b1cd30fea2a2c
-EBUILD caja-dropbox-1.22.1-r1.ebuild 2064 BLAKE2B 34f838656573a407911b342ab0378c812c69b269b8a13981768349089b0ae40cc0712757d403d15f3d990362ba237f447771c6f54d74b2b4585616c41d75d2a3 SHA512 bf0b68420468ffc0aa9e2759dc02f8bf027f175dc7949d1879e537a3927a83e1b99d7da788a2fead26f6fa50bf1256dfd92d2f02d09c64d04675e73b739fff4b
+DIST caja-dropbox-1.24.0.tar.xz 309024 BLAKE2B 2ae560dcd6e744fe96d9e0fcd876a899c22ad06b8238c2ad9e5394cf80aa8844cd634431dc6bb245396e6d919da857645488214880947e5b90413c254cd4c6a2 SHA512 64d699b4c3957d5996ef69936b4b2746641bc2db4efb7b23535febf5eed3ee767330927aeeda67747c0d72e0f052a2979ae2160ffaaf01e4fd82aff68a5f27bf
+EBUILD caja-dropbox-1.22.1-r1.ebuild 2092 BLAKE2B 6453f8d7cf59f98e9d7ea46ef7f8a168cd9fd798bb1658956faf899f3fb59a22df9288612cf4df7e4658c95c9dca7aff70d0caa36e9c7355f614f6051f6ad59c SHA512 cec0411d6b28577a88e8c46f385f4e7ba5b87ab00bf1b4d1fc007b8b4f89ba1ab08195f18e4af29bca8b78b7c4472676970c092790f3201bcc0b29601b5f00e1
+EBUILD caja-dropbox-1.24.0.ebuild 2121 BLAKE2B a3621483d42f57639d9f74d4edbba6d955e875c065e3f0a0ea7f6a642e043cf5cc609e2d6e79560dbfa18d08b1b8a2879cfc110d3082aa611b4873aeacb24592 SHA512 7721243b421c4dc86da61dc15093c042eab0a1526b69e1038e35b3d7e08788fa7ed3067034476252a15629708ba836facc92cee884d3a1d32a5f0f215eccfb88
 MISC metadata.xml 341 BLAKE2B b530aa03ccd9e514d43bd1014500548a5931fcd30e288bdc9b6c56e9b4fa8dc42dd4a31074efe3b8ecb5f2f55aab3da8e7edd30fa5f3c1645cc088e594da7761 SHA512 3ef87b907e90f2093cece194a580099964f434ec7a1d43e961f0c00adeaeca085fc6e141f25f4ef7da0399e71093b4e2c12f52d0c29cd2aa3768354380ec1c37
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.22.1-r1.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.22.1-r1.ebuild
index 94e0300c6a8b..a5d05ac3aee3 100644
--- a/mate-extra/caja-dropbox/caja-dropbox-1.22.1-r1.ebuild
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.22.1-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Store, Sync and Share Files Online"
-LICENSE="GPL-2"
+LICENSE="CC-BY-ND-3.0 GPL-3+ public-domain"
 SLOT="0"
 
 IUSE="debug"
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.24.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.24.0.ebuild
new file mode 100644
index 000000000000..5d30f1adf582
--- /dev/null
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.24.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{6,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="CC-BY-ND-3.0 GPL-3+ public-domain"
+SLOT="0"
+
+IUSE="debug"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	>=mate-base/caja-1.19.1
+	mate-extra/caja-extensions
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.22:3
+	x11-libs/libXinerama
+	x11-libs/pango
+"
+
+RDEPEND="${COMMON_DEPEND}
+	net-misc/dropbox
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/docutils
+	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
+
+	sed -e 's|\[rst2man\]|\[rst2man\.py\]|' -i configure.ac || die
+
+	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 Dropbox account"
+	elog "before using this plugin. Visit ${HOMEPAGE} for more information."
+	elog
+}