[gentoo-commits] repo/gentoo:master commit in: app-text/cmigemo/, profiles/base/

[Michał Górny]

commit:     05d2e73cf8f4bb06070ec743a7232825fe49ac74
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 26 08:32:37 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Aug 26 08:59:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05d2e73c

app-text/cmigemo: Remove support for non-existent deps

 app-text/cmigemo/cmigemo-1.3c-r1.ebuild | 19 ++-----------------
 app-text/cmigemo/cmigemo-1.3c-r2.ebuild | 21 +++------------------
 app-text/cmigemo/cmigemo-1.3c-r3.ebuild | 19 ++-----------------
 app-text/cmigemo/cmigemo-1.3c.ebuild    | 19 ++-----------------
 profiles/base/package.use.mask          |  4 ----
 5 files changed, 9 insertions(+), 73 deletions(-)

diff --git a/app-text/cmigemo/cmigemo-1.3c-r1.ebuild b/app-text/cmigemo/cmigemo-1.3c-r1.ebuild
index 6c9e1cd8322..5339687735f 100644
--- a/app-text/cmigemo/cmigemo-1.3c-r1.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c-r1.ebuild
@@ -12,13 +12,12 @@ SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha ~amd64 ~ppc x86"
-IUSE="emacs unicode vim-syntax"
+IUSE="unicode vim-syntax"
 
 DEPEND="dev-lang/perl
 	>=app-dicts/migemo-dict-200812[unicode=]
 	app-i18n/qkc"
-RDEPEND=">=app-dicts/migemo-dict-200812[unicode=]
-	emacs? ( >=app-text/migemo-0.40-r1 )"
+RDEPEND=">=app-dicts/migemo-dict-200812[unicode=]"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -62,17 +61,3 @@ src_install() {
 
 	dodoc doc/{README_j,TODO_j,vimigemo}.txt
 }
-
-pkg_postinst() {
-	if use emacs ; then
-		elog
-		elog "Please add to your ~/.emacs"
-		elog "    (setq migemo-command \"cmigemo\")"
-		elog "    (setq migemo-options '(\"-q\" \"--emacs\" \"-i\" \"\\\\a\"))"
-		elog "    (setq migemo-dictionary \"/usr/share/migemo/migemo-dict\")"
-		elog "    (setq migemo-user-dictionary nil)"
-		elog "    (setq migemo-regex-dictionary nil)"
-		elog "to use cmigemo instead of migemo under emacs."
-		elog
-	fi
-}

diff --git a/app-text/cmigemo/cmigemo-1.3c-r2.ebuild b/app-text/cmigemo/cmigemo-1.3c-r2.ebuild
index cffb45a64ac..5949875af65 100644
--- a/app-text/cmigemo/cmigemo-1.3c-r2.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=2
@@ -12,7 +12,7 @@ SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ppc x86"
-IUSE="emacs unicode vim-syntax"
+IUSE="unicode vim-syntax"
 
 DEPEND=">=app-dicts/migemo-dict-200812[unicode=]
 	dev-lang/perl
@@ -22,8 +22,7 @@ DEPEND=">=app-dicts/migemo-dict-200812[unicode=]
 		www-client/fetch
 	)
 	app-i18n/nkf"
-RDEPEND="${RDEPEND}
-	emacs? ( >=app-text/migemo-0.40-r1 )"
+RDEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -75,17 +74,3 @@ src_install() {
 
 	dodoc doc/{README_j,TODO_j,vimigemo}.txt
 }
-
-pkg_postinst() {
-	if use emacs ; then
-		elog
-		elog "Please add to your ~/.emacs"
-		elog "    (setq migemo-command \"cmigemo\")"
-		elog "    (setq migemo-options '(\"-q\" \"--emacs\" \"-i\" \"\\\\a\"))"
-		elog "    (setq migemo-dictionary \"/usr/share/migemo/migemo-dict\")"
-		elog "    (setq migemo-user-dictionary nil)"
-		elog "    (setq migemo-regex-dictionary nil)"
-		elog "to use cmigemo instead of migemo under emacs."
-		elog
-	fi
-}

diff --git a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
index 9008d0eeba9..5843c8f263f 100644
--- a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~x86"
-IUSE="emacs unicode vim-syntax"
+IUSE="unicode vim-syntax"
 
 DEPEND=">=app-dicts/migemo-dict-200812[unicode=]
 	dev-lang/perl
@@ -22,8 +22,7 @@ DEPEND=">=app-dicts/migemo-dict-200812[unicode=]
 		www-client/fetch
 	)
 	app-i18n/nkf"
-RDEPEND="${DEPEND}
-	emacs? ( >=app-text/migemo-0.40-r1 )"
+RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -79,17 +78,3 @@ src_install() {
 
 	dodoc doc/{README_j,TODO_j,vimigemo}.txt
 }
-
-pkg_postinst() {
-	if use emacs ; then
-		elog
-		elog "Please add to your ~/.emacs"
-		elog "    (setq migemo-command \"cmigemo\")"
-		elog "    (setq migemo-options '(\"-q\" \"--emacs\" \"-i\" \"\\\\a\"))"
-		elog "    (setq migemo-dictionary \"/usr/share/migemo/migemo-dict\")"
-		elog "    (setq migemo-user-dictionary nil)"
-		elog "    (setq migemo-regex-dictionary nil)"
-		elog "to use cmigemo instead of migemo under emacs."
-		elog
-	fi
-}

diff --git a/app-text/cmigemo/cmigemo-1.3c.ebuild b/app-text/cmigemo/cmigemo-1.3c.ebuild
index 791d191e604..d00bfc14a73 100644
--- a/app-text/cmigemo/cmigemo-1.3c.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c.ebuild
@@ -12,12 +12,11 @@ SRC_URI="http://www.kaoriya.net/dist/var/${P}.tar.bz2"
 LICENSE="cmigemo"
 SLOT="0"
 KEYWORDS="x86 alpha ppc"	# development branch
-IUSE="emacs"
+IUSE=""
 
 DEPEND="app-i18n/qkc
 	app-dicts/migemo-dict"
-RDEPEND="app-dicts/migemo-dict
-	emacs? ( >=app-text/migemo-0.40-r1 )"
+RDEPEND="app-dicts/migemo-dict"
 
 src_unpack() {
 	unpack ${A}
@@ -50,17 +49,3 @@ src_install() {
 	dodoc tools/migemo.vim
 	dodoc doc/{README_j,TODO_j,vimigemo}.txt
 }
-
-pkg_postinst() {
-	if use emacs ; then
-		elog
-		elog "Please add to your ~/.emacs"
-		elog "    (setq migemo-command \"cmigemo\")"
-		elog "    (setq migemo-options '(\"-q\" \"--emacs\" \"-i\" \"\\\\a\"))"
-		elog "    (setq migemo-dictionary \"/usr/share/migemo/migemo-dict\")"
-		elog "    (setq migemo-user-dictionary nil)"
-		elog "    (setq migemo-regex-dictionary nil)"
-		elog "to use cmigemo instead of migemo under emacs."
-		elog
-	fi
-}

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 7b976d1c5be..594eb13eebe 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -434,10 +434,6 @@ dev-java/gcj-jdk awt
 # Gentoo bug: 554484
 >=dev-lang/mono-3.12.1 doc
 
-# Manuel Rüger <mrueg@g.o> (05 Jul 2015)
-# app-text/migemo is masked because it fails for ruby20
-app-text/cmigemo emacs
-
 # Mike Gilbert <floppym@g.o> (16 May 2015)
 # dev-lang/python[berkdb] fails with recent multilib sys-libs/db (bug 519584).
 dev-lang/python berkdb