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
johu · Nov 18, 2015 · 5589111 · 5589111
1 parent 33e3868
commit 5589111
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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}"