diff --git a/dev-vcs/subversion-java/Manifest b/dev-vcs/subversion-java/Manifest
index 8369bd390..b4b48913a 100644
--- a/dev-vcs/subversion-java/Manifest
+++ b/dev-vcs/subversion-java/Manifest
@@ -1,2 +1,2 @@
-DIST subversion-1.7.6.tar.bz2 6006767 SHA256 d1a4f13c5c992a1527a2aeac262c6f54e073963ce1d13abfabb2a90980fa7d05
 DIST subversion-1.7.7.tar.bz2 6023686 SHA256 fc85a9341d1dc275b279e470776014b02328a028e48a7ac7868ac07d4a40a321 SHA512 0ce0a22e05c76132d9a1650cee3d7fdf6eb7606eb7197ee604e48129e6e3ba7ebc910d71c756ef2aced7100c8cd9a7d1dc3da8744315be0a8c506fdafa8ada19 WHIRLPOOL d0c82ab9abd8e95cbd5a5cf0d082a5b1eda7451bfaa5754d33a10279d94548f8c1457b3089c4bbb3347569b96be293e04371c05965ab2019aa38084831bc111d
+DIST subversion-1.7.8.tar.bz2 6023912 SHA256 fc83d4d98ccea8b7bfa8f5c20fff545c8baa7d035db930977550c51c6ca23686 SHA512 1e97a2049d7decaa7002d23a4353b67425ec682c4d229932a5a384d547855b61cdb02f2ee6ea89b9b63a35715a0321dc6ba35b3148d242c4899f4ccdf6ce35cd WHIRLPOOL 1c70043922986ec7af0a99455eb7f60c70461342af838b6151de740afcff6e3e8e999f480ea86020fc64a8620ee5a79eff7c7723df4320a86a2a38eb55063310
diff --git a/dev-vcs/subversion-java/files/subversion-1.7.6-revert-mod_dontdothat-move.patch b/dev-vcs/subversion-java/files/subversion-1.7.6-revert-mod_dontdothat-move.patch
deleted file mode 100644
index 24b2834ab..000000000
--- a/dev-vcs/subversion-java/files/subversion-1.7.6-revert-mod_dontdothat-move.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- build-outputs.mk	2012-08-21 20:38:31.000000000 +0200
-+++ build-outputs.mk.new	2012-08-21 20:45:08.000000000 +0200
-@@ -825,7 +825,7 @@
- # Section 6: Install-Group build targets
- ########################################
- 
--apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la
-+apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la
- 
- bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la
- 
-@@ -877,16 +877,17 @@
- 
- test: subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_test-1.la subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_wc/tree-conflict-data-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT)
- 
--tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
-+tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
- 
- 
- ########################################
- # Section 7: Install-Group install targets
- ########################################
- 
--install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la
-+install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la
- 	cd subversion/mod_dav_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dav_svn mod_dav_svn.la
- 	cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la
-+	cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la
- 
- install-bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la 
- 	$(MKDIR) $(DESTDIR)$(bdb_libdir)
-@@ -1036,7 +1037,7 @@
- 	$(MKDIR) $(DESTDIR)$(swig_rb_libdir)
- 	cd subversion/bindings/swig/ruby/libsvn_swig_ruby ; $(INSTALL_SWIG_RB_LIB) libsvn_swig_ruby-1.la $(DESTDIR)$(swig_rb_libdir)/libsvn_swig_ruby-1.la
- 
--install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)  tools/server-side/mod_dontdothat/mod_dontdothat.la
-+install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
- 	$(MKDIR) $(DESTDIR)$(toolsdir)
- 	cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT)
- 	cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT)
-@@ -1046,7 +1047,6 @@
- 	cd tools/server-side ; $(INSTALL_TOOLS) svnauthz-validate$(EXEEXT) $(DESTDIR)$(toolsdir)/svnauthz-validate$(EXEEXT)
- 	cd tools/client-side/svnmucc ; $(INSTALL_TOOLS) svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT)
- 	cd tools/dev/svnraisetreeconflict ; $(INSTALL_TOOLS) svnraisetreeconflict$(EXEEXT) $(DESTDIR)$(toolsdir)/svnraisetreeconflict$(EXEEXT)
--	cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la
- 
- 
- ########################################
diff --git a/dev-vcs/subversion-java/subversion-java-1.7.6.ebuild b/dev-vcs/subversion-java/subversion-java-1.7.8.ebuild
similarity index 74%
rename from dev-vcs/subversion-java/subversion-java-1.7.6.ebuild
rename to dev-vcs/subversion-java/subversion-java-1.7.8.ebuild
index 5289af82a..8b3f0cae7 100644
--- a/dev-vcs/subversion-java/subversion-java-1.7.6.ebuild
+++ b/dev-vcs/subversion-java/subversion-java-1.7.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
+EAPI=5
 WANT_AUTOMAKE="none"
 MY_P="${P/_/-}"
 
@@ -16,7 +16,7 @@ inherit autotools eutils flag-o-matic java-pkg-2 libtool multilib
 
 DESCRIPTION="Java bindings for Subversion"
 HOMEPAGE="http://subversion.apache.org/"
-SRC_URI="http://subversion.tigris.org/downloads/${MY_SVN_P}.tar.bz2"
+SRC_URI="mirror://apache/${PN}/${MY_SVN_P}.tar.bz2"
 S="${WORKDIR}/${MY_SVN_P/_/-}"
 
 LICENSE="Subversion"
@@ -43,8 +43,8 @@ pkg_setup() {
 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 \
-		"${FILESDIR}"/${MY_SVN_PN}-${PV}-revert-mod_dontdothat-move.patch
+		"${FILESDIR}"/${MY_SVN_PN}-1.6.3-hpux-dso.patch
+	epatch_user
 
 	fperms +x build/transform_libtool_scripts.sh
 
@@ -52,8 +52,6 @@ src_prepare() {
 		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
 		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
 
-	sed -e "/SWIG_PY_INCLUDES=/s/\$ac_cv_python_includes/\\\\\$(PYTHON_INCLUDES)/" -i build/ac-macros/swig.m4 || die "sed failed"
-
 	# this bites us in particular on Solaris
 	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
 		die "/bin/sh is not POSIX shell!"
@@ -61,7 +59,8 @@ src_prepare() {
 	eautoconf
 	elibtoolize
 
-	sed -e "s/libsvn_swig_py-1\.la/libsvn_swig_py-\$(PYTHON_VERSION)-1.la/" -i build-outputs.mk || die "sed failed"
+	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
+		-i build-outputs.mk || die "sed failed"
 }
 
 src_configure() {
@@ -85,11 +84,29 @@ src_configure() {
 			# loader crashes on the LD_PRELOADs...
 			myconf+=" --disable-local-library-preloading"
 		;;
+		*-solaris*)
+			# need -lintl to link
+			use nls && append-libs intl
+			# this breaks installation, on x64 echo replacement is 32-bits
+			myconf+=" --disable-local-library-preloading"
+		;;
+		*-mint*)
+			myconf+=" --enable-all-static --disable-local-library-preloading"
+		;;
+		*)
+			# inject LD_PRELOAD entries for easy in-tree development
+			myconf+=" --enable-local-library-preloading"
+		;;
 	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
+	myconf+=" --disable-disallowing-of-undefined-references"
+
 	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
 		--without-apxs \
 		--without-berkeley-db \
@@ -107,22 +124,21 @@ src_configure() {
 		--with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \
 		--disable-experimental-libtool \
 		--without-jikes \
-		--enable-local-library-preloading \
 		--disable-mod-activation \
 		--disable-neon-version-check \
 		--disable-static
 }
 
 src_compile() {
-	emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Building of Subversion JavaHL library failed"
+	emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
 
 	if use doc; then
-		emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed"
+		emake doc-javahl
 	fi
 }
 
 src_install() {
-	emake DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
+	emake DESTDIR="${D}" install-javahl
 	java-pkg_regso "${ED}"usr/$(get_libdir)/libsvnjavahl*$(get_libname)
 	java-pkg_jarinto /usr/share/"${MY_SVN_PN}"/lib
 	java-pkg_dojar "${ED}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 8369bd390..b4b48913a 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -1,2 +1,2 @@
-DIST subversion-1.7.6.tar.bz2 6006767 SHA256 d1a4f13c5c992a1527a2aeac262c6f54e073963ce1d13abfabb2a90980fa7d05
 DIST subversion-1.7.7.tar.bz2 6023686 SHA256 fc85a9341d1dc275b279e470776014b02328a028e48a7ac7868ac07d4a40a321 SHA512 0ce0a22e05c76132d9a1650cee3d7fdf6eb7606eb7197ee604e48129e6e3ba7ebc910d71c756ef2aced7100c8cd9a7d1dc3da8744315be0a8c506fdafa8ada19 WHIRLPOOL d0c82ab9abd8e95cbd5a5cf0d082a5b1eda7451bfaa5754d33a10279d94548f8c1457b3089c4bbb3347569b96be293e04371c05965ab2019aa38084831bc111d
+DIST subversion-1.7.8.tar.bz2 6023912 SHA256 fc83d4d98ccea8b7bfa8f5c20fff545c8baa7d035db930977550c51c6ca23686 SHA512 1e97a2049d7decaa7002d23a4353b67425ec682c4d229932a5a384d547855b61cdb02f2ee6ea89b9b63a35715a0321dc6ba35b3148d242c4899f4ccdf6ce35cd WHIRLPOOL 1c70043922986ec7af0a99455eb7f60c70461342af838b6151de740afcff6e3e8e999f480ea86020fc64a8620ee5a79eff7c7723df4320a86a2a38eb55063310
diff --git a/dev-vcs/subversion/files/subversion-1.7.6-revert-mod_dontdothat-move.patch b/dev-vcs/subversion/files/subversion-1.7.6-revert-mod_dontdothat-move.patch
deleted file mode 100644
index 24b2834ab..000000000
--- a/dev-vcs/subversion/files/subversion-1.7.6-revert-mod_dontdothat-move.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- build-outputs.mk	2012-08-21 20:38:31.000000000 +0200
-+++ build-outputs.mk.new	2012-08-21 20:45:08.000000000 +0200
-@@ -825,7 +825,7 @@
- # Section 6: Install-Group build targets
- ########################################
- 
--apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la
-+apache-mod: subversion/mod_authz_svn/mod_authz_svn.la subversion/mod_dav_svn/mod_dav_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la
- 
- bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la
- 
-@@ -877,16 +877,17 @@
- 
- test: subversion/tests/cmdline/atomic-ra-revprop-change$(EXEEXT) subversion/tests/libsvn_subr/auth-test$(EXEEXT) subversion/tests/libsvn_subr/cache-test$(EXEEXT) subversion/tests/libsvn_subr/checksum-test$(EXEEXT) subversion/tests/libsvn_client/client-test$(EXEEXT) subversion/tests/libsvn_subr/compat-test$(EXEEXT) subversion/tests/libsvn_subr/config-test$(EXEEXT) subversion/tests/libsvn_wc/db-test$(EXEEXT) subversion/tests/libsvn_diff/diff-diff3-test$(EXEEXT) subversion/tests/libsvn_subr/dirent_uri-test$(EXEEXT) subversion/tests/libsvn_wc/entries-compat-test$(EXEEXT) subversion/tests/cmdline/entries-dump$(EXEEXT) subversion/tests/libsvn_subr/error-test$(EXEEXT) subversion/tests/libsvn_fs_fs/fs-pack-test$(EXEEXT) subversion/tests/libsvn_fs/fs-test$(EXEEXT) subversion/tests/libsvn_subr/hashdump-test$(EXEEXT) subversion/tests/libsvn_test-1.la subversion/tests/libsvn_fs/locks-test$(EXEEXT) subversion/tests/libsvn_subr/mergeinfo-test$(EXEEXT) subversion/tests/libsvn_wc/op-depth-test$(EXEEXT) subversion/tests/libsvn_subr/opt-test$(EXEEXT) subversion/tests/libsvn_diff/parse-diff-test$(EXEEXT) subversion/tests/libsvn_subr/path-test$(EXEEXT) subversion/tests/libsvn_wc/pristine-store-test$(EXEEXT) subversion/tests/libsvn_ra_local/ra-local-test$(EXEEXT) subversion/tests/libsvn_delta/random-test$(EXEEXT) subversion/tests/libsvn_repos/repos-test$(EXEEXT) subversion/tests/libsvn_subr/revision-test$(EXEEXT) subversion/tests/libsvn_subr/skel-test$(EXEEXT) subversion/tests/libsvn_subr/stream-test$(EXEEXT) subversion/tests/libsvn_subr/string-test$(EXEEXT) subversion/tests/libsvn_subr/subst_translate-test$(EXEEXT) subversion/tests/libsvn_delta/svndiff-test$(EXEEXT) subversion/tests/libsvn_subr/target-test$(EXEEXT) subversion/tests/libsvn_subr/time-test$(EXEEXT) subversion/tests/libsvn_subr/translate-test$(EXEEXT) subversion/tests/libsvn_wc/tree-conflict-data-test$(EXEEXT) subversion/tests/libsvn_subr/utf-test$(EXEEXT) subversion/tests/libsvn_delta/vdelta-test$(EXEEXT) subversion/tests/libsvn_wc/wc-incomplete-tester$(EXEEXT) subversion/tests/libsvn_wc/wc-lock-tester$(EXEEXT) subversion/tests/libsvn_delta/window-test$(EXEEXT)
- 
--tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/mod_dontdothat/mod_dontdothat.la tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
-+tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
- 
- 
- ########################################
- # Section 7: Install-Group install targets
- ########################################
- 
--install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la
-+install-mods-shared: subversion/mod_dav_svn/mod_dav_svn.la subversion/mod_authz_svn/mod_authz_svn.la tools/server-side/mod_dontdothat/mod_dontdothat.la
- 	cd subversion/mod_dav_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dav_svn mod_dav_svn.la
- 	cd subversion/mod_authz_svn ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n authz_svn mod_authz_svn.la
-+	cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la
- 
- install-bdb-lib: subversion/libsvn_fs_base/libsvn_fs_base-1.la 
- 	$(MKDIR) $(DESTDIR)$(bdb_libdir)
-@@ -1036,7 +1037,7 @@
- 	$(MKDIR) $(DESTDIR)$(swig_rb_libdir)
- 	cd subversion/bindings/swig/ruby/libsvn_swig_ruby ; $(INSTALL_SWIG_RB_LIB) libsvn_swig_ruby-1.la $(DESTDIR)$(swig_rb_libdir)/libsvn_swig_ruby-1.la
- 
--install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)  tools/server-side/mod_dontdothat/mod_dontdothat.la
-+install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svn-rep-sharing-stats$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT) tools/dev/svnraisetreeconflict/svnraisetreeconflict$(EXEEXT)
- 	$(MKDIR) $(DESTDIR)$(toolsdir)
- 	cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT)
- 	cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT)
-@@ -1046,7 +1047,6 @@
- 	cd tools/server-side ; $(INSTALL_TOOLS) svnauthz-validate$(EXEEXT) $(DESTDIR)$(toolsdir)/svnauthz-validate$(EXEEXT)
- 	cd tools/client-side/svnmucc ; $(INSTALL_TOOLS) svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT)
- 	cd tools/dev/svnraisetreeconflict ; $(INSTALL_TOOLS) svnraisetreeconflict$(EXEEXT) $(DESTDIR)$(toolsdir)/svnraisetreeconflict$(EXEEXT)
--	cd tools/server-side/mod_dontdothat ; $(MKDIR) "$(APACHE_LIBEXECDIR)" ; $(INSTALL_MOD_SHARED) -n dontdothat mod_dontdothat.la
- 
- 
- ########################################
diff --git a/dev-vcs/subversion/subversion-1.7.6.ebuild b/dev-vcs/subversion/subversion-1.7.8.ebuild
similarity index 69%
rename from dev-vcs/subversion/subversion-1.7.6.ebuild
rename to dev-vcs/subversion/subversion-1.7.8.ebuild
index 4926c8f6f..0a6060b69 100644
--- a/dev-vcs/subversion/subversion-1.7.6.ebuild
+++ b/dev-vcs/subversion/subversion-1.7.8.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+DISTUTILS_OPTIONAL=1
 WANT_AUTOMAKE="none"
 MY_P="${P/_/-}"
 
-inherit autotools bash-completion-r1 db-use depend.apache elisp-common eutils flag-o-matic libtool multilib perl-module python
+inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common flag-o-matic libtool multilib perl-module eutils
 
 DESCRIPTION="Advanced version control system"
 HOMEPAGE="http://subversion.apache.org/"
-SRC_URI="http://www.apache.org/dist/${PN}/${MY_P}.tar.bz2"
+SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="Subversion GPL-2"
@@ -20,27 +20,29 @@ 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"
 
-CDEPEND=">=dev-db/sqlite-3.4
+COMMON_DEPEND=">=dev-db/sqlite-3.4
 	>=dev-libs/apr-1.3:1
 	>=dev-libs/apr-util-1.3:1
 	dev-libs/expat
 	sys-libs/zlib
 	berkdb? ( >=sys-libs/db-4.0.14 )
-	ctypes-python? ( =dev-lang/python-2* )
+	ctypes-python? ( ${PYTHON_DEPS} )
 	gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring )
 	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? ( =dev-lang/python-2* )
+	python? ( ${PYTHON_DEPS} )
 	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 )"
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	apache2? ( www-servers/apache[apache2_modules_dav] )
 	kde? ( kde-base/kwalletd )
 	nls? ( virtual/libintl )
 	perl? ( dev-perl/URI )"
-DEPEND="${CDEPEND}
+# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
 	!!<sys-apps/sandbox-1.6
 	ctypes-python? ( dev-python/ctypesgen )
 	doc? ( app-doc/doxygen )
@@ -81,10 +83,6 @@ pkg_setup() {
 
 	depend.apache_pkg_setup
 
-	if use ctypes-python || use python; then
-		python_pkg_setup
-	fi
-
 	if ! use webdav-neon && ! use webdav-serf; then
 		ewarn "WebDAV support is disabled. You need WebDAV to"
 		ewarn "access repositories through the HTTP protocol."
@@ -105,9 +103,8 @@ 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 \
-		"${FILESDIR}"/${P}-revert-mod_dontdothat-move.patch \
-		"${FILESDIR}"/${P}-kwallet.patch
+		"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch
+	epatch_user
 
 	fperms +x build/transform_libtool_scripts.sh
 
@@ -115,8 +112,6 @@ src_prepare() {
 		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
 		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
 
-	sed -e "/SWIG_PY_INCLUDES=/s/\$ac_cv_python_includes/\\\\\$(PYTHON_INCLUDES)/" -i build/ac-macros/swig.m4 || die "sed failed"
-
 	# this bites us in particular on Solaris
 	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
 		die "/bin/sh is not POSIX shell!"
@@ -124,7 +119,14 @@ src_prepare() {
 	eautoconf
 	elibtoolize
 
-	sed -e "s/libsvn_swig_py-1\.la/libsvn_swig_py-\$(PYTHON_VERSION)-1.la/" -i build-outputs.mk || die "sed failed"
+	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
+		-i build-outputs.mk || die "sed failed"
+
+	if use python; then
+		# XXX: make python_copy_sources accept path
+		S=${S}/subversion/bindings/swig/python python_copy_sources
+		rm -r "${S}"/subversion/bindings/swig/python || die
+	fi
 }
 
 src_configure() {
@@ -151,13 +153,36 @@ src_configure() {
 			# loader crashes on the LD_PRELOADs...
 			myconf+=" --disable-local-library-preloading"
 		;;
+		*-solaris*)
+			# need -lintl to link
+			use nls && append-libs intl
+			# this breaks installation, on x64 echo replacement is 32-bits
+			myconf+=" --disable-local-library-preloading"
+		;;
+		*-mint*)
+			myconf+=" --enable-all-static --disable-local-library-preloading"
+		;;
+		*)
+			# inject LD_PRELOAD entries for easy in-tree development
+			myconf+=" --enable-local-library-preloading"
+		;;
 	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
+	myconf+=" --disable-disallowing-of-undefined-references"
+
+	# for build-time scripts
+	python_export_best
+
 	#force ruby-1.8 for bug 399105
+	#allow overriding Python include directory
 	ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby18 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc18 \
+	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
 	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}") \
@@ -174,58 +199,50 @@ src_configure() {
 		--with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \
 		--disable-experimental-libtool \
 		--without-jikes \
-		--enable-local-library-preloading \
 		--disable-mod-activation \
 		--disable-neon-version-check \
 		--disable-static
 }
 
 src_compile() {
-	emake local-all || die "Building of core of Subversion failed"
+	emake local-all
 
 	if use ctypes-python; then
-		python_copy_sources subversion/bindings/ctypes-python
-		rm -fr subversion/bindings/ctypes-python
-		ctypes_python_bindings_building() {
-			rm -f subversion/bindings/ctypes-python
-			ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python
-			emake ctypes-python
-		}
-		python_execute_function \
-			--action-message 'Building of Subversion Ctypes Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Building of Subversion Ctypes Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			ctypes_python_bindings_building
+		# pre-generate .py files
+		use ctypes-python && emake ctypes-python
+
+		pushd subversion/bindings/ctypes-python >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
 	fi
 
 	if use python; then
-		python_copy_sources subversion/bindings/swig/python
-		rm -fr subversion/bindings/swig/python
-		swig_python_bindings_building() {
-			rm -f subversion/bindings/swig/python
-			ln -s python-${PYTHON_ABI} subversion/bindings/swig/python
-			emake \
-				PYTHON_INCLUDES="-I${EPREFIX}$(python_get_includedir)" \
-				PYTHON_VERSION="$(python_get_version)" \
-				swig_pydir="${EPREFIX}$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="${EPREFIX}$(python_get_sitedir)/svn" \
-				swig-py
+		swig_py_compile() {
+			local p=subversion/bindings/swig/python
+			rm -f ${p} || die
+			ln -s "${BUILD_DIR}" ${p} || die
+
+			python_export PYTHON_INCLUDEDIR
+			emake swig-py \
+				swig_pydir="$(python_get_sitedir)/libsvn" \
+				swig_pydir_extra="$(python_get_sitedir)/svn"
 		}
-		python_execute_function \
-			--action-message 'Building of Subversion SWIG Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Building of Subversion SWIG Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			swig_python_bindings_building
+
+		# this will give us proper BUILD_DIR for symlinking
+		BUILD_DIR=python \
+		python_foreach_impl swig_py_compile
 	fi
 
 	if use perl; then
-		emake swig-pl || die "Building of Subversion SWIG Perl bindings failed"
+		emake swig-pl
 	fi
 
 	if use ruby; then
-		emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed"
+		emake swig-rb
 	fi
 
 	if use extras; then
-		emake tools || die "Building of tools failed"
+		emake tools
 	fi
 
 	if use doc; then
@@ -233,50 +250,64 @@ src_compile() {
 	fi
 }
 
-src_install() {
-	emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed"
+src_test() {
+	default
 
 	if use ctypes-python; then
-		ctypes_python_bindings_installation() {
-			rm -f subversion/bindings/ctypes-python
-			ln -s ctypes-python-${PYTHON_ABI} subversion/bindings/ctypes-python
-			emake DESTDIR="${D}" install-ctypes-python
+		python_test() {
+			"${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
+				|| die "ctypes-python tests fail with ${EPYTHON}"
 		}
-		python_execute_function \
-			--action-message 'Installation of Subversion Ctypes Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Installation of Subversion Ctypes Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			ctypes_python_bindings_installation
+
+		distutils-r1_src_test
 	fi
 
 	if use python; then
-		swig_python_bindings_installation() {
-			rm -f subversion/bindings/swig/python
-			ln -s python-${PYTHON_ABI} subversion/bindings/swig/python
-			emake \
-				DESTDIR="${D}" \
-				PYTHON_VERSION="$(python_get_version)" \
-				swig_pydir="${EPREFIX}$(python_get_sitedir)/libsvn" \
-				swig_pydir_extra="${EPREFIX}$(python_get_sitedir)/svn" \
-				install-swig-py
+		swig_py_test() {
+			pushd "${BUILD_DIR}" >/dev/null || die
+			"${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
+			popd >/dev/null || die
 		}
-		python_execute_function \
-			--action-message 'Installation of Subversion SWIG Python bindings with $(python_get_implementation) $(python_get_version)' \
-			--failure-message 'Installation of Subversion SWIG Python bindings failed with $(python_get_implementation) $(python_get_version)' \
-			swig_python_bindings_installation
+
+		BUILD_DIR=subversion/bindings/swig/python \
+		python_foreach_impl swig_py_test
+	fi
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" local-install
+
+	if use ctypes-python; then
+		pushd subversion/bindings/ctypes-python >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
 	fi
 
-	if use ctypes-python || use python; then
-		python_clean_installation_image -q
+	if use python; then
+		swig_py_install() {
+			local p=subversion/bindings/swig/python
+			rm -f ${p} || die
+			ln -s "${BUILD_DIR}" ${p} || die
+
+			emake \
+				DESTDIR="${D}" \
+				swig_pydir="$(python_get_sitedir)/libsvn" \
+				swig_pydir_extra="$(python_get_sitedir)/svn" \
+				install-swig-py
+		}
+
+		BUILD_DIR=python \
+		python_foreach_impl swig_py_install
 	fi
 
 	if use perl; then
-		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion SWIG Perl bindings failed"
+		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
 		fixlocalpod
-		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -print0 | xargs -0 rm -fr
+		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete
 	fi
 
 	if use ruby; then
-		emake DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed"
+		emake DESTDIR="${D}" install-swig-rb
 	fi
 
 	# Install Apache module configuration.
@@ -329,14 +360,12 @@ EOF
 		rm -fr tools/{buildbot,dev,diff,po}
 
 		insinto /usr/share/${PN}
-		python_convert_shebangs -r 2 tools
+		find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
 		doins -r tools
 	fi
 
 	if use doc; then
-		dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed"
-
-		dodoc notes/*
+		dohtml -r doc/doxygen/html/*
 	fi
 
 	find "${ED}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f
@@ -361,14 +390,6 @@ pkg_preinst() {
 pkg_postinst() {
 	use perl && perl-module_pkg_postinst
 
-	if use ctypes-python; then
-		python_mod_optimize csvn
-	fi
-
-	if use python; then
-		python_mod_optimize libsvn svn
-	fi
-
 	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:"
@@ -381,14 +402,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	use perl && perl-module_pkg_postrm
-
-	if use ctypes-python; then
-		python_mod_cleanup csvn
-	fi
-
-	if use python; then
-		python_mod_cleanup libsvn svn
-	fi
 }
 
 pkg_config() {
diff --git a/www-apache/mod_dav_svn/Manifest b/www-apache/mod_dav_svn/Manifest
index 0b364ba2b..9d4927d08 100644
--- a/www-apache/mod_dav_svn/Manifest
+++ b/www-apache/mod_dav_svn/Manifest
@@ -1,2 +1,3 @@
 DIST subversion-1.7.7-Gentoo-patches.tar.gz 2035 SHA256 2e4ee343fb0ed56c9488f3de808133ebbbfb697a717251616d391c1b6268e8c1 SHA512 ab5810639cdd7fa7454b1b8dfc159e221c4ab276b5ac76502ef0c32512839cc0f2d776c98aeac30fe99946a7ab68c1d489a93ec8a4cf74961e1c0c29649e3425 WHIRLPOOL ce7d66223f6c632ebdbb0b3d272cb66e7122cf3aaabbb78081fccce6ad4e266221294130da904abe8c963e9bf4014fce3cec2c3b88e84201b244104cc9748d03
 DIST subversion-1.7.7.tar.bz2 6023686 SHA256 fc85a9341d1dc275b279e470776014b02328a028e48a7ac7868ac07d4a40a321 SHA512 0ce0a22e05c76132d9a1650cee3d7fdf6eb7606eb7197ee604e48129e6e3ba7ebc910d71c756ef2aced7100c8cd9a7d1dc3da8744315be0a8c506fdafa8ada19 WHIRLPOOL d0c82ab9abd8e95cbd5a5cf0d082a5b1eda7451bfaa5754d33a10279d94548f8c1457b3089c4bbb3347569b96be293e04371c05965ab2019aa38084831bc111d
+DIST subversion-1.7.8.tar.bz2 6023912 SHA256 fc83d4d98ccea8b7bfa8f5c20fff545c8baa7d035db930977550c51c6ca23686 SHA512 1e97a2049d7decaa7002d23a4353b67425ec682c4d229932a5a384d547855b61cdb02f2ee6ea89b9b63a35715a0321dc6ba35b3148d242c4899f4ccdf6ce35cd WHIRLPOOL 1c70043922986ec7af0a99455eb7f60c70461342af838b6151de740afcff6e3e8e999f480ea86020fc64a8620ee5a79eff7c7723df4320a86a2a38eb55063310
diff --git a/www-apache/mod_dav_svn/mod_dav_svn-1.7.8.ebuild b/www-apache/mod_dav_svn/mod_dav_svn-1.7.8.ebuild
new file mode 100644
index 000000000..3e6a132fb
--- /dev/null
+++ b/www-apache/mod_dav_svn/mod_dav_svn-1.7.8.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+WANT_AUTOMAKE="none"
+MY_P="${P/_/-}"
+
+MY_SVN_PN="subversion"
+MY_SVN_P="${MY_SVN_PN}-${PV}"
+MY_SVN_PF="${MY_SVN_PN}-${PVR}"
+
+inherit autotools db-use depend.apache flag-o-matic libtool multilib eutils
+
+DESCRIPTION="Subversion WebDAV support"
+HOMEPAGE="http://subversion.apache.org/"
+SRC_URI="mirror://apache/${MY_SVN_PN}/${MY_SVN_P}.tar.bz2
+	mirror://sabayon/dev-vcs/${MY_SVN_PN}-1.7.7-Gentoo-patches.tar.gz"
+S="${WORKDIR}/${MY_SVN_P}"
+
+LICENSE="Subversion"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="berkdb debug +dso nls sasl +webdav-neon webdav-serf"
+# w/o: apache2 ctypes-python doc extras gnome-keyring java kde perl python ruby
+# vim-syntax
+
+# This is an ebuild that provides mod_dav_svn and friends (it does more or
+# less the same as when USE=apache2 is added to dev-vcs/subversion - basically
+# provides three Apache modules and a configuration file), suitable for binary
+# packages.
+# Some flags in IUSE and their handling are only used to enforce the code be
+# compiled sufficiently the same way Subversion itself was - extra carefulness.
+# In the process of building libraries for WebDAV, a few unused libraries are
+# also built (not the whole Subversion, though, which is a win). Some build
+# time dependencies here are just for them.
+
+# If you are building it for yourself, you don't need it.
+# USE=apache2 emerge dev-vcs/subversion will do what you want.
+# However, you can use this ebuild too.
+
+# variable specific to www-apache/mod_dav_svn
+MY_CDEPS="
+	~dev-vcs/subversion-${PV}[berkdb=,debug=,dso=,nls=,sasl=,webdav-neon=,webdav-serf=]
+	>=dev-db/sqlite-3.4
+	>=dev-libs/apr-1.3:1
+	>=dev-libs/apr-util-1.3:1
+	dev-libs/expat
+	sys-apps/file
+	sys-libs/zlib
+	berkdb? ( >=sys-libs/db-4.0.14 )
+"
+
+DEPEND="${MY_CDEPS}
+	sasl? ( dev-libs/cyrus-sasl )
+	webdav-neon? ( >=net-libs/neon-0.28 virtual/pkgconfig )
+	webdav-serf? ( >=net-libs/serf-0.3.0 )
+
+	!!<sys-apps/sandbox-1.6
+	nls? ( sys-devel/gettext )"
+RDEPEND="${MY_CDEPS}
+	!dev-vcs/subversion[apache2]
+
+	www-servers/apache[apache2_modules_dav]
+	nls? ( virtual/libintl )"
+
+need_apache # was: want_apache
+
+pkg_setup() {
+	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
+				SVN_BDB_VERSION="${apu_bdb_version}"
+				einfo "Matching db version to apr-util"
+			else
+				SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
+				einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
+			fi
+		fi
+		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
+		einfo
+
+		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
+			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
+			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
+			eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
+			eerror "Aborting to avoid possible run-time crashes."
+			die "Berkeley DB version mismatch"
+		fi
+	fi
+
+	# depend.apache_pkg_setup
+
+	if ! use webdav-neon && ! use webdav-serf; then
+		ewarn "WebDAV support is disabled. You need WebDAV to"
+		ewarn "access repositories through the HTTP protocol."
+		ewarn "Consider enabling one of the following USE-flags:"
+		ewarn "  webdav-neon webdav-serf"
+		# echo -ne "\a"
+		die "needed option not enabled in USE"
+	fi
+
+	if use debug; then
+		append-cppflags -DSVN_DEBUG -DAP_DEBUG
+	fi
+
+	# Allow for custom repository locations.
+	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
+}
+
+src_prepare() {
+	local d=${WORKDIR}/1.7.7-Gentoo-patches
+
+	epatch "${d}"/${MY_SVN_PN}-1.5.4-interix.patch \
+		"${d}"/${MY_SVN_PN}-1.5.6-aix-dso.patch \
+		"${d}"/${MY_SVN_PN}-1.6.3-hpux-dso.patch \
+		"${d}"/${MY_SVN_PN}-fix-parallel-build-support-for-perl-bindings.patch
+		# "${d}"/${MY_SVN_PN}-1.7.6-kwallet.patch
+	epatch_user
+
+	fperms +x build/transform_libtool_scripts.sh
+
+	sed -i \
+		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
+		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
+
+	# this bites us in particular on Solaris
+	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
+		die "/bin/sh is not POSIX shell!"
+
+	eautoconf
+	elibtoolize
+
+	#sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
+	#-i build-outputs.mk || die "sed failed"
+}
+
+src_configure() {
+	local myconf
+
+	#use python || use perl || use ruby
+	myconf+=" --without-swig"
+
+	#use java
+	myconf+=" --without-junit"
+
+	#use kde || use nls
+	if use nls; then
+		myconf+=" --enable-nls"
+	else
+		myconf+=" --disable-nls"
+	fi
+
+	case ${CHOST} in
+		*-aix*)
+			# avoid recording immediate path to sharedlibs into executables
+			append-ldflags -Wl,-bnoipath
+		;;
+		*-interix*)
+			# loader crashes on the LD_PRELOADs...
+			myconf+=" --disable-local-library-preloading"
+		;;
+		*-solaris*)
+			# need -lintl to link
+			use nls && append-libs intl
+			# this breaks installation, on x64 echo replacement is 32-bits
+			myconf+=" --disable-local-library-preloading"
+		;;
+		*-mint*)
+			myconf+=" --enable-all-static --disable-local-library-preloading"
+		;;
+		*)
+			# inject LD_PRELOAD entries for easy in-tree development
+			myconf+=" --enable-local-library-preloading"
+		;;
+	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
+	myconf+=" --disable-disallowing-of-undefined-references"
+
+	#force ruby-1.8 for bug 399105
+	#allow overriding Python include directory
+	ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby18 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc18 \
+	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
+	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-apxs="${APXS}" \
+		$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}") \
+		--without-ctypesgen \
+		$(use_enable dso runtime-module-search) \
+		--without-gnome-keyring \
+		--disable-javahl \
+		--without-jdk \
+		--without-kwallet \
+		$(use_with sasl) \
+		$(use_with webdav-neon neon) \
+		$(use_with webdav-serf serf "${EPREFIX}/usr") \
+		${myconf} \
+		--with-apr="${EPREFIX}/usr/bin/apr-1-config" \
+		--with-apr-util="${EPREFIX}/usr/bin/apu-1-config" \
+		--disable-experimental-libtool \
+		--without-jikes \
+		--disable-mod-activation \
+		--disable-neon-version-check \
+		--disable-static
+}
+
+src_compile() {
+	emake apache-mod
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-mods-shared
+
+	# Install Apache module configuration.
+	#use apache2
+	keepdir "${APACHE_MODULES_CONFDIR}"
+	insinto "${APACHE_MODULES_CONFDIR}"
+	doins "${FILESDIR}/47_mod_dav_svn.conf"
+}
+
+pkg_preinst() {
+	# Compare versions of Berkeley DB, bug 122877.
+	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
+			CHANGED_BDB_VERSION="1"
+		fi
+	fi
+}
+
+pkg_postinst() {
+	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"
+		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
+	fi
+
+	#ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
+
+	# from src_install in Gentoo ebuild:
+	##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 "${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
+	# We need to address it here with a message (when Subversion ebuild is
+	# intented to be build with USE=-apache2).
+	# Also, user doesn't need to tweak init.d script - user and group can
+	# be changed in conf.d.
+	elog "svnserve users: You may want to change user and group in /etc/conf.d/svnserve"
+	elog "and /etc/xinetd.d/svnserve from current svn:svnusers to apache:apache,"
+	elog "especially if you want to make use of emerge --config	${CATEGORY}/${PN}"
+	elog "and its default ownership settings."
+}
+
+#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 ${SVN_REPOS_LOC}..."
+	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
+		mkdir -p "${SVN_REPOS_LOC}/conf"
+
+		einfo "Populating repository directory..."
+		# Create initial repository.
+		"${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
+
+		einfo "Setting repository permissions..."
+		SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
+		SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
+		#use apache2
+		[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
+		[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
+		#use !apache2
+		#[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
+		#[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
+
+		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
+}