Security bump (bug #519202). Removed old. Also fixed bug #516054 and bug #511440

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

3 files changed, 40 insertions, 25 deletions

diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog
index 737d7ec9dee9..0bf8717bae41 100644
--- a/dev-vcs/subversion/ChangeLog
+++ b/dev-vcs/subversion/ChangeLog
@@ -1,6 +1,14 @@
 # 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.183 2014/08/09 10:48:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.184 2014/08/12 11:05:37 polynomial-c Exp $
+
+*subversion-1.8.10 (12 Aug 2014)
+
+  12 Aug 2014; Lars Wendler <polynomial-c@gentoo.org> -subversion-1.8.8.ebuild,
+  +subversion-1.8.10.ebuild:
+  Security bump (bug #519202). Removed old. Added pkg_pretend which fails if
+  USE=test is set and an old version of this package is installed (bug
+  #516054). Don't run tests with USE=dso.
 
   09 Aug 2014; Agostino Sarubbo <ago@gentoo.org> subversion-1.7.17.ebuild:
   Stable for ppc64, wrt bug #500482
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 97e7065f4167..2ddbeaf10697 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -22,28 +22,28 @@ AUX svnserve.initd2 828 SHA256 8f123253c3bfb9bbe87210a9e1facc7f52df371747dbc1883
 AUX svnserve.xinetd 332 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2 SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae WHIRLPOOL 0c5ed79630859706f18b56fbb910b4b2dc6b480cdf72a929f7d33232f23ee1eb7110b98c4a8e06cd06c620b9f4ff081bfae23edd1f6a65fade2ac5081dbf3962
 DIST subversion-1.7.14.tar.bz2 6045932 SHA256 c4ac8f37eb0ebd38901bfa6f1c7e4d7716d32d7460ee0cee520381ca2f5b120d SHA512 cc7df3a2d258cda65a3fefc1fb9bcc91f78ec817c8d32e561eae7cf59de3d1d5c843594150b63c60c724e4b3df88da319763f814f418d106461adcc78b323840 WHIRLPOOL 21d879775ed0bed15d17b83070eb26269f8d3cc0420be54e0d326b7b6f410b9fee11d2f8d2926f930c66c66a47a6396275ddf20120436b978c0a318bb963f0e0
 DIST subversion-1.7.17.tar.bz2 6008028 SHA256 2a66e4c5d2a8a919914a2e75f76467ef5457d0f96efc1e1c080fa02675867be3 SHA512 60760d9c2d01dcb664b545611e5ac5bb400154568eb811392c7903b223296d8f4e52d5154cfcb5b2e91d39de262c2ad958385190b87458f387fb38e5f3d2eaea WHIRLPOOL 20604f31589aa2fa2eff1869d7af7e80c4cf4fccd40c9d9bd1af8d1628171a381452796d38bc86ccafbf38232a6194d747b6c271f49064f2a361101edb73de00
-DIST subversion-1.8.8.tar.bz2 6821200 SHA256 1569931cd85ae27052895554bc14125e0795d7a17d3e4a7c2aceb7289be71db3 SHA512 9cb3fc05a432336f7df5c81864dcc0b4c4154e61207b636f2e6715e132d436962bb6def70e5b7c45bfea58ead5e328f8db3abd98176c9400c31483262e72819d WHIRLPOOL 2b2880ff00d3cb6f76ca8954a03522510ff8b32e31090b61ccb037d108b1457b5b17b9063cd817c611fe6772953b937331f1a81f9f1481a240353beb3c51ac0b
+DIST subversion-1.8.10.tar.bz2 6899384 SHA256 1cc900c8a7974337c3ed389dc6b5c59012ec48c7d4107ae31fd7c929ded47dcc SHA512 a03e618ee700132a1668668519cccc34dbd46777acfbaa9c3f1769d53a1ee4499a10c53c9b212d27e17b259e19d071b672f247cfcc6502e10122a852ae1b6bd0 WHIRLPOOL bff8ce6509263a6de6a19d135c96f50f4bba24c539a3d0a7300b547c8a264ddd6d3ba38b78680a9dceb171306819ca2835f00d1cf4afa7a9001ae104567c4022
 DIST subversion-1.8.9.tar.bz2 6828921 SHA256 45d708a5c3ffbef4b2a1044c4716a053e680763743d1f7ba99d0369f6da49e33 SHA512 61f0181605cdaf2c87f89f022073dca00f667515ac1702adec4f83af0aeb807a4eb2c65d8186414db4c5a19a3ccc01fc5fdf03c8bfb5f0fa578a45944af0becc WHIRLPOOL 1a850d7c1cc91eb9fddcd15cc9aeb744e28cbf124affc0363af3df3e69765fb97be5d0a6001bdabcead2bd4972d6444238e09a123084907ac38f535605b55fdf
 EBUILD subversion-1.7.14.ebuild 14641 SHA256 1d9ddd420f89c7b5602205a4f99ab86731f324b6470611ca09019bb529384317 SHA512 f76fb125401a18a792e6d67b01495d6e8b1e45a9deb761fd73221e506403d5f08a0b7cbc884b412abc098189a3ac1954d0642710c55b806c3cea76497e43e278 WHIRLPOOL f736a944ff1e8c4bfa85cf03f7b9a90cce612a902ea1768fde2ef5106a2a7f1dd366ac3cb82050faa8d873daae134a1751aee2ebf3193559a1baf0eac1e64827
 EBUILD subversion-1.7.17.ebuild 14667 SHA256 005aa6b2ebbfe04b1ab1d497304680e97a773fdb18e71e6fab8021ba3e1163fc SHA512 d66ac9739fe8bd86358d2d811643cb15e78b8ab82d5aaf2a3b6ea0cd574c5f9bf5a8b0a8d6692b25552b3515bbb5e5b5177e6c28f1b0b728375177882b328900 WHIRLPOOL 2237f9ef869e6f5ef10eae25f64e3868fe41bb8b0cf4055e93e1bb4cd06047158a71031e060beb7e19c4f657bf62f9a95d597b8449140783263d98b9249cf9a4
-EBUILD subversion-1.8.8.ebuild 15244 SHA256 31c853f7ed710fad019d7989271ffa2648ee227f7e66f83fb74bf7071d5a5c29 SHA512 2b7500c1467654815ddc1eb628e5fd2303e2d5b88b6b73b578f1766fe82c6cf894c5dc5edaa74f1ddd0195bd0e3a16c5a228b65b750f69493083a8fb26cf1a8a WHIRLPOOL d620f94037b3ca50239aee0edf000be07779f00a16e55fe6a84804d80f165725454a0c8474f78658860485d4dd2de8cf07c7cda9b56a7a0b77fa55d526397448
+EBUILD subversion-1.8.10.ebuild 15412 SHA256 50e233ed476d7bd6bddcde523d99dd88796fdd16f80f2bd02a41906a39562462 SHA512 27e2e117a82449960b57d7bc3757ae209e6a49628319255a68b32f1c4cb3ac2699434e79a7b18891f06c239e930f06c2e3b89e375cc133ce88cccdc11ab5c759 WHIRLPOOL 204374bfa116b2d0f42bbe43cdbe7df4e9153415ae62f137d9a35492731af4e30ec1b9865866b745386730303ee698ad3d640bd2d2824cf7ed48b2c5d4cbcead
 EBUILD subversion-1.8.9.ebuild 15273 SHA256 30aaf67461b1247c449c1956f1396a5332b75f372594570984ef05f305b2c7ec SHA512 0d95180265cdb296f4f97b355c825b06a2565f64174ef23cd426c327d7da5af1b533cd53a59f719b344baa0ba7800f1e781f878ce899f8e8961fa1e07a65c65e WHIRLPOOL 180b72bfe62c67437976f89a67bef7c0c4924c26546a5412468ef67caa2ed0958e4cf48b799080b015c2be03680ede97a19d8e7152f04f2c9272349ab326cb51
-MISC ChangeLog 98741 SHA256 051284149ed2cbd276860a72362ce260a7d9f35ea8cd7f61161e9c7b8981e6af SHA512 7451727de45b3c2eab5417776687c04071f71e8e44066dea9c2e52b19a546683ea0cf4dea5b1876eee45aa09eb8be1bd99e54251895624aaf061898216d65d41 WHIRLPOOL 538fffb5ed096b2eb2a6f63ed09733880d9d8ab03f97ac720e4cda4aca10f634aa2919e6b611b00f905a54d637d75d3def1a94a76750f09010bcd21e93878683
+MISC ChangeLog 99084 SHA256 cb433b9e717b7f3cf6b4f49d881828e0fa43fd87f3b33d9138141f3758dbf6ac SHA512 3ff3edeb37a3ad97bab89d77b9f6031dc0371579704c2151e172a7363c0fefdeb4d62cfc47baf50aa1a44fed3abff60bf789f6e7519c16fa4619c106791cb443 WHIRLPOOL 323ca68037c3f3116135d9ac3489719dcd96c8369684566c940b4ae4a7e92ca128685edfdca8fd27a79e4012f1eb3c272eb192a3b69b11c81243b8506a62edbc
 MISC metadata.xml 845 SHA256 43917d4b57c7ada945f07ca2507f6df3c83581931b8da7f4bef7eaa3bed0dbaf SHA512 8766f082f146c0d9ddb62f78dc0dfab5b480adddb1d7f1e0a07ac7aa11a2e70fd2aec534fe069eabfc86d75f9027162ed17d9463aa491ab87895934997005041 WHIRLPOOL 42bed6ad1d2cf349eab8d4011fc4fcce3c257a387a2c9c101c62c26058c218f195ef752715a5deac80dadbbeffbb088c37ea5d393f69751cdc78bdae2b982078
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT5fxpAAoJELp701BxlEWfLn4P/3xriGDBo5riUMT4oOWbJGxk
-7AQTUT12qnH1lvpPthowkc1JI4iec9uHo4PcWkmLgc6L0gIiQullUhIPEHHF1SQb
-1xH1MRgIwaF86TupnPKhcqjcK+mQ2SQrVsOdUMqxQGb9Pb83Df6+7Pg/Q+wuhIDL
-pOm3zrhMDv6D1f+nC4kwYxr0vY0qqYF0VhgYU6cwYYPRUI702/G/kPJuWybseDAC
-1rKrn5zwgGaoqG5iurpwKFWWVq/9kIG245zPZ5/5u+RERK5N4dEZRWjhWkOJ83jR
-fUtwsAvKwyCU5tng8dajW+IUXBkv3SFHi6iQEsw1dDzkuI5/yucHtDA74xXgWnNk
-J+k5pwNfRxT8DbGhM9qejzs3ijC50FgMvT/5aIg9ykiz8xcdV7Xf2Uf0u/i7CFYR
-eOYZpOlJCOmxkEwFHbPYUJpBnEZWhLnMbO/jdZGeh/6Y/6S9CxhUfpMz7leXIYjK
-ZA8iAzrg0X1Ru0yfH92yJIuobshcRJmSLWCfsA4gK8FEwhdbPPfVGjfba0IgR7wD
-Xv+v8dRn9zfNd2xT+ywnlIOJLHhz6Xz83FCpo9b8OyKMeDbRvN+QWcZ8r7Kpkmlo
-+WQfuPucfYfgEDU9o1+UZ9Ub4q5tEbdpPq4mtCTB/JuwbVKAhVNwraKvhoWjZCQX
-ViGhLCVheKhM2bR6pmAd
-=q/sb
+iQIcBAEBCAAGBQJT6fUCAAoJEPiazRVxLXTFUmsQAIYfw0Yix7o+B3tCfV/4Y1Bw
+pW+LPr4f60QIRk6iqXKodUZHjsYFy4vqcNktHuK9C4rsk7hEHaFVouk8Fr+ijNZG
+b6HjwlGlOfvrgQTU4/Jh1s3POhINLLlyHtT+tJ+VM4AUXf/JKdlu083us0k/TYAm
+1utvivQEfFTHIbjayfTtyX7EkKvxwUsxGAi+FkfBxfENMvhns575weo8JbCTfprn
+/ifnscatw88fQUXhaENGImo2HRdIVeo/ucIYK1GaZbzzqSoQHrwVanPeH+CnqpEA
+UdfSZSwfkEbNdlqSoWb3bCX2EEfPFRwxqQ1aMUBHReCLHzHcej6SKP+N9yJhnx9a
+p49gQaz1H6PY26OyrMyCsjPQ8q53YRoub8qkfwZSF+8mcSYD569jG0XS5OHK4i9T
+LCA4vLCEC1DxFlz6eY1efCyiGyDSp4eOlst2aF01/cRsUVmd5M3V9b6hMe6rHEAl
+g6qEVrUJs3X1Q+d60o3vo6elo3ReEe+KbHDoZ9DFRdJPoYycSQgIVtw2F+rY0IXp
+vKPKuGwGLal0W3mavJDk4baovX8jJsL17CdwjmIczcU4gjixvb343ztItqERgUIF
+xSUbTkTHJ2zZX1KSbtz355AjwtqtUN44C5e/bHsTarUsFainNGtHp4ekhbSPKUF2
+JAOATPfBTcwoQKPPHmQs
+=DHrh
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/subversion/subversion-1.8.8.ebuild b/dev-vcs/subversion/subversion-1.8.10.ebuild
index dd2845bd2e1f..d6e7d57de6a5 100644
--- a/dev-vcs/subversion/subversion-1.8.8.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.10.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/dev-vcs/subversion/subversion-1.8.8.ebuild,v 1.2 2014/06/10 00:52:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.10.ebuild,v 1.1 2014/08/12 11:05:37 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -58,10 +58,21 @@ DEPEND="${COMMON_DEPEND}
 REQUIRED_USE="
 	ctypes-python? ( ${PYTHON_REQUIRED_USE} )
 	python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} )"
+	test? (
+		${PYTHON_REQUIRED_USE}
+		!dso
+	)"
 
 want_apache
 
+pkg_pretend() {
+	if use test && ! has_version ~${CATEGORY}/${P} ; then
+		ewarn "The test suite shows errors when there is an older version of"
+		ewarn "${CATEGORY}/${PN} installed."
+		die "Tests will fail due to old version of this package being installed."
+	fi
+}
+
 pkg_setup() {
 	if use berkdb ; then
 		local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
@@ -116,7 +127,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-1.5.6-aix-dso.patch \
 		"${FILESDIR}"/${PN}-1.8.0-hpux-dso.patch \
 		"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch \
-		"${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch
+		"${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.patch \
+		"${FILESDIR}"/${PN}-1.8.9-po_fixes.patch
 	epatch_user
 
 	fperms +x build/transform_libtool_scripts.sh
@@ -283,11 +295,6 @@ 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