Version bump. Delete .packlist files (bug #221179).

Package-Manager: portage-13139-svn/cvs/Linux x86_64

6 files changed, 650 insertions, 5 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 5ff700ec87ad..084a15eaf06a 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,10 +1,18 @@
 # ChangeLog for dev-util/subversion
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.351 2009/03/21 00:45:31 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.352 2009/03/22 02:07:57 arfrever Exp $
+
+*subversion-1.6.0 (22 Mar 2009)
+
+  22 Mar 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  +files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch,
+  +files/subversion-1.6.0-various_fixes.patch, metadata.xml,
+  +subversion-1.6.0.ebuild:
+  Version bump. Delete .packlist files (bug #221179).
 
 *subversion-1.5.6 (21 Mar 2009)
 
-  21 Mar 2009; Arfrever Frehtes Taifersar Arahesis <Arfrever@gentoo.org>
+  21 Mar 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   +subversion-1.5.6.ebuild:
   Version bump (bug #260636).
 
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 457237ee9965..f1b305ece7b5 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -7,6 +7,8 @@ AUX subversion-1.3.1-neon-config.patch 1237 RMD160 ccf7449e030afe6ef6388c1215783
 AUX subversion-1.4-db4.patch 600 RMD160 c15ff56d035f0fa0bd520a08afca09a0e00d6e5a SHA1 4adfe056e4f406db961d99673a3a0d6c4e82d1e0 SHA256 fbb91732de667497e9eaa4f500fa80e45e3593f965b0308675c698718103082d
 AUX subversion-1.4.3-debug-config.patch 1015 RMD160 d2a23427d804b8a4c7777e2c6fce1d8270c49b08 SHA1 090ed80c9cc673479a9c5f8ff5b6c37c4b7795e9 SHA256 37d2aa4e8e0dcc38158f4c1b4367dca42647491d143789956fb0e7ed24bac934
 AUX subversion-1.4.6-neon-0.28.patch 2907 RMD160 73b226626fe4d993652e4f94fd7689620dfdd9a3 SHA1 d707928522610cc837304fbf9c04d8238ff81706 SHA256 bbf9a2c7336c96cd6f571ad9834b4f324cee3113d3d36ac3e00abef81ad2a968
+AUX subversion-1.6.0-disable_linking_against_unneeded_libraries.patch 1769 RMD160 89d165463a2e8a7e2ae5855bc4e4e290f20416ae SHA1 3fc9a49e80992b13b016d1c56babae43957f1b91 SHA256 a54a4dd37e197d030b9d56b2954e4cd38f8a7f1b191cfe59f863b75a164d5f96
+AUX subversion-1.6.0-various_fixes.patch 2152 RMD160 bdc11307dc3554127042edd42aa6f936804ac1cc SHA1 256bcd53368c71fedaf8fee4320214d5cdd75a18 SHA256 a83848dcba5e4ddad08097b53c04a2fb09027f4ae23a37f111c61eb9ca56ef5d
 AUX subversion-apr_cppflags.patch 492 RMD160 e2b803040a96dd5cb32a661204d44b79cfb1ca75 SHA1 6b61ee83160aa8cd64671c1b1aeee7f44d15c227 SHA256 33bdd29f58df40d771bba9c1aef97acbfc25c6a66dc8ca390172eef643d3cf13
 AUX subversion-hotbackup-config.patch 693 RMD160 9aa2bdec60df0ed782d8845204d69185e4f06015 SHA1 405a4d1d0bfe8eaad57c5b85a5895a7a4b271306 SHA256 d48d7b05e9bf18ea70d4a1f0efeed28dc2b0912a10b6995c94aabc93c9903da5
 AUX svnserve.confd 323 RMD160 cbf4d810d9f41bac1611004741170d1047cbeef0 SHA1 39e922bc777ba847eb85d421d92f560f84b895b5 SHA256 90d3e2532715a6230ebf65023566a6591eed4b3fc12abbca0d2fb7949e146006
@@ -18,10 +20,12 @@ DIST subversion-1.4.6.tar.bz2 4680316 RMD160 ae63877b5d0eeb1c4f28c4388f97897efde
 DIST subversion-1.5.4.tar.bz2 4925141 RMD160 521cd35602a637dba77864926e7636c08e54f3d7 SHA1 0bebb7029fcf3c0638206c22a1ba9526121e4365 SHA256 e24b6257b53988287471f83689846018e8e7b1e1c713da2567ab57b99e45fb40
 DIST subversion-1.5.5.tar.bz2 4940482 RMD160 6400e387b3505180206b61729cb0b11baeae70d3 SHA1 61c9a7209ccef8eff3c0499629d62ed4d3c89988 SHA256 88cf24ba5d589351791709ff7556ababc019ec59f3240ac2087dacabb9ad77be
 DIST subversion-1.5.6.tar.bz2 4946600 RMD160 5883f925e19e719c8656b5488ed9b00c0f7c3a79 SHA1 774b6dbd4245c36e86289393e651e36dedf17018 SHA256 f701fe75fecc43d9aecf717260ca18661469128a2f28a57c7e6672f3f64f46c2
+DIST subversion-1.6.0.tar.bz2 5477732 RMD160 c59162ea82e9c3e789ef6376c00bfdcf07b9a205 SHA1 a8088dd170ea38f6d175c6b009352922bc808013 SHA256 d6fb8bf61638580a0ad661edb642c38fbffad2a4c273e3f8631c6cc0da14d0a2
 EBUILD subversion-1.4.6-r2.ebuild 13839 RMD160 e707dbbf190bf8921caba79b2bfb792290c2d16d SHA1 e975c9db56dd99385b5cb3bab5f0722f2758f74c SHA256 84445d756df2b5030cd700fc0e351016ff20ff94668bc0df5559b382e2835ddc
 EBUILD subversion-1.4.6.ebuild 13825 RMD160 de7a9ddc2f1444c16d5a1916c322e1d9464b8071 SHA1 444e1eff81deecbe38ff4adc711012ca926ee653 SHA256 1588acc6e11034fcc45e6f2046688a770a1a7b237da190237c99777dc1449179
 EBUILD subversion-1.5.4.ebuild 13393 RMD160 476861d4d198a3f48c5e3e463719973275e08c59 SHA1 a1f4bf2f95e2fa4353a35ae58a398e8434d3f538 SHA256 8266ab65ccc52aeced0ad9f0162631c88aa0a1de6b5f7a55e272477305cd522d
 EBUILD subversion-1.5.5.ebuild 13389 RMD160 7919e6076dc2340f69a53b263eef90b752d5ad75 SHA1 c1daa6c240f93b5e4865a09568645e026df2233d SHA256 1d4b0e1cd10f7e61bcee2aa4fefbb62ee7d1ec972f951d2fc0af6b3f976ac072
 EBUILD subversion-1.5.6.ebuild 13438 RMD160 3f98459072fcc1f33f7985d89fdcbaf6693a7052 SHA1 2677e4f37ca85b5af7ced1afdcbbfffd1739bbd0 SHA256 ef8056b50424466ca646586658d541a6422961384fc7dc0570cba89336d27962
-MISC ChangeLog 58676 RMD160 5bdd558a73126c4ceda6191ea272c0b76517e119 SHA1 39dd2346dc29302ddfed4b96ef25eb9fd4e5fbf2 SHA256 350e93997fc7c5be447f7466f5b0eb9d6b5e3a5f24d869ac270e14564fef5965
-MISC metadata.xml 988 RMD160 2b694bddb324f2798117697cb0a0c973dbdd0c76 SHA1 14a89dd0227b1c82bbd03215b10237d231e4931b SHA256 2a618a46f9870e29375714d3eca2680659300c49a350e833c1199f23257d3bc0
+EBUILD subversion-1.6.0.ebuild 16431 RMD160 6aa61878029a9f1913d84996fe9eb8c83fe8456f SHA1 8270c57e49f29e8fe11f591d7f3365a5632424ec SHA256 6079ff535bf0332a3a8c7be6b18389327bc336ffae9ab4f0692b7173c1ce4dd7
+MISC ChangeLog 59002 RMD160 da3fdfc314c265b5edbfdd9c83830340259d52bf SHA1 b16e5b6765064cc7e0a8c3ce17e542d9f6b8dba3 SHA256 d09799bd15d9e7ae0994a3663f799dd41df9805ab8e4d5647a146fb04ad0506c
+MISC metadata.xml 1067 RMD160 74b69ae2e7b643131a29bf7ffcf6c783167f1511 SHA1 181bd9996c1d9d91f5ee3a99e3ecebbf1ce7cdd5 SHA256 e1aadbab30df2b99f0f7ec407a3c59ae33e62354aad4b71973f76250e83f7359
diff --git a/dev-util/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch b/dev-util/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch
new file mode 100644
index 000000000000..689b29cd7fc7
--- /dev/null
+++ b/dev-util/subversion/files/subversion-1.6.0-disable_linking_against_unneeded_libraries.patch
@@ -0,0 +1,56 @@
+--- Makefile.in
++++ Makefile.in
+@@ -47,6 +47,7 @@
+ SVN_SASL_LIBS = @SVN_SASL_LIBS@
+ SVN_SERF_LIBS = @SVN_SERF_LIBS@
+ SVN_SQLITE_LIBS = @SVN_SQLITE_LIBS@
++SVN_XML_LIBS = -lexpat
+ SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@
+ 
+ LIBS = @LIBS@
+--- build/ac-macros/aprutil.m4
++++ build/ac-macros/aprutil.m4
+@@ -77,16 +77,14 @@
+     AC_MSG_ERROR([apu-config --prefix failed])
+   fi
+ 
+-  dnl When APR stores the dependent libs in the .la file, we don't need
+-  dnl --libs.
+-  SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
++  SVN_APRUTIL_LIBS="`$apu_config --link-libtool`"
+   if test $? -ne 0; then
+-    AC_MSG_ERROR([apu-config --link-libtool --libs failed])
++    AC_MSG_ERROR([apu-config --link-libtool failed])
+   fi
+ 
+-  SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld --libs`"
++  SVN_APRUTIL_EXPORT_LIBS="`$apu_config --link-ld`"
+   if test $? -ne 0; then
+-    AC_MSG_ERROR([apu-config --link-ld --libs failed])
++    AC_MSG_ERROR([apu-config --link-ld failed])
+   fi
+ 
+   AC_SUBST(SVN_APRUTIL_INCLUDES)
+--- build/ac-macros/apr.m4
++++ build/ac-macros/apr.m4
+@@ -74,16 +74,14 @@
+     AC_MSG_ERROR([apr-config --prefix failed])
+   fi
+ 
+-  dnl When APR stores the dependent libs in the .la file, we don't need 
+-  dnl --libs.
+-  SVN_APR_LIBS="`$apr_config --link-libtool --libs`"
++  SVN_APR_LIBS="`$apr_config --link-libtool`"
+   if test $? -ne 0; then
+-    AC_MSG_ERROR([apr-config --link-libtool --libs failed])
++    AC_MSG_ERROR([apr-config --link-libtool failed])
+   fi
+ 
+-  SVN_APR_EXPORT_LIBS="`$apr_config --link-ld --libs`"
++  SVN_APR_EXPORT_LIBS="`$apr_config --link-ld`"
+   if test $? -ne 0; then
+-    AC_MSG_ERROR([apr-config --link-ld --libs failed])
++    AC_MSG_ERROR([apr-config --link-ld failed])
+   fi
+ 
+   SVN_APR_SHLIB_PATH_VAR="`$apr_config --shlib-path-var`"
diff --git a/dev-util/subversion/files/subversion-1.6.0-various_fixes.patch b/dev-util/subversion/files/subversion-1.6.0-various_fixes.patch
new file mode 100644
index 000000000000..2b95ca63e72e
--- /dev/null
+++ b/dev-util/subversion/files/subversion-1.6.0-various_fixes.patch
@@ -0,0 +1,63 @@
+https://svn.collab.net/viewvc/svn?view=revision&revision=36252
+https://svn.collab.net/viewvc/svn?view=revision&revision=36253
+https://svn.collab.net/viewvc/svn?view=revision&revision=36302
+https://svn.collab.net/viewvc/svn?view=revision&revision=36686
+
+--- subversion/libsvn_client/merge.c
++++ subversion/libsvn_client/merge.c
+@@ -7948,7 +7948,7 @@
+   svn_opt_revision_t working_rev;
+   svn_ra_session_t *ra_session;
+   apr_pool_t *sesspool;
+-  svn_boolean_t use_sleep;
++  svn_boolean_t use_sleep = FALSE;
+   svn_error_t *err;
+   svn_boolean_t same_repos;
+ 
+--- subversion/libsvn_wc/crop.c
++++ subversion/libsvn_wc/crop.c
+@@ -284,8 +284,9 @@
+         {
+           svn_wc_entry_t *target_entry;
+           apr_hash_t *parent_entries;
++
+           SVN_ERR(svn_wc_entries_read(&parent_entries, p_access,
+-                                      FALSE, pool));
++                                      TRUE, pool));
+ 
+           target_entry = apr_hash_get(parent_entries,
+                                       svn_path_basename(full_path, pool),
+--- subversion/libsvn_wc/log.c
++++ subversion/libsvn_wc/log.c
+@@ -1472,7 +1472,7 @@
+                             _("Invalid 'format' attribute"));
+ 
+   /* Remove the .svn/format file, if it exists. */
+-  SVN_ERR(svn_io_remove_file(path, loggy->pool));
++  svn_error_clear(svn_io_remove_file(path, loggy->pool));
+ 
+   /* The nice thing is that, just by setting this flag, the entries file will
+      be rewritten in the desired format. */
+--- subversion/libsvn_wc/questions.c
++++ subversion/libsvn_wc/questions.c
+@@ -78,6 +78,10 @@
+ 
+       svn_error_clear(err);
+ 
++      /* If the format file does not exist or path not directory, then for
++         our purposes this is not a working copy, so return 0. */
++      *wc_format = 0;
++
+       /* Check path itself exists. */
+       SVN_ERR(svn_io_check_path(path, &kind, pool));
+ 
+@@ -88,9 +92,6 @@
+             svn_path_local_style(path, pool));
+         }
+ 
+-      /* If the format file does not exist or path not directory, then for
+-         our purposes this is not a working copy, so return 0. */
+-      *wc_format = 0;
+     }
+   else if (err)
+     return err;
diff --git a/dev-util/subversion/metadata.xml b/dev-util/subversion/metadata.xml
index 10a97f2e9751..2ef3dfb2b396 100644
--- a/dev-util/subversion/metadata.xml
+++ b/dev-util/subversion/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
-    <email>Arfrever@gentoo.org</email>
+    <email>arfrever@gentoo.org</email>
     <name>Arfrever Frehtes Taifersar Arahesis</name>
     <description>Gentoo Subversion maintainer and Subversion upstream representative</description>
   </maintainer>
@@ -12,6 +12,7 @@
     <description>Gentoo Subversion maintainer</description>
   </maintainer>
   <use>
+    <flag name="ctypes-python">Build and install ctypes python bindings</flag>
     <flag name="dso">Enable runtime module search</flag>
     <flag name="extras">Install extras scripts (examples, tools, hooks)</flag>
     <flag name="nowebdav">Disables WebDAV support via neon library</flag>
diff --git a/dev-util/subversion/subversion-1.6.0.ebuild b/dev-util/subversion/subversion-1.6.0.ebuild
new file mode 100644
index 000000000000..e4f5baf3477b
--- /dev/null
+++ b/dev-util/subversion/subversion-1.6.0.ebuild
@@ -0,0 +1,513 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.0.ebuild,v 1.1 2009/03/22 02:07:57 arfrever Exp $
+
+EAPI="1"
+
+WANT_AUTOMAKE="none"
+
+inherit autotools bash-completion db-use depend.apache elisp-common eutils flag-o-matic java-pkg-opt-2 libtool multilib perl-module python
+
+DESCRIPTION="Advanced version control system"
+HOMEPAGE="http://subversion.tigris.org/"
+SRC_URI="http://subversion.tigris.org/downloads/${P/_/-}.tar.bz2"
+
+LICENSE="Subversion"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="apache2 berkdb ctypes-python debug doc +dso emacs extras gnome-keyring java kde nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
+RESTRICT="test"
+
+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* )
+	emacs? ( virtual/emacs )
+	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* )
+	ruby? ( >=dev-lang/ruby-1.8.2 )
+	sasl? ( dev-libs/cyrus-sasl )
+	webdav-neon? ( >=net-misc/neon-0.28 )
+	webdav-serf? ( >=net-libs/serf-0.3.0 )"
+
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.5 )
+	nls? ( virtual/libintl )
+	perl? ( dev-perl/URI )"
+
+DEPEND="${CDEPEND}
+	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 )"
+
+want_apache
+
+S="${WORKDIR}/${P/_/-}"
+
+# Allow for custom repository locations.
+# This can't be in pkg_setup() because the variable needs to be available to pkg_config().
+: ${SVN_REPOS_LOC:=/var/svn}
+
+pkg_setup() {
+	if use kde && ! use nls; then
+		eerror "Support for KWallet (KDE) requires Native Language Support (NLS)."
+		die "Enable \"nls\" USE flag"
+	fi
+
+	java-pkg-opt-2_pkg_setup
+
+	if ! use webdav-neon && ! use webdav-serf; then
+		ewarn
+		ewarn "WebDAV support is disabled. You need WebDAV to"
+		ewarn "access repositories through the HTTP protocol."
+		ewarn
+		ewarn "WebDAV support needs one of the following USE flags enabled:"
+		ewarn "  webdav-neon webdav-serf"
+		ewarn
+		ewarn "You can do this by enabling one of these flags in /etc/portage/package.use:"
+		ewarn "    =${CATEGORY}/${PF} webdav-neon webdav-serf"
+		ewarn
+		ebeep
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-disable_linking_against_unneeded_libraries.patch"
+
+	# Various fixes which will be included in 1.6.1.
+	epatch "${FILESDIR}/${P}-various_fixes.patch"
+
+	# Fix 2 messages in Polish translation. They will be fixed in 1.6.1.
+	sed -e "7420d;8586d" -i subversion/po/pl.po
+
+	sed -i \
+		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
+		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
+
+	sed -e "s:@bindir@/svn-contrib:@libdir@/subversion/bin:" \
+		-e "s:@bindir@/svn-tools:@libdir@/subversion/bin:" \
+		-i Makefile.in
+
+	eautoconf
+	elibtoolize
+}
+
+src_compile() {
+	local myconf
+
+	if use python || use perl || use ruby; then
+		myconf="${myconf} --with-swig"
+	else
+		myconf="${myconf} --without-swig"
+	fi
+
+	if use debug; then
+		append-cppflags -DSVN_DEBUG -DAP_DEBUG
+	fi
+
+	append-flags -fno-strict-aliasing
+
+	econf --libdir="/usr/$(get_libdir)" \
+		${myconf} \
+		$(use_with apache2 apxs "${APXS}") \
+		$(use_with berkdb berkeley-db "db.h:$(db_includedir 2>/dev/null)::$(db_libname 2>/dev/null)") \
+		$(use_with ctypes-python ctypesgen /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 webdav-neon neon) \
+		$(use_with webdav-serf serf /usr) \
+		--with-apr=/usr/bin/apr-1-config \
+		--with-apr-util=/usr/bin/apu-1-config \
+		--disable-experimental-libtool \
+		--without-jikes \
+		--without-junit \
+		--disable-mod-activation \
+		--disable-neon-version-check \
+		--with-sqlite=/usr
+
+	einfo
+	einfo "Building of core of Subversion"
+	einfo
+	emake local-all || die "Building of core of Subversion failed"
+
+	if use ctypes-python; then
+		einfo
+		einfo "Building of Subversion Ctypes Python bindings"
+		einfo
+		emake ctypes-python || die "Building of Subversion Ctypes Python bindings failed"
+	fi
+
+	if use python; then
+		einfo
+		einfo "Building of Subversion SWIG Python bindings"
+		einfo
+		emake swig-py || die "Building of Subversion SWIG Python bindings failed"
+	fi
+
+	if use perl; then
+		einfo
+		einfo "Building of Subversion SWIG Perl bindings"
+		einfo
+		emake -j1 swig-pl || die "Building of Subversion SWIG Perl bindings failed"
+	fi
+
+	if use ruby; then
+		einfo
+		einfo "Building of Subversion SWIG Ruby bindings"
+		einfo
+		emake swig-rb || die "Building of Subversion SWIG Ruby bindings failed"
+	fi
+
+	if use java; then
+		einfo
+		einfo "Building of Subversion JavaHL library"
+		einfo
+		make JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl \
+			|| die "Building of Subversion JavaHL library failed"
+	fi
+
+	if use emacs; then
+		einfo
+		einfo "Compilation of Emacs support"
+		einfo
+		elisp-compile contrib/client-side/emacs/{dsvn,psvn,vc-svn}.el doc/svn-doc.el doc/tools/svnbook.el || die "Compilation of Emacs modules failed"
+	fi
+
+	if use extras; then
+		einfo
+		einfo "Building of contrib and tools"
+		einfo
+		emake contrib || die "Building of contrib failed"
+		emake tools || die "Building of tools failed"
+	fi
+
+	if use doc; then
+		einfo
+		einfo "Building of Subversion HTML documentation"
+		einfo
+		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
+
+		if use java; then
+			einfo
+			einfo "Building of Subversion JavaHL library HTML documentation"
+			einfo
+			emake doc-javahl || die "Building of Subversion JavaHL library HTML documentation failed"
+		fi
+	fi
+}
+
+src_install() {
+	python_version
+	PYTHON_DIR=/usr/$(get_libdir)/python${PYVER}
+
+	einfo
+	einfo "Installation of core of Subversion"
+	einfo
+	emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed"
+
+	if use ctypes-python; then
+		einfo
+		einfo "Installation of Subversion Ctypes Python bindings"
+		einfo
+		emake DESTDIR="${D}" install-ctypes-python || die "Installation of Subversion Ctypes Python bindings failed"
+	fi
+
+	if use python; then
+		einfo
+		einfo "Installation of Subversion SWIG Python bindings"
+		einfo
+		emake -j1 DESTDIR="${D}" DISTUTIL_PARAM="--prefix=${D}" LD_LIBRARY_PATH="-L${D}usr/$(get_libdir)" install-swig-py \
+			|| die "Installation of Subversion SWIG Python bindings failed"
+
+		# Move Python bindings.
+		dodir "${PYTHON_DIR}/site-packages"
+		mv "${D}usr/$(get_libdir)/svn-python/svn" "${D}${PYTHON_DIR}/site-packages"
+		mv "${D}usr/$(get_libdir)/svn-python/libsvn" "${D}${PYTHON_DIR}/site-packages"
+		rm -fr "${D}usr/$(get_libdir)/svn-python"
+	fi
+
+	if use perl; then
+		einfo
+		einfo "Installation of Subversion SWIG Perl bindings"
+		einfo
+		emake -j1 DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion SWIG Perl bindings failed"
+		fixlocalpod
+		find "${D}" "(" -name .packlist -o -name "*.bs" ")" -print0 | xargs -0 rm -fr
+	fi
+
+	if use ruby; then
+		einfo
+		einfo "Installation of Subversion SWIG Ruby bindings"
+		einfo
+		emake -j1 DESTDIR="${D}" install-swig-rb || die "Installation of Subversion SWIG Ruby bindings failed"
+	fi
+
+	if use java; then
+		einfo
+		einfo "Installation of Subversion JavaHL library"
+		einfo
+		emake -j1 DESTDIR="${D}" install-javahl || die "Installation of Subversion JavaHL library failed"
+		java-pkg_regso "${D}"usr/$(get_libdir)/libsvnjavahl*.so
+		java-pkg_dojar "${D}"usr/$(get_libdir)/svn-javahl/svn-javahl.jar
+		rm -fr "${D}"usr/$(get_libdir)/svn-javahl/*.jar
+	fi
+
+	# Install Apache module configuration.
+	if use apache2; then
+		dodir "${APACHE_MODULES_CONFDIR}"
+		cat <<EOF >"${D}${APACHE_MODULES_CONFDIR}"/47_mod_dav_svn.conf
+<IfDefine SVN>
+LoadModule dav_svn_module modules/mod_dav_svn.so
+<IfDefine SVN_AUTHZ>
+LoadModule authz_svn_module modules/mod_authz_svn.so
+</IfDefine>
+
+# Example configuration:
+#<Location /svn/repos>
+#	DAV svn
+#	SVNPath ${SVN_REPOS_LOC}/repos
+#	AuthType Basic
+#	AuthName "Subversion repository"
+#	AuthUserFile ${SVN_REPOS_LOC}/conf/svnusers
+#	Require valid-user
+#</Location>
+</IfDefine>
+EOF
+	fi
+
+	# Install Bash Completion, bug 43179.
+	dobashcompletion 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 svn_load_dirs.pl.
+	if use perl; then
+		dobin contrib/client-side/svn_load_dirs/svn_load_dirs.pl
+	fi
+	rm -f contrib/client-side/svn_load_dirs/svn_load_dirs.pl
+
+	# Install svnserve init-script and xinet.d snippet, bug 43245.
+	newinitd "${FILESDIR}"/svnserve.initd svnserve
+	if use apache2; then
+		newconfd "${FILESDIR}"/svnserve.confd svnserve
+	else
+		newconfd "${FILESDIR}"/svnserve.confd2 svnserve
+	fi
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/svnserve.xinetd svnserve
+
+	# Install documentation.
+	dodoc CHANGES COMMITTERS README
+	dohtml www/hacking.html
+	dodoc tools/xslt/svnindex.{css,xsl}
+	rm -fr tools/xslt
+
+	# Install Vim syntax files.
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/client-side/vim/svn.vim
+	fi
+	rm -f contrib/client-side/vim/svn.vim
+
+	# Install Emacs Lisps.
+	if use emacs; then
+		elisp-install ${PN} contrib/client-side/emacs/{dsvn,psvn}.{el,elc} doc/svn-doc.{el,elc} doc/tools/svnbook.{el,elc} || die "Installation of Emacs modules failed"
+		elisp-install ${PN}/compat contrib/client-side/emacs/vc-svn.{el,elc} || die "Installation of Emacs modules failed"
+		touch "${D}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}/1.5.0/70svn-gentoo.el" || die "Installation of Emacs site-init file failed"
+	fi
+	rm -fr contrib/client-side/emacs
+
+	# Install extra files.
+	if use extras; then
+		einfo
+		einfo "Installation of contrib and tools"
+		einfo
+		doenvd "${FILESDIR}/1.5.0/80subversion-extras"
+		emake DESTDIR="${D}" install-contrib || die "Installation of contrib failed"
+		emake DESTDIR="${D}" install-tools || die "Installation of tools failed"
+
+		find contrib tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr
+		rm -fr contrib/client-side/svn-push
+		rm -fr contrib/server-side/svnstsw
+		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 contrib tools
+	fi
+
+	if use doc; then
+		einfo
+		einfo "Installation of Subversion HTML documentation"
+		einfo
+		dohtml doc/doxygen/html/* || die "Installation of Subversion HTML documentation failed"
+
+		insinto /usr/share/doc/${PF}
+		doins -r notes
+		ecompressdir /usr/share/doc/${PF}/notes
+
+#		if use ruby; then
+#			make DESTDIR="${D}" install-swig-rb-doc
+#		fi
+
+		if use java; then
+			java-pkg_dojavadoc doc/javadoc
+		fi
+	fi
+}
+
+pkg_preinst() {
+	# Compare versions of Berkeley DB, bug 122877.
+	if use berkdb && [[ -f "${ROOT}usr/bin/svn" ]]; then
+		OLD_BDB_VERSION="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		NEW_BDB_VERSION="$(scanelf -nq "${D}usr/$(get_libdir)/libsvn_subr-1.so.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 emacs && elisp-site-regen
+	use perl && perl-module_pkg_postinst
+
+	if use ctypes-python; then
+		python_mod_compile "$(python_get_sitedir)/csvn/"{.,core,ext}/*.py
+	fi
+
+	elog "Subversion Server Notes"
+	elog "-----------------------"
+	elog
+	elog "If you intend to run a server, a repository needs to be created using"
+	elog "svnadmin (see man svnadmin) or the following command to create it in"
+	elog "${SVN_REPOS_LOC}:"
+	elog
+	elog "    emerge --config =${CATEGORY}/${PF}"
+	elog
+	elog "Subversion has multiple server types, take your pick:"
+	elog
+	elog " - svnserve daemon: "
+	elog "   1. Edit /etc/conf.d/svnserve"
+	elog "   2. Fix the repository permissions (see \"Fixing the repository permissions\")"
+	elog "   3. Start daemon: /etc/init.d/svnserve start"
+	elog "   4. Make persistent: rc-update add svnserve default"
+	elog
+	elog " - svnserve via xinetd:"
+	elog "   1. Edit /etc/xinetd.d/svnserve (remove disable line)"
+	elog "   2. Fix the repository permissions (see \"Fixing the repository permissions\")"
+	elog "   3. Restart xinetd.d: /etc/init.d/xinetd restart"
+	elog
+	elog " - svn over ssh:"
+	elog "   1. Fix the repository permissions (see \"Fixing the repository permissions\")"
+	elog "      Additionally run:"
+	elog "        groupadd svnusers"
+	elog "        chown -R root:svnusers ${SVN_REPOS_LOC}/repos"
+	elog "   2. Create an svnserve wrapper in /usr/local/bin to set the umask you"
+	elog "      want, for example:"
+	elog "         #!/bin/bash"
+	elog "         . /etc/conf.d/svnserve"
+	elog "         umask 007"
+	elog "         exec /usr/bin/svnserve \${SVNSERVE_OPTS} \"\$@\""
+	elog
+
+	if use apache2; then
+		elog " - http-based server:"
+		elog "   1. Edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\""
+		elog "   2. Create an htpasswd file:"
+		elog "      htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME"
+		elog "   3. Fix the repository permissions (see \"Fixing the repository permissions\")"
+		elog "   4. Restart Apache: /etc/init.d/apache2 restart"
+		elog
+	fi
+
+	elog " Fixing the repository permissions:"
+	elog "      chmod -Rf go-rwx ${SVN_REPOS_LOC}/conf"
+	elog "      chmod -Rf g-w,o-rwx ${SVN_REPOS_LOC}/repos"
+	elog "      chmod -Rf g+rw ${SVN_REPOS_LOC}/repos/db"
+	elog "      chmod -Rf g+rw ${SVN_REPOS_LOC}/repos/locks"
+	elog
+
+	elog "If you intend to use svn-hot-backup, you can specify the number of"
+	elog "backups to keep per repository by specifying an environment variable."
+	elog "If you want to keep e.g. 2 backups, do the following:"
+	elog "echo '# hot-backup: Keep that many repository backups around' > /etc/env.d/80subversion"
+	elog "echo 'SVN_HOTBACKUP_BACKUPS_NUMBER=2' >> /etc/env.d/80subversion"
+	elog
+
+	elog "Subversion contains support for the use of Memcached"
+	elog "to cache data of FSFS repositories."
+	elog "You should install \"net-misc/memcached\", start memcached"
+	elog "and configure your FSFS repositories, if you want to use this feature."
+	elog "See the documentation for details."
+	elog
+	epause 6
+
+	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
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use perl && perl-module_pkg_postrm
+
+	if use ctypes-python; then
+		python_mod_cleanup
+	fi
+}
+
+pkg_config() {
+	if [[ ! -x "${ROOT}usr/bin/svnadmin" ]]; then
+		die "You seem to only have built the Subversion client"
+	fi
+
+	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.
+		"${ROOT}usr/bin/svnadmin" create "${ROOT}${SVN_REPOS_LOC}/repos"
+
+		einfo ">>> Setting repository permissions ..."
+		SVNSERVE_USER="$(. "${ROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
+		SVNSERVE_GROUP="$(. "${ROOT}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
+}