Add tokyocabinet support with USE=tokyocabinet, thanks Tim Harder in bug #289010

Package-Manager: portage-2.2.00.14700-prefix/cvs/Darwin powerpc
RepoMan-Options: --force

3 files changed, 24 insertions, 14 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index a45a4363645a..303dfe61f23c 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.157 2009/09/21 11:00:45 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.158 2009/10/20 17:55:10 grobian Exp $
+
+  20 Oct 2009; Fabian Groffen <grobian@gentoo.org> mutt-1.5.20-r6.ebuild:
+  Add tokyocabinet support with USE=tokyocabinet, thanks Tim Harder in bug
+  #289010
 
 *mutt-1.5.20-r6 (21 Sep 2009)
 
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 6e8b8f44d6b8..23c9c0ffa3b5 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -41,6 +41,6 @@ DIST patch-1.5.20.sidebar.20090619.txt 53335 RMD160 4c693b100a320d11ea94aedb75cf
 EBUILD mutt-1.5.16.ebuild 4989 RMD160 2a9ae3ece8f56692e0077b7b3940e607c79f2a14 SHA1 a79646fbfce1e85ecc2f8aaa4728e3c7303185f0 SHA256 55a70c2bb8f144549e6a12a4ba6bcb8796202d4f7be25fb809fefa2848615368
 EBUILD mutt-1.5.19-r1.ebuild 5933 RMD160 67a206bce8e2c652216cab13b619adfa2924f624 SHA1 07f6fc64eed63a635dc92f56f53687c66b8def13 SHA256 13c9eb5b1e3d933a4ede446d4779202f47ec6695dc4ecbd7fef31f78c67e8dfc
 EBUILD mutt-1.5.20-r4.ebuild 8442 RMD160 b8e5a90fa48cb236f31e69dddb63ba7078f2dd5d SHA1 88f66d53c60f431173ac86c7c1ca5888879e9e7c SHA256 ddfda6ec2a6649f05b36e492b5237feaf64546c758e1c8bfd0a600af8b25ee80
-EBUILD mutt-1.5.20-r6.ebuild 8728 RMD160 54ae3dbf2fce219cf77826002f85d614e81db523 SHA1 c164288853e994aea95b5cd3bcb3b57e9effe4aa SHA256 28135f6a2e462e95f7d85f3a2f9ca17903f70d0534a9b57a15f03d49316e8e0c
-MISC ChangeLog 35550 RMD160 5e53ff8936b84c78b0e0984183eb554d73b9a29d SHA1 82d914c85413e3dce6fb3d502d7eb35491706f2f SHA256 4eebb523390f6d3d16658c18491b5f36c0f614fa4cabb256d424634b7c6c57e9
+EBUILD mutt-1.5.20-r6.ebuild 9031 RMD160 a873bf129c3ad56c1902bc78f7550542748f05a2 SHA1 1c6a5d593093a1861e7bae7c9c9b17e4fad48e05 SHA256 cfda3b79cfe4583d8819898d7cde0bf2618fe87dbeb5fd6fbd958d3c70d90d8c
+MISC ChangeLog 35710 RMD160 f192455f3a5d559a11866e70b1b079c175413e82 SHA1 63276cc47c1558bb5d097918466ea478eab51d21 SHA256 3a0c019e44132b494818b544f112d94da2396912c7f8b3129d0d4e97d9284016
 MISC metadata.xml 627 RMD160 e3a3709dcc01a6b9db15ac7836c75f8dbe3456ea SHA1 92be48491c090c3e6968812b58dde85961af3b8f SHA256 c30f8f2126be6b11b3e0d0e2f6413ce7ab2ca2613856f558bec7689e5a9ada0b
diff --git a/mail-client/mutt/mutt-1.5.20-r6.ebuild b/mail-client/mutt/mutt-1.5.20-r6.ebuild
index 919d0c149c71..1e59ff8d9d5c 100644
--- a/mail-client/mutt/mutt-1.5.20-r6.ebuild
+++ b/mail-client/mutt/mutt-1.5.20-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r6.ebuild,v 1.1 2009/09/21 11:00:45 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r6.ebuild,v 1.2 2009/10/20 17:55:10 grobian Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -22,15 +22,18 @@ SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
 	sidebar? (
 		http://www.lunar-linux.org/~tchan/mutt/${SIDEBAR_PATCH_N}
 	)"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl vanilla"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet vanilla"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 RDEPEND=">=sys-libs/ncurses-5.2
-	qdbm?    ( dev-db/qdbm )
-	!qdbm?   (
-		gdbm?  ( sys-libs/gdbm )
-		!gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+	tokyocabinet?  ( dev-db/tokyocabinet )
+	!tokyocabinet? (
+		qdbm?  ( dev-db/qdbm )
+		!qdbm? (
+			gdbm?  ( sys-libs/gdbm )
+			!gdbm? ( berkdb? ( >=sys-libs/db-4 ) )
+		)
 	)
 	imap?    (
 		gnutls?  ( >=net-libs/gnutls-1.0.17 )
@@ -166,18 +169,21 @@ src_compile() {
 
 	# mutt prioritizes gdbm over bdb, so we will too.
 	# hcache feature requires at least one database is in USE.
-	if use qdbm; then
+	if use tokyocabinet; then
+		myconf="${myconf} --enable-hcache \
+			--with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
+	elif use qdbm; then
 		myconf="${myconf} --enable-hcache \
-		--with-qdbm --without-gdbm --without-bdb"
+			--without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
 	elif use gdbm ; then
 		myconf="${myconf} --enable-hcache \
-			--without-qdbm --with-gdbm --without-bdb"
+			--without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
 	elif use berkdb; then
 		myconf="${myconf} --enable-hcache \
-			--without-gdbm --without-qdbm --with-bdb"
+			--without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
 	else
 		myconf="${myconf} --disable-hcache \
-			--without-qdbm --without-gdbm --without-bdb"
+			--without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
 	fi
 
 	# there's no need for gnutls, ssl or sasl without socket support