Version bump to 1.7.17, fixes bug 506308

Package-Manager: portage-2.2.6-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x35899067

3 files changed, 490 insertions, 15 deletions

diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog
index 9da8885fb21c..4740e7c72adb 100644
--- a/dev-vcs/subversion/ChangeLog
+++ b/dev-vcs/subversion/ChangeLog
@@ -1,6 +1,12 @@
 # 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.165 2014/05/23 12:19:19 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.166 2014/06/01 14:44:15 tommy Exp $
+
+*subversion-1.7.17 (01 Jun 2014)
+
+  01 Jun 2014; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +subversion-1.7.17.ebuild:
+  Version bump to 1.7.17, fixes bug 506308
 
 *subversion-1.8.9 (23 May 2014)
 
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index e1641eb28462..021d6d8b23da 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -21,27 +21,21 @@ AUX svnserve.initd 818 SHA256 4f9d38d5b32d4436dcb302f7e3c7284e67d6339b25b0f057a3
 AUX svnserve.initd2 828 SHA256 8f123253c3bfb9bbe87210a9e1facc7f52df371747dbc188396740a5cf4fa713 SHA512 48729e3befc9fb9f26bbb58f3e3694cecec491df65eb7251af85bec1aa16f6d1b406f2ef072c93c9136e261d8ce64aa658bf41f812c1a555c7014521c2ff775f WHIRLPOOL bbff4d5010a0f6ceb0e9e2f76984c9935f610b18163e7e5c426059a48f84451e5cbeae86582d6dd22d9a59dc47f71b253b19cce9ed6761a29013877a32cb5d81
 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.9.tar.bz2 6828921 SHA256 45d708a5c3ffbef4b2a1044c4716a053e680763743d1f7ba99d0369f6da49e33 SHA512 61f0181605cdaf2c87f89f022073dca00f667515ac1702adec4f83af0aeb807a4eb2c65d8186414db4c5a19a3ccc01fc5fdf03c8bfb5f0fa578a45944af0becc WHIRLPOOL 1a850d7c1cc91eb9fddcd15cc9aeb744e28cbf124affc0363af3df3e69765fb97be5d0a6001bdabcead2bd4972d6444238e09a123084907ac38f535605b55fdf
 EBUILD subversion-1.7.14.ebuild 14635 SHA256 0748ad6cb5c1674a02c7dfe3d306cbe129f72b26db9932735e0c3afe102a5156 SHA512 95af36177747739ecd4619f5db60497fc18893393a054fad8bd60ab1af478166dbe02af769c0e1275d52290697e1120299eb7987fb2d24f89e32ca4e0ab67a39 WHIRLPOOL c843213c1f39fc5b3cc34a33ac46b157d7a950a2a3e824e60d318c11b978cbf5c589f9e4e2a51b572740db14d72509726bd850976b93f48fb462ce88c5622340
+EBUILD subversion-1.7.17.ebuild 14671 SHA256 55505ba1b61c4a3f5245893161ec65a001eca195cb7aaed929b22d9a38f1f265 SHA512 7e0cc8c70363617fb5ea212fbbe019704448592fcd668f4f179f7d6ae53a36277eca1f6d2ba06784a6fdee693d5f8a241048b297697a588d63fe854987eb72af WHIRLPOOL bda9621683104c172d3a7a053c71e7f3ed6b0820881beaf87591a6d2057a581e83fd449a0c3e6179dc837fa9460519e2b2c7062c35c8634390a62fac3237a53a
 EBUILD subversion-1.8.8.ebuild 15243 SHA256 a27ed3cb1e6c5a61d18ce7d8e3b45124809bd1cf06476dd6e91078affa211857 SHA512 9892441504b152c6296ad5c608755f97da20c9e9e83fe75f14153e67e7eecce62cb00c8c22ae9e06a54572bd35eddfcb90e5b3f7033dcd6a6cc45bb278528737 WHIRLPOOL f31c5e870289c50cf9fbc86b76803b305abf350e9b9826a2c65aa51ff1dd2ce10205b7e771146cc007847e0be781357b4d9e8345349f3dafe8110f0679542333
 EBUILD subversion-1.8.9.ebuild 15281 SHA256 89a29139948842740c0d2384c0c97902ab958051be27967973dcd57bd66efbcd SHA512 5e5b8d387588b912c326a39d1dbe678d49f4e500cce9ade1d84c8e69d437f8be541cd075aa945e1b51e0da53b8d2c634b0a81f54339c1cd5b01030a45738ba66 WHIRLPOOL ec33f8e9fa7cab90d3f4e230b44b7269ba951834c67cc04da0f4f356bfc1822dd8e7280e7f62e973ce1ee3ddd5b96b89eb863fc56a83d5bf019e73a13bebad3f
-MISC ChangeLog 96726 SHA256 8c1e9bc42df79690df67c40dda1c51941a660880eacf4dc9ac1f65ec04448ac7 SHA512 e5e70622ea28bfe9d3b23137ad431e2fa2c00958ace02ff70a187061e2652a6bdfdbdd1cbd378e18b4b4ba35a292be6a260939e5ae3a1e698a8078c428dfd3a3 WHIRLPOOL 67d8f6e6dae7140fd74b9fe586bfe8a3205d785dd3a43c335c65f53cbc4c4d8a7813b34d58403a7f4876f09d3fa3dc6037ed15d4c801726d0b03eca7cb13e7d8
+MISC ChangeLog 96885 SHA256 1444c6035f737333d7c8f94393055f3d8acb2636ea27f9b12d94b2706d1d5928 SHA512 f7c1e57736df68ecfce758bb0dad2e94aa22bebe59177cea8ead5ff193d2d448e3e3835884b42a94932ea11f8f55f6b4f18055200596d4ce88b47d8ff203f8c9 WHIRLPOOL 53d52664e8d586581f0f6f735ac8699c56c44dbd1805ca0de4157dced800fcc83db668cf88c12bcd9c20d037b80409dccc2fc44357122f9c8789de53360f904e
 MISC metadata.xml 706 SHA256 17a4bceb3be5f371f153b3f9f7c1cd8d92e10e647eae2ac40af174f135bc7997 SHA512 b30564d6eb44e8c7cbe05dd3a1d52700e70ac5babfc6e0b0d770773322530f38a51a12927c411d42f0932fc161541c90cc97a2d7389b8e402840008229614894 WHIRLPOOL 8c197251aa3f242806b3297c6648807be96e927129230468da04ca44db34dfe25279b3ab9c55cff8b1b794e648374bbbe0eaecfab1db997b714735a4788e9a8f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTfzzIAAoJEPiazRVxLXTFgZQP/RyT8zWYHOFzj3hFgx6Mk9jl
-MJdLOn/i9of8riVagFJ0wSO399go0bAdcEBeXJglW0BCNk4tBJH/jBBcIT31L00N
-WR3ZibsEj4Mkxu9b5+Wt3MRDWbf6LPp+NP7gAZ5dyzZgFq6Mw/veOQwjiWAXnxS7
-3I2QtiZoHrcgShKX9zjNRVO5N6Okh/DK11NTQbD0eWt33K1fMSuJuqQFdV+Frxz4
-zbY4S43mnXrqw0oFCarfrI6H73nvz7tSyAG39skr7V74s1KGYqvW2sMAwFkqojRN
-Lc87Y/zxHO3onf0jCxLug9I1mYXF4WKNTclW17Rn/z9YqKFC5hiwoN9C/JjFBrvd
-Xo1PAf3MbeZ4bSIaAIiKPFYPyccoIe+jy51Vw6wDSApAnSJIqWtKPOLR5PZdIaT/
-nwsDOGpk+pokKjWasR31z1pmJguHbSbFQsO0MLA3UprQ7ZtcYQL+MkCms30sRxnZ
-EcAgLRv2wYCXDe1pCO0YHRH6N1lQjn+EXu79S9nUloOEYjWlRA68jK9nHVJxUhCR
-qJ4dsIY4nCbL1LlKSMDfgb36F3LNR06qKzmcyI+WHGyVn4KIH2/Iih36gurRB/GG
-RTGqLYjaR9E9QVuF0O45LuFQk4NoUAC7e9VzS3Z90gCgl3ybxIT8HIOU2//vcfWy
-zLcEFulyTXE4kmyUJl84
-=mXq9
+iJwEAQEIAAYFAlOLPEgACgkQG7kqcTWJkGcfyAP6A+xYHkTVMs8xVZgokK3eK2QR
+X+rAzi6/LPDOcbFfAzSjfSzQgLbRGRguoTeO4rFG2ZvQUifsQkCtoXVMYIHeI0no
+eUhOm20cl4Bo92FI4DlLJn9SjPQUdfpldtVvmMLQE7ffa/wMODHdtYZH/X6nkG6V
+GCQwsSe2VkqBIKrryLI=
+=Chow
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/subversion/subversion-1.7.17.ebuild b/dev-vcs/subversion/subversion-1.7.17.ebuild
new file mode 100644
index 000000000000..83eecfae199f
--- /dev/null
+++ b/dev-vcs/subversion/subversion-1.7.17.ebuild
@@ -0,0 +1,475 @@
+# 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.7.17.ebuild,v 1.1 2014/06/01 14:44:15 tommy Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_6,2_7} )
+DISTUTILS_OPTIONAL=1
+WANT_AUTOMAKE="none"
+MY_P="${P/_/-}"
+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
+
+DESCRIPTION="Advanced version control system"
+HOMEPAGE="http://subversion.apache.org/"
+SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Subversion GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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.6.18[threadsafe(+)]
+	>=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? ( ${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? ( ${PYTHON_DEPS} )
+	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 )"
+RDEPEND="${COMMON_DEPEND}
+	apache2? ( www-servers/apache[apache2_modules_dav] )
+	java? ( >=virtual/jre-1.5 )
+	kde? ( kde-base/kwalletd )
+	nls? ( virtual/libintl )
+	perl? ( dev-perl/URI )"
+# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
+DEPEND="${COMMON_DEPEND}
+	test? ( ${PYTHON_DEPS} )
+	!!<sys-apps/sandbox-1.6
+	ctypes-python? ( dev-python/ctypesgen )
+	doc? ( app-doc/doxygen )
+	gnome-keyring? ( virtual/pkgconfig )
+	java? ( >=virtual/jdk-1.5 )
+	kde? ( virtual/pkgconfig )
+	nls? ( sys-devel/gettext )
+	webdav-neon? ( virtual/pkgconfig )"
+
+REQUIRED_USE="
+	ctypes-python? ( ${PYTHON_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( ${PYTHON_REQUIRED_USE} )"
+
+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
+
+	java-pkg-opt-2_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"
+	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() {
+	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
+	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"
+
+	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() {
+	local myconf
+
+	if use python || use perl || use ruby; then
+		myconf+=" --with-swig"
+	else
+		myconf+=" --without-swig"
+	fi
+
+	if use java; then
+		myconf+=" --without-junit"
+	fi
+
+	if use kde || 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"
+
+	# for build-time scripts
+	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
+	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}") \
+		$(use_with ctypes-python ctypesgen "${EPREFIX}/usr") \
+		$(use_enable dso runtime-module-search) \
+		$(use_with gnome-keyring) \
+		$(use_enable java javahl) \
+		$(use_with java jdk "${JAVA_HOME}") \
+		$(use_with kde 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 local-all
+
+	if use ctypes-python; then
+		# 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
+		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"
+		}
+
+		# 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
+	fi
+
+	if use ruby; then
+		emake swig-rb
+	fi
+
+	if use java; then
+		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
+	fi
+
+	if use extras; then
+		emake tools
+	fi
+
+	if use doc; then
+		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
+
+		if use java; then
+			emake doc-javahl
+		fi
+	fi
+}
+
+src_test() {
+	default
+
+	if use ctypes-python; then
+		python_test() {
+			"${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
+				|| die "ctypes-python tests fail with ${EPYTHON}"
+		}
+
+		distutils-r1_src_test
+	fi
+
+	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}"
+			popd >/dev/null || die
+		}
+
+		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 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
+		fixlocalpod
+		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete
+	fi
+
+	if use ruby; then
+		emake DESTDIR="${D}" install-swig-rb
+	fi
+
+	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
+		rm -fr "${ED}"usr/$(get_libdir)/svn-javahl/*.jar
+	fi
+
+	# Install Apache module configuration.
+	if use apache2; then
+		keepdir "${APACHE_MODULES_CONFDIR}"
+		insinto "${APACHE_MODULES_CONFDIR}"
+		doins "${FILESDIR}/47_mod_dav_svn.conf"
+	fi
+
+	# Install Bash Completion, bug 43179.
+	newbashcomp tools/client-side/bash_completion subversion
+	rm -f tools/client-side/bash_completion
+
+	# Install hot backup script, bug 54304.
+	newbin tools/backup/hot-backup.py svn-hot-backup
+	rm -fr tools/backup
+
+	# Install svnserve init-script and xinet.d snippet, bug 43245.
+	newinitd "${FILESDIR}"/svnserve.initd2 svnserve
+	newconfd "${FILESDIR}"/svnserve.confd svnserve
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/svnserve.xinetd svnserve
+
+	#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
+
+	# Install documentation.
+	dodoc CHANGES COMMITTERS README
+	dodoc tools/xslt/svnindex.{css,xsl}
+	rm -fr tools/xslt
+
+	# Install extra files.
+	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"
+
+		find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr
+		rm -fr tools/client-side/svnmucc
+		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
+		rm -fr tools/{buildbot,dev,diff,po}
+
+		insinto /usr/share/${PN}
+		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/*
+
+		if use java; then
+			java-pkg_dojavadoc doc/javadoc
+		fi
+	fi
+
+	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() {
+	# 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() {
+	use perl && perl-module_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."
+}
+
+pkg_postrm() {
+	use perl && perl-module_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}")"
+		if use apache2; then
+			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
+			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
+		else
+			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
+			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
+		fi
+		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
+}