fix neon DEPEND and sed

Package-Manager: portage-2.1.5_rc2

5 files changed, 18 insertions, 14 deletions

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 2ded80e24c65..874d7d941a6c 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/subversion
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.297 2008/04/10 19:02:24 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.298 2008/04/13 16:49:23 hollow Exp $
+
+  13 Apr 2008; Benedikt Böhm <hollow@gentoo.org> subversion-1.4.5.ebuild,
+  subversion-1.4.6.ebuild, subversion-1.4.6-r2.ebuild:
+  fix neon DEPEND and sed
 
   10 Apr 2008; Benedikt Böhm <hollow@gentoo.org> subversion-1.4.6.ebuild,
   -subversion-1.4.6-r1.ebuild, subversion-1.4.6-r2.ebuild:
diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest
index 0055996b33fc..17dd2fa17e5f 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -16,15 +16,15 @@ AUX svnserve.xinetd 332 RMD160 c2fc4eb02da7e7405756fce650b8897f0a9da7f7 SHA1 d7d
 AUX vc-svn.el 16847 RMD160 8665b9a34c8fd9acae40e18aac33026aff3a39d7 SHA1 4d1a5a9331ff96e943244a6d5538e4f0abeac9e7 SHA256 b4979d5df9fba02dbc8ad71d813229222e95ee1e8e89dec3060611d2d6be87aa
 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.4.5.ebuild 13743 RMD160 d430ee15a0a191ad525bc2c2a049efbc0cebd3f8 SHA1 82b328cbdb8d18bc51d54d2927af4647c6e0ebb1 SHA256 f0fa626ddd93edfa4a02a61277a357696afce3d3dd00f10de387bd46842ad5ab
-EBUILD subversion-1.4.6-r2.ebuild 13833 RMD160 89985eb70d8ea9fbdd7093f969cfbdc53236258a SHA1 dfa0e471e23349d736678c230f39424f45798b47 SHA256 cf100757487158f953a086ff842085bcea383a713bd9294d1a28b6ead00ba022
-EBUILD subversion-1.4.6.ebuild 13831 RMD160 8c1d72a7dfd97f43aa4fa3c867764691d477eab4 SHA1 64ded53ad29fa2257d4f9668042b36e64c77921f SHA256 b8c815105045f6dd3c6fd7c3816daf72266b1450e1237a37f1e4562a7980ed2a
-MISC ChangeLog 51552 RMD160 014627acb99811293e32f3da01512ab9590c9c46 SHA1 3fe40555278c722f92c6e17ab5e3c0317dac0b04 SHA256 ad00b843a9164e16f3f53ba39d58d81e7a2d43251bb31ca6f7b4aa638cf918fc
+EBUILD subversion-1.4.5.ebuild 13743 RMD160 7361dda2a3124a316c48b723a5ff7807595c36cd SHA1 2421c432fbfcc751cad05f0fac858528d217aa6b SHA256 d900967828e6dfcb2735727a58704bafe1510ffa5bb730a7c8bf818e48a29d3a
+EBUILD subversion-1.4.6-r2.ebuild 13840 RMD160 b0d9f65488c3ce2d5e0589644455c640e9819b80 SHA1 53b407836acb7c2e5c844eeb8aa4441859bcc2bf SHA256 d0ed7cc06676e2227af5a7dd801764bc27628b29462aa436c4c1553640c0276c
+EBUILD subversion-1.4.6.ebuild 13829 RMD160 e26d9d16641a78664fdb283472b26e398b92c8a2 SHA1 3ac932f46971c2a94de2d64747e3adf20b943213 SHA256 bace8982529b24f8353814aafc125d755aee7e0dc4d5c87447936deacdaeab40
+MISC ChangeLog 51709 RMD160 61a18ed86195437858d8cffc8bb3eab34da83bc8 SHA1 6e0c2409b67c89ab82ec27dcc8b2f388aa11b068 SHA256 efffe6eebbcc16412320be0eaefbe70d97308f8c1a2a770a3cea04abef3ce427
 MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkf+ZEoACgkQmPFBzbX68WG7JQCeOb4vfP+BNxD7zjrVNqZWMA/M
-YM4An3DLj33ksU7uow0jegX9nxla0jqm
-=mpXc
+iEYEARECAAYFAkgCOZ4ACgkQmPFBzbX68WE+TwCeJvxLDtLa67vUyNgE/oTSwWJf
+vekAnRyBpBYWDihpK5dpprBdGzbaLHYn
+=cRIw
 -----END PGP SIGNATURE-----
diff --git a/dev-util/subversion/subversion-1.4.5.ebuild b/dev-util/subversion/subversion-1.4.5.ebuild
index c9ffe2d1e7b4..b247b19ebd7d 100644
--- a/dev-util/subversion/subversion-1.4.5.ebuild
+++ b/dev-util/subversion/subversion-1.4.5.ebuild
@@ -1,6 +1,6 @@
 # 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.5.ebuild,v 1.12 2008/01/29 15:33:42 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.5.ebuild,v 1.13 2008/04/13 16:49:23 hollow Exp $
 
 inherit bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python
 
@@ -20,7 +20,7 @@ COMMONDEPEND=">=dev-libs/apr-util-1.2.8
 			doc? ( app-doc/doxygen )
 			emacs? ( virtual/emacs )
 			nls? ( sys-devel/gettext )
-			!nowebdav? ( >=net-misc/neon-0.26 )
+			!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 )"
diff --git a/dev-util/subversion/subversion-1.4.6-r2.ebuild b/dev-util/subversion/subversion-1.4.6-r2.ebuild
index bc205764eb6a..e49eabb3e01c 100644
--- a/dev-util/subversion/subversion-1.4.6-r2.ebuild
+++ b/dev-util/subversion/subversion-1.4.6-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2008/04/10 19:02:24 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6-r2.ebuild,v 1.3 2008/04/13 16:49:23 hollow Exp $
 
 inherit autotools bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python
 
@@ -84,7 +84,7 @@ src_unpack() {
 	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"/' \
+	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" \
diff --git a/dev-util/subversion/subversion-1.4.6.ebuild b/dev-util/subversion/subversion-1.4.6.ebuild
index 34c82543713f..93950a7d680a 100644
--- a/dev-util/subversion/subversion-1.4.6.ebuild
+++ b/dev-util/subversion/subversion-1.4.6.ebuild
@@ -1,6 +1,6 @@
 # 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.11 2008/04/10 19:02:24 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.6.ebuild,v 1.12 2008/04/13 16:49:23 hollow Exp $
 
 inherit bash-completion depend.apache flag-o-matic elisp-common eutils java-pkg-opt-2 libtool multilib perl-module python
 
@@ -20,7 +20,7 @@ COMMONDEPEND=">=dev-libs/apr-util-1.2.8
 			doc? ( app-doc/doxygen )
 			emacs? ( virtual/emacs )
 			nls? ( sys-devel/gettext )
-			!nowebdav? ( >=net-misc/neon-0.26.4 )
+			!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 )"