version bump (fixes #128624, #203257 and maybe #199639, #200082); cleanup

Package-Manager: portage-2.1.4_rc11

10 files changed, 73 insertions, 498 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index f161e6928cda..0df025516bb1 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.284 2007/11/14 01:17:20 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.285 2007/12/28 12:59:30 hollow Exp $
+
+*subversion-1.4.6 (28 Dec 2007)
+
+  28 Dec 2007; Benedikt Böhm <hollow@gentoo.org>
+  -files/subversion-1.3.2-neon-0.26.patch,
+  -files/subversion-1.4.3-neon-0.26.3.patch, metadata.xml,
+  -subversion-1.3.2-r4.ebuild, -subversion-1.4.4-r4.ebuild,
+  +subversion-1.4.6.ebuild:
+  version bump (fixes #128624, #203257 and maybe #199639, #200082); cleanup
 
   14 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   subversion-1.4.5.ebuild:
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index af0cfb9334e4..92e49c7b0bdb 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -17,10 +17,6 @@ AUX subversion-1.3.1-neon-config.patch 1237 RMD160 ccf7449e030afe6ef6388c1215783
 MD5 c357b009b610db967d0df27d61cd3704 files/subversion-1.3.1-neon-config.patch 1237
 RMD160 ccf7449e030afe6ef6388c12157831d5f2d59d6b files/subversion-1.3.1-neon-config.patch 1237
 SHA256 6e0f152a8254b7e7c0b498ce011f1798d475b2acf18d779b4dfe0758de1f3049 files/subversion-1.3.1-neon-config.patch 1237
-AUX subversion-1.3.2-neon-0.26.patch 1983 RMD160 e5709e58868dddd4f0b23ee45511c64a3d7b564a SHA1 92bb0b805fce7d0d3c48cc6c646f1f631532dfa8 SHA256 51983fe1f4686be2692008aef6861988a146368deb5182e01b4957306a51ac01
-MD5 ab214523f5398a14ac5de1d2592cb0a8 files/subversion-1.3.2-neon-0.26.patch 1983
-RMD160 e5709e58868dddd4f0b23ee45511c64a3d7b564a files/subversion-1.3.2-neon-0.26.patch 1983
-SHA256 51983fe1f4686be2692008aef6861988a146368deb5182e01b4957306a51ac01 files/subversion-1.3.2-neon-0.26.patch 1983
 AUX subversion-1.4-db4.patch 570 RMD160 e07111ed95b08289b9e145dad7798430cb45e405 SHA1 7fc6c3dd48b5d018a9794973ecb085abdf262d89 SHA256 73f2915a8334c0ebd95abb3bc1239237c683f71662281b1a183b7885f075e236
 MD5 783cc1d1bbce7e8c5e4ae97a3384b23a files/subversion-1.4-db4.patch 570
 RMD160 e07111ed95b08289b9e145dad7798430cb45e405 files/subversion-1.4-db4.patch 570
@@ -29,10 +25,6 @@ AUX subversion-1.4.3-debug-config.patch 886 RMD160 0d95f3b50617469f1c5466b2e34d4
 MD5 5a3233a471e13f2926b3da7704e2d8fe files/subversion-1.4.3-debug-config.patch 886
 RMD160 0d95f3b50617469f1c5466b2e34d45ecdb1238a8 files/subversion-1.4.3-debug-config.patch 886
 SHA256 b84b31b7a49b79d68ad71feb186882da495e31cec0b8ff3f42b9f261c3e03448 files/subversion-1.4.3-debug-config.patch 886
-AUX subversion-1.4.3-neon-0.26.3.patch 605 RMD160 4cc8ffa588b796120486e272cc4611ed0db2f8cd SHA1 922a13064bfe0c57a6d6d6a54733f272426ea8fd SHA256 760041386bc6caca06e506af9b4df013ba052dcd101c024246c11d3946822395
-MD5 2dbd1b41f94c7e69616ae370e8b66246 files/subversion-1.4.3-neon-0.26.3.patch 605
-RMD160 4cc8ffa588b796120486e272cc4611ed0db2f8cd files/subversion-1.4.3-neon-0.26.3.patch 605
-SHA256 760041386bc6caca06e506af9b4df013ba052dcd101c024246c11d3946822395 files/subversion-1.4.3-neon-0.26.3.patch 605
 AUX subversion-apr_cppflags.patch 426 RMD160 245d52ce05da6652e5f5984f0e33aa51e534082a SHA1 13b975d3632d2a12667a731fe425bf5f21a09955 SHA256 0d7e52ce90cc806270ccb5e3c2b700fdb6d251a17001b91f08de5beab66295e6
 MD5 e7538c50c65c0ae5c7b0cfc7057f8620 files/subversion-apr_cppflags.patch 426
 RMD160 245d52ce05da6652e5f5984f0e33aa51e534082a files/subversion-apr_cppflags.patch 426
@@ -66,48 +58,41 @@ MD5 dc8ba46b50a61d868eb76f524c212381 files/vc-svn.el 16847
 RMD160 8665b9a34c8fd9acae40e18aac33026aff3a39d7 files/vc-svn.el 16847
 SHA256 b4979d5df9fba02dbc8ad71d813229222e95ee1e8e89dec3060611d2d6be87aa files/vc-svn.el 16847
 DIST subversion-1.3.2.tar.bz2 6834364 RMD160 dc9fbe683379ce25a62b91810eb5652ead19abcf SHA1 688ab178db1f6acb2ad3bd99f030402621f837b6 SHA256 805cb0ee894d2c219fe979dde98ccd56c06de6c3ca3986d87c80a2a2bcc08185
-DIST subversion-1.4.4.tar.bz2 4723349 RMD160 24ec3733d337206a3106be434c4505f5cc2e20ec SHA1 1ba850187b3cedb3265850acf32341b7dbe4f945 SHA256 91769f992e142eaeb5017e9ec95be52505a056ef05f93427868a3c0c89e2e966
 DIST subversion-1.4.5.tar.bz2 4722624 RMD160 159f3eac9168d856a19ffb235c5417757cd5a496 SHA1 acc80381cb670736ad626fee1eb04f36ba7e5fc8 SHA256 763b8c9c16c03adc3ad00ccf1b5b47a08b5ffe94e499d3c87bb02acbc1026b53
+DIST subversion-1.4.6.tar.bz2 4680316 RMD160 ae63877b5d0eeb1c4f28c4388f97897efde7244c SHA1 a9c941e2309744f6a2986200698b60da057a7527 SHA256 6c480c3493b25c4b73fa62d5fef2f8dd40dde1eb1294c53d3495d864230fc124
 EBUILD subversion-1.3.2-r3.ebuild 11680 RMD160 70b533487c9ee0a31564f5389e4614f70ce1c96d SHA1 139dc4bd5ee747bdbc1671c8bb8bd6b275af2ea9 SHA256 9686cf223afd6110c989ce123d09fbaa4c2aae2c559e3f15c9436b3080f5ff5e
 MD5 1f5e8a249f27ec9dc38bc01ea883eede subversion-1.3.2-r3.ebuild 11680
 RMD160 70b533487c9ee0a31564f5389e4614f70ce1c96d subversion-1.3.2-r3.ebuild 11680
 SHA256 9686cf223afd6110c989ce123d09fbaa4c2aae2c559e3f15c9436b3080f5ff5e subversion-1.3.2-r3.ebuild 11680
-EBUILD subversion-1.3.2-r4.ebuild 11942 RMD160 608f4aab30c9a33bd4fdb06a2bcb3ce61b129972 SHA1 7fc02da1cb5b2812d843072c2a9c86620fd32c03 SHA256 3c212917b5d222c479bbba024193b29640ff5db6204d13ca15e11f8d1dd87369
-MD5 ac696c78ebc4ea2f23e65f278ba38ea2 subversion-1.3.2-r4.ebuild 11942
-RMD160 608f4aab30c9a33bd4fdb06a2bcb3ce61b129972 subversion-1.3.2-r4.ebuild 11942
-SHA256 3c212917b5d222c479bbba024193b29640ff5db6204d13ca15e11f8d1dd87369 subversion-1.3.2-r4.ebuild 11942
-EBUILD subversion-1.4.4-r4.ebuild 13645 RMD160 66e371642bcf9e6b64df520a0354fdb095516825 SHA1 8caa2492f28d993d042d7a3ff7fcc9cf5cf385f4 SHA256 5b2e2cba4440914cff940e36ed6cb91485ab1c3d0b8e05b5d8a6d707e8782a8f
-MD5 d83d93c3c38641aebb196ff637641647 subversion-1.4.4-r4.ebuild 13645
-RMD160 66e371642bcf9e6b64df520a0354fdb095516825 subversion-1.4.4-r4.ebuild 13645
-SHA256 5b2e2cba4440914cff940e36ed6cb91485ab1c3d0b8e05b5d8a6d707e8782a8f subversion-1.4.4-r4.ebuild 13645
 EBUILD subversion-1.4.5.ebuild 13760 RMD160 ae4997e0037b07730856a30ba4f47145defdea93 SHA1 6607226c40d5f8beedb27852216b3ad013e54d5a SHA256 109b65ea224914defe936b8e8ac7ef73e09e3366db07ecf65ca406e575f64457
 MD5 48850c8b1b8ba70d4393b14b749a67d1 subversion-1.4.5.ebuild 13760
 RMD160 ae4997e0037b07730856a30ba4f47145defdea93 subversion-1.4.5.ebuild 13760
 SHA256 109b65ea224914defe936b8e8ac7ef73e09e3366db07ecf65ca406e575f64457 subversion-1.4.5.ebuild 13760
-MISC ChangeLog 49266 RMD160 fb7fca99c7ac15018ef027c3b39954bebc98a47c SHA1 d1acfb2cf43f7dc27960b625322e9e10815ccb1a SHA256 589a2c916ca8cdda09d6fdccf437d7bcb8d98386038d51efdc644536bebcc17b
-MD5 7be2fc49bab8c49072fba2090362690d ChangeLog 49266
-RMD160 fb7fca99c7ac15018ef027c3b39954bebc98a47c ChangeLog 49266
-SHA256 589a2c916ca8cdda09d6fdccf437d7bcb8d98386038d51efdc644536bebcc17b ChangeLog 49266
-MISC metadata.xml 224 RMD160 5da25d639360542842990baf18b1ae0f0837c0fd SHA1 e096d8a898bd3b957d86654e0e7fb835e2a6a0df SHA256 e6df82c1a36b5df70e15425e6059fb9f486fd31dc453404dfdd2f6b90b7f8aec
-MD5 9d26ecca44906061085842dba1505615 metadata.xml 224
-RMD160 5da25d639360542842990baf18b1ae0f0837c0fd metadata.xml 224
-SHA256 e6df82c1a36b5df70e15425e6059fb9f486fd31dc453404dfdd2f6b90b7f8aec metadata.xml 224
+EBUILD subversion-1.4.6.ebuild 13812 RMD160 07ed61d41fd9a1a87008ac1604a1e97f95daf860 SHA1 f8d65a0cc3755a0ec932d1626b86929ab957cd1a SHA256 58d213025f6f64e159b97931ab81ab023298424d57781685f4ba76153d89e3c3
+MD5 043c4d708ee2062e4d716813d412575c subversion-1.4.6.ebuild 13812
+RMD160 07ed61d41fd9a1a87008ac1604a1e97f95daf860 subversion-1.4.6.ebuild 13812
+SHA256 58d213025f6f64e159b97931ab81ab023298424d57781685f4ba76153d89e3c3 subversion-1.4.6.ebuild 13812
+MISC ChangeLog 49614 RMD160 cd52eb1c2cad8279fb3ff86d7bfa8c86f1fa0f51 SHA1 ce070aac7042845a8de342579e4fd48c9de0d6fb SHA256 426e45910511571dcccbb996c3c03bfe49ba88d2990abc72daf20befe2082298
+MD5 c24efdbc66751808a81c0c8cc91d4fbd ChangeLog 49614
+RMD160 cd52eb1c2cad8279fb3ff86d7bfa8c86f1fa0f51 ChangeLog 49614
+SHA256 426e45910511571dcccbb996c3c03bfe49ba88d2990abc72daf20befe2082298 ChangeLog 49614
+MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe
+MD5 5eede8f5b73ba3c19b1bee203033a5cf metadata.xml 160
+RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa metadata.xml 160
+SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe metadata.xml 160
 MD5 f451fb992815e387265f7dd7afb3ddb6 files/digest-subversion-1.3.2-r3 256
 RMD160 2f2fa8d1f158c558014773611365d6488f55ea09 files/digest-subversion-1.3.2-r3 256
 SHA256 b77de6fcac8e868c91fb08f21a08d8e45e26d50f7efa510c9940722746b37cc5 files/digest-subversion-1.3.2-r3 256
-MD5 f451fb992815e387265f7dd7afb3ddb6 files/digest-subversion-1.3.2-r4 256
-RMD160 2f2fa8d1f158c558014773611365d6488f55ea09 files/digest-subversion-1.3.2-r4 256
-SHA256 b77de6fcac8e868c91fb08f21a08d8e45e26d50f7efa510c9940722746b37cc5 files/digest-subversion-1.3.2-r4 256
-MD5 576f84ed7a5fe7a243604aa6c516d496 files/digest-subversion-1.4.4-r4 256
-RMD160 35c635369a31ed9e54e627d5bca04b2f1154c2ff files/digest-subversion-1.4.4-r4 256
-SHA256 affa1aa33296aa4c7537a386e05b71801ba31437fe10b59dbdab602193315d22 files/digest-subversion-1.4.4-r4 256
 MD5 e7355a55f2b59b15b619af9028926d28 files/digest-subversion-1.4.5 256
 RMD160 2ace6a489db60c1e9bf79ebc2a1f6a01fe5b1a7b files/digest-subversion-1.4.5 256
 SHA256 3418d0d2b6bc6288be20e298fca5b055fe162d92afa0933656713db45e775805 files/digest-subversion-1.4.5 256
+MD5 ef1dc4e473cc21a18323a66738d4a8ec files/digest-subversion-1.4.6 256
+RMD160 de1bd268a322c6b7833d341aaf6ed3857f34787d files/digest-subversion-1.4.6 256
+SHA256 e44b60f81aa4681befae8d05887ada22969bdf70c2c4d1096f1d5521a98c1221 files/digest-subversion-1.4.6 256
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHXsGEp/wUKkr7RBoRAgSLAJ9Mwk5IMQFVrJ5Hhno6futUmN5kmACeNgTF
-DqSXbw6FqOnKzvbQxeYgdgw=
-=x1aB
+iD8DBQFHdPM9mPFBzbX68WERAn2mAKCKQ63+WvZvSgzgo9/a/13CwEpo0QCeNeg0
+Bd82Che5nT+erQYKs7t9xGU=
+=pllO
 -----END PGP SIGNATURE-----
diff --git a/dev-util/subversion/files/digest-subversion-1.3.2-r4 b/dev-util/subversion/files/digest-subversion-1.3.2-r4
deleted file mode 100644
index 3cbcc285bd36..000000000000
--- a/dev-util/subversion/files/digest-subversion-1.3.2-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 34aaac35a8326eba1c8076ee9e93fb6c subversion-1.3.2.tar.bz2 6834364
-RMD160 dc9fbe683379ce25a62b91810eb5652ead19abcf subversion-1.3.2.tar.bz2 6834364
-SHA256 805cb0ee894d2c219fe979dde98ccd56c06de6c3ca3986d87c80a2a2bcc08185 subversion-1.3.2.tar.bz2 6834364
diff --git a/dev-util/subversion/files/digest-subversion-1.4.4-r4 b/dev-util/subversion/files/digest-subversion-1.4.4-r4
deleted file mode 100644
index e3c9fe8133a5..000000000000
--- a/dev-util/subversion/files/digest-subversion-1.4.4-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d4aa5aeb09acb3307841022d279ab895 subversion-1.4.4.tar.bz2 4723349
-RMD160 24ec3733d337206a3106be434c4505f5cc2e20ec subversion-1.4.4.tar.bz2 4723349
-SHA256 91769f992e142eaeb5017e9ec95be52505a056ef05f93427868a3c0c89e2e966 subversion-1.4.4.tar.bz2 4723349
diff --git a/dev-util/subversion/files/digest-subversion-1.4.6 b/dev-util/subversion/files/digest-subversion-1.4.6
new file mode 100644
index 000000000000..823b85871830
--- /dev/null
+++ b/dev-util/subversion/files/digest-subversion-1.4.6
@@ -0,0 +1,3 @@
+MD5 9c7cf517362c1c9332b610339e5cce6b subversion-1.4.6.tar.bz2 4680316
+RMD160 ae63877b5d0eeb1c4f28c4388f97897efde7244c subversion-1.4.6.tar.bz2 4680316
+SHA256 6c480c3493b25c4b73fa62d5fef2f8dd40dde1eb1294c53d3495d864230fc124 subversion-1.4.6.tar.bz2 4680316
diff --git a/dev-util/subversion/files/subversion-1.3.2-neon-0.26.patch b/dev-util/subversion/files/subversion-1.3.2-neon-0.26.patch
deleted file mode 100644
index 3efd014e7655..000000000000
--- a/dev-util/subversion/files/subversion-1.3.2-neon-0.26.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- subversion-1.3.1/build/ac-macros/neon.m4	2005-08-25 16:29:03.000000000 +0000
-+++ subversion-1.3.1/build/ac-macros/neon.m4	2006-04-04 09:08:13.506590250 +0000
-@@ -50,9 +50,10 @@
-       NEON_VERSION=`cat $abs_srcdir/neon/.version`
-       AC_MSG_RESULT([$NEON_VERSION])
- 
--      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then
-+      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" || \
-+         test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then
-         AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
--                           [Defined if have Neon 0.25.x instead of 0.24.7.])
-+                           [Defined if have Neon 0.25.x/0.26.x instead of 0.24.7.])
-       fi
- 
-       for svn_allowed_neon in $NEON_ALLOWED_LIST; do
-@@ -123,9 +123,10 @@
-       NEON_VERSION=`$neon_config --version | sed -e 's/^neon //'`
-       AC_MSG_RESULT([$NEON_VERSION])
- 
--      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" ; then
-+      if test -n "`echo \"$NEON_VERSION\" | grep '^0\.25\.'`" || \
-+         test -n "`echo \"$NEON_VERSION\" | grep '^0\.26\.'`" ; then
-         AC_DEFINE_UNQUOTED([SVN_NEON_0_25], [1],
--                           [Defined if have Neon 0.25.x instead of 0.24.7.])
-+                           [Defined if have Neon 0.25.x/0.26.x instead of 0.24.7.])
-       fi
- 
-       for svn_allowed_neon in $NEON_ALLOWED_LIST; do
---- subversion-1.3.1/configure.in	2006-01-29 00:04:18.000000000 +0000
-+++ subversion-1.3.1/configure.in	2006-04-04 09:08:37.508090250 +0000
-@@ -226,7 +226,7 @@
- 
- # Either a space-separated list of allowable Neon versions, or "any" to
- # mean allow anything.
--NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5"
-+NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.3"
- NEON_LATEST_WORKING_VER=0.25.5
- NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
- dnl You can skip the neon version check only if you know what you are doing 
diff --git a/dev-util/subversion/files/subversion-1.4.3-neon-0.26.3.patch b/dev-util/subversion/files/subversion-1.4.3-neon-0.26.3.patch
deleted file mode 100644
index 1c97d559ff24..000000000000
--- a/dev-util/subversion/files/subversion-1.4.3-neon-0.26.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in.orig	2007-05-15 20:22:18.000000000 +0200
-+++ configure.in	2007-05-15 20:22:55.000000000 +0200
-@@ -69,7 +69,7 @@
- 
- # Either a space-separated list of allowable Neon versions, or "any" to
- # mean allow anything.
--NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2"
-+NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.26.3"
- NEON_LATEST_WORKING_VER=0.25.5
- NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
- dnl You can skip the neon version check only if you know what you are doing 
diff --git a/dev-util/subversion/metadata.xml b/dev-util/subversion/metadata.xml
index 1639a015de6b..64a719ea1bfd 100644
--- a/dev-util/subversion/metadata.xml
+++ b/dev-util/subversion/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>apache</herd>
-	<maintainer>
-		<email>pauldv@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/subversion/subversion-1.3.2-r4.ebuild b/dev-util/subversion/subversion-1.3.2-r4.ebuild
deleted file mode 100644
index 93637565801c..000000000000
--- a/dev-util/subversion/subversion-1.3.2-r4.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.3.2-r4.ebuild,v 1.12 2007/09/05 12:16:36 pauldv Exp $
-
-inherit elisp-common libtool python eutils multilib bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc 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 emacs java nls nowebdav perl python ruby zlib"
-RESTRICT="test"
-
-COMMONDEPEND="apache2? ( ${APACHE2_DEPEND} )
-			>=dev-libs/apr-util-1.2.8
-			perl? ( >=dev-lang/perl-5.8.6-r6 !=dev-lang/perl-5.8.7 )
-			python? ( >=dev-lang/python-2.0 )
-			ruby? ( >=dev-lang/ruby-1.8.2 )
-			!nowebdav? ( >=net-misc/neon-0.26 )
-			berkdb? ( =sys-libs/db-4* )
-			emacs? ( virtual/emacs )
-			zlib? ( sys-libs/zlib )"
-
-RDEPEND="${COMMONDEPEND}
-		java? ( >=virtual/jre-1.4 )"
-
-DEPEND="${COMMONDEPEND}
-		java? ( >=virtual/jdk-1.4 )
-		>=sys-devel/autoconf-2.59"
-
-S=${WORKDIR}/${P/_rc/-rc}
-
-# Allow for custion repository locations.
-# This can't be in pkg_setup because the variable needs to be available to
-# pkg_config.
-: ${SVN_REPOS_LOC:=/var/svn}
-
-discover_apr_suffix() {
-	if use apache2 ; then
-		if has_version '=www-servers/apache-2.0*' \
-		&& has_version '=dev-libs/apr-util-0.9*' ; then
-			aprsuffix=""
-		else
-			aprsuffix="-1"
-		fi
-	else
-		aprsuffix="-1"
-	fi
-
-	echo "${aprsuffix}"
-}
-
-pkg_setup() {
-	if use berkdb && 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
-
-	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-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.3.2-neon-0.26.patch
-
-	if [[ "$(discover_apr_suffix)" == "-1" ]] ; then
-		sed -e s:apu-config:apu-1-config:g \
-			-e s:apr-config:apr-1-config:g \
-			-i build/ac-macros/{find_,}ap*
-	fi
-
-	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
-
-	use apache2 && myconf="${myconf} --with-apxs=${APXS2}"
-	use apache2 || myconf="${myconf} --without-apxs"
-
-	apr_suffix="$(discover_apr_suffix)"
-	myconf="${myconf} --with-apr=/usr/bin/apr${apr_suffix}-config --with-apr-util=/usr/bin/apu${apr_suffix}-config"
-	append-flags $(/usr/bin/apr${apr_suffix}-config --cppflags)
-
-	econf ${myconf} \
-		$(use_with berkdb berkeley-db) \
-		$(use_with python) \
-		$(use_with zlib) \
-		$(use_enable nls) \
-		--disable-experimental-libtool \
-		--disable-mod-activation \
-		|| die "econf failed"
-
-	# Respect the user LDFLAGS
-	export EXTRA_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}
-		make swig-pl || die "Compilation of ${PN} Perl bindings failed"
-	fi
-
-	if use ruby ; then
-		make 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"
-	fi
-
-	# svn-config isn't quite built correctly: it contains references to
-	# @SVN_DB_LIBS@ and @SVN_DB_INCLUDES@. It appears the best thing is to remove that. #64634
-	sed -i 's/@SVN_DB_[^@]*@//g' svn-config || die "svn-config sed failed"
-}
-
-src_install () {
-	python_version
-	PYTHON_DIR=/usr/$(get_libdir)/python${PYVER}
-
-	make DESTDIR="${D}" install || die "Installation of ${PN} failed"
-
-	dobin svn-config
-
-	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
-		mkdir -p "${D}${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="${APACHE2_MODULESDIR/${APACHE2_BASEDIR}\//}"
-		mkdir -p "${D}/${APACHE2_MODULES_CONFDIR}"
-		cat <<EOF >"${D}/${APACHE2_MODULES_CONFDIR}"/47_mod_dav_svn.conf
-<IfDefine SVN>
-	<IfModule !mod_dav_svn.c>
-		LoadModule dav_svn_module	${MOD}/mod_dav_svn.so
-	</IfModule>
-	<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 SVN_AUTHZ>
-		<IfModule !mod_authz_svn.c>
-			LoadModule authz_svn_module	${MOD}/mod_authz_svn.so
-		</IfModule>
-	</IfDefine>
-</IfDefine>
-EOF
-	fi
-
-	# Bug 43179 - Install bash-completion if user wishes
-	dobashcompletion tools/client-side/bash_completion subversion
-
-	# Install hot backup script, bug 54304
-	newbin tools/backup/hot-backup.py svn-hot-backup
-
-	# The svn_load_dirs script is installed by Debian and looks like a good
-	# candidate for us to install as well
-	newbin contrib/client-side/svn_load_dirs.pl svn-load-dirs
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245
-	newinitd "${FILESDIR}"/svnserve.initd svnserve
-	newconfd "${FILESDIR}"/svnserve.confd svnserve
-	insinto /etc/xinetd.d ; newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-	# Install documentation
-	dodoc BUGS COMMITTERS COPYING HACKING INSTALL README
-	dodoc CHANGES
-	dodoc tools/xslt/svnindex.css tools/xslt/svnindex.xsl
-	find contrib tools -name \*.in -print0 | xargs -0 rm -f
-	mkdir -p "${D}/usr/share/doc/${PF}/"
-	cp -R tools/{client-side,examples,hook-scripts} "${D}/usr/share/doc/${PF}/"
-	cp -R contrib/hook-scripts "${D}/usr/share/doc/${PF}/"
-
-	docinto notes
-	for f in notes/*
-	do
-		[[ -f ${f} ]] && dodoc ${f}
-	done
-
-	# Install emacs lisps
-	if use emacs ; then
-		insinto /usr/share/emacs/site-lisp/subversion
-		doins contrib/client-side/psvn/psvn.el*
-		doins contrib/client-side/vc-svn.el*
-
-		elisp-site-file-install "${FILESDIR}"/70svn-gentoo.el
-	fi
-}
-
-src_test() {
-	ewarn "Testing disabled for ${PN}"
-}
-
-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 "/var/svn:"
-	elog
-	elog "    emerge --config =${CATEGORY}/${PF}"
-	elog
-	elog "If you upgraded from an older version of berkely db and experience"
-	elog "problems with your repository then run the following commands as root:"
-	elog "    db4_recover -h ${SVN_REPOS_LOC}/repos"
-	elog "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-	elog
-	elog "Subversion has multiple server types, take your pick:"
-	elog
-	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
-	elog " - svn over ssh:"
-	elog "   1. Fix the repository permissions:"
-	elog "        groupadd svnusers"
-	elog "        chown -R root:svnusers /var/svn/repos/"
-	elog "        chmod -R g-w /var/svn/repos"
-	elog "        chmod -R g+rw /var/svn/repos/db"
-	elog "        chmod -R g+rw /var/svn/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 "         umask 002"
-	elog "         exec /usr/bin/svnserve \"\$@\""
-	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
-}
-
-pkg_postrm() {
-	has_version virtual/emacs && elisp-site-regen
-	use perl && perl-module_pkg_postrm
-}
-
-pkg_config() {
-	if [[ ! -x /usr/bin/svnadmin ]] ; then
-		die "You seem to only have built the ${PN} client"
-	fi
-
-	einfo ">>> Initializing the database in ${SVN_REPOS_LOC} ..."
-	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
-		echo "A subversion repository already exists and I will not overwrite it."
-		echo "Delete ${SVN_REPOS_LOC}/repos first if you're sure you want to have a clean version."
-	else
-		mkdir -p "${SVN_REPOS_LOC}/conf"
-
-		einfo ">>> Populating repository directory ..."
-		# create initial repository
-		/usr/bin/svnadmin create "${SVN_REPOS_LOC}/repos"
-
-		einfo ">>> Setting repository permissions ..."
-		chown -Rf apache:apache "${SVN_REPOS_LOC}/repos"
-		chmod -Rf 755 "${SVN_REPOS_LOC}/repos"
-	fi
-}
diff --git a/dev-util/subversion/subversion-1.4.4-r4.ebuild b/dev-util/subversion/subversion-1.4.6.ebuild
index a2a7c6425c77..1d5c0c1ede9f 100644
--- a/dev-util/subversion/subversion-1.4.4-r4.ebuild
+++ b/dev-util/subversion/subversion-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.4-r4.ebuild,v 1.4 2007/12/11 16:57:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild,v 1.1 2007/12/28 12:59:30 hollow Exp $
 
 inherit bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python
 
@@ -12,17 +12,18 @@ SRC_URI="http://subversion.tigris.org/downloads/${P/_rc/-rc}.tar.bz2"
 
 LICENSE="Subversion"
 SLOT="0"
-IUSE="apache2 berkdb doc emacs extras java nls nowebdav perl python ruby vim-syntax"
+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 )
-			ruby? ( >=dev-lang/ruby-1.8.2 )
-			perl? ( >=dev-lang/perl-5.8.8 )
-			python? ( >=dev-lang/python-2.0 )"
+			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 )
@@ -36,7 +37,7 @@ want_apache
 
 S="${WORKDIR}"/${P/_rc/-rc}
 
-# Allow for custion repository locations.
+# 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}
@@ -79,7 +80,9 @@ src_unpack() {
 	epatch "${FILESDIR}"/subversion-1.3.1-neon-config.patch
 	epatch "${FILESDIR}"/subversion-apr_cppflags.patch
 	epatch "${FILESDIR}"/subversion-1.4.3-debug-config.patch
-	epatch "${FILESDIR}"/subversion-1.4.3-neon-0.26.3.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_config):g" \
 		-e "s:apu-config:$(apu_config):g" \
@@ -96,7 +99,7 @@ src_unpack() {
 }
 
 src_compile() {
-	local myconf=""
+	local myconf=
 
 	myconf="${myconf} $(use_enable java javahl)"
 	use java && myconf="${myconf} --without-jikes --with-jdk=${JAVA_HOME}"
@@ -113,21 +116,21 @@ src_compile() {
 		myconf="${myconf} --with-neon=/usr"
 	fi
 
-	use apache2 && myconf="${myconf} --with-apxs=${APXS2}"
-	use apache2 || myconf="${myconf} --without-apxs"
-
-	myconf="${myconf} --with-apr=/usr/bin/$(apr_config) --with-apr-util=/usr/bin/$(apu_config)"
 	append-flags $(/usr/bin/$(apr_config) --cppflags)
 
 	econf ${myconf} \
+		--with-apr=/usr/bin/$(apr_config) \
+		--with-apr-util=/usr/bin/$(apu_config) \
+		$(use_with apache2 apxs ${APXS2}) \
 		$(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 EXTRA_LDFLAGS="${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.
@@ -247,14 +250,16 @@ EOF
 	rm -f contrib/client-side/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
+	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
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/svnserve.xinetd svnserve
 
 	# Install documentation
 	dodoc BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README TRANSLATING
@@ -322,15 +327,17 @@ pkg_postinst() {
 	elog
 	elog "Subversion has multiple server types, take your pick:"
 	elog
-	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
+	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"
@@ -345,8 +352,7 @@ pkg_postinst() {
 	elog "         umask 002"
 	elog "         exec /usr/bin/svnserve \${SVNSERVE_OPTS} \"\$@\""
 	elog
-
-	if use apache2 ; then
+	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:"
@@ -391,8 +397,10 @@ pkg_config() {
 		"${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 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"