6 files changed, 3 insertions, 221 deletions
diff --git a/app-text/cmigemo/Manifest b/app-text/cmigemo/Manifest
index 150ed30a6a40..cb7cdaccbd6c 100644
--- a/app-text/cmigemo/Manifest
+++ b/app-text/cmigemo/Manifest
@@ -1,10 +1,5 @@
-AUX cmigemo-1.2-migemo-dict.diff 825 BLAKE2B 59c4d476188839e81f68c97b838e903498b890903d22d42a21c41b5f5fddcb7299dee36c9034893785e26d7d90a5e0d5773aefb97188a62c5b9eced826cac8d6 SHA512 e7b6826c4ce5a87a7e95743f233efaa6a5edc2515a86c85dc24e7dcf9d9a105fbab2f9fd8a81b3ff124a032eaa8dfd5050ca23ef7818ea29a7e8f9c44877388a
 AUX cmigemo-1.3c-gentoo.patch 1948 BLAKE2B 5c182d0c9c93b06104d1067272d35b023386a9ce7bfee1828489268cfff1bacbe64d83cde803df1a0f52804b3474900077a8144a1bd5900785c73b77ea0ca1d0 SHA512 90035c0fbf3b341113e4991f08c9962e27d37f6f215983379e92d7c616a67662b8754f390f9f19f7c84f1d5cc9a51a815999ec6c84e7c642758b3324f05b7837
 AUX cmigemo-1.3c-ldflags.patch 502 BLAKE2B 3fc4c85592cc9feffbaeee636e8fcada10c7b7cd8696495239436808ddf9462da09713bbba10c3e5eb66cb45a3ec02e53f1e708fc0c1281dd96cc3e66db8caea SHA512 932bfad5afc4c90531cac96a9a7fb06d1ed690b3391ad9425c5ae1baa7caf2d8046d208e25816ea4ecfbbe44b2a95216e551cbbeb7808548f534853e6b817f7b
 DIST cmigemo-1.3c-MIT.tar.bz2 54447 BLAKE2B 37e561b992317dbf421b3d09203e92000c0217347235545483b4f8b99071794c2b240636a880c1758c1828782468670eb640fbd411abe779b28c52dfc3147650 SHA512 8c5b9109f4309906ed19d5d48643918f51c339be7f3b34c90d2d814fed1b6d30e77a1539f6c1e11ceb3560f83fd9e1079254af0b41e81b274e39128de6ffeb18
-DIST cmigemo-1.3c.tar.bz2 54323 BLAKE2B 4d63bde57c442131056e1aabcc702308243491de0632325b7a80af328e293c97479ac1733f29484a2ee7912f6d599360e7703d45612e8b30b52fd7a1228b5152 SHA512 240bdc92139d692cdb9e98a977f77105ef3ca716ede030629b3c4652276f0b0955ae80cc443fb879cada4b3fc83f7e4181043355e0285fcfe1011f4db4d13cc1
-EBUILD cmigemo-1.3c-r1.ebuild 1427 BLAKE2B 1dac8bc6ba813acec59e3e17132330a742762a71ec6e97dc36debd2199a0a27db97e67c5a158a0938060f59445a286d34e3e255213ce658c2f9aac5aacef2b39 SHA512 976846e86885c9a0435ff36e389d5d8778738159f62a985660899420b7ce621e86057560243dc8540578cbe0ccb33e3a261660ba2641bf2a0e8321430edf86df
-EBUILD cmigemo-1.3c-r2.ebuild 1584 BLAKE2B 4bb59aeeaf8b428a3354ffa3508488f762b8cd8bad63a3f493908ea97c6c6fa48081e742cb47844e60a3304501a9a41969b87323befb2b2220899cfb9de44e21 SHA512 361932a88d926d6a969068e258eb242c12b1180abd5819bf07b199cb187728f8b782af1f9630e37a41c2cb0a022961998c90b0fbb9d06e45f2d413b16767e87d
-EBUILD cmigemo-1.3c-r3.ebuild 1576 BLAKE2B a18ecba544b095a268eb80eace0b596fbaed1fb2c2ef70f5c9eee2cbe481030c448c104426712e43fde8edace62d473b586f91903b360924fc29b488c0e2c562 SHA512 0f0d971ba48ed22fd5150f6724695120c6093e5425cb436772b5020d3a26b935e440e0d2aabdd2525eb7cd198bcfdd9f8b0bd125ff21f54060b24ad8c7261e05
-EBUILD cmigemo-1.3c.ebuild 1102 BLAKE2B 17e25d35db7bff1b72b865addcd4430d7b35b04f1421c6e6ed9c8bebe76d33493cdbb569a0630608a765d3903b4c1620ea3afe06026f29e5ed6e35996e8af2b0 SHA512 d7ab991b692b9dfee83b748be48e159ab2ab4954174384984bf434af80fd2e17d3aa2e5b54615c4981c8414725fa1ee7044f8fbad65530779130bee5d0e387a5
+EBUILD cmigemo-1.3c-r3.ebuild 1569 BLAKE2B 42211da0825a0e072a67c0fef575004f661d1d2d43cd32ef5bac7a63529eca3cda68a893eeae0973bd6a3f57ff9f5d508d3f5a1e770d5c9e83d2f15f6bdba051 SHA512 af7154cc3643cb97c9118155819a912dacc7a0defbcef5b1f8d0d76e221405a69510d0ca364a80a0c2367b113849d07718dd7fc64b354a88cd83ba8e1d0dfb42
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/app-text/cmigemo/cmigemo-1.3c-r1.ebuild b/app-text/cmigemo/cmigemo-1.3c-r1.ebuild
deleted file mode 100644
index 5339687735fb..000000000000
--- a/app-text/cmigemo/cmigemo-1.3c-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_P="${P}-MIT"
-DESCRIPTION="C/Migemo -- Migemo library implementation in C"
-HOMEPAGE="http://www.kaoriya.net/#CMIGEMO"
-SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ~ppc x86"
-IUSE="unicode vim-syntax"
-
-DEPEND="dev-lang/perl
-	>=app-dicts/migemo-dict-200812[unicode=]
-	app-i18n/qkc"
-RDEPEND=">=app-dicts/migemo-dict-200812[unicode=]"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.2-migemo-dict.diff"
-	touch dict/SKK-JISYO.L
-	if use unicode ; then
-		sed -i -e "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die
-	fi
-
-	# Bug #246953
-	sed -i -e "s:-Wl,-rpath[^ ]*::" compile/Make_gcc.mak || die
-}
-
-src_compile() {
-	append-flags -fPIC
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" gcc || die
-}
-
-src_install() {
-	# parallel make install borks
-	emake -j1 \
-		prefix="${D}/usr" \
-		libdir="${D}/usr/$(get_libdir)" \
-		gcc-install || die
-
-	local encoding
-	if use unicode ; then
-		encoding="utf-8"
-	else
-		encoding="euc-jp"
-	fi
-
-	mv "${D}/usr/share/migemo/${encoding}/"*.dat "${D}/usr/share/migemo/"
-	rm -rf "${D}/usr/share/migemo/"{cp932,euc-jp,utf-8}
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins tools/migemo.vim
-	fi
-
-	dodoc doc/{README_j,TODO_j,vimigemo}.txt
-}
diff --git a/app-text/cmigemo/cmigemo-1.3c-r2.ebuild b/app-text/cmigemo/cmigemo-1.3c-r2.ebuild
deleted file mode 100644
index 5949875af65d..000000000000
--- a/app-text/cmigemo/cmigemo-1.3c-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_P="${P}-MIT"
-DESCRIPTION="C/Migemo -- Migemo library implementation in C"
-HOMEPAGE="http://www.kaoriya.net/#CMIGEMO"
-SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc x86"
-IUSE="unicode vim-syntax"
-
-DEPEND=">=app-dicts/migemo-dict-200812[unicode=]
-	dev-lang/perl
-	|| (
-		net-misc/curl
-		net-misc/wget
-		www-client/fetch
-	)
-	app-i18n/nkf"
-RDEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	# Bug #246953
-	epatch "${FILESDIR}/${P}-gentoo.patch" \
-		"${FILESDIR}"/${P}-ldflags.patch
-
-	touch dict/SKK-JISYO.L
-	if use unicode ; then
-		sed -i -e "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die
-	fi
-
-	# Bug #255813
-	sed -i -e "/^docdir/s:/doc/migemo:/share/doc/${PF}:" compile/config.mk.in || die
-}
-
-src_compile() {
-	append-flags -fPIC
-	# parallel make b0rked
-	emake -j1 \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		gcc-all || die
-}
-
-src_install() {
-	# parallel make b0rked
-	emake -j1 \
-		prefix="${D}/usr" \
-		libdir="${D}/usr/$(get_libdir)" \
-		gcc-install || die
-
-	local encoding
-	if use unicode ; then
-		encoding="utf-8"
-	else
-		encoding="euc-jp"
-	fi
-
-	mv "${D}/usr/share/migemo/${encoding}/"*.dat "${D}/usr/share/migemo/"
-	rm -rf "${D}/usr/share/migemo/"{cp932,euc-jp,utf-8}
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins tools/migemo.vim
-	fi
-
-	dodoc doc/{README_j,TODO_j,vimigemo}.txt
-}
diff --git a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
index 5843c8f263fd..b39dc8bc473a 100644
--- a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~x86"
+KEYWORDS="alpha amd64 ppc x86"
 IUSE="unicode vim-syntax"
 
 DEPEND=">=app-dicts/migemo-dict-200812[unicode=]
diff --git a/app-text/cmigemo/cmigemo-1.3c.ebuild b/app-text/cmigemo/cmigemo-1.3c.ebuild
deleted file mode 100644
index d00bfc14a73b..000000000000
--- a/app-text/cmigemo/cmigemo-1.3c.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="C/Migemo -- Migemo library implementation in C"
-HOMEPAGE="http://www.kaoriya.net/#CMIGEMO"
-SRC_URI="http://www.kaoriya.net/dist/var/${P}.tar.bz2"
-
-LICENSE="cmigemo"
-SLOT="0"
-KEYWORDS="x86 alpha ppc"	# development branch
-IUSE=""
-
-DEPEND="app-i18n/qkc
-	app-dicts/migemo-dict"
-RDEPEND="app-dicts/migemo-dict"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}"/${PN}-1.2-migemo-dict.diff
-	touch ${S}/dict/SKK-JISYO.L
-
-	# Bug #246953
-	sed -i -e "s:-Wl,-rpath[^ ]*::" compile/Make_gcc.mak || die
-}
-
-src_compile() {
-	emake CFLAGS="-fPIC ${CFLAGS}" gcc || die
-}
-
-src_install() {
-	make \
-		prefix=${D}/usr \
-		docdir=${D}/usr/share/doc/${P} \
-		gcc-install || die
-
-	mv ${D}/usr/share/migemo/euc-jp/*.dat ${D}/usr/share/migemo
-	rm -rf ${D}/usr/share/migemo/{cp932,euc-jp}
-
-	if has_version 'app-editors/vim-core' ; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins tools/migemo.vim
-	fi
-
-	dodoc tools/migemo.vim
-	dodoc doc/{README_j,TODO_j,vimigemo}.txt
-}
diff --git a/app-text/cmigemo/files/cmigemo-1.2-migemo-dict.diff b/app-text/cmigemo/files/cmigemo-1.2-migemo-dict.diff
deleted file mode 100644
index a216ceafb0ca..000000000000
--- a/app-text/cmigemo/files/cmigemo-1.2-migemo-dict.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN cmigemo-1.2.ORIG/tools/migemo.vim cmigemo-1.2/tools/migemo.vim
---- cmigemo-1.2.ORIG/tools/migemo.vim	2003-01-07 22:57:59.000000000 +0900
-+++ cmigemo-1.2/tools/migemo.vim	2004-03-13 17:25:31.944190968 +0900
-@@ -20,7 +20,7 @@
-     let dict = globpath(path, "migemo-dict")
-   endif
-   if dict == ''
--    let dict = '/usr/local/share/migemo/'.&encoding.'/migemo-dict'
-+    let dict = '/usr/share/migemo/migemo-dict'
-     if !filereadable(dict)
-       let dict = ''
-     endif
-@@ -43,7 +43,9 @@
-   nnoremap <Leader>f :call <SID>SearchChar(0)<CR>
- else
-   " non-builtin version
--  let g:migemodict = s:SearchDict()
-+  if !exists('g:migemodict')
-+    let g:migemodict = s:SearchDict()
-+  endif
-   command! -nargs=* Migemo :call <SID>MigemoSearch(<q-args>)
-   nnoremap <silent> <leader>mi :call <SID>MigemoSearch('')<cr>
-