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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Akinori Hattori" <hattya@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/
Date: Mon, 28 May 2018 14:56:20 +0000 (UTC)	[thread overview]
Message-ID: <1527519357.e4c1809a146836fd3483f12dfae124e8a13ba59e.hattya@gentoo> (raw)

commit:     e4c1809a146836fd3483f12dfae124e8a13ba59e
Author:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Mon May 28 14:21:32 2018 +0000
Commit:     Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Mon May 28 14:55:57 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4c1809a

app-i18n/uim: drop unicode USE flag

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 app-i18n/uim/uim-1.8.6-r1.ebuild | 19 ++++---------------
 app-i18n/uim/uim-1.8.6-r2.ebuild | 19 ++++---------------
 2 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index e0afd85576e..8f11f1958d1 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${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 gtk3 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs unicode xft"
+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk3 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify m17n-lib ncurses nls qt4 skk sqlite ssl static-libs xft"
 RESTRICT="test"
 REQUIRED_USE="gtk? ( X )
 	gtk3? ( X )
@@ -29,10 +29,7 @@ CDEPEND="!dev-scheme/sigscheme
 		x11-libs/libXrender
 		x11-libs/libXt
 	)
-	anthy? (
-		unicode? ( >=app-i18n/anthy-8622 )
-		!unicode? ( app-i18n/anthy )
-	)
+	anthy? ( app-i18n/anthy )
 	canna? ( app-i18n/canna )
 	curl? ( net-misc/curl )
 	eb? ( dev-libs/eb )
@@ -98,6 +95,7 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		$(use_with X x)
+		$(use_with anthy anthy-utf8)
 		$(use_with canna)
 		$(use_with curl)
 		$(use_with eb)
@@ -119,6 +117,7 @@ src_configure() {
 		$(use_enable ssl openssl)
 		$(use_enable static-libs static)
 		$(use_with xft)
+		--without-anthy
 		--disable-gnome-applet
 		--disable-gnome3-applet
 		--disable-kde-applet
@@ -127,16 +126,6 @@ src_configure() {
 		--without-prime
 	)
 
-	if use anthy; then
-		if use unicode; then
-			myconf+=( --with-anthy-utf8 )
-		else
-			myconf+=( --with-anthy )
-		fi
-	else
-		myconf+=( --without-anthy )
-	fi
-
 	if (use gtk || use gtk3) && (use anthy || use canna); then
 		myconf+=( --enable-dict )
 	else

diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
index faf0515534a..92b6abc0c68 100644
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${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 gtk3 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt4 skk sqlite ssl static-libs unicode xft"
+IUSE="X +anthy canna curl eb emacs expat libffi gtk gtk3 l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW libedit libnotify libressl m17n-lib ncurses nls qt4 skk sqlite ssl static-libs xft"
 RESTRICT="test"
 REQUIRED_USE="gtk? ( X )
 	gtk3? ( X )
@@ -29,10 +29,7 @@ CDEPEND="!dev-scheme/sigscheme
 		x11-libs/libXrender
 		x11-libs/libXt
 	)
-	anthy? (
-		unicode? ( >=app-i18n/anthy-8622 )
-		!unicode? ( app-i18n/anthy )
-	)
+	anthy? ( app-i18n/anthy )
 	canna? ( app-i18n/canna )
 	curl? ( net-misc/curl )
 	eb? ( dev-libs/eb )
@@ -102,6 +99,7 @@ src_prepare() {
 src_configure() {
 	local myconf=(
 		$(use_with X x)
+		$(use_with anthy anthy-utf8)
 		$(use_with canna)
 		$(use_with curl)
 		$(use_with eb)
@@ -123,6 +121,7 @@ src_configure() {
 		$(use_enable ssl openssl)
 		$(use_enable static-libs static)
 		$(use_with xft)
+		--without-anthy
 		--disable-gnome-applet
 		--disable-gnome3-applet
 		--disable-kde-applet
@@ -131,16 +130,6 @@ src_configure() {
 		--without-prime
 	)
 
-	if use anthy; then
-		if use unicode; then
-			myconf+=( --with-anthy-utf8 )
-		else
-			myconf+=( --with-anthy )
-		fi
-	else
-		myconf+=( --without-anthy )
-	fi
-
 	if (use gtk || use gtk3) && (use anthy || use canna); then
 		myconf+=( --enable-dict )
 	else

next             reply	other threads:[~2018-05-28 14:56 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-28 14:56 Akinori Hattori [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-12 19:57 [gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/ Sam James
2024-10-07 23:06 Andreas Sturmlechner
2024-10-07 23:06 Andreas Sturmlechner
2023-10-01 18:14 Arthur Zamarin
2023-09-08  9:29 Sam James
2023-09-08  9:29 Sam James
2023-09-08  9:29 Sam James
2022-08-02  7:48 Joonas Niilola
2022-08-02  7:48 Joonas Niilola
2022-03-22 18:43 Jakov Smolić
2021-10-24  8:59 Akinori Hattori
2021-10-23 14:32 Akinori Hattori
2021-07-17 11:26 David Seifert
2021-05-02 19:07 Mikle Kolyada
2021-01-08  0:00 Andreas Sturmlechner
2020-11-16 22:53 Sergei Trofimovich
2020-04-04 11:07 Sergei Trofimovich
2018-10-20 14:12 Sergei Trofimovich
2018-08-26  8:25 Michał Górny
2018-08-18 22:18 Sergei Trofimovich
2018-08-08 17:53 Mikle Kolyada
2018-08-06 22:20 Thomas Deutschmann
2018-08-06 13:15 Akinori Hattori
2018-08-04 13:09 Akinori Hattori
2018-07-27  7:12 Sergei Trofimovich
2018-06-03  2:19 Akinori Hattori
2018-05-28 14:56 Akinori Hattori
2018-05-28 14:56 Akinori Hattori
2018-05-28 14:56 Akinori Hattori
2018-05-28 14:56 Akinori Hattori
2017-11-30  2:33 Andreas Sturmlechner
2016-06-27 12:44 Ulrich Müller
2016-06-14  2:29 Yixun Lan
2015-09-01 18:53 Tobias Klausmann

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:e0afd85576 dfblob:8f11f1958d dfblob:faf0515534
dfblob:92b6abc0c6 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: app-i18n/uim/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1527519357.e4c1809a146836fd3483f12dfae124e8a13ba59e.hattya@gentoo \
    --to=hattya@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

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