diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2014-11-01 00:29:07 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2014-11-01 00:29:07 +0000 |
| commit | 13dc5c504283e5418653021a687231585113e465 (patch) | |
| tree | 9043997bf3719eb6e655db1bd8deae4b2fbe5adb /net-nds | |
| parent | Stable for HPPA (bug #523164). (diff) | |
| download | historical-13dc5c504283e5418653021a687231585113e465.tar.gz historical-13dc5c504283e5418653021a687231585113e465.tar.bz2 historical-13dc5c504283e5418653021a687231585113e465.zip | |
Bug #527140: avoid double-dep against bdb.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Diffstat (limited to 'net-nds')
| -rw-r--r-- | net-nds/openldap/ChangeLog | 5 | ||||
| -rw-r--r-- | net-nds/openldap/Manifest | 4 | ||||
| -rw-r--r-- | net-nds/openldap/openldap-2.4.40-r2.ebuild | 9 |
3 files changed, 11 insertions, 7 deletions
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog index 067e6012d479..3f36c54e2c8d 100644 --- a/net-nds/openldap/ChangeLog +++ b/net-nds/openldap/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-nds/openldap # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.484 2014/10/30 02:22:07 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.485 2014/11/01 00:29:02 robbat2 Exp $ + + 01 Nov 2014; Robin H. Johnson <robbat2@gentoo.org> openldap-2.4.40-r2.ebuild: + Bug #527140: avoid double-dep against bdb. 30 Oct 2014; Patrick Lauer <patrick@gentoo.org> metadata.xml, openldap-2.4.40-r2.ebuild, openldap-2.4.40.ebuild: diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest index 63d69252b88e..2bc6c08b593b 100644 --- a/net-nds/openldap/Manifest +++ b/net-nds/openldap/Manifest @@ -60,7 +60,7 @@ EBUILD openldap-2.4.35.ebuild 22183 SHA256 c85606e0e461306d3da36f2ebacffea27edfd EBUILD openldap-2.4.38-r1.ebuild 22526 SHA256 82c788d06106e4e5dad38f900469e077db5ffcd514628adaa106b11a801aa174 SHA512 0847b7fd3d9c473501e08fe3af0562476eb2325c4749c2f7f7ae63f55d0c8aa940d2ca1e3667ff45bafcabe32a23175bf9e99a37b5fad1f2c612c42e20d54b1d WHIRLPOOL 735b128508f135849fea5c9c4310c2faed5e612b8b662f3f44ff89d05d87edf68a86d4c00c22470e6d634876b910e629b741ee9c8d8f3607bc77a565f7f77deb EBUILD openldap-2.4.38-r2.ebuild 23988 SHA256 4d35a67fd87f7b25ab939b17d2a7efe314f19cc937ab148d36dd1cfe12a82fe4 SHA512 46e72b3e2a02281d6dd96e80e9519a62fc3951f8c68cc24a5eb4c291f89ac52155c158e7f0dd9d714d7f64f6e46cb9e5ecd61ad367c09be23339c5f8323f028f WHIRLPOOL 22f6fd3d6cc418ab16caf96109f4aee3cd872aec377f57656ad5c97df6b69199ac8ab9c587e45c7f928c164ed8e869bd96094c39c9702177920d63b774e6abaa EBUILD openldap-2.4.39.ebuild 23993 SHA256 60c0d2a86303f67cb7d4e8bac0398a48f309439e7628ddc1e99b71e27cb613be SHA512 291722e8516f9db02b35b721e57f5b2a299a9cab032d3a99ca776dbba025873cb8dde7bf711a39283ffd65952952dbd7996a930857baac3c1ad7c7ccb5dfa0dd WHIRLPOOL 219d7a3500d2fccc23496f1b9fe2adf34e46c179a691fc60e2ef37af11778981e5e89369fd5ffcff23aed7a99df56d7c4d7b62ac42a740e3a3a3daf405628fc2 -EBUILD openldap-2.4.40-r2.ebuild 26171 SHA256 e4ef03b4c2014259fc839d08f51dad61927df4bb99b4ac180d16cdd36c08c960 SHA512 e1a901d8f9009366b7a9a2c4f519af82d615466f1cdd22d1e815dce4133e3dcc414c05a6637085ff547e89b18ebd476c891e0157e3621b426d232a7330173a74 WHIRLPOOL 8e0ccb6157be1667c88590e49ee49777b977b5cced7d451ebe6028aa438c6e293f9e795a05a756549283021640fce1cdda06d5246e012eb204aeffda1d23e374 +EBUILD openldap-2.4.40-r2.ebuild 26208 SHA256 41d94c72661fcdf0371c36fc597e5fcfba43cc7410ce7dd6881a4b7a9ea3d677 SHA512 4a6cd141de776953bd14120504471ac079c991a1ae29c271e55513316da6232bb9b198bc6af5b279d128a08ed1cbad5e299df60ac9e3c4db5c591f5c1ae0794b WHIRLPOOL 876ad00ca48c892dbec566081118eff935f115fb51d5cfb7a492fa6999d6df717b4ded9e36489ddb89e94cffa67706ab846719b8e07f86109467610353d799f1 EBUILD openldap-2.4.40.ebuild 26646 SHA256 021a75dcadcd94b29aafa606f9c98fc168f51e7a52952584c00c0db8b2c2bc79 SHA512 c8b5d878b637c5eed7aa19df862374f94b86a280554b6c1e7dfbf317547ba43cdc731a0b206648cd74b54e7b20def8319f06df92b5a922b93074166df7bf7bd3 WHIRLPOOL a408075136c389e8faf020ab6d377ebb53a3dc6f0bfa6b5670eeee47fd113a8fcaac4d3c9498e17d9bdac937ccc10dcfcf269c495e5284e04337949a673772f1 -MISC ChangeLog 85256 SHA256 1fa8e7230e29f4b6a3c379de8048c476da8684ba134178751ef95af28c288acb SHA512 d0ebb21acd390f421bf25606118737cd083161a3ab03494f0faf311f6dad681b76d19f47e5fcc66b642ac48edcfdb831941d422ea571bb082e68cdebd6296ac7 WHIRLPOOL 01dd7b43d6a774492845eab06266fcbe4ee7447c2136752d82d2366b63994377a216175c64aa3ab12237ef137d0a6003998994c6de7b98db3dbac963044d2799 +MISC ChangeLog 85382 SHA256 f165cbbd80ddbcba9f5f13226366bf279fb539777d5dc97e0007a810fe084b89 SHA512 a9a604d2f64bb0fae565bb3ec49d8b7c6fc1b86f9ce67e115f254222b8db502125c2cc55e90101bcd8495101a01aa62fd71468ef0d187e9d3e86bbd662b84a68 WHIRLPOOL 65b1a2a3af76c9daf16ee6d1102402f58925c335581ff21da841d1f735661fddb74e5a23b3b4dfef4bc6da92c57a255c07801f1fb1848801909bb938954654c0 MISC metadata.xml 664 SHA256 70c2b3ca29517c6cafffef5802fcd6a513517d320a118bf2205b0033ffa384ea SHA512 55e576a18ae7c71f3fa413b252a40945059d9f9308f4036739124bd241cc6c409816124c7e4fd30df965963d93907bce03ee117489fdb3443e62bf00dac9da25 WHIRLPOOL ce3c30df03e9026415bd72d5f3c132bb3273a597a6ca8e8928957baae1b4bc6d80ab8f7f0698d72cd8d5773a957ee2a929d3c2bdd4f5a6cd6ba88f9b9e0aa4c7 diff --git a/net-nds/openldap/openldap-2.4.40-r2.ebuild b/net-nds/openldap/openldap-2.4.40-r2.ebuild index f2aeab7b77de..52cface6a820 100644 --- a/net-nds/openldap/openldap-2.4.40-r2.ebuild +++ b/net-nds/openldap/openldap-2.4.40-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.40-r2.ebuild,v 1.2 2014/10/30 02:22:07 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.40-r2.ebuild,v 1.3 2014/11/01 00:29:02 robbat2 Exp $ EAPI="5" @@ -30,12 +30,13 @@ IUSE_CONTRIB="${IUSE_CONTRIB} -cxx" IUSE="${IUSE_DAEMON} ${IUSE_BACKEND} ${IUSE_OVERLAY} ${IUSE_OPTIONAL} ${IUSE_CONTRIB}" REQUIRED_USE="cxx? ( sasl )" -# This is only actually applicable if linking against db-6 # always list newer first # Do not add any AGPL-3 BDB here! # See bug 525110, comment 15. BDB_SLOTS='5.3 5.1 4.8 4.7 4.6 4.5 4.4' +BDB_PKGS='' +for _slot in $BDB_SLOTS; do BDB_PKGS="${BDB_PKGS} sys-libs/db:${_slot}" ; done # openssl is needed to generate lanman-passwords required by samba RDEPEND="icu? ( dev-libs/icu:= ) @@ -53,8 +54,8 @@ RDEPEND="icu? ( dev-libs/icu:= ) perl? ( dev-lang/perl[-build(-)] ) samba? ( dev-libs/openssl ) berkdb? ( - >=sys-libs/db-4.4 - <sys-libs/db-6 + <sys-libs/db-6.0:= + || ( ${BDB_PKGS} ) ) smbkrb5passwd? ( dev-libs/openssl |