[gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/caja-dropbox/files/, mate-extra/caja-dropbox/

[gentoo-commits] proj/gentoo-mate:master commit in: mate-extra/caja-dropbox/files/, mate-extra/caja-dropbox/

[NP Hardass]

commit:     e91bf9c96e4a28d385858a2d8e8d2b89ada9ea65
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 22:22:31 2016 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 22:25:40 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=e91bf9c9

mate-extra/caja-dropbox: Fix epatch call. Thanks to joost_op.

Package-Manager: portage-2.2.26

 mate-extra/caja-dropbox/caja-dropbox-1.10.1.ebuild          |  2 +-
 .../files/caja-dropbox-0.7.0-system-rst2man.patch           | 13 -------------
 .../files/caja-dropbox-1.10.0-system-rst2man.patch          | 13 -------------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/mate-extra/caja-dropbox/caja-dropbox-1.10.1.ebuild b/mate-extra/caja-dropbox/caja-dropbox-1.10.1.ebuild
index fa6fda8..d58a5c7 100644
--- a/mate-extra/caja-dropbox/caja-dropbox-1.10.1.ebuild
+++ b/mate-extra/caja-dropbox/caja-dropbox-1.10.1.ebuild
@@ -58,7 +58,7 @@ src_prepare() {
 			-i caja-dropbox.in || die
 
 	# Use system rst2man.
-	epatch "${FILESDIR}"/${P}-system-rst2man.patch
+	epatch "${FILESDIR}"/${PN}-1.8.0-system-rst2man.patch
 
 	AT_NOELIBTOOLIZE=yes eautoreconf
 }

diff --git a/mate-extra/caja-dropbox/files/caja-dropbox-0.7.0-system-rst2man.patch b/mate-extra/caja-dropbox/files/caja-dropbox-0.7.0-system-rst2man.patch
deleted file mode 100644
index ea0053b..0000000
--- a/mate-extra/caja-dropbox/files/caja-dropbox-0.7.0-system-rst2man.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: nautilus-dropbox-0.7.0/configure.in
-===================================================================
---- nautilus-dropbox-0.7.0.orig/configure.in
-+++ nautilus-dropbox-0.7.0/configure.in
-@@ -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

diff --git a/mate-extra/caja-dropbox/files/caja-dropbox-1.10.0-system-rst2man.patch b/mate-extra/caja-dropbox/files/caja-dropbox-1.10.0-system-rst2man.patch
deleted file mode 100644
index 7404182..0000000
--- a/mate-extra/caja-dropbox/files/caja-dropbox-1.10.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