diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2012-09-20 15:53:03 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2012-09-20 15:53:03 +0000 |
| commit | b6bdd52bdb95d17fd8eb60f086478c1b25889c2c (patch) | |
| tree | 776da4b3bb2aed4599e78024d1b771fb306df45f /app-text/antiword | |
| parent | Old. (diff) | |
| download | gentoo-2-b6bdd52bdb95d17fd8eb60f086478c1b25889c2c.tar.gz gentoo-2-b6bdd52bdb95d17fd8eb60f086478c1b25889c2c.tar.bz2 gentoo-2-b6bdd52bdb95d17fd8eb60f086478c1b25889c2c.zip | |
Redo patches to work around behaviour change in patch-2.7, bug #435492
(Portage version: 2.2.01.21003-prefix/cvs/SunOS i386)
Diffstat (limited to 'app-text/antiword')
| -rw-r--r-- | app-text/antiword/ChangeLog | 5 | ||||
| -rw-r--r-- | app-text/antiword/antiword-0.37.ebuild | 20 |
2 files changed, 15 insertions, 10 deletions
diff --git a/app-text/antiword/ChangeLog b/app-text/antiword/ChangeLog index 65412a06e06e..a3d45fdac633 100644 --- a/app-text/antiword/ChangeLog +++ b/app-text/antiword/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/antiword # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/antiword/ChangeLog,v 1.45 2012/03/02 08:00:05 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/antiword/ChangeLog,v 1.46 2012/09/20 15:53:03 grobian Exp $ + + 20 Sep 2012; Fabian Groffen <grobian@gentoo.org> antiword-0.37.ebuild: + Redo patches to work around behaviour change in patch-2.7, bug #435492 02 Mar 2012; Fabian Groffen <grobian@gentoo.org> metadata.xml: Take maintainership diff --git a/app-text/antiword/antiword-0.37.ebuild b/app-text/antiword/antiword-0.37.ebuild index 994acf9c4dab..93ced71cf4c1 100644 --- a/app-text/antiword/antiword-0.37.ebuild +++ b/app-text/antiword/antiword-0.37.ebuild @@ -1,29 +1,31 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/antiword/antiword-0.37.ebuild,v 1.15 2011/08/08 20:07:39 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/antiword/antiword-0.37.ebuild,v 1.16 2012/09/20 15:53:03 grobian Exp $ EAPI="3" inherit eutils toolchain-funcs IUSE="kde" -PATCHVER=0.1 +PATCHVER="r2" DESCRIPTION="free MS Word reader" HOMEPAGE="http://www.winfield.demon.nl" SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz - mirror://gentoo/${P}-gentoo-${PATCHVER}.tar.bz2" + http://dev.gentoo.org/~grobian/distfiles/${PN}-gentoo-patches-${PATCHVER}.tar.bz2" SLOT="0" LICENSE="GPL-2" KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86 ~ppc-aix ~ia64-hpux ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -PATCHDIR=${WORKDIR}/gentoo-antiword/patches - src_prepare() { - EPATCH_SUFFIX="diff" \ - epatch ${PATCHDIR} + # Makefile is a symlink to Makefile.Linux, avoid that we patch it by + # accident using patch <2.7, see bug #435492 + rm Makefile || die + + EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PN}-gentoo-patches-${PATCHVER}" - epatch "${FILESDIR}"/${P}-prefix.patch + # Re-add convenience symlink, see above + ln -s Makefile.Linux Makefile } src_configure() { :; } |