Fix parallel make issue (bug #506978). Clean up patch.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 23 insertions, 19 deletions

diff --git a/app-text/epstool/ChangeLog b/app-text/epstool/ChangeLog
index dc4c961e4e9e..34853239c37a 100644
--- a/app-text/epstool/ChangeLog
+++ b/app-text/epstool/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/epstool
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/epstool/ChangeLog,v 1.38 2013/09/24 07:43:06 pinkbyte Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/epstool/ChangeLog,v 1.39 2014/04/06 23:54:32 jer Exp $
+
+  06 Apr 2014; Jeroen Roovers <jer@gentoo.org> epstool-3.08-r1.ebuild,
+  files/gcc43.patch:
+  Fix parallel make issue (bug #506978). Clean up patch.
 
   24 Sep 2013; Sergey Popov <pinkbyte@gentoo.org> -epstool-3.08.ebuild:
   Drop old revision
diff --git a/app-text/epstool/Manifest b/app-text/epstool/Manifest
index 5165adaaaf2d..17d3ffba5046 100644
--- a/app-text/epstool/Manifest
+++ b/app-text/epstool/Manifest
@@ -1,19 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX gcc43.patch 731 SHA256 a5e2dcb50fd790005e4d0ad83e5b4053fde8d3ee9c38b3ebdf9e04e95ce2141d SHA512 94cd32490ce286d035256749261185e14e43883625a1bae3dce183023c8d6a6d2728ea1a5309443b6eeed8c2dd83b062f08135812d142cde3d642749de1bb9d2 WHIRLPOOL 6777bf2cf01281a62c363561359ec560ed8e14d7fd0c0a198fb4271ce7b657ef5100aa67b8e59d1e22935bcdb6f833c107be875e80b78ec2083ef58a21b33339
+AUX gcc43.patch 632 SHA256 50dbfda7c668d3a07878bd628c0ae89bb71cb0be8dadfd4589781990d25d15f6 SHA512 a088a86e2c66469da955a4ba2309142cf54be9d88ca18c8c173d9a285a145c3432ec99d4c212f5f69caeeef17035a063f2ca55d57bf72325258555a0af8ca875 WHIRLPOOL 322f1bfec5b818feccb83144edec7e8a42f71d2b217eec1cfe328b421e6af395c04874e060c5b76a92dbd4daf1d7a073cd22ca8777abcf5154e95b6a9e3e8b2d
 DIST epstool-3.08.tar.gz 191567 SHA256 f3f14b95146868ff3f93c8720d5539deef3b6531630a552165664c7ee3c2cfdd SHA512 d6d70825c7d08cca318503bd8c12b48408b6d6cd3a64f26df94890373a3e73b68dc09a4eb454b81893c7ee3c11da791cdfed7466eb1410414cd1b97d80e8abf1 WHIRLPOOL 18b23dec04a5d08a849051fc8e0912f1bad5a73a2bcaff181a0a48bcce7fa0008ac1184bb4df6a74a0d7c64ce58b27d911195dd71d257201e0efad8afbe02d33
-EBUILD epstool-3.08-r1.ebuild 990 SHA256 cfd655633221ad0fb8b25abb30ce0f2aad83e37d554c8eacf1a40c3b632bcf65 SHA512 fd95e5e4ceb59b0e848681172c39b338f016278adad3ec33b72fa6350d6b693e84be41ad6b0f43f71ec76b75ef0e2f35bef0bee6c45707ef2f56f0753fd017d7 WHIRLPOOL 7c82fe069d469c7317d0e32222ca1c3cd680466a6ace81ad733bb384c35920a6004e9d834529a320261d1a3b8e2f10d7b5de378271db6d45d69e97cce1e9c5d6
-MISC ChangeLog 4227 SHA256 19f2c385c6d9619b7155d776aef69b8dd1ab848ac29bf792f5f2800ba729e419 SHA512 dba117b14b8abd260fcbf235394a31fc4103e6ca7dcc6bae4d85793e9df7b8cd8ac2f7adf163922d6a58623bb7c68a9f552c730a01a0a078850b370891e0adf0 WHIRLPOOL 32e6236822350456d0a9c5c8b123e780ddfb01e5bf473b1b2994e62af3ae2a927740dbb212f0dff3ed450de0930c90fef5a02d73cbe4ffa9eb171f666dfe10f5
+EBUILD epstool-3.08-r1.ebuild 1035 SHA256 49a97bc6740d2ac1486d63cbc6ce4f463f76023ce1eba1a43891c439ee43152e SHA512 2d37d6b3297e4a152801a7e9bc9400913f1fb1e93489540f25c8b59d4645b455a1cc9e6bf2c57f6616aa16e27bedce7f84b6ae24175df9eabb9b9a90534a0d12 WHIRLPOOL 39809f94893a15af53545e13a957d05e845fb021add23450dc4b60d5243c21d0004599f04775c320185473c956bdba4e153fbbc96a98794ccdfc560cab7759a0
+MISC ChangeLog 4372 SHA256 2f9c8ca175d16a1b1e043949d5e5d4d7e270606de8f8563a41dff6ab91b376dd SHA512 7f462d0049d1d244fa90637fccafa00e5b77c6e42b3d72316269ac2d1c5e6c93d9fbdadf5202eec8776baf4afeeae72fc7c473f32854e323618fdb661a4c97dc WHIRLPOOL b8e39c5e59cc37d4ec9ff7dbd3760aed8597bb02a739aa3199df456caa2ffd4d4e9a23f1324ec89187ab7538d97e694e0f0928bc288b0d1039dc261ee5eba0d4
 MISC metadata.xml 212 SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757 SHA512 85ac7770baae8cc7c2c52dcd077a448cfb394ec6585e274ffa01c8f92a862d22c6ba0553b71cf2ae6b6f28f6faa5c3d615537f35f9fe0da9f43a2c9043953784 WHIRLPOOL 221b2f4e9b984954eb7268028287339e8678c794c7b4e40ab2baaa037c8e87bac30c8b64473efade9b3ee1ce226aab4ad36760147eee5af7cfd7c081473c839b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSQUJXAAoJECo/aRed9267KMQH/i3AAI7gsL3yhNTFmB5t1xFt
-dCJMPvgaLhqpNGXJvYqOpcgAAQS7rfAhzWo5ObtPGu1L1SQ5zYRZVbSznTFQDUSV
-9RPr4G6lF5RlpE28FDy16Cxudll1aZFyO9393AZdQeK/aDDhBxuMa9WOxZQEyKCM
-L+AmyA3i5octfr8E1lV0RFOWaSm1DOVZ5u6HFBRSSAYzLRdF/DhBlk4sa0eRGsp0
-vEbuGFw/RHT3LfNEuSqBZ2ulH8QDGgAtQnt2Qxw02sQ8Fle0n1i5tr4U6DLHMzqT
-SiHcH/67jCCPFvHIbS8Ob9ajPr+p5106fcsZ/NXGeT58L1j8Bx3yLSGrAG6+8X0=
-=sV0F
+iEYEAREIAAYFAlNB6UIACgkQVWmRsqeSphP/4wCfQ6gORSE2QLJFUhBtJlGlhgaT
+ZZ4An1oN/GXcAqCRnILIS5IkcM9Qj7fo
+=T4nH
 -----END PGP SIGNATURE-----
diff --git a/app-text/epstool/epstool-3.08-r1.ebuild b/app-text/epstool/epstool-3.08-r1.ebuild
index 2556006faba7..1666cdfb3f23 100644
--- a/app-text/epstool/epstool-3.08-r1.ebuild
+++ b/app-text/epstool/epstool-3.08-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/epstool/epstool-3.08-r1.ebuild,v 1.6 2013/09/23 17:36:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/epstool/epstool-3.08-r1.ebuild,v 1.7 2014/04/06 23:54:32 jer Exp $
 
 EAPI="5"
 
@@ -18,15 +18,19 @@ DEPEND="app-text/ghostscript-gpl"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/gcc43.patch"
+	epatch "${FILESDIR}"/gcc43.patch
 
 	sed -i \
 		-e '/^CC/s/=/?=/' \
 		-e '/^CLINK/s/gcc/$(CC)/' \
-		src/unixcom.mak || die 'sed on src/unixcom.mak failed'
+		src/unixcom.mak || die
 	tc-export CC
 
 	epatch_user
+
+	# parallel make issue (bug #506978)
+	mkdir bin || die
+	mkdir epsobj || die
 }
 
 src_compile() {
diff --git a/app-text/epstool/files/gcc43.patch b/app-text/epstool/files/gcc43.patch
index 398ce08c5182..b50250a9af1a 100644
--- a/app-text/epstool/files/gcc43.patch
+++ b/app-text/epstool/files/gcc43.patch
@@ -1,5 +1,5 @@
---- epstool-3.08.orig/src/epstool.c	2005-06-10 04:41:00.000000000 -0500
-+++ epstool-3.08/src/epstool.c	2009-02-16 20:55:43.186140029 -0600
+--- a/src/epstool.c
++++ b/src/epstool.c
 @@ -2824,7 +2824,7 @@
  		code = -1;
  	}