Add patches to fix parallel make issues in bug 427844 and bug 437256.

Update ebuilds for 2.12.20 and 3.1.3 to make use of said patches.
Drop old.

(Portage version: 2.2.0_alpha140/cvs/Linux x86_64, signed Manifest commit with key E27104B3)

1 files changed, 18 insertions, 12 deletions

diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 5466d7cd6b1c..2973f5366db5 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -3,24 +3,30 @@ Hash: SHA256
 
 AUX gnutls-2.12.20-AF_UNIX.patch 1041 SHA256 bd56d19bd1713ef3ddfca7768c2528aacb0c7425cd21f87d69b3d674504562a1 SHA512 a1564ace509fed3b0608ae66859979a364b173006fd43d77678dccb70577bbfd54953aa8c706aca77540ec28c3426a332e86c40722bbc7b4a23f9f50bee0478b WHIRLPOOL 9e27f8e7e82fdd53a11f1f7dfd10790f4d2c67d74bc68d9ce55718a57ef80d391f8fadab93f6186597c52ecedcef2d3f1ff16a77778aedd50545e5829e626baf
 AUX gnutls-2.12.20-glibc-2.16.patch 938 SHA256 9e0383563d5a358680aab3ddf1464d207fa9ea40baeb4d970017730abb7b97aa SHA512 d4216cc1ace84dfab32ac524cd7acc35b14f5c488d1b3716984894c5408667c82d0a4d494149c6a3c5805a6a901831d8df62d12de61d7b93d183520c9b6d93c3 WHIRLPOOL 71e268ab79ff0ad5d7bc0148b37a1070bc3b2ef09fe01e24eb060d04a6f2d03e209750a3853386f53f2d84c9843a6e66c49aab33fbdc6ef645ef2bb3c4882676
+AUX gnutls-2.12.20-guile-parallelmake.patch 349 SHA256 f6c81df63b3dce52df7754cffe9dfae0b94fcb1bedd68cf99d5546b4f00a8c37 SHA512 2c92817e1ac43e301f0c39edca0991e832a875204e9232106f660157f1db91ce942569ef16193f6b1e80038f3a000836f4ac2bb3d728d4bbb602e09f46ba5efd WHIRLPOOL d578f81a0d645c7430301aa35fb15cc4fde3acc044758f28d6046742053965c0b27c0a2d738794bfb6ce27164331b11387402413b40abac8d95192741f1d710c
 AUX gnutls-2.12.20-libadd.patch 988 SHA256 b1f73ec17feb72817f39f109ec2e4dc69ea8d6b6d62ef243491e85164ff513ac SHA512 a0552276b356fd63e802a886e1243ef6341c6b8d1857814a0b2a686fd605d7c03316965cdfcdb70162547033efe9f2d1c17e442a30925d97ef691c2d573eba68 WHIRLPOOL 4ed528cb20705d91db05f0c533cbfd0356fa3292393eba75b45a22457cb23da80639ef739d889af4f64038a97553f3f990cc08f5e31608b1dc83c74b0e1c46d3
 AUX gnutls-3.0.20-parallelmake.patch 1126 SHA256 00acad9ae1420d2d9179ecdf8af22ffc19175a147420305e60e9c8b21e996608 SHA512 b530d9926083477c1e8dcbe4fa144474bc49a4bd48d7a8cf9f4fca216104c5b4c63066e7eea825f4fcc0fb8d28089d682cd7392bdfad4fd254c46858860c1427 WHIRLPOOL 85021d65f2e05aa47543e21df0613e9a099a590ec27fdadb7a5a140f70d50b8c0d5676f5d822eda9161d4480381dfc3864f205475f6160ffdd7d9eae69f4d949
-DIST gnutls-2.12.18.tar.bz2 7207965 SHA256 780b12e3f05191316390611a3d9d982d29ca3f3abc234517b2fc542064b6f07a SHA512 6811a5a087c83a22960ddc654b767629c3bfaed9bfcdb57fa57f670bf0d61dde78b875d509e80db4f8fac5d982ec1dacbcfda279989edbaeb1e28640f05de987 WHIRLPOOL 4ab01c51b7d8d655ff4ba612d20946ad2b9aeaed9c117244ca34017da6135736dbf4d7f8009c98d7cec4ce65c62af44d246d4d5caf85c93158dd5faff4ed2f53
+AUX gnutls-3.1.3-guile-parallelmake.patch 349 SHA256 f6c81df63b3dce52df7754cffe9dfae0b94fcb1bedd68cf99d5546b4f00a8c37 SHA512 2c92817e1ac43e301f0c39edca0991e832a875204e9232106f660157f1db91ce942569ef16193f6b1e80038f3a000836f4ac2bb3d728d4bbb602e09f46ba5efd WHIRLPOOL d578f81a0d645c7430301aa35fb15cc4fde3acc044758f28d6046742053965c0b27c0a2d738794bfb6ce27164331b11387402413b40abac8d95192741f1d710c
 DIST gnutls-2.12.20.tar.bz2 7231438 SHA256 4884eafcc8383ed23209199bbc72ad04f4eb94955a50a594125ff34c6889c564 SHA512 49fde72d049ca75d3df15744519296a5eb982560d739cf9b41033b758564df59698be857bc86825f1ae2dc71b3479208701482bfc085f22e9ff197a65a00d7d1 WHIRLPOOL 5117604a66e9ef30c96b81f3bc09c87f623a0d9aa8e983595b169f178947499c27eb50767375bb9e9ae6684c7670d5532bdff3c5a71e7a4093648d990cc3c230
 DIST gnutls-3.1.3.tar.xz 4890796 SHA256 fcb236c663489d3dba5a3f41486810f3889eb4508403ebeeb58b79f0b34bce39 SHA512 aaef62ab0426975210ec037749c2feb0afdc35045a650e5c6cec9cf2fd27f948641f4af21029395f37d7044c2c1978bc035ce60d26fa5d6f48f9dff191739aa7 WHIRLPOOL aaa5e3b34c67a6882c05310e6acfe2c3fd97f8a8c7ad16f57ae3188c287047be978349928db23408ec3466c23340dcaa92d2f3c1462e730e90093e72734db2be
-EBUILD gnutls-2.12.18.ebuild 3294 SHA256 1c4de12c81ba08be32c906ee0a1eedcd07158a012c0d589577d6bcdd897eeb4e SHA512 bf19d45ba9d4688aadd9298a4773367e1508dc2bc8360ef81fe3c35045a49c22878dc1749b21011e30a380af1838318d05363ce9277fc405cd7e50530ab5f0a0 WHIRLPOOL f98289fbf8a31574e8b7edf5ef6a46329f929e65e02a65fb9bc9c4e1e8045b696ad67dd3bdd06f8fdda1d2d7b36e5c204b7ff16d8321198e139ab78555c80db7
-EBUILD gnutls-2.12.20.ebuild 3533 SHA256 c04ea6b9c5f443ffde19dc3db3a9d0a9c163eff03b13419ca9e83453f65bd956 SHA512 1e17920cf6a351dee2e9940cdf8490c95a3651f6c5088e46e332116abcf961320addb51aa871b0417284bee815c81d0ea6f7bdfcf0e3c84a991f283c0c2b77fe WHIRLPOOL e44ed1e395d527c4094e369e0d7b7cfcbb33b67faa7c7a4cc12fa31bb8a2787cd83535524f42abe8737a8ecba169910d7d6c279287ad2e51e3aaed8164f2f493
-EBUILD gnutls-3.1.3.ebuild 2877 SHA256 142b8b7dd3969f51d57910674553962c7d357940e39ad2e868d833f41bc0e622 SHA512 2c2665abca97cf61ea49af832aa327d8eb8e3f3ee5fa4af3afa9f72f0a928d74f5190689b73a81239a9618856d29d7cb576052a0e3a8066c8b4827fd734f9286 WHIRLPOOL e0217783f8311dfc862e81e1c77670af88f16d3ab1ec607bd33b0e29623cfbcec418e36c08f75fd2ead35ee6635d40fa8973e3099bbac175afa9015301507724
-MISC ChangeLog 57283 SHA256 628e925cc013df6142574da1862643ddb5c31e5b91f05073803c1116957f3586 SHA512 f9dbdb3b819d6017d3c53b6dc9d6e5beffb406346824fa576d5ff1f6558a46c4bdb89faa1085a3e6a5e051f96fa74131e89c1ac7c624b33e42c6376727d34f6c WHIRLPOOL 0d78d47dbaeaeba887d280d488504b814a64e53ffd937fb9a590682432e58a4c441d8821e51b9d822c03e2c845322c2d9b8eaa9a40db749c36148164cc8489d0
+EBUILD gnutls-2.12.20.ebuild 3585 SHA256 3989d9ec76df046c42e5e5c1cc2bde9646d8e3106df1c1ce9ebb5a0cbc03d3c4 SHA512 6486fc72b5ddc67a855a6c54ca7a0bbe41f8bd35b3ed75a1d5cfa9e9b3f2cc43a80ea0eaec4fc8bf07365f36cff7b40112048f5bb8ca982503c52de0f175fa1f WHIRLPOOL 590a66a7f397a0cc663cb8d92d14ae606a477830fa709d6b53bbfcd82d63cc7c1f56f9a5ca67032f32f867557c842e835bd8a815a87537316f145579e4b133b6
+EBUILD gnutls-3.1.3.ebuild 2927 SHA256 e759c04a3c3cfd38f73a59bd2d9109c8b594a165e1baa13061ab0bc3463b3ca7 SHA512 06ad978a891965533948ba2617a7f6a9529aaad7a4ba8809589059608dffba85af11052a11d3310b07849d34a4c8783749f0a8b50b1f48885304c5c7a25e071a WHIRLPOOL 753727ee8aa53e3284273b51b51808b085fd91dbbae26c75a4794fb5bebfde04c5ad544809b8994fe53f2307f20295060759d2af0be65957f8cddf3ef6faf738
+MISC ChangeLog 57645 SHA256 b358236460d1d54a8c7059e51dfa55d858fc7d964b3b6e30861a0437a6cd07b0 SHA512 4a0bcf93e78756dcf4c10525ed95551811eb16eff3050a16851c6f48ef0bd8661ae336cd385de75b8e10878da0e96c9233f9625c50badcd0b47bd4b19c2d6665 WHIRLPOOL a9b6fcc96261dfd5205249b79d7440525cae5d142097bf5fce37769c9b23a661e3ccff19921304071ac477af7ea763ce39c84031ee4d7845a8e108a9086ae357
 MISC metadata.xml 608 SHA256 358aeb9effbe98a9a7b7107b17a6d88d3c81365c2e87e5378a622d85e40d89eb SHA512 704b47d97a7decd410a31f71199b44b2bd6c6bd370dd6280120346426bfe568ab5e70f37404bc02c20c009d0f262d3c2629d289ef0c89556482d6a143a4e2f9c WHIRLPOOL f6f1528d14bb711e7da63c4960b865815ce3a242a13e64526bc01e74e48ebb8bd099895537921e94e8586eb12e7827dfc4dfdecc6e0c61946f167a624e24b991
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQebwKAAoJEBzRPIrUMBNCKzEH/1SHz7l/uLbyeBWqlMRxO3sB
-SsIAAklIXBOc8W3qVS8LXngLjga4tnIeob7XNnUo4+QiYwxmsqnhHxD5NWMNq6L3
-+Js8ZgGUnnhxJzr3tr439uZp+GxJLaFV7LRaI6holoZZkV2OjtmrHYxJG7haUyiR
-XqLacfahg7GXfUepxAEgZ4VcBsMbK+r5ZpwobX95pHIa7z7DmZQcDpso4IejzQbM
-6fFzjYqnQDi/aC46QaSIJp5MXKEkWD+Gkedz+ZAOQL3+bQ+J1OlirhnKq9Z0Lv/u
-sCxU0CNi9N3e8/x1NonLPDKQ4Gm3WpFeDbkATQHG55+gzzAdcGguB/JEFEA5Iwg=
-=N29A
+iQIcBAEBCAAGBQJQganpAAoJEEPsD3/icQSzuLEP/2tah5oiQHuB8kO4/85vCsWn
+j8kH/X/anreqPtGIk0AmF+rdKB0edhWSF5u/Jey64pPDddra3TkUOHVQJYSTUUp6
+A82N0qAfIFdd82vMNoisjvbETR0Qn89xl/ALbOcrazuKk6FnmuHNZPFdOUDBpMwN
+ZifDWbLkyR/G2Qot0UC/0mCRUyo6xCh0LgmCnXj1e3eC6wbwtIum2yl9VOEKeFI4
+MWFRqxKui72DN1lkQwjRueYvgjjEJBieZVtg/PR9LUEDAqQW0DzUF+5I2Q04GC3Z
+sbyWKREvvQKuc+ZJBovx85xsyUOPj8gowB0HqS7fsrxCx5Vmc++U0VJ69Jf8/djy
+iEu/FbjKBfPF5Z1H2E6ooPikeDbFwA5zIB/a/XiDq1sQZOAv8xOdUf9+0pD3P1RH
+9hto4AMBTHjPVf4thVa2sqRjVUSq1xfsJdw4BznGl9cAbn0B1JuIk7GflXxclLRM
+nr9GumQcgQZjPNAm4rUMaycUAWIpv9/DT6xpje/Jfg/PgytmJBoG4u97bEnsULEi
+T7tGjp5tHrAt64UdDKr/0kVqMjcJ5M5aYZOsmhqnPtgZ2xUSPOMb8oSNYwK/a0GI
+GBgaGvvoPa2Qg6YlWsffjfwJC/vRllMrRkfWEFiXrYfeWTPg4OffmFhpdh9usBz8
+osd2w1vvrjBETzyOBmbY
+=hG/c
 -----END PGP SIGNATURE-----