Remove 1.5.23 again, upstream messed up their development and removed all features introduced after 1.5.22 release tag

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

3 files changed, 9 insertions, 258 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index b31d9eb7ab59..d7fccae6c77c 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-client/mutt
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.263 2014/04/06 15:11:52 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.264 2014/04/06 15:47:02 grobian Exp $
+
+  06 Apr 2014; Fabian Groffen <grobian@gentoo.org> -mutt-1.5.23.ebuild:
+  Remove 1.5.23 again, upstream messed up their development and removed all
+  features introduced after 1.5.22 release tag
 
 *mutt-1.5.23 (06 Apr 2014)
 
diff --git a/mail-client/mutt/Manifest b/mail-client/mutt/Manifest
index 3fcc444f4524..873933f38304 100644
--- a/mail-client/mutt/Manifest
+++ b/mail-client/mutt/Manifest
@@ -10,19 +10,16 @@ DIST mutt-1.5.21-gentoo-patches-r17.tar.bz2 120189 SHA256 0e472fbf6bda19ed1432b2
 DIST mutt-1.5.21.tar.gz 3716886 SHA256 2141f36e8d0f4f71c9ca6780001e7cc679fe313e643953fc07f001223e67c4a0 SHA512 077dd8a0dd586badb836b04680052bfadd8574130f27ab11ce9cdbbe8bd5f365e0e79ae3669fad52b2754bc7a66006b242308db1f8d90edd10f6807d7c1b2d12 WHIRLPOOL 818b6d2edfdb3c56475a51f1b8911263f006f0d8a62064ad6dcabc952183c261b920a88a9afd85f3176cc96cb46349c8e4f0110edb228ec412c4d3e2eaebe5c9
 DIST mutt-1.5.22-gentoo-patches-r2.tar.bz2 81259 SHA256 d4ec35bfaf51276645feb9a7808455e6970aa2c171ed9767d2c6c2f3c9c60f5c SHA512 99b5c37dcd74aabc6c8673321aa13d00dab6bf82ad593ede920897921d633903d1de7fc4a80e04cccf0a5d7673560cb7a4e94830fcae27b60d696cb65315ba50 WHIRLPOOL c164faa5822a8181497a57526dcfe123e2fd5d0aa4db76c702a3794a1adb0fdb56377c4471464828617e44beadd7cd7509c2145fb7ae038b753b61be826bf6ba
 DIST mutt-1.5.22.tar.gz 3782237 SHA256 8feae890ed0758a5108bafaef27bd8fc9c378675acf25a3c620f2c7b7540f3a7 SHA512 96edfafa9460bbaff1c5a78f40735599f53e08f794866822558d59e351646b1d2045afbf97000012a6d9f261649e9b473c01f89ade542712120f9213c657b0a1 WHIRLPOOL 4c13c6f667a8990b933c8e25f43e96ba0562785b4038776949abea45454a1621bf1bb9351a52bec3d69909b9dc643de7f7ba383119f1ab8b20cea77d0bad1da9
-DIST mutt-1.5.23-gentoo-patches-r0.tar.bz2 81363 SHA256 9562657bb4d4930adb30841e5e6a19bc786447da7f77fd132af4e59d6fea59df SHA512 bda1304d1724379a87190d5c2b18e8dd139ffcff6ccfde40a71894aefd73a14531f420e3c2f4f7fe2790f19cc462da041486ad3c7d7f94fff42cffc2b606cd58 WHIRLPOOL ec3f2fdba23175d2b89a957de935ed6dcd54d19d5f13852666f8faa72e065341912a711632da27e5af261b1cec529666410847cb9c07ebb54c9ca72b42732c3f
-DIST mutt-1.5.23.tar.gz 3782032 SHA256 3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37 SHA512 f1b4a7230253651857f61bd7215cce870a613012f613d4c907d401556083726c8ed7d429d57a8bf858c3b5b23683380d4c1494540d86ca80813e22cb6b95bc1e WHIRLPOOL b5a676d204aece8c572d57a027fa5a402b7afe8e5b7d4c83b2d1b1612eb0ac5cb58cd225757732a017f03444e0ea42dacffcf1cf2d46c18ae92d7d3306059c61
 EBUILD mutt-1.5.21-r12.ebuild 7888 SHA256 8cb1fd474f1985a9fbed705cc51a35958364070c60fbe98508c9df163b7a0c73 SHA512 63f00130ecbf6de35d5d099060847f4ed7100067a93da8269e6ef1430ce0f618493e796a684c73f1f80409c602e4aa15299d891d5da5a9ccdab362b0771349b5 WHIRLPOOL 10bb2aa302630a50762755eb29a96dcb4d30a4e42ad39a045a8bf6938594feb82c077eb7800ca3b77f49784db2ecc7010bfb980b68af58f8b2c375a1114eeebf
 EBUILD mutt-1.5.21-r13.ebuild 7771 SHA256 0f029bfd6ee94fc312f251da99298027be6900f34f2a6701777300ecf6f049c4 SHA512 6d510116d8398c89356d86e5d94898e161d7df533f5d0515fda9425a874b9e28f965874669090f4ea292561e1e03996874031a05b1353ba809a10dd87f412dc6 WHIRLPOOL c853245f0b022fd304de563339c4d584151a8b995b4defb6fe83fdb9a8aa770eac4d8b7be113e6324f7289537879378cda95bec254a4b6648435742fc6ceb7fd
 EBUILD mutt-1.5.21-r14.ebuild 7793 SHA256 fc56f4a127eca8495a674de97bb681c28c574fd3c3e19144d5438d55cf1ce68b SHA512 dfe91b3bb7a86079c658f9a3521c8a517848979a40e5f7d67b6265ec9d1843cfdba8452afa17ac6920982b4c8709888848935cac410bc0ed46c000751bed592e WHIRLPOOL 42d4aedead5264f06ee5b2a56bda857215a105da9b9df946ff457e9d261cb0a85a111f1d37b2757c01fba989cfe2508bf884c7feb1166375bf3026874e74ecd7
 EBUILD mutt-1.5.22-r3.ebuild 8041 SHA256 3936a30ffc5367b5ce425c3bbdf0e505a800eabff19238ba20b9c2aa507569bd SHA512 1ee38a5914051e56987fc37dbb19f478cca31c3a5fefaad4dbe59dc4299fc89a1da2dd56d8768b7620c8e9320732ac87a502e2bc73dd319ad13d4114d083b008 WHIRLPOOL 942d011e5fa0e9b490d293a88d9a5ba2c979aaa69c72ec06305c101fb9293b10e1f657db0598475287b12f2930b6614038651bf87f7af0cff19de5e4ad5a6ef4
-EBUILD mutt-1.5.23.ebuild 8061 SHA256 ed032c7e033a3d0cab7854f18fe59180bf922a1c6bdbdb292adc370f8458eeb1 SHA512 b84660c56895ded879284f39092bdea40153a393b72ebc4f25d41a6ba564dbb44ec7a0e1674c42adc43467349e4965ba560c546d95a61ee3417146d7ffefdc3a WHIRLPOOL d58a2b1f1af97b136f7086b5d8a43ac14d13d71191b6b430797b604ec210036e8a164384ac8577156c7ac68d53f46e876379c3c7af4546a8b5971dcd243d0360
-MISC ChangeLog 56075 SHA256 9b856fada96a24e7ae03510cefde657556ba2020ceaf4b5748827c84f433a0d1 SHA512 8497e47759a41fd5d1262edc532662dfaffe6b2538ad6313d04d831a07d4832198bbf8b3783d67693d9970356f242743d1e96547434c4acb5875b2bc50b798e3 WHIRLPOOL 3cc1e770888039252fca980f6087f8f8b0b0a443ffdd514f7614c9339c89620c6325c046038d7f9a8c33b3ba5f53ed3690603c66fa498126b0a37c0fb9d8f9ee
+MISC ChangeLog 56271 SHA256 5391dd1438eab9403d5b4ebc97780d993333b59db384ec21b09691a5ac92e0a5 SHA512 11432de139756322e5b0a9948c6e266ad6e5bd44492b4ff83854291d3d90f75382155035c9e737a822afeb4e41b06eaf26dc360f218955fff42861df12a8c945 WHIRLPOOL a0a17b9a502a71c1c93ece99698efe46660b29907bbc6784436eb828a47967dc865244872ccb6608872a875d288234d5b064ed01b8f17aba3a4c68b979212163
 MISC metadata.xml 650 SHA256 b7ca8aa383b947a5e90eafab3839a9ed2a8c4f36f4890fec19636d774ccf5320 SHA512 26cb0a77d35e30432a88cf487d61da45c52967e8327f605a25f97a455fbb0eb518a44e589e140fa55cd7610b8fd22861c0149ef4ebaadd78173cbf8431adee5a WHIRLPOOL e4a73bbce432f77cc336bc93fed13ac6fc4e0e651643cc06402488383c5297a360c59a90e7e67667e2b48a564f10e5169282fe053a5426ee5f186338eddd2cee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (SunOS)
 
-iEYEAREIAAYFAlNBbrkACgkQX3X2B8XHTolcEwCgkEzZDpTile2DAzoWPBLAI0CO
-P0oAoJcgXvpQP033vB7zj3iZ/mVkkoIs
-=CRUf
+iEYEAREIAAYFAlNBdvgACgkQX3X2B8XHTomrAwCfcpl+e8QJ3jTbzPgqN/qaSsis
+nGMAnRWf0Np2zBCl2d+/swMxE8lp4emO
+=W16u
 -----END PGP SIGNATURE-----
diff --git a/mail-client/mutt/mutt-1.5.23.ebuild b/mail-client/mutt/mutt-1.5.23.ebuild
deleted file mode 100644
index bce6f898c76d..000000000000
--- a/mail-client/mutt/mutt-1.5.23.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.23.ebuild,v 1.1 2014/04/06 15:11:52 grobian Exp $
-
-EAPI="5"
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r0"
-
-DESCRIPTION="A small but very powerful text-based mail client"
-HOMEPAGE="http://www.mutt.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	https://bitbucket.org/${PN}/${PN}/downloads/${P}.tar.gz
-	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 kerberos mbox nls nntp pop qdbm sasl selinux sidebar slang smime smtp ssl tokyocabinet"
-SLOT="0"
-LICENSE="GPL-2"
-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="
-	app-misc/mime-types
-	nls? ( virtual/libintl )
-	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 )
-	)
-	kerberos? ( virtual/krb5 )
-	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 )
-	selinux? ( sec-policy/selinux-mutt )
-	slang? ( sys-libs/slang )
-	!slang? ( >=sys-libs/ncurses-5.2 )
-"
-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
-	# fix compilation with ncurses[tinfo], #459260
-	epatch "${PATCHDIR}"/ncurses-tinfo.patch
-
-	# 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
-	# 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
-	if use sidebar ; then
-		epatch "${PATCHDIR}"/sidebar.patch
-		epatch "${PATCHDIR}"/sidebar-utf8.patch
-		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}${upatches}"')"/' \
-		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 kerberos gss) \
-		$(use_with !nntp mixmaster) \
-		$(use slang && echo --with-slang) \
-		--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() {
-	emake 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, so fake one
-	if use !doc; then
-		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/,#' \
-			-e "s#@sysconfdir@#${EPREFIX}/etc/${PN}#" \
-			-e "s#@bindir@#${EPREFIX}/usr/bin#" \
-			doc/mutt.man > mutt.1
-		cp doc/muttbug.man flea.1
-		cp doc/muttrc.man muttrc.5
-		doman mutt.1 flea.1 muttrc.5
-	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
-}