Fix one more parallel make issue (bug #362249).

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

4 files changed, 25 insertions, 16 deletions

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index 6b688c2a9e83..c5d691afe9ee 100644
--- a/www-client/w3m/ChangeLog
+++ b/www-client/w3m/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/w3m
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.82 2014/03/14 13:56:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.83 2014/03/14 14:19:09 jer Exp $
+
+  14 Mar 2014; Jeroen Roovers <jer@gentoo.org> w3m-0.5.3-r5.ebuild,
+  files/w3m-0.5.3-parallel-make.patch:
+  Fix one more parallel make issue (bug #362249).
 
 *w3m-0.5.3-r5 (14 Mar 2014)
 
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index b9186e0a77e2..2e1be468c4df 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -8,7 +8,7 @@ AUX w3m-0.5.3-button.patch 14325 SHA256 acdc0032e213b610d5f6cf0ca15d7370572f7369
 AUX w3m-0.5.3-gdk-pixbuf.patch 1938 SHA256 29b1eaadc29f433616065460362bc5e7d5067f7b1dc1a2d0583d0ff2f5a5e5cf SHA512 05d8d20631832bc04195bddf7eed99df15c5e4b6df70b5b98fb415b08dedc46cf3b6ac870ad51d1f74830a0f5efe65fc6411fa50f2ff483ab6ca2b5c39177701 WHIRLPOOL b397fcdb3e6b0d69fe68217d5cf50c23cca790cc0e4004345246592cc3736c19a241b490fe0a30bf14fa306306fa3f18c19b88216615f17626ccd819c84f5a3b
 AUX w3m-0.5.3-glibc214.patch 1673 SHA256 9cad0a1ba6a15d28a705d43d7d82621d18e298d771c750b01809eed935b0370d SHA512 cf64ac4b62285585941f23861a9928881b6418a36d2488fd9ad8731f4c3145b915310562648a4b45e4572c740be7feafd2ca59185db3da91179f11a1350adb3a WHIRLPOOL 031782753e989aeede0ac23c154f486d9d8482f35dcb71e2a0e1990db7cd92a36d4dc017384d8f4f118a033e541784464858e710c0c2fab3b341ddd582b4c2e2
 AUX w3m-0.5.3-input-type-default.patch 359 SHA256 a8d593ded6fe3852c9ea95c10f8fc4aab98495615f79cd646a547e830a351c4b SHA512 9b402199888508a6b3a6c57a7753d53b642b8e06bcfd669fa20557233476c3205442872c00f260b482cd1c640ce82eab4c5ed17bf2dc9a840006f6458925d69b WHIRLPOOL afc8b68a17b25833941a6c143802cba9d29915d07384908092233583278099793cdb3909cb51c6013c32bbe19db436aecaa6526176f2b42277a85e5b09b3ddb0
-AUX w3m-0.5.3-parallel-make.patch 351 SHA256 606ecdf4b41a49f71efd76a24e6f69fb9aa2ef69d0d27f2e1a7ad42e3a1e47db SHA512 0c52391e3f538b4b3bfce4dc93ef0982ab37a78101051d28115ab997e68e2accc2b346e5d2f28c5ee3a460acdd0bc58d6bd1096b9b259b19e94274dd8ab3b79c WHIRLPOOL ebd3138922c42a127385381eb637b2dff3f6d49da1669b0d27c2302c87454fd0258ec452022b185a35e20c8db4c2deffd93a2f0b0decf4514479c84d7f61cd15
+AUX w3m-0.5.3-parallel-make.patch 410 SHA256 274b40626c5ac0779de84a094a3b6ca85f4f0afc4a1025e960895b9b10514e83 SHA512 9a8700bbe3f404b9f92ae404e70517d44afa492a49fceab7c772942dc1fa3d294c6c60a9fd4ea22b56fe3b80d96b956acdd772ae3edf4933faa0e9fe549c024b WHIRLPOOL 9277acae62d6644dcf3c8d32bc939fa6f97026127bb8650c1ddca0a521c3de28e3b545e0918a4df4247a2518aaf1670580d456ecb5b5352e1b8f1300e4c72511
 AUX w3m-0.5.3-tinfo.patch 634 SHA256 4eedad736f07f7a719f6fed5ec02b9cff045a8e95aceb2319b6865bb58545f4b SHA512 7c821635e684c1d511446d1a06e80dfe03aef1f4d342d89154aa929d91df28bc5bcb13a4522527cacdf4047bc648742b41f0cff07aeff24a2e24d252006de8b8 WHIRLPOOL 014e09e021df08b63887cc5d60ee5624a6ee39e1ba1c057097f380f6b9f22c880ada61c6ab6e7aa56342b9ae4206695fe4f405f99aa3ce8396d30131f41a937a
 AUX w3m-0.5.3-underlinking.patch 790 SHA256 ce289ecf767af2a286e16e7ca03fc47cf2f68eaeab015cbbe48926b18dcb76a6 SHA512 a9848610fbaf124453dc77640617785f5a3b3eb3f3c761cf0e29ea26c9481156339ef6d9efa4977d8dc0b28696bda8b5a2bef87150f86a0f516fa93e4efa2ee8 WHIRLPOOL 6b1354d132743df6285e88205fdbd0ca5f7d06ece6b9c7379d94e1983f2798c9c503d0bcbaca3b5417c99ac21389afb8ac6eb57a94d58e617c096720f9a32907
 AUX w3m-0.5.3-url-schema.patch 3093 SHA256 8442b44860cc420d3e4083f15c76f6282da568073d2fc6e0a92a33de927e0dcb SHA512 a2acded3dd2924c511bdfe3c344a74780e52928301cbe2819479a3d937c74928e62269e018e9387ccac11a55c912e88a5473561c1be05ff61ae9babea9e34005 WHIRLPOOL a9a4089e5e3800235f0773d2cc913dc709726b44f7523e7e58aa3c00e251626fe7c9a7d486e57d3e0dbee56d22570f3829e0b57115f34f9e6f9d0ec1ef5ef2de
@@ -19,14 +19,14 @@ EBUILD w3m-0.5.3-r1.ebuild 3394 SHA256 61008b2b6d65679181c7977c4bc7dfe09a0ed6e97
 EBUILD w3m-0.5.3-r2.ebuild 3693 SHA256 fa99e25117037d53eed5e80f0cc0b0ead84e6f0a3e410dc582cf24b45f709323 SHA512 f331f5cecb978905b1a06243b5dde40ceb492b2bc07fba31fd69094d7297eba6187aed07404fe759d3ef5fca70328f060c107aa591cc1d5b9d9b51d2cd280f27 WHIRLPOOL df7daa1c0dd74293835f430cafdb82f22483695f09c7e474bf02056123ce1d288d84b230ab2528b4cf57ce850a811210d7a1eadf225382b602e3d74dd87eaa5b
 EBUILD w3m-0.5.3-r3.ebuild 3742 SHA256 71fe0693cc3c24bb2aae9753b9e25e211b184ee6e174b388fbc82ff83e3fec31 SHA512 4bfe43998e7bd0e54591808e25b034a3a4a027625a2dc513608aaa64b09faae3011b3aff88ba83aaf16bc5831c4ecf182e11fa370780c6391e4c06f4ba4d661f WHIRLPOOL 94f20e1fb391804a8ae7be5f957673eda77fcf94b16f6e0ddf5741c3e4ef890503bd8eb74e770571a7d75bf78285bedace2f9d71402556f2d44c038900fc93ad
 EBUILD w3m-0.5.3-r4.ebuild 3888 SHA256 20f4b4c81bdf4ef7b44c4c8d2b9f93fe6c2b7b8812d9268379751780c8d5783d SHA512 85bb6b5951407c209a17182dca04fbb265ec2d7cc4b41872b75697a3e00b4659633f3ff521ff7523ef07968c39c9eacef669eb30a1db6a757d2d05fe34ed9882 WHIRLPOOL abd9cf62c503817bce42ffab77fed4a27be43075f9563db03763eb9786b7c25118d735aab1d401982bcb22d5c28355ba701c4927a1d737ea36b22b25dc758240
-EBUILD w3m-0.5.3-r5.ebuild 3779 SHA256 620c482797f1b836f4a596c86cc64bcb43177d803a1081e044dbd20efb9b3d8e SHA512 9258c78bf3c945a694175905ebbefe4509e4c4c03de3dc739cdce3f71b10bd6be7977c2430c2935705d745a4f167a856f27cbfe93bca1b0332cabf3363d6606a WHIRLPOOL 625fedb7052017674f821a476eea0aaa4faf9a6f10d5de4cd47bf5651de4627bef9eae7493ab7bc573d39905a9b422027a094c96cc63def36c0165bc31888500
+EBUILD w3m-0.5.3-r5.ebuild 3734 SHA256 886d506ca59927c6e20eb73ab3987a1ca7f2517d3d04ab45846522dd1dc0a2e7 SHA512 fdddd870e0f2957db283522e826e13b10786fa65e4823a0bd4ece237dc479c4edfd231c2021968d006b1db02d73255bcce461a68c37317f5df7b89a4e37393a9 WHIRLPOOL de0c75cb58c72ac3c07bed37b8134cba2ffd4728c5015b091a70393d2bf05c91b816b030895a7b3a8a42e3da5db61818682bbf382f11d935a1290c12932c5a52
 EBUILD w3m-0.5.3.ebuild 3206 SHA256 d480a07179bb6b5c609d203cd6aa5f839ea2e7409965f6bb0026d883b3dd4d6c SHA512 af582e8390d092ca3fcc9a026ab46078caf75a278770c98bdaa8232192fd274a2d9b8f9abc3ca7eeb292449c487ae2e7871240e3978ffe00ee553eeaba93f9de WHIRLPOOL ad474ef85bff58c03f24ceac34ba7efdf33e10c33a1f0d0677d2443659b639a33c729b840951cfd9a5fde87377ff0fc489b32ba0a02081eba12552d912505802
-MISC ChangeLog 21613 SHA256 b9449f795a852f70fb9976efbbe15234ba4d75eae031ce0bbb3a40b42f38a1b8 SHA512 3f47d2c5833cbd00d2c9f136709c737058fac420e602003f7c8bfa03591d0bd627b48d58f23ac3b320da8550e43e58c27602f6e9441da4300c02084ad80bed74 WHIRLPOOL 0afea6ec2463c516537acacca5ac38cf7be03aea290baf2881f5704990dc1810ff1a4459215c9311fd45e19ee32b7eba26c2c720e88ac3a39bdb1f06b5bced0c
+MISC ChangeLog 21771 SHA256 52a9355301d86c72eb4f9adb58860e3270c53d98f15d82af4a471f201aa761aa SHA512 fdbd8ba82a77ad70bc68a65e7cdf14ef1eae88ada771895a4bf8f5d9eecc9aa39998646bec192ddd74fffa663490f0970cfd294f5432c9924791600822004b8b WHIRLPOOL 5f1b5fc066660678a127e4bc4f9cbdcd6a8d69e49626d8f7ba34b93e88cdd53b22d5a45f51a8101b31eb68d1f17a505d3cf5d4181b2003c86b02a255fd8a2475
 MISC metadata.xml 237 SHA256 58936b557c67f7e90052564817055decab28947a9934d0b889fa5d7e2901ba6d SHA512 12a76610bfe35e83c0939d8a21f552bb1bd6deea528c6c703562316df02d0fccf13c9c96598c748b542649e72aac19c15f3356f20ec08b9271dff059b1f271d1 WHIRLPOOL 4cd733feacdce05513aa74f49a7362aef6e1cf1debbcf2ca1e9e39a597e3b513753490d858feead5ea9fb768f8d05ec2032a9f790734bb836e670053af585817
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMjCpAACgkQVWmRsqeSphMCgwCeL/bEMpqrulArq23QTxXLGKFv
-YqoAn3+W1xKh//FA5g0iGujJiz1prfzu
-=NSjo
+iEYEAREIAAYFAlMjD98ACgkQVWmRsqeSphNr6gCdFOyJzDHLfsQPgJPw5x2RS+5+
+18oAn3YsI3XyS9Gb5Bys/YAD30jbaE2J
+=hIye
 -----END PGP SIGNATURE-----
diff --git a/www-client/w3m/files/w3m-0.5.3-parallel-make.patch b/www-client/w3m/files/w3m-0.5.3-parallel-make.patch
index 8d89b9309575..427e3be20d55 100644
--- a/www-client/w3m/files/w3m-0.5.3-parallel-make.patch
+++ b/www-client/w3m/files/w3m-0.5.3-parallel-make.patch
@@ -1,6 +1,5 @@
-diff -Naur w3m-0.5.3.orig/w3mimg/Makefile.in w3m-0.5.3/w3mimg/Makefile.in
---- w3m-0.5.3.orig/w3mimg/Makefile.in	2011-01-04 18:22:28.000000000 +0900
-+++ w3m-0.5.3/w3mimg/Makefile.in	2011-02-02 11:35:47.725076601 +0900
+--- a/w3mimg/Makefile.in
++++ b/w3mimg/Makefile.in
 @@ -22,6 +22,8 @@
  	$(AR) rv $@ $(IMGOBJS)
  	$(RANLIB) $@
@@ -10,3 +9,14 @@ diff -Naur w3m-0.5.3.orig/w3mimg/Makefile.in w3m-0.5.3/w3mimg/Makefile.in
  w3mimg.o: w3mimg.c
  	$(CC) $(CFLAGS) -c $<
  
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -250,7 +250,7 @@
+ 	 (cd $$subdir && $(MAKE) install); \
+ 	done
+ 
+-all-scripts:
++all-scripts: funcname.tab
+ 	for dir in $(SCRIPTSUBDIRS);	\
+ 	do	\
+ 		(cd $$dir && $(MAKE) $(MAKE_ARGS)); \
diff --git a/www-client/w3m/w3m-0.5.3-r5.ebuild b/www-client/w3m/w3m-0.5.3-r5.ebuild
index d0eebd4fda11..0d2a676a7556 100644
--- a/www-client/w3m/w3m-0.5.3-r5.ebuild
+++ b/www-client/w3m/w3m-0.5.3-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.3-r5.ebuild,v 1.1 2014/03/14 13:56:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.3-r5.ebuild,v 1.2 2014/03/14 14:19:09 jer Exp $
 
 EAPI=5
 inherit autotools eutils
@@ -109,11 +109,6 @@ src_configure() {
 		${myconf}
 }
 
-src_compile() {
-	# bug #362249
-	emake -j1
-}
-
 src_install() {
 
 	emake DESTDIR="${D}" install