Cleanup logic for USE=sidebar. Add big fat warnings that USE=sidebar implies USE=vanilla, and that USE=vanilla excludes the use of zillions of bugfixes applied upstream since the last Mutt release. This should make things clearer for e.g. Bug #326197.

Package-Manager: portage-2.2.00.15842-prefix/cvs/Darwin powerpc

3 files changed, 30 insertions, 17 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 3fea2f4748c1..05d4a67cc1f6 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.186 2010/06/12 09:15:16 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.187 2010/07/02 08:14:30 grobian Exp $
+
+  02 Jul 2010; Fabian Groffen <grobian@gentoo.org> mutt-1.5.20-r15.ebuild:
+  Cleanup logic for USE=sidebar. Add big fat warnings that USE=sidebar
+  implies USE=vanilla, and that USE=vanilla excludes the use of zillions of
+  bugfixes applied upstream since the last Mutt release.
 
   12 Jun 2010; Fabian Groffen <grobian@gentoo.org> mutt-1.5.20-r15.ebuild,
   +files/mutt-1.5.20-crash-on-invalid-limit-pattern.patch:
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index b3d8c603a79d..c2e2a421592e 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -15,7 +15,7 @@ DIST mutt-1.5.20.tar.gz 3635047 RMD160 df582f79364b9fd70a0001e76a119d8f78275ebb
 DIST patch-1.5.20.sidebar.20090619.txt 53335 RMD160 4c693b100a320d11ea94aedb75cff63d9f6cfb3f SHA1 d72355e39674bb4f892e4af3b84fe49c94415487 SHA256 6e925319adbfa0ba7f120f0ef4ddc62f99b1dc8f6a8b5bdc31dd8a0040aded1b
 EBUILD mutt-1.5.20-r10.ebuild 7958 RMD160 c185ac0ab4fa7cafc2f1e645b5d445c133db59bb SHA1 a87fd09bac2321e30748439b2bbc717254076f54 SHA256 d93b2daf5926e01ba4906720fb86f7285cfa29b7877a32f1aeaababb00e35837
 EBUILD mutt-1.5.20-r13.ebuild 7710 RMD160 1a0685395beda44ab9954552a1cb12b670cb2184 SHA1 ad9e3c4643f3be5ad1bc3eaff7742bf68607a3fc SHA256 0171a87a7d880de9f276c97452655ddd87ba6ae5c81c2dbe61dc10ec1c2363cc
-EBUILD mutt-1.5.20-r15.ebuild 8119 RMD160 6661797c49e62c9a7fde4ebace79025670fd9b52 SHA1 5a3fdc5bba6680e4420a70f73a68318a9feda254 SHA256 ebbc1c09486a702c5da0c33ba3c760653f46e4b81d42bc0b8047fb56cf973d66
+EBUILD mutt-1.5.20-r15.ebuild 8625 RMD160 7cc7568084b416f67c35fcee0014d565dfbc1166 SHA1 0eb52ada39bbf8e72fe1f6e77e1e62e232f160fc SHA256 1cdf8f3494220ae27eb11391884aa1b0afc6fb640c5a2d6fc52fdc337db2e49d
 EBUILD mutt-1.5.20-r6.ebuild 7280 RMD160 db5a40d2e845def3f4819de2d8272049215da0f1 SHA1 86e2c567618d1e6753806790072efb2811515348 SHA256 4999238ee8c6d875179d49f1b2b32e82c50b6179b8b4f0f6f97948910f55de11
-MISC ChangeLog 43661 RMD160 c0d1b6682909c4ccebe47e4867266d15fea1d2f0 SHA1 5adc704f3da95796bc76c71e0e30fdd60c7dbedc SHA256 577825e5e6882b8fad2216d88cb5fcb4d5bf648f26a7a69cc758840991dcc821
+MISC ChangeLog 43941 RMD160 c329145fc6530aa1f955c053baca6d37260f8615 SHA1 1786ae78718d5c190b01e9043303f46a80cf838a SHA256 85385a508769c14a0317bcc0938abb7d22c90eb6c10f47560d4813d3f664a272
 MISC metadata.xml 650 RMD160 499b30bbf757e578b8546c72c9d22e033bad1fd0 SHA1 0ad0c9dc1d2a2a1b9da1e32d2f3e056e5b0e6d98 SHA256 b7ca8aa383b947a5e90eafab3839a9ed2a8c4f36f4890fec19636d774ccf5320
diff --git a/mail-client/mutt/mutt-1.5.20-r15.ebuild b/mail-client/mutt/mutt-1.5.20-r15.ebuild
index 49766cc6b92a..19263d0109c5 100644
--- a/mail-client/mutt/mutt-1.5.20-r15.ebuild
+++ b/mail-client/mutt/mutt-1.5.20-r15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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-r15.ebuild,v 1.2 2010/06/12 09:15:16 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.20-r15.ebuild,v 1.3 2010/07/02 08:14:30 grobian Exp $
 
 EAPI="3"
 
@@ -83,7 +83,21 @@ src_prepare() {
 		epatch "${FILESDIR}"/mutt-1.5.18-solaris-ncurses-chars.patch
 	epatch "${FILESDIR}"/mutt-1.5.20-gpgme-1.2.0.patch
 
-	if use !vanilla ; then
+	local pristine=$(use vanilla && echo yes)
+	if use sidebar && use !vanilla ; then
+		ewarn "due to the complexity of the sidebar patch and requests"
+		ewarn "from the author of the patch, USE=sidebar implies USE=vanilla"
+		pristine=yes
+	fi
+	if [[ ${pristine} == yes ]] ; then
+		ewarn "USE=vanilla excludes any post-release or feature patches!"
+		use sidebar && ewarn "(except the sidebar patch you requested)"
+		ewarn "you are very likely to encounter known bugs due to upstream's"
+		ewarn "\"almost never\" release policy, please only use USE=vanilla"
+		ewarn "if you have to test an (almost) pristine mutt tarball."
+	fi
+
+	if [[ ${pristine} != yes ]] ; then
 		# fixes that are not yet upstream, or that upstream doesn't like
 		epatch "${FILESDIR}"/mutt-1.5.20-dont-reveal-bbc.patch
 		epatch "${FILESDIR}"/mutt-1.5.20-realpath-slowness.patch
@@ -102,18 +116,12 @@ src_prepare() {
 
 		# the big feature patches that upstream doesn't want to include, but
 		# nearly every distro has due to their usefulness
-		if use !sidebar ; then
-			use nntp || rm "${PATCHDIR}"/06-nntp.patch
-			for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
-				epatch "${p}"
-			done
-		fi
-	fi
-
-	if use sidebar ; then
-		use vanilla || \
-			ewarn "the sidebar patch is only applied to a vanilla mutt tree"
-		epatch "${DISTDIR}"/${SIDEBAR_PATCH_N}
+		use nntp || rm "${PATCHDIR}"/06-nntp.patch
+		for p in "${PATCHDIR}"/[0-9][0-9]-*.patch ; do
+			epatch "${p}"
+		done
+	else
+		use sidebar && epatch "${DISTDIR}"/${SIDEBAR_PATCH_N}
 	fi
 
 	AT_M4DIR="m4" eautoreconf