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

(Portage version: 2.2.10_p125/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

3 files changed, 110 insertions, 1 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/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