Security bump (bug #545348). Added slightly rewritten init script

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

4 files changed, 537 insertions, 17 deletions

diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog
index 145a520f3c5c..e83c8c415ca9 100644
--- a/dev-vcs/subversion/ChangeLog
+++ b/dev-vcs/subversion/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-vcs/subversion
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.222 2015/04/08 17:53:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.223 2015/04/09 12:58:45 polynomial-c Exp $
+
+*subversion-1.8.13 (09 Apr 2015)
+
+  09 Apr 2015; Lars Wendler <polynomial-c@gentoo.org>
+  +subversion-1.8.13.ebuild, +files/svnserve.initd3:
+  Security bump (bug #545348). Added slightly rewritten init script.
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> subversion-1.7.19.ebuild,
   subversion-1.8.11.ebuild:
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 55403aaf7f1e..27a54650c543 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -12,30 +12,31 @@ AUX subversion-1.8.5-swig-python-no-gnome-keyring.patch 39439 SHA256 0e0e8364ef4
 AUX subversion-fix-parallel-build-support-for-perl-bindings.patch 515 SHA256 c7a9fe0f095de7e49e219af5cabdff28751ee39aa42e712c4b8b3bc0ed64d50c SHA512 c24cf217e3d5c8e31b28c38d63e994ef131b410a7a6ab00b31772a0863f216d9d3482810928ab2cf7025baf632a415435653fd3fd2fd3780013b70a53ccf5cad WHIRLPOOL e7bb2c833d2393f82f769007d5df35e97ed8766cea5f9f5c64e41ed6369950a6aa8c73e44e9803656ec2ac21706e69cc3cf05f45a5dd1abe85fdb2cb9d0894bf
 AUX svnserve.confd 322 SHA256 45f2dc1a718aed885559e71d98112e670c92bd6b4f19c5cf593eced6cd2bbd97 SHA512 c84d96dad0deb40a04963654c5d0874697f2b270751b3ec41bec64847d61d9e88e336e2ee5da438a527b9d8b8b24d7ddbeacdd4bd4ce02db3629fc0972e0c289 WHIRLPOOL c91f8454f4a6d7fc9823bfbded1432993da14574693cfb4ffd6902fce136b2a14dc23616b523cf89e06493f96317ed0520a586af022d2cb1bea025ec99e53ed8
 AUX svnserve.initd2 828 SHA256 8f123253c3bfb9bbe87210a9e1facc7f52df371747dbc188396740a5cf4fa713 SHA512 48729e3befc9fb9f26bbb58f3e3694cecec491df65eb7251af85bec1aa16f6d1b406f2ef072c93c9136e261d8ce64aa658bf41f812c1a555c7014521c2ff775f WHIRLPOOL bbff4d5010a0f6ceb0e9e2f76984c9935f610b18163e7e5c426059a48f84451e5cbeae86582d6dd22d9a59dc47f71b253b19cce9ed6761a29013877a32cb5d81
+AUX svnserve.initd3 695 SHA256 b5bd2a3b09c5e84d385e5d873ad9e3061a6e05dcf59276d6a38a5b86f180eb77 SHA512 7d18a9942608162fa6244dead7d0ca072a257debbb4dd401b73e5cbc94fe1c87d2814698aba7450af3695b8b8434341d4d023ee963c3def0b1eecfececcfe00c WHIRLPOOL 9b7c192d35edf733ebce70753aa1e14cea49d556283a076e642276a525c6d9403a31823c9db76116ce9ef6761770ccec4cb2e72da568d57808563c93774274c4
 AUX svnserve.xinetd 332 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2 SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae WHIRLPOOL 0c5ed79630859706f18b56fbb910b4b2dc6b480cdf72a929f7d33232f23ee1eb7110b98c4a8e06cd06c620b9f4ff081bfae23edd1f6a65fade2ac5081dbf3962
 DIST subversion-1.7.19.tar.bz2 6094560 SHA256 0059cd376ac6a14c80612ea99c4b0fed9dc2ff0ad05560d108a4c5625323cd5c SHA512 8b7f940e9cf007f9076400ec5bebf628ecb9055577de782ed6d90b96ff08e6d9ac9d8c5924c6bf861250345efd1567500541595563c6e3f03984c13d3c07f3d5 WHIRLPOOL 7ef46a86f381fd65f49634906ca0c291eb30cf17b02953ccedfe3c38210bd586ae29189680329e6858eeba65168025f260169819410959a83c162573d04b4dec
 DIST subversion-1.8.11.tar.bz2 6896225 SHA256 10b056420e1f194c12840368f6bf58842e6200f9cb8cc5ebbf9be2e89e56e4d9 SHA512 86c4ff71a0f448895f26cb1674d1e7230ceacfa5cb2a0ccf28589b8c7f30ff65d2bb6b2c201b95ce53b7b877de98e1a69bf291a8cea4e4005afbbb1d0a62aae1 WHIRLPOOL 08c782e2f578a613e5c380922c05230b3ed0114b28f0dbd6a976089db5f563b160641158682e1d53481b06a961a401e26114452517e51e16a0fc12c0c88b3247
+DIST subversion-1.8.13.tar.bz2 6863330 SHA256 1099cc68840753b48aedb3a27ebd1e2afbcc84ddb871412e5d500e843d607579 SHA512 5b145888fdd294b871066483f9cc5af811aadd88c537c3859b005b73efaf66bd8d5c7c4dc6562897c00331be2ddfd834688a90eb5c229bc6625ab3c45c02045f WHIRLPOOL d79c71385e21ee3254a798687fd1de3e01a1577287b03d9a0f87e0a31621501e749ee9b37f40c59cb206fc68ba9968132e724f3c4a12c7aa8d5aa59d66a4ade4
 EBUILD subversion-1.7.19.ebuild 14608 SHA256 d0ff73e3a72c5ac0435d05c59198ec4193b6c61eefa33aedf9ffd8dd157eaa34 SHA512 9af32ad2975fc376a98ba252ab72e1564afb0bccfd66e4b303e2eea159fe76435f701762dfc12fae37e2c4971bb180ee4e017745f200eec4060c293c36d0a3bd WHIRLPOOL c547498bc76e492b96ba4ede96b017c1991201e564715bb082c7e33dc6d73a2cd9a7ce4d30d64b4b2655a5beae906d59dbaa31f03a96d1c3f02654da87208a14
 EBUILD subversion-1.8.11.ebuild 15388 SHA256 ea82b12437232594b6416b3448299ac99f87aafb2e1d606f0ce30e51e85c3ccb SHA512 4fe168bb6899dcb6502d8d272573fca27302c6215bddc8007e751b3332d0c6998cca43e3b34ebc224eca0e3b4b8e1cea72ce5a0e3edfa777b259fd90793f0a1f WHIRLPOOL 8c2d4d80b347c78640c49430fefca635f49c72c47819a7de8fff5d7f3703919a504ac9ac19f61b8f2d496c724fc542e7daf1dd2c445b316f800d1ab34e5bb73f
-MISC ChangeLog 711 SHA256 470e80e1829e453bebec5af7c959cb74c7f8c6611a23bb83c6905eea224df24e SHA512 9c44658de28bb8a4e9f6fda37475d125dec6661dd8f9763bfd68a035bfc5590b85b0e21c322836fd7b146e1be9bde81a72eb5c6a8e88fd98ef079ff538348160 WHIRLPOOL 1434509a3f534bdbeb7a592e92aa5046af07a1831b9524c51712dec6bdd10afe0fbb4bd7a7192c28075d3fb9fd3de907f77e0a47baa2404d2a580de8d19f0da9
+EBUILD subversion-1.8.13.ebuild 15417 SHA256 2693d96a286b054911d4dff2170559512ee5591fde3b6cbfd292a6d67ac3a981 SHA512 1d49b11fe2b82eeed4d1dff8603f15c91d754d3d22629fa43cb926582f5d57849aabdeb5222ffd87eec71c7469f8447bd70d9e11b91b2c4ec80b740c36ed421e WHIRLPOOL 31957531cf0abcb438ab393e9c2d408e99ed05595855cb71b41277de74c3bf26048e451b5308791d51ec93fac0bc78797b68544005d592e76bdb5bc6f5c95dcc
+MISC ChangeLog 928 SHA256 7ac501d58f2bb532f6c6f245859f1c35882e1751c8c848dcfc825b0aeff527d7 SHA512 bcb875c3258304f6db3958dc7b828853640e7f8c5254aa568a2a0662dd4cdac8baa40cbff7b1c7f3e86a76fe9f8ee33ca503fbe8c64694d3a19dd2a6e95b2a43 WHIRLPOOL 97d33147e9918e94c74aa6ec459eea2e718194f98150239f47b1b36099196938ff1ae9f4776b421c2026f7715f81ed3c55d86646638a4dd7765f9f24a8d4a41f
 MISC ChangeLog-2014 104501 SHA256 896e4b8534542aeb582ae3a2e1fcbabd0dacf246fb1f5090161d690164d4ee05 SHA512 6e188d0437e11b908983a6093afa19d17e4c7dce7763fb26ea9a94a70c520ab31ad78829f03443347db0d199c3d30d5a92d73d1e32827e82a1e58535b1808644 WHIRLPOOL 6ecb4ed382b6466e6fa2143b8e9133fce01fcbd57485533637b4cc13663a216c853dbd3c2b3af0d5fcfce0dd1aece589b5c5d9f3275caf89fd0200e64fcad947
 MISC metadata.xml 845 SHA256 43917d4b57c7ada945f07ca2507f6df3c83581931b8da7f4bef7eaa3bed0dbaf SHA512 8766f082f146c0d9ddb62f78dc0dfab5b480adddb1d7f1e0a07ac7aa11a2e70fd2aec534fe069eabfc86d75f9027162ed17d9463aa491ab87895934997005041 WHIRLPOOL 42bed6ad1d2cf349eab8d4011fc4fcce3c257a387a2c9c101c62c26058c218f195ef752715a5deac80dadbbeffbb088c37ea5d393f69751cdc78bdae2b982078
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJWsSXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO50cQAKp/xyDdDvq+FbLPMTq3Q6ih
-aVJVtii8v0eACi7xcVmij1Rfaw/C/sdgQEPzrE0194F79uYR3rtqCEOkqGR5OU3Q
-9MGyszHVYlhbq52vrFUMQeQghybE2G2S+9Z7VGqjGhsoTBVNROZBC6BxFmUBhODt
-U1hZToqJdfCFePpwdCZqmrMoPX4NGpqsFqWENtmjes69f5eIQYyac6GED66rgHKA
-2n/JIhzIwvWFRYuqWWXXWoceQRl9oto9eP3lcgfoAHjpBduq+zGE/9khiS162uU6
-BiEvS/AiugCM94lybP99AQhwLj3O7+4acYBxK2sgqSWKU3tD5wT6P+TnLzcIdTty
-BzQEUvdnu1fSGNmRxnGWl+CuwbLkyQiWD8Q2ItRn3X7DAD4xAASSSsVTd0f9mG00
-lg6Mxbwfabx9JYsFHe9ldYKzDjMjfDLz2V5/XN8BF4tUMQK0s/lcbuQ4om3HSVOz
-Jne9RV2/fm54cJ3akXvHw8gP+90LBehUDIZKsyKQXwie0ify/ekdX9fboz8dFCEI
-H6BUb+/2hgbLJMycaKHr3OzkUphpwM2b5XNG8X6u3LyhqtyBO6oU9OKs7nCimvfv
-5O/7W3+D9lGh1py1MarQvwVnai2hWbidiKEWpfgQ+phPE4f9/4KhnoCpeMiJqUxb
-in+HSwT2vTseBKbDoa0A
-=28RD
+iQIcBAEBCAAGBQJVJneGAAoJEPiazRVxLXTF2fsP/2GPX/1Z2OUApIcscZyD8INj
+tZMFYBA8HFgQR/P8srDWIRJz47xRwNR30BGujh75GbPU2KWlnr7gXpHOFY2mLl6l
+nJfQsCOxVnS+X8ggYfAWvTuKLvOwSC3RhWFIU4bd8oLEAeY4VDLDVc8Iz6/6YyyM
+XVXUFde0l1Re4JhkCT0dm21dhVt5GtnzbGbLJjT7PkxBvK26ZAXiX0K/kQ+VIoxO
+pFrIhKjtkVnV0a/XMrgaQpBseC6ytV1P2roPRDipIGDnP+vQxUWH2OPm06FipL0E
+9lT58xQncDE1WWKhStlhrEwuQwva2X2akaqOHojyAe+jX97H1IFABZI5Bx8OhscD
+atO4M/03GNLQ6jlp0jzQNeLSNF4GP4s+5PNP0+2CqZ6I2imVZ4S9Um/rzegpg9a+
+PyNEqlao5AgYNefob8F0NpHHFQWIEIEH9TfkYYdxpwuXQOR4uYzFKWODSo6RMz0Y
+5nrYNVYbYwJDK0VLM67RdR8yh1Pxm9M8nC8bVfuwRV0I+dSjtcGZ+Jn/0c4G7XHX
+CT4p+0bfgZYJGMHc0VZxIz0xNgZnA8HCKQHqHGtjgc3caN8v9i1O+EloBiFWIybj
+mwaOnn2elj+xdD2NPYl06eO6owyNRxlQryVzrK6y2zYUOYHRT1S2c7qh6gM8j7kY
+4Y8SQ8wE5J+bit1DHf87
+=OyLf
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/subversion/files/svnserve.initd3 b/dev-vcs/subversion/files/svnserve.initd3
new file mode 100644
index 000000000000..2a4fd4b0a636
--- /dev/null
+++ b/dev-vcs/subversion/files/svnserve.initd3
@@ -0,0 +1,21 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/files/svnserve.initd3,v 1.1 2015/04/09 12:58:45 polynomial-c Exp $
+
+description="svn server"
+pidfile="/var/run/svnserve.pid"
+command="/usr/bin/svnserve"
+command_args="--foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn}"
+command_background="true"
+start_stop_daemon_args="-u ${SVNSERVE_USER:-apache} -g ${SVNSERVE_GROUP:-apache}"
+
+depend() {
+	need net
+}
+
+start_pre() {
+	# Ensure that we run from a readable working dir, and that we do not
+	# lock filesystems when being run from such a location.
+	cd /
+}
diff --git a/dev-vcs/subversion/subversion-1.8.13.ebuild b/dev-vcs/subversion/subversion-1.8.13.ebuild
new file mode 100644
index 000000000000..3dee077dcb07
--- /dev/null
+++ b/dev-vcs/subversion/subversion-1.8.13.ebuild
@@ -0,0 +1,492 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.8.13.ebuild,v 1.1 2015/04/09 12:58:45 polynomial-c Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_OPTIONAL=1
+WANT_AUTOMAKE="none"
+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
+
+MY_P="${P/_/-}"
+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 ~arm64 ~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 +http java kde nls perl python ruby sasl test vim-syntax"
+
+COMMON_DEPEND=">=dev-db/sqlite-3.7.12
+	>=dev-libs/apr-1.3:1
+	>=dev-libs/apr-util-1.3:1
+	dev-libs/expat
+	sys-apps/file
+	sys-libs/zlib
+	app-arch/bzip2
+	berkdb? ( >=sys-libs/db-4.0.14:= )
+	ctypes-python? ( ${PYTHON_DEPS} )
+	gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/libgnome-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-2.1:2.1
+		dev-ruby/rubygems[ruby_targets_ruby21] )
+	sasl? ( dev-libs/cyrus-sasl )
+	http? ( >=net-libs/serf-1.2.1 )"
+RDEPEND="${COMMON_DEPEND}
+	apache2? ( www-servers/apache[apache2_modules_dav] )
+	java? ( >=virtual/jre-1.5 )
+	kde? ( || ( kde-apps/kwalletd:4 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 )
+	http? ( virtual/pkgconfig )"
+
+REQUIRED_USE="
+	ctypes-python? ( ${PYTHON_REQUIRED_USE} )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	test? (
+		${PYTHON_REQUIRED_USE}
+		!dso
+	)"
+
+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 http ; then
+		ewarn "WebDAV support is disabled. You need WebDAV to"
+		ewarn "access repositories through the HTTP protocol."
+		ewarn "Consider enabling \"http\" USE flag"
+		echo -ne "\a"
+	fi
+
+	if use debug ; then
+		append-cppflags -DSVN_DEBUG -DAP_DEBUG
+	fi
+
+	# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
+	[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
+
+	# 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.8.0-hpux-dso.patch \
+		"${FILESDIR}"/${PN}-fix-parallel-build-support-for-perl-bindings.patch \
+		"${FILESDIR}"/${PN}-1.8.1-revert_bdb6check.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
+		if [[ ${CHOST} == *-darwin* ]] ; then
+			# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C20130614113003.GA19257@tarsus.local2%3E
+			# in short, we don't have gnome-keyring stuff here, patch
+			# borrowed from MacPorts
+			epatch "${FILESDIR}"/${PN}-1.8.5-swig-python-no-gnome-keyring.patch
+		fi
+
+		# 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
+
+	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
+
+	#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
+
+	if use python && [[ ${CHOST} == *-darwin* ]] ; then
+		export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
+		export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
+		export ac_cv_python_compile="$(tc-getCC)"
+	fi
+
+	# force ruby-2.1
+	# allow overriding Python include directory
+	ac_cv_path_RUBY="${EPREFIX}"/usr/bin/ruby21 ac_cv_path_RDOC="${EPREFIX}"/usr/bin/rdoc21 \
+	ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
+	econf --libdir="${EPREFIX}/usr/$(get_libdir)" \
+		$(use_with apache2 apache-libexecdir) \
+		$(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_enable nls) \
+		$(use_with sasl) \
+		$(use_with http serf) \
+		${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-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() {
+	if has_version ~${CATEGORY}/${P} ; then
+		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
+	else
+		ewarn "The test suite shows errors when there is an older version of"
+		ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
+		ewarn "before running the test suite."
+		ewarn "Test suite skipped."
+	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
+		perl_delete_localpod
+		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 svn
+	bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
+	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.initd3 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
+
+		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
+
+	prune_libtool_files --all
+
+	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() {
+	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() {
+	:
+}
+
+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
+}