Drop old versions

(Portage version: 2.2.00.14200-prefix/cvs/Darwin powerpc)

6 files changed, 7 insertions, 465 deletions

diff --git a/mail-client/mutt/ChangeLog b/mail-client/mutt/ChangeLog
index 0f3006e6bcd0..c670f5523e39 100644
--- a/mail-client/mutt/ChangeLog
+++ b/mail-client/mutt/ChangeLog
@@ -1,6 +1,12 @@
 # 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.151 2009/08/31 01:16:43 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/ChangeLog,v 1.152 2009/09/07 18:36:17 grobian Exp $
+
+  07 Sep 2009; Fabian Groffen <grobian@gentoo.org> -mutt-1.5.15-r2.ebuild,
+  -files/mutt-1.5.15-parallel-make.patch, -mutt-1.5.20-r1.ebuild,
+  -files/mutt-1.5.20-tab-subject-questionmark-298194c414f0.patch,
+  -files/slang.patch:
+  Drop old versions
 
   31 Aug 2009; Brent Baude <ranger@gentoo.org> mutt-1.5.20-r4.ebuild:
   Marking mutt-1.5.20-r4 ppc64 for bug 275703
diff --git a/mail-client/mutt/files/mutt-1.5.15-parallel-make.patch b/mail-client/mutt/files/mutt-1.5.15-parallel-make.patch
deleted file mode 100644
index e5026ee518d1..000000000000
--- a/mail-client/mutt/files/mutt-1.5.15-parallel-make.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index c151d56..b1b5784 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -130,10 +130,9 @@ EDIT = sed -e 's,@sysconfdir\@,$(sysconfdir),g' \
- mutt.1: $(srcdir)/mutt.man
- 	$(EDIT) $(srcdir)/mutt.man > $@
- 
--stamp-doc-xml: $(top_srcdir)/makedoc.c $(top_srcdir)/makedoc-defs.h $(top_srcdir)/init.h \
-+stamp-doc-xml: ../makedoc$(EXEEXT) $(top_srcdir)/makedoc-defs.h $(top_srcdir)/init.h \
-                manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \
-                $(srcdir)/gen-map-doc $(top_srcdir)/VERSION $(top_srcdir)/ChangeLog
--	$(MAKE) -j1 ../makedoc$(EXEEXT) # we do not want to rebuild the documentation in tarball builds
- 	( date=`head -n 1 $(top_srcdir)/ChangeLog | LC_ALL=C cut -d ' ' -f 1` && \
- 	  sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION` ($$date)/" $(srcdir)/manual.xml.head && \
- 	  $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s && \
diff --git a/mail-client/mutt/files/mutt-1.5.20-tab-subject-questionmark-298194c414f0.patch b/mail-client/mutt/files/mutt-1.5.20-tab-subject-questionmark-298194c414f0.patch
deleted file mode 100644
index 4ceed884628b..000000000000
--- a/mail-client/mutt/files/mutt-1.5.20-tab-subject-questionmark-298194c414f0.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-http://dev.mutt.org/trac/changeset/298194c414f0
-
-Allow tabs in index subject. Closes #3270.
-
-
-Index: configure.ac
-===================================================================
---- configure.ac (revision 5939:199b126a7623)
-+++ configure.ac (revision 5958:298194c414f0)
-@@ -1216,5 +1216,5 @@
- 
- AC_CHECK_HEADERS(wctype.h)
--AC_CHECK_FUNCS(iswalnum iswalpha  iswcntrl iswdigit)
-+AC_CHECK_FUNCS(iswalnum iswalpha iswblank iswcntrl iswdigit)
- AC_CHECK_FUNCS(iswgraph iswlower iswprint iswpunct iswspace iswupper)
- AC_CHECK_FUNCS(iswxdigit towupper towlower)
-Index: curs_lib.c
-===================================================================
---- curs_lib.c (revision 5936:642987450d83)
-+++ curs_lib.c (revision 5958:298194c414f0)
-@@ -726,5 +726,9 @@
-     else
-     {
--      if (!IsWPrint (wc))
-+      if (!IsWPrint (wc)
-+#ifdef HAVE_ISWBLANK
-+	  && !iswblank (wc)
-+#endif
-+      )
- 	wc = '?';
-       w = wcwidth (wc);
diff --git a/mail-client/mutt/files/slang.patch b/mail-client/mutt/files/slang.patch
deleted file mode 100644
index f3740bdc85f6..000000000000
--- a/mail-client/mutt/files/slang.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naurbd mutt-1.5.6~orig/menu.c mutt-1.5.6/menu.c
---- mutt-1.5.6~orig/menu.c	2004-02-12 01:00:30.537293896 +0000
-+++ mutt-1.5.6/menu.c	2004-02-12 01:00:35.748501672 +0000
-@@ -45,6 +45,7 @@
-   {
-     if (*s < M_TREE_MAX)
-     {
-+#ifndef USE_SLANG_CURSES
-       if (do_color)
-       {
- 	pair_content(PAIR_NUMBER(ColorDefs[MT_COLOR_TREE]), &f1, &b1);
-@@ -52,6 +53,7 @@
- 	if (b1 == b2)
- 	  SETCOLOR (MT_COLOR_TREE);
-       }
-+#endif
-       while (*s && *s < M_TREE_MAX)
-       {
- 	switch (*s)
diff --git a/mail-client/mutt/mutt-1.5.15-r2.ebuild b/mail-client/mutt/mutt-1.5.15-r2.ebuild
deleted file mode 100644
index bd4908793951..000000000000
--- a/mail-client/mutt/mutt-1.5.15-r2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mutt/mutt-1.5.15-r2.ebuild,v 1.1 2007/04/13 11:32:29 ferdy Exp $
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r2"
-
-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
-	!vanilla? (
-		mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
-	)"
-IUSE="berkdb crypt debug gdbm gnutls gpgme idn imap mbox nls nntp pop qdbm sasl
-smime smtp ssl vanilla"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-RDEPEND=">=sys-libs/ncurses-5.2
-	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 )
-	gpgme?   ( >=app-crypt/gpgme-0.9.0 )
-	smime?   ( >=dev-libs/openssl-0.9.6 )
-	app-misc/mime-types"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	!vanilla? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		app-text/docbook-xsl-stylesheets
-		|| ( www-client/lynx www-client/w3m )
-	)"
-
-PATCHDIR="${WORKDIR}"/${P}-gentoo-patches${PATCHSET_REV}
-
-src_unpack() {
-	unpack ${A} && cd "${S}" || die "unpack failed"
-
-	if ! use vanilla ; then
-		epatch "${FILESDIR}"/${P}-parallel-make.patch
-
-		if ! use nntp ; then
-			rm "${PATCHDIR}"/07-nntp.patch
-		fi
-
-		for p in "${PATCHDIR}"/*.patch ; do
-			epatch "${p}"
-		done
-
-		AT_M4DIR="m4" eautoreconf
-	fi
-}
-
-src_compile() {
-	declare myconf="
-		$(use_enable nls) \
-		$(use_enable gpgme) \
-		$(use_enable imap) \
-		$(use_enable pop) \
-		$(use_enable smtp) \
-		$(use_enable crypt pgp) \
-		$(use_enable smime) \
-		$(use_enable debug) \
-		$(use_with idn) \
-		--with-curses \
-		--sysconfdir=/etc/${PN} \
-		--with-docdir=/usr/share/doc/${PN}-${PVR} \
-		--with-regex \
-		--disable-fcntl --enable-flock \
-		--enable-nfs-fix --enable-external-dotlock \
-		--with-mixmaster"
-
-	# See Bug #22787
-	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
-
-	# mutt prioritizes gdbm over bdb, so we will too.
-	# hcache feature requires at least one database is in USE.
-	if use qdbm; then
-		myconf="${myconf} --enable-hcache \
-		--with-qdbm --without-gdbm --without-bdb"
-	elif use gdbm ; then
-		myconf="${myconf} --enable-hcache \
-			--without-qdbm --with-gdbm --without-bdb"
-	elif use berkdb; then
-		myconf="${myconf} --enable-hcache \
-			--without-gdbm --without-qdbm --with-bdb"
-	else
-		myconf="${myconf} --disable-hcache \
-			--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
-
-	# See Bug #11170
-	case ${ARCH} in
-		alpha|ppc) replace-flags "-O[3-9]" "-O2" ;;
-	esac
-
-	if use mbox; then
-		myconf="${myconf} --with-mailpath=/var/spool/mail"
-	else
-		myconf="${myconf} --with-homespool=Maildir"
-	fi
-
-	if ! use vanilla; then
-		# rr.compressed patch
-		myconf="${myconf} --enable-compressed"
-
-		# nntp patch
-		myconf="${myconf} $(use_enable nntp)"
-	fi
-
-	econf ${myconf} || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "install failed"
-	find "${D}"/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip
-	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 "${D}"/etc/${PN}/mime.types
-	dosym /etc/mime.types /etc/${PN}/mime.types
-
-	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.20-r1.ebuild b/mail-client/mutt/mutt-1.5.20-r1.ebuild
deleted file mode 100644
index 23051bb7b8e3..000000000000
--- a/mail-client/mutt/mutt-1.5.20-r1.ebuild
+++ /dev/null
@@ -1,226 +0,0 @@
-# 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-r1.ebuild,v 1.1 2009/07/02 08:44:33 grobian Exp $
-
-inherit eutils flag-o-matic autotools
-
-PATCHSET_REV="-r2"
-
-# note: latest sidebar patches can be found here:
-# http://www.lunar-linux.org/index.php?option=com_content&task=view&id=44
-SIDEBAR_PATCH_N="patch-1.5.20.sidebar.20090619.txt"
-
-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
-	!vanilla? (
-		!sidebar? (
-			mirror://gentoo/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
-			http://dev.gentoo.org/~grobian/distfiles/${P}-gentoo-patches${PATCHSET_REV}.tar.bz2
-		)
-	)
-	sidebar? (
-		http://www.lunar-linux.org/~tchan/mutt/${SIDEBAR_PATCH_N}
-	)"
-IUSE="berkdb crypt debug gdbm gnutls gpgme idn imap mbox nls nntp pop qdbm sasl
-sidebar smime smtp ssl 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 ) )
-	)
-	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 )
-	gpgme?   ( >=app-crypt/gpgme-0.9.0 )
-	smime?   ( >=dev-libs/openssl-0.9.6 )
-	app-misc/mime-types"
-DEPEND="${RDEPEND}
-	net-mail/mailbase
-	!vanilla? (
-		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_unpack() {
-	unpack ${A//${SIDEBAR_PATCH_N}}
-	cd "${S}"
-
-	# 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 "${FILESDIR}"/mutt-1.5.13-prefix-mailcap.patch
-
-	epatch "${FILESDIR}"/mutt-1.5.18-bdb-prefix.patch # fix bdb detection
-	epatch "${FILESDIR}"/mutt-1.5.18-interix.patch
-	epatch "${FILESDIR}"/mutt-1.5.18-solaris-ncurses-chars.patch
-	# post-release hot-fixes
-	epatch "${FILESDIR}"/mutt-1.5.20-imap-port-invalid-d6f88fbf8387.patch
-	epatch "${FILESDIR}"/mutt-1.5.20-header-weeding-f40de578e8ed.patch
-	epatch "${FILESDIR}"/mutt-1.5.20-display-unsigned-pgp-7f37d0a57d83.patch
-	epatch "${FILESDIR}"/mutt-1.5.20-unmailbox-segfault-25e46aad362b.patch
-	epatch "${FILESDIR}"/mutt-1.5.20-mbox-new-mail-bd59be56c6b0.patch
-	epatch "${FILESDIR}"/mutt-1.5.20-mbox-unchanged-new-mail-9ae13dedb5ed.patch
-	epatch "${FILESDIR}"/mutt-1.5.20-imap-start-fatal-fe30f394cbe6.patch
-	epatch "${FILESDIR}"/mutt-1.5.20-tab-subject-questionmark-298194c414f0.patch
-	epatch "${FILESDIR}"/mutt-1.5.20-smtp-batch-mode-0a3de4d9a009-f6c6066a5925.patch
-
-	if use !vanilla && use !sidebar ; then
-		use nntp || rm "${PATCHDIR}"/06-nntp.patch
-		for p in "${PATCHDIR}"/*.patch ; do
-			epatch "${p}"
-		done
-	fi
-
-	if use sidebar ; then
-		use vanilla || \
-			ewarn "The sidebar patch is only applied to a vanilla mutt tree."
-		epatch "${DISTDIR}"/${SIDEBAR_PATCH_N}
-	fi
-
-	AT_M4DIR="m4" eautoreconf
-
-	# this should be done only when we're not root
-	if [[ ${UID} != 0 ]] ; then
-		sed -i \
-			-e 's/@DOTLOCK_GROUP@/'"`id -gn`"'/g' \
-			Makefile.in \
-			|| die "sed failed"
-	fi
-}
-
-src_compile() {
-	declare myconf="
-		$(use_enable nls) \
-		$(use_enable gpgme) \
-		$(use_enable imap) \
-		$(use_enable pop) \
-		$(use_enable smtp) \
-		$(use_enable crypt pgp) \
-		$(use_enable smime) \
-		$(use_enable debug) \
-		$(use_with idn) \
-		--with-curses \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PN}-${PVR} \
-		--with-regex \
-		--enable-nfs-fix --enable-external-dotlock \
-		$(use_with !nntp mixmaster) \
-		--with-exec-shell=${EPREFIX}/bin/sh"
-
-	case $CHOST in
-		*-darwin7)
-			# locales are broken on Panther
-			myconf="${myconf} --enable-locales-fix --without-wc-funcs"
-			myconf="${myconf} --disable-fcntl --enable-flock"
-		;;
-		*-solaris*)
-			# Solaris has no flock in the standard headers
-			myconf="${myconf} --enable-fcntl --disable-flock"
-		;;
-		*)
-			myconf="${myconf} --disable-fcntl --enable-flock"
-		;;
-	esac
-
-	# See Bug #22787
-	unset WANT_AUTOCONF_2_5 WANT_AUTOCONF
-
-	# mutt prioritizes gdbm over bdb, so we will too.
-	# hcache feature requires at least one database is in USE.
-	if use qdbm; then
-		myconf="${myconf} --enable-hcache \
-		--with-qdbm --without-gdbm --without-bdb"
-	elif use gdbm ; then
-		myconf="${myconf} --enable-hcache \
-			--without-qdbm --with-gdbm --without-bdb"
-	elif use berkdb; then
-		myconf="${myconf} --enable-hcache \
-			--without-gdbm --without-qdbm --with-bdb"
-	else
-		myconf="${myconf} --disable-hcache \
-			--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
-
-	if use !vanilla && use !sidebar ; then
-		# rr.compressed patch
-		myconf="${myconf} --enable-compressed"
-
-		# nntp patch applied conditionally, so avoid QA warning when doing
-		# --disable-nntp while patch not being applied, bug #262069
-		use nntp && myconf="${myconf} --enable-nntp"
-	fi
-
-	econf ${myconf} || die "configure failed"
-	emake || die "make failed"
-}
-
-src_install() {
-	local ED=${ED-${D}}
-	make DESTDIR="${D}" install || die "install failed"
-	find "${ED}"/usr/share/doc -type f | grep -v "html\|manual" | xargs gzip
-	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
-
-	# charset.alias is installed by libiconv
-	rm -f "${ED}"/usr/lib/charset.alias
-	rm -f "${ED}"/usr/share/locale/locale.alias
-
-	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
-}