reintroduce USE=spell as we can fix the wrong built_with_use check by the --missing true option; this fixes bug 250115 (again) and bug 250573, reported by Michael A. Smith <michael AT smith-li DOT com>

Package-Manager: portage-2.1.4.5

5 files changed, 30 insertions, 14 deletions

diff --git a/mail-client/claws-mail/ChangeLog b/mail-client/claws-mail/ChangeLog
index 0cfcaf353ed7..a018b6febeb6 100644
--- a/mail-client/claws-mail/ChangeLog
+++ b/mail-client/claws-mail/ChangeLog
@@ -1,6 +1,12 @@
 # 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.101 2008/12/11 00:10:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/ChangeLog,v 1.102 2008/12/21 01:51:18 fauli Exp $
+
+  21 Dec 2008; Christian Faulhammer <fauli@gentoo.org> metadata.xml,
+  claws-mail-3.6.1.ebuild, claws-mail-3.6.1-r1.ebuild:
+  reintroduce USE=spell as we can fix the wrong built_with_use check by the
+  --missing true option; this fixes bug 250115 (again) and bug 250573,
+  reported by Michael A. Smith <michael AT smith-li DOT com>
 
   10 Dec 2008; <ssuominen@gentoo.org> claws-mail-3.6.1-r1.ebuild:
   Rename USE spell to USE aspell because enchant needs to be built
diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 42ce49d87360..51fa7dc5bc80 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -1,6 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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 5472 RMD160 a7cc484754c8b0e3fa74f0993712c2edbe1a6ff0 SHA1 f6ce00571b3a18719daec7b139387895acf629ef SHA256 bf2dfea2e5649b49fea169b039c4b19d13b04a488ba5c1707d9f027f8f3abbac
-EBUILD claws-mail-3.6.1.ebuild 5673 RMD160 771e520d19599722335a82193691a1b502944956 SHA1 497edda042319b21b4c2fd38205337065af91743 SHA256 de41d6d7639fc8adebfb20e26672aabbb48f938c055b193f797b0705e126a47d
-MISC ChangeLog 16232 RMD160 ab5e794896897c11c4f6c17180d06a7438a9ed5d SHA1 1b8e9048f4ee39aacedc618736244e955b66311a SHA256 3cd9f74a3d056ce893c1c54dc5777e013d1853bbeb59bf94dab0d4a44628bd6a
-MISC metadata.xml 810 RMD160 69d60a57a8937849abe82475b1973c983db618b4 SHA1 5afb1f1301eb7a3c238e63d1c3abe86c6af6ffa4 SHA256 4cf17e7e273f601d1424fd0dbfc5a6c17292440a0cff2835d55863eed2e1af92
+EBUILD claws-mail-3.6.1-r1.ebuild 5479 RMD160 54e96926f8b7af903214baac2a74c77ef6db24ff SHA1 ac4088c81ea72767f78b3f4b4978818cbbbf655d SHA256 33c06b7ac363e26ee3adb190fc2749caf23ef6349d0fd5db507b602845f07453
+EBUILD claws-mail-3.6.1.ebuild 5710 RMD160 b1d13b00b6c0c579c7874085fe8189d02f8adf6f SHA1 2ff6658a08f64f1a24b1256acbf10bdea434db9a SHA256 48dad3ff4582e3c97c71e12da078bea25f23edaca36b663d929187c167645628
+MISC ChangeLog 16561 RMD160 a117eb1b1b2bd355f6d622b42f39a9629ac69941 SHA1 1dc4fb69f33c09c5ba28c2eaead764d288e45b37 SHA256 d19390083bc43c77a4bc14f7fbe4cae378d9ee19349af8553a1eecf75ba1922f
+MISC metadata.xml 748 RMD160 415197ea0159afe4e96bccf7df8552745636b8f7 SHA1 7ee982dc930ec4e30fa4438eaa4e84873da3425a SHA256 8e79dfff9b879544f441924c599816177080fe88797d9389887b736152d81f6b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAklNoSMACgkQNQqtfCuFneOGgACdHg4x2BCMBbaZJ+24Jr6DqQN5
+uj4An3+KMa2rqqpxn46WIhesedrNi0Eh
+=nha8
+-----END PGP SIGNATURE-----
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 70299d926803..bd14540dd57d 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,6 +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.5 2008/12/11 00:02:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.6.1-r1.ebuild,v 1.6 2008/12/21 01:51:18 fauli Exp $
 
 inherit eutils multilib
 
@@ -13,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 aspell ssl startup-notification xface"
+session smime spamassassin spell ssl startup-notification xface"
 
 COMMONDEPEND=">=x11-libs/gtk+-2.6
 	pda? ( >=app-pda/jpilot-0.99 )
@@ -21,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 )
-	aspell? ( >=app-text/enchant-1.4.2 )
+	spell? ( >=app-text/enchant-1.0.0 )
 	kde? ( kde-base/kdelibs )
 	imap? ( >=net-libs/libetpan-0.57 )
 	nntp? ( >=net-libs/libetpan-0.57 )
@@ -44,8 +44,8 @@ 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 aspell; then
-		if ! built_with_use app-text/enchant aspell; then
+	if use spell; then
+		if ! built_with_use --missing true app-text/enchant aspell; then
 			eerror
 			eerror "You need to rebuild app-text/enchant with USE=aspell enabled"
 			eerror
@@ -66,7 +66,7 @@ src_compile() {
 		$(use_enable ipv6) \
 		$(use_enable ldap) \
 		$(use_enable pda jpilot) \
-		$(use_enable aspell enchant) \
+		$(use_enable spell enchant) \
 		$(use_enable gnutls) \
 		$(use_enable ssl gnutls) \
 		$(use_enable xface compface) \
diff --git a/mail-client/claws-mail/claws-mail-3.6.1.ebuild b/mail-client/claws-mail/claws-mail-3.6.1.ebuild
index bf4aedd10274..645365b30b6f 100644
--- a/mail-client/claws-mail/claws-mail-3.6.1.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.6.1.ebuild
@@ -1,6 +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.ebuild,v 1.8 2008/12/07 23:50:37 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/claws-mail/claws-mail-3.6.1.ebuild,v 1.9 2008/12/21 01:51:18 fauli Exp $
 
 inherit eutils multilib
 
@@ -42,8 +42,9 @@ 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 ! built_with_use app-text/enchant aspell; then
+		if ! built_with_use --missing true app-text/enchant aspell; then
 			eerror
 			eerror "You need to rebuild app-text/enchant with USE=aspell enabled"
 			eerror
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
index 60910bfb40e4..0f5bfaffa14b 100644
--- a/mail-client/claws-mail/metadata.xml
+++ b/mail-client/claws-mail/metadata.xml
@@ -19,6 +19,5 @@
 		<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>