diff options
| author |   Sergey Popov <pinkbyte@gentoo.org> | 2013-06-01 21:42:55 +0000 |
|---|---|---|
| committer | Sergey Popov <pinkbyte@gentoo.org> | 2013-06-01 21:42:55 +0000 |
| commit | d3b8b7f03d79e6c2c27021b09df8673b1829f0ca (patch) | |
| tree | 6f0529986eb84adb5953996b61dc14e8b91e2f32 | |
| parent | version bump (diff) | |
| download | gentoo-2-d3b8b7f03d79e6c2c27021b09df8673b1829f0ca.tar.gz gentoo-2-d3b8b7f03d79e6c2c27021b09df8673b1829f0ca.tar.bz2 gentoo-2-d3b8b7f03d79e6c2c27021b09df8673b1829f0ca.zip | |
Add workaround to epatch call to make sure that patches are applied in right order, wrt bug #471666. Thanks to Pavel Riha for discovering this issue and Jeroen Roovers for suggested patch
(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)
| -rw-r--r-- | net-misc/pump/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/pump/pump-0.8.24-r4.ebuild | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/net-misc/pump/ChangeLog b/net-misc/pump/ChangeLog index 67df992bb25c..295b9d71f9b5 100644 --- a/net-misc/pump/ChangeLog +++ b/net-misc/pump/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/pump # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/pump/ChangeLog,v 1.61 2013/02/22 18:12:11 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/pump/ChangeLog,v 1.62 2013/06/01 21:42:55 pinkbyte Exp $ + + 01 Jun 2013; Sergey Popov <pinkbyte@gentoo.org> pump-0.8.24-r4.ebuild: + Add workaround to epatch call to make sure that patches are applied in right + order, wrt bug #471666. Thanks to Pavel Riha for discovering this issue and + Jeroen Roovers for suggested patch 22 Feb 2013; Sergey Popov <pinkbyte@gentoo.org> -pump-0.8.24-r3.ebuild: Drop old revision diff --git a/net-misc/pump/pump-0.8.24-r4.ebuild b/net-misc/pump/pump-0.8.24-r4.ebuild index 92b780603533..4129720f6a62 100644 --- a/net-misc/pump/pump-0.8.24-r4.ebuild +++ b/net-misc/pump/pump-0.8.24-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/pump/pump-0.8.24-r4.ebuild,v 1.9 2013/02/22 17:25:23 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/pump/pump-0.8.24-r4.ebuild,v 1.10 2013/06/01 21:42:55 pinkbyte Exp $ EAPI=5 @@ -32,7 +32,8 @@ src_prepare() { # Apply Debians pump patchset - they fix things good :) # Debian patchset 7 include gentoo patchset too epatch "${WORKDIR}/${PN}_${PV}-${PATCHLEVEL}.diff" - EPATCH_FORCE="yes" EPATCH_SOURCE="patches" EPATCH_SUFFIX="patch" epatch + # Add LC_ALL workaround to make sure that patches are applied in right order(bug 471666) + LC_ALL=C EPATCH_FORCE="yes" EPATCH_SOURCE="patches" EPATCH_SUFFIX="patch" epatch # respect AR, wrt bug #458482 tc-export AR |