[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/

["David Seifert" <soap@gentoo.org>]

commit:     7c5b9237028f432ac3c3404eb57249b2c6be55c2
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 17 11:25:19 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jul 17 11:25:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5b9237

app-i18n/uim: Remove app-i18n/canna

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-i18n/uim/{uim-1.8.8.ebuild => uim-1.8.8-r1.ebuild} | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app-i18n/uim/uim-1.8.8.ebuild b/app-i18n/uim/uim-1.8.8-r1.ebuild
similarity index 94%
rename from app-i18n/uim/uim-1.8.8.ebuild
rename to app-i18n/uim/uim-1.8.8-r1.ebuild
index e658b221ed7..1c032e933dc 100644
--- a/app-i18n/uim/uim-1.8.8.ebuild
+++ b/app-i18n/uim/uim-1.8.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
 LICENSE="BSD GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
+IUSE="X +anthy curl eb emacs expat libffi gtk gtk2 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt5 skk sqlite ssl static-libs xft"
 RESTRICT="test"
 REQUIRED_USE="gtk? ( X )
 	gtk2? ( X )
@@ -21,7 +21,6 @@ REQUIRED_USE="gtk? ( X )
 
 COMMON_DEPEND="
 	anthy? ( app-i18n/anthy )
-	canna? ( app-i18n/canna )
 	curl? ( net-misc/curl )
 	eb? ( dev-libs/eb )
 	emacs? ( >=app-editors/emacs-23.1:* )
@@ -112,7 +111,6 @@ src_configure() {
 	local myconf=(
 		$(use_with X x)
 		$(use_with anthy anthy-utf8)
-		$(use_with canna)
 		$(use_with curl)
 		$(use_with eb)
 		$(use_enable emacs)
@@ -134,6 +132,7 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_with xft)
 		--without-anthy
+		--without-canna
 		--enable-default-toolkit=$(usex gtk gtk3 $(usex gtk2 gtk $(usex qt5 qt5)))
 		--disable-gnome-applet
 		--disable-gnome3-applet
@@ -144,7 +143,7 @@ src_configure() {
 		--disable-qt4-qt3support
 	)
 
-	if (use gtk || use gtk2) && (use anthy || use canna); then
+	if (use gtk || use gtk2) && use anthy; then
 		myconf+=( --enable-dict )
 	else
 		myconf+=( --disable-dict )