Added minimal necessary sys-libs/db version

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 26 insertions, 21 deletions

diff --git a/dev-vcs/subversion/ChangeLog b/dev-vcs/subversion/ChangeLog
index fe15b4b78bc8..2bfc5f8a402f 100644
--- a/dev-vcs/subversion/ChangeLog
+++ b/dev-vcs/subversion/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-vcs/subversion
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.49 2011/08/23 07:59:28 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/ChangeLog,v 1.50 2011/08/23 08:12:07 polynomial-c Exp $
+
+  23 Aug 2011; Lars Wendler <polynomial-c@gentoo.org>
+  subversion-1.6.17-r3.ebuild, subversion-1.6.17-r4.ebuild:
+  Added minimal necessary sys-libs/db version again with kind permission from
+  chainsaw.
 
   23 Aug 2011; Lars Wendler <polynomial-c@gentoo.org>
   subversion-1.6.17-r4.ebuild:
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index c29718973bdf..2f05016dbd90 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -15,25 +15,25 @@ DIST subversion-1.6.16.tar.bz2 5509729 RMD160 f12d7eb31372486290e08143ec1afda029
 DIST subversion-1.6.17.tar.bz2 5504298 RMD160 b0937be80622774fee5d4557e740ad44f7f47172 SHA1 6e3ed7c87d98fdf5f0a999050ab601dcec6155a1 SHA256 d629c657e171616d30cc0cbddf1011a065770813bfc32f78c6940d09ca868124
 EBUILD subversion-1.6.15.ebuild 31841 RMD160 0b018adda55fc51e2a7fb05e7bfdeb1b11f318c4 SHA1 9f73ff35e92d60692d551382a68dac87b56655df SHA256 a1eba80dd50f7ec4092884c410228c7aa0778ca0a812c097deb36139c5907712
 EBUILD subversion-1.6.16.ebuild 31846 RMD160 c2714b45a69939db231e5f03ad26b6def895f397 SHA1 994949ce558dc39e8d8e9b0cf4d248937c628ef7 SHA256 8e4ae636dcb868a4a9ed17dc01c42451c62b8c73f890e99c3b16125c7267af11
-EBUILD subversion-1.6.17-r3.ebuild 15715 RMD160 69fdeb726a3b215e8b47f83f9d7116654acd8cac SHA1 49c07b1fb0b4722d79417620448b8f01dc8b66af SHA256 2c442307b1845fa544d7a523591b8e470e77d06be5af86ce9092fbb80b71a108
-EBUILD subversion-1.6.17-r4.ebuild 15819 RMD160 22ae573f4398cd0c99c639bd1d603c6476feb71a SHA1 c68e196f5738e92a9dc9bb1ddf21392e0822fb9a SHA256 f22db401fc2d798da035a8cf8f969504f4d2296e620fe987144afe3669cfd3fb
+EBUILD subversion-1.6.17-r3.ebuild 15724 RMD160 73203087957b369a94065a009e42e44080b3aaae SHA1 5c1251a4e2036b26ea997b0eac50e11e5b53fdd0 SHA256 f4be56bcf98c467e97a085ff9e1c4a1eaa09f2095710b4a97387b2f5c7acb7c9
+EBUILD subversion-1.6.17-r4.ebuild 15828 RMD160 6456ed98e51e0aba85383c9537f82e7559b73595 SHA1 6722c73c4462211e6e8a0303f9eeb8f3ef48f50b SHA256 fc1163781433aca7c9bc83879af5127e46246b70419fd4d8566d8c7ab51440ef
 EBUILD subversion-1.6.17.ebuild 31736 RMD160 f737154399931fc9691ec0e3d377b0518f98a4c4 SHA1 2ede6c3c8c3dc36058e5dc9995fe10b3d1b040a7 SHA256 243009278832093ab797b7535d333da5cb5e4d9f0f02f95b31249a9fdd5a7625
-MISC ChangeLog 78894 RMD160 9f4d168c02c7a201ca794cc0ce7ddb7db64aaea1 SHA1 5d4d1330fa7a337184f42605542bc3af9600661a SHA256 4ad0a13f49f115f751ff0f2a6a928d50d311faf43f89f8f5d575064c7ff50bf0
+MISC ChangeLog 79099 RMD160 c2134c178bb2065b2a8696fad0d92a3140209663 SHA1 91a8a8960e075cbb55fff3f154f37b0edc3bf641 SHA256 7f104234e4e23755f1798b18ae4ef2b5d1f9c9232ed481d29303311351903692
 MISC metadata.xml 650 RMD160 17a1bcef59b035ceeb456ff3bcff9f121db2cc5e SHA1 677d1e573840f9f634abfa39dbce0dc4f11e4ee8 SHA256 ca7082ab0d3917e015b6532500bd31ef236513c3ad30782462823c947df1afdb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOU13mAAoJEPiazRVxLXTFG0IP/1Cwugn2wnqa8GVhWPB3bhEt
-fvpNn+xaPZUSlSFAMuHnVq5QZdSGAIZjbFka0japQ8mv1OscDXhOyNcBoWwrXj/T
-BujnLZyIp4EakOvUSjRVZEkfml18V4n+dPRs8EpY+dE6dMxdR+usQi2AT3m2wNn1
-q23n5y6WAESBBh1gJXCZg8sX+Br53/bBQFjJG3E24Z9DossMr/f92DA0Rml/XydL
-l5jhGlhYB7OmBzKhz/PalQIF9dfIHo6uPKDFJUDhEJ8rYR/hDwiGx1SYWTwGHgEQ
-VisvOtgziGsM4dhfX6VJoUB1oDh5weryCMvs9rgGxSSAYbfjVeCvVAhWxyEgfwhM
-hwmGJ2Ko83MWJAK7rK8oxs2/qRrYXOz0ai5se8YQYsl89NGKspdD27Yx7f/SaTcA
-3nJv64za4E7I7dswEBrBdymxHh4Giu9OLjnWPZx5Jqz/xePZF+zmXCEgJ2lOlJ3p
-qg8BUiQJJFtpFqXfxHjGNvyWnd9wcQIqiXH6iUdx7Ic2gHyPvAE6EqnLiogWSwTp
-9xMw45zawqzl1cT5nOBaDiKrIppOQgj1vnkMpty+b0ahSGgpJi1wo04W2EJawY9d
-EOp9tFRhHeKJmyLp2GVh0jJQ4/UOcu3l1wKNZfofMYMSudlUXCyh7yOM/LAPEPfD
-fgodzc0tQhOFhqcSepkM
-=SD9J
+iQIcBAEBCgAGBQJOU2DeAAoJEPiazRVxLXTF1g8P/i08gK0RnUlg5hZ+eoE8iNT+
+2oRxo/HJa//hRPZUTIv2JLygAizgpAS8eBWiQiUtwxfNeekw4yDm26Ph9KA6zNYh
+1mVDO8jVxRqPOdlrNn+tmfjLtmaxewJxXt8LdkNit/NkeANnchNi3OM3xanlY29p
+2Y5rMttPsTV0HI9c8LfMJOafloX5l+AYHetkNUCQ7VhO0GPbbIv7O/kCV1MP8wS+
+bIk5BHNf6d5j2hzXh/nmxbGQLSgJ9XJLxd9pAtUa5OoJEOx35PK50m9bp4pfueuY
+mE8biLYDhxxtQ7je/ikllWb2/IsRQspU9SdEKlvHNqOkCUsyukT3KNSpJ1lYRMsJ
+5aTQoKB4+EORRnDtHcCiJdPsFj0JZbwub9zAUziZC9+p8zTCEnbIkDayMVx3/bG9
+WZrD7RpVH3Y5PxS3STJ5PI4rcKu8/NJeikeZ4oHi6Jae5CSMny8iBPtuuxcy7aRS
+WceT2M8H3r73PepSLDs8HlkXgrEGAm9+JGzx+4KC+uu8MapSOlD9ikfTL0Jygt0z
+qxmQG9on1Thtn3m1rBY6qXFIIjt7cD4X5scagUQ/6dPXsxERNUc8fmTtekYpb3oI
+vLRxSIptXcfFAZtuhjPfDgcMUpbvYjXWtZY3gnNvGuaD3z7a1LEIAk+5I61JjClc
+K06ifSN8QjEtDccIZYiU
+=3Xma
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/subversion/subversion-1.6.17-r3.ebuild b/dev-vcs/subversion/subversion-1.6.17-r3.ebuild
index 387184b21182..a9d977e08715 100644
--- a/dev-vcs/subversion/subversion-1.6.17-r3.ebuild
+++ b/dev-vcs/subversion/subversion-1.6.17-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.6.17-r3.ebuild,v 1.1 2011/08/22 11:21:31 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.6.17-r3.ebuild,v 1.2 2011/08/23 08:12:07 polynomial-c Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -25,7 +25,7 @@ CDEPEND=">=dev-db/sqlite-3.4
 	>=dev-libs/apr-util-1.3:1
 	dev-libs/expat
 	sys-libs/zlib
-	berkdb? ( =sys-libs/db-4* )
+	berkdb? ( >=sys-libs/db-4.0.14 )
 	ctypes-python? ( =dev-lang/python-2* )
 	emacs? ( virtual/emacs )
 	gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring )
diff --git a/dev-vcs/subversion/subversion-1.6.17-r4.ebuild b/dev-vcs/subversion/subversion-1.6.17-r4.ebuild
index 8de7106b61a9..9487a639c4ef 100644
--- a/dev-vcs/subversion/subversion-1.6.17-r4.ebuild
+++ b/dev-vcs/subversion/subversion-1.6.17-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.6.17-r4.ebuild,v 1.2 2011/08/23 07:59:28 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/subversion/subversion-1.6.17-r4.ebuild,v 1.3 2011/08/23 08:12:07 polynomial-c Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -25,7 +25,7 @@ CDEPEND=">=dev-db/sqlite-3.4
 	>=dev-libs/apr-util-1.3:1
 	dev-libs/expat
 	sys-libs/zlib
-	berkdb? ( sys-libs/db )
+	berkdb? ( >=sys-libs/db-4.0.14 )
 	ctypes-python? ( =dev-lang/python-2* )
 	emacs? ( virtual/emacs )
 	gnome-keyring? ( dev-libs/glib:2 sys-apps/dbus gnome-base/gnome-keyring )