Version bump, fixes bug 393641 and bug 389961, move from deprecated bashcomp eclass to -r1, adjust svnserve default user and group based on USE flags, fixes bug 381385, adjusting metadata.xml, taking over maintainership for now

Package-Manager: portage-2.2.0_alpha84-r1/cvs/Linux x86_64

5 files changed, 468 insertions, 14 deletions

diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog
index 813e71663d29..425bc3085b4c 100644
--- a/dev-vcs/subversion/ChangeLog
+++ b/dev-vcs/subversion/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-vcs/subversion
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.67 2011/11/30 14:28:49 grobian Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.68 2012/01/14 19:46:34 tommy Exp $
+
+*subversion-1.7.2 (14 Jan 2012)
+
+  14 Jan 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +subversion-1.7.2.ebuild, files/svnserve.initd2, metadata.xml:
+  Version bump, fixes bug 393641 and bug 389961, move from deprecated bashcomp
+  eclass to -r1, adjust svnserve default user and group based on USE flags,
+  fixes bug 381385, adjusting metadata.xml, taking over maintainership for now
 
   30 Nov 2011; Fabian Groffen <grobian@gentoo.org> subversion-1.7.1.ebuild:
   Use get_libname instead of hardcoding .so for shared libraries for Darwin, by
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index c65d665ef47b..b7de12d6c6bd 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -11,22 +11,26 @@ AUX subversion-1.6.3-hpux-dso.patch 627 RMD160 1286a74c3f54e992be3dcaa2b72df36a3
 AUX subversion-1.6.3-kwallet_window.patch 10012 RMD160 d469e0fc8d9fd2ef8c857e5e303eeb24309e7f0d SHA1 9c99b63bc5abf54f642e447af1aa2f814cecb8ab SHA256 5304f39189bed6f83a8342593f23819cf2e12c2288c9daba23dcd78913fd79de
 AUX svnserve.confd 322 RMD160 e291d91f05da848a3517aa76611c1f05527c11e4 SHA1 c07020ea270b787ddf0dbb738391e20d3c8347af SHA256 45f2dc1a718aed885559e71d98112e670c92bd6b4f19c5cf593eced6cd2bbd97
 AUX svnserve.initd 818 RMD160 6a24ac0599ef46b2d1ef0ae9cde70bdc8124db68 SHA1 f3ef120b584d81124171ccaf5bafec709222d04e SHA256 4f9d38d5b32d4436dcb302f7e3c7284e67d6339b25b0f057a306b978f4a06142
-AUX svnserve.initd2 823 RMD160 33ba9c352013dcea2b4a51f392c06ddc615f2b04 SHA1 c27967ae76a034372090d4ab676e85174c4add89 SHA256 5a13b4e037d38483a7086cec4d29fab2eef7c340cb405f24de6c4674829b3b6b
+AUX svnserve.initd2 828 RMD160 3b471e0adecb55f6712b7db360768f13feb6b65d SHA1 7f6f088eaf358c6dde50fe445cc2e3d344f661ae SHA256 8f123253c3bfb9bbe87210a9e1facc7f52df371747dbc188396740a5cf4fa713
 AUX svnserve.xinetd 332 RMD160 c2fc4eb02da7e7405756fce650b8897f0a9da7f7 SHA1 d7d478fc257a40626888f9b12ee218df55dac570 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2
 DIST subversion-1.6.17.tar.bz2 5504298 RMD160 b0937be80622774fee5d4557e740ad44f7f47172 SHA1 6e3ed7c87d98fdf5f0a999050ab601dcec6155a1 SHA256 d629c657e171616d30cc0cbddf1011a065770813bfc32f78c6940d09ca868124
 DIST subversion-1.7.0.tar.bz2 5953297 RMD160 4a474a4ff356b2caf6e04fb1cbc9e9ecd293ada6 SHA1 3e514e0fba9c864d2d13763c22896d31496d7b0d SHA256 64fd5f263a80e609717a3ca42f1f2625606a5c4a40a85716f82c866033780978
 DIST subversion-1.7.1.tar.bz2 5973480 RMD160 cd076403c8e9dd0124a49235730f2c6f24605787 SHA1 4bfaa8e33e9eaf26a504117cd91b23805518071a SHA256 d34bde626fac1aa553f5c9aeedf961999a77cc31540ace18da5aeacdd03d6608
+DIST subversion-1.7.2.tar.bz2 5944987 RMD160 0d20e364c120da454f3139e95d3ec86c22e7e3c1 SHA1 8c0824aeb7f42da1ff4f7cd296877af7f59812bb SHA256 7eb3e1ae2b0385e1cc20ca9e1839e0ef0ac98a7455dc52ba4cdf567547bfc517
 EBUILD subversion-1.6.17-r6.ebuild 16778 RMD160 64d5e3ecd40b8c5f64033031b52cadef81ecda28 SHA1 0675ad79bcef4b23a1c36523401befba6d13c806 SHA256 52e07ef9ecf3890fb19cae22040b03ffd010bfc746d17bbdea8ab698d8b3af47
 EBUILD subversion-1.6.17-r7.ebuild 16358 RMD160 dd05e74fd30f6941ce9eb4734b9dcade3f9b4303 SHA1 211798f014c2a214404121573c5ee164e3df0082 SHA256 3682243435c6c240d7d7eecb4f339595da9844ffb8cab8be5282088f07081d0f
 EBUILD subversion-1.6.17.ebuild 31726 RMD160 1fadbce9c87e6e752939358da88ca5759915d9d3 SHA1 e5965787a4b125db056b7889a6315601829d6702 SHA256 8d518450171a35ee4b4526ec0fe8e73ff29aa087ae8db978914cf5a9da673b36
 EBUILD subversion-1.7.0.ebuild 14771 RMD160 e8010c248bbf6e07932bb1c558f99a359e816286 SHA1 0d662971c2720cfcf97588078088b8252f89acfd SHA256 aba4e2fb89889c8a15fef5c59e676f346af3d2a068368672f4929d09a3dd53f3
 EBUILD subversion-1.7.1.ebuild 14803 RMD160 bd93961c59e135c06a39dfbba98c50f60ae2ac9e SHA1 72bc455988c71690d43ded67bcb902205abcd50b SHA256 764053436db8b25b5130ffe72f946f5c0e9ef6a8036c3cb33bc5d87912b63cf8
-MISC ChangeLog 82354 RMD160 024dff2cadf00dead62238b1522c131cb4e65689 SHA1 4ede652c2678fcfd22ab087d6db0a82b27349dc3 SHA256 27dbc62c39d106473c6c9c60638566fdfdf50ccbd6a09149560468aba49882c1
-MISC metadata.xml 628 RMD160 3443c53b68aab8c4ebe7af9fd0e99170c1c6c736 SHA1 bf7a9a06c9ff7e94569bf7ca70a19161d7b87211 SHA256 ef0b17a03f45da0b6cf376d047aa492cbc8c7ad9ce8a3843fdc5f58a5ee96d61
+EBUILD subversion-1.7.2.ebuild 15005 RMD160 92fbe4739b0fc318dbc53e7078807cf6071fac89 SHA1 abd9c20a2bd6a42c2e106da10b26b593be371dba SHA256 4309ec6c3b1eb8a22ecb4a317933918b8cf0d839904dc6d9d82762df8d6e3cbd
+MISC ChangeLog 82744 RMD160 97252a2bd2195f1dadb8f760e264c91839e509d5 SHA1 da4d3a06082e63a21a9cae38b8c9057e1e5fb734 SHA256 1893d8efb9dd537795e281446c6d9b05787aede6cbc32ca70e486cbf1614d60d
+MISC metadata.xml 628 RMD160 dedf9a0cf024a84c150503331efb66177f6e627e SHA1 4d5336980fb3058db04cb3c87524c6e2ab03eeff SHA256 b3715692f57550cecbca66df385d0cc48ef3d6707b4832b88add2f689c35969d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (Darwin)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7WPaYACgkQX3X2B8XHTolhBQCeL0ZZshxhB4fGKmsmMESHutXk
-S3EAoJ94vYmFvGgbAz7a5+cVRIxuDnUh
-=/B39
+iJwEAQECAAYFAk8R26cACgkQG7kqcTWJkGckHwQArl0KI2KsQTyEqSlBHkSZWjqX
+7O10w52JKGYulUVUkMxzC4wxdfR2/jvDnto7IOodoLmSXmKsrnlwt6mDISIJN1zA
+eVWj164cK6HGHVH/s0SfnwhAkNFcPkIvWCPcdWnLifT0JBbmgFKs64q0F6N1LklI
+17S+ijiagtvVy/OPt5c=
+=l/ss
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/subversion/files/svnserve.initd2 b/dev-vcs/subversion/files/svnserve.initd2
index 186d6f93ceb1..605a4e530832 100644
--- a/dev-vcs/subversion/files/svnserve.initd2
+++ b/dev-vcs/subversion/files/svnserve.initd2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 2004-2011 Gentoo Foundation
+# Copyright 1999-2012 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.initd2,v 1.1 2011/08/18 09:51:23 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/files/svnserve.initd2,v 1.2 2012/01/14 19:46:34 tommy Exp $
 
 depend() {
 	need net
@@ -14,7 +14,7 @@ start() {
 	cd /
 	start-stop-daemon --start --quiet --background --make-pidfile \
 		--pidfile /var/run/svnserve.pid --exec /usr/bin/svnserve \
-		--user ${SVNSERVE_USER:-apache}:${SVNSERVE_GROUP:-apache} -- \
+		--user ${SVNSERVE_USER:-apache} --group ${SVNSERVE_GROUP:-apache} -- \
 		--foreground --daemon ${SVNSERVE_OPTS:---root=/var/svn}
 	eend $?
 }
diff --git a/dev-vcs/subversion/metadata.xml b/dev-vcs/subversion/metadata.xml
index 7c45688e641e..6f92b19ee433 100644
--- a/dev-vcs/subversion/metadata.xml
+++ b/dev-vcs/subversion/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
-		<email>chainsaw@gentoo.org</email>
-		<name>Tony Vroon</name>
+		<email>tommy@gentoo.org</email>
+		<name>Thomas Sachau</name>
 	</maintainer>
 	<use>
 		<flag name="ctypes-python">Build and install Ctypes Python bindings</flag>
diff --git a/dev-vcs/subversion/subversion-1.7.2.ebuild b/dev-vcs/subversion/subversion-1.7.2.ebuild
new file mode 100644
index 000000000000..1a548dcdbac0
--- /dev/null
+++ b/dev-vcs/subversion/subversion-1.7.2.ebuild
@@ -0,0 +1,442 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.7.2.ebuild,v 1.1 2012/01/14 19:46:34 tommy Exp $
+
+EAPI="3"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+WANT_AUTOMAKE="none"
+MY_P="${P/_/-}"
+
+inherit autotools base bash-completion-r1 db-use depend.apache elisp-common flag-o-matic java-pkg-opt-2 libtool multilib perl-module python
+
+DESCRIPTION="Advanced version control system"
+HOMEPAGE="http://subversion.apache.org/"
+SRC_URI="http://www.apache.org/dist/${PN}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="Subversion"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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
+	>=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* )
+	gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring )
+	kde? ( sys-apps/dbus x11-libs/qt-core x11-libs/qt-dbus x11-libs/qt-gui >=kde-base/kdelibs-4 )
+	perl? ( dev-lang/perl )
+	python? ( =dev-lang/python-2* )
+	ruby? ( >=dev-lang/ruby-1.8.2 )
+	sasl? ( dev-libs/cyrus-sasl )
+	webdav-neon? ( >=net-libs/neon-0.28 )
+	webdav-serf? ( >=net-libs/serf-0.3.0 )"
+RDEPEND="${CDEPEND}
+	apache2? ( www-servers/apache[apache2_modules_dav] )
+	java? ( >=virtual/jre-1.5 )
+	kde? ( kde-base/kwalletd )
+	nls? ( virtual/libintl )
+	perl? ( dev-perl/URI )"
+DEPEND="${CDEPEND}
+	!!<sys-apps/sandbox-1.6
+	ctypes-python? ( dev-python/ctypesgen )
+	doc? ( app-doc/doxygen )
+	gnome-keyring? ( dev-util/pkgconfig )
+	java? ( >=virtual/jdk-1.5 )
+	kde? ( dev-util/pkgconfig )
+	nls? ( sys-devel/gettext )
+	webdav-neon? ( dev-util/pkgconfig )"
+
+PATCHES=(
+		"${FILESDIR}/${PN}-1.5.4-interix.patch"
+		"${FILESDIR}/${PN}-1.5.6-aix-dso.patch"
+		"${FILESDIR}/${PN}-1.6.3-hpux-dso.patch"
+)
+
+want_apache
+
+pkg_setup() {
+	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 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."
+		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() {
+	base_src_prepare
+	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
+
+	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!"
+
+	eautoconf
+	elibtoolize
+
+	sed -e "s/libsvn_swig_py-1\.la/libsvn_swig_py-\$(PYTHON_VERSION)-1.la/" -i build-outputs.mk || die "sed failed"
+}
+
+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
+		*-solaris*)
+			# -lintl isn't added for some reason (makes Neon check fail)
+			use nls && append-libs -lintl
+		;;
+		*-aix*)
+			# avoid recording immediate path to sharedlibs into executables
+			append-ldflags -Wl,-bnoipath
+		;;
+		*-interix*)
+			# loader crashes on the LD_PRELOADs...
+			myconf="${myconf} --disable-local-library-preloading"
+		;;
+	esac
+
+	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 \
+		--enable-local-library-preloading \
+		--disable-mod-activation \
+		--disable-neon-version-check \
+		--disable-static \
+		--with-sqlite="${EPREFIX}/usr"
+}
+
+src_compile() {
+	emake local-all || die "Building of core of Subversion failed"
+
+	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
+	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
+		}
+		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
+	fi
+
+	if use perl; then
+		emake swig-pl || die "Building of Subversion SWIG Perl bindings failed"
+	fi
+
+	if use ruby; then
+		emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed"
+	fi
+
+	if use java; then
+		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "Building of Subversion JavaHL library failed"
+	fi
+
+	if use extras; then
+		emake tools || die "Building of tools failed"
+	fi
+
+	if use doc; then
+		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
+
+		if use java; then
+			emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed"
+		fi
+	fi
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed"
+
+	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_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
+	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
+		}
+		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
+	fi
+
+	if use ctypes-python || use python; then
+		python_clean_installation_image -q
+	fi
+
+	if use perl; then
+		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion SWIG Perl bindings failed"
+		fixlocalpod
+		find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -print0 | xargs -0 rm -fr
+	fi
+
+	if use ruby; then
+		emake DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed"
+	fi
+
+	if use java; then
+		emake DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
+		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 "${D}"etc/init.d/svnserve
+
+	# 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}
+		doins -r tools
+	fi
+
+	if use doc; then
+		dohtml -r doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed"
+
+		dodoc notes/*
+
+		if use java; then
+			java-pkg_dojavadoc doc/javadoc
+		fi
+	fi
+
+	find "${D}" '(' -name '*.la' ')' -print0 | xargs -0 rm -f
+}
+
+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 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:"
+		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
+
+	if use ctypes-python; then
+		python_mod_cleanup csvn
+	fi
+
+	if use python; then
+		python_mod_cleanup libsvn svn
+	fi
+}
+
+pkg_config() {
+	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
+	# already has EPREFIX in it
+	einfo "Initializing the database in ${ROOT}${SVN_REPOS_LOC}..."
+	if [[ -e "${ROOT}${SVN_REPOS_LOC}/repos" ]]; then
+		echo "A Subversion repository already exists and I will not overwrite it."
+		echo "Delete \"${ROOT}${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
+	else
+		mkdir -p "${ROOT}${SVN_REPOS_LOC}/conf"
+
+		einfo "Populating repository directory..."
+		# Create initial repository.
+		"${EROOT}usr/bin/svnadmin" create "${ROOT}${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"
+			enewgroup "${SVNSERVE_GROUP}"
+			enewuser "${SVNSERVE_USER}" -1 -1 "${SVN_REPOS_LOC}" "${SVNSERVE_GROUP}"
+		fi
+		chown -Rf "${SVNSERVE_USER}:${SVNSERVE_GROUP}" "${ROOT}${SVN_REPOS_LOC}/repos"
+		chmod -Rf go-rwx "${ROOT}${SVN_REPOS_LOC}/conf"
+		chmod -Rf o-rwx "${ROOT}${SVN_REPOS_LOC}/repos"
+	fi
+}