From fadc5f3643da7c0e97896675186612f23c9c306f Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Sat, 14 Jan 2017 20:46:19 +0100
Subject: mail-client/claws-mail: Minor ebuild cleanup.

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---
 mail-client/claws-mail/claws-mail-3.13.2.ebuild | 28 ++---------------------
 mail-client/claws-mail/claws-mail-3.14.1.ebuild | 30 +++----------------------
 2 files changed, 5 insertions(+), 53 deletions(-)

(limited to 'mail-client/claws-mail')

diff --git a/mail-client/claws-mail/claws-mail-3.13.2.ebuild b/mail-client/claws-mail/claws-mail-3.13.2.ebuild
index beeb0d10500b..6b0cea754659 100644
--- a/mail-client/claws-mail/claws-mail-3.13.2.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -25,29 +25,6 @@ REQUIRED_USE="libcanberra? ( notification )
 	networkmanager? ( dbus )
 	smime? ( pgp )"
 
-# Plugins are all integrated or dropped since 3.9.1
-PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
-	!!mail-client/claws-mail-archive
-	!!mail-client/claws-mail-att-remover
-	!!mail-client/claws-mail-attachwarner
-	!!mail-client/claws-mail-clamd
-	!!mail-client/claws-mail-fancy
-	!!mail-client/claws-mail-fetchinfo
-	!mail-client/claws-mail-gdata
-	!!mail-client/claws-mail-geolocation
-	!!mail-client/claws-mail-gtkhtml
-	!!mail-client/claws-mail-mailmbox
-	!!mail-client/claws-mail-newmail
-	!!mail-client/claws-mail-notification
-	!!mail-client/claws-mail-perl
-	!!mail-client/claws-mail-python
-	!!mail-client/claws-mail-rssyl
-	!!mail-client/claws-mail-spam-report
-	!!mail-client/claws-mail-tnef-parse
-	!!mail-client/claws-mail-vcalendar
-	!!mail-client/claws-mail-address_keeper
-	!!mail-client/claws-mail-pdf-viewer"
-
 COMMONDEPEND=">=sys-devel/gettext-0.12.1
 	gdata? ( >=dev-libs/libgdata-0.17.1 )
 	gtk3? ( x11-libs/gtk+:3 )
@@ -80,8 +57,7 @@ COMMONDEPEND=">=sys-devel/gettext-0.12.1
 	webkit? ( >=net-libs/webkit-gtk-1.0:2 )
 "
 
-DEPEND="${PLUGINBLOCK}
-	${COMMONDEPEND}
+DEPEND="${COMMONDEPEND}
 	app-arch/xz-utils
 	xface? ( >=media-libs/compface-1.4 )
 	virtual/pkgconfig"
diff --git a/mail-client/claws-mail/claws-mail-3.14.1.ebuild b/mail-client/claws-mail/claws-mail-3.14.1.ebuild
index fa974614f8fc..e899454c21dc 100644
--- a/mail-client/claws-mail/claws-mail-3.14.1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.14.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,36 +16,13 @@ SLOT="0"
 LICENSE="GPL-3"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
+IUSE="archive bogofilter calendar clamav dbus debug doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification valgrind webkit xface"
 REQUIRED_USE="libcanberra? ( notification )
 	libindicate? ( notification )
 	libnotify? ( notification )
 	networkmanager? ( dbus )
 	smime? ( pgp )"
 
-# Plugins are all integrated or dropped since 3.9.1
-PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
-	!!mail-client/claws-mail-archive
-	!!mail-client/claws-mail-att-remover
-	!!mail-client/claws-mail-attachwarner
-	!!mail-client/claws-mail-clamd
-	!!mail-client/claws-mail-fancy
-	!!mail-client/claws-mail-fetchinfo
-	!mail-client/claws-mail-gdata
-	!!mail-client/claws-mail-geolocation
-	!!mail-client/claws-mail-gtkhtml
-	!!mail-client/claws-mail-mailmbox
-	!!mail-client/claws-mail-newmail
-	!!mail-client/claws-mail-notification
-	!!mail-client/claws-mail-perl
-	!!mail-client/claws-mail-python
-	!!mail-client/claws-mail-rssyl
-	!!mail-client/claws-mail-spam-report
-	!!mail-client/claws-mail-tnef-parse
-	!!mail-client/claws-mail-vcalendar
-	!!mail-client/claws-mail-address_keeper
-	!!mail-client/claws-mail-pdf-viewer"
-
 COMMONDEPEND="
 	archive? (
 		app-arch/libarchive
@@ -83,8 +60,7 @@ COMMONDEPEND="
 	webkit? ( >=net-libs/webkit-gtk-1.1.14:2 )
 "
 
-DEPEND="${PLUGINBLOCK}
-	${COMMONDEPEND}
+DEPEND="${COMMONDEPEND}
 	app-arch/xz-utils
 	virtual/pkgconfig
 	xface? ( >=media-libs/compface-1.4 )"
-- 
cgit v1.2.3-65-gdbad