Revbump with new patches from upstream. Should contain fix for #359257, adds kerberos support, bug #476070

Package-Manager: portage-2.2.01.22288-prefix/cvs/SunOS i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

4 files changed, 23 insertions, 245 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 633d6ba67690..c280ad8ed2bd 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.245 2013/05/02 07:47:35 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.246 2013/09/09 19:14:05 grobian Exp $
+
+*mutt-1.5.21-r13 (09 Sep 2013)
+
+  09 Sep 2013; Fabian Groffen <grobian@gentoo.org> +mutt-1.5.21-r13.ebuild,
+  -mutt-1.5.21-r1.ebuild, -mutt-1.5.21-r11.ebuild:
+  Revbump with new patches from upstream.  Should contain fix for #359257, adds
+  kerberos support, bug #476070
 
   02 May 2013; Fabian Groffen <grobian@gentoo.org> mutt-1.5.21-r12.ebuild:
   Fix for automake-1.13
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 1368eadaba4d..4dcb933cb591 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -3,19 +3,18 @@ Hash: SHA256
 
 AUX Muttrc 667 SHA256 932940db69c951caaa87a17ee98a8e2262aeadf1e978f6d671b642184c5d545f SHA512 b64d6e857f0c7de2e2e5b23cecd869f8a9807aa827ad6221e3c5864b2a31fb0136aeaf09ffdb2549645507fe92f724774a80395b6ab2345068903f5ee1269f29 WHIRLPOOL 91275eb31729bf72bcc29eaa61f72c88f8a75bc5e8bf2220b7d9aaf1eb9211335b1cbc481f906325dc36d30853c94330a8b59b3d4707d269f2c075c2332166bb
 AUX Muttrc.mbox 486 SHA256 10b251f88ccc5d4c95c96ab17b6ab6a30a16d6590ab896a60037f869fc4d44a0 SHA512 aece9a734d292b6f638d2a0dd39f20d9894b4bb6e6888da606a49274faef9c1864e98eec907ffa7742af58d46456e46b8945d2d47c8b89fc95daa2a8833d3e90 WHIRLPOOL 0bb72d4f1c6d33ececd928dcbbc517be048414beabf2bc488dd3b534633c5b8e30cf3ebe6bc86d76abd84f63657c4fbae05ea61680c4d1b9323ccefaa8b74b89
-DIST mutt-1.5.21-gentoo-patches-r1.tar.bz2 68796 SHA256 89b67ad863941aacdc2b1c9d3fd4f90f7b0cb50bd5fc10c9284a82ce6e7687c0 SHA512 94b72f0fd2fe9bb5b113849616981df273195781230d438a41db99b38171e8ecc1747144504997690978c7a7b9d9fc89958e94f1d4c352ba9e8737fafb050735 WHIRLPOOL 0c7ef62e5bcc6cca4753b3894e0992690b59b8c36c88164cbcb4308e751f78e861086ae7a9e84cabbaf10a79b41fceeb5919a796e6a6783e1092406c85cb730b
-DIST mutt-1.5.21-gentoo-patches-r14.tar.bz2 90770 SHA256 cad13ef042937f04bd159c2bd01ee510df0c83bc59bd5359b644cfbe5b424ba5 SHA512 edacda53a9488a30c88797b8e5c27792f0216768821f8786557c39541bcb353e1e5d29061c63b52cbe397b0e60f2c7b186016ef65edc60b0903756e4e040040e WHIRLPOOL 7512289a1a6674f142650142e4127e2e2def985c66b2527560ef96e5042ad7ac9301e947f6f8b34cc6c8d3a11823b1af6524b1841c186d7a7e78e9c1a8192f62
 DIST mutt-1.5.21-gentoo-patches-r15.tar.bz2 96063 SHA256 01182bcc23a916a72c19a0cf67a4fb52e7bc4d2b65fb1531c076c8b4c74fdc12 SHA512 8b49cc69788fb0cc886dde0f3e2a5c1d421650cb5ad25310429b4dc82f15591c2b4a1fc97f76b6f2566fc12e4224986d92cf72f92c7b4617f35bb77755485734 WHIRLPOOL aeb2c4a82d8ff87364926022b919334bcb472bae20334544f163ab0435457a462bd46c8cf4d8bdc27c71c59108907a94887ad868a548cf3ec08d7a1fbf593bca
+DIST mutt-1.5.21-gentoo-patches-r16.tar.bz2 120095 SHA256 cd0d548e428d27b4f53d347d1aeed1461ecce31d6815b535fe5257ee2ccc199f SHA512 364853593c84e538d727993dd934b26055329a227c71c27f2c17511743e1c7e065c11a641e35e70c6e5ea0a7cd73360e2812214927a35d23ff86e45242fe6548 WHIRLPOOL b60a1dbf7cba3b556ce73d7a667eef36a8734129edef5ebe684bc847b1833e60cc482bd2a9bd19da2e6f3e1770978892520522362653f094ca0148b8e7bc29cd
 DIST mutt-1.5.21.tar.gz 3716886 SHA256 2141f36e8d0f4f71c9ca6780001e7cc679fe313e643953fc07f001223e67c4a0 SHA512 077dd8a0dd586badb836b04680052bfadd8574130f27ab11ce9cdbbe8bd5f365e0e79ae3669fad52b2754bc7a66006b242308db1f8d90edd10f6807d7c1b2d12 WHIRLPOOL 818b6d2edfdb3c56475a51f1b8911263f006f0d8a62064ad6dcabc952183c261b920a88a9afd85f3176cc96cb46349c8e4f0110edb228ec412c4d3e2eaebe5c9
-EBUILD mutt-1.5.21-r1.ebuild 7210 SHA256 a0a12e58c0278662869b49be31dc2f340505a48a9210fd9089f18237b86e76ec SHA512 d3b535ca7f3c2544258d04157b072fc68cb77166a513a3cac2e0f0ce0987c6e730f8e83f8976a7b935d85e382b8c3dbda43e05c50066a851e3a0046723eeba73 WHIRLPOOL 2a8c639bc103f91860aedfa918f0b200680a04ff218e3ae52c6399157a08f82dd1fe852b77a0a25b10ca12d497f637ce1c8720c1054f6640bdf737c9b6aa9d39
-EBUILD mutt-1.5.21-r11.ebuild 7882 SHA256 5bf18ccffa5fe33d5f438b32c1717ca6d4964893423479fd568cf4ea404550ab SHA512 496427e08d4235271fdcd1445bd81a01b050e4e50b6b25ac65c831ebbedc12ef3c0c397b308496db84366f08820dc8a24509bd92b53291b51af87332151e4fe5 WHIRLPOOL 9baff74c8ce0dca2442f9d3454a5167151096dca315764197e76afe4ec699fffd8ce25fc6b749dd87cf50dcb0ef06c1b10304ecdafc276cbbac8904d7d3da017
 EBUILD mutt-1.5.21-r12.ebuild 7888 SHA256 8cb1fd474f1985a9fbed705cc51a35958364070c60fbe98508c9df163b7a0c73 SHA512 63f00130ecbf6de35d5d099060847f4ed7100067a93da8269e6ef1430ce0f618493e796a684c73f1f80409c602e4aa15299d891d5da5a9ccdab362b0771349b5 WHIRLPOOL 10bb2aa302630a50762755eb29a96dcb4d30a4e42ad39a045a8bf6938594feb82c077eb7800ca3b77f49784db2ecc7010bfb980b68af58f8b2c375a1114eeebf
-MISC ChangeLog 53474 SHA256 618e2f0fa5a20b2de40a1b2e4d575ca201d5456cdf0833a1807fa31fdfa43981 SHA512 f571c498d2806f75679e05dc3699b2d54fa6754e5ad51e506f00841bbfdd6f9c88e787ae2976eaef3e2bafc25658236c99da71a3176e95c3cea224df73e23197 WHIRLPOOL 6ec82fd6dad5fd2596d010dbd306ee119e58dd91f967204e07a46727be0194342d02776082ed4b48e1d360b26f0583051a6ee21d53593e3c0f1e86feee354332
+EBUILD mutt-1.5.21-r13.ebuild 7771 SHA256 0f029bfd6ee94fc312f251da99298027be6900f34f2a6701777300ecf6f049c4 SHA512 6d510116d8398c89356d86e5d94898e161d7df533f5d0515fda9425a874b9e28f965874669090f4ea292561e1e03996874031a05b1353ba809a10dd87f412dc6 WHIRLPOOL c853245f0b022fd304de563339c4d584151a8b995b4defb6fe83fdb9a8aa770eac4d8b7be113e6324f7289537879378cda95bec254a4b6648435742fc6ceb7fd
+MISC ChangeLog 53746 SHA256 19d125f55eb58c055e5d2f30674a617986a168b8d28a898b8b81c02bb2011c0b SHA512 16fbf74653125d0ccf1622dbff620139b9d9a48c1a9bdd1d47ec83f13c43adf01672b4f2eb5e1a76695c7c0efda51457f31c604d20907d0f6e8da6ac04209ba7 WHIRLPOOL cde0fc59cbee349078807a58bd544a2fde3d1b01a9b5eb53bb445b83d53500b02a1dd49100261fb0b7e62898d5ba9a00035b0d1b9e4f7f793591b0b5fdb7fdef
 MISC metadata.xml 650 SHA256 b7ca8aa383b947a5e90eafab3839a9ed2a8c4f36f4890fec19636d774ccf5320 SHA512 26cb0a77d35e30432a88cf487d61da45c52967e8327f605a25f97a455fbb0eb518a44e589e140fa55cd7610b8fd22861c0149ef4ebaadd78173cbf8431adee5a WHIRLPOOL e4a73bbce432f77cc336bc93fed13ac6fc4e0e651643cc06402488383c5297a360c59a90e7e67667e2b48a564f10e5169282fe053a5426ee5f186338eddd2cee
+MISC mutt-1.5.21-r13.ebuild.orig 7706 SHA256 782120007a964a72ebb9888a4c6c299c61b39c47544c80030253f37cd71bf7f4 SHA512 1c823c4bc48c7303421364aee5a6ad0f3fb97ee741d40247fed315c7aaa5ad9a4582aa0d0bb31dafa8d2bce1253a9af88fb77d1bb51f98b32e1071c36753cbea WHIRLPOOL c9627a5261a1e28628d98bf43f87dfb7be0b8afc8e332b1af8845f1847539a97efc67f905855694dd25e493ad0c925e861a927ed3b05f96006bacdaec67ca3c6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (SunOS)
+Version: GnuPG v2.0.21 (SunOS)
 
-iEYEAREIAAYFAlGCGhwACgkQX3X2B8XHToknAACeJTCz4Te8icKZcSICp5gqFPTZ
-jyUAn0sfb+7ElCUq3CVUDmr9xJk3UBpt
-=03Fi
+iEYEAREIAAYFAlIuHgYACgkQX3X2B8XHTomWpQCff+UHm2/WqBcG2OZNi27WPG7n
+WFMAn2CSoZxssmWgDmYuVPyuDuqn9via
+=OHDN
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/mutt-1.5.21-r1.ebuild b/mail-client/mutt/mutt-1.5.21-r1.ebuild
deleted file mode 100644
index dd39484cc4ad..000000000000
--- a/mail-client/mutt/mutt-1.5.21-r1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r1.ebuild,v 1.11 2011/08/17 20:11:31 grobian Exp $
-
-EAPI="3"
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r1"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org"
-SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
-	mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
-	http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl sidebar smime smtp ssl tokyocabinet"
-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
-	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 )
-		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
-		sasl?    ( >=dev-libs/cyrus-sasl-2 )
-	)
-	pop?     (
-		gnutls?  ( >=net-libs/gnutls-1.0.17 )
-		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
-		sasl?    ( >=dev-libs/cyrus-sasl-2 )
-	)
-	smtp?     (
-		gnutls?  ( >=net-libs/gnutls-1.0.17 )
-		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
-		sasl?    ( >=dev-libs/cyrus-sasl-2 )
-	)
-	idn?     ( net-dns/libidn )
-	gpg?   ( >=app-crypt/gpgme-0.9.0 )
-	smime?   ( >=dev-libs/openssl-0.9.6 )
-	app-misc/mime-types"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	doc? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m www-client/elinks )
-	)"
-
-PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
-
-src_prepare() {
-	# Post-release hot-fixes grabbed from HG, this is what all following
-	# patches are based on in my Mercurial patchqueue (mq).
-	# If you ever take over or need to modify patches here, just check
-	# out the gentoo branch(es) of Gentoo's Mutt Mercurial clone, and
-	# the patchqueue as it'll save you a lot of work.
-	# http://prefix.gentooexperimental.org:8000/mutt/
-	# http://prefix.gentooexperimental.org:8000/mutt-patches/
-	for rev in $(eval echo {0..${PR#r}}) ; do
-		local revpatch="${PATCHDIR}"/mutt-gentoo-${PV}-r${rev}.patch
-		[[ -e ${revpatch} ]] && \
-			epatch "${revpatch}"
-	done
-
-	# this patch is non-generic and only works because we use a sysconfdir
-	# different from the one used by the mailbase ebuild
-	use prefix && epatch "${PATCHDIR}"/prefix-mailcap.patch
-
-	# must have fixes to compile or behave correctly, upstream
-	# ignores, disagrees or simply doesn't respond/apply
-	epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
-	epatch "${PATCHDIR}"/interix-btowc.patch
-	epatch "${PATCHDIR}"/solaris-ncurses-chars.patch
-	epatch "${PATCHDIR}"/gpgme-1.2.0.patch
-	# same category, but functional bits
-	epatch "${PATCHDIR}"/dont-reveal-bbc.patch
-
-	# the big feature patches that upstream doesn't want to include, but
-	# nearly every distro has due to their usefulness
-	for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
-		epatch "${p}"
-	done
-
-	# we conditionalise this one, simply because it has considerable
-	# impact on the code
-	use sidebar && epatch "${PATCHDIR}"/sidebar.patch
-
-	# patch version string for bug reports
-	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
-		muttlib.c || die "failed patching in Gentoo version"
-
-	# many patches touch the buildsystem, we always need this
-	AT_M4DIR="m4" eautoreconf
-
-	# the configure script contains some "cleverness" whether or not to setgid
-	# the dotlock program, resulting in bugs like #278332
-	sed -i -e 's/@DOTLOCK_GROUP@//' \
-		Makefile.in || die "sed failed"
-
-	# don't just build documentation (lengthy process, with big dependencies)
-	if use !doc ; then
-		sed -i -e '/SUBDIRS =/s/doc//' Makefile.in || die
-	fi
-}
-
-src_configure() {
-	local myconf="
-		$(use_enable crypt pgp) \
-		$(use_enable debug) \
-		$(use_enable gpg gpgme) \
-		$(use_enable imap) \
-		$(use_enable nls) \
-		$(use_enable nntp) \
-		$(use_enable pop) \
-		$(use_enable smime) \
-		$(use_enable smtp) \
-		$(use_with idn) \
-		$(use_with !nntp mixmaster) \
-		--enable-compressed \
-		--enable-external-dotlock \
-		--enable-nfs-fix \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-curses \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \
-		--with-regex \
-		--with-exec-shell=${EPREFIX}/bin/sh"
-
-	case $CHOST in
-		*-solaris*)
-			# Solaris has no flock in the standard headers
-			myconf="${myconf} --enable-fcntl --disable-flock"
-		;;
-		*)
-			myconf="${myconf} --disable-fcntl --enable-flock"
-		;;
-	esac
-
-	# mutt prioritizes gdbm over bdb, so we will too.
-	# hcache feature requires at least one database is in USE.
-	if use tokyocabinet; then
-		myconf="${myconf} --enable-hcache \
-			--with-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
-	elif use qdbm; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --with-qdbm --without-gdbm --without-bdb"
-	elif use gdbm ; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --with-gdbm --without-bdb"
-	elif use berkdb; then
-		myconf="${myconf} --enable-hcache \
-			--without-tokyocabinet --without-qdbm --without-gdbm --with-bdb"
-	else
-		myconf="${myconf} --disable-hcache \
-			--without-tokyocabinet --without-qdbm --without-gdbm --without-bdb"
-	fi
-
-	# there's no need for gnutls, ssl or sasl without socket support
-	if use pop || use imap || use smtp ; then
-		if use gnutls; then
-			myconf="${myconf} --with-gnutls"
-		elif use ssl; then
-			myconf="${myconf} --with-ssl"
-		fi
-		# not sure if this should be mutually exclusive with the other two
-		myconf="${myconf} $(use_with sasl)"
-	else
-		myconf="${myconf} --without-gnutls --without-ssl --without-sasl"
-	fi
-
-	if use mbox; then
-		myconf="${myconf} --with-mailpath=${EPREFIX}/var/spool/mail"
-	else
-		myconf="${myconf} --with-homespool=Maildir"
-	fi
-
-	econf ${myconf} || die "configure failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	if use mbox; then
-		insinto /etc/mutt
-		newins "${FILESDIR}"/Muttrc.mbox Muttrc
-	else
-		insinto /etc/mutt
-		doins "${FILESDIR}"/Muttrc
-	fi
-
-	# A newer file is provided by app-misc/mime-types. So we link it.
-	rm "${ED}"/etc/${PN}/mime.types
-	dosym /etc/mime.types /etc/${PN}/mime.types
-
-	# A man-page is always handy
-	if use !doc; then
-		cp doc/mutt.man mutt.1
-		cp doc/muttbug.man flea.1
-		doman mutt.1 flea.1
-	else
-		# nuke manpages that should be provided by an MTA, bug #177605
-		rm "${ED}"/usr/share/man/man5/{mbox,mmdf}.5 \
-			|| ewarn "failed to remove files, please file a bug"
-	fi
-
-	if use !prefix ; then
-		fowners root:mail /usr/bin/mutt_dotlock
-		fperms g+s /usr/bin/mutt_dotlock
-	fi
-
-	dodoc BEWARE COPYRIGHT ChangeLog NEWS OPS* PATCHES README* TODO VERSION
-}
-
-pkg_postinst() {
-	echo
-	elog "If you are new to mutt you may want to take a look at"
-	elog "the Gentoo QuickStart Guide to Mutt E-Mail:"
-	elog "   http://www.gentoo.org/doc/en/guide-to-mutt.xml"
-	echo
-}
diff --git a/mail-client/mutt/mutt-1.5.21-r11.ebuild b/mail-client/mutt/mutt-1.5.21-r13.ebuild
index fff444bc58d5..580a42e4deb1 100644
--- a/mail-client/mutt/mutt-1.5.21-r11.ebuild
+++ b/mail-client/mutt/mutt-1.5.21-r13.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r11.ebuild,v 1.1 2012/08/25 12:15:04 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r13.ebuild,v 1.1 2013/09/09 19:14:05 grobian Exp $
 
 EAPI="3"
 
 inherit eutils flag-o-matic autotools
 
-PATCHSET_REV="-r14"
+PATCHSET_REV="-r16"
 
 DESCRIPTION="A small but very powerful text-based mail client"
 HOMEPAGE="http://www.mutt.org/"
 SRC_URI="ftp://ftp.mutt.org/mutt/devel/${P}.tar.gz
 	mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
 	http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2"
-IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap mbox nls nntp pop qdbm sasl selinux sidebar smime smtp ssl tokyocabinet"
+IUSE="berkdb crypt debug doc gdbm gnutls gpg idn imap kerberos mbox nls nntp pop qdbm sasl selinux sidebar smime smtp ssl tokyocabinet"
 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"
+KEYWORDS="~alpha ~amd64 ~arm ~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
 	tokyocabinet?  ( dev-db/tokyocabinet )
 	!tokyocabinet? (
@@ -31,6 +31,7 @@ RDEPEND=">=sys-libs/ncurses-5.2
 		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
 		sasl?    ( >=dev-libs/cyrus-sasl-2 )
 	)
+	kerberos? ( virtual/krb5 )
 	pop?     (
 		gnutls?  ( >=net-libs/gnutls-1.0.17 )
 		!gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) )
@@ -78,10 +79,6 @@ src_prepare() {
 	# must have fixes to compile or behave correctly, upstream
 	# ignores, disagrees or simply doesn't respond/apply
 	epatch "${PATCHDIR}"/bdb-prefix.patch # fix bdb detection
-	epatch "${PATCHDIR}"/interix-btowc.patch
-	epatch "${PATCHDIR}"/gpgme-1.2.0.patch
-	epatch "${PATCHDIR}"/emptycharset-segfault.patch
-	epatch "${PATCHDIR}"/gpgkeyverify-segfault.patch
 	# same category, but functional bits
 	epatch "${PATCHDIR}"/dont-reveal-bbc.patch
 
@@ -133,6 +130,7 @@ src_configure() {
 		$(use_enable smime) \
 		$(use_enable smtp) \
 		$(use_with idn) \
+		$(use_with kerberos gss) \
 		$(use_with !nntp mixmaster) \
 		--enable-compressed \
 		--enable-external-dotlock \