Unbundle c-client library - bug #391387. Fix building with ssl. Fix Chappa URL - bug #374405. Remove unneeded blocker - bug #437550

Package-Manager: portage-2.2.0_alpha138/cvs/Linux x86_64
Manifest-Sign-Key: 0x586A3B1F

7 files changed, 496 insertions, 21 deletions

diff --git a/mail-client/alpine/ChangeLog b/mail-client/alpine/ChangeLog
index 2a1cfcf5b89d..15eaf6682154 100644
--- a/mail-client/alpine/ChangeLog
+++ b/mail-client/alpine/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/alpine
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/alpine/ChangeLog,v 1.14 2012/06/13 09:49:13 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/alpine/ChangeLog,v 1.15 2012/10/15 13:00:42 eras Exp $
+
+*alpine-2.00-r5 (15 Oct 2012)
+
+  15 Oct 2012; Eray Aslan <eras@gentoo.org> +alpine-2.00-r5.ebuild,
+  +files/2.00-c-client.patch, +files/2.00-lcrypto.patch,
+  +files/2.00-qa-chappa-115.patch, +files/2.00-qa.patch:
+  Unbundle c-client library - bug #391387. Fix building with ssl. Fix Chappa URL
+  - bug #374405. Remove unneeded blocker - bug #437550
 
   13 Jun 2012; Michael Weber <xmw@gentoo.org> alpine-2.00-r4.ebuild:
   ppc stable (bug 317971)
@@ -55,4 +63,3 @@
   24 Apr 2009; Torsten Veller <tove@gentoo.org> +files/2.00-lpam.patch,
   +files/CVE-2008-5514.patch, +metadata.xml, +alpine-2.00.ebuild:
   Initial commit. Thanks to Sascha Lucas et al. in bug #176904
-
diff --git a/mail-client/alpine/Manifest b/mail-client/alpine/Manifest
index 743ab5577fd2..cd2996697fc4 100644
--- a/mail-client/alpine/Manifest
+++ b/mail-client/alpine/Manifest
@@ -1,25 +1,41 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-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-chappa-73-all.patch.gz 200049 RMD160 984c55fa808c2eb9657be5ce7da250ef8422624b SHA1 08a6cff3f72bd465ce634368706275d08aa7986d SHA256 33a6c3b930a3a14b904386d847721a507e83be0b38ff5f797cb4c136a06015fa
-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-r4.ebuild 3869 RMD160 fb7d63719d6776f3fa3e373f2302540211b20a46 SHA1 ed08c0ef3adc34590275cd1d0b98a7915759920b SHA256 f2b505c7453a785c2c82caa107d4d761688cc19f6be5a1f08ac185068f7c509b
-EBUILD alpine-2.00.ebuild 3865 RMD160 3aaadc2e654c3ae7eeb121430e30c6c592ec84f0 SHA1 969ab89637a7c7bae66c2e3a0f85da16cc568ae5 SHA256 a27755fc41dc3a876e9cbe4c4db3ba6abace7a3a89f042c1b77e698aa7decc82
-MISC ChangeLog 2012 RMD160 bc4611f4e5c384fa49724d47fe2a248a185eea9b SHA1 752fc540ea78f7737c3dcb213ede6c80dd08e1a4 SHA256 1ca1caf094f0270d94f669ba86bf497185b9de56eb66c9b31341bd1df75e8874
-MISC metadata.xml 748 RMD160 d564dd117d392a71b5c8e6c77a09b504c7a4d75e SHA1 385a75b4fb2ce24ac0c5e819d2fe1d4bb01093f7 SHA256 217a240423045ac5706516400425fe4f903252b5eece607ba813ea6b1444067b
+AUX 2.00-c-client.patch 6320 SHA256 e68df15127a68147304fa097c524b891d78fb02666b76800f82756f0f12ec506 SHA512 123eb7d6310cba4908b90393e56bd9cc398ee40289fd328a3bc6b9ae37059cf73540cd9cdd2b16b0210555a696d501016b8e6b201e2c13738088a1d3728f5fb7 WHIRLPOOL 871633f9103eb6baec260e2af97e8f085cf39f6feb5789439c4a4650640fded533338ae20187ffcecd5542247fb36d02d84481e274c11be58639c2d52bff2ea0
+AUX 2.00-lcrypto.patch 496 SHA256 856c3623f9b6092730a6f550e7a3d4bd68d89b20e3eb6d637d339415a5c7692b SHA512 1d90950a3066f29cedf225283e58ac007deb0db4507000e05fc3ccf5ebbfcef6af076f04d4e0da5ec0f47cea823e651eae3ab1315efec5373245515cf1e640ea WHIRLPOOL 4642efdab4209d13e859573d6f0b6726e1bb8bdb711aab4e8c383b50e633ef56be14c54446f01a06a09abd94ba5b2ecbee13cbe38385d6b0f96505e8cacb18c8
+AUX 2.00-lpam.patch 295 SHA256 22c354937019693cfc03a8864a36c30579fd98475b729e089f83ec125e4225ad SHA512 5705c7736797b38c80a2b1bd96f283b00a06ea7b00868c0470cd4a33408aa00a49c5cbba986bf6f3d4d0d84d220f4ae0191003914b0e0651fead785068140d5a WHIRLPOOL 2d7655b9df96e9fd81d38f487a23c2dc078aa49bce9be5212cb2ce94f66f93e736d35847c3c056ae424c25f019f95ee8b1b972d55cd4018d8bc3adda7aae60cb
+AUX 2.00-qa-chappa-115.patch 1312 SHA256 00a899711354f9b854a80c1e650c07bb98faa1a60b6696c221d8c88a75032a90 SHA512 ec6720bffdba5b853f696720ef9a74b13901ec918648c97170dce3ae8be4c2f1dc6de124662b1a9d9e08f7c626688aae81456f5afb6131594a427edc9de7c56b WHIRLPOOL 683266dae55235ea6258f84bc99c1692fc31c38891d3bd0b0e64268228fe4765bddb8f40c9a337653984d45b066e3652934b4e8f9755ff7133bc35e36f64f628
+AUX 2.00-qa.patch 409 SHA256 3c1c89588f85950b5d67f26ce5a5832648f0b923260c4ba168af7d1a818dfdb4 SHA512 4c9107fe2db7688f925054b31748fc10db5c445fda5177babbee2fe543c834658f4b65ea3b4e18259acb809755bf4fa2408f47ee379d6006554ee7556b334a26 WHIRLPOOL f33d9e4e0e703796a3dadb8f5cffabfe646e1cbe8f6f17c45c997476e0e204395728828954d392d18213ad99775c669f2f666d9b12b9bab275005027afca2f56
+AUX CVE-2008-5514.patch 634 SHA256 07fd3dd2ffdfe9e2c952603b9aae099d1250bc89373de3e1a5009ec5d251346b SHA512 c5ed29171b13eb8edc1a8bde0a9923afcb4809bf17da96bc4c72ce501e016494523b0c184754027f9e5fcfec0f0405354e0ebafd6b8e30b9b4986b85e16e881a WHIRLPOOL b9e86ec7513d04c5c240c69cce562d588b7afac8e0c5f417ac6aed7d97edea51dc328dd95ac7210f5c9bc634213dcd204658bf18781006ab9acfb974fa79f758
+DIST alpine-2.00-chappa-115-all.patch.gz 212705 SHA256 1503ae09b6a4a74828e3472c4987b48a310f817e7fd93ca385724660aa234d7f SHA512 5e9fcb6a80dbd18bed26109caa6b7aa5eeb88de420861d9998c32f031e8279d6367c28b6670fb54203d1b14c3dc47cf5ad25b42e4949157de64f3f1fd36d0aa7 WHIRLPOOL d9fef2fb0a07acfb8ba4e5bedbc0140a09020967e52b16853907db47b1a7e35286022c2a03b1670fe377015393d22b27bfa9f12780de05bac1f3458a81f75527
+DIST alpine-2.00-chappa-26-all.patch.gz 179066 SHA256 a14b3cc49a0f7eef6459488687b2a15ff5318f5db8586a47aca04c5bce08aea5
+DIST alpine-2.00-chappa-51-all.patch.gz 195020 SHA256 7a9e8d1e7dfa677543e9db4caf524eb0ff4da5511613c7b5c00228cc31475075
+DIST alpine-2.00-chappa-52-all.patch.gz 194980 SHA256 e0fd704cf6f8214f1daaf7ff4dff0eb04d799943f06fa70bdab2ed7280b0e070
+DIST alpine-2.00-chappa-53-all.patch.gz 196219 SHA256 153d9d903bd0015ca9064ecdd74d03d58e26502edd2116cf4e18db8e88d15e43
+DIST alpine-2.00-chappa-73-all.patch.gz 200049 SHA256 33a6c3b930a3a14b904386d847721a507e83be0b38ff5f797cb4c136a06015fa SHA512 bd540c43d1aa6c2ae4252b950ff18edd0f2ee583d26d9b775a8a248a633d6b79103630a66f6069a23a9365ca1b5f3234a8cebac8e6b631b97835fc73d4d34d66 WHIRLPOOL b69ffa9d2b00d85a1d9533bd1a140e03299b7e0ac2ee9361cb7d73ad6fb7329c565965be24921439ad04e45f9d37a83854a9eeaad59b4a453d8012a06180a414
+DIST alpine-2.00.tar.bz2 5222673 SHA256 c85db8405af90375ba2440c85b7952d80996154e9916b83acca558dc82e0a2a6 SHA512 17c6e65fbe767d4f9ffb3d3c2bb3deeab9d3620cd046cbb0009290aa484c9254effa992957631f0603bd82b82aeca2923d391aee6d20a7684d5830fbca8ce4d2 WHIRLPOOL 6c1fed63e826c12c6e39e8f79e2b33f3b85545e54c32fdbe918636086c0aaaa26073883946061a6b52df50af711b7d6bb6647a177f051afccccdbd0cf473bbc3
+EBUILD alpine-2.00-r1.ebuild 3865 SHA256 b5778a4055e0f9370bb1334d67be426644ed7d6a9e3a4f8821389448d6c67ffa SHA512 d4a19eea47029a161ff6e1a5b57496533a440fd56c2620e85c445b116206d83b2ad1fa23dfb59d4b3ff489f9b512cba42d1feaa05315ffe40c2561ff6d97b36c WHIRLPOOL efdbb6a7de961d81c9a9e59f30abd88c9477dedc62102c3231e22f47439287fbcace903af875d950bc787dbd262502b1524c2bc77788d44cb4b10c6a7ce670ac
+EBUILD alpine-2.00-r2.ebuild 3873 SHA256 d7195eb6be26a40ca3e02c465ad4bfc1ae2d33fa655bdfff1e8d4ecd3f397ac8 SHA512 1ae4012131f31dba4e015f4cc68d053248e394d204d559a502c520a58ae3b1775bd68e4ca4be8ef0411383e86c3d43fb7e4ceaf6744dce7f9de7cbf6deb95a3b WHIRLPOOL cf9586402b97397ee16a6ab279b03c8dd59ad2502bce1196b43de7fafbd9415bcf6144a04b8ade6b50d0572f87eefbecb87288c8678c940d3f0979d77e14a422
+EBUILD alpine-2.00-r3.ebuild 3876 SHA256 12b165d0084ef762e06ab6de1f0c9492affdf89626d211d910477c930ebb3c43 SHA512 5b5a68c3f3573709aab4c181999cab1f0d41c8a0977420ae91b36b315ed8251e64a238b9bfc26615e1fde26bf7e290b7d6dbff001a0a1e7c0b00e4061d7702ac WHIRLPOOL a5a4928b7b4d456a14adb0b6a8d2f497f5376ce6e9b73f0b090710cf8e186520b2156ec1751bc4ade03b3535df31cdd9f2a08e7626e9d95541d0490b29f54361
+EBUILD alpine-2.00-r4.ebuild 3869 SHA256 f2b505c7453a785c2c82caa107d4d761688cc19f6be5a1f08ac185068f7c509b SHA512 312304cc41bd2bc04669b5ae0d28989e1e680dd4ad9d5810af2bdef3072583d912ba926bd7cbc707d12b1a66f174214b9ebbc71cefe0510dc80adaef4c6704b5 WHIRLPOOL 0490a5f00f09e2719617cfc237705297ecf458b21ab12adbd232d297e24ad2690da3242648290552444d728896759e6892f5a79e8dc1ba94aa3c9fb4dcef3e26
+EBUILD alpine-2.00-r5.ebuild 3432 SHA256 c4c0f22adc3237560812df070efe3587dd845940bb91d8c4863a9e91b115ce9f SHA512 2a8786eccf559e8d7f28ac637e6f468390fa65730863965d8471931b9c111a5e1f675acbdd827bec4811313ab63ead44b58db4f81b1bc3285e1f1fd04fea78dd WHIRLPOOL eb0dfc9759cef39f01aa51afca399e968d416087ebbe1d7b577e3e13aba4bffd5aa2d485f378139b782b56dcdb92cb5c93f6b1ecd2b08128755cc7b28890a57c
+EBUILD alpine-2.00.ebuild 3865 SHA256 a27755fc41dc3a876e9cbe4c4db3ba6abace7a3a89f042c1b77e698aa7decc82 SHA512 0d087a497eb7fba670f727a7e7fc341c008e2e21e46ae92048d97e76106bf996dea27485695c76f9fc8dffb75dd3f28b13df09140767c01854f7f52724753353 WHIRLPOOL d79aeb373ca19c5ce4a49f12df0c0cc047070791ef1545d2cb25c07def483e096711df4a8ec53fe9b34c5a4bdb13ff78c11993abf40a990fcdf4a66b12be6675
+MISC ChangeLog 2362 SHA256 a1e47b4ad6fdc54f616c3225be8db03b40eebcc4f4459f868380277ac02cb1de SHA512 8e431fd4c8eab30fbc4693d3a04fb609067fde1c21cd47efd70e5d07e5d1a0442ba69d630173b8536b50e872251ff09938b6e07fb0a41595ef8a686f439c8ab8 WHIRLPOOL 6fefd19b57a9a7d1fa0813fd7be59971b930a40536fbab0871d67265ed2ae253b22d32e9b0cbdebb9db47956e90bbeb486d1c6acf7ee90a4416af341056065cd
+MISC metadata.xml 748 SHA256 217a240423045ac5706516400425fe4f903252b5eece607ba813ea6b1444067b SHA512 f027137f9c351df1b6c651c46d1b88448daced331c9bd93b991f52a44d4b3fcc8c43797c5fb8bd65f7ed7a2150dd4a3694a9c5ca0c67903f23b148150d0ae8c8 WHIRLPOOL 424d47227dfcbe576cd2e669fe0fd7d015ff8579b3137c185d7371b54e6b14ab3f42a769bd3b78c489df8607471f46f068493e2d3e043c5fa1c52f35cee7a93b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/YYfkACgkQknrdDGLu8JCqfgD8DlKGkKzMo/duv9ipfdx19lwU
-dbgaurFTG9FTipr0jTIA+gMf5hrdYY8vGCYT2HD2ksnlFAPdXoa8q1OadI8IKKqc
-=bWvt
+iQIcBAEBCAAGBQJQfAkFAAoJEHfx8XVYajsfaPgP/1qdSOH3yhtIqnyazA9jT5oQ
+FL2oG0iNgEGtqTuIlRZeaYCitq7TM5CWQJoIvHYoKWCKxsi+sAr1puJDIw/LHfWq
+LVja2HiOX0DLY1LFpZtudkzJHu2KbI8v0fEQROUqyd/+lTCd9hZN0JRF27t7mvSL
+1EaCmCp8748yZhlNiVC6NGytAuM6I0ox/hiHtQm4+djlPIPGdypg3fpK+aDB6xhx
+CsD8Om6QVg08UkcxQS5LzJFg66DinytB7+1QR2Lzq0Ch/3pQP7O+pgFldrZZtd+N
+3pIYSs9criZwLeqOOQQURw91VjG9KIOjczkjZgzNoEBKpzybxK5DC2CAIOYKi8AS
+uFKCqa1WpQ/+nA6IgOTTC+XuckNRtR7Hw1n7LiW1Y2sx86QO+atcSfCudu7gm5xs
+aqujqhZJQbGKNYc8Jsh3u6MLGm5LZwIPbz7zu1gsTPrf1SqqU+mzKDdIbJDKu6Fb
+bYAX9ckflRb9mXpY8i8gvz5iPxxX41u1p/3U6qoPvXhlUKwdnXt3dP9akxS0WXFM
+XHF7Hgh87swyunTrM2L4vGYdXzqCipe4vEPtFAm98TXs+goN/fm2rg33ZeJXIFdf
+JjJm9CVKi12MWD8o4wcDMY2/tf7ztEVlKdDLd5VnBkd2+w/iCHRmYnU/kgLV9PuI
+5RqBjcdT+M5fqf0PGahQ
+=ZYbL
 -----END PGP SIGNATURE-----
diff --git a/mail-client/alpine/alpine-2.00-r5.ebuild b/mail-client/alpine/alpine-2.00-r5.ebuild
new file mode 100644
index 000000000000..679c0ecd938d
--- /dev/null
+++ b/mail-client/alpine/alpine-2.00-r5.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/alpine/alpine-2.00-r5.ebuild,v 1.1 2012/10/15 13:00:42 eras Exp $
+
+EAPI=4
+
+inherit eutils flag-o-matic autotools multilib
+
+CHAPPA_PL=115
+DESCRIPTION="alpine is an easy to use text-based based mail and news client"
+HOMEPAGE="http://www.washington.edu/alpine/ http://patches.freeiz.com/alpine/"
+SRC_URI="ftp://ftp.cac.washington.edu/alpine/${P}.tar.bz2
+	chappa? ( http://patches.freeiz.com/alpine/patches/alpine-2.00/all.patch.gz
+	-> ${P}-chappa-${CHAPPA_PL}-all.patch.gz )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+IUSE="doc ipv6 kerberos ldap nls onlyalpine passfile smime spell ssl threads topal +chappa"
+
+DEPEND="virtual/pam
+	>=net-libs/c-client-2007f-r4[topal=,chappa=]
+	>=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? ( !mail-client/pine )
+	!<=net-mail/uw-imap-2004g"
+
+pkg_setup() {
+	if use smime && use topal ; then
+		ewarn "You can not have USE='smime topal'. Assuming topal is more important."
+	fi
+}
+
+src_prepare() {
+	use chappa && epatch "${DISTDIR}/${P}-chappa-${CHAPPA_PL}-all.patch.gz"
+	use topal && epatch /usr/share/topal/patches/"${P}".patch-{1,2}
+
+	# do not use the bundled c-client
+	ebegin "Unbundling the c-client library"
+	rm -rf "${S}"/imap
+	local f
+	while read f ; do
+	sed -i -e \
+		's~^#include[[:blank:]]".*/c-client/\(.*\)"~#include <imap/\1>~g' "$f"
+	done < <(find "${S}" -name "*.c" -o -name "*.h")
+	eend $?
+
+	epatch "${FILESDIR}"/2.00-lpam.patch
+	epatch "${FILESDIR}"/2.00-lcrypto.patch
+	epatch "${FILESDIR}"/2.00-c-client.patch
+	epatch "${FILESDIR}"/2.00-qa.patch
+	use chappa && epatch "${FILESDIR}/2.00-qa-chappa-${CHAPPA_PL}.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf="--without-tcl
+		--with-system-pinerc=/etc/pine.conf
+		--with-system-fixed-pinerc=/etc/pine.conf.fixed"
+		#--disable-debug"
+		# fixme
+		#   --with-system-mail-directory=DIR?
+
+	if use ssl; then
+		myconf+=" --with-ssl
+			--with-ssl-include-dir=/usr
+			--with-ssl-lib-dir=/usr/$(get_libdir)
+			--with-ssl-certs-dir=/etc/ssl/certs"
+	else
+		myconf+="--without-ssl"
+	fi
+	econf \
+		$(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
+		doman doc/alpine.1
+	else
+		emake DESTDIR="${D}" install
+		doman doc/rpdump.1 doc/rpload.1
+	fi
+
+	dodoc NOTICE README
+
+	if use doc ; then
+		dodoc doc/brochure.txt doc/tech-notes.txt
+		docinto imap
+		dodoc imap/docs/*.txt imap/docs/CONFIG imap/docs/RELNOTES
+
+		docinto imap/rfc
+		dodoc imap/docs/rfc/*.txt
+
+		docinto html/tech-notes
+		dohtml -r doc/tech-notes/
+	fi
+}
+
+pkg_postinst() {
+	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 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/files/2.00-c-client.patch b/mail-client/alpine/files/2.00-c-client.patch
new file mode 100644
index 000000000000..b3b33bcc455e
--- /dev/null
+++ b/mail-client/alpine/files/2.00-c-client.patch
@@ -0,0 +1,251 @@
+--- Makefile.am	2012-10-10 12:30:39.442107211 +0000
++++ Makefile.am	2012-10-10 12:31:17.235528699 +0000
+@@ -16,7 +16,7 @@
+ 
+ SUBDIRS = m4 po $(REGEX_BUILD) pith pico alpine $(WEB_PUBCOOKIE_BUILD) $(WEB_BUILD)
+ 
+-BUILT_SOURCES = c-client.d c-client $(WEB_PUBCOOKIE_LINK)
++BUILT_SOURCES = $(WEB_PUBCOOKIE_LINK)
+ 
+ CLEANFILES = c-client
+ 
+@@ -38,3 +38,4 @@
+ man_MANS = doc/alpine.1 doc/pico.1 doc/pilot.1 doc/rpdump.1 doc/rpload.1
+ 
+ ACLOCAL_AMFLAGS = -I m4
++AM_LDFLAGS = -lc-client
+--- pico/Makefile.am	2012-10-10 13:01:06.851900583 +0000
++++ pico/Makefile.am	2012-10-10 13:07:40.960017458 +0000
+@@ -24,8 +24,9 @@
+ 
+ pilot_LDADD = $(LDADD) $(INTLLIBS)
+ 
+-LDADD = ../c-client/utf8.o libpico.a osdep/libpicoosd.a \
++LDADD = libpico.a osdep/libpicoosd.a \
+ 	../pith/osdep/libpithosd.a ../pith/charconv/libpithcc.a
++AM_LDFLAGS = -lc-client
+ 
+ noinst_LIBRARIES = libpico.a
+ 
+diff --git a/alpine/callbacks.c b/alpine/callbacks.c
+new file mode 100644
+index 0000000..e92beb5
+--- /dev/null
++++ alpine/callbacks.c
+@@ -0,0 +1,184 @@
++/* ========================================================================
++ * Copyright 1988-2007 University of Washington
++ *
++ * Licensed under the Apache License, Version 2.0 (the "License");
++ * you may not use this file except in compliance with the License.
++ * You may obtain a copy of the License at
++ *
++ *     http://www.apache.org/licenses/LICENSE-2.0
++ *
++ * 
++ * ========================================================================
++ */
++
++#include <stdio.h>
++#include <signal.h>
++#include <imap/c-client.h>
++
++/* Excellent reasons to hate ifdefs, and why my real code never uses them */
++
++#ifndef unix
++# define unix 0
++#endif
++
++#if unix
++# define UNIXLIKE 1
++# define MACOS 0
++# include <pwd.h>
++#else
++# define UNIXLIKE 0
++# ifdef noErr
++#  define MACOS 1
++#  include <Memory.h>
++# else
++#  define MACOS 0
++# endif
++#endif
++
++char *curhst = NIL;             /* currently connected host */
++char *curusr = NIL;             /* current login user */
++
++
++/* Interfaces to C-client */
++
++
++void mm_searched (MAILSTREAM *stream,unsigned long number)
++{
++}
++
++
++void mm_exists (MAILSTREAM *stream,unsigned long number)
++{
++}
++
++
++void mm_expunged (MAILSTREAM *stream,unsigned long number)
++{
++}
++
++
++void mm_flags (MAILSTREAM *stream,unsigned long number)
++{
++}
++
++
++void mm_notify (MAILSTREAM *stream,char *string,long errflg)
++{
++  mm_log (string,errflg);
++}
++
++
++void mm_list (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes)
++{
++  putchar (' ');
++  if (delimiter) putchar (delimiter);
++  else fputs ("NIL",stdout);
++  putchar (' ');
++  fputs (mailbox,stdout);
++  if (attributes & LATT_NOINFERIORS) fputs (", no inferiors",stdout);
++  if (attributes & LATT_NOSELECT) fputs (", no select",stdout);
++  if (attributes & LATT_MARKED) fputs (", marked",stdout);
++  if (attributes & LATT_UNMARKED) fputs (", unmarked",stdout);
++  putchar ('\n');
++}
++
++
++void mm_lsub (MAILSTREAM *stream,int delimiter,char *mailbox,long attributes)
++{
++  putchar (' ');
++  if (delimiter) putchar (delimiter);
++  else fputs ("NIL",stdout);
++  putchar (' ');
++  fputs (mailbox,stdout);
++  if (attributes & LATT_NOINFERIORS) fputs (", no inferiors",stdout);
++  if (attributes & LATT_NOSELECT) fputs (", no select",stdout);
++  if (attributes & LATT_MARKED) fputs (", marked",stdout);
++  if (attributes & LATT_UNMARKED) fputs (", unmarked",stdout);
++  putchar ('\n');
++}
++
++
++void mm_status (MAILSTREAM *stream,char *mailbox,MAILSTATUS *status)
++{
++  printf (" Mailbox %s",mailbox);
++  if (status->flags & SA_MESSAGES) printf (", %lu messages",status->messages);
++  if (status->flags & SA_RECENT) printf (", %lu recent",status->recent);
++  if (status->flags & SA_UNSEEN) printf (", %lu unseen",status->unseen);
++  if (status->flags & SA_UIDVALIDITY) printf (", %lu UID validity",
++					      status->uidvalidity);
++  if (status->flags & SA_UIDNEXT) printf (", %lu next UID",status->uidnext);
++  printf ("\n");
++}
++
++
++void mm_log (char *string,long errflg)
++{
++  switch ((short) errflg) {
++  case NIL:
++    printf ("[%s]\n",string);
++    break;
++  case PARSE:
++  case WARN:
++    printf ("%%%s\n",string);
++    break;
++  case ERROR:
++    printf ("?%s\n",string);
++    break;
++  }
++}
++
++
++void mm_dlog (char *string)
++{
++  puts (string);
++}
++
++
++void mm_login (NETMBX *mb,char *user,char *pwd,long trial)
++{
++  char *s,tmp[MAILTMPLEN];
++  if (curhst) fs_give ((void **) &curhst);
++  curhst = (char *) fs_get (1+strlen (mb->host));
++  strcpy (curhst,mb->host);
++  sprintf (s = tmp,"{%s/%s",mb->host,mb->service);
++  if (*mb->user) sprintf (tmp+strlen (tmp),"/user=%s",strcpy (user,mb->user));
++  if (*mb->authuser) sprintf (tmp+strlen (tmp),"/authuser=%s",mb->authuser);
++  if (*mb->user) strcat (s = tmp,"} password:");
++  else {
++    printf ("%s} username: ",tmp);
++    fgets (user,NETMAXUSER-1,stdin);
++    user[NETMAXUSER-1] = '\0';
++    if (s = strchr (user,'\n')) *s = '\0';
++    s = "password: ";
++  }
++  if (curusr) fs_give ((void **) &curusr);
++  curusr = cpystr (user);
++  strcpy (pwd,getpass (s));
++}
++
++
++void mm_critical (MAILSTREAM *stream)
++{
++}
++
++
++void mm_nocritical (MAILSTREAM *stream)
++{
++}
++
++
++long mm_diskerror (MAILSTREAM *stream,long errcode,long serious)
++{
++#if UNIXLIKE
++  kill (getpid (),SIGSTOP);
++#else
++  abort ();
++#endif
++  return NIL;
++}
++
++
++void mm_fatal (char *string)
++{
++  printf ("?%s\n",string);
++}
+diff --git a/pico/Makefile.am b/pico/Makefile.am
+index f5f694b..e782324 100644
+--- pico/Makefile.am
++++ pico/Makefile.am
+@@ -16,9 +16,9 @@ SUBDIRS = osdep
+ 
+ bin_PROGRAMS = pico pilot
+ 
+-pico_SOURCES = main.c utf8stub.c
++pico_SOURCES = main.c utf8stub.c ../alpine/callbacks.c
+ 
+-pilot_SOURCES = pilot.c utf8stub.c
++pilot_SOURCES = pilot.c utf8stub.c ../alpine/callbacks.c
+ 
+ pico_LDADD = $(LDADD) $(INTLLIBS)
+ 
+--- alpine/Makefile.am	2012-10-11 07:53:35.749024355 +0000
++++ alpine/Makefile.am	2012-10-11 07:54:15.931528157 +0000
+@@ -35,11 +35,11 @@
+ LDADD = ../pico/libpico.a ../pico/osdep/libpicoosd.a \
+ 	../pith/libpith.a ../pith/osdep/libpithosd.a  \
+ 	../pith/charconv/libpithcc.a \
+-	osdep/libpineosd.a ../c-client/c-client.a
++	osdep/libpineosd.a
+ 
+ AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include -DLOCALEDIR=\"$(localedir)\"
+ 
+-AM_LDFLAGS = `cat $(top_srcdir)/c-client/LDFLAGS`
++AM_LDFLAGS = -lc-client
+ 
+ CLEANFILES = date.c
+ 
diff --git a/mail-client/alpine/files/2.00-lcrypto.patch b/mail-client/alpine/files/2.00-lcrypto.patch
new file mode 100644
index 000000000000..b0601503fece
--- /dev/null
+++ b/mail-client/alpine/files/2.00-lcrypto.patch
@@ -0,0 +1,12 @@
+diff -urp alpine-2.00.org/configure.ac alpine-2.00/configure.ac
+--- alpine-2.00.org/configure.ac	2008-08-08 19:11:31.000000000 +0200
++++ alpine-2.00/configure.ac	2011-11-24 12:01:47.741607522 +0100
+@@ -954,7 +954,7 @@ dnl provide SSL support?
+ if test "x$alpine_SSLTYPE" != "xnone" ; then
+   AC_SEARCH_LIBS(SSL_library_init,ssl,
+     [
+-      LIBS="$LIBS -lssl"
++      LIBS="$LIBS -lcrypto"
+     ])
+   if test "x$alpine_SSLTYPE" = "xnone" ; then
+     AC_MSG_NOTICE([OpenSSL libraries NOT found])
diff --git a/mail-client/alpine/files/2.00-qa-chappa-115.patch b/mail-client/alpine/files/2.00-qa-chappa-115.patch
new file mode 100644
index 000000000000..e13b80864730
--- /dev/null
+++ b/mail-client/alpine/files/2.00-qa-chappa-115.patch
@@ -0,0 +1,40 @@
+--- pith/send.c	2012-10-11 11:21:43.027665295 +0000
++++ pith/send.c	2012-10-11 11:42:37.659237275 +0000
+@@ -48,6 +48,7 @@
+ #include <imap/smtp.h>
+ #include <imap/nntp.h>
+ 
++int maildir_file_path(char *name, char *tmp);
+ 
+ /* this is used in pine_send and pine_simple_send */
+ /* name::type::canedit::writehdr::localcopy::rcptto */
+--- pith/pattern.c	2012-10-11 11:21:48.069603095 +0000
++++ pith/pattern.c	2012-10-11 11:44:19.868974380 +0000
+@@ -91,6 +91,7 @@
+ ACTION_S   *combine_inherited_role_guts(ACTION_S *);
+ int	    move_filtered_msgs(MAILSTREAM *, MSGNO_S *, char *, int, char *);
+ void        set_some_flags(MAILSTREAM *, MSGNO_S *, long, char **, char **, int, char *);
++int         maildir_file_path(char *name, char *tmp);
+ 
+ 
+ /*
+--- pith/folder.c	2012-10-15 08:19:22.933383126 +0000
++++ pith/folder.c	2012-10-15 08:19:06.314585696 +0000
+@@ -28,6 +28,7 @@
+ #include "../pith/status.h"
+ #include "../pith/busy.h"
+ #include "../pith/mailindx.h"
++#include <imap/utf8aux.h>
+ 
+ 
+ typedef struct _build_folder_list_data {
+--- pith/state.c	2012-10-15 08:31:20.378623246 +0000
++++ pith/state.c	2012-10-15 08:38:07.089630169 +0000
+@@ -38,6 +38,7 @@
+  * Globals referenced throughout pine...
+  */
+ struct pine *ps_global;				/* THE global variable! */
++extern void free_allowed_qstr(void);
+ 
+ #ifdef	DEBUG
+ /*
diff --git a/mail-client/alpine/files/2.00-qa.patch b/mail-client/alpine/files/2.00-qa.patch
new file mode 100644
index 000000000000..da2535ef15cd
--- /dev/null
+++ b/mail-client/alpine/files/2.00-qa.patch
@@ -0,0 +1,19 @@
+--- pith/charconv/utf8.c	2012-10-11 07:57:38.022062458 +0000
++++ pith/charconv/utf8.c	2012-10-11 08:59:56.205068504 +0000
+@@ -16,6 +16,8 @@
+  */
+ 
+ 
++#define _XOPEN_SOURCE
++
+ /* includable WITHOUT dependency on c-client */
+ #include <imap/mail.h>
+ #include <imap/utf8.h>
+@@ -38,6 +40,7 @@
+ #include "utf8.h"
+ 
+ #include <stdarg.h>
++#include <wchar.h>
+ 
+ 
+ unsigned single_width_chars_a_to_b(UCS *, int, int);