rerun autoconf to fix bug 469578 by John Brendler; also split out some functionality of notification plugin and giving it the generic name USE=notification instead of libnotify

(Portage version: 2.1.11.62/cvs/Linux i686, RepoMan options: --force, signed Manifest commit with key 2B859DE3)

3 files changed, 29 insertions, 11 deletions

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index fec3f584422f..3570c467ce6a 100644
--- a/mail-client/claws-mail/ChangeLog
+++ b/mail-client/claws-mail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/claws-mail
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.233 2013/05/11 22:36:23 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.234 2013/05/12 19:50:46 fauli Exp $
+
+  12 May 2013; Christian Faulhammer <fauli@gentoo.org> claws-mail-3.9.1.ebuild,
+  metadata.xml:
+  rerun autoconf to fix bug 469578 by John Brendler; also split out some
+  functionality of notification plugin and giving it the generic name
+  USE=notification instead of libnotify
 
   11 May 2013; Christian Faulhammer <fauli@gentoo.org> claws-mail-3.9.1.ebuild:
   >=net-libs/libsoup-2.42 replace preceeding net-libs/libsoup-gnome versions,
diff --git a/mail-client/claws-mail/claws-mail-3.9.1.ebuild b/mail-client/claws-mail/claws-mail-3.9.1.ebuild
index 223458d0f2c0..19ea8338e10b 100644
--- a/mail-client/claws-mail/claws-mail-3.9.1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.9.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.9.1.ebuild,v 1.6 2013/05/11 22:36:23 fauli Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.9.1.ebuild,v 1.7 2013/05/12 19:50:46 fauli Exp $
 EAPI="5"
 
 PYTHON_COMPAT=( python2_{5,6,7} )
+AUTOTOOLS_AUTORECONF=yes
 
 inherit autotools-utils multilib gnome2-utils eutils python-single-r1
 
@@ -17,8 +17,11 @@ SLOT="0"
 LICENSE="GPL-3"
 KEYWORDS="~amd64 ~hppa ~mips ~x86 ~x86-fbsd"
 
-IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap networkmanager nntp +libnotify pda pdf perl +pgp python rss session smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
-REQUIRED_USE="networkmanager? ( dbus )"
+IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface"
+REQUIRED_USE="networkmanager? ( dbus )
+	libcanberra? ( notification )
+	libindicate? ( notification )
+	libnotify? ( notification )"
 
 # Plugins are all integrated or dropped since 3.9.1
 PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier
@@ -62,9 +65,11 @@ COMMONDEPEND=">=sys-devel/gettext-0.12.1
 	archive? ( app-arch/libarchive
 		>=net-misc/curl-7.9.7 )
 	bogofilter? ( mail-filter/bogofilter )
-	libnotify? ( x11-libs/libnotify
-		media-libs/libcanberra[gtk]
-		dev-libs/libindicate:3[gtk]
+	notification? (
+		libnotify? ( x11-libs/libnotify )
+		libcanberra? (  media-libs/libcanberra[gtk] )
+		libindicate? ( dev-libs/libindicate:3[gtk] )
+		dev-libs/glib
 	)
 	smime? ( >=app-crypt/gpgme-0.4.5 )
 	calendar? ( >=net-misc/curl-7.9.7 )
@@ -92,9 +97,7 @@ RDEPEND="${COMMONDEPEND}
 	app-misc/mime-types
 	x11-misc/shared-mime-info"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}_libsoup-check-fix.patch"
-}
+PATCHES=( "${FILESDIR}/${P}_libsoup-check-fix.patch" )
 
 src_configure() {
 	local myeconfargs=(
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
index e3b0a61878a9..77852b006d2c 100644
--- a/mail-client/claws-mail/metadata.xml
+++ b/mail-client/claws-mail/metadata.xml
@@ -19,6 +19,15 @@
 		<flag name='dillo'>Enables support for inline HTTP email viewing with a
 			plugin (which depends on the <pkg>www-client/dillo</pkg> 
 			browser)</flag>
+		<flag name='libcanberra'>Enable sound notification in connection
+		with USE=notification</flag>
+		<flag name='libindicate'>Enable notification through
+		DBUS in connection with USE=notification</flag>
+		<flag name='libnotify'>Enable notification on the
+		desktop in connection with USE=notification</flag>
+		<flag name='notification'>Notification for new mail in
+		different way, see also USE flags libcanberra,
+		libindicate and libnotify</flag>
 		<flag name='smime'>Build plugin for S/MIME support</flag>
 		<flag name='spamassassin'>Build <pkg>mail-filter/spamassassin</pkg>
 			plugin</flag>