commit: 5a961192a0708d55637d73ffc0fc2e7ae5d1a352 Author: Ultrabug <ultrabug <AT> gentoo <DOT> org> AuthorDate: Tue Mar 3 17:27:33 2015 +0000 Commit: git@oystercatcher mirror+tproxy <git <AT> oystercatcher <DOT> gentoo <DOT> org> CommitDate: Tue Mar 3 17:27:33 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=5a961192
fix mongo-tools install after mongodb 3 app-admin/mongo-tools/Manifest | 2 +- app-admin/mongo-tools/mongo-tools-3.0.0.ebuild | 15 ++++++++------- dev-db/mongodb/Manifest | 2 +- dev-db/mongodb/mongodb-3.0.0.ebuild | 7 +++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest index 76d279e..c1e9001 100644 --- a/app-admin/mongo-tools/Manifest +++ b/app-admin/mongo-tools/Manifest @@ -1,3 +1,3 @@ AUX mongo-tools-3.0.0-build.patch 528 SHA256 99ee6a119b3dd4145a088a9c581763f856f53c579f477b4e4eaaa8e7dd2c0f02 SHA512 9bf9e247f49a4fbc251ce878b82d457136b3ede890458afbd92b27a9f283e44e02bab92b2817cd1c3160a807ce8a7e6296e813f3573c2b733f2701fdb07323fe WHIRLPOOL 03d7330cb179111ed608929b15d2901258e8d1434ed9b28a1069a235498b32fb4ba165fb193635be1925236a83181659efd53514ef9a5c640bdfc6d5e4da05f3 DIST mongo-tools-3.0.0.tar.gz 2134169 SHA256 15a773b67004eabef9dc89b19730da64bc31e86a76216a7d0d1f00e86fd2d432 SHA512 a180d1bae030a33f346ff30c96c9bf7d0e0732b42d08b8f1cb0a22f5413afe79b9eaa2a233fd6f336b9f6ecc7dee2f73858eedf1d8038dfe8116c322a0ef3e3a WHIRLPOOL 09491fdac5e1124ea1e3a7385ee675e6d08711f4848459e5cc1b7e212ae688197a8d255c4ec54be90441ddc2ab12ced7f3f538c0f83c257fdfbcaf2cd0573986 -EBUILD mongo-tools-3.0.0.ebuild 950 SHA256 36ced6f5f944022e91b34317e1714d24ed6850f93f2bd9232830a2fbea9b117c SHA512 a521e247a2ca509234be5a5e72ba8357e609f05ab9b0866f601a40a8b4b03ea8b906ff9e03f719d29253ac526e23c4897d2d00018bc39b3e2b9fd131038c3a11 WHIRLPOOL dcbf364ca237f579654f64d5f34d5379eb27010df21f8264ddea671f319f16acef09293e2e580665f4d1a9356ab16dd8fb29cce6f431b8e4b88d8ee37701e5b7 +EBUILD mongo-tools-3.0.0.ebuild 981 SHA256 ce119a1baa7df4c2bb56c8db5c597dd6df09184a197b63019077e5d59a660e02 SHA512 d2f02c1b611aac9a8842e7ac73745882d799a768a968fbcda8837a051b049205b7a35e10a30031fab7351de6c6dc222b2c10fafb65175d01c096fb69cf309569 WHIRLPOOL b95213ae8e5137c113b40ac117ee4684367eaa0524a4c5e937361a465f33a0aea209969b406a3bc0bfd44d15d58ceedc4ae18b3af573d505e8ef10bff55a38e2 diff --git a/app-admin/mongo-tools/mongo-tools-3.0.0.ebuild b/app-admin/mongo-tools/mongo-tools-3.0.0.ebuild index f5058a3..619a761 100644 --- a/app-admin/mongo-tools/mongo-tools-3.0.0.ebuild +++ b/app-admin/mongo-tools/mongo-tools-3.0.0.ebuild @@ -17,19 +17,20 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="sasl ssl" -RDEPEND="" -DEPEND="dev-lang/go +# Maintainer note: +# openssl DEPEND constraint, see: +# https://github.com/mongodb/mongo-tools/issues/11 + +RDEPEND="!<dev-db/mongodb-3.0.0" +DEPEND="${RDEPEND} + dev-lang/go sasl? ( dev-libs/cyrus-sasl ) - ssl? ( <dev-libs/openssl-1.0.2 ) -" + ssl? ( <dev-libs/openssl-1.0.2 )" S=${WORKDIR}/${MY_P} src_prepare() { epatch "${FILESDIR}/${PN}-3.0.0-build.patch" - - # Maintainer note : openssl DEPEND constraint, see : - # https://github.com/mongodb/mongo-tools/issues/11 } src_compile() { diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest index 1d18edc..67245f4 100644 --- a/dev-db/mongodb/Manifest +++ b/dev-db/mongodb/Manifest @@ -8,5 +8,5 @@ AUX mongos.conf-r2 648 SHA256 d1bf479cee999b4e59e5100c134cd3e7af4bb126342418100c AUX mongos.confd-r2 546 SHA256 1378a880ffde0efae213ac6d6d4bbe2181c92fbb06535a58c2dab06ef88ee8e3 SHA512 30e208690b5f28bd0442b7ed302d9be991aedd27203f24e5849201d33291ad7f0f9153ae3a00b55697d79a45c40d7b3792ff45f0c24ef2cf4e88222f88ea1400 WHIRLPOOL 68b8eed779e19261c4d13ebd6be8c11b6df94e748bb8f03d632ecbfc5fcd151a693e51c5a4ad4f0af9439d07dedafc29bd9b86b5a532bad48d570fca73002987 AUX mongos.initd-r2 766 SHA256 673c0662c0638a77cb5f630605a828a6191abd0c4e9bd295b43d7b4aefeb2e1a SHA512 620062890f13bee96a1ff3b1c6900b8e08358481aae7476187eddee8f56f89e4a3d4351df88c9264fdf5e773f57e1c28337b6086a33fa97246005bfd027e0b6d WHIRLPOOL 74094c383596a1c24ced57aea1943ec86e6c98dad3a615fbf9bfc59969aaee2571c7f99a44de879864466fba9efd780f7187a5a95da04faf094f0ce3cd8031f7 DIST mongodb-src-r3.0.0.tar.gz 25590862 SHA256 c1fdbb6bbc33eafedc4aa363be2b3cdf1eea8b8eb618d25131c5a30def24aad9 SHA512 e9a50066754500d53b2e825bc9c4e7ccb692ce45a852b1ff52ba6cd2bbcbd826efea4c1018c68821bb4070a01335db0e19fd35f09f1eee6ba89d52bb96c228a7 WHIRLPOOL e933f5b1c38780ea4ef0fcfa7a188e3871484b768ab42aec881561dd543365946b7c7c9ed56b084112cf237f0dfc6da7760217c6b2c0f0b38609e9ac50a8720b -EBUILD mongodb-3.0.0.ebuild 3931 SHA256 a27721c6ff6e66e3bb8120fe1a334b23d8fed3cf0cf074eae9b2ca5381900b3c SHA512 e85de37965a9f8a2b84844820fe28537a6a795616f9c465de334ab3863dd1fbc5c68b86c8d3e97a9bbddcaaf3f342483aad1438079c31167355191aa695caad5 WHIRLPOOL c6d488297dde738d4d26baf45b88cdfe209ba6d3508e4bed95a171d7bb4f805dfe3a0df0855d561fef9b22b3821138754faea708bb84f52c4b1e79b404839c0f +EBUILD mongodb-3.0.0.ebuild 3929 SHA256 f59e3e00f4f7b33fc395d673b25c4f84ac44c5eac3efa88ea0e672b1c793157c SHA512 f2dbd4a169f14c9dae3ceacde93b5a34e1428e91e8d6f282ad434d4bd052a8069eba2339894b4a97f3b380c7ece0c6d365bafc9e8575e0294da628637774aaf6 WHIRLPOOL e48867b53a46a3ceef6a2b383230b7293e1ff71453ede45f7b5ef9e0b5bc89613c0a6834d47fd6c340c660620613783f56cb1850d7f69b21c0d54504ffd1d6a6 MISC metadata.xml 1213 SHA256 e075011c04c3f1e03af1cf4c671cb77b8133cfbdb611e69a00535c81b97009cd SHA512 3b73629af9bacdc1164530b7fb6f2df09b22d3f653cbfbc1bcc2c10affb24128ca972619fa2164e3c3af728c4aac1ae2b150e7e2918f264aaa0cdbe1c60f44ca WHIRLPOOL 35c5870bc4cc70e7103cbaf0a358f25ef307bc52284d51d31436bb6c7ebd0fbdac62f7963f9d38b8065fea18b8c6c46dafa067726166cea14641449da16b3923 diff --git a/dev-db/mongodb/mongodb-3.0.0.ebuild b/dev-db/mongodb/mongodb-3.0.0.ebuild index fa1e2c8..d23aa9c 100644 --- a/dev-db/mongodb/mongodb-3.0.0.ebuild +++ b/dev-db/mongodb/mongodb-3.0.0.ebuild @@ -21,22 +21,21 @@ SLOT="0" KEYWORDS="" IUSE="debug kerberos mms-agent ssl static-libs +tools" -PDEPEND="tools? ( =app-admin/mongo-tools-${PV} )" -RDEPEND=" - app-arch/snappy +RDEPEND="app-arch/snappy >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.50[threads(+)] >=dev-libs/libpcre-8.30[cxx] dev-libs/snowball-stemmer dev-util/google-perftools[-minimal] net-libs/libpcap - >=sys-devel/gcc-4.8.2:* mms-agent? ( app-admin/mms-agent ) ssl? ( >=dev-libs/openssl-1.0.1g )" DEPEND="${RDEPEND} + >=sys-devel/gcc-4.8.2:* sys-libs/ncurses sys-libs/readline kerberos? ( dev-libs/cyrus-sasl[kerberos] )" +PDEPEND="tools? ( ~app-admin/mongo-tools-${PV} )" S=${WORKDIR}/${MY_P}
