mail-client/alpine: Update deps

4 files changed, 15 insertions, 18 deletions

diff --git a/mail-client/alpine/alpine-2.00-r7.ebuild b/mail-client/alpine/alpine-2.00-r7.ebuild
index d9a35d0d..3abc7a68 100644
--- a/mail-client/alpine/alpine-2.00-r7.ebuild
+++ b/mail-client/alpine/alpine-2.00-r7.ebuild
@@ -1,8 +1,7 @@
-# Copyright 2016 Gentoo Foundation
+# Copyright 2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 inherit flag-o-matic autotools toolchain-funcs
 
 CHAPPA_PL=115
@@ -14,34 +13,28 @@ SRC_URI="ftp://ftp.cac.washington.edu/alpine/${P}.tar.bz2
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="doc ipv6 kerberos ldap libressl nls onlyalpine pam passfile smime spell ssl threads topal +chappa"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+IUSE="doc ipv6 kerberos ldap libressl nls onlyalpine pam passfile smime spell ssl threads +chappa"
 
 DEPEND="pam? ( virtual/pam )
-	>=net-libs/c-client-2007f-r4[topal=,chappa=]
+	>=net-libs/c-client-2007f-r4[chappa=]
 	>=sys-libs/ncurses-5.1:0=
 	ssl? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
 	)
 	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
-}
+	!<=net-mail/uw-imap-2004g
+"
 
 src_prepare() {
 	use chappa && eapply "${WORKDIR}/${P}-chappa-${CHAPPA_PL}-all.patch"
-	use topal && eapply /usr/share/topal/patches/"${P}".patch-{1,2}
 
 	# do not use the bundled c-client
 	ebegin "Unbundling the c-client library"
@@ -89,7 +82,7 @@ src_configure() {
 		$(use_with spell interactive-spellcheck /usr/bin/aspell) \
 		$(use_enable nls) \
 		$(use_with ipv6) \
-		$(use topal || use_with smime) \
+		$(use_with smime) \
 		${myconf}
 }
 
diff --git a/mail-client/alpine/metadata.xml b/mail-client/alpine/metadata.xml
index d221cb81..f37a0597 100644
--- a/mail-client/alpine/metadata.xml
+++ b/mail-client/alpine/metadata.xml
@@ -14,6 +14,5 @@
 		<flag name="passfile">Adds support for caching passwords into a file
 			between sessions</flag>
 		<flag name="smime">Enable support for S/MIME</flag>
-		<flag name="topal">Enable support for <pkg>net-mail/topal</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index aebdc2a4..c4f2b59a 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -72,6 +72,7 @@ games-rpg/aklabeth 1.0-r1: A remake of Richard C. Garriott's Ultima prequel
 games-rpg/dsa-stats 1.0: calculate stat probabalities for the role playing game DSA - Das schwarze Auge
 games-rpg/m5figur-mv 2.8.2: LaTeX2e character sheet layout for the Midgard Role Playing Game (Edition M5)
 games-rpg/magus 1.3.1 1.3.3 99999999: A character generator for the popular German role playing game Midgard
+mail-client/alpine 2.00-r7: alpine is an easy to use text-based based mail and news client
 media-gfx/pqiv 2.8.5: powerful GTK based command-line image viewer with a minimal UI
 media-libs/avidemux-core 2.6.20-r1: Core libraries for media-video/avidemux
 media-libs/avidemux-plugins 2.6.20: Plugins for media-video/avidemux
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 0092f9ae..fcd41bc7 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -180,6 +180,10 @@ games-rpg/magus:pdfviewer_qpdfview - Use qpdfview as default pdfviewer
 games-rpg/magus:pdfviewer_zathura - Use zathura as default pdfviewer
 games-rpg/magus:pngcrush - Use pngcrush for opimizing png before installation
 games-rpg/magus:postgres - Use postgresql instead of sqlite
+mail-client/alpine:chappa - enhance alpine by applying Eduardo Chappa's patches
+mail-client/alpine:onlyalpine - installs only the alpine binary, so it does not collied with app-editors/pico and/or mail-client/pine
+mail-client/alpine:passfile - Adds support for caching passwords into a file between sessions
+mail-client/alpine:smime - Enable support for S/MIME
 media-gfx/pqiv:archive - Enable support for images in archives and cbX comic book files
 media-gfx/pqiv:gtk2 - Use gtk:2 instead of gtk:3
 media-libs/avidemux-core:nvenc - Adds support for NVIDIA Encoder (NVENC) API for hardware accelerated encoding on NVIDIA cards.