[gentoo-commits] gentoo-x86 commit in mail-mta/exim: ChangeLog exim-4.76.ebuild

["Fabian Groffen (grobian)" <grobian@gentoo.org>]

grobian     11/05/12 18:15:50

  Modified:             ChangeLog exim-4.76.ebuild
  Log:
  Fix dsn patch to apply, bug #366835
  
  (Portage version: 2.2.01.18252-prefix/cvs/Darwin powerpc)

Revision  Changes    Path
1.196                mail-mta/exim/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/ChangeLog?rev=1.196&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/ChangeLog?rev=1.196&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/ChangeLog?r1=1.195&r2=1.196

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- ChangeLog	12 May 2011 17:22:19 -0000	1.195
+++ ChangeLog	12 May 2011 18:15:50 -0000	1.196
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/exim
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.195 2011/05/12 17:22:19 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/ChangeLog,v 1.196 2011/05/12 18:15:50 grobian Exp $
+
+  12 May 2011; Fabian Groffen <grobian@gentoo.org> exim-4.76.ebuild,
+  +files/exim-4.76-dsn.patch:
+  Fix dsn patch to apply, bug #366835
 
   12 May 2011; Fabian Groffen <grobian@gentoo.org> exim-4.76.ebuild:
   Allow for msmtp with optional mta support, by Christian Aistleitner, bug



1.3                  mail-mta/exim/exim-4.76.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/exim-4.76.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/exim-4.76.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-mta/exim/exim-4.76.ebuild?r1=1.2&r2=1.3

Index: exim-4.76.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.76.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- exim-4.76.ebuild	12 May 2011 17:22:19 -0000	1.2
+++ exim-4.76.ebuild	12 May 2011 18:15:50 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.76.ebuild,v 1.2 2011/05/12 17:22:19 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/exim/exim-4.76.ebuild,v 1.3 2011/05/12 18:15:50 grobian Exp $
 
 EAPI="3"
 
@@ -75,7 +75,10 @@
 	epatch "${FILESDIR}"/exim-4.75-makefile-freebsd.patch
 
 	use maildir && epatch "${FILESDIR}"/exim-4.20-maildir.patch
-	use dsn && epatch "${DISTDIR}"/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch
+
+	cp "${DISTDIR}"/exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch . || die
+	epatch "${FILESDIR}"/${P}-dsn.patch
+	use dsn && epatch exim_${DSN_EXIM_V}_dsn_${DSN_V}.patch
 }
 
 src_configure() {