app-dicts/canna-2ch: fix install

Gentoo-Bug: 588238

Package-Manager: Portage-2.3.6, Repoman-2.3.1

diff --git a/app-dicts/canna-2ch/canna-2ch-20030827.ebuild b/app-dicts/canna-2ch/canna-2ch-20030827.ebuild
index 66ea9b034917bd13143eb8c5b651c98eb12be09a..2cd3b357a3e3d855360de827506c6772386f9f60 100644 (file)
--- a/app-dicts/canna-2ch/canna-2ch-20030827.ebuild
+++ b/app-dicts/canna-2ch/canna-2ch-20030827.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit cannadic eutils
 
 DESCRIPTION="Japanese Canna dictionary for 2channelers"
-HOMEPAGE="http://omaemona.sourceforge.net/packages/Canna/"
+HOMEPAGE="http://omaemona.sourceforge.net/packages/Canna"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 #SRC_URI="http://omaemona.sourceforge.net/packages/Canna/2ch.t"
 
@@ -15,11 +15,10 @@ IUSE="canna"
 
 DEPEND="canna? ( app-i18n/canna )"
 RDEPEND=""
-# You cannot use 2ch.cbd as its name. Canna doesn't load dictionaries
-# if the name begins with number. (I don't know why ...)
-CANNADICS="2ch"
+S="${WORKDIR}/${PN}"
 
-S=${WORKDIR}/${PN}
+CANNADICS="2ch"
+DICSDIRFILE="${FILESDIR}/052ch.dics.dir"
 
 src_unpack() {
        unpack ${A}

diff --git a/app-dicts/canna-2ch/canna-2ch-20040519.ebuild b/app-dicts/canna-2ch/canna-2ch-20040519.ebuild
index 49909fa3108732f18f0642adcd2203cb85903875..f74c01b6acf3cb1c0a47269851e4ead0cab0c2f3 100644 (file)
--- a/app-dicts/canna-2ch/canna-2ch-20040519.ebuild
+++ b/app-dicts/canna-2ch/canna-2ch-20040519.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit cannadic eutils
 
 DESCRIPTION="Japanese Canna dictionary for 2channelers"
-HOMEPAGE="http://omaemona.sourceforge.net/packages/Canna/"
+HOMEPAGE="http://omaemona.sourceforge.net/packages/Canna"
 SRC_URI="https://dev.gentoo.org/~naota/files/${P}.tar.gz"
 #SRC_URI="http://omaemona.sourceforge.net/packages/Canna/2ch.t"
 
@@ -15,13 +15,10 @@ IUSE="canna"
 
 DEPEND="canna? ( app-i18n/canna )"
 RDEPEND=""
-# You cannot use 2ch.cbd as its name. Canna doesn't load dictionaries
-# if the name begins with number. (I don't know why ...)
-CANNADICS="2ch"
-
-DOCS=""
+S="${WORKDIR}/${PN}"
 
-S=${WORKDIR}/${PN}
+CANNADICS="2ch"
+DICSDIRFILE="${FILESDIR}/052ch.dics.dir"
 
 src_compile() {
        # Anthy users do not need binary dictionary

diff --git a/app-dicts/canna-2ch/files/052ch.dics.dir b/app-dicts/canna-2ch/files/052ch.dics.dir
new file mode 100644 (file)
index 0000000..1ddc85d
--- /dev/null
+++ b/app-dicts/canna-2ch/files/052ch.dics.dir
@@ -0,0 +1,2 @@
+nichan.cbd(nichan.mwd)         -2ch---
+nichan.cld(nichan.mwd)         -2ch---