From 16dd13c73cf4d9939b59f63fecfac633dc323050 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gentoo.org>
Date: Mon, 7 Jun 2010 13:04:16 +0000
Subject: [PATCH] Parallel make fails, bug #323065. Package-Manager:
 portage-2.2_rc67/cvs/Linux x86_64

---
 x11-misc/xrmap/ChangeLog         |  5 ++++-
 x11-misc/xrmap/Manifest          | 14 ++++++++++++--
 x11-misc/xrmap/xrmap-2.33.ebuild |  5 +++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/x11-misc/xrmap/ChangeLog b/x11-misc/xrmap/ChangeLog
index 4e64172d61e6..d92193c4ee29 100644
--- 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.17 2010/05/28 21:10:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.18 2010/06/07 13:04:16 flameeyes Exp $
+
+  07 Jun 2010; Diego E. Pettenò <flameeyes@gentoo.org> xrmap-2.33.ebuild:
+  Parallel make fails, bug #323065.
 
 *xrmap-2.33 (28 May 2010)
 
diff --git a/x11-misc/xrmap/Manifest b/x11-misc/xrmap/Manifest
index 616ecf2bb7b3..0a3699661b50 100644
--- a/x11-misc/xrmap/Manifest
+++ b/x11-misc/xrmap/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xrmap-2.32-Makefile.kit.patch 750 RMD160 520dd023635430506d8c4c4c01a5fa366cf134aa SHA1 4200764cd4db2ae821997fda913c855c2a767064 SHA256 139784b2180e404e9265352fecad131ae535288dddb91b6fe7487095e6d41328
 AUX xrmap-2.32-asneeded.patch 540 RMD160 3e16c8751717730f6e9eb29c9934f7b7c8ddc9fc SHA1 71c82620f0bc245ad8e4a6a5831e979b9252d929 SHA256 a486e3e3fa54fe9f2463c2297bfb8471a2dc9ff3224cecc9d0302aa76c42a776
 AUX xrmap-2.33-Makefile.kit.patch 701 RMD160 97661e2d5e7d5e34db533f66bd3eb6373d4f900a SHA1 01393e37ee1ef8a0dc59415589ad89fcf531493f SHA256 839a5672acd290d24aee62de2ecb30aee584cff7ea7475ef95d778a9ad9125b6
@@ -9,6 +12,13 @@ DIST xrmap-2.32.tar.bz2 1133345 RMD160 5f981cd7e05046d97833bdbf48cf983d3a87d0fe
 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.32.ebuild 2212 RMD160 a5f763b09db009d16b16a7aec37818f5b2b41889 SHA1 14111437745786eb48b72c48a5c02d663a643fa3 SHA256 1db50a05d9b08a2bd68c7fb1d784ea623e7029bab3f49a4d4841a4a6adb00367
-EBUILD xrmap-2.33.ebuild 2212 RMD160 17715efc211f4d9c849bd836e5d4ecea47147a9b SHA1 e44e90af5884df9e21307e572a81ab5c318f5679 SHA256 531321e5a691f24c782774109eb34552c2cf8e123ff9ab4124b8177959641d04
-MISC ChangeLog 2228 RMD160 1dc84686eb0edf21154d8d8a3eda0e89ba66aae0 SHA1 6b0c11b5f11a205bc2a3565729fa8f33c657a45c SHA256 944d84a46cfb5dbe84620744cff6c0a2a329bed7081510441379288532a9d80e
+EBUILD xrmap-2.33.ebuild 2232 RMD160 1d0c9c82db4454ecb97334468ac3e62f781e3641 SHA1 3e3b24cdf31299db96408f02f9a0f54c35692a62 SHA256 bb489208720cee4ff2b505a55dc4d93bd00dafdd8ec9e3ca3c4b796858c48a92
+MISC ChangeLog 2341 RMD160 ee83de3575d9f5c5b1cf6b83b09a2cbe1b214eb9 SHA1 5c0da36cb8d97afaa37fe68064adf2cf0c9ff162 SHA256 d482c1801b693b947ad57715c7b2f6fafde975f47191a2db3a45fe584e68a58e
 MISC metadata.xml 166 RMD160 7b80226659bf40e97050b1ffce1858d5f20b3c60 SHA1 e6c6436c304a65b4a012a5b7be7ee264b228a645 SHA256 8e7de0a7f7c15840474de373a3ce36adcc5dd658b2e4d18366fcb63b964a0826
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkwM7pMACgkQAiZjviIA2XhBVQCfSS6CiLWAxrUMv7rN1iHbbNFg
+yygAoNmHbZDM3Y6aeT24IOsK1qFuoTCs
+=KfoB
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/xrmap/xrmap-2.33.ebuild b/x11-misc/xrmap/xrmap-2.33.ebuild
index 29fc42dec2e0..717f1c19b05e 100644
--- 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.1 2010/05/28 21:10:03 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.33.ebuild,v 1.2 2010/06/07 13:04:16 flameeyes Exp $
 
 inherit eutils
 
@@ -47,7 +47,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
-	emake || die
+	# bug #323065
+	emake -j1 || die
 	cd tools
 	emake || die
 	cd jpd2else
-- 
2.26.2