public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-dicts/canna-2ch/, app-dicts/canna-2ch/files/
@ 2017-07-12 12:30 Akinori Hattori
  0 siblings, 0 replies; 2+ messages in thread
From: Akinori Hattori @ 2017-07-12 12:30 UTC (permalink / raw
  To: gentoo-commits

commit:     a992b12f83d2fbd6dc186fe09faad9418c7357d4
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 12 12:30:05 2017 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Wed Jul 12 12:30:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a992b12f

app-dicts/canna-2ch: fix install

Gentoo-Bug: 588238

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 app-dicts/canna-2ch/canna-2ch-20030827.ebuild | 11 +++++------
 app-dicts/canna-2ch/canna-2ch-20040519.ebuild | 13 +++++--------
 app-dicts/canna-2ch/files/052ch.dics.dir      |  2 ++
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/app-dicts/canna-2ch/canna-2ch-20030827.ebuild b/app-dicts/canna-2ch/canna-2ch-20030827.ebuild
index 66ea9b03491..2cd3b357a3e 100644
--- 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 49909fa3108..f74c01b6acf 100644
--- 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
index 00000000000..1ddc85d6433
--- /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---


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-dicts/canna-2ch/, app-dicts/canna-2ch/files/
@ 2018-07-22 12:16 Akinori Hattori
  0 siblings, 0 replies; 2+ messages in thread
From: Akinori Hattori @ 2018-07-22 12:16 UTC (permalink / raw
  To: gentoo-commits

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 3245 bytes --]

commit:     a7c8b722f7ee398b9a655959a2062f0a3e2bb8bf
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 22 12:15:55 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sun Jul 22 12:15:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7c8b722

app-dicts/canna-2ch: drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 app-dicts/canna-2ch/Manifest                       |  1 -
 app-dicts/canna-2ch/canna-2ch-20030827.ebuild      | 31 ----------------------
 .../files/canna-2ch-20030827-gentoo.patch          | 18 -------------
 3 files changed, 50 deletions(-)

diff --git a/app-dicts/canna-2ch/Manifest b/app-dicts/canna-2ch/Manifest
index 3a92bab7c86..0cf8a347e27 100644
--- a/app-dicts/canna-2ch/Manifest
+++ b/app-dicts/canna-2ch/Manifest
@@ -1,2 +1 @@
-DIST canna-2ch-20030827.tar.gz 51757 BLAKE2B 4fa31c65a650a986f38b3b338c7ccdb89d197f578f0bc896bd80c23e078a9bda1cbe12d7c43054fde7f9e760711d6ace56489410501910377250449e909a3b33 SHA512 9cc5a78461ac0d6acb9eebae2ae2a71b02b368fc9ec61741b6459a3baab734e20b37d14bd939d44b03c3ee8b8b9c926d045aeb48ca0fd42d42f88fc02d136d0b
 DIST canna-2ch-20040519.tar.gz 53168 BLAKE2B 247b30f7a97258eac52f9a1d32bd2a785dcfaccd50430fd251a287a80b7a7ab12d1f2c4894d9eb026552f033854b50fbc967a50b66b84d3d5fe68e1954beb6fb SHA512 62b6f633fd0d345e09ce1e0603f61fe1363880ecdc72932e7a8d6d4c17a23be619a749974a3f54a78642396834888f628f047f1a88db3c8d36a758468bd6d296

diff --git a/app-dicts/canna-2ch/canna-2ch-20030827.ebuild b/app-dicts/canna-2ch/canna-2ch-20030827.ebuild
deleted file mode 100644
index 45e27b445d4..00000000000
--- a/app-dicts/canna-2ch/canna-2ch-20030827.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit cannadic
-
-DESCRIPTION="Japanese Canna dictionary for 2channelers"
-HOMEPAGE="http://omaemona.sourceforge.net/packages/Canna"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-#SRC_URI="http://omaemona.sourceforge.net/packages/Canna/2ch.t"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ppc ppc64 sparc x86"
-IUSE="canna"
-
-DEPEND="canna? ( app-i18n/canna )"
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}/"${P}-gentoo.patch )
-
-CANNADICS="2ch"
-DICSDIRFILE="${FILESDIR}/052ch.dics.dir"
-
-src_compile() {
-	# Anthy users do not need binary dictionary
-	if use canna; then
-		mkbindic nichan.ctd || die
-	fi
-}

diff --git a/app-dicts/canna-2ch/files/canna-2ch-20030827-gentoo.patch b/app-dicts/canna-2ch/files/canna-2ch-20030827-gentoo.patch
deleted file mode 100644
index 67f28e304dc..00000000000
--- a/app-dicts/canna-2ch/files/canna-2ch-20030827-gentoo.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/nichan.ctd
-+++ b/nichan.ctd
-@@ -2439,7 +2439,6 @@
- ¤¿¤¯¤­¤å¤¦ #T35 Âðµå
- ¤¿¤°¤Á¤Ë¤Ã¤­ #T35 ÅĸýÆüµ­
- ¤¿¤±¤·¤¯¤ó #JNM ¤¿¤±¤··¯
--¤¿¤±¤·¤¯¤ó #JNMUC ¤¿¤±¤··¯
- ¤¿¤±¤À¤­¤¾¤Ì #JN ÉðÅĵ³¤¾¤Ì
- ¤¿¤±¤À¤­¤Ð #JN ÉðÅĵ³ÇÏ
- ¤¿¤±¤À¤­¤Ð¤°¤ó¤À¤ó #T35 ÉðÅĵ³ÇÏ·³ÃÄ
-@@ -4585,7 +4584,6 @@
- ¤ä¤í¤ª¤¦¤è #CJ ¥ä¥í¡¼¥¦¥è
- ¤ä¤í¤ª¤¦¤è #CJ ¥ä¥í¡Ý¥¦¥è
- ¤ä¤ï¤é¤Á¤ã¤ó #JNM ¥ä¥ï¥é¤Á¤ã¤ó
--¤ä¤ï¤é¤Á¤ã¤ó #JNMUC ¥ä¥ï¥é¤Á¤ã¤ó
- ¤ä¤ó¤¸¤ã¤ó #KK ¥ä¥ó¥¸¥ã¥ó
- ¤ä¤ó¤¸¤ã¤ó #T35 ¥ä¥ó¥¸¥ã¥ó
- ¤ä¤ó¤ä¤ó #CJ ¤ä¤ó¤ä¤ó


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-07-22 12:16 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-12 12:30 [gentoo-commits] repo/gentoo:master commit in: app-dicts/canna-2ch/, app-dicts/canna-2ch/files/ Akinori Hattori
  -- strict thread matches above, loose matches on Subject: below --
2018-07-22 12:16 Akinori Hattori

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox