QDBM and Tokyo Cabinet can't be used together

Package-Manager: portage-2.2.0_alpha19/cvs/Linux x86_64

4 files changed, 44 insertions, 14 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index ffa06f78abd3..455767078f8d 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/cfengine
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.125 2011/01/23 15:35:35 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.126 2011/01/30 20:39:29 idl0r Exp $
+
+  30 Jan 2011; Christian Ruppert <idl0r@gentoo.org> cfengine-3.1.2.ebuild,
+  cfengine-3.1.3.ebuild:
+  QDBM and Tokyo Cabinet can't be used together
 
   23 Jan 2011; Christian Ruppert <idl0r@gentoo.org> cfengine-3.1.2.ebuild,
   cfengine-3.1.3.ebuild:
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index 01eda2c87427..9f7afea3029f 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 511666-segfault.patch 731 RMD160 5a1965029fcc27f95ef89aaf74ea7b5e93ff30eb SHA1 1c93030161d91bab21e46df355bbb7da77772f27 SHA256 cb38c886bf92c1ae48000a65a93a2cf610a9b9d991c44fb1b7df00c3bd9af54d
 AUX admit-noclass-520696.patch 400 RMD160 35073a17f2618c189bc3dd9b1a4264b117d6abdb SHA1 39e8a42c9ecca02d51d340fd6dabe91626c494c8 SHA256 d882a327a3788640f96ef7fa5a38953365f358722883ce105c8be973fbb6c5d2
 AUX cf-execd.rc6 318 RMD160 462f1700ca412a2ffbdc7e9f96e9d7354906a770 SHA1 0c161245a34a7562cbe37e878545ad90d551f508 SHA256 1862d1d86752b96cf92810f324f5746f0d73730cfce75e9598bea5e0b391a2e9
@@ -13,7 +16,18 @@ DIST cfengine-3.1.2.tar.gz 1588874 RMD160 5df871993ea77107bfc617ec8dc2e183d76ed7
 DIST cfengine-3.1.3.tar.gz 1593482 RMD160 2f0c289544ae70882e90c01fa4c523e0d594a3ad SHA1 9d63a4f02ce044b481d9aaa1e2db33070dbc91aa SHA256 b21cc4f6c05e492230f894b6b0622d3ada1ab508d6f09d7118521d8826e617ce
 EBUILD cfengine-2.2.10-r3.ebuild 3109 RMD160 c4dc9fe7d8026ad6ecf7fa01a4e8dc67a62ab277 SHA1 7921fd2d9434d6f9f331c1deeafd14a514353dfc SHA256 53b7fde170c753a64a5c605b23bbd6168fdc211833a2b4e5542b994831be0ce8
 EBUILD cfengine-2.2.10.ebuild 2720 RMD160 f79ad7c72b4ceac12a0323434b3797c4dbc1f3cb SHA1 cddf8f46bd13c6d1c83bddbcdff56673151f6104 SHA256 6b20bf4737274d6bfbe519dd717a4b19f689296accb431e7b0dae6b16e41a34d
-EBUILD cfengine-3.1.2.ebuild 4152 RMD160 abfff7544a51a31cf8a9e2843d00b767a8ef6799 SHA1 01e7a4f226d672fdd9b707131da033f52e23ad7c SHA256 c7fac45f3c5c1e47c9ca0958ce19bd905c50ad997fc96f687db713bf4131eb71
-EBUILD cfengine-3.1.3.ebuild 4153 RMD160 c137562a7dd63c75417579c8442baf0e4a751b28 SHA1 612622d9a3bff65944d00d99d04b15a6fc6388a8 SHA256 43a7d165aebf6507ea2c0409aaf43d6ffd700514edfbd80efa3f1773fad5ae6b
-MISC ChangeLog 21558 RMD160 cec2a557d6f04df905ce55bdf05ddc80a738d3dd SHA1 acda5a766f40ca4974dfea346207f7936b1a8f90 SHA256 f0dca18c66bab84827b781cbd299ab416e019c57fc6bca71aa67200f04b80b51
+EBUILD cfengine-3.1.2.ebuild 4503 RMD160 ca632078d13ae4172f29f9acc479ca89f7685274 SHA1 c88ce0c68d3ce642481418be39c586ffe7fbdd93 SHA256 1f8a5033503435ab6e12be84bac69f755bec9bfd5be4974ca128e1c53917d64c
+EBUILD cfengine-3.1.3.ebuild 4504 RMD160 eee44de86a9035d2a0377bf9d8e92281388be15d SHA1 e3c1d516d601e6492198766c52fc9138dc9991ea SHA256 12c29a9d401e41f272a979c7a75e74a25d045de42dd92072fe178ecbaf47d171
+MISC ChangeLog 21707 RMD160 734a0c9b98545b461c75857d06e34c84435a723d SHA1 44e5427d817ef7f691fe36f2e3d0b583503bd9ff SHA256 87745daa428480f411a0811c5cea94b450372aa75ef5f87f58c13c0a3ae6a011
 MISC metadata.xml 2591 RMD160 d5907725b22a9608780c95f44e9cdf28645b4e40 SHA1 a6780f88141ed5fe46d201fe32aacabbb7e05b91 SHA256 f871e8ac89cf6f0b46aabf0409aa387307288c72cd0ac4a6bf1231ed01e4ddf0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iQEcBAEBCAAGBQJNRcyHAAoJEMOx0zmdw4Z1YIMH/2Ht79nmvQN3vBqf/nWNCQXc
+6MxbNQrxPStNeWr1Z7GdZMi7SE+6gnBOC4qDZR4ekH3MhiG/mHbhtAqE9ElYBygG
+803mm4mfTX+d+DywSIRf8So5JLi+qSljPWq5DRLa9K9OSPUlhiawKsVtJLBEnz82
+r6DH7IitkENuBDBRy/eTf0PsGB7vaYYJCbw7AFYXWklMVXKUogvrnSwrBNnKnJeK
+aJQj5vxaMwOqFot2QTjT53UyuqVZjEvvOzmutfqwVy0OeZAp80WuKSLLe92n1cZk
+cdD/aWypLybhCazUTuMlWI1PxQMK84fbNuMLZyaVI5NthA1l9juftko+b1KiK9Q=
+=5mDs
+-----END PGP SIGNATURE-----
diff --git a/net-misc/cfengine/cfengine-3.1.2.ebuild b/net-misc/cfengine/cfengine-3.1.2.ebuild
index 0fa14d2772fd..aa6b255884a9 100644
--- a/net-misc/cfengine/cfengine-3.1.2.ebuild
+++ b/net-misc/cfengine/cfengine-3.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.2.ebuild,v 1.5 2011/01/23 15:35:35 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.2.ebuild,v 1.6 2011/01/30 20:39:30 idl0r Exp $
 
 EAPI="3"
 
@@ -29,7 +29,7 @@ DEPEND=">=sys-libs/db-4
 	postgres? ( dev-db/postgresql-base )
 	selinux? ( sys-libs/libselinux )
 	tokyocabinet? ( dev-db/tokyocabinet )
-	qdbm? ( dev-db/qdbm )
+	!tokyocabinet? ( qdbm? ( dev-db/qdbm ) )
 	!tokyocabinet? ( !qdbm? ( >=sys-libs/db-4 ) )
 	>=dev-libs/openssl-0.9.7
 	dev-libs/libpcre"
@@ -47,8 +47,16 @@ src_configure() {
 		myconf="--without-sql"
 	fi
 
+	# BDB by default, prefer tokyocabinet above qdbm...
 	if ! use qdbm && ! use tokyocabinet; then
 		myconf="${myconf} --with-berkeleydb=/usr"
+	elif use qdbm && use tokyocabinet; then
+		elog "QDBM and Tokyo Cabinet can't be used together, using Tokyo Cabinet by default"
+		myconf="${myconf} --with-tokyocabinet"
+	elif use qdbm && ! use tokyocabinet; then
+		myconf="${myconf} --with-qdbm"
+	elif ! use qdbm && use tokyocabinet; then
+		myconf="${myconf} --with-tokyocabinet"
 	fi
 
 	# Enforce /var/cfengine for historical compatibility
@@ -61,9 +69,7 @@ src_configure() {
 		$(use_with gd) \
 		$(use_with graphviz) \
 		$(use_with ldap) \
-		$(use_with qdbm) \
-		$(use_enable selinux) \
-		$(use_with tokyocabinet)
+		$(use_enable selinux)
 
 	# Fix Makefile to skip inputs, see below "examples"
 	sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die
diff --git a/net-misc/cfengine/cfengine-3.1.3.ebuild b/net-misc/cfengine/cfengine-3.1.3.ebuild
index 4561f9b60509..596bd76b5263 100644
--- a/net-misc/cfengine/cfengine-3.1.3.ebuild
+++ b/net-misc/cfengine/cfengine-3.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.3.ebuild,v 1.4 2011/01/23 15:35:35 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.3.ebuild,v 1.5 2011/01/30 20:39:30 idl0r Exp $
 
 EAPI="3"
 
@@ -29,7 +29,7 @@ DEPEND=">=sys-libs/db-4
 	postgres? ( dev-db/postgresql-base )
 	selinux? ( sys-libs/libselinux )
 	tokyocabinet? ( dev-db/tokyocabinet )
-	qdbm? ( dev-db/qdbm )
+	!tokyocabinet? ( qdbm? ( dev-db/qdbm ) )
 	!tokyocabinet? ( !qdbm? ( >=sys-libs/db-4 ) )
 	>=dev-libs/openssl-0.9.7
 	dev-libs/libpcre"
@@ -47,8 +47,16 @@ src_configure() {
 		myconf="--without-sql"
 	fi
 
+	# BDB by default, prefer tokyocabinet above qdbm...
 	if ! use qdbm && ! use tokyocabinet; then
 		myconf="${myconf} --with-berkeleydb=/usr"
+	elif use qdbm && use tokyocabinet; then
+		elog "QDBM and Tokyo Cabinet can't be used together, using Tokyo Cabinet by default"
+		myconf="${myconf} --with-tokyocabinet"
+	elif use qdbm && ! use tokyocabinet; then
+		myconf="${myconf} --with-qdbm"
+	elif ! use qdbm && use tokyocabinet; then
+		myconf="${myconf} --with-tokyocabinet"
 	fi
 
 	# Enforce /var/cfengine for historical compatibility
@@ -61,9 +69,7 @@ src_configure() {
 		$(use_with gd) \
 		$(use_with graphviz) \
 		$(use_with ldap) \
-		$(use_with qdbm) \
-		$(use_enable selinux) \
-		$(use_with tokyocabinet)
+		$(use_enable selinux)
 
 	# Fix Makefile to skip inputs, see below "examples"
 	sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile || die