diff --git a/dev-vcs/subversion-java/Manifest b/dev-vcs/subversion-java/Manifest
index 5603700e3..01e57a1ba 100644
--- a/dev-vcs/subversion-java/Manifest
+++ b/dev-vcs/subversion-java/Manifest
@@ -5,8 +5,8 @@ AUX subversion-1.6.3-hpux-dso.patch 627 RMD160 1286a74c3f54e992be3dcaa2b72df36a3
 AUX svnserve.confd 322 RMD160 e291d91f05da848a3517aa76611c1f05527c11e4 SHA1 c07020ea270b787ddf0dbb738391e20d3c8347af SHA256 45f2dc1a718aed885559e71d98112e670c92bd6b4f19c5cf593eced6cd2bbd97
 AUX svnserve.initd 818 RMD160 6a24ac0599ef46b2d1ef0ae9cde70bdc8124db68 SHA1 f3ef120b584d81124171ccaf5bafec709222d04e SHA256 4f9d38d5b32d4436dcb302f7e3c7284e67d6339b25b0f057a306b978f4a06142
 AUX svnserve.xinetd 332 RMD160 c2fc4eb02da7e7405756fce650b8897f0a9da7f7 SHA1 d7d478fc257a40626888f9b12ee218df55dac570 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2
-DIST subversion-1.7.2.tar.bz2 5944987 RMD160 0d20e364c120da454f3139e95d3ec86c22e7e3c1 SHA1 8c0824aeb7f42da1ff4f7cd296877af7f59812bb SHA256 7eb3e1ae2b0385e1cc20ca9e1839e0ef0ac98a7455dc52ba4cdf567547bfc517
 DIST subversion-1.7.4.tar.bz2 5978020 RMD160 769bf868f728d606f68c9951320c2529abc3dd95 SHA1 57a3cd351c1dbedddd020e7a1952df6cd2674527 SHA256 c4c736f5d94a93b5862d1d2452353146c8aeaae33ccec67649bba91f91ad506f
-EBUILD subversion-java-1.7.2.ebuild 3670 RMD160 8b98547e9fd933f39c7cb7f6b8cec6c239c39e30 SHA1 c8b5c8e4e8edfc7ec1be9b9fc2812670e9fc1eb4 SHA256 d7eebf1f03243b54aa5c3514350d3ba6aa6ce167d1f67c8f700ca7ffbc84bf48
+DIST subversion-1.7.5.tar.bz2 6002955 RMD160 e16682869311056d777016f35f63ebcff272ec9a SHA1 05c079762690d5ac1ccd2549742e7ef70fa45cf1 SHA256 cb23ccd08b0c1f0c66fdcda773265e404d95f378493ba64b49dbaaf54ae44aec
 EBUILD subversion-java-1.7.4.ebuild 3655 RMD160 df2f4f6a239aeeb453a2c3584116c9b66be53648 SHA1 bd3900ad9b82fe13f1e75f9ae5ff956a65a18409 SHA256 4699a2b6c073e876cc2c28de35415784ab24eaff00186dd9a243a964afe89fa7
+EBUILD subversion-java-1.7.5.ebuild 3655 RMD160 df2f4f6a239aeeb453a2c3584116c9b66be53648 SHA1 bd3900ad9b82fe13f1e75f9ae5ff956a65a18409 SHA256 4699a2b6c073e876cc2c28de35415784ab24eaff00186dd9a243a964afe89fa7
 MISC metadata.xml 286 RMD160 2431b313f7dbef6ca78fdd87c1b4de2077634c01 SHA1 39ab12a0f999d65946182288e157f5222598e6f1 SHA256 f67628961bf775bf88adcc6abf072eb4126a0f85e48d848054f3a7bc0ec951bb
diff --git a/dev-vcs/subversion-java/subversion-java-1.7.2.ebuild b/dev-vcs/subversion-java/subversion-java-1.7.5.ebuild
similarity index 88%
rename from dev-vcs/subversion-java/subversion-java-1.7.2.ebuild
rename to dev-vcs/subversion-java/subversion-java-1.7.5.ebuild
index 008711abb..fd526a946 100644
--- a/dev-vcs/subversion-java/subversion-java-1.7.2.ebuild
+++ b/dev-vcs/subversion-java/subversion-java-1.7.5.ebuild
@@ -12,7 +12,7 @@ MY_SVN_PF="${MY_SVN_PN}-${PVR}"
 MY_SVN_CATEGORY="${CATEGORY}"
 
 # note: java-pkg-2, not java-pkt-opt-2
-inherit autotools base flag-o-matic java-pkg-2 libtool multilib
+inherit autotools eutils flag-o-matic java-pkg-2 libtool multilib
 
 DESCRIPTION="Java bindings for Subversion"
 HOMEPAGE="http://subversion.apache.org/"
@@ -32,12 +32,6 @@ RDEPEND="
 DEPEND="${COMMON_DEPEND}
 	>=virtual/jdk-1.5"
 
-PATCHES=(
-		"${FILESDIR}/${MY_SVN_PN}-1.5.4-interix.patch"
-		"${FILESDIR}/${MY_SVN_PN}-1.5.6-aix-dso.patch"
-		"${FILESDIR}/${MY_SVN_PN}-1.6.3-hpux-dso.patch"
-)
-
 pkg_setup() {
 	java-pkg-2_pkg_setup
 
@@ -47,7 +41,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	base_src_prepare
+	epatch "${FILESDIR}"/${MY_SVN_PN}-1.5.4-interix.patch \
+		"${FILESDIR}"/${MY_SVN_PN}-1.5.6-aix-dso.patch \
+		"${FILESDIR}"/${MY_SVN_PN}-1.6.3-hpux-dso.patch
+
 	fperms +x build/transform_libtool_scripts.sh
 
 	sed -i \
@@ -79,20 +76,19 @@ src_configure() {
 	fi
 
 	case ${CHOST} in
-		*-solaris*)
-			# -lintl isn't added for some reason (makes Neon check fail)
-			use nls && append-libs -lintl
-		;;
 		*-aix*)
 			# avoid recording immediate path to sharedlibs into executables
 			append-ldflags -Wl,-bnoipath
 		;;
 		*-interix*)
 			# loader crashes on the LD_PRELOADs...
-			myconf="${myconf} --disable-local-library-preloading"
+			myconf+=" --disable-local-library-preloading"
 		;;
 	esac
 
+	#workaround for bug 387057
+	has_version =dev-vcs/subversion-1.6* && myconf+=" --disable-disallowing-of-undefined-references"
+
 	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--without-apxs \
 		--without-berkeley-db \
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 4308b84e3..7489116e4 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -6,8 +6,8 @@ AUX subversion-fix-parallel-build-support-for-perl-bindings.patch 515 RMD160 1f0
 AUX svnserve.confd 322 RMD160 e291d91f05da848a3517aa76611c1f05527c11e4 SHA1 c07020ea270b787ddf0dbb738391e20d3c8347af SHA256 45f2dc1a718aed885559e71d98112e670c92bd6b4f19c5cf593eced6cd2bbd97
 AUX svnserve.initd2 828 RMD160 3b471e0adecb55f6712b7db360768f13feb6b65d SHA1 7f6f088eaf358c6dde50fe445cc2e3d344f661ae SHA256 8f123253c3bfb9bbe87210a9e1facc7f52df371747dbc188396740a5cf4fa713
 AUX svnserve.xinetd 332 RMD160 c2fc4eb02da7e7405756fce650b8897f0a9da7f7 SHA1 d7d478fc257a40626888f9b12ee218df55dac570 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2
-DIST subversion-1.7.2.tar.bz2 5944987 RMD160 0d20e364c120da454f3139e95d3ec86c22e7e3c1 SHA1 8c0824aeb7f42da1ff4f7cd296877af7f59812bb SHA256 7eb3e1ae2b0385e1cc20ca9e1839e0ef0ac98a7455dc52ba4cdf567547bfc517
 DIST subversion-1.7.4.tar.bz2 5978020 RMD160 769bf868f728d606f68c9951320c2529abc3dd95 SHA1 57a3cd351c1dbedddd020e7a1952df6cd2674527 SHA256 c4c736f5d94a93b5862d1d2452353146c8aeaae33ccec67649bba91f91ad506f
-EBUILD subversion-1.7.2.ebuild 14109 RMD160 4cac5c559affd6104e8f59f42f6f36c59697c109 SHA1 6f1ae6057eac095345d2493630fa8184c4f0275a SHA256 fa6851d7cc0ac37d0b3d1a219e8c1d2d7e9642da57c1eefca3c6caaae923b759
+DIST subversion-1.7.5.tar.bz2 6002955 RMD160 e16682869311056d777016f35f63ebcff272ec9a SHA1 05c079762690d5ac1ccd2549742e7ef70fa45cf1 SHA256 cb23ccd08b0c1f0c66fdcda773265e404d95f378493ba64b49dbaaf54ae44aec
 EBUILD subversion-1.7.4.ebuild 14682 RMD160 d3b3e2c4cc6280c0a551236551574b4a7adc92a9 SHA1 52a12485b7117fa216a61d10aaea3da7680955c2 SHA256 22c996b102776c491e2aac5faf5e12f4aada7b0d732266a8dde850c18b18f55f
+EBUILD subversion-1.7.5.ebuild 14432 RMD160 0aba3116f4c2b0d259bc31e40be9cf8c65b82420 SHA1 5f970a78640639708e5935df27b914a6d245e767 SHA256 8c91345fe99b3cc6fee98d840452db1883c7d85b8aa1b47e46a837d83988dd09
 MISC metadata.xml 681 RMD160 b8bf10a068c94531f0529910fc02ea7194aa486f SHA1 ddb9a385533de0e77b605e3a556f8137014293cf SHA256 ac762b366aaea3d4cfad15a1ce05b28062260e0479ade0e6088893a986146a73
diff --git a/dev-vcs/subversion/subversion-1.7.2.ebuild b/dev-vcs/subversion/subversion-1.7.5.ebuild
similarity index 86%
rename from dev-vcs/subversion/subversion-1.7.2.ebuild
rename to dev-vcs/subversion/subversion-1.7.5.ebuild
index 791e69549..29adeff54 100644
--- a/dev-vcs/subversion/subversion-1.7.2.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.5.ebuild
@@ -4,11 +4,11 @@
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
+RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
 WANT_AUTOMAKE="none"
 MY_P="${P/_/-}"
 
-inherit autotools base bash-completion-r1 db-use depend.apache elisp-common flag-o-matic libtool multilib perl-module python
+inherit autotools bash-completion-r1 db-use depend.apache elisp-common eutils flag-o-matic libtool multilib perl-module python
 
 DESCRIPTION="Advanced version control system"
 HOMEPAGE="http://subversion.apache.org/"
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Subversion"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
 
 CDEPEND=">=dev-db/sqlite-3.4
@@ -31,7 +31,7 @@ CDEPEND=">=dev-db/sqlite-3.4
 	kde? ( sys-apps/dbus x11-libs/qt-core x11-libs/qt-dbus x11-libs/qt-gui >=kde-base/kdelibs-4 )
 	perl? ( dev-lang/perl )
 	python? ( =dev-lang/python-2* )
-	ruby? ( >=dev-lang/ruby-1.8.2 )
+	ruby? ( >=dev-lang/ruby-1.8.2:1.8 )
 	sasl? ( dev-libs/cyrus-sasl )
 	webdav-neon? ( >=net-libs/neon-0.28 )
 	webdav-serf? ( >=net-libs/serf-0.3.0 )"
@@ -44,18 +44,12 @@ DEPEND="${CDEPEND}
 	!!<sys-apps/sandbox-1.6
 	ctypes-python? ( dev-python/ctypesgen )
 	doc? ( app-doc/doxygen )
-	gnome-keyring? ( dev-util/pkgconfig )
-	kde? ( dev-util/pkgconfig )
+	gnome-keyring? ( virtual/pkgconfig )
+	kde? ( virtual/pkgconfig )
 	nls? ( sys-devel/gettext )
-	webdav-neon? ( dev-util/pkgconfig )"
+	webdav-neon? ( virtual/pkgconfig )"
 PDEPEND="java? ( ~dev-vcs/subversion-java-${PV} )"
 
-PATCHES=(
-		"${FILESDIR}/${PN}-1.5.4-interix.patch"
-		"${FILESDIR}/${PN}-1.5.6-aix-dso.patch"
-		"${FILESDIR}/${PN}-1.6.3-hpux-dso.patch"
-)
-
 want_apache
 
 pkg_setup() {
@@ -108,7 +102,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	base_src_prepare
+	epatch "${FILESDIR}"/${PN}-1.5.4-interix.patch \
+		"${FILESDIR}"/${PN}-1.5.6-aix-dso.patch \
+		"${FILESDIR}"/${PN}-1.6.3-hpux-dso.patch \
+		"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch
+
 	fperms +x build/transform_libtool_scripts.sh
 
 	sed -i \
@@ -143,20 +141,21 @@ src_configure() {
 	fi
 
 	case ${CHOST} in
-		*-solaris*)
-			# -lintl isn't added for some reason (makes Neon check fail)
-			use nls && append-libs -lintl
-		;;
 		*-aix*)
 			# avoid recording immediate path to sharedlibs into executables
 			append-ldflags -Wl,-bnoipath
 		;;
 		*-interix*)
 			# loader crashes on the LD_PRELOADs...
-			myconf="${myconf} --disable-local-library-preloading"
+			myconf+=" --disable-local-library-preloading"
 		;;
 	esac
 
+	#workaround for bug 387057
+	has_version =dev-vcs/subversion-1.6* && myconf+=" --disable-disallowing-of-undefined-references"
+
+	#force ruby-1.8 for bug 399105
+	ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby18 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc18 \
 	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
 		$(use_with apache2 apxs "${APXS}") \
 		$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \
@@ -303,7 +302,10 @@ src_install() {
 	#adjust default user and group with disabled apache2 USE flag, bug 381385
 	use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \
 			-e "s\GROUP:-apache\GROUP:-svnusers\g" \
-			-i "${D}"etc/init.d/svnserve
+			-i "${ED}"etc/init.d/svnserve || die
+	use apache2 || sed -e "0,/apache/s//svn/" \
+			-e "s:apache:svnusers:" \
+			-i "${ED}"etc/xinetd.d/svnserve || die
 
 	# Install documentation.
 	dodoc CHANGES COMMITTERS README
@@ -335,7 +337,12 @@ EOF
 		dodoc notes/*
 	fi
 
-	find "${D}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f
+	find "${ED}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f
+
+	cd "${ED}"usr/share/locale
+	for i in * ; do
+		[[ $i == *$LINGUAS* ]] || { rm -r $i || die ; }
+	done
 }
 
 pkg_preinst() {
@@ -385,16 +392,16 @@ pkg_postrm() {
 pkg_config() {
 	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
 	# already has EPREFIX in it
-	einfo "Initializing the database in ${ROOT}${SVN_REPOS_LOC}..."
-	if [[ -e "${ROOT}${SVN_REPOS_LOC}/repos" ]]; then
+	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
+	if [[ -e "${SVN_REPOS_LOC}/repos" ]]; then
 		echo "A Subversion repository already exists and I will not overwrite it."
-		echo "Delete \"${ROOT}${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
+		echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
 	else
-		mkdir -p "${ROOT}${SVN_REPOS_LOC}/conf"
+		mkdir -p "${SVN_REPOS_LOC}/conf"
 
 		einfo "Populating repository directory..."
 		# Create initial repository.
-		"${EROOT}usr/bin/svnadmin" create "${ROOT}${SVN_REPOS_LOC}/repos"
+		"${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
 
 		einfo "Setting repository permissions..."
 		SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
@@ -405,11 +412,13 @@ pkg_config() {
 		else
 			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
 			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
-			enewgroup "${SVNSERVE_GROUP}"
-			enewuser "${SVNSERVE_USER}" -1 -1 "${SVN_REPOS_LOC}" "${SVNSERVE_GROUP}"
 		fi
-		chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${ROOT}${SVN_REPOS_LOC}/repos"
-		chmod -Rf go-rwx "${ROOT}${SVN_REPOS_LOC}/conf"
-		chmod -Rf o-rwx "${ROOT}${SVN_REPOS_LOC}/repos"
+		chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
+		chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
+		echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet."
+		echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\""
+		echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet."
+		echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
+		echo "to finish the configuration."
 	fi
 }