sync with main portage tree

13 files changed, 609 insertions, 37 deletions

diff --git a/mail-client/alpine/ChangeLog b/mail-client/alpine/ChangeLog
index ad986e7..33509c1 100644
--- a/mail-client/alpine/ChangeLog
+++ b/mail-client/alpine/ChangeLog
@@ -1,6 +1,33 @@
 # 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.1 2009/04/24 07:54:58 tove 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
+
+*alpine-2.00-r2 (05 Sep 2009)
+
+  05 Sep 2009; Torsten Veller <tove@gentoo.org> +alpine-2.00-r2.ebuild:
+  Bump chappa patchset to patchlevel 52 (#283316)
+
+*alpine-2.00-r1 (17 Aug 2009)
+
+  17 Aug 2009; Torsten Veller <tove@gentoo.org> +alpine-2.00-r1.ebuild:
+  Bump chappa patchset to patchlevel 51
+
+  22 May 2009; Raúl Porcel <armin76@gentoo.org> alpine-2.00.ebuild:
+  Add ~ia64/~sparc wrt #267299
+
+  15 May 2009; Markus Meier <maekke@gentoo.org> alpine-2.00.ebuild:
+  add ~amd64, bug #267299
+
+  03 May 2009; Tobias Klausmann <klausman@gentoo.org> alpine-2.00.ebuild:
+  Keyworded on alpha, bug #267299
 
 *alpine-2.00 (24 Apr 2009)
 
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index c0e9ca7..2334cee 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -1,17 +1,13 @@
------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.ebuild 3835 RMD160 2b1a52d4b5c0fbfb9ba0dfba12b1a31103ae5947 SHA1 17ec392caefabb177321baaeb3da9b10ae5edc05 SHA256 a495a9187c2fececc9cda91c877e92f31727ebccc9ef2f4c781c6170f73e46cc
-MISC ChangeLog 437 RMD160 2bcbfe6a7eb2644c7ece32de0035d8ca52219c97 SHA1 d197cc9a89ca6cd6cabefd201bc6d19ad3953429 SHA256 f5f8f59e36256d23a4182d38d2a4997168b3c5b4c041cac2a441000b6771a66f
-MISC metadata.xml 857 RMD160 e83569fa133c11d8d2c99eb6c5ebe893be94b7c9 SHA1 a4c1ea58f11c8f725355bb870413b1a0389ea9ed SHA256 e1f4da684f1c311d40958e0652c9ae652129e7cf2eea12ba35eff332098e5fbc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.10 (GNU/Linux)
-
-iEYEARECAAYFAknxcGEACgkQV3J2n04EauwoGgCfVEw3OUCfLg2HISoSJFeUjp3+
-HnwAoL1wXFlOiLfmaRAReh0yy3edHg+z
-=BSDp
------END PGP SIGNATURE-----
+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 1308 RMD160 a7b4498b8b594ada99177c60b3ae4bacc6bb6731 SHA1 7505884875d1cc276a204f3d6815268521c97fcb SHA256 6fb0a86bed81cee424509b8b9e2123d32dd82ef9f4272f20c75e680247518f72
+MISC metadata.xml 844 RMD160 9eb2c872014f45593cb6600e33f8f31df908db9b SHA1 320f98eedaa623a0ff8a4af207875738eb3aae37 SHA256 e008b89b84a35953d391d4d8384563dddc2b22c0b363334deaedb69d57d57393
diff --git a/mail-client/alpine/alpine-2.00-r1.ebuild b/mail-client/alpine/alpine-2.00-r1.ebuild
new file mode 100644
index 0000000..af0d719
--- /dev/null
+++ b/mail-client/alpine/alpine-2.00-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/alpine/alpine-2.00-r1.ebuild,v 1.1 2009/08/17 18:50:32 tove Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic
+
+# http://staff.washington.edu/chappa/alpine/patches/${P}/log.txt
+CHAPPA_PL="51"
+
+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 ~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-64 )"
+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
+
+	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
+}
diff --git a/mail-client/alpine/alpine-2.00-r2.ebuild b/mail-client/alpine/alpine-2.00-r2.ebuild
new file mode 100644
index 0000000..eada635
--- /dev/null
+++ b/mail-client/alpine/alpine-2.00-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/alpine/alpine-2.00-r2.ebuild,v 1.2 2009/11/07 22:22:08 volkmar Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic
+
+# http://staff.washington.edu/chappa/alpine/patches/${P}/log.txt
+CHAPPA_PL="52"
+
+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-64 )"
+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
+
+	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
+}
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 0000000..63c5614
--- /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
+}
diff --git a/mail-client/alpine/alpine-2.00.ebuild b/mail-client/alpine/alpine-2.00.ebuild
index 1965b35..4d99cf6 100644
--- a/mail-client/alpine/alpine-2.00.ebuild
+++ b/mail-client/alpine/alpine-2.00.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/alpine/alpine-2.00.ebuild,v 1.1 2009/04/24 07:54:58 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/alpine/alpine-2.00.ebuild,v 1.4 2009/05/22 14:59:38 armin76 Exp $
 
 EAPI="2"
 
@@ -16,7 +16,7 @@ SRC_URI="ftp://ftp.cac.washington.edu/alpine/${P}.tar.bz2
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~x86"
 IUSE="+chappa doc ipv6 kerberos ldap nls onlyalpine passfile smime spell ssl threads topal"
 
 DEPEND="virtual/pam
diff --git a/mail-client/alpine/metadata.xml b/mail-client/alpine/metadata.xml
index 85a477a..ce466ae 100644
--- a/mail-client/alpine/metadata.xml
+++ b/mail-client/alpine/metadata.xml
@@ -11,7 +11,7 @@
 			<name>Torsten Veller</name>
 		</maintainer>
 	<use>
-		<flag name='chappa'>enhance alpine by appling Eduardo Chappa's
+		<flag name='chappa'>enhance alpine by applying Eduardo Chappa's
 			patches</flag>
 		<flag name='onlyalpine'>installs only the alpine binary, so it does
 			not collied with <pkg>app-editors/pico</pkg> and/or 
diff --git a/net-mail/topal/ChangeLog b/net-mail/topal/ChangeLog
index cde3ecc..a4d613a 100644
--- a/net-mail/topal/ChangeLog
+++ b/net-mail/topal/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-mail/topal
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/topal/ChangeLog,v 1.2 2009/04/26 06:40:02 tove Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/topal/ChangeLog,v 1.5 2010/03/05 12:03:53 tove Exp $
+
+*topal-72 (05 Mar 2010)
+
+  05 Mar 2010; Torsten Veller <tove@gentoo.org> files/64-Makefile.patch,
+  +topal-72.ebuild, +files/72-Makefile.patch:
+  Version bump. Thanks to Peter Gantner (#306981)
+
+  07 Nov 2009; Mounir Lamouri <volkmar@gentoo.org> topal-64.ebuild:
+  Keywording for ppc, bug 267299
+
+  15 May 2009; Markus Meier <maekke@gentoo.org> topal-64.ebuild:
+  add ~amd64, bug #267299
 
   26 Apr 2009; Torsten Veller <tove@gentoo.org> topal-64.ebuild:
   Use virtual/ada instead of virtual/gnat (#267299)
diff --git a/net-mail/topal/Manifest b/net-mail/topal/Manifest
index 459bba9..c058ef5 100644
--- a/net-mail/topal/Manifest
+++ b/net-mail/topal/Manifest
@@ -1,15 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX 64-Makefile.patch 2257 RMD160 0652cdee0aab52844a34e5df06fc7691eb830e67 SHA1 6e16885eb61227e4dfa0496f29df54c0cf7febc2 SHA256 2fb606d11c9dca6cc782e43c620002fbe1c7de9528d70cbd490d45a73eb53cfe
+AUX 64-Makefile.patch 2267 RMD160 60348219f8849e3719bf2678da4858c8f8d48dea SHA1 5fb4a4a6d7c08c29324436d1711b5d7151168205 SHA256 8623312f3eea1fa5ad3a41cd434dbe30cee9011eb3ccbdf459692a5d74e4f9a8
+AUX 72-Makefile.patch 2481 RMD160 83f4c210459a581e6e8f10e99ee2d38ee4511dde SHA1 704cc8c8cd9905bb8602fdef2b5d56e5127cd848 SHA256 c824acdda60194bf885733663a6255e03197597cb411f89eecf63cc37ce7baba
 DIST topal-package-64.tgz 170401 RMD160 69e5bdd0b2956fc4ead3815304d7e4def4f99292 SHA1 e2939bcff099e8d32e30dc1eef025f9b29b1053a SHA256 e44b879a8e8d96d5f0cad9e2b68056ba05fe4267a6f4d2d50325164be3f48cd5
-EBUILD topal-64.ebuild 1054 RMD160 35b914d582b7ab74588e9f14738a160103f29fa8 SHA1 c780428da2356499123d2f84776301de14512a77 SHA256 7ee608d228474d2b7d6c65bfdf0bd41c949350c0d9687adcd2d7b3a71aa84653
-MISC ChangeLog 537 RMD160 bfc88556e2f3466897ad1aa468f5bd311bc34661 SHA1 e6ae4d24d2dd066f7fea474a2aac6192aad06338 SHA256 60143df1d689d720fc7eee17756fc9b330648177e62240f3191c50e7a1c21a74
-MISC metadata.xml 539 RMD160 44b5e2c5cbdb0635d1f3e751079ece4c24fd5701 SHA1 730f36ed565f50554dce3153150a7b8fd088f553 SHA256 0462df752380e8177b0e04c032885543f419c8bd78d9e596cc3bd885c5231b4b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkn0AdUACgkQV3J2n04EauxWfwCfZC4PPS+sKyzc9FBItiwWfPfM
-qtMAoIPtl0JHgRgyGRjJOM1BS4Yu81K4
-=D37q
------END PGP SIGNATURE-----
+DIST topal-package-72.tgz 186728 RMD160 80a5493a91fe19f2b92a3e56810035b890cab1fb SHA1 1c05595d6b00db179539620d997c27ef4cf42fd3 SHA256 ccef20b3add7add640931b6de284e90815dade6ddc171b20d35f8d9b3487db52
+EBUILD topal-64.ebuild 1069 RMD160 5f9134dd9152d1b063e6c690788c390ded11c92c SHA1 1a41b0a2d57fd85e0d47b99c779687680982c3fb SHA256 5a83c6fabc3b600b55a0a213f41bcdde45cb85275cf4589c3748c3a4b6bf0983
+EBUILD topal-72.ebuild 1115 RMD160 6672851aa47332f11cd21e7fda7467a7c4ba52c0 SHA1 1014b3854caa4b9b647bd2baed5c03979ac1a7a1 SHA256 80ac5ec2d461ea781438a40a7a1f7f0d70bb57dcf4aeac1703a0c50e470abece
+MISC ChangeLog 926 RMD160 d5258700e7a36be0d48081279dad1f3aee3925c6 SHA1 91110f11602de744ed5a57151e0829f5241726d9 SHA256 a2ac300661fcccf731fde23ff6f3441b6aea37530186c3c7a7fc6a993a786a24
+MISC metadata.xml 525 RMD160 9a080da8a52fec2d0c4d714929394f9b6b4766a4 SHA1 59d2e01301a195391739c6f6c3e9a302a86ac45a SHA256 934a0ef2cfdb2ee20e5656852ba86ddae8216f221949be31a4c87091499f6fcb
diff --git a/net-mail/topal/files/64-Makefile.patch b/net-mail/topal/files/64-Makefile.patch
index 694a065..834b75b 100644
--- a/net-mail/topal/files/64-Makefile.patch
+++ b/net-mail/topal/files/64-Makefile.patch
@@ -20,12 +20,13 @@ diff -Naur topal-64.orig/MIME-tool/Makefile topal-64/MIME-tool/Makefile
 diff -Naur topal-64.orig/Makefile topal-64/Makefile
 --- topal-64.orig/Makefile	2008-10-24 12:16:45.000000000 +0200
 +++ topal-64/Makefile	2009-04-22 09:37:18.000000000 +0200
-@@ -36,26 +36,28 @@
+@@ -36,26 +36,29 @@
  INSTALLPATHDOC ?= $(INSTALLPATH)/share/doc/topal
  INSTALLPATHPATCHES ?= $(INSTALLPATH)/share/topal/patches
  
 +CC=gcc
 +CFLAGS=-Wall -O2
++LDFLAGS=
 +
  # The default action.
  all:	topal mime-tool README.txt
diff --git a/net-mail/topal/files/72-Makefile.patch b/net-mail/topal/files/72-Makefile.patch
new file mode 100644
index 0000000..e787370
--- /dev/null
+++ b/net-mail/topal/files/72-Makefile.patch
@@ -0,0 +1,79 @@
+diff -uraN topal-72-orig/MIME-tool/Makefile topal-72/MIME-tool/Makefile
+--- topal-72-orig/MIME-tool/Makefile	2010-02-25 21:28:39.000000000 +0100
++++ topal-72/MIME-tool/Makefile	2010-03-04 13:24:53.691055969 +0100
+@@ -1,10 +1,14 @@
+ .PHONY:	all clean realclean distrib
+ 
++CC=gcc
++CFLAGS=-Wall -O2
++LDFLAGS=
++
++
+ all:	mime-tool
+ 
+ mime-tool:	mime.c
+-	gcc -Wall -O2 -o mime-tool mime.c
+-	-strip mime-tool
++	$(CC) $(CFLAGS) $(LDFLAGS) -o mime-tool mime.c
+ 
+ realclean:	clean
+ 	-rm mime-tool
+diff -uraN topal-72-orig/Makefile topal-72/Makefile
+--- topal-72-orig/Makefile	2010-02-25 21:28:39.000000000 +0100
++++ topal-72/Makefile	2010-03-04 13:44:58.220101516 +0100
+@@ -15,6 +15,10 @@
+ 
+ .PHONY:	all clean realclean distclean package install distrib all2 FORCE
+ 
++CC=gcc
++CFLAGS=-Wall -O2
++LDFLAGS=
++
+ RELEASECODE=$(shell grep '^<dt>' README.html | tail -1 | sed 's/.* release //; sx</a>.*$$xx')
+ BUILDDATE=$(shell date '+%Y-%m-%dT%H%M%S%Z')
+ 
+@@ -42,20 +46,19 @@
+ all2:	package distrib
+ 
+ ada-readline-c.o:	ada-readline-c.c
+-	gcc -c -Wall -O2 $(TOPALDEBUG) ada-readline-c.c
++	$(CC) -c $(CFLAGS) $(TOPALDEBUG) ada-readline-c.c
+ 
+ ada-echo-c.o:	ada-echo-c.c
+-	gcc -c -Wall -O2 $(TOPALDEBUG) ada-echo-c.c
++	$(CC) -c $(CFLAGS) $(TOPALDEBUG) ada-echo-c.c
+ 
+ externals-c.o:	externals-c.c
+-	gcc -c -Wall -O2 $(TOPALDEBUG) externals-c.c
++	$(CC) -c $(CFLAGS) $(TOPALDEBUG) externals-c.c
+ 
+ mime-tool:	
+-	make -C MIME-tool
++	$(MAKE) -C MIME-tool
+ 
+ topal:	$(TOPALDEPS)
+-	gnatmake -gnatwa -gnato -O2 $(TOPALDEBUG) topal
+-	-strip topal
++	gnatmake -gnatwa -gnato -O2 $(TOPALDEBUG) topal -largs $(LDFLAGS)
+ 
+ topal.gz:	topal
+ 	gzip -c9 topal > topal.gz
+@@ -85,13 +88,13 @@
+ README.txt:	README.html
+ 	lynx -dont_wrap_pre -underscore -nolist -dump README.html > README.txt
+ 
+-install:	all
++install:
+ 	install -d $(INSTALLPATHBIN) $(INSTALLPATHDOC) $(INSTALLPATHMAN)/man1 $(INSTALLPATHPATCHES)
+-	install -m 755 -s topal $(INSTALLPATHBIN)
+-	install -m 644 README.html README.txt COPYING $(INSTALLPATHDOC)
++	install -m 755 topal $(INSTALLPATHBIN)
++	install -m 644 README.txt $(INSTALLPATHDOC)
+ 	install -m 644 topal.man $(INSTALLPATHMAN)/man1/topal.1
+-	install -m 644 pine-*.patch alpine-*.patch alpine-*.patch-* $(INSTALLPATHPATCHES)
+-	install -m 755 -s MIME-tool/mime-tool $(INSTALLPATHBIN)
++	install -m 644 alpine-*.patch alpine-*.patch-* $(INSTALLPATHPATCHES)
++	install -m 755 MIME-tool/mime-tool $(INSTALLPATHBIN)
+ 	install -m 644 MIME-tool/mime-tool.man $(INSTALLPATHMAN)/man1/mime-tool.1
+ 
+ clean:
diff --git a/net-mail/topal/topal-64.ebuild b/net-mail/topal/topal-64.ebuild
index 74174cd..a1d7f49 100644
--- a/net-mail/topal/topal-64.ebuild
+++ b/net-mail/topal/topal-64.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/topal/topal-64.ebuild,v 1.2 2009/04/26 06:40:02 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/topal/topal-64.ebuild,v 1.4 2009/11/07 22:18:37 volkmar Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ SRC_URI="http://homepage.ntlworld.com/phil.brooke/topal/rel-${PV}/topal-package-
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="virtual/ada"
diff --git a/net-mail/topal/topal-72.ebuild b/net-mail/topal/topal-72.ebuild
new file mode 100644
index 0000000..43907f5
--- /dev/null
+++ b/net-mail/topal/topal-72.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/topal/topal-72.ebuild,v 1.1 2010/03/05 12:03:53 tove Exp $
+
+EAPI=2
+
+inherit toolchain-funcs eutils
+
+DESCRIPTION="Topal is a 'glue' program that links GnuPG and Pine/Alpine."
+HOMEPAGE="http://homepage.ntlworld.com/phil.brooke/topal/"
+SRC_URI="http://homepage.ntlworld.com/phil.brooke/topal/rel-${PV}/topal-package-${PV}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=app-crypt/gnupg-2.0.7-r1
+	|| ( net-mail/metamail app-misc/run-mailcap )
+	|| ( app-text/dos2unix app-text/hd2u )
+	sys-libs/ncurses
+	sys-libs/readline"
+DEPEND="${RDEPEND}
+	virtual/ada"
+
+src_prepare() {
+	rm "${S}"/MIME-tool/mime-tool || die
+	epatch "${FILESDIR}"/${PV}-Makefile.patch
+}
+
+src_compile() {
+	emake -j1 CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "make failed"
+}
+
+src_install() {
+	emake install \
+		INSTALLPATH="${D}"/usr \
+		INSTALLPATHDOC="${D}"/usr/share/doc/${PF} \
+			|| die "make install failed"
+	dohtml "${S}"/README.html || die
+}