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

(Portage version: 2.1.2_pre3-r5)

3 files changed, 21 insertions, 22 deletions

diff --git a/app-dicts/canna-zipcode/ChangeLog b/app-dicts/canna-zipcode/ChangeLog
index 3a894c0db10b..8b4a64129485 100644
--- a/app-dicts/canna-zipcode/ChangeLog
+++ b/app-dicts/canna-zipcode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-dicts/canna-zipcode
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-zipcode/ChangeLog,v 1.10 2005/01/01 12:48:20 eradicator Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-zipcode/ChangeLog,v 1.11 2006/10/21 00:12:53 flameeyes Exp $
+
+  21 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  canna-zipcode-20021021-r2.ebuild, canna-zipcode-20040803.ebuild:
+  Remove canna useflag, it's mandatory for this package.
 
   16 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
   canna-zipcode-20040803.ebuild:
diff --git a/app-dicts/canna-zipcode/canna-zipcode-20021021-r2.ebuild b/app-dicts/canna-zipcode/canna-zipcode-20021021-r2.ebuild
index ddac4293d8af..7358f4e4aa05 100644
--- a/app-dicts/canna-zipcode/canna-zipcode-20021021-r2.ebuild
+++ b/app-dicts/canna-zipcode/canna-zipcode-20021021-r2.ebuild
@@ -1,6 +1,6 @@
-# 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-zipcode/canna-zipcode-20021021-r2.ebuild,v 1.5 2005/01/01 12:48:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-zipcode/canna-zipcode-20021021-r2.ebuild,v 1.6 2006/10/21 00:12:53 flameeyes Exp $
 
 inherit cannadic
 
@@ -16,12 +16,11 @@ SRC_URI="http://bonobo.gnome.gr.jp/~nakai/canna/${MY_P}.tar.bz2
 LICENSE="GPL-2 public-domain"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha"
-IUSE="canna"
 
-DEPEND="canna? ( >=app-i18n/canna-3.6_p3-r1
+DEPEND=">=app-i18n/canna-3.6_p3-r1
 	dev-lang/perl
 	app-i18n/nkf
-	app-arch/lha )"
+	app-arch/lha"
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
@@ -36,9 +35,7 @@ src_unpack() {
 }
 
 src_compile() {
-	if use canna ; then
-		make all || die
-		mkbindic zipcode.t || die
-		mkbindic jigyosyo.t || die
-	fi
+	make all || die
+	mkbindic zipcode.t || die
+	mkbindic jigyosyo.t || die
 }
diff --git a/app-dicts/canna-zipcode/canna-zipcode-20040803.ebuild b/app-dicts/canna-zipcode/canna-zipcode-20040803.ebuild
index caede820d23b..410698f4bab6 100644
--- a/app-dicts/canna-zipcode/canna-zipcode-20040803.ebuild
+++ b/app-dicts/canna-zipcode/canna-zipcode-20040803.ebuild
@@ -1,6 +1,6 @@
-# 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-zipcode/canna-zipcode-20040803.ebuild,v 1.5 2005/01/01 12:48:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-zipcode/canna-zipcode-20040803.ebuild,v 1.6 2006/10/21 00:12:53 flameeyes Exp $
 
 inherit cannadic
 
@@ -16,12 +16,12 @@ SRC_URI="http://bonobo.gnome.gr.jp/~nakai/canna/${MY_P}.tar.bz2
 LICENSE="GPL-2 public-domain"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha ppc64"
-IUSE="canna"
+IUSE=""
 
-DEPEND="canna? ( >=app-i18n/canna-3.6_p3-r1
+DEPEND=">=app-i18n/canna-3.6_p3-r1
 	dev-lang/perl
 	app-i18n/nkf
-	app-arch/lha )"
+	app-arch/lha"
 RDEPEND=""
 
 S="${WORKDIR}/${MY_P}"
@@ -36,9 +36,7 @@ src_unpack() {
 }
 
 src_compile() {
-	if use canna ; then
-		make all || die
-		mkbindic zipcode.t || die
-		mkbindic jigyosyo.t || die
-	fi
+	make all || die
+	mkbindic zipcode.t || die
+	mkbindic jigyosyo.t || die
 }