public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "NP Hardass" <np-hardass@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: mate-extra/caja-dropbox/, mate-extra/caja-dropbox/files/
Date: Wed, 10 Feb 2016 22:27:49 +0000 (UTC)	[thread overview]
Message-ID: <1455143214.7798256450e8d30ad51963993972fae488973e93.np-hardass@gentoo> (raw)

commit:     7798256450e8d30ad51963993972fae488973e93
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:26:54 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77982564

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


             reply	other threads:[~2016-02-10 22:27 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-10 22:27 NP Hardass [this message]
  -- strict thread matches above, loose matches on Subject: below --
2016-02-09  2:49 [gentoo-commits] repo/gentoo:master commit in: mate-extra/caja-dropbox/, mate-extra/caja-dropbox/files/ NP Hardass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1455143214.7798256450e8d30ad51963993972fae488973e93.np-hardass@gentoo \
    --to=np-hardass@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox