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

Package-Manager: portage-2.1.2_pre3-r5

11 files changed, 63 insertions, 64 deletions

diff --git a/app-dicts/canna-2ch/ChangeLog b/app-dicts/canna-2ch/ChangeLog
index 343cdccf7ac1..9491d3b24b7c 100644
--- a/app-dicts/canna-2ch/ChangeLog
+++ b/app-dicts/canna-2ch/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-dicts/canna-2ch
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-2ch/ChangeLog,v 1.9 2005/01/01 12:47:25 eradicator Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-2ch/ChangeLog,v 1.10 2006/10/21 00:14:47 flameeyes Exp $
+
+  21 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  canna-2ch-20030827.ebuild:
+  Remove canna useflag, it's mandatory for this package.
 
   01 Sep 2004; Tom Gall <tgall@gentoo.org> canna-2ch-20030827.ebuild:
   stable on ppc64, bug #61777
diff --git a/app-dicts/canna-2ch/canna-2ch-20030827.ebuild b/app-dicts/canna-2ch/canna-2ch-20030827.ebuild
index 738241892528..b761b8204cf8 100644
--- a/app-dicts/canna-2ch/canna-2ch-20030827.ebuild
+++ b/app-dicts/canna-2ch/canna-2ch-20030827.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-2ch/canna-2ch-20030827.ebuild,v 1.12 2005/01/01 12:47:25 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-2ch/canna-2ch-20030827.ebuild,v 1.13 2006/10/21 00:14:47 flameeyes Exp $
 
 inherit cannadic eutils
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="x86 ppc sparc alpha ppc64"
-IUSE="canna"
+IUSE=""
 
 DEPEND=""
 # You cannot use 2ch.cbd as its name. Canna doesn't load dictionaries
@@ -23,12 +23,10 @@ S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-canna36p4-gentoo.patch
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-canna36p4-gentoo.patch"
 }
 
 src_compile() {
-	if use canna ; then
-		mkbindic nichan.ctd || die
-	fi
+	mkbindic nichan.ctd || die
 }
diff --git a/app-dicts/canna-canada-med/ChangeLog b/app-dicts/canna-canada-med/ChangeLog
index 50a140d4d71d..6af8c4312440 100644
--- a/app-dicts/canna-canada-med/ChangeLog
+++ b/app-dicts/canna-canada-med/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-dicts/canna-canada-med
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-canada-med/ChangeLog,v 1.6 2005/01/01 12:47:39 eradicator Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-canada-med/ChangeLog,v 1.7 2006/10/21 00:16:46 flameeyes Exp $
+
+  21 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
+  canna-canada-med-20030309.ebuild:
+  Remove canna useflag, it's mandatory for this package.
 
   30 Nov 2004; Sven Wegener <swegener@gentoo.org>
   canna-canada-med-20030309.ebuild:
diff --git a/app-dicts/canna-canada-med/canna-canada-med-20030309.ebuild b/app-dicts/canna-canada-med/canna-canada-med-20030309.ebuild
index 05a83ea5fa53..aca477b31d83 100644
--- a/app-dicts/canna-canada-med/canna-canada-med-20030309.ebuild
+++ b/app-dicts/canna-canada-med/canna-canada-med-20030309.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-canada-med/canna-canada-med-20030309.ebuild,v 1.6 2005/01/01 12:47:39 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-dicts/canna-canada-med/canna-canada-med-20030309.ebuild,v 1.7 2006/10/21 00:16:46 flameeyes Exp $
 
 inherit cannadic
 
-IUSE="canna"
+IUSE=""
 
 DESCRIPTION="Set of medical dictionaries for Canna"
 HOMEPAGE="http://spica.onh.go.jp/med_dic/"
@@ -15,7 +15,7 @@ LICENSE="canada-med"
 SLOT="0"
 KEYWORDS="x86 alpha ppc ppc64"
 
-DEPEND="canna? ( >=app-i18n/canna-3.6_p4 )"
+DEPEND=">=app-i18n/canna-3.6_p4"
 
 S="${WORKDIR}/canada_med"
 
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
 }
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
 }