evolution->evo USE flag change, bug #157265

Package-Manager: portage-2.1.3.7

6 files changed, 49 insertions, 44 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/Manifest b/mail-client/mail-notification/Manifest
index 1ebe3bc2b9b4..914b5726bf3d 100644
--- a/mail-client/mail-notification/Manifest
+++ b/mail-client/mail-notification/Manifest
@@ -33,26 +33,26 @@ EBUILD mail-notification-1.1.ebuild 1814 RMD160 f624800bafed0197af056f47bed8486c
 MD5 4ec34f3718248e51520bb199155a10aa mail-notification-1.1.ebuild 1814
 RMD160 f624800bafed0197af056f47bed8486c14e6df24 mail-notification-1.1.ebuild 1814
 SHA256 fed80ef505695252856a8c64d44e79799ca7b3fa714d4c08fd52fc84b90cd072 mail-notification-1.1.ebuild 1814
-EBUILD mail-notification-2.0.ebuild 2711 RMD160 bd79da416481266719ade3b5e22970a7aefbc1b4 SHA1 4bf4055d7204cfe05648d5b2a09ad01dec5ae5f0 SHA256 539137953166dddb9b69a9a8fd51a007fdd9d335e57696154ab0e81cbd8abab4
-MD5 235618ae10d043ea7108b3e149e164ed mail-notification-2.0.ebuild 2711
-RMD160 bd79da416481266719ade3b5e22970a7aefbc1b4 mail-notification-2.0.ebuild 2711
-SHA256 539137953166dddb9b69a9a8fd51a007fdd9d335e57696154ab0e81cbd8abab4 mail-notification-2.0.ebuild 2711
-EBUILD mail-notification-3.0.ebuild 2471 RMD160 3deea2927548d5481a2965600ae2ecc5f0d1f2ad SHA1 b948f631723e3ff103eed1a773c365c8897087e1 SHA256 83a01dc14be94d06ee124527ec3dac90a0f79abedc1e362ada2e0fdbcf3cf0b1
-MD5 216981dce4d1801ac3e8ddfeab6e2145 mail-notification-3.0.ebuild 2471
-RMD160 3deea2927548d5481a2965600ae2ecc5f0d1f2ad mail-notification-3.0.ebuild 2471
-SHA256 83a01dc14be94d06ee124527ec3dac90a0f79abedc1e362ada2e0fdbcf3cf0b1 mail-notification-3.0.ebuild 2471
-EBUILD mail-notification-4.0.ebuild 2315 RMD160 78721f1831fdf246a6550228810a8a8ac2d3ccd3 SHA1 a9fcbbf7bafcf4f6535a014253ddb000ec5ec314 SHA256 0dc63c26b3bdd8906a108c4e8ad61b2bda490d8f06219c60ea3535396db4d8e2
-MD5 7559bd4d702be0451d31a35daa592bd8 mail-notification-4.0.ebuild 2315
-RMD160 78721f1831fdf246a6550228810a8a8ac2d3ccd3 mail-notification-4.0.ebuild 2315
-SHA256 0dc63c26b3bdd8906a108c4e8ad61b2bda490d8f06219c60ea3535396db4d8e2 mail-notification-4.0.ebuild 2315
-EBUILD mail-notification-4.0_rc2.ebuild 2412 RMD160 dd68c3747dbd2408d87998c1f2b42deec3975419 SHA1 139d99596015824fadf978946aa33b1ac4744787 SHA256 55e5eea23b4f31124f6953c1fe4c14fff4e05ba162293e58ed0c2684fbb76f7b
-MD5 eb38243457395e6b4bf949319ba16ac6 mail-notification-4.0_rc2.ebuild 2412
-RMD160 dd68c3747dbd2408d87998c1f2b42deec3975419 mail-notification-4.0_rc2.ebuild 2412
-SHA256 55e5eea23b4f31124f6953c1fe4c14fff4e05ba162293e58ed0c2684fbb76f7b mail-notification-4.0_rc2.ebuild 2412
-MISC ChangeLog 7388 RMD160 bcdfdb1e04e04f7a9b68f3b7117c1bdab656079a SHA1 9ab10589f4d15d38cee2566a3a09a8a01b879842 SHA256 da83266c8db342ac116462690d769bc577a1587ad90aa842546807a0d4a752c5
-MD5 2ba5426ec50563017b069afe36e9917f ChangeLog 7388
-RMD160 bcdfdb1e04e04f7a9b68f3b7117c1bdab656079a ChangeLog 7388
-SHA256 da83266c8db342ac116462690d769bc577a1587ad90aa842546807a0d4a752c5 ChangeLog 7388
+EBUILD mail-notification-2.0.ebuild 2689 RMD160 614d9fbb0887a8a669c44b5314749605d615bea7 SHA1 16e3ecac380376246945f63fa33f6860d24abad5 SHA256 7145bf78e49b0fa0b9ab7e7f4523ae8e18e61af84e3fed5bfe00b8c1d369efb8
+MD5 ff3a60e9a7880bddae8aeff6ed4e927a mail-notification-2.0.ebuild 2689
+RMD160 614d9fbb0887a8a669c44b5314749605d615bea7 mail-notification-2.0.ebuild 2689
+SHA256 7145bf78e49b0fa0b9ab7e7f4523ae8e18e61af84e3fed5bfe00b8c1d369efb8 mail-notification-2.0.ebuild 2689
+EBUILD mail-notification-3.0.ebuild 2451 RMD160 d3def20c2b10d8ee1b8962d1cbb47160414bf0ea SHA1 e5535e0312781f9052f029ffe2e97372e10e3bad SHA256 97d3bedb628493f9731723ccab15e2336f6beb3c831c69ab1a604df3818deaac
+MD5 e0ad3718ff9f6853a3ec4832e5fb4705 mail-notification-3.0.ebuild 2451
+RMD160 d3def20c2b10d8ee1b8962d1cbb47160414bf0ea mail-notification-3.0.ebuild 2451
+SHA256 97d3bedb628493f9731723ccab15e2336f6beb3c831c69ab1a604df3818deaac mail-notification-3.0.ebuild 2451
+EBUILD mail-notification-4.0.ebuild 2298 RMD160 bdd06f97c069fdf97d52cc31ee380b80a260291f SHA1 20738c9e12bb0b310ccec8db765b7a4a8ce90618 SHA256 4d3629ca388498d1020b4244d6662cce17d580a3589118595feee1b75f2239b0
+MD5 30013bd03e9543f68794014c85b40338 mail-notification-4.0.ebuild 2298
+RMD160 bdd06f97c069fdf97d52cc31ee380b80a260291f mail-notification-4.0.ebuild 2298
+SHA256 4d3629ca388498d1020b4244d6662cce17d580a3589118595feee1b75f2239b0 mail-notification-4.0.ebuild 2298
+EBUILD mail-notification-4.0_rc2.ebuild 2395 RMD160 4c457b928d07e3ca2a6e093b3ae2511ba99b820f SHA1 3aac5c2d8772f04bdace3de081ccd40135cf2215 SHA256 cdfc6c0f0bba514193b40a72d6aabb44bf37b87665897088c81628979302e3be
+MD5 8f885eb64e3f36f6298fe1a6383b84d1 mail-notification-4.0_rc2.ebuild 2395
+RMD160 4c457b928d07e3ca2a6e093b3ae2511ba99b820f mail-notification-4.0_rc2.ebuild 2395
+SHA256 cdfc6c0f0bba514193b40a72d6aabb44bf37b87665897088c81628979302e3be mail-notification-4.0_rc2.ebuild 2395
+MISC ChangeLog 7592 RMD160 0cccf63dc8a902edbba5bfa21635185ec962de38 SHA1 ab9812e8818129ab120f0848456da04bf52c7dea SHA256 22eee426847db47dd31a3fa4fe9a59fcc78d1a8c7a19d4f7819256b0ae95d942
+MD5 5bb6e51a309024643c49a8bf5d1811c5 ChangeLog 7592
+RMD160 0cccf63dc8a902edbba5bfa21635185ec962de38 ChangeLog 7592
+SHA256 22eee426847db47dd31a3fa4fe9a59fcc78d1a8c7a19d4f7819256b0ae95d942 ChangeLog 7592
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 metadata.xml 161
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)"