Remove canna useflag, it's mandatory for this package.

(Portage version: 2.1.2_pre3-r5)

4 files changed, 20 insertions, 26 deletions

diff --git a/app-dicts/canna-cannadic/ChangeLog b/app-dicts/canna-cannadic/ChangeLog
index 30a9dbe72913..d2a6f76cb161 100644
--- a/app-dicts/canna-cannadic/ChangeLog
+++ b/app-dicts/canna-cannadic/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-dicts/canna-cannadic
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-cannadic/ChangeLog,v 1.24 2006/10/11 02:01:57 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-cannadic/ChangeLog,v 1.25 2006/10/21 00:18:50 flameeyes Exp $
+
+  21 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  canna-cannadic-0.95a.ebuild, canna-cannadic-0.95b.ebuild,
+  canna-cannadic-0.95c.ebuild:
+  Remove canna useflag, it's mandatory for this package.
 
   11 Oct 2006; Seemant Kulleen <seemant@gentoo.org>
   canna-cannadic-0.95c.ebuild:
diff --git a/app-dicts/canna-cannadic/canna-cannadic-0.95a.ebuild b/app-dicts/canna-cannadic/canna-cannadic-0.95a.ebuild
index 74d025ba2a33..71cf71d755c5 100644
--- a/app-dicts/canna-cannadic/canna-cannadic-0.95a.ebuild
+++ b/app-dicts/canna-cannadic/canna-cannadic-0.95a.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-cannadic/canna-cannadic-0.95a.ebuild,v 1.7 2005/01/01 12:47:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-cannadic/canna-cannadic-0.95a.ebuild,v 1.8 2006/10/21 00:18:50 flameeyes Exp $
 
 inherit cannadic
 
-IUSE="canna"
+IUSE=""
 
 MY_P="${P/canna-/}"
 
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha"
 
-DEPEND="canna? ( >=app-i18n/canna-3.6_p3-r1 )"
+DEPEND=">=app-i18n/canna-3.6_p3-r1"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -24,8 +24,5 @@ CANNADICS="gcanna gcannaf"
 DICSDIRFILE="${FILESDIR}/05cannadic.dics.dir"
 
 src_compile() {
-
-	if use canna ; then
-		make maindic || die
-	fi
+	make maindic || die
 }
diff --git a/app-dicts/canna-cannadic/canna-cannadic-0.95b.ebuild b/app-dicts/canna-cannadic/canna-cannadic-0.95b.ebuild
index b103f6191db7..31fcbc11846f 100644
--- a/app-dicts/canna-cannadic/canna-cannadic-0.95b.ebuild
+++ b/app-dicts/canna-cannadic/canna-cannadic-0.95b.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-cannadic/canna-cannadic-0.95b.ebuild,v 1.9 2005/01/01 12:47:52 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-cannadic/canna-cannadic-0.95b.ebuild,v 1.10 2006/10/21 00:18:50 flameeyes Exp $
 
 inherit cannadic
 
-IUSE="canna"
+IUSE=""
 
 MY_P="${P/canna-/}"
 
@@ -17,15 +17,11 @@ LICENSE="GPL-2"
 SLOT="0"
 S="${WORKDIR}/${MY_P}"
 
-DEPEND="canna? ( >=app-i18n/canna-3.6_p3-r1 )"
+DEPEND=">=app-i18n/canna-3.6_p3-r1"
 
 CANNADICS="gcanna gcannaf"
 DICSDIRFILE="${FILESDIR}/05cannadic.dics.dir"
 
 src_compile() {
-
-	if use canna; then
-		make maindic || die
-	fi
-
+	make maindic || die
 }
diff --git a/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild b/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild
index 029b446b5c52..b3af6b7e5987 100644
--- a/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild
+++ b/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild,v 1.6 2006/10/11 02:01:57 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-cannadic/canna-cannadic-0.95c.ebuild,v 1.7 2006/10/21 00:18:50 flameeyes Exp $
 
 inherit cannadic
 
-IUSE="canna"
+IUSE=""
 
 MY_P="${P/canna-/}"
 
@@ -17,15 +17,11 @@ LICENSE="GPL-2"
 SLOT="0"
 S="${WORKDIR}/${MY_P}"
 
-DEPEND="canna? ( >=app-i18n/canna-3.6_p3-r1 )"
+DEPEND=">=app-i18n/canna-3.6_p3-r1"
 
 CANNADICS="gcanna gcannaf"
 DICSDIRFILE="${FILESDIR}/05cannadic.dics.dir"
 
 src_compile() {
-
-	if use canna; then
-		make maindic || die
-	fi
-
+	make maindic || die
 }