diff --git a/dev-vcs/subversion-java/Manifest b/dev-vcs/subversion-java/Manifest
index bc1467c53..6daa28bb5 100644
--- a/dev-vcs/subversion-java/Manifest
+++ b/dev-vcs/subversion-java/Manifest
@@ -1,2 +1,2 @@
 DIST subversion-1.7.11.tar.bz2 6042338 SHA256 c383b19d8d0db4c736570f1eb6af196416b26d0b3bde64ae60988a9d1f7ac3c0 SHA512 3a0be9144b6eaa8d0d81a77d3f3f4a5cab782f2d98f52126fedaa53967211ec1a2c190f31ec99bba4157d31b2c721a352edc8f3f401465d8484681ef15a4d171 WHIRLPOOL 0563276b5e185fa5ccd454b85533925b2bc654f1ca6594f49feed15b1a6aedaed243837ad6c870e6b063765c91c0aca32b207c353f68746d875f5d6258b5d1ae
-DIST subversion-1.7.9.tar.bz2 6040347 SHA256 f8454c585f99afed764232a5048d9b8bfd0a25a9ab8e339ea69fe1204c453ef4 SHA512 04f1287ef7a114e12018d9a0c76c6ff5bcb977afc398710b8760c126975d1f8033462e9da3a75eba67359ad9166a9d3f980be9bc2d440e1e5b16545581e9100c WHIRLPOOL 551bf4a01c8d72c45efa4fdd1adeafe76036b5a77726b9b39396a1bb754f2d2a3b1a80b1ab07ac84c5aa6896e138dd3e53952b3f0832828f232526bbfd759275
+DIST subversion-1.7.13.tar.bz2 6043884 SHA256 e07b3b8559b7b74f8d8fd602424bfc9e4eef95b4ca415eab98a25439d97fe2e9 SHA512 85ebd0532959f98f71da1dfac77ac9e424a46d9327ec426854798a3c1f2897c5e515f76ee81e08514d05af5715cdc74d92504072bd19627d22d27574d5d9b5e4 WHIRLPOOL 234338ab9ee71fb15fda567a5e7c982180f4bf47bef2d47ef23bc8d131aee2a7409e413f04ecd29aa2e5425daf765e7ace2969cbf1bd53a5f705499908772ee2
diff --git a/dev-vcs/subversion-java/subversion-java-1.7.9.ebuild b/dev-vcs/subversion-java/subversion-java-1.7.13.ebuild
similarity index 100%
rename from dev-vcs/subversion-java/subversion-java-1.7.9.ebuild
rename to dev-vcs/subversion-java/subversion-java-1.7.13.ebuild
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index bc1467c53..6daa28bb5 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -1,2 +1,2 @@
 DIST subversion-1.7.11.tar.bz2 6042338 SHA256 c383b19d8d0db4c736570f1eb6af196416b26d0b3bde64ae60988a9d1f7ac3c0 SHA512 3a0be9144b6eaa8d0d81a77d3f3f4a5cab782f2d98f52126fedaa53967211ec1a2c190f31ec99bba4157d31b2c721a352edc8f3f401465d8484681ef15a4d171 WHIRLPOOL 0563276b5e185fa5ccd454b85533925b2bc654f1ca6594f49feed15b1a6aedaed243837ad6c870e6b063765c91c0aca32b207c353f68746d875f5d6258b5d1ae
-DIST subversion-1.7.9.tar.bz2 6040347 SHA256 f8454c585f99afed764232a5048d9b8bfd0a25a9ab8e339ea69fe1204c453ef4 SHA512 04f1287ef7a114e12018d9a0c76c6ff5bcb977afc398710b8760c126975d1f8033462e9da3a75eba67359ad9166a9d3f980be9bc2d440e1e5b16545581e9100c WHIRLPOOL 551bf4a01c8d72c45efa4fdd1adeafe76036b5a77726b9b39396a1bb754f2d2a3b1a80b1ab07ac84c5aa6896e138dd3e53952b3f0832828f232526bbfd759275
+DIST subversion-1.7.13.tar.bz2 6043884 SHA256 e07b3b8559b7b74f8d8fd602424bfc9e4eef95b4ca415eab98a25439d97fe2e9 SHA512 85ebd0532959f98f71da1dfac77ac9e424a46d9327ec426854798a3c1f2897c5e515f76ee81e08514d05af5715cdc74d92504072bd19627d22d27574d5d9b5e4 WHIRLPOOL 234338ab9ee71fb15fda567a5e7c982180f4bf47bef2d47ef23bc8d131aee2a7409e413f04ecd29aa2e5425daf765e7ace2969cbf1bd53a5f705499908772ee2
diff --git a/dev-vcs/subversion/subversion-1.7.9.ebuild b/dev-vcs/subversion/subversion-1.7.13.ebuild
similarity index 96%
rename from dev-vcs/subversion/subversion-1.7.9.ebuild
rename to dev-vcs/subversion/subversion-1.7.13.ebuild
index 0a6060b69..1e1632871 100644
--- a/dev-vcs/subversion/subversion-1.7.9.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.13.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_6,2_7} )
 DISTUTILS_OPTIONAL=1
 WANT_AUTOMAKE="none"
 MY_P="${P/_/-}"
@@ -18,9 +18,9 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="Subversion GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
+IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring java kde nls perl python ruby sasl test vim-syntax +webdav-neon webdav-serf"
 
-COMMON_DEPEND=">=dev-db/sqlite-3.4
+COMMON_DEPEND=">=dev-db/sqlite-3.4[threadsafe(+)]
 	>=dev-libs/apr-1.3:1
 	>=dev-libs/apr-util-1.3:1
 	dev-libs/expat
@@ -31,7 +31,8 @@ COMMON_DEPEND=">=dev-db/sqlite-3.4
 	kde? ( sys-apps/dbus dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 >=kde-base/kdelibs-4:4 )
 	perl? ( dev-lang/perl )
 	python? ( ${PYTHON_DEPS} )
-	ruby? ( >=dev-lang/ruby-1.8.2:1.8 )
+	ruby? ( >=dev-lang/ruby-1.8.2:1.8
+		dev-ruby/rubygems[ruby_targets_ruby18] )
 	sasl? ( dev-libs/cyrus-sasl )
 	webdav-neon? ( >=net-libs/neon-0.28 )
 	webdav-serf? ( >=net-libs/serf-0.3.0 )"
@@ -42,7 +43,7 @@ RDEPEND="${COMMON_DEPEND}
 	perl? ( dev-perl/URI )"
 # Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
 DEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
+	test? ( ${PYTHON_DEPS} )
 	!!<sys-apps/sandbox-1.6
 	ctypes-python? ( dev-python/ctypesgen )
 	doc? ( app-doc/doxygen )
@@ -52,6 +53,11 @@ DEPEND="${COMMON_DEPEND}
 	webdav-neon? ( virtual/pkgconfig )"
 PDEPEND="java? ( ~dev-vcs/subversion-java-${PV} )"
 
+REQUIRED_USE="
+	ctypes-python? ( ${PYTHON_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( ${PYTHON_REQUIRED_USE} )"
+
 want_apache
 
 pkg_setup() {
@@ -177,7 +183,9 @@ src_configure() {
 	myconf+=" --disable-disallowing-of-undefined-references"
 
 	# for build-time scripts
-	python_export_best
+	if use ctypes-python || use python || use test; then
+		python_export_best
+	fi
 
 	#force ruby-1.8 for bug 399105
 	#allow overriding Python include directory