evolution->evo USE flag change, bug #157265

(Portage version: 2.1.3.7)

5 files changed, 29 insertions, 24 deletions

diff --git a/mail-client/mail-notification/ChangeLog b/mail-client/mail-notification/ChangeLog
index b54de8e64459..3f5da2b1e26a 100644
--- a/mail-client/mail-notification/ChangeLog
+++ b/mail-client/mail-notification/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/mail-notification
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.40 2007/01/29 21:57:08 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/ChangeLog,v 1.41 2007/08/30 16:08:54 pva Exp $
+
+  30 Aug 2007; <pva@gentoo.org> mail-notification-2.0.ebuild,
+  mail-notification-3.0.ebuild, mail-notification-4.0_rc2.ebuild,
+  mail-notification-4.0.ebuild:
+  evolution->evo USE flag change, bug #157265
 
   29 Jan 2007; Tom Martin <slarti@gentoo.org> mail-notification-4.0.ebuild:
   Fix numerous cock-ups. Thanks to Ed Catmur <ed@catmur.co.uk> in bug #164072.
diff --git a/mail-client/mail-notification/mail-notification-2.0.ebuild b/mail-client/mail-notification/mail-notification-2.0.ebuild
index 3e8253a678af..8af6ff21468e 100644
--- a/mail-client/mail-notification/mail-notification-2.0.ebuild
+++ b/mail-client/mail-notification/mail-notification-2.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-2.0.ebuild,v 1.9 2006/04/26 18:02:18 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-2.0.ebuild,v 1.10 2007/08/30 16:08:54 pva Exp $
 
 inherit eutils gnome2 multilib flag-o-matic versionator
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-IUSE="imap ipv6 ssl sasl gmail evolution sylpheed mbox maildir pop"
+IUSE="imap ipv6 ssl sasl gmail evo sylpheed mbox maildir pop"
 
 # gmime is actually optional, but it's used by so much of the package it's
 # pointless making it optional.
@@ -30,11 +30,11 @@ DEPEND=">=x11-libs/gtk+-2.6
 	dev-perl/XML-Parser
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	evolution? ( >=mail-client/evolution-2.4 )
+	evo? ( >=mail-client/evolution-2.4 )
 	sylpheed? ( virtual/sylpheed )"
 
 pkg_setup() {
-	if use evolution ; then
+	if use evo ; then
 		EVO_INSTALLED="$(best_version mail-client/evolution)"
 		EVO_INSTALLED="${EVO_INSTALLED##*/}"
 		EVO_INSTALLED="${EVO_INSTALLED#*-}"
@@ -48,7 +48,7 @@ pkg_setup() {
 	G2CONF="${G2CONF} $(use_enable imap)"
 	G2CONF="${G2CONF} $(use_enable pop pop3)"
 	G2CONF="${G2CONF} $(use_enable gmail)"
-	G2CONF="${G2CONF} $(use_enable evolution)"
+	G2CONF="${G2CONF} $(use_enable evo evolution)"
 	G2CONF="${G2CONF} --with-evolution-source-dir=/usr/include/evolution-${EVO_VERSION}"
 	G2CONF="${G2CONF} $(use_enable sylpheed)"
 }
@@ -57,7 +57,7 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	if use evolution ; then
+	if use evo ; then
 		epatch "${FILESDIR}/${P}-evolution-${EVO_VERSION}.diff"
 	fi
 
diff --git a/mail-client/mail-notification/mail-notification-3.0.ebuild b/mail-client/mail-notification/mail-notification-3.0.ebuild
index 2497d5b2d3fe..365181d79381 100644
--- a/mail-client/mail-notification/mail-notification-3.0.ebuild
+++ b/mail-client/mail-notification/mail-notification-3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-3.0.ebuild,v 1.6 2007/07/15 03:33:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-3.0.ebuild,v 1.7 2007/08/30 16:08:54 pva Exp $
 
 inherit eutils gnome2 multilib flag-o-matic versionator
 
@@ -14,7 +14,7 @@ KEYWORDS="amd64 ppc sparc x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-IUSE="imap ipv6 ssl sasl gmail evolution sylpheed mbox maildir pop"
+IUSE="imap ipv6 ssl sasl gmail evo sylpheed mbox maildir pop"
 
 # gmime is actually optional, but it's used by so much of the package it's
 # pointless making it optional.
@@ -30,11 +30,11 @@ DEPEND=">=x11-libs/gtk+-2.6
 	dev-perl/XML-Parser
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	evolution? ( >=mail-client/evolution-2.4 )
+	evo? ( >=mail-client/evolution-2.4 )
 	sylpheed? ( virtual/sylpheed )"
 
 pkg_setup() {
-	if use evolution ; then
+	if use evo ; then
 		EVO_INSTALLED="$(best_version mail-client/evolution)"
 		EVO_INSTALLED="${EVO_INSTALLED##*/}"
 		EVO_INSTALLED="${EVO_INSTALLED#*-}"
@@ -48,7 +48,7 @@ pkg_setup() {
 	G2CONF="${G2CONF} $(use_enable imap)"
 	G2CONF="${G2CONF} $(use_enable pop pop3)"
 	G2CONF="${G2CONF} $(use_enable gmail)"
-	G2CONF="${G2CONF} $(use_enable evolution)"
+	G2CONF="${G2CONF} $(use_enable evo evolution)"
 	G2CONF="${G2CONF} --with-evolution-source-dir=/usr/include/evolution-${EVO_VERSION}"
 	G2CONF="${G2CONF} $(use_enable sylpheed)"
 }
diff --git a/mail-client/mail-notification/mail-notification-4.0.ebuild b/mail-client/mail-notification/mail-notification-4.0.ebuild
index 6ca4f6ec4cb7..5077660b8980 100644
--- a/mail-client/mail-notification/mail-notification-4.0.ebuild
+++ b/mail-client/mail-notification/mail-notification-4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-4.0.ebuild,v 1.2 2007/01/29 21:57:08 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-4.0.ebuild,v 1.3 2007/08/30 16:08:54 pva Exp $
 
 inherit eutils gnome2 multilib flag-o-matic versionator
 
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-IUSE="imap ipv6 ssl sasl gmail evolution sylpheed mbox maildir pop mozilla"
+IUSE="imap ipv6 ssl sasl gmail evo sylpheed mbox maildir pop mozilla"
 
 # gmime is actually optional, but it's used by so much of the package it's
 # pointless making it optional.
@@ -30,11 +30,11 @@ DEPEND=">=x11-libs/gtk+-2.6
 	dev-perl/XML-Parser
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	evolution? ( >=mail-client/evolution-2.6 )
+	evo? ( >=mail-client/evolution-2.6 )
 	sylpheed? ( virtual/sylpheed )"
 
 pkg_setup() {
-	if use evolution ; then
+	if use evo ; then
 		EVO_INSTALLED="$(best_version mail-client/evolution)"
 		EVO_INSTALLED="${EVO_INSTALLED##*/}"
 		EVO_INSTALLED="${EVO_INSTALLED#*-}"
@@ -48,7 +48,7 @@ pkg_setup() {
 	G2CONF="${G2CONF} $(use_enable imap)"
 	G2CONF="${G2CONF} $(use_enable pop pop3)"
 	G2CONF="${G2CONF} $(use_enable gmail)"
-	G2CONF="${G2CONF} $(use_enable evolution)"
+	G2CONF="${G2CONF} $(use_enable evo evolution)"
 	G2CONF="${G2CONF} --with-evolution-source-dir=/usr/include/evolution-${EVO_VERSION}"
 	G2CONF="${G2CONF} $(use_enable sylpheed)"
 	G2CONF="${G2CONF} $(use_enable mozilla)"
diff --git a/mail-client/mail-notification/mail-notification-4.0_rc2.ebuild b/mail-client/mail-notification/mail-notification-4.0_rc2.ebuild
index 0a0b73a1c01d..9173e09439a9 100644
--- a/mail-client/mail-notification/mail-notification-4.0_rc2.ebuild
+++ b/mail-client/mail-notification/mail-notification-4.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-4.0_rc2.ebuild,v 1.3 2007/01/27 12:26:43 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/mail-notification/mail-notification-4.0_rc2.ebuild,v 1.4 2007/08/30 16:08:54 pva Exp $
 
 inherit eutils gnome2 multilib flag-o-matic versionator
 
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 
-IUSE="imap ipv6 ssl sasl gmail evolution sylpheed mbox maildir pop mozilla"
+IUSE="imap ipv6 ssl sasl gmail evo sylpheed mbox maildir pop mozilla"
 
 # gmime is actually optional, but it's used by so much of the package it's
 # pointless making it optional.
@@ -32,13 +32,13 @@ DEPEND=">=x11-libs/gtk+-2.6
 	dev-perl/XML-Parser
 	ssl? ( >=dev-libs/openssl-0.9.6 )
 	sasl? ( >=dev-libs/cyrus-sasl-2 )
-	evolution? ( >=mail-client/evolution-2.6 )
+	evo? ( >=mail-client/evolution-2.6 )
 	sylpheed? ( virtual/sylpheed )"
 
 S="${WORKDIR}/${P/_/-}"
 
 pkg_setup() {
-	if use evolution ; then
+	if use evo ; then
 		EVO_INSTALLED="$(best_version mail-client/evolution)"
 		EVO_INSTALLED="${EVO_INSTALLED##*/}"
 		EVO_INSTALLED="${EVO_INSTALLED#*-}"
@@ -52,7 +52,7 @@ pkg_setup() {
 	G2CONF="${G2CONF} $(use_enable imap)"
 	G2CONF="${G2CONF} $(use_enable pop pop3)"
 	G2CONF="${G2CONF} $(use_enable gmail)"
-	G2CONF="${G2CONF} $(use_enable evolution)"
+	G2CONF="${G2CONF} $(use_enable evo evolution)"
 	G2CONF="${G2CONF} --with-evolution-source-dir=/usr/include/evolution-${EVO_VERSION}"
 	G2CONF="${G2CONF} $(use_enable sylpheed)"
 	G2CONF="${G2CONF} $(use_enable mozilla)"