Really fix hpux-dso patch this time. Thanks to Arfrever

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

3 files changed, 22 insertions, 18 deletions

diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog
index c482c655693a..1a00578545a8 100644
--- a/dev-vcs/subversion/ChangeLog
+++ b/dev-vcs/subversion/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/subversion
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.158 2014/01/08 09:42:20 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.159 2014/01/08 10:09:27 polynomial-c Exp $
+
+  08 Jan 2014; Lars Wendler <polynomial-c@gentoo.org>
+  files/subversion-1.8.0-hpux-dso.patch:
+  Really fix hpux-dso patch this time. Thanks to Arfrever.
 
   08 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> subversion-1.8.5.ebuild:
   Really use pkg-config for finding serf.
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 76948d7799b8..f8d2f366433b 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -11,7 +11,7 @@ AUX subversion-1.6.3-hpux-dso.patch 627 SHA256 0fa69598635ea9630e95e3e8b693cd5f1
 AUX subversion-1.6.3-kwallet_window.patch 10012 SHA256 5304f39189bed6f83a8342593f23819cf2e12c2288c9daba23dcd78913fd79de SHA512 e21fc601ee23ca75ebf089627e425696e39015fc9ceb55defc85d758e3a9ee191c11a7af8b78857b32c821730313b75b237b674d1eec31e51292b82f4fe10352 WHIRLPOOL 74fcd09ff7f4e6831ef1708970794f7b16e711fe0d264c4d5748afae7ed071b301ef72021076d14260d9032be873930d59ca87c0b92cbb6174d3a0cab1c071f5
 AUX subversion-1.7.6-kwallet.patch 1624 SHA256 61a1f2c9a05553ab874a07765e9680bcf7af5adc843fcfaf7f6c4c0a1e5454a7 SHA512 90b8b2e8200f54deeb2da7b79d133b57863b3279dc7bb169e1d71ee54c9c727bda5cd60abdfb5076f25a6273bd64ccfa3c577e55d70545fa252dd1092eefcdde WHIRLPOOL fcb1ca01e3b2e510d9a9bb2614d0a4893414d0093a05e2930edb98ef1c2d7cb2e136b1f714172858a327db4beea7995274e37db8ebf98f4fcb7cc8ad6063144c
 AUX subversion-1.7.6-revert-mod_dontdothat-move.patch 6001 SHA256 c01a12f8fd96c6470caabce97c7a3ef651b4fbe8dd8656bc8854fc3f65e4f7dd SHA512 927be300babe1692f4ca942e8e9fc3e4211aa3890c22adf6a70804c7293761335015da98040ed3acdee3f151b7f92a8d15014589b718711165ebf638f35b56a3 WHIRLPOOL 65d01a348c11dcfe6f23d6f0761f47ee328774b0dc954c56194fed12fe6945d4c408be55d852cba5f541aff4efc118abc07d2cfd1a45c4a6b77d7528b4da1d45
-AUX subversion-1.8.0-hpux-dso.patch 599 SHA256 aa508b478d525361142342d37f95d1dd862fd8ed7e13bd388a1a231577c68232 SHA512 a651293d90e0a13a8365451031399aa705635809f8fb37f6e7cea22f024e185e601db9331a8a784221a5abd1a5529ee97779793ca71c9a871240bae4fdc87225 WHIRLPOOL 9c2d4e3242613fccf3b8cee5af7e5da84d3ed4a08cbebf781d8bd4a15c37d9ef31082512f25e1cc328c7801e8dfa70d02da7270ec8a93e8a28f7120031a40f5c
+AUX subversion-1.8.0-hpux-dso.patch 615 SHA256 1ef3e8ae4d881ae9eec6c6e40ddff2e326357e39069c53b84e51b138f05d409a SHA512 02286f248caccc7ed2b834d8b648b9229fbbaabb69535f2d63b64f6e8711e96420f368917ada5d46f8882c085d68be5acf1ddadf6b7033c9fab70ade1348b2b1 WHIRLPOOL d9050799234d2af014d054ab4a9e13e3f6cd24981e1a4ae6f3313216cc744450e6bfe5aa0bb95ef777e7253b2c1f2609cb678a32a0d3e9ada77b20569b6f5a6c
 AUX subversion-1.8.1-revert_bdb6check.patch 3160 SHA256 4b42624c83c87a19c9e1f60fb08b1875e2de696bc6b92835e1404d689d078954 SHA512 9845582e974bad914608f9fa24fe8bb980ce525e94ddac0a9238953e3902879c492aff9388f11727e400c7ccf6a1aa9f2030d58e7b268e44363b53c312a39ec3 WHIRLPOOL 168f53408a1d9ab6f60dd1b5413b2187da832bec960a52d68757edf3ffd187e44672f15b08ac26fb6f966b91ea888da7525020d6d1a6148736f15e713efd3f62
 AUX subversion-fix-parallel-build-support-for-perl-bindings.patch 515 SHA256 c7a9fe0f095de7e49e219af5cabdff28751ee39aa42e712c4b8b3bc0ed64d50c SHA512 c24cf217e3d5c8e31b28c38d63e994ef131b410a7a6ab00b31772a0863f216d9d3482810928ab2cf7025baf632a415435653fd3fd2fd3780013b70a53ccf5cad WHIRLPOOL e7bb2c833d2393f82f769007d5df35e97ed8766cea5f9f5c64e41ed6369950a6aa8c73e44e9803656ec2ac21706e69cc3cf05f45a5dd1abe85fdb2cb9d0894bf
 AUX svnserve.confd 322 SHA256 45f2dc1a718aed885559e71d98112e670c92bd6b4f19c5cf593eced6cd2bbd97 SHA512 c84d96dad0deb40a04963654c5d0874697f2b270751b3ec41bec64847d61d9e88e336e2ee5da438a527b9d8b8b24d7ddbeacdd4bd4ce02db3629fc0972e0c289 WHIRLPOOL c91f8454f4a6d7fc9823bfbded1432993da14574693cfb4ffd6902fce136b2a14dc23616b523cf89e06493f96317ed0520a586af022d2cb1bea025ec99e53ed8
@@ -22,22 +22,22 @@ DIST subversion-1.7.14.tar.bz2 6045932 SHA256 c4ac8f37eb0ebd38901bfa6f1c7e4d7716
 DIST subversion-1.8.5.tar.bz2 6881572 SHA256 fd522bf1ecda1c09426ed6c436f0744ab95c31702b0904add089864c73ee7564 SHA512 1a7f19c2ea09c16f66cefef2454e8650f92caac0c505b83e52b32d51ccfece07d5623a26ee7b728c1c4c1bc6c5240cc2b5d65f9aab661d1094c04ed13339b1f6 WHIRLPOOL 89c3b5ea9f4bfe70a05d412a87f278ce74fdcb4b1fdad4905c60729f4a4e01c3a895178313a26358b2e5ab280f9fa8fd5c81c68af6f027d313b40ebcbcb5c3e0
 EBUILD subversion-1.7.14.ebuild 14637 SHA256 f762bef34ffe8b7ffb5389085ebfe92b10066defc26338abe93a17a1b7eb0a57 SHA512 bf423b3878ee0cd1da32a1f1b6c10ae32bcb8d0bcaa85a7ac3ebbe8c745ec7f7e0604a5bd84b3600c2cd48f3df42891b5fa24ec4729581da24e8c4ad7b71aa80 WHIRLPOOL b26587efe46c82f38432940914e14d55eefb58a0bafec86ea5bf54f9f8c2a032b87b90fbf2556e7e42ca51578e785347cc259b93a8c5aedfe56c0fff37fb8a9b
 EBUILD subversion-1.8.5.ebuild 14436 SHA256 567c0822ab8cae8479a19498c2ac61a14e3e44b45e60fd0e9a7f74ec6175fc0c SHA512 69315928eeb6241ec4bddc548112daf4e44c6b9b5e0947f4d6d3ca923d95e704dd73cad474bb5f6313e741a22648b51ebe6856a16e5c96f7202fa33785e81774 WHIRLPOOL cd3967f54d4482ae552e5fd71d9b08785f8c12422a7db1a872362af79b27623c051fff2ad2f447f2daa473b28e2d14001e8ac01290c614d86f78b30f06840514
-MISC ChangeLog 95651 SHA256 c19fc004d9fb4bb46458631c493ef9075f8cb6407f7089b5c662e13ad6b816b4 SHA512 b42b9bbf1f69ee68ff2da1a5937f2ccac1a27094e58e342505141cbfc0ba0ff881676845a32bec8989f505fcd339942a76132298075e1499a399c292224ee435 WHIRLPOOL 549c38a1f50afa36fcafec57f43709a50055ed424b8990e4ab61392ec12ff60a1f623cb68e0c4cf11562c354e856a97f7da93868a394e45b9cffefc84b971c83
+MISC ChangeLog 95806 SHA256 6875a3ba969686ddfba8302ffe20a1ca21a041afeeb66f43653f5e70974f2604 SHA512 0aca6703a9c9302100f826eb102e056728be23760bcc269d6e2387c9aa95c2bd96eed772e939b9640b3e465c6355aba5d4681e97a51f003321d0e2022499a77f WHIRLPOOL a4bb7f6fea25f165dba15dd31290e840cee085c33484fb00a7470f1d7cb0347a42fa88a8d538027b9b80bfed343c469e2422274cf6a4298bdd0041c44c998b37
 MISC metadata.xml 706 SHA256 17a4bceb3be5f371f153b3f9f7c1cd8d92e10e647eae2ac40af174f135bc7997 SHA512 b30564d6eb44e8c7cbe05dd3a1d52700e70ac5babfc6e0b0d770773322530f38a51a12927c411d42f0932fc161541c90cc97a2d7389b8e402840008229614894 WHIRLPOOL 8c197251aa3f242806b3297c6648807be96e927129230468da04ca44db34dfe25279b3ab9c55cff8b1b794e648374bbbe0eaecfab1db997b714735a4788e9a8f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSzR19AAoJEPiazRVxLXTFNOUP/iXh0kdXx9zm019QEPcT7tTU
-YHoxYcHB4CtRDV+8kghuap5i3RzVkktlcVYMI7sUz6y10lO1Zrur4xCvBWVQ2kE7
-JywDXh7uuVoFpUL9ro51x9SLHdZNQuiWe+f7yUvW7WgY1EgbXL+gdZSHaTY4Q4Wd
-iQnORVuhDBT1uCUzVV5S8WEl5zO4ffZPYtObzA9My/I38+NvNSUaXesq66bkWy6d
-TpqHPoEXbuPdrKYv9pTMGMOsGKW5rVQlDovD7zipAxU4b2Oqx4OcmR9IztJLBnXs
-Pr/6V/EzCVnDCbYNtGK9R5WNIGzlv3PGL8LtvYfGIThGDD+mvu34EQUpZYm9Syg7
-Ra53AK6UYE4tWqxT2kSYufgU32ssVLQ3zwbSDr/Mc9VVqQOgeWAHEhe1aawQmRyE
-SgX+cdH6IGObZKMbWfa4m18dY/OeWO4kBHUpTqyeJVAQjDi7dVL+tDbBGG0H9ekH
-hvNnM8odZ7diCc/qESPuPKy8ryjqbf7d9de+jopZG8vxKdGzI6atJmvRE+/1c4lQ
-ozuz15r/SphR1T4pIR7A6bzWQLGpcvfkIidbfhvAXFWtqJVqtuUwTS2A8mKUnD+R
-VEaKzORBcjfwx10mWPOR6h9PLe68RVX3uEORIBHNncoR5PzndN28sc1O8dMdx5vd
-HnLrwATPH6zwoeZojCOG
-=XcgD
+iQIcBAEBCAAGBQJSzSPYAAoJEPiazRVxLXTFHdoP/jmJldpR3SZQl2um5edym8fh
+AtqBjGSDO5Y87xwiEap2AnNEdJ5JvrmImP4uQi+Tt9gz2iJx4lDNvbIIs4SLUOIg
+6HiTMPGfxFz8Vp9Y7kZeZYRZH/QxXLCf/AOe7/x6WUHIKG9iG9V7wU7ztK8aJLFp
+yw4ECPb651JF7HHlNM1Z+JupG6ZD04zlEsH8qLvw17JY86OH+0URScTYP36cKLzn
+3qneMSRx1wd9VYOdVzyC7qK59S5oVzBt2rYWcMyjXEcijacthm1bNlsMf4Y8XkH0
+WrDmzw2rM9BesnSzoG7pJTkoU1pEhUSSaNFDIvGJ7b8lkEzh87feFpCaciVQwy5h
+SrXG45Cgk9RSO6Qg5U1K8AUDrIQpfr1DY5CEen7dAunAYlUTcfQfGOZDkg5awuGm
+qiy78/sI+XzouIxt6fkFk0QTrRGKvaL+sGLmu7Ve8VCIbUAujhm2IsOeXWzuVCaa
+ADGrR7AgMavQ+7Rzak1l1Kv9TxoVh4yFNrne+xyHpSEbSzZE6BZp9ZfTzdeFErkb
+GOluWMGJu/GuONvGN4ZTd1G4joZRDEZt7abZZ5oBbcuWw/2ITgVbSw3xJKVcSwVL
+AOtnoutow/YkvcFPHj09rrcjbGdLpwQl7x9HdJVwGEnKu5+p0jxolkhcjbyxUxWy
+61Xtz5tFbSNo3CVfv3xh
+=LX+z
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/subversion/files/subversion-1.8.0-hpux-dso.patch b/dev-vcs/subversion/files/subversion-1.8.0-hpux-dso.patch
index 7a51960da1da..80e5563672c7 100644
--- a/dev-vcs/subversion/files/subversion-1.8.0-hpux-dso.patch
+++ b/dev-vcs/subversion/files/subversion-1.8.0-hpux-dso.patch
@@ -5,8 +5,8 @@
      apr_status_t status;
  
 +#if defined(__hpux) && defined(__hppa)
-+    libname = apr_psprintf(pool, "libsvn_ra_%s-%d.sl.0",
-+			   ra_name, SVN_VER_MAJOR);
++    libname = apr_psprintf(pool, "libsvn_ra_%s-%d.sl.%d",
++			   ra_name, SVN_VER_MAJOR, SVN_SOVERSION);
 +#else
      libname = apr_psprintf(pool, "libsvn_ra_%s-%d.so.%d",
                             ra_name, SVN_VER_MAJOR, SVN_SOVERSION);