dev-vcs/subversion-1.8.8-r1: revbump/merge

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

3 files changed, 553 insertions, 36 deletions

diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 49542a9..6602e80 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -10,12 +10,15 @@ AUX subversion-1.7.6-kwallet.patch 1624 SHA256 61a1f2c9a05553ab874a07765e9680bcf
 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 615 SHA256 1ef3e8ae4d881ae9eec6c6e40ddff2e326357e39069c53b84e51b138f05d409a SHA512 02286f248caccc7ed2b834d8b648b9229fbbaabb69535f2d63b64f6e8711e96420f368917ada5d46f8882c085d68be5acf1ddadf6b7033c9fab70ade1348b2b1 WHIRLPOOL d9050799234d2af014d054ab4a9e13e3f6cd24981e1a4ae6f3313216cc744450e6bfe5aa0bb95ef777e7253b2c1f2609cb678a32a0d3e9ada77b20569b6f5a6c
 AUX subversion-1.8.1-revert_bdb6check.patch 3160 SHA256 4b42624c83c87a19c9e1f60fb08b1875e2de696bc6b92835e1404d689d078954 SHA512 9845582e974bad914608f9fa24fe8bb980ce525e94ddac0a9238953e3902879c492aff9388f11727e400c7ccf6a1aa9f2030d58e7b268e44363b53c312a39ec3 WHIRLPOOL 168f53408a1d9ab6f60dd1b5413b2187da832bec960a52d68757edf3ffd187e44672f15b08ac26fb6f966b91ea888da7525020d6d1a6148736f15e713efd3f62
+AUX subversion-1.8.5-swig-python-no-gnome-keyring.patch 39439 SHA256 0e0e8364ef4ba9835968a68329020f0ae1047c9d06c440a4bca21fa0f5effe19 SHA512 ecb8a11ae3fe8904d2381b85f841eedaf4d1f303baf079aab9a83a70c4b34212c7399f86276fb3e5b34557b2dde911f7abb246fe14cbc0a6b8c5fa15357d01a0 WHIRLPOOL e95ffc62e915814e359e9f603c8c2688395d45ef7a04aab107df46ed001c6741c0a74b8c02091af8eb84b294bd74b73f1adbb202965827d6647926e2292d3e50
 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
 AUX svnserve.initd 818 SHA256 4f9d38d5b32d4436dcb302f7e3c7284e67d6339b25b0f057a306b978f4a06142 SHA512 aa5493c364a761bef8728187bdbf9ed89f341121be502d3dabfc377c43b973d71eba38145c7e2679a0d457000396af164e5ca8f6f7d23c8a5fb61134f55297d7 WHIRLPOOL 5b0114b76ee2d8c6e8925a6d294826b5d08afcf4c98145cceed9c59459740e40a8cac58493d5838d58004e44f32ef77dc8bdba2475fba4742e47c28b6c4ba8ca
 AUX svnserve.initd2 828 SHA256 8f123253c3bfb9bbe87210a9e1facc7f52df371747dbc188396740a5cf4fa713 SHA512 48729e3befc9fb9f26bbb58f3e3694cecec491df65eb7251af85bec1aa16f6d1b406f2ef072c93c9136e261d8ce64aa658bf41f812c1a555c7014521c2ff775f WHIRLPOOL bbff4d5010a0f6ceb0e9e2f76984c9935f610b18163e7e5c426059a48f84451e5cbeae86582d6dd22d9a59dc47f71b253b19cce9ed6761a29013877a32cb5d81
 AUX svnserve.xinetd 332 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2 SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae WHIRLPOOL 0c5ed79630859706f18b56fbb910b4b2dc6b480cdf72a929f7d33232f23ee1eb7110b98c4a8e06cd06c620b9f4ff081bfae23edd1f6a65fade2ac5081dbf3962
 DIST subversion-1.8.5.tar.bz2 6881572 SHA256 fd522bf1ecda1c09426ed6c436f0744ab95c31702b0904add089864c73ee7564 SHA512 1a7f19c2ea09c16f66cefef2454e8650f92caac0c505b83e52b32d51ccfece07d5623a26ee7b728c1c4c1bc6c5240cc2b5d65f9aab661d1094c04ed13339b1f6 WHIRLPOOL 89c3b5ea9f4bfe70a05d412a87f278ce74fdcb4b1fdad4905c60729f4a4e01c3a895178313a26358b2e5ab280f9fa8fd5c81c68af6f027d313b40ebcbcb5c3e0
+DIST subversion-1.8.8.tar.bz2 6821200 SHA256 1569931cd85ae27052895554bc14125e0795d7a17d3e4a7c2aceb7289be71db3 SHA512 9cb3fc05a432336f7df5c81864dcc0b4c4154e61207b636f2e6715e132d436962bb6def70e5b7c45bfea58ead5e328f8db3abd98176c9400c31483262e72819d WHIRLPOOL 2b2880ff00d3cb6f76ca8954a03522510ff8b32e31090b61ccb037d108b1457b5b17b9063cd817c611fe6772953b937331f1a81f9f1481a240353beb3c51ac0b
 EBUILD subversion-1.8.5-r1.ebuild 14109 SHA256 135358a98addf13fd8d58b745ca2792245c22ee75990c268bc5d1f198a8aee05 SHA512 d3a2c965c19a46c6a89adb882e5478a401e582fcac03deb76eddc473c30fc4f9f978ca55ace2f710832f6c5545233eebd1b149cca11c2daafa6527f9d894cafc WHIRLPOOL f7e6b1e1eef06a6bc492ee1ba7184acc72e0c972aa9f495329c4cc72275ebd192dd40932f6a57bf849b4f107723df018aa66d3adfeadd6d0fb86362cf1096818
+EBUILD subversion-1.8.8-r1.ebuild 14916 SHA256 19bfafe1226176c006744b978380517e87b69bde7ea0e74648ea999dbf603679 SHA512 20751582e33aa9169468612ce88bcb62ff7f4f8780bf90ce5fac81214095ac2b06cff8019c4d08c28697562184df9b4247d839b39e1886f475074f3c173f5dba WHIRLPOOL 7025e800eefeb83c2f7431fb2101b113f74c769c9f999530d3da0562f0be7c259371da14cbad8cf6501b7f45af7477fa3a9a05b33728eb44f945bd619c5cc82e
 MISC ChangeLog 95806 SHA256 6875a3ba969686ddfba8302ffe20a1ca21a041afeeb66f43653f5e70974f2604 SHA512 0aca6703a9c9302100f826eb102e056728be23760bcc269d6e2387c9aa95c2bd96eed772e939b9640b3e465c6355aba5d4681e97a51f003321d0e2022499a77f WHIRLPOOL a4bb7f6fea25f165dba15dd31290e840cee085c33484fb00a7470f1d7cb0347a42fa88a8d538027b9b80bfed343c469e2422274cf6a4298bdd0041c44c998b37
 MISC metadata.xml 706 SHA256 17a4bceb3be5f371f153b3f9f7c1cd8d92e10e647eae2ac40af174f135bc7997 SHA512 b30564d6eb44e8c7cbe05dd3a1d52700e70ac5babfc6e0b0d770773322530f38a51a12927c411d42f0932fc161541c90cc97a2d7389b8e402840008229614894 WHIRLPOOL 8c197251aa3f242806b3297c6648807be96e927129230468da04ca44db34dfe25279b3ab9c55cff8b1b794e648374bbbe0eaecfab1db997b714735a4788e9a8f
diff --git a/dev-vcs/subversion/files/subversion-1.8.5-swig-python-no-gnome-keyring.patch b/dev-vcs/subversion/files/subversion-1.8.5-swig-python-no-gnome-keyring.patch
new file mode 100644
index 0000000..9feccfb
--- /dev/null
+++ b/dev-vcs/subversion/files/subversion-1.8.5-swig-python-no-gnome-keyring.patch
@@ -0,0 +1,495 @@
+https://trac.macports.org/browser/trunk/dports/devel/subversion-python27bindings/files/patch-swig-python-core.diff
+
+diff -u -d -b -w -r subversion-1.8.0-orig/subversion/bindings/swig/python/core.c subversion-1.8.0-python/subversion/bindings/swig/python/core.c
+--- subversion/bindings/swig/python/core.c	2013-06-13 05:07:20.000000000 -0400
++++ subversion/bindings/swig/python/core.c	2013-07-12 16:11:05.000000000 -0400
+@@ -2958,140 +2958,139 @@
+ #define SWIGTYPE_p_apr_size_t swig_types[15]
+ #define SWIGTYPE_p_char swig_types[16]
+ #define SWIGTYPE_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[17]
+-#define SWIGTYPE_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[18]
+-#define SWIGTYPE_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void swig_types[19]
+-#define SWIGTYPE_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[20]
+-#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[21]
+-#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[22]
+-#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[23]
+-#define SWIGTYPE_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[24]
+-#define SWIGTYPE_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[25]
+-#define SWIGTYPE_p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[26]
+-#define SWIGTYPE_p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[27]
+-#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void__int swig_types[28]
+-#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int swig_types[29]
+-#define SWIGTYPE_p_f_p_q_const__char_p_void__int swig_types[30]
+-#define SWIGTYPE_p_f_p_q_const__char_p_void_p_apr_pool_t__int swig_types[31]
+-#define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[32]
+-#define SWIGTYPE_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[33]
+-#define SWIGTYPE_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[34]
+-#define SWIGTYPE_p_f_p_svn_boolean_t_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[35]
+-#define SWIGTYPE_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[36]
+-#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[37]
+-#define SWIGTYPE_p_f_p_void_apr_size_t__p_svn_error_t swig_types[38]
+-#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[39]
+-#define SWIGTYPE_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t swig_types[40]
+-#define SWIGTYPE_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t swig_types[41]
+-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t swig_types[42]
+-#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t swig_types[43]
+-#define SWIGTYPE_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t swig_types[44]
+-#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[45]
+-#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[46]
+-#define SWIGTYPE_p_f_void__p_svn_version_t swig_types[47]
+-#define SWIGTYPE_p_int swig_types[48]
+-#define SWIGTYPE_p_long swig_types[49]
+-#define SWIGTYPE_p_p_apr_array_header_t swig_types[50]
+-#define SWIGTYPE_p_p_apr_file_t swig_types[51]
+-#define SWIGTYPE_p_p_apr_hash_t swig_types[52]
+-#define SWIGTYPE_p_p_char swig_types[53]
+-#define SWIGTYPE_p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[54]
+-#define SWIGTYPE_p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void swig_types[55]
+-#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[56]
+-#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[57]
+-#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[58]
+-#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[59]
+-#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[60]
+-#define SWIGTYPE_p_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[61]
+-#define SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void__int swig_types[62]
+-#define SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int swig_types[63]
+-#define SWIGTYPE_p_p_f_p_q_const__char_p_void__int swig_types[64]
+-#define SWIGTYPE_p_p_f_p_q_const__char_p_void_p_apr_pool_t__int swig_types[65]
+-#define SWIGTYPE_p_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[66]
+-#define SWIGTYPE_p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[67]
+-#define SWIGTYPE_p_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[68]
+-#define SWIGTYPE_p_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[69]
+-#define SWIGTYPE_p_p_f_p_void__p_svn_error_t swig_types[70]
+-#define SWIGTYPE_p_p_f_p_void_apr_size_t__p_svn_error_t swig_types[71]
+-#define SWIGTYPE_p_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[72]
+-#define SWIGTYPE_p_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t swig_types[73]
+-#define SWIGTYPE_p_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t swig_types[74]
+-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t swig_types[75]
+-#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t swig_types[76]
+-#define SWIGTYPE_p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t swig_types[77]
+-#define SWIGTYPE_p_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[78]
+-#define SWIGTYPE_p_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[79]
+-#define SWIGTYPE_p_p_f_void__p_svn_version_t swig_types[80]
+-#define SWIGTYPE_p_p_svn_auth_baton_t swig_types[81]
+-#define SWIGTYPE_p_p_svn_auth_cred_simple_t swig_types[82]
+-#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[83]
+-#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_t swig_types[84]
+-#define SWIGTYPE_p_p_svn_auth_cred_ssl_server_trust_t swig_types[85]
+-#define SWIGTYPE_p_p_svn_auth_cred_username_t swig_types[86]
+-#define SWIGTYPE_p_p_svn_auth_iterstate_t swig_types[87]
+-#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[88]
+-#define SWIGTYPE_p_p_svn_checksum_t swig_types[89]
+-#define SWIGTYPE_p_p_svn_config_t swig_types[90]
+-#define SWIGTYPE_p_p_svn_io_dirent2_t swig_types[91]
+-#define SWIGTYPE_p_p_svn_stream_mark_t swig_types[92]
+-#define SWIGTYPE_p_p_svn_stream_t swig_types[93]
+-#define SWIGTYPE_p_p_svn_string_t swig_types[94]
+-#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[95]
+-#define SWIGTYPE_p_p_void swig_types[96]
+-#define SWIGTYPE_p_svn_auth_baton_t swig_types[97]
+-#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[98]
+-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[99]
+-#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[100]
+-#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[101]
+-#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[102]
+-#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[103]
+-#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[104]
+-#define SWIGTYPE_p_svn_auth_provider_t swig_types[105]
+-#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[106]
+-#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[107]
+-#define SWIGTYPE_p_svn_checksum_kind_t swig_types[108]
+-#define SWIGTYPE_p_svn_checksum_t swig_types[109]
+-#define SWIGTYPE_p_svn_commit_info_t swig_types[110]
+-#define SWIGTYPE_p_svn_config_t swig_types[111]
+-#define SWIGTYPE_p_svn_depth_t swig_types[112]
+-#define SWIGTYPE_p_svn_dirent_t swig_types[113]
+-#define SWIGTYPE_p_svn_errno_t swig_types[114]
+-#define SWIGTYPE_p_svn_error_t swig_types[115]
+-#define SWIGTYPE_p_svn_io_dirent2_t swig_types[116]
+-#define SWIGTYPE_p_svn_io_dirent_t swig_types[117]
+-#define SWIGTYPE_p_svn_io_file_del_t swig_types[118]
+-#define SWIGTYPE_p_svn_location_segment_t swig_types[119]
+-#define SWIGTYPE_p_svn_lock_t swig_types[120]
+-#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[121]
+-#define SWIGTYPE_p_svn_log_changed_path_t swig_types[122]
+-#define SWIGTYPE_p_svn_log_entry_t swig_types[123]
+-#define SWIGTYPE_p_svn_merge_range_t swig_types[124]
+-#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[125]
+-#define SWIGTYPE_p_svn_node_kind_t swig_types[126]
+-#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[127]
+-#define SWIGTYPE_p_svn_opt_revision_t swig_types[128]
+-#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[129]
+-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[130]
+-#define SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides swig_types[131]
+-#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[132]
+-#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[133]
+-#define SWIGTYPE_p_svn_prop_kind swig_types[134]
+-#define SWIGTYPE_p_svn_prop_t swig_types[135]
+-#define SWIGTYPE_p_svn_stream_mark_t swig_types[136]
+-#define SWIGTYPE_p_svn_stream_t swig_types[137]
+-#define SWIGTYPE_p_svn_string_t swig_types[138]
+-#define SWIGTYPE_p_svn_stringbuf_t swig_types[139]
+-#define SWIGTYPE_p_svn_tristate_t swig_types[140]
+-#define SWIGTYPE_p_svn_version_checklist_t swig_types[141]
+-#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[142]
+-#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[143]
+-#define SWIGTYPE_p_svn_version_extended_t swig_types[144]
+-#define SWIGTYPE_p_svn_version_t swig_types[145]
+-#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[146]
+-#define SWIGTYPE_p_unsigned_char swig_types[147]
+-#define SWIGTYPE_p_unsigned_long swig_types[148]
+-#define SWIGTYPE_p_void swig_types[149]
+-static swig_type_info *swig_types[151];
+-static swig_module_info swig_module = {swig_types, 150, 0, 0, 0, 0};
++#define SWIGTYPE_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void swig_types[18]
++#define SWIGTYPE_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[19]
++#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[20]
++#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[21]
++#define SWIGTYPE_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[22]
++#define SWIGTYPE_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[23]
++#define SWIGTYPE_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[24]
++#define SWIGTYPE_p_f_p_p_void_p_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[25]
++#define SWIGTYPE_p_f_p_p_void_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[26]
++#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void__int swig_types[27]
++#define SWIGTYPE_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int swig_types[28]
++#define SWIGTYPE_p_f_p_q_const__char_p_void__int swig_types[29]
++#define SWIGTYPE_p_f_p_q_const__char_p_void_p_apr_pool_t__int swig_types[30]
++#define SWIGTYPE_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[31]
++#define SWIGTYPE_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[32]
++#define SWIGTYPE_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[33]
++#define SWIGTYPE_p_f_p_svn_boolean_t_p_void_p_void_p_apr_hash_t_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[34]
++#define SWIGTYPE_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[35]
++#define SWIGTYPE_p_f_p_void__p_svn_error_t swig_types[36]
++#define SWIGTYPE_p_f_p_void_apr_size_t__p_svn_error_t swig_types[37]
++#define SWIGTYPE_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[38]
++#define SWIGTYPE_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t swig_types[39]
++#define SWIGTYPE_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t swig_types[40]
++#define SWIGTYPE_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t swig_types[41]
++#define SWIGTYPE_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t swig_types[42]
++#define SWIGTYPE_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t swig_types[43]
++#define SWIGTYPE_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[44]
++#define SWIGTYPE_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[45]
++#define SWIGTYPE_p_f_void__p_svn_version_t swig_types[46]
++#define SWIGTYPE_p_int swig_types[47]
++#define SWIGTYPE_p_long swig_types[48]
++#define SWIGTYPE_p_p_apr_array_header_t swig_types[49]
++#define SWIGTYPE_p_p_apr_file_t swig_types[50]
++#define SWIGTYPE_p_p_apr_hash_t swig_types[51]
++#define SWIGTYPE_p_p_char swig_types[52]
++#define SWIGTYPE_p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void swig_types[53]
++#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[54]
++#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[55]
++#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_client_cert_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[56]
++#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_ssl_server_trust_t_p_void_p_q_const__char_apr_uint32_t_p_q_const__svn_auth_ssl_server_cert_info_t_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[57]
++#define SWIGTYPE_p_p_f_p_p_svn_auth_cred_username_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t swig_types[58]
++#define SWIGTYPE_p_p_f_p_p_svn_stream_t_p_void_p_apr_pool_t_p_apr_pool_t__p_svn_error_t swig_types[59]
++#define SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void__int swig_types[60]
++#define SWIGTYPE_p_p_f_p_q_const__char_p_q_const__char_p_void_p_apr_pool_t__int swig_types[61]
++#define SWIGTYPE_p_p_f_p_q_const__char_p_void__int swig_types[62]
++#define SWIGTYPE_p_p_f_p_q_const__char_p_void_p_apr_pool_t__int swig_types[63]
++#define SWIGTYPE_p_p_f_p_q_const__svn_commit_info_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[64]
++#define SWIGTYPE_p_p_f_p_svn_boolean_t_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t swig_types[65]
++#define SWIGTYPE_p_p_f_p_svn_boolean_t_p_void_p_q_const__char_p_q_const__char_p_apr_hash_t_p_apr_pool_t__p_svn_error_t swig_types[66]
++#define SWIGTYPE_p_p_f_p_svn_location_segment_t_p_void_p_apr_pool_t__p_svn_error_t swig_types[67]
++#define SWIGTYPE_p_p_f_p_void__p_svn_error_t swig_types[68]
++#define SWIGTYPE_p_p_f_p_void_apr_size_t__p_svn_error_t swig_types[69]
++#define SWIGTYPE_p_p_f_p_void_p_apr_hash_t_svn_revnum_t_p_q_const__char_p_q_const__char_p_q_const__char_p_apr_pool_t__p_svn_error_t swig_types[70]
++#define SWIGTYPE_p_p_f_p_void_p_char_p_apr_size_t__p_svn_error_t swig_types[71]
++#define SWIGTYPE_p_p_f_p_void_p_p_svn_stream_mark_t_p_apr_pool_t__p_svn_error_t swig_types[72]
++#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_apr_size_t__p_svn_error_t swig_types[73]
++#define SWIGTYPE_p_p_f_p_void_p_q_const__char_p_q_const__apr_finfo_t_p_apr_pool_t__p_svn_error_t swig_types[74]
++#define SWIGTYPE_p_p_f_p_void_p_q_const__svn_stream_mark_t__p_svn_error_t swig_types[75]
++#define SWIGTYPE_p_p_f_p_void_p_svn_log_entry_t_p_apr_pool_t__p_svn_error_t swig_types[76]
++#define SWIGTYPE_p_p_f_svn_revnum_t_p_q_const__char_p_q_const__char_p_void__p_svn_error_t swig_types[77]
++#define SWIGTYPE_p_p_f_void__p_svn_version_t swig_types[78]
++#define SWIGTYPE_p_p_svn_auth_baton_t swig_types[79]
++#define SWIGTYPE_p_p_svn_auth_cred_simple_t swig_types[80]
++#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[81]
++#define SWIGTYPE_p_p_svn_auth_cred_ssl_client_cert_t swig_types[82]
++#define SWIGTYPE_p_p_svn_auth_cred_ssl_server_trust_t swig_types[83]
++#define SWIGTYPE_p_p_svn_auth_cred_username_t swig_types[84]
++#define SWIGTYPE_p_p_svn_auth_iterstate_t swig_types[85]
++#define SWIGTYPE_p_p_svn_auth_provider_object_t swig_types[86]
++#define SWIGTYPE_p_p_svn_checksum_t swig_types[87]
++#define SWIGTYPE_p_p_svn_config_t swig_types[88]
++#define SWIGTYPE_p_p_svn_io_dirent2_t swig_types[89]
++#define SWIGTYPE_p_p_svn_stream_mark_t swig_types[90]
++#define SWIGTYPE_p_p_svn_stream_t swig_types[91]
++#define SWIGTYPE_p_p_svn_string_t swig_types[92]
++#define SWIGTYPE_p_p_svn_stringbuf_t swig_types[93]
++#define SWIGTYPE_p_p_void swig_types[94]
++#define SWIGTYPE_p_svn_auth_baton_t swig_types[95]
++#define SWIGTYPE_p_svn_auth_cred_simple_t swig_types[96]
++#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_pw_t swig_types[97]
++#define SWIGTYPE_p_svn_auth_cred_ssl_client_cert_t swig_types[98]
++#define SWIGTYPE_p_svn_auth_cred_ssl_server_trust_t swig_types[99]
++#define SWIGTYPE_p_svn_auth_cred_username_t swig_types[100]
++#define SWIGTYPE_p_svn_auth_gnome_keyring_unlock_prompt_func_t swig_types[101]
++#define SWIGTYPE_p_svn_auth_iterstate_t swig_types[102]
++#define SWIGTYPE_p_svn_auth_provider_object_t swig_types[103]
++#define SWIGTYPE_p_svn_auth_provider_t swig_types[104]
++#define SWIGTYPE_p_svn_auth_ssl_server_cert_info_t swig_types[105]
++#define SWIGTYPE_p_svn_checksum_ctx_t swig_types[106]
++#define SWIGTYPE_p_svn_checksum_kind_t swig_types[107]
++#define SWIGTYPE_p_svn_checksum_t swig_types[108]
++#define SWIGTYPE_p_svn_commit_info_t swig_types[109]
++#define SWIGTYPE_p_svn_config_t swig_types[110]
++#define SWIGTYPE_p_svn_depth_t swig_types[111]
++#define SWIGTYPE_p_svn_dirent_t swig_types[112]
++#define SWIGTYPE_p_svn_errno_t swig_types[113]
++#define SWIGTYPE_p_svn_error_t swig_types[114]
++#define SWIGTYPE_p_svn_io_dirent2_t swig_types[115]
++#define SWIGTYPE_p_svn_io_dirent_t swig_types[116]
++#define SWIGTYPE_p_svn_io_file_del_t swig_types[117]
++#define SWIGTYPE_p_svn_location_segment_t swig_types[118]
++#define SWIGTYPE_p_svn_lock_t swig_types[119]
++#define SWIGTYPE_p_svn_log_changed_path2_t swig_types[120]
++#define SWIGTYPE_p_svn_log_changed_path_t swig_types[121]
++#define SWIGTYPE_p_svn_log_entry_t swig_types[122]
++#define SWIGTYPE_p_svn_merge_range_t swig_types[123]
++#define SWIGTYPE_p_svn_mergeinfo_inheritance_t swig_types[124]
++#define SWIGTYPE_p_svn_node_kind_t swig_types[125]
++#define SWIGTYPE_p_svn_opt_revision_range_t swig_types[126]
++#define SWIGTYPE_p_svn_opt_revision_t swig_types[127]
++#define SWIGTYPE_p_svn_opt_revision_value_t swig_types[128]
++#define SWIGTYPE_p_svn_opt_subcommand_desc2_t swig_types[129]
++#define SWIGTYPE_p_svn_opt_subcommand_desc2_t_desc_overrides swig_types[130]
++#define SWIGTYPE_p_svn_opt_subcommand_desc_t swig_types[131]
++#define SWIGTYPE_p_svn_prop_inherited_item_t swig_types[132]
++#define SWIGTYPE_p_svn_prop_kind swig_types[133]
++#define SWIGTYPE_p_svn_prop_t swig_types[134]
++#define SWIGTYPE_p_svn_stream_mark_t swig_types[135]
++#define SWIGTYPE_p_svn_stream_t swig_types[136]
++#define SWIGTYPE_p_svn_string_t swig_types[137]
++#define SWIGTYPE_p_svn_stringbuf_t swig_types[138]
++#define SWIGTYPE_p_svn_tristate_t swig_types[139]
++#define SWIGTYPE_p_svn_version_checklist_t swig_types[140]
++#define SWIGTYPE_p_svn_version_ext_linked_lib_t swig_types[141]
++#define SWIGTYPE_p_svn_version_ext_loaded_lib_t swig_types[142]
++#define SWIGTYPE_p_svn_version_extended_t swig_types[143]
++#define SWIGTYPE_p_svn_version_t swig_types[144]
++#define SWIGTYPE_p_svn_wc_external_item2_t swig_types[145]
++#define SWIGTYPE_p_unsigned_char swig_types[146]
++#define SWIGTYPE_p_unsigned_long swig_types[147]
++#define SWIGTYPE_p_void swig_types[148]
++static swig_type_info *swig_types[150];
++static swig_module_info swig_module = {swig_types, 149, 0, 0, 0, 0};
+ #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
+ #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
+ 
+@@ -3834,29 +3833,6 @@
+ 
+ 
+ 
+-/* Helper function to set the gnome-keyring unlock prompt function. This
+- * C function accepts an auth baton, a function and a prompt baton, but
+- * the below callback_typemap uses both the function and the prompt
+- * baton, so the resulting binding has just two arguments: The auth
+- * baton and the prompt function.
+- * The prompt function should again have two arguments: The keyring name
+- * (string) and a pool (except for the ruby version, which doesn't have
+- * the pool argument). It should return the entered password (string).
+- * This binding generated for this function generates a reference to the
+- * prompt function that was passed into this. The caller should store
+- * that reference somewhere, to prevent the function from being garbage
+- * collected...
+- */
+-static void svn_auth_set_gnome_keyring_unlock_prompt_func(svn_auth_baton_t *ab,
+-                                                          svn_auth_gnome_keyring_unlock_prompt_func_t prompt_func,
+-                                                          void *prompt_baton) {
+-    svn_auth_set_parameter(ab, SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC,
+-                           prompt_func);
+-    svn_auth_set_parameter(ab, SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON,
+-                           prompt_baton);
+-}
+-
+-
+ static svn_error_t *
+ svn_swig_mergeinfo_merge(apr_hash_t **mergeinfo_inout,
+                          apr_hash_t *changes,
+@@ -17674,7 +17650,7 @@
+ SWIGINTERN PyObject *svn_auth_gnome_keyring_unlock_prompt_func_t_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+   PyObject *obj;
+   if (!PyArg_ParseTuple(args,(char*)"O:swigregister", &obj)) return NULL;
+-  SWIG_TypeNewClientData(SWIGTYPE_p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, SWIG_NewClientData(obj));
++  SWIG_TypeNewClientData(SWIGTYPE_p_svn_auth_gnome_keyring_unlock_prompt_func_t, SWIG_NewClientData(obj));
+   return SWIG_Py_Void();
+ }
+ 
+@@ -32562,40 +32538,6 @@
+   return SWIG_Py_Void();
+ }
+ 
+-SWIGINTERN PyObject *_wrap_svn_auth_set_gnome_keyring_unlock_prompt_func(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+-  PyObject *resultobj = 0;
+-  svn_auth_baton_t *arg1 = (svn_auth_baton_t *) 0 ;
+-  svn_auth_gnome_keyring_unlock_prompt_func_t arg2 = (svn_auth_gnome_keyring_unlock_prompt_func_t) 0 ;
+-  void *arg3 = (void *) 0 ;
+-  PyObject * obj0 = 0 ;
+-  PyObject * obj1 = 0 ;
+-  
+-  if (!PyArg_ParseTuple(args,(char *)"OO:svn_auth_set_gnome_keyring_unlock_prompt_func",&obj0,&obj1)) SWIG_fail;
+-  {
+-    arg1 = (svn_auth_baton_t *)svn_swig_MustGetPtr(obj0, SWIGTYPE_p_svn_auth_baton_t, svn_argnum_obj0);
+-    if (PyErr_Occurred()) {
+-      SWIG_fail;
+-    }
+-  }
+-  {
+-    arg2 = svn_swig_py_auth_gnome_keyring_unlock_prompt_func;
+-    arg3 = obj1;
+-  }
+-  {
+-    svn_swig_py_release_py_lock();
+-    
+-    svn_auth_set_gnome_keyring_unlock_prompt_func(arg1,arg2,arg3);
+-    
+-    svn_swig_py_acquire_py_lock();
+-    
+-  }
+-  resultobj = SWIG_Py_Void();
+-  return resultobj;
+-fail:
+-  return NULL;
+-}
+-
+-
+ SWIGINTERN PyObject *_wrap_svn_swig_py_set_application_pool(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+   PyObject *resultobj = 0;
+   PyObject *arg1 = (PyObject *) 0 ;
+@@ -33902,7 +33844,6 @@
+ 	 { (char *)"svn_checksum_is_empty_checksum", _wrap_svn_checksum_is_empty_checksum, METH_VARARGS, (char *)"svn_checksum_is_empty_checksum(svn_checksum_t checksum) -> svn_boolean_t"},
+ 	 { (char *)"svn_checksum_mismatch_err", _wrap_svn_checksum_mismatch_err, METH_VARARGS, (char *)"svn_checksum_mismatch_err(svn_checksum_t expected, svn_checksum_t actual, apr_pool_t scratch_pool, char const * fmt) -> svn_error_t"},
+ 	 { (char *)"svn_checksum_ctx_t_swigregister", svn_checksum_ctx_t_swigregister, METH_VARARGS, NULL},
+-	 { (char *)"svn_auth_set_gnome_keyring_unlock_prompt_func", _wrap_svn_auth_set_gnome_keyring_unlock_prompt_func, METH_VARARGS, (char *)"svn_auth_set_gnome_keyring_unlock_prompt_func(svn_auth_baton_t * ab, svn_auth_gnome_keyring_unlock_prompt_func_t prompt_func)"},
+ 	 { (char *)"svn_swig_py_set_application_pool", _wrap_svn_swig_py_set_application_pool, METH_VARARGS, (char *)"svn_swig_py_set_application_pool(PyObject * py_pool, apr_pool_t pool)"},
+ 	 { (char *)"svn_swig_py_clear_application_pool", _wrap_svn_swig_py_clear_application_pool, METH_VARARGS, (char *)"svn_swig_py_clear_application_pool()"},
+ 	 { (char *)"apr_array_header_t_swigregister", apr_array_header_t_swigregister, METH_VARARGS, NULL},
+@@ -33937,7 +33878,6 @@
+ static swig_type_info _swigt__p_apr_size_t = {"_p_apr_size_t", "apr_size_t *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t", "svn_opt_subcommand_t *|struct svn_error_t *(*)(apr_getopt_t *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "svn_auth_gnome_keyring_unlock_prompt_func_t|struct svn_error_t *(*)(char **,char const *,void *,apr_pool_t *)", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void = {"_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void", "svn_auth_simple_provider_func_t|svn_auth_ssl_client_cert_pw_provider_func_t|void (*)(struct svn_auth_provider_object_t **,apr_pool_t *)", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_simple_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_simple_t **,void *,char const *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "svn_auth_ssl_client_cert_pw_prompt_func_t|struct svn_error_t *(*)(svn_auth_cred_ssl_client_cert_pw_t **,void *,char const *,svn_boolean_t,apr_pool_t *)", 0, 0, (void*)0, 0};
+@@ -33973,7 +33913,6 @@
+ static swig_type_info _swigt__p_p_apr_file_t = {"_p_p_apr_file_t", "apr_file_t **", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_p_apr_hash_t = {"_p_p_apr_hash_t", "apr_hash_t **|svn_mergeinfo_t *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_p_char = {"_p_p_char", "char **", 0, 0, (void*)0, 0};
+-static swig_type_info _swigt__p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(char **,char const *,void *,apr_pool_t *)|svn_auth_gnome_keyring_unlock_prompt_func_t *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void = {"_p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void", "void (**)(struct svn_auth_provider_object_t **,apr_pool_t *)|svn_auth_simple_provider_func_t *|svn_auth_ssl_client_cert_pw_provider_func_t *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_auth_cred_simple_t **,void *,char const *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_simple_prompt_func_t *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t = {"_p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t", "struct svn_error_t *(**)(svn_auth_cred_ssl_client_cert_pw_t **,void *,char const *,svn_boolean_t,apr_pool_t *)|svn_auth_ssl_client_cert_pw_prompt_func_t *", 0, 0, (void*)0, 0};
+@@ -34022,6 +33961,7 @@
+ static swig_type_info _swigt__p_svn_auth_cred_ssl_client_cert_t = {"_p_svn_auth_cred_ssl_client_cert_t", "struct svn_auth_cred_ssl_client_cert_t *|svn_auth_cred_ssl_client_cert_t *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_svn_auth_cred_ssl_server_trust_t = {"_p_svn_auth_cred_ssl_server_trust_t", "struct svn_auth_cred_ssl_server_trust_t *|svn_auth_cred_ssl_server_trust_t *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_svn_auth_cred_username_t = {"_p_svn_auth_cred_username_t", "struct svn_auth_cred_username_t *|svn_auth_cred_username_t *", 0, 0, (void*)0, 0};
++static swig_type_info _swigt__p_svn_auth_gnome_keyring_unlock_prompt_func_t = {"_p_svn_auth_gnome_keyring_unlock_prompt_func_t", "svn_auth_gnome_keyring_unlock_prompt_func_t *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_svn_auth_iterstate_t = {"_p_svn_auth_iterstate_t", "struct svn_auth_iterstate_t *|svn_auth_iterstate_t *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_svn_auth_provider_object_t = {"_p_svn_auth_provider_object_t", "struct svn_auth_provider_object_t *|svn_auth_provider_object_t *", 0, 0, (void*)0, 0};
+ static swig_type_info _swigt__p_svn_auth_provider_t = {"_p_svn_auth_provider_t", "struct svn_auth_provider_t *|svn_auth_provider_t *", 0, 0, (void*)0, 0};
+@@ -34089,7 +34029,6 @@
+   &_swigt__p_apr_size_t,
+   &_swigt__p_char,
+   &_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t,
+-  &_swigt__p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
+   &_swigt__p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void,
+   &_swigt__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
+   &_swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
+@@ -34125,7 +34064,6 @@
+   &_swigt__p_p_apr_file_t,
+   &_swigt__p_p_apr_hash_t,
+   &_swigt__p_p_char,
+-  &_swigt__p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
+   &_swigt__p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void,
+   &_swigt__p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
+   &_swigt__p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
+@@ -34174,6 +34112,7 @@
+   &_swigt__p_svn_auth_cred_ssl_client_cert_t,
+   &_swigt__p_svn_auth_cred_ssl_server_trust_t,
+   &_swigt__p_svn_auth_cred_username_t,
++  &_swigt__p_svn_auth_gnome_keyring_unlock_prompt_func_t,
+   &_swigt__p_svn_auth_iterstate_t,
+   &_swigt__p_svn_auth_provider_object_t,
+   &_swigt__p_svn_auth_provider_t,
+@@ -34241,7 +34180,6 @@
+ static swig_cast_info _swigc__p_apr_size_t[] = {  {&_swigt__p_apr_size_t, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+-static swig_cast_info _swigc__p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void[] = {  {&_swigt__p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+@@ -34277,7 +34215,6 @@
+ static swig_cast_info _swigc__p_p_apr_file_t[] = {  {&_swigt__p_p_apr_file_t, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_p_apr_hash_t[] = {  {&_swigt__p_p_apr_hash_t, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_p_char[] = {  {&_swigt__p_p_char, 0, 0, 0},{0, 0, 0, 0}};
+-static swig_cast_info _swigc__p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void[] = {  {&_swigt__p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t[] = {  {&_swigt__p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t, 0, 0, 0},{0, 0, 0, 0}};
+@@ -34326,6 +34263,7 @@
+ static swig_cast_info _swigc__p_svn_auth_cred_ssl_client_cert_t[] = {  {&_swigt__p_svn_auth_cred_ssl_client_cert_t, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_svn_auth_cred_ssl_server_trust_t[] = {  {&_swigt__p_svn_auth_cred_ssl_server_trust_t, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_svn_auth_cred_username_t[] = {  {&_swigt__p_svn_auth_cred_username_t, 0, 0, 0},{0, 0, 0, 0}};
++static swig_cast_info _swigc__p_svn_auth_gnome_keyring_unlock_prompt_func_t[] = {  {&_swigt__p_svn_auth_gnome_keyring_unlock_prompt_func_t, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_svn_auth_iterstate_t[] = {  {&_swigt__p_svn_auth_iterstate_t, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_svn_auth_provider_object_t[] = {  {&_swigt__p_svn_auth_provider_object_t, 0, 0, 0},{0, 0, 0, 0}};
+ static swig_cast_info _swigc__p_svn_auth_provider_t[] = {  {&_swigt__p_svn_auth_provider_t, 0, 0, 0},{0, 0, 0, 0}};
+@@ -34393,7 +34331,6 @@
+   _swigc__p_apr_size_t,
+   _swigc__p_char,
+   _swigc__p_f_p_apr_getopt_t_p_void_p_apr_pool_t__p_svn_error_t,
+-  _swigc__p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
+   _swigc__p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void,
+   _swigc__p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
+   _swigc__p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
+@@ -34429,7 +34366,6 @@
+   _swigc__p_p_apr_file_t,
+   _swigc__p_p_apr_hash_t,
+   _swigc__p_p_char,
+-  _swigc__p_p_f_p_p_char_p_q_const__char_p_void_p_apr_pool_t__p_svn_error_t,
+   _swigc__p_p_f_p_p_struct_svn_auth_provider_object_t_p_apr_pool_t__void,
+   _swigc__p_p_f_p_p_svn_auth_cred_simple_t_p_void_p_q_const__char_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
+   _swigc__p_p_f_p_p_svn_auth_cred_ssl_client_cert_pw_t_p_void_p_q_const__char_svn_boolean_t_p_apr_pool_t__p_svn_error_t,
+@@ -34478,6 +34414,7 @@
+   _swigc__p_svn_auth_cred_ssl_client_cert_t,
+   _swigc__p_svn_auth_cred_ssl_server_trust_t,
+   _swigc__p_svn_auth_cred_username_t,
++  _swigc__p_svn_auth_gnome_keyring_unlock_prompt_func_t,
+   _swigc__p_svn_auth_iterstate_t,
+   _swigc__p_svn_auth_provider_object_t,
+   _swigc__p_svn_auth_provider_t,
+@@ -35638,8 +35575,6 @@
+   SWIG_Python_SetConstant(d, "SVN_AUTH_PARAM_CONFIG",SWIG_FromCharPtr("svn:auth:config-category-servers"));
+   SWIG_Python_SetConstant(d, "SVN_AUTH_PARAM_SERVER_GROUP",SWIG_FromCharPtr("svn:auth:server-group"));
+   SWIG_Python_SetConstant(d, "SVN_AUTH_PARAM_CONFIG_DIR",SWIG_FromCharPtr("svn:auth:config-dir"));
+-  SWIG_Python_SetConstant(d, "SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC",SWIG_FromCharPtr("gnome-keyring-unlock-prompt-func"));
+-  SWIG_Python_SetConstant(d, "SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON",SWIG_FromCharPtr("gnome-keyring-unlock-prompt-baton"));
+   SWIG_Python_SetConstant(d, "SVN_CONFIG_CATEGORY_SERVERS",SWIG_FromCharPtr("servers"));
+   SWIG_Python_SetConstant(d, "SVN_CONFIG_SECTION_GROUPS",SWIG_FromCharPtr("groups"));
+   SWIG_Python_SetConstant(d, "SVN_CONFIG_SECTION_GLOBAL",SWIG_FromCharPtr("global"));
+diff -u -d -b -w -r subversion-1.8.0-orig/subversion/bindings/swig/python/core.py subversion-1.8.0-python/subversion/bindings/swig/python/core.py
+--- subversion/bindings/swig/python/core.py	2013-06-13 05:07:20.000000000 -0400
++++ subversion/bindings/swig/python/core.py	2013-07-12 16:11:04.000000000 -0400
+@@ -3316,8 +3316,6 @@
+ def svn_auth_get_platform_specific_client_providers(*args):
+   """svn_auth_get_platform_specific_client_providers(svn_config_t * config, apr_pool_t pool) -> svn_error_t"""
+   return _core.svn_auth_get_platform_specific_client_providers(*args)
+-SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC = _core.SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC
+-SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON = _core.SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON
+ 
+ def svn_auth_get_username_provider(*args):
+   """svn_auth_get_username_provider(apr_pool_t pool)"""
+@@ -6336,10 +6334,6 @@
+ svn_checksum_ctx_t_swigregister(svn_checksum_ctx_t)
+ 
+ 
+-def svn_auth_set_gnome_keyring_unlock_prompt_func(*args):
+-  """svn_auth_set_gnome_keyring_unlock_prompt_func(svn_auth_baton_t * ab, svn_auth_gnome_keyring_unlock_prompt_func_t prompt_func)"""
+-  return _core.svn_auth_set_gnome_keyring_unlock_prompt_func(*args)
+-
+ def svn_swig_py_set_application_pool(*args):
+   """svn_swig_py_set_application_pool(PyObject * py_pool, apr_pool_t pool)"""
+   return _core.svn_swig_py_set_application_pool(*args)
diff --git a/dev-vcs/subversion/subversion-1.8.5-r1.ebuild b/dev-vcs/subversion/subversion-1.8.8-r1.ebuild
index a1c7f88..be737fd 100644
--- a/dev-vcs/subversion/subversion-1.8.5-r1.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.8-r1.ebuild
@@ -6,6 +6,7 @@ EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
 DISTUTILS_OPTIONAL=1
 WANT_AUTOMAKE="none"
+GENTOO_DEPEND_ON_PERL="no"
 
 inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module eutils
 
@@ -62,13 +63,13 @@ REQUIRED_USE="
 want_apache
 
 pkg_setup() {
-	if use berkdb; then
+	if use berkdb ; then
 		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
 			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
 			| sed 's:.*b::')"
 		einfo
-		if [[ -z "${SVN_BDB_VERSION}" ]]; then
-			if [[ -n "${apu_bdb_version}" ]]; then
+		if [[ -z "${SVN_BDB_VERSION}" ]] ; then
+			if [[ -n "${apu_bdb_version}" ]] ; then
 				SVN_BDB_VERSION="${apu_bdb_version}"
 				einfo "Matching db version to apr-util"
 			else
@@ -99,10 +100,13 @@ pkg_setup() {
 		echo -ne "\a"
 	fi
 
-	if use debug; then
+	if use debug ; then
 		append-cppflags -DSVN_DEBUG -DAP_DEBUG
 	fi
 
+	# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
+	[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
+
 	# Allow for custom repository locations.
 	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
 }
@@ -131,7 +135,14 @@ src_prepare() {
 	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
 		-i build-outputs.mk || die "sed failed"
 
-	if use python; then
+	if use python ; then
+		if [[ ${CHOST} == *-darwin* ]] ; then
+			# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C20130614113003.GA19257@tarsus.local2%3E
+			# in short, we don't have gnome-keyring stuff here, patch
+			# borrowed from MacPorts
+			epatch "${FILESDIR}"/${PN}-1.8.5-swig-python-no-gnome-keyring.patch
+		fi
+
 		# XXX: make python_copy_sources accept path
 		S=${S}/subversion/bindings/swig/python python_copy_sources
 		rm -r "${S}"/subversion/bindings/swig/python || die
@@ -147,7 +158,7 @@ src_configure() {
 		myconf+=" --without-swig"
 	fi
 
-	if use java; then
+	if use java ; then
 		myconf+=" --without-junit"
 	fi
 
@@ -175,9 +186,6 @@ src_configure() {
 		;;
 	esac
 
-	#workaround for bug 387057
-	has_version =dev-vcs/subversion-1.6* && myconf+=" --disable-disallowing-of-undefined-references"
-
 	#version 1.7.7 again tries to link against the older installed version and fails, when trying to
 	#compile for x86 on amd64, so workaround this issue again
 	#check newer versions, if this is still/again needed
@@ -189,8 +197,14 @@ src_configure() {
 		append-flags "${PYTHON_CFLAGS}"
 	fi
 
-	#force ruby-1.8 for bug 399105
-	#allow overriding Python include directory
+	if use python && [[ ${CHOST} == *-darwin* ]] ; then
+		export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
+		export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
+		export ac_cv_python_compile="$(tc-getCC)"
+	fi
+
+	# force ruby-1.9
+	# allow overriding Python include directory
 	ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby19 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc19 \
 	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
 	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
@@ -218,7 +232,7 @@ src_configure() {
 src_compile() {
 	emake local-all
 
-	if use ctypes-python; then
+	if use ctypes-python ; then
 		# pre-generate .py files
 		use ctypes-python && emake ctypes-python
 
@@ -227,7 +241,7 @@ src_compile() {
 		popd >/dev/null || die
 	fi
 
-	if use python; then
+	if use python ; then
 		swig_py_compile() {
 			local p=subversion/bindings/swig/python
 			rm -f ${p} || die
@@ -244,23 +258,23 @@ src_compile() {
 		python_foreach_impl swig_py_compile
 	fi
 
-	if use perl; then
+	if use perl ; then
 		emake swig-pl
 	fi
 
-	if use ruby; then
+	if use ruby ; then
 		emake swig-rb
 	fi
 
-	if use java; then
+	if use java ; then
 		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
 	fi
 
-	if use extras; then
+	if use extras ; then
 		emake tools
 	fi
 
-	if use doc; then
+	if use doc ; then
 		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
 
 		if use java; then
@@ -270,9 +284,14 @@ src_compile() {
 }
 
 src_test() {
+	if ! has_version ~${CATEGORY}/${P} ; then
+		ewarn "The test suite shows errors when there is an older version of"
+		ewarn "${CATEGORY}/${PN} installed."
+	fi
+
 	default
 
-	if use ctypes-python; then
+	if use ctypes-python ; then
 		python_test() {
 			"${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
 				|| die "ctypes-python tests fail with ${EPYTHON}"
@@ -281,7 +300,7 @@ src_test() {
 		distutils-r1_src_test
 	fi
 
-	if use python; then
+	if use python ; then
 		swig_py_test() {
 			pushd "${BUILD_DIR}" >/dev/null || die
 			"${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
@@ -296,13 +315,13 @@ src_test() {
 src_install() {
 	emake -j1 DESTDIR="${D}" local-install
 
-	if use ctypes-python; then
+	if use ctypes-python ; then
 		pushd subversion/bindings/ctypes-python >/dev/null || die
 		distutils-r1_src_install
 		popd >/dev/null || die
 	fi
 
-	if use python; then
+	if use python ; then
 		swig_py_install() {
 			local p=subversion/bindings/swig/python
 			rm -f ${p} || die
@@ -319,17 +338,17 @@ src_install() {
 		python_foreach_impl swig_py_install
 	fi
 
-	if use perl; then
+	if use perl ; then
 		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
 		fixlocalpod
 		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete
 	fi
 
-	if use ruby; then
+	if use ruby ; then
 		emake DESTDIR="${D}" install-swig-rb
 	fi
 
-	if use java; then
+	if use java ; then
 		emake DESTDIR="${D}" install-javahl
 		java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname)
 		java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar
@@ -337,7 +356,7 @@ src_install() {
 	fi
 
 	# Install Apache module configuration.
-	if use apache2; then
+	if use apache2 ; then
 		keepdir "${APACHE_MODULES_CONFDIR}"
 		insinto "${APACHE_MODULES_CONFDIR}"
 		doins "${FILESDIR}/47_mod_dav_svn.conf"
@@ -371,14 +390,14 @@ src_install() {
 	rm -fr tools/xslt
 
 	# Install extra files.
-	if use extras; then
+	if use extras ; then
 		cat << EOF > 80subversion-extras
 PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
 ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
 EOF
 		doenvd 80subversion-extras
 
-		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools || die "Installation of tools failed"
+		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
 
 		find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr
 		rm -fr tools/client-side/svnmucc
@@ -390,15 +409,15 @@ EOF
 		doins -r tools
 	fi
 
-	if use doc; then
+	if use doc ; then
 		dohtml -r doc/doxygen/html/*
 
-		if use java; then
+		if use java ; then
 			java-pkg_dojavadoc doc/javadoc
 		fi
 	fi
 
-	find "${ED}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f
+	prune_libtool_files --all
 
 	cd "${ED}"usr/share/locale
 	for i in * ; do
@@ -408,10 +427,10 @@ EOF
 
 pkg_preinst() {
 	# Compare versions of Berkeley DB, bug 122877.
-	if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]]; then
+	if use berkdb && [[ -f "${EROOT}usr/bin/svn" ]] ; then
 		OLD_BDB_VERSION="$(scanelf -nq "${EROOT}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
 		NEW_BDB_VERSION="$(scanelf -nq "${ED}usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]]; then
+		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
 			CHANGED_BDB_VERSION="1"
 		fi
 	fi
@@ -420,7 +439,7 @@ pkg_preinst() {
 pkg_postinst() {
 	use perl && perl-module_pkg_postinst
 
-	if [[ -n "${CHANGED_BDB_VERSION}" ]]; then
+	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
 		ewarn "You upgraded from an older version of Berkeley DB and may experience"
 		ewarn "problems with your repository. Run the following commands as root to fix it:"
 		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
@@ -438,7 +457,7 @@ pkg_config() {
 	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
 	# already has EPREFIX in it
 	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e "${SVN_REPOS_LOC}/repos" ]]; then
+	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
 		echo "A Subversion repository already exists and I will not overwrite it."
 		echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
 	else
@@ -451,7 +470,7 @@ pkg_config() {
 		einfo "Setting repository permissions..."
 		SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
 		SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
-		if use apache2; then
+		if use apache2 ; then
 			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
 			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
 		else