diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2009-09-18 22:47:39 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2009-09-18 22:47:39 +0000 |
| commit | cb46133df1dd6dff26e50ac60c2d638f234bee42 (patch) | |
| tree | 19ba09ddff048d44b147bcbc31a4aab8c51ed509 | |
| parent | no need for the site-package symlink with findlib 1.2.4-r1 (diff) | |
| download | gentoo-2-cb46133df1dd6dff26e50ac60c2d638f234bee42.tar.gz gentoo-2-cb46133df1dd6dff26e50ac60c2d638f234bee42.tar.bz2 gentoo-2-cb46133df1dd6dff26e50ac60c2d638f234bee42.zip | |
Fix mangled m4, bug #175679, patch from Honza Macháček.
(Portage version: 2.2_rc40/cvs/Linux x86_64, RepoMan options: --force)
| -rw-r--r-- | media-gfx/pstoedit/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/pstoedit/files/pstoedit-3.45-am_path_pstoedit.patch | 18 | ||||
| -rw-r--r-- | media-gfx/pstoedit/pstoedit-3.45-r1.ebuild (renamed from media-gfx/pstoedit/pstoedit-3.45.ebuild) | 3 |
3 files changed, 27 insertions, 2 deletions
diff --git a/media-gfx/pstoedit/ChangeLog b/media-gfx/pstoedit/ChangeLog index 0a618e7e8598..09940156033a 100644 --- a/media-gfx/pstoedit/ChangeLog +++ b/media-gfx/pstoedit/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/pstoedit # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/ChangeLog,v 1.57 2009/09/12 12:17:12 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/ChangeLog,v 1.58 2009/09/18 22:47:33 dirtyepic Exp $ + +*pstoedit-3.45-r1 (18 Sep 2009) + + 18 Sep 2009; Ryan Hill <dirtyepic@gentoo.org> +pstoedit-3.45-r1.ebuild, + +files/pstoedit-3.45-am_path_pstoedit.patch: + Fix mangled m4, bug #175679, patch from Honza Macháček. 12 Sep 2009; Petteri Räty <betelgeuse@gentoo.org> pstoedit-3.45.ebuild: Migrate to EAPI 2 in order to nuke built_with_use. diff --git a/media-gfx/pstoedit/files/pstoedit-3.45-am_path_pstoedit.patch b/media-gfx/pstoedit/files/pstoedit-3.45-am_path_pstoedit.patch new file mode 100644 index 000000000000..bc4909abc2c8 --- /dev/null +++ b/media-gfx/pstoedit/files/pstoedit-3.45-am_path_pstoedit.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/175679 + +diff --git a/config/pstoedit.m4 b/config/pstoedit.m4 +index b6fa407..67b923b 100644 +--- a/config/pstoedit.m4 ++++ b/config/pstoedit.m4 +@@ -5,6 +5,11 @@ dnl AM_PATH_PSTOEDIT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]] + dnl Test to see if libpstoedit is installed, and define PSTOEDIT_CFLAGS, LIBS + dnl + ++AC_DEFUN([AM_PATH_PSTOEDIT], ++[dnl ++dnl Get the cflags and libraries from the pstoedit-config script ++dnl ++ + AC_ARG_WITH(pstoedit-prefix,[ --with-pstoedit-prefix=PFX Prefix where Pstoedit is installed (optional)], + pstoedit_prefix="$withval", pstoedit_prefix="") + AC_ARG_WITH(pstoedit-exec-prefix,[ --with-pstoedit-exec-prefix=PFX Exec prefix where Pstoedit is installed (optional)], diff --git a/media-gfx/pstoedit/pstoedit-3.45.ebuild b/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild index a664a3057a0f..7486c29969d3 100644 --- a/media-gfx/pstoedit/pstoedit-3.45.ebuild +++ b/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.45.ebuild,v 1.15 2009/09/12 12:17:12 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/pstoedit/pstoedit-3.45-r1.ebuild,v 1.1 2009/09/18 22:47:33 dirtyepic Exp $ EAPI="2" @@ -30,6 +30,7 @@ src_prepare() { # Fails due to imagemagick having 'long long' in its headers (at least in # 6.3.9.8). sed -i -e "s/-pedantic //" configure + epatch "${FILESDIR}"/${P}-am_path_pstoedit.patch # bug 175679 (fixed in 3.50) epatch "${FILESDIR}/${P}-gcc-4.3.patch" epatch "${FILESDIR}/${P}-gcc-4.4.patch" } |