Version bump. Remove older versions.

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

15 files changed, 51 insertions, 1504 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index c7530d81e918..a9d14bf7df5b 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,20 @@
 # 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.364 2009/04/05 11:28:00 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.365 2009/04/09 19:24:23 arfrever Exp $
+
+*subversion-1.6.1 (09 Apr 2009)
+
+  09 Apr 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  -files/subversion-1.3.1-neon-config.patch,
+  -files/subversion-1.4.3-debug-config.patch,
+  -files/subversion-1.4-db4.patch, -files/subversion-1.4.6-neon-0.28.patch,
+  files/70svn-gentoo.el, -files/subversion-1.1.1-perl-vendor.patch,
+  -files/subversion-apr_cppflags.patch,
+  -files/subversion-hotbackup-config.patch, metadata.xml,
+  -subversion-1.4.6.ebuild, -subversion-1.4.6-r2.ebuild,
+  -subversion-1.5.4.ebuild, -subversion-1.6.0.ebuild,
+  +subversion-1.6.1.ebuild:
+  Version bump. Remove older versions.
 
   05 Apr 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   subversion-1.6.0-r1.ebuild:
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 4d5b163fcff4..07828bdcdd3b 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,32 +1,21 @@
 AUX 1.5.0/70svn-gentoo.el 443 RMD160 300189eea80dfefa0f2a8479f67d255b39fd2adb SHA1 245b5ed611755276016bc76de2eabdc117e2c511 SHA256 23aa9effa5aea7ae73d14ae4df1a9269135137a5e483b4ff2a501dc130d7d1be
 AUX 1.5.0/80subversion-extras 62 RMD160 c334b15a86eaf19129afa5b62558dd47504a4e3d SHA1 ba05e978e7ff7b047ec99225e4d932036c340d26 SHA256 758d07cf161fff5e0afef5791dca641d3af58192ad1e4874c5f5c2c285c1149d
 AUX 1.5.0/disable-unneeded-linking.patch 2409 RMD160 0d7c34cc83eff7d08369128762ed714fabcd1dde SHA1 92b80f6cb30fe569f79368aea66027a6da022c53 SHA256 2ef8fcd9fabfd1a71bdd50e1156cb9d421a7008fccd73b7ae3536e9a30886231
-AUX 70svn-gentoo.el 339 RMD160 326d564fa56884a772eb8a5a71c6771b1427207a SHA1 36f45fbf1e9907f66a2ba1fca7adc3f2ff8407f0 SHA256 b66bb629f760018b2761d6d255220a723336e5958acc09b4c78a354986c2ecd1
-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 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 70svn-gentoo.el 443 RMD160 300189eea80dfefa0f2a8479f67d255b39fd2adb SHA1 245b5ed611755276016bc76de2eabdc117e2c511 SHA256 23aa9effa5aea7ae73d14ae4df1a9269135137a5e483b4ff2a501dc130d7d1be
 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 7027 RMD160 79591ebd4041bafe0aa1a345620ed42ee5b14e83 SHA1 8ba2ab266bbd9e1093c93390bd15747334e65983 SHA256 13943e51df7d6003fbb35f4f616754f6ee5555853b8021df06e96bfc17490b2f
-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
 AUX svnserve.xinetd 332 RMD160 c2fc4eb02da7e7405756fce650b8897f0a9da7f7 SHA1 d7d478fc257a40626888f9b12ee218df55dac570 SHA256 267f30c78ef6428aeeb97d3c64c06b9acfba4bc624766fc3c6a6d2c4133799a2
 AUX vc-svn.el 16847 RMD160 8665b9a34c8fd9acae40e18aac33026aff3a39d7 SHA1 4d1a5a9331ff96e943244a6d5538e4f0abeac9e7 SHA256 b4979d5df9fba02dbc8ad71d813229222e95ee1e8e89dec3060611d2d6be87aa
-DIST subversion-1.4.6.tar.bz2 4680316 RMD160 ae63877b5d0eeb1c4f28c4388f97897efde7244c SHA1 a9c941e2309744f6a2986200698b60da057a7527 SHA256 6c480c3493b25c4b73fa62d5fef2f8dd40dde1eb1294c53d3495d864230fc124
-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
+DIST subversion-1.6.1.tar.bz2 5462507 RMD160 b3cc8e6cf46c8e4ad4adbee6e3dec186ae790257 SHA1 de01efed25505d689c369a67fbf9b2d2f02e4795 SHA256 cdd4a7a4e2c6e67967b99fe7857a409b2ff5e57126214fdc0f6d835ff789e6ca
 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
 EBUILD subversion-1.6.0-r1.ebuild 17410 RMD160 deda83376904c678d8207ef364d352d0ee40155a SHA1 41db3fef36877a3bb4ef88bd2a6a7ead877535d5 SHA256 4c613a5f61bd3487cb83f60c0f5698ced34a6d07f1ec3df5e67494f1bef68845
-EBUILD subversion-1.6.0.ebuild 17492 RMD160 e77d25b10611ce6a426b165116348da4f2101dec SHA1 4750f9902a84cdd741ac5fff3e957ff333ade148 SHA256 b89c6405cba07a2f0364d6194f1211bc9daecbab36c9a3ce1e0a856ada1cd289
-MISC ChangeLog 60789 RMD160 2d860c157576c6850acb01ce3dd3be41eecdcfae SHA1 73ff689e65a247c99bfbe21164e09f22e25fbfd3 SHA256 db0f8374cdb0e35904a9e939526541e448da9a0a52125cf4ea1b740a0c04e48b
-MISC metadata.xml 930 RMD160 944f7e4d738928569b152bf4830146a8289b0c96 SHA1 2dbf910b5d4dfbd7bf47c35d29c20982a98a3f1c SHA256 784c7e9128e436a1f5ccb68b239f001e50941c37fbac80f4dd3c24bf3741407a
+EBUILD subversion-1.6.1.ebuild 16982 RMD160 ac1f15ae4b732ba8175948296303e43f6f815bc1 SHA1 002dd79626b38ccbf5272a2d0bfd877409d4672b SHA256 be7d9903d8e0830f5a59df797a902e2b9285ad30e9c3d36e29532a857ab4cb6f
+MISC ChangeLog 61407 RMD160 af525de1c8d4b90250ca0e813c02a29a365e5309 SHA1 b39a23139c6880b9f79cae579e96b40515655cf0 SHA256 eb21e2b54f5206802123cca6c42241a98890efd1de641f4758c9c089dd229477
+MISC metadata.xml 794 RMD160 6e8968481ac256000ec54f71bac21c7b4cbde1cc SHA1 c753273c54c52d52187cb886e35dc08726f1b97e SHA256 3d7a28065aaf0e28837de71ccde29de53a074b5b3ede715c1b412cf5a43aaeac
diff --git a/dev-util/subversion/files/70svn-gentoo.el b/dev-util/subversion/files/70svn-gentoo.el
index 60ee7128d02f..e5721e2480c1 100644
--- a/dev-util/subversion/files/70svn-gentoo.el
+++ b/dev-util/subversion/files/70svn-gentoo.el
@@ -7,5 +7,7 @@
 (add-to-list 'vc-handled-backends 'SVN)
 
 (defalias 'svn-examine 'svn-status)
+(autoload 'svn-status "dsvn" "Run `svn status'." t)
+(autoload 'svn-update "dsvn" "Run `svn update'." t)
 (autoload 'svn-status "psvn"
   "Examine the status of Subversion working copy in directory DIR." t)
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
deleted file mode 100644
index ed8bdded26ea..000000000000
--- a/dev-util/subversion/files/subversion-1.1.1-perl-vendor.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-This patch fixes bug 66712 by installing the perl bindings in vendor
-instead of site.  The INSTALLDIRS bit is stolen from perl-module.eclass
-
-11 Nov 2004 agriffis
-
-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 = 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.3.1-neon-config.patch b/dev-util/subversion/files/subversion-1.3.1-neon-config.patch
deleted file mode 100644
index b164729a1a2e..000000000000
--- a/dev-util/subversion/files/subversion-1.3.1-neon-config.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- subversion-1.3.0/build/ac-macros/neon.m4.orig	2006-02-27 16:13:32.000000000 +0100
-+++ subversion-1.3.0/build/ac-macros/neon.m4	2006-02-27 16:19:34.000000000 +0100
-@@ -142,7 +142,7 @@
-       if test -z $svn_allowed_neon_on_system; then
-         echo "You have neon version $NEON_VERSION,"
-         echo "but Subversion needs neon $NEON_LATEST_WORKING_VER."
--        SVN_DOWNLOAD_NEON()
-+        SVN_DOWNLOAD_NEONFAIL()
-       fi
- 
-     else
-@@ -177,3 +177,23 @@
-   AC_MSG_RESULT([no suitable neon found])
-   svn_lib_neon="no"
- ])
-+
-+dnl SVN_DOWNLOAD_NEONFAIL()
-+dnl no neon found, print out a message telling the user what to do
-+AC_DEFUN(SVN_DOWNLOAD_NEONFAIL,
-+[
-+  echo ""
-+  echo "An appropriate version of neon could not be found, so libsvn_ra_dav"
-+  echo "will not be built.  If you want to build libsvn_ra_dav, please either"
-+  echo "install neon ${NEON_LATEST_WORKING_VER} on this system"
-+  echo ""
-+  echo "or"
-+  echo ""
-+  echo "get neon ${NEON_LATEST_WORKING_VER} from:"
-+  echo "    ${NEON_URL}"
-+  echo "unpack the archive using tar/gunzip and rename the resulting"
-+  echo "directory from ./neon-${NEON_LATEST_WORKING_VER}/ to ./neon/"
-+  echo ""
-+  AC_MSG_FAILURE([no suitable neon found])
-+  svn_lib_neon="no"
-+])
diff --git a/dev-util/subversion/files/subversion-1.4-db4.patch b/dev-util/subversion/files/subversion-1.4-db4.patch
deleted file mode 100644
index cfaaefa8a842..000000000000
--- a/dev-util/subversion/files/subversion-1.4-db4.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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])
- 
- 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
deleted file mode 100644
index 94fb19438906..000000000000
--- a/dev-util/subversion/files/subversion-1.4.3-debug-config.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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],
--	       [Turn on debugging and compile time warnings]),
-+	       [(gentoo) disabled, just observe CFLAGS]),
- [
-     if test "$enableval" = "yes" ; then
-       enable_debugging="yes"
-@@ -441,17 +441,6 @@ AC_HELP_STRING([--enable-debug],
-       enable_debugging="no"
-     fi
- ])
--if test "$enable_debugging" = "yes" ; then
--  dnl At the moment, we don't want optimization, because we're
--  dnl debugging.
--  dnl ### actually, debugging should be fine with the default -O2
--  CFLAGS=["`echo $CFLAGS' ' | sed -e 's/-O[^ ]* //g'`"]
--else
--  if test "$enable_debugging" = "no" ; then
--    CFLAGS=["`echo $CFLAGS' ' | sed -e 's/-g[0-9] //g' | sed -e 's/-g//g'`"]
--  fi
--fi
--
- 
- AC_ARG_WITH(editor,
- AC_HELP_STRING([--with-editor=PATH],
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
deleted file mode 100644
index 7dc23c576de0..000000000000
--- a/dev-util/subversion/files/subversion-1.4.6-neon-0.28.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-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])
- 
--      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56]]\.'`" ; then
-+      if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[5-8]\.'`"] ; then
-         AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
-                            [Define to 1 if you have Neon 0.25 or later.])
-       fi
--      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then
-+      if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[6-8]\.'`"] ; then
-         AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1],
-                            [Define to 1 if you have Neon 0.26 or later.])
-       fi
-+      if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[7-8]\.'`"] ; then
-+        AC_DEFINE_UNQUOTED([SVN_NEON_0_27], [1],
-+                           [Define to 1 if you have Neon 0.27 or later.])
-+      fi
- 
-       for svn_allowed_neon in $NEON_ALLOWED_LIST; do
-         if test "$NEON_VERSION" = "$svn_allowed_neon" ||
-@@ -127,14 +131,18 @@ AC_DEFUN(SVN_NEON_CONFIG,
-       NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
-       AC_MSG_RESULT([$NEON_VERSION])
- 
--      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.2[[56]]\.'`" ; then
-+      if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[5-8]\.'`"] ; then
-         AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
-                            [Define to 1 if you have Neon 0.25 or later.])
-       fi
--      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then
-+      if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[6-8]\.'`"] ; then
-         AC_DEFINE_UNQUOTED([SVN_NEON_0_26], [1],
-                            [Define to 1 if you have Neon 0.26 or later.])
-       fi
-+      if test -n ["`echo "$NEON_VERSION" | grep '^0\.2[7-8]\.'`"] ; then
-+        AC_DEFINE_UNQUOTED([SVN_NEON_0_27], [1],
-+                           [Define to 1 if you have Neon 0.27 or later.])
-+      fi
- 
-       for svn_allowed_neon in $NEON_ALLOWED_LIST; do
-         if test "$NEON_VERSION" = "$svn_allowed_neon" ||
-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
-+#ifdef SVN_NEON_0_27
-+ra_dav_neonprogress(void *baton, ne_off_t progress, ne_off_t total)
-+#else
- ra_dav_neonprogress(void *baton, off_t progress, off_t total)
-+#endif /* SVN_NEON_0_27 */
- {
-   const neonprogress_baton_t *neonprogress_baton = baton;
-   if (neonprogress_baton->progress_func)
diff --git a/dev-util/subversion/files/subversion-apr_cppflags.patch b/dev-util/subversion/files/subversion-apr_cppflags.patch
deleted file mode 100644
index c46a2511e59d..000000000000
--- a/dev-util/subversion/files/subversion-apr_cppflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
- 
--  SVN_APR_INCLUDES="`$apr_config --includes`"
-+  SVN_APR_INCLUDES="`$apr_config --includes --cppflags`"
-   if test $? -ne 0; then
-     AC_MSG_ERROR([apr-config --includes failed])
-   fi
diff --git a/dev-util/subversion/files/subversion-hotbackup-config.patch b/dev-util/subversion/files/subversion-hotbackup-config.patch
deleted file mode 100644
index b10b7d9fb194..000000000000
--- a/dev-util/subversion/files/subversion-hotbackup-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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")
--num_backups = 64
-+# Configurable in /etc/env.d/80hotbackup
-+envvar_hb_num='SVN_HOTBACKUP_NUM_BACKUPS'
-+if os.environ.has_key(envvar_hb_num):
-+	num_backups = int(os.environ[envvar_hb_num])
-+else:
-+	num_backups = 64
-+print 'Keeping up to', num_backups, 'around.'			
-+
- 
- # Archive types/extensions
- archive_map = {
diff --git a/dev-util/subversion/metadata.xml b/dev-util/subversion/metadata.xml
index 7beee7aa1788..2a6cb54ac8a9 100644
--- a/dev-util/subversion/metadata.xml
+++ b/dev-util/subversion/metadata.xml
@@ -11,8 +11,6 @@
     <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>
-    <flag name="svnserve">Install scripts for svnserve</flag>
     <flag name="webdav-neon">Enable WebDAV support using <pkg>net-misc/neon</pkg></flag>
     <flag name="webdav-serf">Enable WebDAV support using <pkg>net-libs/serf</pkg></flag>
   </use>
diff --git a/dev-util/subversion/subversion-1.4.6-r2.ebuild b/dev-util/subversion/subversion-1.4.6-r2.ebuild
deleted file mode 100644
index ab0a67a4c43a..000000000000
--- a/dev-util/subversion/subversion-1.4.6-r2.ebuild
+++ /dev/null
@@ -1,418 +0,0 @@
-# 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.4 2008/06/01 10:16:08 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* )
-			emacs? ( virtual/emacs )
-			nls? ( sys-devel/gettext )
-			!nowebdav? ( >=net-misc/neon-0.26.4 )
-			ruby? ( >=dev-lang/ruby-1.8.2 )
-			perl? ( >=dev-lang/perl-5.8.8 )
-			python? ( >=dev-lang/python-2.0 )"
-
-RDEPEND="${COMMONDEPEND}
-		java? ( >=virtual/jre-1.4 )
-		perl? ( dev-perl/URI )"
-
-DEPEND="${COMMONDEPEND}
-		>=sys-devel/autoconf-2.59
-		doc? ( app-doc/doxygen )
-		java? ( >=virtual/jdk-1.4 )
-		ruby? ( dev-lang/swig )
-		perl? ( dev-lang/swig )
-		python? ( dev-lang/swig )"
-
-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 0.28.2"/' \
-		-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
-}
diff --git a/dev-util/subversion/subversion-1.4.6.ebuild b/dev-util/subversion/subversion-1.4.6.ebuild
deleted file mode 100644
index b59d7e2cb0af..000000000000
--- a/dev-util/subversion/subversion-1.4.6.ebuild
+++ /dev/null
@@ -1,419 +0,0 @@
-# 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.ebuild,v 1.14 2008/11/04 09:16:40 vapier Exp $
-
-inherit 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* )
-			emacs? ( virtual/emacs )
-			nls? ( sys-devel/gettext )
-			!nowebdav? ( =net-misc/neon-0.26* )
-			ruby? ( >=dev-lang/ruby-1.8.2 )
-			perl? ( >=dev-lang/perl-5.8.8 )
-			python? ( >=dev-lang/python-2.0 )"
-
-RDEPEND="${COMMONDEPEND}
-		java? ( >=virtual/jre-1.4 )
-		perl? ( dev-perl/URI )"
-
-DEPEND="${COMMONDEPEND}
-		>=sys-devel/autoconf-2.59
-		doc? ( app-doc/doxygen )
-		java? ( >=virtual/jdk-1.4 )
-		ruby? ( dev-lang/swig )
-		perl? ( dev-lang/swig )
-		python? ( dev-lang/swig )"
-
-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-1.3.1-neon-config.patch
-	epatch "${FILESDIR}"/subversion-apr_cppflags.patch
-	epatch "${FILESDIR}"/subversion-1.4.3-debug-config.patch
-
-	sed -e 's/\(NEON_ALLOWED_LIST=.* 0.26.2\)"/\1 0.26.3 0.26.4"/' \
-		-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*
-
-	export WANT_AUTOCONF=2.5
-	autoconf
-
-	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
-}
diff --git a/dev-util/subversion/subversion-1.5.4.ebuild b/dev-util/subversion/subversion-1.5.4.ebuild
deleted file mode 100644
index 7396b2d0959b..000000000000
--- a/dev-util/subversion/subversion-1.5.4.ebuild
+++ /dev/null
@@ -1,412 +0,0 @@
-# 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.5.4.ebuild,v 1.12 2009/01/15 08:04:40 hollow Exp $
-
-EAPI="1"
-WANT_AUTOMAKE="none"
-
-inherit autotools bash-completion confutils 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="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="apache2 berkdb debug doc +dso emacs extras java nls perl python ruby sasl vim-syntax +webdav-neon webdav-serf"
-RESTRICT="test"
-
-CDEPEND=">=dev-libs/apr-1.2.8
-	>=dev-libs/apr-util-1.2.8
-	dev-libs/expat
-	sys-libs/zlib
-	berkdb? ( =sys-libs/db-4* )
-	emacs? ( virtual/emacs )
-	ruby? ( >=dev-lang/ruby-1.8.2 )
-	sasl? ( dev-libs/cyrus-sasl )
-	webdav-neon? ( >=net-misc/neon-0.28 )
-	webdav-serf? ( net-libs/serf )"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.5 )
-	nls? ( virtual/libintl )
-	perl? ( dev-perl/URI )"
-
-DEPEND="${CDEPEND}
-	doc? ( app-doc/doxygen )
-	java? ( >=virtual/jdk-1.5 )
-	nls? ( sys-devel/gettext )"
-
-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() {
-	confutils_use_depend_built_with_all berkdb dev-libs/apr-util berkdb
-	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}"/1.5.0/disable-unneeded-linking.patch
-
-	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 ${myconf} \
-		$(use_with apache2 apxs "${APXS}") \
-		$(use_with berkdb berkeley-db) \
-		$(use_enable dso runtime-module-search) \
-		$(use_enable java javahl) \
-		$(use_with java jdk "${JAVA_HOME}") \
-		$(use_enable nls) \
-		$(use_with sasl) \
-		$(use_with webdav-neon neon /usr) \
-		$(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
-
-	emake local-all || die "Building of core Subversion failed"
-
-	if use python; then
-		emake swig-py || die "Building of Subversion Python bindings failed"
-	fi
-
-	if use perl; then
-		emake -j1 swig-pl || die "Building of Subversion Perl bindings failed"
-	fi
-
-	if use ruby; then
-		emake swig-rb || die "Building of Subversion Ruby bindings failed"
-	fi
-
-	if use java; then
-		make JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl \
-			|| die "Building of Subversion JavaHL library failed"
-	fi
-
-	if use emacs; then
-		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
-		emake contrib || die "Building of contrib failed"
-		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() {
-	python_version
-	PYTHON_DIR=/usr/$(get_libdir)/python${PYVER}
-
-	emake -j1 DESTDIR="${D}" local-install || die "Installation of core of Subversion failed"
-
-	if use python; then
-		emake -j1 DESTDIR="${D}" DISTUTIL_PARAM="--prefix=${D}" LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" install-swig-py \
-			|| die "Installation of Subversion 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
-		emake -j1 DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl || die "Installation of Subversion Perl bindings failed"
-		fixlocalpod
-	fi
-
-	if use ruby; then
-		emake -j1 DESTDIR="${D}" install-swig-rb || die "Installation of Subversion Ruby bindings failed"
-	fi
-
-	if use java; then
-		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 -Rf "${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
-		newbin contrib/client-side/svn_load_dirs/svn_load_dirs.pl svn-load-dirs
-	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
-		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,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
-		dohtml doc/doxygen/html/*
-
-		insinto /usr/share/doc/${PF}
-		doins -r notes
-		ecompressdir /usr/share/doc/${PF}/notes
-
-		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
-
-	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
-
-	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
-}
-
-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
-}
diff --git a/dev-util/subversion/subversion-1.6.0.ebuild b/dev-util/subversion/subversion-1.6.1.ebuild
index a5e103f261d6..350e434e376a 100644
--- a/dev-util/subversion/subversion-1.6.0.ebuild
+++ b/dev-util/subversion/subversion-1.6.1.ebuild
@@ -1,6 +1,6 @@
 # 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.6 2009/04/04 13:45:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.6.1.ebuild,v 1.1 2009/04/09 19:24:23 arfrever Exp $
 
 EAPI="1"
 
@@ -14,7 +14,7 @@ SRC_URI="http://subversion.tigris.org/downloads/${P/_/-}.tar.bz2"
 
 LICENSE="Subversion"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
 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"
 
@@ -26,7 +26,7 @@ CDEPEND=">=dev-db/sqlite-3.4
 	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* )
+	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 )
@@ -34,6 +34,7 @@ CDEPEND=">=dev-db/sqlite-3.4
 
 RDEPEND="${CDEPEND}
 	java? ( >=virtual/jre-1.5 )
+	kde? ( kde-base/kwalletd )
 	nls? ( virtual/libintl )
 	perl? ( dev-perl/URI )"
 
@@ -60,6 +61,25 @@ pkg_setup() {
 		die "Enable \"nls\" USE flag"
 	fi
 
+	if use berkdb; then
+		einfo
+		if [[ -z "${SVN_BDB_VERSION}" ]]; then
+			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
+		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
+		einfo
+
+		local apu_bdb_version="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libaprutil-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
+		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
+
 	java-pkg-opt-2_pkg_setup
 
 	if ! use webdav-neon && ! use webdav-serf; then
@@ -71,7 +91,7 @@ pkg_setup() {
 		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 "    ${CATEGORY}/${PN} webdav-neon webdav-serf"
 		ewarn
 		ebeep
 	fi
@@ -87,16 +107,7 @@ 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
-
-	# https://svn.collab.net/viewvc/svn?view=revision&revision=36742
-	sed -e 's/$SVN_APRUTIL_INCLUDES $SVN_DB_INCLUDES/$SVN_DB_INCLUDES $SVN_APRUTIL_INCLUDES/' -i build/ac-macros/berkeley-db.m4
+	epatch "${FILESDIR}/${PN}-1.6.0-disable_linking_against_unneeded_libraries.patch"
 
 	sed -i \
 		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
@@ -119,24 +130,6 @@ src_compile() {
 		myconf="${myconf} --without-swig"
 	fi
 
-	if use berkdb; then
-		einfo
-		if [[ -z "${SVN_BDB_VERSION}" ]]; then
-			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
-		einfo "Using Berkeley DB ${SVN_BDB_VERSION}"
-		einfo
-
-		local apu_bdb_version="$(scanelf -nq "${ROOT}usr/$(get_libdir)/libaprutil-1.so.0" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		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 "Aborting to avoid possible run-time crashes."
-			die "Berkeley DB version mismatch"
-		fi
-	fi
-
 	econf --libdir="/usr/$(get_libdir)" \
 		${myconf} \
 		$(use_with apache2 apxs "${APXS}") \
@@ -176,7 +169,8 @@ src_compile() {
 		einfo
 		einfo "Building of Subversion SWIG Python bindings"
 		einfo
-		emake swig-py || die "Building of Subversion SWIG Python bindings failed"
+		emake swig_pydir="$(python_get_sitedir)/libsvn" swig_pydir_extra="$(python_get_sitedir)/svn" swig-py \
+			|| die "Building of Subversion SWIG Python bindings failed"
 	fi
 
 	if use perl; then
@@ -232,9 +226,6 @@ src_compile() {
 }
 
 src_install() {
-	python_version
-	PYTHON_DIR=/usr/$(get_libdir)/python${PYVER}
-
 	einfo
 	einfo "Installation of core of Subversion"
 	einfo
@@ -251,14 +242,8 @@ src_install() {
 		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 \
+		emake -j1 DESTDIR="${D}" swig_pydir="$(python_get_sitedir)/libsvn" swig_pydir_extra="$(python_get_sitedir)/svn" 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
@@ -352,7 +337,7 @@ EOF
 		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"
+		elisp-site-file-install "${FILESDIR}/70svn-gentoo.el" || die "Installation of Emacs site-init file failed"
 	fi
 	rm -fr contrib/client-side/emacs