Be less precise with db's dependency, if 4.2 is installed that will be used.

Package-Manager: portage-2.1_rc1-r2

5 files changed, 104 insertions, 13 deletions

diff --git a/dev-util/kdevelop/ChangeLog b/dev-util/kdevelop/ChangeLog
index c4ce280b7e33..b700cde09172 100644
--- a/dev-util/kdevelop/ChangeLog
+++ b/dev-util/kdevelop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-util/kdevelop
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.115 2006/04/22 11:35:08 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/ChangeLog,v 1.116 2006/05/17 10:39:45 flameeyes Exp $
+
+  17 May 2006; Diego Pettenò <flameeyes@gentoo.org> kdevelop-3.3.2.ebuild:
+  Be less precise with db's dependency, if 4.2 is installed that will be used.
 
   22 Apr 2006; Carsten Lohrke <carlo@gentoo.org> kdevelop-3.3.2.ebuild:
   #128897, second try...
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 8c7a592ab010..15b47347f999 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,25 +1,109 @@
-MD5 6575ab0041ca441f658234e3f39d28a3 ChangeLog 17494
-MD5 529d6ae5875e5eff1f3ec62dd5234e81 files/digest-kdevelop-3.1.2 68
-MD5 3e9fd708ae657cffd1d68041f52aabc8 files/digest-kdevelop-3.2.1-r1 68
-MD5 a94b1b00d38f496db64b8fcbd85bbb9b files/digest-kdevelop-3.2.2 68
-MD5 34af4d3547f033e0198702768d81c2ad files/digest-kdevelop-3.2.3 68
-MD5 34af4d3547f033e0198702768d81c2ad files/digest-kdevelop-3.2.3-r1 68
-MD5 2e51b8b6ea22818559bec6f23ad1f59d files/digest-kdevelop-3.3.0 68
-MD5 e8050b7a0ef9987f4ebb6376e71c958b files/digest-kdevelop-3.3.1 68
-MD5 a2c57d3d2bfee6695d34befbf38e4dd0 files/digest-kdevelop-3.3.2 68
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX kdevelop-3.1.0-bdb-mutex.patch 656 RMD160 48977df5e39b96fda068d80620e15a9f72a631e0 SHA1 5766de104985eba30162c7bfadfbb7b0eb538ad1 SHA256 3b19be5ed9e0f19b9efc5b211893b9294269a9bb2b7b03fa4003685aef039d90 size 656
 MD5 9baadc6b0dcbb08db8c865897cf4cf43 files/kdevelop-3.1.0-bdb-mutex.patch 656
+RMD160 48977df5e39b96fda068d80620e15a9f72a631e0 files/kdevelop-3.1.0-bdb-mutex.patch 656
+SHA256 3b19be5ed9e0f19b9efc5b211893b9294269a9bb2b7b03fa4003685aef039d90 files/kdevelop-3.1.0-bdb-mutex.patch 656
+AUX kdevelop-3.1_beta1-bdb-fPIC.patch 391 RMD160 ffb5d64bc795c9a58cb243ffe6ee20d01433d55c SHA1 ec0f099b0ec29db7a5220fdb35b4b7b3cb59346a SHA256 cfb0441886ddff95685ec2aa12b43a407d91e2a2a30adf0c66eae326936d5ff5 size 391
 MD5 dcdcaf1dea68db854de8dad4df83c096 files/kdevelop-3.1_beta1-bdb-fPIC.patch 391
+RMD160 ffb5d64bc795c9a58cb243ffe6ee20d01433d55c files/kdevelop-3.1_beta1-bdb-fPIC.patch 391
+SHA256 cfb0441886ddff95685ec2aa12b43a407d91e2a2a30adf0c66eae326936d5ff5 files/kdevelop-3.1_beta1-bdb-fPIC.patch 391
+AUX kdevelop-3.2.1-gcc4.patch 446 RMD160 f49c27b92c80dea0cafb791b663b759bd7e50eae SHA1 39c86f01efda389a6e48a916a7cdd6aa1e9357ef SHA256 b7d615efce19dbc253b85fb8250d0c3c553965484c3d2f0012157a15c19c6345 size 446
 MD5 72bf5d9a24a821f9584ec59ccf1a2d6e files/kdevelop-3.2.1-gcc4.patch 446
+RMD160 f49c27b92c80dea0cafb791b663b759bd7e50eae files/kdevelop-3.2.1-gcc4.patch 446
+SHA256 b7d615efce19dbc253b85fb8250d0c3c553965484c3d2f0012157a15c19c6345 files/kdevelop-3.2.1-gcc4.patch 446
+AUX kdevelop-3.2.1-makefiles.patch 815 RMD160 1a251c1e358edec14119f83e79f32ec69e86cf42 SHA1 37d244097a58a5e9360d97f4a4fe3b01d9939d7e SHA256 5c64f714cb5a63766406aea06d563ef9dcf7bb51b253a880b0a6499b504867a3 size 815
 MD5 1760f21a5c2d5c152495c12af8232d04 files/kdevelop-3.2.1-makefiles.patch 815
+RMD160 1a251c1e358edec14119f83e79f32ec69e86cf42 files/kdevelop-3.2.1-makefiles.patch 815
+SHA256 5c64f714cb5a63766406aea06d563ef9dcf7bb51b253a880b0a6499b504867a3 files/kdevelop-3.2.1-makefiles.patch 815
+AUX kdevelop-3.2.3-ant.patch 968 RMD160 2c38e000c1e3ccdb358d51a0856ac1ecb17755b9 SHA1 c6a971dccc47de207f1f7f2280d7e8eda5eb21a7 SHA256 bf91c72da6ae279d0524b1c1f1b22cec0d3a3934a55689ca0a801afd9baae791 size 968
 MD5 e904b2e0a85d8e1363b48e3a3ce623d3 files/kdevelop-3.2.3-ant.patch 968
+RMD160 2c38e000c1e3ccdb358d51a0856ac1ecb17755b9 files/kdevelop-3.2.3-ant.patch 968
+SHA256 bf91c72da6ae279d0524b1c1f1b22cec0d3a3934a55689ca0a801afd9baae791 files/kdevelop-3.2.3-ant.patch 968
+AUX kdevelop-3.3.0-makefiles.patch 3069 RMD160 b26f749feb1120c3be815bb3016c0cb1ad3e6623 SHA1 cb063ef7dec11df313fbe8ee36969a74024590fe SHA256 0ee5e07ba0333299cadd584a2d7be40c6281fd52f9821f818e85c364c1c56ae8 size 3069
 MD5 3b430a9820d4d15b32cea7937512cdcb files/kdevelop-3.3.0-makefiles.patch 3069
+RMD160 b26f749feb1120c3be815bb3016c0cb1ad3e6623 files/kdevelop-3.3.0-makefiles.patch 3069
+SHA256 0ee5e07ba0333299cadd584a2d7be40c6281fd52f9821f818e85c364c1c56ae8 files/kdevelop-3.3.0-makefiles.patch 3069
+AUX kdevelop-qt-3.3.5.patch 479 RMD160 f7a9df1d541f40e4887c358e089272bcd2ce4481 SHA1 d926447d950aad012ba351a771a06fed3678e36c SHA256 91b373e190d2b7d038086b9548f21e9577fe567fe0393be17780229f9bb05ba0 size 479
 MD5 2c2ec3055c3e463c416ac6d713f532e0 files/kdevelop-qt-3.3.5.patch 479
+RMD160 f7a9df1d541f40e4887c358e089272bcd2ce4481 files/kdevelop-qt-3.3.5.patch 479
+SHA256 91b373e190d2b7d038086b9548f21e9577fe567fe0393be17780229f9bb05ba0 files/kdevelop-qt-3.3.5.patch 479
+DIST kdevelop-3.1.2.tar.bz2 7954052 size 7954052
+DIST kdevelop-3.2.1.tar.bz2 8335006 size 8335006
+DIST kdevelop-3.2.2.tar.bz2 8350892 size 8350892
+DIST kdevelop-3.2.3.tar.bz2 8353809 size 8353809
+DIST kdevelop-3.3.0.tar.bz2 8100852 size 8100852
+DIST kdevelop-3.3.1.tar.bz2 8115709 RMD160 a4be3b5b8f8f211da4ef687fc11b62ec434df9ac SHA256 ee102eb8896e9b32b66631a27b1fa6efa28159489275b5f6105092f81f20d093 size 8115709
+DIST kdevelop-3.3.2.tar.bz2 8147418 RMD160 b6a5889db770a6bb7aaf71970407fd8c439d25d3 SHA256 145c2996e4a9c90881487914aebe11803d2cedd6f363030eb53462c42fa0efd1 size 8147418
+EBUILD kdevelop-3.1.2.ebuild 2722 RMD160 fe8465006523d47e98e77ceb6ae2672cddd76433 SHA1 2a4310da719a40eae96c8ba5edd23d1048a6cf1b SHA256 9529edc8e96695a8e049a313274e1ed7ca93ab7b160d38acdcc4f73d88b813d4 size 2722
 MD5 be27cb0ad17d922992efa60840dda2dc kdevelop-3.1.2.ebuild 2722
+RMD160 fe8465006523d47e98e77ceb6ae2672cddd76433 kdevelop-3.1.2.ebuild 2722
+SHA256 9529edc8e96695a8e049a313274e1ed7ca93ab7b160d38acdcc4f73d88b813d4 kdevelop-3.1.2.ebuild 2722
+EBUILD kdevelop-3.2.1-r1.ebuild 2858 RMD160 993e5be8944cc97df988d151b19e1587c2bdab99 SHA1 43f0a55f693ac91aba0a7f72c697379f17c99979 SHA256 f4c73e7751e8b3f573d39affe1010d63fff8f3c908bb209f67d217264f8100dd size 2858
 MD5 af2bf95f6867509e24f9d4ccda1cfba9 kdevelop-3.2.1-r1.ebuild 2858
+RMD160 993e5be8944cc97df988d151b19e1587c2bdab99 kdevelop-3.2.1-r1.ebuild 2858
+SHA256 f4c73e7751e8b3f573d39affe1010d63fff8f3c908bb209f67d217264f8100dd kdevelop-3.2.1-r1.ebuild 2858
+EBUILD kdevelop-3.2.2.ebuild 2832 RMD160 72be109f67fce0f0c54344f392ea3e5821f22474 SHA1 6cc921361f8df1b4c3896ee6c7bf276cf4fbf515 SHA256 5306322bee2d10f3a3b8f2a5c5dde722e036c51130bd9b09c94c9a44eb770edf size 2832
 MD5 e940bb0a107baa39c8a1b42e13e57e98 kdevelop-3.2.2.ebuild 2832
+RMD160 72be109f67fce0f0c54344f392ea3e5821f22474 kdevelop-3.2.2.ebuild 2832
+SHA256 5306322bee2d10f3a3b8f2a5c5dde722e036c51130bd9b09c94c9a44eb770edf kdevelop-3.2.2.ebuild 2832
+EBUILD kdevelop-3.2.3-r1.ebuild 2999 RMD160 e29505215e1ae95d71803ed28227091e5993cd5b SHA1 b3143212d7b2109289fcf65aa49a0e77fb246d55 SHA256 f65b2c48b5f8d04d4fac29d3054e9cd99b1f8e052fa99395629f0d8bd6bf1346 size 2999
 MD5 dec73ae3a6b2e0c29b673b50e83e7f49 kdevelop-3.2.3-r1.ebuild 2999
+RMD160 e29505215e1ae95d71803ed28227091e5993cd5b kdevelop-3.2.3-r1.ebuild 2999
+SHA256 f65b2c48b5f8d04d4fac29d3054e9cd99b1f8e052fa99395629f0d8bd6bf1346 kdevelop-3.2.3-r1.ebuild 2999
+EBUILD kdevelop-3.2.3.ebuild 2882 RMD160 4a051b3460d9c835d1039626d114df35aee543bf SHA1 b599319e7b8d78b842f7f26ac1806e6ebbd1f4a4 SHA256 3b79d55e19fab40bdf70fcb952510780409496834e660cc2e9ea5d2865317f2e size 2882
 MD5 9a9549087cbbd316790c894ca0c96ce3 kdevelop-3.2.3.ebuild 2882
+RMD160 4a051b3460d9c835d1039626d114df35aee543bf kdevelop-3.2.3.ebuild 2882
+SHA256 3b79d55e19fab40bdf70fcb952510780409496834e660cc2e9ea5d2865317f2e kdevelop-3.2.3.ebuild 2882
+EBUILD kdevelop-3.3.0.ebuild 2968 RMD160 22d6e278fb4482a93e4380a7185ee88a0de8fc86 SHA1 a39b8e2693aa755577f1e18dfc09dfd2a8ae6e65 SHA256 5a1281fa97ba433caa3ee822e17d68ce6f0b613ddbca11f7c3ead1de07a8e1ce size 2968
 MD5 09f0712642adef858165f66654af4131 kdevelop-3.3.0.ebuild 2968
+RMD160 22d6e278fb4482a93e4380a7185ee88a0de8fc86 kdevelop-3.3.0.ebuild 2968
+SHA256 5a1281fa97ba433caa3ee822e17d68ce6f0b613ddbca11f7c3ead1de07a8e1ce kdevelop-3.3.0.ebuild 2968
+EBUILD kdevelop-3.3.1.ebuild 2841 RMD160 c4908f8325264fb74944d6c6812a1415d9836cb9 SHA1 8e7fdb9f32461fdec06dea575bc3f2b9f5fd3a61 SHA256 506b6dde63e8680f80b3c697a51a4249f07d664e9fc30679b6e9cdfaa00a657b size 2841
 MD5 9f79d94a4a2ea9d4457ab62fae6d7f56 kdevelop-3.3.1.ebuild 2841
-MD5 a628d3c612a56c75a5fdea16e18636be kdevelop-3.3.2.ebuild 3061
+RMD160 c4908f8325264fb74944d6c6812a1415d9836cb9 kdevelop-3.3.1.ebuild 2841
+SHA256 506b6dde63e8680f80b3c697a51a4249f07d664e9fc30679b6e9cdfaa00a657b kdevelop-3.3.1.ebuild 2841
+EBUILD kdevelop-3.3.2.ebuild 3063 RMD160 44403996dabe794930bf9cd18de7782c376ffbdf SHA1 a714bbfaa180dc87f7cab4a79026d7da7a1b6c82 SHA256 42afd239ceb9bed003c838924eb582b2694dc9de5ea65ceb17d3605ddcc47226 size 3063
+MD5 d27ea5b6464ae63dbfa521519fa14bb8 kdevelop-3.3.2.ebuild 3063
+RMD160 44403996dabe794930bf9cd18de7782c376ffbdf kdevelop-3.3.2.ebuild 3063
+SHA256 42afd239ceb9bed003c838924eb582b2694dc9de5ea65ceb17d3605ddcc47226 kdevelop-3.3.2.ebuild 3063
+MISC ChangeLog 17654 RMD160 11431670bef4e001c889dc2546026d2340ec3ed1 SHA1 976451a51643274fb4b09ebf8b6d25e62e732a03 SHA256 0539c9ebba8f67c112c96aee79f47bea3ae44c682e4c3e00fc1b8ee481bec348 size 17654
+MD5 75e64e07b18df75dc74daf72386a86d6 ChangeLog 17654
+RMD160 11431670bef4e001c889dc2546026d2340ec3ed1 ChangeLog 17654
+SHA256 0539c9ebba8f67c112c96aee79f47bea3ae44c682e4c3e00fc1b8ee481bec348 ChangeLog 17654
+MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a size 156
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
+SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a metadata.xml 156
+MD5 529d6ae5875e5eff1f3ec62dd5234e81 files/digest-kdevelop-3.1.2 68
+RMD160 2a46cbfed85c5aa9d9faee4545b446d6a4826db7 files/digest-kdevelop-3.1.2 68
+SHA256 70270bed329c7fc1855c440193c7a6d48771b7058701476cb6786eaa1f3d53e3 files/digest-kdevelop-3.1.2 68
+MD5 3e9fd708ae657cffd1d68041f52aabc8 files/digest-kdevelop-3.2.1-r1 68
+RMD160 c01e9a919a1a98c2d73329951d6e70f66d21acba files/digest-kdevelop-3.2.1-r1 68
+SHA256 1f7bf8ce3d5c23d479fc4663fd36e528fb00ca6f02e307dfdda4132de4df5160 files/digest-kdevelop-3.2.1-r1 68
+MD5 a94b1b00d38f496db64b8fcbd85bbb9b files/digest-kdevelop-3.2.2 68
+RMD160 3482b3bc26e64fe288a6e079baaadc091a5b6c37 files/digest-kdevelop-3.2.2 68
+SHA256 7dd00d9094ae4cf3c017222042836f92ffade61e8022794a4c908d96d62583aa files/digest-kdevelop-3.2.2 68
+MD5 34af4d3547f033e0198702768d81c2ad files/digest-kdevelop-3.2.3 68
+RMD160 e8e77111e301edc640f497e838f3bc23238598b9 files/digest-kdevelop-3.2.3 68
+SHA256 2a9a38c7b33e00198295e5e21412dd10a5de321a55a0f0b4f93131bf5c42ef94 files/digest-kdevelop-3.2.3 68
+MD5 34af4d3547f033e0198702768d81c2ad files/digest-kdevelop-3.2.3-r1 68
+RMD160 e8e77111e301edc640f497e838f3bc23238598b9 files/digest-kdevelop-3.2.3-r1 68
+SHA256 2a9a38c7b33e00198295e5e21412dd10a5de321a55a0f0b4f93131bf5c42ef94 files/digest-kdevelop-3.2.3-r1 68
+MD5 2e51b8b6ea22818559bec6f23ad1f59d files/digest-kdevelop-3.3.0 68
+RMD160 9f7cabb23e73658abc8b6ce66548f5c5be0bf663 files/digest-kdevelop-3.3.0 68
+SHA256 f535ba9bf39cf20e9cee69d81ecbdd7012a41b2486cd53cebbe043b9e580b289 files/digest-kdevelop-3.3.0 68
+MD5 08c43d3e0a852a8b01e94485573650f6 files/digest-kdevelop-3.3.1 250
+RMD160 561b2918025cfeb8c5b49e45ee3d039c4c4ea117 files/digest-kdevelop-3.3.1 250
+SHA256 8056e4b44047639ccd97b47a6a794bfcbe8ad292791c88f1231303b443d1dff5 files/digest-kdevelop-3.3.1 250
+MD5 ad5d42b2a1dfdd92a19c0ffac7a76d66 files/digest-kdevelop-3.3.2 250
+RMD160 ca0d71acefad789912d27fee4d203d140808bd05 files/digest-kdevelop-3.3.2 250
+SHA256 ad5fda1edc445e7ac079f96bb484bccb6db6f5ba4cae2d3d30db6c2a04f62452 files/digest-kdevelop-3.3.2 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFEav2XAiZjviIA2XgRAuksAJ9173GSayZBhWaZY+4HOe25b8mATwCdEl0f
+8gczBPhzBKoiJ2ZDZKGpMpo=
+=pZPk
+-----END PGP SIGNATURE-----
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.3.1 b/dev-util/kdevelop/files/digest-kdevelop-3.3.1
index 54894f38d202..980a43bff3eb 100644
--- a/dev-util/kdevelop/files/digest-kdevelop-3.3.1
+++ b/dev-util/kdevelop/files/digest-kdevelop-3.3.1
@@ -1 +1,3 @@
 MD5 e5e3d3ce60a0dcafb99721f6304f87ef kdevelop-3.3.1.tar.bz2 8115709
+RMD160 a4be3b5b8f8f211da4ef687fc11b62ec434df9ac kdevelop-3.3.1.tar.bz2 8115709
+SHA256 ee102eb8896e9b32b66631a27b1fa6efa28159489275b5f6105092f81f20d093 kdevelop-3.3.1.tar.bz2 8115709
diff --git a/dev-util/kdevelop/files/digest-kdevelop-3.3.2 b/dev-util/kdevelop/files/digest-kdevelop-3.3.2
index c76f213915b2..5479cbe88e21 100644
--- a/dev-util/kdevelop/files/digest-kdevelop-3.3.2
+++ b/dev-util/kdevelop/files/digest-kdevelop-3.3.2
@@ -1 +1,3 @@
 MD5 494c9320a5f8681b67a3a06fa0ce18b7 kdevelop-3.3.2.tar.bz2 8147418
+RMD160 b6a5889db770a6bb7aaf71970407fd8c439d25d3 kdevelop-3.3.2.tar.bz2 8147418
+SHA256 145c2996e4a9c90881487914aebe11803d2cedd6f363030eb53462c42fa0efd1 kdevelop-3.3.2.tar.bz2 8147418
diff --git a/dev-util/kdevelop/kdevelop-3.3.2.ebuild b/dev-util/kdevelop/kdevelop-3.3.2.ebuild
index be886feebca7..d1bb31fd5361 100644
--- a/dev-util/kdevelop/kdevelop-3.3.2.ebuild
+++ b/dev-util/kdevelop/kdevelop-3.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.3.2.ebuild,v 1.4 2006/04/22 11:35:09 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdevelop/kdevelop-3.3.2.ebuild,v 1.5 2006/05/17 10:39:45 flameeyes Exp $
 
 inherit kde eutils
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ada clearcase cvs fortran haskell java pascal perforce perl php python ruby sql subversion"
 
 DEPEND="sys-devel/gdb
-	=sys-libs/db-4.1*
+	=sys-libs/db-4*
 	cvs? ( || ( kde-base/cervisia kde-base/kdesdk ) )"
 RDEPEND="${DEPEND}
 	subversion? ( || ( kde-base/kdesdk-kioslaves kde-base/kdesdk ) )"