diff options
| author |   Tuan Van <langthang@gentoo.org> | 2004-07-26 16:27:25 +0000 |
|---|---|---|
| committer | Tuan Van <langthang@gentoo.org> | 2004-07-26 16:27:25 +0000 |
| commit | c2707a4a7739584c5d053a944996150379640561 (patch) | |
| tree | 8bc9136f8e993602abb0d4031d242753914ee380 | |
| parent | new snapshot and added patch from madwifi mailing list which resolves corrupt... (diff) | |
| download | gentoo-2-c2707a4a7739584c5d053a944996150379640561.tar.gz gentoo-2-c2707a4a7739584c5d053a944996150379640561.tar.bz2 gentoo-2-c2707a4a7739584c5d053a944996150379640561.zip | |
default to gdbm for SASLdb database backend if both berkdb and gdbm in USE.
| -rw-r--r-- | dev-libs/cyrus-sasl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/cyrus-sasl/cyrus-sasl-2.1.19.ebuild | 26 |
2 files changed, 22 insertions, 10 deletions
diff --git a/dev-libs/cyrus-sasl/ChangeLog b/dev-libs/cyrus-sasl/ChangeLog index 0ddeca907246..4f7e50fc1536 100644 --- a/dev-libs/cyrus-sasl/ChangeLog +++ b/dev-libs/cyrus-sasl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/cyrus-sasl # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.88 2004/07/21 23:56:52 langthang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/ChangeLog,v 1.89 2004/07/26 16:27:25 langthang Exp $ + + 26 Jul 2004; Tuan Van <langthang@gentoo.org> cyrus-sasl-2.1.19.ebuild: + default to gdbm for SASLdb database backend if both berkdb and gdbm in + USE. 21 Jul 2004; Tuan Van <langthang@gentoo.org> cyrus-sasl-2.1.19.ebuild: re-keywords, touchup ready to remove hardmask. diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19.ebuild index 7d4c45268a2c..9fb1cf0c251a 100644 --- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19.ebuild +++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19.ebuild,v 1.2 2004/07/21 23:56:52 langthang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-sasl/cyrus-sasl-2.1.19.ebuild,v 1.3 2004/07/26 16:27:25 langthang Exp $ inherit eutils flag-o-matic gnuconfig @@ -32,19 +32,23 @@ DEPEND="${RDEPEND} pkg_setup() { if use gdbm && use berkdb; then echo - eerror "You have both \"gdbm\" and \"berkdb\" in your USE flags." - eerror "please choose only one for your SASLdb database backend." + ewarn "You have both \"gdbm\" and \"berkdb\" in your USE flags." + ewarn "Will default to GNU DB as your SASLdb database backend." + ewarn "If you want to build with Berkeley DB support; hit Control-C now." + ewarn "Change your USE flag -gdbm and emerge again." echo - has_version ">=sys-apps/portage-2.0.50" && ( einfo "It would be best practice to add the set of USE flags that you use for this" einfo "package to the file: /etc/portage/package.use. Example:" - einfo "\`echo \"dev-libs/cyrus-sasl gdbm -berkdb\" >> /etc/portage/package.use\`" - einfo "to build cyrus-sasl with GNU database as your SASLdb backend." + einfo "\`echo \"dev-libs/cyrus-sasl -gdbm berkdb\" >> /etc/portage/package.use\`" + einfo "to build cyrus-sasl with Berkeley database as your SASLdb backend." ) - - exit 1 + echo + ewarn "Waiting 30 seconds before starting..." + ewarn "(Control-C to abort)..." + sleep 30 fi + echo einfo "This version include a "-r" option for saslauthd to instruct it to reassemble" einfo "realm and username into a username of "user@realm" form." @@ -109,7 +113,11 @@ src_compile() { else myconf="${myconf} --disable-sql" fi - if use gdbm ; then + + if use gdbm && use berkdb; then + einfo "build with GNU DB as database backend for your SASLdb." + myconf="${myconf} --with-dblib=gdbm" + elif use gdbm ; then einfo "build with GNU DB as database backend for your SASLdb." myconf="${myconf} --with-dblib=gdbm" elif use berkdb ; then |