[gentoo-commits] repo/gentoo:master commit in: dev-db/tokumx/, dev-libs/mongo-cxx-driver/

[gentoo-commits] repo/gentoo:master commit in: dev-db/tokumx/, dev-libs/mongo-cxx-driver/

[Sergey Popov]

commit:     5589111e1da88966794703ab0412ec98457d41ad
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 18 05:09:51 2015 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Nov 18 05:11:26 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5589111e

dev-libs/mongo-cxx-driver: add blocking dependency on dev-db/tokumx

Also add apropriate blocking dependency on dev-libs/mongo-cxx-driver
in dev-db/tokumx ebuilds

Package-Manager: portage-2.2.23

 dev-db/tokumx/tokumx-1.5.0-r1.ebuild                    | 1 +
 dev-db/tokumx/tokumx-1.5.0.ebuild                       | 1 +
 dev-db/tokumx/tokumx-2.0.1.ebuild                       | 1 +
 dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.0.ebuild | 3 ++-
 dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.5.ebuild | 3 ++-
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dev-db/tokumx/tokumx-1.5.0-r1.ebuild b/dev-db/tokumx/tokumx-1.5.0-r1.ebuild
index 87c68b8..837ca80 100644
--- a/dev-db/tokumx/tokumx-1.5.0-r1.ebuild
+++ b/dev-db/tokumx/tokumx-1.5.0-r1.ebuild
@@ -21,6 +21,7 @@ IUSE=""
 
 RDEPEND="
 	dev-libs/jemalloc
+	!dev-libs/mongo-cxx-driver
 	>=dev-libs/boost-1.50[threads(+)]
 	>=dev-libs/libpcre-8.30[cxx]
 	net-libs/libpcap"

diff --git a/dev-db/tokumx/tokumx-1.5.0.ebuild b/dev-db/tokumx/tokumx-1.5.0.ebuild
index e24d5bb..361adb8 100644
--- a/dev-db/tokumx/tokumx-1.5.0.ebuild
+++ b/dev-db/tokumx/tokumx-1.5.0.ebuild
@@ -20,6 +20,7 @@ IUSE=""
 
 RDEPEND="
 	!dev-libs/jemalloc
+	!dev-libs/mongo-cxx-driver
 	>=dev-libs/boost-1.50[threads(+)]
 	>=dev-libs/libpcre-8.30[cxx]
 	net-libs/libpcap"

diff --git a/dev-db/tokumx/tokumx-2.0.1.ebuild b/dev-db/tokumx/tokumx-2.0.1.ebuild
index 2b76bc4..70fd171 100644
--- a/dev-db/tokumx/tokumx-2.0.1.ebuild
+++ b/dev-db/tokumx/tokumx-2.0.1.ebuild
@@ -21,6 +21,7 @@ IUSE="pax_kernel"
 
 RDEPEND="
 	dev-libs/jemalloc
+	!dev-libs/mongo-cxx-driver
 	>=dev-libs/boost-1.50[threads(+)]
 	>=dev-libs/libpcre-8.30[cxx]
 	net-libs/libpcap"

diff --git a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.0.ebuild b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.0.ebuild
index c6eb633..35a03e3 100644
--- a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.0.ebuild
+++ b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.0.ebuild
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug sasl ssl static-libs"
 
-RDEPEND=">=dev-libs/boost-1.50[threads(+)]
+RDEPEND="!dev-db/tokumx
+	>=dev-libs/boost-1.50[threads(+)]
 	sasl? ( dev-libs/cyrus-sasl )
 	ssl? ( dev-libs/openssl:= )"
 DEPEND="${RDEPEND}"

diff --git a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.5.ebuild b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.5.ebuild
index c6eb633..35a03e3 100644
--- a/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.5.ebuild
+++ b/dev-libs/mongo-cxx-driver/mongo-cxx-driver-1.0.5.ebuild
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug sasl ssl static-libs"
 
-RDEPEND=">=dev-libs/boost-1.50[threads(+)]
+RDEPEND="!dev-db/tokumx
+	>=dev-libs/boost-1.50[threads(+)]
 	sasl? ( dev-libs/cyrus-sasl )
 	ssl? ( dev-libs/openssl:= )"
 DEPEND="${RDEPEND}"