add neon-0.28.1 support wrt #210535; refresh patches

Package-Manager: portage-2.1.4.4

9 files changed, 482 insertions, 43 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index d6c6373d5a81..e4a72b06613b 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.295 2008/03/02 11:26:25 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.296 2008/03/22 18:43:19 hollow Exp $
+
+*subversion-1.4.6-r2 (22 Mar 2008)
+
+  22 Mar 2008; Benedikt Böhm <hollow@gentoo.org>
+  files/subversion-1.1.1-perl-vendor.patch,
+  files/subversion-1.4.6-neon-0.28.patch, files/subversion-1.4-db4.patch,
+  files/subversion-1.4.3-debug-config.patch,
+  files/subversion-apr_cppflags.patch,
+  files/subversion-hotbackup-config.patch, +subversion-1.4.6-r2.ebuild:
+  add neon-0.28.1 support wrt #210535; refresh patches
 
 *subversion-1.4.6-r1 (02 Mar 2008)
 
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 6d878ac49f99..7362bc4b6bb0 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 AUX 70svn-gentoo.el 331 RMD160 1de1310ae7e4bdbecef3c685ef8d7ff95b9aab87 SHA1 48eb99e9d494a4a674de32e599914df234b627cd SHA256 c0d733bd3f7c75c47acaea4fd0c816d45ee2cd765da70dc494666f38c91e3d87
-AUX subversion-1.1.1-perl-vendor.patch 713 RMD160 fdc54d38c44c3e1273b654b3d1a2f4a76f91aec3 SHA1 8c9a2fb00c4cb17dd477937701587a5da3fe1800 SHA256 d7c5994fa66d77ec956b2e1ca1020fadcf1200bdd2acce974033e9839bb8f7c3
+AUX subversion-1.1.1-perl-vendor.patch 803 RMD160 04c3367b045050c73534f4662d2d7658547b8bd1 SHA1 96c6281b6ce8c618c4e7644240df8e8a8bba875a SHA256 03bca78f12845aabc39c089b9c5bd59e67556bd9b2dec2b06174a805ca95dcb4
 AUX subversion-1.3.1-neon-config.patch 1237 RMD160 ccf7449e030afe6ef6388c12157831d5f2d59d6b SHA1 f05075b7c17be367cf83529e8558d8a1d14ace91 SHA256 6e0f152a8254b7e7c0b498ce011f1798d475b2acf18d779b4dfe0758de1f3049
-AUX subversion-1.4-db4.patch 570 RMD160 e07111ed95b08289b9e145dad7798430cb45e405 SHA1 7fc6c3dd48b5d018a9794973ecb085abdf262d89 SHA256 73f2915a8334c0ebd95abb3bc1239237c683f71662281b1a183b7885f075e236
-AUX subversion-1.4.3-debug-config.patch 886 RMD160 0d95f3b50617469f1c5466b2e34d45ecdb1238a8 SHA1 f9f38bf70f8042a4a754830a7f456f6d2d52bf5d SHA256 b84b31b7a49b79d68ad71feb186882da495e31cec0b8ff3f42b9f261c3e03448
-AUX subversion-1.4.6-neon-0.28.patch 2501 RMD160 7ad442306b88b27f49b3c0c4927e69b7520d773f SHA1 de31c7660c50c98ed8c629b98371f1ceb6828fe7 SHA256 cd405f98ed6706ca8f961fad29faf955f45b73eaeda585ee43c6a2f8cdc2e2c6
-AUX subversion-apr_cppflags.patch 426 RMD160 245d52ce05da6652e5f5984f0e33aa51e534082a SHA1 13b975d3632d2a12667a731fe425bf5f21a09955 SHA256 0d7e52ce90cc806270ccb5e3c2b700fdb6d251a17001b91f08de5beab66295e6
-AUX subversion-hotbackup-config.patch 629 RMD160 6a53b1b676bc3ce3ef2644666c2ebd21574c18fe SHA1 941f864c430eceb1c4cce40cf6830fbcae1219b3 SHA256 7a80e05ed26508abee1bd2aa358747a681ce55e18711ff28c745012f60d989f3
+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-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
 AUX svnserve.confd2 320 RMD160 dc1e74d06d9bd3eeb1a8dfd20aacebecd8378abb SHA1 557191219c3afa90126b8a2bfe7dd62b8a09eb82 SHA256 c70655c073dc06f538c5acdbcd49e216f4be2c859ce395bdf78757a1eeccab00
 AUX svnserve.initd 817 RMD160 59f4e8e983d4595b7c27615889a9c0809d015a18 SHA1 483b47512fb444c0f752ad4eb6c3252f659a967e SHA256 6b483e211b5c311079605e246fca9228c7e5762d27a023fa4c4529fdaa766b08
@@ -18,13 +18,14 @@ DIST subversion-1.4.5.tar.bz2 4722624 RMD160 159f3eac9168d856a19ffb235c5417757cd
 DIST subversion-1.4.6.tar.bz2 4680316 RMD160 ae63877b5d0eeb1c4f28c4388f97897efde7244c SHA1 a9c941e2309744f6a2986200698b60da057a7527 SHA256 6c480c3493b25c4b73fa62d5fef2f8dd40dde1eb1294c53d3495d864230fc124
 EBUILD subversion-1.4.5.ebuild 13743 RMD160 d430ee15a0a191ad525bc2c2a049efbc0cebd3f8 SHA1 82b328cbdb8d18bc51d54d2927af4647c6e0ebb1 SHA256 f0fa626ddd93edfa4a02a61277a357696afce3d3dd00f10de387bd46842ad5ab
 EBUILD subversion-1.4.6-r1.ebuild 13788 RMD160 db0b3c8aa243d1f4971a6c36bb5971231c1c80c7 SHA1 7c26f809ea08c6b6a971066c5efb020236336fef SHA256 48a1a5e9305b1836b98d370fe25c04c5eb95cfa24357a02f80cbca216f7d4884
+EBUILD subversion-1.4.6-r2.ebuild 13795 RMD160 f548e35b83423eaee48e01fff4897df3e9ca8f73 SHA1 9a47d40fc8982807871c69e48327120051609c82 SHA256 a3e69460eab7cd892bd4c76c8355bb93aa1f2c44cb9120453b6b39885818a5c5
 EBUILD subversion-1.4.6.ebuild 13794 RMD160 5106b4348eb605d41b1f1480e8fbe158f0b4fb82 SHA1 94a4a5cd30ec56bb69453af5d2af16fc517eb3be SHA256 9b901eea36340e8936beedc5964ec86e60c00054201cea6a97589f4bfb6cdcdb
-MISC ChangeLog 50987 RMD160 5779b4ed84a9166a2f98dc909899dd1a9e2131bf SHA1 2375afceacf440b015f50b7e2ef61e19685ea4d3 SHA256 9961ebf98c4127a5248574d90d85515fe7b897872fc0f02658a31ad6160422bb
+MISC ChangeLog 51403 RMD160 82507b983c7285c23a89e79114d9b2c9bc0892d0 SHA1 34b8f21ac4b1ad259b96a5ecb6a84c8910de987e SHA256 7c92fdf3609e86f5766f1bdc542015a7bdb60ce770cea15e3de5caa7cb89964c
 MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkfKjucACgkQmPFBzbX68WFETgCfc5hSOR06CtAbp6vFwpd3x41X
-QdcAoJEBuD/Q+EWolH7JSepP4UffQNGb
-=Xy3T
+iD8DBQFH5VNTmPFBzbX68WERAsZZAJ9qJsNY+tbk21uu8Fxf8MSeJRVTBACgmyWW
+FGTlBeqBQpieAvYVsyVhSJI=
+=h+iT
 -----END PGP SIGNATURE-----
diff --git a/dev-util/subversion/files/subversion-1.1.1-perl-vendor.patch b/dev-util/subversion/files/subversion-1.1.1-perl-vendor.patch
index 5da7451e8164..ed8bdded26ea 100644
--- a/dev-util/subversion/files/subversion-1.1.1-perl-vendor.patch
+++ b/dev-util/subversion/files/subversion-1.1.1-perl-vendor.patch
@@ -3,14 +3,16 @@ instead of site.  The INSTALLDIRS bit is stolen from perl-module.eclass
 
 11 Nov 2004 agriffis
 
---- subversion-1.1.1/Makefile.in.vendor	2004-11-11 23:20:10.000000000 -0500
-+++ subversion-1.1.1/Makefile.in	2004-11-11 23:21:42.815937984 -0500
-@@ -571,7 +571,7 @@
-         done
+Index: subversion-1.4.6/Makefile.in
+===================================================================
+--- subversion-1.4.6.orig/Makefile.in
++++ subversion-1.4.6/Makefile.in
+@@ -606,7 +606,7 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI
+ 	./config.status subversion/bindings/swig/perl/native/Makefile.PL
  
  $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
 -	cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
 +	cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL INSTALLDIRS=vendor
  
- swig-pl_DEPS = libsvn_client libsvn_delta libsvn_diff libsvn_fs libsvn_ra libsvn_repos libsvn_subr libsvn_wc libsvn_swig_perl $(SWIG_PL_DIR)/native/Makefile
- swig-pl: $(swig-pl_DEPS)
+ swig-pl_DEPS = autogen-swig-pl libsvn_client libsvn_delta libsvn_diff \
+   libsvn_fs libsvn_ra libsvn_repos libsvn_subr libsvn_wc libsvn_swig_perl \
diff --git a/dev-util/subversion/files/subversion-1.4-db4.patch b/dev-util/subversion/files/subversion-1.4-db4.patch
index 369cabb225f7..cfaaefa8a842 100644
--- a/dev-util/subversion/files/subversion-1.4-db4.patch
+++ b/dev-util/subversion/files/subversion-1.4-db4.patch
@@ -1,12 +1,13 @@
-diff -rNu subversion-0.27.0.orig/configure.in subversion-0.27.0/configure.in
---- subversion-0.27.0.orig/configure.in	2003-08-14 14:22:08.000000000 +0200
-+++ subversion-0.27.0/configure.in	2003-08-26 12:43:23.000000000 +0200
-@@ -261,7 +261,7 @@
+Index: subversion-1.4.6/configure.in
+===================================================================
+--- subversion-1.4.6.orig/configure.in
++++ subversion-1.4.6/configure.in
+@@ -245,7 +245,7 @@ powerpc-apple-darwin*)
  esac
  # Look for libdb4.so first:
  SVN_LIB_BERKELEY_DB($SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MINOR,
 -                    $SVN_FS_WANT_DB_PATCH, [db4 db])
 +                    $SVN_FS_WANT_DB_PATCH, [db-4.3 db-4.2 db-4.0 db-4 db-4.1 db4 db])
  
- 
- # Only add *_APACHE_RULE if we also have db, since mod_dav_svn depends on it.
+ AC_DEFINE_UNQUOTED(SVN_FS_WANT_DB_MAJOR, $SVN_FS_WANT_DB_MAJOR,
+                    [The desired major version for the Berkeley DB])
diff --git a/dev-util/subversion/files/subversion-1.4.3-debug-config.patch b/dev-util/subversion/files/subversion-1.4.3-debug-config.patch
index fe6abafec101..94fb19438906 100644
--- a/dev-util/subversion/files/subversion-1.4.3-debug-config.patch
+++ b/dev-util/subversion/files/subversion-1.4.3-debug-config.patch
@@ -1,6 +1,8 @@
---- configure.in.orig	2007-02-27 21:58:01.000000000 +0100
-+++ configure.in	2007-02-27 22:00:07.000000000 +0100
-@@ -433,7 +433,7 @@
+Index: subversion-1.4.6/configure.in
+===================================================================
+--- subversion-1.4.6.orig/configure.in
++++ subversion-1.4.6/configure.in
+@@ -433,7 +433,7 @@ AC_HELP_STRING([--with-ssl],
  
  AC_ARG_ENABLE(debug,
  AC_HELP_STRING([--enable-debug],
@@ -9,7 +11,7 @@
  [
      if test "$enableval" = "yes" ; then
        enable_debugging="yes"
-@@ -441,17 +441,6 @@
+@@ -441,17 +441,6 @@ AC_HELP_STRING([--enable-debug],
        enable_debugging="no"
      fi
  ])
diff --git a/dev-util/subversion/files/subversion-1.4.6-neon-0.28.patch b/dev-util/subversion/files/subversion-1.4.6-neon-0.28.patch
index 0b5f7e5399b4..7dc23c576de0 100644
--- a/dev-util/subversion/files/subversion-1.4.6-neon-0.28.patch
+++ b/dev-util/subversion/files/subversion-1.4.6-neon-0.28.patch
@@ -1,6 +1,8 @@
---- build/ac-macros/neon.m4
-+++ build/ac-macros/neon.m4
-@@ -50,14 +50,18 @@
+Index: subversion-1.4.6/build/ac-macros/neon.m4
+===================================================================
+--- subversion-1.4.6.orig/build/ac-macros/neon.m4
++++ subversion-1.4.6/build/ac-macros/neon.m4
+@@ -50,14 +50,18 @@ AC_DEFUN(SVN_LIB_NEON,
        NEON_VERSION=`cat $abs_srcdir/neon/.version`
        AC_MSG_RESULT([$NEON_VERSION])
  
@@ -21,7 +23,7 @@
  
        for svn_allowed_neon in $NEON_ALLOWED_LIST; do
          if test "$NEON_VERSION" = "$svn_allowed_neon" ||
-@@ -127,14 +131,18 @@
+@@ -127,14 +131,18 @@ AC_DEFUN(SVN_NEON_CONFIG,
        NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
        AC_MSG_RESULT([$NEON_VERSION])
  
@@ -42,9 +44,11 @@
  
        for svn_allowed_neon in $NEON_ALLOWED_LIST; do
          if test "$NEON_VERSION" = "$svn_allowed_neon" ||
---- subversion/libsvn_ra_dav/session.c
-+++ subversion/libsvn_ra_dav/session.c
-@@ -575,7 +575,11 @@
+Index: subversion-1.4.6/subversion/libsvn_ra_dav/session.c
+===================================================================
+--- subversion-1.4.6.orig/subversion/libsvn_ra_dav/session.c
++++ subversion-1.4.6/subversion/libsvn_ra_dav/session.c
+@@ -575,7 +575,11 @@ typedef struct neonprogress_baton_t
  } neonprogress_baton_t;
  
  static void
diff --git a/dev-util/subversion/files/subversion-apr_cppflags.patch b/dev-util/subversion/files/subversion-apr_cppflags.patch
index 1c24d8ea9664..c46a2511e59d 100644
--- a/dev-util/subversion/files/subversion-apr_cppflags.patch
+++ b/dev-util/subversion/files/subversion-apr_cppflags.patch
@@ -1,6 +1,8 @@
---- subversion-1.3.1/build/ac-macros/apr.m4	2004-11-24 00:18:18.000000000 +0100
-+++ subversion-1.3.1/build/ac-macros/apr.m4.new	2006-04-16 17:57:36.214707250 +0200
-@@ -59,7 +59,7 @@
+Index: subversion-1.4.6/build/ac-macros/apr.m4
+===================================================================
+--- subversion-1.4.6.orig/build/ac-macros/apr.m4
++++ subversion-1.4.6/build/ac-macros/apr.m4
+@@ -64,7 +64,7 @@ AC_DEFUN(SVN_LIB_APR,
      AC_MSG_ERROR([apr-config --ldflags failed])
    fi
  
diff --git a/dev-util/subversion/files/subversion-hotbackup-config.patch b/dev-util/subversion/files/subversion-hotbackup-config.patch
index ca9380f1aba5..b10b7d9fb194 100644
--- a/dev-util/subversion/files/subversion-hotbackup-config.patch
+++ b/dev-util/subversion/files/subversion-hotbackup-config.patch
@@ -1,6 +1,8 @@
---- tools/backup/hot-backup.py.in.orig	2003-12-16 17:41:14.000000000 +0100
-+++ tools/backup/hot-backup.py.in	2005-07-06 10:44:55.000000000 +0200
-@@ -34,7 +34,14 @@
+Index: subversion-1.4.6/tools/backup/hot-backup.py.in
+===================================================================
+--- subversion-1.4.6.orig/tools/backup/hot-backup.py.in
++++ subversion-1.4.6/tools/backup/hot-backup.py.in
+@@ -34,7 +34,14 @@ svnlook = "@SVN_BINDIR@/svnlook"
  svnadmin = "@SVN_BINDIR@/svnadmin"
  
  # Number of backups to keep around (0 for "keep them all")
@@ -14,5 +16,5 @@
 +print 'Keeping up to', num_backups, 'around.'			
 +
  
- ######################################################################
- # Command line arguments
+ # Archive types/extensions
+ archive_map = {
diff --git a/dev-util/subversion/subversion-1.4.6-r2.ebuild b/dev-util/subversion/subversion-1.4.6-r2.ebuild
new file mode 100644
index 000000000000..3416cd78d1ec
--- /dev/null
+++ b/dev-util/subversion/subversion-1.4.6-r2.ebuild
@@ -0,0 +1,415 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6-r2.ebuild,v 1.1 2008/03/22 18:43:19 hollow Exp $
+
+inherit autotools bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+
+DESCRIPTION="A compelling replacement for CVS."
+HOMEPAGE="http://subversion.tigris.org/"
+SRC_URI="http://subversion.tigris.org/downloads/${P/_rc/-rc}.tar.bz2"
+
+LICENSE="Subversion"
+SLOT="0"
+IUSE="apache2 berkdb debug doc emacs extras java nls nowebdav perl python ruby svnserve vim-syntax"
+RESTRICT="test"
+
+COMMONDEPEND=">=dev-libs/apr-util-1.2.8
+			berkdb? ( =sys-libs/db-4* )
+			doc? ( app-doc/doxygen )
+			emacs? ( virtual/emacs )
+			nls? ( sys-devel/gettext )
+			!nowebdav? ( >=net-misc/neon-0.26.4 )
+			ruby? ( >=dev-lang/ruby-1.8.2 dev-lang/swig )
+			perl? ( >=dev-lang/perl-5.8.8 dev-lang/swig )
+			python? ( >=dev-lang/python-2.0 dev-lang/swig )"
+
+RDEPEND="${COMMONDEPEND}
+		java? ( >=virtual/jre-1.4 )
+		perl? ( dev-perl/URI )"
+
+DEPEND="${COMMONDEPEND}
+		java? ( >=virtual/jdk-1.4 )
+		>=sys-devel/autoconf-2.59"
+
+want_apache
+
+S="${WORKDIR}"/${P/_rc/-rc}
+
+# 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 berkdb ; then
+		if ! built_with_use 'dev-libs/apr-util' berkdb ; then
+			eerror "dev-libs/apr-util is missing USE=berkdb"
+			die "dev-libs/apr-util is missing USE=berkdb"
+		fi
+
+		if has_version '<dev-util/subversion-0.34.0' && [[ -z ${SVN_DUMPED} ]] ; then
+			echo
+			ewarn "Presently you have $(best_version dev-util/subversion) installed."
+			ewarn "Subversion has changed the repository filesystem schema from 0.34.0."
+			ewarn "So you MUST dump your repositories before upgrading."
+			ewarn
+			ewarn 'After doing so call emerge with SVN_DUMPED=1 emerge !*'
+			ewarn
+			ewarn "More details on dumping:"
+			ewarn "http://svn.collab.net/repos/svn/trunk/notes/repos_upgrade_HOWTO"
+			echo
+			die "Ensure that you dump your repository first"
+		fi
+	fi
+
+	java-pkg-opt-2_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# assure we don't use the included libs by accident
+	rm -Rf neon apr apr-util
+
+	epatch "${FILESDIR}"/subversion-1.4-db4.patch
+	epatch "${FILESDIR}"/subversion-1.1.1-perl-vendor.patch
+	epatch "${FILESDIR}"/subversion-hotbackup-config.patch
+	epatch "${FILESDIR}"/subversion-apr_cppflags.patch
+	epatch "${FILESDIR}"/subversion-1.4.3-debug-config.patch
+	epatch "${FILESDIR}"/subversion-1.4.6-neon-0.28.patch
+
+	sed -e 's/\(NEON_ALLOWED_LIST=.* 0.26.4\)"/\1 0.27.2 0.28.0 0.28.1"/' \
+		-i configure.in
+
+	sed -e "s:apr-config:apr-1-config:g" \
+		-e "s:apu-config:apu-1-config:g" \
+		-i build/ac-macros/{find_,}ap*
+
+	eautoreconf
+
+	sed -i -e 's,\(subversion/svnversion/svnversion.*\)\(>.*svn-revision.txt\),echo "exported" \2,' Makefile.in
+
+	elibtoolize
+
+	use emacs && cp "${FILESDIR}"/vc-svn.el "${S}"/contrib/client-side/vc-svn.el
+}
+
+src_compile() {
+	local myconf=
+
+	myconf="${myconf} $(use_enable java javahl)"
+	use java && myconf="${myconf} --without-jikes --with-jdk=${JAVA_HOME}"
+
+	if use python || use perl || use ruby ; then
+		myconf="${myconf} --with-swig"
+	else
+		myconf="${myconf} --without-swig"
+	fi
+
+	if use nowebdav ; then
+		myconf="${myconf} --without-neon"
+	else
+		myconf="${myconf} --with-neon=/usr"
+	fi
+
+	append-flags $(/usr/bin/apr-1-config --cppflags)
+
+	econf ${myconf} \
+		--with-apr=/usr/bin/apr-1-config \
+		--with-apr-util=/usr/bin/apu-1-config \
+		$(use_with apache2 apxs ${APXS}) \
+		$(use_with berkdb berkeley-db) \
+		$(use_enable debug maintainer-mode) \
+		$(use_enable nls) \
+		--disable-experimental-libtool \
+		--disable-mod-activation \
+		|| die "econf failed"
+
+	# Respect the user LDFLAGS
+	export SWIG_LDFLAGS="${LDFLAGS}"
+
+	# Build subversion, but do it in a way that is safe for parallel builds.
+	# Also apparently the included apr has a libtool that doesn't like -L flags.
+	# So not specifying it at all when not building apache modules and only
+	# specify it for internal parts otherwise.
+	( emake external-all && emake LT_LDFLAGS="-L${D}/usr/$(get_libdir)" local-all ) || die "Compilation of ${PN} failed"
+
+	if use python ; then
+		# Building fails without the apache apr-util as includes are wrong.
+		emake swig-py || die "Compilation of ${PN} Python bindings failed"
+	fi
+
+	if use perl ; then
+		# Work around a buggy Makefile.PL, bug 64634
+		mkdir -p subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc}
+		emake -j1 swig-pl || die "Compilation of ${PN} Perl bindings failed"
+	fi
+
+	if use ruby ; then
+		emake swig-rb || die "Compilation of ${PN} Ruby bindings failed"
+	fi
+
+	if use java ; then
+		# ensure that the destination dir exists, else some compilation fails
+		mkdir -p "${S}"/subversion/bindings/java/javahl/classes
+		# Compile javahl
+		make JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl || die "make javahl failed"
+	fi
+
+	if use emacs ; then
+		einfo "Compiling emacs support"
+		elisp-compile "${S}"/contrib/client-side/psvn/psvn.el || die "emacs modules failed"
+		elisp-compile "${S}"/contrib/client-side/vc-svn.el || die "emacs modules failed"
+		elisp-compile "${S}"/doc/svn-doc.el || die "emacs modules failed"
+		elisp-compile "${S}"/doc/tools/svnbook.el || die "emacs modules failed"
+	fi
+
+	if use doc ; then
+		doxygen doc/doxygen.conf || die "doxygen failed"
+	fi
+}
+
+src_install () {
+	python_version
+	PYTHON_DIR=/usr/$(get_libdir)/python${PYVER}
+
+	make DESTDIR="${D}" install || die "Installation of ${PN} failed"
+
+	if use python ; then
+		make DESTDIR="${D}" DISTUTIL_PARAM="--prefix=${D}" LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" install-swig-py \
+			|| die "Installation of ${PN} 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 -Rf "${D}"/usr/$(get_libdir)/svn-python
+	fi
+
+	if use perl ; then
+		make DESTDIR="${D}" install-swig-pl || die "Installation of ${PN} Perl bindings failed"
+		fixlocalpod
+	fi
+
+	if use ruby ; then
+		make DESTDIR="${D}" install-swig-rb || die "Installation of ${PN} Ruby bindings failed"
+	fi
+
+	if use java ; then
+		make DESTDIR="${D}" install-javahl || die "make install-javahl failed"
+		java-pkg_regso "${D}"/usr/$(get_libdir)/libsvnjavahl*.so
+		java-pkg_dojar "${D}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
+		rm -Rf "${D}"/usr/$(get_libdir)/svn-javahl/*.jar
+	fi
+
+	# Install apache2 module config
+	if use apache2 ; then
+		MOD="${APACHE_MODULESDIR/${APACHE_BASEDIR}\//}"
+		dodir "${APACHE_MODULES_CONFDIR}"
+		cat <<EOF >"${D}/${APACHE_MODULES_CONFDIR}"/47_mod_dav_svn.conf
+<IfDefine SVN>
+	<IfModule !mod_dav_svn.c>
+		LoadModule dav_svn_module	${MOD}/mod_dav_svn.so
+	</IfModule>
+	<IfDefine SVN_AUTHZ>
+		<IfModule !mod_authz_svn.c>
+			LoadModule authz_svn_module	${MOD}/mod_authz_svn.so
+		</IfModule>
+	</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
+
+	# Bug 43179 - Install bash-completion if user wishes
+	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
+
+	# The svn_load_dirs script is installed by Debian and looks like a good
+	# candidate for us to install as well
+	if use perl ; then
+		newbin contrib/client-side/svn_load_dirs.pl svn-load-dirs
+	fi
+	rm -f contrib/client-side/svn_load_dirs.pl
+
+	# Install svnserve init-script and xinet.d snippet, bug 43245
+	if use svnserve; then
+		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
+	fi
+
+	# Install documentation
+	dodoc BUGS CHANGES COMMITTERS HACKING INSTALL README TRANSLATING
+	dodoc tools/xslt/svnindex.{css,xsl}
+	rm -fr tools/xslt
+
+	if use doc ; then
+		dohtml doc/doxygen/html/*
+		cp -R notes "${D}usr/share/doc/${PF}"
+		ecompressdir "/usr/share/doc/${PF}/notes"
+	fi
+
+	# Install Vim syntax files.
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins contrib/client-side/svn.vim
+	fi
+	rm -f contrib/client-side/svn.vim
+
+	# Install emacs lisps
+	if use emacs ; then
+		elisp-install ${PN} contrib/client-side/psvn/psvn.el*
+		elisp-install ${PN}/compat contrib/client-side/vc-svn.el*
+		elisp-install ${PN} doc/svn-doc.el*
+		elisp-install ${PN} doc/tools/svnbook.el*
+		touch "${D}${SITELISP}/${PN}/compat/.nosearch"
+
+		elisp-site-file-install "${FILESDIR}"/70svn-gentoo.el
+	fi
+	rm -fr contrib/client-side/psvn/
+	rm -f contrib/client-side/vc-svn.el*
+
+	# Install extra files
+	if use extras ; then
+		find contrib tools '(' -name "*.bat" -o -name "*.in" ')' -print0 | xargs -0 rm -f
+		rm -fr tools/{dev,po}
+		dodir "/usr/share/${PN}"
+		cp -R contrib tools "${D}usr/share/${PN}"
+	fi
+}
+
+pkg_preinst() {
+	# Compare versions of Berkeley DB.
+	if use berkdb && [[ -f "${ROOT}usr/bin/svn" ]] ; then
+		OLD_BDB_VERSION="$(scanelf -qn "${ROOT}usr/lib/libsvn_subr-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		NEW_BDB_VERSION="$(scanelf -qn "${D}usr/lib/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
+
+	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
+	if use svnserve; then
+		elog " - svnserve daemon: "
+		elog "   1. edit /etc/conf.d/svnserve"
+		elog "   2. start daemon: /etc/init.d/svnserve start"
+		elog "   3. make persistent: rc-update add svnserve default"
+		elog
+		elog " - svnserve via xinetd:"
+		elog "   1. edit /etc/xinetd.d/svnserve (remove disable line)"
+		elog "   2. restart xinetd.d: /etc/init.d/xinetd restart"
+		elog
+	fi
+	elog " - svn over ssh:"
+	elog "   1. Fix the repository permissions:"
+	elog "        groupadd svnusers"
+	elog "        chown -R root:svnusers ${SVN_REPOS_LOC}/repos/"
+	elog "        chmod -R g-w ${SVN_REPOS_LOC}/repos"
+	elog "        chmod -R g+rw ${SVN_REPOS_LOC}/repos/db"
+	elog "        chmod -R g+rw ${SVN_REPOS_LOC}/repos/locks"
+	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 002"
+	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
+	fi
+
+	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_NUM_BACKUPS=2' >> /etc/env.d/80subversion"
+	elog
+
+	if [[ -n "${CHANGED_BDB_VERSION}" ]]; then
+		ewarn "You upgraded from an older version of Berkely 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
+}
+
+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 ..."
+		if use svnserve; then
+			SVNSERVE_USER="$(. ${ROOT}etc/conf.d/svnserve ; echo ${SVNSERVE_USER})"
+			SVNSERVE_GROUP="$(. ${ROOT}etc/conf.d/svnserve ; echo ${SVNSERVE_GROUP})"
+		fi
+		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 755 "${ROOT}${SVN_REPOS_LOC}/repos"
+	fi
+}