Fix mangled m4, bug #175679, patch from Honza Macháček.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64
RepoMan-Options: --force

4 files changed, 33 insertions, 7 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/Manifest b/media-gfx/pstoedit/Manifest
index b5fce5ae75a2..b82d23fe08fc 100644
--- a/media-gfx/pstoedit/Manifest
+++ b/media-gfx/pstoedit/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX pstoedit-3.45-am_path_pstoedit.patch 750 RMD160 cecc99e65ab51d4cc346af62ceefaa97dde0d774 SHA1 5c83d10076c55b84e5bfea285615f85984774063 SHA256 2ff71c57df130ea0dfb946548a436e5fc042771cc507afc2b96cdbc881e7195e
 AUX pstoedit-3.45-gcc-4.3.patch 253 RMD160 5eea970d6f5936160f7c1bc7dd4ffa12b93b8de9 SHA1 7873231790e1d6cbaec5c79c151b7bd2e75c10bd SHA256 30ec4235d0551c752c5092790ef296440bac15113aafaaa7f28d6abed55217b8
 AUX pstoedit-3.45-gcc-4.4.patch 290 RMD160 712a204fae448b31da7284ac6731d321426c8cc2 SHA1 c6a143d391ce27b590fe32da815538b693e4c4eb SHA256 fa64304d920b4ab944148029f87830dd6c17d2d33baa1c54e2971a0573379cc9
 DIST pstoedit-3.45.tar.gz 848922 RMD160 dbe610807dae3ece5d32979100795d3399beb23a SHA1 3eecd5efcd4f3d1752d13303a2d1b64346f74171 SHA256 a489e47e536c194d7fc3a8121a274156a3577d3d893ac4b54d79849bb29f7fd9
-EBUILD pstoedit-3.45.ebuild 1594 RMD160 119e23876824ede2a0ddb315cb42ed142d45fcb9 SHA1 3737056f807200503039a11c9a65edb25629e94e SHA256 ff6455233c56c42818615b4267c34eb9beb564cc20d7d121543a13f011bbefed
-MISC ChangeLog 8001 RMD160 7feb17a7d53039e3c3d5d93ae32b42e71afb5b82 SHA1 694c8b05b7d4488e1f30c761a51511919441f25f SHA256 010a984486b96b67a6d9091c0dbb86b4a47000860c091928b2f05c7bcb029e4a
+EBUILD pstoedit-3.45-r1.ebuild 1674 RMD160 3f4086d1310ca9e8e4cd0d84cfe7f06f848bbf2f SHA1 6daa018073fe0c7fc3f5665b817b987f8e4368f5 SHA256 5441dc887a3ee46d2a7e442a0ecd53217d87386ceb0fd1beb7b6f59549f7239c
+MISC ChangeLog 8215 RMD160 3fadb32c0a4e38e61f74cd8a49ee44613084e845 SHA1 c0324e9d430763556e70dd57d3129bce4ef7f52b SHA256 10eb55563d18907e2a6b560e3bd562d6b643abaf99a257e3645b012ada406d5d
 MISC metadata.xml 266 RMD160 405ece9efc9a19d31ca7394a9c159a51309a3bec SHA1 7cb5575a9c14679a2f6bbeb1f11333918dda2368 SHA256 5fe90f8eb0d17c47a5e85afd6f31144f68a86e4819c1a43f11b53789f6015c57
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqrkUQACgkQcxLzpIGCsLRnFQCeLX6n/EA0G9b+JHw2mOlyaxtD
-jMEAoIACCnQ9CKneC4quiX9o4Xz5sT2Q
-=ufYX
+iEYEARECAAYFAkq0DkwACgkQiqiDRvmkBmJPGwCgr0zM+oRGJpK73tk8R5xXFjmm
+NpcAnRNTS1yhP7np9tdvDCgQerBmfhcI
+=u6b4
 -----END PGP SIGNATURE-----
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"
 }