Fix makefile to allow parallel compilation. Fixes bug #323065

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/x11-misc/xrmap/ChangeLog b/x11-misc/xrmap/ChangeLog
index a9a0fdff5a6ba669e3b812cb45e3958dc0f37c84..b28f5d4108acd95c3332afe75dd39adbc729e47e 100644 (file)
--- a/x11-misc/xrmap/ChangeLog
+++ b/x11-misc/xrmap/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/xrmap
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.19 2010/06/11 18:36:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.20 2010/06/23 12:24:47 hwoarang Exp $
+
+  23 Jun 2010; Markos Chandras <hwoarang@gentoo.org> xrmap-2.33.ebuild:
+  Fix makefile to allow parallel compilation. Fixes bug #323065
 
   11 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> xrmap-2.33.ebuild:
   Fix imagemagick vs. graphicsmagick depend wrt #314405 by Mikael Magnusson.

diff --git a/x11-misc/xrmap/Manifest b/x11-misc/xrmap/Manifest
index 9c0efd27826969a5a21b8bf99b645c884ca9fa0b..dd335cdf740f8a7df12c94467b8eb4c7100f7f23 100644 (file)
--- a/x11-misc/xrmap/Manifest
+++ b/x11-misc/xrmap/Manifest
@@ -5,6 +5,6 @@ DIST xrmap-2.10.tgz 3944521 RMD160 dd398b2e4b24c23b1fbf9edfa37ddf7d1f4eaf65 SHA1
 DIST xrmap-2.29.tar.bz2 1072241 RMD160 f8cacc343643a66c8236743c76c80d3c33c44c5c SHA1 af2efc47b7ef76840a72a96e67174b0fd5dd8973 SHA256 2c790904c5077940b8e4b23d848b0e6a02757cde18a3256c47f34da7d7ae31d0
 DIST xrmap-2.33.tar.bz2 1224699 RMD160 6c025976f98046315a370405f043aaf2cd05a12d SHA1 bd6392e1732754f5421615ff16ef625e703fbb5b SHA256 120bb1544a7f375e2ed2ec036e7b170081a963b559c3b3b0b5eefe52f56c8440
 EBUILD xrmap-2.29.ebuild 2112 RMD160 1b9f33e54013a4c7ed06c1a0550b9c716f815549 SHA1 fc79529380a944b5585c1655be573511a4cca5df SHA256 bd641e18421edc15bd9f3e439cd97f83c38eef3b1d285ebac970bdff29be6d32
-EBUILD xrmap-2.33.ebuild 2303 RMD160 983cd6e2d5e50eef251153dafb8087679137e2f7 SHA1 2d190ccf4d3f512b6a926270052779a7c0659ad7 SHA256 acc19b2b5eb8810277424afe3fb6356b65752430248e4838b0e08bbcd2c8c703
-MISC ChangeLog 2492 RMD160 2180262d5c51d52abebf13faef437eea4055b51d SHA1 186cae75e0114cbe695b32c313f1795543a6336a SHA256 f04efb7ab80be37aa4a7e4d507d035e88db5fbb271bf54daa334b1d2ada1853c
+EBUILD xrmap-2.33.ebuild 2358 RMD160 15819efe33f54db7ae5160f46182e2f4e4570996 SHA1 03241ef116a735f57e32ce5b4ca1347c3427c686 SHA256 327af5cc9fa73e4623d4fe23172ff90d0e36d72bd9e59d01840b7053abed116d
+MISC ChangeLog 2628 RMD160 4c3368add2d6148144d80943bb0a712b1e3b38a3 SHA1 952bd9434ed518afe57d3c2f564f7f3f59f518f8 SHA256 b408037252c88fa8349a3958f91637c9d3197b833a03f36bc8c53bd771b9da2c
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826

diff --git a/x11-misc/xrmap/xrmap-2.33.ebuild b/x11-misc/xrmap/xrmap-2.33.ebuild
index 1c1a2a7c21fd47980d1fce11c0bb93c041c0b044..68abcb8fbc5445bd3d6fb8310c5cec76e849b919 100644 (file)
--- a/x11-misc/xrmap/xrmap-2.33.ebuild
+++ b/x11-misc/xrmap/xrmap-2.33.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.33.ebuild,v 1.3 2010/06/11 18:36:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.33.ebuild,v 1.4 2010/06/23 12:24:47 hwoarang Exp $
 
 EAPI=2
 inherit eutils
@@ -52,7 +52,8 @@ src_compile() {
        sed -i -e 's,^\(#define RCFILE \)SHAREDIR\",\1\"/etc/xrmap,g'  \
                   -e 's,^\(#define SHAREDIR \"/usr/share/\),\1x,g' xrmap.h || die
        # bug #323065
-       emake -j1 || die
+       sed -i "/^image.o/s/image.o:/& numdefs.h/" Makefile || die
+       emake || die
        cd tools
        emake || die
        cd jpd2else