Version bump to 1.8.0; fixes bug #510464, reported by nihil39.

Package-Manager: portage-2.2.10_p125/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

4 files changed, 122 insertions, 16 deletions

diff --git a/mate-extra/caja-dropbox/ChangeLog b/mate-extra/caja-dropbox/ChangeLog
index 53ac652ab068..1f210328ae9d 100644
--- a/mate-extra/caja-dropbox/ChangeLog
+++ b/mate-extra/caja-dropbox/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mate-extra/caja-dropbox
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mate-extra/caja-dropbox/ChangeLog,v 1.2 2014/05/04 14:54:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/caja-dropbox/ChangeLog,v 1.3 2014/07/22 19:04:55 tomwij Exp $
+
+*caja-dropbox-1.8.0 (22 Jul 2014)
+
+  22 Jul 2014; Tom Wijsman <TomWij@gentoo.org> +caja-dropbox-1.8.0.ebuild,
+  +files/caja-dropbox-1.8.0-system-rst2man.patch:
+  Version bump to 1.8.0; fixes bug #510464, reported by nihil39.
 
   04 May 2014; Agostino Sarubbo <ago@gentoo.org> caja-dropbox-0.7.1.ebuild:
   Stable for amd64, wrt bug #509268
diff --git a/mate-extra/caja-dropbox/Manifest b/mate-extra/caja-dropbox/Manifest
index ef079d0f5e9c..9dc216ce7fd1 100644
--- a/mate-extra/caja-dropbox/Manifest
+++ b/mate-extra/caja-dropbox/Manifest
@@ -2,24 +2,21 @@
 Hash: SHA256
 
 AUX caja-dropbox-0.7.0-system-rst2man.patch 463 SHA256 f8c6add8d61b73ac8083a79177705a172005a16f1f0738f37e09ce5daddc3702 SHA512 5a34c3e6ff51a1a14eac11e0619a81afeec05979944d128ed37076cadb9a79edd839918ee289c409c537be73a913ee3bc58f19cc2227cda8762328e2f0fbd7eb WHIRLPOOL 75f33c78b99b923da61a2dc926e0c4a62973cc61e36e7c5bd0a52fa840757b876fd9badf158ba1e78a42094023f76eaedf0fa72ba6795acd90bc3dd30683d9e6
+AUX caja-dropbox-1.8.0-system-rst2man.patch 463 SHA256 6e2260a6bbf2f25911b23735f155a0a7e0da38bc0433bd7054e2f0ad9122380f SHA512 c3fcfd5b87f7801c77e8935f20d26c2a32ad60a03f068eb891e4bc491296ee1b19763634a02e387d7cf8b4192c30931a6dd9d9bf44f7ce3f8965db62a184c806 WHIRLPOOL b26c60b7bd75a08c5a737dbcc58f9e38b8aea5079f0be3e572e07198773adce4109adedf74bab8129fc18bedb0759153ae5bf2abd60b457b8f3ff0cc0a44d6df
 DIST caja-dropbox-0.7.1.tar.xz 149108 SHA256 7989ce7d71c746104242c3d91d20788938f7bda532b7077193fca6be1cf69760 SHA512 cfa1413b2f433e097dc650630de1b434243b9675de5c3a37186f404720466a81a1e8c86fd813b6e7ad538c0d94f58f8e36fa26f0bcd8e124ad091a705d331443 WHIRLPOOL f06c151b9dcee172f50abbd79a2d16818c4825587aeff33728ddd86bda248afeed143785a39dddeef4b4615aab61ac029b9e48f0ff8a16a04d92003abc4a9bca
+DIST caja-dropbox-1.8.0.tar.xz 310592 SHA256 bb26151cad68e910979af6dd8b323434462a2457998ad67529660135c0caa513 SHA512 33c0804ba756ec50b531e4992b74577848f52fef60b8c69b96f307a2b8a57fd42ff951d6d3fdd55a6b1e260c4f46d0a26f90f730a88dc45a66e2d78888492fbc WHIRLPOOL 3b200e6a1b5e6f9926566962c48b9585fa0f9cc1ccc8ee89e45489d87c41cbf50a2b1bd62036140ba7492edf5a2812b918c4c4596b17c4674e0821a72d29550f
 EBUILD caja-dropbox-0.7.1.ebuild 2225 SHA256 587ce1b97886b6a8e94f90dc38858626b022f0d20aabeb036ef6d95b1ffa00a1 SHA512 a280ef868081bba51f0230a28d759fcd71baad5a403e1d18d66e07a8028a991aabca2d5ab43b655a3c45e1e671d36444b4768cced57b91805480593447ddbd08 WHIRLPOOL c0996de9bcfa701f3658bc71c095097da8c3bc103e5a637fb5906dbf3ecc0d88d8b2ea1c30e505f36dadc9acab51dc4e05ef0388a4a7d841a17636320d3e9e00
-MISC ChangeLog 639 SHA256 d6e1d195ca810315fc2473219afca8beced7fedfe70d7747a613a3c16a544f94 SHA512 a187868cec671c32cfa1bc162ac792f8b226425abb37b58dd86a5bbcf7a2ed010dc16af16552f3cc0c4448e0affe1fb0e3fe9ec8ecee2f3a8c00d0b05fe3bbc5 WHIRLPOOL de3f7b510a83546ddf5582fe2a476a8eb8904d0d6b2caa8266cef6f505314f6eb258c1ffc240e2cee330797bd9a872bf38ac63c1d01b27e74724b0acc4478c54
+EBUILD caja-dropbox-1.8.0.ebuild 2262 SHA256 4921cf603f770904484c3574d6178b62c23b16cea41810c387c1db0714bce3a0 SHA512 ea0d531cf6fbf5a5034812be2ddc1e84e8a4fdd364c8707e0fb1425aee29872e633765e478d7e9231f228febcdb381ae86ed7edb3aa448c485f6f759a40d6d58 WHIRLPOOL 077e610e17cceb09699d6a529bad2190485f208cb42fcf1a26295977876299e586d84f24a16cd74222e894d2ea6181f8bfeb76ff6c8ef0d96ee189a8e9e44272
+MISC ChangeLog 868 SHA256 5ee0ebb787f68726183ffec0667c6b78ec3fdb387910a185a4c9faefa1d0adda SHA512 dac47e9027c4ab2b9160a0993fbd9c559ce54b0aa3a3b34ea9c1d49411976bffab4dc5e36ba0c2eb993ffd3391605e6f4c549af683c3f73fc0d378e1fd32598c WHIRLPOOL 5854ba2888ff18e8b51c13d051ae66618c61241cbdae2430c051f68fdbbe3f73c39cc8aacbcb164ec4d96f1803a65f479b48fe86b0a633fcfb8ee361755d7d33
 MISC metadata.xml 230 SHA256 c188c403bd41d5dfe348e4809c2350a5a2fca98d46f8adae83a36d89af439ecd SHA512 17d13ca08cb96bf73a2c821019fd00677f17579c54b5543c1653c9f6106d7c52ad14b4a7ff72000ab7f59b7031e4471756b96864ca2fedef2e3a047fa0eb71eb WHIRLPOOL 39073c2fd817e3c41775408adf7271656a744ccd967e74770c673506c8c78cd11356b0cd28eeb16fe7350e8708141ad25037c45066263f2ed1b85d5270743986
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTZlSYAAoJELp701BxlEWf0GcQAJVRfbh9hWQkEp4eTqnPQEBP
-y+RtjK/CtlSUxMJOYLmiqyGHkt0MhiMyMsdZ2wgdioEHNDsn4zjnNQSboYymgGRo
-Z3osYSnKoyRNuFCVw6zziqPFq9rjt9K2RTTt8Gbk3nFlS5TrmRocyL2Xw8Ha1NFY
-5H0gfO/BvGo5vtXe8ypDr//BoLppS6I5xJsIaEc2Jkn9sA9iOvmpI3/ayHrwkAw3
-skw2nKCgGfj6v58zxliZek2jrfsQ0NPzNoiIU6Rutgrlup2tJQnU/VodftB0Naip
-QZUuFoenlCgY36PzKlx6yc9aEImhTMFiZCaHryzrzdtx5HVvmMbn3r2/vUiYyVcm
-L83QPJBpqVvfOuitewPd6GxzWS8VXuZWoBofKF/yGjM8CCblM91DeyMPHTC3KYFq
-at7oCy07LBwmyHjvr+fcD1FePgLOVcojeLEBTiH32GbaQCurZJfCSAAuPuyzKjWJ
-homG795egv9vDEvZrSxxE8tgbPXcHISH24txNPxLwenGIDoHwpTCXC19tdbzj89T
-bXNwrWoC9vVefkDjxNx6T7M8hqmZQHMcgOOWqSfd5Em3GU70hGT4Io2Uhvvd9Olq
-YSRJetBAuOc7hblQBjcZlqsGuwp3uBv/SsUze1dzIt/gsMIuysSKowWCxzn5zBMJ
-NFMjn76hWVXUKFwYvISw
-=Yc9z
+iQEcBAEBCAAGBQJTzrXbAAoJEJWyH81tNOV9LmkH/10vy2/PWwIUp2JcGY92vcBa
+J8s49kpFDeayanUV4hUxeVUhpMy5jeL72OjUbenvRS/rmKIhPYxyk3PfmyqPEMsV
+cTo1dtkvAA2YJhJ1R+N/uQUB+IdFviTnRX5udOYLXsSqiC2BH84h6r+VA3Z9J2Mk
+yxIptmvLQrsDBFIp6ZdKMwt+znj1RuSvBeNTjjE+aEXY5VMVFXOhrIM4HNLVACGg
+RBhVuLqYbEMAaFu7QXeYveVzbnGTe+1+L7vjpBo/0TlTE3D01A6We2QRGIlC9X+a
+XWAd5YZMCilUOhTs98wArmDk0pct5Bbvt3j3L+24ljCfwxoPXFVC/ZPdbygt0DI=
+=DOfk
 -----END PGP SIGNATURE-----
diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild
new file mode 100644
index 000000000000..bf39700fdaa2
--- /dev/null
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mate-extra/caja-dropbox/caja-dropbox-1.8.0.ebuild,v 1.1 2014/07/22 19:04:55 tomwij Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_{6,7} )
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 python-single-r1 linux-info user versionator
+
+MATE_BRANCH="1.8"
+
+SRC_URI="http://pub.mate-desktop.org/releases/${MATE_BRANCH}/${P}.tar.xz"
+DESCRIPTION="Store, Sync and Share Files Online"
+HOMEPAGE="http://www.dropbox.com/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/atk:0
+	>=dev-libs/glib-2.14:2
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	|| ( >=mate-base/caja-1.8:0 >=mate-base/mate-file-manager-1.6:0 )
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	net-misc/dropbox:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/libXinerama:0
+	x11-libs/pango:0"
+
+DEPEND="${RDEPEND}
+	dev-python/docutils:0
+	virtual/pkgconfig:*"
+
+G2CONF="${G2CONF} $(use_enable debug) --disable-static"
+
+CONFIG_CHECK="~INOTIFY_USER"
+
+pkg_setup () {
+	python-single-r1_pkg_setup
+	check_extra_config
+	enewgroup dropbox
+}
+
+src_prepare() {
+	gnome2_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}"/${P}-system-rst2man.patch
+
+	AT_NOELIBTOOLIZE=yes eautoreconf
+}
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_install () {
+	python_fix_shebang caja-dropbox.in
+
+	gnome2_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 () {
+	gnome2_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/files/caja-dropbox-1.8.0-system-rst2man.patch b/mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch
new file mode 100644
index 000000000000..740418249d8d
--- /dev/null
+++ b/mate-extra/caja-dropbox/files/caja-dropbox-1.8.0-system-rst2man.patch
@@ -0,0 +1,13 @@
+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