Bump chappa patches (53) and use latest topal patches

Package-Manager: portage-2.2_rc64/cvs/Linux x86_64

3 files changed, 161 insertions, 3 deletions

diff --git a/mail-client/alpine/ChangeLog b/mail-client/alpine/ChangeLog
index 96440fbe5820..33509c15cd0a 100644
--- a/mail-client/alpine/ChangeLog
+++ b/mail-client/alpine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/alpine
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/alpine/ChangeLog,v 1.7 2009/11/07 22:22:08 volkmar Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/alpine/ChangeLog,v 1.8 2010/03/05 12:07:14 tove Exp $
+
+*alpine-2.00-r3 (05 Mar 2010)
+
+  05 Mar 2010; Torsten Veller <tove@gentoo.org> +alpine-2.00-r3.ebuild:
+  Bump chappa patches (53) and use latest topal patches
 
   07 Nov 2009; Mounir Lamouri <volkmar@gentoo.org> alpine-2.00-r2.ebuild:
   Keywording for ppc, bug 267299
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index 3911b19de294..7fce982d9f88 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -1,11 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 2.00-lpam.patch 295 RMD160 f3b34a9179529f4c25086559d57dc19d828356f1 SHA1 1b39525f91ebd5a9de5a1e04f5554f6fa5f58ae3 SHA256 22c354937019693cfc03a8864a36c30579fd98475b729e089f83ec125e4225ad
 AUX CVE-2008-5514.patch 634 RMD160 ca159f967e2e973390dce3cab2768a09e1da50cf SHA1 bc61d76a237ff42b00b3f60f2e6fc5c45e261dbb SHA256 07fd3dd2ffdfe9e2c952603b9aae099d1250bc89373de3e1a5009ec5d251346b
 DIST alpine-2.00-chappa-26-all.patch.gz 179066 RMD160 c109c463da0f6736474d6c114468bb524dca35ad SHA1 5d646dc9075d0f47cfb3ae2a66dd4ad3103f66f4 SHA256 a14b3cc49a0f7eef6459488687b2a15ff5318f5db8586a47aca04c5bce08aea5
 DIST alpine-2.00-chappa-51-all.patch.gz 195020 RMD160 6e3cf9daa28f28c34a9d0c5f50063ca4b7e39ad9 SHA1 5bcb36f736d9e2c13417113e9f974272d2fdc4a0 SHA256 7a9e8d1e7dfa677543e9db4caf524eb0ff4da5511613c7b5c00228cc31475075
 DIST alpine-2.00-chappa-52-all.patch.gz 194980 RMD160 f3ce0022420bcded4f390d92f090a546d680a06e SHA1 1d952e652e8ccf11867af12fe6de70180e58acb1 SHA256 e0fd704cf6f8214f1daaf7ff4dff0eb04d799943f06fa70bdab2ed7280b0e070
+DIST alpine-2.00-chappa-53-all.patch.gz 196219 RMD160 5556e3c95656ad01abd21682df5bf2f615054710 SHA1 7396ed92062924c126087dc32b98ccebf98e17cc SHA256 153d9d903bd0015ca9064ecdd74d03d58e26502edd2116cf4e18db8e88d15e43
 DIST alpine-2.00.tar.bz2 5222673 RMD160 9e67704b23b3973d8b878e65ad9e6f5026c10d13 SHA1 dcbd3c5419954f484ccf706feaba31ce48cdebc4 SHA256 c85db8405af90375ba2440c85b7952d80996154e9916b83acca558dc82e0a2a6
 EBUILD alpine-2.00-r1.ebuild 3865 RMD160 215dac6479626df7aceab420c5b7e2630d052ccf SHA1 33a69dfe71b9d5a830352bc4da9050cac6217431 SHA256 b5778a4055e0f9370bb1334d67be426644ed7d6a9e3a4f8821389448d6c67ffa
 EBUILD alpine-2.00-r2.ebuild 3873 RMD160 1342422c79dca2db06d7bda33ba31c2e80edccef SHA1 1b88fb49a14f20bc700d76c5595e9f166deb2f20 SHA256 d7195eb6be26a40ca3e02c465ad4bfc1ae2d33fa655bdfff1e8d4ecd3f397ac8
+EBUILD alpine-2.00-r3.ebuild 3876 RMD160 16fac26fae028267f4e9f32e11845d73cf674348 SHA1 a8fc4ef42e02213c13cdc59adc643aa192f40631 SHA256 12b165d0084ef762e06ab6de1f0c9492affdf89626d211d910477c930ebb3c43
 EBUILD alpine-2.00.ebuild 3865 RMD160 3aaadc2e654c3ae7eeb121430e30c6c592ec84f0 SHA1 969ab89637a7c7bae66c2e3a0f85da16cc568ae5 SHA256 a27755fc41dc3a876e9cbe4c4db3ba6abace7a3a89f042c1b77e698aa7decc82
-MISC ChangeLog 1151 RMD160 5eed11fab7839f7e7a13b4749948776a37d713e6 SHA1 a254a50ae27d7ee58ea6351918711be21ab98b8d SHA256 849331b4f59a781f9a4b959c51953aef87e6f6a1f0f6dcc8bac36c0f58d8dbfa
+MISC ChangeLog 1308 RMD160 a7b4498b8b594ada99177c60b3ae4bacc6bb6731 SHA1 7505884875d1cc276a204f3d6815268521c97fcb SHA256 6fb0a86bed81cee424509b8b9e2123d32dd82ef9f4272f20c75e680247518f72
 MISC metadata.xml 857 RMD160 e83569fa133c11d8d2c99eb6c5ebe893be94b7c9 SHA1 a4c1ea58f11c8f725355bb870413b1a0389ea9ed SHA256 e1f4da684f1c311d40958e0652c9ae652129e7cf2eea12ba35eff332098e5fbc
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkuQ8/kACgkQV3J2n04EauwgTgCgqI9R9WJ75U8XLZk4HEl1AY25
+6VUAn3QwBVOtkHGIOtKgFvVJQAg3z8n0
+=FvHq
+-----END PGP SIGNATURE-----
diff --git a/mail-client/alpine/alpine-2.00-r3.ebuild b/mail-client/alpine/alpine-2.00-r3.ebuild
new file mode 100644
index 000000000000..63c5614c2f3c
--- /dev/null
+++ b/mail-client/alpine/alpine-2.00-r3.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/alpine/alpine-2.00-r3.ebuild,v 1.1 2010/03/05 12:07:14 tove Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic
+
+# http://staff.washington.edu/chappa/alpine/patches/${P}/log.txt
+CHAPPA_PL="53"
+
+DESCRIPTION="alpine is an easy to use text-based based mail and news client"
+HOMEPAGE="http://www.washington.edu/alpine/ http://staff.washington.edu/chappa/alpine/"
+SRC_URI="ftp://ftp.cac.washington.edu/alpine/${P}.tar.bz2
+	chappa? ( http://staff.washington.edu/chappa/alpine/patches/${P}/all.patch.gz -> ${P}-chappa-${CHAPPA_PL}-all.patch.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="+chappa doc ipv6 kerberos ldap nls onlyalpine passfile smime spell ssl threads topal"
+
+DEPEND="virtual/pam
+	>=sys-libs/ncurses-5.1
+	ssl? ( dev-libs/openssl )
+	ldap? ( net-nds/openldap )
+	kerberos? ( app-crypt/mit-krb5 )
+	spell? ( app-text/aspell )
+	topal? ( >=net-mail/topal-72 )"
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+	!onlyalpine? ( !app-editors/pico )
+	!onlyalpine? ( !mail-client/pine )
+	!<=net-mail/uw-imap-2004g"
+
+maildir_warn() {
+	elog
+	elog "This build of ${PN} has Maildir support built in as"
+	elog "part of the chappa-all patch."
+	elog
+	elog "If you have a maildir at ~/Maildir it will be your"
+	elog "default INBOX. The path may be changed with the"
+	elog "\"maildir-location\" setting in alpine."
+	elog
+	elog "To use /var/spool/mail INBOX again, set"
+	elog "\"disable-these-drivers=md\" in your .pinerc file."
+	elog
+	elog "Alternately, you might want to read following webpage, which explains how to"
+	elog "use multiple mailboxes simultaneously:"
+	elog
+	elog "http://www.math.washington.edu/~chappa/pine/pine-info/collections/incoming-folders/"
+	elog
+}
+
+pkg_setup() {
+	if use smime && use topal ; then
+		ewarn "You can not have USE='smime topal'. Assuming topal is more important."
+	fi
+}
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+}
+
+src_prepare() {
+	use chappa && epatch "${DISTDIR}"/${P}-chappa-${CHAPPA_PL}-all.patch.gz
+	use topal && epatch /usr/share/topal/patches/${P}.patch-{1,2}
+
+	epatch "${FILESDIR}"/2.00-lpam.patch
+	cd "${S}/imap/src/c-client"
+	epatch "${FILESDIR}"/CVE-2008-5514.patch
+}
+
+src_configure() {
+	local myconf="--without-tcl
+		--with-system-pinerc=/etc/pine.conf
+		--with-system-fixed-pinerc=/etc/pine.conf.fixed
+		--with-ssl-certs-dir=/etc/ssl/certs"
+		# fixme
+		#   --with-system-mail-directory=DIR?
+	econf $(use_with ssl) \
+		$(use_with ldap) \
+		$(use_with passfile passfile .pinepwd) \
+		$(use_with kerberos krb5) \
+		$(use_with threads pthread) \
+		$(use_with spell interactive-spellcheck /usr/bin/aspell) \
+		$(use_enable nls) \
+		$(use_with ipv6) \
+		$(use topal || use_with smime) \
+		${myconf}
+}
+
+src_install() {
+	if use onlyalpine ; then
+		dobin alpine/alpine || die
+		doman doc/alpine.1 || die
+	else
+		emake DESTDIR="${D}" install || die
+		doman doc/rpdump.1 doc/rpload.1 || die
+	fi
+
+	dodoc NOTICE || die
+	if use chappa ; then
+		dodoc README.maildir || die
+	fi
+
+	if use doc ; then
+		dodoc README doc/brochure.txt doc/tech-notes.txt || die
+		docinto imap
+		dodoc imap/docs/*.txt imap/docs/CONFIG imap/docs/RELNOTES || die
+
+		docinto imap/rfc
+		dodoc imap/docs/rfc/*.txt || die
+
+		docinto html/tech-notes
+		dohtml -r doc/tech-notes/ || die
+	fi
+}
+
+pkg_postinst() {
+	use chappa && maildir_warn
+	if use spell ; then
+		elog
+		elog "In order to use spell checking"
+		elog "  emerge app-dicts/aspell-\<your_langs\>"
+		elog "and setup alpine with:"
+		elog "  Speller = /usr/bin/aspell -c"
+		elog
+	fi
+	if use topal ; then
+		elog
+		elog "In order to use gpg with topal"
+		elog "  read /usr/doc/topal/README.txt"
+		elog
+	fi
+	if use passfile ; then
+		elog
+		elog "${PN} will cache passwords between connections."
+		elog "File ~/.pinepwd will be used for this."
+		elog
+	fi
+}