Because eutils.eclass is broken with EAPI=1 and doesn't support disabled default USE flags, we use an alternative approach. Rename USE spell to USE aspell.

Package-Manager: portage-2.1.6/cvs/Linux 2.6.27.7 i686

4 files changed, 15 insertions, 11 deletions

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index 1c9121a0ac43..10311b388601 100644
--- a/mail-client/claws-mail/ChangeLog
+++ b/mail-client/claws-mail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/claws-mail
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.99 2008/12/09 18:26:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.100 2008/12/10 23:56:33 ssuominen Exp $
+
+  10 Dec 2008; <ssuominen@gentoo.org> claws-mail-3.6.1-r1.ebuild:
+  Because eutils.eclass is broken with EAPI=1 and doesn't support disabled
+  default USE flags, we use an alternative approach. Rename USE spell to USE
+  aspell.
 
   09 Dec 2008; <ssuominen@gentoo.org> claws-mail-3.6.1-r1.ebuild:
   Disable spell USE flag by default because it pulls in enchant which has
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 17474234c699..475c2087b226 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,6 +1,6 @@
 AUX plugins-rebuild.sh 1367 RMD160 af49058972a932a5e8dddbe30e24ead56f14ce97 SHA1 4ae22ca11b8b3c4200b5a4b997157611d50dac0b SHA256 bea620d685a40ceb68cd5316b4cf7ff684afb94c305a45549e814a16daa18da1
 DIST claws-mail-3.6.1.tar.bz2 5387916 RMD160 a36a92bbe9fe203f770bfea80ebe06362e59c666 SHA1 5894b6e533a151ce8e4be6445e117cd40a0f63b9 SHA256 67337a4a1a5a5ce09f2a38422b7a6fc481e4747f74d4ddedd130d4fb06fc3907
-EBUILD claws-mail-3.6.1-r1.ebuild 5477 RMD160 1d7510616da356c8db8588ef66696254696b2fad SHA1 84153e577d6dc26b363a80bc084448ce20b171ef SHA256 4c66d3cae1559ff28811aacb163427d4dc730130c3c6d55378f2b92078ae45f3
+EBUILD claws-mail-3.6.1-r1.ebuild 5472 RMD160 3af99a4c2b11f3be41cffecabb02ef1ce80cd513 SHA1 9a4981c439c2ff17bf947bd24829a4803b369ae6 SHA256 71de87dcc7113d4b4b69b87973c7224b8d7d8defb3fe82682ecd8cc8c81a0de9
 EBUILD claws-mail-3.6.1.ebuild 5673 RMD160 771e520d19599722335a82193691a1b502944956 SHA1 497edda042319b21b4c2fd38205337065af91743 SHA256 de41d6d7639fc8adebfb20e26672aabbb48f938c055b193f797b0705e126a47d
-MISC ChangeLog 16231 RMD160 85043367eabe419061205def7f6d566878c3d0f4 SHA1 b09b409b859eb182a9ed5b6b0f89402e7cfc32fd SHA256 29ed16b8ed0713286e6c8d78e4704f39d976e63dcaa01e8caa2654840ad70ae7
-MISC metadata.xml 748 RMD160 415197ea0159afe4e96bccf7df8552745636b8f7 SHA1 7ee982dc930ec4e30fa4438eaa4e84873da3425a SHA256 8e79dfff9b879544f441924c599816177080fe88797d9389887b736152d81f6b
+MISC ChangeLog 16461 RMD160 ae6b659ed97a8cca98923bc3182310152388e2cf SHA1 8ed9ba87deb2eac1aaa480d21e5a64ef83cf5da0 SHA256 c296a8b6dc195fe8969bafa407626640966b75a77f57ae56ef05699dd81073cb
+MISC metadata.xml 810 RMD160 69d60a57a8937849abe82475b1973c983db618b4 SHA1 5afb1f1301eb7a3c238e63d1c3abe86c6af6ffa4 SHA256 4cf17e7e273f601d1424fd0dbfc5a6c17292440a0cff2835d55863eed2e1af92
diff --git a/mail-client/claws-mail/claws-mail-3.6.1-r1.ebuild b/mail-client/claws-mail/claws-mail-3.6.1-r1.ebuild
index 9113d20221a4..a12c1709492a 100644
--- a/mail-client/claws-mail/claws-mail-3.6.1-r1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.6.1-r1.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2008 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.6.1-r1.ebuild,v 1.3 2008/12/09 18:26:16 ssuominen Exp $
-
-EAPI=1
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.6.1-r1.ebuild,v 1.4 2008/12/10 23:56:33 ssuominen Exp $
 
 inherit eutils multilib
 
@@ -15,7 +13,7 @@ SLOT="0"
 LICENSE="GPL-3"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="bogofilter crypt dillo doc gnome gnutls imap ipv6 kde ldap nntp pda
-session smime spamassassin -spell ssl startup-notification xface"
+session smime spamassassin aspell ssl startup-notification xface"
 
 COMMONDEPEND=">=x11-libs/gtk+-2.6
 	pda? ( >=app-pda/jpilot-0.99 )
@@ -23,7 +21,7 @@ COMMONDEPEND=">=x11-libs/gtk+-2.6
 	ldap? ( >=net-nds/openldap-2.0.7 )
 	crypt? ( >=app-crypt/gpgme-1.1.1 )
 	dillo? ( www-client/dillo )
-	spell? ( >=app-text/enchant-1.0.0 )
+	aspell? ( >=app-text/enchant-1.0.0 )
 	kde? ( kde-base/kdelibs )
 	imap? ( >=net-libs/libetpan-0.57 )
 	nntp? ( >=net-libs/libetpan-0.57 )
@@ -46,7 +44,7 @@ RDEPEND="${COMMONDEPEND}
 PLUGIN_NAMES="acpi-notifier att-remover attachwarner cachesaver etpan-privacy fetchinfo gtkhtml maildir mailmbox newmail notification pdf-viewer perl rssyl smime synce vcalendar"
 pkg_setup() {
 	# rework with EAPI=2
-	if use spell; then
+	if use aspell; then
 		if ! built_with_use app-text/enchant aspell; then
 			eerror
 			eerror "You need to rebuild app-text/enchant with USE=aspell enabled"
@@ -68,7 +66,7 @@ src_compile() {
 		$(use_enable ipv6) \
 		$(use_enable ldap) \
 		$(use_enable pda jpilot) \
-		$(use_enable spell enchant) \
+		$(use_enable aspell enchant) \
 		$(use_enable gnutls) \
 		$(use_enable ssl gnutls) \
 		$(use_enable xface compface) \
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
index 0f5bfaffa14b..60910bfb40e4 100644
--- a/mail-client/claws-mail/metadata.xml
+++ b/mail-client/claws-mail/metadata.xml
@@ -19,5 +19,6 @@
 		<flag name='smime'>Build plugin for S/MIME support</flag>
 		<flag name='spamassassin'>Build <pkg>mail-filter/spamassassin</pkg>
 			plugin</flag>
+		<flag name='aspell'>Use enchant with aspell support.</flag>
 	</use>
 </pkgmetadata>