Revbump, adding several fixes from upstream

Package-Manager: portage-2.2.01.21418-prefix/cvs/Darwin i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

3 files changed, 22 insertions, 17 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 38addf98b356..653f9432db30 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.233 2012/08/25 12:15:04 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.234 2012/12/07 18:43:39 grobian Exp $
+
+*mutt-1.5.21-r12 (07 Dec 2012)
+
+  07 Dec 2012; Fabian Groffen <grobian@gentoo.org> +mutt-1.5.21-r12.ebuild,
+  -mutt-1.5.21-r9.ebuild:
+  Revbump, adding several fixes from upstream
 
 *mutt-1.5.21-r11 (25 Aug 2012)
 
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index b913cd4850b3..fede488945a3 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -4,18 +4,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-r12.tar.bz2 88492 SHA256 7b9c0ad07b29918a6a967ff39fa43524229d4a5aeb77707daad0e68853520d94 SHA512 ca4a7bdc8097e68cbdb92552bbeeef122ab7b4b121f66b4fb0c5da98b85b05c56cefd513611092e9397901e9b1940e50106d30676e129890347b0980166f0dea WHIRLPOOL bd217e3577e4849c8ed6131dbcae30708f36adce770603581934a0415f547a3fe21abf324ba599ff74d1a6d316ac648201a43a6b95108b6fcf3493f2a07d5fc5
 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.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-r9.ebuild 7868 SHA256 8487a07bc99d7944684704f55e71a3abc15dafb7815722c96562562cc0014274 SHA512 621e46a1437e7b0a1b98ffb48a099ab430ec99ab6d5e95ad0e02847ea96db72b383d3fa5af0bc448dee43b5821f679ab161e7f4f86c6932eec618048bc6504ca WHIRLPOOL 2347a3d759b8a21207d140102e95457d137c55045e0fe630479c2524ba9075cabd089fb6b5bbf4d82d2bac9a7d4e5e795544aef1047c3dabca200d693398ee74
-MISC ChangeLog 52070 SHA256 4309f5d08f1946dda2acb28178eb170e7b81068a359eea7f3e1cbdfcd545fbf4 SHA512 7b824ce79471ce1d7a73a4dfb91d335819f5c2e7d13f29f93308f8ebe8e8f036b0785ff2ba93b523687226b53ed32db4c8420122afb67103e9506d9b2178b7c3 WHIRLPOOL 7c40f6c7bbd94be3c18812e6493ec6a110ca02e84d9e967c74f1a5302a21352a9a362f525bf87580b26dbf3a89c12fdc4d62b9cceb64f6d4e42f740ada5a7872
+EBUILD mutt-1.5.21-r12.ebuild 7842 SHA256 a053b383bf8d27c0c497c0199add3a7105fedc4775a09fe4fea422b0e049ba3c SHA512 df30bebde33d19b5e90921a998e80382ab549ea38f83e49d9b417cb09aee12315fc8377ff108e528a346f7727f62605dff30aaffb0a9e310447ba52685ff8053 WHIRLPOOL 8b441fa73f281fc3ccf893350975bf52c968ff0f35f658daa6f870cf8068d47ed08c5bc9f03004bd45ad3e5ef9c08a41add0dae3fefd034ee00a2d88df3f32bf
+MISC ChangeLog 52251 SHA256 192bb0300a92b899475eac945e2bcf05b8b0fb0bde9326b2e546b162e9c9063b SHA512 ce585ec27bd2283f6bddc41fb25f48cceee262ba92a96ff533019b79d02051ef44e00595df12db37bc96c3a5fb4dfc0bb7bc84b8aebe05e61e045cf35255e95c WHIRLPOOL 19ba9fcb5d1dd6fc7ea165d51140eae47c1110e4a4db75088366047bea4d9dfdf5cb39f29835aaec26dac9da19819aa0f16c9699abe6c8de71094a0d8e1fa922
 MISC metadata.xml 650 SHA256 b7ca8aa383b947a5e90eafab3839a9ed2a8c4f36f4890fec19636d774ccf5320 SHA512 26cb0a77d35e30432a88cf487d61da45c52967e8327f605a25f97a455fbb0eb518a44e589e140fa55cd7610b8fd22861c0149ef4ebaadd78173cbf8431adee5a WHIRLPOOL e4a73bbce432f77cc336bc93fed13ac6fc4e0e651643cc06402488383c5297a360c59a90e7e67667e2b48a564f10e5169282fe053a5426ee5f186338eddd2cee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (Darwin)
 
-iEYEAREIAAYFAlA4wc0ACgkQX3X2B8XHTomVsgCgnNHpFALfFeIaF0Wes+EmGavr
-UowAnjb93PffpTvjXUp1HODcMr5iMhYo
-=2/2W
+iEYEAREIAAYFAlDCONwACgkQX3X2B8XHTolatQCeMBVsLPRfleJynLVJa0uX5z6O
+h78An01hMpra375x24IA55qWMGPCnyqs
+=zWUp
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/mutt-1.5.21-r9.ebuild b/mail-client/mutt/mutt-1.5.21-r12.ebuild
index fe6392cf010b..ecf7775f0696 100644
--- a/mail-client/mutt/mutt-1.5.21-r9.ebuild
+++ b/mail-client/mutt/mutt-1.5.21-r12.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 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-r9.ebuild,v 1.1 2012/04/28 15:05:01 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.21-r12.ebuild,v 1.1 2012/12/07 18:43:39 grobian Exp $
 
 EAPI="3"
 
 inherit eutils flag-o-matic autotools
 
-PATCHSET_REV="-r12"
+PATCHSET_REV="-r15"
 
 DESCRIPTION="A small but very powerful text-based mail client"
 HOMEPAGE="http://www.mutt.org/"
@@ -79,8 +79,6 @@ src_prepare() {
 	# 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
 	epatch "${PATCHDIR}"/emptycharset-segfault.patch
 	epatch "${PATCHDIR}"/gpgkeyverify-segfault.patch
 	# same category, but functional bits
@@ -100,13 +98,14 @@ src_prepare() {
 		epatch "${PATCHDIR}"/sidebar-dotpathsep.patch
 	fi
 
+	local upatches=
+	# allow user patches
+	epatch_user && upatches=" with user patches"
+
 	# patch version string for bug reports
-	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}"')"/' \
+	sed -i -e 's/"Mutt %s (%s)"/"Mutt %s (%s, Gentoo '"${PVR}${upatches}"')"/' \
 		muttlib.c || die "failed patching in Gentoo version"
 
-	# allow user patches
-	epatch_user
-
 	# many patches touch the buildsystem, we always need this
 	AT_M4DIR="m4" eautoreconf
 
@@ -195,7 +194,7 @@ src_configure() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install || die "install failed"
 	if use mbox; then
 		insinto /etc/mutt
 		newins "${FILESDIR}"/Muttrc.mbox Muttrc
@@ -210,7 +209,7 @@ src_install() {
 
 	# A man-page is always handy, so fake one
 	if use !doc; then
-		make -C doc DESTDIR="${D}" muttrc.man || die
+		emake -C doc DESTDIR="${D}" muttrc.man || die
 		# make the fake slightly better, bug #413405
 		sed -e 's#@docdir@/manual.txt#http://www.mutt.org/doc/devel/manual.html#' \
 			-e 's#in @docdir@,#at http://www.mutt.org/,#' \