From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 98BC2139694 for ; Sun, 23 Jul 2017 15:04:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DC564E0DBE; Sun, 23 Jul 2017 15:04:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A8EE3E0DBE for ; Sun, 23 Jul 2017 15:04:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3CAFA34186C for ; Sun, 23 Jul 2017 15:04:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5C4D74B8 for ; Sun, 23 Jul 2017 15:04:40 +0000 (UTC) From: "Akinori Hattori" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Akinori Hattori" Message-ID: <1500822240.13fb60a81e2cf411fcf856a081bb14a8aac31918.hattya@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/mlterm/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/mlterm/metadata.xml x11-terms/mlterm/mlterm-3.8.0.ebuild x11-terms/mlterm/mlterm-3.8.1.ebuild X-VCS-Directories: x11-terms/mlterm/ X-VCS-Committer: hattya X-VCS-Committer-Name: Akinori Hattori X-VCS-Revision: 13fb60a81e2cf411fcf856a081bb14a8aac31918 X-VCS-Branch: master Date: Sun, 23 Jul 2017 15:04:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2ab9d658-1927-46ec-baed-f0bde3944b47 X-Archives-Hash: 0bb92d7736ae7ef585b879ac92df0570 commit: 13fb60a81e2cf411fcf856a081bb14a8aac31918 Author: Akinori Hattori gentoo org> AuthorDate: Sun Jul 23 15:04:00 2017 +0000 Commit: Akinori Hattori gentoo org> CommitDate: Sun Jul 23 15:04:00 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13fb60a8 x11-terms/mlterm: add gtk2 USE flag Package-Manager: Portage-2.3.6, Repoman-2.3.1 x11-terms/mlterm/metadata.xml | 19 +++++++++++-------- x11-terms/mlterm/mlterm-3.8.0.ebuild | 20 +++++++++++--------- x11-terms/mlterm/mlterm-3.8.1.ebuild | 20 +++++++++++--------- 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/x11-terms/mlterm/metadata.xml b/x11-terms/mlterm/metadata.xml index 38d86b2d1e0..7123d0f0827 100644 --- a/x11-terms/mlterm/metadata.xml +++ b/x11-terms/mlterm/metadata.xml @@ -6,14 +6,17 @@ Cjk - Enable app-i18n/fcitx support - Enable app-i18n/ibus support - Enable net-libs/libssh2 support - Enable ReGIS support - Enable app-i18n/scim support - Enable app-i18n/uim support - Enable SKK support (virtual/skkserv or app-i18n/skk-jisyo) - Enable sys-libs/libutempter support + Enable support for app-i18n/fcitx + + Build with x11-libs/gtk+:2 instead of x11-libs/gtk+:3 + + Enable support for app-i18n/ibus + Enable support for net-libs/libssh2 + Enable support for ReGIS + Enable support for app-i18n/scim + Enable support for SKK (virtual/skkserv or app-i18n/skk-jisyo) + Enable support for app-i18n/uim + Enable support for sys-libs/libutempter mlterm diff --git a/x11-terms/mlterm/mlterm-3.8.0.ebuild b/x11-terms/mlterm/mlterm-3.8.0.ebuild index 863e8a78c5c..90575a8cde7 100644 --- a/x11-terms/mlterm/mlterm-3.8.0.ebuild +++ b/x11-terms/mlterm/mlterm-3.8.0.ebuild @@ -7,12 +7,12 @@ inherit eutils DESCRIPTION="A multi-lingual terminal emulator" HOMEPAGE="http://mlterm.sourceforge.net/" -SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="amd64 hppa ppc ppc64 x86" -IUSE="bidi cairo canna debug fcitx freewnn gtk ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter xft" +IUSE="bidi cairo canna debug fcitx freewnn gtk gtk2 ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter xft" RDEPEND="x11-libs/libICE x11-libs/libSM @@ -22,7 +22,10 @@ RDEPEND="x11-libs/libICE canna? ( app-i18n/canna ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) - gtk? ( >=x11-libs/gtk+-2:= ) + gtk? ( + gtk2? ( x11-libs/gtk+:2 ) + !gtk2? ( x11-libs/gtk+:3 ) + ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) @@ -46,6 +49,7 @@ RDEPEND="x11-libs/libICE DEPEND="${RDEPEND} virtual/pkgconfig nls? ( sys-devel/gettext )" +REQUIRED_USE="gtk2? ( gtk )" DOCS=( doc/{en,ja} ) @@ -83,12 +87,10 @@ src_configure() { local scrollbars="sample,extra" local tools="mlclient,mlcc,mlfc,mlmenu,mlterm-zoom" if use gtk; then - myconf+=( --with-imagelib=gdk-pixbuf ) - if has_version x11-libs/gtk+:3; then - myconf+=( --with-gtk=3.0 ) - else - myconf+=( --with-gtk=2.0 ) - fi + myconf+=( + $(use_with gtk gtk $(usex gtk2 2.0 3.0)) + --with-imagelib=gdk-pixbuf + ) scrollbars+=",pixmap_engine" tools+=",mlconfig,mlimgloader" fi diff --git a/x11-terms/mlterm/mlterm-3.8.1.ebuild b/x11-terms/mlterm/mlterm-3.8.1.ebuild index a90ee67d69c..8127c27a5b6 100644 --- a/x11-terms/mlterm/mlterm-3.8.1.ebuild +++ b/x11-terms/mlterm/mlterm-3.8.1.ebuild @@ -7,12 +7,12 @@ inherit eutils DESCRIPTION="A multi-lingual terminal emulator" HOMEPAGE="http://mlterm.sourceforge.net/" -SRC_URI="mirror://sourceforge/mlterm/${P}.tar.gz" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="bidi cairo canna debug fbcon fcitx freewnn gtk ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter xft" +IUSE="bidi cairo canna debug fbcon fcitx freewnn gtk gtk2 ibus libssh2 m17n-lib nls regis scim skk static-libs uim utempter xft" RDEPEND="x11-libs/libICE x11-libs/libSM @@ -23,7 +23,10 @@ RDEPEND="x11-libs/libICE fbcon? ( media-fonts/unifont ) fcitx? ( app-i18n/fcitx ) freewnn? ( app-i18n/freewnn ) - gtk? ( >=x11-libs/gtk+-2:= ) + gtk? ( + gtk2? ( x11-libs/gtk+:2 ) + !gtk2? ( x11-libs/gtk+:3 ) + ) ibus? ( app-i18n/ibus ) libssh2? ( net-libs/libssh2 ) m17n-lib? ( dev-libs/m17n-lib ) @@ -47,6 +50,7 @@ RDEPEND="x11-libs/libICE DEPEND="${RDEPEND} virtual/pkgconfig nls? ( sys-devel/gettext )" +REQUIRED_USE="gtk2? ( gtk )" PATCHES=( "${FILESDIR}"/${PN}-font.patch ) DOCS=( doc/{en,ja} ) @@ -86,12 +90,10 @@ src_configure() { local scrollbars="sample,extra" local tools="mlclient,mlcc,mlfc,mlmenu,mlterm-zoom" if use gtk; then - myconf+=( --with-imagelib=gdk-pixbuf ) - if has_version x11-libs/gtk+:3; then - myconf+=( --with-gtk=3.0 ) - else - myconf+=( --with-gtk=2.0 ) - fi + myconf+=( + $(use_with gtk gtk $(usex gtk2 2.0 3.0)) + --with-imagelib=gdk-pixbuf + ) scrollbars+=",pixmap_engine" tools+=",mlconfig,mlimgloader" fi